maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Finegrainify namespacification. 

Adjust TmpInstruction to work with the new User model.

llvm-svn: 19896
This commit is contained in:
Chris Lattner 2005-01-29 00:36:59 +00:00
parent 68afd89730
commit 3479f9cca8
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp
View File

@ -14,14 +14,24 @@
#include "SparcV9TmpInstr.h" #include "SparcV9TmpInstr.h"
#include "llvm/Support/LeakDetector.h" #include "llvm/Support/LeakDetector.h"
using namespace llvm;
namespace llvm { TmpInstruction::TmpInstruction(const TmpInstruction &TI)
: Instruction(TI.getType(), TI.getOpcode(), Ops, TI.getNumOperands()) {
if (TI.getNumOperands()) {
Ops[0].init(TI.Ops[0], this);
if (TI.getNumOperands() == 2)
Ops[1].init(TI.Ops[1], this);
else
assert(0 && "Bad # operands to TmpInstruction!");
}
}
TmpInstruction::TmpInstruction(Value *s1, Value *s2, const std::string &name) TmpInstruction::TmpInstruction(Value *s1, Value *s2, const std::string &name)
: Instruction(s1->getType(), Instruction::UserOp1, name) { : Instruction(s1->getType(), Instruction::UserOp1, Ops, 1+(s2 != 0), name) {
Operands.push_back(Use(s1, this)); // s1 must be non-null Ops[0].init(s1, this); // s1 must be non-null
if (s2) if (s2)
Operands.push_back(Use(s2, this)); Ops[1].init(s2, this);
// TmpInstructions should not be garbage checked. // TmpInstructions should not be garbage checked.
LeakDetector::removeGarbageObject(this); LeakDetector::removeGarbageObject(this);
@ -29,12 +39,12 @@ TmpInstruction::TmpInstruction(Value *s1, Value *s2, const std::string &name)
TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi, TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi,
Value *s1, Value *s2, const std::string &name) Value *s1, Value *s2, const std::string &name)
: Instruction(s1->getType(), Instruction::UserOp1, name) { : Instruction(s1->getType(), Instruction::UserOp1, Ops, 1+(s2 != 0), name) {
mcfi.addTemp(this); mcfi.addTemp(this);
Operands.push_back(Use(s1, this)); // s1 must be non-null Ops[0].init(s1, this); // s1 must be non-null
if (s2) if (s2)
Operands.push_back(Use(s2, this)); Ops[1].init(s2, this);
// TmpInstructions should not be garbage checked. // TmpInstructions should not be garbage checked.
LeakDetector::removeGarbageObject(this); LeakDetector::removeGarbageObject(this);
@ -45,16 +55,17 @@ TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi,
TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi, TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi,
const Type *Ty, Value *s1, Value* s2, const Type *Ty, Value *s1, Value* s2,
const std::string &name) const std::string &name)
: Instruction(Ty, Instruction::UserOp1, name) { : Instruction(Ty, Instruction::UserOp1, Ops, (s1 != 0)+(s2 != 0), name) {
mcfi.addTemp(this); mcfi.addTemp(this);
if (s1) assert((s1 != 0 || s2 == 0) &&
Operands.push_back(Use(s1, this)); "s2 cannot be non-null if s1 is non-null!");
if (s2) if (s1) {
Operands.push_back(Use(s2, this)); Ops[0].init(s1, this);
if (s2)
Ops[1].init(s2, this);
}
// TmpInstructions should not be garbage checked. // TmpInstructions should not be garbage checked.
LeakDetector::removeGarbageObject(this); LeakDetector::removeGarbageObject(this);
} }
} // end namespace llvm

12
llvm/lib/Target/SparcV9/SparcV9TmpInstr.h
View File

@ -24,16 +24,8 @@ namespace llvm {
/// values used within the SparcV9 machine code for an LLVM instruction. /// values used within the SparcV9 machine code for an LLVM instruction.
/// ///
class TmpInstruction : public Instruction { class TmpInstruction : public Instruction {
TmpInstruction(const TmpInstruction &TI) Use Ops[2];
: Instruction(TI.getType(), TI.getOpcode()) { TmpInstruction(const TmpInstruction &TI);
if (!TI.Operands.empty()) {
Operands.push_back(Use(TI.Operands[0], this));
if (TI.Operands.size() == 2)
Operands.push_back(Use(TI.Operands[1], this));
else
assert(0 && "Bad # operands to TmpInstruction!");
}
}
public: public:
// Constructor that uses the type of S1 as the type of the temporary. // Constructor that uses the type of S1 as the type of the temporary.
// s1 must be a valid value. s2 may be NULL. // s1 must be a valid value. s2 may be NULL.