diff options
Diffstat (limited to 'lib')
45 files changed, 145 insertions, 108 deletions
diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp index a323610..47dbde7 100644 --- a/lib/Analysis/IPA/CallGraph.cpp +++ b/lib/Analysis/IPA/CallGraph.cpp @@ -12,11 +12,11 @@ #include "llvm/Analysis/CallGraph.h" #include "llvm/Analysis/Writer.h" -#include "llvm/Support/STLExtras.h" #include "llvm/Module.h" #include "llvm/Method.h" #include "llvm/iOther.h" #include "llvm/iTerminators.h" +#include "Support/STLExtras.h" #include <algorithm> // getNodeFor - Return the node for the specified method or create one if it diff --git a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp index d47e1d7..8527637 100644 --- a/lib/Analysis/IPA/FindUnsafePointerTypes.cpp +++ b/lib/Analysis/IPA/FindUnsafePointerTypes.cpp @@ -18,8 +18,8 @@ #include "llvm/Analysis/FindUnsafePointerTypes.h" #include "llvm/Assembly/CachedWriter.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Type.h" +#include "Support/CommandLine.h" // Provide a command line option to turn on printing of which instructions cause // a type to become invalid diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp index 4bff950..8616cb7 100644 --- a/lib/Analysis/IntervalPartition.cpp +++ b/lib/Analysis/IntervalPartition.cpp @@ -6,7 +6,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/IntervalIterator.h" -#include "llvm/Support/STLExtras.h" +#include "Support/STLExtras.h" using namespace cfg; diff --git a/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp b/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp index 32201be..e981a86 100644 --- a/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp +++ b/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp @@ -11,7 +11,7 @@ #include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/PostOrderIterator.h" +#include "Support/PostOrderIterator.h" /************************** Constructor/Destructor ***************************/ diff --git a/lib/Analysis/LoopDepth.cpp b/lib/Analysis/LoopDepth.cpp index 7518606..ed96bd4 100644 --- a/lib/Analysis/LoopDepth.cpp +++ b/lib/Analysis/LoopDepth.cpp @@ -7,7 +7,7 @@ #include "llvm/Analysis/LoopDepth.h" #include "llvm/Analysis/IntervalPartition.h" -#include "llvm/Support/STLExtras.h" +#include "Support/STLExtras.h" #include <algorithm> inline void LoopDepthCalculator::AddBB(const BasicBlock *BB) { diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp index a240ec8..40a195b 100644 --- a/lib/Analysis/LoopInfo.cpp +++ b/lib/Analysis/LoopInfo.cpp @@ -9,8 +9,8 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/Dominators.h" -#include "llvm/Support/DepthFirstIterator.h" #include "llvm/BasicBlock.h" +#include "Support/DepthFirstIterator.h" #include <algorithm> bool cfg::Loop::contains(const BasicBlock *BB) const { diff --git a/lib/Analysis/ModuleAnalyzer.cpp b/lib/Analysis/ModuleAnalyzer.cpp index d543216..dc6ee71 100644 --- a/lib/Analysis/ModuleAnalyzer.cpp +++ b/lib/Analysis/ModuleAnalyzer.cpp @@ -12,7 +12,7 @@ #include "llvm/BasicBlock.h" #include "llvm/DerivedTypes.h" #include "llvm/ConstPoolVals.h" -#include "llvm/Support/STLExtras.h" +#include "Support/STLExtras.h" #include <map> // processModule - Driver function to call all of my subclasses virtual methods. diff --git a/lib/Analysis/PostDominators.cpp b/lib/Analysis/PostDominators.cpp index 2bc3edb..2ed02db 100644 --- a/lib/Analysis/PostDominators.cpp +++ b/lib/Analysis/PostDominators.cpp @@ -6,9 +6,9 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Analysis/SimplifyCFG.h" // To get cfg::UnifyAllExitNodes -#include "llvm/Support/DepthFirstIterator.h" -#include "llvm/Support/STLExtras.h" #include "llvm/Method.h" +#include "Support/DepthFirstIterator.h" +#include "Support/STLExtras.h" #include <algorithm> //===----------------------------------------------------------------------===// diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h index 0f25f54..76052fa 100644 --- a/lib/AsmParser/ParserInternals.h +++ b/lib/AsmParser/ParserInternals.h @@ -18,7 +18,7 @@ #include "llvm/Method.h" #include "llvm/DerivedTypes.h" #include "llvm/Assembly/Parser.h" -#include "llvm/Support/StringExtras.h" +#include "Support/StringExtras.h" class Module; diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index aca9878..0f5c11e 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -21,8 +21,8 @@ #include "llvm/DerivedTypes.h" #include "llvm/iTerminators.h" #include "llvm/iMemory.h" -#include "llvm/Support/STLExtras.h" -#include "llvm/Support/DepthFirstIterator.h" +#include "Support/STLExtras.h" +#include "Support/DepthFirstIterator.h" #include <list> #include <utility> // Get definition of pair class #include <algorithm> diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp index 3211e72..6fed526 100644 --- a/lib/Bytecode/Writer/SlotCalculator.cpp +++ b/lib/Bytecode/Writer/SlotCalculator.cpp @@ -19,8 +19,8 @@ #include "llvm/iOther.h" #include "llvm/DerivedTypes.h" #include "llvm/SymbolTable.h" -#include "llvm/Support/STLExtras.h" -#include "llvm/Support/DepthFirstIterator.h" +#include "Support/DepthFirstIterator.h" +#include "Support/STLExtras.h" #include <algorithm> #if 0 diff --git a/lib/CodeGen/InstrSched/InstrScheduling.cpp b/lib/CodeGen/InstrSched/InstrScheduling.cpp index 0ba218d..528e5ab 100644 --- a/lib/CodeGen/InstrSched/InstrScheduling.cpp +++ b/lib/CodeGen/InstrSched/InstrScheduling.cpp @@ -13,15 +13,11 @@ //************************* User Include Files *****************************/ #include "llvm/CodeGen/InstrScheduling.h" -#include "SchedPriorities.h" #include "llvm/Analysis/LiveVar/BBLiveVar.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Instruction.h" - - -//************************ System Include Files *****************************/ - +#include "Support/CommandLine.h" +#include "SchedPriorities.h" #include <hash_set> #include <algorithm> #include <iterator> diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index 9d3651a..9e9af5b 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -21,8 +21,8 @@ #include "llvm/CodeGen/InstrSelection.h" #include "llvm/Target/MachineInstrInfo.h" #include "llvm/Target/MachineRegInfo.h" -#include "llvm/Support/StringExtras.h" #include "llvm/iOther.h" +#include "Support/StringExtras.h" #include <algorithm> #include <hash_map> #include <vector> @@ -132,7 +132,7 @@ SchedGraphEdge::~SchedGraphEdge() } void SchedGraphEdge::dump(int indent=0) const { - printIndent(indent); cout << *this; + cout << string(indent*2, ' ') << *this; } @@ -168,7 +168,7 @@ SchedGraphNode::~SchedGraphNode() } void SchedGraphNode::dump(int indent=0) const { - printIndent(indent); cout << *this; + cout << string(indent*2, ' ') << *this; } @@ -1023,32 +1023,24 @@ operator<<(ostream& os, const SchedGraphEdge& edge) ostream& operator<<(ostream& os, const SchedGraphNode& node) { - printIndent(4, os); - os << "Node " << node.nodeId << " : " - << "latency = " << node.latency << endl; - - printIndent(6, os); + os << string(8, ' ') + << "Node " << node.nodeId << " : " + << "latency = " << node.latency << endl << string(12, ' '); if (node.getMachineInstr() == NULL) os << "(Dummy node)" << endl; else { - os << *node.getMachineInstr() << endl; - - printIndent(6, os); + os << *node.getMachineInstr() << endl << string(12, ' '); os << node.inEdges.size() << " Incoming Edges:" << endl; for (unsigned i=0, N=node.inEdges.size(); i < N; i++) - { - printIndent(8, os); - os << * node.inEdges[i]; - } + os << string(16, ' ') << *node.inEdges[i]; - printIndent(6, os); - os << node.outEdges.size() << " Outgoing Edges:" << endl; + os << string(12, ' ') << node.outEdges.size() + << " Outgoing Edges:" << endl; for (unsigned i=0, N=node.outEdges.size(); i < N; i++) { - printIndent(8, os); - os << * node.outEdges[i]; + os << string(16, ' ') << * node.outEdges[i]; } } diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h index 44d59a1..a4567a5 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.h +++ b/lib/CodeGen/InstrSched/SchedGraph.h @@ -19,11 +19,11 @@ #ifndef LLVM_CODEGEN_SCHEDGRAPH_H #define LLVM_CODEGEN_SCHEDGRAPH_H -#include "llvm/Support/NonCopyable.h" -#include "llvm/Support/HashExtras.h" -#include "llvm/Support/GraphTraits.h" #include "llvm/Target/MachineInstrInfo.h" #include "llvm/CodeGen/MachineInstr.h" +#include "Support/NonCopyable.h" +#include "Support/HashExtras.h" +#include "Support/GraphTraits.h" #include <hash_map> class Value; diff --git a/lib/CodeGen/InstrSched/SchedPriorities.cpp b/lib/CodeGen/InstrSched/SchedPriorities.cpp index 31d9f6c..acbe552 100644 --- a/lib/CodeGen/InstrSched/SchedPriorities.cpp +++ b/lib/CodeGen/InstrSched/SchedPriorities.cpp @@ -19,7 +19,7 @@ //**************************************************************************/ #include "SchedPriorities.h" -#include "llvm/Support/PostOrderIterator.h" +#include "Support/PostOrderIterator.h" SchedPriorities::SchedPriorities(const Method* method, diff --git a/lib/CodeGen/InstrSelection/InstrForest.cpp b/lib/CodeGen/InstrSelection/InstrForest.cpp index f928683..c6d5367 100644 --- a/lib/CodeGen/InstrSelection/InstrForest.cpp +++ b/lib/CodeGen/InstrSelection/InstrForest.cpp @@ -30,7 +30,7 @@ #include "llvm/ConstPoolVals.h" #include "llvm/BasicBlock.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/STLExtras.h" +#include "Support/STLExtras.h" //------------------------------------------------------------------------ // class InstrTreeNode diff --git a/lib/CodeGen/InstrSelection/InstrSelection.cpp b/lib/CodeGen/InstrSelection/InstrSelection.cpp index f27ad71..ce26a1d 100644 --- a/lib/CodeGen/InstrSelection/InstrSelection.cpp +++ b/lib/CodeGen/InstrSelection/InstrSelection.cpp @@ -17,12 +17,12 @@ #include "llvm/CodeGen/InstrSelection.h" #include "llvm/CodeGen/InstrSelectionSupport.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Instruction.h" #include "llvm/BasicBlock.h" #include "llvm/Method.h" #include "llvm/iOther.h" #include "llvm/Target/MachineRegInfo.h" +#include "Support/CommandLine.h" #include <string.h> diff --git a/lib/CodeGen/RegAlloc/RegAllocCommon.h b/lib/CodeGen/RegAlloc/RegAllocCommon.h index 5fa51c0..02b3331 100644 --- a/lib/CodeGen/RegAlloc/RegAllocCommon.h +++ b/lib/CodeGen/RegAlloc/RegAllocCommon.h @@ -1,5 +1,5 @@ -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" #ifndef REG_ALLOC_COMMON_H #define REG_ALLOC_COMMON_H diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 538e39a..2f0ee41 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -26,7 +26,7 @@ CachedWriter CW; // Object to accelerate printing of LLVM #ifdef PROFILE_STRUCTURE_FIELDS -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" static cl::Flag ProfileStructureFields("profilestructfields", "Profile Structure Field Accesses"); #include <map> diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp index bc337ee..f693816 100644 --- a/lib/Support/CommandLine.cpp +++ b/lib/Support/CommandLine.cpp @@ -9,8 +9,8 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/CommandLine.h" -#include "llvm/Support/STLExtras.h" +#include "Support/CommandLine.h" +#include "Support/STLExtras.h" #include <vector> #include <algorithm> #include <map> diff --git a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp index 0ba218d..528e5ab 100644 --- a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp +++ b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp @@ -13,15 +13,11 @@ //************************* User Include Files *****************************/ #include "llvm/CodeGen/InstrScheduling.h" -#include "SchedPriorities.h" #include "llvm/Analysis/LiveVar/BBLiveVar.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Instruction.h" - - -//************************ System Include Files *****************************/ - +#include "Support/CommandLine.h" +#include "SchedPriorities.h" #include <hash_set> #include <algorithm> #include <iterator> diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index 9d3651a..9e9af5b 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp @@ -21,8 +21,8 @@ #include "llvm/CodeGen/InstrSelection.h" #include "llvm/Target/MachineInstrInfo.h" #include "llvm/Target/MachineRegInfo.h" -#include "llvm/Support/StringExtras.h" #include "llvm/iOther.h" +#include "Support/StringExtras.h" #include <algorithm> #include <hash_map> #include <vector> @@ -132,7 +132,7 @@ SchedGraphEdge::~SchedGraphEdge() } void SchedGraphEdge::dump(int indent=0) const { - printIndent(indent); cout << *this; + cout << string(indent*2, ' ') << *this; } @@ -168,7 +168,7 @@ SchedGraphNode::~SchedGraphNode() } void SchedGraphNode::dump(int indent=0) const { - printIndent(indent); cout << *this; + cout << string(indent*2, ' ') << *this; } @@ -1023,32 +1023,24 @@ operator<<(ostream& os, const SchedGraphEdge& edge) ostream& operator<<(ostream& os, const SchedGraphNode& node) { - printIndent(4, os); - os << "Node " << node.nodeId << " : " - << "latency = " << node.latency << endl; - - printIndent(6, os); + os << string(8, ' ') + << "Node " << node.nodeId << " : " + << "latency = " << node.latency << endl << string(12, ' '); if (node.getMachineInstr() == NULL) os << "(Dummy node)" << endl; else { - os << *node.getMachineInstr() << endl; - - printIndent(6, os); + os << *node.getMachineInstr() << endl << string(12, ' '); os << node.inEdges.size() << " Incoming Edges:" << endl; for (unsigned i=0, N=node.inEdges.size(); i < N; i++) - { - printIndent(8, os); - os << * node.inEdges[i]; - } + os << string(16, ' ') << *node.inEdges[i]; - printIndent(6, os); - os << node.outEdges.size() << " Outgoing Edges:" << endl; + os << string(12, ' ') << node.outEdges.size() + << " Outgoing Edges:" << endl; for (unsigned i=0, N=node.outEdges.size(); i < N; i++) { - printIndent(8, os); - os << * node.outEdges[i]; + os << string(16, ' ') << * node.outEdges[i]; } } diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.h b/lib/Target/SparcV9/InstrSched/SchedGraph.h index 44d59a1..a4567a5 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.h +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.h @@ -19,11 +19,11 @@ #ifndef LLVM_CODEGEN_SCHEDGRAPH_H #define LLVM_CODEGEN_SCHEDGRAPH_H -#include "llvm/Support/NonCopyable.h" -#include "llvm/Support/HashExtras.h" -#include "llvm/Support/GraphTraits.h" #include "llvm/Target/MachineInstrInfo.h" #include "llvm/CodeGen/MachineInstr.h" +#include "Support/NonCopyable.h" +#include "Support/HashExtras.h" +#include "Support/GraphTraits.h" #include <hash_map> class Value; diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp index 31d9f6c..acbe552 100644 --- a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp @@ -19,7 +19,7 @@ //**************************************************************************/ #include "SchedPriorities.h" -#include "llvm/Support/PostOrderIterator.h" +#include "Support/PostOrderIterator.h" SchedPriorities::SchedPriorities(const Method* method, diff --git a/lib/Target/SparcV9/InstrSelection/InstrForest.cpp b/lib/Target/SparcV9/InstrSelection/InstrForest.cpp index f928683..c6d5367 100644 --- a/lib/Target/SparcV9/InstrSelection/InstrForest.cpp +++ b/lib/Target/SparcV9/InstrSelection/InstrForest.cpp @@ -30,7 +30,7 @@ #include "llvm/ConstPoolVals.h" #include "llvm/BasicBlock.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/STLExtras.h" +#include "Support/STLExtras.h" //------------------------------------------------------------------------ // class InstrTreeNode diff --git a/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp b/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp index f27ad71..ce26a1d 100644 --- a/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp +++ b/lib/Target/SparcV9/InstrSelection/InstrSelection.cpp @@ -17,12 +17,12 @@ #include "llvm/CodeGen/InstrSelection.h" #include "llvm/CodeGen/InstrSelectionSupport.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Instruction.h" #include "llvm/BasicBlock.h" #include "llvm/Method.h" #include "llvm/iOther.h" #include "llvm/Target/MachineRegInfo.h" +#include "Support/CommandLine.h" #include <string.h> diff --git a/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp b/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp index 32201be..e981a86 100644 --- a/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp +++ b/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp @@ -11,7 +11,7 @@ #include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/Support/PostOrderIterator.h" +#include "Support/PostOrderIterator.h" /************************** Constructor/Destructor ***************************/ diff --git a/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h b/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h index 5fa51c0..02b3331 100644 --- a/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h +++ b/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h @@ -1,5 +1,5 @@ -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" #ifndef REG_ALLOC_COMMON_H #define REG_ALLOC_COMMON_H diff --git a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp index 618fb6d..3edeb96 100644 --- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp +++ b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp @@ -19,8 +19,8 @@ #include "llvm/BasicBlock.h" #include "llvm/Method.h" #include "llvm/Module.h" -#include "llvm/Support/HashExtras.h" -#include "llvm/Support/StringExtras.h" +#include "Support/StringExtras.h" +#include "Support/HashExtras.h" #include <locale.h> namespace { @@ -161,6 +161,69 @@ private : } }; + +// Can we treat the specified array as a string? Only if it is an array of +// ubytes or non-negative sbytes. +// +static bool isStringCompatible(ConstPoolArray *CPA) { + const Type *ETy = cast<ArrayType>(CPA->getType())->getElementType(); + if (ETy == Type::UByteTy) return true; + if (ETy != Type::SByteTy) return false; + + for (unsigned i = 0; i < CPA->getNumOperands(); ++i) + if (cast<ConstPoolSInt>(CPA->getOperand(i))->getValue() < 0) + return false; + + return true; +} + +// toOctal - Convert the low order bits of X into an octal letter +static inline char toOctal(int X) { + return (X&7)+'0'; +} + +// getAsCString - Return the specified array as a C compatible string, only if +// the predicate isStringCompatible is true. +// +static string getAsCString(ConstPoolArray *CPA) { + if (isStringCompatible(CPA)) { + string Result; + const Type *ETy = cast<ArrayType>(CPA->getType())->getElementType(); + Result = "\""; + for (unsigned i = 0; i < CPA->getNumOperands(); ++i) { + unsigned char C = (ETy == Type::SByteTy) ? + (unsigned char)cast<ConstPoolSInt>(CPA->getOperand(i))->getValue() : + (unsigned char)cast<ConstPoolUInt>(CPA->getOperand(i))->getValue(); + + if (isprint(C)) { + Result += C; + } else { + switch(C) { + case '\a': Result += "\\a"; break; + case '\b': Result += "\\b"; break; + case '\f': Result += "\\f"; break; + case '\n': Result += "\\n"; break; + case '\r': Result += "\\r"; break; + case '\t': Result += "\\t"; break; + case '\v': Result += "\\v"; break; + default: + Result += '\\'; + Result += toOctal(C >> 6); + Result += toOctal(C >> 3); + Result += toOctal(C >> 0); + break; + } + } + } + Result += "\""; + + return Result; + } else { + return CPA->getStrValue(); + } +} + + inline bool SparcAsmPrinter::OpIsBranchTargetLabel(const MachineInstr *MI, unsigned int opNum) { diff --git a/lib/Target/SparcV9/SparcV9InstrSelection.cpp b/lib/Target/SparcV9/SparcV9InstrSelection.cpp index c1b8aa3..631d609 100644 --- a/lib/Target/SparcV9/SparcV9InstrSelection.cpp +++ b/lib/Target/SparcV9/SparcV9InstrSelection.cpp @@ -16,7 +16,6 @@ #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/InstrForest.h" #include "llvm/CodeGen/InstrSelection.h" -#include "llvm/Support/MathExtras.h" #include "llvm/DerivedTypes.h" #include "llvm/iTerminators.h" #include "llvm/iMemory.h" @@ -24,10 +23,9 @@ #include "llvm/BasicBlock.h" #include "llvm/Method.h" #include "llvm/ConstPoolVals.h" +#include "Support/MathExtras.h" #include <math.h> -//******************** Internal Data Declarations ************************/ - //************************* Forward Declarations ***************************/ diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp index 327cb63..a1d92f1 100644 --- a/lib/Transforms/ExprTypeConvert.cpp +++ b/lib/Transforms/ExprTypeConvert.cpp @@ -8,13 +8,13 @@ #include "TransformInternals.h" #include "llvm/Method.h" -#include "llvm/Support/STLExtras.h" #include "llvm/iOther.h" #include "llvm/iMemory.h" #include "llvm/ConstPoolVals.h" #include "llvm/Optimizations/ConstantHandling.h" #include "llvm/Optimizations/DCE.h" #include "llvm/Analysis/Expressions.h" +#include "Support/STLExtras.h" #include <map> #include <algorithm> diff --git a/lib/Transforms/IPO/GlobalDCE.cpp b/lib/Transforms/IPO/GlobalDCE.cpp index 24945c0..7395bab 100644 --- a/lib/Transforms/IPO/GlobalDCE.cpp +++ b/lib/Transforms/IPO/GlobalDCE.cpp @@ -6,9 +6,9 @@ #include "llvm/Transforms/IPO/GlobalDCE.h" #include "llvm/Analysis/CallGraph.h" -#include "llvm/Support/DepthFirstIterator.h" #include "llvm/Module.h" #include "llvm/Method.h" +#include "Support/DepthFirstIterator.h" #include <set> static bool RemoveUnreachableMethods(Module *M, cfg::CallGraph *CG) { diff --git a/lib/Transforms/Instrumentation/TraceValues.cpp b/lib/Transforms/Instrumentation/TraceValues.cpp index f59b0ae..07db028 100644 --- a/lib/Transforms/Instrumentation/TraceValues.cpp +++ b/lib/Transforms/Instrumentation/TraceValues.cpp @@ -27,8 +27,8 @@ #include "llvm/Module.h" #include "llvm/SymbolTable.h" #include "llvm/Assembly/Writer.h" -#include "llvm/Support/HashExtras.h" -#include "llvm/Support/StringExtras.h" +#include "Support/StringExtras.h" +#include "Support/HashExtras.h" #include <hash_set> #include <sstream> diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp index d4bf823..f802705 100644 --- a/lib/Transforms/LevelRaise.cpp +++ b/lib/Transforms/LevelRaise.cpp @@ -9,7 +9,6 @@ #include "llvm/Transforms/LevelChange.h" #include "TransformInternals.h" #include "llvm/Method.h" -#include "llvm/Support/STLExtras.h" #include "llvm/iOther.h" #include "llvm/iMemory.h" #include "llvm/ConstPoolVals.h" @@ -17,6 +16,7 @@ #include "llvm/Optimizations/DCE.h" #include "llvm/Optimizations/ConstantProp.h" #include "llvm/Analysis/Expressions.h" +#include "Support/STLExtras.h" #include <algorithm> #include "llvm/Assembly/Writer.h" diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp index 14a1811..a5d1d12 100644 --- a/lib/Transforms/Scalar/ADCE.cpp +++ b/lib/Transforms/Scalar/ADCE.cpp @@ -10,11 +10,11 @@ #include "llvm/Instruction.h" #include "llvm/Type.h" #include "llvm/Analysis/Dominators.h" -#include "llvm/Support/STLExtras.h" -#include "llvm/Support/DepthFirstIterator.h" #include "llvm/Analysis/Writer.h" #include "llvm/iTerminators.h" #include "llvm/iOther.h" +#include "Support/STLExtras.h" +#include "Support/DepthFirstIterator.h" #include <set> #include <algorithm> diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp index 16d9534..caacf32 100644 --- a/lib/Transforms/Scalar/DCE.cpp +++ b/lib/Transforms/Scalar/DCE.cpp @@ -24,7 +24,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Optimizations/DCE.h" -#include "llvm/Support/STLExtras.h" #include "llvm/Module.h" #include "llvm/GlobalVariable.h" #include "llvm/Method.h" @@ -32,6 +31,7 @@ #include "llvm/iTerminators.h" #include "llvm/iOther.h" #include "llvm/Assembly/Writer.h" +#include "Support/STLExtras.h" #include <algorithm> // dceInstruction - Inspect the instruction at *BBI and figure out if it's diff --git a/lib/Transforms/Scalar/InductionVars.cpp b/lib/Transforms/Scalar/InductionVars.cpp index 1cec66d..9f0513f 100644 --- a/lib/Transforms/Scalar/InductionVars.cpp +++ b/lib/Transforms/Scalar/InductionVars.cpp @@ -23,9 +23,9 @@ #include "llvm/ConstPoolVals.h" #include "llvm/Analysis/IntervalPartition.h" #include "llvm/Assembly/Writer.h" -#include "llvm/Support/STLExtras.h" #include "llvm/SymbolTable.h" #include "llvm/iOther.h" +#include "Support/STLExtras.h" #include <algorithm> #include "llvm/Analysis/LoopDepth.h" diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index bca3f9b..256fadf 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -24,8 +24,8 @@ #include "llvm/iOther.h" #include "llvm/iMemory.h" #include "llvm/iTerminators.h" -#include "llvm/Support/STLExtras.h" #include "llvm/Assembly/Writer.h" +#include "Support/STLExtras.h" #include <algorithm> #include <map> #include <set> diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 1bfdff9..2be1723 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -21,8 +21,8 @@ #include "llvm/iMemory.h" #include "llvm/iTerminators.h" #include "llvm/SymbolTable.h" -#include "llvm/Support/STLExtras.h" -#include "llvm/Support/StringExtras.h" +#include "Support/StringExtras.h" +#include "Support/STLExtras.h" #include <algorithm> #include <map> diff --git a/lib/VMCore/ConstPoolVals.cpp b/lib/VMCore/ConstPoolVals.cpp index 3b8fe10..dd30171 100644 --- a/lib/VMCore/ConstPoolVals.cpp +++ b/lib/VMCore/ConstPoolVals.cpp @@ -6,12 +6,12 @@ #define __STDC_LIMIT_MACROS // Get defs for INT64_MAX and friends... #include "llvm/ConstPoolVals.h" -#include "llvm/Support/StringExtras.h" // itostr #include "llvm/DerivedTypes.h" #include "llvm/SymbolTable.h" #include "llvm/GlobalValue.h" #include "llvm/Module.h" #include "llvm/Analysis/SlotCalculator.h" +#include "Support/StringExtras.h" #include <algorithm> #include <assert.h> diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index 2bc3edb..2ed02db 100644 --- a/lib/VMCore/Dominators.cpp +++ b/lib/VMCore/Dominators.cpp @@ -6,9 +6,9 @@ #include "llvm/Analysis/Dominators.h" #include "llvm/Analysis/SimplifyCFG.h" // To get cfg::UnifyAllExitNodes -#include "llvm/Support/DepthFirstIterator.h" -#include "llvm/Support/STLExtras.h" #include "llvm/Method.h" +#include "Support/DepthFirstIterator.h" +#include "Support/STLExtras.h" #include <algorithm> //===----------------------------------------------------------------------===// diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index bb5e5b5..86b944d 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -10,9 +10,9 @@ #include "llvm/BasicBlock.h" #include "llvm/InstrTypes.h" #include "llvm/ValueHolderImpl.h" -#include "llvm/Support/STLExtras.h" #include "llvm/Type.h" #include "llvm/ConstPoolVals.h" +#include "Support/STLExtras.h" #include <map> // Instantiate Templates - This ugliness is the price we have to pay diff --git a/lib/VMCore/SlotCalculator.cpp b/lib/VMCore/SlotCalculator.cpp index 3211e72..6fed526 100644 --- a/lib/VMCore/SlotCalculator.cpp +++ b/lib/VMCore/SlotCalculator.cpp @@ -19,8 +19,8 @@ #include "llvm/iOther.h" #include "llvm/DerivedTypes.h" #include "llvm/SymbolTable.h" -#include "llvm/Support/STLExtras.h" -#include "llvm/Support/DepthFirstIterator.h" +#include "Support/DepthFirstIterator.h" +#include "Support/STLExtras.h" #include <algorithm> #if 0 diff --git a/lib/VMCore/SymbolTable.cpp b/lib/VMCore/SymbolTable.cpp index b8da428..c32cec9 100644 --- a/lib/VMCore/SymbolTable.cpp +++ b/lib/VMCore/SymbolTable.cpp @@ -6,10 +6,10 @@ #include "llvm/SymbolTable.h" #include "llvm/InstrTypes.h" -#include "llvm/Support/StringExtras.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/Method.h" +#include "Support/StringExtras.h" #define DEBUG_SYMBOL_TABLE 0 #define DEBUG_ABSTYPE 0 diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index 53844d6..5f39682 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -5,9 +5,9 @@ //===----------------------------------------------------------------------===// #include "llvm/DerivedTypes.h" -#include "llvm/Support/StringExtras.h" #include "llvm/SymbolTable.h" -#include "llvm/Support/STLExtras.h" +#include "Support/StringExtras.h" +#include "Support/STLExtras.h" // DEBUG_MERGE_TYPES - Enable this #define to see how and when derived types are // created and later destroyed, all in an effort to make sure that there is only |