Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/intermediate_language_mips.cc

Issue 670263007: IR refactoring: consolidate all boxing and unboxing instructions. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/intermediate_language_ia32.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_mips.cc
diff --git a/runtime/vm/intermediate_language_mips.cc b/runtime/vm/intermediate_language_mips.cc
index f23a56e116297f639029d779fa4056d853beb2f6..0af0207ea39354d22679938b645f7b3fc43a919f 100644
--- a/runtime/vm/intermediate_language_mips.cc
+++ b/runtime/vm/intermediate_language_mips.cc
@@ -3077,14 +3077,12 @@ void CheckEitherNonSmiInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
}
-LocationSummary* BoxDoubleInstr::MakeLocationSummary(Isolate* isolate,
+LocationSummary* BoxInstr::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::kCallOnSlowPath);
+ isolate, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
summary->set_in(0, Location::RequiresFpuRegister());
summary->set_temp(0, Location::RequiresRegister());
summary->set_out(0, Location::RequiresRegister());
@@ -3092,7 +3090,9 @@ LocationSummary* BoxDoubleInstr::MakeLocationSummary(Isolate* isolate,
}
-void BoxDoubleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+void BoxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+ ASSERT(from_representation() == kUnboxedDouble);
+
Register out_reg = locs()->out(0).reg();
DRegister value = locs()->in(0).fpu_reg();
@@ -3102,7 +3102,7 @@ void BoxDoubleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
}
-LocationSummary* UnboxDoubleInstr::MakeLocationSummary(Isolate* isolate,
+LocationSummary* UnboxInstr::MakeLocationSummary(Isolate* isolate,
bool opt) const {
const intptr_t kNumInputs = 1;
const intptr_t kNumTemps = 0;
@@ -3114,116 +3114,209 @@ LocationSummary* UnboxDoubleInstr::MakeLocationSummary(Isolate* isolate,
}
-void UnboxDoubleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- CompileType* value_type = value()->Type();
- const intptr_t value_cid = value_type->ToCid();
- const Register value = locs()->in(0).reg();
- const DRegister result = locs()->out(0).fpu_reg();
-
- if (value_cid == kDoubleCid) {
- __ LoadDFromOffset(result, value, Double::value_offset() - kHeapObjectTag);
- } else if (value_cid == kSmiCid) {
- __ SmiUntag(TMP, value);
- __ mtc1(TMP, STMP1);
- __ cvtdw(result, STMP1);
- } else {
- Label* deopt = compiler->AddDeoptStub(GetDeoptId(),
- ICData::kDeoptBinaryDoubleOp);
- if (value_type->is_nullable() &&
- (value_type->ToNullableCid() == kDoubleCid)) {
- __ BranchEqual(value, Object::null_object(), deopt);
- // It must be double now.
- __ LoadDFromOffset(result, value,
- Double::value_offset() - kHeapObjectTag);
- } else {
- Label is_smi, done;
-
- __ andi(CMPRES1, value, Immediate(kSmiTagMask));
- __ beq(CMPRES1, ZR, &is_smi);
- __ LoadClassId(CMPRES1, value);
- __ BranchNotEqual(CMPRES1, Immediate(kDoubleCid), deopt);
- __ LoadDFromOffset(result, value,
- Double::value_offset() - kHeapObjectTag);
- __ b(&done);
- __ Bind(&is_smi);
- __ SmiUntag(TMP, value);
- __ mtc1(TMP, STMP1);
- __ cvtdw(result, STMP1);
- __ Bind(&done);
- }
- }
-}
+void UnboxInstr::EmitLoadFromBox(FlowGraphCompiler* compiler) {
+ const Register box = locs()->in(0).reg();
+ switch (representation()) {
+ case kUnboxedMint: {
+ UNIMPLEMENTED();
+ break;
+ }
-LocationSummary* BoxFloat32x4Instr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
+ case kUnboxedDouble: {
+ const DRegister result = locs()->out(0).fpu_reg();
+ __ LoadDFromOffset(result, box, Double::value_offset() - kHeapObjectTag);
+ break;
+ }
+ case kUnboxedFloat32x4:
+ case kUnboxedFloat64x2:
+ case kUnboxedInt32x4: {
+ UNIMPLEMENTED();
+ break;
+ }
-void BoxFloat32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
+ default:
+ UNREACHABLE();
+ break;
+ }
}
-LocationSummary* UnboxFloat32x4Instr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
+void UnboxInstr::EmitSmiConversion(FlowGraphCompiler* compiler) {
+ const Register box = locs()->in(0).reg();
+ switch (representation()) {
+ case kUnboxedMint: {
+ UNIMPLEMENTED();
+ break;
+ }
-void UnboxFloat32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
+ case kUnboxedDouble: {
+ const DRegister result = locs()->out(0).fpu_reg();
+ __ SmiUntag(TMP, box);
+ __ mtc1(TMP, STMP1);
+ __ cvtdw(result, STMP1);
+ break;
+ }
+
+ default:
+ UNREACHABLE();
+ break;
+ }
}
-LocationSummary* BoxFloat64x2Instr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
+void UnboxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+ const intptr_t value_cid = value()->Type()->ToCid();
+ const intptr_t box_cid = BoxCid();
+ if (value_cid == box_cid) {
+ EmitLoadFromBox(compiler);
+ } else if (CanConvertSmi() && (value_cid == kSmiCid)) {
+ EmitSmiConversion(compiler);
+ } else {
+ const Register box = locs()->in(0).reg();
+ Label* deopt = compiler->AddDeoptStub(GetDeoptId(),
+ ICData::kDeoptCheckClass);
+ Label is_smi;
-void BoxFloat64x2Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
-}
+ if ((value()->Type()->ToNullableCid() == box_cid) &&
+ value()->Type()->is_nullable()) {
+ __ BranchEqual(box, Object::null_object(), deopt);
+ } else {
+ __ andi(CMPRES1, box, Immediate(kSmiTagMask));
+ __ beq(CMPRES1, ZR, CanConvertSmi() ? &is_smi : deopt);
+ __ LoadClassId(CMPRES1, box);
+ __ BranchNotEqual(CMPRES1, Immediate(box_cid), deopt);
+ }
+ EmitLoadFromBox(compiler);
-LocationSummary* UnboxFloat64x2Instr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
+ if (is_smi.IsLinked()) {
+ Label done;
+ __ b(&done);
+ __ Bind(&is_smi);
+ EmitSmiConversion(compiler);
+ __ Bind(&done);
+ }
+ }
}
-void UnboxFloat64x2Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
+LocationSummary* BoxInteger32Instr::MakeLocationSummary(Isolate* isolate,
+ bool opt) const {
+ ASSERT((from_representation() == kUnboxedInt32) ||
+ (from_representation() == kUnboxedUint32));
+ const intptr_t kNumInputs = 1;
+ const intptr_t kNumTemps = 1;
+ LocationSummary* summary = new(isolate) LocationSummary(
+ isolate, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
+ summary->set_in(0, Location::RequiresRegister());
+ summary->set_temp(0, Location::RequiresRegister());
+ summary->set_out(0, Location::RequiresRegister());
+ return summary;
}
-LocationSummary* BoxInt32x4Instr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
+void BoxInteger32Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
+ Register value = locs()->in(0).reg();
+ Register out = locs()->out(0).reg();
+ ASSERT(value != out);
+
+ Label done;
+ __ SmiTag(out, value);
+ if (!ValueFitsSmi()) {
+ Register temp = locs()->temp(0).reg();
+ if (from_representation() == kUnboxedInt32) {
+ __ SmiUntag(CMPRES1, out);
+ __ BranchEqual(CMPRES1, value, &done);
+ } else {
+ ASSERT(from_representation() == kUnboxedUint32);
+ __ AndImmediate(CMPRES1, value, 0xC0000000);
+ __ BranchEqual(CMPRES1, ZR, &done);
+ }
+ BoxAllocationSlowPath::Allocate(
+ compiler,
+ this,
+ compiler->mint_class(),
+ out,
+ temp);
+ Register hi;
+ if (from_representation() == kUnboxedInt32) {
+ hi = temp;
+ __ sra(hi, value, kBitsPerWord - 1);
+ } else {
+ ASSERT(from_representation() == kUnboxedUint32);
+ hi = ZR;
+ }
+ __ StoreToOffset(value,
+ out,
+ Mint::value_offset() - kHeapObjectTag);
+ __ StoreToOffset(hi,
+ out,
+ Mint::value_offset() - kHeapObjectTag + kWordSize);
+ __ Bind(&done);
+ }
}
-void BoxInt32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
+DEFINE_UNIMPLEMENTED_INSTRUCTION(BoxInt64Instr);
+
+LocationSummary* UnboxInteger32Instr::MakeLocationSummary(Isolate* isolate,
+ bool opt) const {
+ ASSERT((representation() == kUnboxedInt32) ||
+ (representation() == kUnboxedUint32));
+ const intptr_t kNumInputs = 1;
+ const intptr_t kNumTemps = 0;
+ LocationSummary* summary = new(isolate) LocationSummary(
+ isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
+ summary->set_in(0, Location::RequiresRegister());
+ summary->set_out(0, Location::RequiresRegister());
+ return summary;
}
-LocationSummary* UnboxInt32x4Instr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
+static void LoadInt32FromMint(FlowGraphCompiler* compiler,
+ Register mint,
+ Register result,
+ Label* deopt) {
+ __ LoadFromOffset(result,
+ mint,
+ Mint::value_offset() - kHeapObjectTag);
+ if (deopt != NULL) {
+ __ LoadFromOffset(CMPRES1,
+ mint,
+ Mint::value_offset() - kHeapObjectTag + kWordSize);
+ __ sra(CMPRES2, result, kBitsPerWord - 1);
+ __ BranchNotEqual(CMPRES1, CMPRES2, deopt);
+ }
}
-void UnboxInt32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
+void UnboxInteger32Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
+ const intptr_t value_cid = value()->Type()->ToCid();
+ const Register value = locs()->in(0).reg();
+ const Register out = locs()->out(0).reg();
+ Label* deopt = CanDeoptimize() ?
+ compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptUnboxInteger) : NULL;
+ Label* out_of_range = !is_truncating() ? deopt : NULL;
+ ASSERT(value != out);
+
+ if (value_cid == kSmiCid) {
+ __ SmiUntag(out, value);
+ } else if (value_cid == kMintCid) {
+ LoadInt32FromMint(compiler, value, out, out_of_range);
+ } else {
+ Label done;
+ __ SmiUntag(out, value);
+ __ andi(CMPRES1, value, Immediate(kSmiTagMask));
+ __ beq(CMPRES1, ZR, &done);
+ __ LoadClassId(CMPRES1, value);
+ __ BranchNotEqual(CMPRES1, Immediate(kMintCid), deopt);
+ LoadInt32FromMint(compiler, value, out, out_of_range);
+ __ Bind(&done);
+ }
}
@@ -4490,72 +4583,15 @@ void CheckArrayBoundInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
}
}
-
-LocationSummary* UnboxIntegerInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
-
-
-void UnboxIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
-}
-
-
-LocationSummary* BoxIntegerInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
-
-
-void BoxIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
-}
-
-
-LocationSummary* BinaryMintOpInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
-
-
-void BinaryMintOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
-}
-
+DEFINE_UNIMPLEMENTED_INSTRUCTION(BinaryMintOpInstr);
bool ShiftMintOpInstr::has_shift_count_check() const {
UNREACHABLE();
return false;
}
-
-LocationSummary* ShiftMintOpInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
-
-
-void ShiftMintOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
-}
-
-
-LocationSummary* UnaryMintOpInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- UNIMPLEMENTED();
- return NULL;
-}
-
-
-void UnaryMintOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- UNIMPLEMENTED();
-}
-
+DEFINE_UNIMPLEMENTED_INSTRUCTION(ShiftMintOpInstr);
+DEFINE_UNIMPLEMENTED_INSTRUCTION(UnaryMintOpInstr);
CompileType BinaryUint32OpInstr::ComputeType() const {
return CompileType::Int();
@@ -4578,120 +4614,6 @@ DEFINE_UNIMPLEMENTED_INSTRUCTION(UnaryUint32OpInstr)
DEFINE_UNIMPLEMENTED_INSTRUCTION(BinaryInt32OpInstr)
-LocationSummary* BoxIntNInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- ASSERT((from_representation() == kUnboxedInt32) ||
- (from_representation() == kUnboxedUint32));
- const intptr_t kNumInputs = 1;
- const intptr_t kNumTemps = 1;
- LocationSummary* summary = new(isolate) LocationSummary(
- isolate, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
- summary->set_in(0, Location::RequiresRegister());
- summary->set_temp(0, Location::RequiresRegister());
- summary->set_out(0, Location::RequiresRegister());
- return summary;
-}
-
-
-void BoxIntNInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- Register value = locs()->in(0).reg();
- Register out = locs()->out(0).reg();
- ASSERT(value != out);
-
- Label done;
- __ SmiTag(out, value);
- if (!ValueFitsSmi()) {
- Register temp = locs()->temp(0).reg();
- if (from_representation() == kUnboxedInt32) {
- __ SmiUntag(CMPRES1, out);
- __ BranchEqual(CMPRES1, value, &done);
- } else {
- ASSERT(from_representation() == kUnboxedUint32);
- __ AndImmediate(CMPRES1, value, 0xC0000000);
- __ BranchEqual(CMPRES1, ZR, &done);
- }
- BoxAllocationSlowPath::Allocate(
- compiler,
- this,
- compiler->mint_class(),
- out,
- temp);
- Register hi;
- if (from_representation() == kUnboxedInt32) {
- hi = temp;
- __ sra(hi, value, kBitsPerWord - 1);
- } else {
- ASSERT(from_representation() == kUnboxedUint32);
- hi = ZR;
- }
- __ StoreToOffset(value,
- out,
- Mint::value_offset() - kHeapObjectTag);
- __ StoreToOffset(hi,
- out,
- Mint::value_offset() - kHeapObjectTag + kWordSize);
- __ Bind(&done);
- }
-}
-
-
-LocationSummary* UnboxIntNInstr::MakeLocationSummary(Isolate* isolate,
- bool opt) const {
- ASSERT((representation() == kUnboxedInt32) ||
- (representation() == kUnboxedUint32));
- const intptr_t kNumInputs = 1;
- const intptr_t kNumTemps = 0;
- LocationSummary* summary = new(isolate) LocationSummary(
- isolate, kNumInputs, kNumTemps, LocationSummary::kNoCall);
- summary->set_in(0, Location::RequiresRegister());
- summary->set_out(0, Location::RequiresRegister());
- return summary;
-}
-
-
-static void LoadInt32FromMint(FlowGraphCompiler* compiler,
- Register mint,
- Register result,
- Label* deopt) {
- __ LoadFromOffset(result,
- mint,
- Mint::value_offset() - kHeapObjectTag);
- if (deopt != NULL) {
- __ LoadFromOffset(CMPRES1,
- mint,
- Mint::value_offset() - kHeapObjectTag + kWordSize);
- __ sra(CMPRES2, result, kBitsPerWord - 1);
- __ BranchNotEqual(CMPRES1, CMPRES2, deopt);
- }
-}
-
-
-void UnboxIntNInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- const intptr_t value_cid = value()->Type()->ToCid();
- const Register value = locs()->in(0).reg();
- const Register out = locs()->out(0).reg();
- Label* deopt = CanDeoptimize() ?
- compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptUnboxInteger) : NULL;
- Label* out_of_range = !is_truncating() ? deopt : NULL;
- ASSERT(value != out);
-
- if (value_cid == kSmiCid) {
- __ SmiUntag(out, value);
- } else if (value_cid == kMintCid) {
- LoadInt32FromMint(compiler, value, out, out_of_range);
- } else {
- Label done;
- __ SmiUntag(out, value);
- __ andi(CMPRES1, value, Immediate(kSmiTagMask));
- __ beq(CMPRES1, ZR, &done);
- __ LoadClassId(CMPRES1, value);
- __ BranchNotEqual(CMPRES1, Immediate(kMintCid), deopt);
- LoadInt32FromMint(compiler, value, out, out_of_range);
- __ Bind(&done);
- }
-}
-
-
LocationSummary* UnboxedIntConverterInstr::MakeLocationSummary(Isolate* isolate,
bool opt) const {
const intptr_t kNumInputs = 1;
« no previous file with comments | « runtime/vm/intermediate_language_ia32.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698