From 33342a77c511b88b55342e44b72d8ec009720172 Mon Sep 17 00:00:00 2001 From: zilmar Date: Sat, 29 Dec 2012 07:32:15 +1100 Subject: [PATCH] Memory: LB_NonMemory only shows breakpoint when writing to rom --- .../Project64/N64 System/Mips/Memory Virtual Mem.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp index 277ce08f8..eac713a81 100644 --- a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp +++ b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp @@ -1678,9 +1678,10 @@ int CMipsMemoryVM::LB_NonMemory ( DWORD PAddr, DWORD * Value, BOOL /*SignExtend* * Value = 0; return true; } - g_Notify->BreakPoint(__FILE__,__LINE__); + if (PAddr >= 0x10000000 && PAddr < 0x16000000) + { + g_Notify->BreakPoint(__FILE__,__LINE__); #ifdef tofix - if (PAddr >= 0x10000000 && PAddr < 0x16000000) { if (WrittenToRom) { return FALSE; } if ((PAddr & 2) == 0) { PAddr = (PAddr + 4) ^ 2; } if ((PAddr - 0x10000000) < RomFileSize) { @@ -1694,15 +1695,15 @@ int CMipsMemoryVM::LB_NonMemory ( DWORD PAddr, DWORD * Value, BOOL /*SignExtend* *Value = 0; return FALSE; } - } #endif + } // switch (PAddr & 0xFFF00000) { // default: * Value = 0; - return FALSE; +// return FALSE; // break; // } -// return TRUE; + return TRUE; } int CMipsMemoryVM::LH_NonMemory ( DWORD PAddr, DWORD * Value, int/* SignExtend*/ )