From cee8f9ae67104576b2028125b56e9ba4856a1d66 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 27 Nov 2001 00:03:19 +0000 Subject: [PATCH] Create a new #include "Support/..." directory structure to move things from "llvm/Support/..." that are not llvm dependant. Move files and fix #includes git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1400 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/CommandLine.html | 4 +- include/Support/CommandLine.h | 399 ++++++++++++++++++ .../{llvm => }/Support/DepthFirstIterator.h | 4 +- include/{llvm => }/Support/GraphTraits.h | 2 +- include/{llvm => }/Support/HashExtras.h | 0 include/Support/MathExtras.h | 32 ++ include/{llvm => }/Support/NonCopyable.h | 0 .../{llvm => }/Support/PostOrderIterator.h | 4 +- include/{llvm => }/Support/STLExtras.h | 0 include/{llvm => }/Support/StringExtras.h | 27 +- include/{llvm => }/Support/Tree.h | 2 +- include/llvm/ADT/DepthFirstIterator.h | 147 +++++++ include/llvm/ADT/GraphTraits.h | 65 +++ include/llvm/ADT/HashExtras.h | 27 ++ include/llvm/ADT/PostOrderIterator.h | 145 +++++++ include/llvm/ADT/STLExtras.h | 222 ++++++++++ include/llvm/ADT/StringExtras.h | 69 +++ include/llvm/ADT/Tree.h | 52 +++ include/llvm/Analysis/CallGraph.h | 2 +- include/llvm/Analysis/InstForest.h | 2 +- include/llvm/BasicBlock.h | 2 +- include/llvm/CodeGen/InstrForest.h | 4 +- include/llvm/CodeGen/InstrScheduling.h | 2 +- include/llvm/CodeGen/MachineInstr.h | 6 +- include/llvm/CodeGen/RegAllocCommon.h | 2 +- include/llvm/Support/CommandLine.h | 399 ++++++++++++++++++ include/llvm/Support/MathExtras.h | 32 ++ include/llvm/Target/TargetFrameInfo.h | 2 +- include/llvm/Target/TargetMachine.h | 2 +- include/llvm/Target/TargetRegInfo.h | 2 +- include/llvm/Type.h | 2 +- lib/Analysis/IPA/CallGraph.cpp | 2 +- lib/Analysis/IPA/FindUnsafePointerTypes.cpp | 2 +- lib/Analysis/IntervalPartition.cpp | 2 +- lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp | 2 +- lib/Analysis/LoopDepth.cpp | 2 +- lib/Analysis/LoopInfo.cpp | 2 +- lib/Analysis/ModuleAnalyzer.cpp | 2 +- lib/Analysis/PostDominators.cpp | 4 +- lib/AsmParser/ParserInternals.h | 2 +- lib/AsmParser/llvmAsmParser.y | 4 +- lib/Bytecode/Writer/SlotCalculator.cpp | 4 +- lib/CodeGen/InstrSched/InstrScheduling.cpp | 8 +- lib/CodeGen/InstrSched/SchedGraph.cpp | 30 +- lib/CodeGen/InstrSched/SchedGraph.h | 6 +- lib/CodeGen/InstrSched/SchedPriorities.cpp | 2 +- lib/CodeGen/InstrSelection/InstrForest.cpp | 2 +- lib/CodeGen/InstrSelection/InstrSelection.cpp | 2 +- lib/CodeGen/RegAlloc/RegAllocCommon.h | 2 +- lib/ExecutionEngine/Interpreter/Execution.cpp | 2 +- lib/Support/CommandLine.cpp | 4 +- .../SparcV9/InstrSched/InstrScheduling.cpp | 8 +- lib/Target/SparcV9/InstrSched/SchedGraph.cpp | 30 +- lib/Target/SparcV9/InstrSched/SchedGraph.h | 6 +- .../SparcV9/InstrSched/SchedPriorities.cpp | 2 +- .../SparcV9/InstrSelection/InstrForest.cpp | 2 +- .../SparcV9/InstrSelection/InstrSelection.cpp | 2 +- .../SparcV9/LiveVar/FunctionLiveVarInfo.cpp | 2 +- lib/Target/SparcV9/RegAlloc/RegAllocCommon.h | 2 +- lib/Target/SparcV9/SparcV9AsmPrinter.cpp | 67 ++- lib/Target/SparcV9/SparcV9InstrSelection.cpp | 4 +- lib/Transforms/ExprTypeConvert.cpp | 2 +- lib/Transforms/IPO/GlobalDCE.cpp | 2 +- .../Instrumentation/TraceValues.cpp | 4 +- lib/Transforms/LevelRaise.cpp | 2 +- lib/Transforms/Scalar/ADCE.cpp | 4 +- lib/Transforms/Scalar/DCE.cpp | 2 +- lib/Transforms/Scalar/InductionVars.cpp | 2 +- lib/Transforms/Scalar/SCCP.cpp | 2 +- lib/VMCore/AsmWriter.cpp | 4 +- lib/VMCore/ConstPoolVals.cpp | 2 +- lib/VMCore/Dominators.cpp | 4 +- lib/VMCore/Module.cpp | 2 +- lib/VMCore/SlotCalculator.cpp | 4 +- lib/VMCore/SymbolTable.cpp | 2 +- lib/VMCore/Type.cpp | 4 +- support/lib/Support/CommandLine.cpp | 4 +- support/lib/Support/StringExtras.cpp | 66 --- tools/analyze/analyze.cpp | 3 +- tools/as/as.cpp | 7 +- tools/dis/dis.cpp | 9 +- tools/gccas/gccas.cpp | 2 +- tools/link/link.cpp | 4 +- tools/llc/llc.cpp | 2 +- tools/lli/lli.cpp | 2 +- tools/llvm-as/as.cpp | 7 +- tools/llvm-as/llvm-as.cpp | 7 +- tools/llvm-dis/dis.cpp | 9 +- tools/llvm-dis/llvm-dis.cpp | 9 +- tools/llvm-link/llvm-link.cpp | 4 +- tools/opt/opt.cpp | 2 +- 91 files changed, 1792 insertions(+), 258 deletions(-) create mode 100644 include/Support/CommandLine.h rename include/{llvm => }/Support/DepthFirstIterator.h (97%) rename include/{llvm => }/Support/GraphTraits.h (97%) rename include/{llvm => }/Support/HashExtras.h (100%) create mode 100644 include/Support/MathExtras.h rename include/{llvm => }/Support/NonCopyable.h (100%) rename include/{llvm => }/Support/PostOrderIterator.h (97%) rename include/{llvm => }/Support/STLExtras.h (100%) rename include/{llvm => }/Support/StringExtras.h (68%) rename include/{llvm => }/Support/Tree.h (96%) create mode 100644 include/llvm/ADT/DepthFirstIterator.h create mode 100644 include/llvm/ADT/GraphTraits.h create mode 100644 include/llvm/ADT/HashExtras.h create mode 100644 include/llvm/ADT/PostOrderIterator.h create mode 100644 include/llvm/ADT/STLExtras.h create mode 100644 include/llvm/ADT/StringExtras.h create mode 100644 include/llvm/ADT/Tree.h create mode 100644 include/llvm/Support/CommandLine.h create mode 100644 include/llvm/Support/MathExtras.h delete mode 100644 support/lib/Support/StringExtras.cpp diff --git a/docs/CommandLine.html b/docs/CommandLine.html index 1660639dcb1..f12525b263e 100644 --- a/docs/CommandLine.html +++ b/docs/CommandLine.html @@ -64,7 +64,7 @@ This section of the manual runs through a simple CommandLine'ification of a util To start out, you need to include the CommandLine header file into your program:

-  #include "llvm/Support/CommandLine.h"
+  #include "Support/CommandLine.h"

Additionally, you need to add this as the first line of your main program:

@@ -353,7 +353,7 @@ Extension Guide: TODO

