diff options
Diffstat (limited to 'llvm/tools')
31 files changed, 109 insertions, 6 deletions
diff --git a/llvm/tools/analyze/AnalysisWrappers.cpp b/llvm/tools/analyze/AnalysisWrappers.cpp index 6c4c99f5a30..a9b9cd0470c 100644 --- a/llvm/tools/analyze/AnalysisWrappers.cpp +++ b/llvm/tools/analyze/AnalysisWrappers.cpp @@ -26,6 +26,8 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Support/InstIterator.h" +using namespace llvm; + namespace { struct InstForestHelper : public FunctionPass { Function *F; diff --git a/llvm/tools/analyze/GraphPrinters.cpp b/llvm/tools/analyze/GraphPrinters.cpp index 34c937f0d4d..6d2750f5e2e 100644 --- a/llvm/tools/analyze/GraphPrinters.cpp +++ b/llvm/tools/analyze/GraphPrinters.cpp @@ -20,6 +20,8 @@ #include "llvm/Analysis/CallGraph.h" #include <fstream> +namespace llvm { + template<typename GraphType> static void WriteGraphToFile(std::ostream &O, const std::string &GraphName, const GraphType >) { @@ -72,3 +74,5 @@ namespace { RegisterAnalysis<CallGraphPrinter> P2("print-callgraph", "Print Call Graph to 'dot' file"); }; + +} // End llvm namespace diff --git a/llvm/tools/analyze/analyze.cpp b/llvm/tools/analyze/analyze.cpp index 836b6aa8d72..3e1e51600e8 100644 --- a/llvm/tools/analyze/analyze.cpp +++ b/llvm/tools/analyze/analyze.cpp @@ -26,6 +26,7 @@ #include "Support/Timer.h" #include <algorithm> +using namespace llvm; struct ModulePassPrinter : public Pass { const PassInfo *PassToPrint; diff --git a/llvm/tools/bugpoint/BugDriver.cpp b/llvm/tools/bugpoint/BugDriver.cpp index f0fb785db9c..12843588c88 100644 --- a/llvm/tools/bugpoint/BugDriver.cpp +++ b/llvm/tools/bugpoint/BugDriver.cpp @@ -23,6 +23,8 @@ #include "Support/FileUtilities.h" #include <memory> +using namespace llvm; + // Anonymous namespace to define command line options for debugging. // namespace { @@ -36,6 +38,8 @@ namespace { "(for miscompilation detection)")); } +namespace llvm { + /// getPassesString - Turn a list of passes into a string which indicates the /// command line options that must be passed to add the passes. /// @@ -179,3 +183,5 @@ void BugDriver::PrintFunctionList(const std::vector<Function*> &Funcs) { } std::cout << std::flush; } + +} // End llvm namespace diff --git a/llvm/tools/bugpoint/BugDriver.h b/llvm/tools/bugpoint/BugDriver.h index e1af721a75c..af04a7d61a8 100644 --- a/llvm/tools/bugpoint/BugDriver.h +++ b/llvm/tools/bugpoint/BugDriver.h @@ -19,6 +19,8 @@ #include <vector> #include <string> +namespace llvm { + class PassInfo; class Module; class Function; @@ -207,4 +209,6 @@ std::string getPassesString(const std::vector<const PassInfo*> &Passes); // void DeleteFunctionBody(Function *F); +} // End llvm namespace + #endif diff --git a/llvm/tools/bugpoint/CodeGeneratorBug.cpp b/llvm/tools/bugpoint/CodeGeneratorBug.cpp index 41df79a110a..b24620ea140 100644 --- a/llvm/tools/bugpoint/CodeGeneratorBug.cpp +++ b/llvm/tools/bugpoint/CodeGeneratorBug.cpp @@ -33,6 +33,8 @@ #include <algorithm> #include <set> +namespace llvm { + extern cl::list<std::string> InputArgv; class ReduceMisCodegenFunctions : public ListReducer<Function*> { @@ -408,3 +410,5 @@ bool BugDriver::debugCodeGenerator() { return false; } + +} // End llvm namespace diff --git a/llvm/tools/bugpoint/CrashDebugger.cpp b/llvm/tools/bugpoint/CrashDebugger.cpp index 0b2851f220c..8c29ea226a4 100644 --- a/llvm/tools/bugpoint/CrashDebugger.cpp +++ b/llvm/tools/bugpoint/CrashDebugger.cpp @@ -29,6 +29,8 @@ #include <fstream> #include <set> +namespace llvm { + class DebugCrashes : public ListReducer<const PassInfo*> { BugDriver &BD; public: @@ -397,3 +399,5 @@ bool BugDriver::debugCrash() { return false; } + +} // End llvm namespace diff --git a/llvm/tools/bugpoint/ExecutionDriver.cpp b/llvm/tools/bugpoint/ExecutionDriver.cpp index 596aeb95a88..9a3bd550555 100644 --- a/llvm/tools/bugpoint/ExecutionDriver.cpp +++ b/llvm/tools/bugpoint/ExecutionDriver.cpp @@ -30,6 +30,8 @@ BUGPOINT NOTES: #include <fstream> #include <iostream> +using namespace llvm; + namespace { // OutputType - Allow the user to specify the way code should be run, to test // for miscompilation. @@ -58,6 +60,8 @@ namespace { "into executing programs")); } +namespace llvm { + // Anything specified after the --args option are taken as arguments to the // program being debugged. cl::list<std::string> @@ -232,3 +236,5 @@ bool BugDriver::diffProgram(const std::string &BytecodeFile, bool BugDriver::isExecutingJIT() { return InterpreterSel == RunJIT; } + +} // End llvm namespace diff --git a/llvm/tools/bugpoint/ExtractFunction.cpp b/llvm/tools/bugpoint/ExtractFunction.cpp index 38e25864e4c..4c671be62fa 100644 --- a/llvm/tools/bugpoint/ExtractFunction.cpp +++ b/llvm/tools/bugpoint/ExtractFunction.cpp @@ -25,8 +25,15 @@ #include "llvm/Target/TargetData.h" #include "Support/CommandLine.h" + +namespace llvm { + bool DisableSimplifyCFG = false; +} // End llvm namespace + +using namespace llvm; + namespace { cl::opt<bool> NoADCE("disable-adce", @@ -39,6 +46,8 @@ namespace { cl::desc("Do not use the -simplifycfg pass to reduce testcases")); } +namespace llvm { + /// deleteInstructionFromProgram - This method clones the current Program and /// deletes the specified instruction from the cloned module. It then runs a /// series of cleanup passes (ADCE and SimplifyCFG) to eliminate any code which @@ -125,3 +134,5 @@ Module *BugDriver::performFinalCleanups(Module *M, bool MayModifySemantics) { } return M; } + +} // End llvm namespace diff --git a/llvm/tools/bugpoint/ListReducer.h b/llvm/tools/bugpoint/ListReducer.h index 0ab2ef9927a..0ad24065cf3 100644 --- a/llvm/tools/bugpoint/ListReducer.h +++ b/llvm/tools/bugpoint/ListReducer.h @@ -17,6 +17,8 @@ #include <vector> +namespace llvm { + template<typename ElTy> struct ListReducer { enum TestResult { @@ -109,4 +111,6 @@ struct ListReducer { } }; +} // End llvm namespace + #endif diff --git a/llvm/tools/bugpoint/Miscompilation.cpp b/llvm/tools/bugpoint/Miscompilation.cpp index 5ec8b1543e3..1fb46a62bcb 100644 --- a/llvm/tools/bugpoint/Miscompilation.cpp +++ b/llvm/tools/bugpoint/Miscompilation.cpp @@ -19,6 +19,8 @@ #include "llvm/Transforms/Utils/Linker.h" #include "Support/FileUtilities.h" +namespace llvm { + class ReduceMiscompilingPasses : public ListReducer<const PassInfo*> { BugDriver &BD; public: @@ -308,3 +310,5 @@ bool BugDriver::debugMiscompilation() { return false; } + +} // End llvm namespace diff --git a/llvm/tools/bugpoint/OptimizerDriver.cpp b/llvm/tools/bugpoint/OptimizerDriver.cpp index 600a25ad723..af9d1e5a945 100644 --- a/llvm/tools/bugpoint/OptimizerDriver.cpp +++ b/llvm/tools/bugpoint/OptimizerDriver.cpp @@ -26,6 +26,8 @@ #include <sys/types.h> #include <sys/wait.h> +namespace llvm { + /// writeProgramToFile - This writes the current "Program" to the named bytecode /// file. If an error occurs, true is returned. /// @@ -159,3 +161,5 @@ bool BugDriver::runPasses(const std::vector<const PassInfo*> &Passes, // Was the child successful? return !ExitedOK; } + +} // End llvm namespace diff --git a/llvm/tools/bugpoint/TestPasses.cpp b/llvm/tools/bugpoint/TestPasses.cpp index af5c045788a..ee2c0d72483 100644 --- a/llvm/tools/bugpoint/TestPasses.cpp +++ b/llvm/tools/bugpoint/TestPasses.cpp @@ -18,6 +18,8 @@ #include "llvm/Pass.h" #include "llvm/Support/InstVisitor.h" +using namespace llvm; + namespace { /// CrashOnCalls - This pass is used to test bugpoint. It intentionally /// crashes on any call instructions. diff --git a/llvm/tools/bugpoint/bugpoint.cpp b/llvm/tools/bugpoint/bugpoint.cpp index 8f55804e0cb..9bca7fd6fcb 100644 --- a/llvm/tools/bugpoint/bugpoint.cpp +++ b/llvm/tools/bugpoint/bugpoint.cpp @@ -19,6 +19,8 @@ #include "Config/unistd.h" #include <sys/resource.h> +using namespace llvm; + static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore, cl::desc("<input llvm ll/bc files>")); diff --git a/llvm/tools/extract/extract.cpp b/llvm/tools/extract/extract.cpp index 272d4731808..72412b8b098 100644 --- a/llvm/tools/extract/extract.cpp +++ b/llvm/tools/extract/extract.cpp @@ -21,6 +21,8 @@ #include "Support/CommandLine.h" #include <memory> +using namespace llvm; + // InputFilename - The filename to read from. static cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input bytecode file>"), diff --git a/llvm/tools/gccas/gccas.cpp b/llvm/tools/gccas/gccas.cpp index d97c716da1e..c7a2204e32d 100644 --- a/llvm/tools/gccas/gccas.cpp +++ b/llvm/tools/gccas/gccas.cpp @@ -27,6 +27,8 @@ #include <memory> #include <fstream> +using namespace llvm; + namespace { cl::opt<std::string> InputFilename(cl::Positional,cl::desc("<input llvm assembly>"),cl::init("-")); diff --git a/llvm/tools/gccld/GenerateCode.cpp b/llvm/tools/gccld/GenerateCode.cpp index bf32400c634..aac1f93d32f 100644 --- a/llvm/tools/gccld/GenerateCode.cpp +++ b/llvm/tools/gccld/GenerateCode.cpp @@ -25,11 +25,14 @@ #include "Support/SystemUtils.h" #include "Support/CommandLine.h" +using namespace llvm; + namespace { cl::opt<bool> DisableInline("disable-inlining", cl::desc("Do not run the inliner pass")); } +namespace llvm { /// GenerateBytecode - generates a bytecode file from the specified module. /// @@ -221,3 +224,5 @@ GenerateNative(const std::string &OutputFilename, // Run the compiler to assembly and link together the program. return ExecWait(&(cmd[0]), clean_env); } + +} // End llvm namespace diff --git a/llvm/tools/gccld/Linker.cpp b/llvm/tools/gccld/Linker.cpp index 06f0635749b..9c228917754 100644 --- a/llvm/tools/gccld/Linker.cpp +++ b/llvm/tools/gccld/Linker.cpp @@ -30,6 +30,8 @@ #include <memory> #include <set> +namespace llvm { + /// FindLib - Try to convert Filename into the name of a file that we can open, /// if it does not already name a file we can open, by first trying to open /// Filename, then libFilename.<suffix> for each of a set of several common @@ -405,3 +407,5 @@ bool LinkLibraries(const char *progname, return false; } + +} // End llvm namespace diff --git a/llvm/tools/gccld/gccld.cpp b/llvm/tools/gccld/gccld.cpp index 45163f43968..5a1b26100a9 100644 --- a/llvm/tools/gccld/gccld.cpp +++ b/llvm/tools/gccld/gccld.cpp @@ -36,6 +36,8 @@ #include <fstream> #include <memory> +using namespace llvm; + namespace { cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input bytecode files>"), @@ -86,6 +88,8 @@ namespace { CO5("eh-frame-hdr", cl::Hidden, cl::desc("Compatibility option: ignored")); } +namespace llvm { + // // Function: PrintAndReturn () // @@ -211,6 +215,7 @@ void RemoveEnv(const char * name, char ** const envp) { return; } +} // End llvm namespace int main(int argc, char **argv, char **envp) { cl::ParseCommandLineOptions(argc, argv, " llvm linker for GCC\n"); diff --git a/llvm/tools/gccld/gccld.h b/llvm/tools/gccld/gccld.h index e3c55042095..9b7eb1e8773 100644 --- a/llvm/tools/gccld/gccld.h +++ b/llvm/tools/gccld/gccld.h @@ -17,6 +17,8 @@ #include <set> #include <ostream> +namespace llvm { + int PrintAndReturn (const char *progname, const std::string &Message, @@ -69,3 +71,4 @@ LinkFiles (const char * progname, const std::vector<std::string> & Files, bool Verbose); +} // End llvm namespace diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp index 0143d086e74..f219b6ea161 100644 --- a/llvm/tools/llc/llc.cpp +++ b/llvm/tools/llc/llc.cpp @@ -23,6 +23,8 @@ #include <memory> #include <fstream> +using namespace llvm; + // General options for llc. Other pass-specific options are specified // within the corresponding llc passes, and target-specific options // and back-end code generation options are specified with the target machine. diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp index 87fe461ce0d..82b354dc18a 100644 --- a/llvm/tools/lli/lli.cpp +++ b/llvm/tools/lli/lli.cpp @@ -28,6 +28,8 @@ #include "Support/Debug.h" #include "Support/SystemUtils.h" +using namespace llvm; + namespace { cl::opt<std::string> InputFile(cl::desc("<input bytecode>"), cl::Positional, cl::init("-")); diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 879d847630f..e9a4dbf0951 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -25,6 +25,8 @@ #include <unistd.h> #include <sys/mman.h> +using namespace llvm; + using std::string; using std::vector; using std::cout; @@ -69,7 +71,7 @@ namespace { //Option to generate symbol table or not //running llvm-ar -s is the same as ranlib -cl::opt<bool> SymbolTable ("s", cl::desc("Generate an archive symbol table")); +cl::opt<bool> SymbolTableOption ("s", cl::desc("Generate an archive symbol table")); //Archive name cl::opt<string> Archive (cl::Positional, cl::desc("<archive file>"), @@ -335,7 +337,7 @@ void CreateArchive() { ArchiveFile << ARMAG; //If the '-s' option was specified, generate symbol table. - if(SymbolTable) { + if(SymbolTableOption) { cout << "Symbol Table Start: " << ArchiveFile.tellp() << "\n"; if(!WriteSymbolTable(ArchiveFile)) { std::cerr << "Error creating symbol table. Exiting program."; diff --git a/llvm/tools/llvm-as/llvm-as.cpp b/llvm/tools/llvm-as/llvm-as.cpp index 0905466780c..9be5afff116 100644 --- a/llvm/tools/llvm-as/llvm-as.cpp +++ b/llvm/tools/llvm-as/llvm-as.cpp @@ -24,6 +24,8 @@ #include <fstream> #include <memory> +using namespace llvm; + static cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-")); diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp index 915755903bf..8d0ca7bc2da 100644 --- a/llvm/tools/llvm-dis/llvm-dis.cpp +++ b/llvm/tools/llvm-dis/llvm-dis.cpp @@ -29,10 +29,12 @@ // OutputMode - The different orderings to print basic blocks in... enum OutputMode { - llvm = 0, // Generate LLVM assembly (the default) + LLVM = 0, // Generate LLVM assembly (the default) c, // Generate C code }; +using namespace llvm; + static cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input bytecode>"), cl::init("-")); @@ -45,8 +47,8 @@ Force("f", cl::desc("Overwrite output files")); static cl::opt<enum OutputMode> WriteMode(cl::desc("Specify the output format:"), - cl::values(clEnumVal(llvm, "Output LLVM assembly"), - clEnumVal(c , "Output C code for program"), + cl::values(clEnumVal(LLVM, "Output LLVM assembly"), + clEnumVal(c, "Output C code for program"), 0)); int main(int argc, char **argv) { @@ -116,7 +118,7 @@ int main(int argc, char **argv) { PassManager Passes; switch (WriteMode) { - case llvm: // Output LLVM assembly + case LLVM: // Output LLVM assembly Passes.add(new PrintModulePass(Out)); break; case c: // Convert LLVM to C diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp index 764b59b43f8..3b492145163 100644 --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -24,6 +24,8 @@ #include <sys/types.h> // For FileExists #include <sys/stat.h> +using namespace llvm; + static cl::list<std::string> InputFilenames(cl::Positional, cl::OneOrMore, cl::desc("<input bytecode files>")); diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index f7a0ef67465..878aa24f432 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -21,6 +21,8 @@ #include "Support/CommandLine.h" #include <cctype> +using namespace llvm; + namespace { enum OutputFormatTy { bsd, sysv, posix }; cl::opt<OutputFormatTy> diff --git a/llvm/tools/llvm-prof/ProfileInfo.cpp b/llvm/tools/llvm-prof/ProfileInfo.cpp index 78de9c16c7a..1d37c4291a6 100644 --- a/llvm/tools/llvm-prof/ProfileInfo.cpp +++ b/llvm/tools/llvm-prof/ProfileInfo.cpp @@ -20,6 +20,8 @@ #include <fcntl.h> #include <stdio.h> +using namespace llvm; + enum ProfilingType { ArgumentInfo = 1, // The command line argument block FunctionInfo = 2, // Function profiling information diff --git a/llvm/tools/llvm-prof/ProfileInfo.h b/llvm/tools/llvm-prof/ProfileInfo.h index 24e42961565..db4500127df 100644 --- a/llvm/tools/llvm-prof/ProfileInfo.h +++ b/llvm/tools/llvm-prof/ProfileInfo.h @@ -18,6 +18,9 @@ #include <vector> #include <string> #include <utility> + +namespace llvm { + class Module; class Function; class BasicBlock; @@ -55,4 +58,6 @@ public: void getBlockCounts(std::vector<std::pair<BasicBlock*, unsigned> > &Counts); }; +} // End llvm namespace + #endif diff --git a/llvm/tools/llvm-prof/llvm-prof.cpp b/llvm/tools/llvm-prof/llvm-prof.cpp index 4492fd67b71..438fecf07a4 100644 --- a/llvm/tools/llvm-prof/llvm-prof.cpp +++ b/llvm/tools/llvm-prof/llvm-prof.cpp @@ -23,6 +23,8 @@ #include <map> #include <set> +using namespace llvm; + namespace { cl::opt<std::string> BytecodeFile(cl::Positional, cl::desc("<program bytecode file>"), diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index bc0a5fcb6fb..30c72f1c9e8 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -27,6 +27,7 @@ #include <memory> #include <algorithm> +using namespace llvm; // The OptimizationList is automatically populated with registered Passes by the // PassNameParser. |
