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

runtime/vm/flow_graph_compiler_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/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
@@ skipping 1557 matching lines @@
     __ Drop(argument_count);
     if (!is_last_check) {
       assembler()->jmp(&match_found);
     }
     assembler()->Bind(&next_test);
   }
   assembler()->Bind(&match_found);
 }
 
 
-Address FlowGraphCompiler::ElementAddressForIntIndex(intptr_t cid,
+Address FlowGraphCompiler::ElementAddressForIntIndex(bool is_load,
+                                                     bool is_external,
+                                                     intptr_t cid,
                                                      intptr_t index_scale,
                                                      Register array,
                                                      intptr_t index) {
-  const int64_t disp =
-      static_cast<int64_t>(index) * index_scale + DataOffsetFor(cid);
-  ASSERT(Utils::IsInt(32, disp));
-  return FieldAddress(array, static_cast<int32_t>(disp));
+  if (is_external) {
+    return Address(array, index * index_scale);
+  } else {
+    const int64_t disp =
+        static_cast<int64_t>(index) * index_scale + DataOffsetFor(cid);
+    ASSERT(Utils::IsInt(32, disp));
+    return FieldAddress(array, static_cast<int32_t>(disp));
+  }
 }
 
 
 static ScaleFactor ToScaleFactor(intptr_t index_scale) {
   // 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);
   switch (index_scale) {
     case 1: return TIMES_1;
     case 2: return TIMES_1;
     case 4: return TIMES_2;
     case 8: return TIMES_4;
     case 16: return TIMES_8;
     default:
       UNREACHABLE();
       return TIMES_1;
   }
 }
 
 
-Address FlowGraphCompiler::ElementAddressForRegIndex(intptr_t cid,
+Address FlowGraphCompiler::ElementAddressForRegIndex(bool is_load,
+                                                     bool is_external,
+                                                     intptr_t cid,
                                                      intptr_t index_scale,
                                                      Register array,
                                                      Register index) {
-  return FieldAddress(array,
-                      index,
-                      ToScaleFactor(index_scale),
-                      DataOffsetFor(cid));
-}
-
-
-Address FlowGraphCompiler::ExternalElementAddressForIntIndex(
-    intptr_t index_scale,
-    Register array,
-    intptr_t index) {
-  return Address(array, index * index_scale);
-}
-
-
-Address FlowGraphCompiler::ExternalElementAddressForRegIndex(
-    intptr_t index_scale,
-    Register array,
-    Register index) {
-  return Address(array, index, ToScaleFactor(index_scale), 0);
+  if (is_external) {
+    return Address(array, index, ToScaleFactor(index_scale), 0);
+  } else {
+    return FieldAddress(array,
+                        index,
+                        ToScaleFactor(index_scale),
+                        DataOffsetFor(cid));
+  }
 }
 
 
 #undef __
 #define __ compiler_->assembler()->
 
 
 void ParallelMoveResolver::EmitMove(int index) {
   MoveOperands* move = moves_[index];
   const Location source = move->src();
@@ skipping 200 matching lines @@
   __ movups(reg, Address(RSP, 0));
   __ AddImmediate(RSP, Immediate(kFpuRegisterSize), PP);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64