diff options
| author |  archshift | 2015-05-10 18:07:44 -0700 |
|---|---|---|
| committer | archshift | 2015-05-10 18:07:44 -0700 |
| commit | e98fbadf4a49eecc6d39c082cba683d5d88ea2c5 (patch) | |
| tree | 7901b6ad673f8950d4f36d731eaa45b195cac763 /src/core/hle/svc.cpp | |
| parent | Merge pull request #741 from Subv/tls (diff) | |
| parent | fixup! GSP: Small tweaks to shared memory initialization (diff) | |
| download | yuzu-e98fbadf4a49eecc6d39c082cba683d5d88ea2c5.tar.gz yuzu-e98fbadf4a49eecc6d39c082cba683d5d88ea2c5.tar.xz yuzu-e98fbadf4a49eecc6d39c082cba683d5d88ea2c5.zip | |
Merge pull request #740 from yuriks/gsp-shmem
Fix crashes due to un-initialized GSP shared memory
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 393cfbe79..1ec6599c7 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -601,7 +601,9 @@ static ResultCode CreateMemoryBlock(Handle* out_handle, u32 addr, u32 size, u32 | |||
| 601 | using Kernel::SharedMemory; | 601 | using Kernel::SharedMemory; |
| 602 | // TODO(Subv): Implement this function | 602 | // TODO(Subv): Implement this function |
| 603 | 603 | ||
| 604 | SharedPtr<SharedMemory> shared_memory = SharedMemory::Create(); | 604 | using Kernel::MemoryPermission; |
| 605 | SharedPtr<SharedMemory> shared_memory = SharedMemory::Create(size, | ||
| 606 | (MemoryPermission)my_permission, (MemoryPermission)other_permission); | ||
| 605 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(shared_memory))); | 607 | CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(shared_memory))); |
| 606 | 608 | ||
| 607 | LOG_WARNING(Kernel_SVC, "(STUBBED) called addr=0x%08X", addr); | 609 | LOG_WARNING(Kernel_SVC, "(STUBBED) called addr=0x%08X", addr); |