Last cross-platform cleanup in preparation of improved ARM code for indexed

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 1132 matching lines @@
   ASSERT(!state_field.IsNull());
   const Field& random_A_field = Field::ZoneHandle(
       random_class.LookupStaticField(Symbols::_A()));
   ASSERT(!random_A_field.IsNull());
   ASSERT(random_A_field.is_const());
   const Instance& a_value = Instance::Handle(random_A_field.value());
   const int64_t a_int_value = Integer::Cast(a_value).AsInt64Value();
   __ movq(RAX, Address(RSP, + 1 * kWordSize));  // Receiver.
   __ movq(RBX, FieldAddress(RAX, state_field.Offset()));  // Field '_state'.
   // Addresses of _state[0] and _state[1].
-  const intptr_t index_scale =
-      FlowGraphCompiler::ElementSizeFor(kTypedDataUint32ArrayCid);
-  const intptr_t offset =
-      FlowGraphCompiler::DataOffsetFor(kTypedDataUint32ArrayCid);
-  Address addr_0 = FieldAddress(RBX, 0 * index_scale + offset);
-  Address addr_1 = FieldAddress(RBX, 1 * index_scale + offset);
+  const intptr_t scale = Instance::ElementSizeFor(kTypedDataUint32ArrayCid);
+  const intptr_t offset = Instance::DataOffsetFor(kTypedDataUint32ArrayCid);
+  Address addr_0 = FieldAddress(RBX, 0 * scale + offset);
+  Address addr_1 = FieldAddress(RBX, 1 * scale + offset);
   __ movq(RAX, Immediate(a_int_value));
   __ movl(RCX, addr_0);
   __ imulq(RCX, RAX);
   __ movl(RDX, addr_1);
   __ addq(RDX, RCX);
   __ movl(addr_0, RDX);
   __ shrq(RDX, Immediate(32));
   __ movl(addr_1, RDX);
   __ ret();
 }
@@ skipping 409 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