Merge pull request #2652 from unknownbrackets/debugger

Fix memcheck range intersect check
This commit is contained in:
Henrik Rydgård committed 2013-07-06 12:17:05 -07:00
commit 4dc49dfbc5
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -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 &check;
}
else
+1 -1
View File
@@ -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);
}