DisassemblerViewAgent m_disassemblerViewAgent;
QFutureInterface<void> m_progress;
+ QHash<quint64, Internal::BreakpointData *> m_breakpoints;
bool m_isSlaveEngine;
};
{
for (int i = 0; i < breakHandler()->size(); i++) {
BreakpointData *bp = breakHandler()->at(i);
- if (!m_breakpoints.contains(bp->id)) {
- m_breakpoints.insert(bp->id, bp);
- }
- QTC_ASSERT(m_breakpoints[bp->id] == bp, qDebug() << "corrupted breakpoint map");
+ if (!d->m_breakpoints.contains(bp->id))
+ d->m_breakpoints.insert(bp->id, bp);
+ QTC_ASSERT(d->m_breakpoints[bp->id] == bp, qDebug() << "corrupted breakpoint map");
if (bp->uiDirty) {
bp->uiDirty = false;
bp->state = BreakpointChangeRequested;
Breakpoints bps = breakHandler()->takeRemovedBreakpoints();
foreach (BreakpointData *bp, bps) {
- if (m_breakpoints.contains(bp->id)) {
+ if (d->m_breakpoints.contains(bp->id)) {
bp->state = BreakpointRemovalRequested;
removeBreakpoint(bp->id);
- } else
+ } else {
delete bp;
+ }
}
}
void DebuggerEngine::notifyAddBreakpointOk(quint64 id)
{
- BreakpointData *bp = m_breakpoints[id];
- if (!bp)
- return;
+ BreakpointData *bp = d->m_breakpoints[id];
+ QTC_ASSERT(bp, return);
bp->state = BreakpointOk;
}
void DebuggerEngine::notifyAddBreakpointFailed(quint64 id)
{
- BreakpointData *bp = m_breakpoints[id];
- if (!bp)
- return;
+ BreakpointData *bp = d->m_breakpoints[id];
+ QTC_ASSERT(bp, return);
bp->state = BreakpointDead;
}
void DebuggerEngine::notifyRemoveBreakpointOk(quint64 id)
{
- BreakpointData *bp = m_breakpoints.take(id);
- if (!bp)
- return;
+ BreakpointData *bp = d->m_breakpoints.take(id);
+ QTC_ASSERT(bp, return);
bp->state = BreakpointDead;
delete bp;
}
void DebuggerEngine::notifyRemoveBreakpointFailed(quint64 id)
{
- BreakpointData *bp = m_breakpoints[id];
- if (!bp)
- return;
+ BreakpointData *bp = d->m_breakpoints[id];
+ QTC_ASSERT(bp, return);
bp->state = BreakpointOk;
}
void DebuggerEngine::notifyChangeBreakpointOk(quint64 id)
{
- BreakpointData *bp = m_breakpoints[id];
- if (!bp)
- return;
+ BreakpointData *bp = d->m_breakpoints[id];
+ QTC_ASSERT(bp, return);
bp->state = BreakpointOk;
}
void DebuggerEngine::notifyChangeBreakpointFailed(quint64 id)
{
- BreakpointData *bp = m_breakpoints[id];
- if (!bp)
- return;
+ BreakpointData *bp = d->m_breakpoints[id];
+ QTC_ASSERT(bp, return);
bp->state = BreakpointDead;
}
void DebuggerEngine::notifyBreakpointAdjusted(const BreakpointData & rbp)
{
- BreakpointData *bp = m_breakpoints[rbp.id];
- if (!bp)
- return;
+ BreakpointData *bp = d->m_breakpoints[rbp.id];
+ QTC_ASSERT(bp, return);
bp->bpNumber = rbp.bpNumber;
bp->bpCondition = rbp.bpCondition;
bp->bpIgnoreCount = rbp.bpIgnoreCount;