projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This file is empty.
[oota-llvm.git]
/
tools
/
bugpoint
/
BugDriver.cpp
diff --git
a/tools/bugpoint/BugDriver.cpp
b/tools/bugpoint/BugDriver.cpp
index 2b4d35d142e819867bbbcdbefd5279562b028bd1..acea37e1feef5daa9f1256cce1a38ed855d6ba7b 100644
(file)
--- a/
tools/bugpoint/BugDriver.cpp
+++ b/
tools/bugpoint/BugDriver.cpp
@@
-2,8
+2,8
@@
//
// The LLVM Compiler Infrastructure
//
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by the LLVM research group and is distributed under
-//
the University of Illinois Open Source
License. See LICENSE.TXT for details.
+// This file
is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
//
@@
-19,13
+19,12
@@
#include "llvm/Module.h"
#include "llvm/Pass.h"
#include "llvm/Assembly/Parser.h"
#include "llvm/Module.h"
#include "llvm/Pass.h"
#include "llvm/Assembly/Parser.h"
-#include "llvm/B
ytecode/Read
er.h"
+#include "llvm/B
itcode/ReaderWrit
er.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Compressor.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/MemoryBuffer.h"
#include <iostream>
#include <memory>
#include <iostream>
#include <memory>
-
using namespace llvm;
// Anonymous namespace to define command line options for debugging.
using namespace llvm;
// Anonymous namespace to define command line options for debugging.
@@
-64,29
+63,33
@@
std::string llvm::getPassesString(const std::vector<const PassInfo*> &Passes) {
}
BugDriver::BugDriver(const char *toolname, bool as_child, bool find_bugs,
}
BugDriver::BugDriver(const char *toolname, bool as_child, bool find_bugs,
- unsigned timeout)
+ unsigned timeout
, unsigned memlimit
)
: ToolName(toolname), ReferenceOutputFile(OutputFile),
Program(0), Interpreter(0), cbe(0), gcc(0), run_as_child(as_child),
: ToolName(toolname), ReferenceOutputFile(OutputFile),
Program(0), Interpreter(0), cbe(0), gcc(0), run_as_child(as_child),
- run_find_bugs(find_bugs), Timeout(timeout) {}
+ run_find_bugs(find_bugs), Timeout(timeout)
, MemoryLimit(memlimit)
{}
-/// ParseInputFile - Given a b
yte
code or assembly input filename, parse and
+/// ParseInputFile - Given a b
it
code or assembly input filename, parse and
/// return it, or return null if not possible.
///
/// return it, or return null if not possible.
///
-Module *llvm::ParseInputFile(const std::string &InputFilename) {
+Module *llvm::ParseInputFile(const std::string &Filename) {
+ std::auto_ptr<MemoryBuffer> Buffer(MemoryBuffer::getFileOrSTDIN(Filename));
+ Module *Result = 0;
+ if (Buffer.get())
+ Result = ParseBitcodeFile(Buffer.get());
+
ParseError Err;
ParseError Err;
- Module *Result = ParseBytecodeFile(InputFilename,
- Compressor::decompressToNewBuffer);
- if (!Result && !(Result = ParseAssemblyFile(InputFilename,&Err))) {
+ if (!Result && !(Result = ParseAssemblyFile(Filename, &Err))) {
std::cerr << "bugpoint: " << Err.getMessage() << "\n";
Result = 0;
}
std::cerr << "bugpoint: " << Err.getMessage() << "\n";
Result = 0;
}
+
return Result;
}
// This method takes the specified list of LLVM input files, attempts to load
return Result;
}
// This method takes the specified list of LLVM input files, attempts to load
-// them, either as assembly or b
yte
code, then link them together. It returns
-// true on failure (if, for example, an input b
yte
code file could not be
+// them, either as assembly or b
it
code, then link them together. It returns
+// true on failure (if, for example, an input b
it
code file could not be
// parsed), and false on success.
//
bool BugDriver::addSources(const std::vector<std::string> &Filenames) {
// parsed), and false on success.
//
bool BugDriver::addSources(const std::vector<std::string> &Filenames) {
@@
-97,6
+100,7
@@
bool BugDriver::addSources(const std::vector<std::string> &Filenames) {
// Load the first input file.
Program = ParseInputFile(Filenames[0]);
if (Program == 0) return true;
// Load the first input file.
Program = ParseInputFile(Filenames[0]);
if (Program == 0) return true;
+
if (!run_as_child)
std::cout << "Read input file : '" << Filenames[0] << "'\n";
if (!run_as_child)
std::cout << "Read input file : '" << Filenames[0] << "'\n";
@@
-149,7
+153,7
@@
bool BugDriver::run() {
// determine what the problem is. Does the optimization series crash the
// compiler, or does it produce illegal code? We make the top-level
// decision by trying to run all of the passes on the the input program,
// determine what the problem is. Does the optimization series crash the
// compiler, or does it produce illegal code? We make the top-level
// decision by trying to run all of the passes on the the input program,
- // which should generate a b
ytecode file. If it does generate a byte
code
+ // which should generate a b
itcode file. If it does generate a bit
code
// file, then we know the compiler didn't crash, so try to diagnose a
// miscompilation.
if (!PassesToRun.empty()) {
// file, then we know the compiler didn't crash, so try to diagnose a
// miscompilation.
if (!PassesToRun.empty()) {
@@
-158,7
+162,7
@@
bool BugDriver::run() {
return debugOptimizerCrash();
}
return debugOptimizerCrash();
}
- // Set up the execution environment, selecting a method to run LLVM b
yte
code.
+ // Set up the execution environment, selecting a method to run LLVM b
it
code.
if (initializeExecutionEnvironment()) return true;
// Test to see if we have a code generator crash.
if (initializeExecutionEnvironment()) return true;
// Test to see if we have a code generator crash.
@@
-180,7
+184,7
@@
bool BugDriver::run() {
if (ReferenceOutputFile.empty()) {
std::cout << "Generating reference output from raw program: ";
if(!createReferenceFile(Program)){
if (ReferenceOutputFile.empty()) {
std::cout << "Generating reference output from raw program: ";
if(!createReferenceFile(Program)){
-
return debugCodeGeneratorCrash();
+ return debugCodeGeneratorCrash();
}
CreatedOutput = true;
}
}
CreatedOutput = true;
}