Chromium Code Reviews| Index: runtime/vm/stub_code_mips.cc |
| diff --git a/runtime/vm/stub_code_mips.cc b/runtime/vm/stub_code_mips.cc |
| index 5c04197cd8e5ddb11f6bcc82d0c70f696cdeb9ca..3a5ab3b7dedd363197cae3c691b7d807cb5bdcfe 100644 |
| --- a/runtime/vm/stub_code_mips.cc |
| +++ b/runtime/vm/stub_code_mips.cc |
| @@ -1892,6 +1892,7 @@ void StubCode::GenerateGetStackPointerStub(Assembler* assembler) { |
| // A2: frame_pointer. |
| // A3: error object. |
| // SP + 4*kWordSize: address of stacktrace object. |
| +// SP + 5*kWordSize: address of isolate. |
| // Does not return. |
| void StubCode::GenerateJumpToExceptionHandlerStub(Assembler* assembler) { |
| ASSERT(kExceptionObjectReg == V0); |
| @@ -1901,6 +1902,13 @@ void StubCode::GenerateJumpToExceptionHandlerStub(Assembler* assembler) { |
| // the last of five arguments, so it is first pushed on the stack. |
| __ lw(V1, Address(SP, 4 * kWordSize)); // StackTrace object. |
| __ mov(FP, A2); // Frame_pointer. |
| + __ lw(CTX, Address(SP, 5 * kWordSize)); // Isolate. |
|
regis
2014/07/14 20:00:34
A3?
Cutch
2014/07/14 21:32:07
Done.
|
| + // Set tag. |
| + __ LoadImmediate(A2, VMTag::kScriptTagId); |
| + __ sw(A2, Address(CTX, Isolate::vm_tag_offset())); |
| + // Clear top exit frame. |
| + __ sw(ZR, Address(CTX, Isolate::top_exit_frame_info_offset())); |
| + |
| __ jr(A0); // Jump to the exception handler code. |
| __ delay_slot()->mov(SP, A1); // Stack pointer. |
| } |