#include "llvm/Support/InstVisitor.h"
#include "llvm/Support/Mangler.h"
#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Config/config.h"
#include <algorithm>
std::set<const Type *> UT = getAnalysis<FindUsedTypes>().getTypes();
// Loop over the module symbol table, removing types from UT that are
- // already named, and removing names for structure types that are not used.
+ // already named, and removing names for types that are not used.
//
SymbolTable &MST = M.getSymbolTable();
for (SymbolTable::type_iterator TI = MST.type_begin(), TE = MST.type_end();
TI != TE; ) {
SymbolTable::type_iterator I = TI++;
- if (const StructType *STy = dyn_cast<StructType>(I->second)) {
- // If this is not used, remove it from the symbol table.
- std::set<const Type *>::iterator UTI = UT.find(STy);
- if (UTI == UT.end())
- MST.remove(I);
- else
- UT.erase(UTI);
- }
+
+ // If this is not used, remove it from the symbol table.
+ std::set<const Type *>::iterator UTI = UT.find(I->second);
+ if (UTI == UT.end())
+ MST.remove(I);
+ else
+ UT.erase(UTI); // Only keep one name for this type.
}
// UT now contains types that are not named. Loop over it, naming
// Check to see if the type is named.
if (!IgnoreName || isa<OpaqueType>(Ty)) {
std::map<const Type *, std::string>::iterator I = TypeNames.find(Ty);
- if (I != TypeNames.end()) return Out << I->second << " " << NameSoFar;
+ if (I != TypeNames.end()) return Out << I->second << ' ' << NameSoFar;
}
switch (Ty->getTypeID()) {
} else if (!MTy->getNumParams()) {
FunctionInnards << "void";
}
- FunctionInnards << ")";
+ FunctionInnards << ')';
std::string tstr = FunctionInnards.str();
printType(Out, MTy->getReturnType(), tstr);
return Out;
printType(Out, *I, "field" + utostr(Idx++));
Out << ";\n";
}
- return Out << "}";
+ return Out << '}';
}
case Type::PointerTyID: {
std::string TyName = "struct opaque_" + itostr(Count++);
assert(TypeNames.find(Ty) == TypeNames.end());
TypeNames[Ty] = TyName;
- return Out << TyName << " " << NameSoFar;
+ return Out << TyName << ' ' << NameSoFar;
}
default:
assert(0 && "Unhandled case in getTypeProps!");
isString = false;
if (isString) {
- Out << "\"";
+ Out << '\"';
// Keep track of whether the last number was a hexadecimal escape
bool LastWasHex = false;
}
}
}
- Out << "\"";
+ Out << '\"';
} else {
- Out << "{";
+ Out << '{';
if (CPA->getNumOperands()) {
- Out << " ";
+ Out << ' ';
printConstant(cast<Constant>(CPA->getOperand(0)));
for (unsigned i = 1, e = CPA->getNumOperands(); i != e; ++i) {
Out << ", ";
case Instruction::Cast:
Out << "((";
printType(Out, CPV->getType());
- Out << ")";
+ Out << ')';
printConstant(CE->getOperand(0));
- Out << ")";
+ Out << ')';
return;
case Instruction::GetElementPtr:
Out << "))";
return;
case Instruction::Select:
- Out << "(";
+ Out << '(';
printConstant(CE->getOperand(0));
- Out << "?";
+ Out << '?';
printConstant(CE->getOperand(1));
- Out << ":";
+ Out << ':';
printConstant(CE->getOperand(2));
- Out << ")";
+ Out << ')';
return;
case Instruction::Add:
case Instruction::Sub:
case Instruction::SetGE:
case Instruction::Shl:
case Instruction::Shr:
- Out << "(";
+ Out << '(';
printConstant(CE->getOperand(0));
switch (CE->getOpcode()) {
case Instruction::Add: Out << " + "; break;
default: assert(0 && "Illegal opcode here!");
}
printConstant(CE->getOperand(1));
- Out << ")";
+ Out << ')';
return;
default:
switch (CPV->getType()->getTypeID()) {
case Type::BoolTyID:
- Out << (CPV == ConstantBool::False ? "0" : "1"); break;
+ Out << (CPV == ConstantBool::False ? '0' : '1'); break;
case Type::SByteTyID:
case Type::ShortTyID:
Out << cast<ConstantSInt>(CPV)->getValue(); break;
case Type::UShortTyID:
Out << cast<ConstantUInt>(CPV)->getValue(); break;
case Type::UIntTyID:
- Out << cast<ConstantUInt>(CPV)->getValue() << "u"; break;
+ Out << cast<ConstantUInt>(CPV)->getValue() << 'u'; break;
case Type::ULongTyID:
Out << cast<ConstantUInt>(CPV)->getValue() << "ull"; break;
// Because of FP precision problems we must load from a stack allocated
// value that holds the value in hex.
Out << "(*(" << (FPC->getType() == Type::FloatTy ? "float" : "double")
- << "*)&FPConstant" << I->second << ")";
+ << "*)&FPConstant" << I->second << ')';
} else {
if (IsNAN(FPC->getValue())) {
// The value is NaN
<< Buffer << "\") /*nan*/ ";
} else if (IsInf(FPC->getValue())) {
// The value is Inf
- if (FPC->getValue() < 0) Out << "-";
+ if (FPC->getValue() < 0) Out << '-';
Out << "LLVM_INF" << (FPC->getType() == Type::FloatTy ? "F" : "")
<< " /*inf*/ ";
} else {
case Type::ArrayTyID:
if (isa<ConstantAggregateZero>(CPV) || isa<UndefValue>(CPV)) {
const ArrayType *AT = cast<ArrayType>(CPV->getType());
- Out << "{";
+ Out << '{';
if (AT->getNumElements()) {
- Out << " ";
+ Out << ' ';
Constant *CZ = Constant::getNullValue(AT->getElementType());
printConstant(CZ);
for (unsigned i = 1, e = AT->getNumElements(); i != e; ++i) {
case Type::StructTyID:
if (isa<ConstantAggregateZero>(CPV) || isa<UndefValue>(CPV)) {
const StructType *ST = cast<StructType>(CPV->getType());
- Out << "{";
+ Out << '{';
if (ST->getNumElements()) {
- Out << " ";
+ Out << ' ';
printConstant(Constant::getNullValue(ST->getElementType(0)));
for (unsigned i = 1, e = ST->getNumElements(); i != e; ++i) {
Out << ", ";
}
Out << " }";
} else {
- Out << "{";
+ Out << '{';
if (CPV->getNumOperands()) {
- Out << " ";
+ Out << ' ';
printConstant(cast<Constant>(CPV->getOperand(0)));
for (unsigned i = 1, e = CPV->getNumOperands(); i != e; ++i) {
Out << ", ";
if (Instruction *I = dyn_cast<Instruction>(Operand))
if (isInlinableInst(*I) && !isDirectAlloca(I)) {
// Should we inline this instruction to build a tree?
- Out << "(";
+ Out << '(';
visit(*I);
- Out << ")";
+ Out << ')';
return;
}
writeOperandInternal(Operand);
if (isa<GlobalVariable>(Operand) || isDirectAlloca(Operand))
- Out << ")";
+ Out << ')';
}
// generateCompilerSpecificCode - This is where we add conditional compilation
<< "#define LLVM_NANSF(NanStr) __builtin_nansf(NanStr) /* Float */\n"
<< "#define LLVM_INF __builtin_inf() /* Double */\n"
<< "#define LLVM_INFF __builtin_inff() /* Float */\n"
+ << "#define LLVM_PREFETCH(addr,rw,locality) __builtin_prefetch(addr,rw,locality)\n"
<< "#else\n"
<< "#define LLVM_NAN(NanStr) ((double)0.0) /* Double */\n"
<< "#define LLVM_NANF(NanStr) 0.0F /* Float */\n"
<< "#define LLVM_NANSF(NanStr) 0.0F /* Float */\n"
<< "#define LLVM_INF ((double)0.0) /* Double */\n"
<< "#define LLVM_INFF 0.0F /* Float */\n"
+ << "#define LLVM_PREFETCH(addr,rw,locality) \n"
<< "#endif\n";
}
printModuleTypes(M.getSymbolTable());
// Global variable declarations...
- if (!M.gempty()) {
+ if (!M.global_empty()) {
Out << "\n/* External Global Variable Declarations */\n";
- for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I) {
+ for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I) {
if (I->hasExternalLinkage()) {
Out << "extern ";
printType(Out, I->getType()->getElementType(), Mang->getValueName(I));
}
// Output the global variable declarations
- if (!M.gempty()) {
+ if (!M.global_empty()) {
Out << "\n\n/* Global Variable Declarations */\n";
- for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I)
+ for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
if (!I->isExternal()) {
if (I->hasInternalLinkage())
Out << "static ";
}
// Output the global variable definitions and contents...
- if (!M.gempty()) {
+ if (!M.global_empty()) {
Out << "\n\n/* Global Variable Definitions and Initialization */\n";
- for (Module::giterator I = M.gbegin(), E = M.gend(); I != E; ++I)
+ for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
if (!I->isExternal()) {
if (I->hasInternalLinkage())
Out << "static ";
assert(0 && "Unknown float type!");
}
- Out << "\n";
+ Out << '\n';
}
/// type name is found, emit it's declaration...
///
void CWriter::printModuleTypes(const SymbolTable &ST) {
- // If there are no type names, exit early.
- if ( ! ST.hasTypes() )
- return;
-
- // We are only interested in the type plane of the symbol table...
+ // We are only interested in the type plane of the symbol table.
SymbolTable::type_const_iterator I = ST.type_begin();
SymbolTable::type_const_iterator End = ST.type_end();
+
+ // If there are no type names, exit early.
+ if (I == End) return;
// Print out forward declarations for structure types before anything else!
Out << "/* Structure forward decls */\n";
TypeNames.insert(std::make_pair(STy, Name));
}
- Out << "\n";
+ Out << '\n';
// Now we can print out typedefs...
Out << "/* Typedefs */\n";
Out << ";\n";
}
- Out << "\n";
+ Out << '\n';
// Keep track of which structures have been printed so far...
std::set<const StructType *> StructPrinted;
std::stringstream FunctionInnards;
// Print out the name...
- FunctionInnards << Mang->getValueName(F) << "(";
+ FunctionInnards << Mang->getValueName(F) << '(';
if (!F->isExternal()) {
- if (!F->aempty()) {
+ if (!F->arg_empty()) {
std::string ArgName;
- if (F->abegin()->hasName() || !Prototype)
- ArgName = Mang->getValueName(F->abegin());
- printType(FunctionInnards, F->afront().getType(), ArgName);
- for (Function::const_aiterator I = ++F->abegin(), E = F->aend();
+ if (F->arg_begin()->hasName() || !Prototype)
+ ArgName = Mang->getValueName(F->arg_begin());
+ printType(FunctionInnards, F->arg_begin()->getType(), ArgName);
+ for (Function::const_arg_iterator I = ++F->arg_begin(), E = F->arg_end();
I != E; ++I) {
FunctionInnards << ", ";
if (I->hasName() || !Prototype)
} else if (!FT->isVarArg() && FT->getNumParams() == 0) {
FunctionInnards << "void"; // ret() -> ret(void) in C.
}
- FunctionInnards << ")";
+ FunctionInnards << ')';
// Print out the return type and the entire signature for that matter
printType(Out, F->getReturnType(), FunctionInnards.str());
}
}
}
- Out << "\n";
+ Out << '\n';
if (F.hasExternalLinkage() && F.getName() == "main")
printCodeForMain();
Out << " return";
if (I.getNumOperands()) {
- Out << " ";
+ Out << ' ';
writeOperand(I.getOperand(0));
}
Out << ";\n";
BasicBlock *Succ = cast<BasicBlock>(SI.getOperand(i+1));
printPHICopiesForSuccessor (SI.getParent(), Succ, 2);
printBranchToBlock(SI.getParent(), Succ, 2);
- if (Succ == SI.getParent()->getNext())
+ if (Function::iterator(Succ) == next(Function::iterator(SI.getParent())))
Out << " break;\n";
}
Out << " }\n";
/// FIXME: This should be reenabled, but loop reordering safe!!
return true;
- if (From->getNext() != To) // Not the direct successor, we need a goto
- return true;
+ if (next(Function::iterator(From)) != Function::iterator(To))
+ return true; // Not the direct successor, we need a goto.
//isa<SwitchInst>(From->getTerminator())
-
if (LI->getLoopFor(From) != LI->getLoopFor(To))
return true;
return false;
printType(Out, I.getType());
Out << ")(";
}
-
- writeOperand(I.getOperand(0));
- switch (I.getOpcode()) {
- case Instruction::Add: Out << " + "; break;
- case Instruction::Sub: Out << " - "; break;
- case Instruction::Mul: Out << "*"; break;
- case Instruction::Div: Out << "/"; break;
- case Instruction::Rem: Out << "%"; break;
- case Instruction::And: Out << " & "; break;
- case Instruction::Or: Out << " | "; break;
- case Instruction::Xor: Out << " ^ "; break;
- case Instruction::SetEQ: Out << " == "; break;
- case Instruction::SetNE: Out << " != "; break;
- case Instruction::SetLE: Out << " <= "; break;
- case Instruction::SetGE: Out << " >= "; break;
- case Instruction::SetLT: Out << " < "; break;
- case Instruction::SetGT: Out << " > "; break;
- case Instruction::Shl : Out << " << "; break;
- case Instruction::Shr : Out << " >> "; break;
- default: std::cerr << "Invalid operator type!" << I; abort();
- }
+ // If this is a negation operation, print it out as such. For FP, we don't
+ // want to print "-0.0 - X".
+ if (BinaryOperator::isNeg(&I)) {
+ Out << "-";
+ writeOperand(BinaryOperator::getNegArgument(cast<BinaryOperator>(&I)));
- writeOperand(I.getOperand(1));
+ } else {
+ writeOperand(I.getOperand(0));
+
+ switch (I.getOpcode()) {
+ case Instruction::Add: Out << " + "; break;
+ case Instruction::Sub: Out << " - "; break;
+ case Instruction::Mul: Out << '*'; break;
+ case Instruction::Div: Out << '/'; break;
+ case Instruction::Rem: Out << '%'; break;
+ case Instruction::And: Out << " & "; break;
+ case Instruction::Or: Out << " | "; break;
+ case Instruction::Xor: Out << " ^ "; break;
+ case Instruction::SetEQ: Out << " == "; break;
+ case Instruction::SetNE: Out << " != "; break;
+ case Instruction::SetLE: Out << " <= "; break;
+ case Instruction::SetGE: Out << " >= "; break;
+ case Instruction::SetLT: Out << " < "; break;
+ case Instruction::SetGT: Out << " > "; break;
+ case Instruction::Shl : Out << " << "; break;
+ case Instruction::Shr : Out << " >> "; break;
+ default: std::cerr << "Invalid operator type!" << I; abort();
+ }
+
+ writeOperand(I.getOperand(1));
+ }
if (needsCast) {
Out << "))";
void CWriter::visitCastInst(CastInst &I) {
if (I.getType() == Type::BoolTy) {
- Out << "(";
+ Out << '(';
writeOperand(I.getOperand(0));
Out << " != 0)";
return;
}
- Out << "(";
+ Out << '(';
printType(Out, I.getType());
- Out << ")";
+ Out << ')';
if (isa<PointerType>(I.getType())&&I.getOperand(0)->getType()->isIntegral() ||
isa<PointerType>(I.getOperand(0)->getType())&&I.getType()->isIntegral()) {
// Avoid "cast to pointer from integer of different size" warnings
case Intrinsic::frameaddress:
case Intrinsic::setjmp:
case Intrinsic::longjmp:
+ case Intrinsic::prefetch:
// We directly implement these intrinsics
break;
default:
// All other intrinsic calls we must lower.
- Instruction *Before = CI->getPrev();
+ Instruction *Before = 0;
+ if (CI != &BB->front())
+ Before = prior(BasicBlock::iterator(CI));
+
IL.LowerIntrinsicCall(CI);
if (Before) { // Move iterator to instruction after call
I = Before; ++I;
Out << "va_start(*(va_list*)&" << Mang->getValueName(&I) << ", ";
// Output the last argument to the enclosing function...
- if (I.getParent()->getParent()->aempty()) {
+ if (I.getParent()->getParent()->arg_empty()) {
std::cerr << "The C backend does not currently support zero "
<< "argument varargs functions, such as '"
<< I.getParent()->getParent()->getName() << "'!\n";
abort();
}
- writeOperand(&I.getParent()->getParent()->aback());
- Out << ")";
+ writeOperand(--I.getParent()->getParent()->arg_end());
+ Out << ')';
return;
case Intrinsic::vaend:
if (!isa<ConstantPointerNull>(I.getOperand(1))) {
Out << "va_end(*(va_list*)&";
writeOperand(I.getOperand(1));
- Out << ")";
+ Out << ')';
} else {
Out << "va_end(*(va_list*)0)";
}
Out << "va_copy(*(va_list*)&" << Mang->getValueName(&I) << ", ";
Out << "*(va_list*)&";
writeOperand(I.getOperand(1));
- Out << ")";
+ Out << ')';
return;
case Intrinsic::returnaddress:
Out << "__builtin_return_address(";
writeOperand(I.getOperand(1));
- Out << ")";
+ Out << ')';
return;
case Intrinsic::frameaddress:
Out << "__builtin_frame_address(";
writeOperand(I.getOperand(1));
- Out << ")";
+ Out << ')';
return;
case Intrinsic::setjmp:
Out << "setjmp(*(jmp_buf*)";
writeOperand(I.getOperand(1));
- Out << ")";
+ Out << ')';
return;
case Intrinsic::longjmp:
Out << "longjmp(*(jmp_buf*)";
writeOperand(I.getOperand(1));
Out << ", ";
writeOperand(I.getOperand(2));
+ Out << ')';
+ return;
+ case Intrinsic::prefetch:
+ Out << "LLVM_PREFETCH((const void *)";
+ writeOperand(I.getOperand(1));
+ Out << ", ";
+ writeOperand(I.getOperand(2));
+ Out << ", ";
+ writeOperand(I.getOperand(3));
Out << ")";
return;
}
printType(Out, CE->getType());
Out << ")(void*)";
printConstant(RF);
- Out << ")";
+ Out << ')';
WroteCallee = true;
}
}
const Type *RetTy = FTy->getReturnType();
if (!WroteCallee) writeOperand(Callee);
- Out << "(";
+ Out << '(';
unsigned NumDeclaredParams = FTy->getNumParams();
if (I.getNumOperands() != 1) {
CallSite::arg_iterator AI = I.op_begin()+1, AE = I.op_end();
if (NumDeclaredParams && (*AI)->getType() != FTy->getParamType(0)) {
- Out << "(";
+ Out << '(';
printType(Out, FTy->getParamType(0));
- Out << ")";
+ Out << ')';
}
writeOperand(*AI);
Out << ", ";
if (ArgNo < NumDeclaredParams &&
(*AI)->getType() != FTy->getParamType(ArgNo)) {
- Out << "(";
+ Out << '(';
printType(Out, FTy->getParamType(ArgNo));
- Out << ")";
+ Out << ')';
}
writeOperand(*AI);
}
}
- Out << ")";
+ Out << ')';
}
void CWriter::visitMallocInst(MallocInst &I) {
}
void CWriter::visitAllocaInst(AllocaInst &I) {
- Out << "(";
+ Out << '(';
printType(Out, I.getType());
Out << ") alloca(sizeof(";
printType(Out, I.getType()->getElementType());
- Out << ")";
+ Out << ')';
if (I.isArrayAllocation()) {
Out << " * " ;
writeOperand(I.getOperand(0));
}
- Out << ")";
+ Out << ')';
}
void CWriter::visitFreeInst(FreeInst &I) {
if (I == E) {
if (!HasImplicitAddress)
- Out << "*"; // Implicit zero first argument: '*x' is equivalent to 'x[0]'
+ Out << '*'; // Implicit zero first argument: '*x' is equivalent to 'x[0]'
writeOperandInternal(Ptr);
return;
writeOperandInternal(Ptr);
if (HasImplicitAddress && (!CI || !CI->isNullValue())) {
- Out << ")";
+ Out << ')';
HasImplicitAddress = false; // HIA is only true if we haven't addressed yet
}
if (isa<StructType>(*I)) {
Out << ".field" << cast<ConstantUInt>(I.getOperand())->getValue();
} else {
- Out << "[";
+ Out << '[';
writeOperand(I.getOperand());
- Out << "]";
+ Out << ']';
}
}
void CWriter::visitLoadInst(LoadInst &I) {
- Out << "*";
+ Out << '*';
if (I.isVolatile()) {
- Out << "((volatile ";
- printType(Out, I.getOperand(0)->getType());
- Out << ")";
+ Out << "((";
+ printType(Out, I.getType());
+ Out << " volatile*)";
}
writeOperand(I.getOperand(0));
if (I.isVolatile())
- Out << ")";
+ Out << ')';
}
void CWriter::visitStoreInst(StoreInst &I) {
- Out << "*";
+ Out << '*';
if (I.isVolatile()) {
- Out << "((volatile ";
- printType(Out, I.getPointerOperand()->getType());
- Out << ")";
+ Out << "((";
+ printType(Out, I.getOperand(0)->getType());
+ Out << " volatile*)";
}
writeOperand(I.getPointerOperand());
- if (I.isVolatile()) Out << ")";
+ if (I.isVolatile()) Out << ')';
Out << " = ";
writeOperand(I.getOperand(0));
}
void CWriter::visitGetElementPtrInst(GetElementPtrInst &I) {
- Out << "&";
+ Out << '&';
printIndexingExpression(I.getPointerOperand(), gep_type_begin(I),
gep_type_end(I));
}
Out << Mang->getValueName(I.getOperand(0));
Out << "; va_arg(*(va_list*)&" << Mang->getValueName(&I) << ", ";
printType(Out, I.getArgType());
- Out << ")";
+ Out << ')';
}
void CWriter::visitVAArgInst(VAArgInst &I) {
bool CTargetMachine::addPassesToEmitAssembly(PassManager &PM, std::ostream &o) {
PM.add(createLowerGCPass());
- PM.add(createLowerAllocationsPass());
+ PM.add(createLowerAllocationsPass(true));
PM.add(createLowerInvokePass());
PM.add(new CBackendNameAllUsedStructs());
PM.add(new CWriter(o, getIntrinsicLowering()));
projects / oota-llvm.git / blobdiff