diff options
author | Chris Lattner <sabre@nondot.org> | 2007-05-06 05:47:06 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2007-05-06 05:47:06 +0000 |
commit | 03b696376219945d67caffda1995d12e3410f05b (patch) | |
tree | 8ea1373739d0fa82791130f9e878819a0b1601e5 /tools | |
parent | e3c55a52f888701c9003fb4bacd866fda06ae113 (diff) | |
download | llvm-03b696376219945d67caffda1995d12e3410f05b.tar.gz llvm-03b696376219945d67caffda1995d12e3410f05b.tar.bz2 llvm-03b696376219945d67caffda1995d12e3410f05b.tar.xz |
add bitcode support
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36849 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/bugpoint/BugDriver.cpp | 10 | ||||
-rw-r--r-- | tools/bugpoint/CrashDebugger.cpp | 1 | ||||
-rw-r--r-- | tools/bugpoint/Makefile | 2 | ||||
-rw-r--r-- | tools/bugpoint/OptimizerDriver.cpp | 9 |
4 files changed, 18 insertions, 4 deletions
diff --git a/tools/bugpoint/BugDriver.cpp b/tools/bugpoint/BugDriver.cpp index b2a8f030c5..fe290805e4 100644 --- a/tools/bugpoint/BugDriver.cpp +++ b/tools/bugpoint/BugDriver.cpp @@ -19,13 +19,14 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Assembly/Parser.h" +#include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Compressor.h" #include "llvm/Support/FileUtilities.h" +#include "llvm/Support/MemoryBuffer.h" #include <iostream> #include <memory> - using namespace llvm; // Anonymous namespace to define command line options for debugging. @@ -77,6 +78,13 @@ Module *llvm::ParseInputFile(const std::string &InputFilename) { ParseError Err; Module *Result = ParseBytecodeFile(InputFilename, Compressor::decompressToNewBuffer); + if (!Result) { + std::auto_ptr<MemoryBuffer> Buffer( + MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size())); + if (Buffer.get()) + Result = ParseBitcodeFile(Buffer.get()); + } + if (!Result && !(Result = ParseAssemblyFile(InputFilename,&Err))) { std::cerr << "bugpoint: " << Err.getMessage() << "\n"; Result = 0; diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp index 5596839979..723134856d 100644 --- a/tools/bugpoint/CrashDebugger.cpp +++ b/tools/bugpoint/CrashDebugger.cpp @@ -22,7 +22,6 @@ #include "llvm/PassManager.h" #include "llvm/ValueSymbolTable.h" #include "llvm/Analysis/Verifier.h" -#include "llvm/Bytecode/Writer.h" #include "llvm/Support/CFG.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/Cloning.h" diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile index acafa838d0..11741480dd 100644 --- a/tools/bugpoint/Makefile +++ b/tools/bugpoint/Makefile @@ -11,7 +11,7 @@ LEVEL = ../.. TOOLNAME = bugpoint LINK_COMPONENTS := bcreader bcwriter asmparser instrumentation scalaropts ipo \ - linker + linker bitreader bitwriter REQUIRES_EH := 1 include $(LEVEL)/Makefile.common diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp index 210f348f35..e5435ed1bc 100644 --- a/tools/bugpoint/OptimizerDriver.cpp +++ b/tools/bugpoint/OptimizerDriver.cpp @@ -24,6 +24,7 @@ #include "llvm/PassManager.h" #include "llvm/Analysis/Verifier.h" #include "llvm/Bytecode/WriteBytecodePass.h" +#include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Target/TargetData.h" #include "llvm/Support/FileUtilities.h" #include "llvm/Support/CommandLine.h" @@ -38,6 +39,9 @@ #include <fstream> using namespace llvm; +static bool Bitcode = false; + + namespace { // ChildOutput - This option captures the name of the child output file that // is set up by the parent bugpoint process @@ -110,7 +114,10 @@ int BugDriver::runPassesAsChild(const std::vector<const PassInfo*> &Passes) { // Write bytecode out to disk as the last step... OStream L(OutFile); - PM.add(new WriteBytecodePass(&L)); + if (Bitcode) + PM.add(CreateBitcodeWriterPass(OutFile)); + else + PM.add(new WriteBytecodePass(&L)); // Run all queued passes. PM.run(*Program); |