Add support for WritableRegister policy in the register allocator.

runtime/vm/intermediate_language_x64.cc

 // Copyright (c) 2012, 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/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 914 matching lines @@
 
     default:
       UNREACHABLE();
       break;
   }
 }
 
 
 LocationSummary* StoreIndexedInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 3;
+  const intptr_t kNumTemps =
+      (receiver_type() == kGrowableObjectArrayCid) ? 1 : 0;
+  LocationSummary* locs =
+      new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
+  locs->set_in(0, Location::RequiresRegister());
+  locs->set_in(1, Location::RequiresRegister());
+  locs->set_in(2, value()->NeedsStoreBuffer() ? Location::WritableRegister()
+                                              : Location::RequiresRegister());
   if (receiver_type() == kGrowableObjectArrayCid) {
-    const intptr_t kNumTemps = 1;
-    LocationSummary* locs =
-        new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
-    locs->set_in(0, Location::RequiresRegister());
-    locs->set_in(1, Location::RequiresRegister());
-    locs->set_in(2, Location::RequiresRegister());
     locs->set_temp(0, Location::RequiresRegister());
-    return locs;
-  } else  {
-    ASSERT(receiver_type() == kArrayCid);
-    return LocationSummary::Make(kNumInputs,
-                                 Location::NoLocation(),
-                                 LocationSummary::kNoCall);
   }
+  return locs;
 }
 
 
 void StoreIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register receiver = locs()->in(0).reg();
   Register index = locs()->in(1).reg();
   Register value = locs()->in(2).reg();
 
   switch (receiver_type()) {
     case kArrayCid:
     case kImmutableArrayCid:
       // Note that index is Smi, i.e, times 4.
       ASSERT(kSmiTagShift == 1);
       if (this->value()->NeedsStoreBuffer()) {
-        __ StoreIntoObject(receiver,
+        __ StoreIntoObject(
+            receiver,
             FieldAddress(receiver, index, TIMES_4, sizeof(RawArray)),
             value);
       } else {
         __ StoreIntoObjectNoBarrier(receiver,
             FieldAddress(receiver, index, TIMES_4, sizeof(RawArray)),
             value);
       }
       break;
 
     case kGrowableObjectArrayCid: {
       Register temp = locs()->temp(0).reg();
       __ movq(temp, FieldAddress(receiver, GrowableObjectArray::data_offset()));
       // Note that index is Smi, i.e, times 4.
       ASSERT(kSmiTagShift == 1);
       if (this->value()->NeedsStoreBuffer()) {
-        __ StoreIntoObject(temp,
+        __ StoreIntoObject(
+            temp,
             FieldAddress(temp, index, TIMES_4, sizeof(RawArray)),
             value);
       } else {
         __ StoreIntoObjectNoBarrier(temp,
             FieldAddress(temp, index, TIMES_4, sizeof(RawArray)),
             value);
       }
       break;
     }
 
@@ skipping 21 matching lines @@
   __ movq(result_reg, FieldAddress(instance_reg, field().Offset()));
 }
 
 
 LocationSummary* StoreInstanceFieldInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 2;
   const intptr_t num_temps = 0;
   LocationSummary* summary =
       new LocationSummary(kNumInputs, num_temps, LocationSummary::kNoCall);
   summary->set_in(0, Location::RequiresRegister());
-  summary->set_in(1, Location::RequiresRegister());
+  summary->set_in(1,
+      value()->NeedsStoreBuffer() ? Location::WritableRegister()
+                                  : Location::RequiresRegister());
   return summary;
 }
 
 
 void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register instance_reg = locs()->in(0).reg();
   Register value_reg = locs()->in(1).reg();
   if (this->value()->NeedsStoreBuffer()) {
     __ StoreIntoObject(instance_reg,
-        FieldAddress(instance_reg, field().Offset()), value_reg);
+                       FieldAddress(instance_reg, field().Offset()),
+                       value_reg);
   } else {
     __ StoreIntoObjectNoBarrier(instance_reg,
         FieldAddress(instance_reg, field().Offset()), value_reg);
   }
 }
 
 
 LocationSummary* LoadStaticFieldInstr::MakeLocationSummary() const {
   return LocationSummary::Make(0,
                                Location::RequiresRegister(),
                                LocationSummary::kNoCall);
 }
 
 
 void LoadStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register result = locs()->out().reg();
   __ LoadObject(result, field());
   __ movq(result, FieldAddress(result, Field::value_offset()));
 }
 
 
 LocationSummary* StoreStaticFieldInstr::MakeLocationSummary() const {
   LocationSummary* locs = new LocationSummary(1, 1, LocationSummary::kNoCall);
-  locs->set_in(0, Location::RequiresRegister());
+  locs->set_in(0, value()->NeedsStoreBuffer() ? Location::WritableRegister()
+                                              : Location::RequiresRegister());
   locs->set_temp(0, Location::RequiresRegister());
-  locs->set_out(is_used() ? Location::SameAsFirstInput()
-                          : Location::NoLocation());
   return locs;
 }
 
 
 void StoreStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register value = locs()->in(0).reg();
   Register temp = locs()->temp(0).reg();
-  ASSERT(!is_used() || (locs()->out().reg() == value));
 
   __ LoadObject(temp, field());
   if (this->value()->NeedsStoreBuffer()) {
-    __ StoreIntoObject(temp, FieldAddress(temp, Field::value_offset()), value);
+    __ StoreIntoObject(temp,

[Ivan Posva, 2012/09/11 11:57:30]

ditto

[Vyacheslav Egorov (Google), 2012/09/11 12:18:05]

Done.

+                       FieldAddress(temp, Field::value_offset()),
+                       value);
   } else {
     __ StoreIntoObjectNoBarrier(
         temp, FieldAddress(temp, Field::value_offset()), value);
   }
 }
 
 
 LocationSummary* InstanceOfInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 3;
   const intptr_t kNumTemps = 0;
@@ skipping 1231 matching lines @@
     __ j(ABOVE_EQUAL, deopt);
   }
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64