Changes in directory llvm/lib/Target/X86:
X86CodeEmitter.cpp updated: 1.123 -> 1.124 X86InstrInfo.h updated: 1.59 -> 1.60 X86RegisterInfo.cpp updated: 1.181 -> 1.182 --- Log message: Match TargetInstrInfo changes. --- Diffs of the changes: (+6 -4) X86CodeEmitter.cpp | 4 ++-- X86InstrInfo.h | 4 +++- X86RegisterInfo.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) Index: llvm/lib/Target/X86/X86CodeEmitter.cpp diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.123 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.124 --- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.123 Fri Nov 17 01:52:03 2006 +++ llvm/lib/Target/X86/X86CodeEmitter.cpp Fri Dec 1 15:52:58 2006 @@ -471,7 +471,7 @@ unsigned NumOps = II->getNumOperands(Opcode); if (NumOps) { bool isTwoAddr = NumOps > 1 && - II->getOperandConstraint(Opcode, 1, TargetInstrInfo::TIED_TO) != -1; + II->getOperandConstraint(Opcode, 1, TOI::TIED_TO) != -1; // If it accesses SPL, BPL, SIL, or DIL, then it requires a 0x40 REX prefix. bool isTrunc8 = isX86_64TruncToByte(Opcode); @@ -610,7 +610,7 @@ unsigned NumOps = II->getNumOperands(Opcode); unsigned CurOp = 0; if (NumOps > 1 && - II->getOperandConstraint(Opcode, 1, TargetInstrInfo::TIED_TO) != -1) + II->getOperandConstraint(Opcode, 1, TOI::TIED_TO) != -1) CurOp++; unsigned char BaseOpcode = II->getBaseOpcodeFor(Opcode); Index: llvm/lib/Target/X86/X86InstrInfo.h diff -u llvm/lib/Target/X86/X86InstrInfo.h:1.59 llvm/lib/Target/X86/X86InstrInfo.h:1.60 --- llvm/lib/Target/X86/X86InstrInfo.h:1.59 Sat Oct 28 12:29:57 2006 +++ llvm/lib/Target/X86/X86InstrInfo.h Fri Dec 1 15:52:58 2006 @@ -252,7 +252,9 @@ /// This method returns a null pointer if the transformation cannot be /// performed, otherwise it returns the new instruction. /// - virtual MachineInstr *convertToThreeAddress(MachineInstr *TA) const; + virtual MachineInstr *convertToThreeAddress(MachineFunction::iterator &MFI, + MachineBasicBlock::iterator &MBBI, + LiveVariables &LV) const; /// commuteInstruction - We have a few instructions that must be hacked on to /// commute them. Index: llvm/lib/Target/X86/X86RegisterInfo.cpp diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.181 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.182 --- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.181 Mon Nov 27 17:37:22 2006 +++ llvm/lib/Target/X86/X86RegisterInfo.cpp Fri Dec 1 15:52:58 2006 @@ -289,7 +289,7 @@ bool isTwoAddrFold = false; unsigned NumOps = TII.getNumOperands(MI->getOpcode()); bool isTwoAddr = NumOps > 1 && - TII.getOperandConstraint(MI->getOpcode(), 1,TargetInstrInfo::TIED_TO) != -1; + TII.getOperandConstraint(MI->getOpcode(), 1, TOI::TIED_TO) != -1; MachineInstr *NewMI = NULL; // Folding a memory location into the two-address part of a two-address _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits