diff options
Diffstat (limited to 'lib/Target/PowerPC')
-rw-r--r-- | lib/Target/PowerPC/PPCAsmPrinter.cpp | 28 | ||||
-rw-r--r-- | lib/Target/PowerPC/PPCCodeEmitter.cpp | 2 | ||||
-rw-r--r-- | lib/Target/PowerPC/PPCInstrInfo.cpp | 18 | ||||
-rw-r--r-- | lib/Target/PowerPC/PPCRegisterInfo.cpp | 8 |
4 files changed, 28 insertions, 28 deletions
diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp index 3c6b7fff42..614a470dec 100644 --- a/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -124,7 +124,7 @@ namespace { if (MO.isRegister()) { printRegister(MO, false); } else if (MO.isImmediate()) { - O << MO.getImmedValue(); + O << MO.getImm(); } else { printOp(MO); } @@ -137,29 +137,29 @@ namespace { void printS5ImmOperand(const MachineInstr *MI, unsigned OpNo) { - char value = MI->getOperand(OpNo).getImmedValue(); + char value = MI->getOperand(OpNo).getImm(); value = (value << (32-5)) >> (32-5); O << (int)value; } void printU5ImmOperand(const MachineInstr *MI, unsigned OpNo) { - unsigned char value = MI->getOperand(OpNo).getImmedValue(); + unsigned char value = MI->getOperand(OpNo).getImm(); assert(value <= 31 && "Invalid u5imm argument!"); O << (unsigned int)value; } void printU6ImmOperand(const MachineInstr *MI, unsigned OpNo) { - unsigned char value = MI->getOperand(OpNo).getImmedValue(); + unsigned char value = MI->getOperand(OpNo).getImm(); assert(value <= 63 && "Invalid u6imm argument!"); O << (unsigned int)value; } void printS16ImmOperand(const MachineInstr *MI, unsigned OpNo) { - O << (short)MI->getOperand(OpNo).getImmedValue(); + O << (short)MI->getOperand(OpNo).getImm(); } void printU16ImmOperand(const MachineInstr *MI, unsigned OpNo) { - O << (unsigned short)MI->getOperand(OpNo).getImmedValue(); + O << (unsigned short)MI->getOperand(OpNo).getImm(); } void printS16X4ImmOperand(const MachineInstr *MI, unsigned OpNo) { if (MI->getOperand(OpNo).isImmediate()) { - O << (short)(MI->getOperand(OpNo).getImmedValue()*4); + O << (short)(MI->getOperand(OpNo).getImm()*4); } else { O << "lo16("; printOp(MI->getOperand(OpNo)); @@ -173,7 +173,7 @@ namespace { // Branches can take an immediate operand. This is used by the branch // selection pass to print $+8, an eight byte displacement from the PC. if (MI->getOperand(OpNo).isImmediate()) { - O << "$+" << MI->getOperand(OpNo).getImmedValue()*4; + O << "$+" << MI->getOperand(OpNo).getImm()*4; } else { printOp(MI->getOperand(OpNo)); } @@ -205,7 +205,7 @@ namespace { printOp(MI->getOperand(OpNo)); } void printAbsAddrOperand(const MachineInstr *MI, unsigned OpNo) { - O << (int)MI->getOperand(OpNo).getImmedValue()*4; + O << (int)MI->getOperand(OpNo).getImm()*4; } void printPICLabel(const MachineInstr *MI, unsigned OpNo) { O << "\"L" << getFunctionNumber() << "$pb\"\n"; @@ -509,9 +509,9 @@ void PPCAsmPrinter::printMachineInstruction(const MachineInstr *MI) { // Check for slwi/srwi mnemonics. if (MI->getOpcode() == PPC::RLWINM) { bool FoundMnemonic = false; - unsigned char SH = MI->getOperand(2).getImmedValue(); - unsigned char MB = MI->getOperand(3).getImmedValue(); - unsigned char ME = MI->getOperand(4).getImmedValue(); + unsigned char SH = MI->getOperand(2).getImm(); + unsigned char MB = MI->getOperand(3).getImm(); + unsigned char ME = MI->getOperand(4).getImm(); if (SH <= 31 && MB == 0 && ME == (31-SH)) { O << "slwi "; FoundMnemonic = true; } @@ -536,8 +536,8 @@ void PPCAsmPrinter::printMachineInstruction(const MachineInstr *MI) { return; } } else if (MI->getOpcode() == PPC::RLDICR) { - unsigned char SH = MI->getOperand(2).getImmedValue(); - unsigned char ME = MI->getOperand(3).getImmedValue(); + unsigned char SH = MI->getOperand(2).getImm(); + unsigned char ME = MI->getOperand(3).getImm(); // rldicr RA, RS, SH, 63-SH == sldi RA, RS, SH if (63-SH == ME) { O << "sldi "; diff --git a/lib/Target/PowerPC/PPCCodeEmitter.cpp b/lib/Target/PowerPC/PPCCodeEmitter.cpp index 1d5a6c0fa1..8bd92732c5 100644 --- a/lib/Target/PowerPC/PPCCodeEmitter.cpp +++ b/lib/Target/PowerPC/PPCCodeEmitter.cpp @@ -131,7 +131,7 @@ int PPCCodeEmitter::getMachineOpValue(MachineInstr &MI, MachineOperand &MO) { rv = 0x80 >> rv; } } else if (MO.isImmediate()) { - rv = MO.getImmedValue(); + rv = MO.getImm(); } else if (MO.isGlobalAddress() || MO.isExternalSymbol() || MO.isConstantPoolIndex() || MO.isJumpTableIndex()) { unsigned Reloc = 0; diff --git a/lib/Target/PowerPC/PPCInstrInfo.cpp b/lib/Target/PowerPC/PPCInstrInfo.cpp index 944d20dac7..b20943ecf1 100644 --- a/lib/Target/PowerPC/PPCInstrInfo.cpp +++ b/lib/Target/PowerPC/PPCInstrInfo.cpp @@ -54,7 +54,7 @@ bool PPCInstrInfo::isMoveInstr(const MachineInstr& MI, MI.getOperand(0).isRegister() && MI.getOperand(2).isImmediate() && "invalid PPC ADDI instruction!"); - if (MI.getOperand(1).isRegister() && MI.getOperand(2).getImmedValue()==0) { + if (MI.getOperand(1).isRegister() && MI.getOperand(2).getImm() == 0) { sourceReg = MI.getOperand(1).getReg(); destReg = MI.getOperand(0).getReg(); return true; @@ -65,7 +65,7 @@ bool PPCInstrInfo::isMoveInstr(const MachineInstr& MI, MI.getOperand(1).isRegister() && MI.getOperand(2).isImmediate() && "invalid PPC ORI instruction!"); - if (MI.getOperand(2).getImmedValue()==0) { + if (MI.getOperand(2).getImm() == 0) { sourceReg = MI.getOperand(1).getReg(); destReg = MI.getOperand(0).getReg(); return true; @@ -99,7 +99,7 @@ unsigned PPCInstrInfo::isLoadFromStackSlot(MachineInstr *MI, case PPC::LWZ: case PPC::LFS: case PPC::LFD: - if (MI->getOperand(1).isImmediate() && !MI->getOperand(1).getImmedValue() && + if (MI->getOperand(1).isImmediate() && !MI->getOperand(1).getImm() && MI->getOperand(2).isFrameIndex()) { FrameIndex = MI->getOperand(2).getFrameIndex(); return MI->getOperand(0).getReg(); @@ -117,7 +117,7 @@ unsigned PPCInstrInfo::isStoreToStackSlot(MachineInstr *MI, case PPC::STW: case PPC::STFS: case PPC::STFD: - if (MI->getOperand(1).isImmediate() && !MI->getOperand(1).getImmedValue() && + if (MI->getOperand(1).isImmediate() && !MI->getOperand(1).getImm() && MI->getOperand(2).isFrameIndex()) { FrameIndex = MI->getOperand(2).getFrameIndex(); return MI->getOperand(0).getReg(); @@ -135,7 +135,7 @@ MachineInstr *PPCInstrInfo::commuteInstruction(MachineInstr *MI) const { return TargetInstrInfo::commuteInstruction(MI); // Cannot commute if it has a non-zero rotate count. - if (MI->getOperand(3).getImmedValue() != 0) + if (MI->getOperand(3).getImm() != 0) return 0; // If we have a zero rotate count, we have: @@ -162,10 +162,10 @@ MachineInstr *PPCInstrInfo::commuteInstruction(MachineInstr *MI) const { MI->getOperand(1).unsetIsKill(); // Swap the mask around. - unsigned MB = MI->getOperand(4).getImmedValue(); - unsigned ME = MI->getOperand(5).getImmedValue(); - MI->getOperand(4).setImmedValue((ME+1) & 31); - MI->getOperand(5).setImmedValue((MB-1) & 31); + unsigned MB = MI->getOperand(4).getImm(); + unsigned ME = MI->getOperand(5).getImm(); + MI->getOperand(4).setImm((ME+1) & 31); + MI->getOperand(5).setImm((MB-1) & 31); return MI; } diff --git a/lib/Target/PowerPC/PPCRegisterInfo.cpp b/lib/Target/PowerPC/PPCRegisterInfo.cpp index d4639cd83c..2a0bdc6739 100644 --- a/lib/Target/PowerPC/PPCRegisterInfo.cpp +++ b/lib/Target/PowerPC/PPCRegisterInfo.cpp @@ -214,7 +214,7 @@ void PPCRegisterInfo::storeRegToAddr(MachineFunction &MF, unsigned SrcReg, if (MO.isRegister()) MIB.addReg(MO.getReg()); else if (MO.isImmediate()) - MIB.addImm(MO.getImmedValue()); + MIB.addImm(MO.getImm()); else MIB.addFrameIndex(MO.getFrameIndex()); } @@ -324,7 +324,7 @@ void PPCRegisterInfo::loadRegFromAddr(MachineFunction &MF, unsigned DestReg, if (MO.isRegister()) MIB.addReg(MO.getReg()); else if (MO.isImmediate()) - MIB.addImm(MO.getImmedValue()); + MIB.addImm(MO.getImm()); else MIB.addFrameIndex(MO.getFrameIndex()); } @@ -802,9 +802,9 @@ void PPCRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II, // Now add the frame object offset to the offset from r1. int Offset = MFI->getObjectOffset(FrameIndex); if (!isIXAddr) - Offset += MI.getOperand(OffsetOperandNo).getImmedValue(); + Offset += MI.getOperand(OffsetOperandNo).getImm(); else - Offset += MI.getOperand(OffsetOperandNo).getImmedValue() << 2; + Offset += MI.getOperand(OffsetOperandNo).getImm() << 2; // If we're not using a Frame Pointer that has been set to the value of the // SP before having the stack size subtracted from it, then add the stack size |