RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-04 01:01:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the Opcode enum for PHI nodes from "Instruction::PHINode" to "Instruction::PHI" to be more consistent with the other instructions.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9269 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-10-19 21:34:28 +00:00
parent 4661dc6a6a
commit 3b237fcd38
15 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Instruction.def
View File

@ -114,7 +114,7 @@ HANDLE_MEMORY_INST(25, GetElementPtr, GetElementPtrInst)
// Other operators... // Other operators...
FIRST_OTHER_INST(26) FIRST_OTHER_INST(26)
HANDLE_OTHER_INST(26, PHINode, PHINode ) // PHI node instruction HANDLE_OTHER_INST(26, PHI , PHINode ) // PHI node instruction
HANDLE_OTHER_INST(27, Cast , CastInst ) // Type cast HANDLE_OTHER_INST(27, Cast , CastInst ) // Type cast
HANDLE_OTHER_INST(28, Call , CallInst ) // Call a function HANDLE_OTHER_INST(28, Call , CallInst ) // Call a function

4
include/llvm/iPHINode.h
View File

@ -23,7 +23,7 @@ class PHINode : public Instruction {
public: public:
PHINode(const Type *Ty, const std::string &Name = "", PHINode(const Type *Ty, const std::string &Name = "",
Instruction *InsertBefore = 0) Instruction *InsertBefore = 0)
: Instruction(Ty, Instruction::PHINode, Name, InsertBefore) { : Instruction(Ty, Instruction::PHI, Name, InsertBefore) {
} }
virtual Instruction *clone() const { return new PHINode(*this); } virtual Instruction *clone() const { return new PHINode(*this); }
@ -98,7 +98,7 @@ public:
/// Methods for support type inquiry through isa, cast, and dyn_cast: /// Methods for support type inquiry through isa, cast, and dyn_cast:
static inline bool classof(const PHINode *) { return true; } static inline bool classof(const PHINode *) { return true; }
static inline bool classof(const Instruction *I) { static inline bool classof(const Instruction *I) {
return I->getOpcode() == Instruction::PHINode; return I->getOpcode() == Instruction::PHI;
} }
static inline bool classof(const Value *V) { static inline bool classof(const Value *V) {
return isa<Instruction>(V) && classof(cast<Instruction>(V)); return isa<Instruction>(V) && classof(cast<Instruction>(V));

2
lib/Analysis/IPA/FindUnsafePointerTypes.cpp
View File

@ -43,7 +43,7 @@ static inline bool isSafeInstruction(const Instruction *I) {
case Instruction::GetElementPtr: case Instruction::GetElementPtr:
case Instruction::Call: case Instruction::Call:
case Instruction::Invoke: case Instruction::Invoke:
case Instruction::PHINode: case Instruction::PHI:
return true; return true;
} }
return false; return false;

2
lib/AsmParser/Lexer.l
View File

@ -219,7 +219,7 @@ setgt { RET_TOK(BinaryOpVal, SetGT, SETGT); }
setle { RET_TOK(BinaryOpVal, SetLE, SETLE); } setle { RET_TOK(BinaryOpVal, SetLE, SETLE); }
setge { RET_TOK(BinaryOpVal, SetGE, SETGE); } setge { RET_TOK(BinaryOpVal, SetGE, SETGE); }
phi { RET_TOK(OtherOpVal, PHINode, PHI); } phi { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
call { RET_TOK(OtherOpVal, Call, CALL); } call { RET_TOK(OtherOpVal, Call, CALL); }
cast { RET_TOK(OtherOpVal, Cast, CAST); } cast { RET_TOK(OtherOpVal, Cast, CAST); }
shl { RET_TOK(OtherOpVal, Shl, SHL); } shl { RET_TOK(OtherOpVal, Shl, SHL); }

4
lib/AsmParser/llvmAsmParser.y
View File

@ -785,7 +785,7 @@ Module *RunVMAsmParser(const std::string &Filename, FILE *F) {
// Other Operators // Other Operators
%type <OtherOpVal> ShiftOps %type <OtherOpVal> ShiftOps
%token <OtherOpVal> PHI CALL CAST SHL SHR VAARG VANEXT %token <OtherOpVal> PHI_TOK CALL CAST SHL SHR VAARG VANEXT
%token VA_ARG // FIXME: OBSOLETE %token VA_ARG // FIXME: OBSOLETE
%start Module %start Module
@ -1747,7 +1747,7 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
$$ = new VANextInst($2, *$4); $$ = new VANextInst($2, *$4);
delete $4; delete $4;
} }
| PHI PHIList { | PHI_TOK PHIList {
const Type *Ty = $2->front().first->getType(); const Type *Ty = $2->front().first->getType();
$$ = new PHINode(Ty); $$ = new PHINode(Ty);
$$->op_reserve($2->size()*2); $$->op_reserve($2->size()*2);

2
lib/Bytecode/Reader/InstructionReader.cpp
View File

@ -158,7 +158,7 @@ void BytecodeParser::ParseInstruction(const unsigned char *&Buf,
case Instruction::Cast: case Instruction::Cast:
Result = new CastInst(getValue(RI.Type, Args[0]), getType(Args[1])); Result = new CastInst(getValue(RI.Type, Args[0]), getType(Args[1]));
break; break;
case Instruction::PHINode: { case Instruction::PHI: {
if (Args.size() == 0 || (Args.size() & 1)) if (Args.size() == 0 || (Args.size() & 1))
throw std::string("Invalid phi node encountered!\n"); throw std::string("Invalid phi node encountered!\n");

4
lib/CodeGen/InstrSelection/InstrForest.cpp
View File

@ -299,7 +299,7 @@ InstrForest::buildTreeForInstruction(Instruction *instr)
InstrTreeNode* opTreeNode; InstrTreeNode* opTreeNode;
if (isa<Instruction>(operand) && operand->hasOneUse() && if (isa<Instruction>(operand) && operand->hasOneUse() &&
cast<Instruction>(operand)->getParent() == instr->getParent() && cast<Instruction>(operand)->getParent() == instr->getParent() &&
instr->getOpcode() != Instruction::PHINode && instr->getOpcode() != Instruction::PHI &&
instr->getOpcode() != Instruction::Call) instr->getOpcode() != Instruction::Call)
{ {
// Recursively create a treeNode for it. // Recursively create a treeNode for it.
@ -334,7 +334,7 @@ InstrForest::buildTreeForInstruction(Instruction *instr)
if (numChildren > 2) if (numChildren > 2)
{ {
unsigned instrOpcode = treeNode->getInstruction()->getOpcode(); unsigned instrOpcode = treeNode->getInstruction()->getOpcode();
assert(instrOpcode == Instruction::PHINode || assert(instrOpcode == Instruction::PHI ||
instrOpcode == Instruction::Call || instrOpcode == Instruction::Call ||
instrOpcode == Instruction::Load || instrOpcode == Instruction::Load ||
instrOpcode == Instruction::Store || instrOpcode == Instruction::Store ||

4
lib/Target/SparcV9/InstrSelection/InstrForest.cpp
View File

@ -299,7 +299,7 @@ InstrForest::buildTreeForInstruction(Instruction *instr)
InstrTreeNode* opTreeNode; InstrTreeNode* opTreeNode;
if (isa<Instruction>(operand) && operand->hasOneUse() && if (isa<Instruction>(operand) && operand->hasOneUse() &&
cast<Instruction>(operand)->getParent() == instr->getParent() && cast<Instruction>(operand)->getParent() == instr->getParent() &&
instr->getOpcode() != Instruction::PHINode && instr->getOpcode() != Instruction::PHI &&
instr->getOpcode() != Instruction::Call) instr->getOpcode() != Instruction::Call)
{ {
// Recursively create a treeNode for it. // Recursively create a treeNode for it.
@ -334,7 +334,7 @@ InstrForest::buildTreeForInstruction(Instruction *instr)
if (numChildren > 2) if (numChildren > 2)
{ {
unsigned instrOpcode = treeNode->getInstruction()->getOpcode(); unsigned instrOpcode = treeNode->getInstruction()->getOpcode();
assert(instrOpcode == Instruction::PHINode || assert(instrOpcode == Instruction::PHI ||
instrOpcode == Instruction::Call || instrOpcode == Instruction::Call ||
instrOpcode == Instruction::Load || instrOpcode == Instruction::Load ||
instrOpcode == Instruction::Store || instrOpcode == Instruction::Store ||

2
lib/Target/SparcV9/SparcV9InstrInfo.cpp
View File

@ -365,7 +365,7 @@ MaxConstantForInstr(unsigned llvmOpCode)
case Instruction::Malloc: case Instruction::Malloc:
case Instruction::Alloca: case Instruction::Alloca:
case Instruction::GetElementPtr: case Instruction::GetElementPtr:
case Instruction::PHINode: case Instruction::PHI:
case Instruction::Cast: case Instruction::Cast:
case Instruction::Call: modelOpCode = V9::ADDi; break; case Instruction::Call: modelOpCode = V9::ADDi; break;

8
lib/Transforms/ExprTypeConvert.cpp
View File

@ -196,7 +196,7 @@ bool ExpressionConvertibleToType(Value *V, const Type *Ty,
return false; return false;
break; break;
} }
case Instruction::PHINode: { case Instruction::PHI: {
PHINode *PN = cast<PHINode>(I); PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD)) if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD))
@ -402,7 +402,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
break; break;
} }
case Instruction::PHINode: { case Instruction::PHI: {
PHINode *OldPN = cast<PHINode>(I); PHINode *OldPN = cast<PHINode>(I);
PHINode *NewPN = new PHINode(Ty, Name); PHINode *NewPN = new PHINode(Ty, Name);
@ -808,7 +808,7 @@ static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
} }
return false; return false;
case Instruction::PHINode: { case Instruction::PHI: {
PHINode *PN = cast<PHINode>(I); PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD)) if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD))
@ -1141,7 +1141,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
#endif #endif
break; break;
case Instruction::PHINode: { case Instruction::PHI: {
PHINode *OldPN = cast<PHINode>(I); PHINode *OldPN = cast<PHINode>(I);
PHINode *NewPN = new PHINode(NewTy, Name); PHINode *NewPN = new PHINode(NewTy, Name);
VMC.ExprMap[I] = NewPN; VMC.ExprMap[I] = NewPN;

2
lib/Transforms/IPO/MutateStructTypes.cpp
View File

@ -425,7 +425,7 @@ void MutateStructTypes::transformFunction(Function *m) {
} }
// Miscellaneous Instructions // Miscellaneous Instructions
case Instruction::PHINode: { case Instruction::PHI: {
const PHINode &OldPN = cast<PHINode>(I); const PHINode &OldPN = cast<PHINode>(I);
PHINode *PN = new PHINode(ConvertType(OldPN.getType())); PHINode *PN = new PHINode(ConvertType(OldPN.getType()));
for (unsigned i = 0; i < OldPN.getNumIncomingValues(); ++i) for (unsigned i = 0; i < OldPN.getNumIncomingValues(); ++i)

2
lib/Transforms/Instrumentation/TraceValues.cpp
View File

@ -180,7 +180,7 @@ static inline bool TraceThisOpCode(unsigned opCode) {
// //
return (opCode < Instruction::OtherOpsBegin && return (opCode < Instruction::OtherOpsBegin &&
opCode != Instruction::Alloca && opCode != Instruction::Alloca &&
opCode != Instruction::PHINode && opCode != Instruction::PHI &&
opCode != Instruction::Cast); opCode != Instruction::Cast);
} }

2
lib/Transforms/Scalar/Reassociate.cpp
View File

@ -75,7 +75,7 @@ unsigned Reassociate::getRank(Value *V) {
// for PHI nodes, we cannot have infinite recursion here, because there // for PHI nodes, we cannot have infinite recursion here, because there
// cannot be loops in the value graph that do not go through PHI nodes. // cannot be loops in the value graph that do not go through PHI nodes.
// //
if (I->getOpcode() == Instruction::PHINode || if (I->getOpcode() == Instruction::PHI ||
I->getOpcode() == Instruction::Alloca || I->getOpcode() == Instruction::Alloca ||
I->getOpcode() == Instruction::Malloc || isa<TerminatorInst>(I) || I->getOpcode() == Instruction::Malloc || isa<TerminatorInst>(I) ||
I->mayWriteToMemory()) // Cannot move inst if it writes to memory! I->mayWriteToMemory()) // Cannot move inst if it writes to memory!

2
lib/VMCore/InstrTypes.cpp
View File

@ -25,7 +25,7 @@ TerminatorInst::TerminatorInst(Instruction::TermOps iType, Instruction *IB)
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
PHINode::PHINode(const PHINode &PN) PHINode::PHINode(const PHINode &PN)
: Instruction(PN.getType(), Instruction::PHINode) { : Instruction(PN.getType(), Instruction::PHI) {
Operands.reserve(PN.Operands.size()); Operands.reserve(PN.Operands.size());
for (unsigned i = 0; i < PN.Operands.size(); i+=2) { for (unsigned i = 0; i < PN.Operands.size(); i+=2) {
Operands.push_back(Use(PN.Operands[i], this)); Operands.push_back(Use(PN.Operands[i], this));

2
lib/VMCore/Instruction.cpp
View File

@ -87,7 +87,7 @@ const char *Instruction::getOpcodeName(unsigned OpCode) {
case GetElementPtr: return "getelementptr"; case GetElementPtr: return "getelementptr";
// Other instructions... // Other instructions...
case PHINode: return "phi"; case PHI: return "phi";
case Cast: return "cast"; case Cast: return "cast";
case Call: return "call"; case Call: return "call";
case Shl: return "shl"; case Shl: return "shl";