mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-22 23:24:59 +00:00
Print the tool name when an error comes from so that I can tell which
tool of a pipeline is having issues. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3168 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
|
|||||||
// Parse the file now...
|
// Parse the file now...
|
||||||
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
|
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
|
||||||
if (M.get() == 0) {
|
if (M.get() == 0) {
|
||||||
cerr << "assembly didn't read correctly.\n";
|
cerr << argv[0] << ": assembly didn't read correctly.\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,8 @@ int main(int argc, char **argv) {
|
|||||||
if (OutputFilename != "") { // Specified an output filename?
|
if (OutputFilename != "") { // Specified an output filename?
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -71,7 +72,8 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -84,13 +86,13 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!Out->good()) {
|
if (!Out->good()) {
|
||||||
cerr << "Error opening " << OutputFilename << "!\n";
|
cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
WriteBytecodeToFile(M.get(), *Out);
|
WriteBytecodeToFile(M.get(), *Out);
|
||||||
} catch (const ParseException &E) {
|
} catch (const ParseException &E) {
|
||||||
cerr << E.getMessage() << std::endl;
|
cerr << argv[0] << ": " << E.getMessage() << "\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -102,12 +102,12 @@ int main(int argc, char **argv) {
|
|||||||
// Parse the file now...
|
// Parse the file now...
|
||||||
M.reset(ParseAssemblyFile(InputFilename));
|
M.reset(ParseAssemblyFile(InputFilename));
|
||||||
} catch (const ParseException &E) {
|
} catch (const ParseException &E) {
|
||||||
cerr << E.getMessage() << "\n";
|
cerr << argv[0] << ": " << E.getMessage() << "\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (M.get() == 0) {
|
if (M.get() == 0) {
|
||||||
cerr << "assembly didn't read correctly.\n";
|
cerr << argv[0] << ": assembly didn't read correctly.\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,7 +124,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
std::ofstream Out(OutputFilename.c_str(), std::ios::out);
|
std::ofstream Out(OutputFilename.c_str(), std::ios::out);
|
||||||
if (!Out.good()) {
|
if (!Out.good()) {
|
||||||
cerr << "Error opening " << OutputFilename << "!\n";
|
cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -109,7 +109,7 @@ int main(int argc, char **argv) {
|
|||||||
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
|
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
|
||||||
|
|
||||||
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
|
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
|
||||||
cerr << "Error linking in '" << InputFilenames[i] << "': "
|
cerr << argv[0] << ": error linking in '" << InputFilenames[i] << "': "
|
||||||
<< ErrorMessage << "\n";
|
<< ErrorMessage << "\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -121,13 +121,14 @@ int main(int argc, char **argv) {
|
|||||||
if (OutputFilename != "-") {
|
if (OutputFilename != "-") {
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
Out = new std::ofstream(OutputFilename.c_str());
|
Out = new std::ofstream(OutputFilename.c_str());
|
||||||
if (!Out->good()) {
|
if (!Out->good()) {
|
||||||
cerr << "Error opening '" << OutputFilename << "'!\n";
|
cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
|
|||||||
// Parse the file now...
|
// Parse the file now...
|
||||||
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
|
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
|
||||||
if (M.get() == 0) {
|
if (M.get() == 0) {
|
||||||
cerr << "assembly didn't read correctly.\n";
|
cerr << argv[0] << ": assembly didn't read correctly.\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,8 @@ int main(int argc, char **argv) {
|
|||||||
if (OutputFilename != "") { // Specified an output filename?
|
if (OutputFilename != "") { // Specified an output filename?
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -71,7 +72,8 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -84,13 +86,13 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!Out->good()) {
|
if (!Out->good()) {
|
||||||
cerr << "Error opening " << OutputFilename << "!\n";
|
cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
WriteBytecodeToFile(M.get(), *Out);
|
WriteBytecodeToFile(M.get(), *Out);
|
||||||
} catch (const ParseException &E) {
|
} catch (const ParseException &E) {
|
||||||
cerr << E.getMessage() << std::endl;
|
cerr << argv[0] << ": " << E.getMessage() << "\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
|
|||||||
// Parse the file now...
|
// Parse the file now...
|
||||||
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
|
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
|
||||||
if (M.get() == 0) {
|
if (M.get() == 0) {
|
||||||
cerr << "assembly didn't read correctly.\n";
|
cerr << argv[0] << ": assembly didn't read correctly.\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,8 @@ int main(int argc, char **argv) {
|
|||||||
if (OutputFilename != "") { // Specified an output filename?
|
if (OutputFilename != "") { // Specified an output filename?
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -71,7 +72,8 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -84,13 +86,13 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!Out->good()) {
|
if (!Out->good()) {
|
||||||
cerr << "Error opening " << OutputFilename << "!\n";
|
cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
WriteBytecodeToFile(M.get(), *Out);
|
WriteBytecodeToFile(M.get(), *Out);
|
||||||
} catch (const ParseException &E) {
|
} catch (const ParseException &E) {
|
||||||
cerr << E.getMessage() << std::endl;
|
cerr << argv[0] << ": " << E.getMessage() << "\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -109,7 +109,7 @@ int main(int argc, char **argv) {
|
|||||||
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
|
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
|
||||||
|
|
||||||
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
|
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
|
||||||
cerr << "Error linking in '" << InputFilenames[i] << "': "
|
cerr << argv[0] << ": error linking in '" << InputFilenames[i] << "': "
|
||||||
<< ErrorMessage << "\n";
|
<< ErrorMessage << "\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -121,13 +121,14 @@ int main(int argc, char **argv) {
|
|||||||
if (OutputFilename != "-") {
|
if (OutputFilename != "-") {
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
Out = new std::ofstream(OutputFilename.c_str());
|
Out = new std::ofstream(OutputFilename.c_str());
|
||||||
if (!Out->good()) {
|
if (!Out->good()) {
|
||||||
cerr << "Error opening '" << OutputFilename << "'!\n";
|
cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
// LLVM 'OPT' UTILITY
|
// LLVM Modular Optimizer Utility: opt
|
||||||
//
|
//
|
||||||
// Optimizations may be specified an arbitrary number of times on the command
|
// Optimizations may be specified an arbitrary number of times on the command
|
||||||
// line, they are run in the order specified.
|
// line, they are run in the order specified.
|
||||||
@@ -67,7 +67,7 @@ int main(int argc, char **argv) {
|
|||||||
// Load the input module...
|
// Load the input module...
|
||||||
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
|
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
|
||||||
if (M.get() == 0) {
|
if (M.get() == 0) {
|
||||||
cerr << "bytecode didn't read correctly.\n";
|
cerr << argv[0] << ": bytecode didn't read correctly.\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,14 +76,15 @@ int main(int argc, char **argv) {
|
|||||||
if (OutputFilename != "") {
|
if (OutputFilename != "") {
|
||||||
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
if (!Force && std::ifstream(OutputFilename.c_str())) {
|
||||||
// If force is not specified, make sure not to overwrite a file!
|
// If force is not specified, make sure not to overwrite a file!
|
||||||
cerr << "Error opening '" << OutputFilename << "': File exists!\n"
|
cerr << argv[0] << ": error opening '" << OutputFilename
|
||||||
|
<< "': file exists!\n"
|
||||||
<< "Use -f command line argument to force output\n";
|
<< "Use -f command line argument to force output\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
Out = new std::ofstream(OutputFilename.c_str());
|
Out = new std::ofstream(OutputFilename.c_str());
|
||||||
|
|
||||||
if (!Out->good()) {
|
if (!Out->good()) {
|
||||||
cerr << "Error opening " << OutputFilename << "!\n";
|
cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,7 +107,7 @@ int main(int argc, char **argv) {
|
|||||||
else if (Opt->getDataCtor())
|
else if (Opt->getDataCtor())
|
||||||
Passes.add(Opt->getDataCtor()(TD)); // Pass dummy target data...
|
Passes.add(Opt->getDataCtor()(TD)); // Pass dummy target data...
|
||||||
else
|
else
|
||||||
cerr << "Cannot create pass: " << Opt->getPassName() << "\n";
|
cerr << argv[0] << ": cannot create pass: " << Opt->getPassName() << "\n";
|
||||||
|
|
||||||
if (PrintEachXForm)
|
if (PrintEachXForm)
|
||||||
Passes.add(new PrintModulePass(&cerr));
|
Passes.add(new PrintModulePass(&cerr));
|
||||||
|
Reference in New Issue
Block a user