6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-15 05:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Use the new tool_output_file in several tools. This fixes a variety

Browse Source 
of problems with output files being left behind or output streams
being left unclosed. Fix llvm-mc to respect the -o option in all
modes, rather than hardcoding outs() in some cases.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111603 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2010-08-20 01:07:01 +00:00
parent 52fdaeda75
commit d5826a33a5
7 changed files with 150 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
tools/llvm-mc/llvm-mc.cpp
View File

@ -27,6 +27,7 @@
#include "llvm/Target/TargetSelect.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h"
@ -139,6 +140,23 @@ static const Target *GetTarget(const char *ProgName) {
return 0;
}
static formatted_tool_output_file *GetOutputStream() {
if (OutputFilename == "")
OutputFilename = "-";
std::string Err;
tool_output_file *Out = new tool_output_file(OutputFilename.c_str(), Err,
raw_fd_ostream::F_Binary);
if (!Err.empty()) {
errs() << Err << '\n';
delete Out;
return 0;
}
return new formatted_tool_output_file(*Out,
formatted_raw_ostream::DELETE_STREAM);
}
static int AsLexInput(const char *ProgName) {
std::string ErrorMessage;
MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename,
@ -171,6 +189,10 @@ static int AsLexInput(const char *ProgName) {
AsmLexer Lexer(*MAI);
Lexer.setBuffer(SrcMgr.getMemoryBuffer(0));
OwningPtr<formatted_tool_output_file> Out(GetOutputStream());
if (!Out)
return 1;
bool Error = false;
while (Lexer.Lex().isNot(AsmToken::Eof)) {
switch (Lexer.getKind()) {
@ -182,71 +204,53 @@ static int AsLexInput(const char *ProgName) {
Error = true; // error already printed.
break;
case AsmToken::Identifier:
outs() << "identifier: " << Lexer.getTok().getString() << '\n';
*Out << "identifier: " << Lexer.getTok().getString() << '\n';
break;
case AsmToken::String:
outs() << "string: " << Lexer.getTok().getString() << '\n';
*Out << "string: " << Lexer.getTok().getString() << '\n';
break;
case AsmToken::Integer:
outs() << "int: " << Lexer.getTok().getString() << '\n';
*Out << "int: " << Lexer.getTok().getString() << '\n';
break;
case AsmToken::Amp: outs() << "Amp\n"; break;
case AsmToken::AmpAmp: outs() << "AmpAmp\n"; break;
case AsmToken::Caret: outs() << "Caret\n"; break;
case AsmToken::Colon: outs() << "Colon\n"; break;
case AsmToken::Comma: outs() << "Comma\n"; break;
case AsmToken::Dollar: outs() << "Dollar\n"; break;
case AsmToken::EndOfStatement: outs() << "EndOfStatement\n"; break;
case AsmToken::Eof: outs() << "Eof\n"; break;
case AsmToken::Equal: outs() << "Equal\n"; break;
case AsmToken::EqualEqual: outs() << "EqualEqual\n"; break;
case AsmToken::Exclaim: outs() << "Exclaim\n"; break;
case AsmToken::ExclaimEqual: outs() << "ExclaimEqual\n"; break;
case AsmToken::Greater: outs() << "Greater\n"; break;
case AsmToken::GreaterEqual: outs() << "GreaterEqual\n"; break;
case AsmToken::GreaterGreater: outs() << "GreaterGreater\n"; break;
case AsmToken::LParen: outs() << "LParen\n"; break;
case AsmToken::Less: outs() << "Less\n"; break;
case AsmToken::LessEqual: outs() << "LessEqual\n"; break;
case AsmToken::LessGreater: outs() << "LessGreater\n"; break;
case AsmToken::LessLess: outs() << "LessLess\n"; break;
case AsmToken::Minus: outs() << "Minus\n"; break;
case AsmToken::Percent: outs() << "Percent\n"; break;
case AsmToken::Pipe: outs() << "Pipe\n"; break;
case AsmToken::PipePipe: outs() << "PipePipe\n"; break;
case AsmToken::Plus: outs() << "Plus\n"; break;
case AsmToken::RParen: outs() << "RParen\n"; break;
case AsmToken::Slash: outs() << "Slash\n"; break;
case AsmToken::Star: outs() << "Star\n"; break;
case AsmToken::Tilde: outs() << "Tilde\n"; break;
case AsmToken::Amp: *Out << "Amp\n"; break;
case AsmToken::AmpAmp: *Out << "AmpAmp\n"; break;
case AsmToken::Caret: *Out << "Caret\n"; break;
case AsmToken::Colon: *Out << "Colon\n"; break;
case AsmToken::Comma: *Out << "Comma\n"; break;
case AsmToken::Dollar: *Out << "Dollar\n"; break;
case AsmToken::EndOfStatement: *Out << "EndOfStatement\n"; break;
case AsmToken::Eof: *Out << "Eof\n"; break;
case AsmToken::Equal: *Out << "Equal\n"; break;
case AsmToken::EqualEqual: *Out << "EqualEqual\n"; break;
case AsmToken::Exclaim: *Out << "Exclaim\n"; break;
case AsmToken::ExclaimEqual: *Out << "ExclaimEqual\n"; break;
case AsmToken::Greater: *Out << "Greater\n"; break;
case AsmToken::GreaterEqual: *Out << "GreaterEqual\n"; break;
case AsmToken::GreaterGreater: *Out << "GreaterGreater\n"; break;
case AsmToken::LParen: *Out << "LParen\n"; break;
case AsmToken::Less: *Out << "Less\n"; break;
case AsmToken::LessEqual: *Out << "LessEqual\n"; break;
case AsmToken::LessGreater: *Out << "LessGreater\n"; break;
case AsmToken::LessLess: *Out << "LessLess\n"; break;
case AsmToken::Minus: *Out << "Minus\n"; break;
case AsmToken::Percent: *Out << "Percent\n"; break;
case AsmToken::Pipe: *Out << "Pipe\n"; break;
case AsmToken::PipePipe: *Out << "PipePipe\n"; break;
case AsmToken::Plus: *Out << "Plus\n"; break;
case AsmToken::RParen: *Out << "RParen\n"; break;
case AsmToken::Slash: *Out << "Slash\n"; break;
case AsmToken::Star: *Out << "Star\n"; break;
case AsmToken::Tilde: *Out << "Tilde\n"; break;
}
}
// Keep output if no errors.
if (Error == 0) Out->keep();
return Error;
}
static formatted_raw_ostream *GetOutputStream() {
if (OutputFilename == "")
OutputFilename = "-";
// Make sure that the Out file gets unlinked from the disk if we get a
// SIGINT.
if (OutputFilename != "-")
sys::RemoveFileOnSignal(sys::Path(OutputFilename));
std::string Err;
raw_fd_ostream *Out = new raw_fd_ostream(OutputFilename.c_str(), Err,
raw_fd_ostream::F_Binary);
if (!Err.empty()) {
errs() << Err << '\n';
delete Out;
return 0;
}
return new formatted_raw_ostream(*Out, formatted_raw_ostream::DELETE_STREAM);
}
static int AssembleInput(const char *ProgName) {
const Target *TheTarget = GetTarget(ProgName);
if (!TheTarget)
@ -277,10 +281,6 @@ static int AssembleInput(const char *ProgName) {
assert(MAI && "Unable to create target asm info!");
MCContext Ctx(*MAI);
formatted_raw_ostream *Out = GetOutputStream();
if (!Out)
return 1;
// FIXME: We shouldn't need to do this (and link in codegen).
OwningPtr<TargetMachine> TM(TheTarget->createTargetMachine(TripleName, ""));
@ -291,6 +291,10 @@ static int AssembleInput(const char *ProgName) {
return 1;
}
OwningPtr<formatted_tool_output_file> Out(GetOutputStream());
if (!Out)
return 1;
OwningPtr<MCStreamer> Str;
if (FileType == OFT_AssemblyFile) {
@ -328,11 +332,9 @@ static int AssembleInput(const char *ProgName) {
Parser->setTargetParser(*TAP.get());
int Res = Parser->Run(NoInitialTextSection);
delete Out;
// Delete output on errors.
if (Res && OutputFilename != "-")
sys::Path(OutputFilename).eraseFromDisk();
// Keep output if no errors.
if (Res == 0) Out->keep();
return Res;
}
@ -356,10 +358,20 @@ static int DisassembleInput(const char *ProgName, bool Enhanced) {
return 1;
}
OwningPtr<formatted_tool_output_file> Out(GetOutputStream());
if (!Out)
return 1;
int Res;
if (Enhanced)
return Disassembler::disassembleEnhanced(TripleName, *Buffer);
Res = Disassembler::disassembleEnhanced(TripleName, *Buffer, *Out);
else
return Disassembler::disassemble(*TheTarget, TripleName, *Buffer);
Res = Disassembler::disassemble(*TheTarget, TripleName, *Buffer, *Out);
// Keep output if no errors.
if (Res == 0) Out->keep();
return Res;
}