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

Unified Diff: runtime/vm/assembler_arm64.cc

Issue 1277883002: VM: Move calling convention-dependent code out of cc tests. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: More clean up Created 5 years, 4 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/assembler_arm64.h ('k') | runtime/vm/assembler_mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_arm64.cc
diff --git a/runtime/vm/assembler_arm64.cc b/runtime/vm/assembler_arm64.cc
index 11fbdb251e263751ef9bd6cb8354b5f4978b7df2..72d90f221aeec291afe226b66b19b639ca5e6d5e 100644
--- a/runtime/vm/assembler_arm64.cc
+++ b/runtime/vm/assembler_arm64.cc
@@ -1086,24 +1086,7 @@ void Assembler::LeaveFrame() {
}
-void Assembler::EnterDartFrame(intptr_t frame_size) {
- ASSERT(!constant_pool_allowed());
- // Setup the frame.
- adr(TMP, Immediate(-CodeSize())); // TMP gets PC marker.
- EnterFrame(0);
- TagAndPushPPAndPcMarker(TMP); // Save PP and PC marker.
-
- // Load the pool pointer.
- LoadPoolPointer();
-
- // Reserve space.
- if (frame_size > 0) {
- AddImmediate(SP, SP, -frame_size);
- }
-}
-
-
-void Assembler::EnterDartFrameWithInfo(intptr_t frame_size, Register new_pp) {
+void Assembler::EnterDartFrame(intptr_t frame_size, Register new_pp) {
ASSERT(!constant_pool_allowed());
// Setup the frame.
adr(TMP, Immediate(-CodeSize())); // TMP gets PC marker.
@@ -1152,9 +1135,6 @@ void Assembler::EnterOsrFrame(intptr_t extra_size, Register new_pp) {
void Assembler::LeaveDartFrame() {
- // LeaveDartFrame is called from stubs (pp disallowed) and from Dart code (pp
- // allowed), so there is no point in checking the current value of
- // constant_pool_allowed().
set_constant_pool_allowed(false);
// Restore and untag PP.
LoadFromOffset(PP, FP, kSavedCallerPpSlotFromFp * kWordSize);
@@ -1232,11 +1212,7 @@ void Assembler::EnterStubFrame() {
void Assembler::LeaveStubFrame() {
- set_constant_pool_allowed(false);
- // Restore and untag PP.
- LoadFromOffset(PP, FP, kSavedCallerPpSlotFromFp * kWordSize);
- sub(PP, PP, Operand(kHeapObjectTag));
- LeaveFrame();
+ LeaveDartFrame();
}
« no previous file with comments | « runtime/vm/assembler_arm64.h ('k') | runtime/vm/assembler_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698