[llvm-commits] CVS: llvm/tools/llvm2cpp/Makefile llvm2cpp.cpp
Chris Lattner
lattner at cs.uiuc.edu
Thu Jul 6 16:49:09 PDT 2006
Changes in directory llvm/tools/llvm2cpp:
Makefile updated: 1.5 -> 1.6
llvm2cpp.cpp updated: 1.4 -> 1.5
---
Log message:
Fix PR819: http://llvm.org/PR819 , llvm2cpp should read .bc files, not .ll files.
---
Diffs of the changes: (+56 -83)
Makefile | 5 --
llvm2cpp.cpp | 134 +++++++++++++++++++++++------------------------------------
2 files changed, 56 insertions(+), 83 deletions(-)
Index: llvm/tools/llvm2cpp/Makefile
diff -u llvm/tools/llvm2cpp/Makefile:1.5 llvm/tools/llvm2cpp/Makefile:1.6
--- llvm/tools/llvm2cpp/Makefile:1.5 Thu Jun 1 19:39:08 2006
+++ llvm/tools/llvm2cpp/Makefile Thu Jul 6 18:48:57 2006
@@ -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
Index: llvm/tools/llvm2cpp/llvm2cpp.cpp
diff -u llvm/tools/llvm2cpp/llvm2cpp.cpp:1.4 llvm/tools/llvm2cpp/llvm2cpp.cpp:1.5
--- llvm/tools/llvm2cpp/llvm2cpp.cpp:1.4 Thu Jul 6 13:01:01 2006
+++ llvm/tools/llvm2cpp/llvm2cpp.cpp Thu Jul 6 18:48:57 2006
@@ -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 @@
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;
- }
-
- 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 .cpp to it
}
- }
+ OutputFilename += ".cpp";
- if (!Out->good()) {
- std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
- return 1;
- }
+ 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;
+ }
- WriteModuleToCppFile(M.get(), *Out);
+ 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));
+ }
+ }
- } 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;
}
More information about the llvm-commits
mailing list