VM: Refactor assembler test that rely on the constant pool.

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 1607 matching lines @@
 
 ASSEMBLER_TEST_RUN(LoadImmediateMedNeg4, test) {
   typedef int64_t (*Int64Return)() DART_UNUSED;
   EXPECT_EQ(-0x12341234, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
 }
 
 
 // Loading immediate values with the object pool.
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPSmall, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
-  __ LoadPoolPointer();
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 42);
-  __ PopAndUntagPP();
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPSmall, test) {
-  typedef int64_t (*Int64Return)() DART_UNUSED;
-  EXPECT_EQ(42, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
+  EXPECT_EQ(42, test->Invoke<int64_t>());
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPMed, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
-  __ LoadPoolPointer();
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 0xf1234123);
-  __ PopAndUntagPP();
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPMed, test) {
-  typedef int64_t (*Int64Return)() DART_UNUSED;
-  EXPECT_EQ(0xf1234123, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
+  EXPECT_EQ(0xf1234123, test->Invoke<int64_t>());
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPMed2, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
-  __ LoadPoolPointer();
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 0x4321f1234124);
-  __ PopAndUntagPP();
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPMed2, test) {
-  typedef int64_t (*Int64Return)() DART_UNUSED;
-  EXPECT_EQ(
-      0x4321f1234124, EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
+  EXPECT_EQ(0x4321f1234124, test->Invoke<int64_t>());
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadImmediatePPLarge, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
-  __ LoadPoolPointer();
+  __ EnterStubFrame();
   __ LoadImmediate(R0, 0x9287436598237465);
-  __ PopAndUntagPP();
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadImmediatePPLarge, test) {
-  typedef int64_t (*Int64Return)() DART_UNUSED;
-  EXPECT_EQ(static_cast<int64_t>(0x9287436598237465),
-            EXECUTE_TEST_CODE_INT64(Int64Return, test->entry()));
+  EXPECT_EQ(static_cast<int64_t>(0x9287436598237465), test->Invoke<int64_t>());
 }
 
 
-#if defined(USING_SIMULATOR)
-#define ASSEMBLER_TEST_RUN_WITH_THREAD(var_name) \
+#define ASSEMBLER_TEST_RUN_WITH_THREAD(result_type, var_name) \
   Thread* thread = Thread::Current(); \
-  int64_t var_name = Simulator::Current()->Call( \
-      bit_cast<intptr_t, uword>(test->entry()), \
-      reinterpret_cast<intptr_t>(thread), 0, 0, 0)
-#else
-#define ASSEMBER_TEST_RUN_WITH_THREAD(var_name) \
-  typedef int64_t (*Int64Return)(Thread* thread); \
-  Int64Return test_code = reinterpret_cast<Int64Return>(test->entry()); \
-  int64_t var_name = test_code(thread)
-#endif
+  int64_t var_name = test->Invoke<result_type>(thread);
 
 
 // LoadObject null.
 ASSEMBLER_TEST_GENERATE(LoadObjectNull, assembler) {
   __ SetupDartSP(kTestStackSpace);
+  __ EnterStubFrame();
   __ Push(THR);
   __ mov(THR, R0);
-  __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
-  __ LoadPoolPointer();
   __ LoadObject(R0, Object::null_object());
-  __ PopAndUntagPP();
   __ Pop(THR);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectNull, test) {
-  ASSEMBLER_TEST_RUN_WITH_THREAD(result);
+  ASSEMBLER_TEST_RUN_WITH_THREAD(int64_t, result);
   EXPECT_EQ(reinterpret_cast<int64_t>(Object::null()), result);
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadObjectTrue, assembler) {
   __ SetupDartSP(kTestStackSpace);
+  __ EnterStubFrame();
   __ Push(THR);
   __ mov(THR, R0);
-  __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
-  __ LoadPoolPointer();
   __ LoadObject(R0, Bool::True());
-  __ PopAndUntagPP();
   __ Pop(THR);
+  __ LeaveDartFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectTrue, test) {
-  ASSEMBLER_TEST_RUN_WITH_THREAD(result);
+  ASSEMBLER_TEST_RUN_WITH_THREAD(int64_t, result);
   EXPECT_EQ(reinterpret_cast<int64_t>(Bool::True().raw()), result);
 }
 
 
 ASSEMBLER_TEST_GENERATE(LoadObjectFalse, assembler) {
   __ SetupDartSP(kTestStackSpace);
+  __ EnterStubFrame();
   __ Push(THR);
   __ mov(THR, R0);
-  __ TagAndPushPP();  // Save caller's pool pointer and load a new one here.
-  __ LoadPoolPointer();
   __ LoadObject(R0, Bool::False());
-  __ PopAndUntagPP();
   __ Pop(THR);
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(LoadObjectFalse, test) {
-  ASSEMBLER_TEST_RUN_WITH_THREAD(result);
+  ASSEMBLER_TEST_RUN_WITH_THREAD(int64_t, result);
   EXPECT_EQ(reinterpret_cast<int64_t>(Bool::False().raw()), result);
 }
 
 
 ASSEMBLER_TEST_GENERATE(CSelTrue, assembler) {
   __ LoadImmediate(R1, 42);
   __ LoadImmediate(R2, 1234);
   __ CompareRegisters(R1, R2);
   __ csel(R0, R1, R2, LT);
   __ ret();
@@ skipping 1791 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);
-  __ TagAndPushPP();
-  __ LoadPoolPointer();
+  __ EnterStubFrame();
   __ Push(THR);
   __ Push(LR);
   __ mov(THR, R2);
   __ StoreIntoObject(R1,
                      FieldAddress(R1, GrowableObjectArray::data_offset()),
                      R0);
   __ Pop(LR);
   __ Pop(THR);
-  __ PopAndUntagPP();
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_GENERATE(ComputeRange, assembler) {
   __ SetupDartSP(kTestStackSpace);
-  __ TagAndPushPP();
-  __ LoadPoolPointer();
+  __ EnterStubFrame();
   Label miss, done;
   __ mov(R1, R0);
   __ ComputeRange(R0, R1, R2, &miss);
   __ b(&done);
 
   __ Bind(&miss);
   __ LoadImmediate(R0, -1);
 
   __ Bind(&done);
-  __ PopAndUntagPP();
+  __ LeaveStubFrame();
   __ mov(CSP, SP);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(ComputeRange, test) {
-  typedef intptr_t (*ComputeRange)(intptr_t value) DART_UNUSED;
+#define RANGE_OF(arg_type, v) test->Invoke<intptr_t, arg_type>(v)
 
-#define RANGE_OF(v)                                              \
-  (EXECUTE_TEST_CODE_INTPTR_INTPTR(                              \
-    ComputeRange, test->entry(), reinterpret_cast<intptr_t>(v)))
-
-  EXPECT_EQ(ICData::kInt32RangeBit, RANGE_OF(Smi::New(0)));
-  EXPECT_EQ(ICData::kInt32RangeBit, RANGE_OF(Smi::New(1)));
-  EXPECT_EQ(ICData::kInt32RangeBit, RANGE_OF(Smi::New(kMaxInt32)));
+  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(Smi::New(-1)));
+            RANGE_OF(RawSmi*, Smi::New(-1)));
   EXPECT_EQ(ICData::kInt32RangeBit | ICData::kSignedRangeBit,
-            RANGE_OF(Smi::New(kMinInt32)));
+            RANGE_OF(RawSmi*, Smi::New(kMinInt32)));
 
   EXPECT_EQ(ICData::kUint32RangeBit,
-            RANGE_OF(Smi::New(static_cast<int64_t>(kMaxInt32) + 1)));
+            RANGE_OF(RawSmi*, Smi::New(static_cast<int64_t>(kMaxInt32) + 1)));
   EXPECT_EQ(ICData::kUint32RangeBit,
-            RANGE_OF(Smi::New(kMaxUint32)));
+            RANGE_OF(RawSmi*, Smi::New(kMaxUint32)));
 
   // On 64-bit platforms we don't track the sign of the smis outside of
   // int32 range because it is not needed to distinguish kInt32Range from
   // kUint32Range.
   EXPECT_EQ(ICData::kSignedRangeBit,
-            RANGE_OF(Smi::New(static_cast<int64_t>(kMinInt32) - 1)));
+            RANGE_OF(RawSmi*, Smi::New(static_cast<int64_t>(kMinInt32) - 1)));
   EXPECT_EQ(ICData::kSignedRangeBit,
-            RANGE_OF(Smi::New(static_cast<int64_t>(kMaxUint32) + 1)));
-  EXPECT_EQ(ICData::kSignedRangeBit, RANGE_OF(Smi::New(Smi::kMaxValue)));
-  EXPECT_EQ(ICData::kSignedRangeBit, RANGE_OF(Smi::New(Smi::kMinValue)));
+            RANGE_OF(RawSmi*, Smi::New(static_cast<int64_t>(kMaxUint32) + 1)));
+  EXPECT_EQ(ICData::kSignedRangeBit,
+            RANGE_OF(RawSmi*, Smi::New(Smi::kMaxValue)));
+  EXPECT_EQ(ICData::kSignedRangeBit, RANGE_OF(RawSmi*,
+            Smi::New(Smi::kMinValue)));
 
