diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2006-09-08 21:08:13 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2006-09-08 21:08:13 +0000 |
| commit | de33f662866b2ae18c597ac1bb6463ab12934be2 (patch) | |
| tree | 507c980a10145813aad2c6aba196bfcff21ef52a /llvm/lib | |
| parent | b2e7316b2dd6c96489a672a00aaba6f63b096551 (diff) | |
| download | bcm5719-llvm-de33f662866b2ae18c597ac1bb6463ab12934be2.tar.gz bcm5719-llvm-de33f662866b2ae18c597ac1bb6463ab12934be2.zip | |
Fixed a FuseTwoAddrInst() bug: consider GlobalAddress and JumpTableIndex
in addition to immediate operands.
llvm-svn: 30205
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/X86/X86RegisterInfo.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index 037220adbbe..40d7a6c3834 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -169,12 +169,17 @@ static MachineInstr *FuseTwoAddrInst(unsigned Opcode, unsigned FrameIndex, // Loop over the rest of the ri operands, converting them over. for (unsigned i = 0; i != NumOps; ++i) { - if (MI->getOperand(i+2).isReg()) - MIB = MIB.addReg(MI->getOperand(i+2).getReg()); - else { - assert(MI->getOperand(i+2).isImm() && "Unknown operand type!"); - MIB = MIB.addImm(MI->getOperand(i+2).getImm()); - } + MachineOperand &MO = MI->getOperand(i+2); + if (MO.isReg()) + MIB = MIB.addReg(MO.getReg()); + else if (MO.isImm()) + MIB = MIB.addImm(MO.getImm()); + else if (MO.isGlobalAddress()) + MIB = MIB.addGlobalAddress(MO.getGlobal(), MO.getOffset()); + else if (MO.isJumpTableIndex()) + MIB = MIB.addJumpTableIndex(MO.getJumpTableIndex()); + else + assert(0 && "Unknown operand type!"); } return MIB; } |
