Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
QT_VERSION: [5.15.*, 6.8.*]
QT_VERSION: [5.15.*, 6.8.*, 6.11.*]
steps:
- name: Install Dependencies
run: sudo apt-get install -y libcapstone-dev libgraphviz-dev
Expand Down
9 changes: 4 additions & 5 deletions src/Debugger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class RunUntilRet : public IDebugEventHandler {
IDebugEvent::TRAP_REASON trap_reason = event->trapReason();
IDebugEvent::REASON reason = event->reason();

qDebug() << QStringLiteral("Event at address 0x%1").arg(address, 0, 16);
qDebug() << QStringLiteral("Event at address 0x%1").arg(address.toPointerString());

/*
* An IDebugEvent::TRAP_BREAKPOINT can happen for the following reasons:
Expand Down Expand Up @@ -251,12 +251,12 @@ class RunUntilRet : public IDebugEventHandler {

// Get the instruction
edb::Instruction inst(buffer, buffer + size, 0);
qDebug() << QStringLiteral("Scanning for terminator at 0x%1: found %2").arg(address, 0, 16).arg(QString::fromStdString(inst.mnemonic()));
qDebug() << QStringLiteral("Scanning for terminator at 0x%1: found %2").arg(address.toPointerString()).arg(QString::fromStdString(inst.mnemonic()));

// Check if it's a proper block terminator (ret/jmp/jcc/hlt)
if (inst) {
if (is_terminator(inst)) {
qDebug() << QStringLiteral("Found terminator %1 at 0x%2").arg(QString::fromStdString(inst.mnemonic())).arg(address, 0, 16);
qDebug() << QStringLiteral("Found terminator %1 at 0x%2").arg(QString::fromStdString(inst.mnemonic())).arg(address.toPointerString());
// If we already had a breakpoint there, then just continue.
if (std::shared_ptr<IBreakpoint> bp = edb::v1::debugger_core->findBreakpoint(address)) {
qDebug() << "Already a breakpoint at terminator: " << address.toHexString();
Expand Down Expand Up @@ -1968,8 +1968,7 @@ void Debugger::mnuDumpSaveToFile() {

if (!filename.isEmpty()) {
QFile file(filename);
file.open(QIODevice::WriteOnly);
if (file.isOpen()) {
if (file.open(QIODevice::WriteOnly)) {
file.write(s->allBytes());
}
}
Expand Down