| Index: runtime/vm/intermediate_language_x64.cc
|
| diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/intermediate_language_x64.cc
|
| index 4fc3b68d2845309a709d2ee451fe5ab1c93e408e..597f67a6f680e151c17ee7651986cca271d61142 100644
|
| --- a/runtime/vm/intermediate_language_x64.cc
|
| +++ b/runtime/vm/intermediate_language_x64.cc
|
| @@ -28,8 +28,8 @@ namespace dart {
|
| // Generic summary for call instructions that have all arguments pushed
|
| // on the stack and return the result in a fixed register RAX.
|
| LocationSummary* Instruction::MakeCallSummary(Zone* zone) {
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, 0, 0, LocationSummary::kCall);
|
| + LocationSummary* result =
|
| + new (zone) LocationSummary(zone, 0, 0, LocationSummary::kCall);
|
| result->set_out(0, Location::RegisterLocation(RAX));
|
| return result;
|
| }
|
| @@ -39,8 +39,8 @@ LocationSummary* PushArgumentInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::AnyOrConstant(value()));
|
| return locs;
|
| }
|
| @@ -63,12 +63,11 @@ void PushArgumentInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -LocationSummary* ReturnInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| +LocationSummary* ReturnInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| }
|
| @@ -111,18 +110,30 @@ void ReturnInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| static Condition NegateCondition(Condition condition) {
|
| switch (condition) {
|
| - case EQUAL: return NOT_EQUAL;
|
| - case NOT_EQUAL: return EQUAL;
|
| - case LESS: return GREATER_EQUAL;
|
| - case LESS_EQUAL: return GREATER;
|
| - case GREATER: return LESS_EQUAL;
|
| - case GREATER_EQUAL: return LESS;
|
| - case BELOW: return ABOVE_EQUAL;
|
| - case BELOW_EQUAL: return ABOVE;
|
| - case ABOVE: return BELOW_EQUAL;
|
| - case ABOVE_EQUAL: return BELOW;
|
| - case PARITY_EVEN: return PARITY_ODD;
|
| - case PARITY_ODD: return PARITY_EVEN;
|
| + case EQUAL:
|
| + return NOT_EQUAL;
|
| + case NOT_EQUAL:
|
| + return EQUAL;
|
| + case LESS:
|
| + return GREATER_EQUAL;
|
| + case LESS_EQUAL:
|
| + return GREATER;
|
| + case GREATER:
|
| + return LESS_EQUAL;
|
| + case GREATER_EQUAL:
|
| + return LESS;
|
| + case BELOW:
|
| + return ABOVE_EQUAL;
|
| + case BELOW_EQUAL:
|
| + return ABOVE;
|
| + case ABOVE:
|
| + return BELOW_EQUAL;
|
| + case ABOVE_EQUAL:
|
| + return BELOW;
|
| + case PARITY_EVEN:
|
| + return PARITY_ODD;
|
| + case PARITY_ODD:
|
| + return PARITY_EVEN;
|
| default:
|
| UNIMPLEMENTED();
|
| return EQUAL;
|
| @@ -154,7 +165,7 @@ void IfThenElseInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ xorq(RDX, RDX);
|
|
|
| // Emit comparison code. This must not overwrite the result register.
|
| - BranchLabels labels = { NULL, NULL, NULL };
|
| + BranchLabels labels = {NULL, NULL, NULL};
|
| Condition true_condition = comparison()->EmitComparisonCode(compiler, labels);
|
|
|
| const bool is_power_of_two_kind = IsPowerOfTwoKind(if_true_, if_false_);
|
| @@ -186,8 +197,8 @@ void IfThenElseInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ shlq(RDX, Immediate(shift + kSmiTagSize));
|
| } else {
|
| __ decq(RDX);
|
| - __ AndImmediate(RDX,
|
| - Immediate(Smi::RawValue(true_value) - Smi::RawValue(false_value)));
|
| + __ AndImmediate(
|
| + RDX, Immediate(Smi::RawValue(true_value) - Smi::RawValue(false_value)));
|
| if (false_value != 0) {
|
| __ AddImmediate(RDX, Immediate(Smi::RawValue(false_value)));
|
| }
|
| @@ -199,10 +210,9 @@ LocationSummary* LoadLocalInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 0;
|
| const intptr_t stack_index = (local().index() < 0)
|
| - ? kFirstLocalSlotFromFp - local().index()
|
| - : kParamEndSlotFromFp - local().index();
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| + ? kFirstLocalSlotFromFp - local().index()
|
| + : kParamEndSlotFromFp - local().index();
|
| + return LocationSummary::Make(zone, kNumInputs,
|
| Location::StackSlot(stack_index),
|
| LocationSummary::kNoCall);
|
| }
|
| @@ -217,9 +227,7 @@ void LoadLocalInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| LocationSummary* StoreLocalInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| - Location::SameAsFirstInput(),
|
| + return LocationSummary::Make(zone, kNumInputs, Location::SameAsFirstInput(),
|
| LocationSummary::kNoCall);
|
| }
|
|
|
| @@ -235,8 +243,7 @@ void StoreLocalInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| LocationSummary* ConstantInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 0;
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| + return LocationSummary::Make(zone, kNumInputs,
|
| Assembler::IsSafe(value())
|
| ? Location::Constant(this)
|
| : Location::RequiresRegister(),
|
| @@ -259,8 +266,8 @@ LocationSummary* UnboxedConstantInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 0;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| switch (representation()) {
|
| case kUnboxedDouble:
|
| locs->set_out(0, Location::RequiresFpuRegister());
|
| @@ -305,8 +312,8 @@ LocationSummary* AssertAssignableInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| summary->set_in(0, Location::RegisterLocation(RAX)); // Value.
|
| summary->set_in(1, Location::RegisterLocation(RDX)); // Type arguments.
|
| summary->set_out(0, Location::RegisterLocation(RAX));
|
| @@ -318,8 +325,8 @@ LocationSummary* AssertBooleanInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| @@ -348,11 +355,8 @@ static void EmitAssertBoolean(Register reg,
|
| }
|
|
|
| __ pushq(reg); // Push the source object.
|
| - compiler->GenerateRuntimeCall(token_pos,
|
| - deopt_id,
|
| - kNonBoolTypeErrorRuntimeEntry,
|
| - 1,
|
| - locs);
|
| + compiler->GenerateRuntimeCall(token_pos, deopt_id,
|
| + kNonBoolTypeErrorRuntimeEntry, 1, locs);
|
| // We should never return here.
|
| __ int3();
|
| __ Bind(&done);
|
| @@ -370,12 +374,18 @@ void AssertBooleanInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| static Condition TokenKindToIntCondition(Token::Kind kind) {
|
| switch (kind) {
|
| - case Token::kEQ: return EQUAL;
|
| - case Token::kNE: return NOT_EQUAL;
|
| - case Token::kLT: return LESS;
|
| - case Token::kGT: return GREATER;
|
| - case Token::kLTE: return LESS_EQUAL;
|
| - case Token::kGTE: return GREATER_EQUAL;
|
| + case Token::kEQ:
|
| + return EQUAL;
|
| + case Token::kNE:
|
| + return NOT_EQUAL;
|
| + case Token::kLT:
|
| + return LESS;
|
| + case Token::kGT:
|
| + return GREATER;
|
| + case Token::kLTE:
|
| + return LESS_EQUAL;
|
| + case Token::kGTE:
|
| + return GREATER_EQUAL;
|
| default:
|
| UNREACHABLE();
|
| return OVERFLOW;
|
| @@ -388,17 +398,17 @@ LocationSummary* EqualityCompareInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 2;
|
| if (operation_cid() == kMintCid) {
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RequiresRegister());
|
| locs->set_in(1, Location::RequiresRegister());
|
| locs->set_out(0, Location::RequiresRegister());
|
| return locs;
|
| }
|
| if (operation_cid() == kDoubleCid) {
|
| - const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + const intptr_t kNumTemps = 0;
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RequiresFpuRegister());
|
| locs->set_in(1, Location::RequiresFpuRegister());
|
| locs->set_out(0, Location::RequiresRegister());
|
| @@ -406,8 +416,8 @@ LocationSummary* EqualityCompareInstr::MakeLocationSummary(Zone* zone,
|
| }
|
| if (operation_cid() == kSmiCid) {
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RegisterOrConstant(left()));
|
| // Only one input can be a constant operand. The case of two constant
|
| // operands should be handled by constant propagation.
|
| @@ -444,16 +454,26 @@ static void LoadValueCid(FlowGraphCompiler* compiler,
|
|
|
| static Condition FlipCondition(Condition condition) {
|
| switch (condition) {
|
| - case EQUAL: return EQUAL;
|
| - case NOT_EQUAL: return NOT_EQUAL;
|
| - case LESS: return GREATER;
|
| - case LESS_EQUAL: return GREATER_EQUAL;
|
| - case GREATER: return LESS;
|
| - case GREATER_EQUAL: return LESS_EQUAL;
|
| - case BELOW: return ABOVE;
|
| - case BELOW_EQUAL: return ABOVE_EQUAL;
|
| - case ABOVE: return BELOW;
|
| - case ABOVE_EQUAL: return BELOW_EQUAL;
|
| + case EQUAL:
|
| + return EQUAL;
|
| + case NOT_EQUAL:
|
| + return NOT_EQUAL;
|
| + case LESS:
|
| + return GREATER;
|
| + case LESS_EQUAL:
|
| + return GREATER_EQUAL;
|
| + case GREATER:
|
| + return LESS;
|
| + case GREATER_EQUAL:
|
| + return LESS_EQUAL;
|
| + case BELOW:
|
| + return ABOVE;
|
| + case BELOW_EQUAL:
|
| + return ABOVE_EQUAL;
|
| + case ABOVE:
|
| + return BELOW;
|
| + case ABOVE_EQUAL:
|
| + return BELOW_EQUAL;
|
| default:
|
| UNIMPLEMENTED();
|
| return EQUAL;
|
| @@ -505,12 +525,18 @@ static Condition EmitInt64ComparisonOp(FlowGraphCompiler* compiler,
|
|
|
| static Condition TokenKindToDoubleCondition(Token::Kind kind) {
|
| switch (kind) {
|
| - case Token::kEQ: return EQUAL;
|
| - case Token::kNE: return NOT_EQUAL;
|
| - case Token::kLT: return BELOW;
|
| - case Token::kGT: return ABOVE;
|
| - case Token::kLTE: return BELOW_EQUAL;
|
| - case Token::kGTE: return ABOVE_EQUAL;
|
| + case Token::kEQ:
|
| + return EQUAL;
|
| + case Token::kNE:
|
| + return NOT_EQUAL;
|
| + case Token::kLT:
|
| + return BELOW;
|
| + case Token::kGT:
|
| + return ABOVE;
|
| + case Token::kLTE:
|
| + return BELOW_EQUAL;
|
| + case Token::kGTE:
|
| + return ABOVE_EQUAL;
|
| default:
|
| UNREACHABLE();
|
| return OVERFLOW;
|
| @@ -528,8 +554,8 @@ static Condition EmitDoubleComparisonOp(FlowGraphCompiler* compiler,
|
| __ comisd(left, right);
|
|
|
| Condition true_condition = TokenKindToDoubleCondition(kind);
|
| - Label* nan_result = (true_condition == NOT_EQUAL)
|
| - ? labels.true_label : labels.false_label;
|
| + Label* nan_result =
|
| + (true_condition == NOT_EQUAL) ? labels.true_label : labels.false_label;
|
| __ j(PARITY_EVEN, nan_result);
|
| return true_condition;
|
| }
|
| @@ -550,9 +576,9 @@ void EqualityCompareInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT((kind() == Token::kEQ) || (kind() == Token::kNE));
|
|
|
| Label is_true, is_false;
|
| - BranchLabels labels = { &is_true, &is_false, &is_false };
|
| + BranchLabels labels = {&is_true, &is_false, &is_false};
|
| Condition true_condition = EmitComparisonCode(compiler, labels);
|
| - EmitBranchOnCondition(compiler, true_condition, labels);
|
| + EmitBranchOnCondition(compiler, true_condition, labels);
|
|
|
| Register result = locs()->out(0).reg();
|
| Label done;
|
| @@ -575,12 +601,11 @@ void EqualityCompareInstr::EmitBranchCode(FlowGraphCompiler* compiler,
|
| }
|
|
|
|
|
| -LocationSummary* TestSmiInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| +LocationSummary* TestSmiInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RequiresRegister());
|
| // Only one input can be a constant operand. The case of two constant
|
| // operands should be handled by constant propagation.
|
| @@ -595,8 +620,7 @@ Condition TestSmiInstr::EmitComparisonCode(FlowGraphCompiler* compiler,
|
| Location right = locs()->in(1);
|
| if (right.IsConstant()) {
|
| ASSERT(right.constant().IsSmi());
|
| - const int64_t imm =
|
| - reinterpret_cast<int64_t>(right.constant().raw());
|
| + const int64_t imm = reinterpret_cast<int64_t>(right.constant().raw());
|
| __ TestImmediate(left_reg, Immediate(imm));
|
| } else {
|
| __ testq(left_reg, right.reg());
|
| @@ -620,13 +644,12 @@ void TestSmiInstr::EmitBranchCode(FlowGraphCompiler* compiler,
|
| }
|
|
|
|
|
| -
|
| LocationSummary* TestCidsInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RequiresRegister());
|
| locs->set_temp(0, Location::RequiresRegister());
|
| locs->set_out(0, Location::RequiresRegister());
|
| @@ -640,11 +663,11 @@ Condition TestCidsInstr::EmitComparisonCode(FlowGraphCompiler* compiler,
|
| Register val_reg = locs()->in(0).reg();
|
| Register cid_reg = locs()->temp(0).reg();
|
|
|
| - Label* deopt = CanDeoptimize()
|
| - ? compiler->AddDeoptStub(deopt_id(),
|
| - ICData::kDeoptTestCids,
|
| - licm_hoisted_ ? ICData::kHoisted : 0)
|
| - : NULL;
|
| + Label* deopt =
|
| + CanDeoptimize()
|
| + ? compiler->AddDeoptStub(deopt_id(), ICData::kDeoptTestCids,
|
| + licm_hoisted_ ? ICData::kHoisted : 0)
|
| + : NULL;
|
|
|
| const intptr_t true_result = (kind() == Token::kIS) ? 1 : 0;
|
| const ZoneGrowableArray<intptr_t>& data = cid_results();
|
| @@ -657,7 +680,7 @@ Condition TestCidsInstr::EmitComparisonCode(FlowGraphCompiler* compiler,
|
| const intptr_t test_cid = data[i];
|
| ASSERT(test_cid != kSmiCid);
|
| result = data[i + 1] == true_result;
|
| - __ cmpq(cid_reg, Immediate(test_cid));
|
| + __ cmpq(cid_reg, Immediate(test_cid));
|
| __ j(EQUAL, result ? labels.true_label : labels.false_label);
|
| }
|
| // No match found, deoptimize or false.
|
| @@ -685,7 +708,7 @@ void TestCidsInstr::EmitBranchCode(FlowGraphCompiler* compiler,
|
| void TestCidsInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Register result_reg = locs()->out(0).reg();
|
| Label is_true, is_false, done;
|
| - BranchLabels labels = { &is_true, &is_false, &is_false };
|
| + BranchLabels labels = {&is_true, &is_false, &is_false};
|
| EmitComparisonCode(compiler, labels);
|
| __ Bind(&is_false);
|
| __ LoadObject(result_reg, Bool::False());
|
| @@ -701,23 +724,23 @@ LocationSummary* RelationalOpInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| if (operation_cid() == kDoubleCid) {
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::RequiresRegister());
|
| return summary;
|
| } else if (operation_cid() == kMintCid) {
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| summary->set_out(0, Location::RequiresRegister());
|
| return summary;
|
| }
|
| ASSERT(operation_cid() == kSmiCid);
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RegisterOrConstant(left()));
|
| // Only one input can be a constant operand. The case of two constant
|
| // operands should be handled by constant propagation.
|
| @@ -742,7 +765,7 @@ Condition RelationalOpInstr::EmitComparisonCode(FlowGraphCompiler* compiler,
|
|
|
| void RelationalOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label is_true, is_false;
|
| - BranchLabels labels = { &is_true, &is_false, &is_false };
|
| + BranchLabels labels = {&is_true, &is_false, &is_false};
|
| Condition true_condition = EmitComparisonCode(compiler, labels);
|
| EmitBranchOnCondition(compiler, true_condition, labels);
|
|
|
| @@ -780,8 +803,9 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ PushObject(Object::null_object());
|
| // Pass a pointer to the first argument in RAX.
|
| if (!function().HasOptionalParameters()) {
|
| - __ leaq(RAX, Address(RBP, (kParamEndSlotFromFp +
|
| - function().NumParameters()) * kWordSize));
|
| + __ leaq(RAX,
|
| + Address(RBP, (kParamEndSlotFromFp + function().NumParameters()) *
|
| + kWordSize));
|
| } else {
|
| __ leaq(RAX, Address(RBP, kFirstLocalSlotFromFp * kWordSize));
|
| }
|
| @@ -792,15 +816,13 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ExternalLabel label(NativeEntry::LinkNativeCallEntry());
|
| __ LoadNativeEntry(RBX, &label, kPatchable);
|
| } else {
|
| - stub_entry = (is_bootstrap_native()) ?
|
| - StubCode::CallBootstrapCFunction_entry() :
|
| - StubCode::CallNativeCFunction_entry();
|
| + stub_entry = (is_bootstrap_native())
|
| + ? StubCode::CallBootstrapCFunction_entry()
|
| + : StubCode::CallNativeCFunction_entry();
|
| const ExternalLabel label(reinterpret_cast<uword>(native_c_function()));
|
| __ LoadNativeEntry(RBX, &label, kNotPatchable);
|
| }
|
| - compiler->GenerateCall(token_pos(),
|
| - *stub_entry,
|
| - RawPcDescriptors::kOther,
|
| + compiler->GenerateCall(token_pos(), *stub_entry, RawPcDescriptors::kOther,
|
| locs());
|
| __ popq(result);
|
| }
|
| @@ -819,12 +841,11 @@ static bool CanBeImmediateIndex(Value* index, intptr_t cid) {
|
|
|
|
|
| LocationSummary* OneByteStringFromCharCodeInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| // TODO(fschneider): Allow immediate operands for the char code.
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| - Location::RequiresRegister(),
|
| + return LocationSummary::Make(zone, kNumInputs, Location::RequiresRegister(),
|
| LocationSummary::kNoCall);
|
| }
|
|
|
| @@ -836,8 +857,7 @@ void OneByteStringFromCharCodeInstr::EmitNativeCode(
|
| Register result = locs()->out(0).reg();
|
|
|
| __ movq(result, Address(THR, Thread::predefined_symbols_address_offset()));
|
| - __ movq(result, Address(result,
|
| - char_code,
|
| + __ movq(result, Address(result, char_code,
|
| TIMES_HALF_WORD_SIZE, // Char code is a smi.
|
| Symbols::kNullCharCodeSymbolOffset * kWordSize));
|
| }
|
| @@ -846,9 +866,7 @@ void OneByteStringFromCharCodeInstr::EmitNativeCode(
|
| LocationSummary* StringToCharCodeInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| - Location::RequiresRegister(),
|
| + return LocationSummary::Make(zone, kNumInputs, Location::RequiresRegister(),
|
| LocationSummary::kNoCall);
|
| }
|
|
|
| @@ -874,8 +892,8 @@ LocationSummary* StringInterpolateInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| summary->set_in(0, Location::RegisterLocation(RAX));
|
| summary->set_out(0, Location::RegisterLocation(RAX));
|
| return summary;
|
| @@ -887,12 +905,8 @@ void StringInterpolateInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ pushq(array);
|
| const int kNumberOfArguments = 1;
|
| const Array& kNoArgumentNames = Object::null_array();
|
| - compiler->GenerateStaticCall(deopt_id(),
|
| - token_pos(),
|
| - CallFunction(),
|
| - kNumberOfArguments,
|
| - kNoArgumentNames,
|
| - locs(),
|
| + compiler->GenerateStaticCall(deopt_id(), token_pos(), CallFunction(),
|
| + kNumberOfArguments, kNoArgumentNames, locs(),
|
| ICData::Handle());
|
| ASSERT(locs()->out(0).reg() == RAX);
|
| }
|
| @@ -901,9 +915,7 @@ void StringInterpolateInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| LocationSummary* LoadUntaggedInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| - Location::RequiresRegister(),
|
| + return LocationSummary::Make(zone, kNumInputs, Location::RequiresRegister(),
|
| LocationSummary::kNoCall);
|
| }
|
|
|
| @@ -923,9 +935,7 @@ void LoadUntaggedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| LocationSummary* LoadClassIdInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| - Location::RequiresRegister(),
|
| + return LocationSummary::Make(zone, kNumInputs, Location::RequiresRegister(),
|
| LocationSummary::kNoCall);
|
| }
|
|
|
| @@ -1038,23 +1048,25 @@ LocationSummary* LoadIndexedInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->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).
|
| if (index_scale() == 1) {
|
| - locs->set_in(1, CanBeImmediateIndex(index(), class_id())
|
| - ? Location::Constant(index()->definition()->AsConstant())
|
| - : Location::WritableRegister());
|
| + locs->set_in(1,
|
| + CanBeImmediateIndex(index(), class_id())
|
| + ? Location::Constant(index()->definition()->AsConstant())
|
| + : Location::WritableRegister());
|
| } else {
|
| - locs->set_in(1, CanBeImmediateIndex(index(), class_id())
|
| - ? Location::Constant(index()->definition()->AsConstant())
|
| - : Location::RequiresRegister());
|
| + locs->set_in(1,
|
| + CanBeImmediateIndex(index(), class_id())
|
| + ? Location::Constant(index()->definition()->AsConstant())
|
| + : Location::RequiresRegister());
|
| }
|
| - if ((representation() == kUnboxedDouble) ||
|
| + if ((representation() == kUnboxedDouble) ||
|
| (representation() == kUnboxedFloat32x4) ||
|
| - (representation() == kUnboxedInt32x4) ||
|
| + (representation() == kUnboxedInt32x4) ||
|
| (representation() == kUnboxedFloat64x2)) {
|
| locs->set_out(0, Location::RequiresFpuRegister());
|
| } else {
|
| @@ -1069,16 +1081,17 @@ void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register array = locs()->in(0).reg();
|
| const Location index = locs()->in(1);
|
|
|
| - Address element_address = index.IsRegister()
|
| - ? Assembler::ElementAddressForRegIndex(
|
| - IsExternal(), class_id(), index_scale(), array, index.reg())
|
| - : Assembler::ElementAddressForIntIndex(
|
| - IsExternal(), class_id(), index_scale(),
|
| - array, Smi::Cast(index.constant()).Value());
|
| + Address element_address =
|
| + index.IsRegister()
|
| + ? Assembler::ElementAddressForRegIndex(
|
| + IsExternal(), class_id(), index_scale(), array, index.reg())
|
| + : Assembler::ElementAddressForIntIndex(
|
| + IsExternal(), class_id(), index_scale(), array,
|
| + Smi::Cast(index.constant()).Value());
|
|
|
| - if ((representation() == kUnboxedDouble) ||
|
| + if ((representation() == kUnboxedDouble) ||
|
| (representation() == kUnboxedFloat32x4) ||
|
| - (representation() == kUnboxedInt32x4) ||
|
| + (representation() == kUnboxedInt32x4) ||
|
| (representation() == kUnboxedFloat64x2)) {
|
| if ((index_scale() == 1) && index.IsRegister()) {
|
| __ SmiUntag(index.reg());
|
| @@ -1091,7 +1104,7 @@ void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| } else if (class_id() == kTypedDataFloat64ArrayCid) {
|
| __ movsd(result, element_address);
|
| } else {
|
| - ASSERT((class_id() == kTypedDataInt32x4ArrayCid) ||
|
| + ASSERT((class_id() == kTypedDataInt32x4ArrayCid) ||
|
| (class_id() == kTypedDataFloat32x4ArrayCid) ||
|
| (class_id() == kTypedDataFloat64x2ArrayCid));
|
| __ movups(result, element_address);
|
| @@ -1123,7 +1136,7 @@ void LoadIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (representation() == kUnboxedMint) {
|
| ASSERT(class_id() == kTypedDataInt64ArrayCid);
|
| if ((index_scale() == 1) && index.IsRegister()) {
|
| - __ SmiUntag(index.reg());
|
| + __ SmiUntag(index.reg());
|
| }
|
| Register result = locs()->out(0).reg();
|
| __ movq(result, element_address);
|
| @@ -1172,8 +1185,8 @@ LocationSummary* LoadCodeUnitsInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, 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).
|
| @@ -1190,7 +1203,7 @@ void LoadCodeUnitsInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Location index = locs()->in(1);
|
|
|
| Address element_address = Assembler::ElementAddressForRegIndex(
|
| - IsExternal(), class_id(), index_scale(), str, index.reg());
|
| + IsExternal(), class_id(), index_scale(), str, index.reg());
|
|
|
| if ((index_scale() == 1)) {
|
| __ SmiUntag(index.reg());
|
| @@ -1200,19 +1213,31 @@ void LoadCodeUnitsInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case kOneByteStringCid:
|
| case kExternalOneByteStringCid:
|
| switch (element_count()) {
|
| - case 1: __ movzxb(result, element_address); break;
|
| - case 2: __ movzxw(result, element_address); break;
|
| - case 4: __ movl(result, element_address); break;
|
| - default: UNREACHABLE();
|
| + case 1:
|
| + __ movzxb(result, element_address);
|
| + break;
|
| + case 2:
|
| + __ movzxw(result, element_address);
|
| + break;
|
| + case 4:
|
| + __ movl(result, element_address);
|
| + break;
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| __ SmiTag(result);
|
| break;
|
| case kTwoByteStringCid:
|
| case kExternalTwoByteStringCid:
|
| switch (element_count()) {
|
| - case 1: __ movzxw(result, element_address); break;
|
| - case 2: __ movl(result, element_address); break;
|
| - default: UNREACHABLE();
|
| + case 1:
|
| + __ movzxw(result, element_address);
|
| + break;
|
| + case 2:
|
| + __ movl(result, element_address);
|
| + break;
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| __ SmiTag(result);
|
| break;
|
| @@ -1265,25 +1290,27 @@ LocationSummary* StoreIndexedInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 3;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->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).
|
| if (index_scale() == 1) {
|
| - locs->set_in(1, CanBeImmediateIndex(index(), class_id())
|
| - ? Location::Constant(index()->definition()->AsConstant())
|
| - : Location::WritableRegister());
|
| + locs->set_in(1,
|
| + CanBeImmediateIndex(index(), class_id())
|
| + ? Location::Constant(index()->definition()->AsConstant())
|
| + : Location::WritableRegister());
|
| } else {
|
| - locs->set_in(1, CanBeImmediateIndex(index(), class_id())
|
| - ? Location::Constant(index()->definition()->AsConstant())
|
| - : Location::RequiresRegister());
|
| + locs->set_in(1,
|
| + CanBeImmediateIndex(index(), class_id())
|
| + ? Location::Constant(index()->definition()->AsConstant())
|
| + : Location::RequiresRegister());
|
| }
|
| switch (class_id()) {
|
| case kArrayCid:
|
| locs->set_in(2, ShouldEmitStoreBarrier()
|
| - ? Location::WritableRegister()
|
| - : Location::RegisterOrConstant(value()));
|
| + ? Location::WritableRegister()
|
| + : Location::RegisterOrConstant(value()));
|
| break;
|
| case kExternalTypedDataUint8ArrayCid:
|
| case kExternalTypedDataUint8ClampedArrayCid:
|
| @@ -1328,12 +1355,13 @@ void StoreIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register array = locs()->in(0).reg();
|
| const Location index = locs()->in(1);
|
|
|
| - Address element_address = index.IsRegister()
|
| - ? Assembler::ElementAddressForRegIndex(
|
| - IsExternal(), class_id(), index_scale(), array, index.reg())
|
| - : Assembler::ElementAddressForIntIndex(
|
| - IsExternal(), class_id(), index_scale(),
|
| - array, Smi::Cast(index.constant()).Value());
|
| + Address element_address =
|
| + index.IsRegister()
|
| + ? Assembler::ElementAddressForRegIndex(
|
| + IsExternal(), class_id(), index_scale(), array, index.reg())
|
| + : Assembler::ElementAddressForIntIndex(
|
| + IsExternal(), class_id(), index_scale(), array,
|
| + Smi::Cast(index.constant()).Value());
|
|
|
| if ((index_scale() == 1) && index.IsRegister()) {
|
| __ SmiUntag(index.reg());
|
| @@ -1376,8 +1404,7 @@ void StoreIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| } else if (value < 0) {
|
| value = 0;
|
| }
|
| - __ movb(element_address,
|
| - Immediate(static_cast<int8_t>(value)));
|
| + __ movb(element_address, Immediate(static_cast<int8_t>(value)));
|
| } else {
|
| ASSERT(locs()->in(2).reg() == RAX);
|
| Label store_value, store_0xff;
|
| @@ -1439,7 +1466,7 @@ LocationSummary* GuardFieldClassInstr::MakeLocationSummary(Zone* zone,
|
|
|
| const bool emit_full_guard = !opt || (field_cid == kIllegalCid);
|
| const bool needs_value_cid_temp_reg =
|
| - (value_cid == kDynamicCid) && (emit_full_guard || (field_cid != kSmiCid));
|
| + (value_cid == kDynamicCid) && (emit_full_guard || (field_cid != kSmiCid));
|
| const bool needs_field_temp_reg = emit_full_guard;
|
|
|
| intptr_t num_temps = 0;
|
| @@ -1450,8 +1477,8 @@ LocationSummary* GuardFieldClassInstr::MakeLocationSummary(Zone* zone,
|
| num_temps++;
|
| }
|
|
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, num_temps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, num_temps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
|
|
| for (intptr_t i = 0; i < num_temps; i++) {
|
| @@ -1472,7 +1499,8 @@ void GuardFieldClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (field_cid == kDynamicCid) {
|
| if (Compiler::IsBackgroundCompilation()) {
|
| // Field state changed while compiling.
|
| - Compiler::AbortBackgroundCompilation(deopt_id(),
|
| + Compiler::AbortBackgroundCompilation(
|
| + deopt_id(),
|
| "GuardFieldClassInstr: field state changed while compiling");
|
| }
|
| ASSERT(!compiler->is_optimizing());
|
| @@ -1489,16 +1517,19 @@ void GuardFieldClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| const Register value_reg = locs()->in(0).reg();
|
|
|
| - const Register value_cid_reg = needs_value_cid_temp_reg ?
|
| - locs()->temp(0).reg() : kNoRegister;
|
| + const Register value_cid_reg =
|
| + needs_value_cid_temp_reg ? locs()->temp(0).reg() : kNoRegister;
|
|
|
| - const Register field_reg = needs_field_temp_reg ?
|
| - locs()->temp(locs()->temp_count() - 1).reg() : kNoRegister;
|
| + const Register field_reg = needs_field_temp_reg
|
| + ? locs()->temp(locs()->temp_count() - 1).reg()
|
| + : kNoRegister;
|
|
|
| Label ok, fail_label;
|
|
|
| - Label* deopt = compiler->is_optimizing() ?
|
| - compiler->AddDeoptStub(deopt_id(), ICData::kDeoptGuardField) : NULL;
|
| + Label* deopt =
|
| + compiler->is_optimizing()
|
| + ? compiler->AddDeoptStub(deopt_id(), ICData::kDeoptGuardField)
|
| + : NULL;
|
|
|
| Label* fail = (deopt != NULL) ? deopt : &fail_label;
|
|
|
| @@ -1506,8 +1537,8 @@ void GuardFieldClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ LoadObject(field_reg, Field::ZoneHandle(field().Original()));
|
|
|
| FieldAddress field_cid_operand(field_reg, Field::guarded_cid_offset());
|
| - FieldAddress field_nullability_operand(
|
| - field_reg, Field::is_nullable_offset());
|
| + FieldAddress field_nullability_operand(field_reg,
|
| + Field::is_nullable_offset());
|
|
|
| if (value_cid == kDynamicCid) {
|
| LoadValueCid(compiler, value_cid_reg, value_reg);
|
| @@ -1596,8 +1627,8 @@ LocationSummary* GuardFieldLengthInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 1;
|
| if (!opt || (field().guarded_list_length() == Field::kUnknownFixedLength)) {
|
| const intptr_t kNumTemps = 3;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| // We need temporaries for field object, length offset and expected length.
|
| summary->set_temp(0, Location::RequiresRegister());
|
| @@ -1605,8 +1636,8 @@ LocationSummary* GuardFieldLengthInstr::MakeLocationSummary(Zone* zone,
|
| summary->set_temp(2, Location::RequiresRegister());
|
| return summary;
|
| } else {
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, 0, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, 0, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| return summary;
|
| }
|
| @@ -1618,15 +1649,18 @@ void GuardFieldLengthInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (field().guarded_list_length() == Field::kNoFixedLength) {
|
| if (Compiler::IsBackgroundCompilation()) {
|
| // Field state changed while compiling.
|
| - Compiler::AbortBackgroundCompilation(deopt_id(),
|
| + Compiler::AbortBackgroundCompilation(
|
| + deopt_id(),
|
| "GuardFieldLengthInstr: field state changed while compiling");
|
| }
|
| ASSERT(!compiler->is_optimizing());
|
| return; // Nothing to emit.
|
| }
|
|
|
| - Label* deopt = compiler->is_optimizing() ?
|
| - compiler->AddDeoptStub(deopt_id(), ICData::kDeoptGuardField) : NULL;
|
| + Label* deopt =
|
| + compiler->is_optimizing()
|
| + ? compiler->AddDeoptStub(deopt_id(), ICData::kDeoptGuardField)
|
| + : NULL;
|
|
|
| const Register value_reg = locs()->in(0).reg();
|
|
|
| @@ -1640,10 +1674,12 @@ void GuardFieldLengthInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| __ LoadObject(field_reg, Field::ZoneHandle(field().Original()));
|
|
|
| - __ movsxb(offset_reg, FieldAddress(field_reg,
|
| - Field::guarded_list_length_in_object_offset_offset()));
|
| - __ movq(length_reg, FieldAddress(field_reg,
|
| - Field::guarded_list_length_offset()));
|
| + __ movsxb(
|
| + offset_reg,
|
| + FieldAddress(field_reg,
|
| + Field::guarded_list_length_in_object_offset_offset()));
|
| + __ movq(length_reg,
|
| + FieldAddress(field_reg, Field::guarded_list_length_offset()));
|
|
|
| __ cmpq(offset_reg, Immediate(0));
|
| __ j(NEGATIVE, &ok);
|
| @@ -1670,12 +1706,11 @@ void GuardFieldLengthInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(compiler->is_optimizing());
|
| ASSERT(field().guarded_list_length() >= 0);
|
| ASSERT(field().guarded_list_length_in_object_offset() !=
|
| - Field::kUnknownLengthOffset);
|
| + Field::kUnknownLengthOffset);
|
|
|
| __ CompareImmediate(
|
| - FieldAddress(value_reg,
|
| - field().guarded_list_length_in_object_offset()),
|
| - Immediate(Smi::RawValue(field().guarded_list_length())));
|
| + FieldAddress(value_reg, field().guarded_list_length_in_object_offset()),
|
| + Immediate(Smi::RawValue(field().guarded_list_length())));
|
| __ j(NOT_EQUAL, deopt);
|
| }
|
| }
|
| @@ -1686,19 +1721,16 @@ class BoxAllocationSlowPath : public SlowPathCode {
|
| BoxAllocationSlowPath(Instruction* instruction,
|
| const Class& cls,
|
| Register result)
|
| - : instruction_(instruction),
|
| - cls_(cls),
|
| - result_(result) { }
|
| + : instruction_(instruction), cls_(cls), result_(result) {}
|
|
|
| virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (Assembler::EmittingComments()) {
|
| - __ Comment("%s slow path allocation of %s",
|
| - instruction_->DebugName(),
|
| + __ Comment("%s slow path allocation of %s", instruction_->DebugName(),
|
| String::Handle(cls_.ScrubbedName()).ToCString());
|
| }
|
| __ Bind(entry_label());
|
| - const Code& stub = Code::ZoneHandle(compiler->zone(),
|
| - StubCode::GetAllocationStubForClass(cls_));
|
| + const Code& stub = Code::ZoneHandle(
|
| + compiler->zone(), StubCode::GetAllocationStubForClass(cls_));
|
| const StubEntry stub_entry(stub);
|
|
|
| LocationSummary* locs = instruction_->locs();
|
| @@ -1707,9 +1739,7 @@ class BoxAllocationSlowPath : public SlowPathCode {
|
|
|
| compiler->SaveLiveRegisters(locs);
|
| compiler->GenerateCall(TokenPosition::kNoSource, // No token position.
|
| - stub_entry,
|
| - RawPcDescriptors::kOther,
|
| - locs);
|
| + stub_entry, RawPcDescriptors::kOther, locs);
|
| compiler->AddStubCallTarget(stub);
|
| __ MoveRegister(result_, RAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -1722,20 +1752,14 @@ class BoxAllocationSlowPath : public SlowPathCode {
|
| Register result,
|
| Register temp) {
|
| if (compiler->intrinsic_mode()) {
|
| - __ TryAllocate(cls,
|
| - compiler->intrinsic_slow_path_label(),
|
| - Assembler::kFarJump,
|
| - result,
|
| - temp);
|
| + __ TryAllocate(cls, compiler->intrinsic_slow_path_label(),
|
| + Assembler::kFarJump, result, temp);
|
| } else {
|
| BoxAllocationSlowPath* slow_path =
|
| new BoxAllocationSlowPath(instruction, cls, result);
|
| compiler->AddSlowPathCode(slow_path);
|
|
|
| - __ TryAllocate(cls,
|
| - slow_path->entry_label(),
|
| - Assembler::kFarJump,
|
| - result,
|
| + __ TryAllocate(cls, slow_path->entry_label(), Assembler::kFarJump, result,
|
| temp);
|
| __ Bind(slow_path->exit_label());
|
| }
|
| @@ -1752,14 +1776,13 @@ LocationSummary* StoreInstanceFieldInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps =
|
| - (IsUnboxedStore() && opt) ? 2 :
|
| - ((IsPotentialUnboxedStore()) ? 3 : 0);
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps,
|
| - ((IsUnboxedStore() && opt && is_initialization()) ||
|
| - IsPotentialUnboxedStore())
|
| - ? LocationSummary::kCallOnSlowPath
|
| - : LocationSummary::kNoCall);
|
| + (IsUnboxedStore() && opt) ? 2 : ((IsPotentialUnboxedStore()) ? 3 : 0);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps,
|
| + ((IsUnboxedStore() && opt && is_initialization()) ||
|
| + IsPotentialUnboxedStore())
|
| + ? LocationSummary::kCallOnSlowPath
|
| + : LocationSummary::kNoCall);
|
|
|
| summary->set_in(0, Location::RequiresRegister());
|
| if (IsUnboxedStore() && opt) {
|
| @@ -1767,17 +1790,16 @@ LocationSummary* StoreInstanceFieldInstr::MakeLocationSummary(Zone* zone,
|
| summary->set_temp(0, Location::RequiresRegister());
|
| summary->set_temp(1, Location::RequiresRegister());
|
| } else if (IsPotentialUnboxedStore()) {
|
| - summary->set_in(1, ShouldEmitStoreBarrier()
|
| - ? Location::WritableRegister()
|
| - : Location::RequiresRegister());
|
| + summary->set_in(1, ShouldEmitStoreBarrier() ? Location::WritableRegister()
|
| + : Location::RequiresRegister());
|
| summary->set_temp(0, Location::RequiresRegister());
|
| summary->set_temp(1, Location::RequiresRegister());
|
| summary->set_temp(2, opt ? Location::RequiresFpuRegister()
|
| : Location::FpuRegisterLocation(XMM1));
|
| } else {
|
| summary->set_in(1, ShouldEmitStoreBarrier()
|
| - ? Location::WritableRegister()
|
| - : Location::RegisterOrConstant(value()));
|
| + ? Location::WritableRegister()
|
| + : Location::RegisterOrConstant(value()));
|
| }
|
| return summary;
|
| }
|
| @@ -1796,9 +1818,7 @@ static void EnsureMutableBox(FlowGraphCompiler* compiler,
|
| __ j(NOT_EQUAL, &done);
|
| BoxAllocationSlowPath::Allocate(compiler, instruction, cls, box_reg, temp);
|
| __ movq(temp, box_reg);
|
| - __ StoreIntoObject(instance_reg,
|
| - FieldAddress(instance_reg, offset),
|
| - temp);
|
| + __ StoreIntoObject(instance_reg, FieldAddress(instance_reg, offset), temp);
|
|
|
| __ Bind(&done);
|
| }
|
| @@ -1835,8 +1855,7 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| BoxAllocationSlowPath::Allocate(compiler, this, *cls, temp, temp2);
|
| __ movq(temp2, temp);
|
| __ StoreIntoObject(instance_reg,
|
| - FieldAddress(instance_reg, offset_in_bytes_),
|
| - temp2);
|
| + FieldAddress(instance_reg, offset_in_bytes_), temp2);
|
| } else {
|
| __ movq(temp, FieldAddress(instance_reg, offset_in_bytes_));
|
| }
|
| @@ -1852,7 +1871,7 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case kFloat64x2Cid:
|
| __ Comment("UnboxedFloat64x2StoreInstanceFieldInstr");
|
| __ movups(FieldAddress(temp, Float64x2::value_offset()), value);
|
| - break;
|
| + break;
|
| default:
|
| UNREACHABLE();
|
| }
|
| @@ -1908,13 +1927,8 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| {
|
| __ Bind(&store_double);
|
| - EnsureMutableBox(compiler,
|
| - this,
|
| - temp,
|
| - compiler->double_class(),
|
| - instance_reg,
|
| - offset_in_bytes_,
|
| - temp2);
|
| + EnsureMutableBox(compiler, this, temp, compiler->double_class(),
|
| + instance_reg, offset_in_bytes_, temp2);
|
| __ movsd(fpu_temp, FieldAddress(value_reg, Double::value_offset()));
|
| __ movsd(FieldAddress(temp, Double::value_offset()), fpu_temp);
|
| __ jmp(&skip_store);
|
| @@ -1922,13 +1936,8 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| {
|
| __ Bind(&store_float32x4);
|
| - EnsureMutableBox(compiler,
|
| - this,
|
| - temp,
|
| - compiler->float32x4_class(),
|
| - instance_reg,
|
| - offset_in_bytes_,
|
| - temp2);
|
| + EnsureMutableBox(compiler, this, temp, compiler->float32x4_class(),
|
| + instance_reg, offset_in_bytes_, temp2);
|
| __ movups(fpu_temp, FieldAddress(value_reg, Float32x4::value_offset()));
|
| __ movups(FieldAddress(temp, Float32x4::value_offset()), fpu_temp);
|
| __ jmp(&skip_store);
|
| @@ -1936,13 +1945,8 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| {
|
| __ Bind(&store_float64x2);
|
| - EnsureMutableBox(compiler,
|
| - this,
|
| - temp,
|
| - compiler->float64x2_class(),
|
| - instance_reg,
|
| - offset_in_bytes_,
|
| - temp2);
|
| + EnsureMutableBox(compiler, this, temp, compiler->float64x2_class(),
|
| + instance_reg, offset_in_bytes_, temp2);
|
| __ movups(fpu_temp, FieldAddress(value_reg, Float64x2::value_offset()));
|
| __ movups(FieldAddress(temp, Float64x2::value_offset()), fpu_temp);
|
| __ jmp(&skip_store);
|
| @@ -1954,8 +1958,7 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (ShouldEmitStoreBarrier()) {
|
| Register value_reg = locs()->in(1).reg();
|
| __ StoreIntoObject(instance_reg,
|
| - FieldAddress(instance_reg, offset_in_bytes_),
|
| - value_reg,
|
| + FieldAddress(instance_reg, offset_in_bytes_), value_reg,
|
| CanValueBeSmi());
|
| } else {
|
| if (locs()->in(1).IsConstant()) {
|
| @@ -1965,8 +1968,8 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| } else {
|
| Register value_reg = locs()->in(1).reg();
|
| __ StoreIntoObjectNoBarrier(instance_reg,
|
| - FieldAddress(instance_reg, offset_in_bytes_),
|
| - value_reg);
|
| + FieldAddress(instance_reg, offset_in_bytes_),
|
| + value_reg);
|
| }
|
| }
|
| __ Bind(&skip_store);
|
| @@ -1977,8 +1980,8 @@ LocationSummary* LoadStaticFieldInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_out(0, Location::RequiresRegister());
|
| return summary;
|
| @@ -1999,8 +2002,8 @@ void LoadStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| LocationSummary* StoreStaticFieldInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, 1, 1, LocationSummary::kNoCall);
|
| + LocationSummary* locs =
|
| + new (zone) LocationSummary(zone, 1, 1, LocationSummary::kNoCall);
|
| locs->set_in(0, value()->NeedsStoreBuffer() ? Location::WritableRegister()
|
| : Location::RequiresRegister());
|
| locs->set_temp(0, Location::RequiresRegister());
|
| @@ -2014,10 +2017,8 @@ void StoreStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| __ LoadObject(temp, Field::ZoneHandle(Z, field().Original()));
|
| if (this->value()->NeedsStoreBuffer()) {
|
| - __ StoreIntoObject(temp,
|
| - FieldAddress(temp, Field::static_value_offset()),
|
| - value,
|
| - CanValueBeSmi());
|
| + __ StoreIntoObject(temp, FieldAddress(temp, Field::static_value_offset()),
|
| + value, CanValueBeSmi());
|
| } else {
|
| __ StoreIntoObjectNoBarrier(
|
| temp, FieldAddress(temp, Field::static_value_offset()), value);
|
| @@ -2029,8 +2030,8 @@ LocationSummary* InstanceOfInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| summary->set_in(0, Location::RegisterLocation(RAX));
|
| summary->set_in(1, Location::RegisterLocation(RDX));
|
| summary->set_out(0, Location::RegisterLocation(RAX));
|
| @@ -2042,10 +2043,7 @@ void InstanceOfInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(locs()->in(0).reg() == RAX); // Value.
|
| ASSERT(locs()->in(1).reg() == RDX); // Instantiator type arguments.
|
|
|
| - compiler->GenerateInstanceOf(token_pos(),
|
| - deopt_id(),
|
| - type(),
|
| - negate_result(),
|
| + compiler->GenerateInstanceOf(token_pos(), deopt_id(), type(), negate_result(),
|
| locs());
|
| ASSERT(locs()->out(0).reg() == RAX);
|
| }
|
| @@ -2057,8 +2055,8 @@ LocationSummary* CreateArrayInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RBX));
|
| locs->set_in(1, Location::RegisterLocation(R10));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| @@ -2068,28 +2066,26 @@ LocationSummary* CreateArrayInstr::MakeLocationSummary(Zone* zone,
|
|
|
| // Inlines array allocation for known constant values.
|
| static void InlineArrayAllocation(FlowGraphCompiler* compiler,
|
| - intptr_t num_elements,
|
| - Label* slow_path,
|
| - Label* done) {
|
| + intptr_t num_elements,
|
| + Label* slow_path,
|
| + Label* done) {
|
| const int kInlineArraySize = 12; // Same as kInlineInstanceSize.
|
| const Register kLengthReg = R10;
|
| const Register kElemTypeReg = RBX;
|
| const intptr_t instance_size = Array::InstanceSize(num_elements);
|
|
|
| __ TryAllocateArray(kArrayCid, instance_size, slow_path, Assembler::kFarJump,
|
| - RAX, // instance
|
| - RCX, // end address
|
| + RAX, // instance
|
| + RCX, // end address
|
| R13); // temp
|
|
|
| // RAX: new object start as a tagged pointer.
|
| // Store the type argument field.
|
| - __ StoreIntoObjectNoBarrier(RAX,
|
| - FieldAddress(RAX, Array::type_arguments_offset()),
|
| - kElemTypeReg);
|
| + __ StoreIntoObjectNoBarrier(
|
| + RAX, FieldAddress(RAX, Array::type_arguments_offset()), kElemTypeReg);
|
|
|
| // Set the length field.
|
| - __ StoreIntoObjectNoBarrier(RAX,
|
| - FieldAddress(RAX, Array::length_offset()),
|
| + __ StoreIntoObjectNoBarrier(RAX, FieldAddress(RAX, Array::length_offset()),
|
| kLengthReg);
|
|
|
| // Initialize all array elements to raw_null.
|
| @@ -2129,8 +2125,7 @@ void CreateArrayInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(locs()->in(1).reg() == kLengthReg);
|
|
|
| Label slow_path, done;
|
| - if (compiler->is_optimizing() &&
|
| - !FLAG_precompiled_mode &&
|
| + if (compiler->is_optimizing() && !FLAG_precompiled_mode &&
|
| num_elements()->BindsToConstant() &&
|
| num_elements()->BoundConstant().IsSmi()) {
|
| const intptr_t length = Smi::Cast(num_elements()->BoundConstant()).Value();
|
| @@ -2141,11 +2136,8 @@ void CreateArrayInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ PushObject(Object::null_object()); // Make room for the result.
|
| __ pushq(kLengthReg);
|
| __ pushq(kElemTypeReg);
|
| - compiler->GenerateRuntimeCall(token_pos(),
|
| - deopt_id(),
|
| - kAllocateArrayRuntimeEntry,
|
| - 2,
|
| - locs());
|
| + compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
|
| + kAllocateArrayRuntimeEntry, 2, locs());
|
| __ Drop(2);
|
| __ popq(kResultReg);
|
| __ Bind(&done);
|
| @@ -2157,10 +2149,8 @@ void CreateArrayInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Code& stub = Code::ZoneHandle(compiler->zone(),
|
| StubCode::AllocateArray_entry()->code());
|
| compiler->AddStubCallTarget(stub);
|
| - compiler->GenerateCall(token_pos(),
|
| - *StubCode::AllocateArray_entry(),
|
| - RawPcDescriptors::kOther,
|
| - locs());
|
| + compiler->GenerateCall(token_pos(), *StubCode::AllocateArray_entry(),
|
| + RawPcDescriptors::kOther, locs());
|
| __ Bind(&done);
|
| ASSERT(locs()->out(0).reg() == kResultReg);
|
| }
|
| @@ -2170,13 +2160,11 @@ LocationSummary* LoadFieldInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps =
|
| - (IsUnboxedLoad() && opt) ? 1 :
|
| - ((IsPotentialUnboxedLoad()) ? 2 : 0);
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps,
|
| - (opt && !IsPotentialUnboxedLoad())
|
| - ? LocationSummary::kNoCall
|
| - : LocationSummary::kCallOnSlowPath);
|
| + (IsUnboxedLoad() && opt) ? 1 : ((IsPotentialUnboxedLoad()) ? 2 : 0);
|
| + LocationSummary* locs = new (zone) LocationSummary(
|
| + zone, kNumInputs, kNumTemps, (opt && !IsPotentialUnboxedLoad())
|
| + ? LocationSummary::kNoCall
|
| + : LocationSummary::kCallOnSlowPath);
|
|
|
| locs->set_in(0, Location::RequiresRegister());
|
|
|
| @@ -2257,8 +2245,8 @@ void LoadFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| {
|
| __ Bind(&load_double);
|
| - BoxAllocationSlowPath::Allocate(
|
| - compiler, this, compiler->double_class(), result, temp);
|
| + BoxAllocationSlowPath::Allocate(compiler, this, compiler->double_class(),
|
| + result, temp);
|
| __ movq(temp, FieldAddress(instance_reg, offset_in_bytes()));
|
| __ movsd(value, FieldAddress(temp, Double::value_offset()));
|
| __ movsd(FieldAddress(result, Double::value_offset()), value);
|
| @@ -2296,8 +2284,8 @@ LocationSummary* InstantiateTypeInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| @@ -2313,23 +2301,21 @@ void InstantiateTypeInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ PushObject(Object::null_object()); // Make room for the result.
|
| __ PushObject(type());
|
| __ pushq(instantiator_reg); // Push instantiator type arguments.
|
| - compiler->GenerateRuntimeCall(token_pos(),
|
| - deopt_id(),
|
| - kInstantiateTypeRuntimeEntry,
|
| - 2,
|
| - locs());
|
| - __ Drop(2); // Drop instantiator and uninstantiated type.
|
| + compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
|
| + kInstantiateTypeRuntimeEntry, 2, locs());
|
| + __ Drop(2); // Drop instantiator and uninstantiated type.
|
| __ popq(result_reg); // Pop instantiated type.
|
| ASSERT(instantiator_reg == result_reg);
|
| }
|
|
|
|
|
| LocationSummary* InstantiateTypeArgumentsInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| @@ -2384,12 +2370,10 @@ void InstantiateTypeArgumentsInstr::EmitNativeCode(
|
| __ PushObject(Object::null_object()); // Make room for the result.
|
| __ PushObject(type_arguments());
|
| __ pushq(instantiator_reg); // Push instantiator type arguments.
|
| - compiler->GenerateRuntimeCall(token_pos(),
|
| - deopt_id(),
|
| - kInstantiateTypeArgumentsRuntimeEntry,
|
| - 2,
|
| + compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
|
| + kInstantiateTypeArgumentsRuntimeEntry, 2,
|
| locs());
|
| - __ Drop(2); // Drop instantiator and uninstantiated type arguments.
|
| + __ Drop(2); // Drop instantiator and uninstantiated type arguments.
|
| __ popq(result_reg); // Pop instantiated type arguments.
|
| __ Bind(&type_arguments_instantiated);
|
| ASSERT(instantiator_reg == result_reg);
|
| @@ -2402,7 +2386,7 @@ LocationSummary* AllocateUninitializedContextInstr::MakeLocationSummary(
|
| ASSERT(opt);
|
| const intptr_t kNumInputs = 0;
|
| const intptr_t kNumTemps = 2;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| + LocationSummary* locs = new (zone) LocationSummary(
|
| zone, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
|
| locs->set_temp(0, Location::RegisterLocation(R10));
|
| locs->set_temp(1, Location::RegisterLocation(R13));
|
| @@ -2415,7 +2399,7 @@ class AllocateContextSlowPath : public SlowPathCode {
|
| public:
|
| explicit AllocateContextSlowPath(
|
| AllocateUninitializedContextInstr* instruction)
|
| - : instruction_(instruction) { }
|
| + : instruction_(instruction) {}
|
|
|
| virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Comment("AllocateContextSlowPath");
|
| @@ -2432,8 +2416,7 @@ class AllocateContextSlowPath : public SlowPathCode {
|
| compiler->AddStubCallTarget(stub);
|
| compiler->GenerateCall(instruction_->token_pos(),
|
| *StubCode::AllocateContext_entry(),
|
| - RawPcDescriptors::kOther,
|
| - locs);
|
| + RawPcDescriptors::kOther, locs);
|
| ASSERT(instruction_->locs()->out(0).reg() == RAX);
|
| compiler->RestoreLiveRegisters(instruction_->locs());
|
| __ jmp(exit_label());
|
| @@ -2457,7 +2440,7 @@ void AllocateUninitializedContextInstr::EmitNativeCode(
|
| __ TryAllocateArray(kContextCid, instance_size, slow_path->entry_label(),
|
| Assembler::kFarJump,
|
| result, // instance
|
| - temp, // end address
|
| + temp, // end address
|
| locs()->temp(1).reg());
|
|
|
| // Setup up number of context variables field.
|
| @@ -2472,8 +2455,8 @@ LocationSummary* AllocateContextInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 0;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_temp(0, Location::RegisterLocation(R10));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| @@ -2485,10 +2468,8 @@ void AllocateContextInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(locs()->out(0).reg() == RAX);
|
|
|
| __ LoadImmediate(R10, Immediate(num_context_variables()));
|
| - compiler->GenerateCall(token_pos(),
|
| - *StubCode::AllocateContext_entry(),
|
| - RawPcDescriptors::kOther,
|
| - locs());
|
| + compiler->GenerateCall(token_pos(), *StubCode::AllocateContext_entry(),
|
| + RawPcDescriptors::kOther, locs());
|
| }
|
|
|
|
|
| @@ -2496,8 +2477,8 @@ LocationSummary* InitStaticFieldInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| locs->set_temp(0, Location::RegisterLocation(RCX));
|
| return locs;
|
| @@ -2520,11 +2501,8 @@ void InitStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(&call_runtime);
|
| __ PushObject(Object::null_object()); // Make room for (unused) result.
|
| __ pushq(field);
|
| - compiler->GenerateRuntimeCall(token_pos(),
|
| - deopt_id(),
|
| - kInitStaticFieldRuntimeEntry,
|
| - 1,
|
| - locs());
|
| + compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
|
| + kInitStaticFieldRuntimeEntry, 1, locs());
|
| __ Drop(2); // Remove argument and unused result.
|
| __ Bind(&no_call);
|
| }
|
| @@ -2534,8 +2512,8 @@ LocationSummary* CloneContextInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| @@ -2548,11 +2526,8 @@ void CloneContextInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| __ PushObject(Object::null_object()); // Make room for the result.
|
| __ pushq(context_value);
|
| - compiler->GenerateRuntimeCall(token_pos(),
|
| - deopt_id(),
|
| - kCloneContextRuntimeEntry,
|
| - 1,
|
| - locs());
|
| + compiler->GenerateRuntimeCall(token_pos(), deopt_id(),
|
| + kCloneContextRuntimeEntry, 1, locs());
|
| __ popq(result); // Remove argument.
|
| __ popq(result); // Get result (cloned context).
|
| }
|
| @@ -2567,19 +2542,16 @@ LocationSummary* CatchBlockEntryInstr::MakeLocationSummary(Zone* zone,
|
|
|
| void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(compiler->GetJumpLabel(this));
|
| - compiler->AddExceptionHandler(catch_try_index(),
|
| - try_index(),
|
| + compiler->AddExceptionHandler(catch_try_index(), try_index(),
|
| compiler->assembler()->CodeSize(),
|
| - catch_handler_types_,
|
| - needs_stacktrace());
|
| + catch_handler_types_, needs_stacktrace());
|
| // On lazy deoptimization we patch the optimized code here to enter the
|
| // deoptimization stub.
|
| const intptr_t deopt_id = Thread::ToDeoptAfter(GetDeoptId());
|
| if (compiler->is_optimizing()) {
|
| compiler->AddDeoptIndexAtCall(deopt_id);
|
| } else {
|
| - compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| - deopt_id,
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id,
|
| TokenPosition::kNoSource);
|
| }
|
| if (HasParallelMove()) {
|
| @@ -2644,10 +2616,8 @@ LocationSummary* CheckStackOverflowInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 0;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs,
|
| - kNumTemps,
|
| - LocationSummary::kCallOnSlowPath);
|
| + LocationSummary* summary = new (zone) LocationSummary(
|
| + zone, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
|
| summary->set_temp(0, Location::RequiresRegister());
|
| return summary;
|
| }
|
| @@ -2656,7 +2626,7 @@ LocationSummary* CheckStackOverflowInstr::MakeLocationSummary(Zone* zone,
|
| class CheckStackOverflowSlowPath : public SlowPathCode {
|
| public:
|
| explicit CheckStackOverflowSlowPath(CheckStackOverflowInstr* instruction)
|
| - : instruction_(instruction) { }
|
| + : instruction_(instruction) {}
|
|
|
| virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (FLAG_use_osr && osr_entry_label()->IsLinked()) {
|
| @@ -2673,11 +2643,9 @@ class CheckStackOverflowSlowPath : public SlowPathCode {
|
| ASSERT(compiler->pending_deoptimization_env_ == NULL);
|
| Environment* env = compiler->SlowPathEnvironmentFor(instruction_);
|
| compiler->pending_deoptimization_env_ = env;
|
| - compiler->GenerateRuntimeCall(instruction_->token_pos(),
|
| - instruction_->deopt_id(),
|
| - kStackOverflowRuntimeEntry,
|
| - 0,
|
| - instruction_->locs());
|
| + compiler->GenerateRuntimeCall(
|
| + instruction_->token_pos(), instruction_->deopt_id(),
|
| + kStackOverflowRuntimeEntry, 0, instruction_->locs());
|
|
|
| if (FLAG_use_osr && !compiler->is_optimizing() && instruction_->in_loop()) {
|
| // In unoptimized code, record loop stack checks as possible OSR entries.
|
| @@ -2734,9 +2702,10 @@ static void EmitSmiShiftLeft(FlowGraphCompiler* compiler,
|
| Register left = locs.in(0).reg();
|
| Register result = locs.out(0).reg();
|
| ASSERT(left == result);
|
| - Label* deopt = shift_left->CanDeoptimize() ?
|
| - compiler->AddDeoptStub(shift_left->deopt_id(), ICData::kDeoptBinarySmiOp)
|
| - : NULL;
|
| + Label* deopt = shift_left->CanDeoptimize()
|
| + ? compiler->AddDeoptStub(shift_left->deopt_id(),
|
| + ICData::kDeoptBinarySmiOp)
|
| + : NULL;
|
| if (locs.in(1).IsConstant()) {
|
| const Object& constant = locs.in(1).constant();
|
| ASSERT(constant.IsSmi());
|
| @@ -2782,8 +2751,8 @@ static void EmitSmiShiftLeft(FlowGraphCompiler* compiler,
|
| const bool right_needs_check =
|
| !RangeUtils::IsWithin(right_range, 0, max_right - 1);
|
| if (right_needs_check) {
|
| - __ CompareImmediate(right,
|
| - Immediate(reinterpret_cast<int64_t>(Smi::New(max_right))));
|
| + __ CompareImmediate(
|
| + right, Immediate(reinterpret_cast<int64_t>(Smi::New(max_right))));
|
| __ j(ABOVE_EQUAL, deopt);
|
| }
|
| __ SmiUntag(right);
|
| @@ -2805,8 +2774,8 @@ static void EmitSmiShiftLeft(FlowGraphCompiler* compiler,
|
| __ j(NEGATIVE, deopt);
|
| }
|
| Label done, is_not_zero;
|
| - __ CompareImmediate(right,
|
| - Immediate(reinterpret_cast<int64_t>(Smi::New(Smi::kBits))));
|
| + __ CompareImmediate(
|
| + right, Immediate(reinterpret_cast<int64_t>(Smi::New(Smi::kBits))));
|
| __ j(BELOW, &is_not_zero, Assembler::kNearJump);
|
| __ xorq(left, left);
|
| __ jmp(&done, Assembler::kNearJump);
|
| @@ -2821,8 +2790,8 @@ static void EmitSmiShiftLeft(FlowGraphCompiler* compiler,
|
| } else {
|
| if (right_needs_check) {
|
| ASSERT(shift_left->CanDeoptimize());
|
| - __ CompareImmediate(right,
|
| - Immediate(reinterpret_cast<int64_t>(Smi::New(Smi::kBits))));
|
| + __ CompareImmediate(
|
| + right, Immediate(reinterpret_cast<int64_t>(Smi::New(Smi::kBits))));
|
| __ j(ABOVE_EQUAL, deopt);
|
| }
|
| // Left is not a constant.
|
| @@ -2844,7 +2813,7 @@ static void EmitSmiShiftLeft(FlowGraphCompiler* compiler,
|
| class CheckedSmiSlowPath : public SlowPathCode {
|
| public:
|
| CheckedSmiSlowPath(CheckedSmiOpInstr* instruction, intptr_t try_index)
|
| - : instruction_(instruction), try_index_(try_index) { }
|
| + : instruction_(instruction), try_index_(try_index) {}
|
|
|
| virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (Assembler::EmittingComments()) {
|
| @@ -2859,12 +2828,9 @@ class CheckedSmiSlowPath : public SlowPathCode {
|
| __ pushq(locs->in(0).reg());
|
| __ pushq(locs->in(1).reg());
|
| compiler->EmitMegamorphicInstanceCall(
|
| - *instruction_->call()->ic_data(),
|
| - instruction_->call()->ArgumentCount(),
|
| - instruction_->call()->deopt_id(),
|
| - instruction_->call()->token_pos(),
|
| - locs,
|
| - try_index_,
|
| + *instruction_->call()->ic_data(), instruction_->call()->ArgumentCount(),
|
| + instruction_->call()->deopt_id(), instruction_->call()->token_pos(),
|
| + locs, try_index_,
|
| /* slow_path_argument_count = */ 2);
|
| __ MoveRegister(result, RAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -2881,7 +2847,7 @@ LocationSummary* CheckedSmiOpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| + LocationSummary* summary = new (zone) LocationSummary(
|
| zone, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| @@ -2971,7 +2937,7 @@ class CheckedSmiComparisonSlowPath : public SlowPathCode {
|
| : instruction_(instruction),
|
| try_index_(try_index),
|
| labels_(labels),
|
| - merged_(merged) { }
|
| + merged_(merged) {}
|
|
|
| virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (Assembler::EmittingComments()) {
|
| @@ -2986,21 +2952,18 @@ class CheckedSmiComparisonSlowPath : public SlowPathCode {
|
| __ pushq(locs->in(0).reg());
|
| __ pushq(locs->in(1).reg());
|
| compiler->EmitMegamorphicInstanceCall(
|
| - *instruction_->call()->ic_data(),
|
| - instruction_->call()->ArgumentCount(),
|
| - instruction_->call()->deopt_id(),
|
| - instruction_->call()->token_pos(),
|
| - locs,
|
| - try_index_,
|
| + *instruction_->call()->ic_data(), instruction_->call()->ArgumentCount(),
|
| + instruction_->call()->deopt_id(), instruction_->call()->token_pos(),
|
| + locs, try_index_,
|
| /* slow_path_argument_count = */ 2);
|
| __ MoveRegister(result, RAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| if (merged_) {
|
| __ CompareObject(result, Bool::True());
|
| - __ j(EQUAL, instruction_->is_negated()
|
| - ? labels_.false_label : labels_.true_label);
|
| - __ jmp(instruction_->is_negated()
|
| - ? labels_.true_label : labels_.false_label);
|
| + __ j(EQUAL, instruction_->is_negated() ? labels_.false_label
|
| + : labels_.true_label);
|
| + __ jmp(instruction_->is_negated() ? labels_.true_label
|
| + : labels_.false_label);
|
| } else {
|
| __ jmp(exit_label());
|
| }
|
| @@ -3015,10 +2978,11 @@ class CheckedSmiComparisonSlowPath : public SlowPathCode {
|
|
|
|
|
| LocationSummary* CheckedSmiComparisonInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| + LocationSummary* summary = new (zone) LocationSummary(
|
| zone, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| @@ -3029,12 +2993,13 @@ LocationSummary* CheckedSmiComparisonInstr::MakeLocationSummary(
|
|
|
|
|
| Condition CheckedSmiComparisonInstr::EmitComparisonCode(
|
| - FlowGraphCompiler* compiler, BranchLabels labels) {
|
| + FlowGraphCompiler* compiler,
|
| + BranchLabels labels) {
|
| return EmitInt64ComparisonOp(compiler, *locs(), kind());
|
| }
|
|
|
|
|
| -#define EMIT_SMI_CHECK \
|
| +#define EMIT_SMI_CHECK \
|
| intptr_t left_cid = left()->Type()->ToCid(); \
|
| intptr_t right_cid = right()->Type()->ToCid(); \
|
| Register left = locs()->in(0).reg(); \
|
| @@ -3056,11 +3021,9 @@ Condition CheckedSmiComparisonInstr::EmitComparisonCode(
|
| void CheckedSmiComparisonInstr::EmitBranchCode(FlowGraphCompiler* compiler,
|
| BranchInstr* branch) {
|
| BranchLabels labels = compiler->CreateBranchLabels(branch);
|
| - CheckedSmiComparisonSlowPath* slow_path =
|
| - new CheckedSmiComparisonSlowPath(this,
|
| - compiler->CurrentTryIndex(),
|
| - labels,
|
| - /* merged = */ true);
|
| + CheckedSmiComparisonSlowPath* slow_path = new CheckedSmiComparisonSlowPath(
|
| + this, compiler->CurrentTryIndex(), labels,
|
| + /* merged = */ true);
|
| compiler->AddSlowPathCode(slow_path);
|
| EMIT_SMI_CHECK;
|
| Condition true_condition = EmitComparisonCode(compiler, labels);
|
| @@ -3071,12 +3034,10 @@ void CheckedSmiComparisonInstr::EmitBranchCode(FlowGraphCompiler* compiler,
|
|
|
| void CheckedSmiComparisonInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label true_label, false_label, done;
|
| - BranchLabels labels = { &true_label, &false_label, &false_label };
|
| - CheckedSmiComparisonSlowPath* slow_path =
|
| - new CheckedSmiComparisonSlowPath(this,
|
| - compiler->CurrentTryIndex(),
|
| - labels,
|
| - /* merged = */ false);
|
| + BranchLabels labels = {&true_label, &false_label, &false_label};
|
| + CheckedSmiComparisonSlowPath* slow_path = new CheckedSmiComparisonSlowPath(
|
| + this, compiler->CurrentTryIndex(), labels,
|
| + /* merged = */ false);
|
| compiler->AddSlowPathCode(slow_path);
|
| EMIT_SMI_CHECK;
|
| Condition true_condition = EmitComparisonCode(compiler, labels);
|
| @@ -3094,7 +3055,7 @@ void CheckedSmiComparisonInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| static bool CanBeImmediate(const Object& constant) {
|
| return constant.IsSmi() &&
|
| - Immediate(reinterpret_cast<int64_t>(constant.raw())).is_int32();
|
| + Immediate(reinterpret_cast<int64_t>(constant.raw())).is_int32();
|
| }
|
|
|
| static bool IsSmiValue(const Object& constant, intptr_t value) {
|
| @@ -3107,15 +3068,12 @@ LocationSummary* BinarySmiOpInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 2;
|
|
|
| ConstantInstr* right_constant = right()->definition()->AsConstant();
|
| - if ((right_constant != NULL) &&
|
| - (op_kind() != Token::kTRUNCDIV) &&
|
| - (op_kind() != Token::kSHL) &&
|
| - (op_kind() != Token::kMUL) &&
|
| - (op_kind() != Token::kMOD) &&
|
| - CanBeImmediate(right_constant->value())) {
|
| + if ((right_constant != NULL) && (op_kind() != Token::kTRUNCDIV) &&
|
| + (op_kind() != Token::kSHL) && (op_kind() != Token::kMUL) &&
|
| + (op_kind() != Token::kMOD) && CanBeImmediate(right_constant->value())) {
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::Constant(right_constant));
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -3124,8 +3082,8 @@ LocationSummary* BinarySmiOpInstr::MakeLocationSummary(Zone* zone,
|
|
|
| if (op_kind() == Token::kTRUNCDIV) {
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| if (RightIsPowerOfTwoConstant()) {
|
| summary->set_in(0, Location::RequiresRegister());
|
| ConstantInstr* right_constant = right()->definition()->AsConstant();
|
| @@ -3143,8 +3101,8 @@ LocationSummary* BinarySmiOpInstr::MakeLocationSummary(Zone* zone,
|
| return summary;
|
| } else if (op_kind() == Token::kMOD) {
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| // Both inputs must be writable because they will be untagged.
|
| summary->set_in(0, Location::RegisterLocation(RDX));
|
| summary->set_in(1, Location::WritableRegister());
|
| @@ -3154,8 +3112,8 @@ LocationSummary* BinarySmiOpInstr::MakeLocationSummary(Zone* zone,
|
| return summary;
|
| } else if (op_kind() == Token::kSHR) {
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::FixedRegisterOrSmiConstant(right(), RCX));
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -3165,8 +3123,8 @@ LocationSummary* BinarySmiOpInstr::MakeLocationSummary(Zone* zone,
|
| const bool shiftBy1 =
|
| (right_constant != NULL) && IsSmiValue(right_constant->value(), 1);
|
| const intptr_t kNumTemps = (can_overflow() && !shiftBy1) ? 1 : 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::FixedRegisterOrSmiConstant(right(), RCX));
|
| if (kNumTemps == 1) {
|
| @@ -3176,8 +3134,8 @@ LocationSummary* BinarySmiOpInstr::MakeLocationSummary(Zone* zone,
|
| return summary;
|
| } else {
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| ConstantInstr* constant = right()->definition()->AsConstant();
|
| if (constant != NULL) {
|
| @@ -3266,8 +3224,8 @@ void BinarySmiOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| // sarq operation masks the count to 6 bits.
|
| const intptr_t kCountLimit = 0x3F;
|
| const intptr_t value = Smi::Cast(constant).Value();
|
| - __ sarq(left, Immediate(
|
| - Utils::Minimum(value + kSmiTagSize, kCountLimit)));
|
| + __ sarq(left,
|
| + Immediate(Utils::Minimum(value + kSmiTagSize, kCountLimit)));
|
| __ SmiTag(left);
|
| break;
|
| }
|
| @@ -3393,7 +3351,7 @@ void BinarySmiOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(¬_32bit);
|
| __ SmiUntag(left);
|
| __ SmiUntag(right);
|
| - __ cqo(); // Sign extend RAX -> RDX:RAX.
|
| + __ cqo(); // Sign extend RAX -> RDX:RAX.
|
| __ idivq(right); // RAX: quotient, RDX: remainder.
|
| // Check the corner case of dividing the 'MIN_SMI' with -1, in which
|
| // case we cannot tag the result.
|
| @@ -3441,7 +3399,7 @@ void BinarySmiOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ SmiUntag(left);
|
| __ SmiUntag(right);
|
| __ movq(RAX, RDX);
|
| - __ cqo(); // Sign extend RAX -> RDX:RAX.
|
| + __ cqo(); // Sign extend RAX -> RDX:RAX.
|
| __ idivq(right); // RAX: quotient, RDX: remainder.
|
| __ Bind(&div_done);
|
| // res = left % right;
|
| @@ -3523,12 +3481,11 @@ LocationSummary* CheckEitherNonSmiInstr::MakeLocationSummary(Zone* zone,
|
| intptr_t right_cid = right()->Type()->ToCid();
|
| ASSERT((left_cid != kDoubleCid) && (right_cid != kDoubleCid));
|
| const intptr_t kNumInputs = 2;
|
| - const bool need_temp = (left()->definition() != right()->definition())
|
| - && (left_cid != kSmiCid)
|
| - && (right_cid != kSmiCid);
|
| + const bool need_temp = (left()->definition() != right()->definition()) &&
|
| + (left_cid != kSmiCid) && (right_cid != kSmiCid);
|
| const intptr_t kNumTemps = need_temp ? 1 : 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| if (need_temp) summary->set_temp(0, Location::RequiresRegister());
|
| @@ -3537,9 +3494,9 @@ LocationSummary* CheckEitherNonSmiInstr::MakeLocationSummary(Zone* zone,
|
|
|
|
|
| void CheckEitherNonSmiInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| - Label* deopt = compiler->AddDeoptStub(deopt_id(),
|
| - ICData::kDeoptBinaryDoubleOp,
|
| - licm_hoisted_ ? ICData::kHoisted : 0);
|
| + Label* deopt =
|
| + compiler->AddDeoptStub(deopt_id(), ICData::kDeoptBinaryDoubleOp,
|
| + licm_hoisted_ ? ICData::kHoisted : 0);
|
| intptr_t left_cid = left()->Type()->ToCid();
|
| intptr_t right_cid = right()->Type()->ToCid();
|
| Register left = locs()->in(0).reg();
|
| @@ -3560,11 +3517,10 @@ void CheckEitherNonSmiInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -LocationSummary* BoxInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| +LocationSummary* BoxInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| + LocationSummary* summary = new (zone) LocationSummary(
|
| zone, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_temp(0, Location::RequiresRegister());
|
| @@ -3578,9 +3534,9 @@ void BoxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Register temp = locs()->temp(0).reg();
|
| XmmRegister value = locs()->in(0).fpu_reg();
|
|
|
| - BoxAllocationSlowPath::Allocate(
|
| - compiler, this, compiler->BoxClassFor(from_representation()), out_reg,
|
| - temp);
|
| + BoxAllocationSlowPath::Allocate(compiler, this,
|
| + compiler->BoxClassFor(from_representation()),
|
| + out_reg, temp);
|
| __ movsd(FieldAddress(out_reg, Double::value_offset()), value);
|
| switch (from_representation()) {
|
| case kUnboxedDouble:
|
| @@ -3598,15 +3554,14 @@ void BoxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -LocationSummary* UnboxInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| +LocationSummary* UnboxInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| const bool needs_writable_input =
|
| (representation() != kUnboxedMint) &&
|
| (value()->Type()->ToNullableCid() != BoxCid());
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, needs_writable_input ? Location::WritableRegister()
|
| : Location::RequiresRegister());
|
| if (representation() == kUnboxedMint) {
|
| @@ -3684,8 +3639,8 @@ void UnboxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| EmitSmiConversion(compiler);
|
| } else {
|
| const Register box = locs()->in(0).reg();
|
| - Label* deopt = compiler->AddDeoptStub(GetDeoptId(),
|
| - ICData::kDeoptCheckClass);
|
| + Label* deopt =
|
| + compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptCheckClass);
|
| Label is_smi;
|
|
|
| if ((value()->Type()->ToNullableCid() == box_cid) &&
|
| @@ -3716,8 +3671,8 @@ LocationSummary* UnboxInteger32Instr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = (!is_truncating() && CanDeoptimize()) ? 1 : 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| if (kNumTemps > 0) {
|
| @@ -3730,8 +3685,10 @@ LocationSummary* UnboxInteger32Instr::MakeLocationSummary(Zone* zone,
|
| void UnboxInteger32Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const intptr_t value_cid = value()->Type()->ToCid();
|
| const Register value = locs()->in(0).reg();
|
| - Label* deopt = CanDeoptimize() ?
|
| - compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptUnboxInteger) : NULL;
|
| + Label* deopt =
|
| + CanDeoptimize()
|
| + ? compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptUnboxInteger)
|
| + : NULL;
|
| ASSERT(value == locs()->out(0).reg());
|
|
|
| if (value_cid == kSmiCid) {
|
| @@ -3772,16 +3729,13 @@ void UnboxInteger32Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* BoxInteger32Instr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| + bool opt) const {
|
| ASSERT((from_representation() == kUnboxedInt32) ||
|
| (from_representation() == kUnboxedUint32));
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone,
|
| - kNumInputs,
|
| - kNumTemps,
|
| - LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_out(0, Location::RequiresRegister());
|
| return summary;
|
| @@ -3808,12 +3762,10 @@ LocationSummary* BoxInt64Instr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = ValueFitsSmi() ? 0 : 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone,
|
| - kNumInputs,
|
| - kNumTemps,
|
| - ValueFitsSmi() ? LocationSummary::kNoCall
|
| - : LocationSummary::kCallOnSlowPath);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps,
|
| + ValueFitsSmi() ? LocationSummary::kNoCall
|
| + : LocationSummary::kCallOnSlowPath);
|
| summary->set_in(0, Location::RequiresRegister());
|
| if (!ValueFitsSmi()) {
|
| summary->set_temp(0, Location::RequiresRegister());
|
| @@ -3832,8 +3784,8 @@ void BoxInt64Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register temp = locs()->temp(0).reg();
|
| Label done;
|
| __ j(NO_OVERFLOW, &done);
|
| - BoxAllocationSlowPath::Allocate(
|
| - compiler, this, compiler->mint_class(), out, temp);
|
| + BoxAllocationSlowPath::Allocate(compiler, this, compiler->mint_class(), out,
|
| + temp);
|
| __ movq(FieldAddress(out, Mint::value_offset()), value);
|
| __ Bind(&done);
|
| }
|
| @@ -3844,8 +3796,8 @@ LocationSummary* BinaryDoubleOpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -3860,11 +3812,20 @@ void BinaryDoubleOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(locs()->out(0).fpu_reg() == left);
|
|
|
| switch (op_kind()) {
|
| - case Token::kADD: __ addsd(left, right); break;
|
| - case Token::kSUB: __ subsd(left, right); break;
|
| - case Token::kMUL: __ mulsd(left, right); break;
|
| - case Token::kDIV: __ divsd(left, right); break;
|
| - default: UNREACHABLE();
|
| + case Token::kADD:
|
| + __ addsd(left, right);
|
| + break;
|
| + case Token::kSUB:
|
| + __ subsd(left, right);
|
| + break;
|
| + case Token::kMUL:
|
| + __ mulsd(left, right);
|
| + break;
|
| + case Token::kDIV:
|
| + __ divsd(left, right);
|
| + break;
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -3874,8 +3835,8 @@ LocationSummary* DoubleTestOpInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps =
|
| (op_kind() == MethodRecognizer::kDouble_getIsInfinite) ? 1 : 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| if (op_kind() == MethodRecognizer::kDouble_getIsInfinite) {
|
| summary->set_temp(0, Location::RequiresRegister());
|
| @@ -3921,9 +3882,9 @@ void DoubleTestOpInstr::EmitBranchCode(FlowGraphCompiler* compiler,
|
|
|
| void DoubleTestOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label is_true, is_false;
|
| - BranchLabels labels = { &is_true, &is_false, &is_false };
|
| + BranchLabels labels = {&is_true, &is_false, &is_false};
|
| Condition true_condition = EmitComparisonCode(compiler, labels);
|
| - EmitBranchOnCondition(compiler, true_condition, labels);
|
| + EmitBranchOnCondition(compiler, true_condition, labels);
|
|
|
| Register result = locs()->out(0).reg();
|
| Label done;
|
| @@ -3940,8 +3901,8 @@ LocationSummary* BinaryFloat32x4OpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -3956,11 +3917,20 @@ void BinaryFloat32x4OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(locs()->out(0).fpu_reg() == left);
|
|
|
| switch (op_kind()) {
|
| - case Token::kADD: __ addps(left, right); break;
|
| - case Token::kSUB: __ subps(left, right); break;
|
| - case Token::kMUL: __ mulps(left, right); break;
|
| - case Token::kDIV: __ divps(left, right); break;
|
| - default: UNREACHABLE();
|
| + case Token::kADD:
|
| + __ addps(left, right);
|
| + break;
|
| + case Token::kSUB:
|
| + __ subps(left, right);
|
| + break;
|
| + case Token::kMUL:
|
| + __ mulps(left, right);
|
| + break;
|
| + case Token::kDIV:
|
| + __ divps(left, right);
|
| + break;
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -3969,8 +3939,8 @@ LocationSummary* BinaryFloat64x2OpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -3985,11 +3955,20 @@ void BinaryFloat64x2OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(locs()->out(0).fpu_reg() == left);
|
|
|
| switch (op_kind()) {
|
| - case Token::kADD: __ addpd(left, right); break;
|
| - case Token::kSUB: __ subpd(left, right); break;
|
| - case Token::kMUL: __ mulpd(left, right); break;
|
| - case Token::kDIV: __ divpd(left, right); break;
|
| - default: UNREACHABLE();
|
| + case Token::kADD:
|
| + __ addpd(left, right);
|
| + break;
|
| + case Token::kSUB:
|
| + __ subpd(left, right);
|
| + break;
|
| + case Token::kMUL:
|
| + __ mulpd(left, right);
|
| + break;
|
| + case Token::kDIV:
|
| + __ divpd(left, right);
|
| + break;
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -3998,8 +3977,8 @@ LocationSummary* Simd32x4ShuffleInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4032,7 +4011,8 @@ void Simd32x4ShuffleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kInt32x4Shuffle:
|
| __ shufps(value, value, Immediate(mask_));
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4041,8 +4021,8 @@ LocationSummary* Simd32x4ShuffleMixInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4060,7 +4040,8 @@ void Simd32x4ShuffleMixInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kInt32x4ShuffleMix:
|
| __ shufps(left, right, Immediate(mask_));
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4069,8 +4050,8 @@ LocationSummary* Simd32x4GetSignMaskInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::RequiresRegister());
|
| return summary;
|
| @@ -4087,11 +4068,12 @@ void Simd32x4GetSignMaskInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* Float32x4ConstructorInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 4;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_in(2, Location::RequiresFpuRegister());
|
| @@ -4128,8 +4110,8 @@ LocationSummary* Float32x4ZeroInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 0;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_out(0, Location::RequiresFpuRegister());
|
| return summary;
|
| }
|
| @@ -4145,8 +4127,8 @@ LocationSummary* Float32x4SplatInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4167,8 +4149,8 @@ LocationSummary* Float32x4ComparisonInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4202,7 +4184,8 @@ void Float32x4ComparisonInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ cmppsle(left, right);
|
| break;
|
|
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4211,8 +4194,8 @@ LocationSummary* Float32x4MinMaxInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4233,7 +4216,8 @@ void Float32x4MinMaxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kFloat32x4Max:
|
| __ maxps(left, right);
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4242,8 +4226,8 @@ LocationSummary* Float32x4ScaleInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4263,7 +4247,8 @@ void Float32x4ScaleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ shufps(left, left, Immediate(0x00));
|
| __ mulps(left, right);
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4272,8 +4257,8 @@ LocationSummary* Float32x4SqrtInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4295,7 +4280,8 @@ void Float32x4SqrtInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kFloat32x4ReciprocalSqrt:
|
| __ rsqrtps(left);
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4304,8 +4290,8 @@ LocationSummary* Float32x4ZeroArgInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4323,7 +4309,8 @@ void Float32x4ZeroArgInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kFloat32x4Absolute:
|
| __ absps(left);
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4332,8 +4319,8 @@ LocationSummary* Float32x4ClampInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 3;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_in(2, Location::RequiresFpuRegister());
|
| @@ -4356,8 +4343,8 @@ LocationSummary* Float32x4WithInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4416,7 +4403,8 @@ void Float32x4WithInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ movups(replacement, Address(RSP, 0));
|
| __ AddImmediate(RSP, Immediate(16));
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4425,8 +4413,8 @@ LocationSummary* Float32x4ToInt32x4Instr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4442,8 +4430,8 @@ LocationSummary* Simd64x2ShuffleInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4461,7 +4449,8 @@ void Simd64x2ShuffleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kFloat64x2GetY:
|
| __ shufpd(value, value, Immediate(0x33));
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4470,8 +4459,8 @@ LocationSummary* Float64x2ZeroInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 0;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_out(0, Location::RequiresFpuRegister());
|
| return summary;
|
| }
|
| @@ -4487,8 +4476,8 @@ LocationSummary* Float64x2SplatInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4502,11 +4491,12 @@ void Float64x2SplatInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* Float64x2ConstructorInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4526,11 +4516,12 @@ void Float64x2ConstructorInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* Float64x2ToFloat32x4Instr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4544,11 +4535,12 @@ void Float64x2ToFloat32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* Float32x4ToFloat64x2Instr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4565,8 +4557,8 @@ LocationSummary* Float64x2ZeroArgInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| if (representation() == kTagged) {
|
| ASSERT(op_kind() == MethodRecognizer::kFloat64x2GetSignMask);
|
| @@ -4599,7 +4591,8 @@ void Float64x2ZeroArgInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ movmskpd(locs()->out(0).reg(), left);
|
| __ SmiTag(locs()->out(0).reg());
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4608,8 +4601,8 @@ LocationSummary* Float64x2OneArgInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4653,17 +4646,18 @@ void Float64x2OneArgInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kFloat64x2Max:
|
| __ maxpd(left, right);
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
|
|
| -LocationSummary* Int32x4ConstructorInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| +LocationSummary* Int32x4ConstructorInstr::MakeLocationSummary(Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 4;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| summary->set_in(2, Location::RequiresRegister());
|
| @@ -4690,11 +4684,12 @@ void Int32x4ConstructorInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* Int32x4BoolConstructorInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 4;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| summary->set_in(2, Location::RequiresRegister());
|
| @@ -4763,8 +4758,8 @@ LocationSummary* Int32x4GetFlagInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::RequiresRegister());
|
| return summary;
|
| @@ -4792,7 +4787,8 @@ void Int32x4GetFlagInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case MethodRecognizer::kInt32x4GetFlagW:
|
| __ movl(result, Address(RSP, 12));
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| __ AddImmediate(RSP, Immediate(16));
|
| __ testl(result, result);
|
| @@ -4809,8 +4805,8 @@ LocationSummary* Int32x4SelectInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 3;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_in(2, Location::RequiresFpuRegister());
|
| @@ -4844,8 +4840,8 @@ LocationSummary* Int32x4SetFlagInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| summary->set_temp(0, Location::RequiresRegister());
|
| @@ -4873,7 +4869,7 @@ void Int32x4SetFlagInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(&falsePath);
|
| __ LoadImmediate(temp, Immediate(0x0));
|
| __ movl(Address(RSP, 0), temp);
|
| - break;
|
| + break;
|
| case MethodRecognizer::kInt32x4WithFlagY:
|
| __ LoadImmediate(temp, Immediate(0xFFFFFFFF));
|
| __ movl(Address(RSP, 4), temp);
|
| @@ -4881,7 +4877,7 @@ void Int32x4SetFlagInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(&falsePath);
|
| __ LoadImmediate(temp, Immediate(0x0));
|
| __ movl(Address(RSP, 4), temp);
|
| - break;
|
| + break;
|
| case MethodRecognizer::kInt32x4WithFlagZ:
|
| __ LoadImmediate(temp, Immediate(0xFFFFFFFF));
|
| __ movl(Address(RSP, 8), temp);
|
| @@ -4889,7 +4885,7 @@ void Int32x4SetFlagInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(&falsePath);
|
| __ LoadImmediate(temp, Immediate(0x0));
|
| __ movl(Address(RSP, 8), temp);
|
| - break;
|
| + break;
|
| case MethodRecognizer::kInt32x4WithFlagW:
|
| __ LoadImmediate(temp, Immediate(0xFFFFFFFF));
|
| __ movl(Address(RSP, 12), temp);
|
| @@ -4897,8 +4893,9 @@ void Int32x4SetFlagInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(&falsePath);
|
| __ LoadImmediate(temp, Immediate(0x0));
|
| __ movl(Address(RSP, 12), temp);
|
| - break;
|
| - default: UNREACHABLE();
|
| + break;
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| __ Bind(&exitPath);
|
| // Copy mask back to register.
|
| @@ -4911,8 +4908,8 @@ LocationSummary* Int32x4ToFloat32x4Instr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -4928,8 +4925,8 @@ LocationSummary* BinaryInt32x4OpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4960,7 +4957,8 @@ void BinaryInt32x4OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case Token::kSUB:
|
| __ subpl(left, right);
|
| break;
|
| - default: UNREACHABLE();
|
| + default:
|
| + UNREACHABLE();
|
| }
|
| }
|
|
|
| @@ -4971,8 +4969,8 @@ LocationSummary* MathUnaryInstr::MakeLocationSummary(Zone* zone,
|
| (kind() == MathUnaryInstr::kDoubleSquare));
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| if (kind() == MathUnaryInstr::kDoubleSquare) {
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -4997,10 +4995,11 @@ void MathUnaryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* CaseInsensitiveCompareUC16Instr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, InputCount(), kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, InputCount(), kNumTemps, LocationSummary::kCall);
|
| summary->set_in(0, Location::RegisterLocation(CallingConventions::kArg1Reg));
|
| summary->set_in(1, Location::RegisterLocation(CallingConventions::kArg2Reg));
|
| summary->set_in(2, Location::RegisterLocation(CallingConventions::kArg3Reg));
|
| @@ -5012,7 +5011,6 @@ LocationSummary* CaseInsensitiveCompareUC16Instr::MakeLocationSummary(
|
|
|
| void CaseInsensitiveCompareUC16Instr::EmitNativeCode(
|
| FlowGraphCompiler* compiler) {
|
| -
|
| // Save RSP. R13 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 = R13;
|
| @@ -5030,9 +5028,7 @@ void CaseInsensitiveCompareUC16Instr::EmitNativeCode(
|
| LocationSummary* UnarySmiOpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| - return LocationSummary::Make(zone,
|
| - kNumInputs,
|
| - Location::SameAsFirstInput(),
|
| + return LocationSummary::Make(zone, kNumInputs, Location::SameAsFirstInput(),
|
| LocationSummary::kNoCall);
|
| }
|
|
|
| @@ -5062,8 +5058,8 @@ LocationSummary* UnaryDoubleOpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -5082,8 +5078,8 @@ LocationSummary* MathMinMaxInstr::MakeLocationSummary(Zone* zone,
|
| if (result_cid() == kDoubleCid) {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresFpuRegister());
|
| summary->set_in(1, Location::RequiresFpuRegister());
|
| // Reuse the left register so that code can be made shorter.
|
| @@ -5094,8 +5090,8 @@ LocationSummary* MathMinMaxInstr::MakeLocationSummary(Zone* zone,
|
| ASSERT(result_cid() == kSmiCid);
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| // Reuse the left register so that code can be made shorter.
|
| @@ -5168,11 +5164,11 @@ void MathMinMaxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* Int32ToDoubleInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| result->set_in(0, Location::RequiresRegister());
|
| result->set_out(0, Location::RequiresFpuRegister());
|
| return result;
|
| @@ -5190,8 +5186,8 @@ LocationSummary* SmiToDoubleInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| result->set_in(0, Location::WritableRegister());
|
| result->set_out(0, Location::RequiresFpuRegister());
|
| return result;
|
| @@ -5222,8 +5218,8 @@ LocationSummary* DoubleToIntegerInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| result->set_in(0, Location::RegisterLocation(RCX));
|
| result->set_out(0, Location::RegisterLocation(RAX));
|
| result->set_temp(0, Location::RegisterLocation(RBX));
|
| @@ -5257,13 +5253,10 @@ void DoubleToIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| const intptr_t kNumberOfArguments = 1;
|
| __ pushq(value_obj);
|
| - compiler->GenerateStaticCall(deopt_id(),
|
| - instance_call()->token_pos(),
|
| - target,
|
| + compiler->GenerateStaticCall(deopt_id(), instance_call()->token_pos(), target,
|
| kNumberOfArguments,
|
| Object::null_array(), // No argument names.
|
| - locs(),
|
| - ICData::Handle());
|
| + locs(), ICData::Handle());
|
| __ Bind(&done);
|
| }
|
|
|
| @@ -5272,8 +5265,8 @@ LocationSummary* DoubleToSmiInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| result->set_in(0, Location::RequiresFpuRegister());
|
| result->set_out(0, Location::RequiresRegister());
|
| result->set_temp(0, Location::RequiresRegister());
|
| @@ -5302,8 +5295,8 @@ LocationSummary* DoubleToDoubleInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| result->set_in(0, Location::RequiresFpuRegister());
|
| result->set_out(0, Location::RequiresFpuRegister());
|
| return result;
|
| @@ -5315,13 +5308,13 @@ void DoubleToDoubleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| XmmRegister result = locs()->out(0).fpu_reg();
|
| switch (recognized_kind()) {
|
| case MethodRecognizer::kDoubleTruncate:
|
| - __ roundsd(result, value, Assembler::kRoundToZero);
|
| + __ roundsd(result, value, Assembler::kRoundToZero);
|
| break;
|
| case MethodRecognizer::kDoubleFloor:
|
| - __ roundsd(result, value, Assembler::kRoundDown);
|
| + __ roundsd(result, value, Assembler::kRoundDown);
|
| break;
|
| case MethodRecognizer::kDoubleCeil:
|
| - __ roundsd(result, value, Assembler::kRoundUp);
|
| + __ roundsd(result, value, Assembler::kRoundUp);
|
| break;
|
| default:
|
| UNREACHABLE();
|
| @@ -5333,8 +5326,8 @@ LocationSummary* DoubleToFloatInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| result->set_in(0, Location::RequiresFpuRegister());
|
| result->set_out(0, Location::SameAsFirstInput());
|
| return result;
|
| @@ -5350,8 +5343,8 @@ LocationSummary* FloatToDoubleInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| result->set_in(0, Location::RequiresFpuRegister());
|
| result->set_out(0, Location::SameAsFirstInput());
|
| return result;
|
| @@ -5373,8 +5366,8 @@ LocationSummary* InvokeMathCFunctionInstr::MakeLocationSummary(Zone* zone,
|
| ASSERT((InputCount() == 1) || (InputCount() == 2));
|
| const intptr_t kNumTemps =
|
| (recognized_kind() == MethodRecognizer::kMathDoublePow) ? 3 : 1;
|
| - LocationSummary* result = new(zone) LocationSummary(
|
| - zone, InputCount(), kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* result = new (zone)
|
| + LocationSummary(zone, InputCount(), kNumTemps, LocationSummary::kCall);
|
| ASSERT(R13 != CALLEE_SAVED_TEMP);
|
| ASSERT(((1 << R13) & CallingConventions::kCalleeSaveCpuRegisters) != 0);
|
| result->set_temp(0, Location::RegisterLocation(R13));
|
| @@ -5418,8 +5411,7 @@ static void InvokeDoublePow(FlowGraphCompiler* compiler,
|
| XmmRegister base = locs->in(0).fpu_reg();
|
| XmmRegister exp = locs->in(1).fpu_reg();
|
| XmmRegister result = locs->out(0).fpu_reg();
|
| - Register temp =
|
| - locs->temp(InvokeMathCFunctionInstr::kObjectTempIndex).reg();
|
| + Register temp = locs->temp(InvokeMathCFunctionInstr::kObjectTempIndex).reg();
|
| XmmRegister zero_temp =
|
| locs->temp(InvokeMathCFunctionInstr::kDoubleTempIndex).fpu_reg();
|
|
|
| @@ -5488,8 +5480,7 @@ static void InvokeDoublePow(FlowGraphCompiler* compiler,
|
| Label do_pow, return_zero;
|
| __ Bind(&try_sqrt);
|
| // Before calling pow, check if we could use sqrt instead of pow.
|
| - __ LoadObject(temp,
|
| - Double::ZoneHandle(Double::NewCanonical(kNegInfinity)));
|
| + __ LoadObject(temp, Double::ZoneHandle(Double::NewCanonical(kNegInfinity)));
|
| __ movsd(result, FieldAddress(temp, Double::value_offset()));
|
| // base == -Infinity -> call pow;
|
| __ comisd(base, result);
|
| @@ -5553,27 +5544,27 @@ LocationSummary* ExtractNthOutputInstr::MakeLocationSummary(Zone* zone,
|
| // Only use this instruction in optimized code.
|
| ASSERT(opt);
|
| const intptr_t kNumInputs = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, 0, LocationSummary::kNoCall);
|
| + LocationSummary* summary =
|
| + new (zone) LocationSummary(zone, kNumInputs, 0, LocationSummary::kNoCall);
|
| if (representation() == kUnboxedDouble) {
|
| if (index() == 0) {
|
| - summary->set_in(0, Location::Pair(Location::RequiresFpuRegister(),
|
| - Location::Any()));
|
| + summary->set_in(
|
| + 0, Location::Pair(Location::RequiresFpuRegister(), Location::Any()));
|
| } else {
|
| ASSERT(index() == 1);
|
| - summary->set_in(0, Location::Pair(Location::Any(),
|
| - Location::RequiresFpuRegister()));
|
| + summary->set_in(
|
| + 0, Location::Pair(Location::Any(), Location::RequiresFpuRegister()));
|
| }
|
| summary->set_out(0, Location::RequiresFpuRegister());
|
| } else {
|
| ASSERT(representation() == kTagged);
|
| if (index() == 0) {
|
| - summary->set_in(0, Location::Pair(Location::RequiresRegister(),
|
| - Location::Any()));
|
| + summary->set_in(
|
| + 0, Location::Pair(Location::RequiresRegister(), Location::Any()));
|
| } else {
|
| ASSERT(index() == 1);
|
| - summary->set_in(0, Location::Pair(Location::Any(),
|
| - Location::RequiresRegister()));
|
| + summary->set_in(
|
| + 0, Location::Pair(Location::Any(), Location::RequiresRegister()));
|
| }
|
| summary->set_out(0, Location::RequiresRegister());
|
| }
|
| @@ -5603,8 +5594,8 @@ LocationSummary* MergedMathInstr::MakeLocationSummary(Zone* zone,
|
| if (kind() == MergedMathInstr::kTruncDivMod) {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| // Both inputs must be writable because they will be untagged.
|
| summary->set_in(0, Location::RegisterLocation(RAX));
|
| summary->set_in(1, Location::WritableRegister());
|
| @@ -5615,8 +5606,8 @@ LocationSummary* MergedMathInstr::MakeLocationSummary(Zone* zone,
|
| if (kind() == MergedMathInstr::kSinCos) {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 1;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| // Because we always call into the runtime (LocationSummary::kCall) we
|
| // must specify each input, temp, and output register explicitly.
|
| summary->set_in(0, Location::FpuRegisterLocation(XMM1));
|
| @@ -5632,18 +5623,20 @@ LocationSummary* MergedMathInstr::MakeLocationSummary(Zone* zone,
|
| }
|
|
|
|
|
| -
|
| -typedef void (*SinCosCFunction) (double x, double* res_sin, double* res_cos);
|
| +typedef void (*SinCosCFunction)(double x, double* res_sin, double* res_cos);
|
|
|
| extern const RuntimeEntry kSinCosRuntimeEntry(
|
| - "libc_sincos", reinterpret_cast<RuntimeFunction>(
|
| - static_cast<SinCosCFunction>(&SinCos)), 1, true, true);
|
| + "libc_sincos",
|
| + reinterpret_cast<RuntimeFunction>(static_cast<SinCosCFunction>(&SinCos)),
|
| + 1,
|
| + true,
|
| + true);
|
|
|
|
|
| void MergedMathInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label* deopt = NULL;
|
| if (CanDeoptimize()) {
|
| - deopt = compiler->AddDeoptStub(deopt_id(), ICData::kDeoptBinarySmiOp);
|
| + deopt = compiler->AddDeoptStub(deopt_id(), ICData::kDeoptBinarySmiOp);
|
| }
|
| if (kind() == MergedMathInstr::kTruncDivMod) {
|
| Register left = locs()->in(0).reg();
|
| @@ -5689,7 +5682,7 @@ void MergedMathInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Bind(¬_32bit);
|
| __ SmiUntag(left);
|
| __ SmiUntag(right);
|
| - __ cqo(); // Sign extend RAX -> RDX:RAX.
|
| + __ cqo(); // Sign extend RAX -> RDX:RAX.
|
| __ idivq(right); // RAX: quotient, RDX: remainder.
|
| // Check the corner case of dividing the 'MIN_SMI' with -1, in which
|
| // case we cannot tag the result.
|
| @@ -5762,7 +5755,7 @@ void MergedMathInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| __ CallRuntime(kSinCosRuntimeEntry, InputCount());
|
| __ movsd(out2, Address(RSP, 2 * kWordSize + kDoubleSize * 2)); // sin.
|
| - __ movsd(out1, Address(RSP, 2 * kWordSize + kDoubleSize)); // cos.
|
| + __ movsd(out1, Address(RSP, 2 * kWordSize + kDoubleSize)); // cos.
|
| // Restore RSP.
|
| __ movq(RSP, locs()->temp(0).reg());
|
|
|
| @@ -5773,13 +5766,13 @@ void MergedMathInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* PolymorphicInstanceCallInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| + Zone* zone,
|
| + bool opt) const {
|
| return MakeCallSummary(zone);
|
| }
|
|
|
|
|
| -LocationSummary* BranchInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| +LocationSummary* BranchInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| comparison()->InitializeLocationSummary(zone, opt);
|
| // Branches don't produce a result.
|
| comparison()->locs()->set_out(0, Location::NoLocation());
|
| @@ -5797,8 +5790,8 @@ LocationSummary* CheckClassInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 1;
|
| const bool need_mask_temp = IsDenseSwitch() && !IsDenseMask(ComputeCidMask());
|
| const intptr_t kNumTemps = !IsNullCheck() ? (need_mask_temp ? 2 : 1) : 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| if (!IsNullCheck()) {
|
| summary->set_temp(0, Location::RequiresRegister());
|
| @@ -5811,12 +5804,10 @@ LocationSummary* CheckClassInstr::MakeLocationSummary(Zone* zone,
|
|
|
|
|
| void CheckClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| - Label* deopt = compiler->AddDeoptStub(deopt_id(),
|
| - ICData::kDeoptCheckClass,
|
| + Label* deopt = compiler->AddDeoptStub(deopt_id(), ICData::kDeoptCheckClass,
|
| licm_hoisted_ ? ICData::kHoisted : 0);
|
| if (IsNullCheck()) {
|
| - __ CompareObject(locs()->in(0).reg(),
|
| - Object::null_object());
|
| + __ CompareObject(locs()->in(0).reg(), Object::null_object());
|
| Condition cond = DeoptIfNull() ? EQUAL : NOT_EQUAL;
|
| __ j(cond, deopt);
|
| return;
|
| @@ -5853,8 +5844,7 @@ void CheckClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
| } else {
|
| GrowableArray<CidTarget> sorted_ic_data;
|
| - FlowGraphCompiler::SortICDataByCount(unary_checks(),
|
| - &sorted_ic_data,
|
| + FlowGraphCompiler::SortICDataByCount(unary_checks(), &sorted_ic_data,
|
| /* drop_smi = */ true);
|
| const intptr_t num_checks = sorted_ic_data.length();
|
| const bool use_near_jump = num_checks < 5;
|
| @@ -5880,8 +5870,8 @@ LocationSummary* CheckSmiInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| return summary;
|
| }
|
| @@ -5889,8 +5879,7 @@ LocationSummary* CheckSmiInstr::MakeLocationSummary(Zone* zone,
|
|
|
| void CheckSmiInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Register value = locs()->in(0).reg();
|
| - Label* deopt = compiler->AddDeoptStub(deopt_id(),
|
| - ICData::kDeoptCheckSmi,
|
| + Label* deopt = compiler->AddDeoptStub(deopt_id(), ICData::kDeoptCheckSmi,
|
| licm_hoisted_ ? ICData::kHoisted : 0);
|
| __ BranchIfNotSmi(value, deopt);
|
| }
|
| @@ -5900,8 +5889,8 @@ LocationSummary* CheckClassIdInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| return summary;
|
| }
|
| @@ -5919,7 +5908,7 @@ LocationSummary* GenericCheckBoundInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| + LocationSummary* locs = new (zone) LocationSummary(
|
| zone, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
|
| locs->set_in(kLengthPos, Location::RequiresRegister());
|
| locs->set_in(kIndexPos, Location::RequiresRegister());
|
| @@ -5930,7 +5919,7 @@ LocationSummary* GenericCheckBoundInstr::MakeLocationSummary(Zone* zone,
|
| class RangeErrorSlowPath : public SlowPathCode {
|
| public:
|
| RangeErrorSlowPath(GenericCheckBoundInstr* instruction, intptr_t try_index)
|
| - : instruction_(instruction), try_index_(try_index) { }
|
| + : instruction_(instruction), try_index_(try_index) {}
|
|
|
| virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (Assembler::EmittingComments()) {
|
| @@ -5942,11 +5931,8 @@ class RangeErrorSlowPath : public SlowPathCode {
|
| __ pushq(locs->in(1).reg());
|
| __ CallRuntime(kRangeErrorRuntimeEntry, 2);
|
| compiler->pc_descriptors_list()->AddDescriptor(
|
| - RawPcDescriptors::kOther,
|
| - compiler->assembler()->CodeSize(),
|
| - instruction_->deopt_id(),
|
| - instruction_->token_pos(),
|
| - try_index_);
|
| + RawPcDescriptors::kOther, compiler->assembler()->CodeSize(),
|
| + instruction_->deopt_id(), instruction_->token_pos(), try_index_);
|
| compiler->RecordSafepoint(locs, 2);
|
| __ int3();
|
| }
|
| @@ -5979,8 +5965,8 @@ LocationSummary* CheckArrayBoundInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(kLengthPos, Location::RegisterOrSmiConstant(length()));
|
| locs->set_in(kIndexPos, Location::RegisterOrSmiConstant(index()));
|
| return locs;
|
| @@ -5990,10 +5976,8 @@ LocationSummary* CheckArrayBoundInstr::MakeLocationSummary(Zone* zone,
|
| void CheckArrayBoundInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| uint32_t flags = generalized_ ? ICData::kGeneralized : 0;
|
| flags |= licm_hoisted_ ? ICData::kHoisted : 0;
|
| - Label* deopt = compiler->AddDeoptStub(
|
| - deopt_id(),
|
| - ICData::kDeoptCheckArrayBound,
|
| - flags);
|
| + Label* deopt =
|
| + compiler->AddDeoptStub(deopt_id(), ICData::kDeoptCheckArrayBound, flags);
|
|
|
| Location length_loc = locs()->in(kLengthPos);
|
| Location index_loc = locs()->in(kIndexPos);
|
| @@ -6012,8 +5996,8 @@ void CheckArrayBoundInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| if (index_loc.IsConstant()) {
|
| Register length = length_loc.reg();
|
| const Smi& index = Smi::Cast(index_loc.constant());
|
| - __ CompareImmediate(
|
| - length, Immediate(reinterpret_cast<int64_t>(index.raw())));
|
| + __ CompareImmediate(length,
|
| + Immediate(reinterpret_cast<int64_t>(index.raw())));
|
| __ j(BELOW_EQUAL, deopt);
|
| } else if (length_loc.IsConstant()) {
|
| const Smi& length = Smi::Cast(length_loc.constant());
|
| @@ -6025,8 +6009,8 @@ void CheckArrayBoundInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ testq(index, index);
|
| __ j(NEGATIVE, deopt);
|
| } else {
|
| - __ CompareImmediate(
|
| - index, Immediate(reinterpret_cast<int64_t>(length.raw())));
|
| + __ CompareImmediate(index,
|
| + Immediate(reinterpret_cast<int64_t>(length.raw())));
|
| __ j(ABOVE_EQUAL, deopt);
|
| }
|
| } else {
|
| @@ -6041,7 +6025,7 @@ void CheckArrayBoundInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -template<typename OperandType>
|
| +template <typename OperandType>
|
| static void EmitInt64Arithmetic(FlowGraphCompiler* compiler,
|
| Token::Kind op_kind,
|
| Register left,
|
| @@ -6077,8 +6061,8 @@ LocationSummary* BinaryMintOpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -6106,8 +6090,8 @@ LocationSummary* UnaryMintOpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -6126,8 +6110,8 @@ void UnaryMintOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| static const intptr_t kMintShiftCountLimit = 63;
|
|
|
| bool ShiftMintOpInstr::has_shift_count_check() const {
|
| - return !RangeUtils::IsWithin(
|
| - right()->definition()->range(), 0, kMintShiftCountLimit);
|
| + return !RangeUtils::IsWithin(right()->definition()->range(), 0,
|
| + kMintShiftCountLimit);
|
| }
|
|
|
|
|
| @@ -6135,8 +6119,8 @@ LocationSummary* ShiftMintOpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = can_overflow() ? 1 : 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::FixedRegisterOrSmiConstant(right(), RCX));
|
| if (kNumTemps > 0) {
|
| @@ -6238,8 +6222,8 @@ LocationSummary* BinaryUint32OpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RequiresRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -6247,7 +6231,7 @@ LocationSummary* BinaryUint32OpInstr::MakeLocationSummary(Zone* zone,
|
| }
|
|
|
|
|
| -template<typename OperandType>
|
| +template <typename OperandType>
|
| static void EmitIntegerArithmetic(FlowGraphCompiler* compiler,
|
| Token::Kind op_kind,
|
| Register left,
|
| @@ -6303,8 +6287,8 @@ LocationSummary* ShiftUint32OpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::FixedRegisterOrSmiConstant(right(), RCX));
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| @@ -6333,10 +6317,10 @@ void ShiftUint32OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| switch (op_kind()) {
|
| case Token::kSHR:
|
| __ shrl(left, Immediate(shift_value));
|
| - break;
|
| + break;
|
| case Token::kSHL:
|
| __ shll(left, Immediate(shift_value));
|
| - break;
|
| + break;
|
| default:
|
| UNREACHABLE();
|
| }
|
| @@ -6365,11 +6349,11 @@ void ShiftUint32OpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| case Token::kSHR:
|
| __ shrl(left, shifter);
|
| __ jmp(&done);
|
| - break;
|
| + break;
|
| case Token::kSHL:
|
| __ shll(left, shifter);
|
| __ jmp(&done);
|
| - break;
|
| + break;
|
| default:
|
| UNREACHABLE();
|
| }
|
| @@ -6387,8 +6371,8 @@ LocationSummary* UnaryUint32OpInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_out(0, Location::SameAsFirstInput());
|
| return summary;
|
| @@ -6412,8 +6396,8 @@ LocationSummary* UnboxedIntConverterInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| if (from() == kUnboxedMint) {
|
| ASSERT((to() == kUnboxedUint32) || (to() == kUnboxedInt32));
|
| summary->set_in(0, Location::RequiresRegister());
|
| @@ -6487,42 +6471,33 @@ void UnboxedIntConverterInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -LocationSummary* ThrowInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| - return new(zone) LocationSummary(zone, 0, 0, LocationSummary::kCall);
|
| +LocationSummary* ThrowInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| + return new (zone) LocationSummary(zone, 0, 0, LocationSummary::kCall);
|
| }
|
|
|
|
|
| void ThrowInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| - compiler->GenerateRuntimeCall(token_pos(),
|
| - deopt_id(),
|
| - kThrowRuntimeEntry,
|
| - 1,
|
| + compiler->GenerateRuntimeCall(token_pos(), deopt_id(), kThrowRuntimeEntry, 1,
|
| locs());
|
| __ int3();
|
| }
|
|
|
|
|
| -LocationSummary* ReThrowInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| - return new(zone) LocationSummary(zone, 0, 0, LocationSummary::kCall);
|
| +LocationSummary* ReThrowInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| + return new (zone) LocationSummary(zone, 0, 0, LocationSummary::kCall);
|
| }
|
|
|
|
|
| void ReThrowInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| compiler->SetNeedsStacktrace(catch_try_index());
|
| - compiler->GenerateRuntimeCall(token_pos(),
|
| - deopt_id(),
|
| - kReThrowRuntimeEntry,
|
| - 2,
|
| - locs());
|
| + compiler->GenerateRuntimeCall(token_pos(), deopt_id(), kReThrowRuntimeEntry,
|
| + 2, locs());
|
| __ int3();
|
| }
|
|
|
|
|
| -LocationSummary* StopInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| - return new(zone) LocationSummary(zone, 0, 0, LocationSummary::kNoCall);
|
| +LocationSummary* StopInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| + return new (zone) LocationSummary(zone, 0, 0, LocationSummary::kNoCall);
|
| }
|
|
|
|
|
| @@ -6538,9 +6513,8 @@ void GraphEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -LocationSummary* GotoInstr::MakeLocationSummary(Zone* zone,
|
| - bool opt) const {
|
| - return new(zone) LocationSummary(zone, 0, 0, LocationSummary::kNoCall);
|
| +LocationSummary* GotoInstr::MakeLocationSummary(Zone* zone, bool opt) const {
|
| + return new (zone) LocationSummary(zone, 0, 0, LocationSummary::kNoCall);
|
| }
|
|
|
|
|
| @@ -6551,8 +6525,7 @@ void GotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
| // Add a deoptimization descriptor for deoptimizing instructions that
|
| // may be inserted before this instruction.
|
| - compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| - GetDeoptId(),
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt, GetDeoptId(),
|
| TokenPosition::kNoSource);
|
| }
|
| if (HasParallelMove()) {
|
| @@ -6572,8 +6545,8 @@ LocationSummary* IndirectGotoInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 1;
|
|
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
|
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_temp(0, Location::RequiresRegister());
|
| @@ -6588,8 +6561,7 @@ void IndirectGotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| {
|
| const intptr_t kRIPRelativeLeaqSize = 7;
|
| - const intptr_t entry_to_rip_offset =
|
| - __ CodeSize() + kRIPRelativeLeaqSize;
|
| + const intptr_t entry_to_rip_offset = __ CodeSize() + kRIPRelativeLeaqSize;
|
| __ leaq(target_address_reg,
|
| Address::AddressRIPRelative(-entry_to_rip_offset));
|
| ASSERT(__ CodeSize() == entry_to_rip_offset);
|
| @@ -6612,15 +6584,15 @@ LocationSummary* StrictCompareInstr::MakeLocationSummary(Zone* zone,
|
| const intptr_t kNumInputs = 2;
|
| const intptr_t kNumTemps = 0;
|
| if (needs_number_check()) {
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| locs->set_in(1, Location::RegisterLocation(RCX));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| }
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RegisterOrConstant(left()));
|
| // Only one of the inputs can be a constant. Choose register if the first one
|
| // is a constant.
|
| @@ -6639,20 +6611,14 @@ Condition StrictCompareInstr::EmitComparisonCode(FlowGraphCompiler* compiler,
|
| ASSERT(!left.IsConstant() || !right.IsConstant());
|
| Condition true_condition;
|
| if (left.IsConstant()) {
|
| - true_condition = compiler->EmitEqualityRegConstCompare(right.reg(),
|
| - left.constant(),
|
| - needs_number_check(),
|
| - token_pos());
|
| + true_condition = compiler->EmitEqualityRegConstCompare(
|
| + right.reg(), left.constant(), needs_number_check(), token_pos());
|
| } else if (right.IsConstant()) {
|
| - true_condition = compiler->EmitEqualityRegConstCompare(left.reg(),
|
| - right.constant(),
|
| - needs_number_check(),
|
| - token_pos());
|
| + true_condition = compiler->EmitEqualityRegConstCompare(
|
| + left.reg(), right.constant(), needs_number_check(), token_pos());
|
| } else {
|
| - true_condition = compiler->EmitEqualityRegRegCompare(left.reg(),
|
| - right.reg(),
|
| - needs_number_check(),
|
| - token_pos());
|
| + true_condition = compiler->EmitEqualityRegRegCompare(
|
| + left.reg(), right.reg(), needs_number_check(), token_pos());
|
| }
|
| if (kind() != Token::kEQ_STRICT) {
|
| ASSERT(kind() == Token::kNE_STRICT);
|
| @@ -6666,7 +6632,7 @@ void StrictCompareInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| ASSERT(kind() == Token::kEQ_STRICT || kind() == Token::kNE_STRICT);
|
|
|
| Label is_true, is_false;
|
| - BranchLabels labels = { &is_true, &is_false, &is_false };
|
| + BranchLabels labels = {&is_true, &is_false, &is_false};
|
|
|
| Condition true_condition = EmitComparisonCode(compiler, labels);
|
| EmitBranchOnCondition(compiler, true_condition, labels);
|
| @@ -6696,8 +6662,8 @@ LocationSummary* ClosureCallInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* summary = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* summary = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| summary->set_in(0, Location::RegisterLocation(RAX)); // Function.
|
| summary->set_out(0, Location::RegisterLocation(RAX));
|
| return summary;
|
| @@ -6707,9 +6673,8 @@ LocationSummary* ClosureCallInstr::MakeLocationSummary(Zone* zone,
|
| void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| // Arguments descriptor is expected in R10.
|
| intptr_t argument_count = ArgumentCount();
|
| - const Array& arguments_descriptor =
|
| - Array::ZoneHandle(ArgumentsDescriptor::New(argument_count,
|
| - argument_names()));
|
| + const Array& arguments_descriptor = Array::ZoneHandle(
|
| + ArgumentsDescriptor::New(argument_count, argument_names()));
|
| __ LoadObject(R10, arguments_descriptor);
|
|
|
| // Function in RAX.
|
| @@ -6732,8 +6697,7 @@ void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| // Add deoptimization continuation point after the call and before the
|
| // arguments are removed.
|
| // In optimized code this descriptor is needed for exception handling.
|
| - compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| - deopt_id_after,
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id_after,
|
| token_pos());
|
| __ Drop(argument_count);
|
| }
|
| @@ -6741,9 +6705,7 @@ void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| LocationSummary* BooleanNegateInstr::MakeLocationSummary(Zone* zone,
|
| bool opt) const {
|
| - return LocationSummary::Make(zone,
|
| - 1,
|
| - Location::RequiresRegister(),
|
| + return LocationSummary::Make(zone, 1, Location::RequiresRegister(),
|
| LocationSummary::kNoCall);
|
| }
|
|
|
| @@ -6771,9 +6733,7 @@ void AllocateObjectInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Code& stub = Code::ZoneHandle(
|
| compiler->zone(), StubCode::GetAllocationStubForClass(cls()));
|
| const StubEntry stub_entry(stub);
|
| - compiler->GenerateCall(token_pos(),
|
| - stub_entry,
|
| - RawPcDescriptors::kOther,
|
| + compiler->GenerateCall(token_pos(), stub_entry, RawPcDescriptors::kOther,
|
| locs());
|
| compiler->AddStubCallTarget(stub);
|
| __ Drop(ArgumentCount()); // Discard arguments.
|
| @@ -6788,12 +6748,12 @@ void DebugStepCheckInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| }
|
|
|
|
|
| -LocationSummary* GrowRegExpStackInstr::MakeLocationSummary(
|
| - Zone* zone, bool opt) const {
|
| +LocationSummary* GrowRegExpStackInstr::MakeLocationSummary(Zone* zone,
|
| + bool opt) const {
|
| const intptr_t kNumInputs = 1;
|
| const intptr_t kNumTemps = 0;
|
| - LocationSummary* locs = new(zone) LocationSummary(
|
| - zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| + LocationSummary* locs = new (zone)
|
| + LocationSummary(zone, kNumInputs, kNumTemps, LocationSummary::kCall);
|
| locs->set_in(0, Location::RegisterLocation(RAX));
|
| locs->set_out(0, Location::RegisterLocation(RAX));
|
| return locs;
|
| @@ -6805,11 +6765,8 @@ void GrowRegExpStackInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register result = locs()->out(0).reg();
|
| __ PushObject(Object::null_object());
|
| __ pushq(typed_data);
|
| - compiler->GenerateRuntimeCall(TokenPosition::kNoSource,
|
| - deopt_id(),
|
| - kGrowRegExpStackRuntimeEntry,
|
| - 1,
|
| - locs());
|
| + compiler->GenerateRuntimeCall(TokenPosition::kNoSource, deopt_id(),
|
| + kGrowRegExpStackRuntimeEntry, 1, locs());
|
| __ Drop(1);
|
| __ popq(result);
|
| }
|
|
|