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

runtime/vm/intermediate_language_mips.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_MIPS.
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 1147 matching lines @@
   __ addu(index.reg(), array, index.reg());
 
   if (IsExternal()) {
     element_address = Address(index.reg(), 0);
   } else {
     ASSERT(this->array()->definition()->representation() == kTagged);
     // If the data offset doesn't fit into the 18 bits we get for the addressing
     // mode, then we must load the offset into a register and add it to the
     // index.
     element_address = Address(index.reg(),
-        FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag);
+        Instance::DataOffsetFor(class_id()) - kHeapObjectTag);
   }
 
   if ((representation() == kUnboxedDouble) ||
       (representation() == kUnboxedMint) ||
       (representation() == kUnboxedFloat32x4) ||
       (representation() == kUnboxedInt32x4)) {
     DRegister result = locs()->out(0).fpu_reg();
     switch (class_id()) {
       case kTypedDataInt32ArrayCid:
         UNIMPLEMENTED();
         break;
       case kTypedDataUint32ArrayCid:
         UNIMPLEMENTED();
         break;
       case kTypedDataFloat32ArrayCid:
         // Load single precision float.
         __ lwc1(EvenFRegisterOf(result), element_address);
         break;
       case kTypedDataFloat64ArrayCid:
         __ LoadDFromOffset(result, index.reg(),
-            FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag);
+            Instance::DataOffsetFor(class_id()) - kHeapObjectTag);
         break;
       case kTypedDataInt32x4ArrayCid:
       case kTypedDataFloat32x4ArrayCid:
         UNIMPLEMENTED();
         break;
     }
     return;
   }
 
   Register result = locs()->out(0).reg();
@@ skipping 164 matching lines @@
     default:
       UNREACHABLE();
   }
   __ addu(index.reg(), array, index.reg());
 
   if (IsExternal()) {
     element_address = Address(index.reg(), 0);
   } else {
     ASSERT(this->array()->definition()->representation() == kTagged);
     element_address = Address(index.reg(),
-        FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag);
+        Instance::DataOffsetFor(class_id()) - kHeapObjectTag);
   }
 
   switch (class_id()) {
     case kArrayCid:
       if (ShouldEmitStoreBarrier()) {
         Register value = locs()->in(2).reg();
         __ StoreIntoObject(array, element_address, value);
       } else if (locs()->in(2).IsConstant()) {
         const Object& constant = locs()->in(2).constant();
         __ StoreIntoObjectNoBarrier(array, element_address, constant);
@@ skipping 63 matching lines @@
       }
       break;
     }
     case kTypedDataFloat32ArrayCid: {
       FRegister value = EvenFRegisterOf(locs()->in(2).fpu_reg());
       __ swc1(value, element_address);
       break;
     }
     case kTypedDataFloat64ArrayCid:
       __ StoreDToOffset(locs()->in(2).fpu_reg(), index.reg(),
-          FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag);
+          Instance::DataOffsetFor(class_id()) - kHeapObjectTag);
       break;
     case kTypedDataInt32x4ArrayCid:
     case kTypedDataFloat32x4ArrayCid:
       UNIMPLEMENTED();
       break;
     default:
       UNREACHABLE();
   }
 }
 
@@ skipping 3287 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(ArgumentCount());  // Discard arguments.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS