Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: runtime/vm/stub_code_arm.cc

Issue 2521413002: Revert "Implement rewind: drop one or more frames from the debugger." (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/stub_code.h ('k') | runtime/vm/stub_code_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_arm.cc
diff --git a/runtime/vm/stub_code_arm.cc b/runtime/vm/stub_code_arm.cc
index 58124b2428e927d9f5ed6bd8532f3b4fa54944d6..87b054d36aec0ef517bd1a94d3a3338ba5f440e7 100644
--- a/runtime/vm/stub_code_arm.cc
+++ b/runtime/vm/stub_code_arm.cc
@@ -537,20 +537,19 @@ static void GenerateDeoptimizationSequence(Assembler* assembler,
__ LeaveStubFrame();
// Remove materialization arguments.
__ add(SP, SP, Operand(R2, ASR, kSmiTagSize));
- // The caller is responsible for emitting the return instruction.
+ __ Ret();
}
// R0: result, must be preserved
void StubCode::GenerateDeoptimizeLazyFromReturnStub(Assembler* assembler) {
// Push zap value instead of CODE_REG for lazy deopt.
- __ LoadImmediate(IP, kZapCodeReg);
+ __ LoadImmediate(IP, 0xf1f1f1f1);
__ Push(IP);
// Return address for "call" to deopt stub.
- __ LoadImmediate(LR, kZapReturnAddress);
+ __ LoadImmediate(LR, 0xe1e1e1e1);
__ ldr(CODE_REG, Address(THR, Thread::lazy_deopt_from_return_stub_offset()));
GenerateDeoptimizationSequence(assembler, kLazyDeoptFromReturn);
- __ Ret();
}
@@ -558,19 +557,17 @@ void StubCode::GenerateDeoptimizeLazyFromReturnStub(Assembler* assembler) {
// R1: stacktrace, must be preserved
void StubCode::GenerateDeoptimizeLazyFromThrowStub(Assembler* assembler) {
// Push zap value instead of CODE_REG for lazy deopt.
- __ LoadImmediate(IP, kZapCodeReg);
+ __ LoadImmediate(IP, 0xf1f1f1f1);
__ Push(IP);
// Return address for "call" to deopt stub.
- __ LoadImmediate(LR, kZapReturnAddress);
+ __ LoadImmediate(LR, 0xe1e1e1e1);
__ ldr(CODE_REG, Address(THR, Thread::lazy_deopt_from_throw_stub_offset()));
GenerateDeoptimizationSequence(assembler, kLazyDeoptFromThrow);
- __ Ret();
}
void StubCode::GenerateDeoptimizeStub(Assembler* assembler) {
GenerateDeoptimizationSequence(assembler, kEagerDeopt);
- __ Ret();
}
@@ -1902,26 +1899,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(IP, kZapCodeReg);
- __ Push(IP);
-
- // Load the deopt pc into LR.
- __ LoadFromOffset(kWord, LR, THR, Thread::resume_pc_offset());
- GenerateDeoptimizationSequence(assembler, kEagerDeopt);
-
- // After we have deoptimized, jump to the correct frame.
- __ EnterStubFrame();
- __ CallRuntime(kRewindPostDeoptRuntimeEntry, 0);
- __ LeaveStubFrame();
- __ bkpt(0);
-}
-
-
// Calls to the runtime to optimize the given function.
// R8: function to be reoptimized.
// R4: argument descriptor (preserved).
« no previous file with comments | « runtime/vm/stub_code.h ('k') | runtime/vm/stub_code_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698