Modify Bigint _mulAdd, _sqrAdd, _estQuotientDigit, and Montgomery _mulMod

runtime/vm/intrinsifier_x64.cc

Index: runtime/vm/intrinsifier_x64.cc
===================================================================
--- runtime/vm/intrinsifier_x64.cc	(revision 42566)
+++ runtime/vm/intrinsifier_x64.cc	(working copy)
@@ -929,12 +929,12 @@
 
 void Intrinsifier::Bigint_mulAdd(Assembler* assembler) {
   // 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.
@@ -952,6 +952,7 @@
   //     *ajp++ = low32(t);
   //     c = high32(t);  // c == 0 or 1.
   //   }
+  //   return 1;
   // }
 
   Label done;
@@ -1027,7 +1028,7 @@
   __ j(CARRY, &propagate_carry_loop, Assembler::kNearJump);
 
   __ Bind(&done);
-  // Returning Object::null() is not required, since this method is private.
+  __ movq(RAX, Immediate(Smi::RawValue(1)));  // One digit processed.
   __ ret();
 }
 
@@ -1034,11 +1035,11 @@
 
 void Intrinsifier::Bigint_sqrAdd(Assembler* assembler) {
   // 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;
@@ -1056,6 +1057,7 @@
   //   uint64_t t = aj + c;  // 32-bit + 33-bit -> 34-bit.
   //   *ajp++ = low32(t);
   //   *ajp = high32(t);
+  //   return 1;
   // }
 
   // RDI = xip = &x_digits[i >> 1]
@@ -1145,7 +1147,7 @@
   __ movl(Address(RSI, Bigint::kBytesPerDigit), R13);
 
   __ Bind(&x_zero);
-  // Returning Object::null() is not required, since this method is private.
+  __ movq(RAX, Immediate(Smi::RawValue(1)));  // One digit processed.
   __ ret();
 }
 
@@ -1152,8 +1154,8 @@
 
 void Intrinsifier::Bigint_estQuotientDigit(Assembler* assembler) {
   // Pseudo code:
-  // static void _estQuotientDigit(Uint32List args, Uint32List digits, int i) {
-  //   uint32_t yt = args[_YT];  // _YT == 0.
+  // static int _estQuotientDigit(Uint32List args, Uint32List digits, int i) {
+  //   uint32_t yt = args[_YT];  // _YT == 1.
   //   uint32_t* dp = &digits[i >> 1];  // i is Smi.
   //   uint32_t dh = dp[0];  // dh == digits[i >> 1].
   //   uint32_t qd;
@@ -1163,14 +1165,16 @@
   //     dl = dp[-1];  // dl == digits[(i - 1) >> 1].
   //     qd = dh:dl / yt;  // No overflow possible, because dh < yt.
   //   }
-  //   args[_QD] = qd;  // _QD == 1;
+  //   args[_QD] = qd;  // _QD == 2.
+  //   return 1;
   // }
 
   // RDI = args
   __ movq(RDI, Address(RSP, 3 * kWordSize));  // args
 
-  // RCX = yt = args[0]
-  __ movl(RCX, FieldAddress(RDI, TypedData::data_offset()));
+  // RCX = yt = args[1]
+  __ movl(RCX,
+          FieldAddress(RDI, TypedData::data_offset() + Bigint::kBytesPerDigit));
 
   // RBX = dp = &digits[i >> 1]
   __ movq(RBX, Address(RSP, 2 * kWordSize));  // digits
@@ -1195,11 +1199,12 @@
   __ divl(RCX);
 
   __ Bind(&return_qd);
-  // args[1] = qd
-  __ movl(FieldAddress(RDI, TypedData::data_offset() + Bigint::kBytesPerDigit),
+  // args[2] = qd
+  __ movl(FieldAddress(RDI,
+                       TypedData::data_offset() + 2*Bigint::kBytesPerDigit),
           RAX);
 
-  // Returning Object::null() is not required, since this method is private.
+  __ movq(RAX, Immediate(Smi::RawValue(1)));  // One digit processed.
   __ ret();
 }
 
@@ -1206,18 +1211,21 @@
 
 void Intrinsifier::Montgomery_mulMod(Assembler* assembler) {
   // 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;
   // }
 
   // RDI = args
   __ movq(RDI, Address(RSP, 3 * kWordSize));  // args
 
-  // RCX = rho = args[0]
-  __ movl(RCX, FieldAddress(RDI, TypedData::data_offset()));
+  // RCX = rho = args[2]
+  __ movl(RCX,
+          FieldAddress(RDI,
+                       TypedData::data_offset() + 2*Bigint::kBytesPerDigit));
 
   // RAX = digits[i >> 1]
   __ movq(RBX, Address(RSP, 2 * kWordSize));  // digits
@@ -1227,11 +1235,12 @@
   // RDX:RAX = t = rho*d
   __ mull(RCX);
 
-  // args[1] = t mod DIGIT_BASE = low32(t)
-  __ movl(FieldAddress(RDI, TypedData::data_offset() + Bigint::kBytesPerDigit),
+  // args[4] = t mod DIGIT_BASE = low32(t)
+  __ movl(FieldAddress(RDI,
+                       TypedData::data_offset() + 4*Bigint::kBytesPerDigit),
           RAX);
 
-  // Returning Object::null() is not required, since this method is private.
+  __ movq(RAX, Immediate(Smi::RawValue(1)));  // One digit processed.
   __ ret();
 }