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

Merge remote branch 'origin/1.3'

Browse Source 
Trailing whitespace removal re-applied manually.
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:49:55 +01:00
parent 4320314046 a6ca348636
commit 75b42f18d8
302 changed files with 940 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ void Snapshot::insertMemory(const MemoryRange &range, const QByteArray &ba)
{
QTC_ASSERT(range.size() == uint(ba.size()),
qDebug() << "RANGE: " << range << " BA SIZE: " << ba.size(); return);
MEMORY_DEBUG("INSERT: " << range);
// Try to combine with existing chunk.
Snapshot::Memory::iterator it = memory.begin();
@@ -700,7 +700,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
// Kill inferior process
logMessage(msgGdbPacket(QLatin1String("kill")));
sendTrkMessage(0x41, TrkCB(handleDeleteProcess),
trkDeleteProcessMessage(), "Delete process");
trkDeleteProcessMessage(), "Delete process");
}
else if (cmd.startsWith("m")) {
@@ -1015,7 +1015,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
if (data.startsWith("auxv:read::")) {
const int offsetPos = data.lastIndexOf(':') + 1;
const int commaPos = data.lastIndexOf(',');
if (commaPos != -1) {
if (commaPos != -1) {
bool ok1 = false, ok2 = false;
const int offset = data.mid(offsetPos, commaPos - offsetPos)
.toUInt(&ok1, 16);
@@ -1282,7 +1282,7 @@ void TrkGdbAdapter::handleReadRegisters(const TrkResult &result)
for (int i = 0; i < RegisterCount; ++i)
m_snapshot.registers[i] = extractInt(data + 4 * i);
m_snapshot.registerValid = true;
}
}
void TrkGdbAdapter::handleWriteRegister(const TrkResult &result)
{
@@ -1293,7 +1293,7 @@ void TrkGdbAdapter::handleWriteRegister(const TrkResult &result)
return;
}
sendGdbServerMessage("OK");
}
}
void TrkGdbAdapter::reportRegisters()
{
@@ -1446,7 +1446,7 @@ void TrkGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered)
Snapshot::Memory::const_iterator et = m_snapshot.memory.end();
for ( ; it != et; ++it) {
MEMORY_DEBUG(" NEEDED STEP: " << needed);
needed -= it.key();
needed -= it.key();
}
MEMORY_DEBUG("NEEDED FINAL: " << needed);
@@ -1621,7 +1621,7 @@ void TrkGdbAdapter::handleClearBreakpoint(const TrkResult &result)
if (result.errorCode()) {
logMessage("ERROR: " + result.errorString());
//return;
}
}
sendGdbServerMessage("OK");
}
@@ -1716,7 +1716,7 @@ void TrkGdbAdapter::startAdapter()
logMessage(QLatin1String("### Starting TrkGdbAdapter"));
m_trkDevice->setSerialFrame(effectiveTrkDeviceType() != TrkOptions::BlueTooth);
// Prompt the user to start communication
QString message;
QString message;
const trk::PromptStartCommunicationResult src =
S60DebuggerBluetoothStarter::startCommunication(m_trkDevice,
effectiveTrkDevice(),
@@ -1807,8 +1807,8 @@ void TrkGdbAdapter::handleCreateProcess(const TrkResult &result)
m_engine->postCommand("set breakpoint always-inserted on");
m_engine->postCommand("set trust-readonly-sections"); // No difference?
m_engine->postCommand("set displaced-stepping on"); // No difference?
m_engine->postCommand("mem 0x00400000 0x00800000 cache");
m_engine->postCommand("mem 0x78000000 0x88000000 cache ro");
m_engine->postCommand("mem 0x00400000 0x00800000 cache");
m_engine->postCommand("mem 0x78000000 0x88000000 cache ro");
// FIXME: replace with stack-cache for newer gdb?
m_engine->postCommand("set remotecache on"); // "info dcache" to check
m_engine->postCommand("target remote " + gdbServerName().toLatin1(),
@@ -1900,16 +1900,16 @@ void TrkGdbAdapter::handleDirectWrite1(const TrkResult &response)
appendByte(&ba, 0xe5);
#else
// Thumb:
// subs r0, #16
// subs r0, #16
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
// subs r0, #16
// subs r0, #16
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
//
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
// subs r0, #16
// subs r0, #16
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
#endif