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

runtime/vm/intermediate_language_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/intermediate_language.h"
 
 #include "vm/cpu.h"
@@ skipping 1185 matching lines @@
       case 16:
         __ add(idx, array, ShifterOperand(idx, LSL, 3));
         break;
       default:
         // Case 2 is not reachable: We don't have unboxed 16-bit sized loads.
         UNREACHABLE();
     }
     if (!IsExternal()) {
       ASSERT(this->array()->definition()->representation() == kTagged);
       __ AddImmediate(idx,
-          FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag);
+                      Instance::DataOffsetFor(class_id()) - kHeapObjectTag);
     }
     Address element_address(idx);
     const QRegister result = locs()->out(0).fpu_reg();
     const DRegister dresult0 = EvenDRegisterOf(result);
     switch (class_id()) {
       case kTypedDataFloat32ArrayCid:
         // Load single precision float.
         // vldrs does not support indexed addressing.
         __ vldrs(EvenSRegisterOf(dresult0), element_address);
         break;
@@ skipping 15 matching lines @@
   const Register array = locs()->in(0).reg();
   Location index = locs()->in(1);
   ASSERT(index.IsRegister());  // TODO(regis): Revisit.
   Address element_address(kNoRegister, 0);
   // Note that index is expected smi-tagged, (i.e, times 2) for all arrays
   // with index scale factor > 1. E.g., for Uint8Array and OneByteString the
   // index is expected to be untagged before accessing.
   ASSERT(kSmiTagShift == 1);
   const intptr_t offset = IsExternal()
       ? 0
-      : FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag;
+      : Instance::DataOffsetFor(class_id()) - kHeapObjectTag;
   switch (index_scale()) {
     case 1: {
       __ add(index.reg(), array, ShifterOperand(index.reg(), ASR, kSmiTagSize));
       element_address = Address(index.reg(), offset);
       break;
     }
     case 2: {
       // No scaling needed, since index is a smi.
       if (!IsExternal()) {
         __ AddImmediate(index.reg(), index.reg(),
-            FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag);
+            Instance::DataOffsetFor(class_id()) - kHeapObjectTag);
         element_address = Address(array, index.reg(), LSL, 0);
       } else {
         element_address = Address(array, index.reg(), LSL, 0);
       }
       break;
     }
     case 4: {
       __ add(index.reg(), array, ShifterOperand(index.reg(), LSL, 1));
       element_address = Address(index.reg(), offset);
       break;
@@ skipping 199 matching lines @@
       case 16:
         __ add(idx, array, ShifterOperand(idx, LSL, 3));
         break;
       default:
         // Case 2 is not reachable: We don't have unboxed 16-bit sized loads.
         UNREACHABLE();
     }
     if (!IsExternal()) {
       ASSERT(this->array()->definition()->representation() == kTagged);
       __ AddImmediate(idx,
-          FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag);
+                      Instance::DataOffsetFor(class_id()) - kHeapObjectTag);
     }
     switch (class_id()) {
       case kTypedDataFloat32ArrayCid: {
         const SRegister value_reg =
             EvenSRegisterOf(EvenDRegisterOf(value.fpu_reg()));
         __ StoreSToOffset(value_reg, idx, 0);
         break;
       }
       case kTypedDataFloat64ArrayCid: {
         const DRegister value_reg = EvenDRegisterOf(value.fpu_reg());
@@ skipping 17 matching lines @@
   Location index = locs()->in(1);
 
   Address element_address(kNoRegister, 0);
   ASSERT(index.IsRegister());  // TODO(regis): Revisit.
   // Note that index is expected smi-tagged, (i.e, times 2) for all arrays
   // with index scale factor > 1. E.g., for Uint8Array and OneByteString the
   // index is expected to be untagged before accessing.
   ASSERT(kSmiTagShift == 1);
   const intptr_t offset = IsExternal()
       ? 0
-      : FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag;
+      : Instance::DataOffsetFor(class_id()) - kHeapObjectTag;
   switch (index_scale()) {
     case 1: {
       __ add(index.reg(), array, ShifterOperand(index.reg(), ASR, kSmiTagSize));
       element_address = Address(index.reg(), offset);
       break;
     }
     case 2: {
       // No scaling needed, since index is a smi.
       if (!IsExternal()) {
         __ AddImmediate(index.reg(), index.reg(), offset);
@@ skipping 4916 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(ArgumentCount());  // Discard arguments.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM