Skip to content

fix load session when breakpoint type is invalid #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m9710797 merged 1 commit into from
Mar 17, 2022
Merged

fix load session when breakpoint type is invalid #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 13 additions & 34 deletions src/DebuggerData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
#include "qglobal.h"
#include <QStringList>
#include <QDebug>
#include <algorithm>
// class MemoryLayout

static const char* const TypeNames[] = { "breakpoint", "memread", "memwrite", "ioread", "iowrite",
"condition" };

MemoryLayout::MemoryLayout()
{
for (int p = 0; p < 4; ++p) {
Expand Down Expand Up @@ -314,13 +318,13 @@ bool Breakpoints::isWatchpoint(quint16 addr, QString *id)

int Breakpoints::findBreakpoint(quint16 addr)
{
auto i = std::lower_bound(breakpoints.begin(), breakpoints.end(), addr,
auto i = std::lower_bound(breakpoints.begin(), breakpoints.end(), addr,
[](const Breakpoint& bp, const quint16 addr) {
return bp.address < addr;
}
);
if (i != breakpoints.end() && i->address == addr) {
return i - breakpoints.begin();
return std::distance(breakpoints.begin(), i);
Comment thread
pvmm marked this conversation as resolved.
}
return -1;
}
Expand All @@ -340,26 +344,7 @@ void Breakpoints::saveBreakpoints(QXmlStreamWriter& xml)
xml.writeStartElement("Breakpoint");

// type
switch (bp.type) {
case BREAKPOINT:
xml.writeAttribute("type", "breakpoint");
break;
case WATCHPOINT_IOREAD:
xml.writeAttribute("type", "ioread");
break;
case WATCHPOINT_IOWRITE:
xml.writeAttribute("type", "iowrite");
break;
case WATCHPOINT_MEMREAD:
xml.writeAttribute("type", "memread");
break;
case WATCHPOINT_MEMWRITE:
xml.writeAttribute("type", "memwrite");
break;
case CONDITION:
xml.writeAttribute("type", "condition");
break;
}
xml.writeAttribute("type", TypeNames[bp.type]);

// id
xml.writeAttribute("id", bp.id);
Expand Down Expand Up @@ -402,19 +387,13 @@ void Breakpoints::loadBreakpoints(QXmlStreamReader& xml)
if (xml.isStartElement()) {
if (xml.name() == "Breakpoint") {
// set type
QString type = xml.attributes().value("type").toString().toLower();
if (type == "ioread") {
bp.type = WATCHPOINT_IOREAD;
} else if (type == "iowrite") {
bp.type = WATCHPOINT_IOWRITE;
} else if (type == "memread") {
bp.type = WATCHPOINT_MEMREAD;
} else if (type == "memwrite") {
bp.type = WATCHPOINT_MEMWRITE;
} else if (type == "condition") {
bp.type = CONDITION;
} else {
QString label = xml.attributes().value("type").toString().toLower();
auto iter = std::find(std::begin(TypeNames), std::end(TypeNames), label);
if (iter == std::end(TypeNames)) {
qWarning() << "Unknown type" << label << "in XML";
bp.type = BREAKPOINT;
} else {
bp.type = static_cast<Type>(std::distance(TypeNames, iter));
}

// id
Expand Down