RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Remove NumImplicitOps which is now unused.

Browse Source 
llvm-svn: 140767
This commit is contained in:
Jakob Stoklund Olesen 2011-09-29 01:47:36 +00:00
parent e1d5ae73ac
commit 49803374a4
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/CodeGen/MachineInstr.h
View File

@ -58,8 +58,6 @@ public:
}; };
private: private:
const MCInstrDesc *MCID; // Instruction descriptor. const MCInstrDesc *MCID; // Instruction descriptor.
uint16_t NumImplicitOps; // Number of implicit operands (which
// are determined at construction time).
uint8_t Flags; // Various bits of additional uint8_t Flags; // Various bits of additional
// information about machine // information about machine
@ -78,9 +76,6 @@ private:
MachineBasicBlock *Parent; // Pointer to the owning basic block. MachineBasicBlock *Parent; // Pointer to the owning basic block.
DebugLoc debugLoc; // Source line information. DebugLoc debugLoc; // Source line information.
// OperandComplete - Return true if it's illegal to add a new operand
bool OperandsComplete() const;
MachineInstr(const MachineInstr&); // DO NOT IMPLEMENT MachineInstr(const MachineInstr&); // DO NOT IMPLEMENT
void operator=(const MachineInstr&); // DO NOT IMPLEMENT void operator=(const MachineInstr&); // DO NOT IMPLEMENT

30
lib/CodeGen/MachineInstr.cpp
View File

