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

[Chris Lattner]

Changes in directory llvm/tools/llvm-extract:

Makefile updated: 1.7 -> 1.8
llvm-extract.cpp updated: 1.38 -> 1.39
---
Log message:

switch tools to bitcode instead of bytecode


---
Diffs of the changes:  (+9 -24)

 Makefile         |    2 +-
 llvm-extract.cpp |   31 ++++++++-----------------------
 2 files changed, 9 insertions(+), 24 deletions(-)


Index: llvm/tools/llvm-extract/Makefile
diff -u llvm/tools/llvm-extract/Makefile:1.7 llvm/tools/llvm-extract/Makefile:1.8
--- llvm/tools/llvm-extract/Makefile:1.7	Sun May  6 00:13:17 2007
+++ llvm/tools/llvm-extract/Makefile	Sun May  6 04:29:57 2007
@@ -10,6 +10,6 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-extract
-LINK_COMPONENTS := bcreader bcwriter ipo bitreader bitwriter
+LINK_COMPONENTS := ipo bitreader bitwriter
 
 include $(LEVEL)/Makefile.common


Index: llvm/tools/llvm-extract/llvm-extract.cpp
diff -u llvm/tools/llvm-extract/llvm-extract.cpp:1.38 llvm/tools/llvm-extract/llvm-extract.cpp:1.39
--- llvm/tools/llvm-extract/llvm-extract.cpp:1.38	Sun May  6 00:13:17 2007
+++ llvm/tools/llvm-extract/llvm-extract.cpp	Sun May  6 04:29:57 2007
@@ -15,23 +15,17 @@
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Bytecode/Reader.h"
-#include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Compressor.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Streams.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
 #include <memory>
 #include <fstream>
 using namespace llvm;
 
-cl::opt<bool> Bitcode("bitcode");
-
 // InputFilename - The filename to read from.
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input bytecode file>"),
@@ -63,20 +57,15 @@
 
   std::auto_ptr<Module> M;
   
-  if (Bitcode) {
-    MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&InputFilename[0],
-                                                        InputFilename.size());
-    if (Buffer == 0) {
-      cerr << "Error reading file '" + InputFilename + "'";
-      return 1;
-    } else {
-      M.reset(ParseBitcodeFile(Buffer));
-    }
-    delete Buffer;
+  MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&InputFilename[0],
+                                                      InputFilename.size());
+  if (Buffer == 0) {
+    cerr << "Error reading file '" + InputFilename + "'";
+    return 1;
   } else {
-    M.reset(ParseBytecodeFile(InputFilename,
-                              Compressor::decompressToNewBuffer));
+    M.reset(ParseBitcodeFile(Buffer));
   }
+  delete Buffer;
   
   if (M.get() == 0) {
     cerr << argv[0] << ": bytecode didn't read correctly.\n";
@@ -120,11 +109,7 @@
     Out = &std::cout;
   }
 
-  OStream L(*Out);
-  if (Bitcode)
-    Passes.add(CreateBitcodeWriterPass(*Out));
-  else 
-    Passes.add(new WriteBytecodePass(&L));  // Write bytecode to file...
+  Passes.add(CreateBitcodeWriterPass(*Out));
   Passes.run(*M.get());
 
   if (Out != &std::cout)