From: Chris Lattner Date: Sun, 30 Dec 2007 00:45:46 +0000 (+0000) Subject: Shrinkify the machine operand creation method names. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=39697a83b5ebb857263fc8b9a83ea1834e9d7fe4;p=oota-llvm.git Shrinkify the machine operand creation method names. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45433 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index 006a8722b5d..1eaceefa41d 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -298,42 +298,42 @@ public: Op.auxInfo.subReg = SubReg; return Op; } - static MachineOperand CreateBasicBlock(MachineBasicBlock *MBB) { + static MachineOperand CreateMBB(MachineBasicBlock *MBB) { MachineOperand Op; Op.opType = MachineOperand::MO_MachineBasicBlock; Op.contents.MBB = MBB; Op.auxInfo.offset = 0; return Op; } - static MachineOperand CreateFrameIndex(unsigned Idx) { + static MachineOperand CreateFI(unsigned Idx) { MachineOperand Op; Op.opType = MachineOperand::MO_FrameIndex; Op.contents.immedVal = Idx; Op.auxInfo.offset = 0; return Op; } - static MachineOperand CreateConstantPoolIndex(unsigned Idx, int Offset) { + static MachineOperand CreateCPI(unsigned Idx, int Offset) { MachineOperand Op; Op.opType = MachineOperand::MO_ConstantPoolIndex; Op.contents.immedVal = Idx; Op.auxInfo.offset = Offset; return Op; } - static MachineOperand CreateJumpTableIndex(unsigned Idx) { + static MachineOperand CreateJTI(unsigned Idx) { MachineOperand Op; Op.opType = MachineOperand::MO_JumpTableIndex; Op.contents.immedVal = Idx; Op.auxInfo.offset = 0; return Op; } - static MachineOperand CreateGlobalAddress(GlobalValue *GV, int Offset) { + static MachineOperand CreateGA(GlobalValue *GV, int Offset) { MachineOperand Op; Op.opType = MachineOperand::MO_GlobalAddress; Op.contents.GV = GV; Op.auxInfo.offset = Offset; return Op; } - static MachineOperand CreateExternalSymbol(const char *SymName, int Offset) { + static MachineOperand CreateES(const char *SymName, int Offset) { MachineOperand Op; Op.opType = MachineOperand::MO_ExternalSymbol; Op.contents.SymbolName = SymName; @@ -524,39 +524,39 @@ public: } void addMachineBasicBlockOperand(MachineBasicBlock *MBB) { - addOperand(MachineOperand::CreateBasicBlock(MBB)); + addOperand(MachineOperand::CreateMBB(MBB)); } /// addFrameIndexOperand - Add an abstract frame index to the instruction /// void addFrameIndexOperand(unsigned Idx) { - addOperand(MachineOperand::CreateFrameIndex(Idx)); + addOperand(MachineOperand::CreateFI(Idx)); } /// addConstantPoolndexOperand - Add a constant pool object index to the /// instruction. /// void addConstantPoolIndexOperand(unsigned Idx, int Offset) { - addOperand(MachineOperand::CreateConstantPoolIndex(Idx, Offset)); + addOperand(MachineOperand::CreateCPI(Idx, Offset)); } /// addJumpTableIndexOperand - Add a jump table object index to the /// instruction. /// void addJumpTableIndexOperand(unsigned Idx) { - addOperand(MachineOperand::CreateJumpTableIndex(Idx)); + addOperand(MachineOperand::CreateJTI(Idx)); } void addGlobalAddressOperand(GlobalValue *GV, int Offset) { - addOperand(MachineOperand::CreateGlobalAddress(GV, Offset)); + addOperand(MachineOperand::CreateGA(GV, Offset)); } /// addExternalSymbolOperand - Add an external symbol operand to this instr /// void addExternalSymbolOperand(const char *SymName, int Offset = 0) { - addOperand(MachineOperand::CreateExternalSymbol(SymName, Offset)); + addOperand(MachineOperand::CreateES(SymName, Offset)); } - + //===--------------------------------------------------------------------===// // Accessors used to modify instructions in place. // diff --git a/include/llvm/CodeGen/MachineInstrBuilder.h b/include/llvm/CodeGen/MachineInstrBuilder.h index 39f241a54dc..91c4ad9ac12 100644 --- a/include/llvm/CodeGen/MachineInstrBuilder.h +++ b/include/llvm/CodeGen/MachineInstrBuilder.h @@ -53,34 +53,34 @@ public: } const MachineInstrBuilder &addMBB(MachineBasicBlock *MBB) const { - MI->addOperand(MachineOperand::CreateBasicBlock(MBB)); + MI->addOperand(MachineOperand::CreateMBB(MBB)); return *this; } const MachineInstrBuilder &addFrameIndex(unsigned Idx) const { - MI->addOperand(MachineOperand::CreateFrameIndex(Idx)); + MI->addOperand(MachineOperand::CreateFI(Idx)); return *this; } const MachineInstrBuilder &addConstantPoolIndex(unsigned Idx, int Offset = 0) const { - MI->addOperand(MachineOperand::CreateConstantPoolIndex(Idx, Offset)); + MI->addOperand(MachineOperand::CreateCPI(Idx, Offset)); return *this; } const MachineInstrBuilder &addJumpTableIndex(unsigned Idx) const { - MI->addOperand(MachineOperand::CreateJumpTableIndex(Idx)); + MI->addOperand(MachineOperand::CreateJTI(Idx)); return *this; } const MachineInstrBuilder &addGlobalAddress(GlobalValue *GV, int Offset = 0) const { - MI->addOperand(MachineOperand::CreateGlobalAddress(GV, Offset)); + MI->addOperand(MachineOperand::CreateGA(GV, Offset)); return *this; } const MachineInstrBuilder &addExternalSymbol(const char *FnName) const{ - MI->addOperand(MachineOperand::CreateExternalSymbol(FnName, 0)); + MI->addOperand(MachineOperand::CreateES(FnName, 0)); return *this; } }; diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index 897324f008d..532581e7563 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -1166,7 +1166,7 @@ MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, return NULL; SmallVector MOs; - MOs.push_back(MachineOperand::CreateFrameIndex(FrameIndex)); + MOs.push_back(MachineOperand::CreateFI(FrameIndex)); return foldMemoryOperand(MI, Ops[0], MOs); }