Commit a9bdee1f authored by yangguo's avatar yangguo Committed by Commit bot

[debugger] Remove obsolete stepping modes.

R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/1479843002

Cr-Commit-Position: refs/heads/master@{#32343}
parent c19a29f8
...@@ -964,7 +964,7 @@ void Debug::PrepareStep(StepAction step_action, ...@@ -964,7 +964,7 @@ void Debug::PrepareStep(StepAction step_action,
return; return;
} }
if (step_action != StepNext && step_action != StepMin) { if (step_action != StepNext) {
// If there's restarter frame on top of the stack, just get the pointer // If there's restarter frame on top of the stack, just get the pointer
// to function which is going to be restarted. // to function which is going to be restarted.
if (thread_local_.restarter_frame_function_pointer_ != NULL) { if (thread_local_.restarter_frame_function_pointer_ != NULL) {
......
...@@ -37,10 +37,7 @@ enum StepAction : int8_t { ...@@ -37,10 +37,7 @@ enum StepAction : int8_t {
StepNext = 1, // Step to the next statement in the current function. StepNext = 1, // Step to the next statement in the current function.
StepIn = 2, // Step into new functions invoked or the next statement StepIn = 2, // Step into new functions invoked or the next statement
// in the current function. // in the current function.
StepMin = 3, // Perform a minimum step in the current function. StepFrame = 3 // Step into a new frame or return to previous frame.
StepInMin = 4, // Step into new functions invoked or perform a minimum step
// in the current function.
StepFrame = 5 // Step into a new frame or return to previous frame.
}; };
......
...@@ -62,9 +62,7 @@ Debug.ExceptionBreak = { Caught : 0, ...@@ -62,9 +62,7 @@ Debug.ExceptionBreak = { Caught : 0,
Debug.StepAction = { StepOut: 0, Debug.StepAction = { StepOut: 0,
StepNext: 1, StepNext: 1,
StepIn: 2, StepIn: 2,
StepMin: 3, StepFrame: 3 };
StepInMin: 4,
StepFrame: 5 };
// The different types of scripts matching enum ScriptType in objects.h. // The different types of scripts matching enum ScriptType in objects.h.
Debug.ScriptType = { Native: 0, Debug.ScriptType = { Native: 0,
...@@ -1479,8 +1477,6 @@ DebugCommandProcessor.prototype.continueRequest_ = function(request, response) { ...@@ -1479,8 +1477,6 @@ DebugCommandProcessor.prototype.continueRequest_ = function(request, response) {
if (stepaction) { if (stepaction) {
if (stepaction == 'in') { if (stepaction == 'in') {
action = Debug.StepAction.StepIn; action = Debug.StepAction.StepIn;
} else if (stepaction == 'min') {
action = Debug.StepAction.StepMin;
} else if (stepaction == 'next') { } else if (stepaction == 'next') {
action = Debug.StepAction.StepNext; action = Debug.StepAction.StepNext;
} else if (stepaction == 'out') { } else if (stepaction == 'out') {
......
...@@ -1232,13 +1232,12 @@ RUNTIME_FUNCTION(Runtime_PrepareStep) { ...@@ -1232,13 +1232,12 @@ RUNTIME_FUNCTION(Runtime_PrepareStep) {
// Get the step action and check validity. // Get the step action and check validity.
StepAction step_action = static_cast<StepAction>(NumberToInt32(args[1])); StepAction step_action = static_cast<StepAction>(NumberToInt32(args[1]));
if (step_action != StepIn && step_action != StepNext && if (step_action != StepIn && step_action != StepNext &&
step_action != StepOut && step_action != StepInMin && step_action != StepOut && step_action != StepFrame) {
step_action != StepMin && step_action != StepFrame) {
return isolate->Throw(isolate->heap()->illegal_argument_string()); return isolate->Throw(isolate->heap()->illegal_argument_string());
} }
if (frame_id != StackFrame::NO_ID && step_action != StepNext && if (frame_id != StackFrame::NO_ID && step_action != StepNext &&
step_action != StepMin && step_action != StepOut) { step_action != StepOut) {
return isolate->ThrowIllegalOperation(); return isolate->ThrowIllegalOperation();
} }
......
...@@ -78,7 +78,6 @@ function listener(event, exec_state, event_data, data) { ...@@ -78,7 +78,6 @@ function listener(event, exec_state, event_data, data) {
// Test some legal continue requests. // Test some legal continue requests.
testArguments(exec_state, '{"stepaction":"in"}', true); testArguments(exec_state, '{"stepaction":"in"}', true);
testArguments(exec_state, '{"stepaction":"min"}', true);
testArguments(exec_state, '{"stepaction":"next"}', true); testArguments(exec_state, '{"stepaction":"next"}', true);
testArguments(exec_state, '{"stepaction":"out"}', true); testArguments(exec_state, '{"stepaction":"out"}', true);
testArguments(exec_state, '{"stepcount":1}', true); testArguments(exec_state, '{"stepcount":1}', true);
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) { ...@@ -44,9 +44,7 @@ function listener(event, exec_state, event_data, data) {
} }
// Do steps until we reach the global scope again. // Do steps until we reach the global scope again.
if (true) { exec_state.prepareStep(Debug.StepAction.StepIn, 1);
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment