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

runtime/vm/assembler_x64_test.cc

Index: runtime/vm/assembler_x64_test.cc
diff --git a/runtime/vm/assembler_x64_test.cc b/runtime/vm/assembler_x64_test.cc
index 6a04b6a727839375ad5e8aac886e650976d8f728..eaa9ce0e218c57d0e0048f27a3eec91bb70b4fd8 100644
--- a/runtime/vm/assembler_x64_test.cc
+++ b/runtime/vm/assembler_x64_test.cc
@@ -2020,40 +2020,23 @@ ASSEMBLER_TEST_RUN(PackedDoubleSub, test) {
 }
 
 
-static void EnterTestFrame(Assembler* assembler) {
-  __ EnterFrame(0);
-  __ pushq(CODE_REG);
-  __ pushq(PP);
-  __ movq(CODE_REG, Address(CallingConventions::kArg1Reg,
-                            VMHandles::kOffsetOfRawPtrInHandle));
-  __ LoadPoolPointer(PP);
-}
-
-
-static void LeaveTestFrame(Assembler* assembler) {
-  __ popq(PP);
-  __ popq(CODE_REG);
-  __ LeaveFrame();
-}
-
-
 ASSEMBLER_TEST_GENERATE(PackedDoubleNegate, assembler) {
   static const struct ALIGN16 {
     double a;
     double b;
   } constant0 = { 1.0, 2.0 };
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ movq(RAX, Immediate(reinterpret_cast<uword>(&constant0)));
   __ movups(XMM10, Address(RAX, 0));
   __ negatepd(XMM10);
   __ movaps(XMM0, XMM10);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(PackedDoubleNegate, test) {
-  double res = test->InvokeWithCode<double>();
+  double res = test->Invoke<double>();
   EXPECT_FLOAT_EQ(-1.0, res, 0.000001f);
 }
 
@@ -2063,18 +2046,18 @@ ASSEMBLER_TEST_GENERATE(PackedDoubleAbsolute, assembler) {
     double a;
     double b;
   } constant0 = { -1.0, 2.0 };
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ movq(RAX, Immediate(reinterpret_cast<uword>(&constant0)));
   __ movups(XMM10, Address(RAX, 0));
   __ abspd(XMM10);
   __ movaps(XMM0, XMM10);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(PackedDoubleAbsolute, test) {
-  double res = test->InvokeWithCode<double>();
+  double res = test->Invoke<double>();
   EXPECT_FLOAT_EQ(1.0, res, 0.000001f);
 }
 
@@ -2508,53 +2491,53 @@ ASSEMBLER_TEST_RUN(PackedCompareNLE, test) {
 
 
 ASSEMBLER_TEST_GENERATE(PackedNegate, assembler) {
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ movl(RAX, Immediate(bit_cast<int32_t, float>(12.3f)));
   __ movd(XMM0, RAX);
   __ shufps(XMM0, XMM0, Immediate(0x0));
   __ negateps(XMM0);
   __ shufps(XMM0, XMM0, Immediate(0xAA));  // Copy third lane into all 4 lanes.
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(PackedNegate, test) {
-  float res = test->InvokeWithCode<float>();
+  float res = test->Invoke<float>();
   EXPECT_FLOAT_EQ(-12.3f, res, 0.001f);
 }
 
 
 ASSEMBLER_TEST_GENERATE(PackedAbsolute, assembler) {
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ movl(RAX, Immediate(bit_cast<int32_t, float>(-15.3f)));
   __ movd(XMM0, RAX);
   __ shufps(XMM0, XMM0, Immediate(0x0));
   __ absps(XMM0);
   __ shufps(XMM0, XMM0, Immediate(0xAA));  // Copy third lane into all 4 lanes.
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(PackedAbsolute, test) {
-  float res = test->InvokeWithCode<float>();
+  float res = test->Invoke<float>();
   EXPECT_FLOAT_EQ(15.3f, res, 0.001f);
 }
 
 
 ASSEMBLER_TEST_GENERATE(PackedSetWZero, assembler) {
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ set1ps(XMM0, RAX, Immediate(bit_cast<int32_t, float>(12.3f)));
   __ zerowps(XMM0);
   __ shufps(XMM0, XMM0, Immediate(0xFF));  // Copy the W lane which is now 0.0.
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(PackedSetWZero, test) {
-  float res = test->InvokeWithCode<float>();
+  float res = test->Invoke<float>();
   EXPECT_FLOAT_EQ(0.0f, res, 0.001f);
 }
 
@@ -2664,7 +2647,7 @@ ASSEMBLER_TEST_GENERATE(PackedLogicalNot, assembler) {
     uint32_t d;
   } constant1 =
       { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ LoadImmediate(RAX, Immediate(reinterpret_cast<intptr_t>(&constant1)));
   __ movups(XMM9, Address(RAX, 0));
   __ notps(XMM9);
@@ -2672,13 +2655,13 @@ ASSEMBLER_TEST_GENERATE(PackedLogicalNot, assembler) {
   __ pushq(RAX);
   __ movss(Address(RSP, 0), XMM0);
   __ popq(RAX);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(PackedLogicalNot, test) {
-  uint32_t res = test->InvokeWithCode<uint32_t>();
+  uint32_t res = test->Invoke<uint32_t>();
   EXPECT_EQ(static_cast<uword>(0x0), res);
 }
 
@@ -3070,7 +3053,7 @@ ASSEMBLER_TEST_GENERATE(TestObjectCompare, assembler) {
   ObjectStore* object_store = Isolate::Current()->object_store();
   const Object& obj = Object::ZoneHandle(object_store->smi_class());
   Label fail;
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ LoadObject(RAX, obj);
   __ CompareObject(RAX, obj);
   __ j(NOT_EQUAL, &fail);
@@ -3097,13 +3080,13 @@ ASSEMBLER_TEST_GENERATE(TestObjectCompare, assembler) {
   __ ret();
   __ Bind(&fail);
   __ movl(RAX, Immediate(0));  // Fail.
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(TestObjectCompare, test) {
-  bool res = test->InvokeWithCode<bool>();
+  bool res = test->Invoke<bool>();
   EXPECT_EQ(true, res);
 }
 
@@ -3307,7 +3290,6 @@ ASSEMBLER_TEST_RUN(SquareRootDouble, test) {
 
 // Called from assembler_test.cc.
 ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
-  __ pushq(CODE_REG);
   __ pushq(THR);
   __ movq(THR, CallingConventions::kArg3Reg);
   __ StoreIntoObject(CallingConventions::kArg2Reg,
@@ -3315,7 +3297,6 @@ ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
                                   GrowableObjectArray::data_offset()),
                      CallingConventions::kArg1Reg);
   __ popq(THR);
-  __ popq(CODE_REG);
   __ ret();
 }
 
@@ -3429,19 +3410,19 @@ ASSEMBLER_TEST_RUN(DoubleToDoubleTrunc, test) {
 
 
 ASSEMBLER_TEST_GENERATE(DoubleAbs, assembler) {
-  EnterTestFrame(assembler);
+  __ EnterStubFrame();
   __ DoubleAbs(XMM0);
-  LeaveTestFrame(assembler);
+  __ LeaveStubFrame();
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(DoubleAbs, test) {
   double val = -12.45;
-  double res =  test->InvokeWithCode<double, double>(val);
+  double res =  test->Invoke<double, double>(val);
   EXPECT_FLOAT_EQ(-val, res, 0.001);
   val = 12.45;
-  res = test->InvokeWithCode<double, double>(val);
+  res = test->Invoke<double, double>(val);
   EXPECT_FLOAT_EQ(val, res, 0.001);
 }