Revert 12534006

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 436 matching lines @@
   /* RDI: requested array length argument. */                                  \
   __ testq(RDI, Immediate(kSmiTagSize));                                       \
   __ j(NOT_ZERO, &fall_through);                                               \
   __ cmpq(RDI, Immediate(0));                                                  \
   __ j(LESS, &fall_through);                                                   \
   __ SmiUntag(RDI);                                                            \
   /* Check for maximum allowed length. */                                      \
   /* RDI: untagged array length. */                                            \
   __ cmpq(RDI, Immediate(max_len));                                            \
   __ j(GREATER, &fall_through);                                                \
-  /* Special case for scaling by 16. */                                        \
-  if (scale_factor == TIMES_16) {                                              \
-    /* double length of array. */                                              \
-    __ addq(RDI, RDI);                                                         \
-    /* only scale by 8. */                                                     \
-    scale_factor = TIMES_8;                                                    \
-  }                                                                            \
   const intptr_t fixed_size = sizeof(Raw##type_name) + kObjectAlignment - 1;   \
   __ leaq(RDI, Address(RDI, scale_factor, fixed_size));                        \
   __ andq(RDI, Immediate(-kObjectAlignment));                                  \
   Heap* heap = Isolate::Current()->heap();                                     \
                                                                                \
   __ movq(RAX, Immediate(heap->TopAddress()));                                 \
   __ movq(RAX, Address(RAX, 0));                                               \
   __ movq(RCX, RAX);                                                           \
                                                                                \
   /* RDI: allocation size. */                                                  \
@@ skipping 56 matching lines @@
   __ j(ABOVE_EQUAL, &done, Assembler::kNearJump);                              \
   __ movq(Address(RDI, 0), RBX);                                               \
   __ addq(RDI, Immediate(kWordSize));                                          \
   __ jmp(&init_loop, Assembler::kNearJump);                                    \
   __ Bind(&done);                                                              \
                                                                                \
   __ ret();                                                                    \
   __ Bind(&fall_through);                                                      \
 
 
-#define SCALARLIST_ALLOCATOR(clazz, scale_)                                    \
+#define SCALARLIST_ALLOCATOR(clazz, scale)                                     \
 bool Intrinsifier::clazz##_new(Assembler* assembler) {                         \
-  ScaleFactor scale = scale_;                                                  \
   TYPED_ARRAY_ALLOCATION(clazz, k##clazz##Cid, clazz::kMaxElements, scale);    \
   return false;                                                                \
 }                                                                              \
 bool Intrinsifier::clazz##_factory(Assembler* assembler) {                     \
-  ScaleFactor scale = scale_;                                                  \
   TYPED_ARRAY_ALLOCATION(clazz, k##clazz##Cid, clazz::kMaxElements, scale);    \
   return false;                                                                \
 }
 
 
 SCALARLIST_ALLOCATOR(Int8Array, TIMES_1)
 SCALARLIST_ALLOCATOR(Uint8Array, TIMES_1)
 SCALARLIST_ALLOCATOR(Uint8ClampedArray, TIMES_1)
 SCALARLIST_ALLOCATOR(Int16Array, TIMES_2)
 SCALARLIST_ALLOCATOR(Uint16Array, TIMES_2)
@@ skipping 61 matching lines @@
   return true;
 }
 
 
 static ScaleFactor GetScaleFactor(intptr_t size) {
   switch (size) {
     case 1: return TIMES_1;
     case 2: return TIMES_2;
     case 4: return TIMES_4;
     case 8: return TIMES_8;
-    case 16: return TIMES_16;
   }
   UNREACHABLE();
   return static_cast<ScaleFactor>(0);
 };
 
 
 #define TYPEDDATA_ALLOCATOR(clazz)                                             \
 bool Intrinsifier::TypedData_##clazz##_new(Assembler* assembler) {             \
   intptr_t size = TypedData::ElementSizeInBytes(kTypedData##clazz##Cid);       \
   intptr_t max_len = TypedData::MaxElements(kTypedData##clazz##Cid);           \
@@ skipping 828 matching lines @@
   __ ret();
   return true;
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64