Modify Bigint _mulAdd, _sqrAdd, _estQuotientDigit, and Montgomery _mulMod

runtime/vm/intrinsifier_arm.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"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 1009 matching lines @@
   // Returning Object::null() is not required, since this method is private.
   __ Ret();
 }
 
 
 void Intrinsifier::Bigint_mulAdd(Assembler* assembler) {
   if (TargetCPUFeatures::arm_version() != ARMv7) {
     return;
   }
   // Pseudo code:
-  // static void _mulAdd(Uint32List x_digits, int xi,
-  //                     Uint32List m_digits, int i,
-  //                     Uint32List a_digits, int j, int n) {
+  // static int _mulAdd(Uint32List x_digits, int xi,
+  //                    Uint32List m_digits, int i,
+  //                    Uint32List a_digits, int j, int n) {
   //   uint32_t x = x_digits[xi >> 1];  // xi is Smi.
   //   if (x == 0 || n == 0) {
-  //     return;
+  //     return 1;
   //   }
   //   uint32_t* mip = &m_digits[i >> 1];  // i is Smi.
   //   uint32_t* ajp = &a_digits[j >> 1];  // j is Smi.
   //   uint32_t c = 0;
   //   SmiUntag(n);
   //   do {
   //     uint32_t mi = *mip++;
   //     uint32_t aj = *ajp;
   //     uint64_t t = x*mi + aj + c;  // 32-bit * 32-bit -> 64-bit.
   //     *ajp++ = low32(t);
   //     c = high32(t);
   //   } while (--n > 0);
   //   while (c != 0) {
   //     uint64_t t = *ajp + c;
   //     *ajp++ = low32(t);
   //     c = high32(t);  // c == 0 or 1.
   //   }
+  //   return 1;
   // }
 
   Label done;
   // R3 = x, no_op if x == 0
   __ ldrd(R0, Address(SP, 5 * kWordSize));  // R0 = xi as Smi, R1 = x_digits.
   __ add(R1, R1, Operand(R0, LSL, 1));
   __ ldr(R3, FieldAddress(R1, TypedData::data_offset()));
   __ tst(R3, Operand(R3));
   __ b(&done, EQ);
 
@@ skipping 51 matching lines @@
   __ b(&done, CC);
 
   Label propagate_carry_loop;
   __ Bind(&propagate_carry_loop);
   __ ldr(R0, Address(R5, 0));
   __ adds(R0, R0, Operand(1));
   __ str(R0, Address(R5, Bigint::kBytesPerDigit, Address::PostIndex));
   __ b(&propagate_carry_loop, CS);
 
   __ Bind(&done);
-  // Returning Object::null() is not required, since this method is private.
+  __ mov(R0, Operand(Smi::RawValue(1)));  // One digit processed.
   __ Ret();
 }
 
 
 void Intrinsifier::Bigint_sqrAdd(Assembler* assembler) {
   if (TargetCPUFeatures::arm_version() != ARMv7) {
     return;
   }
   // Pseudo code:
-  // static void _sqrAdd(Uint32List x_digits, int i,
-  //                     Uint32List a_digits, int used) {
+  // static int _sqrAdd(Uint32List x_digits, int i,
+  //                    Uint32List a_digits, int used) {
   //   uint32_t* xip = &x_digits[i >> 1];  // i is Smi.
   //   uint32_t x = *xip++;
-  //   if (x == 0) return;
+  //   if (x == 0) return 1;
   //   uint32_t* ajp = &a_digits[i];  // j == 2*i, i is Smi.
   //   uint32_t aj = *ajp;
   //   uint64_t t = x*x + aj;
   //   *ajp++ = low32(t);
   //   uint64_t c = high32(t);
   //   int n = ((used - i) >> 1) - 1;  // used and i are Smi.
   //   while (--n >= 0) {
   //     uint32_t xi = *xip++;
   //     uint32_t aj = *ajp;
   //     uint96_t t = 2*x*xi + aj + c;  // 2-bit * 32-bit * 32-bit -> 65-bit.
   //     *ajp++ = low32(t);
   //     c = high64(t);  // 33-bit.
   //   }
   //   uint32_t aj = *ajp;
   //   uint64_t t = aj + c;  // 32-bit + 33-bit -> 34-bit.
   //   *ajp++ = low32(t);
   //   *ajp = high32(t);
+  //   return 1;
   // }
 
   // R4 = xip = &x_digits[i >> 1]
   __ ldrd(R2, Address(SP, 2 * kWordSize));  // R2 = i as Smi, R3 = x_digits
   __ add(R3, R3, Operand(R2, LSL, 1));
   __ add(R4, R3, Operand(TypedData::data_offset() - kHeapObjectTag));
 
   // R3 = x = *xip++, return if x == 0
   Label x_zero;
   __ ldr(R3, Address(R4, Bigint::kBytesPerDigit, Address::PostIndex));
@@ skipping 64 matching lines @@
 
   // uint64_t t = aj + c
   __ adds(R6, R6, Operand(R0));
   __ adc(R7, R7, Operand(0));
 
   // *ajp = low32(t) = R6
   // *(ajp + 1) = high32(t) = R7
   __ strd(R6, Address(R5, 0));
 
   __ Bind(&x_zero);
-  // Returning Object::null() is not required, since this method is private.
+  __ mov(R0, Operand(Smi::RawValue(1)));  // One digit processed.
   __ Ret();
 }
 
 
 void Intrinsifier::Bigint_estQuotientDigit(Assembler* assembler) {
   // No unsigned 64-bit / 32-bit divide instruction.
 }
 
 
 void Intrinsifier::Montgomery_mulMod(Assembler* assembler) {
   if (TargetCPUFeatures::arm_version() != ARMv7) {
     return;
   }
   // Pseudo code:
-  // static void _mulMod(Uint32List args, Uint32List digits, int i) {
-  //   uint32_t rho = args[_RHO];  // _RHO == 0.
+  // static int _mulMod(Uint32List args, Uint32List digits, int i) {
+  //   uint32_t rho = args[_RHO];  // _RHO == 2.
   //   uint32_t d = digits[i >> 1];  // i is Smi.
   //   uint64_t t = rho*d;
-  //   args[_MU] = t mod DIGIT_BASE;  // _MU == 1.
+  //   args[_MU] = t mod DIGIT_BASE;  // _MU == 4.
+  //   return 1;
   // }
 
   // R4 = args
   __ ldr(R4, Address(SP, 2 * kWordSize));  // args
 
-  // R3 = rho = args[0]
-  __ ldr(R3, FieldAddress(R4, TypedData::data_offset()));
+  // R3 = rho = args[2]
+  __ ldr(R3, FieldAddress(R4,
+                          TypedData::data_offset() + 2*Bigint::kBytesPerDigit));
 
   // R2 = digits[i >> 1]
   __ ldrd(R0, Address(SP, 0 * kWordSize));  // R0 = i as Smi, R1 = digits
   __ add(R1, R1, Operand(R0, LSL, 1));
   __ ldr(R2, FieldAddress(R1, TypedData::data_offset()));
 
   // R1:R0 = t = rho*d
   __ umull(R0, R1, R2, R3);
 
-  // args[1] = t mod DIGIT_BASE = low32(t)
+  // args[4] = t mod DIGIT_BASE = low32(t)
   __ str(R0,
-         FieldAddress(R4, TypedData::data_offset() + Bigint::kBytesPerDigit));
+         FieldAddress(R4, TypedData::data_offset() + 4*Bigint::kBytesPerDigit));
 
-  // Returning Object::null() is not required, since this method is private.
+  __ mov(R0, Operand(Smi::RawValue(1)));  // One digit processed.
   __ Ret();
 }
 
 
 // Check if the last argument is a double, jump to label 'is_smi' if smi
 // (easy to convert to double), otherwise jump to label 'not_double_smi',
 // Returns the last argument in R0.
 static void TestLastArgumentIsDouble(Assembler* assembler,
                                      Label* is_smi,
                                      Label* not_double_smi) {
@@ skipping 763 matching lines @@
   Isolate* isolate = Isolate::Current();
   __ LoadImmediate(R1, reinterpret_cast<uword>(isolate));
   // Set return value to Isolate::current_tag_.
   __ ldr(R0, Address(R1, Isolate::current_tag_offset()));
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM