Revert "Handle non-power-of-2 divisors in division-like operations", "A64 tweaks for division-like …

src/arm/lithium-arm.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 67 matching lines @@
   V(ConstantD)                                  \
   V(ConstantE)                                  \
   V(ConstantI)                                  \
   V(ConstantS)                                  \
   V(ConstantT)                                  \
   V(Context)                                    \
   V(DateField)                                  \
   V(DebugBreak)                                 \
   V(DeclareGlobals)                             \
   V(Deoptimize)                                 \
-  V(DivByConstI)                                \
   V(DivByPowerOf2I)                             \
   V(DivI)                                       \
   V(DoubleToI)                                  \
   V(DoubleToSmi)                                \
   V(Drop)                                       \
   V(Dummy)                                      \
   V(DummyUse)                                   \
   V(FlooringDivByConstI)                        \
   V(FlooringDivByPowerOf2I)                     \
   V(ForInCacheArray)                            \
@@ skipping 30 matching lines @@
   V(MapEnumLength)                              \
   V(MathAbs)                                    \
   V(MathClz32)                                  \
   V(MathExp)                                    \
   V(MathFloor)                                  \
   V(MathLog)                                    \
   V(MathMinMax)                                 \
   V(MathPowHalf)                                \
   V(MathRound)                                  \
   V(MathSqrt)                                   \
-  V(ModByConstI)                                \
   V(ModByPowerOf2I)                             \
   V(ModI)                                       \
   V(MulI)                                       \
   V(MultiplyAddD)                               \
   V(MultiplySubD)                               \
   V(NumberTagD)                                 \
   V(NumberTagI)                                 \
   V(NumberTagU)                                 \
   V(NumberUntagD)                               \
   V(OsrEntry)                                   \
@@ skipping 481 matching lines @@
   int32_t divisor() const { return divisor_; }
 
   DECLARE_CONCRETE_INSTRUCTION(ModByPowerOf2I, "mod-by-power-of-2-i")
   DECLARE_HYDROGEN_ACCESSOR(Mod)
 
  private:
   int32_t divisor_;
 };
 
 
-class LModByConstI V8_FINAL : public LTemplateInstruction<1, 1, 0> {
- public:
-  LModByConstI(LOperand* dividend, int32_t divisor) {
-    inputs_[0] = dividend;
-    divisor_ = divisor;
-  }
-
-  LOperand* dividend() { return inputs_[0]; }
-  int32_t divisor() const { return divisor_; }
-
-  DECLARE_CONCRETE_INSTRUCTION(ModByConstI, "mod-by-const-i")
-  DECLARE_HYDROGEN_ACCESSOR(Mod)
-
- private:
-  int32_t divisor_;
-};
-
-
 class LModI V8_FINAL : public LTemplateInstruction<1, 2, 2> {
  public:
   LModI(LOperand* left, LOperand* right, LOperand* temp, LOperand* temp2) {
     inputs_[0] = left;
     inputs_[1] = right;
     temps_[0] = temp;
     temps_[1] = temp2;
   }
 
   LOperand* left() { return inputs_[0]; }
@@ skipping 17 matching lines @@
   int32_t divisor() const { return divisor_; }
 
   DECLARE_CONCRETE_INSTRUCTION(DivByPowerOf2I, "div-by-power-of-2-i")
   DECLARE_HYDROGEN_ACCESSOR(Div)
 
  private:
   int32_t divisor_;
 };
 
 
-class LDivByConstI V8_FINAL : public LTemplateInstruction<1, 1, 0> {
- public:
-  LDivByConstI(LOperand* dividend, int32_t divisor) {
-    inputs_[0] = dividend;
-    divisor_ = divisor;
-  }
-
-  LOperand* dividend() { return inputs_[0]; }
-  int32_t divisor() const { return divisor_; }
-
-  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) {
     inputs_[0] = left;
     inputs_[1] = right;
     temps_[0] = temp;
   }
 
   LOperand* left() { return inputs_[0]; }
   LOperand* right() { return inputs_[1]; }
@@ skipping 18 matching lines @@
 
   DECLARE_CONCRETE_INSTRUCTION(FlooringDivByPowerOf2I,
                                "flooring-div-by-power-of-2-i")
   DECLARE_HYDROGEN_ACCESSOR(MathFloorOfDiv)
 
  private:
   int32_t divisor_;
 };
 
 
-class LFlooringDivByConstI V8_FINAL : public LTemplateInstruction<1, 1, 0> {
+class LFlooringDivByConstI V8_FINAL : public LTemplateInstruction<1, 2, 1> {
  public:
-  LFlooringDivByConstI(LOperand* dividend, int32_t divisor) {
+  LFlooringDivByConstI(LOperand* dividend, LOperand* divisor, LOperand* temp) {
     inputs_[0] = dividend;
-    divisor_ = divisor;
+    inputs_[1] = divisor;
+    temps_[0] = temp;
   }
 
   LOperand* dividend() { return inputs_[0]; }
-  int32_t divisor() const { return divisor_; }
-  LOperand* temp1() { return temps_[0]; }
+  LOperand* divisor() { return inputs_[1]; }
+  LOperand* temp() { return temps_[0]; }
 
   DECLARE_CONCRETE_INSTRUCTION(FlooringDivByConstI, "flooring-div-by-const-i")
   DECLARE_HYDROGEN_ACCESSOR(MathFloorOfDiv)
-
- private:
-  int32_t divisor_;
 };
 
 
 class LMulI V8_FINAL : public LTemplateInstruction<1, 2, 0> {
  public:
   LMulI(LOperand* left, LOperand* right) {
     inputs_[0] = left;
     inputs_[1] = right;
   }
 
@@ skipping 1937 matching lines @@
 
   LInstruction* DoMathFloor(HUnaryMathOperation* instr);
   LInstruction* DoMathRound(HUnaryMathOperation* instr);
   LInstruction* DoMathAbs(HUnaryMathOperation* instr);
   LInstruction* DoMathLog(HUnaryMathOperation* instr);
   LInstruction* DoMathExp(HUnaryMathOperation* instr);
   LInstruction* DoMathSqrt(HUnaryMathOperation* instr);
   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);
 
  private:
   enum Status {
     UNUSED,
     BUILDING,
     DONE,
     ABORTED
@@ skipping 105 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(LChunkBuilder);
 };
 
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_LITHIUM_ARM_H_