diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-07-19 00:15:53 +0200 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-07-19 16:06:08 +0200 |
commit | 9bede4eeed523f9707a989f1297279c006086e76 (patch) | |
tree | 2acfabeff5f7f449bcdb22563f5ad66f7fa5f414 /src/core/hle/kernel/process.cpp | |
parent | Merge pull request #2687 from lioncash/tls-process (diff) | |
download | yuzu-9bede4eeed523f9707a989f1297279c006086e76.tar yuzu-9bede4eeed523f9707a989f1297279c006086e76.tar.gz yuzu-9bede4eeed523f9707a989f1297279c006086e76.tar.bz2 yuzu-9bede4eeed523f9707a989f1297279c006086e76.tar.lz yuzu-9bede4eeed523f9707a989f1297279c006086e76.tar.xz yuzu-9bede4eeed523f9707a989f1297279c006086e76.tar.zst yuzu-9bede4eeed523f9707a989f1297279c006086e76.zip |
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() { ASSERT(region_address.Succeeded()); const auto map_result = vm_manager.MapMemoryBlock( - *region_address, std::make_shared<std::vector<u8>>(Memory::PAGE_SIZE), 0, + *region_address, std::make_shared<PhysicalMemory>(Memory::PAGE_SIZE), 0, Memory::PAGE_SIZE, MemoryState::ThreadLocal); ASSERT(map_result.Succeeded()); @@ -277,7 +277,7 @@ void Process::FreeTLSRegion(VAddr tls_address) { } void Process::LoadModule(CodeSet module_, VAddr base_addr) { - const auto memory = std::make_shared<std::vector<u8>>(std::move(module_.memory)); + const auto memory = std::make_shared<PhysicalMemory>(std::move(module_.memory)); const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, MemoryState memory_state) { @@ -327,7 +327,7 @@ void Process::AllocateMainThreadStack(u64 stack_size) { // Allocate and map the main thread stack const VAddr mapping_address = vm_manager.GetTLSIORegionEndAddress() - main_thread_stack_size; vm_manager - .MapMemoryBlock(mapping_address, std::make_shared<std::vector<u8>>(main_thread_stack_size), + .MapMemoryBlock(mapping_address, std::make_shared<PhysicalMemory>(main_thread_stack_size), 0, main_thread_stack_size, MemoryState::Stack) .Unwrap(); } |