| Index: runtime/vm/simulator_mips.cc
|
| diff --git a/runtime/vm/simulator_mips.cc b/runtime/vm/simulator_mips.cc
|
| index f3c325f9e1a2a8aee6a0ba94b8f507bdd7163e2a..f65b9ed2da108faf53c0fd04cd40da1c797fe1a8 100644
|
| --- a/runtime/vm/simulator_mips.cc
|
| +++ b/runtime/vm/simulator_mips.cc
|
| @@ -2479,7 +2479,12 @@ int64_t Simulator::Call(int32_t entry,
|
| }
|
|
|
|
|
| -void Simulator::JumpToFrame(uword pc, uword sp, uword fp, Thread* thread) {
|
| +void Simulator::Longjmp(uword pc,
|
| + uword sp,
|
| + uword fp,
|
| + RawObject* raw_exception,
|
| + RawObject* raw_stacktrace,
|
| + Thread* thread) {
|
| // Walk over all setjmp buffers (simulated --> C++ transitions)
|
| // and try to find the setjmp associated with the simulated stack pointer.
|
| SimulatorSetjmpBuffer* buf = last_setjmp_buffer();
|
| @@ -2502,6 +2507,10 @@ void Simulator::JumpToFrame(uword pc, uword sp, uword fp, Thread* thread) {
|
| thread->set_vm_tag(VMTag::kDartTagId);
|
| // Clear top exit frame.
|
| thread->set_top_exit_frame_info(0);
|
| +
|
| + 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);
|
|
|