diff options
| author | 2019-08-21 12:10:10 -0400 | |
|---|---|---|
| committer | 2019-08-21 12:10:10 -0400 | |
| commit | b4a8cfbd00863032fe4b4ed0145cfe1711b9317d (patch) | |
| tree | 96d2ef5ae4b54857e2fd9b0dae5cb867acf30f7f /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #2769 from FernandoS27/commands-flush (diff) | |
| parent | Common/Alignment: Add noexcept where required. (diff) | |
| download | yuzu-b4a8cfbd00863032fe4b4ed0145cfe1711b9317d.tar.gz yuzu-b4a8cfbd00863032fe4b4ed0145cfe1711b9317d.tar.xz yuzu-b4a8cfbd00863032fe4b4ed0145cfe1711b9317d.zip | |
Merge pull request #2748 from FernandoS27/align-memory
VM_Manager: Align allocated host physical memory to 256bytes
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 92169a97b..e80a12ac3 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -247,7 +247,7 @@ VAddr Process::CreateTLSRegion() { | |||
| 247 | ASSERT(region_address.Succeeded()); | 247 | ASSERT(region_address.Succeeded()); |
| 248 | 248 | ||
| 249 | const auto map_result = vm_manager.MapMemoryBlock( | 249 | const auto map_result = vm_manager.MapMemoryBlock( |
| 250 | *region_address, std::make_shared<std::vector<u8>>(Memory::PAGE_SIZE), 0, | 250 | *region_address, std::make_shared<PhysicalMemory>(Memory::PAGE_SIZE), 0, |
| 251 | Memory::PAGE_SIZE, MemoryState::ThreadLocal); | 251 | Memory::PAGE_SIZE, MemoryState::ThreadLocal); |
| 252 | ASSERT(map_result.Succeeded()); | 252 | ASSERT(map_result.Succeeded()); |
| 253 | 253 | ||
| @@ -277,7 +277,7 @@ void Process::FreeTLSRegion(VAddr tls_address) { | |||
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | void Process::LoadModule(CodeSet module_, VAddr base_addr) { | 279 | void Process::LoadModule(CodeSet module_, VAddr base_addr) { |
| 280 | const auto memory = std::make_shared<std::vector<u8>>(std::move(module_.memory)); | 280 | const auto memory = std::make_shared<PhysicalMemory>(std::move(module_.memory)); |
| 281 | 281 | ||
| 282 | const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, | 282 | const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, |
| 283 | MemoryState memory_state) { | 283 | MemoryState memory_state) { |
| @@ -327,7 +327,7 @@ void Process::AllocateMainThreadStack(u64 stack_size) { | |||
| 327 | // Allocate and map the main thread stack | 327 | // Allocate and map the main thread stack |
| 328 | const VAddr mapping_address = vm_manager.GetTLSIORegionEndAddress() - main_thread_stack_size; | 328 | const VAddr mapping_address = vm_manager.GetTLSIORegionEndAddress() - main_thread_stack_size; |
| 329 | vm_manager | 329 | vm_manager |
| 330 | .MapMemoryBlock(mapping_address, std::make_shared<std::vector<u8>>(main_thread_stack_size), | 330 | .MapMemoryBlock(mapping_address, std::make_shared<PhysicalMemory>(main_thread_stack_size), |
| 331 | 0, main_thread_stack_size, MemoryState::Stack) | 331 | 0, main_thread_stack_size, MemoryState::Stack) |
| 332 | .Unwrap(); | 332 | .Unwrap(); |
| 333 | } | 333 | } |