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

runtime/vm/assembler_arm64_test.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM64)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/os.h"
@@ skipping 1604 matching lines @@
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediateMedNeg4, test) {
   typedef int64_t (*Int64Return)() DART_UNUSED;
   EXPECT_EQ(-0x12341234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
-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();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectNull, test) {
   ASSEMBLER_TEST_RUN_WITH_THREAD(RawObject*, result);
   EXPECT_EQ(Object::null(), result);
 }
 
 
 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();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectTrue, test) {
   ASSEMBLER_TEST_RUN_WITH_THREAD(RawObject*, result);
   EXPECT_EQ(Bool::True().raw(), result);
 }
 
 
 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();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectFalse, test) {
   ASSEMBLER_TEST_RUN_WITH_THREAD(RawObject*, result);
   EXPECT_EQ(Bool::False().raw(), result);
 }
 
@@ skipping 1798 matching lines @@
 }
 
 
 // Called from assembler_test.cc.
 // LR: return address.
 // R0: value.
 // R1: growable array.
 // R2: current thread.
 ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  __ Push(CODE_REG);
   __ Push(THR);
   __ Push(LR);
   __ mov(THR, R2);
   __ StoreIntoObject(R1,
                      FieldAddress(R1, GrowableObjectArray::data_offset()),
                      R0);
   __ Pop(LR);
   __ Pop(THR);
-  __ Pop(CODE_REG);
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_GENERATE(ComputeRange, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   Label miss, done;
+  __ mov(R1, R0);
   __ ComputeRange(R0, R1, R2, &miss);
   __ b(&done);
 
   __ Bind(&miss);
   __ 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)));
   EXPECT_EQ(ICData::kInt32RangeBit, RANGE_OF(RawSmi*, Smi::New(kMaxInt32)));
   EXPECT_EQ(ICData::kInt32RangeBit | ICData::kSignedRangeBit,
             RANGE_OF(RawSmi*, Smi::New(-1)));
   EXPECT_EQ(ICData::kInt32RangeBit | ICData::kSignedRangeBit,
             RANGE_OF(RawSmi*, Smi::New(kMinInt32)));
 
   EXPECT_EQ(ICData::kUint32RangeBit,
@@ skipping 24 matching lines @@
 
   EXPECT_EQ(-1, RANGE_OF(RawBool*, Bool::True().raw()));
 
 #undef RANGE_OF
 }
 
 
 }  // namespace dart
 
 #endif  // defined(TARGET_ARCH_ARM64)