diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2006-12-01 21:52:58 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2006-12-01 21:52:58 +0000 |
| commit | 67fc141db590de46b564b634897ff8948255b39c (patch) | |
| tree | 688096a7b561522fc7ffae2b3650743455ea9679 /llvm/lib/Target/X86 | |
| parent | 07fc107e90793c52c7902b0471ad6b5bf60f8da4 (diff) | |
| download | bcm5719-llvm-67fc141db590de46b564b634897ff8948255b39c.tar.gz bcm5719-llvm-67fc141db590de46b564b634897ff8948255b39c.zip | |
Match TargetInstrInfo changes.
llvm-svn: 32098
Diffstat (limited to 'llvm/lib/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/X86CodeEmitter.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrInfo.h | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86RegisterInfo.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/llvm/lib/Target/X86/X86CodeEmitter.cpp b/llvm/lib/Target/X86/X86CodeEmitter.cpp index aa77a25e1b7..a1547cf47a1 100644 --- a/llvm/lib/Target/X86/X86CodeEmitter.cpp +++ b/llvm/lib/Target/X86/X86CodeEmitter.cpp @@ -471,7 +471,7 @@ unsigned Emitter::determineREX(const MachineInstr &MI) { 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 @@ void Emitter::emitInstruction(const MachineInstr &MI) { 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); diff --git a/llvm/lib/Target/X86/X86InstrInfo.h b/llvm/lib/Target/X86/X86InstrInfo.h index c9ce1fc920b..409243ab360 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.h +++ b/llvm/lib/Target/X86/X86InstrInfo.h @@ -252,7 +252,9 @@ public: /// 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. diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index 8355390218d..2dcb2bc49a4 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -289,7 +289,7 @@ MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, 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 |
