6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-26 10:29:36 +00:00
Code Issues Projects Releases Wiki Activity

Convert the CPP backend to use the AttributeSet instead of AttributeWithIndex.

Browse Source 
Further removal of the introspective AttributeWithIndex thing. Also fix the #includes.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173599 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-01-27 01:22:51 +00:00
parent 0c2f0ff9cc
commit 9a131c544c
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/Target/CppBackend/CPPBackend.cpp
View File

@ -470,18 +470,19 @@ void CppWriter::printAttributes(const AttributeSet &PAL,
nl(Out); nl(Out);
if (!PAL.isEmpty()) { if (!PAL.isEmpty()) {
Out << '{'; in(); nl(Out); Out << '{'; in(); nl(Out);
Out << "SmallVector<AttributeWithIndex, 4> Attrs;"; nl(Out); Out << "SmallVector<AttributeSet, 4> Attrs;"; nl(Out);
Out << "AttributeWithIndex PAWI;"; nl(Out); Out << "AttributeSet PAS;"; in(); nl(Out);
for (unsigned i = 0; i < PAL.getNumSlots(); ++i) { for (unsigned i = 0; i < PAL.getNumSlots(); ++i) {
unsigned index = PAL.getSlotIndex(i); unsigned index = PAL.getSlotIndex(i);
AttrBuilder attrs(PAL.getSlotAttributes(i), index); AttrBuilder attrs(PAL.getSlotAttributes(i), index);
Out << "PAWI.Index = " << index << "U;\n"; Out << "{"; in(); nl(Out);
Out << " {\n AttrBuilder B;\n"; Out << "AttrBuilder B;"; nl(Out);
#define HANDLE_ATTR(X) \ #define HANDLE_ATTR(X) \
if (attrs.contains(Attribute::X)) \ if (attrs.contains(Attribute::X)) { \
Out << " B.addAttribute(Attribute::" #X ");\n"; \ Out << "B.addAttribute(Attribute::" #X ");"; nl(Out); \
attrs.removeAttribute(Attribute::X); attrs.removeAttribute(Attribute::X); \
}
HANDLE_ATTR(SExt); HANDLE_ATTR(SExt);
HANDLE_ATTR(ZExt); HANDLE_ATTR(ZExt);
@ -510,14 +511,23 @@ void CppWriter::printAttributes(const AttributeSet &PAL,
HANDLE_ATTR(NonLazyBind); HANDLE_ATTR(NonLazyBind);
HANDLE_ATTR(MinSize); HANDLE_ATTR(MinSize);
#undef HANDLE_ATTR #undef HANDLE_ATTR
if (attrs.contains(Attribute::StackAlignment))
Out << " B.addStackAlignmentAttr(" << attrs.getStackAlignment() << ")\n"; if (attrs.contains(Attribute::StackAlignment)) {
Out << "B.addStackAlignmentAttr(" << attrs.getStackAlignment()<<')';
nl(Out);
attrs.removeAttribute(Attribute::StackAlignment); attrs.removeAttribute(Attribute::StackAlignment);
}
assert(!attrs.hasAttributes() && "Unhandled attribute!"); assert(!attrs.hasAttributes() && "Unhandled attribute!");
Out << " PAWI.Attrs = Attribute::get(mod->getContext(), B);\n }"; Out << "PAS = AttributeSet::get(mod->getContext(), ";
nl(Out); if (index == ~0U)
Out << "Attrs.push_back(PAWI);"; Out << "~0U,";
else
Out << index << "U,";
Out << " B);"; out(); nl(Out);
Out << "}"; out(); nl(Out);
nl(Out); nl(Out);
Out << "Attrs.push_back(PAS);"; nl(Out);
} }
Out << name << "_PAL = AttributeSet::get(mod->getContext(), Attrs);"; Out << name << "_PAL = AttributeSet::get(mod->getContext(), Attrs);";
nl(Out); nl(Out);
@ -1889,23 +1899,24 @@ void CppWriter::printModuleBody() {
void CppWriter::printProgram(const std::string& fname, void CppWriter::printProgram(const std::string& fname,
const std::string& mName) { const std::string& mName) {
Out << "#include <llvm/LLVMContext.h>\n";
Out << "#include <llvm/Module.h>\n";
Out << "#include <llvm/DerivedTypes.h>\n";
Out << "#include <llvm/Constants.h>\n";
Out << "#include <llvm/GlobalVariable.h>\n";
Out << "#include <llvm/Function.h>\n";
Out << "#include <llvm/CallingConv.h>\n";
Out << "#include <llvm/BasicBlock.h>\n";
Out << "#include <llvm/Instructions.h>\n";
Out << "#include <llvm/InlineAsm.h>\n";
Out << "#include <llvm/Support/FormattedStream.h>\n";
Out << "#include <llvm/Support/MathExtras.h>\n";
Out << "#include <llvm/Pass.h>\n"; Out << "#include <llvm/Pass.h>\n";
Out << "#include <llvm/PassManager.h>\n"; Out << "#include <llvm/PassManager.h>\n";
Out << "#include <llvm/ADT/SmallVector.h>\n"; Out << "#include <llvm/ADT/SmallVector.h>\n";
Out << "#include <llvm/Analysis/Verifier.h>\n"; Out << "#include <llvm/Analysis/Verifier.h>\n";
Out << "#include <llvm/Assembly/PrintModulePass.h>\n"; Out << "#include <llvm/Assembly/PrintModulePass.h>\n";
Out << "#include <llvm/IR/BasicBlock.h>\n";
Out << "#include <llvm/IR/CallingConv.h>\n";
Out << "#include <llvm/IR/Constants.h>\n";
Out << "#include <llvm/IR/DerivedTypes.h>\n";
Out << "#include <llvm/IR/Function.h>\n";
Out << "#include <llvm/IR/GlobalVariable.h>\n";
Out << "#include <llvm/IR/InlineAsm.h>\n";
Out << "#include <llvm/IR/Instructions.h>\n";
Out << "#include <llvm/IR/LLVMContext.h>\n";
Out << "#include <llvm/IR/Module.h>\n";
Out << "#include <llvm/Support/FormattedStream.h>\n";
Out << "#include <llvm/Support/MathExtras.h>\n";
Out << "#include <algorithm>\n"; Out << "#include <algorithm>\n";
Out << "using namespace llvm;\n\n"; Out << "using namespace llvm;\n\n";
Out << "Module* " << fname << "();\n\n"; Out << "Module* " << fname << "();\n\n";