From: Chris Lattner Date: Fri, 6 May 2005 20:26:43 +0000 (+0000) Subject: add support for explicit calling conventions X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d511898b581826694e6c651e23343b1e1ba5ba64;p=oota-llvm.git add support for explicit calling conventions git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21746 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 6db1a9a26c1..889ae4067cb 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -18,6 +18,7 @@ #include "llvm/Assembly/Writer.h" #include "llvm/Assembly/PrintModulePass.h" #include "llvm/Assembly/AsmAnnotationWriter.h" +#include "llvm/CallingConv.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Instruction.h" @@ -915,6 +916,14 @@ void AssemblyWriter::printFunction(const Function *F) { abort(); } + // Print the calling convention. + switch (F->getCallingConv()) { + case CallingConv::C: break; // default + case CallingConv::Fast: Out << "fastcc "; break; + case CallingConv::Cold: Out << "coldcc "; break; + default: Out << "cc" << F->getCallingConv() << " "; break; + } + printType(F->getReturnType()) << ' '; if (!F->getName().empty()) Out << getLLVMName(F->getName()); @@ -1090,7 +1099,15 @@ void AssemblyWriter::printInstruction(const Instruction &I) { } } else if (isa(I) && !Operand) { Out << " void"; - } else if (isa(I)) { + } else if (const CallInst *CI = dyn_cast(&I)) { + // Print the calling convention being used. + switch (CI->getCallingConv()) { + case CallingConv::C: break; // default + case CallingConv::Fast: Out << " fastcc"; break; + case CallingConv::Cold: Out << " coldcc"; break; + default: Out << " cc" << CI->getCallingConv(); break; + } + const PointerType *PTy = cast(Operand->getType()); const FunctionType *FTy = cast(PTy->getElementType()); const Type *RetTy = FTy->getReturnType(); @@ -1108,7 +1125,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) { writeOperand(Operand, true); } Out << '('; - if (I.getNumOperands() > 1) writeOperand(I.getOperand(1), true); + if (CI->getNumOperands() > 1) writeOperand(CI->getOperand(1), true); for (unsigned op = 2, Eop = I.getNumOperands(); op < Eop; ++op) { Out << ','; writeOperand(I.getOperand(op), true); @@ -1120,6 +1137,14 @@ void AssemblyWriter::printInstruction(const Instruction &I) { const FunctionType *FTy = cast(PTy->getElementType()); const Type *RetTy = FTy->getReturnType(); + // Print the calling convention being used. + switch (II->getCallingConv()) { + case CallingConv::C: break; // default + case CallingConv::Fast: Out << " fastcc"; break; + case CallingConv::Cold: Out << " coldcc"; break; + default: Out << " cc" << II->getCallingConv(); break; + } + // If possible, print out the short form of the invoke instruction. We can // only do this if the first argument is a pointer to a nonvararg function, // and if the return type is not a pointer to a function. diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index f61a4d23262..1e68289f652 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -77,6 +77,7 @@ void Argument::setParent(Function *parent) { Function::Function(const FunctionType *Ty, LinkageTypes Linkage, const std::string &name, Module *ParentModule) : GlobalValue(PointerType::get(Ty), Value::FunctionVal, 0, 0, Linkage, name) { + CallingConvention = 0; BasicBlocks.setItemParent(this); BasicBlocks.setParent(this); ArgumentList.setItemParent(this); diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp index d5adaa79d95..7d3b0eecb88 100644 --- a/lib/VMCore/Instructions.cpp +++ b/lib/VMCore/Instructions.cpp @@ -20,6 +20,20 @@ #include "llvm/Support/CallSite.h" using namespace llvm; +unsigned CallSite::getCallingConv() const { + if (CallInst *CI = dyn_cast(I)) + return CI->getCallingConv(); + else + return cast(I)->getCallingConv(); +} +void CallSite::setCallingConv(unsigned CC) { + if (CallInst *CI = dyn_cast(I)) + CI->setCallingConv(CC); + else + cast(I)->setCallingConv(CC); +} + + //===----------------------------------------------------------------------===// // TerminatorInst Class //===----------------------------------------------------------------------===// @@ -249,7 +263,7 @@ CallInst::CallInst(Value *Func, const std::string &Name, CallInst::CallInst(const CallInst &CI) : Instruction(CI.getType(), Instruction::Call, new Use[CI.getNumOperands()], CI.getNumOperands()) { - setTailCall(CI.isTailCall()); + SubclassData = CI.SubclassData; Use *OL = OperandList; Use *InOL = CI.OperandList; for (unsigned i = 0, e = CI.getNumOperands(); i != e; ++i) @@ -306,6 +320,7 @@ InvokeInst::InvokeInst(Value *Fn, BasicBlock *IfNormal, InvokeInst::InvokeInst(const InvokeInst &II) : TerminatorInst(II.getType(), Instruction::Invoke, new Use[II.getNumOperands()], II.getNumOperands()) { + SubclassData = II.SubclassData; Use *OL = OperandList, *InOL = II.OperandList; for (unsigned i = 0, e = II.getNumOperands(); i != e; ++i) OL[i].init(InOL[i], this);