Revert "VM: New calling convention for generated code."

runtime/vm/assembler_arm64_test.cc

Index: runtime/vm/assembler_arm64_test.cc
diff --git a/runtime/vm/assembler_arm64_test.cc b/runtime/vm/assembler_arm64_test.cc
index a187ee8e6130d730ea71aff76b37f4728f32fdb8..72043716a91856990adeebb574ae7a3b88713d4a 100644
--- a/runtime/vm/assembler_arm64_test.cc
+++ b/runtime/vm/assembler_arm64_test.cc
@@ -1622,100 +1622,81 @@ ASSEMBLER_TEST_RUN(LoadImmediateMedNeg4, test) {
 }
 
 
-static void EnterTestFrame(Assembler* assembler) {
-  __ EnterFrame(0);
-  __ Push(CODE_REG);
-  __ TagAndPushPP();
-  __ ldr(CODE_REG, Address(R0, VMHandles::kOffsetOfRawPtrInHandle));
-  __ LoadPoolPointer(PP);
-}
-
-
-static void LeaveTestFrame(Assembler* assembler) {
-  __ PopAndUntagPP();
-  __ Pop(CODE_REG);
-  __ LeaveFrame();
-}
-
-
-
-
 // Loading immediate values with the object pool.
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPSmall, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 42);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPSmall, test) {
-  EXPECT_EQ(42, test->InvokeWithCode<int64_t>());
+  EXPECT_EQ(42, test->Invoke<int64_t>());
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPMed, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 0xf1234123);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPMed, test) {
-  EXPECT_EQ(0xf1234123, test->InvokeWithCode<int64_t>());
+  EXPECT_EQ(0xf1234123, test->Invoke<int64_t>());
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPMed2, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 0x4321f1234124);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPMed2, test) {
-  EXPECT_EQ(0x4321f1234124, test->InvokeWithCode<int64_t>());
+  EXPECT_EQ(0x4321f1234124, test->Invoke<int64_t>());
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPLarge, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 0x9287436598237465);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPLarge, test) {
-  EXPECT_EQ(static_cast<int64_t>(0x9287436598237465),
-            test->InvokeWithCode<int64_t>());
+  EXPECT_EQ(static_cast<int64_t>(0x9287436598237465), test->Invoke<int64_t>());
 }
 
 
 #define ASSEMBLER_TEST_RUN_WITH_THREAD(result_type, var_name) \
   Thread* thread = Thread::Current(); \
-  result_type var_name = test->InvokeWithCode<result_type>(thread);
+  result_type var_name = test->Invoke<result_type>(thread);
 
 
 // LoadObject null.
 ASSEMBLER_TEST_GENERATE(LoadObjectNull, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ Push(THR);
-  __ mov(THR, R1);
+  __ mov(THR, R0);
   __ LoadObject(R0, Object::null_object());
   __ Pop(THR);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
@@ -1729,12 +1710,12 @@ ASSEMBLER_TEST_RUN(LoadObjectNull, test) {
 
 ASSEMBLER_TEST_GENERATE(LoadObjectTrue, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ Push(THR);
-  __ mov(THR, R1);
+  __ mov(THR, R0);
   __ LoadObject(R0, Bool::True());
   __ Pop(THR);
-  LeaveTestFrame(assembler);
+  __ LeaveDartFrame();
   __ mov(CSP, SP);
   __ ret();
 }
@@ -1748,12 +1729,12 @@ ASSEMBLER_TEST_RUN(LoadObjectTrue, test) {
 
 ASSEMBLER_TEST_GENERATE(LoadObjectFalse, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ Push(THR);
-  __ mov(THR, R1);
+  __ mov(THR, R0);
   __ LoadObject(R0, Bool::False());
   __ Pop(THR);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
@@ -3572,7 +3553,6 @@ ASSEMBLER_TEST_RUN(ReciprocalSqrt, test) {
 // R2: current thread.
 ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  __ Push(CODE_REG);
   __ Push(THR);
   __ Push(LR);
   __ mov(THR, R2);
@@ -3581,7 +3561,6 @@ ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
                      R0);
   __ Pop(LR);
   __ Pop(THR);
-  __ Pop(CODE_REG);
   __ mov(CSP, SP);
   __ ret();
 }
@@ -3589,8 +3568,9 @@ ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
 
 ASSEMBLER_TEST_GENERATE(ComputeRange, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   Label miss, done;
+  __ mov(R1, R0);
   __ ComputeRange(R0, R1, R2, &miss);
   __ b(&done);
 
@@ -3598,14 +3578,14 @@ ASSEMBLER_TEST_GENERATE(ComputeRange, assembler) {
   __ LoadImmediate(R0, -1);
 
   __ Bind(&done);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(ComputeRange, test) {
-#define RANGE_OF(arg_type, v) test->InvokeWithCode<intptr_t, arg_type>(v)
+#define RANGE_OF(arg_type, v) test->Invoke<intptr_t, arg_type>(v)
 
   EXPECT_EQ(ICData::kInt32RangeBit, RANGE_OF(RawSmi*, Smi::New(0)));
   EXPECT_EQ(ICData::kInt32RangeBit, RANGE_OF(RawSmi*, Smi::New(1)));