Chris Lattner
-Last modified: Mon Jul 23 17:33:57 CDT 2001 +Last modified: Mon Nov 26 17:09:39 CST 2001 diff --git a/include/Support/CommandLine.h b/include/Support/CommandLine.h new file mode 100644 index 00000000000..84a3bc9b59d --- /dev/null +++ b/include/Support/CommandLine.h @@ -0,0 +1,399 @@ +//===- Support/CommandLine.h - Flexible Command line parser ------*- C++ -*--=// +// +// This class implements a command line argument processor that is useful when +// creating a tool. It provides a simple, minimalistic interface that is easily +// extensible and supports nonlocal (library) command line options. +// +// Note that rather than trying to figure out what this code does, you could try +// reading the library documentation located in docs/CommandLine.html +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_COMMANDLINE_H +#define LLVM_SUPPORT_COMMANDLINE_H + +#include +#include +#include +#include + +namespace cl { // Short namespace to make usage concise + +//===----------------------------------------------------------------------===// +// ParseCommandLineOptions - Minimalistic command line option processing entry +// +void cl::ParseCommandLineOptions(int &argc, char **argv, + const char *Overview = 0, + int Flags = 0); + +// ParserOptions - This set of option is use to control global behavior of the +// command line processor. +// +enum ParserOptions { + // DisableSingleLetterArgGrouping - With this option enabled, multiple letter + // options are allowed to bunch together with only a single hyphen for the + // whole group. This allows emulation of the behavior that ls uses for + // example: ls -la === ls -l -a Providing this option, disables this. + // + DisableSingleLetterArgGrouping = 0x0001, + + // EnableSingleLetterArgValue - This option allows arguments that are + // otherwise unrecognized to match single letter flags that take a value. + // This is useful for cases like a linker, where options are typically of the + // form '-lfoo' or '-L../../include' where -l or -L are the actual flags. + // + EnableSingleLetterArgValue = 0x0002, +}; + + +//===----------------------------------------------------------------------===// +// Global flags permitted to be passed to command line arguments + +enum FlagsOptions { + NoFlags = 0x00, // Marker to make explicit that we have no flags + Default = 0x00, // Equally, marker to use the default flags + + GlobalsMask = 0x80, +}; + +enum NumOccurances { // Flags for the number of occurances allowed... + Optional = 0x01, // Zero or One occurance + ZeroOrMore = 0x02, // Zero or more occurances allowed + Required = 0x03, // One occurance required + OneOrMore = 0x04, // One or more occurances required + + // ConsumeAfter - Marker for a null ("") flag that can be used to indicate + // that anything that matches the null marker starts a sequence of options + // that all get sent to the null marker. Thus, for example, all arguments + // to LLI are processed until a filename is found. Once a filename is found, + // all of the succeeding arguments are passed, unprocessed, to the null flag. + // + ConsumeAfter = 0x05, + + OccurancesMask = 0x07, +}; + +enum ValueExpected { // Is a value required for the option? + ValueOptional = 0x08, // The value can oppear... or not + ValueRequired = 0x10, // The value is required to appear! + ValueDisallowed = 0x18, // A value may not be specified (for flags) + ValueMask = 0x18, +}; + +enum OptionHidden { // Control whether -help shows this option + NotHidden = 0x20, // Option included in --help & --help-hidden + Hidden = 0x40, // -help doesn't, but --help-hidden does + ReallyHidden = 0x60, // Neither --help nor --help-hidden show this arg + HiddenMask = 0x60, +}; + + +//===----------------------------------------------------------------------===// +// Option Base class +// +class Alias; +class Option { + friend void cl::ParseCommandLineOptions(int &, char **, const char *, int); + friend class Alias; + + // handleOccurances - Overriden by subclasses to handle the value passed into + // an argument. Should return true if there was an error processing the + // argument and the program should exit. + // + virtual bool handleOccurance(const char *ArgName, const string &Arg) = 0; + + virtual enum NumOccurances getNumOccurancesFlagDefault() const { + return Optional; + } + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueOptional; + } + virtual enum OptionHidden getOptionHiddenFlagDefault() const { + return NotHidden; + } + + int NumOccurances; // The number of times specified + const int Flags; // Flags for the argument +public: + const char * const ArgStr; // The argument string itself (ex: "help", "o") + const char * const HelpStr; // The descriptive text message for --help + + inline enum NumOccurances getNumOccurancesFlag() const { + int NO = Flags & OccurancesMask; + return NO ? (enum NumOccurances)NO : getNumOccurancesFlagDefault(); + } + inline enum ValueExpected getValueExpectedFlag() const { + int VE = Flags & ValueMask; + return VE ? (enum ValueExpected)VE : getValueExpectedFlagDefault(); + } + inline enum OptionHidden getOptionHiddenFlag() const { + int OH = Flags & HiddenMask; + return OH ? (enum OptionHidden)OH : getOptionHiddenFlagDefault(); + } + +protected: + Option(const char *ArgStr, const char *Message, int Flags); + Option(int flags) : NumOccurances(0), Flags(flags), ArgStr(""), HelpStr("") {} + +public: + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; + + // addOccurance - Wrapper around handleOccurance that enforces Flags + // + bool addOccurance(const char *ArgName, const string &Value); + + // Prints option name followed by message. Always returns true. + bool error(string Message, const char *ArgName = 0); + +public: + inline int getNumOccurances() const { return NumOccurances; } + virtual ~Option() {} +}; + + +//===----------------------------------------------------------------------===// +// Aliased command line option (alias this name to a preexisting name) +// +class Alias : public Option { + Option &AliasFor; + virtual bool handleOccurance(const char *ArgName, const string &Arg) { + return AliasFor.handleOccurance(AliasFor.ArgStr, Arg); + } + virtual enum OptionHidden getOptionHiddenFlagDefault() const {return Hidden;} +public: + inline Alias(const char *ArgStr, const char *Message, int Flags, + Option &aliasFor) : Option(ArgStr, Message, Flags), + AliasFor(aliasFor) {} +}; + +//===----------------------------------------------------------------------===// +// Boolean/flag command line option +// +class Flag : public Option { + bool Value; + virtual bool handleOccurance(const char *ArgName, const string &Arg); +public: + inline Flag(const char *ArgStr, const char *Message, int Flags = 0, + bool DefaultVal = 0) : Option(ArgStr, Message, Flags), + Value(DefaultVal) {} + operator const bool() const { return Value; } + inline bool operator=(bool Val) { Value = Val; return Val; } +}; + + + +//===----------------------------------------------------------------------===// +// Integer valued command line option +// +class Int : public Option { + int Value; + virtual bool handleOccurance(const char *ArgName, const string &Arg); + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } +public: + inline Int(const char *ArgStr, const char *Help, int Flags = 0, + int DefaultVal = 0) : Option(ArgStr, Help, Flags), + Value(DefaultVal) {} + inline operator int() const { return Value; } + inline int operator=(int Val) { Value = Val; return Val; } +}; + + +//===----------------------------------------------------------------------===// +// String valued command line option +// +class String : public Option, public string { + virtual bool handleOccurance(const char *ArgName, const string &Arg); + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } +public: + inline String(const char *ArgStr, const char *Help, int Flags = 0, + const char *DefaultVal = "") + : Option(ArgStr, Help, Flags), string(DefaultVal) {} + + inline const string &operator=(const string &Val) { + return string::operator=(Val); + } +}; + + +//===----------------------------------------------------------------------===// +// String list command line option +// +class StringList : public Option, public vector { + + virtual enum NumOccurances getNumOccurancesFlagDefault() const { + return ZeroOrMore; + } + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } + virtual bool handleOccurance(const char *ArgName, const string &Arg); + +public: + inline StringList(const char *ArgStr, const char *Help, int Flags = 0) + : Option(ArgStr, Help, Flags) {} +}; + + +//===----------------------------------------------------------------------===// +// Enum valued command line option +// +#define clEnumVal(ENUMVAL, DESC) #ENUMVAL, ENUMVAL, DESC +#define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, ENUMVAL, DESC + +// EnumBase - Base class for all enum/varargs related argument types... +class EnumBase : public Option { +protected: + // Use a vector instead of a map, because the lists should be short, + // the overhead is less, and most importantly, it keeps them in the order + // inserted so we can print our option out nicely. + vector > > ValueMap; + + inline EnumBase(const char *ArgStr, const char *Help, int Flags) + : Option(ArgStr, Help, Flags) {} + inline EnumBase(int Flags) : Option(Flags) {} + + // processValues - Incorporate the specifed varargs arglist into the + // ValueMap. + // + void processValues(va_list Vals); + + // registerArgs - notify the system about these new arguments + void registerArgs(); + +public: + // Turn an enum into the arg name that activates it + const char *getArgName(int ID) const; + const char *getArgDescription(int ID) const; +}; + +class EnumValueBase : public EnumBase { +protected: + int Value; + inline EnumValueBase(const char *ArgStr, const char *Help, int Flags) + : EnumBase(ArgStr, Help, Flags) {} + inline EnumValueBase(int Flags) : EnumBase(Flags) {} + + // handleOccurance - Set Value to the enum value specified by Arg + virtual bool handleOccurance(const char *ArgName, const string &Arg); + + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; +}; + +template // The enum we are representing +class Enum : public EnumValueBase { + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } +public: + inline Enum(const char *ArgStr, int Flags, const char *Help, ...) + : EnumValueBase(ArgStr, Help, Flags) { + va_list Values; + va_start(Values, Help); + processValues(Values); + va_end(Values); + Value = ValueMap.front().second.first; // Grab default value + } + + inline operator E() const { return (E)Value; } + inline E operator=(E Val) { Value = Val; return Val; } +}; + + +//===----------------------------------------------------------------------===// +// Enum flags command line option +// +class EnumFlagsBase : public EnumValueBase { + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueDisallowed; + } +protected: + virtual bool handleOccurance(const char *ArgName, const string &Arg); + inline EnumFlagsBase(int Flags) : EnumValueBase(Flags) {} + + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; +}; + +template // The enum we are representing +class EnumFlags : public EnumFlagsBase { +public: + inline EnumFlags(int Flags, ...) : EnumFlagsBase(Flags) { + va_list Values; + va_start(Values, Flags); + processValues(Values); + va_end(Values); + registerArgs(); + Value = ValueMap.front().second.first; // Grab default value + } + + inline operator E() const { return (E)Value; } + inline E operator=(E Val) { Value = Val; return Val; } +}; + + +//===----------------------------------------------------------------------===// +// Enum list command line option +// +class EnumListBase : public EnumBase { + virtual enum NumOccurances getNumOccurancesFlagDefault() const { + return ZeroOrMore; + } + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueDisallowed; + } +protected: + vector Values; // The options specified so far. + + inline EnumListBase(int Flags) + : EnumBase(Flags) {} + virtual bool handleOccurance(const char *ArgName, const string &Arg); + + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; +public: + inline unsigned size() { return Values.size(); } +}; + +template // The enum we are representing +class EnumList : public EnumListBase { +public: + inline EnumList(int Flags, ...) : EnumListBase(Flags) { + va_list Values; + va_start(Values, Flags); + processValues(Values); + va_end(Values); + registerArgs(); + } + inline E operator[](unsigned i) const { return (E)Values[i]; } + inline E &operator[](unsigned i) { return (E&)Values[i]; } +}; + +} // End namespace cl + +#endif diff --git a/include/llvm/Support/DepthFirstIterator.h b/include/Support/DepthFirstIterator.h similarity index 97% rename from include/llvm/Support/DepthFirstIterator.h rename to include/Support/DepthFirstIterator.h index 73017067b32..a2d5a9df68c 100644 --- a/include/llvm/Support/DepthFirstIterator.h +++ b/include/Support/DepthFirstIterator.h @@ -1,4 +1,4 @@ -//===- llvm/Support/DepthFirstIterator.h - Depth First iterators -*- C++ -*--=// +//===- Support/DepthFirstIterator.h - Depth First iterator -------*- C++ -*--=// // // This file builds on the Support/GraphTraits.h file to build generic depth // first graph iterator. @@ -8,7 +8,7 @@ #ifndef LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H #define LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H -#include "llvm/Support/GraphTraits.h" +#include "Support/GraphTraits.h" #include #include #include diff --git a/include/llvm/Support/GraphTraits.h b/include/Support/GraphTraits.h similarity index 97% rename from include/llvm/Support/GraphTraits.h rename to include/Support/GraphTraits.h index 67fe7c9360f..00973d59fab 100644 --- a/include/llvm/Support/GraphTraits.h +++ b/include/Support/GraphTraits.h @@ -1,4 +1,4 @@ -//===-- llvm/Support/GraphTraits.h - Graph traits template -------*- C++ -*--=// +//===-- Support/GraphTraits.h - Graph traits template ------------*- C++ -*--=// // // This file defines the little GraphTraits template class that should be // specialized by classes that want to be iteratable by generic graph iterators. diff --git a/include/llvm/Support/HashExtras.h b/include/Support/HashExtras.h similarity index 100% rename from include/llvm/Support/HashExtras.h rename to include/Support/HashExtras.h diff --git a/include/Support/MathExtras.h b/include/Support/MathExtras.h new file mode 100644 index 00000000000..f3dc3de17bb --- /dev/null +++ b/include/Support/MathExtras.h @@ -0,0 +1,32 @@ +// $Id$ -*-c++-*- +//*************************************************************************** +// File: +// MathExtras.h +// +// Purpose: +// +// History: +// 8/25/01 - Vikram Adve - Created +//**************************************************************************/ + +#ifndef LLVM_SUPPORT_MATH_EXTRAS_H +#define LLVM_SUPPORT_MATH_EXTRAS_H + +#include + +inline bool IsPowerOf2 (int64_t C, unsigned& getPow); + +inline +bool IsPowerOf2(int64_t C, unsigned& getPow) +{ + if (C < 0) + C = -C; + bool isBool = C > 0 && (C == (C & ~(C - 1))); + if (isBool) + for (getPow = 0; C > 1; getPow++) + C = C >> 1; + + return isBool; +} + +#endif /*LLVM_SUPPORT_MATH_EXTRAS_H*/ diff --git a/include/llvm/Support/NonCopyable.h b/include/Support/NonCopyable.h similarity index 100% rename from include/llvm/Support/NonCopyable.h rename to include/Support/NonCopyable.h diff --git a/include/llvm/Support/PostOrderIterator.h b/include/Support/PostOrderIterator.h similarity index 97% rename from include/llvm/Support/PostOrderIterator.h rename to include/Support/PostOrderIterator.h index fa135f8785a..89a9b4db869 100644 --- a/include/llvm/Support/PostOrderIterator.h +++ b/include/Support/PostOrderIterator.h @@ -1,4 +1,4 @@ -//===-- llvm/Support/PostOrderIterator.h - Generic PO iterator ---*- C++ -*--=// +//===-- Support/PostOrderIterator.h - Generic PostOrder iterator -*- C++ -*--=// // // This file builds on the Support/GraphTraits.h file to build a generic graph // post order iterator. This should work over any graph type that has a @@ -9,7 +9,7 @@ #ifndef LLVM_SUPPORT_POSTORDER_ITERATOR_H #define LLVM_SUPPORT_POSTORDER_ITERATOR_H -#include "llvm/Support/GraphTraits.h" +#include "Support/GraphTraits.h" #include #include #include diff --git a/include/llvm/Support/STLExtras.h b/include/Support/STLExtras.h similarity index 100% rename from include/llvm/Support/STLExtras.h rename to include/Support/STLExtras.h diff --git a/include/llvm/Support/StringExtras.h b/include/Support/StringExtras.h similarity index 68% rename from include/llvm/Support/StringExtras.h rename to include/Support/StringExtras.h index aaae8577ef9..e67e25ced51 100644 --- a/include/llvm/Support/StringExtras.h +++ b/include/Support/StringExtras.h @@ -1,17 +1,15 @@ -//===-- StringExtras.h - Useful string functions -----------------*- C++ -*--=// +//===-- Support/StringExtras.h - Useful string functions ---------*- C++ -*--=// // // This file contains some functions that are useful when dealing with strings. // //===----------------------------------------------------------------------===// -#ifndef LLVM_TOOLS_STRING_EXTRAS_H -#define LLVM_TOOLS_STRING_EXTRAS_H +#ifndef SUPPORT_STRING_EXTRAS_H +#define SUPPORT_STRING_EXTRAS_H +#include "Support/DataTypes.h" #include #include -#include "Support/DataTypes.h" - -class ConstPoolArray; static inline string utostr(uint64_t X, bool isNeg = false) { char Buffer[40]; @@ -68,21 +66,4 @@ static inline string ftostr(double V) { return Buffer; } -static inline void -printIndent(unsigned int indent, ostream& os=cout, const char* const istr=" ") -{ - for (unsigned i=0; i < indent; i++) - os << istr; -} - -// Can we treat the specified array as a string? Only if it is an array of -// ubytes or non-negative sbytes. -// -bool isStringCompatible(ConstPoolArray *CPA); - -// getAsCString - Return the specified array as a C compatible string, only if -// the predicate isStringCompatible is true. -// -string getAsCString(ConstPoolArray *CPA); - #endif diff --git a/include/llvm/Support/Tree.h b/include/Support/Tree.h similarity index 96% rename from include/llvm/Support/Tree.h rename to include/Support/Tree.h index 679b6dfd836..33b0bb7b039 100644 --- a/include/llvm/Support/Tree.h +++ b/include/Support/Tree.h @@ -1,4 +1,4 @@ -//===- llvm/Support/Tree.h - Generic n-way tree structure --------*- C++ -*--=// +//===- Support/Tree.h - Generic n-way tree structure -------------*- C++ -*--=// // // This class defines a generic N way tree node structure. The tree structure // is immutable after creation, but the payload contained within it is not. diff --git a/include/llvm/ADT/DepthFirstIterator.h b/include/llvm/ADT/DepthFirstIterator.h new file mode 100644 index 00000000000..a2d5a9df68c --- /dev/null +++ b/include/llvm/ADT/DepthFirstIterator.h @@ -0,0 +1,147 @@ +//===- Support/DepthFirstIterator.h - Depth First iterator -------*- C++ -*--=// +// +// This file builds on the Support/GraphTraits.h file to build generic depth +// first graph iterator. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H +#define LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H + +#include "Support/GraphTraits.h" +#include +#include +#include + +// Generic Depth First Iterator +template > +class df_iterator : public std::forward_iterator { + typedef typename GT::NodeType NodeType; + typedef typename GT::ChildIteratorType ChildItTy; + + set Visited; // All of the blocks visited so far... + // VisitStack - Used to maintain the ordering. Top = current block + // First element is node pointer, second is the 'next child' to visit + stack > VisitStack; + const bool Reverse; // Iterate over children before self? +private: + void reverseEnterNode() { + pair &Top = VisitStack.top(); + NodeType *Node = Top.first; + ChildItTy &It = Top.second; + for (; It != GT::child_end(Node); ++It) { + NodeType *Child = *It; + if (!Visited.count(Child)) { + Visited.insert(Child); + VisitStack.push(make_pair(Child, GT::child_begin(Child))); + reverseEnterNode(); + return; + } + } + } + + inline df_iterator(NodeType *Node, bool reverse) : Reverse(reverse) { + Visited.insert(Node); + VisitStack.push(make_pair(Node, GT::child_begin(Node))); + if (Reverse) reverseEnterNode(); + } + inline df_iterator() { /* End is when stack is empty */ } + +public: + typedef df_iterator _Self; + + // Provide static begin and end methods as our public "constructors" + static inline _Self begin(GraphT G, bool Reverse = false) { + return _Self(GT::getEntryNode(G), Reverse); + } + static inline _Self end(GraphT G) { return _Self(); } + + + inline bool operator==(const _Self& x) const { + return VisitStack == x.VisitStack; + } + inline bool operator!=(const _Self& x) const { return !operator==(x); } + + inline pointer operator*() const { + return VisitStack.top().first; + } + + // This is a nonstandard operator-> that dereferences the pointer an extra + // time... so that you can actually call methods ON the Node, because + // the contained type is a pointer. This allows BBIt->getTerminator() f.e. + // + inline NodeType *operator->() const { return operator*(); } + + inline _Self& operator++() { // Preincrement + if (Reverse) { // Reverse Depth First Iterator + if (VisitStack.top().second == GT::child_end(VisitStack.top().first)) + VisitStack.pop(); + if (!VisitStack.empty()) + reverseEnterNode(); + } else { // Normal Depth First Iterator + do { + pair &Top = VisitStack.top(); + NodeType *Node = Top.first; + ChildItTy &It = Top.second; + + while (It != GT::child_end(Node)) { + NodeType *Next = *It++; + if (!Visited.count(Next)) { // Has our next sibling been visited? + // No, do it now. + Visited.insert(Next); + VisitStack.push(make_pair(Next, GT::child_begin(Next))); + return *this; + } + } + + // Oops, ran out of successors... go up a level on the stack. + VisitStack.pop(); + } while (!VisitStack.empty()); + } + return *this; + } + + inline _Self operator++(int) { // Postincrement + _Self tmp = *this; ++*this; return tmp; + } + + // nodeVisited - return true if this iterator has already visited the + // specified node. This is public, and will probably be used to iterate over + // nodes that a depth first iteration did not find: ie unreachable nodes. + // + inline bool nodeVisited(NodeType *Node) const { + return Visited.count(Node) != 0; + } +}; + + +// Provide global constructors that automatically figure out correct types... +// +template +df_iterator df_begin(T G, bool Reverse = false) { + return df_iterator::begin(G, Reverse); +} + +template +df_iterator df_end(T G) { + return df_iterator::end(G); +} + +// Provide global definitions of inverse depth first iterators... +template +struct idf_iterator : public df_iterator > { + idf_iterator(const df_iterator > &V) :df_iterator >(V){} +}; + +template +idf_iterator idf_begin(T G, bool Reverse = false) { + return idf_iterator::begin(G, Reverse); +} + +template +idf_iterator idf_end(T G){ + return idf_iterator::end(G); +} + +#endif diff --git a/include/llvm/ADT/GraphTraits.h b/include/llvm/ADT/GraphTraits.h new file mode 100644 index 00000000000..00973d59fab --- /dev/null +++ b/include/llvm/ADT/GraphTraits.h @@ -0,0 +1,65 @@ +//===-- Support/GraphTraits.h - Graph traits template ------------*- C++ -*--=// +// +// This file defines the little GraphTraits template class that should be +// specialized by classes that want to be iteratable by generic graph iterators. +// +// This file also defines the marker class Inverse that is used to iterate over +// graphs in a graph defined, inverse ordering... +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_GRAPH_TRAITS_H +#define LLVM_SUPPORT_GRAPH_TRAITS_H + +// GraphTraits - This class should be specialized by different graph types... +// which is why the default version is empty. +// +template +struct GraphTraits { + // Elements to provide: + + // typedef NodeType - Type of Node in the graph + // typedef ChildIteratorType - Type used to iterate over children in graph + + // static NodeType *getEntryNode(GraphType *) + // Return the entry node of the graph + + // static ChildIteratorType child_begin(NodeType *) + // static ChildIteratorType child_end (NodeType *) + // Return iterators that point to the beginning and ending of the child + // node list for the specified node. + // + + + // If anyone tries to use this class without having an appropriate + // specialization, make an error. If you get this error, it's because you + // need to include the appropriate specialization of GraphTraits<> for your + // graph, or you need to define it for a new graph type. Either that or + // your argument to XXX_begin(...) is unknown or needs to have the proper .h + // file #include'd. + // + typedef typename GraphType::UnknownGraphTypeError NodeType; +}; + + +// Inverse - This class is used as a little marker class to tell the graph +// iterator to iterate over the graph in a graph defined "Inverse" ordering. +// Not all graphs define an inverse ordering, and if they do, it depends on +// the graph exactly what that is. Here's an example of usage with the +// df_iterator: +// +// idf_iterator I = idf_begin(M), E = idf_end(M); +// for (; I != E; ++I) { ... } +// +// Which is equivalent to: +// df_iterator > I = idf_begin(M), E = idf_end(M); +// for (; I != E; ++I) { ... } +// +template +struct Inverse { + GraphType &Graph; + + inline Inverse(GraphType &G) : Graph(G) {} +}; + +#endif diff --git a/include/llvm/ADT/HashExtras.h b/include/llvm/ADT/HashExtras.h new file mode 100644 index 00000000000..6ea831e78f0 --- /dev/null +++ b/include/llvm/ADT/HashExtras.h @@ -0,0 +1,27 @@ +//===-- HashExtras.h - Useful functions for STL hash containers --*- C++ -*--=// +// +// This file contains some templates that are useful if you are working with the +// STL Hashed containers. +// +// No library is required when using these functinons. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_HASHEXTRAS_H +#define LLVM_SUPPORT_HASHEXTRAS_H + +#include +#include + +template <> struct hash { + size_t operator()(string const &str) const { + return hash()(str.c_str()); + } +}; + +// Provide a hash function for arbitrary pointers... +template struct hash { + inline size_t operator()(const T *Val) const { return (size_t)Val; } +}; + +#endif diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h new file mode 100644 index 00000000000..89a9b4db869 --- /dev/null +++ b/include/llvm/ADT/PostOrderIterator.h @@ -0,0 +1,145 @@ +//===-- Support/PostOrderIterator.h - Generic PostOrder iterator -*- C++ -*--=// +// +// This file builds on the Support/GraphTraits.h file to build a generic graph +// post order iterator. This should work over any graph type that has a +// GraphTraits specialization. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_POSTORDER_ITERATOR_H +#define LLVM_SUPPORT_POSTORDER_ITERATOR_H + +#include "Support/GraphTraits.h" +#include +#include +#include + +template > +class po_iterator : public std::forward_iterator { + typedef typename GT::NodeType NodeType; + typedef typename GT::ChildIteratorType ChildItTy; + + set Visited; // All of the blocks visited so far... + // VisitStack - Used to maintain the ordering. Top = current block + // First element is basic block pointer, second is the 'next child' to visit + stack > VisitStack; + + void traverseChild() { + while (VisitStack.top().second != GT::child_end(VisitStack.top().first)) { + NodeType *BB = *VisitStack.top().second++; + if (!Visited.count(BB)) { // If the block is not visited... + Visited.insert(BB); + VisitStack.push(make_pair(BB, GT::child_begin(BB))); + } + } + } + + inline po_iterator(NodeType *BB) { + Visited.insert(BB); + VisitStack.push(make_pair(BB, GT::child_begin(BB))); + traverseChild(); + } + inline po_iterator() { /* End is when stack is empty */ } +public: + typedef po_iterator _Self; + + // Provide static "constructors"... + static inline _Self begin(GraphT G) { return _Self(GT::getEntryNode(G)); } + static inline _Self end (GraphT G) { return _Self(); } + + inline bool operator==(const _Self& x) const { + return VisitStack == x.VisitStack; + } + inline bool operator!=(const _Self& x) const { return !operator==(x); } + + inline pointer operator*() const { + return VisitStack.top().first; + } + + // This is a nonstandard operator-> that dereferences the pointer an extra + // time... so that you can actually call methods ON the BasicBlock, because + // the contained type is a pointer. This allows BBIt->getTerminator() f.e. + // + inline NodeType *operator->() const { return operator*(); } + + inline _Self& operator++() { // Preincrement + VisitStack.pop(); + if (!VisitStack.empty()) + traverseChild(); + return *this; + } + + inline _Self operator++(int) { // Postincrement + _Self tmp = *this; ++*this; return tmp; + } +}; + +// Provide global constructors that automatically figure out correct types... +// +template +po_iterator po_begin(T G) { return po_iterator::begin(G); } +template +po_iterator po_end (T G) { return po_iterator::end(G); } + +// Provide global definitions of inverse post order iterators... +template +struct ipo_iterator : public po_iterator > { + ipo_iterator(const po_iterator > &V) :po_iterator >(V){} +}; + +template +ipo_iterator ipo_begin(T G, bool Reverse = false) { + return ipo_iterator::begin(G, Reverse); +} + +template +ipo_iterator ipo_end(T G){ + return ipo_iterator::end(G); +} + + +//===--------------------------------------------------------------------===// +// Reverse Post Order CFG iterator code +//===--------------------------------------------------------------------===// +// +// This is used to visit basic blocks in a method in reverse post order. This +// class is awkward to use because I don't know a good incremental algorithm to +// computer RPO from a graph. Because of this, the construction of the +// ReversePostOrderTraversal object is expensive (it must walk the entire graph +// with a postorder iterator to build the data structures). The moral of this +// story is: Don't create more ReversePostOrderTraversal classes than neccesary. +// +// This class should be used like this: +// { +// cfg::ReversePostOrderTraversal RPOT(MethodPtr); // Expensive to create +// for (cfg::rpo_iterator I = RPOT.begin(); I != RPOT.end(); ++I) { +// ... +// } +// for (cfg::rpo_iterator I = RPOT.begin(); I != RPOT.end(); ++I) { +// ... +// } +// } +// + +typedef reverse_iterator::iterator> rpo_iterator; +// TODO: FIXME: ReversePostOrderTraversal is not generic! +class ReversePostOrderTraversal { + vector Blocks; // Block list in normal PO order + inline void Initialize(BasicBlock *BB) { + copy(po_begin(BB), po_end(BB), back_inserter(Blocks)); + } +public: + inline ReversePostOrderTraversal(Method *M) { + Initialize(M->front()); + } + inline ReversePostOrderTraversal(BasicBlock *BB) { + Initialize(BB); + } + + // Because we want a reverse post order, use reverse iterators from the vector + inline rpo_iterator begin() { return Blocks.rbegin(); } + inline rpo_iterator end() { return Blocks.rend(); } +}; + +#endif diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h new file mode 100644 index 00000000000..44d789dcf22 --- /dev/null +++ b/include/llvm/ADT/STLExtras.h @@ -0,0 +1,222 @@ +//===-- STLExtras.h - Useful functions when working with the STL -*- C++ -*--=// +// +// This file contains some templates that are useful if you are working with the +// STL at all. +// +// No library is required when using these functinons. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_STL_EXTRAS_H +#define LLVM_SUPPORT_STL_EXTRAS_H + +#include + +//===----------------------------------------------------------------------===// +// Extra additions to +//===----------------------------------------------------------------------===// + +// bind_obj - Often times you want to apply the member function of an object +// as a unary functor. This macro is shorthand that makes it happen less +// verbosely. +// +// Example: +// struct Summer { void accumulate(int x); } +// vector Numbers; +// Summer MyS; +// for_each(Numbers.begin(), Numbers.end(), +// bind_obj(&MyS, &Summer::accumulate)); +// +// TODO: When I get lots of extra time, convert this from an evil macro +// +#define bind_obj(OBJ, METHOD) std::bind1st(std::mem_fun(METHOD), OBJ) + + +// bitwise_or - This is a simple functor that applys operator| on its two +// arguments to get a boolean result. +// +template +struct bitwise_or : public binary_function { + bool operator()(const Ty& left, const Ty& right) const { + return left | right; + } +}; + + +// deleter - Very very very simple method that is used to invoke operator +// delete on something. It is used like this: +// +// for_each(V.begin(), B.end(), deleter); +// +template +static inline void deleter(T *Ptr) { + delete Ptr; +} + + + +//===----------------------------------------------------------------------===// +// Extra additions to +//===----------------------------------------------------------------------===// + +// mapped_iterator - This is a simple iterator adapter that causes a function to +// be dereferenced whenever operator* is invoked on the iterator. +// +// It turns out that this is disturbingly similar to boost::transform_iterator +// +#if 1 +template +class mapped_iterator { + RootIt current; + UnaryFunc Fn; +public: + typedef typename iterator_traits::iterator_category + iterator_category; + typedef typename iterator_traits::difference_type + difference_type; + typedef typename UnaryFunc::result_type value_type; + typedef typename UnaryFunc::result_type *pointer; + typedef void reference; // Can't modify value returned by fn + + typedef RootIt iterator_type; + typedef mapped_iterator _Self; + + inline RootIt &getCurrent() const { return current; } + + inline explicit mapped_iterator(const RootIt &I, UnaryFunc F) + : current(I), Fn(F) {} + inline mapped_iterator(const mapped_iterator &It) + : current(It.current), Fn(It.Fn) {} + + inline value_type operator*() const { // All this work to do this + return Fn(*current); // little change + } + + _Self& operator++() { ++current; return *this; } + _Self& operator--() { --current; return *this; } + _Self operator++(int) { _Self __tmp = *this; ++current; return __tmp; } + _Self operator--(int) { _Self __tmp = *this; --current; return __tmp; } + _Self operator+ (difference_type n) const { return _Self(current + n); } + _Self& operator+= (difference_type n) { current += n; return *this; } + _Self operator- (difference_type n) const { return _Self(current - n); } + _Self& operator-= (difference_type n) { current -= n; return *this; } + reference operator[](difference_type n) const { return *(*this + n); } + + inline bool operator==(const _Self &X) const { return current == X.current; } + inline bool operator< (const _Self &X) const { return current < X.current; } + + inline difference_type operator-(const _Self &X) const { + return current - X.current; + } +}; + +template +inline mapped_iterator<_Iterator, Func> +operator+(typename mapped_iterator<_Iterator, Func>::difference_type N, + const mapped_iterator<_Iterator, Func>& X) { + return mapped_iterator<_Iterator, Func>(X.getCurrent() - N); +} + +#else + +// This fails to work, because some iterators are not classes, for example +// vector iterators are commonly value_type **'s +template +class mapped_iterator : public RootIt { + UnaryFunc Fn; +public: + typedef typename UnaryFunc::result_type value_type; + typedef typename UnaryFunc::result_type *pointer; + typedef void reference; // Can't modify value returned by fn + + typedef mapped_iterator _Self; + typedef RootIt super; + inline explicit mapped_iterator(const RootIt &I) : super(I) {} + inline mapped_iterator(const super &It) : super(It) {} + + inline value_type operator*() const { // All this work to do + return Fn(super::operator*()); // this little thing + } +}; +#endif + +// map_iterator - Provide a convenient way to create mapped_iterators, just like +// make_pair is useful for creating pairs... +// +template +inline mapped_iterator map_iterator(const ItTy &I, FuncTy F) { + return mapped_iterator(I, F); +} + + +//===----------------------------------------------------------------------===// +// Extra additions to +//===----------------------------------------------------------------------===// + +// apply_until - Apply a functor to a sequence continually, unless the +// functor returns true. Return true if the functor returned true, return false +// if the functor never returned true. +// +template +bool apply_until(InputIt First, InputIt Last, Function Func) { + for ( ; First != Last; ++First) + if (Func(*First)) return true; + return false; +} + + +// reduce - Reduce a sequence values into a single value, given an initial +// value and an operator. +// +template +ValueType reduce(InputIt First, InputIt Last, Function Func, ValueType Value) { + for ( ; First != Last; ++First) + Value = Func(*First, Value); + return Value; +} + +#if 1 // This is likely to be more efficient + +// reduce_apply - Reduce the result of applying a function to each value in a +// sequence, given an initial value, an operator, a function, and a sequence. +// +template +inline ValueType reduce_apply(InputIt First, InputIt Last, Function Func, + ValueType Value, TransFunc XForm) { + for ( ; First != Last; ++First) + Value = Func(XForm(*First), Value); + return Value; +} + +#else // This is arguably more elegant + +// reduce_apply - Reduce the result of applying a function to each value in a +// sequence, given an initial value, an operator, a function, and a sequence. +// +template +inline ValueType reduce_apply2(InputIt First, InputIt Last, Function Func, + ValueType Value, TransFunc XForm) { + return reduce(map_iterator(First, XForm), map_iterator(Last, XForm), + Func, Value); +} +#endif + + +// reduce_apply_bool - Reduce the result of applying a (bool returning) function +// to each value in a sequence. All of the bools returned by the mapped +// function are bitwise or'd together, and the result is returned. +// +template +inline bool reduce_apply_bool(InputIt First, InputIt Last, Function Func) { + return reduce_apply(First, Last, bitwise_or(), false, Func); +} + + +// map - This function maps the specified input sequence into the specified +// output iterator, applying a unary function in between. +// +template +inline OutIt mapto(InIt Begin, InIt End, OutIt Dest, Functor F) { + return copy(map_iterator(Begin, F), map_iterator(End, F), Dest); +} +#endif diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h new file mode 100644 index 00000000000..e67e25ced51 --- /dev/null +++ b/include/llvm/ADT/StringExtras.h @@ -0,0 +1,69 @@ +//===-- Support/StringExtras.h - Useful string functions ---------*- C++ -*--=// +// +// This file contains some functions that are useful when dealing with strings. +// +//===----------------------------------------------------------------------===// + +#ifndef SUPPORT_STRING_EXTRAS_H +#define SUPPORT_STRING_EXTRAS_H + +#include "Support/DataTypes.h" +#include +#include + +static inline string utostr(uint64_t X, bool isNeg = false) { + char Buffer[40]; + char *BufPtr = Buffer+39; + + *BufPtr = 0; // Null terminate buffer... + if (X == 0) *--BufPtr = '0'; // Handle special case... + + while (X) { + *--BufPtr = '0' + (X % 10); + X /= 10; + } + + if (isNeg) *--BufPtr = '-'; // Add negative sign... + + return string(BufPtr); +} + +static inline string itostr(int64_t X) { + if (X < 0) + return utostr((uint64_t)-X, true); + else + return utostr((uint64_t)X); +} + + +static inline string utostr(unsigned X, bool isNeg = false) { + char Buffer[20]; + char *BufPtr = Buffer+19; + + *BufPtr = 0; // Null terminate buffer... + if (X == 0) *--BufPtr = '0'; // Handle special case... + + while (X) { + *--BufPtr = '0' + (X % 10); + X /= 10; + } + + if (isNeg) *--BufPtr = '-'; // Add negative sign... + + return string(BufPtr); +} + +static inline string itostr(int X) { + if (X < 0) + return utostr((unsigned)-X, true); + else + return utostr((unsigned)X); +} + +static inline string ftostr(double V) { + char Buffer[200]; + snprintf(Buffer, 200, "%e", V); + return Buffer; +} + +#endif diff --git a/include/llvm/ADT/Tree.h b/include/llvm/ADT/Tree.h new file mode 100644 index 00000000000..33b0bb7b039 --- /dev/null +++ b/include/llvm/ADT/Tree.h @@ -0,0 +1,52 @@ +//===- Support/Tree.h - Generic n-way tree structure -------------*- C++ -*--=// +// +// This class defines a generic N way tree node structure. The tree structure +// is immutable after creation, but the payload contained within it is not. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_TREE_H +#define LLVM_SUPPORT_TREE_H + +#include + +template +class Tree { + vector Children; // This nodes children, if any + ConcreteTreeNode *Parent; // Parent of this node... + Payload Data; // Data held in this node... + +protected: + void setChildren(const vector &children) { + Children = children; + } +public: + inline Tree(ConcreteTreeNode *parent) : Parent(parent) {} + inline Tree(const vector &children, ConcreteTreeNode *par) + : Children(children), Parent(par) {} + + inline Tree(const vector &children, ConcreteTreeNode *par, + const Payload &data) + : Children(children), Parent(parent), Data(data) {} + + // Tree dtor - Free all children + inline ~Tree() { + for (unsigned i = Children.size(); i > 0; --i) + delete Children[i-1]; + } + + // Tree manipulation/walking routines... + inline ConcreteTreeNode *getParent() const { return Parent; } + inline unsigned getNumChildren() const { return Children.size(); } + inline ConcreteTreeNode *getChild(unsigned i) const { + assert(i < Children.size() && "Tree::getChild with index out of range!"); + return Children[i]; + } + + // Payload access... + inline Payload &getTreeData() { return Data; } + inline const Payload &getTreeData() const { return Data; } +}; + + +#endif diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h index 62b1846952b..8365a4f397c 100644 --- a/include/llvm/Analysis/CallGraph.h +++ b/include/llvm/Analysis/CallGraph.h @@ -16,7 +16,7 @@ #ifndef LLVM_ANALYSIS_CALLGRAPH_H #define LLVM_ANALYSIS_CALLGRAPH_H -#include "llvm/Support/GraphTraits.h" +#include "Support/GraphTraits.h" #include #include class Method; diff --git a/include/llvm/Analysis/InstForest.h b/include/llvm/Analysis/InstForest.h index 967ed45ec96..497bb46188b 100644 --- a/include/llvm/Analysis/InstForest.h +++ b/include/llvm/Analysis/InstForest.h @@ -14,8 +14,8 @@ #ifndef LLVM_ANALYSIS_INSTFOREST_H #define LLVM_ANALYSIS_INSTFOREST_H -#include "llvm/Support/Tree.h" #include "llvm/Instruction.h" +#include "Support/Tree.h" #include namespace analysis { diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h index cf29cbd00e7..df9447fb09c 100644 --- a/include/llvm/BasicBlock.h +++ b/include/llvm/BasicBlock.h @@ -24,8 +24,8 @@ #include "llvm/Value.h" #include "llvm/ValueHolder.h" -#include "llvm/Support/GraphTraits.h" #include "llvm/InstrTypes.h" +#include "Support/GraphTraits.h" #include class Instruction; diff --git a/include/llvm/CodeGen/InstrForest.h b/include/llvm/CodeGen/InstrForest.h index 1b9af714b9b..e7bd3ad145d 100644 --- a/include/llvm/CodeGen/InstrForest.h +++ b/include/llvm/CodeGen/InstrForest.h @@ -24,9 +24,9 @@ #ifndef LLVM_CODEGEN_INSTRFOREST_H #define LLVM_CODEGEN_INSTRFOREST_H -#include "llvm/Support/NonCopyable.h" -#include "llvm/Support/HashExtras.h" #include "llvm/Instruction.h" +#include "Support/NonCopyable.h" +#include "Support/HashExtras.h" #include #include diff --git a/include/llvm/CodeGen/InstrScheduling.h b/include/llvm/CodeGen/InstrScheduling.h index 8f88a61590a..69390fae966 100644 --- a/include/llvm/CodeGen/InstrScheduling.h +++ b/include/llvm/CodeGen/InstrScheduling.h @@ -12,8 +12,8 @@ #ifndef LLVM_CODEGEN_INSTR_SCHEDULING_H #define LLVM_CODEGEN_INSTR_SCHEDULING_H -#include "llvm/Support/CommandLine.h" #include "llvm/CodeGen/MachineInstr.h" +#include "Support/CommandLine.h" class Method; class SchedulingManager; diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index 91ae9def7fc..a20431848ee 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -15,13 +15,13 @@ #ifndef LLVM_CODEGEN_MACHINEINSTR_H #define LLVM_CODEGEN_MACHINEINSTR_H -#include -#include "llvm/CodeGen/InstrForest.h" #include "Support/DataTypes.h" -#include "llvm/Support/NonCopyable.h" +#include "Support/NonCopyable.h" +#include "llvm/CodeGen/InstrForest.h" #include "llvm/Target/MachineInstrInfo.h" #include "llvm/Annotation.h" #include "llvm/Method.h" +#include #include #include #include diff --git a/include/llvm/CodeGen/RegAllocCommon.h b/include/llvm/CodeGen/RegAllocCommon.h index 5fa51c034f6..02b33311321 100644 --- a/include/llvm/CodeGen/RegAllocCommon.h +++ b/include/llvm/CodeGen/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/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h new file mode 100644 index 00000000000..84a3bc9b59d --- /dev/null +++ b/include/llvm/Support/CommandLine.h @@ -0,0 +1,399 @@ +//===- Support/CommandLine.h - Flexible Command line parser ------*- C++ -*--=// +// +// This class implements a command line argument processor that is useful when +// creating a tool. It provides a simple, minimalistic interface that is easily +// extensible and supports nonlocal (library) command line options. +// +// Note that rather than trying to figure out what this code does, you could try +// reading the library documentation located in docs/CommandLine.html +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_COMMANDLINE_H +#define LLVM_SUPPORT_COMMANDLINE_H + +#include +#include +#include +#include + +namespace cl { // Short namespace to make usage concise + +//===----------------------------------------------------------------------===// +// ParseCommandLineOptions - Minimalistic command line option processing entry +// +void cl::ParseCommandLineOptions(int &argc, char **argv, + const char *Overview = 0, + int Flags = 0); + +// ParserOptions - This set of option is use to control global behavior of the +// command line processor. +// +enum ParserOptions { + // DisableSingleLetterArgGrouping - With this option enabled, multiple letter + // options are allowed to bunch together with only a single hyphen for the + // whole group. This allows emulation of the behavior that ls uses for + // example: ls -la === ls -l -a Providing this option, disables this. + // + DisableSingleLetterArgGrouping = 0x0001, + + // EnableSingleLetterArgValue - This option allows arguments that are + // otherwise unrecognized to match single letter flags that take a value. + // This is useful for cases like a linker, where options are typically of the + // form '-lfoo' or '-L../../include' where -l or -L are the actual flags. + // + EnableSingleLetterArgValue = 0x0002, +}; + + +//===----------------------------------------------------------------------===// +// Global flags permitted to be passed to command line arguments + +enum FlagsOptions { + NoFlags = 0x00, // Marker to make explicit that we have no flags + Default = 0x00, // Equally, marker to use the default flags + + GlobalsMask = 0x80, +}; + +enum NumOccurances { // Flags for the number of occurances allowed... + Optional = 0x01, // Zero or One occurance + ZeroOrMore = 0x02, // Zero or more occurances allowed + Required = 0x03, // One occurance required + OneOrMore = 0x04, // One or more occurances required + + // ConsumeAfter - Marker for a null ("") flag that can be used to indicate + // that anything that matches the null marker starts a sequence of options + // that all get sent to the null marker. Thus, for example, all arguments + // to LLI are processed until a filename is found. Once a filename is found, + // all of the succeeding arguments are passed, unprocessed, to the null flag. + // + ConsumeAfter = 0x05, + + OccurancesMask = 0x07, +}; + +enum ValueExpected { // Is a value required for the option? + ValueOptional = 0x08, // The value can oppear... or not + ValueRequired = 0x10, // The value is required to appear! + ValueDisallowed = 0x18, // A value may not be specified (for flags) + ValueMask = 0x18, +}; + +enum OptionHidden { // Control whether -help shows this option + NotHidden = 0x20, // Option included in --help & --help-hidden + Hidden = 0x40, // -help doesn't, but --help-hidden does + ReallyHidden = 0x60, // Neither --help nor --help-hidden show this arg + HiddenMask = 0x60, +}; + + +//===----------------------------------------------------------------------===// +// Option Base class +// +class Alias; +class Option { + friend void cl::ParseCommandLineOptions(int &, char **, const char *, int); + friend class Alias; + + // handleOccurances - Overriden by subclasses to handle the value passed into + // an argument. Should return true if there was an error processing the + // argument and the program should exit. + // + virtual bool handleOccurance(const char *ArgName, const string &Arg) = 0; + + virtual enum NumOccurances getNumOccurancesFlagDefault() const { + return Optional; + } + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueOptional; + } + virtual enum OptionHidden getOptionHiddenFlagDefault() const { + return NotHidden; + } + + int NumOccurances; // The number of times specified + const int Flags; // Flags for the argument +public: + const char * const ArgStr; // The argument string itself (ex: "help", "o") + const char * const HelpStr; // The descriptive text message for --help + + inline enum NumOccurances getNumOccurancesFlag() const { + int NO = Flags & OccurancesMask; + return NO ? (enum NumOccurances)NO : getNumOccurancesFlagDefault(); + } + inline enum ValueExpected getValueExpectedFlag() const { + int VE = Flags & ValueMask; + return VE ? (enum ValueExpected)VE : getValueExpectedFlagDefault(); + } + inline enum OptionHidden getOptionHiddenFlag() const { + int OH = Flags & HiddenMask; + return OH ? (enum OptionHidden)OH : getOptionHiddenFlagDefault(); + } + +protected: + Option(const char *ArgStr, const char *Message, int Flags); + Option(int flags) : NumOccurances(0), Flags(flags), ArgStr(""), HelpStr("") {} + +public: + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; + + // addOccurance - Wrapper around handleOccurance that enforces Flags + // + bool addOccurance(const char *ArgName, const string &Value); + + // Prints option name followed by message. Always returns true. + bool error(string Message, const char *ArgName = 0); + +public: + inline int getNumOccurances() const { return NumOccurances; } + virtual ~Option() {} +}; + + +//===----------------------------------------------------------------------===// +// Aliased command line option (alias this name to a preexisting name) +// +class Alias : public Option { + Option &AliasFor; + virtual bool handleOccurance(const char *ArgName, const string &Arg) { + return AliasFor.handleOccurance(AliasFor.ArgStr, Arg); + } + virtual enum OptionHidden getOptionHiddenFlagDefault() const {return Hidden;} +public: + inline Alias(const char *ArgStr, const char *Message, int Flags, + Option &aliasFor) : Option(ArgStr, Message, Flags), + AliasFor(aliasFor) {} +}; + +//===----------------------------------------------------------------------===// +// Boolean/flag command line option +// +class Flag : public Option { + bool Value; + virtual bool handleOccurance(const char *ArgName, const string &Arg); +public: + inline Flag(const char *ArgStr, const char *Message, int Flags = 0, + bool DefaultVal = 0) : Option(ArgStr, Message, Flags), + Value(DefaultVal) {} + operator const bool() const { return Value; } + inline bool operator=(bool Val) { Value = Val; return Val; } +}; + + + +//===----------------------------------------------------------------------===// +// Integer valued command line option +// +class Int : public Option { + int Value; + virtual bool handleOccurance(const char *ArgName, const string &Arg); + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } +public: + inline Int(const char *ArgStr, const char *Help, int Flags = 0, + int DefaultVal = 0) : Option(ArgStr, Help, Flags), + Value(DefaultVal) {} + inline operator int() const { return Value; } + inline int operator=(int Val) { Value = Val; return Val; } +}; + + +//===----------------------------------------------------------------------===// +// String valued command line option +// +class String : public Option, public string { + virtual bool handleOccurance(const char *ArgName, const string &Arg); + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } +public: + inline String(const char *ArgStr, const char *Help, int Flags = 0, + const char *DefaultVal = "") + : Option(ArgStr, Help, Flags), string(DefaultVal) {} + + inline const string &operator=(const string &Val) { + return string::operator=(Val); + } +}; + + +//===----------------------------------------------------------------------===// +// String list command line option +// +class StringList : public Option, public vector { + + virtual enum NumOccurances getNumOccurancesFlagDefault() const { + return ZeroOrMore; + } + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } + virtual bool handleOccurance(const char *ArgName, const string &Arg); + +public: + inline StringList(const char *ArgStr, const char *Help, int Flags = 0) + : Option(ArgStr, Help, Flags) {} +}; + + +//===----------------------------------------------------------------------===// +// Enum valued command line option +// +#define clEnumVal(ENUMVAL, DESC) #ENUMVAL, ENUMVAL, DESC +#define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, ENUMVAL, DESC + +// EnumBase - Base class for all enum/varargs related argument types... +class EnumBase : public Option { +protected: + // Use a vector instead of a map, because the lists should be short, + // the overhead is less, and most importantly, it keeps them in the order + // inserted so we can print our option out nicely. + vector > > ValueMap; + + inline EnumBase(const char *ArgStr, const char *Help, int Flags) + : Option(ArgStr, Help, Flags) {} + inline EnumBase(int Flags) : Option(Flags) {} + + // processValues - Incorporate the specifed varargs arglist into the + // ValueMap. + // + void processValues(va_list Vals); + + // registerArgs - notify the system about these new arguments + void registerArgs(); + +public: + // Turn an enum into the arg name that activates it + const char *getArgName(int ID) const; + const char *getArgDescription(int ID) const; +}; + +class EnumValueBase : public EnumBase { +protected: + int Value; + inline EnumValueBase(const char *ArgStr, const char *Help, int Flags) + : EnumBase(ArgStr, Help, Flags) {} + inline EnumValueBase(int Flags) : EnumBase(Flags) {} + + // handleOccurance - Set Value to the enum value specified by Arg + virtual bool handleOccurance(const char *ArgName, const string &Arg); + + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; +}; + +template // The enum we are representing +class Enum : public EnumValueBase { + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueRequired; + } +public: + inline Enum(const char *ArgStr, int Flags, const char *Help, ...) + : EnumValueBase(ArgStr, Help, Flags) { + va_list Values; + va_start(Values, Help); + processValues(Values); + va_end(Values); + Value = ValueMap.front().second.first; // Grab default value + } + + inline operator E() const { return (E)Value; } + inline E operator=(E Val) { Value = Val; return Val; } +}; + + +//===----------------------------------------------------------------------===// +// Enum flags command line option +// +class EnumFlagsBase : public EnumValueBase { + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueDisallowed; + } +protected: + virtual bool handleOccurance(const char *ArgName, const string &Arg); + inline EnumFlagsBase(int Flags) : EnumValueBase(Flags) {} + + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; +}; + +template // The enum we are representing +class EnumFlags : public EnumFlagsBase { +public: + inline EnumFlags(int Flags, ...) : EnumFlagsBase(Flags) { + va_list Values; + va_start(Values, Flags); + processValues(Values); + va_end(Values); + registerArgs(); + Value = ValueMap.front().second.first; // Grab default value + } + + inline operator E() const { return (E)Value; } + inline E operator=(E Val) { Value = Val; return Val; } +}; + + +//===----------------------------------------------------------------------===// +// Enum list command line option +// +class EnumListBase : public EnumBase { + virtual enum NumOccurances getNumOccurancesFlagDefault() const { + return ZeroOrMore; + } + virtual enum ValueExpected getValueExpectedFlagDefault() const { + return ValueDisallowed; + } +protected: + vector Values; // The options specified so far. + + inline EnumListBase(int Flags) + : EnumBase(Flags) {} + virtual bool handleOccurance(const char *ArgName, const string &Arg); + + // Return the width of the option tag for printing... + virtual unsigned getOptionWidth() const; + + // printOptionInfo - Print out information about this option. The + // to-be-maintained width is specified. + // + virtual void printOptionInfo(unsigned GlobalWidth) const; +public: + inline unsigned size() { return Values.size(); } +}; + +template // The enum we are representing +class EnumList : public EnumListBase { +public: + inline EnumList(int Flags, ...) : EnumListBase(Flags) { + va_list Values; + va_start(Values, Flags); + processValues(Values); + va_end(Values); + registerArgs(); + } + inline E operator[](unsigned i) const { return (E)Values[i]; } + inline E &operator[](unsigned i) { return (E&)Values[i]; } +}; + +} // End namespace cl + +#endif diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h new file mode 100644 index 00000000000..f3dc3de17bb --- /dev/null +++ b/include/llvm/Support/MathExtras.h @@ -0,0 +1,32 @@ +// $Id$ -*-c++-*- +//*************************************************************************** +// File: +// MathExtras.h +// +// Purpose: +// +// History: +// 8/25/01 - Vikram Adve - Created +//**************************************************************************/ + +#ifndef LLVM_SUPPORT_MATH_EXTRAS_H +#define LLVM_SUPPORT_MATH_EXTRAS_H + +#include + +inline bool IsPowerOf2 (int64_t C, unsigned& getPow); + +inline +bool IsPowerOf2(int64_t C, unsigned& getPow) +{ + if (C < 0) + C = -C; + bool isBool = C > 0 && (C == (C & ~(C - 1))); + if (isBool) + for (getPow = 0; C > 1; getPow++) + C = C >> 1; + + return isBool; +} + +#endif /*LLVM_SUPPORT_MATH_EXTRAS_H*/ diff --git a/include/llvm/Target/TargetFrameInfo.h b/include/llvm/Target/TargetFrameInfo.h index 4f19cc95c3c..df16c730b22 100644 --- a/include/llvm/Target/TargetFrameInfo.h +++ b/include/llvm/Target/TargetFrameInfo.h @@ -13,7 +13,7 @@ #ifndef LLVM_CODEGEN_FRAMEINFO_H #define LLVM_CODEGEN_FRAMEINFO_H -#include "llvm/Support/NonCopyable.h" +#include "Support/NonCopyable.h" #include diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h index 4f0b934bb92..ad1f1059581 100644 --- a/include/llvm/Target/TargetMachine.h +++ b/include/llvm/Target/TargetMachine.h @@ -8,7 +8,7 @@ #define LLVM_TARGET_TARGETMACHINE_H #include "llvm/Target/TargetData.h" -#include "llvm/Support/NonCopyable.h" +#include "Support/NonCopyable.h" class TargetMachine; class MachineInstrInfo; diff --git a/include/llvm/Target/TargetRegInfo.h b/include/llvm/Target/TargetRegInfo.h index 8f7fad57115..4bd2319d02f 100644 --- a/include/llvm/Target/TargetRegInfo.h +++ b/include/llvm/Target/TargetRegInfo.h @@ -8,7 +8,7 @@ #ifndef LLVM_TARGET_MACHINEREGINFO_H #define LLVM_TARGET_MACHINEREGINFO_H -#include "llvm/Support/NonCopyable.h" +#include "Support/NonCopyable.h" #include #include diff --git a/include/llvm/Type.h b/include/llvm/Type.h index 04780e9e3c2..905aa2d11f5 100644 --- a/include/llvm/Type.h +++ b/include/llvm/Type.h @@ -27,7 +27,7 @@ #define LLVM_TYPE_H #include "llvm/Value.h" -#include "llvm/Support/GraphTraits.h" +#include "Support/GraphTraits.h" class DerivedType; class MethodType; diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp index a323610427b..47dbde71483 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 // 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 d47e1d7f6ad..852763755aa 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 4bff950a82e..8616cb721ce 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 32201beb6a0..e981a866420 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 7518606c898..ed96bd4f577 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 inline void LoopDepthCalculator::AddBB(const BasicBlock *BB) { diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp index a240ec8b8ba..40a195b042f 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 bool cfg::Loop::contains(const BasicBlock *BB) const { diff --git a/lib/Analysis/ModuleAnalyzer.cpp b/lib/Analysis/ModuleAnalyzer.cpp index d5432163496..dc6ee710c45 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 // processModule - Driver function to call all of my subclasses virtual methods. diff --git a/lib/Analysis/PostDominators.cpp b/lib/Analysis/PostDominators.cpp index 2bc3edbc2a8..2ed02dbed26 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 //===----------------------------------------------------------------------===// diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h index 0f25f5461d2..76052fa5410 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 aca9878da39..0f5c11e1eae 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 #include // Get definition of pair class #include diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp index 3211e728ff2..6fed526bd6e 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 #if 0 diff --git a/lib/CodeGen/InstrSched/InstrScheduling.cpp b/lib/CodeGen/InstrSched/InstrScheduling.cpp index 0ba218da1c7..528e5abdd34 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 #include #include diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index 9d3651a256e..9e9af5b80d8 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 #include #include @@ -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 44d59a1aa52..a4567a5198f 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 class Value; diff --git a/lib/CodeGen/InstrSched/SchedPriorities.cpp b/lib/CodeGen/InstrSched/SchedPriorities.cpp index 31d9f6c5926..acbe552d052 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 f928683060a..c6d53674ac7 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 f27ad710e0a..ce26a1d073e 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 diff --git a/lib/CodeGen/RegAlloc/RegAllocCommon.h b/lib/CodeGen/RegAlloc/RegAllocCommon.h index 5fa51c034f6..02b33311321 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 538e39ad0cb..2f0ee41c52f 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 diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp index bc337ee8b5c..f6938169dab 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 #include #include diff --git a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp index 0ba218da1c7..528e5abdd34 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 #include #include diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index 9d3651a256e..9e9af5b80d8 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 #include #include @@ -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 44d59a1aa52..a4567a5198f 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 class Value; diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp index 31d9f6c5926..acbe552d052 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 f928683060a..c6d53674ac7 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 f27ad710e0a..ce26a1d073e 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 diff --git a/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp b/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp index 32201beb6a0..e981a866420 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 5fa51c034f6..02b33311321 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 618fb6dc30f..3edeb962039 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 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(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(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(CPA->getType())->getElementType(); + Result = "\""; + for (unsigned i = 0; i < CPA->getNumOperands(); ++i) { + unsigned char C = (ETy == Type::SByteTy) ? + (unsigned char)cast(CPA->getOperand(i))->getValue() : + (unsigned char)cast(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 c1b8aa38c87..631d6090184 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 -//******************** Internal Data Declarations ************************/ - //************************* Forward Declarations ***************************/ diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp index 327cb6301de..a1d92f1b269 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 #include diff --git a/lib/Transforms/IPO/GlobalDCE.cpp b/lib/Transforms/IPO/GlobalDCE.cpp index 24945c02b44..7395bab8030 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 static bool RemoveUnreachableMethods(Module *M, cfg::CallGraph *CG) { diff --git a/lib/Transforms/Instrumentation/TraceValues.cpp b/lib/Transforms/Instrumentation/TraceValues.cpp index f59b0aed248..07db02854ef 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 #include diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp index d4bf823a54e..f80270567d3 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 #include "llvm/Assembly/Writer.h" diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp index 14a18116186..a5d1d12bcf8 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 #include diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp index 16d95340188..caacf32d389 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 // 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 1cec66de71e..9f0513f36e8 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 #include "llvm/Analysis/LoopDepth.h" diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index bca3f9b2f32..256fadf6371 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 #include #include diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 1bfdff9364a..2be172324c4 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 #include diff --git a/lib/VMCore/ConstPoolVals.cpp b/lib/VMCore/ConstPoolVals.cpp index 3b8fe10f46f..dd301716fb1 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 #include diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index 2bc3edbc2a8..2ed02dbed26 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 //===----------------------------------------------------------------------===// diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index bb5e5b5a25c..86b944d79f5 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 // Instantiate Templates - This ugliness is the price we have to pay diff --git a/lib/VMCore/SlotCalculator.cpp b/lib/VMCore/SlotCalculator.cpp index 3211e728ff2..6fed526bd6e 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 #if 0 diff --git a/lib/VMCore/SymbolTable.cpp b/lib/VMCore/SymbolTable.cpp index b8da428a2cb..c32cec93656 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 53844d605d3..5f39682ca4d 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 diff --git a/support/lib/Support/CommandLine.cpp b/support/lib/Support/CommandLine.cpp index bc337ee8b5c..f6938169dab 100644 --- a/support/lib/Support/CommandLine.cpp +++ b/support/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 #include #include diff --git a/support/lib/Support/StringExtras.cpp b/support/lib/Support/StringExtras.cpp deleted file mode 100644 index 2229df049ac..00000000000 --- a/support/lib/Support/StringExtras.cpp +++ /dev/null @@ -1,66 +0,0 @@ - - -#include "llvm/Support/StringExtras.h" -#include "llvm/ConstPoolVals.h" -#include "llvm/DerivedTypes.h" - -// Can we treat the specified array as a string? Only if it is an array of -// ubytes or non-negative sbytes. -// -bool isStringCompatible(ConstPoolArray *CPA) { - const Type *ETy = cast(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(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. -// -string getAsCString(ConstPoolArray *CPA) { - if (isStringCompatible(CPA)) { - string Result; - const Type *ETy = cast(CPA->getType())->getElementType(); - Result = "\""; - for (unsigned i = 0; i < CPA->getNumOperands(); ++i) { - unsigned char C = (ETy == Type::SByteTy) ? - (unsigned char)cast(CPA->getOperand(i))->getValue() : - (unsigned char)cast(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(); - } -} diff --git a/tools/analyze/analyze.cpp b/tools/analyze/analyze.cpp index ec5d2c0431d..da7de6ec9af 100644 --- a/tools/analyze/analyze.cpp +++ b/tools/analyze/analyze.cpp @@ -15,9 +15,7 @@ #include "llvm/Method.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Assembly/Parser.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Analysis/Writer.h" - #include "llvm/Analysis/InstForest.h" #include "llvm/Analysis/Dominators.h" #include "llvm/Analysis/IntervalPartition.h" @@ -27,6 +25,7 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/FindUnsafePointerTypes.h" #include "llvm/Analysis/FindUsedTypes.h" +#include "Support/CommandLine.h" #include static void PrintMethod(Method *M) { diff --git a/tools/as/as.cpp b/tools/as/as.cpp index 72b63ecfdde..ee664f15249 100644 --- a/tools/as/as.cpp +++ b/tools/as/as.cpp @@ -9,14 +9,13 @@ // //===------------------------------------------------------------------------=== -#include -#include -#include #include "llvm/Module.h" #include "llvm/Assembly/Parser.h" #include "llvm/Assembly/Writer.h" #include "llvm/Bytecode/Writer.h" -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" +#include +#include cl::String InputFilename ("", "Parse file, compile to bytecode", 0, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, ""); diff --git a/tools/dis/dis.cpp b/tools/dis/dis.cpp index 712cf85e812..2a7eb4e06ea 100644 --- a/tools/dis/dis.cpp +++ b/tools/dis/dis.cpp @@ -16,15 +16,14 @@ // //===----------------------------------------------------------------------===// -#include -#include #include "llvm/Module.h" #include "llvm/Assembly/Writer.h" #include "llvm/Bytecode/Reader.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Method.h" -#include "llvm/Support/DepthFirstIterator.h" -#include "llvm/Support/PostOrderIterator.h" +#include "Support/DepthFirstIterator.h" +#include "Support/PostOrderIterator.h" +#include "Support/CommandLine.h" +#include // OutputMode - The different orderings to print basic blocks in... enum OutputMode { diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp index e19508fdacd..c5ab2dff68d 100644 --- a/tools/gccas/gccas.cpp +++ b/tools/gccas/gccas.cpp @@ -15,7 +15,7 @@ #include "llvm/Optimizations/DCE.h" #include "llvm/Transforms/ConstantMerge.h" #include "llvm/Bytecode/Writer.h" -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" #include #include #include diff --git a/tools/link/link.cpp b/tools/link/link.cpp index 80a39b2d9c1..9bf766fcaad 100644 --- a/tools/link/link.cpp +++ b/tools/link/link.cpp @@ -13,10 +13,10 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Writer.h" #include "llvm/Assembly/Writer.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Module.h" #include "llvm/Method.h" -#include +#include "Support/CommandLine.h" +#include #include diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index 1490cf40d16..7c8c3a608b6 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -13,9 +13,9 @@ #include "llvm/Assembly/PrintModulePass.h" #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Transforms/ConstantMerge.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Module.h" #include "llvm/Method.h" +#include "Support/CommandLine.h" #include #include #include diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index ef9dddf750d..f4145c169c5 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// #include "Interpreter.h" -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" cl::StringList InputArgv("" , "Input command line", cl::ConsumeAfter); cl::String MainFunction ("f" , "Function to execute", cl::NoFlags, "main"); diff --git a/tools/llvm-as/as.cpp b/tools/llvm-as/as.cpp index 72b63ecfdde..ee664f15249 100644 --- a/tools/llvm-as/as.cpp +++ b/tools/llvm-as/as.cpp @@ -9,14 +9,13 @@ // //===------------------------------------------------------------------------=== -#include -#include -#include #include "llvm/Module.h" #include "llvm/Assembly/Parser.h" #include "llvm/Assembly/Writer.h" #include "llvm/Bytecode/Writer.h" -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" +#include +#include cl::String InputFilename ("", "Parse file, compile to bytecode", 0, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, ""); diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index 72b63ecfdde..ee664f15249 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -9,14 +9,13 @@ // //===------------------------------------------------------------------------=== -#include -#include -#include #include "llvm/Module.h" #include "llvm/Assembly/Parser.h" #include "llvm/Assembly/Writer.h" #include "llvm/Bytecode/Writer.h" -#include "llvm/Support/CommandLine.h" +#include "Support/CommandLine.h" +#include +#include cl::String InputFilename ("", "Parse file, compile to bytecode", 0, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, ""); diff --git a/tools/llvm-dis/dis.cpp b/tools/llvm-dis/dis.cpp index 712cf85e812..2a7eb4e06ea 100644 --- a/tools/llvm-dis/dis.cpp +++ b/tools/llvm-dis/dis.cpp @@ -16,15 +16,14 @@ // //===----------------------------------------------------------------------===// -#include -#include #include "llvm/Module.h" #include "llvm/Assembly/Writer.h" #include "llvm/Bytecode/Reader.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Method.h" -#include "llvm/Support/DepthFirstIterator.h" -#include "llvm/Support/PostOrderIterator.h" +#include "Support/DepthFirstIterator.h" +#include "Support/PostOrderIterator.h" +#include "Support/CommandLine.h" +#include // OutputMode - The different orderings to print basic blocks in... enum OutputMode { diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp index 712cf85e812..2a7eb4e06ea 100644 --- a/tools/llvm-dis/llvm-dis.cpp +++ b/tools/llvm-dis/llvm-dis.cpp @@ -16,15 +16,14 @@ // //===----------------------------------------------------------------------===// -#include -#include #include "llvm/Module.h" #include "llvm/Assembly/Writer.h" #include "llvm/Bytecode/Reader.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Method.h" -#include "llvm/Support/DepthFirstIterator.h" -#include "llvm/Support/PostOrderIterator.h" +#include "Support/DepthFirstIterator.h" +#include "Support/PostOrderIterator.h" +#include "Support/CommandLine.h" +#include // OutputMode - The different orderings to print basic blocks in... enum OutputMode { diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 80a39b2d9c1..9bf766fcaad 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -13,10 +13,10 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Writer.h" #include "llvm/Assembly/Writer.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Module.h" #include "llvm/Method.h" -#include +#include "Support/CommandLine.h" +#include #include diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 0386a4955fe..927a69a5f32 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -9,7 +9,6 @@ #include "llvm/Module.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Writer.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Optimizations/AllOpts.h" #include "llvm/Transforms/Instrumentation/TraceValues.h" #include "llvm/Assembly/PrintModulePass.h" @@ -18,6 +17,7 @@ #include "llvm/Transforms/LevelChange.h" #include "llvm/Transforms/SwapStructContents.h" #include "llvm/Transforms/IPO/GlobalDCE.h" +#include "Support/CommandLine.h" #include #include