feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger[CDB]: Interrupt to fetch memory if required.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-04-19 13:57:25 +02:00
parent 3b6d3b1361
commit c834720710
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -1512,18 +1512,23 @@ void CdbEngine::handleDisassembler(const CdbBuiltinCommandPtr &command)
void CdbEngine::fetchMemory(MemoryAgent *agent, QObject *editor, quint64 addr, quint64 length)
{
if (!m_accessible) {
qWarning("Internal error: Attempt to read memory from inaccessible session: %s", Q_FUNC_INFO);
return;
}
if (debug)
qDebug("CdbEngine::fetchMemory %llu bytes from 0x%llx", length, addr);
const MemoryViewCookie cookie(agent, editor, addr, length);
if (m_accessible) {
postFetchMemory(cookie);
} else {
doInterruptInferiorCustomSpecialStop(qVariantFromValue(cookie));
}
}
void CdbEngine::postFetchMemory(const MemoryViewCookie &cookie)
{
QByteArray args;
ByteArrayInputStream str(args);
str << addr << ' ' << length;
const QVariant cookie = qVariantFromValue<MemoryViewCookie>(MemoryViewCookie(agent, editor, addr, length));
postExtensionCommand("memory", args, 0, &CdbEngine::handleMemory, 0, cookie);
str << cookie.address << ' ' << cookie.length;
postExtensionCommand("memory", args, 0, &CdbEngine::handleMemory, 0,
qVariantFromValue(cookie));
}
void CdbEngine::changeMemory(Internal::MemoryAgent *, QObject *, quint64 addr, const QByteArray &data)
@@ -1547,7 +1552,7 @@ void CdbEngine::handleMemory(const CdbExtensionCommandPtr &command)
memViewCookie.agent->addLazyData(memViewCookie.editorToken,
memViewCookie.address, data);
} else {
showMessage(QString::fromLocal8Bit(command->errorMessage), LogError);
showMessage(QString::fromLocal8Bit(command->errorMessage), LogWarning);
}
}
@@ -2781,6 +2786,10 @@ void CdbEngine::handleCustomSpecialStop(const QVariant &v)
postCommand(cdbWriteMemoryCommand(changeData.address, changeData.data), 0);
return;
}
if (qVariantCanConvert<MemoryViewCookie>(v)) {
postFetchMemory(qVariantValue<MemoryViewCookie>(v));
return;
}
}
} // namespace Internal