6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-26 02:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Use a vector<char*> instead of char*[] so that we can add arbitrary number of

Browse Source 
parameters, such as command-line arguments that the executing program gets via
bugpoint.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7423 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Misha Brukman
2003-07-30 17:44:15 +00:00
parent c1869e85de
commit 7835c85227
1 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
tools/bugpoint/ExecutionDriver.cpp
View File

@@ -43,6 +43,8 @@ namespace {
enum FileType { AsmFile, CFile }; enum FileType { AsmFile, CFile };
} }
extern cl::list<std::string> InputArgv;
/// AbstractInterpreter Class - Subclasses of this class are used to execute /// AbstractInterpreter Class - Subclasses of this class are used to execute
/// LLVM bytecode in a variety of ways. This abstract interface hides this /// LLVM bytecode in a variety of ways. This abstract interface hides this
/// complexity behind a simple interface. /// complexity behind a simple interface.
@@ -93,17 +95,19 @@ int LLI::ExecuteProgram(const std::string &Bytecode,
exit(1); exit(1);
} }
const char *Args[] = { std::vector<const char*> Args;
LLIPath.c_str(), Args.push_back(LLIPath.c_str());
"-abort-on-exception", Args.push_back("-abort-on-exception");
"-quiet", Args.push_back("-quiet");
"-force-interpreter=true", Args.push_back("-force-interpreter=true");
Bytecode.c_str(), Args.push_back(Bytecode.c_str());
0 // Add optional parameters to the running program from Argv
}; for (unsigned i=0, e = InputArgv.size(); i != e; ++i)
Args.push_back(InputArgv[i].c_str());
Args.push_back(0);
std::cout << "<lli>"; std::cout << "<lli>";
return RunProgramWithTimeout(LLIPath, Args, return RunProgramWithTimeout(LLIPath, &Args[0],
InputFile, OutputFile, OutputFile); InputFile, OutputFile, OutputFile);
} }
@@ -148,44 +152,37 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
const std::string &OutputFile, const std::string &OutputFile,
const std::string &SharedLib) { const std::string &SharedLib) {
std::string OutputBinary = getUniqueFilename("bugpoint.gcc.exe"); std::string OutputBinary = getUniqueFilename("bugpoint.gcc.exe");
const char **GCCArgs; std::vector<const char*> GCCArgs;
const char *ArgsWithoutSO[] = { GCCArgs.push_back(GCCPath.c_str());
GCCPath.c_str(), if (!SharedLib.empty()) // Specify the shared library to link in...
"-x", (fileType == AsmFile) ? "assembler" : "c", GCCArgs.push_back(SharedLib.c_str());
ProgramFile.c_str(), // Specify the input filename... GCCArgs.push_back("-x");
"-o", OutputBinary.c_str(), // Output to the right filename... GCCArgs.push_back((fileType == AsmFile) ? "assembler" : "c");
"-lm", // Hard-code the math library... GCCArgs.push_back(ProgramFile.c_str()); // Specify the input filename...
"-O2", // Optimize the program a bit... GCCArgs.push_back("-o");
0 GCCArgs.push_back(OutputBinary.c_str()); // Output to the right file...
}; GCCArgs.push_back("-lm"); // Hard-code the math library...
const char *ArgsWithSO[] = { GCCArgs.push_back("-O2"); // Optimize the program a bit...
GCCPath.c_str(), GCCArgs.push_back(0); // NULL terminator
SharedLib.c_str(), // Specify the shared library to link in...
"-x", (fileType == AsmFile) ? "assembler" : "c",
ProgramFile.c_str(), // Specify the input filename...
"-o", OutputBinary.c_str(), // Output to the right filename...
"-lm", // Hard-code the math library...
"-O2", // Optimize the program a bit...
0
};
GCCArgs = (SharedLib.empty()) ? ArgsWithoutSO : ArgsWithSO;
std::cout << "<gcc>"; std::cout << "<gcc>";
if (RunProgramWithTimeout(GCCPath, GCCArgs, "/dev/null", "/dev/null", if (RunProgramWithTimeout(GCCPath, &GCCArgs[0], "/dev/null", "/dev/null",
"/dev/null")) { "/dev/null")) {
ProcessFailure(GCCArgs); ProcessFailure(&GCCArgs[0]);
exit(1); exit(1);
} }
const char *ProgramArgs[] = { std::vector<const char*> ProgramArgs;
OutputBinary.c_str(), ProgramArgs.push_back(OutputBinary.c_str());
0 // Add optional parameters to the running program from Argv
}; for (unsigned i=0, e = InputArgv.size(); i != e; ++i)
ProgramArgs.push_back(InputArgv[i].c_str());
ProgramArgs.push_back(0); // NULL terminator
// Now that we have a binary, run it! // Now that we have a binary, run it!
std::cout << "<program>"; std::cout << "<program>";
int ProgramResult = RunProgramWithTimeout(OutputBinary, ProgramArgs, int ProgramResult = RunProgramWithTimeout(OutputBinary, &ProgramArgs[0],
InputFile, OutputFile, OutputFile); InputFile, OutputFile, OutputFile);
std::cout << "\n"; std::cout << "\n";
removeFile(OutputBinary); removeFile(OutputBinary);