aboutsummaryrefslogtreecommitdiff
path: root/tools/driver
diff options
context:
space:
mode:
Diffstat (limited to 'tools/driver')
-rw-r--r--tools/driver/EmbeddedRunner.cc10
-rw-r--r--tools/driver/main.cc70
2 files changed, 42 insertions, 38 deletions
diff --git a/tools/driver/EmbeddedRunner.cc b/tools/driver/EmbeddedRunner.cc
index 81a2265..83489b1 100644
--- a/tools/driver/EmbeddedRunner.cc
+++ b/tools/driver/EmbeddedRunner.cc
@@ -10,12 +10,12 @@
int runEmbedded(const cps::CodeGen &CG) {
if (llvm::InitializeNativeTarget() || llvm::InitializeNativeTargetAsmPrinter()) {
- llvm::errs() << "Error: cannot initialize the embedded LLVM target\n";
+ llvm::errs() << "error: cannot initialize the embedded LLVM target\n";
return 1;
}
std::string Error;
if (llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr, &Error)) {
- llvm::errs() << "Error: cannot load process symbols: " << Error << "\n";
+ llvm::errs() << "error: cannot load process symbols: " << Error << "\n";
return 1;
}
// Keep CodeGen's module and context alive while the engine owns its clone.
@@ -27,17 +27,17 @@ int runEmbedded(const cps::CodeGen &CG) {
Builder.setMCJITMemoryManager(std::make_unique<llvm::SectionMemoryManager>());
std::unique_ptr<llvm::ExecutionEngine> Engine(Builder.create());
if (!Engine) {
- llvm::errs() << "Error: cannot create the embedded LLVM engine: " << Error << "\n";
+ llvm::errs() << "error: cannot create the embedded LLVM engine: " << Error << "\n";
return 1;
}
Engine->finalizeObject();
if (Engine->hasError()) {
- llvm::errs() << "Error: embedded LLVM execution failed: " << Engine->getErrorMessage() << "\n";
+ llvm::errs() << "error: embedded LLVM execution failed: " << Engine->getErrorMessage() << "\n";
return 1;
}
auto MainAddress = Engine->getFunctionAddress("main");
if (!MainAddress) {
- llvm::errs() << "Error: embedded LLVM could not resolve main\n";
+ llvm::errs() << "error: embedded LLVM could not resolve main\n";
return 1;
}
auto Main = reinterpret_cast<int (*)()>(MainAddress);
diff --git a/tools/driver/main.cc b/tools/driver/main.cc
index 4df8562..d670ac0 100644
--- a/tools/driver/main.cc
+++ b/tools/driver/main.cc
@@ -13,12 +13,16 @@
#include <fstream>
#include <string>
-int main(int argc, char **argv) {
- if (argc == 1) {
- // TODO: Print help here when help text is available.
- return 0;
- }
+namespace {
+
+int compilationTerminated() {
+ llvm::errs() << "compilation terminated.\n";
+ return 1;
+}
+} // namespace
+
+int main(int argc, char **argv) {
std::string InputPath;
std::string OutputPath;
bool Run = false;
@@ -28,28 +32,28 @@ int main(int argc, char **argv) {
Run = true;
} else if (Arg == "-o") {
if (!OutputPath.empty()) {
- llvm::errs() << "Error: -o may only be specified once\n";
- return 1;
+ llvm::errs() << "cpsc: error: -o may only be specified once\n";
+ return compilationTerminated();
}
if (I + 1 == argc || argv[I + 1][0] == '-' || argv[I + 1][0] == '\0') {
- llvm::errs() << "Error: -o requires an output path\n";
- return 1;
+ llvm::errs() << "cpsc: error: -o requires an output path\n";
+ return compilationTerminated();
}
OutputPath = argv[++I];
} else if (Arg.empty() || Arg[0] == '-') {
- llvm::errs() << "Error: unknown argument '" << Arg << "'\n";
- return 1;
+ llvm::errs() << "cpsc: error: unknown argument '" << Arg << "'\n";
+ return compilationTerminated();
} else if (!InputPath.empty()) {
- llvm::errs() << "Error: only one source file is supported\n";
- return 1;
+ llvm::errs() << "cpsc: error: only one source file is supported\n";
+ return compilationTerminated();
} else {
InputPath = Arg;
}
}
if (InputPath.empty()) {
- llvm::errs() << "Error: no source file specified\n";
- return 1;
+ llvm::errs() << "cpsc: fatal error: no input files\n";
+ return compilationTerminated();
}
#ifdef CPSC_RUN_PATH
std::string LliPath;
@@ -58,13 +62,13 @@ int main(int argc, char **argv) {
#ifdef CPSC_RUN_PATH
auto Lli = llvm::sys::findProgramByName("lli");
if (!Lli) {
- llvm::errs() << "Error: -r requires lli in PATH: " << Lli.getError().message() << "\n";
- return 1;
+ llvm::errs() << "cpsc: fatal error: -r requires lli in PATH: " << Lli.getError().message() << "\n";
+ return compilationTerminated();
}
LliPath = *Lli;
#elif defined(CPSC_RUN_NONE)
- llvm::errs() << "Error: -r is disabled in this build (CPSC_RUN_MODE=NONE)\n";
- return 1;
+ llvm::errs() << "cpsc: fatal error: -r is disabled in this build (CPSC_RUN_MODE=NONE)\n";
+ return compilationTerminated();
#endif
}
if (OutputPath.empty() && !Run) {
@@ -75,12 +79,12 @@ int main(int argc, char **argv) {
std::ifstream Input(InputPath, std::ios::binary);
if (!Input) {
- llvm::errs() << "Error: cannot open source file '" << InputPath << "'\n";
- return 1;
+ llvm::errs() << "cpsc: fatal error: cannot open source file '" << InputPath << "'\n";
+ return compilationTerminated();
}
if (llvm::sys::fs::equivalent(InputPath, OutputPath)) {
- llvm::errs() << "Error: output file must not be the source file\n";
- return 1;
+ llvm::errs() << "cpsc: error: output file must not be the source file\n";
+ return compilationTerminated();
}
cps::Lexer Lex(Input);
@@ -88,15 +92,15 @@ int main(int argc, char **argv) {
cps::Parser Parser(Lex);
auto Statements = Parser.Parse();
if (Input.bad()) {
- llvm::errs() << "Error: cannot read source file '" << InputPath << "'\n";
- return 1;
+ llvm::errs() << "cpsc: fatal error: cannot read source file '" << InputPath << "'\n";
+ return compilationTerminated();
}
- if (Lex.hadError() || Parser.hadError()) return 1;
+ if (Lex.hadError() || Parser.hadError()) return compilationTerminated();
cps::CodeGen CG;
CG.compile(Statements);
- if (CG.hadError()) return 1;
+ if (CG.hadError()) return compilationTerminated();
#ifdef CPSC_RUN_EMBEDDED
if (Run && OutputPath.empty()) return runEmbedded(CG);
@@ -115,32 +119,32 @@ int main(int argc, char **argv) {
EC = llvm::sys::fs::openFileForWrite(OutputPath, OutputFD);
}
if (EC) {
- llvm::errs() << "Error: cannot open output file '" << OutputPath
+ llvm::errs() << "cpsc: fatal error: cannot open output file '" << OutputPath
<< "': " << EC.message() << "\n";
- return 1;
+ return compilationTerminated();
}
llvm::raw_fd_ostream Output(OutputFD, true);
CG.print(Output);
Output.close();
if (Output.has_error()) {
- llvm::errs() << "Error: cannot write output file '" << OutputPath
+ llvm::errs() << "cpsc: fatal error: cannot write output file '" << OutputPath
<< "': " << Output.error().message() << "\n";
Output.clear_error();
- return 1;
+ return compilationTerminated();
}
if (!Run) return 0;
#ifdef CPSC_RUN_PATH
llvm::SmallString<256> RunPath(OutputPath);
if (auto PathError = llvm::sys::fs::make_absolute(RunPath)) {
- llvm::errs() << "Error: cannot resolve IR path: " << PathError.message() << "\n";
+ llvm::errs() << "cpsc: error: cannot resolve IR path: " << PathError.message() << "\n";
return 1;
}
std::string ExecutionError;
int Result = llvm::sys::ExecuteAndWait(LliPath, {LliPath, RunPath},
std::nullopt, {}, 0, 0, &ExecutionError);
if (Result < 0) {
- llvm::errs() << "Error: lli execution failed (status " << Result << "): "
+ llvm::errs() << "cpsc: error: lli execution failed (status " << Result << "): "
<< ExecutionError << "\n";
return 1;
}
generated by cgit v1.3.1-4-g156e (git 2.54.0) at 2026-11-15 09:40:43 +0000