Merge pull request #1172 from NZJenkins/master

Debugger breakpoint bugfix
This commit is contained in:
Jonathan Li 2016-02-11 22:47:40 +00:00
commit f67cb001df
1 changed files with 4 additions and 0 deletions

View File

@ -153,6 +153,10 @@ size_t CBreakPoints::FindMemCheck(u32 start, u32 end)
bool CBreakPoints::IsAddressBreakPoint(u32 addr)
{
size_t bp = FindBreakpoint(addr);
if (bp != INVALID_BREAKPOINT && breakPoints_[bp].enabled)
return true;
// Check again for overlapping temp breakpoint
bp = FindBreakpoint(addr, true, true);
return bp != INVALID_BREAKPOINT && breakPoints_[bp].enabled;
}