summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp2
-rw-r--r--src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp21
-rw-r--r--src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp20
-rw-r--r--src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp24
-rw-r--r--src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp24
-rw-r--r--src/DebuggerKit/src/Mach+CLI.cpp (renamed from src/DebuggerKit/src/MachContractCLI.cpp)2
-rw-r--r--src/DebuggerKit/src/Mach.cpp (renamed from src/DebuggerKit/src/MachContract.cpp)2
-rw-r--r--src/DebuggerKit/src/NeSystem+CLI.cpp (renamed from src/DebuggerKit/src/NeKernelContractCLI.cpp)3
-rw-r--r--src/DebuggerKit/src/NeSystem.cpp (renamed from src/DebuggerKit/src/NeKernelContract.cpp)16
-rw-r--r--src/DebuggerKit/src/POSIX+CLI.cpp (renamed from src/DebuggerKit/src/POSIXContractCLI.cpp)2
10 files changed, 80 insertions, 36 deletions
diff --git a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
index 0d0cff7..a7c1832 100644
--- a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
+++ b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
@@ -38,7 +38,7 @@ Int32 AssemblyFactory::Compile(STLString sourceFile, const Int32& arch) {
std::filesystem::remove(compiledUnit);
}
- return NECTAR_INVALID_ARCH;
+ return NECTAR_INVALID_DATA;
}
///! @brief mount assembly backend.
diff --git a/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp b/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp
index 97b5161..5936e27 100644
--- a/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp
+++ b/src/CompilerKit/src/Frontends/NectarCompiler+AMD64.cpp
@@ -1689,6 +1689,27 @@ NECTAR_MODULE(CompilerNectarAMD64) {
continue;
}
+ if (strcmp(argv[index], "--help") == 0 || strcmp(argv[index], "-h") == 0) {
+ std::cout << "====================================================\n";
+ std::cout << "NECTAR X64 FRONTEND:\n";
+ std::cout << "====================================================\n";
+ std::cout << "-fverbose: Enable Verbose output.\n";
+ std::cout << "-fuse-masm: Use the NeSystem Assembler syntax.\n";
+ std::cout << "-fprint-dialect: Prints the current Nectar dialect.\n";
+ std::cout << "-fuse-nasm: Use the Netwide Assembler syntax.\n";
+ std::cout << "====================================================\n";
+
+ continue;
+ }
+
+ if (strcmp(argv[index], "--version") == 0 || strcmp(argv[index], "-v") == 0) {
+ std::cout << "====================================================\n";
+ std::cout << "NECTAR X64 FRONTEND:\nDIST RELEASE:";
+ std::cout << kDistRelease << "\n";
+ std::cout << "====================================================\n";
+ continue;
+ }
+
if (strcmp(argv[index], "-fverbose") == 0) {
kVerbose = true;
continue;
diff --git a/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp b/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp
index 4583dfe..1584661 100644
--- a/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp
+++ b/src/CompilerKit/src/Frontends/NectarCompiler+PTX.cpp
@@ -1623,6 +1623,26 @@ NECTAR_MODULE(CompilerNectarPTX) {
continue;
}
+ if (strcmp(argv[index], "--help") == 0 ||
+ strcmp(argv[index], "-h") == 0) {
+ std::cout << "====================================================\n";
+ std::cout << "NECTAR PTX FRONTEND:\n";
+ std::cout << "====================================================\n";
+ std::cout << "-fverbose: Enable Verbose output.\n";
+ std::cout << "-fprint-dialect: Prints the current Nectar dialect.\n";
+ std::cout << "====================================================\n";
+
+ continue;
+ }
+
+ if (strcmp(argv[index], "--version") == 0 || strcmp(argv[index], "-v") == 0) {
+ std::cout << "====================================================\n";
+ std::cout << "NECTAR PTX FRONTEND:\nDIST RELEASE:";
+ std::cout << kDistRelease << "\n";
+ std::cout << "====================================================\n";
+ continue;
+ }
+
if (strcmp(argv[index], "-fverbose") == 0) {
kVerbose = true;
continue;
diff --git a/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp b/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp
index 1a97660..42f5112 100644
--- a/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp
+++ b/src/CompilerKit/src/Generators/DynamicLinker64+MachO.cpp
@@ -30,9 +30,9 @@
#define kLinkerSplash() kStdOut << kLinkerVersionStr << kStdEndl
#define kConsoleOut \
- (std::cout << "\e[0;31m" \
- << "mld64: " \
- << "\e[0;97m")
+ (std::cout << kRed \
+ << "ld: " \
+ << kReset)
static CompilerKit::STLString kOutput = kMachODefaultOutput;
static cpu_type_t kCpuType = CPU_TYPE_X86_64;
@@ -132,21 +132,23 @@ NECTAR_MODULE(DynamicLinker64MachO) {
* @brief parse flags and trigger options.
*/
for (size_t linker_arg{1}; linker_arg < argc; ++linker_arg) {
- if (std::strcmp(argv[linker_arg], "-help") == 0) {
+ if (std::strcmp(argv[linker_arg], "--help") == 0 ||
+ std::strcmp(argv[linker_arg], "-h") == 0) {
kLinkerSplash();
- kConsoleOut << "-version: Show linker version.\n";
- kConsoleOut << "-help: Show linker help.\n";
- kConsoleOut << "-verbose: Enable linker trace.\n";
+ kConsoleOut << "--version: Show linker version.\n";
+ kConsoleOut << "--help: Show linker help.\n";
+ kConsoleOut << "--verbose: Enable linker trace.\n";
kConsoleOut << "-fdylib: Output as a Dynamic Library.\n";
kConsoleOut << "-ffat: Output as a FAT binary.\n";
kConsoleOut << "-famd64: Output as an x86_64 Mach-O.\n";
kConsoleOut << "-farm64: Output as an ARM64 Mach-O.\n";
- kConsoleOut << "-output: Select the output file name.\n";
+ kConsoleOut << "--output: Select the output file name.\n";
kConsoleOut << "-fstart: Specify entry point symbol.\n";
return NECTAR_SUCCESS;
- } else if (std::strcmp(argv[linker_arg], "-version") == 0) {
+ } else if (std::strcmp(argv[linker_arg], "--version") == 0 ||
+ std::strcmp(argv[linker_arg], "-v") == 0) {
kLinkerSplash();
return NECTAR_SUCCESS;
@@ -171,7 +173,7 @@ NECTAR_MODULE(DynamicLinker64MachO) {
linker_arg += 1;
continue;
- } else if (std::strcmp(argv[linker_arg], "-verbose") == 0) {
+ } else if (std::strcmp(argv[linker_arg], "--verbose") == 0) {
kVerbose = true;
continue;
@@ -184,7 +186,7 @@ NECTAR_MODULE(DynamicLinker64MachO) {
}
continue;
- } else if (std::strcmp(argv[linker_arg], "-output") == 0) {
+ } else if (std::strcmp(argv[linker_arg], "--output") == 0) {
if ((linker_arg + 1) > argc) continue;
kOutput = argv[linker_arg + 1];
diff --git a/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp b/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp
index 250ec75..650b4ab 100644
--- a/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp
+++ b/src/CompilerKit/src/Generators/DynamicLinker64+PEF.cpp
@@ -38,9 +38,9 @@
#define kLinkerStackSizeSymbol "__PEFSizeOfReserveStack"
#define kConsoleOut \
- (std::cout << "\e[0;31m" \
- << "ld64: " \
- << "\e[0;97m")
+ (std::cout << kRed \
+ << "ld: " \
+ << kReset)
enum struct ABIType : Int32 {
kABITypeNull = 0,
@@ -79,12 +79,13 @@ NECTAR_MODULE(DynamicLinker64PEF) {
* @brief parse flags and trigger options.
*/
for (size_t linker_arg = 1; linker_arg < argc; ++linker_arg) {
- if (std::strcmp(argv[linker_arg], "-help") == 0) {
+ if (std::strcmp(argv[linker_arg], "--help") == 0 ||
+ std::strcmp(argv[linker_arg], "-h") == 0) {
kLinkerSplash();
- kConsoleOut << "-version: Show linker version.\n";
- kConsoleOut << "-help: Show linker help.\n";
- kConsoleOut << "-verbose: Enable linker trace.\n";
+ kConsoleOut << "--version: Show linker version.\n";
+ kConsoleOut << "--help: Show linker help.\n";
+ kConsoleOut << "--verbose: Enable linker trace.\n";
kConsoleOut << "-fdylib: Output as a Dynamic PEF.\n";
kConsoleOut << "-ffat: Output as a FAT PEF.\n";
kConsoleOut << "-f32k: Output as a 32x0 PEF.\n";
@@ -93,10 +94,11 @@ NECTAR_MODULE(DynamicLinker64PEF) {
kConsoleOut << "-frv64: Output as a RISC-V PEF.\n";
kConsoleOut << "-fpower64: Output as a POWER PEF.\n";
kConsoleOut << "-farm64: Output as a ARM64 PEF.\n";
- kConsoleOut << "-output: Select the output file name.\n";
+ kConsoleOut << "--output: Select the output file name.\n";
return NECTAR_SUCCESS;
- } else if (std::strcmp(argv[linker_arg], "-version") == 0) {
+ } else if (std::strcmp(argv[linker_arg], "--version") == 0 ||
+ std::strcmp(argv[linker_arg], "-v") == 0) {
kLinkerSplash();
return NECTAR_SUCCESS;
@@ -135,7 +137,7 @@ NECTAR_MODULE(DynamicLinker64PEF) {
kArch = CompilerKit::kPefArchARM64;
continue;
- } else if (std::strcmp(argv[linker_arg], "-verbose") == 0) {
+ } else if (std::strcmp(argv[linker_arg], "--verbose") == 0) {
kVerbose = true;
continue;
@@ -151,7 +153,7 @@ NECTAR_MODULE(DynamicLinker64PEF) {
is_executable = false;
continue;
- } else if (std::strcmp(argv[linker_arg], "-output") == 0) {
+ } else if (std::strcmp(argv[linker_arg], "--output") == 0) {
if ((linker_arg + 1) > argc) continue;
kOutput = argv[linker_arg + 1];
diff --git a/src/DebuggerKit/src/MachContractCLI.cpp b/src/DebuggerKit/src/Mach+CLI.cpp
index 9bdb5b1..69000c9 100644
--- a/src/DebuggerKit/src/MachContractCLI.cpp
+++ b/src/DebuggerKit/src/Mach+CLI.cpp
@@ -6,7 +6,7 @@
#ifdef DK_MACH_DEBUGGER
-#include <DebuggerKit/MachContract.h>
+#include <DebuggerKit/Mach.h>
#include <ThirdParty/Dialogs/Dialogs.h>
#ifdef DK_MACH_DEBUGGER
diff --git a/src/DebuggerKit/src/MachContract.cpp b/src/DebuggerKit/src/Mach.cpp
index 518f61a..31ae544 100644
--- a/src/DebuggerKit/src/MachContract.cpp
+++ b/src/DebuggerKit/src/Mach.cpp
@@ -6,7 +6,7 @@
#ifdef DK_MACH_DEBUGGER
-#include <DebuggerKit/MachContract.h>
+#include <DebuggerKit/Mach.h>
#include <ThirdParty/Dialogs/Dialogs.h>
/// @brief a terrible way to import globals.
diff --git a/src/DebuggerKit/src/NeKernelContractCLI.cpp b/src/DebuggerKit/src/NeSystem+CLI.cpp
index 13144eb..39271b1 100644
--- a/src/DebuggerKit/src/NeKernelContractCLI.cpp
+++ b/src/DebuggerKit/src/NeSystem+CLI.cpp
@@ -6,9 +6,8 @@
#ifdef DK_NEKERNEL_DEBUGGER
-#include <DebuggerKit/NeKernelContract.h>
+#include <DebuggerKit/NeSystem.h>
#include <ThirdParty/Dialogs/Dialogs.h>
-#include <string>
#include <DebuggerKit/Common.inl>
diff --git a/src/DebuggerKit/src/NeKernelContract.cpp b/src/DebuggerKit/src/NeSystem.cpp
index 5e7fb5e..ea3beb4 100644
--- a/src/DebuggerKit/src/NeKernelContract.cpp
+++ b/src/DebuggerKit/src/NeSystem.cpp
@@ -9,16 +9,16 @@
/// @author Amlal El Mahrouss
/// @brief Kernel Debugger Protocol
-#include <DebuggerKit/NeKernelContract.h>
+#include <DebuggerKit/NeSystem.h>
#include <ThirdParty/Dialogs/Dialogs.h>
using namespace DebuggerKit::Detail;
using namespace DebuggerKit::NeKernel;
-NeKernelContract::NeKernelContract() = default;
-NeKernelContract::~NeKernelContract() = default;
+NeSystemDebugger::NeSystemDebugger() = default;
+NeSystemDebugger::~NeSystemDebugger() = default;
-bool NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLString argv,
+bool NeSystemDebugger::Attach(CompilerKit::STLString path, CompilerKit::STLString argv,
ProcessID& pid) noexcept {
if (path.empty() || argv.empty()) return NO;
@@ -44,7 +44,7 @@ bool NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLStrin
return ret;
}
-bool NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept {
+bool NeSystemDebugger::BreakAt(CompilerKit::STLString symbol) noexcept {
CompilerKit::STLString pkt = Detail::kDebugMagic;
pkt += ";SYM=\"";
pkt += symbol;
@@ -56,7 +56,7 @@ bool NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept {
return ret;
}
-bool NeKernelContract::Break() noexcept {
+bool NeSystemDebugger::Break() noexcept {
CompilerKit::STLString pkt = Detail::kDebugMagic;
pkt += ";BRK=1;\r";
@@ -64,7 +64,7 @@ bool NeKernelContract::Break() noexcept {
return ret;
}
-bool NeKernelContract::Continue() noexcept {
+bool NeSystemDebugger::Continue() noexcept {
CompilerKit::STLString pkt = Detail::kDebugMagic;
pkt += ";CONT=1;\r";
@@ -73,7 +73,7 @@ bool NeKernelContract::Continue() noexcept {
return NO;
}
-bool NeKernelContract::Detach() noexcept {
+bool NeSystemDebugger::Detach() noexcept {
CompilerKit::STLString pkt = Detail::kDebugMagic;
pkt += ";DTCH=1;\r";
diff --git a/src/DebuggerKit/src/POSIXContractCLI.cpp b/src/DebuggerKit/src/POSIX+CLI.cpp
index 58aa4a1..30dbe26 100644
--- a/src/DebuggerKit/src/POSIXContractCLI.cpp
+++ b/src/DebuggerKit/src/POSIX+CLI.cpp
@@ -6,7 +6,7 @@
#ifdef DK_POSIX_DEBUGGER
-#include <DebuggerKit/POSIXContract.h>
+#include <DebuggerKit/POSIX.h>
#include <ThirdParty/Dialogs/Dialogs.h>
#include <DebuggerKit/Common.inl>
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-25 20:20:42 +0000