Index: src/ia32/lithium-ia32.cc |
=================================================================== |
--- src/ia32/lithium-ia32.cc (revision 6414) |
+++ src/ia32/lithium-ia32.cc (working copy) |
@@ -162,6 +162,12 @@ |
case Token::MUL: return "mul-t"; |
case Token::MOD: return "mod-t"; |
case Token::DIV: return "div-t"; |
+ case Token::BIT_AND: return "bit-and-t"; |
+ case Token::BIT_OR: return "bit-or-t"; |
+ case Token::BIT_XOR: return "bit-xor-t"; |
+ case Token::SHL: return "sal-t"; |
+ case Token::SAR: return "sar-t"; |
+ case Token::SHR: return "shr-t"; |
default: |
UNREACHABLE(); |
return NULL; |
@@ -739,18 +745,38 @@ |
LInstruction* LChunkBuilder::DoBit(Token::Value op, |
HBitwiseBinaryOperation* instr) { |
- ASSERT(instr->representation().IsInteger32()); |
- ASSERT(instr->left()->representation().IsInteger32()); |
- ASSERT(instr->right()->representation().IsInteger32()); |
+ if (instr->representation().IsInteger32()) { |
+ ASSERT(instr->left()->representation().IsInteger32()); |
+ ASSERT(instr->right()->representation().IsInteger32()); |
- LOperand* left = UseRegisterAtStart(instr->LeastConstantOperand()); |
- LOperand* right = UseOrConstantAtStart(instr->MostConstantOperand()); |
- return DefineSameAsFirst(new LBitI(op, left, right)); |
+ LOperand* left = UseRegisterAtStart(instr->LeastConstantOperand()); |
+ LOperand* right = UseOrConstantAtStart(instr->MostConstantOperand()); |
+ return DefineSameAsFirst(new LBitI(op, left, right)); |
+ } else { |
+ ASSERT(instr->representation().IsTagged()); |
+ ASSERT(instr->left()->representation().IsTagged()); |
+ ASSERT(instr->right()->representation().IsTagged()); |
+ |
+ LOperand* left = UseFixed(instr->left(), edx); |
+ LOperand* right = UseFixed(instr->right(), eax); |
+ LArithmeticT* result = new LArithmeticT(op, left, right); |
+ return MarkAsCall(DefineFixed(result, eax), instr); |
+ } |
} |
LInstruction* LChunkBuilder::DoShift(Token::Value op, |
HBitwiseBinaryOperation* instr) { |
+ if (instr->representation().IsTagged()) { |
+ ASSERT(instr->left()->representation().IsTagged()); |
+ ASSERT(instr->right()->representation().IsTagged()); |
+ |
+ LOperand* left = UseFixed(instr->left(), edx); |
+ LOperand* right = UseFixed(instr->right(), eax); |
+ LArithmeticT* result = new LArithmeticT(op, left, right); |
+ return MarkAsCall(DefineFixed(result, eax), instr); |
+ } |
+ |
ASSERT(instr->representation().IsInteger32()); |
ASSERT(instr->OperandAt(0)->representation().IsInteger32()); |
ASSERT(instr->OperandAt(1)->representation().IsInteger32()); |