Fix debug seek to PC (#2527)

This commit is contained in:
yossizap 2020-12-19 21:32:51 +00:00 committed by GitHub
parent ac8c0e4175
commit a78613904e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1581,7 +1581,7 @@ RVA CutterCore::getProgramCounterValue()
if (currentlyDebugging) {
// Use cmd because cmdRaw would not work with inner command backticked
// TODO: Risky command due to changes in API, search for something safer
RVA addr = cmd("dr?`drn PC`").toULongLong(&ok, 16);
RVA addr = cmd("dr `drn PC`").toULongLong(&ok, 16);
if (ok) {
return addr;
}
@ -1746,9 +1746,7 @@ void CutterCore::attachRemote(const QString &uri)
connected = true;
}
}
// Use cmd because cmdRaw would not with inner command backticked
QString programCounterValue = cmd("dr?`drn PC`").trimmed();
seekAndShow(programCounterValue);
seekAndShow(getProgramCounterValue());
if (!connected) {
emit attachedRemote(false);
emit debugTaskStateChanged();
@ -1868,9 +1866,7 @@ void CutterCore::stopDebug()
void CutterCore::syncAndSeekProgramCounter()
{
// Use cmd because cmdRaw would not work with inner command backticked
QString programCounterValue = cmd("dr?`drn PC`").trimmed();
seekAndShow(programCounterValue);
seekAndShow(getProgramCounterValue());
emit registersChanged();
}