diff options
author | Chris Lattner <sabre@nondot.org> | 2006-07-06 23:48:57 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2006-07-06 23:48:57 +0000 |
commit | 8eaafdedb2ec19ceeeb664e23f636059fdbf3954 (patch) | |
tree | 0ad9601a242228f81c2080f50a3986c68b175374 /tools/llvm2cpp | |
parent | 148f440635598630718ee32aeee56fded466039c (diff) | |
download | external_llvm-8eaafdedb2ec19ceeeb664e23f636059fdbf3954.zip external_llvm-8eaafdedb2ec19ceeeb664e23f636059fdbf3954.tar.gz external_llvm-8eaafdedb2ec19ceeeb664e23f636059fdbf3954.tar.bz2 |
Fix PR819, llvm2cpp should read .bc files, not .ll files.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29030 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm2cpp')
-rw-r--r-- | tools/llvm2cpp/Makefile | 5 | ||||
-rw-r--r-- | tools/llvm2cpp/llvm2cpp.cpp | 132 |
2 files changed, 55 insertions, 82 deletions
diff --git a/tools/llvm2cpp/Makefile b/tools/llvm2cpp/Makefile index 9894803..d6b65c8 100644 --- a/tools/llvm2cpp/Makefile +++ b/tools/llvm2cpp/Makefile @@ -1,4 +1,4 @@ -##===- tools/llvm-as/Makefile ------------------------------*- Makefile -*-===## +##===- tools/llvm2cpp/Makefile -----------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # @@ -8,8 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = ../.. TOOLNAME = llvm2cpp -USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \ - LLVMSupport.a LLVMbzip2.a LLVMSystem.a +USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a include $(LEVEL)/Makefile.common diff --git a/tools/llvm2cpp/llvm2cpp.cpp b/tools/llvm2cpp/llvm2cpp.cpp index 7e322db..8d3653a 100644 --- a/tools/llvm2cpp/llvm2cpp.cpp +++ b/tools/llvm2cpp/llvm2cpp.cpp @@ -17,8 +17,7 @@ //===------------------------------------------------------------------------=== #include "llvm/Module.h" -#include "llvm/Assembly/Parser.h" -#include "llvm/Bytecode/Writer.h" +#include "llvm/Bytecode/Reader.h" #include "llvm/Analysis/Verifier.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/SystemUtils.h" @@ -31,7 +30,7 @@ using namespace llvm; static cl::opt<std::string> -InputFilename(cl::Positional, cl::desc("<input LLVM assembly file>"), +InputFilename(cl::Positional, cl::desc("<input LLVM bytecode file>"), cl::init("-")); static cl::opt<std::string> @@ -41,100 +40,75 @@ OutputFilename("o", cl::desc("Override output filename"), static cl::opt<bool> Force("f", cl::desc("Overwrite output files")); -static cl::opt<bool> -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 -> .cpp assembler\n"); sys::PrintStackTraceOnErrorSignal(); int exitCode = 0; std::ostream *Out = 0; - try { - // Parse the file now... - std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename)); - if (M.get() == 0) { - std::cerr << argv[0] << ": assembly didn't read correctly.\n"; - return 1; - } + std::string ErrorMessage; + std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage)); + if (M.get() == 0) { + std::cerr << argv[0] << ": "; + if (ErrorMessage.size()) + std::cerr << ErrorMessage << "\n"; + else + std::cerr << "bytecode didn't read correctly.\n"; + return 1; + } - // FIXME: llvm2cpp should read .bc files and thus not run the verifier - // explicitly! - if (!DisableVerify) { - std::string Err; - if (verifyModule(*M.get(), ReturnStatusAction, &Err)) { - std::cerr << argv[0] - << ": assembly parsed, but does not verify as correct!\n"; - std::cerr << Err; + 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; - } - } - - 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; } + Out = new std::ofstream(OutputFilename.c_str(), std::ios::out | + std::ios::trunc | std::ios::binary); + } else { // Specified stdout + Out = &std::cout; + } + } else { + if (InputFilename == "-") { + OutputFilename = "-"; + Out = &std::cout; } 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 .cpp to it - } - OutputFilename += ".cpp"; - - 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; - } + OutputFilename = IFN; // Append a .cpp to it + } + OutputFilename += ".cpp"; - 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)); + 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; } - } - if (!Out->good()) { - std::cerr << argv[0] << ": error opening " << OutputFilename << "!\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)); } + } - WriteModuleToCppFile(M.get(), *Out); - - } 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->good()) { + std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n"; + return 1; } + WriteModuleToCppFile(M.get(), *Out); + if (Out != &std::cout) delete Out; return exitCode; } |