Index: runtime/vm/intermediate_language_ia32.cc |
=================================================================== |
--- runtime/vm/intermediate_language_ia32.cc (revision 12258) |
+++ runtime/vm/intermediate_language_ia32.cc (working copy) |
@@ -864,22 +864,43 @@ |
} |
+static bool CanBeImmediateIndex(Value* index) { |
+ if (!index->definition()->IsConstant()) return false; |
+ const Object& constant = index->definition()->AsConstant()->value(); |
+ const Smi& smi_const = Smi::Cast(constant); |
+ int64_t disp = smi_const.AsInt64Value() * kWordSize + sizeof(RawArray); |
+ return Utils::IsInt(32, disp); |
+} |
+ |
+ |
LocationSummary* LoadIndexedInstr::MakeLocationSummary() const { |
const intptr_t kNumInputs = 2; |
- return LocationSummary::Make(kNumInputs, |
- Location::RequiresRegister(), |
- LocationSummary::kNoCall); |
+ const intptr_t kNumTemps = 0; |
+ LocationSummary* locs = |
+ new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall); |
+ locs->set_in(0, Location::RequiresRegister()); |
+ locs->set_in(1, CanBeImmediateIndex(index()) |
+ ? Location::RegisterOrConstant(index()) |
+ : Location::RequiresRegister()); |
+ locs->set_out(Location::RequiresRegister()); |
+ return locs; |
} |
void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Register array = locs()->in(0).reg(); |
- Register index = locs()->in(1).reg(); |
Register result = locs()->out().reg(); |
- |
- // Note that index is Smi, i.e, times 2. |
- ASSERT(kSmiTagShift == 1); |
- __ movl(result, FieldAddress(array, index, TIMES_2, sizeof(RawArray))); |
+ Location index = locs()->in(1); |
+ if (index.IsRegister()) { |
+ // Note that index is Smi, i.e, times 2. |
+ ASSERT(kSmiTagShift == 1); |
+ __ movl(result, |
+ FieldAddress(array, index.reg(), TIMES_2, sizeof(RawArray))); |
+ } else { |
+ const int32_t disp = |
+ Smi::Cast(index.constant()).Value() * kWordSize + sizeof(RawArray); |
+ __ movl(result, FieldAddress(array, disp)); |
+ } |
} |
@@ -889,28 +910,39 @@ |
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()); |
+ locs->set_in(1, CanBeImmediateIndex(index()) |
+ ? Location::RegisterOrConstant(index()) |
+ : Location::RequiresRegister()); |
+ locs->set_in(2, value()->NeedsStoreBuffer() |
+ ? Location::WritableRegister() |
+ : Location::RegisterOrConstant(value())); |
return locs; |
} |
void StoreIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Register array = locs()->in(0).reg(); |
- Register index = locs()->in(1).reg(); |
- Register value = locs()->in(2).reg(); |
// Note that index is Smi, i.e, times 2. |
ASSERT(kSmiTagShift == 1); |
+ Location index = locs()->in(1); |
+ FieldAddress field_address = index.IsConstant() |
+ ? FieldAddress( |
+ array, |
+ Smi::Cast(index.constant()).Value() * kWordSize + sizeof(RawArray)) |
+ : FieldAddress(array, index.reg(), TIMES_2, sizeof(RawArray)); |
+ |
if (this->value()->NeedsStoreBuffer()) { |
- __ StoreIntoObject(array, |
- FieldAddress(array, index, TIMES_2, sizeof(RawArray)), |
- value); |
+ Register value = locs()->in(2).reg(); |
+ __ StoreIntoObject(array, field_address, value); |
} else { |
- __ StoreIntoObjectNoBarrier(array, |
- FieldAddress(array, index, TIMES_2, sizeof(RawArray)), |
- value); |
+ if (locs()->in(2).IsConstant()) { |
+ const Object& constant = locs()->in(2).constant(); |
+ __ StoreIntoObjectNoBarrier(array, field_address, constant); |
+ } else { |
+ Register value = locs()->in(2).reg(); |
+ __ StoreIntoObjectNoBarrier(array, field_address, value); |
+ } |
} |
} |