summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar Lioncash2018-11-19 08:50:28 -0500
committerGravatar Lioncash2018-11-19 09:20:29 -0500
commit76ac234bf66a5cad7898056dcd33f52d2c38a232 (patch)
treee8f6ab5b2f6bb76e4f85df713e429e17ccc4f885 /src/core/hle/kernel
parentkernel/shared_memory: Make data members private (diff)
downloadyuzu-76ac234bf66a5cad7898056dcd33f52d2c38a232.tar.gz
yuzu-76ac234bf66a5cad7898056dcd33f52d2c38a232.tar.xz
yuzu-76ac234bf66a5cad7898056dcd33f52d2c38a232.zip
kernel/shared_memory: Make GetPointer() take a std::size_t instead of a u32
Makes the interface nicer to use in terms of 64-bit code, as it makes it less likely for one to get truncation warnings (and also makes sense in the context of the rest of the interface where 64-bit types are used for sizes and offsets
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/shared_memory.cpp2
-rw-r--r--src/core/hle/kernel/shared_memory.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index a016a86b6..214f0c9bf 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -132,7 +132,7 @@ VMAPermission SharedMemory::ConvertPermissions(MemoryPermission permission) {
132 return static_cast<VMAPermission>(masked_permissions); 132 return static_cast<VMAPermission>(masked_permissions);
133} 133}
134 134
135u8* SharedMemory::GetPointer(u32 offset) { 135u8* SharedMemory::GetPointer(std::size_t offset) {
136 return backing_block->data() + backing_block_offset + offset; 136 return backing_block->data() + backing_block_offset + offset;
137} 137}
138 138
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h
index 9a7c189e8..7d7d6486d 100644
--- a/src/core/hle/kernel/shared_memory.h
+++ b/src/core/hle/kernel/shared_memory.h
@@ -115,7 +115,7 @@ public:
115 * @param offset Offset from the start of the shared memory block to get pointer 115 * @param offset Offset from the start of the shared memory block to get pointer
116 * @return Pointer to the shared memory block from the specified offset 116 * @return Pointer to the shared memory block from the specified offset
117 */ 117 */
118 u8* GetPointer(u32 offset = 0); 118 u8* GetPointer(std::size_t offset = 0);
119 119
120private: 120private:
121 explicit SharedMemory(KernelCore& kernel); 121 explicit SharedMemory(KernelCore& kernel);