diff options
| author | 2022-09-05 17:42:24 -0700 | |
|---|---|---|
| committer | 2022-10-18 19:13:34 -0700 | |
| commit | 47b8160666da8dcb679bb7cabe35a615a1786155 (patch) | |
| tree | c22fd04d12cc19f0155feb98157dc90874e6456b /src/core/memory.cpp | |
| parent | core: hle: result: Add GetInnerValue and Includes methods. (diff) | |
| download | yuzu-47b8160666da8dcb679bb7cabe35a615a1786155.tar.gz yuzu-47b8160666da8dcb679bb7cabe35a615a1786155.tar.xz yuzu-47b8160666da8dcb679bb7cabe35a615a1786155.zip | |
core: device_memory: Templatize GetPointer(..).
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 2ac792566..9637cb5b1 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -65,7 +65,7 @@ struct Memory::Impl { | |||
| 65 | return {}; | 65 | return {}; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | return system.DeviceMemory().GetPointer(paddr) + vaddr; | 68 | return system.DeviceMemory().GetPointer<u8>(paddr) + vaddr; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | [[nodiscard]] u8* GetPointerFromDebugMemory(VAddr vaddr) const { | 71 | [[nodiscard]] u8* GetPointerFromDebugMemory(VAddr vaddr) const { |
| @@ -75,7 +75,7 @@ struct Memory::Impl { | |||
| 75 | return {}; | 75 | return {}; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | return system.DeviceMemory().GetPointer(paddr) + vaddr; | 78 | return system.DeviceMemory().GetPointer<u8>(paddr) + vaddr; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | u8 Read8(const VAddr addr) { | 81 | u8 Read8(const VAddr addr) { |
| @@ -499,7 +499,7 @@ struct Memory::Impl { | |||
| 499 | } else { | 499 | } else { |
| 500 | while (base != end) { | 500 | while (base != end) { |
| 501 | page_table.pointers[base].Store( | 501 | page_table.pointers[base].Store( |
| 502 | system.DeviceMemory().GetPointer(target) - (base << YUZU_PAGEBITS), type); | 502 | system.DeviceMemory().GetPointer<u8>(target) - (base << YUZU_PAGEBITS), type); |
| 503 | page_table.backing_addr[base] = target - (base << YUZU_PAGEBITS); | 503 | page_table.backing_addr[base] = target - (base << YUZU_PAGEBITS); |
| 504 | 504 | ||
| 505 | ASSERT_MSG(page_table.pointers[base].Pointer(), | 505 | ASSERT_MSG(page_table.pointers[base].Pointer(), |