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

[Chris Lattner]

Changes in directory llvm/tools/lli:

Makefile updated: 1.52 -> 1.53
lli.cpp updated: 1.71 -> 1.72
---
Log message:

switch tools to bitcode from bytecode


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

 Makefile |    2 +-
 lli.cpp  |   24 +++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)


Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.52 llvm/tools/lli/Makefile:1.53
--- llvm/tools/lli/Makefile:1.52	Sat May  5 23:58:26 2007
+++ llvm/tools/lli/Makefile	Sun May  6 04:32:02 2007
@@ -9,7 +9,7 @@
 
 LEVEL    := ../..
 TOOLNAME := lli
-LINK_COMPONENTS := jit interpreter native bcreader bitreader selectiondag
+LINK_COMPONENTS := jit interpreter native bitreader selectiondag
 
 # Enable JIT support
 include $(LEVEL)/Makefile.common


Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.71 llvm/tools/lli/lli.cpp:1.72
--- llvm/tools/lli/lli.cpp:1.71	Sat May  5 23:58:26 2007
+++ llvm/tools/lli/lli.cpp	Sun May  6 04:32:02 2007
@@ -17,13 +17,11 @@
 #include "llvm/ModuleProvider.h"
 #include "llvm/Type.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Bytecode/Reader.h"
 #include "llvm/CodeGen/LinkAllCodegenComponents.h"
 #include "llvm/ExecutionEngine/JIT.h"
 #include "llvm/ExecutionEngine/Interpreter.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Compressor.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/PluginLoader.h"
@@ -34,8 +32,6 @@
 using namespace llvm;
 
 namespace {
-  cl::opt<bool> Bitcode("bitcode");
-
   cl::opt<std::string>
   InputFile(cl::desc("<input bytecode>"), cl::Positional, cl::init("-"));
 
@@ -81,19 +77,13 @@
   // Load the bytecode...
   std::string ErrorMsg;
   ModuleProvider *MP = 0;
-  if (Bitcode) {
-    MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&InputFile[0],
-                                                        InputFile.size());
-    if (Buffer == 0)
-      ErrorMsg = "Error reading file '" + InputFile + "'";
-    else {
-      MP = getBitcodeModuleProvider(Buffer, &ErrorMsg);
-      if (!MP) delete Buffer;
-    }
-  } else {
-    MP = getBytecodeModuleProvider(InputFile, 
-                                   Compressor::decompressToNewBuffer,
-                                   &ErrorMsg);
+  MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&InputFile[0],
+                                                      InputFile.size());
+  if (Buffer == 0)
+    ErrorMsg = "Error reading file '" + InputFile + "'";
+  else {
+    MP = getBitcodeModuleProvider(Buffer, &ErrorMsg);
+    if (!MP) delete Buffer;
   }
   
   if (!MP) {