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 a323610427..47dbde7148 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 d47e1d7f6a..852763755a 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 4bff950a82..8616cb721c 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 32201beb6a..e981a86642 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 7518606c89..ed96bd4f57 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 a240ec8b8b..40a195b042 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 d543216349..dc6ee710c4 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 2bc3edbc2a..2ed02dbed2 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 0f25f5461d..76052fa541 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 aca9878da3..0f5c11e1ea 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 3211e728ff..6fed526bd6 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 0ba218da1c..528e5abdd3 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 9d3651a256..9e9af5b80d 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 44d59a1aa5..a4567a5198 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 31d9f6c592..acbe552d05 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 f928683060..c6d53674ac 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 f27ad710e0..ce26a1d073 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 5fa51c034f..02b3331132 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 538e39ad0c..2f0ee41c52 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 bc337ee8b5..f6938169da 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 0ba218da1c..528e5abdd3 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 9d3651a256..9e9af5b80d 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 44d59a1aa5..a4567a5198 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 31d9f6c592..acbe552d05 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 f928683060..c6d53674ac 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 f27ad710e0..ce26a1d073 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 32201beb6a..e981a86642 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 5fa51c034f..02b3331132 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 618fb6dc30..3edeb96203 100644 --- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp +++ b/ |