summaryrefslogtreecommitdiff
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorGravatar Mai2022-12-10 19:08:45 +0000
committerGravatar GitHub2022-12-10 19:08:45 +0000
commita5bc86a9acabfb38799e7f7dd15fc5898c754d23 (patch)
treec0a0d9112b4256f88e51cea22dfb8442193a5959 /src/core/memory.cpp
parentMerge pull request #9418 from liamwhite/implicitly-deleted (diff)
parentmemory: remove DEBUG_ASSERT pointer test (diff)
downloadyuzu-a5bc86a9acabfb38799e7f7dd15fc5898c754d23.tar.gz
yuzu-a5bc86a9acabfb38799e7f7dd15fc5898c754d23.tar.xz
yuzu-a5bc86a9acabfb38799e7f7dd15fc5898c754d23.zip
Merge pull request #9417 from liamwhite/debug-assert
memory: remove DEBUG_ASSERT pointer test
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 3141122f1..b3f50223b 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -195,13 +195,11 @@ struct Memory::Impl {
195 break; 195 break;
196 } 196 }
197 case Common::PageType::Memory: { 197 case Common::PageType::Memory: {
198 DEBUG_ASSERT(pointer);
199 u8* mem_ptr = pointer + page_offset + (page_index << YUZU_PAGEBITS); 198 u8* mem_ptr = pointer + page_offset + (page_index << YUZU_PAGEBITS);
200 on_memory(copy_amount, mem_ptr); 199 on_memory(copy_amount, mem_ptr);
201 break; 200 break;
202 } 201 }
203 case Common::PageType::DebugMemory: { 202 case Common::PageType::DebugMemory: {
204 DEBUG_ASSERT(pointer);
205 u8* const mem_ptr{GetPointerFromDebugMemory(current_vaddr)}; 203 u8* const mem_ptr{GetPointerFromDebugMemory(current_vaddr)};
206 on_memory(copy_amount, mem_ptr); 204 on_memory(copy_amount, mem_ptr);
207 break; 205 break;