Refactor unboxed fields in preparation of reusable SIMD boxes

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/dart_entry.h"
@@ skipping 1565 matching lines @@
         UNREACHABLE();
       }
     }
   }
   __ Bind(&ok);
 }
 
 
 class StoreInstanceFieldSlowPath : public SlowPathCode {
  public:
-  explicit StoreInstanceFieldSlowPath(StoreInstanceFieldInstr* instruction)
-      : instruction_(instruction) { }
+  explicit StoreInstanceFieldSlowPath(const Class& cls,

[srdjan, 2014/01/30 23:58:39]

Remove explicit.
I would put cls as second argument.

[Cutch, 2014/01/31 00:18:49]

Done.

+                                      StoreInstanceFieldInstr* instruction)
+      : instruction_(instruction), cls_(cls) { }
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
     __ Comment("StoreInstanceFieldSlowPath");
     __ Bind(entry_label());
-    const Class& double_class = compiler->double_class();
     const Code& stub =
-        Code::Handle(StubCode::GetAllocationStubForClass(double_class));
-    const ExternalLabel label(double_class.ToCString(), stub.EntryPoint());
+        Code::Handle(StubCode::GetAllocationStubForClass(cls_));
+    const ExternalLabel label(cls_.ToCString(), stub.EntryPoint());
 
     LocationSummary* locs = instruction_->locs();
     locs->live_registers()->Remove(locs->out());
 
     compiler->SaveLiveRegisters(locs);
     compiler->GenerateCall(Scanner::kNoSourcePos,  // No token position.
                            &label,
                            PcDescriptors::kOther,
                            locs);
     __ MoveRegister(locs->temp(0).reg(), R0);
     compiler->RestoreLiveRegisters(locs);
 
     __ b(exit_label());
   }
 
  private:
   StoreInstanceFieldInstr* instruction_;
