diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-14 00:16:13 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-28 14:52:52 +0100 |
commit | 73fba22c019562687c6e14f20ca7422020f7e070 (patch) | |
tree | 605504e9e6306752023ce8bfbff9599c2eab957e /src/core/hle/kernel/shared_memory.cpp | |
parent | Merge pull request #349 from lioncash/uhdync (diff) | |
download | yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.gz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.bz2 yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.lz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.xz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.zst yuzu-73fba22c019562687c6e14f20ca7422020f7e070.zip |
Diffstat (limited to 'src/core/hle/kernel/shared_memory.cpp')
-rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 2840f13bb..5138bb7ae 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -32,7 +32,7 @@ public: */ SharedMemory* CreateSharedMemory(Handle& handle, const std::string& name) { SharedMemory* shared_memory = new SharedMemory; - handle = Kernel::g_object_pool.Create(shared_memory); + handle = Kernel::g_handle_table.Create(shared_memory); shared_memory->name = name; return shared_memory; } @@ -60,7 +60,7 @@ ResultCode MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions return ResultCode(ErrorDescription::InvalidAddress, ErrorModule::Kernel, ErrorSummary::InvalidArgument, ErrorLevel::Permanent); } - SharedMemory* shared_memory = Kernel::g_object_pool.Get<SharedMemory>(handle); + SharedMemory* shared_memory = Kernel::g_handle_table.Get<SharedMemory>(handle); if (shared_memory == nullptr) return InvalidHandle(ErrorModule::Kernel); shared_memory->base_address = address; @@ -71,7 +71,7 @@ ResultCode MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions } ResultVal<u8*> GetSharedMemoryPointer(Handle handle, u32 offset) { - SharedMemory* shared_memory = Kernel::g_object_pool.Get<SharedMemory>(handle); + SharedMemory* shared_memory = Kernel::g_handle_table.Get<SharedMemory>(handle); if (shared_memory == nullptr) return InvalidHandle(ErrorModule::Kernel); if (0 != shared_memory->base_address) |