diff --git a/tests/manual/trk/adapter.cpp b/tests/manual/trk/adapter.cpp
index 054aab91a71b20ebb4edca559ba65ae4975eea23..bd3ae8cca4dee3f82f408f491d3994ef73929af5 100644
--- a/tests/manual/trk/adapter.cpp
+++ b/tests/manual/trk/adapter.cpp
@@ -177,6 +177,7 @@ private:
void handleAndReportCreateProcess(const TrkResult &result);
void handleAndReportReadRegisters(const TrkResult &result);
+ QByteArray memoryReadLogMessage(uint addr, uint len, const QByteArray &ba) const;
void handleReadMemory(const TrkResult &result);
void reportReadMemory(const TrkResult &result);
void reportToGdb(const TrkResult &result);
@@ -215,7 +216,6 @@ private:
void sendGdbMessageAfterSync(const QByteArray &msg, const QByteArray &logNote = QByteArray());
void sendGdbAckMessage();
- //
void logMessage(const QString &msg, bool force = false);
QTcpServer m_gdbServer;
@@ -870,7 +870,8 @@ void Adapter::trkWrite(const TrkMessage &msg)
m_writtenTrkMessages.insert(msg.token, msg);
m_trkWriteBusy = true;
- logMessage("WRITE: " + stringFromArray(ba));
+ if (m_verbose > 1)
+ logMessage("WRITE: " + stringFromArray(ba));
#if USE_NATIVE
DWORD charsWritten;
@@ -1174,6 +1175,37 @@ void Adapter::handleReadMemory(const TrkResult &result)
m_snapshot.memory[blockaddr] = ba;
}
+// Format log message for memory access with some smartness about registers
+QByteArray Adapter::memoryReadLogMessage(uint addr, uint len, const QByteArray &ba) const
+{
+ QByteArray logMsg = "memory contents";
+ if (m_verbose > 1) {
+ logMsg += " addr: 0x";
+ logMsg += QByteArray::number(addr, 16);
+ // indicate dereferencing of registers
+ if (len == 4) {
+ if (addr == m_snapshot.registers[RegisterPC]) {
+ logMsg += "[PC]";
+ } else if (addr == m_snapshot.registers[RegisterPSTrk]) {
+ logMsg += "[PSTrk]";
+ } else if (addr == m_snapshot.registers[RegisterSP]) {
+ logMsg += "[SP]";
+ } else if (addr == m_snapshot.registers[RegisterLR]) {
+ logMsg += "[LR]";
+ } else if (addr > m_snapshot.registers[RegisterSP] && (addr - m_snapshot.registers[RegisterSP]) < 10240) {
+ logMsg += "[SP+"; // Stack area ...stack seems to be top-down
+ logMsg += QByteArray::number(addr - m_snapshot.registers[RegisterSP]);
+ logMsg += ']';
+ }
+ }
+ logMsg += " length ";
+ logMsg += QByteArray::number(len);
+ logMsg += " :";
+ logMsg += stringFromArray(ba, 16);
+ }
+ return logMsg;
+}
+
void Adapter::reportReadMemory(const TrkResult &result)
{
qulonglong cookie = result.cookie.toLongLong();
@@ -1189,20 +1221,7 @@ void Adapter::reportReadMemory(const TrkResult &result)
}
ba = ba.mid(addr % MemoryChunkSize, len);
- // qDebug() << "REPORTING MEMORY " << ba.size()
- // << " ADDR: " << hexNumber(blockaddr) << " LEN: " << len
- // << " BYTES: " << quoteUnprintableLatin1(ba);
-
- QByteArray logMsg = "memory contents";
- if (m_verbose > 1) {
- logMsg += " addr: 0x";
- logMsg += QByteArray::number(addr, 16);
- logMsg += " length ";
- logMsg += QByteArray::number(len);
- logMsg += " :";
- logMsg += stringFromArray(ba, 16);
- }
- sendGdbMessage(ba.toHex(), logMsg);
+ sendGdbMessage(ba.toHex(), memoryReadLogMessage(addr, len, ba));
}
void Adapter::setTrkBreakpoint(const Breakpoint &bp)
diff --git a/tests/manual/trk/swapendian.pro b/tests/manual/trk/swapendian.pro
index acf599089647e888686c75601009488f72f09448..d12122e7aa33adcf5184760ba7c9464863707519 100644
--- a/tests/manual/trk/swapendian.pro
+++ b/tests/manual/trk/swapendian.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
-
+MAKEFILE = Makefile.swapendian
QT = core
HEADERS += \
diff --git a/tests/manual/trk/trkserver.cpp b/tests/manual/trk/trkserver.cpp
index 83cea50c3968b473f757bc57126d40411e3d37f4..e8eb82f95920ce1d0980823a46aaf67da01f9742 100644
--- a/tests/manual/trk/trkserver.cpp
+++ b/tests/manual/trk/trkserver.cpp
@@ -32,6 +32,7 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QFile>
#include <QtCore/QStringList>
+#include <QtCore/QFileInfo>
#include <QtNetwork/QLocalServer>
#include <QtNetwork/QLocalSocket>
@@ -56,6 +57,7 @@ struct TrkOptions {
int verbose;
QString serverName;
QString dumpName;
+ QStringList additionalDumps;
};
@@ -69,6 +71,76 @@ struct TrkOptions {
// [80 02 00 7E 00 4F 5F 01 00 00 00 0F 1F 00 00 00
// 00 00 00 01 00 11 00 03 00 00 00 00 00 03 00 00...]
+struct MemorySegment {
+ MemorySegment(const QString &n = QString()) : name(n), address(0) {}
+
+ bool readDump(const QString &fileName, uint address /* = 0*/, QString *errorMessage);
+ bool readMemory(uint addr, ushort len, QByteArray *ba) const;
+
+ QString name;
+ uint address;
+ QByteArray data;
+};
+
+// Determine address from filename using the "0xa5453.bin" convention
+
+static int addressFromFileName(const QString &fn)
+{
+ QString baseName = QFileInfo(fn).fileName();
+ if (!baseName.startsWith(QLatin1String("0x")))
+ return -1;
+ baseName.remove(0, 2);
+ int sepPos = baseName.indexOf(QLatin1Char('_'));
+ if (sepPos == -1)
+ sepPos = baseName.indexOf(QLatin1Char('-'));
+ if (sepPos == -1)
+ sepPos = baseName.indexOf(QLatin1Char('.'));
+ if (sepPos == -1)
+ return -1;
+ baseName.truncate(sepPos);
+ bool ok;
+ const int value = baseName.toInt(&ok, 16);
+ return ok ? value : -1;
+}
+
+// Read a chunk of memory from file. Use address unless it is 0,
+// in which case the filename is used for matching "0xa5453.bin"
+bool MemorySegment::readDump(const QString &fileName, uint addressIn /* = 0*/, QString *errorMessage)
+{
+ QFile file(fileName);
+ if (!file.open(QIODevice::ReadOnly)) {
+ *errorMessage = QString::fromLatin1("Unable to read %1: %2").arg(fileName, file.errorString());
+ return false;
+ }
+ data = file.readAll();
+ file.close();
+ if (addressIn) {
+ address = addressIn;
+ } else {
+ const int addressInt = addressFromFileName(fileName);
+ if (addressInt == -1) {
+ *errorMessage = QString::fromLatin1("Unable to determine address from %1").arg(fileName);
+ return false;
+ }
+ address = addressInt;
+ }
+ *errorMessage = QString::fromLatin1("Read %1 bytes of data starting at 0x%2 from %3").arg(data.size()).arg(address, 0, 16).arg(fileName);
+ return true;
+}
+
+bool MemorySegment::readMemory(uint addr, ushort len, QByteArray *ba) const
+{
+ if (addr < address)
+ return false;
+ const int requestStart = addr - address;
+ const int requestEnd = requestStart + len;
+ if (requestEnd > data.size())
+ return false;
+ for (int i = requestStart; i != requestEnd; ++i)
+ appendByte(ba, data.at(i));
+ return true;
+}
+
struct Inferior
{
Inferior();
@@ -78,6 +150,7 @@ struct Inferior
uint dataseg;
uint registers[RegisterCount];
+ QList<MemorySegment> memorySegments;
};
Inferior::Inferior()
@@ -118,6 +191,7 @@ public:
void setServerName(const QString &name) { m_serverName = name; }
void setMemoryDumpName(const QString &source) { m_memoryDumpName = source; }
void setVerbose(int v) { m_verbose = v; }
+ bool readDump(const QString &fn);
bool startServer();
private slots:
@@ -128,7 +202,8 @@ private slots:
void handleAdapterMessage(const TrkResult &result);
private:
- void logMessage(const QString &msg, bool force = 0);
+ void logMessage(const QString &msg, bool force = 0) const;
+ bool handleMemoryRequest(uint addr, ushort len, byte option, QByteArray *ba) const;
byte nextNotificationToken();
QString m_serverName;
@@ -157,18 +232,29 @@ TrkServer::~TrkServer()
m_server.close();
}
-bool TrkServer::startServer()
+bool TrkServer::readDump(const QString &fn)
{
- QFile file(m_memoryDumpName);
- if (!file.open(QIODevice::ReadOnly)) {
- logMessage(QString::fromLatin1("Unable to read %1: %2").arg(m_memoryDumpName, file.errorString()), true);
+ QString msg;
+ MemorySegment segment(QLatin1String("data"));
+ if (!segment.readDump(fn, 0, &msg)) {
+ logMessage(msg, true);
return false;
}
- m_memoryData = file.readAll();
- file.close();
+ m_inferior.memorySegments.push_back(segment);
+ logMessage(msg, true);
+ return true;
+}
- logMessage(QString("Read %1 bytes of data from %2")
- .arg(m_memoryData.size()).arg(m_memoryDumpName), true);
+bool TrkServer::startServer()
+{
+ QString msg;
+ MemorySegment codeSegment(QLatin1String("code"));
+ if (!codeSegment.readDump(m_memoryDumpName, 0x786A4000, &msg)) {
+ logMessage(msg, true);
+ return false;
+ }
+ m_inferior.memorySegments.push_front(codeSegment);
+ logMessage(msg, true);
m_lastSent = 0;
if (!m_server.listen(m_serverName)) {
@@ -182,7 +268,7 @@ bool TrkServer::startServer()
return true;
}
-void TrkServer::logMessage(const QString &msg, bool force)
+void TrkServer::logMessage(const QString &msg, bool force) const
{
if (m_verbose || force)
qDebug("TRKSERVER: %s", qPrintable(msg));
@@ -218,6 +304,22 @@ void TrkServer::writeToAdapter(byte command, byte token, const QByteArray &data)
m_adapterConnection->write(msg);
}
+bool TrkServer::handleMemoryRequest(uint addr, ushort len, byte option, QByteArray *ba) const
+{
+ Q_UNUSED(option);
+ foreach (const MemorySegment &s, m_inferior.memorySegments) {
+ if (s.readMemory(addr, len, ba)) {
+ if (m_verbose)
+ logMessage(QString::fromLatin1("Read memory %1 bytes from 0x%2 from segment %3.").arg(len).arg(addr, 0, 16).arg(s.name));
+ return true;
+ }
+ }
+ for (int i = 0; i != len / 4; ++i)
+ appendInt(ba, 0xDEADBEEF);
+ logMessage(QString::fromLatin1("ADDRESS OUTSIDE ANY SEGMENTS: 0X%1").arg(addr, 0, 16), true);
+ return false;
+}
+
void TrkServer::handleAdapterMessage(const TrkResult &result)
{
QByteArray data;
@@ -236,21 +338,9 @@ void TrkServer::handleAdapterMessage(const TrkResult &result)
const char *p = result.data.data();
byte option = p[0];
Q_UNUSED(option);
- ushort len = extractShort(p + 1);
- uint addr = extractInt(p + 3);
- //qDebug() << "MESSAGE: " << result.data.toHex();
- qDebug() << "ADDR: " << hexNumber(addr) << " " << hexNumber(len);
- if (addr < m_inferior.codeseg
- || addr + len >= m_inferior.codeseg + m_memoryData.size()) {
- qDebug() << "ADDRESS OUTSIDE CODESEG: " << hexNumber(addr)
- << hexNumber(m_inferior.codeseg);
- for (int i = 0; i != len / 4; ++i)
- appendInt(&data, 0xDEADBEEF);
- writeToAdapter(0x80, result.token, data);
- break;
- }
- for (int i = 0; i != len; ++i)
- appendByte(&data, m_memoryData[addr - m_inferior.codeseg + i]);
+ const ushort len = extractShort(p + 1);
+ const uint addr = extractInt(p + 3);;
+ handleMemoryRequest(addr, len, option, &data);
writeToAdapter(0x80, result.token, data);
break;
}
@@ -363,6 +453,9 @@ static bool readTrkArgs(const QStringList &args, TrkOptions *o)
case 1:
o->dumpName = *it;
break;
+ default:
+ o->additionalDumps.push_back(*it);
+ break;
}
}
}
@@ -378,15 +471,19 @@ int main(int argc, char *argv[])
QCoreApplication app(argc, argv);
TrkOptions options;
if (!readTrkArgs(app.arguments(), &options)) {
- qWarning("Usage: %s [-v|-q] <trkservername> <replaysource>\n"
+ qWarning("Usage: %s [-v|-q] <trkservername> <replaysource> [additional dumps]\n"
"Options: -v verbose\n"
- " -q quiet\n", argv[0]);
+ " -q quiet\n"
+ " Additional dump names must follow the naming convention '0x4AD.bin", argv[0]);
return 1;
}
TrkServer server;
server.setServerName(options.serverName);
server.setMemoryDumpName(options.dumpName);
+ foreach(const QString &ad, options.additionalDumps)
+ if (!server.readDump(ad))
+ return -1;
server.setVerbose(options.verbose);
if (!server.startServer())
return -1;
diff --git a/tests/manual/trk/trkutils.h b/tests/manual/trk/trkutils.h
index d1499265617e979c7d9db1f02b9d3a540fcb9aa3..92dd8c72339741a40d72de6af3b973c44279de0c 100644
--- a/tests/manual/trk/trkutils.h
+++ b/tests/manual/trk/trkutils.h
@@ -93,10 +93,13 @@ enum CodeMode
enum TargetConstants
{
+
RegisterCount = 17,
+ RegisterSP = 13, // Stack Pointer
+ RegisterLR = 14, // Return address
RegisterPC = 15, // Program counter
RegisterPSGdb = 25, // gdb's view of the world
- RegisterPSTrk = 16, // gdb's view of the world
+ RegisterPSTrk = 16, // TRK's view of the world
MemoryChunkSize = 256
};