Skip to content

Commit

Permalink
adjustments to objdump call
Browse files Browse the repository at this point in the history
* invoke directly from the processPath  already resolved before
* improve error message for objdump invocation issues helping to
  find problems related to the call
  • Loading branch information
GitMensch committed Oct 23, 2023
1 parent cdc66a4 commit e8a65d4
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/models/disassemblyoutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -308,22 +308,26 @@ DisassemblyOutput DisassemblyOutput::disassemble(const QString& objdump, const Q
}
arguments.append(binary);

asmProcess.start(objdump, arguments);
asmProcess.start(processPath, arguments);

if (!asmProcess.waitForStarted()) {
disassemblyOutput.errorMessage += QApplication::translate("DisassemblyOutput", "Process was not started.");
disassemblyOutput.errorMessage += QApplication::translate("DisassemblyOutput", "Process was not started.")
+ QStringLiteral("\n")
+ QApplication::tr("command: %1 %2").arg(processPath, arguments.join(QLatin1Char(' ')));
return disassemblyOutput;
}

if (!asmProcess.waitForFinished()) {
disassemblyOutput.errorMessage +=
QApplication::translate("DisassemblyOutput", "Process was not finished. Stopped by timeout");
QApplication::translate("DisassemblyOutput", "Process was not finished. Stopped by timeout")
+ QStringLiteral("\n")
+ QApplication::tr("command: %1 %2").arg(processPath, arguments.join(QLatin1Char(' ')));
return disassemblyOutput;
}

if (output.isEmpty()) {
disassemblyOutput.errorMessage +=
QApplication::tr("Empty output of command %1 %2").arg(objdump, arguments.join(QLatin1Char(' ')));
QApplication::tr("Empty output of command %1 %2").arg(processPath, arguments.join(QLatin1Char(' ')));
}

const auto objdumpOutput = objdumpParse(output);
Expand Down

0 comments on commit e8a65d4

Please sign in to comment.