Adjust location summaries to match expectations of new register allocator.

runtime/vm/intermediate_language_ia32.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_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 150 matching lines @@
                                                  kNumTemps,
                                                  LocationSummary::kCall);
   summary->set_in(0, Location::RegisterLocation(EAX));  // Value.
   summary->set_in(1, Location::RegisterLocation(ECX));  // Instantiator.
   summary->set_in(2, Location::RegisterLocation(EDX));  // Type arguments.
   summary->set_out(Location::RegisterLocation(EAX));
   return summary;
 }
 
 
+LocationSummary* AssertBooleanComp::MakeLocationSummary() const {
+  const intptr_t kNumInputs = 1;
+  const intptr_t kNumTemps = 0;
+  LocationSummary* locs = new LocationSummary(kNumInputs,
+                                              kNumTemps,
+                                              LocationSummary::kCall);
+  locs->set_in(0, Location::RegisterLocation(EAX));
+  locs->set_out(Location::RegisterLocation(EAX));
+  return locs;
+}
+
+
 void AssertBooleanComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register obj = locs()->in(0).reg();
   Register result = locs()->out().reg();
 
   // Check that the type of the value is allowed in conditional context.
   // Call the runtime if the object is not bool::true or bool::false.
   Label done;
   __ CompareObject(obj, compiler->bool_true());
   __ j(EQUAL, &done, Assembler::kNearJump);
   __ CompareObject(obj, compiler->bool_false());
@@ skipping 39 matching lines @@
     locs->set_in(1, Location::RequiresRegister());
     locs->set_temp(0, Location::RequiresRegister());
     locs->set_out(Location::RequiresRegister());
     return locs;
   }
   if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
     const intptr_t kNumTemps = 1;
     LocationSummary* locs = new LocationSummary(kNumInputs,
                                                 kNumTemps,
                                                 LocationSummary::kCall);
-    locs->set_in(0, Location::RequiresRegister());
-    locs->set_in(1, Location::RequiresRegister());
-    locs->set_temp(0, Location::RequiresRegister());
+    locs->set_in(0, Location::RegisterLocation(ECX));
+    locs->set_in(1, Location::RegisterLocation(EDX));
+    locs->set_temp(0, Location::RegisterLocation(EBX));
     locs->set_out(Location::RegisterLocation(EAX));
     return locs;
   }
   const intptr_t kNumTemps = 0;
   LocationSummary* locs = new LocationSummary(kNumInputs,
                                               kNumTemps,
                                               LocationSummary::kCall);
-  locs->set_in(0, Location::RequiresRegister());
-  locs->set_in(1, Location::RequiresRegister());
+  locs->set_in(0, Location::RegisterLocation(ECX));
+  locs->set_in(1, Location::RegisterLocation(EDX));
   locs->set_out(Location::RegisterLocation(EAX));
   return locs;
 }
 
 
 // Optional integer arguments can often be null. Null is not collected
 // by IC data. TODO(srdjan): Shall we collect null classes in ICData as well?
 static void EmitSmiEqualityCompare(FlowGraphCompiler* compiler,
                                    EqualityCompareComp* comp) {
   Register left = comp->locs()->in(0).reg();
@@ skipping 873 matching lines @@
   __ leal(temp_reg, FieldAddress(result_reg, Array::data_offset()));
   for (int i = ElementCount() - 1; i >= 0; --i) {
     ASSERT(ElementAt(i)->IsUse());
     __ popl(Address(temp_reg, i * kWordSize));
   }
 }
 
 
 LocationSummary*
     AllocateObjectWithBoundsCheckComp::MakeLocationSummary() const {
-  return LocationSummary::Make(2,
-                               Location::RequiresRegister(),
-                               LocationSummary::kCall);
+  const intptr_t kNumInputs = 2;
+  const intptr_t kNumTemps = 0;
+  LocationSummary* locs = new LocationSummary(kNumInputs,
+                                              kNumTemps,
+                                              LocationSummary::kCall);
+  locs->set_in(0, Location::RegisterLocation(EAX));
+  locs->set_in(1, Location::RegisterLocation(ECX));
+  locs->set_out(Location::RegisterLocation(EAX));
+  return locs;
 }
 
 
 void AllocateObjectWithBoundsCheckComp::EmitNativeCode(
     FlowGraphCompiler* compiler) {
   const Class& cls = Class::ZoneHandle(constructor().owner());
   Register type_arguments = locs()->in(0).reg();
   Register instantiator_type_arguments = locs()->in(1).reg();
   Register result = locs()->out().reg();
 
@@ skipping 38 matching lines @@
   __ movl(result_reg, FieldAddress(instance_reg, offset_in_bytes()));
 }
 
 
 LocationSummary* InstantiateTypeArgumentsComp::MakeLocationSummary() const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 1;
   LocationSummary* locs = new LocationSummary(kNumInputs,
                                               kNumTemps,
                                               LocationSummary::kCall);