+  const Class& cls_;
 };
 
 
 LocationSummary* StoreInstanceFieldInstr::MakeLocationSummary(bool opt) const {
   const intptr_t kNumInputs = 2;
   const intptr_t kNumTemps = 0;
   LocationSummary* summary =
       new LocationSummary(kNumInputs, kNumTemps,
           (field().guarded_cid() == kIllegalCid) || (is_initialization_)
           ? LocationSummary::kCallOnSlowPath
@@ skipping 23 matching lines @@
 
 void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Label skip_store;
 
   Register instance_reg = locs()->in(0).reg();
 
   if (IsUnboxedStore() && compiler->is_optimizing()) {
     DRegister value = EvenDRegisterOf(locs()->in(1).fpu_reg());
     Register temp = locs()->temp(0).reg();
     Register temp2 = locs()->temp(1).reg();
+    const intptr_t cid = field().UnboxedFieldCid();
 
     if (is_initialization_) {
+      const Class* cls = NULL;
+      switch (cid) {
+        case kDoubleCid:
+          cls = &compiler->double_class();
+          break;
+        // TODO(johnmccutchan): Add kFloat32x4Cid here.
+        default:
+          UNREACHABLE();
+      }
       StoreInstanceFieldSlowPath* slow_path =
-          new StoreInstanceFieldSlowPath(this);
+          new StoreInstanceFieldSlowPath(*cls, this);
       compiler->AddSlowPathCode(slow_path);
-      __ TryAllocate(compiler->double_class(),
+      __ TryAllocate(*cls,
                      slow_path->entry_label(),
                      temp,
                      temp2);
       __ Bind(slow_path->exit_label());
       __ MoveRegister(temp2, temp);
       __ StoreIntoObject(instance_reg,
                          FieldAddress(instance_reg, field().Offset()),
                          temp2);
     } else {
       __ ldr(temp, FieldAddress(instance_reg, field().Offset()));
     }
-    __ StoreDToOffset(value, temp, Double::value_offset() - kHeapObjectTag);
+    switch (cid) {
+      case kDoubleCid:
+      __ StoreDToOffset(value, temp, Double::value_offset() - kHeapObjectTag);
+      // TODO(johnmccutchan): Add kFloat32x4Cid here.
+      break;
+      default:
+        UNREACHABLE();
+    }
+
     return;
   }
 
   if (IsPotentialUnboxedStore()) {
     Register value_reg = locs()->in(1).reg();
     Register temp = locs()->temp(0).reg();
     Register temp2 = locs()->temp(1).reg();
     DRegister fpu_temp = EvenDRegisterOf(locs()->temp(2).fpu_reg());
 
-    Label store_pointer, copy_payload;
+    Label store_pointer;
+    Label copy_double;
+    Label store_double;
+
     __ LoadObject(temp, Field::ZoneHandle(field().raw()));
-    __ ldr(temp2, FieldAddress(temp, Field::guarded_cid_offset()));
-    __ CompareImmediate(temp2, kDoubleCid);
-    __ b(&store_pointer, NE);
+
     __ ldr(temp2, FieldAddress(temp, Field::is_nullable_offset()));
     __ CompareImmediate(temp2, kNullCid);
     __ b(&store_pointer, EQ);
+
     __ ldrb(temp2, FieldAddress(temp, Field::kind_bits_offset()));
     __ tst(temp2, ShifterOperand(1 << Field::kUnboxingCandidateBit));
     __ b(&store_pointer, EQ);
 
+    __ ldr(temp2, FieldAddress(temp, Field::guarded_cid_offset()));
+    __ CompareImmediate(temp2, kDoubleCid);
+    __ b(&store_double, EQ);
+
+    // Fall through.
+    __ b(&store_pointer);
+
+    __ Bind(&store_double);
+
     __ ldr(temp, FieldAddress(instance_reg, field().Offset()));
     __ CompareImmediate(temp,
                         reinterpret_cast<intptr_t>(Object::null()));
-    __ b(&copy_payload, NE);
+    __ b(&copy_double, NE);
 
     StoreInstanceFieldSlowPath* slow_path =
-        new StoreInstanceFieldSlowPath(this);
+        new StoreInstanceFieldSlowPath(compiler->double_class(), this);
     compiler->AddSlowPathCode(slow_path);
 
     if (!compiler->is_optimizing()) {
       locs()->live_registers()->Add(locs()->in(0));
       locs()->live_registers()->Add(locs()->in(1));
     }
 
     __ TryAllocate(compiler->double_class(),
                    slow_path->entry_label(),
                    temp,
                    temp2);
     __ Bind(slow_path->exit_label());
     __ MoveRegister(temp2, temp);
     __ StoreIntoObject(instance_reg,
                        FieldAddress(instance_reg, field().Offset()),
                        temp2);
-    __ Bind(&copy_payload);
+    __ Bind(&copy_double);
     __ LoadDFromOffset(fpu_temp,
                        value_reg,
                        Double::value_offset() - kHeapObjectTag);
     __ StoreDToOffset(fpu_temp, temp, Double::value_offset() - kHeapObjectTag);
     __ b(&skip_store);
     __ Bind(&store_pointer);
   }
 
   if (ShouldEmitStoreBarrier()) {
     Register value_reg = locs()->in(1).reg();
@@ skipping 189 matching lines @@
   return locs;
 }
 
 
 void LoadFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register instance_reg = locs()->in(0).reg();
   if (IsUnboxedLoad() && compiler->is_optimizing()) {
     DRegister result = EvenDRegisterOf(locs()->out().fpu_reg());
     Register temp = locs()->temp(0).reg();
     __ ldr(temp, FieldAddress(instance_reg, offset_in_bytes()));
-    __ LoadDFromOffset(result, temp, Double::value_offset() - kHeapObjectTag);
+    intptr_t cid = field()->UnboxedFieldCid();
+    switch (cid) {
+      case kDoubleCid:
+        __ LoadDFromOffset(result, temp,
+                           Double::value_offset() - kHeapObjectTag);
+      break;
+      // TODO(johnmccutchan): Add Float32x4 path here.
+      default:
+        UNREACHABLE();
+    }
     return;
   }
 
   Label done;
   Register result_reg = locs()->out().reg();
   if (IsPotentialUnboxedLoad()) {
     Register temp = locs()->temp(1).reg();
     DRegister value = EvenDRegisterOf(locs()->temp(0).fpu_reg());
 
     Label load_pointer;
+    Label load_double;
+
     __ LoadObject(result_reg, Field::ZoneHandle(field()->raw()));
 
     FieldAddress field_cid_operand(result_reg, Field::guarded_cid_offset());
     FieldAddress field_nullability_operand(result_reg,
                                            Field::is_nullable_offset());
 
-    __ ldr(temp, field_cid_operand);
-    __ CompareImmediate(temp, kDoubleCid);
-    __ b(&load_pointer, NE);
-
     __ ldr(temp, field_nullability_operand);
     __ CompareImmediate(temp, kNullCid);
     __ b(&load_pointer, EQ);
 
+    __ ldr(temp, field_cid_operand);
+    __ CompareImmediate(temp, kDoubleCid);
+    __ b(&load_double, EQ);
+
+    // Fall through.
+    __ b(&load_pointer);
+
+    __ Bind(&load_double);
+
     BoxDoubleSlowPath* slow_path = new BoxDoubleSlowPath(this);
     compiler->AddSlowPathCode(slow_path);
 
     if (!compiler->is_optimizing()) {
       locs()->live_registers()->Add(locs()->in(0));
     }
 
     __ TryAllocate(compiler->double_class(),
                    slow_path->entry_label(),
                    result_reg,
                    temp);
     __ Bind(slow_path->exit_label());
     __ ldr(temp, FieldAddress(instance_reg, offset_in_bytes()));
     __ LoadDFromOffset(value, temp, Double::value_offset() - kHeapObjectTag);
     __ StoreDToOffset(value,
                       result_reg,
                       Double::value_offset() - kHeapObjectTag);
     __ b(&done);
+
+    // TODO(johnmccutchan): Add Float32x4 path here.
+
     __ Bind(&load_pointer);
   }
   __ LoadFromOffset(kWord, result_reg,
                     instance_reg, offset_in_bytes() - kHeapObjectTag);
   __ Bind(&done);
 }
 
 
 LocationSummary* InstantiateTypeInstr::MakeLocationSummary(bool opt) const {
   const intptr_t kNumInputs = 1;
@@ skipping 2856 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM