From a5bb370aa42a238e07ee22adcdc792df292b1ab0 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 30 Dec 2007 23:10:15 +0000 Subject: Add new shorter predicates for testing machine operands for various types: e.g. MO.isMBB() instead of MO.isMachineBasicBlock(). I don't plan on switching everything over, so new clients should just start using the shorter names. Remove old long accessors, switching everything over to use the short accessor: getMachineBasicBlock() -> getMBB(), getConstantPoolIndex() -> getIndex(), setMachineBasicBlock -> setMBB(), etc. llvm-svn: 45464 --- llvm/lib/Target/Sparc/SparcRegisterInfo.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'llvm/lib/Target/Sparc/SparcRegisterInfo.cpp') diff --git a/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp b/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp index aaf6fa5f504..7416ebb6777 100644 --- a/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp +++ b/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp @@ -69,8 +69,10 @@ void SparcRegisterInfo::storeRegToAddr(MachineFunction &MF, unsigned SrcReg, MIB.addReg(MO.getReg()); else if (MO.isImmediate()) MIB.addImm(MO.getImm()); - else - MIB.addFrameIndex(MO.getFrameIndex()); + else { + assert(MO.isFI()); + MIB.addFrameIndex(MO.getIndex()); + } } MIB.addReg(SrcReg, false, false, isKill); NewMIs.push_back(MIB); @@ -107,12 +109,14 @@ void SparcRegisterInfo::loadRegFromAddr(MachineFunction &MF, unsigned DestReg, MachineInstrBuilder MIB = BuildMI(TII.get(Opc), DestReg); for (unsigned i = 0, e = Addr.size(); i != e; ++i) { MachineOperand &MO = Addr[i]; - if (MO.isRegister()) + if (MO.isReg()) MIB.addReg(MO.getReg()); - else if (MO.isImmediate()) + else if (MO.isImm()) MIB.addImm(MO.getImm()); - else - MIB.addFrameIndex(MO.getFrameIndex()); + else { + assert(MO.isFI()); + MIB.addFrameIndex(MO.getIndex()); + } } NewMIs.push_back(MIB); return; @@ -241,7 +245,7 @@ void SparcRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II, assert(i < MI.getNumOperands() && "Instr doesn't have FrameIndex operand!"); } - int FrameIndex = MI.getOperand(i).getFrameIndex(); + int FrameIndex = MI.getOperand(i).getIndex(); // Addressable stack objects are accessed using neg. offsets from %fp MachineFunction &MF = *MI.getParent()->getParent(); -- cgit v1.2.3