-  locs->set_in(0, Location::RequiresRegister());
-  locs->set_temp(0, Location::RequiresRegister());
-  locs->set_out(Location::SameAsFirstInput());
+  locs->set_in(0, Location::RegisterLocation(EAX));
+  locs->set_temp(0, Location::RegisterLocation(ECX));
+  locs->set_out(Location::RegisterLocation(EAX));
   return locs;
 }
 
 
 void InstantiateTypeArgumentsComp::EmitNativeCode(
     FlowGraphCompiler* compiler) {
   Register instantiator_reg = locs()->in(0).reg();
   Register temp = locs()->temp(0).reg();
   Register result_reg = locs()->out().reg();
 
@@ skipping 269 matching lines @@
   if (operands_type() == kDoubleOperands) {
     return MakeCallSummary();  // Calls into a stub for allocation.
   }
 
   if (operands_type() == kMintOperands) {
     ASSERT(op_kind() == Token::kBIT_AND);
     const intptr_t kNumTemps = 1;
     LocationSummary* summary =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
     summary->set_in(0, Location::RegisterLocation(EAX));
-    summary->set_in(1, Location::RequiresRegister());
-    summary->set_out(Location::SameAsFirstInput());
-    summary->set_temp(0, Location::RequiresRegister());
+    summary->set_in(1, Location::RegisterLocation(ECX));
+    summary->set_temp(0, Location::RegisterLocation(EDX));
+    summary->set_out(Location::RegisterLocation(EAX));
     return summary;
   }
 
   ASSERT(operands_type() == kSmiOperands);
 
   if (op_kind() == Token::kTRUNCDIV) {
     const intptr_t kNumTemps = 3;
     LocationSummary* summary = new LocationSummary(kNumInputs, kNumTemps);
     summary->set_in(0, Location::RegisterLocation(EAX));
     summary->set_in(1, Location::RegisterLocation(ECX));
@@ skipping 10 matching lines @@
     summary->set_in(1, Location::RegisterLocation(ECX));
     summary->set_out(Location::SameAsFirstInput());
     summary->set_temp(0, Location::RequiresRegister());
     return summary;
   } else if (op_kind() == Token::kSHL) {
     // Two Smi operands can easily overflow into Mint.
     const intptr_t kNumTemps = 2;
     LocationSummary* summary =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
     summary->set_in(0, Location::RegisterLocation(EAX));
-    summary->set_in(1, Location::RequiresRegister());
-    summary->set_out(Location::SameAsFirstInput());
-    summary->set_temp(0, Location::RequiresRegister());
+    summary->set_in(1, Location::RegisterLocation(EDX));
+    summary->set_temp(0, Location::RegisterLocation(EBX));
     summary->set_temp(1, Location::RegisterLocation(ECX));
+    summary->set_out(Location::RegisterLocation(EAX));
     return summary;
   } else {
     const intptr_t kNumTemps = 1;
     LocationSummary* summary = new LocationSummary(kNumInputs, kNumTemps);
     summary->set_in(0, Location::RequiresRegister());
     summary->set_in(1, Location::RequiresRegister());
     summary->set_out(Location::SameAsFirstInput());
     summary->set_temp(0, Location::RequiresRegister());
     return summary;
   }
@@ skipping 355 matching lines @@
   }
 }
 
 
 LocationSummary* NumberNegateComp::MakeLocationSummary() const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 1;  // Needed for doubles.
   LocationSummary* summary = new LocationSummary(kNumInputs,
                                                  kNumTemps,
                                                  LocationSummary::kCall);
-  summary->set_in(0, Location::RequiresRegister());
-  summary->set_out(Location::SameAsFirstInput());
-  summary->set_temp(0, Location::RequiresRegister());
+  summary->set_in(0, Location::RegisterLocation(EAX));
+  summary->set_temp(0, Location::RegisterLocation(ECX));
+  summary->set_out(Location::RegisterLocation(EAX));
   return summary;
 }
 
 
 void NumberNegateComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   const ICData& ic_data = *instance_call()->ic_data();
   ASSERT(!ic_data.IsNull());
   ASSERT(ic_data.num_args_tested() == 1);
 
   // TODO(srdjan): Implement for more checks.
@@ skipping 187 matching lines @@
       summary->set_in(1, Location::RequiresRegister());
       summary->set_temp(0, Location::RequiresRegister());
       return summary;
     }
     if ((kind() == Token::kEQ) || (kind() == Token::kNE)) {
       const intptr_t kNumInputs = 2;
       const intptr_t kNumTemps = 1;
       LocationSummary* locs = new LocationSummary(kNumInputs,
                                                   kNumTemps,
                                                   LocationSummary::kCall);
-      locs->set_in(0, Location::RequiresRegister());
-      locs->set_in(1, Location::RequiresRegister());
-      locs->set_temp(0, Location::RequiresRegister());
+      locs->set_in(0, Location::RegisterLocation(EAX));
+      locs->set_in(1, Location::RegisterLocation(ECX));
+      locs->set_temp(0, Location::RegisterLocation(EDX));
       return locs;
     }
     // Otherwise polymorphic dispatch.
   }
   // Call.
   LocationSummary* result = new LocationSummary(0, 0, LocationSummary::kCall);
   result->set_out(Location::RegisterLocation(EAX));
   return result;
 }
 
@@ skipping 48 matching lines @@
   ASSERT(locs()->out().reg() == EAX);
   __ CompareObject(locs()->out().reg(), compiler->bool_true());
   EmitBranchOnCondition(compiler, branch_condition);
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64