From 945c211996e9e45e28a2353339ca4ce4e044b9b0 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 1 Feb 2010 16:30:11 +0100
Subject: [PATCH] debugger: fall back to raw disassembly if mixed display fails
due to "unreadable" memory
---
src/plugins/debugger/gdb/gdbengine.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index ee415d667e5..0a5d7d7af63 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3583,7 +3583,8 @@ void GdbEngine::handleFetchDisassemblerByLine(const GdbResponse &response)
} else {
// 536^error,msg="mi_cmd_disassemble: Invalid line number"
QByteArray msg = response.data.findChild("msg").data();
- if (msg == "mi_cmd_disassemble: Invalid line number")
+ if (msg == "mi_cmd_disassemble: Invalid line number"
+ || msg.startsWith("Cannot access memory at address"))
fetchDisassemblerByAddress(ac.agent, true);
else
showStatusMessage(tr("Disassembler failed: %1").arg(QString::fromLocal8Bit(msg)), 5000);
--
GitLab