Index: src/compiler/ia32/code-generator-ia32.cc |
diff --git a/src/compiler/ia32/code-generator-ia32.cc b/src/compiler/ia32/code-generator-ia32.cc |
index 6730469051adb881fa545dcf2f6978eca8787ef0..19b4ddf7f287c56ceb56ec955aed82d277a4756b 100644 |
--- a/src/compiler/ia32/code-generator-ia32.cc |
+++ b/src/compiler/ia32/code-generator-ia32.cc |
@@ -335,60 +335,60 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
// TODO(turbofan): IA32 SSE LoadUint32() should take an operand. |
__ LoadUint32(i.OutputDoubleRegister(), i.InputRegister(0)); |
break; |
- case kSSELoad: |
- __ movsd(i.OutputDoubleRegister(), i.MemoryOperand()); |
+ case kIA32Movsxbl: |
+ __ movsx_b(i.OutputRegister(), i.MemoryOperand()); |
break; |
- case kSSEStore: { |
- int index = 0; |
- Operand operand = i.MemoryOperand(&index); |
- __ movsd(operand, i.InputDoubleRegister(index)); |
- break; |
- } |
- case kIA32LoadWord8: |
+ case kIA32Movzxbl: |
__ movzx_b(i.OutputRegister(), i.MemoryOperand()); |
break; |
- case kIA32StoreWord8: { |
+ case kIA32Movb: { |
int index = 0; |
Operand operand = i.MemoryOperand(&index); |
- __ mov_b(operand, i.InputRegister(index)); |
+ if (HasImmediateInput(instr, index)) { |
+ __ mov_b(operand, i.InputInt8(index)); |
+ } else { |
+ __ mov_b(operand, i.InputRegister(index)); |
+ } |
break; |
} |
- case kIA32StoreWord8I: { |
- int index = 0; |
- Operand operand = i.MemoryOperand(&index); |
- __ mov_b(operand, i.InputInt8(index)); |
+ case kIA32Movsxwl: |
+ __ movsx_w(i.OutputRegister(), i.MemoryOperand()); |
break; |
- } |
- case kIA32LoadWord16: |
+ case kIA32Movzxwl: |
__ movzx_w(i.OutputRegister(), i.MemoryOperand()); |
break; |
- case kIA32StoreWord16: { |
+ case kIA32Movw: { |
int index = 0; |
Operand operand = i.MemoryOperand(&index); |
- __ mov_w(operand, i.InputRegister(index)); |
- break; |
- } |
- case kIA32StoreWord16I: { |
- int index = 0; |
- Operand operand = i.MemoryOperand(&index); |
- __ mov_w(operand, i.InputInt16(index)); |
+ if (HasImmediateInput(instr, index)) { |
+ __ mov_w(operand, i.InputInt16(index)); |
+ } else { |
+ __ mov_w(operand, i.InputRegister(index)); |
+ } |
break; |
} |
- case kIA32LoadWord32: |
- __ mov(i.OutputRegister(), i.MemoryOperand()); |
- break; |
- case kIA32StoreWord32: { |
- int index = 0; |
- Operand operand = i.MemoryOperand(&index); |
- __ mov(operand, i.InputRegister(index)); |
+ case kIA32Movl: |
+ if (instr->HasOutput()) { |
+ __ mov(i.OutputRegister(), i.MemoryOperand()); |
+ } else { |
+ int index = 0; |
+ Operand operand = i.MemoryOperand(&index); |
+ if (HasImmediateInput(instr, index)) { |
+ __ mov(operand, i.InputImmediate(index)); |
+ } else { |
+ __ mov(operand, i.InputRegister(index)); |
+ } |
+ } |
break; |
- } |
- case kIA32StoreWord32I: { |
- int index = 0; |
- Operand operand = i.MemoryOperand(&index); |
- __ mov(operand, i.InputImmediate(index)); |
+ case kIA32Movsd: |
+ if (instr->HasOutput()) { |
+ __ movsd(i.OutputDoubleRegister(), i.MemoryOperand()); |
+ } else { |
+ int index = 0; |
+ Operand operand = i.MemoryOperand(&index); |
+ __ movsd(operand, i.InputDoubleRegister(index)); |
+ } |
break; |
- } |
case kIA32StoreWriteBarrier: { |
Register object = i.InputRegister(0); |
Register index = i.InputRegister(1); |