Commit 3f750695 authored by Pawel Polanski's avatar Pawel Polanski Committed by Paweł Polański

Symbian: TRK is no more!

TKR-related code has been removed.
From now on CODA is the default On-Device
Agent

Change-Id: I52236a33aff9b31ca48d507da97430df7d871239
Reviewed-on: http://codereview.qt.nokia.com/450Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarPaweł Polański <jaggernod@gmail.com>
parent eed4d1e1
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
\brief Base class of a debugger engine. \brief Base class of a debugger engine.
Note: the Debugger process itself and any helper processes like Note: the Debugger process itself and any helper processes like
gdbserver, the trk client etc are referred to as 'Engine', gdbserver, the CODA client etc are referred to as 'Engine',
whereas the debugged process is referred to as 'Inferior'. whereas the debugged process is referred to as 'Inferior'.
Transitions marked by '---' are done in the individual engines. Transitions marked by '---' are done in the individual engines.
......
...@@ -56,7 +56,6 @@ public: ...@@ -56,7 +56,6 @@ public:
}; };
enum SymbianDebugClient { enum SymbianDebugClient {
SymbianDebugClientTrk,
SymbianDebugClientCoda SymbianDebugClientCoda
}; };
...@@ -73,7 +72,7 @@ public: ...@@ -73,7 +72,7 @@ public:
executableUid(0), executableUid(0),
communicationChannel(CommunicationChannelTcpIp), communicationChannel(CommunicationChannelTcpIp),
serverPort(0), serverPort(0),
debugClient(SymbianDebugClientTrk) debugClient(SymbianDebugClientCoda)
{} {}
QString executable; QString executable;
......
...@@ -74,7 +74,7 @@ void AbstractGdbAdapter::write(const QByteArray &data) ...@@ -74,7 +74,7 @@ void AbstractGdbAdapter::write(const QByteArray &data)
gdbProc()->write(data); gdbProc()->write(data);
} }
bool AbstractGdbAdapter::isTrkAdapter() const bool AbstractGdbAdapter::isCodaAdapter() const
{ {
return false; return false;
} }
......
...@@ -49,9 +49,9 @@ class AbstractGdbProcess; ...@@ -49,9 +49,9 @@ class AbstractGdbProcess;
class GdbResponse; class GdbResponse;
// AbstractGdbAdapter is inherited by PlainGdbAdapter used for local // AbstractGdbAdapter is inherited by PlainGdbAdapter used for local
// debugging and TrkGdbAdapter used for on-device debugging. // debugging and CodaGdbAdapter used for on-device debugging.
// In the PlainGdbAdapter case it's just a wrapper around a QProcess running // In the PlainGdbAdapter case it's just a wrapper around a QProcess running
// gdb, in the TrkGdbAdapter case it's the interface to the gdb process in // gdb, in the CodaGdbAdapter case it's the interface to the gdb process in
// the whole rfcomm/gdb/gdbserver combo. // the whole rfcomm/gdb/gdbserver combo.
class AbstractGdbAdapter : public QObject class AbstractGdbAdapter : public QObject
{ {
...@@ -88,10 +88,10 @@ public: ...@@ -88,10 +88,10 @@ public:
static QString msgInferiorRunOk(); static QString msgInferiorRunOk();
static QString msgConnectRemoteServerFailed(const QString &why); static QString msgConnectRemoteServerFailed(const QString &why);
// Trk specific stuff // CODA specific stuff
virtual bool isTrkAdapter() const; virtual bool isCodaAdapter() const;
virtual void trkReloadRegisters() {} virtual void codaReloadRegisters() {}
virtual void trkReloadThreads() {} virtual void codaReloadThreads() {}
virtual void handleRemoteSetupDone(int gdbServerPort, int qmlPort); virtual void handleRemoteSetupDone(int gdbServerPort, int qmlPort);
virtual void handleRemoteSetupFailed(const QString &reason); virtual void handleRemoteSetupFailed(const QString &reason);
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "debuggerstartparameters.h" #include "debuggerstartparameters.h"
#include "codadevice.h" #include "codadevice.h"
#include "trkutils.h" #include "codautils.h"
#include "gdbmi.h" #include "gdbmi.h"
#include "symbiandevicemanager.h" #include "symbiandevicemanager.h"
...@@ -89,7 +89,7 @@ namespace Internal { ...@@ -89,7 +89,7 @@ namespace Internal {
using namespace Symbian; using namespace Symbian;
using namespace Coda; using namespace Coda;
static inline QString startMsg(const trk::Session &session) static inline QString startMsg(const Coda::Session &session)
{ {
return CodaGdbAdapter::tr("Process started, PID: 0x%1, thread id: 0x%2, " return CodaGdbAdapter::tr("Process started, PID: 0x%1, thread id: 0x%2, "
"code segment: 0x%3, data segment: 0x%4.") "code segment: 0x%3, data segment: 0x%4.")
...@@ -109,9 +109,9 @@ static inline QString startMsg(const trk::Session &session) ...@@ -109,9 +109,9 @@ static inline QString startMsg(const trk::Session &session)
* - Engine sets up breakpoints,etc and calls inferiorStartPhase2(), which * - Engine sets up breakpoints,etc and calls inferiorStartPhase2(), which
* resumes the suspended CODA process via gdb 'continue'. * resumes the suspended CODA process via gdb 'continue'.
* Thread handling (30.06.2010): * Thread handling (30.06.2010):
* TRK does not report thread creation/termination. So, if we receive * CODA does not report thread creation/termination. So, if we receive
* a stop in a different thread, we store an additional thread in snapshot. * a stop in a different thread, we store an additional thread in snapshot.
* When continuing in sendTrkContinue(), we delete this thread, since we cannot * When continuing in sendContinue(), we delete this thread, since we cannot
* know whether it will exist at the next stop. * know whether it will exist at the next stop.
* Also note that threads continue running in Symbian even if one crashes. * Also note that threads continue running in Symbian even if one crashes.
* TODO: - Maybe thread reporting will be improved in CODA? * TODO: - Maybe thread reporting will be improved in CODA?
...@@ -149,7 +149,7 @@ CodaGdbAdapter::CodaGdbAdapter(GdbEngine *engine) : ...@@ -149,7 +149,7 @@ CodaGdbAdapter::CodaGdbAdapter(GdbEngine *engine) :
this, SLOT(setVerbose(QVariant))); this, SLOT(setVerbose(QVariant)));
} }
void CodaGdbAdapter::setupTrkDeviceSignals() void CodaGdbAdapter::setupDeviceSignals()
{ {
connect(m_codaDevice.data(), SIGNAL(error(QString)), connect(m_codaDevice.data(), SIGNAL(error(QString)),
this, SLOT(codaDeviceError(QString))); this, SLOT(codaDeviceError(QString)));
...@@ -186,7 +186,7 @@ void CodaGdbAdapter::setVerbose(int verbose) ...@@ -186,7 +186,7 @@ void CodaGdbAdapter::setVerbose(int verbose)
void CodaGdbAdapter::codaLogMessage(const QString &msg) void CodaGdbAdapter::codaLogMessage(const QString &msg)
{ {
logMessage(_("TRK ") + msg); logMessage(_("CODA ") + msg);
} }
void CodaGdbAdapter::setGdbServerName(const QString &name) void CodaGdbAdapter::setGdbServerName(const QString &name)
...@@ -221,7 +221,7 @@ void CodaGdbAdapter::handleCodaRunControlModuleLoadContextSuspendedEvent(const C ...@@ -221,7 +221,7 @@ void CodaGdbAdapter::handleCodaRunControlModuleLoadContextSuspendedEvent(const C
if (!isExe) { if (!isExe) {
if (minfo.loaded) { if (minfo.loaded) {
m_session.modules.push_back(moduleName); m_session.modules.push_back(moduleName);
trk::Library library; Coda::Library library;
library.name = minfo.name; library.name = minfo.name;
library.codeseg = minfo.codeAddress; library.codeseg = minfo.codeAddress;
library.dataseg = minfo.dataAddress; library.dataseg = minfo.dataAddress;
...@@ -268,7 +268,7 @@ void CodaGdbAdapter::handleCodaRunControlModuleLoadContextSuspendedEvent(const C ...@@ -268,7 +268,7 @@ void CodaGdbAdapter::handleCodaRunControlModuleLoadContextSuspendedEvent(const C
} else { } else {
// Does not seem to be necessary anymore. // Does not seem to be necessary anymore.
// FIXME: Startup sequence can be streamlined now as we do not // FIXME: Startup sequence can be streamlined now as we do not
// have to wait for the TRK startup to learn the load address. // have to wait for the CODA startup to learn the load address.
//m_engine->postCommand("add-symbol-file \"" + symbolFile + "\" " //m_engine->postCommand("add-symbol-file \"" + symbolFile + "\" "
// + QByteArray::number(m_session.codeseg)); // + QByteArray::number(m_session.codeseg));
m_engine->postCommand("symbol-file \"" + symbolFile + "\""); m_engine->postCommand("symbol-file \"" + symbolFile + "\"");
...@@ -466,7 +466,7 @@ void CodaGdbAdapter::readGdbServerCommand() ...@@ -466,7 +466,7 @@ void CodaGdbAdapter::readGdbServerCommand()
if (code != '$') { if (code != '$') {
logMessage("Broken package (2) " + quoteUnprintableLatin1(ba) logMessage("Broken package (2) " + quoteUnprintableLatin1(ba)
+ trk::hexNumber(code), LogError); + Coda::hexNumber(code), LogError);
continue; continue;
} }
...@@ -486,7 +486,7 @@ void CodaGdbAdapter::readGdbServerCommand() ...@@ -486,7 +486,7 @@ void CodaGdbAdapter::readGdbServerCommand()
} }
//logMessage(QString("Packet checksum: %1").arg(checkSum)); //logMessage(QString("Packet checksum: %1").arg(checkSum));
trk::byte sum = 0; Coda::byte sum = 0;
for (int i = 0; i < pos; ++i) for (int i = 0; i < pos; ++i)
sum += ba.at(i); sum += ba.at(i);
...@@ -533,7 +533,7 @@ void CodaGdbAdapter::sendGdbServerAck() ...@@ -533,7 +533,7 @@ void CodaGdbAdapter::sendGdbServerAck()
void CodaGdbAdapter::sendGdbServerMessage(const QByteArray &msg, const QByteArray &logNote) void CodaGdbAdapter::sendGdbServerMessage(const QByteArray &msg, const QByteArray &logNote)
{ {
trk::byte sum = 0; Coda::byte sum = 0;
for (int i = 0; i != msg.size(); ++i) for (int i = 0; i != msg.size(); ++i)
sum += msg.at(i); sum += msg.at(i);
...@@ -593,7 +593,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd) ...@@ -593,7 +593,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
else if (cmd == "c") { else if (cmd == "c") {
logMessage(msgGdbPacket(_("Continue"))); logMessage(msgGdbPacket(_("Continue")));
sendGdbServerAck(); sendGdbServerAck();
sendTrkContinue(); sendContinue();
} }
else if (cmd.startsWith('C')) { else if (cmd.startsWith('C')) {
...@@ -608,7 +608,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd) ...@@ -608,7 +608,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
LogWarning); LogWarning);
sendGdbServerMessage('O' + QByteArray("Console output").toHex()); sendGdbServerMessage('O' + QByteArray("Console output").toHex());
sendGdbServerMessage("W81"); // "Process exited with result 1 sendGdbServerMessage("W81"); // "Process exited with result 1
sendTrkContinue(); sendContinue();
} }
else if (cmd.startsWith('D')) { else if (cmd.startsWith('D')) {
...@@ -746,12 +746,12 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd) ...@@ -746,12 +746,12 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
logMessage(_("Setting register #%1 to 0x%2").arg(regnumValue.first) logMessage(_("Setting register #%1 to 0x%2").arg(regnumValue.first)
.arg(regnumValue.second, 0, 16)); .arg(regnumValue.second, 0, 16));
QByteArray registerValue; QByteArray registerValue;
trk::appendInt(&registerValue, trk::BigEndian); // Registers are big endian Coda::appendInt(&registerValue, Coda::BigEndian); // Registers are big endian
m_codaDevice->sendRegistersSetCommand( m_codaDevice->sendRegistersSetCommand(
CodaCallback(this, &CodaGdbAdapter::handleWriteRegister), CodaCallback(this, &CodaGdbAdapter::handleWriteRegister),
currentThreadContextId(), regnumValue.first, registerValue, currentThreadContextId(), regnumValue.first, registerValue,
QVariant(regnumValue.first)); QVariant(regnumValue.first));
// Note that App TRK refuses to write registers 13 and 14 // Note that App CODA refuses to write registers 13 and 14
} }
else if (cmd == "qAttached") { else if (cmd == "qAttached") {
...@@ -890,7 +890,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd) ...@@ -890,7 +890,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
arg(pc, 0, 16))); arg(pc, 0, 16)));
sendGdbServerAck(); sendGdbServerAck();
m_running = true; m_running = true;
sendTrkStepRange(); sendStepRange();
} }
else if (cmd.startsWith('T')) { else if (cmd.startsWith('T')) {
...@@ -909,7 +909,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd) ...@@ -909,7 +909,7 @@ void CodaGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
// vCont[;action[:thread-id]]...' // vCont[;action[:thread-id]]...'
sendGdbServerAck(); sendGdbServerAck();
m_running = true; m_running = true;
sendTrkContinue(); sendContinue();
} }
else if (cmd.startsWith("Z0,") || cmd.startsWith("Z1,")) { else if (cmd.startsWith("Z0,") || cmd.startsWith("Z1,")) {
...@@ -1047,7 +1047,7 @@ void CodaGdbAdapter::startAdapter() ...@@ -1047,7 +1047,7 @@ void CodaGdbAdapter::startAdapter()
if (parameters.communicationChannel == if (parameters.communicationChannel ==
DebuggerStartParameters::CommunicationChannelTcpIp) { DebuggerStartParameters::CommunicationChannelTcpIp) {
m_codaDevice = QSharedPointer<CodaDevice>(new CodaDevice, &CodaDevice::deleteLater); m_codaDevice = QSharedPointer<CodaDevice>(new CodaDevice, &CodaDevice::deleteLater);
setupTrkDeviceSignals(); setupDeviceSignals();
codaSocket = QSharedPointer<QTcpSocket>(new QTcpSocket); codaSocket = QSharedPointer<QTcpSocket>(new QTcpSocket);
m_codaDevice->setDevice(codaSocket); m_codaDevice->setDevice(codaSocket);
} else { } else {
...@@ -1065,7 +1065,7 @@ void CodaGdbAdapter::startAdapter() ...@@ -1065,7 +1065,7 @@ void CodaGdbAdapter::startAdapter()
m_engine->handleAdapterStartFailed(msg, QString()); m_engine->handleAdapterStartFailed(msg, QString());
return; return;
} }
setupTrkDeviceSignals(); setupDeviceSignals();
m_codaDevice->setVerbose(m_verbose); m_codaDevice->setVerbose(m_verbose);
} }
...@@ -1209,7 +1209,7 @@ void CodaGdbAdapter::write(const QByteArray &data) ...@@ -1209,7 +1209,7 @@ void CodaGdbAdapter::write(const QByteArray &data)
QByteArray ba = QByteArray::fromHex(data.mid(2)); QByteArray ba = QByteArray::fromHex(data.mid(2));
qDebug() << "Writing: " << quoteUnprintableLatin1(ba); qDebug() << "Writing: " << quoteUnprintableLatin1(ba);
// if (ba.size() >= 1) // if (ba.size() >= 1)
// sendTrkMessage(ba.at(0), TrkCB(handleDirectTrk), ba.mid(1)); // sendMessage(ba.at(0), TrkCB(handleDirectTrk), ba.mid(1));
return; return;
} }
if (data.startsWith("@@")) { if (data.startsWith("@@")) {
...@@ -1252,13 +1252,13 @@ void CodaGdbAdapter::shutdownAdapter() ...@@ -1252,13 +1252,13 @@ void CodaGdbAdapter::shutdownAdapter()
} }
} }
void CodaGdbAdapter::trkReloadRegisters() void CodaGdbAdapter::codaReloadRegisters()
{ {
// Take advantage of direct access to cached register values. // Take advantage of direct access to cached register values.
m_snapshot.syncRegisters(m_session.tid, m_engine->registerHandler()); m_snapshot.syncRegisters(m_session.tid, m_engine->registerHandler());
} }
void CodaGdbAdapter::trkReloadThreads() void CodaGdbAdapter::codaReloadThreads()
{ {
m_snapshot.syncThreads(m_engine->threadsHandler()); m_snapshot.syncThreads(m_engine->threadsHandler());
} }
...@@ -1557,7 +1557,7 @@ void CodaGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered) ...@@ -1557,7 +1557,7 @@ void CodaGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered)
it = m_snapshot.memory.begin(); it = m_snapshot.memory.begin();
et = m_snapshot.memory.end(); et = m_snapshot.memory.end();
for ( ; it != et; ++it) for ( ; it != et; ++it)
qDebug() << trk::hexNumber(it.key().from) << trk::hexNumber(it.key().to); qDebug() << Coda::hexNumber(it.key().from) << Coda::hexNumber(it.key().to);
qDebug() << "WANTED" << wanted.from << wanted.to; qDebug() << "WANTED" << wanted.from << wanted.to;
# endif # endif
sendGdbServerMessage("E22", ""); sendGdbServerMessage("E22", "");
...@@ -1601,7 +1601,7 @@ QByteArray CodaGdbAdapter::currentThreadContextId() const ...@@ -1601,7 +1601,7 @@ QByteArray CodaGdbAdapter::currentThreadContextId() const
return RunControlContext::codaId(m_session.pid, m_session.tid); return RunControlContext::codaId(m_session.pid, m_session.tid);
} }
void CodaGdbAdapter::sendTrkContinue() void CodaGdbAdapter::sendContinue()
{ {
// Remove all but main thread as we do not know whether they will exist // Remove all but main thread as we do not know whether they will exist
// at the next stop. // at the next stop.
...@@ -1610,7 +1610,7 @@ void CodaGdbAdapter::sendTrkContinue() ...@@ -1610,7 +1610,7 @@ void CodaGdbAdapter::sendTrkContinue()
m_codaDevice->sendRunControlResumeCommand(CodaCallback(), m_codaProcessId); m_codaDevice->sendRunControlResumeCommand(CodaCallback(), m_codaProcessId);
} }
void CodaGdbAdapter::sendTrkStepRange() void CodaGdbAdapter::sendStepRange()
{ {
uint from = m_snapshot.lineFromAddress; uint from = m_snapshot.lineFromAddress;
uint to = m_snapshot.lineToAddress; uint to = m_snapshot.lineToAddress;
...@@ -1641,10 +1641,10 @@ void CodaGdbAdapter::handleStep(const CodaCommandResult &result) ...@@ -1641,10 +1641,10 @@ void CodaGdbAdapter::handleStep(const CodaCommandResult &result)
if (!result) { // Try fallback with Continue. if (!result) { // Try fallback with Continue.
logMessage(_("Error while stepping: %1 (fallback to 'continue')"). logMessage(_("Error while stepping: %1 (fallback to 'continue')").
arg(result.errorString()), LogWarning); arg(result.errorString()), LogWarning);
sendTrkContinue(); sendContinue();
// Doing nothing as below does not work as gdb seems to insist on // Doing nothing as below does not work as gdb seems to insist on
// making some progress through a 'step'. // making some progress through a 'step'.
//sendTrkMessage(0x12, //sendMessage(0x12,
// TrkCB(handleAndReportReadRegistersAfterStop), // TrkCB(handleAndReportReadRegistersAfterStop),
// trkReadRegistersMessage()); // trkReadRegistersMessage());
return; return;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "abstractgdbadapter.h" #include "abstractgdbadapter.h"
#include "localgdbprocess.h" #include "localgdbprocess.h"
#include "callback.h" #include "callback.h"
#include "trkutils.h" #include "codautils.h"
#include "symbian.h" #include "symbian.h"
#include <QtCore/QPointer> #include <QtCore/QPointer>
...@@ -78,9 +78,9 @@ class CodaGdbAdapter : public AbstractGdbAdapter ...@@ -78,9 +78,9 @@ class CodaGdbAdapter : public AbstractGdbAdapter
Q_OBJECT Q_OBJECT
public: public:
typedef trk::Callback<const GdbResult &> GdbResultCallback; typedef Coda::Callback<const GdbResult &> GdbResultCallback;
typedef trk::Callback<const Coda::CodaCommandResult &> CodaCallback; typedef Coda::Callback<const Coda::CodaCommandResult &> CodaCallback;
typedef trk::Callback<const GdbResponse &> GdbCallback; typedef Coda::Callback<const GdbResponse &> GdbCallback;
explicit CodaGdbAdapter(GdbEngine *engine); explicit CodaGdbAdapter(GdbEngine *engine);
virtual ~CodaGdbAdapter(); virtual ~CodaGdbAdapter();
...@@ -91,8 +91,8 @@ public: ...@@ -91,8 +91,8 @@ public:
void setVerbose(int verbose); void setVerbose(int verbose);
void setBufferedMemoryRead(bool b) { m_bufferedMemoryRead = b; } void setBufferedMemoryRead(bool b) { m_bufferedMemoryRead = b; }
void trkReloadRegisters(); void codaReloadRegisters();
void trkReloadThreads(); void codaReloadThreads();
signals: signals:
void output(const QString &msg); void output(const QString &msg);
...@@ -104,12 +104,12 @@ public: ...@@ -104,12 +104,12 @@ public:
void start(const QString &program, const QStringList &args, void start(const QString &program, const QStringList &args,
QIODevice::OpenMode mode = QIODevice::ReadWrite); QIODevice::OpenMode mode = QIODevice::ReadWrite);
void write(const QByteArray &data); void write(const QByteArray &data);
bool isTrkAdapter() const { return true; } bool isCodaAdapter() const { return true; }
virtual DumperHandling dumperHandling() const { return DumperNotAvailable; } virtual DumperHandling dumperHandling() const { return DumperNotAvailable; }
private: private:
void setupTrkDeviceSignals(); void setupDeviceSignals();
void startAdapter(); void startAdapter();
void setupInferior(); void setupInferior();
void runEngine(); void runEngine();
...@@ -162,8 +162,8 @@ private: ...@@ -162,8 +162,8 @@ private:
void startGdb(); void startGdb();
Q_SLOT void codaEvent(const Coda::CodaEvent &knownEvent); Q_SLOT void codaEvent(const Coda::CodaEvent &knownEvent);
void handleCodaRunControlModuleLoadContextSuspendedEvent(const Coda::CodaRunControlModuleLoadContextSuspendedEvent &e); void handleCodaRunControlModuleLoadContextSuspendedEvent(const Coda::CodaRunControlModuleLoadContextSuspendedEvent &e);
inline void sendTrkContinue(); inline void sendContinue();
void sendTrkStepRange(); void sendStepRange();
void handleStep(const Coda::CodaCommandResult &result); void handleStep(const Coda::CodaCommandResult &result);
void handleCreateProcess(const Coda::CodaCommandResult &result); void handleCreateProcess(const Coda::CodaCommandResult &result);
...@@ -184,7 +184,7 @@ private: ...@@ -184,7 +184,7 @@ private:
bool m_gdbAckMode; bool m_gdbAckMode;
// Debuggee state // Debuggee state
trk::Session m_session; // global-ish data (process id, target information) Coda::Session m_session; // global-ish data (process id, target information)
Symbian::Snapshot m_snapshot; // local-ish data (memory and registers) Symbian::Snapshot m_snapshot; // local-ish data (memory and registers)
QString m_remoteExecutable; QString m_remoteExecutable;
unsigned m_uid; unsigned m_uid;
......
...@@ -8,9 +8,7 @@ HEADERS += \ ...@@ -8,9 +8,7 @@ HEADERS += \
$$PWD/localplaingdbadapter.h \ $$PWD/localplaingdbadapter.h \
$$PWD/termgdbadapter.h \ $$PWD/termgdbadapter.h \
$$PWD/remotegdbserveradapter.h \ $$PWD/remotegdbserveradapter.h \
$$PWD/trkgdbadapter.h \
$$PWD/codagdbadapter.h \ $$PWD/codagdbadapter.h \
$$PWD/s60debuggerbluetoothstarter.h \
$$PWD/abstractgdbprocess.h \ $$PWD/abstractgdbprocess.h \
$$PWD/localgdbprocess.h \ $$PWD/localgdbprocess.h \
$$PWD/remotegdbprocess.h \ $$PWD/remotegdbprocess.h \
...@@ -30,9 +28,7 @@ SOURCES += \ ...@@ -30,9 +28,7 @@ SOURCES += \
$$PWD/localplaingdbadapter.cpp \ $$PWD/localplaingdbadapter.cpp \
$$PWD/termgdbadapter.cpp \ $$PWD/termgdbadapter.cpp \
$$PWD/remotegdbserveradapter.cpp \ $$PWD/remotegdbserveradapter.cpp \
$$PWD/trkgdbadapter.cpp \
$$PWD/codagdbadapter.cpp \ $$PWD/codagdbadapter.cpp \
$$PWD/s60debuggerbluetoothstarter.cpp \
$$PWD/abstractgdbprocess.cpp \ $$PWD/abstractgdbprocess.cpp \
$$PWD/localgdbprocess.cpp \ $$PWD/localgdbprocess.cpp \
$$PWD/remotegdbprocess.cpp \ $$PWD/remotegdbprocess.cpp \
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "termgdbadapter.h" #include "termgdbadapter.h"
#include "remotegdbserveradapter.h" #include "remotegdbserveradapter.h"
#include "remoteplaingdbadapter.h" #include "remoteplaingdbadapter.h"
#include "trkgdbadapter.h"
#include "codagdbadapter.h" #include "codagdbadapter.h"
#include "debuggeractions.h" #include "debuggeractions.h"
...@@ -1618,8 +1617,8 @@ void GdbEngine::handleStop2() ...@@ -1618,8 +1617,8 @@ void GdbEngine::handleStop2()
reloadStack(false); // Will trigger register reload. reloadStack(false); // Will trigger register reload.
if (supportsThreads()) { if (supportsThreads()) {
if (m_gdbAdapter->isTrkAdapter()) { if (m_gdbAdapter->isCodaAdapter()) {
m_gdbAdapter->trkReloadThreads(); m_gdbAdapter->codaReloadThreads();
} else if (m_isMacGdb) { } else if (m_isMacGdb) {
postCommand("-thread-list-ids", Discardable, CB(handleThreadListIds)); postCommand("-thread-list-ids", Discardable, CB(handleThreadListIds));
} else { } else {
...@@ -1894,8 +1893,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter() ...@@ -1894,8 +1893,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
// FIXME: 1 of 3 testing hacks. // FIXME: 1 of 3 testing hacks.
if (sp.debugClient == DebuggerStartParameters::SymbianDebugClientCoda) if (sp.debugClient == DebuggerStartParameters::SymbianDebugClientCoda)
return new CodaGdbAdapter(this); return new CodaGdbAdapter(this);
else return 0;
return new TrkGdbAdapter(this);
} }
switch (sp.startMode) { switch (sp.startMode) {
...@@ -1998,7 +1996,7 @@ void GdbEngine::executeStep() ...@@ -1998,7 +1996,7 @@ void GdbEngine::executeStep()
setTokenBarrier(); setTokenBarrier();
notifyInferiorRunRequested(); notifyInferiorRunRequested();
showStatusMessage(tr("Step requested..."), 5000); showStatusMessage(tr("Step requested..."), 5000);
if (m_gdbAdapter->isTrkAdapter() && stackHandler()->stackSize() > 0) if (m_gdbAdapter->isCodaAdapter() && stackHandler()->stackSize() > 0)
postCommand("sal step,0x" + QByteArray::number(stackHandler()->topAddress(), 16)); postCommand("sal step,0x" + QByteArray::number(stackHandler()->topAddress(), 16));
if (isReverseDebugging()) { if (isReverseDebugging()) {
postCommand("reverse-step", RunRequest, CB(handleExecuteStep)); postCommand("reverse-step", RunRequest,<