6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-11 08:29:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix llvm-extract's "writing bitcode to a terminal" warning, which wasn't

Browse Source 
working. To support this, add an is_displayed() function to raw_ostream,
and generalize Process::StandardOutIsDisplayed and friends in order to
support it.

Also, call RemoveFileOnSignal before creating a file instead of after, so
that the file isn't left behind if the program is interrupted between when
the file is created and RemoveFileOnSignal is called.

While here, add a -S to llvm-extract and port it to IRReader so that it
supports assembly input.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81568 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2009-09-11 20:46:33 +00:00
parent 82b3c2e404
commit ec080467f5
12 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/llvm-extract/llvm-extract.cpp
View File

@@ -15,10 +15,12 @@
#include "llvm/LLVMContext.h"
#include "llvm/Module.h"
#include "llvm/PassManager.h"
#include "llvm/Assembly/PrintModulePass.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Transforms/IPO.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/IRReader.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/PrettyStackTrace.h"
@@ -57,6 +59,10 @@ static cl::opt<std::string>
ExtractGlobal("glob", cl::desc("Specify global to extract"), cl::init(""),
cl::value_desc("global"));
static cl::opt<bool>
OutputAssembly("S",
cl::desc("Write output as LLVM assembly"), cl::Hidden);
int main(int argc, char **argv) {
// Print a stack trace if we signal out.
sys::PrintStackTraceOnErrorSignal();
@@ -66,19 +72,12 @@ int main(int argc, char **argv) {
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
cl::ParseCommandLineOptions(argc, argv, "llvm extractor\n");
SMDiagnostic Err;
std::auto_ptr<Module> M;
MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename);
if (Buffer == 0) {
errs() << argv[0] << ": Error reading file '" + InputFilename + "'\n";
return 1;
} else {
M.reset(ParseBitcodeFile(Buffer, Context));
}
delete Buffer;
M.reset(ParseIRFile(InputFilename, Err, Context));
if (M.get() == 0) {
errs() << argv[0] << ": bitcode didn't read correctly.\n";
Err.Print(argv[0], errs());
return 1;
}
@@ -111,17 +110,22 @@ int main(int argc, char **argv) {
Passes.add(createDeadTypeEliminationPass()); // Remove dead types...
Passes.add(createStripDeadPrototypesPass()); // Remove dead func decls
// Make sure that the Output file gets unlinked from the disk if we get a
// SIGINT
sys::RemoveFileOnSignal(sys::Path(OutputFilename));
std::string ErrorInfo;
std::auto_ptr<raw_fd_ostream>
Out(new raw_fd_ostream(OutputFilename.c_str(), ErrorInfo,
raw_fd_ostream::F_Binary));
raw_fd_ostream Out(OutputFilename.c_str(), ErrorInfo,
raw_fd_ostream::F_Binary);
if (!ErrorInfo.empty()) {
errs() << ErrorInfo << '\n';
return 1;
}
if (Force || !CheckBitcodeOutputToConsole(*Out, true))
Passes.add(createBitcodeWriterPass(*Out));
if (OutputAssembly)
Passes.add(createPrintModulePass(&Out));
else if (Force || !CheckBitcodeOutputToConsole(Out, true))
Passes.add(createBitcodeWriterPass(Out));
Passes.run(*M.get());