VERY experimental Nintendo Switch 2 emulator
C++
SMMU: Fix 8Gb layout.
Fernando Sahmkoweda09c091a12
diff --git a/src/core/device_memory_manager.inc b/src/core/device_memory_manager.incindex a0eb4214e7..5241293b63 100644--- a/src/core/device_memory_manager.inc+++ b/src/core/device_memory_manager.inc@@ -340,8 +340,8 @@ T* DeviceMemoryManager<Traits>::GetPointer(DAddr address) {if (phys_addr == 0) [[unlikely]] {return nullptr;}- return GetPointerFromRaw<T>(- static_cast<PAddr>(((phys_addr - 1) << Memory::YUZU_PAGEBITS) + offset));+ return GetPointerFromRaw<T>((static_cast<PAddr>(phys_addr - 1) << Memory::YUZU_PAGEBITS) ++ offset);}template <typename Traits>@@ -353,8 +353,8 @@ const T* DeviceMemoryManager<Traits>::GetPointer(DAddr address) const {if (phys_addr == 0) [[unlikely]] {return nullptr;}- return GetPointerFromRaw<T>(- static_cast<PAddr>(((phys_addr - 1) << Memory::YUZU_PAGEBITS) + offset));+ return GetPointerFromRaw<T>((static_cast<PAddr>(phys_addr - 1) << Memory::YUZU_PAGEBITS) ++ offset);}template <typename Traits>@@ -405,7 +405,7 @@ void DeviceMemoryManager<Traits>::WalkBlock(DAddr addr, std::size_t size, auto ocontinue;}auto* mem_ptr = GetPointerFromRaw<u8>(- static_cast<PAddr>(((phys_addr - 1) << Memory::YUZU_PAGEBITS) + page_offset));+ (static_cast<PAddr>(phys_addr - 1) << Memory::YUZU_PAGEBITS) + page_offset);on_memory(copy_amount, mem_ptr);}}diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cppindex ac1417fbc6..b18b44e427 100644--- a/src/video_core/memory_manager.cpp+++ b/src/video_core/memory_manager.cpp@@ -762,6 +762,9 @@ void MemoryManager::FlushCaching() {}const u8* MemoryManager::GetSpan(const GPUVAddr src_addr, const std::size_t size) const {+ if (!IsContinuousRange(src_addr, size)) {+ return nullptr;+ }auto dev_addr = GpuToCpuAddress(src_addr);if (dev_addr) {return memory.GetSpan(*dev_addr, size);