Index: runtime/vm/intermediate_language_ia32.cc |
diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc |
index a124fa9a00125183feb088170de58100d05ae15e..0f0deb20e7889ed56f1e951ac329328cdec9f20b 100644 |
--- a/runtime/vm/intermediate_language_ia32.cc |
+++ b/runtime/vm/intermediate_language_ia32.cc |
@@ -1199,6 +1199,106 @@ void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
} |
+Representation LoadCodeUnitsInstr::representation() const { |
+ switch (class_id()) { |
+ case kOneByteStringCid: |
+ case kExternalOneByteStringCid: |
+ case kTwoByteStringCid: |
+ case kExternalTwoByteStringCid: |
+ // TODO(zerny): kUnboxedUint32 could be a better choice. |
+ return can_pack_into_smi() ? kTagged : kUnboxedMint; |
+ default: |
+ UNIMPLEMENTED(); |
+ return kTagged; |
+ } |
+} |
+ |
+ |
+LocationSummary* LoadCodeUnitsInstr::MakeLocationSummary(Isolate* isolate, |
+ bool opt) const { |
+ const intptr_t kNumInputs = 2; |
+ const intptr_t kNumTemps = 0; |
+ LocationSummary* summary = new(isolate) LocationSummary( |
+ isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall); |
+ summary->set_in(0, Location::RequiresRegister()); |
+ // The smi index is either untagged (element size == 1), or it is left smi |
+ // tagged (for all element sizes > 1). |
+ summary->set_in(1, (index_scale() == 1) ? Location::WritableRegister() |
+ : Location::RequiresRegister()); |
+ |
+ if (representation() == kUnboxedMint) { |
+ summary->set_out(0, Location::Pair(Location::RequiresRegister(), |
+ Location::RequiresRegister())); |
+ } else { |
+ ASSERT(representation() == kTagged); |
+ summary->set_out(0, Location::RequiresRegister()); |
+ } |
+ |
+ return summary; |
+} |
+ |
+ |
+void LoadCodeUnitsInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
+ const Register array = locs()->in(0).reg(); |
+ const Location index = locs()->in(1); |
+ |
+ Address element_address = Assembler::ElementAddressForRegIndex( |
+ IsExternal(), class_id(), index_scale(), array, index.reg()); |
+ |
+ if ((index_scale() == 1)) { |
+ __ SmiUntag(index.reg()); |
+ } |
+ |
+ 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(); |
+ switch (class_id()) { |
+ case kOneByteStringCid: |
+ case kExternalOneByteStringCid: |
+ ASSERT(element_count() == 4); |
+ __ movl(result1, element_address); |
+ __ xorl(result2, result2); |
+ break; |
+ case kTwoByteStringCid: |
+ case kExternalTwoByteStringCid: |
+ ASSERT(element_count() == 2); |
+ __ movl(result1, element_address); |
+ __ xorl(result2, result2); |
+ break; |
+ default: |
+ UNREACHABLE(); |
+ } |
+ } else { |
+ ASSERT(representation() == kTagged); |
+ Register result = locs()->out(0).reg(); |
+ switch (class_id()) { |
+ case kOneByteStringCid: |
+ case kExternalOneByteStringCid: |
+ switch (element_count()) { |
+ case 1: __ movzxb(result, element_address); break; |
+ case 2: __ movzxw(result, element_address); break; |
+ default: UNREACHABLE(); |
+ } |
+ __ SmiTag(result); |
+ break; |
+ case kTwoByteStringCid: |
+ case kExternalTwoByteStringCid: |
+ switch (element_count()) { |
+ case 1: __ movzxw(result, element_address); break; |
+ default: UNREACHABLE(); |
+ } |
+ __ SmiTag(result); |
+ break; |
+ default: |
+ UNREACHABLE(); |
+ break; |
+ } |
+ } |
+} |
+ |
+ |
Representation StoreIndexedInstr::RequiredInputRepresentation( |
intptr_t idx) const { |
// Array can be a Dart object or a pointer to external data. |
@@ -4791,6 +4891,42 @@ void MathUnaryInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
} |
+LocationSummary* CaseInsensitiveCompareUC16Instr::MakeLocationSummary( |
+ Isolate* isolate, bool opt) const { |
+ const intptr_t kNumTemps = 0; |
+ LocationSummary* summary = new(isolate) LocationSummary( |
+ isolate, InputCount(), kNumTemps, LocationSummary::kCall); |
+ summary->set_in(0, Location::RegisterLocation(EAX)); |
+ summary->set_in(1, Location::RegisterLocation(ECX)); |
+ summary->set_in(2, Location::RegisterLocation(EDX)); |
+ summary->set_in(3, Location::RegisterLocation(EBX)); |
+ summary->set_out(0, Location::RegisterLocation(EAX)); |
+ return summary; |
+} |
+ |
+ |
+void CaseInsensitiveCompareUC16Instr::EmitNativeCode( |
+ FlowGraphCompiler* compiler) { |
+ |
+ // Save ESP. EDI is chosen because it is callee saved so we do not need to |
+ // back it up before calling into the runtime. |
+ static const Register kSavedSPReg = EDI; |
+ __ movl(kSavedSPReg, ESP); |
+ __ ReserveAlignedFrameSpace(kWordSize * TargetFunction().argument_count()); |
+ |
+ __ movl(Address(ESP, + 0 * kWordSize), locs()->in(0).reg()); |
+ __ movl(Address(ESP, + 1 * kWordSize), locs()->in(1).reg()); |
+ __ movl(Address(ESP, + 2 * kWordSize), locs()->in(2).reg()); |
+ __ movl(Address(ESP, + 3 * kWordSize), locs()->in(3).reg()); |
+ |
+ // Call the function. |
+ __ CallRuntime(TargetFunction(), TargetFunction().argument_count()); |
+ |
+ // Restore ESP. |
+ __ movl(ESP, kSavedSPReg); |
+} |
+ |
+ |
LocationSummary* MathMinMaxInstr::MakeLocationSummary(Isolate* isolate, |
bool opt) const { |
if (result_cid() == kDoubleCid) { |
@@ -6362,6 +6498,37 @@ void GotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
} |
+LocationSummary* IndirectGotoInstr::MakeLocationSummary(Isolate* isolate, |
+ bool opt) const { |
+ const intptr_t kNumInputs = 1; |
+ const intptr_t kNumTemps = 1; |
+ |
+ LocationSummary* summary = new(isolate) LocationSummary( |
+ isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall); |
+ |
+ summary->set_in(0, Location::RequiresRegister()); |
+ summary->set_temp(0, Location::RequiresRegister()); |
+ |
+ return summary; |
+} |
+ |
+ |
+void IndirectGotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
+ Register target_address_reg = locs()->temp_slot(0)->reg(); |
+ |
+ // Load from [current frame pointer] + kPcMarkerSlotFromFp. |
+ __ movl(target_address_reg, Address(EBP, kPcMarkerSlotFromFp * kWordSize)); |
+ |
+ // Add the offset. |
+ Register offset_reg = locs()->in(0).reg(); |
+ __ SmiUntag(offset_reg); |
+ __ addl(target_address_reg, offset_reg); |
+ |
+ // Jump to the absolute address. |
+ __ jmp(target_address_reg); |
+} |
+ |
+ |
LocationSummary* StrictCompareInstr::MakeLocationSummary(Isolate* isolate, |
bool opt) const { |
const intptr_t kNumInputs = 2; |