X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-as%2Fllvm-as.cpp;h=d6f191961daa27967d12d0761bed13e2048ccd54;hb=318b7cc7f10d41370929ff93274de29c11f87b81;hp=ad7ad29c9607cad9efddedd1f9adea2b182954ba;hpb=3da94aec4d429b2ba0f65fa040c33650cade196b;p=oota-llvm.git diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index ad7ad29c960..d6f191961da 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -2,30 +2,32 @@ // // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group and is distributed under -// the University of Illinois Open Source License. See LICENSE.TXT for details. +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // // This utility may be invoked in the following manner: // llvm-as --help - Output information about command line switches -// llvm-as [options] - Read LLVM asm from stdin, write bytecode to stdout -// llvm-as [options] x.ll - Read LLVM asm from the x.ll file, write bytecode +// llvm-as [options] - Read LLVM asm from stdin, write bitcode to stdout +// llvm-as [options] x.ll - Read LLVM asm from the x.ll file, write bitcode // to the x.bc file. // -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// -#include "llvm/Module.h" -#include "llvm/Assembly/Parser.h" -#include "llvm/Bytecode/Writer.h" +#include "llvm/IR/LLVMContext.h" #include "llvm/Analysis/Verifier.h" +#include "llvm/Assembly/Parser.h" +#include "llvm/Bitcode/ReaderWriter.h" +#include "llvm/IR/Module.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/ManagedStatic.h" +#include "llvm/Support/PrettyStackTrace.h" +#include "llvm/Support/Signals.h" +#include "llvm/Support/SourceMgr.h" #include "llvm/Support/SystemUtils.h" -#include "llvm/System/Signals.h" -#include -#include +#include "llvm/Support/ToolOutputFile.h" #include - using namespace llvm; static cl::opt @@ -36,111 +38,82 @@ OutputFilename("o", cl::desc("Override output filename"), cl::value_desc("filename")); static cl::opt -Force("f", cl::desc("Overwrite output files")); +Force("f", cl::desc("Enable binary output on terminals")); static cl::opt -DumpAsm("d", cl::desc("Print assembly as parsed"), cl::Hidden); +DisableOutput("disable-output", cl::desc("Disable output"), cl::init(false)); static cl::opt -NoCompress("disable-compression", cl::init(false), - cl::desc("Don't compress the generated bytecode")); +DumpAsm("d", cl::desc("Print assembly as parsed"), cl::Hidden); static cl::opt DisableVerify("disable-verify", cl::Hidden, cl::desc("Do not run verifier on input LLVM (dangerous!)")); -int main(int argc, char **argv) { - cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .bc assembler\n"); - sys::PrintStackTraceOnErrorSignal(); - - int exitCode = 0; - std::ostream *Out = 0; - try { - // Parse the file now... - std::auto_ptr M(ParseAssemblyFile(InputFilename)); - if (M.get() == 0) { - std::cerr << argv[0] << ": assembly didn't read correctly.\n"; - return 1; - } - - try { - if (!DisableVerify) - verifyModule(*M.get(), ThrowExceptionAction); - } catch (const std::string &Err) { - std::cerr << argv[0] - << ": assembly parsed, but does not verify as correct!\n"; - std::cerr << Err; - return 1; - } - - if (DumpAsm) std::cerr << "Here's the assembly:\n" << *M.get(); - - if (OutputFilename != "") { // Specified an output filename? - if (OutputFilename != "-") { // Not stdout? - if (!Force && std::ifstream(OutputFilename.c_str())) { - // If force is not specified, make sure not to overwrite a file! - std::cerr << argv[0] << ": error opening '" << OutputFilename - << "': file exists!\n" - << "Use -f command line argument to force output\n"; - return 1; - } - Out = new std::ofstream(OutputFilename.c_str(), std::ios::out | - std::ios::trunc | std::ios::binary); - } else { // Specified stdout - // FIXME: cout is not binary! - Out = &std::cout; - } +static void WriteOutputFile(const Module *M) { + // Infer the output filename if needed. + if (OutputFilename.empty()) { + if (InputFilename == "-") { + OutputFilename = "-"; } else { - if (InputFilename == "-") { - OutputFilename = "-"; - Out = &std::cout; + std::string IFN = InputFilename; + int Len = IFN.length(); + if (IFN[Len-3] == '.' && IFN[Len-2] == 'l' && IFN[Len-1] == 'l') { + // Source ends in .ll + OutputFilename = std::string(IFN.begin(), IFN.end()-3); } else { - std::string IFN = InputFilename; - int Len = IFN.length(); - if (IFN[Len-3] == '.' && IFN[Len-2] == 'l' && IFN[Len-1] == 'l') { - // Source ends in .ll - OutputFilename = std::string(IFN.begin(), IFN.end()-3); - } else { - OutputFilename = IFN; // Append a .bc to it - } - OutputFilename += ".bc"; - - if (!Force && std::ifstream(OutputFilename.c_str())) { - // If force is not specified, make sure not to overwrite a file! - std::cerr << argv[0] << ": error opening '" << OutputFilename - << "': file exists!\n" - << "Use -f command line argument to force output\n"; - return 1; - } - - Out = new std::ofstream(OutputFilename.c_str(), std::ios::out | - std::ios::trunc | std::ios::binary); - // Make sure that the Out file gets unlinked from the disk if we get a - // SIGINT - sys::RemoveFileOnSignal(sys::Path(OutputFilename)); + OutputFilename = IFN; // Append a .bc to it } + OutputFilename += ".bc"; } + } - if (!Out->good()) { - std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; - return 1; - } + std::string ErrorInfo; + OwningPtr Out + (new tool_output_file(OutputFilename.c_str(), ErrorInfo, + raw_fd_ostream::F_Binary)); + if (!ErrorInfo.empty()) { + errs() << ErrorInfo << '\n'; + exit(1); + } - if (Force || !CheckBytecodeOutputToConsole(Out,true)) { - WriteBytecodeToFile(M.get(), *Out, !NoCompress); + if (Force || !CheckBitcodeOutputToConsole(Out->os(), true)) + WriteBitcodeToFile(M, Out->os()); + + // Declare success. + Out->keep(); +} + +int main(int argc, char **argv) { + // Print a stack trace if we signal out. + sys::PrintStackTraceOnErrorSignal(); + PrettyStackTraceProgram X(argc, argv); + LLVMContext &Context = getGlobalContext(); + llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. + cl::ParseCommandLineOptions(argc, argv, "llvm .ll -> .bc assembler\n"); + + // Parse the file now... + SMDiagnostic Err; + OwningPtr M(ParseAssemblyFile(InputFilename, Err, Context)); + if (M.get() == 0) { + Err.print(argv[0], errs()); + return 1; + } + + if (!DisableVerify) { + std::string Err; + if (verifyModule(*M.get(), ReturnStatusAction, &Err)) { + errs() << argv[0] + << ": assembly parsed, but does not verify as correct!\n"; + errs() << Err; + return 1; } - } catch (const ParseException &E) { - std::cerr << argv[0] << ": " << E.getMessage() << "\n"; - exitCode = 1; - } catch (const std::string& msg) { - std::cerr << argv[0] << ": " << msg << "\n"; - exitCode = 1; - } catch (...) { - std::cerr << argv[0] << ": Unexpected unknown exception occurred.\n"; - exitCode = 1; } - if (Out != &std::cout) delete Out; - return exitCode; -} + if (DumpAsm) errs() << "Here's the assembly:\n" << *M.get(); + + if (!DisableOutput) + WriteOutputFile(M.get()); + return 0; +}