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

Trk/Debugger: Invoke memory read callback directly if no requests

Browse Source 
are sent.
This commit is contained in:
Friedemann Kleint
2009-09-29 08:51:28 +02:00
parent 6baeb06a76
commit e4f253ea2b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -1155,7 +1155,11 @@ void TrkGdbAdapter::reportReadMemoryBuffered(const TrkResult &result)
const qulonglong cookie = result.cookie.toULongLong(); const qulonglong cookie = result.cookie.toULongLong();
const uint addr = cookie >> 32; const uint addr = cookie >> 32;
const uint len = uint(cookie); const uint len = uint(cookie);
reportReadMemoryBuffered(addr, len);
}
void TrkGdbAdapter::reportReadMemoryBuffered(uint addr, uint len)
{
// Gdb accepts less memory according to documentation. // Gdb accepts less memory according to documentation.
// Send E on complete failure. // Send E on complete failure.
QByteArray ba; QByteArray ba;
@@ -1320,6 +1324,7 @@ void TrkGdbAdapter::readMemory(uint addr, uint len)
.arg(len).arg(addr, 0, 16).arg(MemoryChunkSize)); .arg(len).arg(addr, 0, 16).arg(MemoryChunkSize));
if (m_bufferedMemoryRead) { if (m_bufferedMemoryRead) {
uint requests = 0;
uint blockaddr = (addr / MemoryChunkSize) * MemoryChunkSize; uint blockaddr = (addr / MemoryChunkSize) * MemoryChunkSize;
for (; blockaddr < addr + len; blockaddr += MemoryChunkSize) { for (; blockaddr < addr + len; blockaddr += MemoryChunkSize) {
if (!m_snapshot.memory.contains(blockaddr)) { if (!m_snapshot.memory.contains(blockaddr)) {
@@ -1330,12 +1335,19 @@ void TrkGdbAdapter::readMemory(uint addr, uint len)
sendTrkMessage(0x10, TrkCB(handleReadMemoryBuffered), sendTrkMessage(0x10, TrkCB(handleReadMemoryBuffered),
trkReadMemoryMessage(blockaddr, MemoryChunkSize), trkReadMemoryMessage(blockaddr, MemoryChunkSize),
QVariant(blockaddr)); QVariant(blockaddr));
requests++;
} }
} }
// If requests have been sent: Sync
if (requests) {
const qulonglong cookie = (qulonglong(addr) << 32) + len; const qulonglong cookie = (qulonglong(addr) << 32) + len;
sendTrkMessage(TRK_WRITE_QUEUE_NOOP_CODE, TrkCB(reportReadMemoryBuffered), sendTrkMessage(TRK_WRITE_QUEUE_NOOP_CODE, TrkCB(reportReadMemoryBuffered),
QByteArray(), cookie); QByteArray(), cookie);
} else { } else {
// Everything is already buffered: invoke callback directly
reportReadMemoryBuffered(addr, len);
}
} else { // Unbuffered, direct requests
if (m_verbose) if (m_verbose)
logMessage(QString::fromLatin1("Requesting unbuffered memory %1 " logMessage(QString::fromLatin1("Requesting unbuffered memory %1 "
"bytes from 0x%2").arg(len).arg(addr, 0, 16)); "bytes from 0x%2").arg(len).arg(addr, 0, 16));

1
src/plugins/debugger/gdb/trkgdbadapter.h
View File

@@ -170,6 +170,7 @@ public:
void handleStepOver2(const TrkResult &result); void handleStepOver2(const TrkResult &result);
void handleReadRegisters(const TrkResult &result); void handleReadRegisters(const TrkResult &result);
void reportReadMemoryBuffered(const TrkResult &result); void reportReadMemoryBuffered(const TrkResult &result);
void reportReadMemoryBuffered(uint addr, uint len);
void handleWriteRegister(const TrkResult &result); void handleWriteRegister(const TrkResult &result);
void reportToGdb(const TrkResult &result); void reportToGdb(const TrkResult &result);