Revert bigint changes of r41817 until dart2js failures are understood and fixed.

runtime/vm/intrinsifier_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 810 matching lines @@
 }
 
 
 void Intrinsifier::Bigint_absAdd(Assembler* assembler) {
   // static void _absAdd(Uint32List digits, int used,
   //                     Uint32List a_digits, int a_used,
   //                     Uint32List r_digits)
 
   __ movq(RDI, Address(RSP, 5 * kWordSize));  // digits
   __ movq(R8, Address(RSP, 4 * kWordSize));  // used is Smi
-  __ addq(R8, Immediate(2));  // used > 0, Smi. R8 = used + 1, round up.
-  __ sarq(R8, Immediate(2));  // R8 = number of digit pairs to process.
+  __ SmiUntag(R8);  // used > 0.
   __ movq(RSI, Address(RSP, 3 * kWordSize));  // a_digits
   __ movq(RCX, Address(RSP, 2 * kWordSize));  // a_used is Smi
-  __ addq(RCX, Immediate(2));  // a_used > 0, Smi. R8 = a_used + 1, round up.
-  __ sarq(RCX, Immediate(2));  // R8 = number of digit pairs to process.
+  __ SmiUntag(RCX);  // a_used > 0.
   __ movq(RBX, Address(RSP, 1 * kWordSize));  // r_digits
 
   // Precompute 'used - a_used' now so that carry flag is not lost later.
   __ subq(R8, RCX);
   __ incq(R8);  // To account for the extra test between loops.
 
   __ xorq(RDX, RDX);  // RDX = 0, carry flag = 0.
   Label add_loop;
   __ Bind(&add_loop);
-  // Loop (a_used+1)/2 times, RCX > 0.
-  __ movq(RAX, FieldAddress(RDI, RDX, TIMES_8, TypedData::data_offset()));
-  __ adcq(RAX, FieldAddress(RSI, RDX, TIMES_8, TypedData::data_offset()));
-  __ movq(FieldAddress(RBX, RDX, TIMES_8, TypedData::data_offset()), RAX);
+  // Loop a_used times, RCX = a_used, RCX > 0.
+  __ movl(RAX, FieldAddress(RDI, RDX, TIMES_4, TypedData::data_offset()));
+  __ adcl(RAX, FieldAddress(RSI, RDX, TIMES_4, TypedData::data_offset()));
+  __ movl(FieldAddress(RBX, RDX, TIMES_4, TypedData::data_offset()), RAX);
   __ incq(RDX);  // Does not affect carry flag.
   __ decq(RCX);  // Does not affect carry flag.
   __ j(NOT_ZERO, &add_loop, Assembler::kNearJump);
 
   Label last_carry;
   __ decq(R8);  // Does not affect carry flag.
   __ j(ZERO, &last_carry, Assembler::kNearJump);  // If used - a_used == 0.
 
   Label carry_loop;
   __ Bind(&carry_loop);
-  // Loop (used+1)/2 - (a_used+1)/2 times, R8 > 0.
-  __ movq(RAX, FieldAddress(RDI, RDX, TIMES_8, TypedData::data_offset()));
-  __ adcq(RAX, Immediate(0));
-  __ movq(FieldAddress(RBX, RDX, TIMES_8, TypedData::data_offset()), RAX);
+  // Loop used - a_used times, R8 = used - a_used, R8 > 0.
+  __ movl(RAX, FieldAddress(RDI, RDX, TIMES_4, TypedData::data_offset()));
+  __ adcl(RAX, Immediate(0));
+  __ movl(FieldAddress(RBX, RDX, TIMES_4, TypedData::data_offset()), RAX);
   __ incq(RDX);  // Does not affect carry flag.
   __ decq(R8);  // Does not affect carry flag.
   __ j(NOT_ZERO, &carry_loop, Assembler::kNearJump);
 
   __ Bind(&last_carry);
-  __ movq(RAX, Immediate(0));
-  __ adcq(RAX, Immediate(0));
-  __ movq(FieldAddress(RBX, RDX, TIMES_8, TypedData::data_offset()), RAX);
+  __ movl(RAX, Immediate(0));
+  __ adcl(RAX, Immediate(0));
+  __ movl(FieldAddress(RBX, RDX, TIMES_4, TypedData::data_offset()), RAX);
 
   // Returning Object::null() is not required, since this method is private.
   __ ret();
 }
 
 
 void Intrinsifier::Bigint_absSub(Assembler* assembler) {
   // static void _absSub(Uint32List digits, int used,
   //                     Uint32List a_digits, int a_used,
   //                     Uint32List r_digits)
 
   __ movq(RDI, Address(RSP, 5 * kWordSize));  // digits
   __ movq(R8, Address(RSP, 4 * kWordSize));  // used is Smi
-  __ addq(R8, Immediate(2));  // used > 0, Smi. R8 = used + 1, round up.
-  __ sarq(R8, Immediate(2));  // R8 = number of digit pairs to process.
+  __ SmiUntag(R8);  // used > 0.
   __ movq(RSI, Address(RSP, 3 * kWordSize));  // a_digits
   __ movq(RCX, Address(RSP, 2 * kWordSize));  // a_used is Smi
-  __ addq(RCX, Immediate(2));  // a_used > 0, Smi. R8 = a_used + 1, round up.
-  __ sarq(RCX, Immediate(2));  // R8 = number of digit pairs to process.
+  __ SmiUntag(RCX);  // a_used > 0.
   __ movq(RBX, Address(RSP, 1 * kWordSize));  // r_digits
 
   // Precompute 'used - a_used' now so that carry flag is not lost later.
   __ subq(R8, RCX);
   __ incq(R8);  // To account for the extra test between loops.
 
   __ xorq(RDX, RDX);  // RDX = 0, carry flag = 0.
   Label sub_loop;
   __ Bind(&sub_loop);
-  // Loop (a_used+1)/2 times, RCX > 0.
-  __ movq(RAX, FieldAddress(RDI, RDX, TIMES_8, TypedData::data_offset()));
-  __ sbbq(RAX, FieldAddress(RSI, RDX, TIMES_8, TypedData::data_offset()));
-  __ movq(FieldAddress(RBX, RDX, TIMES_8, TypedData::data_offset()), RAX);
+  // Loop a_used times, RCX = a_used, RCX > 0.
+  __ movl(RAX, FieldAddress(RDI, RDX, TIMES_4, TypedData::data_offset()));
+  __ sbbl(RAX, FieldAddress(RSI, RDX, TIMES_4, TypedData::data_offset()));
+  __ movl(FieldAddress(RBX, RDX, TIMES_4, TypedData::data_offset()), RAX);
   __ incq(RDX);  // Does not affect carry flag.
   __ decq(RCX);  // Does not affect carry flag.
   __ j(NOT_ZERO, &sub_loop, Assembler::kNearJump);
 
   Label done;
   __ decq(R8);  // Does not affect carry flag.
   __ j(ZERO, &done, Assembler::kNearJump);  // If used - a_used == 0.
 
   Label carry_loop;
   __ Bind(&carry_loop);
-  // Loop (used+1)/2 - (a_used+1)/2 times, R8 > 0.
-  __ movq(RAX, FieldAddress(RDI, RDX, TIMES_8, TypedData::data_offset()));
-  __ sbbq(RAX, Immediate(0));
-  __ movq(FieldAddress(RBX, RDX, TIMES_8, TypedData::data_offset()), RAX);
+  // Loop used - a_used times, R8 = used - a_used, R8 > 0.
+  __ movl(RAX, FieldAddress(RDI, RDX, TIMES_4, TypedData::data_offset()));
+  __ sbbl(RAX, Immediate(0));
+  __ movl(FieldAddress(RBX, RDX, TIMES_4, TypedData::data_offset()), RAX);
   __ incq(RDX);  // Does not affect carry flag.
   __ decq(R8);  // Does not affect carry flag.
   __ j(NOT_ZERO, &carry_loop, Assembler::kNearJump);
 
   __ Bind(&done);
   // Returning Object::null() is not required, since this method is private.
   __ ret();
 }
 
 
@@ skipping 1032 matching lines @@
   // Set return value to Isolate::current_tag_.
   __ movq(RAX, Address(RBX, Isolate::current_tag_offset()));
   __ ret();
 }
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64