Skip to content
GitLab
Menu
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
c0a8fbe9
Commit
c0a8fbe9
authored
Mar 10, 2010
by
hjk
Browse files
debugger: rename a few functions
parent
411ccc8f
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/cdb/cdbdebugengine.cpp
View file @
c0a8fbe9
...
...
@@ -776,27 +776,27 @@ bool CdbDebugEngine::step(unsigned long executionStatus)
return
success
;
}
void
CdbDebugEngine
::
stepExec
()
void
CdbDebugEngine
::
executeStep
()
{
step
(
manager
()
->
isReverseDebugging
()
?
DEBUG_STATUS_REVERSE_STEP_INTO
:
DEBUG_STATUS_STEP_INTO
);
}
void
CdbDebugEngine
::
n
ex
tExec
()
void
CdbDebugEngine
::
ex
ecuteNext
()
{
step
(
manager
()
->
isReverseDebugging
()
?
DEBUG_STATUS_REVERSE_STEP_OVER
:
DEBUG_STATUS_STEP_OVER
);
}
void
CdbDebugEngine
::
stepIExec
()
void
CdbDebugEngine
::
executeStepI
()
{
stepExec
();
// Step into by instruction (figured out by step)
executeStep
();
// Step into by instruction (figured out by step)
}
void
CdbDebugEngine
::
nextIExec
()
void
CdbDebugEngine
::
executeNextI
()
{
n
ex
tExec
();
// Step over by instruction (figured out by step)
ex
ecuteNext
();
// Step over by instruction (figured out by step)
}
void
CdbDebugEngine
::
s
tepOut
Exec
()
void
CdbDebugEngine
::
executeS
tepOut
()
{
if
(
!
manager
()
->
isReverseDebugging
())
step
(
CdbExtendedExecutionStatusStepOut
);
...
...
@@ -901,7 +901,7 @@ void CdbDebugEngine::interruptInferior()
}
}
void
CdbDebugEngine
::
r
unToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
)
void
CdbDebugEngine
::
executeR
unToLine
(
const
QString
&
fileName
,
int
lineNumber
)
{
manager
()
->
showDebuggerOutput
(
LogMisc
,
tr
(
"Running up to %1:%2..."
).
arg
(
fileName
).
arg
(
lineNumber
));
QString
errorMessage
;
...
...
@@ -915,7 +915,7 @@ void CdbDebugEngine::runToLineExec(const QString &fileName, int lineNumber)
warning
(
errorMessage
);
}
void
CdbDebugEngine
::
r
unToFunction
Exec
(
const
QString
&
functionName
)
void
CdbDebugEngine
::
executeR
unToFunction
(
const
QString
&
functionName
)
{
manager
()
->
showDebuggerOutput
(
LogMisc
,
tr
(
"Running up to function '%1()'..."
).
arg
(
functionName
));
QString
errorMessage
;
...
...
@@ -928,7 +928,7 @@ void CdbDebugEngine::runToFunctionExec(const QString &functionName)
warning
(
errorMessage
);
}
void
CdbDebugEngine
::
j
umpToLine
Exec
(
const
QString
&
/* fileName */
,
int
/*lineNumber*/
)
void
CdbDebugEngine
::
executeJ
umpToLine
(
const
QString
&
/* fileName */
,
int
/*lineNumber*/
)
{
warning
(
tr
(
"Jump to line is not implemented"
));
}
...
...
src/plugins/debugger/cdb/cdbdebugengine.h
View file @
c0a8fbe9
...
...
@@ -69,18 +69,18 @@ public:
virtual
void
updateWatchData
(
const
WatchData
&
data
);
virtual
unsigned
debuggerCapabilities
()
const
;
virtual
void
stepExec
();
virtual
void
s
tepOut
Exec
();
virtual
void
n
ex
tExec
();
virtual
void
stepIExec
();
virtual
void
nextIExec
();
virtual
void
executeStep
();
virtual
void
executeS
tepOut
();
virtual
void
ex
ecuteNext
();
virtual
void
executeStepI
();
virtual
void
executeNextI
();
virtual
void
continueInferior
();
virtual
void
interruptInferior
();
virtual
void
r
unToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
r
unToFunction
Exec
(
const
QString
&
functionName
);
virtual
void
j
umpToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
executeR
unToLine
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
executeR
unToFunction
(
const
QString
&
functionName
);
virtual
void
executeJ
umpToLine
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
assignValueInDebugger
(
const
QString
&
expr
,
const
QString
&
value
);
virtual
void
executeDebuggerCommand
(
const
QString
&
command
);
...
...
src/plugins/debugger/debuggermanager.cpp
View file @
c0a8fbe9
...
...
@@ -515,29 +515,29 @@ void DebuggerManager::init()
d
->
m_actions
.
reverseDirectionAction
->
setChecked
(
false
);
connect
(
d
->
m_actions
.
continueAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
c
ontinue
Exec
()));
this
,
SLOT
(
executeC
ontinue
()));
connect
(
d
->
m_actions
.
stopAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
interruptDebuggingRequest
()));
connect
(
d
->
m_actions
.
resetAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
exitDebugger
()));
connect
(
d
->
m_actions
.
nextAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
n
ex
tExec
()));
this
,
SLOT
(
ex
ecuteStepNext
()));
connect
(
d
->
m_actions
.
stepAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
stepExec
()));
this
,
SLOT
(
executeStep
()));
connect
(
d
->
m_actions
.
stepOutAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
s
tepOut
Exec
()));
this
,
SLOT
(
executeS
tepOut
()));
connect
(
d
->
m_actions
.
runToLineAction1
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
r
unToLine
Exec
()));
this
,
SLOT
(
executeR
unToLine
()));
connect
(
d
->
m_actions
.
runToLineAction2
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
r
unToLine
Exec
()));
this
,
SLOT
(
executeR
unToLine
()));
connect
(
d
->
m_actions
.
runToFunctionAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
r
unToFunction
Exec
()));
this
,
SLOT
(
executeR
unToFunction
()));
connect
(
d
->
m_actions
.
jumpToLineAction1
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
j
umpToLine
Exec
()));
this
,
SLOT
(
executeJ
umpToLine
()));
connect
(
d
->
m_actions
.
jumpToLineAction2
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
j
umpToLine
Exec
()));
this
,
SLOT
(
executeJ
umpToLine
()));
connect
(
d
->
m_actions
.
returnFromFunctionAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
r
eturn
Exec
()));
this
,
SLOT
(
executeR
eturn
()));
connect
(
d
->
m_actions
.
watchAction1
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
addToWatchWindow
()));
connect
(
d
->
m_actions
.
watchAction2
,
SIGNAL
(
triggered
()),
...
...
@@ -1178,38 +1178,38 @@ QList<Symbol> DebuggerManager::moduleSymbols(const QString &moduleName)
return
d
->
m_engine
->
moduleSymbols
(
moduleName
);
}
void
DebuggerManager
::
stepExec
()
void
DebuggerManager
::
executeStep
()
{
QTC_ASSERT
(
d
->
m_engine
,
return
);
resetLocation
();
if
(
theDebuggerBoolSetting
(
OperateByInstruction
))
d
->
m_engine
->
stepIExec
();
d
->
m_engine
->
executeStepI
();
else
d
->
m_engine
->
stepExec
();
d
->
m_engine
->
executeStep
();
}
void
DebuggerManager
::
s
tepOut
Exec
()
void
DebuggerManager
::
executeS
tepOut
()
{
QTC_ASSERT
(
d
->
m_engine
,
return
);
resetLocation
();
d
->
m_engine
->
s
tepOut
Exec
();
d
->
m_engine
->
executeS
tepOut
();
}
void
DebuggerManager
::
n
ex
tExec
()
void
DebuggerManager
::
ex
ecuteStepNext
()
{
QTC_ASSERT
(
d
->
m_engine
,
return
);
resetLocation
();
if
(
theDebuggerBoolSetting
(
OperateByInstruction
))
d
->
m_engine
->
nextIExec
();
d
->
m_engine
->
executeNextI
();
else
d
->
m_engine
->
n
ex
tExec
();
d
->
m_engine
->
ex
ecuteNext
();
}
void
DebuggerManager
::
r
eturn
Exec
()
void
DebuggerManager
::
executeR
eturn
()
{
QTC_ASSERT
(
d
->
m_engine
,
return
);
resetLocation
();
d
->
m_engine
->
r
eturn
Exec
();
d
->
m_engine
->
executeR
eturn
();
}
void
DebuggerManager
::
watchPoint
()
...
...
@@ -1349,7 +1349,7 @@ void DebuggerManager::setBusyCursor(bool busy)
d
->
m_watchersWindow
->
setCursor
(
cursor
);
}
void
DebuggerManager
::
c
ontinue
Exec
()
void
DebuggerManager
::
executeC
ontinue
()
{
if
(
d
->
m_engine
)
d
->
m_engine
->
continueInferior
();
...
...
@@ -1374,7 +1374,7 @@ void DebuggerManager::interruptDebuggingRequest()
}
}
void
DebuggerManager
::
r
unToLine
Exec
()
void
DebuggerManager
::
executeR
unToLine
()
{
ITextEditor
*
textEditor
=
d
->
m_plugin
->
currentTextEditor
();
QTC_ASSERT
(
textEditor
,
return
);
...
...
@@ -1382,11 +1382,11 @@ void DebuggerManager::runToLineExec()
int
lineNumber
=
textEditor
->
currentLine
();
if
(
d
->
m_engine
&&
!
fileName
.
isEmpty
())
{
STATE_DEBUG
(
fileName
<<
lineNumber
);
d
->
m_engine
->
r
unToLine
Exec
(
fileName
,
lineNumber
);
d
->
m_engine
->
executeR
unToLine
(
fileName
,
lineNumber
);
}
}
void
DebuggerManager
::
r
unToFunction
Exec
()
void
DebuggerManager
::
executeR
unToFunction
()
{
ITextEditor
*
textEditor
=
d
->
m_plugin
->
currentTextEditor
();
QTC_ASSERT
(
textEditor
,
return
);
...
...
@@ -1415,10 +1415,10 @@ void DebuggerManager::runToFunctionExec()
STATE_DEBUG
(
functionName
);
if
(
d
->
m_engine
&&
!
functionName
.
isEmpty
())
d
->
m_engine
->
r
unToFunction
Exec
(
functionName
);
d
->
m_engine
->
executeR
unToFunction
(
functionName
);
}
void
DebuggerManager
::
j
umpToLine
Exec
()
void
DebuggerManager
::
executeJ
umpToLine
()
{
ITextEditor
*
textEditor
=
d
->
m_plugin
->
currentTextEditor
();
QTC_ASSERT
(
textEditor
,
return
);
...
...
@@ -1426,7 +1426,7 @@ void DebuggerManager::jumpToLineExec()
int
lineNumber
=
textEditor
->
currentLine
();
if
(
d
->
m_engine
&&
!
fileName
.
isEmpty
())
{
STATE_DEBUG
(
fileName
<<
lineNumber
);
d
->
m_engine
->
j
umpToLine
Exec
(
fileName
,
lineNumber
);
d
->
m_engine
->
executeJ
umpToLine
(
fileName
,
lineNumber
);
}
}
...
...
src/plugins/debugger/debuggermanager.h
View file @
c0a8fbe9
...
...
@@ -213,9 +213,9 @@ public slots:
void
interruptDebuggingRequest
();
void
j
umpToLine
Exec
();
void
r
unToLine
Exec
();
void
r
unToFunction
Exec
();
void
executeJ
umpToLine
();
void
executeR
unToLine
();
void
executeR
unToFunction
();
void
toggleBreakpoint
();
void
breakByFunction
(
const
QString
&
functionName
);
void
breakByFunctionMain
();
...
...
@@ -225,11 +225,11 @@ public slots:
void
activateSnapshot
(
int
index
);
void
removeSnapshot
(
int
index
);
void
stepExec
();
void
s
tepOut
Exec
();
void
n
ex
tExec
();
void
c
ontinue
Exec
();
void
r
eturn
Exec
();
void
executeStep
();
void
executeS
tepOut
();
void
ex
ecuteStepNext
();
void
executeC
ontinue
();
void
executeR
eturn
();
void
detachDebugger
();
void
makeSnapshot
();
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
c0a8fbe9
...
...
@@ -890,7 +890,7 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
debugMessage
(
_
(
"APPLYING WORKAROUND #3"
));
setState
(
InferiorStopping
);
setState
(
InferiorStopped
);
nextIExec
();
executeNextI
();
}
else
if
(
msg
.
startsWith
(
"Couldn't get registers: No such process."
))
{
// Happens on archer-tromey-python 6.8.50.20090910-cvs
// There might to be a race between a process shutting down
...
...
@@ -1268,14 +1268,13 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
if
(
isLeavableFunction
(
funcName
,
fileName
))
{
//debugMessage(_("LEAVING ") + funcName);
++
stepCounter
;
m_manager
->
stepOutExec
();
//stepExec();
m_manager
->
executeStepOut
();
return
;
}
if
(
isSkippableFunction
(
funcName
,
fileName
))
{
//debugMessage(_("SKIPPING ") + funcName);
++
stepCounter
;
m_manager
->
stepExec
();
m_manager
->
executeStep
();
return
;
}
//if (stepCounter)
...
...
@@ -1516,7 +1515,7 @@ void GdbEngine::handleHasPython(const GdbResponse &response)
}
}
void
GdbEngine
::
handleExecContinue
(
const
GdbResponse
&
response
)
void
GdbEngine
::
handleExec
ute
Continue
(
const
GdbResponse
&
response
)
{
if
(
response
.
resultClass
==
GdbResultRunning
)
{
// The "running" state is picked up in handleResponse()
...
...
@@ -1536,7 +1535,7 @@ void GdbEngine::handleExecContinue(const GdbResponse &response)
showStatusMessage
(
tr
(
"Stopped."
),
5000
);
//showStatusMessage(tr("No debug information available. "
// "Leaving function..."));
//
s
tepOut
Exec
();
//
executeS
tepOut();
}
else
{
showMessageBox
(
QMessageBox
::
Critical
,
tr
(
"Execution Error"
),
tr
(
"Cannot continue debugged process:
\n
"
)
+
QString
::
fromLocal8Bit
(
msg
));
...
...
@@ -1756,7 +1755,7 @@ void GdbEngine::continueInferiorInternal()
QTC_ASSERT
(
state
()
==
InferiorStopped
||
state
()
==
InferiorStarting
,
qDebug
()
<<
state
());
setState
(
InferiorRunningRequested
);
postCommand
(
"-exec-continue"
,
RunRequest
,
CB
(
handleExecContinue
));
postCommand
(
"-exec-continue"
,
RunRequest
,
CB
(
handleExec
ute
Continue
));
}
void
GdbEngine
::
autoContinueInferior
()
...
...
@@ -1773,7 +1772,7 @@ void GdbEngine::continueInferior()
showStatusMessage
(
tr
(
"Running requested..."
),
5000
);
}
void
GdbEngine
::
stepExec
()
void
GdbEngine
::
executeStep
()
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
...
...
@@ -1783,12 +1782,12 @@ void GdbEngine::stepExec()
if
(
m_gdbAdapter
->
isTrkAdapter
()
&&
stackHandler
->
stackSize
()
>
0
)
postCommand
(
"sal step,"
+
stackHandler
->
topAddress
().
toLatin1
());
if
(
manager
()
->
isReverseDebugging
())
postCommand
(
"-reverse-step"
,
RunRequest
,
CB
(
handleExecStep
));
postCommand
(
"-reverse-step"
,
RunRequest
,
CB
(
handleExec
ute
Step
));
else
postCommand
(
"-exec-step"
,
RunRequest
,
CB
(
handleExecStep
));
postCommand
(
"-exec-step"
,
RunRequest
,
CB
(
handleExec
ute
Step
));
}
void
GdbEngine
::
handleExecStep
(
const
GdbResponse
&
response
)
void
GdbEngine
::
handleExec
ute
Step
(
const
GdbResponse
&
response
)
{
if
(
response
.
resultClass
==
GdbResultRunning
)
{
// The "running" state is picked up in handleResponse()
...
...
@@ -1805,7 +1804,7 @@ void GdbEngine::handleExecStep(const GdbResponse &response)
if
(
msg
.
startsWith
(
"Cannot find bounds of current function"
))
{
if
(
!
m_commandsToRunOnTemporaryBreak
.
isEmpty
())
flushQueuedCommands
();
stepIExec
();
// Fall back to instruction-wise stepping.
executeStepI
();
// Fall back to instruction-wise stepping.
}
else
{
showMessageBox
(
QMessageBox
::
Critical
,
tr
(
"Execution Error"
),
tr
(
"Cannot continue debugged process:
\n
"
)
+
QString
::
fromLocal8Bit
(
msg
));
...
...
@@ -1814,28 +1813,28 @@ void GdbEngine::handleExecStep(const GdbResponse &response)
}
}
void
GdbEngine
::
stepIExec
()
void
GdbEngine
::
executeStepI
()
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
setState
(
InferiorRunningRequested
);
showStatusMessage
(
tr
(
"Step by instruction requested..."
),
5000
);
if
(
manager
()
->
isReverseDebugging
())
postCommand
(
"-reverse-stepi"
,
RunRequest
,
CB
(
handleExecContinue
));
postCommand
(
"-reverse-stepi"
,
RunRequest
,
CB
(
handleExec
ute
Continue
));
else
postCommand
(
"-exec-step-instruction"
,
RunRequest
,
CB
(
handleExecContinue
));
postCommand
(
"-exec-step-instruction"
,
RunRequest
,
CB
(
handleExec
ute
Continue
));
}
void
GdbEngine
::
s
tepOut
Exec
()
void
GdbEngine
::
executeS
tepOut
()
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
setState
(
InferiorRunningRequested
);
showStatusMessage
(
tr
(
"Finish function requested..."
),
5000
);
postCommand
(
"-exec-finish"
,
RunRequest
,
CB
(
handleExecContinue
));
postCommand
(
"-exec-finish"
,
RunRequest
,
CB
(
handleExec
ute
Continue
));
}
void
GdbEngine
::
n
ex
tExec
()
void
GdbEngine
::
ex
ecuteNext
()
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
...
...
@@ -1845,12 +1844,12 @@ void GdbEngine::nextExec()
if
(
m_gdbAdapter
->
isTrkAdapter
()
&&
stackHandler
->
stackSize
()
>
0
)
postCommand
(
"sal next,"
+
stackHandler
->
topAddress
().
toLatin1
());
if
(
manager
()
->
isReverseDebugging
())
postCommand
(
"-reverse-next"
,
RunRequest
,
CB
(
handleExecNext
));
postCommand
(
"-reverse-next"
,
RunRequest
,
CB
(
handleExec
ute
Next
));
else
postCommand
(
"-exec-next"
,
RunRequest
,
CB
(
handleExecNext
));
postCommand
(
"-exec-next"
,
RunRequest
,
CB
(
handleExec
ute
Next
));
}
void
GdbEngine
::
handleExecNext
(
const
GdbResponse
&
response
)
void
GdbEngine
::
handleExec
ute
Next
(
const
GdbResponse
&
response
)
{
if
(
response
.
resultClass
==
GdbResultRunning
)
{
// The "running" state is picked up in handleResponse()
...
...
@@ -1867,7 +1866,7 @@ void GdbEngine::handleExecNext(const GdbResponse &response)
if
(
msg
.
startsWith
(
"Cannot find bounds of current function"
))
{
if
(
!
m_commandsToRunOnTemporaryBreak
.
isEmpty
())
flushQueuedCommands
();
nextIExec
();
// Fall back to instruction-wise stepping.
executeNextI
();
// Fall back to instruction-wise stepping.
}
else
{
showMessageBox
(
QMessageBox
::
Critical
,
tr
(
"Execution Error"
),
tr
(
"Cannot continue debugged process:
\n
"
)
+
QString
::
fromLocal8Bit
(
msg
));
...
...
@@ -1876,19 +1875,19 @@ void GdbEngine::handleExecNext(const GdbResponse &response)
}
}
void
GdbEngine
::
nextIExec
()
void
GdbEngine
::
executeNextI
()
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
setState
(
InferiorRunningRequested
);
showStatusMessage
(
tr
(
"Step next instruction requested..."
),
5000
);
if
(
manager
()
->
isReverseDebugging
())
postCommand
(
"-reverse-nexti"
,
RunRequest
,
CB
(
handleExecContinue
));
postCommand
(
"-reverse-nexti"
,
RunRequest
,
CB
(
handleExec
ute
Continue
));
else
postCommand
(
"-exec-next-instruction"
,
RunRequest
,
CB
(
handleExecContinue
));
postCommand
(
"-exec-next-instruction"
,
RunRequest
,
CB
(
handleExec
ute
Continue
));
}
void
GdbEngine
::
r
unToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
)
void
GdbEngine
::
executeR
unToLine
(
const
QString
&
fileName
,
int
lineNumber
)
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
...
...
@@ -1896,10 +1895,10 @@ void GdbEngine::runToLineExec(const QString &fileName, int lineNumber)
showStatusMessage
(
tr
(
"Run to line %1 requested..."
).
arg
(
lineNumber
),
5000
);
QByteArray
args
=
'"'
+
breakLocation
(
fileName
).
toLocal8Bit
()
+
'"'
+
':'
+
QByteArray
::
number
(
lineNumber
);
postCommand
(
"-exec-until "
+
args
,
RunRequest
,
CB
(
handleExecContinue
));
postCommand
(
"-exec-until "
+
args
,
RunRequest
,
CB
(
handleExec
ute
Continue
));
}
void
GdbEngine
::
r
unToFunction
Exec
(
const
QString
&
functionName
)
void
GdbEngine
::
executeR
unToFunction
(
const
QString
&
functionName
)
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
...
...
@@ -1910,7 +1909,7 @@ void GdbEngine::runToFunctionExec(const QString &functionName)
showStatusMessage
(
tr
(
"Run to function %1 requested..."
).
arg
(
functionName
),
5000
);
}
void
GdbEngine
::
j
umpToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
)
void
GdbEngine
::
executeJ
umpToLine
(
const
QString
&
fileName
,
int
lineNumber
)
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
StackFrame
frame
;
...
...
@@ -1939,16 +1938,16 @@ void GdbEngine::jumpToLineExec(const QString &fileName, int lineNumber)
#endif
}
void
GdbEngine
::
r
eturn
Exec
()
void
GdbEngine
::
executeR
eturn
()
{
QTC_ASSERT
(
state
()
==
InferiorStopped
,
qDebug
()
<<
state
());
setTokenBarrier
();
setState
(
InferiorRunningRequested
);
showStatusMessage
(
tr
(
"Immediate return from function requested..."
),
5000
);
postCommand
(
"-exec-finish"
,
RunRequest
,
CB
(
handleExecReturn
));
postCommand
(
"-exec-finish"
,
RunRequest
,
CB
(
handleExec
ute
Return
));
}
void
GdbEngine
::
handleExecReturn
(
const
GdbResponse
&
response
)
void
GdbEngine
::
handleExec
ute
Return
(
const
GdbResponse
&
response
)
{
if
(
response
.
resultClass
==
GdbResultDone
)
{
updateAll
();
...
...
src/plugins/debugger/gdb/gdbengine.h
View file @
c0a8fbe9
...
...
@@ -292,11 +292,11 @@ private: ////////// Inferior Management //////////
// This should be always the last call in a function.
Q_SLOT
virtual
void
attemptBreakpointSynchronization
();
virtual
void
stepExec
();
virtual
void
s
tepOut
Exec
();
virtual
void
n
ex
tExec
();
virtual
void
stepIExec
();
virtual
void
nextIExec
();
virtual
void
executeStep
();
virtual
void
executeS
tepOut
();
virtual
void
ex
ecuteNext
();
virtual
void
executeStepI
();
virtual
void
executeNextI
();
void
continueInferiorInternal
();
void
autoContinueInferior
();
...
...
@@ -304,16 +304,16 @@ private: ////////// Inferior Management //////////
virtual
void
interruptInferior
();
void
interruptInferiorTemporarily
();
virtual
void
r
unToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
r
unToFunction
Exec
(
const
QString
&
functionName
);
virtual
void
executeR
unToLine
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
executeR
unToFunction
(
const
QString
&
functionName
);
// void handleExecRunToFunction(const GdbResponse &response);
virtual
void
j
umpToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
r
eturn
Exec
();
virtual
void
executeJ
umpToLine
(
const
QString
&
fileName
,
int
lineNumber
);
virtual
void
executeR
eturn
();
void
handleExecContinue
(
const
GdbResponse
&
response
);
void
handleExecStep
(
const
GdbResponse
&
response
);
void
handleExecNext
(
const
GdbResponse
&
response
);
void
handleExecReturn
(
const
GdbResponse
&
response
);
void
handleExec
ute
Continue
(
const
GdbResponse
&
response
);
void
handleExec
ute
Step
(
const
GdbResponse
&
response
);
void
handleExec
ute
Next
(
const
GdbResponse
&
response
);
void
handleExec
ute
Return
(
const
GdbResponse
&
response
);
qint64
inferiorPid
()
const
{
return
m_manager
->
inferiorPid
();
}
void
handleInferiorPidChanged
(
qint64
pid
)
{
manager
()
->
notifyInferiorPidChanged
(
pid
);
}
...
...
src/plugins/debugger/idebuggerengine.h
View file @
c0a8fbe9
...
...
@@ -77,19 +77,19 @@ public:
virtual
void
detachDebugger
()
{}
virtual
void
updateWatchData
(
const
WatchData
&
data
)
=
0
;
virtual
void
stepExec
()
=
0
;
virtual
void
s
tepOut
Exec
()
=
0
;
virtual
void
n
ex
tExec
()
=
0
;
virtual
void
stepIExec
()
=
0
;
virtual
void
nextIExec
()
=
0
;
virtual
void
r
eturn
Exec
()
{}
virtual
void
executeStep
()
=
0
;
virtual
void
executeS
tepOut
()
=
0
;
virtual
void
ex
ecuteNext
()
=
0
;
virtual
void
executeStepI
()
=
0
;
virtual
void
executeNextI
()
=
0
;
virtual
void
executeR
eturn
()
{}
virtual
void
continueInferior
()
=
0
;
virtual
void
interruptInferior
()
=
0
;
virtual
void
r
unToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
)
=
0
;
virtual
void
r
unToFunction
Exec
(
const
QString
&
functionName
)
=
0
;
virtual
void
j
umpToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
)
=
0
;
virtual
void
executeR
unToLine
(
const
QString
&
fileName
,
int
lineNumber
)
=
0
;
virtual
void
executeR
unToFunction
(
const
QString
&
functionName
)
=
0
;
virtual
void
executeJ
umpToLine
(
const
QString
&
fileName
,
int
lineNumber
)
=
0
;
virtual
void
assignValueInDebugger
(
const
QString
&
expr
,
const
QString
&
value
)
=
0
;
virtual
void
executeDebuggerCommand
(
const
QString
&
command
)
=
0
;
...
...
src/plugins/debugger/script/scriptengine.cpp
View file @
c0a8fbe9
...
...
@@ -346,55 +346,55 @@ void ScriptEngine::interruptInferior()
XSDEBUG
(
"ScriptEngine::interruptInferior()"
);
}
void
ScriptEngine
::
stepExec
()
void
ScriptEngine
::
executeStep
()
{
//SDEBUG("ScriptEngine::stepExec()");
m_stopped
=
false
;
m_stopOnNextLine
=
true
;
}
void
ScriptEngine
::
stepIExec
()
void
ScriptEngine
::
executeStepI
()
{
//SDEBUG("ScriptEngine::stepIExec()");
m_stopped
=
false
;
m_stopOnNextLine
=
true
;
}
void
ScriptEngine
::
s
tepOut
Exec
()
void
ScriptEngine
::
executeS
tepOut
()
{
//SDEBUG("ScriptEngine::stepOutExec()");
m_stopped
=
false
;
m_stopOnNextLine
=
true
;
}
void
ScriptEngine
::
n
ex
tExec
()
void
ScriptEngine
::
ex
ecuteNext
()
{
//SDEBUG("ScriptEngine::nextExec()");
m_stopped
=
false
;
m_stopOnNextLine
=
true
;
}
void
ScriptEngine
::
nextIExec
()
void
ScriptEngine
::
executeNextI
()
{
//SDEBUG("ScriptEngine::nextIExec()");
m_stopped
=
false
;
m_stopOnNextLine
=
true
;
}
void
ScriptEngine
::
r
unToLine
Exec
(
const
QString
&
fileName
,
int
lineNumber
)
void
ScriptEngine
::
executeR
unToLine
(
const
QString
&
fileName
,
int
lineNumber
)
{
Q_UNUSED
(
fileName
)
Q_UNUSED
(
lineNumber
)
SDEBUG
(
"FIXME: ScriptEngine::runToLineExec()"
);
}
void
ScriptEngine
::
r
unToFunction
Exec
(
const
QString
&
functionName
)
void
ScriptEngine
::
executeR
unToFunction