diff options
Diffstat (limited to 'llvm/lib/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/InstSelectSimple.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/PeepholeOptimizer.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrInfo.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86RegisterInfo.cpp | 15 |
4 files changed, 15 insertions, 9 deletions
diff --git a/llvm/lib/Target/X86/InstSelectSimple.cpp b/llvm/lib/Target/X86/InstSelectSimple.cpp index b8873284c07..e216f9da609 100644 --- a/llvm/lib/Target/X86/InstSelectSimple.cpp +++ b/llvm/lib/Target/X86/InstSelectSimple.cpp @@ -43,7 +43,7 @@ inline static MachineInstrBuilder BMI(MachineBasicBlock *MBB, unsigned DestReg) { MachineInstr *MI = new MachineInstr(Opcode, NumOperands+1, true, true); MBB->insert(I, MI); - return MachineInstrBuilder(MI).addReg(DestReg, MOTy::Def); + return MachineInstrBuilder(MI).addReg(DestReg, MachineOperand::Def); } /// BMI - A special BuildMI variant that takes an iterator to insert the diff --git a/llvm/lib/Target/X86/PeepholeOptimizer.cpp b/llvm/lib/Target/X86/PeepholeOptimizer.cpp index 1ceef0edc5f..1640862270b 100644 --- a/llvm/lib/Target/X86/PeepholeOptimizer.cpp +++ b/llvm/lib/Target/X86/PeepholeOptimizer.cpp @@ -149,7 +149,8 @@ bool PH::PeepholeOptimize(MachineBasicBlock &MBB, } unsigned R0 = MI->getOperand(0).getReg(); I = MBB.insert(MBB.erase(I), - BuildMI(Opcode, 1, R0, MOTy::UseAndDef).addZImm((char)Val)); + BuildMI(Opcode, 1, R0, MachineOperand::UseAndDef) + .addZImm((char)Val)); return true; } } diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp index b10d23e9e7d..caffe62867b 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.cpp +++ b/llvm/lib/Target/X86/X86InstrInfo.cpp @@ -29,8 +29,8 @@ X86InstrInfo::X86InstrInfo() // another instruction, e.g. X86: `xchg ax, ax'; SparcV9: `sethi r0, r0, r0' // MachineInstr* X86InstrInfo::createNOPinstr() const { - return BuildMI(X86::XCHGrr16, 2).addReg(X86::AX, MOTy::UseAndDef) - .addReg(X86::AX, MOTy::UseAndDef); + return BuildMI(X86::XCHGrr16, 2).addReg(X86::AX, MachineOperand::UseAndDef) + .addReg(X86::AX, MachineOperand::UseAndDef); } diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index d97b5295315..6fd2644f767 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -295,10 +295,12 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB, MachineInstr *New; if (Old->getOpcode() == X86::ADJCALLSTACKDOWN) { - New=BuildMI(X86::SUBri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(Amount); + New=BuildMI(X86::SUBri32, 1, X86::ESP, MachineOperand::UseAndDef) + .addZImm(Amount); } else { assert(Old->getOpcode() == X86::ADJCALLSTACKUP); - New=BuildMI(X86::ADDri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(Amount); + New=BuildMI(X86::ADDri32, 1, X86::ESP, MachineOperand::UseAndDef) + .addZImm(Amount); } // Replace the pseudo instruction with a new instruction... @@ -360,7 +362,8 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const { int EBPOffset = MFI->getObjectOffset(MFI->getObjectIndexBegin())+4; if (NumBytes) { // adjust stack pointer: ESP -= numbytes - MI= BuildMI(X86::SUBri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(NumBytes); + MI= BuildMI(X86::SUBri32, 1, X86::ESP, MachineOperand::UseAndDef) + .addZImm(NumBytes); MBB.insert(MBBI, MI); } @@ -396,7 +399,8 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const { if (NumBytes) { // adjust stack pointer: ESP -= numbytes - MI= BuildMI(X86::SUBri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(NumBytes); + MI= BuildMI(X86::SUBri32, 1, X86::ESP, MachineOperand::UseAndDef) + .addZImm(NumBytes); MBB.insert(MBBI, MI); } } @@ -427,7 +431,8 @@ void X86RegisterInfo::emitEpilogue(MachineFunction &MF, unsigned NumBytes = MFI->getStackSize(); if (NumBytes) { // adjust stack pointer back: ESP += numbytes - MI =BuildMI(X86::ADDri32, 1, X86::ESP, MOTy::UseAndDef).addZImm(NumBytes); + MI =BuildMI(X86::ADDri32, 1, X86::ESP, MachineOperand::UseAndDef) + .addZImm(NumBytes); MBB.insert(MBBI, MI); } } |
