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

Unified Diff: runtime/vm/stub_code_arm64.cc

Issue 311413002: Changes for running tests on arm64 hardware. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 6 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
Index: runtime/vm/stub_code_arm64.cc
===================================================================
--- runtime/vm/stub_code_arm64.cc (revision 37032)
+++ runtime/vm/stub_code_arm64.cc (working copy)
@@ -1540,7 +1540,8 @@
void StubCode::GenerateClosureCallInlineCacheStub(Assembler* assembler) {
- __ Stop("GenerateClosureCallInlineCacheStub");
+ GenerateNArgsCheckInlineCacheStub(
+ assembler, 1, kInlineCacheMissHandlerOneArgRuntimeEntry);
}
@@ -1787,8 +1788,23 @@
}
+// Jump to the exception or error handler.
+// LR: return address.
+// R0: program_counter.
+// R1: stack_pointer.
+// R2: frame_pointer.
+// R3: error object.
+// R4: address of stacktrace object.
+// Does not return.
void StubCode::GenerateJumpToExceptionHandlerStub(Assembler* assembler) {
- __ Stop("GenerateJumpToExceptionHandlerStub");
+ ASSERT(kExceptionObjectReg == R0);
+ ASSERT(kStackTraceObjectReg == R1);
+ __ mov(LR, R0); // Program counter.
+ __ mov(SP, R1); // Stack pointer.
+ __ mov(FP, R2); // Frame_pointer.
+ __ mov(R0, R3); // Exception object.
+ __ mov(R1, R4); // StackTrace object.
+ __ ret(); // Jump to the exception handler code.
}
@@ -1809,7 +1825,7 @@
__ AddImmediate(R0, R0, Instructions::HeaderSize() - kHeapObjectTag, PP);
__ LeaveStubFrame();
__ br(R0);
- __ hlt(0);
+ __ brk(0);
}

Powered by Google App Engine
This is Rietveld 408576698