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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/intrinsifier_arm.cc

Issue 1343373003: Revert "VM: New calling convention for generated code." (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 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 | « runtime/vm/intermediate_language_x64.cc ('k') | runtime/vm/intrinsifier_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intrinsifier_arm.cc
diff --git a/runtime/vm/intrinsifier_arm.cc b/runtime/vm/intrinsifier_arm.cc
index 9b6260e67c1aa8538b2e997a326aa9ffe1a05c84..7d3421d5489b1751dbdf2a5c8eb015a43325f2e8 100644
--- a/runtime/vm/intrinsifier_arm.cc
+++ b/runtime/vm/intrinsifier_arm.cc
@@ -549,7 +549,7 @@ void Intrinsifier::Integer_shl(Assembler* assembler) {
ASSERT(kSmiTagShift == 1);
ASSERT(kSmiTag == 0);
Label fall_through;
- __ Push(R10);
+
TestBothArgumentsSmis(assembler, &fall_through);
__ CompareImmediate(R0, Smi::RawValue(Smi::kBits));
__ b(&fall_through, HI);
@@ -577,10 +577,10 @@ void Intrinsifier::Integer_shl(Assembler* assembler) {
__ LoadImmediate(R7, 1);
__ mov(R7, Operand(R7, LSL, R0)); // R7 <- 1 << R0
__ sub(R7, R7, Operand(1)); // R7 <- R7 - 1
- __ rsb(R10, R0, Operand(32)); // R10 <- 32 - R0
- __ mov(R7, Operand(R7, LSL, R10)); // R7 <- R7 << R10
+ __ rsb(R9, R0, Operand(32)); // R9 <- 32 - R0
+ __ mov(R7, Operand(R7, LSL, R9)); // R7 <- R7 << R9
__ and_(R7, R1, Operand(R7)); // R7 <- R7 & R1
- __ mov(R7, Operand(R7, LSR, R10)); // R7 <- R7 >> R10
+ __ mov(R7, Operand(R7, LSR, R9)); // R7 <- R7 >> R9
// Now R7 has the bits that fall off of R1 on a left shift.
__ mov(R1, Operand(R1, LSL, R0)); // R1 gets the low bits.
@@ -591,11 +591,8 @@ void Intrinsifier::Integer_shl(Assembler* assembler) {
__ str(R1, FieldAddress(R0, Mint::value_offset()));
__ str(R7, FieldAddress(R0, Mint::value_offset() + kWordSize));
- __ Pop(R10);
__ Ret();
__ Bind(&fall_through);
- ASSERT(CODE_REG == R10);
- __ Pop(R10);
}
@@ -821,12 +818,12 @@ void Intrinsifier::Bigint_lsh(Assembler* assembler) {
__ add(R6, R3, Operand(TypedData::data_offset() - kHeapObjectTag));
// R7 = &x_digits[x_used]
__ add(R7, R6, Operand(R2, LSL, 1));
- // R10 = &r_digits[1]
- __ add(R10, R4, Operand(TypedData::data_offset() - kHeapObjectTag +
+ // R9 = &r_digits[1]
+ __ add(R9, R4, Operand(TypedData::data_offset() - kHeapObjectTag +
Bigint::kBytesPerDigit));
- // R10 = &r_digits[x_used + n ~/ _DIGIT_BITS + 1]
+ // R9 = &r_digits[x_used + n ~/ _DIGIT_BITS + 1]
__ add(R0, R0, Operand(R2, ASR, 1));
- __ add(R10, R10, Operand(R0, LSL, 2));
+ __ add(R9, R9, Operand(R0, LSL, 2));
// R3 = n % _DIGIT_BITS
__ and_(R3, R5, Operand(31));
// R2 = 32 - R3
@@ -836,11 +833,11 @@ void Intrinsifier::Bigint_lsh(Assembler* assembler) {
__ Bind(&loop);
__ ldr(R0, Address(R7, -Bigint::kBytesPerDigit, Address::PreIndex));
__ orr(R1, R1, Operand(R0, LSR, R2));
- __ str(R1, Address(R10, -Bigint::kBytesPerDigit, Address::PreIndex));
+ __ str(R1, Address(R9, -Bigint::kBytesPerDigit, Address::PreIndex));
__ mov(R1, Operand(R0, LSL, R3));
__ teq(R7, Operand(R6));
__ b(&loop, NE);
- __ str(R1, Address(R10, -Bigint::kBytesPerDigit, Address::PreIndex));
+ __ str(R1, Address(R9, -Bigint::kBytesPerDigit, Address::PreIndex));
// Returning Object::null() is not required, since this method is private.
__ Ret();
}
@@ -857,15 +854,15 @@ void Intrinsifier::Bigint_rsh(Assembler* assembler) {
__ SmiUntag(R5);
// R0 = n ~/ _DIGIT_BITS
__ Asr(R0, R5, Operand(5));
- // R10 = &r_digits[0]
- __ add(R10, R4, Operand(TypedData::data_offset() - kHeapObjectTag));
+ // R9 = &r_digits[0]
+ __ add(R9, R4, Operand(TypedData::data_offset() - kHeapObjectTag));
// R7 = &x_digits[n ~/ _DIGIT_BITS]
__ add(R7, R3, Operand(TypedData::data_offset() - kHeapObjectTag));
__ add(R7, R7, Operand(R0, LSL, 2));
// R6 = &r_digits[x_used - n ~/ _DIGIT_BITS - 1]
__ add(R0, R0, Operand(1));
__ rsb(R0, R0, Operand(R2, ASR, 1));
- __ add(R6, R10, Operand(R0, LSL, 2));
+ __ add(R6, R9, Operand(R0, LSL, 2));
// R3 = n % _DIGIT_BITS
__ and_(R3, R5, Operand(31));
// R2 = 32 - R3
@@ -879,12 +876,12 @@ void Intrinsifier::Bigint_rsh(Assembler* assembler) {
__ Bind(&loop);
__ ldr(R0, Address(R7, Bigint::kBytesPerDigit, Address::PostIndex));
__ orr(R1, R1, Operand(R0, LSL, R2));
- __ str(R1, Address(R10, Bigint::kBytesPerDigit, Address::PostIndex));
+ __ str(R1, Address(R9, Bigint::kBytesPerDigit, Address::PostIndex));
__ mov(R1, Operand(R0, LSR, R3));
__ Bind(&loop_entry);
- __ teq(R10, Operand(R6));
+ __ teq(R9, Operand(R6));
__ b(&loop, NE);
- __ str(R1, Address(R10, 0));
+ __ str(R1, Address(R9, 0));
// Returning Object::null() is not required, since this method is private.
__ Ret();
}
@@ -913,8 +910,8 @@ void Intrinsifier::Bigint_absAdd(Assembler* assembler) {
// R7 = &digits[a_used >> 1], a_used is Smi.
__ add(R7, R3, Operand(R4, LSL, 1));
- // R10 = &digits[used >> 1], used is Smi.
- __ add(R10, R3, Operand(R2, LSL, 1));
+ // R9 = &digits[used >> 1], used is Smi.
+ __ add(R9, R3, Operand(R2, LSL, 1));
__ adds(R0, R0, Operand(0)); // carry flag = 0
Label add_loop;
@@ -928,7 +925,7 @@ void Intrinsifier::Bigint_absAdd(Assembler* assembler) {
__ b(&add_loop, NE);
Label last_carry;
- __ teq(R3, Operand(R10)); // Does not affect carry flag.
+ __ teq(R3, Operand(R9)); // Does not affect carry flag.
__ b(&last_carry, EQ); // If used - a_used == 0.
Label carry_loop;
@@ -936,7 +933,7 @@ void Intrinsifier::Bigint_absAdd(Assembler* assembler) {
// Loop used - a_used times, used - a_used > 0.
__ ldr(R0, Address(R3, Bigint::kBytesPerDigit, Address::PostIndex));
__ adcs(R0, R0, Operand(0));
- __ teq(R3, Operand(R10)); // Does not affect carry flag.
+ __ teq(R3, Operand(R9)); // Does not affect carry flag.
__ str(R0, Address(R6, Bigint::kBytesPerDigit, Address::PostIndex));
__ b(&carry_loop, NE);
@@ -973,8 +970,8 @@ void Intrinsifier::Bigint_absSub(Assembler* assembler) {
// R7 = &digits[a_used >> 1], a_used is Smi.
__ add(R7, R3, Operand(R4, LSL, 1));
- // R10 = &digits[used >> 1], used is Smi.
- __ add(R10, R3, Operand(R2, LSL, 1));
+ // R9 = &digits[used >> 1], used is Smi.
+ __ add(R9, R3, Operand(R2, LSL, 1));
__ subs(R0, R0, Operand(0)); // carry flag = 1
Label sub_loop;
@@ -988,7 +985,7 @@ void Intrinsifier::Bigint_absSub(Assembler* assembler) {
__ b(&sub_loop, NE);
Label done;
- __ teq(R3, Operand(R10)); // Does not affect carry flag.
+ __ teq(R3, Operand(R9)); // Does not affect carry flag.
__ b(&done, EQ); // If used - a_used == 0.
Label carry_loop;
@@ -996,7 +993,7 @@ void Intrinsifier::Bigint_absSub(Assembler* assembler) {
// Loop used - a_used times, used - a_used > 0.
__ ldr(R0, Address(R3, Bigint::kBytesPerDigit, Address::PostIndex));
__ sbcs(R0, R0, Operand(0));
- __ teq(R3, Operand(R10)); // Does not affect carry flag.
+ __ teq(R3, Operand(R9)); // Does not affect carry flag.
__ str(R0, Address(R6, Bigint::kBytesPerDigit, Address::PostIndex));
__ b(&carry_loop, NE);
@@ -1165,9 +1162,9 @@ void Intrinsifier::Bigint_sqrAdd(Assembler* assembler) {
// int n = used - i - 1; while (--n >= 0) ...
__ ldr(R0, Address(SP, 0 * kWordSize)); // used is Smi
- __ sub(R10, R0, Operand(R2));
+ __ sub(R9, R0, Operand(R2));
__ mov(R0, Operand(2)); // n = used - i - 2; if (n >= 0) ... while (--n >= 0)
- __ rsbs(R10, R0, Operand(R10, ASR, kSmiTagSize));
+ __ rsbs(R9, R0, Operand(R9, ASR, kSmiTagSize));
Label loop, done;
__ b(&done, MI);
@@ -1178,7 +1175,7 @@ void Intrinsifier::Bigint_sqrAdd(Assembler* assembler) {
// ajp: R5
// c: R7:R6
// t: R2:R1:R0 (not live at loop entry)
- // n: R10
+ // n: R9
// uint32_t xi = *xip++
__ ldr(R2, Address(R4, Bigint::kBytesPerDigit, Address::PostIndex));
@@ -1201,7 +1198,7 @@ void Intrinsifier::Bigint_sqrAdd(Assembler* assembler) {
__ str(R0, Address(R5, Bigint::kBytesPerDigit, Address::PostIndex));
// while (--n >= 0)
- __ subs(R10, R10, Operand(1)); // --n
+ __ subs(R9, R9, Operand(1)); // --n
__ b(&loop, PL);
__ Bind(&done);
@@ -2016,7 +2013,6 @@ void Intrinsifier::JSRegExp_ExecuteMatch(Assembler* assembler) {
__ eor(R5, R5, Operand(R5));
// Tail-call the function.
- __ ldr(CODE_REG, FieldAddress(R0, Function::code_offset()));
__ ldr(R1, FieldAddress(R0, Function::entry_point_offset()));
__ bx(R1);
}
« no previous file with comments | « runtime/vm/intermediate_language_x64.cc ('k') | runtime/vm/intrinsifier_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698