Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
87d13230
Commit
87d13230
authored
Jan 11, 2010
by
hjk
Browse files
debugger: disable 'continue' as woraround for failing 'step'
parent
9ac4a4e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/gdbengine.cpp
View file @
87d13230
...
...
@@ -3631,6 +3631,10 @@ void GdbEngine::updateLocals(const QVariant &cookie)
expanded
.
chop
(
1
);
QByteArray
watchers
;
if
(
!
m_toolTipExpression
.
isEmpty
())
watchers
+=
m_toolTipExpression
.
toLatin1
()
+
"#"
+
tooltipINameForExpression
(
m_toolTipExpression
.
toLatin1
());
QHash
<
QByteArray
,
int
>
watcherNames
=
handler
->
watcherNames
();
QHashIterator
<
QByteArray
,
int
>
it
(
watcherNames
);
while
(
it
.
hasNext
())
{
...
...
@@ -3642,9 +3646,6 @@ void GdbEngine::updateLocals(const QVariant &cookie)
else
watchers
+=
it
.
key
()
+
"#watch."
+
QByteArray
::
number
(
it
.
value
());
}
if
(
!
m_toolTipExpression
.
isEmpty
())
watchers
+=
"##"
+
m_toolTipExpression
.
toLatin1
()
+
"#"
+
tooltipINameForExpression
(
m_toolTipExpression
.
toLatin1
());
QByteArray
options
;
if
(
theDebuggerBoolSetting
(
UseDebuggingHelpers
))
...
...
src/plugins/debugger/gdb/trkgdbadapter.cpp
View file @
87d13230
...
...
@@ -451,6 +451,7 @@ void TrkGdbAdapter::readGdbServerCommand()
if
(
code
==
'-'
)
{
logMessage
(
"NAK: Retransmission requested"
);
emit
adapterCrashed
(
"Communication problem encountered."
);
continue
;
}
...
...
@@ -1459,9 +1460,15 @@ void TrkGdbAdapter::handleStepInto(const TrkResult &result)
m_snapshot
.
reset
();
if
(
result
.
errorCode
())
{
logMessage
(
"ERROR: "
+
result
.
errorString
()
+
" in handleStepInto"
);
#if 0
// Try fallback with Step Over
QByteArray ba = trkStepRangeMessage(0x11); // options "step over"
sendTrkMessage(0x19, TrkCB(handleStepInto2), ba, "Step range");
#else
sendTrkMessage
(
0x12
,
TrkCB
(
handleAndReportReadRegistersAfterStop
),
trkReadRegistersMessage
());
#endif
return
;
}
// The gdb server response is triggered later by the Stop Reply packet
...
...
@@ -1472,9 +1479,15 @@ void TrkGdbAdapter::handleStepInto2(const TrkResult &result)
{
if
(
result
.
errorCode
())
{
logMessage
(
"ERROR: "
+
result
.
errorString
()
+
" in handleStepInto2"
);
#if 0
// Try fallback with Continue
sendTrkMessage(0x18, TrkCallback(), trkContinueMessage(), "CONTINUE");
//sendGdbServerMessage("S05", "Stepping finished");
#else
sendTrkMessage
(
0x12
,
TrkCB
(
handleAndReportReadRegistersAfterStop
),
trkReadRegistersMessage
());
#endif
return
;
}
logMessage
(
"STEP INTO FINISHED (FALLBACK)"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment