diff options
| author |  bunnei | 2015-05-25 22:43:17 -0400 |
|---|---|---|
| committer | bunnei | 2015-05-25 22:43:17 -0400 |
| commit | 5bcff3b837f1b2192b190ff8e6a1efdd8f113821 (patch) | |
| tree | 75d35066309e7bcdc7a0e90fbb0449da3f4e2d0e | |
| parent | Update bundled GLFW to 3.1.1 (diff) | |
| parent | Core/SVC: Map the shared memory created in CreateMemoryBlock to the specified... (diff) | |
| download | yuzu-5bcff3b837f1b2192b190ff8e6a1efdd8f113821.tar.gz yuzu-5bcff3b837f1b2192b190ff8e6a1efdd8f113821.tar.xz yuzu-5bcff3b837f1b2192b190ff8e6a1efdd8f113821.zip | |
Merge pull request #820 from Subv/creatememoryblock
Core/SVC: Map the shared memory created in CreateMemoryBlock to the specified address
| -rw-r--r-- | src/core/hle/svc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 347d241f9..ca3ff3328 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -654,6 +654,8 @@ static ResultCode CreateMemoryBlock(Handle* out_handle, u32 addr, u32 size, u32 | |||
| 654 | using Kernel::MemoryPermission; | 654 | using Kernel::MemoryPermission; |
| 655 | SharedPtr<SharedMemory> shared_memory = SharedMemory::Create(size, | 655 | SharedPtr<SharedMemory> shared_memory = SharedMemory::Create(size, |
| 656 | (MemoryPermission)my_permission, (MemoryPermission)other_permission); | 656 | (MemoryPermission)my_permission, (MemoryPermission)other_permission); |
| 657 | // Map the SharedMemory to the specified address | ||
| 658 | shared_memory->base_address = addr; | ||
| 657 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(shared_memory))); | 659 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(shared_memory))); |
| 658 | 660 | ||
| 659 | LOG_WARNING(Kernel_SVC, "(STUBBED) called addr=0x%08X", addr); | 661 | LOG_WARNING(Kernel_SVC, "(STUBBED) called addr=0x%08X", addr); |