6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-20 20:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Add support for the new varargs intrinsics and instructions

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9226 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-10-18 05:57:43 +00:00
parent cda965e28a
commit 4d45bd007d
5 changed files with 63 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Target/CBackend/CBackend.cpp
View File

@ -90,7 +90,7 @@ namespace {
// emit it inline where it would go. // emit it inline where it would go.
if (I.getType() == Type::VoidTy || !I.hasOneUse() || if (I.getType() == Type::VoidTy || !I.hasOneUse() ||
isa<TerminatorInst>(I) || isa<CallInst>(I) || isa<PHINode>(I) || isa<TerminatorInst>(I) || isa<CallInst>(I) || isa<PHINode>(I) ||
isa<LoadInst>(I) || isa<VarArgInst>(I)) isa<LoadInst>(I) || isa<VAArgInst>(I) || isa<VANextInst>(I))
// Don't inline a load across a store or other bad things! // Don't inline a load across a store or other bad things!
return false; return false;
@ -135,7 +135,8 @@ namespace {
void visitLoadInst (LoadInst &I); void visitLoadInst (LoadInst &I);
void visitStoreInst (StoreInst &I); void visitStoreInst (StoreInst &I);
void visitGetElementPtrInst(GetElementPtrInst &I); void visitGetElementPtrInst(GetElementPtrInst &I);
void visitVarArgInst(VarArgInst &I); void visitVANextInst(VANextInst &I);
void visitVAArgInst (VAArgInst &I);
void visitInstruction(Instruction &I) { void visitInstruction(Instruction &I) {
std::cerr << "C Writer does not know about " << I; std::cerr << "C Writer does not know about " << I;
@ -1181,26 +1182,25 @@ void CWriter::visitCallInst(CallInst &I) {
switch (ID) { switch (ID) {
default: assert(0 && "Unknown LLVM intrinsic!"); default: assert(0 && "Unknown LLVM intrinsic!");
case LLVMIntrinsic::va_start: case LLVMIntrinsic::va_start:
Out << "va_start(*(va_list*)"; Out << "0; ";
writeOperand(I.getOperand(1));
Out << ", "; Out << "va_start(*(va_list*)&" << Mang->getValueName(&I) << ", ";
// Output the last argument to the enclosing function... // Output the last argument to the enclosing function...
writeOperand(&I.getParent()->getParent()->aback()); writeOperand(&I.getParent()->getParent()->aback());
Out << ")"; Out << ")";
return; return;
case LLVMIntrinsic::va_end: case LLVMIntrinsic::va_end:
Out << "va_end(*(va_list*)"; Out << "va_end(*(va_list*)&";
writeOperand(I.getOperand(1)); writeOperand(I.getOperand(1));
Out << ")"; Out << ")";
return; return;
case LLVMIntrinsic::va_copy: case LLVMIntrinsic::va_copy:
Out << "va_copy(*(va_list*)"; Out << "0;";
Out << "va_copy(*(va_list*)&" << Mang->getValueName(&I) << ", ";
Out << "*(va_list*)&";
writeOperand(I.getOperand(1)); writeOperand(I.getOperand(1));
Out << ", (va_list)";
writeOperand(I.getOperand(2));
Out << ")"; Out << ")";
return; return;
case LLVMIntrinsic::setjmp: case LLVMIntrinsic::setjmp:
case LLVMIntrinsic::sigsetjmp: case LLVMIntrinsic::sigsetjmp:
// This intrinsic should never exist in the program, but until we get // This intrinsic should never exist in the program, but until we get
@ -1346,14 +1346,23 @@ void CWriter::visitGetElementPtrInst(GetElementPtrInst &I) {
printIndexingExpression(I.getPointerOperand(), I.idx_begin(), I.idx_end()); printIndexingExpression(I.getPointerOperand(), I.idx_begin(), I.idx_end());
} }
void CWriter::visitVarArgInst(VarArgInst &I) { void CWriter::visitVANextInst(VANextInst &I) {
Out << "va_arg((va_list)*"; Out << Mang->getValueName(I.getOperand(0));
writeOperand(I.getOperand(0)); Out << "; va_arg(*(va_list*)&" << Mang->getValueName(&I) << ", ";
Out << ", "; printType(Out, I.getArgType(), "", /*ignoreName*/false,
printType(Out, I.getType(), "", /*ignoreName*/false, /*namedContext*/false); /*namedContext*/false);
Out << ")"; Out << ")";
} }
void CWriter::visitVAArgInst(VAArgInst &I) {
Out << "0;\n";
Out << "{ va_list Tmp; va_copy(Tmp, *(va_list*)&";
writeOperand(I.getOperand(0));
Out << ");\n " << Mang->getValueName(&I) << " = va_arg(Tmp, ";
printType(Out, I.getType(), "", /*ignoreName*/false, /*namedContext*/false);
Out << ");\n va_end(Tmp); }";
}
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// External Interface declaration // External Interface declaration

39
lib/Target/CBackend/Writer.cpp
View File

@ -90,7 +90,7 @@ namespace {
// emit it inline where it would go. // emit it inline where it would go.
if (I.getType() == Type::VoidTy || !I.hasOneUse() || if (I.getType() == Type::VoidTy || !I.hasOneUse() ||
isa<TerminatorInst>(I) || isa<CallInst>(I) || isa<PHINode>(I) || isa<TerminatorInst>(I) || isa<CallInst>(I) || isa<PHINode>(I) ||
isa<LoadInst>(I) || isa<VarArgInst>(I)) isa<LoadInst>(I) || isa<VAArgInst>(I) || isa<VANextInst>(I))
// Don't inline a load across a store or other bad things! // Don't inline a load across a store or other bad things!
return false; return false;
@ -135,7 +135,8 @@ namespace {
void visitLoadInst (LoadInst &I); void visitLoadInst (LoadInst &I);
void visitStoreInst (StoreInst &I); void visitStoreInst (StoreInst &I);
void visitGetElementPtrInst(GetElementPtrInst &I); void visitGetElementPtrInst(GetElementPtrInst &I);
void visitVarArgInst(VarArgInst &I); void visitVANextInst(VANextInst &I);
void visitVAArgInst (VAArgInst &I);
void visitInstruction(Instruction &I) { void visitInstruction(Instruction &I) {
std::cerr << "C Writer does not know about " << I; std::cerr << "C Writer does not know about " << I;
@ -1181,26 +1182,25 @@ void CWriter::visitCallInst(CallInst &I) {
switch (ID) { switch (ID) {
default: assert(0 && "Unknown LLVM intrinsic!"); default: assert(0 && "Unknown LLVM intrinsic!");
case LLVMIntrinsic::va_start: case LLVMIntrinsic::va_start:
Out << "va_start(*(va_list*)"; Out << "0; ";
writeOperand(I.getOperand(1));
Out << ", "; Out << "va_start(*(va_list*)&" << Mang->getValueName(&I) << ", ";
// Output the last argument to the enclosing function... // Output the last argument to the enclosing function...
writeOperand(&I.getParent()->getParent()->aback()); writeOperand(&I.getParent()->getParent()->aback());
Out << ")"; Out << ")";
return; return;
case LLVMIntrinsic::va_end: case LLVMIntrinsic::va_end:
Out << "va_end(*(va_list*)"; Out << "va_end(*(va_list*)&";
writeOperand(I.getOperand(1)); writeOperand(I.getOperand(1));
Out << ")"; Out << ")";
return; return;
case LLVMIntrinsic::va_copy: case LLVMIntrinsic::va_copy:
Out << "va_copy(*(va_list*)"; Out << "0;";
Out << "va_copy(*(va_list*)&" << Mang->getValueName(&I) << ", ";
Out << "*(va_list*)&";
writeOperand(I.getOperand(1)); writeOperand(I.getOperand(1));
Out << ", (va_list)";
writeOperand(I.getOperand(2));
Out << ")"; Out << ")";
return; return;
case LLVMIntrinsic::setjmp: case LLVMIntrinsic::setjmp:
case LLVMIntrinsic::sigsetjmp: case LLVMIntrinsic::sigsetjmp:
// This intrinsic should never exist in the program, but until we get // This intrinsic should never exist in the program, but until we get
@ -1346,14 +1346,23 @@ void CWriter::visitGetElementPtrInst(GetElementPtrInst &I) {
printIndexingExpression(I.getPointerOperand(), I.idx_begin(), I.idx_end()); printIndexingExpression(I.getPointerOperand(), I.idx_begin(), I.idx_end());
} }
void CWriter::visitVarArgInst(VarArgInst &I) { void CWriter::visitVANextInst(VANextInst &I) {
Out << "va_arg((va_list)*"; Out << Mang->getValueName(I.getOperand(0));
writeOperand(I.getOperand(0)); Out << "; va_arg(*(va_list*)&" << Mang->getValueName(&I) << ", ";
Out << ", "; printType(Out, I.getArgType(), "", /*ignoreName*/false,
printType(Out, I.getType(), "", /*ignoreName*/false, /*namedContext*/false); /*namedContext*/false);
Out << ")"; Out << ")";
} }
void CWriter::visitVAArgInst(VAArgInst &I) {
Out << "0;\n";
Out << "{ va_list Tmp; va_copy(Tmp, *(va_list*)&";
writeOperand(I.getOperand(0));
Out << ");\n " << Mang->getValueName(&I) << " = va_arg(Tmp, ";
printType(Out, I.getType(), "", /*ignoreName*/false, /*namedContext*/false);
Out << ");\n va_end(Tmp); }";
}
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// External Interface declaration // External Interface declaration

11
lib/VMCore/AsmWriter.cpp
View File

@ -661,7 +661,10 @@ void AssemblyWriter::printFunction(const Function *F) {
} }
printType(F->getReturnType()) << " "; printType(F->getReturnType()) << " ";
if (!F->getName().empty()) Out << getLLVMName(F->getName()); if (!F->getName().empty())
Out << getLLVMName(F->getName());
else
Out << "\"\"";
Out << "("; Out << "(";
Table.incorporateFunction(F); Table.incorporateFunction(F);
@ -882,10 +885,14 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
writeOperand(Operand, true); writeOperand(Operand, true);
Out << " to "; Out << " to ";
printType(I.getType()); printType(I.getType());
} else if (isa<VarArgInst>(I)) { } else if (isa<VAArgInst>(I)) {
writeOperand(Operand, true); writeOperand(Operand, true);
Out << ", "; Out << ", ";
printType(I.getType()); printType(I.getType());
} else if (const VANextInst *VAN = dyn_cast<VANextInst>(&I)) {
writeOperand(Operand, true);
Out << ", ";
printType(VAN->getArgType());
} else if (Operand) { // Print the normal way... } else if (Operand) { // Print the normal way...
// PrintAllTypes - Instructions who have operands of all the same type // PrintAllTypes - Instructions who have operands of all the same type

3
lib/VMCore/Instruction.cpp
View File

@ -92,7 +92,8 @@ const char *Instruction::getOpcodeName(unsigned OpCode) {
case Call: return "call"; case Call: return "call";
case Shl: return "shl"; case Shl: return "shl";
case Shr: return "shr"; case Shr: return "shr";
case VarArg: return "va_arg"; case VANext: return "vanext";
case VAArg: return "vaarg";
default: return "<Invalid operator> "; default: return "<Invalid operator> ";
} }

7
lib/VMCore/Verifier.cpp
View File

@ -131,7 +131,8 @@ namespace { // Anonymous namespace for class
void visitPHINode(PHINode &PN); void visitPHINode(PHINode &PN);
void visitBinaryOperator(BinaryOperator &B); void visitBinaryOperator(BinaryOperator &B);
void visitShiftInst(ShiftInst &SI); void visitShiftInst(ShiftInst &SI);
void visitVarArgInst(VarArgInst &VAI) { visitInstruction(VAI); } void visitVANextInst(VANextInst &VAN) { visitInstruction(VAN); }
void visitVAArgInst(VAArgInst &VAA) { visitInstruction(VAA); }
void visitCallInst(CallInst &CI); void visitCallInst(CallInst &CI);
void visitGetElementPtrInst(GetElementPtrInst &GEP); void visitGetElementPtrInst(GetElementPtrInst &GEP);
void visitLoadInst(LoadInst &LI); void visitLoadInst(LoadInst &LI);
@ -505,10 +506,10 @@ void Verifier::visitIntrinsicFunctionCall(LLVMIntrinsic::ID ID, CallInst &CI) {
Assert1(CI.getParent()->getParent()->getFunctionType()->isVarArg(), Assert1(CI.getParent()->getParent()->getFunctionType()->isVarArg(),
"llvm.va_start intrinsic may only occur in function with variable" "llvm.va_start intrinsic may only occur in function with variable"
" args!", &CI); " args!", &CI);
NumArgs = 1; NumArgs = 0;
break; break;
case LLVMIntrinsic::va_end: NumArgs = 1; break; case LLVMIntrinsic::va_end: NumArgs = 1; break;
case LLVMIntrinsic::va_copy: NumArgs = 2; break; case LLVMIntrinsic::va_copy: NumArgs = 1; break;
case LLVMIntrinsic::setjmp: NumArgs = 1; break; case LLVMIntrinsic::setjmp: NumArgs = 1; break;
case LLVMIntrinsic::longjmp: NumArgs = 2; break; case LLVMIntrinsic::longjmp: NumArgs = 2; break;