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

runtime/vm/intermediate_language_ia32.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_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 1025 matching lines @@
   }
   return locs;
 }
 
 
 void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register array = locs()->in(0).reg();
   Location index = locs()->in(1);
 
   Address element_address(kNoRegister, 0);
-  if (IsExternal()) {
-    element_address = index.IsRegister()
-        ? compiler->ExternalElementAddressForRegIndex(
-            index_scale(), array, index.reg())
-        : compiler->ExternalElementAddressForIntIndex(
-            index_scale(), array, Smi::Cast(index.constant()).Value());
-  } else {
-    ASSERT(this->array()->definition()->representation() == kTagged);
-    element_address = index.IsRegister()
-        ? compiler->ElementAddressForRegIndex(
-            class_id(), index_scale(), array, index.reg())
-        : compiler->ElementAddressForIntIndex(
-            class_id(), index_scale(), array,
-            Smi::Cast(index.constant()).Value());
-  }
+  element_address = index.IsRegister()
+      ? compiler->ElementAddressForRegIndex(
+          true,  // Load.
+          IsExternal(), class_id(), index_scale(), array, index.reg())
+      : compiler->ElementAddressForIntIndex(
+          true,  // Load.
+          IsExternal(), class_id(), index_scale(), array,
+          Smi::Cast(index.constant()).Value());
 
   if ((representation() == kUnboxedDouble) ||
       (representation() == kUnboxedFloat32x4) ||
       (representation() == kUnboxedInt32x4) ||
       (representation() == kUnboxedFloat64x2)) {
     XmmRegister result = locs()->out(0).fpu_reg();
     if ((index_scale() == 1) && index.IsRegister()) {
       __ SmiUntag(index.reg());
     }
     switch (class_id()) {
@@ skipping 199 matching lines @@
   }
   return locs;
 }
 
 
 void StoreIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register array = locs()->in(0).reg();
   Location index = locs()->in(1);
 
   Address element_address(kNoRegister, 0);
-  if (IsExternal()) {
-    element_address = index.IsRegister()
-        ? compiler->ExternalElementAddressForRegIndex(
-            index_scale(), array, index.reg())
-        : compiler->ExternalElementAddressForIntIndex(
-            index_scale(), array, Smi::Cast(index.constant()).Value());
-  } else {
-    ASSERT(this->array()->definition()->representation() == kTagged);
-    element_address = index.IsRegister()
-        ? compiler->ElementAddressForRegIndex(
-          class_id(), index_scale(), array, index.reg())
-        : compiler->ElementAddressForIntIndex(
-          class_id(), index_scale(), array,
+  element_address = index.IsRegister()
+      ? compiler->ElementAddressForRegIndex(
+          false,  // Store.
+          IsExternal(), class_id(), index_scale(), array, index.reg())
+      : compiler->ElementAddressForIntIndex(
+          false,  // Store.
+          IsExternal(), class_id(), index_scale(), array,
           Smi::Cast(index.constant()).Value());
-  }
 
   if ((index_scale() == 1) && index.IsRegister()) {
     __ SmiUntag(index.reg());
   }
   switch (class_id()) {
     case kArrayCid:
       if (ShouldEmitStoreBarrier()) {
         Register value = locs()->in(2).reg();
         __ StoreIntoObject(array, element_address, value);
       } else if (locs()->in(2).IsConstant()) {
@@ skipping 4936 matching lines @@
                          PcDescriptors::kOther,
                          locs());
   __ Drop(ArgumentCount());  // Discard arguments.
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_IA32