#include "llvm/InlineAsm.h"
#include "llvm/Instruction.h"
#include "llvm/Instructions.h"
+#include "llvm/ParameterAttributes.h"
#include "llvm/Module.h"
#include "llvm/TypeSymbolTable.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/CFG.h"
#include "llvm/Support/ManagedStatic.h"
case GlobalValue::ExternalLinkage:
Out << "GlobalValue::ExternalLinkage"; break;
case GlobalValue::DLLImportLinkage:
- Out << "GlobalValue::DllImportLinkage"; break;
+ Out << "GlobalValue::DLLImportLinkage"; break;
case GlobalValue::DLLExportLinkage:
- Out << "GlobalValue::DllExportLinkage"; break;
+ Out << "GlobalValue::DLLExportLinkage"; break;
case GlobalValue::ExternalWeakLinkage:
Out << "GlobalValue::ExternalWeakLinkage"; break;
case GlobalValue::GhostLinkage:
Out << ");";
nl(Out);
}
+ const ParamAttrsList *PAL = FT->getParamAttrs();
+ Out << "ParamAttrsList *" << typeName << "_PAL = 0;";
+ nl(Out);
+ if (PAL) {
+ Out << '{'; in(); nl(Out);
+ Out << "ParamAttrsVector Attrs;"; nl(Out);
+ Out << "ParamAttrsWithIndex PAWI;"; nl(Out);
+ for (unsigned i = 0; i < PAL->size(); ++i) {
+ uint16_t index = PAL->getParamIndex(i);
+ uint16_t attrs = PAL->getParamAttrs(index);
+ Out << "PAWI.index = " << index << "; PAWI.attrs = 0 ";
+ if (attrs & ParamAttr::SExt)
+ Out << " | ParamAttr::SExt";
+ if (attrs & ParamAttr::ZExt)
+ Out << " | ParamAttr::ZExt";
+ if (attrs & ParamAttr::NoAlias)
+ Out << " | ParamAttr::NoAlias";
+ if (attrs & ParamAttr::StructRet)
+ Out << " | ParamAttr::StructRet";
+ if (attrs & ParamAttr::InReg)
+ Out << " | ParamAttr::InReg";
+ if (attrs & ParamAttr::NoReturn)
+ Out << " | ParamAttr::NoReturn";
+ if (attrs & ParamAttr::NoUnwind)
+ Out << " | ParamAttr::NoUnwind";
+ Out << ";";
+ nl(Out);
+ Out << "Attrs.push_back(PAWI);";
+ nl(Out);
+ }
+ Out << typeName << "_PAL = ParamAttrsList::get(Attrs);";
+ nl(Out);
+ out(); nl(Out);
+ Out << '}'; nl(Out);
+ }
bool isForward = printTypeInternal(FT->getReturnType());
std::string retTypeName(getCppName(FT->getReturnType()));
Out << "FunctionType* " << typeName << " = FunctionType::get(";
Out << "_fwd";
Out << ",";
nl(Out) << "/*Params=*/" << typeName << "_args,";
- nl(Out) << "/*isVarArg=*/" << (FT->isVarArg() ? "true" : "false") << ");";
+ nl(Out) << "/*isVarArg=*/" << (FT->isVarArg() ? "true," : "false,") ;
+ nl(Out) << "/*ParamAttrs=*/" << typeName << "_PAL" << ");";
out();
nl(Out);
break;
nl(Out);
}
Out << "StructType* " << typeName << " = StructType::get("
- << typeName << "_fields);";
+ << typeName << "_fields, /*isPacked=*/"
+ << (ST->isPacked() ? "true" : "false") << ");";
nl(Out);
break;
}
// If the type had a name, make sure we recreate it.
const std::string* progTypeName =
findTypeName(TheModule->getTypeSymbolTable(),Ty);
- if (progTypeName)
+ if (progTypeName) {
Out << "mod->addTypeName(\"" << *progTypeName << "\", "
<< typeName << ");";
nl(Out);
+ }
// Pop us off the type stack
TypeStack.pop_back();
return;
}
if (const ConstantInt *CI = dyn_cast<ConstantInt>(CV)) {
- Out << "ConstantInt* " << constName << " = ConstantInt::get("
- << typeName << ", " << CI->getZExtValue() << ");";
+ Out << "ConstantInt* " << constName << " = ConstantInt::get(APInt("
+ << cast<IntegerType>(CI->getType())->getBitWidth() << ", "
+ << " \"" << CI->getValue().toStringSigned(10) << "\", 10));";
} else if (isa<ConstantAggregateZero>(CV)) {
Out << "ConstantAggregateZero* " << constName
<< " = ConstantAggregateZero::get(" << typeName << ");";
} else if (const ConstantArray *CA = dyn_cast<ConstantArray>(CV)) {
if (CA->isString() && CA->getType()->getElementType() == Type::Int8Ty) {
Out << "Constant* " << constName << " = ConstantArray::get(\"";
- printEscapedString(CA->getAsString());
+ std::string tmp = CA->getAsString();
+ bool nullTerminate = false;
+ if (tmp[tmp.length()-1] == 0) {
+ tmp.erase(tmp.length()-1);
+ nullTerminate = true;
+ }
+ printEscapedString(tmp);
// Determine if we want null termination or not.
- if (CA->getType()->getNumElements() <= CA->getAsString().length())
- Out << "\", false";// No null terminator
- else
+ if (nullTerminate)
Out << "\", true"; // Indicate that the null terminator should be added.
+ else
+ Out << "\", false";// No null terminator
Out << ");";
} else {
Out << "std::vector<Constant*> " << constName << "_elems;";
Out << "Constant* " << constName
<< " = ConstantExpr::getGetElementPtr("
<< getCppName(CE->getOperand(0)) << ", "
- << constName << "_indices);";
+ << "&" << constName << "_indices[0], "
+ << constName << "_indices.size()"
+ << " );";
} else if (CE->isCast()) {
printConstant(CE->getOperand(0));
Out << "Constant* " << constName << " = ConstantExpr::getCast(";
switch (I->getOpcode()) {
case Instruction::Ret: {
const ReturnInst* ret = cast<ReturnInst>(I);
- Out << "ReturnInst* " << iName << " = new ReturnInst("
+ Out << "new ReturnInst("
<< (ret->getReturnValue() ? opNames[0] + ", " : "") << bbname << ");";
break;
}
case Instruction::Br: {
const BranchInst* br = cast<BranchInst>(I);
- Out << "BranchInst* " << iName << " = new BranchInst(" ;
+ Out << "new BranchInst(" ;
if (br->getNumOperands() == 3 ) {
Out << opNames[0] << ", "
<< opNames[1] << ", "
<< opNames[i] << ");";
nl(Out);
}
- Out << "InvokeInst* " << iName << " = new InvokeInst("
+ Out << "InvokeInst *" << iName << " = new InvokeInst("
<< opNames[0] << ", "
<< opNames[1] << ", "
<< opNames[2] << ", "
- << iName << "_params, \"";
+ << iName << "_params.begin(), " << iName << "_params.end(), \"";
printEscapedString(inv->getName());
Out << "\", " << bbname << ");";
nl(Out) << iName << "->setCallingConv(";
break;
}
case Instruction::Unwind: {
- Out << "UnwindInst* " << iName << " = new UnwindInst("
+ Out << "new UnwindInst("
<< bbname << ");";
break;
}
case Instruction::Unreachable:{
- Out << "UnreachableInst* " << iName << " = new UnreachableInst("
+ Out << "new UnreachableInst("
<< bbname << ");";
break;
}
nl(Out);
}
Out << "Instruction* " << iName << " = new GetElementPtrInst("
- << opNames[0] << ", " << iName << "_indices";
+ << opNames[0] << ", " << iName << "_indices.begin(), "
+ << iName << "_indices.end()";
}
Out << ", \"";
printEscapedString(gep->getName());
const CastInst* cst = cast<CastInst>(I);
Out << "CastInst* " << iName << " = new ";
switch (I->getOpcode()) {
- case Instruction::Trunc: Out << "TruncInst";
- case Instruction::ZExt: Out << "ZExtInst";
- case Instruction::SExt: Out << "SExtInst";
- case Instruction::FPTrunc: Out << "FPTruncInst";
- case Instruction::FPExt: Out << "FPExtInst";
- case Instruction::FPToUI: Out << "FPToUIInst";
- case Instruction::FPToSI: Out << "FPToSIInst";
- case Instruction::UIToFP: Out << "UIToFPInst";
- case Instruction::SIToFP: Out << "SIToFPInst";
- case Instruction::PtrToInt: Out << "PtrToInst";
- case Instruction::IntToPtr: Out << "IntToPtrInst";
- case Instruction::BitCast: Out << "BitCastInst";
+ case Instruction::Trunc: Out << "TruncInst"; break;
+ case Instruction::ZExt: Out << "ZExtInst"; break;
+ case Instruction::SExt: Out << "SExtInst"; break;
+ case Instruction::FPTrunc: Out << "FPTruncInst"; break;
+ case Instruction::FPExt: Out << "FPExtInst"; break;
+ case Instruction::FPToUI: Out << "FPToUIInst"; break;
+ case Instruction::FPToSI: Out << "FPToSIInst"; break;
+ case Instruction::UIToFP: Out << "UIToFPInst"; break;
+ case Instruction::SIToFP: Out << "SIToFPInst"; break;
+ case Instruction::PtrToInt: Out << "PtrToIntInst"; break;
+ case Instruction::IntToPtr: Out << "IntToPtrInst"; break;
+ case Instruction::BitCast: Out << "BitCastInst"; break;
default: assert(!"Unreachable"); break;
}
Out << "(" << opNames[0] << ", "
<< (ila->hasSideEffects() ? "true" : "false") << ");";
nl(Out);
}
- if (call->getNumOperands() > 3) {
+ if (call->getNumOperands() > 2) {
Out << "std::vector<Value*> " << iName << "_params;";
nl(Out);
for (unsigned i = 1; i < call->getNumOperands(); ++i) {
nl(Out);
}
Out << "CallInst* " << iName << " = new CallInst("
- << opNames[0] << ", " << iName << "_params, \"";
- } else if (call->getNumOperands() == 3) {
- Out << "CallInst* " << iName << " = new CallInst("
- << opNames[0] << ", " << opNames[1] << ", " << opNames[2] << ", \"";
+ << opNames[0] << ", " << iName << "_params.begin(), "
+ << iName << "_params.end(), \"";
} else if (call->getNumOperands() == 2) {
Out << "CallInst* " << iName << " = new CallInst("
<< opNames[0] << ", " << opNames[1] << ", \"";
// Print type definitions for every type referenced by an instruction and
// make a note of any global values or constants that are referenced
- std::vector<GlobalValue*> gvs;
- std::vector<Constant*> consts;
+ SmallPtrSet<GlobalValue*,64> gvs;
+ SmallPtrSet<Constant*,64> consts;
for (Function::const_iterator BB = F->begin(), BE = F->end(); BB != BE; ++BB){
for (BasicBlock::const_iterator I = BB->begin(), E = BB->end();
I != E; ++I) {
for (unsigned i = 0; i < I->getNumOperands(); ++i) {
Value* operand = I->getOperand(i);
printType(operand->getType());
- if (GlobalValue* GV = dyn_cast<GlobalValue>(operand))
- gvs.push_back(GV);
- else if (Constant* C = dyn_cast<Constant>(operand))
- consts.push_back(C);
+
+ // If the operand references a GVal or Constant, make a note of it
+ if (GlobalValue* GV = dyn_cast<GlobalValue>(operand)) {
+ gvs.insert(GV);
+ if (GlobalVariable *GVar = dyn_cast<GlobalVariable>(GV))
+ if (GVar->hasInitializer())
+ consts.insert(GVar->getInitializer());
+ } else if (Constant* C = dyn_cast<Constant>(operand))
+ consts.insert(C);
}
}
}
// Print the function declarations for any functions encountered
nl(Out) << "// Function Declarations"; nl(Out);
- for (std::vector<GlobalValue*>::iterator I = gvs.begin(), E = gvs.end();
+ for (SmallPtrSet<GlobalValue*,64>::iterator I = gvs.begin(), E = gvs.end();
I != E; ++I) {
if (Function* Fun = dyn_cast<Function>(*I)) {
if (!is_inline || Fun != F)
// Print the global variable declarations for any variables encountered
nl(Out) << "// Global Variable Declarations"; nl(Out);
- for (std::vector<GlobalValue*>::iterator I = gvs.begin(), E = gvs.end();
+ for (SmallPtrSet<GlobalValue*,64>::iterator I = gvs.begin(), E = gvs.end();
I != E; ++I) {
if (GlobalVariable* F = dyn_cast<GlobalVariable>(*I))
printVariableHead(F);
// Print the constants found
nl(Out) << "// Constant Definitions"; nl(Out);
- for (std::vector<Constant*>::iterator I = consts.begin(), E = consts.end();
+ for (SmallPtrSet<Constant*,64>::iterator I = consts.begin(), E = consts.end();
I != E; ++I) {
printConstant(*I);
}
// been emitted. These definitions just couple the gvars with their constant
// initializers.
nl(Out) << "// Global Variable Definitions"; nl(Out);
- for (std::vector<GlobalValue*>::iterator I = gvs.begin(), E = gvs.end();
+ for (SmallPtrSet<GlobalValue*,64>::iterator I = gvs.begin(), E = gvs.end();
I != E; ++I) {
if (GlobalVariable* GV = dyn_cast<GlobalVariable>(*I))
printVariableBody(GV);
Out << "#include <llvm/BasicBlock.h>\n";
Out << "#include <llvm/Instructions.h>\n";
Out << "#include <llvm/InlineAsm.h>\n";
+ Out << "#include <llvm/ParameterAttributes.h>\n";
Out << "#include <llvm/Support/MathExtras.h>\n";
Out << "#include <llvm/Pass.h>\n";
Out << "#include <llvm/PassManager.h>\n";
Out << "using namespace llvm;\n\n";
Out << "Module* " << fname << "();\n\n";
Out << "int main(int argc, char**argv) {\n";
- Out << " Module* Mod = makeLLVMModule();\n";
+ Out << " Module* Mod = " << fname << "();\n";
Out << " verifyModule(*Mod, PrintMessageAction);\n";
Out << " std::cerr.flush();\n";
Out << " std::cout.flush();\n";
Out << " PassManager PM;\n";
- Out << " PM.add(new PrintModulePass(&std::cout));\n";
+ Out << " PM.add(new PrintModulePass(&llvm::cout));\n";
Out << " PM.run(*Mod);\n";
Out << " return 0;\n";
Out << "}\n\n";
nl(Out) << "Module* " << fname << "() {";
nl(Out,1) << "// Module Construction";
nl(Out) << "Module* mod = new Module(\"" << mName << "\");";
- nl(Out) << "mod->setEndianness(";
- switch (TheModule->getEndianness()) {
- case Module::LittleEndian: Out << "Module::LittleEndian);"; break;
- case Module::BigEndian: Out << "Module::BigEndian);"; break;
- case Module::AnyEndianness:Out << "Module::AnyEndianness);"; break;
- }
- nl(Out) << "mod->setPointerSize(";
- switch (TheModule->getPointerSize()) {
- case Module::Pointer32: Out << "Module::Pointer32);"; break;
- case Module::Pointer64: Out << "Module::Pointer64);"; break;
- case Module::AnyPointerSize: Out << "Module::AnyPointerSize);"; break;
+ if (!TheModule->getTargetTriple().empty()) {
+ nl(Out) << "mod->setDataLayout(\"" << TheModule->getDataLayout() << "\");";
}
- nl(Out);
if (!TheModule->getTargetTriple().empty()) {
- Out << "mod->setTargetTriple(\"" << TheModule->getTargetTriple()
- << "\");";
- nl(Out);
+ nl(Out) << "mod->setTargetTriple(\"" << TheModule->getTargetTriple()
+ << "\");";
}
if (!TheModule->getModuleInlineAsm().empty()) {
- Out << "mod->setModuleInlineAsm(\"";
+ nl(Out) << "mod->setModuleInlineAsm(\"";
printEscapedString(TheModule->getModuleInlineAsm());
Out << "\");";
- nl(Out);
}
+ nl(Out);
// Loop over the dependent libraries and emit them.
Module::lib_iterator LI = TheModule->lib_begin();
projects / oota-llvm.git / blobdiff