Revert "Implement rewind: drop one or more frames from the debugger."

runtime/vm/stub_code_mips.cc

Index: runtime/vm/stub_code_mips.cc
diff --git a/runtime/vm/stub_code_mips.cc b/runtime/vm/stub_code_mips.cc
index 53394cf82eb4beda3bcd581482bc3bb36f8a0f71..d52e6cc643960d196aa06281fd80040299619e56 100644
--- a/runtime/vm/stub_code_mips.cc
+++ b/runtime/vm/stub_code_mips.cc
@@ -549,19 +549,18 @@ static void GenerateDeoptimizationSequence(Assembler* assembler,
   // Remove materialization arguments.
   __ SmiUntag(T1);
   __ addu(SP, SP, T1);
-  // The caller is responsible for emitting the return instruction.
+  __ Ret();
 }
 
 // V0: result, must be preserved
 void StubCode::GenerateDeoptimizeLazyFromReturnStub(Assembler* assembler) {
   // Push zap value instead of CODE_REG for lazy deopt.
-  __ LoadImmediate(TMP, kZapCodeReg);
+  __ LoadImmediate(TMP, 0xf1f1f1f1);
   __ Push(TMP);
   // Return address for "call" to deopt stub.
-  __ LoadImmediate(RA, kZapReturnAddress);
+  __ LoadImmediate(RA, 0xe1e1e1e1);
   __ lw(CODE_REG, Address(THR, Thread::lazy_deopt_from_return_stub_offset()));
   GenerateDeoptimizationSequence(assembler, kLazyDeoptFromReturn);
-  __ Ret();
 }
 
 
@@ -569,19 +568,17 @@ void StubCode::GenerateDeoptimizeLazyFromReturnStub(Assembler* assembler) {
 // V1: stacktrace, must be preserved
 void StubCode::GenerateDeoptimizeLazyFromThrowStub(Assembler* assembler) {
   // Push zap value instead of CODE_REG for lazy deopt.
-  __ LoadImmediate(TMP, kZapCodeReg);
+  __ LoadImmediate(TMP, 0xf1f1f1f1);
   __ Push(TMP);
   // Return address for "call" to deopt stub.
-  __ LoadImmediate(RA, kZapReturnAddress);
+  __ LoadImmediate(RA, 0xe1e1e1e1);
   __ lw(CODE_REG, Address(THR, Thread::lazy_deopt_from_throw_stub_offset()));
   GenerateDeoptimizationSequence(assembler, kLazyDeoptFromThrow);
-  __ Ret();
 }
 
 
 void StubCode::GenerateDeoptimizeStub(Assembler* assembler) {
   GenerateDeoptimizationSequence(assembler, kEagerDeopt);
-  __ Ret();
 }
 
 
@@ -2031,26 +2028,6 @@ void StubCode::GenerateRunExceptionHandlerStub(Assembler* assembler) {
 }
 
 
-// Deoptimize a frame on the call stack before rewinding.
-// The arguments are stored in the Thread object.
-// No result.
-void StubCode::GenerateDeoptForRewindStub(Assembler* assembler) {
-  // Push zap value instead of CODE_REG.
-  __ LoadImmediate(TMP, kZapCodeReg);
-  __ Push(TMP);
-
-  // Load the deopt pc into RA.
-  __ lw(RA, Address(THR, Thread::resume_pc_offset()));
-  GenerateDeoptimizationSequence(assembler, kEagerDeopt);
-
-  // After we have deoptimized, jump to the correct frame.
-  __ EnterStubFrame();
-  __ CallRuntime(kRewindPostDeoptRuntimeEntry, 0);
-  __ LeaveStubFrame();
-  __ break_(0);
-}
-
-
 // Calls to the runtime to optimize the given function.
 // T0: function to be reoptimized.
 // S4: argument descriptor (preserved).