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

[Chris Lattner]

Changes in directory llvm/tools/llvm-dis:

Makefile updated: 1.21 -> 1.22
llvm-dis.cpp updated: 1.60 -> 1.61
---
Log message:

switch tools to bitcode instead of bytecode


---
Diffs of the changes:  (+8 -20)

 Makefile     |    2 +-
 llvm-dis.cpp |   26 +++++++-------------------
 2 files changed, 8 insertions(+), 20 deletions(-)


Index: llvm/tools/llvm-dis/Makefile
diff -u llvm/tools/llvm-dis/Makefile:1.21 llvm/tools/llvm-dis/Makefile:1.22
--- llvm/tools/llvm-dis/Makefile:1.21	Sun Apr 22 01:31:02 2007
+++ llvm/tools/llvm-dis/Makefile	Sun May  6 04:29:57 2007
@@ -9,7 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-dis
-LINK_COMPONENTS := bcreader bitreader
+LINK_COMPONENTS := bitreader
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common


Index: llvm/tools/llvm-dis/llvm-dis.cpp
diff -u llvm/tools/llvm-dis/llvm-dis.cpp:1.60 llvm/tools/llvm-dis/llvm-dis.cpp:1.61
--- llvm/tools/llvm-dis/llvm-dis.cpp:1.60	Sat May  5 23:43:36 2007
+++ llvm/tools/llvm-dis/llvm-dis.cpp	Sun May  6 04:29:57 2007
@@ -19,9 +19,7 @@
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Bytecode/Reader.h"
 #include "llvm/Assembly/PrintModulePass.h"
-#include "llvm/Support/Compressor.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -45,9 +43,6 @@
 static cl::opt<bool>
 DontPrint("disable-output", cl::desc("Don't output the .ll file"), cl::Hidden);
 
-static cl::opt<bool>
-Bitcode("bitcode", cl::desc("Read a bitcode file"));
-
 int main(int argc, char **argv) {
   llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.
   try {
@@ -59,21 +54,14 @@
 
     std::auto_ptr<Module> M;
    
-    if (Bitcode) {
-      MemoryBuffer *Buffer
-        = MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size());
+    MemoryBuffer *Buffer
+      = MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size());
 
-      if (Buffer == 0)
-        ErrorMessage = "Error reading file '" + InputFilename + "'";
-      else
-        M.reset(ParseBitcodeFile(Buffer, &ErrorMessage));
-      
-      delete Buffer;
-    } else {
-      M.reset(ParseBytecodeFile(InputFilename,
-                                Compressor::decompressToNewBuffer,
-                                &ErrorMessage));
-    }
+    if (Buffer == 0)
+      ErrorMessage = "Error reading file '" + InputFilename + "'";
+    else
+      M.reset(ParseBitcodeFile(Buffer, &ErrorMessage));
+    delete Buffer;
 
     if (M.get() == 0) {
       cerr << argv[0] << ": ";