@ -464,7 +464,7 @@ raw_ostream &llvm::operator<<(raw_ostream &OS, const MachineMemOperand &MMO) {
/// MachineInstr ctor - This constructor creates a dummy MachineInstr with /// MachineInstr ctor - This constructor creates a dummy MachineInstr with
/// MCID NULL and no operands. /// MCID NULL and no operands.
MachineInstr::MachineInstr() MachineInstr::MachineInstr()
: MCID(0), NumImplicitOps(0), Flags(0), AsmPrinterFlags(0), : MCID(0), Flags(0), AsmPrinterFlags(0),
MemRefs(0), MemRefsEnd(0), MemRefs(0), MemRefsEnd(0),
Parent(0) { Parent(0) {
// Make sure that we get added to a machine basicblock // Make sure that we get added to a machine basicblock
@ -484,8 +484,9 @@ void MachineInstr::addImplicitDefUseOperands() {
/// implicit operands. It reserves space for the number of operands specified by /// implicit operands. It reserves space for the number of operands specified by
/// the MCInstrDesc. /// the MCInstrDesc.
MachineInstr::MachineInstr(const MCInstrDesc &tid, bool NoImp) MachineInstr::MachineInstr(const MCInstrDesc &tid, bool NoImp)
: MCID(&tid), NumImplicitOps(0), Flags(0), AsmPrinterFlags(0), : MCID(&tid), Flags(0), AsmPrinterFlags(0),
MemRefs(0), MemRefsEnd(0), Parent(0) { MemRefs(0), MemRefsEnd(0), Parent(0) {
unsigned NumImplicitOps = 0;
if (!NoImp) if (!NoImp)
NumImplicitOps = MCID->getNumImplicitDefs() + MCID->getNumImplicitUses(); NumImplicitOps = MCID->getNumImplicitDefs() + MCID->getNumImplicitUses();
Operands.reserve(NumImplicitOps + MCID->getNumOperands()); Operands.reserve(NumImplicitOps + MCID->getNumOperands());
@ -498,8 +499,9 @@ MachineInstr::MachineInstr(const MCInstrDesc &tid, bool NoImp)
/// MachineInstr ctor - As above, but with a DebugLoc. /// MachineInstr ctor - As above, but with a DebugLoc.
MachineInstr::MachineInstr(const MCInstrDesc &tid, const DebugLoc dl, MachineInstr::MachineInstr(const MCInstrDesc &tid, const DebugLoc dl,
bool NoImp) bool NoImp)
: MCID(&tid), NumImplicitOps(0), Flags(0), AsmPrinterFlags(0), : MCID(&tid), Flags(0), AsmPrinterFlags(0),
MemRefs(0), MemRefsEnd(0), Parent(0), debugLoc(dl) { MemRefs(0), MemRefsEnd(0), Parent(0), debugLoc(dl) {
unsigned NumImplicitOps = 0;
if (!NoImp) if (!NoImp)
NumImplicitOps = MCID->getNumImplicitDefs() + MCID->getNumImplicitUses(); NumImplicitOps = MCID->getNumImplicitDefs() + MCID->getNumImplicitUses();
Operands.reserve(NumImplicitOps + MCID->getNumOperands()); Operands.reserve(NumImplicitOps + MCID->getNumOperands());
@ -513,10 +515,11 @@ MachineInstr::MachineInstr(const MCInstrDesc &tid, const DebugLoc dl,
/// that the MachineInstr is created and added to the end of the specified /// that the MachineInstr is created and added to the end of the specified
/// basic block. /// basic block.
MachineInstr::MachineInstr(MachineBasicBlock *MBB, const MCInstrDesc &tid) MachineInstr::MachineInstr(MachineBasicBlock *MBB, const MCInstrDesc &tid)
: MCID(&tid), NumImplicitOps(0), Flags(0), AsmPrinterFlags(0), : MCID(&tid), Flags(0), AsmPrinterFlags(0),
MemRefs(0), MemRefsEnd(0), Parent(0) { MemRefs(0), MemRefsEnd(0), Parent(0) {
assert(MBB && "Cannot use inserting ctor with null basic block!"); assert(MBB && "Cannot use inserting ctor with null basic block!");
NumImplicitOps = MCID->getNumImplicitDefs() + MCID->getNumImplicitUses(); unsigned NumImplicitOps =
MCID->getNumImplicitDefs() + MCID->getNumImplicitUses();
Operands.reserve(NumImplicitOps + MCID->getNumOperands()); Operands.reserve(NumImplicitOps + MCID->getNumOperands());
addImplicitDefUseOperands(); addImplicitDefUseOperands();
// Make sure that we get added to a machine basicblock // Make sure that we get added to a machine basicblock
@ -528,10 +531,11 @@ MachineInstr::MachineInstr(MachineBasicBlock *MBB, const MCInstrDesc &tid)
/// ///
MachineInstr::MachineInstr(MachineBasicBlock *MBB, const DebugLoc dl, MachineInstr::MachineInstr(MachineBasicBlock *MBB, const DebugLoc dl,
const MCInstrDesc &tid) const MCInstrDesc &tid)
: MCID(&tid), NumImplicitOps(0), Flags(0), AsmPrinterFlags(0), : MCID(&tid), Flags(0), AsmPrinterFlags(0),
MemRefs(0), MemRefsEnd(0), Parent(0), debugLoc(dl) { MemRefs(0), MemRefsEnd(0), Parent(0), debugLoc(dl) {
assert(MBB && "Cannot use inserting ctor with null basic block!"); assert(MBB && "Cannot use inserting ctor with null basic block!");
NumImplicitOps = MCID->getNumImplicitDefs() + MCID->getNumImplicitUses(); unsigned NumImplicitOps =
MCID->getNumImplicitDefs() + MCID->getNumImplicitUses();
Operands.reserve(NumImplicitOps + MCID->getNumOperands()); Operands.reserve(NumImplicitOps + MCID->getNumOperands());
addImplicitDefUseOperands(); addImplicitDefUseOperands();
// Make sure that we get added to a machine basicblock // Make sure that we get added to a machine basicblock
@ -542,7 +546,7 @@ MachineInstr::MachineInstr(MachineBasicBlock *MBB, const DebugLoc dl,
/// MachineInstr ctor - Copies MachineInstr arg exactly /// MachineInstr ctor - Copies MachineInstr arg exactly
/// ///
MachineInstr::MachineInstr(MachineFunction &MF, const MachineInstr &MI) MachineInstr::MachineInstr(MachineFunction &MF, const MachineInstr &MI)
: MCID(&MI.getDesc()), NumImplicitOps(0), Flags(0), AsmPrinterFlags(0), : MCID(&MI.getDesc()), Flags(0), AsmPrinterFlags(0),
MemRefs(MI.MemRefs), MemRefsEnd(MI.MemRefsEnd), MemRefs(MI.MemRefs), MemRefsEnd(MI.MemRefsEnd),
Parent(0), debugLoc(MI.getDebugLoc()) { Parent(0), debugLoc(MI.getDebugLoc()) {
Operands.reserve(MI.getNumOperands()); Operands.reserve(MI.getNumOperands());
@ -550,7 +554,6 @@ MachineInstr::MachineInstr(MachineFunction &MF, const MachineInstr &MI)
// Add operands // Add operands
for (unsigned i = 0; i != MI.getNumOperands(); ++i) for (unsigned i = 0; i != MI.getNumOperands(); ++i)
addOperand(MI.getOperand(i)); addOperand(MI.getOperand(i));
NumImplicitOps = MI.NumImplicitOps;
// Copy all the flags. // Copy all the flags.
Flags = MI.Flags; Flags = MI.Flags;
@ -799,15 +802,6 @@ void MachineInstr::eraseFromParent() {
} }
/// OperandComplete - Return true if it's illegal to add a new operand
///
bool MachineInstr::OperandsComplete() const {
unsigned short NumOperands = MCID->getNumOperands();
if (!MCID->isVariadic() && getNumOperands()-NumImplicitOps >= NumOperands)
return true; // Broken: we have all the operands of this instruction!
return false;
}
/// getNumExplicitOperands - Returns the number of non-implicit operands. /// getNumExplicitOperands - Returns the number of non-implicit operands.
/// ///
unsigned MachineInstr::getNumExplicitOperands() const { unsigned MachineInstr::getNumExplicitOperands() const {