From 10f3597c4e0c13ecf0272b7ca0be741a91ade48c Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 4 May 2006 00:44:25 +0000 Subject: [PATCH] Remove some more unused stuff from MachineInstr that was leftover from V9. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28091 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/MachineInstr.h | 49 ++-------------------- include/llvm/CodeGen/MachineInstrBuilder.h | 25 ----------- lib/CodeGen/MachineInstr.cpp | 38 ----------------- lib/Target/Alpha/AlphaAsmPrinter.cpp | 6 --- lib/Target/IA64/IA64AsmPrinter.cpp | 7 ---- lib/Target/PowerPC/PPCAsmPrinter.cpp | 6 --- lib/Target/Sparc/SparcAsmPrinter.cpp | 4 -- lib/Target/X86/X86ATTAsmPrinter.cpp | 4 -- lib/Target/X86/X86IntelAsmPrinter.cpp | 4 -- 9 files changed, 3 insertions(+), 140 deletions(-) diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index d02493bfc78..23b56eacb4d 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -98,10 +98,8 @@ public: enum MachineOperandType { MO_VirtualRegister, // virtual register for *value MO_MachineRegister, // pre-assigned machine register `regNum' - MO_CCRegister, MO_SignExtendedImmed, MO_UnextendedImmed, - MO_PCRelativeDisp, MO_MachineBasicBlock, // MachineBasicBlock reference MO_FrameIndex, // Abstract Stack Frame Index MO_ConstantPoolIndex, // Address of indexed Constant in Constant Pool @@ -237,7 +235,6 @@ public: /// Accessors that tell you what kind of MachineOperand you're looking at. /// bool isMachineBasicBlock() const { return opType == MO_MachineBasicBlock; } - bool isPCRelativeDisp() const { return opType == MO_PCRelativeDisp; } bool isImmediate() const { return opType == MO_SignExtendedImmed || opType == MO_UnextendedImmed; } @@ -251,16 +248,14 @@ public: /// has one. This is deprecated and only used by the SPARC v9 backend. /// Value* getVRegValueOrNull() const { - return (opType == MO_VirtualRegister || opType == MO_CCRegister || - isPCRelativeDisp()) ? contents.value : NULL; + return opType == MO_VirtualRegister ? contents.value : NULL; } /// MachineOperand accessors that only work on certain types of /// MachineOperand... /// Value* getVRegValue() const { - assert ((opType == MO_VirtualRegister || opType == MO_CCRegister - || isPCRelativeDisp()) && "Wrong MachineOperand accessor"); + assert(opType == MO_VirtualRegister && "Wrong MachineOperand accessor"); return contents.value; } int getMachineRegNum() const { @@ -322,8 +317,7 @@ public: /// bool hasAllocatedReg() const { return (extra.regNum >= 0 && - (opType == MO_VirtualRegister || opType == MO_CCRegister || - opType == MO_MachineRegister)); + (opType == MO_VirtualRegister || opType == MO_MachineRegister)); } /// getReg - Returns the register number. It is a runtime error to call this @@ -362,25 +356,6 @@ public: friend std::ostream& operator<<(std::ostream& os, const MachineOperand& mop); - /// markHi32, markLo32, etc. - These methods are deprecated and only used by - /// the SPARC v9 back-end. - /// - void markHi32() { flags |= HIFLAG32; } - void markLo32() { flags |= LOFLAG32; } - void markHi64() { flags |= HIFLAG64; } - void markLo64() { flags |= LOFLAG64; } - -private: - /// setRegForValue - Replaces the Value with its corresponding physical - /// register after register allocation is complete. This is deprecated - /// and only used by the SPARC v9 back-end. - /// - void setRegForValue(int reg) { - assert(opType == MO_VirtualRegister || opType == MO_CCRegister || - opType == MO_MachineRegister); - extra.regNum = reg; - } - friend class MachineInstr; }; @@ -507,15 +482,6 @@ public: UTy, isPCRelative)); } - void addCCRegOperand(Value *V, - MachineOperand::UseType UTy = MachineOperand::Use) { - assert(!OperandsComplete() && - "Trying to add an operand to a machine instr that is already done!"); - operands.push_back(MachineOperand(V, MachineOperand::MO_CCRegister, UTy, - false)); - } - - /// addRegOperand - Add a symbolic virtual register reference... /// void addRegOperand(int reg, bool isDef) { @@ -536,15 +502,6 @@ public: MachineOperand(reg, MachineOperand::MO_VirtualRegister, UTy)); } - /// addPCDispOperand - Add a PC relative displacement operand to the MI - /// - void addPCDispOperand(Value *V) { - assert(!OperandsComplete() && - "Trying to add an operand to a machine instr that is already done!"); - operands.push_back( - MachineOperand(V, MachineOperand::MO_PCRelativeDisp,MachineOperand::Use)); - } - /// addMachineRegOperand - Add a virtual register operand to this MachineInstr /// void addMachineRegOperand(int reg, bool isDef) { diff --git a/include/llvm/CodeGen/MachineInstrBuilder.h b/include/llvm/CodeGen/MachineInstrBuilder.h index d29d53b6375..c267c77da29 100644 --- a/include/llvm/CodeGen/MachineInstrBuilder.h +++ b/include/llvm/CodeGen/MachineInstrBuilder.h @@ -55,15 +55,6 @@ public: return *this; } - /// addReg - Add an LLVM value that is to be used as a register... - /// - const MachineInstrBuilder &addCCReg( - Value *V, - MachineOperand::UseType Ty = MachineOperand::Use) const { - MI->addCCRegOperand(V, Ty); - return *this; - } - /// addRegDef - Add an LLVM value that is to be defined as a register... this /// is the same as addReg(V, MachineOperand::Def). /// @@ -71,22 +62,6 @@ public: return addReg(V, MachineOperand::Def); } - /// addPCDisp - Add an LLVM value to be treated as a PC relative - /// displacement... - /// - const MachineInstrBuilder &addPCDisp(Value *V) const { - MI->addPCDispOperand(V); - return *this; - } - - /// addMReg - Add a machine register operand... - /// - const MachineInstrBuilder &addMReg(int Reg, MachineOperand::UseType Ty - = MachineOperand::Use) const { - MI->addMachineRegOperand(Reg, Ty); - return *this; - } - /// addImm - Add a new immediate operand. /// const MachineInstrBuilder &addImm(int Val) const { diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp index f92c0844d8a..8889a7aea2d 100644 --- a/lib/CodeGen/MachineInstr.cpp +++ b/lib/CodeGen/MachineInstr.cpp @@ -199,14 +199,6 @@ static void print(const MachineOperand &MO, std::ostream &OS, if (MO.hasAllocatedReg()) OutputReg(OS, MO.getReg(), MRI); break; - case MachineOperand::MO_CCRegister: - OS << "%ccreg"; - OutputValue(OS, MO.getVRegValue()); - if (MO.hasAllocatedReg()) { - OS << "=="; - OutputReg(OS, MO.getReg(), MRI); - } - break; case MachineOperand::MO_MachineRegister: OutputReg(OS, MO.getMachineRegNum(), MRI); break; @@ -216,17 +208,6 @@ static void print(const MachineOperand &MO, std::ostream &OS, case MachineOperand::MO_UnextendedImmed: OS << (long)MO.getImmedValue(); break; - case MachineOperand::MO_PCRelativeDisp: { - const Value* opVal = MO.getVRegValue(); - bool isLabel = isa(opVal) || isa(opVal); - OS << "%disp(" << (isLabel? "label " : "addr-of-val "); - if (opVal->hasName()) - OS << opVal->getName(); - else - OS << (const void*) opVal; - OS << ")"; - break; - } case MachineOperand::MO_MachineBasicBlock: OS << "mbb<" << ((Value*)MO.getMachineBasicBlock()->getBasicBlock())->getName() @@ -341,14 +322,6 @@ std::ostream &operator<<(std::ostream &OS, const MachineOperand &MO) { OutputValue(OS, MO.getVRegValue()); } break; - case MachineOperand::MO_CCRegister: - OS << "%ccreg"; - OutputValue(OS, MO.getVRegValue()); - if (MO.hasAllocatedReg()) { - OS << "=="; - OutputReg(OS, MO.getReg()); - } - break; case MachineOperand::MO_MachineRegister: OutputReg(OS, MO.getMachineRegNum()); break; @@ -358,17 +331,6 @@ std::ostream &operator<<(std::ostream &OS, const MachineOperand &MO) { case MachineOperand::MO_UnextendedImmed: OS << (long)MO.getImmedValue(); break; - case MachineOperand::MO_PCRelativeDisp: { - const Value* opVal = MO.getVRegValue(); - bool isLabel = isa(opVal) || isa(opVal); - OS << "%disp(" << (isLabel? "label " : "addr-of-val "); - if (opVal->hasName()) - OS << opVal->getName(); - else - OS << (const void*) opVal; - OS << ")"; - break; - } case MachineOperand::MO_MachineBasicBlock: OS << "getBasicBlock())->getName() diff --git a/lib/Target/Alpha/AlphaAsmPrinter.cpp b/lib/Target/Alpha/AlphaAsmPrinter.cpp index 74af78e250a..600dbe2247d 100644 --- a/lib/Target/Alpha/AlphaAsmPrinter.cpp +++ b/lib/Target/Alpha/AlphaAsmPrinter.cpp @@ -100,7 +100,6 @@ void AlphaAsmPrinter::printOp(const MachineOperand &MO, bool IsCallOp) { } // FALLTHROUGH case MachineOperand::MO_MachineRegister: - case MachineOperand::MO_CCRegister: O << RI.get(MO.getReg()).Name; return; @@ -110,11 +109,6 @@ void AlphaAsmPrinter::printOp(const MachineOperand &MO, bool IsCallOp) { abort(); return; - case MachineOperand::MO_PCRelativeDisp: - std::cerr << "Shouldn't use addPCDisp() when building Alpha MachineInstrs"; - abort(); - return; - case MachineOperand::MO_MachineBasicBlock: printBasicBlockLabel(MO.getMachineBasicBlock()); return; diff --git a/lib/Target/IA64/IA64AsmPrinter.cpp b/lib/Target/IA64/IA64AsmPrinter.cpp index d7f2fe10833..6895d328da6 100644 --- a/lib/Target/IA64/IA64AsmPrinter.cpp +++ b/lib/Target/IA64/IA64AsmPrinter.cpp @@ -180,10 +180,8 @@ void IA64AsmPrinter::printOp(const MachineOperand &MO, } // FALLTHROUGH case MachineOperand::MO_MachineRegister: - case MachineOperand::MO_CCRegister: { O << RI.get(MO.getReg()).Name; return; - } case MachineOperand::MO_SignExtendedImmed: case MachineOperand::MO_UnextendedImmed: @@ -192,11 +190,6 @@ void IA64AsmPrinter::printOp(const MachineOperand &MO, case MachineOperand::MO_MachineBasicBlock: printBasicBlockLabel(MO.getMachineBasicBlock()); return; - case MachineOperand::MO_PCRelativeDisp: - std::cerr << "Shouldn't use addPCDisp() when building IA64 MachineInstrs"; - abort (); - return; - case MachineOperand::MO_ConstantPoolIndex: { O << "@gprel(" << PrivateGlobalPrefix << "CPI" << getFunctionNumber() << "_" << MO.getConstantPoolIndex() << ")"; diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp index cfcf4dfe2e3..2cf10a2f9d4 100644 --- a/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -360,7 +360,6 @@ void PPCAsmPrinter::printOp(const MachineOperand &MO) { } // FALLTHROUGH case MachineOperand::MO_MachineRegister: - case MachineOperand::MO_CCRegister: O << RI.get(MO.getReg()).Name; return; @@ -370,11 +369,6 @@ void PPCAsmPrinter::printOp(const MachineOperand &MO) { abort(); return; - case MachineOperand::MO_PCRelativeDisp: - std::cerr << "Shouldn't use addPCDisp() when building PPC MachineInstrs"; - abort(); - return; - case MachineOperand::MO_MachineBasicBlock: printBasicBlockLabel(MO.getMachineBasicBlock()); return; diff --git a/lib/Target/Sparc/SparcAsmPrinter.cpp b/lib/Target/Sparc/SparcAsmPrinter.cpp index 7033ab9422b..ced2b3dd0c1 100644 --- a/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -166,10 +166,6 @@ void SparcAsmPrinter::printOperand(const MachineInstr *MI, int opNum) { case MachineOperand::MO_MachineBasicBlock: printBasicBlockLabel(MO.getMachineBasicBlock()); return; - case MachineOperand::MO_PCRelativeDisp: - std::cerr << "Shouldn't use addPCDisp() when building Sparc MachineInstrs"; - abort (); - return; case MachineOperand::MO_GlobalAddress: O << Mang->getValueName(MO.getGlobal()); break; diff --git a/lib/Target/X86/X86ATTAsmPrinter.cpp b/lib/Target/X86/X86ATTAsmPrinter.cpp index 1b10123514d..b7f5b6c8a69 100755 --- a/lib/Target/X86/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/X86ATTAsmPrinter.cpp @@ -126,10 +126,6 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo, case MachineOperand::MO_MachineBasicBlock: printBasicBlockLabel(MO.getMachineBasicBlock()); return; - case MachineOperand::MO_PCRelativeDisp: - std::cerr << "Shouldn't use addPCDisp() when building X86 MachineInstrs"; - abort (); - return; case MachineOperand::MO_JumpTableIndex: { bool isMemOp = Modifier && !strcmp(Modifier, "mem"); if (!isMemOp) O << '$'; diff --git a/lib/Target/X86/X86IntelAsmPrinter.cpp b/lib/Target/X86/X86IntelAsmPrinter.cpp index 8f12446b61c..f3213b64f41 100755 --- a/lib/Target/X86/X86IntelAsmPrinter.cpp +++ b/lib/Target/X86/X86IntelAsmPrinter.cpp @@ -134,10 +134,6 @@ void X86IntelAsmPrinter::printOp(const MachineOperand &MO, case MachineOperand::MO_MachineBasicBlock: printBasicBlockLabel(MO.getMachineBasicBlock()); return; - case MachineOperand::MO_PCRelativeDisp: - assert(0 && "Shouldn't use addPCDisp() when building X86 MachineInstrs"); - abort (); - return; case MachineOperand::MO_ConstantPoolIndex: { bool isMemOp = Modifier && !strcmp(Modifier, "mem"); if (!isMemOp) O << "OFFSET ";