[llvm-commits] CVS: llvm/tools/llvm2cpp/Makefile llvm2cpp.cpp

[Chris Lattner]

Changes in directory llvm/tools/llvm2cpp:

Makefile updated: 1.10 -> 1.11
llvm2cpp.cpp updated: 1.8 -> 1.9
---
Log message:

switch tools to bitcode instead of bytecode


---
Diffs of the changes:  (+7 -16)

 Makefile     |    2 +-
 llvm2cpp.cpp |   21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)


Index: llvm/tools/llvm2cpp/Makefile
diff -u llvm/tools/llvm2cpp/Makefile:1.10 llvm/tools/llvm2cpp/Makefile:1.11
--- llvm/tools/llvm2cpp/Makefile:1.10	Sun May  6 00:21:42 2007
+++ llvm/tools/llvm2cpp/Makefile	Sun May  6 04:29:57 2007
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvm2cpp
-LINK_COMPONENTS = bcreader bitreader
+LINK_COMPONENTS = bitreader
 
 include $(LEVEL)/Makefile.common
 


Index: llvm/tools/llvm2cpp/llvm2cpp.cpp
diff -u llvm/tools/llvm2cpp/llvm2cpp.cpp:1.8 llvm/tools/llvm2cpp/llvm2cpp.cpp:1.9
--- llvm/tools/llvm2cpp/llvm2cpp.cpp:1.8	Sun May  6 00:21:42 2007
+++ llvm/tools/llvm2cpp/llvm2cpp.cpp	Sun May  6 04:29:57 2007
@@ -18,7 +18,6 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Bytecode/Reader.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
@@ -31,8 +30,6 @@
 #include <memory>
 using namespace llvm;
 
-cl::opt<bool> Bitcode("bitcode");
-
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input LLVM bytecode file>"), 
   cl::init("-"));
@@ -54,18 +51,12 @@
   std::string ErrorMessage;
   
   std::auto_ptr<Module> M;
-  if (Bitcode) {
-    std::auto_ptr<MemoryBuffer> Buffer(
-         MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size()));
-    if (Buffer.get())
-      M.reset(ParseBitcodeFile(Buffer.get(), &ErrorMessage));
-    else
-      ErrorMessage = "Error reading file '" + InputFilename + "'";
-  } else {
-    M.reset(ParseBytecodeFile(InputFilename, 
-                              Compressor::decompressToNewBuffer,
-                              &ErrorMessage));
-  }
+  std::auto_ptr<MemoryBuffer> Buffer(
+       MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size()));
+  if (Buffer.get())
+    M.reset(ParseBitcodeFile(Buffer.get(), &ErrorMessage));
+  else
+    ErrorMessage = "Error reading file '" + InputFilename + "'";
   if (M.get() == 0) {
     std::cerr << argv[0] << ": ";
     if (ErrorMessage.size())