From 6d80e21a1d5393e2b882ce993e3e22dc675dfe71 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 6 May 2007 09:29:57 +0000 Subject: switch tools to bitcode instead of bytecode llvm-svn: 36868 --- llvm/tools/llvm-dis/llvm-dis.cpp | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'llvm/tools/llvm-dis/llvm-dis.cpp') diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp index 12a53285c0a..6321551446a 100644 --- a/llvm/tools/llvm-dis/llvm-dis.cpp +++ b/llvm/tools/llvm-dis/llvm-dis.cpp @@ -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 @@ Force("f", cl::desc("Overwrite output files")); static cl::opt DontPrint("disable-output", cl::desc("Don't output the .ll file"), cl::Hidden); -static cl::opt -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 @@ int main(int argc, char **argv) { std::auto_ptr M; - if (Bitcode) { - 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)); - } + MemoryBuffer *Buffer + = MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size()); + + if (Buffer == 0) + ErrorMessage = "Error reading file '" + InputFilename + "'"; + else + M.reset(ParseBitcodeFile(Buffer, &ErrorMessage)); + delete Buffer; if (M.get() == 0) { cerr << argv[0] << ": "; -- cgit v1.2.3