Browse Source

Merge pull request #9417 from liamwhite/debug-assert

memory: remove DEBUG_ASSERT pointer test
nce_cpp
Mai 3 years ago
committed by GitHub
parent
commit
70c9f6000d
  1. 2
      src/core/memory.cpp

2
src/core/memory.cpp

@ -195,13 +195,11 @@ struct Memory::Impl {
break; break;
} }
case Common::PageType::Memory: { case Common::PageType::Memory: {
DEBUG_ASSERT(pointer);
u8* mem_ptr = pointer + page_offset + (page_index << YUZU_PAGEBITS); u8* mem_ptr = pointer + page_offset + (page_index << YUZU_PAGEBITS);
on_memory(copy_amount, mem_ptr); on_memory(copy_amount, mem_ptr);
break; break;
} }
case Common::PageType::DebugMemory: { case Common::PageType::DebugMemory: {
DEBUG_ASSERT(pointer);
u8* const mem_ptr{GetPointerFromDebugMemory(current_vaddr)}; u8* const mem_ptr{GetPointerFromDebugMemory(current_vaddr)};
on_memory(copy_amount, mem_ptr); on_memory(copy_amount, mem_ptr);
break; break;

Loading…
Cancel
Save