Use ChangeBreakPointAddCond function

This commit is contained in:
Kingcom 2013-07-02 17:43:34 +02:00
parent c41b08f9e2
commit 2521a88207
3 changed files with 3 additions and 29 deletions

View file

@ -105,31 +105,6 @@ void CBreakPoints::AddBreakPoint(u32 addr, bool temp)
}
}
void CBreakPoints::AddBreakPoint(u32 addr, BreakPointCond cond)
{
size_t bp = FindBreakpoint(addr);
if (bp == INVALID_BREAKPOINT)
{
BreakPoint pt;
pt.enabled = true;
pt.temporary = false;
pt.addr = addr;
pt.hasCond = true;
pt.cond = cond;
breakPoints_.push_back(pt);
Update(addr);
}
else if (!breakPoints_[bp].enabled)
{
breakPoints_[bp].enabled = true;
breakPoints_[bp].temporary = false;
breakPoints_[bp].hasCond = true;
breakPoints_[bp].cond = cond;
Update(addr);
}
}
void CBreakPoints::RemoveBreakPoint(u32 addr)
{
size_t bp = FindBreakpoint(addr);

View file

@ -102,7 +102,6 @@ public:
static bool IsAddressBreakPoint(u32 addr);
static bool IsTempBreakPoint(u32 addr);
static void AddBreakPoint(u32 addr, bool temp = false);
static void AddBreakPoint(u32 addr, BreakPointCond cond); // conditional breakpoints aren't temporary
static void RemoveBreakPoint(u32 addr);
static void ChangeBreakPoint(u32 addr, bool enable);
static void ClearAllBreakPoints();

View file

@ -196,15 +196,15 @@ void BreakpointWindow::addBreakpoint()
CBreakPoints::AddMemCheck(address,address+size,cond,result);
} else {
// add breakpoint
CBreakPoints::AddBreakPoint(address,false);
if (condition[0] != 0)
{
BreakPointCond cond;
cond.debug = cpu;
strcpy(cond.expressionString,condition);
cond.expression = compiledCondition;
CBreakPoints::AddBreakPoint(address,cond);
} else {
CBreakPoints::AddBreakPoint(address,false);
CBreakPoints::ChangeBreakPointAddCond(address,cond);
}
if (enabled == false)