Index: src/x64/lithium-x64.h |
diff --git a/src/x64/lithium-x64.h b/src/x64/lithium-x64.h |
index a37a562cc9c560c8163812620cf083004d754e19..29cfc5fccc256f4df97386f17f05218ab8be03d0 100644 |
--- a/src/x64/lithium-x64.h |
+++ b/src/x64/lithium-x64.h |
@@ -85,7 +85,6 @@ class LCodeGen; |
V(DebugBreak) \ |
V(DeclareGlobals) \ |
V(Deoptimize) \ |
- V(DivByConstI) \ |
V(DivByPowerOf2I) \ |
V(DivI) \ |
V(DoubleToI) \ |
@@ -136,7 +135,6 @@ class LCodeGen; |
V(MathPowHalf) \ |
V(MathRound) \ |
V(MathSqrt) \ |
- V(ModByConstI) \ |
V(ModByPowerOf2I) \ |
V(ModI) \ |
V(MulI) \ |
@@ -638,31 +636,6 @@ class LModByPowerOf2I V8_FINAL : public LTemplateInstruction<1, 1, 0> { |
}; |
-class LModByConstI V8_FINAL : public LTemplateInstruction<1, 1, 2> { |
- public: |
- LModByConstI(LOperand* dividend, |
- int32_t divisor, |
- LOperand* temp1, |
- LOperand* temp2) { |
- inputs_[0] = dividend; |
- divisor_ = divisor; |
- temps_[0] = temp1; |
- temps_[1] = temp2; |
- } |
- |
- LOperand* dividend() { return inputs_[0]; } |
- int32_t divisor() const { return divisor_; } |
- LOperand* temp1() { return temps_[0]; } |
- LOperand* temp2() { return temps_[1]; } |
- |
- DECLARE_CONCRETE_INSTRUCTION(ModByConstI, "mod-by-const-i") |
- DECLARE_HYDROGEN_ACCESSOR(Mod) |
- |
- private: |
- int32_t divisor_; |
-}; |
- |
- |
class LModI V8_FINAL : public LTemplateInstruction<1, 2, 1> { |
public: |
LModI(LOperand* left, LOperand* right, LOperand* temp) { |
@@ -698,31 +671,6 @@ class LDivByPowerOf2I V8_FINAL : public LTemplateInstruction<1, 1, 0> { |
}; |
-class LDivByConstI V8_FINAL : public LTemplateInstruction<1, 1, 2> { |
- public: |
- LDivByConstI(LOperand* dividend, |
- int32_t divisor, |
- LOperand* temp1, |
- LOperand* temp2) { |
- inputs_[0] = dividend; |
- divisor_ = divisor; |
- temps_[0] = temp1; |
- temps_[1] = temp2; |
- } |
- |
- LOperand* dividend() { return inputs_[0]; } |
- int32_t divisor() const { return divisor_; } |
- LOperand* temp1() { return temps_[0]; } |
- LOperand* temp2() { return temps_[1]; } |
- |
- DECLARE_CONCRETE_INSTRUCTION(DivByConstI, "div-by-const-i") |
- DECLARE_HYDROGEN_ACCESSOR(Div) |
- |
- private: |
- int32_t divisor_; |
-}; |
- |
- |
class LDivI V8_FINAL : public LTemplateInstruction<1, 2, 1> { |
public: |
LDivI(LOperand* left, LOperand* right, LOperand* temp) { |
@@ -761,22 +709,17 @@ class LFlooringDivByPowerOf2I V8_FINAL : public LTemplateInstruction<1, 1, 0> { |
}; |
-class LFlooringDivByConstI V8_FINAL : public LTemplateInstruction<1, 1, 2> { |
+class LFlooringDivByConstI V8_FINAL : public LTemplateInstruction<1, 1, 1> { |
public: |
- LFlooringDivByConstI(LOperand* dividend, |
- int32_t divisor, |
- LOperand* temp1, |
- LOperand* temp2) { |
+ LFlooringDivByConstI(LOperand* dividend, int32_t divisor, LOperand* temp) { |
inputs_[0] = dividend; |
divisor_ = divisor; |
- temps_[0] = temp1; |
- temps_[1] = temp2; |
+ temps_[0] = temp; |
} |
LOperand* dividend() { return inputs_[0]; } |
int32_t divisor() const { return divisor_; } |
- LOperand* temp1() { return temps_[0]; } |
- LOperand* temp2() { return temps_[0]; } |
+ LOperand* temp() { return temps_[0]; } |
DECLARE_CONCRETE_INSTRUCTION(FlooringDivByConstI, "flooring-div-by-const-i") |
DECLARE_HYDROGEN_ACCESSOR(MathFloorOfDiv) |
@@ -2662,10 +2605,8 @@ class LChunkBuilder V8_FINAL : public LChunkBuilderBase { |
LInstruction* DoMathPowHalf(HUnaryMathOperation* instr); |
LInstruction* DoMathClz32(HUnaryMathOperation* instr); |
LInstruction* DoDivByPowerOf2I(HDiv* instr); |
- LInstruction* DoDivByConstI(HDiv* instr); |
LInstruction* DoDivI(HBinaryOperation* instr); |
LInstruction* DoModByPowerOf2I(HMod* instr); |
- LInstruction* DoModByConstI(HMod* instr); |
LInstruction* DoModI(HMod* instr); |
LInstruction* DoFlooringDivByPowerOf2I(HMathFloorOfDiv* instr); |
LInstruction* DoFlooringDivByConstI(HMathFloorOfDiv* instr); |