Make LoadIndexedInstr for Uint32List use kUnboxedUint32 representation

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 995 matching lines @@
     case kExternalTypedDataUint8ArrayCid:
     case kExternalTypedDataUint8ClampedArrayCid:
     case kTypedDataInt16ArrayCid:
     case kTypedDataUint16ArrayCid:
     case kOneByteStringCid:
     case kTwoByteStringCid:
       return CompileType::FromCid(kSmiCid);
 
     case kTypedDataInt32ArrayCid:
     case kTypedDataUint32ArrayCid:
-      return Typed32BitIsSmi() ? CompileType::FromCid(kSmiCid)
-                               : CompileType::FromCid(kMintCid);
+      return CompileType::Int();
 
     default:
       UNIMPLEMENTED();
       return CompileType::Dynamic();
   }
 }
 
 
 Representation LoadIndexedInstr::representation() const {
   switch (class_id_) {
     case kArrayCid:
     case kImmutableArrayCid:
     case kTypedDataInt8ArrayCid:
     case kTypedDataUint8ArrayCid:
     case kTypedDataUint8ClampedArrayCid:
     case kExternalTypedDataUint8ArrayCid:
     case kExternalTypedDataUint8ClampedArrayCid:
     case kTypedDataInt16ArrayCid:
     case kTypedDataUint16ArrayCid:
     case kOneByteStringCid:
     case kTwoByteStringCid:
       return kTagged;
     case kTypedDataInt32ArrayCid:
+      return kUnboxedInt32;
     case kTypedDataUint32ArrayCid:
-      return Typed32BitIsSmi() ? kTagged : kUnboxedMint;
+      return kUnboxedUint32;
     case kTypedDataFloat32ArrayCid:
     case kTypedDataFloat64ArrayCid:
       return kUnboxedDouble;
     case kTypedDataFloat32x4ArrayCid:
       return kUnboxedFloat32x4;
     case kTypedDataInt32x4ArrayCid:
       return kUnboxedInt32x4;
     case kTypedDataFloat64x2ArrayCid:
       return kUnboxedFloat64x2;
     default:
@@ skipping 18 matching lines @@
     // element sizes > 1).
     locs->set_in(1, (index_scale() == 1)
                         ? Location::WritableRegister()
                         : Location::RequiresRegister());
   }
   if ((representation() == kUnboxedDouble) ||
       (representation() == kUnboxedFloat32x4) ||
       (representation() == kUnboxedInt32x4) ||
       (representation() == kUnboxedFloat64x2)) {
     locs->set_out(0, Location::RequiresFpuRegister());
-  } else if (representation() == kUnboxedMint) {
-    if (class_id() == kTypedDataInt32ArrayCid) {
-      locs->set_out(0, Location::Pair(Location::RegisterLocation(EAX),
-                                      Location::RegisterLocation(EDX)));
-    } else {
-      ASSERT(class_id() == kTypedDataUint32ArrayCid);
-      locs->set_out(0, Location::Pair(Location::RequiresRegister(),
-                                      Location::RequiresRegister()));
-    }
+  } else if (representation() == kUnboxedUint32) {
+    ASSERT(class_id() == kTypedDataUint32ArrayCid);
+    locs->set_out(0, Location::RequiresRegister());
+  } else if (representation() == kUnboxedInt32) {
+    ASSERT(class_id() == kTypedDataInt32ArrayCid);
+    locs->set_out(0, Location::RequiresRegister());
   } else {
     ASSERT(representation() == kTagged);
     locs->set_out(0, Location::RequiresRegister());
   }
   return locs;
 }
 
 
 void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   // The array register points to the backing store for external arrays.
@@ skipping 26 matching lines @@
       case kTypedDataFloat32x4ArrayCid:
       case kTypedDataFloat64x2ArrayCid:
         __ movups(result, element_address);
         break;
       default:
         UNREACHABLE();
     }
     return;
   }
 
-  if (representation() == kUnboxedMint) {
-    ASSERT(locs()->out(0).IsPairLocation());
-    PairLocation* result_pair = locs()->out(0).AsPairLocation();
-    Register result1 = result_pair->At(0).reg();
-    Register result2 = result_pair->At(1).reg();
+  if (representation() == kUnboxedUint32) {
+    ASSERT(class_id() == kTypedDataUint32ArrayCid);
+    Register result = locs()->out(0).reg();
     if ((index_scale() == 1) && index.IsRegister()) {
       __ SmiUntag(index.reg());
     }
-    switch (class_id()) {
-      case kTypedDataInt32ArrayCid:
-        ASSERT(result1 == EAX);
-        ASSERT(result2 == EDX);
-        __ movl(result1, element_address);
-        __ cdq();
-        break;
-      case kTypedDataUint32ArrayCid:
-        __ movl(result1, element_address);
-        __ xorl(result2, result2);
-        break;
-      default:
-        UNREACHABLE();
-    }
+    __ movl(result, element_address);
     return;
   }
 
+  if (representation() == kUnboxedInt32) {
+    ASSERT(class_id() == kTypedDataInt32ArrayCid);
+    Register result = locs()->out(0).reg();
+    if ((index_scale() == 1) && index.IsRegister()) {
+      __ SmiUntag(index.reg());
+    }
+    __ movl(result, element_address);
+    return;
+  }
+

[Vyacheslav Egorov (Google), 2014/09/30 16:52:52]

I suggest to make it look more like on ARM64 to reduce duplication.

if (representation() == kUnboxedInt32 ||
    representation() == kUnboxedUint32) {
  // Add assertion here in form of the switch if you feel it's necessary.
  Register result = locs()->out(0).reg();
  if ((index_scale() == 1) && index.IsRegister()) {
    __ SmiUntag(index.reg());
  }
  __ movl(result, element_address);
}

[Cutch, 2014/09/30 17:16:21]

Done.

   ASSERT(representation() == kTagged);
 
   Register result = locs()->out(0).reg();
   if ((index_scale() == 1) && index.IsRegister()) {
     __ SmiUntag(index.reg());
   }
   switch (class_id()) {
     case kTypedDataInt8ArrayCid:
       ASSERT(index_scale() == 1);
       __ movsxb(result, element_address);
@@ skipping 5614 matching lines @@
   __ movl(EDX, Immediate(kInvalidObjectPointer));
   __ movl(EDX, Immediate(kInvalidObjectPointer));
 #endif
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_IA32