Handle non-constant divisor in MathFloorOfDiv, on ia32/x64

src/ia32/lithium-ia32.cc

Index: src/ia32/lithium-ia32.cc
===================================================================
--- src/ia32/lithium-ia32.cc	(revision 13258)
+++ src/ia32/lithium-ia32.cc	(working copy)
@@ -1305,12 +1305,30 @@
     return constant_val->CopyToRepresentation(Representation::Integer32(),
                                               divisor->block()->zone());
   }
+  // A value with an integer representation does not need to be transformed.
+  if (divisor->representation().IsInteger32())

[Yang, 2012/12/27 14:41:53]

For if-else, we always insert brackets.

+    return divisor;

[Yang, 2012/12/27 14:41:53]

Please conform to the usual code style. Specifically, use no brackets if the if
is a one-liner, or brackets if you have line breaks.

+  // A change from an integer32 can be replaced by the integer32 value.
+  else if (divisor->IsChange() &&
+           HChange::cast(divisor)->from().IsInteger32())
+    return HChange::cast(divisor)->value();
   return NULL;
 }
 
 
 LInstruction* LChunkBuilder::DoMathFloorOfDiv(HMathFloorOfDiv* instr) {
   HValue* right = instr->right();
+  if (!right->IsConstant()) {
+    ASSERT(right->representation().IsInteger32());
+    // The temporary operand is necessary to ensure that right is not allocated
+    // into edx.
+    LOperand* temp = FixedTemp(edx);
+    LOperand* dividend = UseFixed(instr->left(), eax);
+    LOperand* divisor = UseRegister(instr->right());
+    LDivI* flooring_div = new(zone()) LDivI(dividend, divisor, temp);
+    return AssignEnvironment(DefineFixed(flooring_div, eax));
+  }
+
   ASSERT(right->IsConstant() && HConstant::cast(right)->HasInteger32Value());
   LOperand* divisor = chunk_->DefineConstantOperand(HConstant::cast(right));
   int32_t divisor_si = HConstant::cast(right)->Integer32Value();