From 77670876cd569a17aaf4ab9f8484c082d3aed873 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 6 Jul 2013 12:08:34 -0700 Subject: [PATCH] Fix memcheck range intersect check. --- Core/Debugger/Breakpoints.cpp | 2 +- Core/MIPS/x86/Jit.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp index 548241000b..256d5c7ee4 100644 --- a/Core/Debugger/Breakpoints.cpp +++ b/Core/Debugger/Breakpoints.cpp @@ -248,7 +248,7 @@ MemCheck *CBreakPoints::GetMemCheck(u32 address, int size) MemCheck &check = *iter; if (check.end != 0) { - if (address + size >= check.start && address < check.end) + if (address + size > check.start && address < check.end) return ✓ } else diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 78b34986bf..058cffe908 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -788,7 +788,7 @@ void Jit::JitSafeMem::MemCheckAsm(ReadType type) if (it->end != 0) { jit_->CMP(32, R(xaddr_), Imm32(it->start - offset_ - size_)); - skipNext = jit_->J_CC(CC_B); + skipNext = jit_->J_CC(CC_BE); jit_->CMP(32, R(xaddr_), Imm32(it->end - offset_)); skipNextRange = jit_->J_CC(CC_AE); }