From 83c18d0cb6f770b2e8b934c30ead8e4773d2ebad Mon Sep 17 00:00:00 2001 From: Ziemas Date: Tue, 24 Oct 2023 15:46:32 +0200 Subject: [PATCH] DebugInterface: Fix r3000 isValidAddress --- pcsx2/DebugTools/DebugInterface.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pcsx2/DebugTools/DebugInterface.cpp b/pcsx2/DebugTools/DebugInterface.cpp index 37736c5f27..fb6d3fa669 100644 --- a/pcsx2/DebugTools/DebugInterface.cpp +++ b/pcsx2/DebugTools/DebugInterface.cpp @@ -1003,14 +1003,22 @@ std::string R3000DebugInterface::disasm(u32 address, bool simplify) bool R3000DebugInterface::isValidAddress(u32 addr) { - if (addr >= 0x10000000 && addr < 0x10010000) - return true; - if (addr >= 0x12000000 && addr < 0x12001100) - return true; - if (addr >= 0x70000000 && addr < 0x70004000) + if (addr >= 0x1D000000 && addr < 0x1E000000) + { return true; + } - return !(addr & 0x40000000) && vtlb_GetPhyPtr(addr & 0x1FFFFFFF) != NULL; + if (addr >= 0x1F400000 && addr < 0x1FA00000) + { + return true; + } + + if (addr < 0x200000) + { + return true; + } + + return false; } u32 R3000DebugInterface::getCycles()