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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/assembler_arm64_test.cc

Issue 1283733003: VM: Refactor assembler test that rely on the constant pool. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Added comments, fixed that pass in Thread 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 | « no previous file | runtime/vm/assembler_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_arm64_test.cc
diff --git a/runtime/vm/assembler_arm64_test.cc b/runtime/vm/assembler_arm64_test.cc
index 94329a9a51af6541c6269c6ae45ed9faab09f070..72043716a91856990adeebb574ae7a3b88713d4a 100644
--- a/runtime/vm/assembler_arm64_test.cc
+++ b/runtime/vm/assembler_arm64_test.cc
@@ -1625,147 +1625,124 @@ ASSEMBLER_TEST_RUN(LoadImmediateMedNeg4, test) {
// 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 ASSEMBLER_TEST_RUN_WITH_THREAD(var_name) \
- Thread* thread = Thread::Current(); \
- typedef int64_t (*Int64Return)(Thread* thread); \
- Int64Return test_code = reinterpret_cast<Int64Return>(test->entry()); \
- int64_t var_name = test_code(thread)
-#endif
+ result_type 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);
- EXPECT_EQ(reinterpret_cast<int64_t>(Object::null()), result);
+ ASSEMBLER_TEST_RUN_WITH_THREAD(RawObject*, result);
+ EXPECT_EQ(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);
- EXPECT_EQ(reinterpret_cast<int64_t>(Bool::True().raw()), result);
+ ASSEMBLER_TEST_RUN_WITH_THREAD(RawObject*, result);
+ EXPECT_EQ(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);
- EXPECT_EQ(reinterpret_cast<int64_t>(Bool::False().raw()), result);
+ ASSEMBLER_TEST_RUN_WITH_THREAD(RawObject*, result);
+ EXPECT_EQ(Bool::False().raw(), result);
}
@@ -3576,8 +3553,6 @@ ASSEMBLER_TEST_RUN(ReciprocalSqrt, test) {
// R2: current thread.
ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
__ SetupDartSP(kTestStackSpace);
- __ TagAndPushPP();
- __ LoadPoolPointer();
__ Push(THR);
__ Push(LR);
__ mov(THR, R2);
@@ -3586,7 +3561,6 @@ ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
R0);
__ Pop(LR);
__ Pop(THR);
- __ PopAndUntagPP();
__ mov(CSP, SP);
__ ret();
}
@@ -3594,8 +3568,7 @@ ASSEMBLER_TEST_GENERATE(StoreIntoObject, assembler) {
ASSEMBLER_TEST_GENERATE(ComputeRange, assembler) {
__ SetupDartSP(kTestStackSpace);
- __ TagAndPushPP();
- __ LoadPoolPointer();
+ __ EnterStubFrame();
Label miss, done;
__ mov(R1, R0);
__ ComputeRange(R0, R1, R2, &miss);
@@ -3605,48 +3578,50 @@ ASSEMBLER_TEST_GENERATE(ComputeRange, assembler) {
__ 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(v) \
- (EXECUTE_TEST_CODE_INTPTR_INTPTR( \
- ComputeRange, test->entry(), reinterpret_cast<intptr_t>(v)))
+#define RANGE_OF(arg_type, v) test->Invoke<intptr_t, arg_type>(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)));
-
- 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(-1, RANGE_OF(Bool::True().raw()));
+ 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(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(RawBool*, Bool::True().raw()));
#undef RANGE_OF
}
« no previous file with comments | « no previous file | runtime/vm/assembler_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698