FEX-Emu/vixl
1
0
Fork 0
mirror of https://github.com/FEX-Emu/vixl.git synced 2024-11-23 14:40:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the AArch64 debugger's stepi command.

Browse Source 
Change-Id: I5e16d72760e0b288ef1e86f13997d1d5e7d6f2eb
This commit is contained in:
Alexandre Rames 2016-07-19 14:46:57 +01:00
parent 6c0406d676
commit 4886a72530
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/aarch64/debugger-aarch64.cc
View File

@ -264,8 +264,8 @@ class DebugCommand {
virtual ~DebugCommand() { delete name_; }
const char* name() { return name_->value(); }
// Run the command on the given debugger. The command returns true if
// execution should move to the next instruction.
// Run the command on the given debugger.
// Return `true` if control should be given back to the debugger.
virtual bool Run(Debugger* debugger) = 0;
virtual void Print(FILE* out = stdout);
@ -1225,14 +1225,23 @@ DebugCommand* ContinueCommand::Build(std::vector<Token*> args) {
bool StepCommand::Run(Debugger* debugger) {
VIXL_ASSERT(debugger->IsDebuggerRunning());
// To avoid recursive calls to the debugger shell when hitting breakpoints
// while stepping, stepping is implemented by telling the debugger how many
// instructions to execute before starting the shell again.
int64_t steps = count();
if (steps < 0) {
printf(" ** invalid value for steps: %" PRId64 " (<0) **\n", steps);
} else if (steps > 1) {
if (steps <= 0) {
if (steps < 0) {
printf(" ** invalid value for steps: %" PRId64 " (<0) **\n", steps);
}
// Execute nothing and stay in the shell.
return false;
} else {
debugger->SetSteps(steps - 1);
// Relinquish control to the debugger. It will execute the next instruction,
// followed by `steps - 1` instructions, before starting the shell again.
// (Unless another breakpoint is hit in the meantime.)
return true;
}
return true;
}

2
src/aarch64/debugger-aarch64.h
View File

@ -85,7 +85,7 @@ class Debugger : public Simulator {
VIXL_DEPRECATED("GetSteps", int64_t steps() const) { return GetSteps(); }
void SetSteps(int64_t value) {
VIXL_ASSERT(value > 1);
VIXL_ASSERT(value >= 0);
steps_ = value;
}
VIXL_DEPRECATED("SetSteps", void set_steps(int64_t value)) {