Mike Magruder
c158e4a24b
Small stepping, which is stepping over sub-expressions (kinda), worked but was a little goofy. The mode was set on the client, passed over with control flow commands, placed on the execution context, then retrieved from there and used by those same flow commands. Removed the execution context part of it, since it was useless, and factored grabbing the offsets into the flow cmds where they belong instead of doing it all the time. The run cmd also had some notion of small stepping, but you'll note it was never sent over the wire. Nuked that, since it never mattered anyway.
60 linhas
2.3 KiB
C++
60 linhas
2.3 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include "hphp/runtime/debugger/cmd/cmd_step.h"
|
|
|
|
namespace HPHP { namespace Eval {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
TRACE_SET_MOD(debuggerflow);
|
|
|
|
void CmdStep::help(DebuggerClient &client) {
|
|
client.helpTitle("Step Command");
|
|
client.helpCmds(
|
|
"[s]tep {count=1}", "steps into lines of code",
|
|
nullptr
|
|
);
|
|
client.helpBody(
|
|
"Use this command at break to step into lines of code. Specify a "
|
|
"count to step more than once."
|
|
);
|
|
}
|
|
|
|
void CmdStep::onSetup(DebuggerProxy &proxy, CmdInterrupt &interrupt) {
|
|
assert(!m_complete); // Complete cmds should not be asked to do work.
|
|
// Allows a breakpoint on this same line to be hit again when control returns
|
|
// from function call.
|
|
BreakPointInfoPtr bp = proxy.getBreakPointAtCmd(interrupt);
|
|
if (bp) {
|
|
bp->setBreakable(proxy.getRealStackDepth());
|
|
}
|
|
installLocationFilterForLine(interrupt.getSite());
|
|
m_needsVMInterrupt = true;
|
|
}
|
|
|
|
void CmdStep::onBeginInterrupt(DebuggerProxy &proxy, CmdInterrupt &interrupt) {
|
|
// Step doesn't care about this interrupt... we just stay the course and
|
|
// keep stepping.
|
|
if (interrupt.getInterruptType() == ExceptionHandler) return;
|
|
m_complete = (decCount() == 0);
|
|
if (!m_complete) {
|
|
installLocationFilterForLine(interrupt.getSite());
|
|
}
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}}
|