RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 12:12:47 +01:00
Code Issues Projects Releases Wiki Activity

Updates to support

Browse Source 
* Changes in PHI node structure
* Change to PHI syntax

llvm-svn: 24
This commit is contained in:
Chris Lattner 2001-06-11 15:04:20 +00:00
parent c819db7005
commit 88f6f66802
4 changed files with 315 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

540
lib/AsmParser/llvmAsmParser.cpp
View File

File diff suppressed because it is too large Load Diff

1
lib/AsmParser/llvmAsmParser.h
View File

@ -11,6 +11,7 @@ typedef union {
list<MethodArgument*> *MethodArgList;
list<Value*> *ValueList;
list<const Type*> *TypeList;
list<pair<Value*, BasicBlock*> > *PHIList; // Represent the RHS of PHI node
list<pair<ConstPoolVal*, BasicBlock*> > *JumpTable;
vector<ConstPoolVal*> *ConstVector;

26
lib/AsmParser/llvmAsmParser.y
View File

@ -347,6 +347,7 @@ Module *RunVMAsmParser(const ToolCommandLine &Opts, FILE *F) {
list<MethodArgument*> *MethodArgList;
list<Value*> *ValueList;
list<const Type*> *TypeList;
list<pair<Value*, BasicBlock*> > *PHIList; // Represent the RHS of PHI node
list<pair<ConstPoolVal*, BasicBlock*> > *JumpTable;
vector<ConstPoolVal*> *ConstVector;
@ -373,6 +374,7 @@ Module *RunVMAsmParser(const ToolCommandLine &Opts, FILE *F) {
%type <ConstVector> ConstVector
%type <MethodArgList> ArgList ArgListH
%type <MethArgVal> ArgVal
%type <PHIList> PHIList
%type <ValueList> ValueRefList ValueRefListE
%type <TypeList> TypeList
%type <JumpTable> JumpTable
@ -839,7 +841,19 @@ Inst : OptAssign InstVal {
$$ = $2;
}
ValueRefList : Types ValueRef { // Used for PHI nodes and call statements...
PHIList : Types '[' ValueRef ',' ValueRef ']' { // Used for PHI nodes
$$ = new list<pair<Value*, BasicBlock*> >();
$$->push_back(make_pair(getVal($1, $3),
(BasicBlock*)getVal(Type::LabelTy, $5)));
}
| PHIList ',' '[' ValueRef ',' ValueRef ']' {
$$ = $1;
$1->push_back(make_pair(getVal($1->front().first->getType(), $4),
(BasicBlock*)getVal(Type::LabelTy, $6)));
}
ValueRefList : Types ValueRef { // Used for call statements...
$$ = new list<Value*>();
$$->push_back(getVal($1, $2));
}
@ -861,11 +875,13 @@ InstVal : BinaryOps Types ValueRef ',' ValueRef {
if ($$ == 0)
ThrowException("unary operator returned null!");
}
| PHI ValueRefList {
$$ = new PHINode($2->front()->getType());
| PHI PHIList {
const Type *Ty = $2->front().first->getType();
$$ = new PHINode(Ty);
while ($2->begin() != $2->end()) {
// TODO: Ensure all types are the same...
((PHINode*)$$)->addIncoming($2->front());
if ($2->front().first->getType() != Ty)
ThrowException("All elements of a PHI node must be of the same type!");
((PHINode*)$$)->addIncoming($2->front().first, $2->front().second);
$2->pop_front();
}
delete $2; // Free the list...

8
lib/VMCore/AsmWriter.cpp
View File

@ -178,7 +178,15 @@ bool AssemblyWriter::processInstruction(const Instruction *I) {
writeOperand(I->getOperand(op+1), true);
}
Out << "\n\t]";
} else if (I->getInstType() == Instruction::PHINode) {
Out << " " << Operand->getType();
Out << " ["; writeOperand(Operand, false); Out << ",";
writeOperand(I->getOperand(1), false); Out << "]";
for (unsigned op = 2; (Operand = I->getOperand(op)); op += 2) {
Out << ", ["; writeOperand(Operand, false); Out << ",";
writeOperand(I->getOperand(op+1), false); Out << "]";
}
} else if (I->getInstType() == Instruction::Ret && !Operand) {
Out << " void";
} else if (I->getInstType() == Instruction::Call) {