Skip to content
Snippets Groups Projects
Commit 09e72eaa authored by hjk's avatar hjk
Browse files

debugger: fix remote debugging

parent 3b12f5f1
No related branches found
No related tags found
No related merge requests found
...@@ -193,7 +193,14 @@ void RemoteGdbAdapter::prepareInferior() ...@@ -193,7 +193,14 @@ void RemoteGdbAdapter::prepareInferior()
m_engine->postCommand(_("-exec-arguments ") m_engine->postCommand(_("-exec-arguments ")
+ startParameters().processArgs.join(_(" "))); + startParameters().processArgs.join(_(" ")));
#if 0
m_engine->postCommand(_("set target-async on"), CB(handleSetTargetAsync)); m_engine->postCommand(_("set target-async on"), CB(handleSetTargetAsync));
#else
QFileInfo fi(startParameters().executable);
QString fileName = fi.absoluteFilePath();
m_engine->postCommand(_("-file-exec-and-symbols \"%1\"").arg(fileName),
CB(handleFileExecAndSymbols));
#endif
} }
void RemoteGdbAdapter::handleSetTargetAsync(const GdbResponse &response) void RemoteGdbAdapter::handleSetTargetAsync(const GdbResponse &response)
...@@ -234,12 +241,14 @@ void RemoteGdbAdapter::handleTargetRemote(const GdbResponse &record) ...@@ -234,12 +241,14 @@ void RemoteGdbAdapter::handleTargetRemote(const GdbResponse &record)
// gdb server will stop the remote application itself. // gdb server will stop the remote application itself.
debugMessage(_("INFERIOR STARTED")); debugMessage(_("INFERIOR STARTED"));
showStatusMessage(tr("Attached to stopped inferior.")); showStatusMessage(tr("Attached to stopped inferior."));
setState(InferiorStopped);
m_engine->continueInferior();
} else if (record.resultClass == GdbResultError) { } else if (record.resultClass == GdbResultError) {
// 16^error,msg="hd:5555: Connection timed out." // 16^error,msg="hd:5555: Connection timed out."
QString msg = tr("Connecting to remote server failed:\n"); QString msg = tr("Connecting to remote server failed:\n");
msg += __(record.data.findChild("msg").data()); msg += __(record.data.findChild("msg").data());
setState(InferiorPreparationFailed); setState(InferiorPreparationFailed);
emit inferiorPreparationFailed(msg); emit inferiorStartFailed(msg);
} }
} }
...@@ -286,6 +295,7 @@ void RemoteGdbAdapter::shutdown() ...@@ -286,6 +295,7 @@ void RemoteGdbAdapter::shutdown()
void RemoteGdbAdapter::handleKill(const GdbResponse &response) void RemoteGdbAdapter::handleKill(const GdbResponse &response)
{ {
QTC_ASSERT(state() == InferiorShuttingDown, qDebug() << state());
if (response.resultClass == GdbResultDone) { if (response.resultClass == GdbResultDone) {
setState(InferiorShutDown); setState(InferiorShutDown);
emit inferiorShutDown(); emit inferiorShutDown();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment