X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-as%2Fllvm-as.cpp;h=dd29bc19e83d7b47ba57be2585d4711cec8c106f;hb=c597a888c076bec0b22d68c707898e903b2dcb0e;hp=c66dd598b9bb8f4f4cab59f367136ad4571be2dd;hpb=5ff62e90d0bc321206023897edc1e2691cb0fbb6;p=oota-llvm.git diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index c66dd598b9b..dd29bc19e83 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -1,27 +1,38 @@ -//===------------------------------------------------------------------------=== -// LLVM 'AS' UTILITY +//===--- llvm-as.cpp - The low-level LLVM assembler -----------------------===// +// +// 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 utility may be invoked in the following manner: -// as --help - Output information about command line switches -// as [options] - Read LLVM assembly from stdin, write bytecode to stdout -// as [options] x.ll - Read LLVM assembly from the x.ll file, write bytecode -// to the x.bc file. -// -//===------------------------------------------------------------------------=== +// 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 +// to the x.bc file. +// +//===----------------------------------------------------------------------===// #include "llvm/Module.h" #include "llvm/Assembly/Parser.h" #include "llvm/Bytecode/Writer.h" -#include "Support/CommandLine.h" -#include "Support/Signals.h" +#include "llvm/Analysis/Verifier.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/ManagedStatic.h" +#include "llvm/Support/Streams.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/System/Signals.h" #include +#include #include -using std::cerr; +using namespace llvm; -static cl::opt +static cl::opt InputFilename(cl::Positional, cl::desc(""), cl::init("-")); -static cl::opt +static cl::opt OutputFilename("o", cl::desc("Override output filename"), cl::value_desc("filename")); @@ -31,69 +42,106 @@ Force("f", cl::desc("Overwrite output files")); static cl::opt DumpAsm("d", cl::desc("Print assembly as parsed"), cl::Hidden); +static cl::opt +NoCompress("disable-compression", cl::init(false), + cl::desc("Don't compress the generated bytecode")); + +static cl::opt +DisableVerify("disable-verify", cl::Hidden, + cl::desc("Do not run verifier on input LLVM (dangerous!)")); + int main(int argc, char **argv) { + llvm_shutdown_obj X; // Call llvm_shutdown() on exit. 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)); + ParseError Err; + std::auto_ptr M(ParseAssemblyFile(InputFilename,&Err)); if (M.get() == 0) { - cerr << "assembly didn't read correctly.\n"; + cerr << argv[0] << ": " << Err.getMessage() << "\n"; return 1; } - - if (DumpAsm) cerr << "Here's the assembly:\n" << M.get(); - if (OutputFilename != "") { // Specified an output filename? - if (!Force && std::ifstream(OutputFilename.c_str())) { - // If force is not specified, make sure not to overwrite a file! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" - << "Use -f command line argument to force output\n"; + if (!DisableVerify) { + std::string Err; + if (verifyModule(*M.get(), ReturnStatusAction, &Err)) { + cerr << argv[0] + << ": assembly parsed, but does not verify as correct!\n"; + cerr << Err; return 1; + } + } + + if (DumpAsm) 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! + 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; } - Out = new std::ofstream(OutputFilename.c_str()); } else { if (InputFilename == "-") { - OutputFilename = "-"; - Out = &std::cout; + OutputFilename = "-"; + Out = &std::cout; } 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); + 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"; + 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! - cerr << "Error opening '" << OutputFilename << "': File exists!\n" + 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()); - // Make sure that the Out file gets unlink'd from the disk if we get a + 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 - RemoveFileOnSignal(OutputFilename); + sys::RemoveFileOnSignal(sys::Path(OutputFilename)); } } - + if (!Out->good()) { - cerr << "Error opening " << OutputFilename << "!\n"; + cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; return 1; } - - WriteBytecodeToFile(M.get(), *Out); - } catch (const ParseException &E) { - cerr << E.getMessage() << std::endl; - return 1; + + if (Force || !CheckBytecodeOutputToConsole(Out,true)) { + OStream L(*Out); + WriteBytecodeToFile(M.get(), L, !NoCompress); + } + } catch (const std::string& msg) { + cerr << argv[0] << ": " << msg << "\n"; + exitCode = 1; + } catch (...) { + cerr << argv[0] << ": Unexpected unknown exception occurred.\n"; + exitCode = 1; } if (Out != &std::cout) delete Out; - return 0; + return exitCode; }