X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-ld%2Fllvm-ld.cpp;h=bb3f625e23c73461572a770204533fc0a1854d9b;hb=81361d6a28eb29988fef865afaf182f7fe1511ad;hp=2aa6d18350edc373f62b7294e404348e9de3080c;hpb=bb3f3d357fb25a39c9b4ca9a5ace047b5efd518c;p=oota-llvm.git diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp index 2aa6d18350e..bb3f625e23c 100644 --- a/tools/llvm-ld/llvm-ld.cpp +++ b/tools/llvm-ld/llvm-ld.cpp @@ -11,7 +11,7 @@ // system 'ld' conventions. As such, the default output file is ./a.out. // Additionally, this program outputs a shell script that is used to invoke LLI // to execute the program. In this manner, the generated executable (a.out for -// example), is directly executable, whereas the bytecode file actually lives in +// example), is directly executable, whereas the bitcode file actually lives in // the a.out.bc file generated by this program. Also, Force is on by default. // // Note that if someone (or a script) deletes the executable program generated, @@ -26,7 +26,6 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" #include "llvm/Bitcode/ReaderWriter.h" -#include "llvm/Bytecode/Writer.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetMachineRegistry.h" @@ -41,11 +40,9 @@ #include using namespace llvm; -cl::opt Bitcode("bitcode"); - // Input/Output Options static cl::list InputFilenames(cl::Positional, cl::OneOrMore, - cl::desc("")); + cl::desc("")); static cl::opt OutputFilename("o", cl::init("a.out"), cl::desc("Override output filename"), @@ -69,18 +66,12 @@ static cl::opt LinkAsLibrary("link-as-library", static cl::alias Relink("r", cl::aliasopt(LinkAsLibrary), cl::desc("Alias for -link-as-library")); -static cl::opt - MachineArch("march", cl::desc("Architecture to generate assembly for:")); - static cl::opt Native("native", cl::desc("Generate a native binary instead of a shell script")); static cl::optNativeCBE("native-cbe", cl::desc("Generate a native binary with the C backend and GCC")); -static cl::optDisableCompression("disable-compression", cl::init(true), - cl::desc("Disable writing of compressed bytecode files")); - static cl::list PostLinkOpts("post-link-opts", cl::value_desc("path"), cl::desc("Run one or more optimization programs after linking")); @@ -209,11 +200,11 @@ static void RemoveEnv(const char * name, char ** const envp) { return; } -/// GenerateBytecode - generates a bytecode file from the module provided -void GenerateBytecode(Module* M, const std::string& FileName) { +/// GenerateBitcode - generates a bitcode file from the module provided +void GenerateBitcode(Module* M, const std::string& FileName) { if (Verbose) - cout << "Generating Bytecode To " << FileName << '\n'; + cout << "Generating Bitcode To " << FileName << '\n'; // Create the output file. std::ios::openmode io_mode = std::ios::out | std::ios::trunc | @@ -222,27 +213,22 @@ void GenerateBytecode(Module* M, const std::string& FileName) { if (!Out.good()) PrintAndExit("error opening '" + FileName + "' for writing!"); - // Ensure that the bytecode file gets removed from the disk if we get a + // Ensure that the bitcode file gets removed from the disk if we get a // terminating signal. sys::RemoveFileOnSignal(sys::Path(FileName)); // Write it out - if (Bitcode) { - WriteBitcodeToFile(M, Out); - } else { - OStream L(Out); - WriteBytecodeToFile(M, L, !DisableCompression); - } + WriteBitcodeToFile(M, Out); - // Close the bytecode file. + // Close the bitcode file. Out.close(); } /// GenerateAssembly - generates a native assembly language source file from the -/// specified bytecode file. +/// specified bitcode file. /// /// Inputs: -/// InputFilename - The name of the input bytecode file. +/// InputFilename - The name of the input bitcode file. /// OutputFilename - The name of the file to generate. /// llc - The pathname to use for LLC. /// envp - The environment to use when running LLC. @@ -253,7 +239,7 @@ static int GenerateAssembly(const std::string &OutputFilename, const std::string &InputFilename, const sys::Path &llc, std::string &ErrMsg ) { - // Run LLC to convert the bytecode file into assembly code. + // Run LLC to convert the bitcode file into assembly code. std::vector args; args.push_back(llc.c_str()); args.push_back("-f"); @@ -270,12 +256,12 @@ static int GenerateAssembly(const std::string &OutputFilename, return sys::Program::ExecuteAndWait(llc, &args[0], 0, 0, 0, 0, &ErrMsg); } -/// GenerateCFile - generates a C source file from the specified bytecode file. +/// GenerateCFile - generates a C source file from the specified bitcode file. static int GenerateCFile(const std::string &OutputFile, const std::string &InputFile, const sys::Path &llc, std::string& ErrMsg) { - // Run LLC to convert the bytecode file into C. + // Run LLC to convert the bitcode file into C. std::vector args; args.push_back(llc.c_str()); args.push_back("-march=c"); @@ -294,10 +280,10 @@ static int GenerateCFile(const std::string &OutputFile, } /// GenerateNative - generates a native object file from the -/// specified bytecode file. +/// specified bitcode file. /// /// Inputs: -/// InputFilename - The name of the input bytecode file. +/// InputFilename - The name of the input bitcode file. /// OutputFilename - The name of the file to generate. /// NativeLinkItems - The native libraries, files, code with which to link /// LibPaths - The list of directories in which to find libraries. @@ -337,52 +323,58 @@ static int GenerateNative(const std::string &OutputFilename, // We can't just assemble and link the file with the system assembler // and linker because we don't know where to put the _start symbol. // GCC mysteriously knows how to do it. - std::vector args; + std::vector args; args.push_back(gcc.c_str()); args.push_back("-fno-strict-aliasing"); args.push_back("-O3"); args.push_back("-o"); - args.push_back(OutputFilename.c_str()); - args.push_back(InputFilename.c_str()); + args.push_back(OutputFilename); + args.push_back(InputFilename); // Add in the library paths for (unsigned index = 0; index < LibPaths.size(); index++) { args.push_back("-L"); - args.push_back(LibPaths[index].c_str()); + args.push_back(LibPaths[index]); } // Add the requested options for (unsigned index = 0; index < XLinker.size(); index++) { - args.push_back(XLinker[index].c_str()); - args.push_back(Libraries[index].c_str()); + args.push_back(XLinker[index]); + args.push_back(Libraries[index]); } // Add in the libraries to link. for (unsigned index = 0; index < LinkItems.size(); index++) if (LinkItems[index].first != "crtend") { - if (LinkItems[index].second) { - std::string lib_name = "-l" + LinkItems[index].first; - args.push_back(lib_name.c_str()); - } else - args.push_back(LinkItems[index].first.c_str()); + if (LinkItems[index].second) + args.push_back("-l" + LinkItems[index].first); + else + args.push_back(LinkItems[index].first); } - args.push_back(0); + + // Now that "args" owns all the std::strings for the arguments, call the c_str + // method to get the underlying string array. We do this game so that the + // std::string array is guaranteed to outlive the const char* array. + std::vector Args; + for (unsigned i = 0, e = args.size(); i != e; ++i) + Args.push_back(args[i].c_str()); + Args.push_back(0); if (Verbose) { cout << "Generating Native Executable With:\n"; - PrintCommand(args); + PrintCommand(Args); } // Run the compiler to assembly and link together the program. int R = sys::Program::ExecuteAndWait( - gcc, &args[0], (const char**)clean_env, 0, 0, 0, &ErrMsg); + gcc, &Args[0], (const char**)clean_env, 0, 0, 0, &ErrMsg); delete [] clean_env; return R; } /// EmitShellScript - Output the wrapper file that invokes the JIT on the LLVM -/// bytecode file for the program. +/// bitcode file for the program. static void EmitShellScript(char **argv) { if (Verbose) cout << "Emitting Shell Script\n"; @@ -477,13 +469,13 @@ int main(int argc, char **argv, char **envp) { progname = sys::Path(argv[0]).getBasename(); // Parse the command line options - cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); + cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); sys::PrintStackTraceOnErrorSignal(); // Construct a Linker (now that Verbose is set) Linker TheLinker(progname, OutputFilename, Verbose); - // Keep track of the native link items (versus the bytecode items) + // Keep track of the native link items (versus the bitcode items) Linker::ItemList NativeLinkItems; // Add library paths to the linker @@ -522,10 +514,10 @@ int main(int argc, char **argv, char **envp) { // Optimize the module Optimize(Composite.get()); - // Generate the bytecode for the optimized module. - std::string RealBytecodeOutput = OutputFilename; - if (!LinkAsLibrary) RealBytecodeOutput += ".bc"; - GenerateBytecode(Composite.get(), RealBytecodeOutput); + // Generate the bitcode for the optimized module. + std::string RealBitcodeOutput = OutputFilename; + if (!LinkAsLibrary) RealBitcodeOutput += ".bc"; + GenerateBitcode(Composite.get(), RealBitcodeOutput); // If we are not linking a library, generate either a native executable // or a JIT shell script, depending upon what the user wants. @@ -550,17 +542,17 @@ int main(int argc, char **argv, char **envp) { const char* args[4]; args[0] = I->c_str(); - args[1] = RealBytecodeOutput.c_str(); + args[1] = RealBitcodeOutput.c_str(); args[2] = tmp_output.c_str(); args[3] = 0; if (0 == sys::Program::ExecuteAndWait(prog, args, 0,0,0,0, &ErrMsg)) { - if (tmp_output.isBytecodeFile() || tmp_output.isBitcodeFile()) { - sys::Path target(RealBytecodeOutput); + if (tmp_output.isBitcodeFile() || tmp_output.isBitcodeFile()) { + sys::Path target(RealBitcodeOutput); target.eraseFromDisk(); if (tmp_output.renamePathOnDisk(target, &ErrMsg)) PrintAndExit(ErrMsg, 2); } else - PrintAndExit("Post-link optimization output is not bytecode"); + PrintAndExit("Post-link optimization output is not bitcode"); } else { PrintAndExit(ErrMsg); } @@ -568,9 +560,9 @@ int main(int argc, char **argv, char **envp) { } // If the user wants to generate a native executable, compile it from the - // bytecode file. + // bitcode file. // - // Otherwise, create a script that will run the bytecode through the JIT. + // Otherwise, create a script that will run the bitcode through the JIT. if (Native) { // Name of the Assembly Language output file sys::Path AssemblyFile ( OutputFilename); @@ -589,9 +581,9 @@ int main(int argc, char **argv, char **envp) { if (gcc.isEmpty()) PrintAndExit("Failed to find gcc"); - // Generate an assembly language file for the bytecode. + // Generate an assembly language file for the bitcode. std::string ErrMsg; - if (0 != GenerateAssembly(AssemblyFile.toString(), RealBytecodeOutput, + if (0 != GenerateAssembly(AssemblyFile.toString(), RealBitcodeOutput, llc, ErrMsg)) PrintAndExit(ErrMsg); @@ -618,10 +610,10 @@ int main(int argc, char **argv, char **envp) { if (gcc.isEmpty()) PrintAndExit("Failed to find gcc"); - // Generate an assembly language file for the bytecode. + // Generate an assembly language file for the bitcode. std::string ErrMsg; if (0 != GenerateCFile( - CFile.toString(), RealBytecodeOutput, llc, ErrMsg)) + CFile.toString(), RealBitcodeOutput, llc, ErrMsg)) PrintAndExit(ErrMsg); if (0 != GenerateNative(OutputFilename, CFile.toString(), @@ -640,11 +632,11 @@ int main(int argc, char **argv, char **envp) { if (sys::Path(OutputFilename).makeExecutableOnDisk(&ErrMsg)) PrintAndExit(ErrMsg); - // Make the bytecode file readable and directly executable in LLEE as well - if (sys::Path(RealBytecodeOutput).makeExecutableOnDisk(&ErrMsg)) + // Make the bitcode file readable and directly executable in LLEE as well + if (sys::Path(RealBitcodeOutput).makeExecutableOnDisk(&ErrMsg)) PrintAndExit(ErrMsg); - if (sys::Path(RealBytecodeOutput).makeReadableOnDisk(&ErrMsg)) + if (sys::Path(RealBitcodeOutput).makeReadableOnDisk(&ErrMsg)) PrintAndExit(ErrMsg); } } catch (const std::string& msg) {