X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvmc%2Fllvmc.cpp;h=3b22149db3cf3e20276ff553fd24bb30dc80e296;hb=aea932d27fa41bebaa8576b6002637e74054a7c4;hp=9d677d73581c2ea1c603173c2d1d017d2f324b9c;hpb=a3b4e09715f2c65c54e7a875bba01345da8e3914;p=oota-llvm.git diff --git a/tools/llvmc/llvmc.cpp b/tools/llvmc/llvmc.cpp index 9d677d73581..3b22149db3c 100644 --- a/tools/llvmc/llvmc.cpp +++ b/tools/llvmc/llvmc.cpp @@ -1,18 +1,18 @@ //===--- llvmc.cpp - The LLVM Compiler Driver -------------------*- C++ -*-===// -// +// // The LLVM Compiler Infrastructure // // This file was developed by Reid Spencer and is distributed under the // University of Illinois Open Source License. See LICENSE.TXT for details. -// +// //===----------------------------------------------------------------------===// // // This tool provides a single point of access to the LLVM compilation tools. // It has many options. To discover the options supported please refer to the // tools' manual page (docs/CommandGuide/html/llvmc.html) or run the tool with // the --help option. -// -//===------------------------------------------------------------------------=== +// +//===----------------------------------------------------------------------===// #include "CompilerDriver.h" #include "Configuration.h" @@ -24,11 +24,11 @@ using namespace llvm; namespace { -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// //=== PHASE OPTIONS -//===------------------------------------------------------------------------=== -cl::opt FinalPhase( - cl::desc("Choose final phase of compilation:"), +//===----------------------------------------------------------------------===// +cl::opt FinalPhase(cl::Optional, + cl::desc("Choose final phase of compilation:"), cl::init(CompilerDriver::LINKING), cl::values( clEnumValN(CompilerDriver::PREPROCESSING,"E", @@ -43,17 +43,17 @@ cl::opt FinalPhase( ) ); -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// //=== OPTIMIZATION OPTIONS -//===------------------------------------------------------------------------=== -cl::opt OptLevel( +//===----------------------------------------------------------------------===// +cl::opt OptLevel(cl::ZeroOrMore, cl::desc("Choose level of optimization to apply:"), cl::init(CompilerDriver::OPT_FAST_COMPILE), cl::values( clEnumValN(CompilerDriver::OPT_FAST_COMPILE,"O0", - "An alias for the -O1 option."), + "An alias for the -O1 option"), clEnumValN(CompilerDriver::OPT_FAST_COMPILE,"O1", - "Optimize for compilation speed, not execution speed."), + "Optimize for compilation speed, not execution speed"), clEnumValN(CompilerDriver::OPT_SIMPLE,"O2", "Perform simple translation time optimizations"), clEnumValN(CompilerDriver::OPT_AGGRESSIVE,"O3", @@ -66,14 +66,17 @@ cl::opt OptLevel( ) ); -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// //=== TOOL OPTIONS -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// cl::list PreprocessorToolOpts("Tpre", cl::ZeroOrMore, - cl::desc("Pass specific options to the pre-processor"), + cl::desc("Pass specific options to the pre-processor"), cl::value_desc("option")); +cl::alias PreprocessorToolOptsAlias("Wp,", cl::ZeroOrMore, + cl::desc("Alias for -Tpre"), cl::aliasopt(PreprocessorToolOpts)); + cl::list TranslatorToolOpts("Ttrn", cl::ZeroOrMore, cl::desc("Pass specific options to the assembler"), cl::value_desc("option")); @@ -82,6 +85,9 @@ cl::list AssemblerToolOpts("Tasm", cl::ZeroOrMore, cl::desc("Pass specific options to the assembler"), cl::value_desc("option")); +cl::alias AssemblerToolOptsAlias("Wa,", cl::ZeroOrMore, + cl::desc("Alias for -Tasm"), cl::aliasopt(AssemblerToolOpts)); + cl::list OptimizerToolOpts("Topt", cl::ZeroOrMore, cl::desc("Pass specific options to the optimizer"), cl::value_desc("option")); @@ -90,47 +96,69 @@ cl::list LinkerToolOpts("Tlnk", cl::ZeroOrMore, cl::desc("Pass specific options to the linker"), cl::value_desc("option")); -//===------------------------------------------------------------------------=== +cl::alias LinkerToolOptsAlias("Wl,", cl::ZeroOrMore, + cl::desc("Alias for -Tlnk"), cl::aliasopt(LinkerToolOpts)); + +cl::list fOpts("f", cl::ZeroOrMore, cl::Prefix, + cl::desc("Pass through -f options to compiler tools"), + cl::value_desc("option")); + +cl::list MOpts("M", cl::ZeroOrMore, cl::Prefix, + cl::desc("Pass through -M options to compiler tools"), + cl::value_desc("option")); + +cl::list WOpts("W", cl::ZeroOrMore, cl::Prefix, + cl::desc("Pass through -W options to compiler tools"), + cl::value_desc("option")); + +cl::list BOpt("B", cl::ZeroOrMore, cl::Prefix, + cl::desc("Specify path to find llvmc sub-tools"), + cl::value_desc("dir")); + +//===----------------------------------------------------------------------===// //=== INPUT OPTIONS -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// cl::list LibPaths("L", cl::Prefix, - cl::desc("Specify a library search path"), cl::value_desc("directory")); - + cl::desc("Specify a library search path"), cl::value_desc("dir")); + cl::list Libraries("l", cl::Prefix, - cl::desc("Specify libraries to link to"), cl::value_desc("library prefix")); + cl::desc("Specify base name of libraries to link to"), cl::value_desc("lib")); cl::list Includes("I", cl::Prefix, - cl::desc("Specify location to search for included source"), - cl::value_desc("include directory")); + cl::desc("Specify location to search for included source"), + cl::value_desc("dir")); cl::list Defines("D", cl::Prefix, - cl::desc("Specify a symbol to define for source configuration"), - cl::value_desc("symbol definition")); - + cl::desc("Specify a pre-processor symbol to define"), + cl::value_desc("symbol")); -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// //=== OUTPUT OPTIONS -//===------------------------------------------------------------------------=== - -cl::opt OutputFilename("o", - cl::desc("Override output filename"), cl::value_desc("filename")); +//===----------------------------------------------------------------------===// -cl::opt ForceOutput("f", cl::Optional, cl::init(false), - cl::desc("Force output files to be overridden")); +cl::opt OutputFilename("o", + cl::desc("Override output filename"), cl::value_desc("file")); cl::opt OutputMachine("m", cl::Prefix, cl::desc("Specify a target machine"), cl::value_desc("machine")); - + cl::opt Native("native", cl::init(false), - cl::desc("Generative native object and executables instead of bytecode")); + cl::desc("Generative native code instead of bytecode")); cl::opt DebugOutput("g", cl::init(false), cl::desc("Generate objects that include debug symbols")); -//===------------------------------------------------------------------------=== +cl::opt StripOutput("strip", cl::init(false), + cl::desc("Strip all symbols from linked output file")); + +cl::opt PrintFileName("print-fname", cl::Optional, + cl::value_desc("file"), + cl::desc("Print the full path for the option's value")); + +//===----------------------------------------------------------------------===// //=== INFORMATION OPTIONS -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// cl::opt DryRun("dry-run", cl::Optional, cl::init(false), cl::desc("Do everything but perform the compilation actions")); @@ -141,10 +169,10 @@ cl::alias DryRunAlias("y", cl::Optional, cl::opt Verbose("verbose", cl::Optional, cl::init(false), cl::desc("Print out each action taken")); -cl::alias VerboseAlias("v", cl::Optional, +cl::alias VerboseAlias("v", cl::Optional, cl::desc("Alias for -verbose"), cl::aliasopt(Verbose)); -cl::opt Debug("debug", cl::Optional, cl::init(false), +cl::opt Debug("debug", cl::Optional, cl::init(false), cl::Hidden, cl::desc("Print out debugging information")); cl::alias DebugAlias("d", cl::Optional, @@ -156,17 +184,13 @@ cl::opt TimeActions("time-actions", cl::Optional, cl::init(false), cl::opt ShowStats("stats", cl::Optional, cl::init(false), cl::desc("Print statistics accumulated during optimization")); -cl::list Warnings("W", cl::Prefix, - cl::desc("Provide warnings for additional classes of errors"), - cl::value_desc("warning category")); - -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// //=== ADVANCED OPTIONS -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// static cl::opt ConfigDir("config-dir", cl::Optional, - cl::desc("Specify a configuration directory to override defaults"), - cl::value_desc("directory")); + cl::desc("Specify configuration directory to override defaults"), + cl::value_desc("dir")); static cl::opt EmitRawCode("emit-raw-code", cl::Hidden, cl::Optional, cl::desc("Emit raw, unoptimized code")); @@ -175,30 +199,30 @@ static cl::opt PipeCommands("pipe", cl::Optional, cl::desc("Invoke sub-commands by linking input/output with pipes")); static cl::opt KeepTemps("keep-temps", cl::Optional, - cl::desc("Don't delete the temporary files created during compilation")); + cl::desc("Don't delete temporary files created by llvmc")); -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// //=== POSITIONAL OPTIONS -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// -static cl::list Files(cl::Positional, cl::OneOrMore, +static cl::list Files(cl::Positional, cl::ZeroOrMore, cl::desc("[Sources/objects/libraries]")); static cl::list Languages("x", cl::ZeroOrMore, cl::desc("Specify the source language for subsequent files"), cl::value_desc("language")); -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// //=== GetFileType - determine type of a file -//===------------------------------------------------------------------------=== -const std::string GetFileType(const std::string& fname, unsigned pos ) { +//===----------------------------------------------------------------------===// +const std::string GetFileType(const std::string& fname, unsigned pos) { static std::vector::iterator langIt = Languages.begin(); static std::string CurrLang = ""; // If a -x LANG option has been specified .. - if ( langIt != Languages.end() ) + if (langIt != Languages.end()) // If the -x LANG option came before the current file on command line - if ( Languages.getPosition( langIt - Languages.begin() ) < pos ) { + if (Languages.getPosition( langIt - Languages.begin() ) < pos) { // use that language CurrLang = *langIt++; return CurrLang; @@ -209,11 +233,22 @@ const std::string GetFileType(const std::string& fname, unsigned pos ) { return CurrLang; // use that language // otherwise just determine lang from the filename's suffix - return fname.substr( fname.rfind('.',fname.size()) + 1 ); + return fname.substr(fname.rfind('.', fname.size()) + 1); } } // end anonymous namespace +void handleTerminatingOptions(CompilerDriver* CD) { + if (!PrintFileName.empty()) { + sys::Path path = CD->GetPathForLinkageItem(PrintFileName, false); + std::string p = path.toString(); + if (p.empty()) + std::cout << "Can't locate `" << PrintFileName << "'.\n"; + else + std::cout << p << '\n'; + exit(0); + } +} /// @brief The main program for llvmc int main(int argc, char **argv) { @@ -223,7 +258,7 @@ int main(int argc, char **argv) { try { // Parse the command line options - cl::ParseCommandLineOptions(argc, argv, + cl::ParseCommandLineOptions(argc, argv, " LLVM Compiler Driver (llvmc)\n\n" " This program provides easy invocation of the LLVM tool set\n" " and other compiler tools.\n" @@ -236,8 +271,6 @@ int main(int argc, char **argv) { if (OutputFilename.empty()) if (OptLevel == CompilerDriver::LINKING) OutputFilename = "a.out"; - else - throw std::string("An output file must be specified. Please use the -o option"); // Construct the ConfigDataProvider object LLVMC_ConfigDataProvider Provider; @@ -248,31 +281,33 @@ int main(int argc, char **argv) { // If the LLVM_LIB_SEARCH_PATH environment variable is // set, append it to the list of places to search for libraries - std::string srchPath = getenv("LLVM_LIB_SEARCH_PATH"); - if (!srchPath.empty()) - LibPaths.push_back(srchPath); + char *srchPath = getenv("LLVM_LIB_SEARCH_PATH"); + if (srchPath != NULL && strlen(srchPath) != 0) + LibPaths.push_back(std::string(srchPath)); // Set the driver flags based on command line options unsigned flags = 0; if (Verbose) flags |= CompilerDriver::VERBOSE_FLAG; if (Debug) flags |= CompilerDriver::DEBUG_FLAG; if (DryRun) flags |= CompilerDriver::DRY_RUN_FLAG; - if (ForceOutput) flags |= CompilerDriver::FORCE_FLAG; if (Native) flags |= CompilerDriver::EMIT_NATIVE_FLAG; if (EmitRawCode) flags |= CompilerDriver::EMIT_RAW_FLAG; if (KeepTemps) flags |= CompilerDriver::KEEP_TEMPS_FLAG; if (ShowStats) flags |= CompilerDriver::SHOW_STATS_FLAG; if (TimeActions) flags |= CompilerDriver::TIME_ACTIONS_FLAG; - if (TimePassesIsEnabled) flags |= CompilerDriver::TIME_PASSES_FLAG; + if (StripOutput) flags |= CompilerDriver::STRIP_OUTPUT_FLAG; CD->setDriverFlags(flags); - // Specify requred parameters + // Specify required parameters CD->setFinalPhase(FinalPhase); CD->setOptimization(OptLevel); CD->setOutputMachine(OutputMachine); CD->setIncludePaths(Includes); CD->setSymbolDefines(Defines); CD->setLibraryPaths(LibPaths); + CD->setfPassThrough(fOpts); + CD->setMPassThrough(MOpts); + CD->setWPassThrough(WOpts); // Provide additional tool arguments if (!PreprocessorToolOpts.empty()) @@ -286,46 +321,52 @@ int main(int argc, char **argv) { if (!LinkerToolOpts.empty()) CD->setPhaseArgs(CompilerDriver::LINKING, LinkerToolOpts); + // Check for options that cause us to terminate before any significant work + // is done. + handleTerminatingOptions(CD); + // Prepare the list of files to be compiled by the CompilerDriver. CompilerDriver::InputList InpList; std::vector::iterator fileIt = Files.begin(); std::vector::iterator libIt = Libraries.begin(); unsigned libPos = 0, filePos = 0; while ( 1 ) { - if ( libIt != Libraries.end() ) + if (libIt != Libraries.end()) libPos = Libraries.getPosition( libIt - Libraries.begin() ); else libPos = 0; - if ( fileIt != Files.end() ) - filePos = Files.getPosition( fileIt - Files.begin() ); + if (fileIt != Files.end()) + filePos = Files.getPosition(fileIt - Files.begin()); else filePos = 0; - if ( filePos != 0 && (libPos == 0 || filePos < libPos) ) { + if (filePos != 0 && (libPos == 0 || filePos < libPos)) { // Add a source file - InpList.push_back( std::make_pair(*fileIt, GetFileType(*fileIt,filePos))); + InpList.push_back(std::make_pair(*fileIt, + GetFileType(*fileIt, filePos))); ++fileIt; - } - else if ( libPos != 0 && (filePos == 0 || libPos < filePos) ) { + } else if ( libPos != 0 && (filePos == 0 || libPos < filePos) ) { // Add a library - InpList.push_back( std::make_pair(*libIt++,"")); + InpList.push_back(std::make_pair(*libIt++, "")); } else break; // we're done with the list } // Tell the driver to do its thing - int result = CD->execute(InpList,sys::Path(OutputFilename)); + std::string ErrMsg; + int result = CD->execute(InpList, sys::Path(OutputFilename), ErrMsg); if (result != 0) { - throw std::string("Error executing actions. Terminated."); + std::cerr << argv[0] << ": " << ErrMsg << '\n'; return result; } // All is good, return success return 0; } catch (const std::string& msg) { - std::cerr << argv[0] << ": " << msg << "\n"; + std::cerr << argv[0] << ": " << msg << '\n'; } catch (...) { std::cerr << argv[0] << ": Unexpected unknown exception occurred.\n"; } + return 1; }