| Index: runtime/vm/stub_code_arm_test.cc
|
| diff --git a/runtime/vm/stub_code_arm_test.cc b/runtime/vm/stub_code_arm_test.cc
|
| index ae1ce837a8574e00531c69c287e8ad54cc24c0c9..39aa9e66e757dacd93762da4aa3d5377baa86ef7 100644
|
| --- a/runtime/vm/stub_code_arm_test.cc
|
| +++ b/runtime/vm/stub_code_arm_test.cc
|
| @@ -36,16 +36,15 @@ static Function* CreateFunction(const char* name) {
|
|
|
| // Test calls to stub code which calls into the runtime.
|
| static void GenerateCallToCallRuntimeStub(Assembler* assembler,
|
| - int value1, int value2) {
|
| + int length) {
|
| const int argc = 2;
|
| - const Smi& smi1 = Smi::ZoneHandle(Smi::New(value1));
|
| - const Smi& smi2 = Smi::ZoneHandle(Smi::New(value2));
|
| + const Smi& smi_length = Smi::ZoneHandle(Smi::New(length));
|
| __ EnterDartFrame(0);
|
| __ PushObject(Object::null_object()); // Push Null object for return value.
|
| - __ PushObject(smi1); // Push argument 1 smi1.
|
| - __ PushObject(smi2); // Push argument 2 smi2.
|
| - ASSERT(kTestSmiSubRuntimeEntry.argument_count() == argc);
|
| - __ CallRuntime(kTestSmiSubRuntimeEntry, argc); // Call SmiSub runtime func.
|
| + __ PushObject(smi_length); // Push argument 1: length.
|
| + __ PushObject(Object::null_object()); // Push argument 2: type arguments.
|
| + ASSERT(kAllocateArrayRuntimeEntry.argument_count() == argc);
|
| + __ CallRuntime(kAllocateArrayRuntimeEntry, argc);
|
| __ AddImmediate(SP, argc * kWordSize);
|
| __ Pop(R0); // Pop return value from return slot.
|
| __ LeaveDartFrame();
|
| @@ -56,31 +55,33 @@ static void GenerateCallToCallRuntimeStub(Assembler* assembler,
|
| TEST_CASE(CallRuntimeStubCode) {
|
| extern const Function& RegisterFakeFunction(const char* name,
|
| const Code& code);
|
| - const int value1 = 10;
|
| - const int value2 = 20;
|
| + const int length = 10;
|
| const char* kName = "Test_CallRuntimeStubCode";
|
| Assembler _assembler_;
|
| - GenerateCallToCallRuntimeStub(&_assembler_, value1, value2);
|
| + GenerateCallToCallRuntimeStub(&_assembler_, length);
|
| const Code& code = Code::Handle(Code::FinalizeCode(
|
| *CreateFunction("Test_CallRuntimeStubCode"), &_assembler_));
|
| const Function& function = RegisterFakeFunction(kName, code);
|
| - Smi& result = Smi::Handle();
|
| + Array& result = Array::Handle();
|
| result ^= DartEntry::InvokeFunction(function, Object::empty_array());
|
| - EXPECT_EQ((value1 - value2), result.Value());
|
| + EXPECT_EQ(length, result.Length());
|
| }
|
|
|
|
|
| // Test calls to stub code which calls into a leaf runtime entry.
|
| static void GenerateCallToCallLeafRuntimeStub(Assembler* assembler,
|
| - int value1,
|
| - int value2) {
|
| - const Smi& smi1 = Smi::ZoneHandle(Smi::New(value1));
|
| - const Smi& smi2 = Smi::ZoneHandle(Smi::New(value2));
|
| + const char* value1,
|
| + const char* value2) {
|
| + const Bigint& bigint1 =
|
| + Bigint::ZoneHandle(Bigint::NewFromCString(value1, Heap::kOld));
|
| + const Bigint& bigint2 =
|
| + Bigint::ZoneHandle(Bigint::NewFromCString(value2, Heap::kOld));
|
| __ EnterDartFrame(0);
|
| __ ReserveAlignedFrameSpace(0);
|
| - __ LoadObject(R0, smi1); // Set up argument 1 smi1.
|
| - __ LoadObject(R1, smi2); // Set up argument 2 smi2.
|
| - __ CallRuntime(kTestLeafSmiAddRuntimeEntry, 2); // Call SmiAdd runtime func.
|
| + __ LoadObject(R0, bigint1); // Set up argument 1 bigint1.
|
| + __ LoadObject(R1, bigint2); // Set up argument 2 bigint2.
|
| + __ CallRuntime(kBigintCompareRuntimeEntry, 2);
|
| + __ SmiTag(R0);
|
| __ LeaveDartFrame();
|
| __ Ret(); // Return value is in R0.
|
| }
|
| @@ -89,8 +90,8 @@ static void GenerateCallToCallLeafRuntimeStub(Assembler* assembler,
|
| TEST_CASE(CallLeafRuntimeStubCode) {
|
| extern const Function& RegisterFakeFunction(const char* name,
|
| const Code& code);
|
| - const int value1 = 10;
|
| - const int value2 = 20;
|
| + const char* value1 = "0xAAABBCCDDAABBCCDD";
|
| + const char* value2 = "0xAABBCCDDAABBCCDD";
|
| const char* kName = "Test_CallLeafRuntimeStubCode";
|
| Assembler _assembler_;
|
| GenerateCallToCallLeafRuntimeStub(&_assembler_, value1, value2);
|
| @@ -99,7 +100,7 @@ TEST_CASE(CallLeafRuntimeStubCode) {
|
| const Function& function = RegisterFakeFunction(kName, code);
|
| Smi& result = Smi::Handle();
|
| result ^= DartEntry::InvokeFunction(function, Object::empty_array());
|
| - EXPECT_EQ((value1 + value2), result.Value());
|
| + EXPECT_EQ(1, result.Value());
|
| }
|
|
|
| } // namespace dart
|
|
|