-  EXPECT_EQ(ICData::kInt64RangeBit, RANGE_OF(Integer::New(Smi::kMaxValue + 1)));
-  EXPECT_EQ(ICData::kInt64RangeBit, RANGE_OF(Integer::New(Smi::kMinValue - 1)));
-  EXPECT_EQ(ICData::kInt64RangeBit, RANGE_OF(Integer::New(kMaxInt64)));
-  EXPECT_EQ(ICData::kInt64RangeBit, RANGE_OF(Integer::New(kMinInt64)));
+  EXPECT_EQ(ICData::kInt64RangeBit,
+            RANGE_OF(RawInteger*, Integer::New(Smi::kMaxValue + 1)));
+  EXPECT_EQ(ICData::kInt64RangeBit,
+            RANGE_OF(RawInteger*, Integer::New(Smi::kMinValue - 1)));
+  EXPECT_EQ(ICData::kInt64RangeBit,
+            RANGE_OF(RawInteger*, Integer::New(kMaxInt64)));
+  EXPECT_EQ(ICData::kInt64RangeBit,
+            RANGE_OF(RawInteger*, Integer::New(kMinInt64)));
 
-  EXPECT_EQ(-1, RANGE_OF(Bool::True().raw()));
+  EXPECT_EQ(-1, RANGE_OF(RawBool*, Bool::True().raw()));
 
 #undef RANGE_OF
 }
 
 
 }  // namespace dart
 
 #endif  // defined(TARGET_ARCH_ARM64)