6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-20 10:30:03 +00:00
Code Issues Projects Releases Wiki Activity

For PR351:

Browse Source 
* Make the OutputC and OutputAsm functions work with sys::Path for the output
  file name instead of using std::string.
* Get rid of extraneous "toString" calls.
* Change "removeFile" to sys::Path::destroyFile()


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19000 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-12-16 23:01:34 +00:00
parent a2f7ed7035
commit 9ac141823d
4 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/ToolRunner.h
View File

@ -147,7 +147,7 @@ public:
// necessarily compile it with GCC and run the program. This throws an
// exception if LLC crashes.
//
virtual void OutputC(const std::string &Bytecode, std::string &OutputCFile);
virtual void OutputC(const std::string &Bytecode, sys::Path& OutputCFile);
};
@ -184,7 +184,7 @@ public:
// not necessarily compile it all the way and run the program. This throws
// an exception if execution of LLC fails.
//
void OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile);
void OutputAsm(const std::string &Bytecode, sys::Path &OutputAsmFile);
};
} // End llvm namespace

29
lib/Support/ToolRunner.cpp
View File

@ -44,7 +44,7 @@ static void ProcessFailure(std::string ProgPath, const char** Args) {
ErrorFile.close();
}
removeFile(ErrorFilename.toString());
ErrorFilename.destroyFile();
throw ToolExecutionError(OS.str());
}
@ -123,10 +123,10 @@ AbstractInterpreter *AbstractInterpreter::createLLI(const std::string &ProgPath,
//===----------------------------------------------------------------------===//
// LLC Implementation of AbstractIntepreter interface
//
void LLC::OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile) {
void LLC::OutputAsm(const std::string &Bytecode, sys::Path &OutputAsmFile) {
sys::Path uniqueFile(Bytecode+".llc.s");
uniqueFile.makeUnique();
OutputAsmFile = uniqueFile.toString();
OutputAsmFile = uniqueFile;
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@ -152,9 +152,9 @@ void LLC::OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile) {
}
void LLC::compileProgram(const std::string &Bytecode) {
std::string OutputAsmFile;
sys::Path OutputAsmFile;
OutputAsm(Bytecode, OutputAsmFile);
removeFile(OutputAsmFile);
OutputAsmFile.destroyFile();
}
int LLC::ExecuteProgram(const std::string &Bytecode,
@ -164,12 +164,12 @@ int LLC::ExecuteProgram(const std::string &Bytecode,
const std::vector<std::string> &SharedLibs,
unsigned Timeout) {
std::string OutputAsmFile;
sys::Path OutputAsmFile;
OutputAsm(Bytecode, OutputAsmFile);
FileRemover OutFileRemover(OutputAsmFile);
// Assuming LLC worked, compile the result with GCC and run it.
return gcc->ExecuteProgram(OutputAsmFile, Args, GCC::AsmFile,
return gcc->ExecuteProgram(OutputAsmFile.toString(), Args, GCC::AsmFile,
InputFile, OutputFile, SharedLibs, Timeout);
}
@ -266,11 +266,10 @@ AbstractInterpreter *AbstractInterpreter::createJIT(const std::string &ProgPath,
return 0;
}
void CBE::OutputC(const std::string &Bytecode,
std::string &OutputCFile) {
void CBE::OutputC(const std::string &Bytecode, sys::Path& OutputCFile) {
sys::Path uniqueFile(Bytecode+".cbe.c");
uniqueFile.makeUnique();
OutputCFile = uniqueFile.toString();
OutputCFile = uniqueFile;
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@ -297,9 +296,9 @@ void CBE::OutputC(const std::string &Bytecode,
}
void CBE::compileProgram(const std::string &Bytecode) {
std::string OutputCFile;
sys::Path OutputCFile;
OutputC(Bytecode, OutputCFile);
removeFile(OutputCFile);
OutputCFile.destroyFile();
}
int CBE::ExecuteProgram(const std::string &Bytecode,
@ -308,12 +307,12 @@ int CBE::ExecuteProgram(const std::string &Bytecode,
const std::string &OutputFile,
const std::vector<std::string> &SharedLibs,
unsigned Timeout) {
std::string OutputCFile;
sys::Path OutputCFile;
OutputC(Bytecode, OutputCFile);
FileRemover CFileRemove(OutputCFile);
return gcc->ExecuteProgram(OutputCFile, Args, GCC::CFile,
return gcc->ExecuteProgram(OutputCFile.toString(), Args, GCC::CFile,
InputFile, OutputFile, SharedLibs, Timeout);
}
@ -398,7 +397,7 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
std::cerr << "\n";
);
FileRemover OutputBinaryRemover(OutputBinary.toString());
FileRemover OutputBinaryRemover(OutputBinary);
return RunProgramWithTimeout(OutputBinary.toString(), &ProgramArgs[0],
InputFile, OutputFile, OutputFile, Timeout);
}

29
tools/bugpoint/ToolRunner.cpp
View File

@ -44,7 +44,7 @@ static void ProcessFailure(std::string ProgPath, const char** Args) {
ErrorFile.close();
}
removeFile(ErrorFilename.toString());
ErrorFilename.destroyFile();
throw ToolExecutionError(OS.str());
}
@ -123,10 +123,10 @@ AbstractInterpreter *AbstractInterpreter::createLLI(const std::string &ProgPath,
//===----------------------------------------------------------------------===//
// LLC Implementation of AbstractIntepreter interface
//
void LLC::OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile) {
void LLC::OutputAsm(const std::string &Bytecode, sys::Path &OutputAsmFile) {
sys::Path uniqueFile(Bytecode+".llc.s");
uniqueFile.makeUnique();
OutputAsmFile = uniqueFile.toString();
OutputAsmFile = uniqueFile;
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@ -152,9 +152,9 @@ void LLC::OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile) {
}
void LLC::compileProgram(const std::string &Bytecode) {
std::string OutputAsmFile;
sys::Path OutputAsmFile;
OutputAsm(Bytecode, OutputAsmFile);
removeFile(OutputAsmFile);
OutputAsmFile.destroyFile();
}
int LLC::ExecuteProgram(const std::string &Bytecode,
@ -164,12 +164,12 @@ int LLC::ExecuteProgram(const std::string &Bytecode,
const std::vector<std::string> &SharedLibs,
unsigned Timeout) {
std::string OutputAsmFile;
sys::Path OutputAsmFile;
OutputAsm(Bytecode, OutputAsmFile);
FileRemover OutFileRemover(OutputAsmFile);
// Assuming LLC worked, compile the result with GCC and run it.
return gcc->ExecuteProgram(OutputAsmFile, Args, GCC::AsmFile,
return gcc->ExecuteProgram(OutputAsmFile.toString(), Args, GCC::AsmFile,
InputFile, OutputFile, SharedLibs, Timeout);
}
@ -266,11 +266,10 @@ AbstractInterpreter *AbstractInterpreter::createJIT(const std::string &ProgPath,
return 0;
}
void CBE::OutputC(const std::string &Bytecode,
std::string &OutputCFile) {
void CBE::OutputC(const std::string &Bytecode, sys::Path& OutputCFile) {
sys::Path uniqueFile(Bytecode+".cbe.c");
uniqueFile.makeUnique();
OutputCFile = uniqueFile.toString();
OutputCFile = uniqueFile;
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@ -297,9 +296,9 @@ void CBE::OutputC(const std::string &Bytecode,
}
void CBE::compileProgram(const std::string &Bytecode) {
std::string OutputCFile;
sys::Path OutputCFile;
OutputC(Bytecode, OutputCFile);
removeFile(OutputCFile);
OutputCFile.destroyFile();
}
int CBE::ExecuteProgram(const std::string &Bytecode,
@ -308,12 +307,12 @@ int CBE::ExecuteProgram(const std::string &Bytecode,
const std::string &OutputFile,
const std::vector<std::string> &SharedLibs,
unsigned Timeout) {
std::string OutputCFile;
sys::Path OutputCFile;
OutputC(Bytecode, OutputCFile);
FileRemover CFileRemove(OutputCFile);
return gcc->ExecuteProgram(OutputCFile, Args, GCC::CFile,
return gcc->ExecuteProgram(OutputCFile.toString(), Args, GCC::CFile,
InputFile, OutputFile, SharedLibs, Timeout);
}
@ -398,7 +397,7 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
std::cerr << "\n";
);
FileRemover OutputBinaryRemover(OutputBinary.toString());
FileRemover OutputBinaryRemover(OutputBinary);
return RunProgramWithTimeout(OutputBinary.toString(), &ProgramArgs[0],
InputFile, OutputFile, OutputFile, Timeout);
}

4
tools/bugpoint/ToolRunner.h
View File

@ -147,7 +147,7 @@ public:
// necessarily compile it with GCC and run the program. This throws an
// exception if LLC crashes.
//
virtual void OutputC(const std::string &Bytecode, std::string &OutputCFile);
virtual void OutputC(const std::string &Bytecode, sys::Path& OutputCFile);
};
@ -184,7 +184,7 @@ public:
// not necessarily compile it all the way and run the program. This throws
// an exception if execution of LLC fails.
//
void OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile);
void OutputAsm(const std::string &Bytecode, sys::Path &OutputAsmFile);
};
} // End llvm namespace