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

Unified Diff: runtime/vm/simulator_mips.cc

Issue 2374173002: Revert "Pass new pool pointer to the JumpToException stub instead of reloading in through the frame… (Closed)
Patch Set: Created 4 years, 3 months 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/simulator_mips.h ('k') | runtime/vm/stack_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/simulator_mips.cc
diff --git a/runtime/vm/simulator_mips.cc b/runtime/vm/simulator_mips.cc
index 3da7c6486ca3a4f72c1d8c2c1569d742a12cb4a5..f42b3fa88066541589a77e12bb5ed3bbdc25f1f3 100644
--- a/runtime/vm/simulator_mips.cc
+++ b/runtime/vm/simulator_mips.cc
@@ -2501,7 +2501,6 @@ int64_t Simulator::Call(int32_t entry,
void Simulator::Longjmp(uword pc,
uword sp,
uword fp,
- uword pp,
RawObject* raw_exception,
RawObject* raw_stacktrace,
Thread* thread) {
@@ -2522,7 +2521,6 @@ void Simulator::Longjmp(uword pc,
set_pc(static_cast<int32_t>(pc));
set_register(SP, static_cast<int32_t>(sp));
set_register(FP, static_cast<int32_t>(fp));
- set_register(PP, static_cast<int32_t>(pp));
set_register(THR, reinterpret_cast<int32_t>(thread));
// Set the tag.
thread->set_vm_tag(VMTag::kDartTagId);
@@ -2532,6 +2530,13 @@ void Simulator::Longjmp(uword pc,
ASSERT(raw_exception != Object::null());
set_register(kExceptionObjectReg, bit_cast<int32_t>(raw_exception));
set_register(kStackTraceObjectReg, bit_cast<int32_t>(raw_stacktrace));
+ // Restore pool pointer.
+ int32_t code = *reinterpret_cast<int32_t*>(
+ fp + kPcMarkerSlotFromFp * kWordSize);
+ int32_t pp = *reinterpret_cast<int32_t*>(
+ code + Code::object_pool_offset() - kHeapObjectTag);
+ set_register(CODE_REG, code);
+ set_register(PP, pp);
buf->Longjmp();
}
« no previous file with comments | « runtime/vm/simulator_mips.h ('k') | runtime/vm/stack_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698