summaryrefslogtreecommitdiffhomepage
path: root/src/CompilerKit
diff options
context:
space:
mode:
Diffstat (limited to 'src/CompilerKit')
-rw-r--r--src/CompilerKit/ck-osx-san.json2
-rw-r--r--src/CompilerKit/ck-osx.json2
-rw-r--r--src/CompilerKit/ck-posix.json2
-rw-r--r--src/CompilerKit/src/Assemblers/Assembler+32x0.cc2
-rw-r--r--src/CompilerKit/src/Assemblers/Assembler+64x0.cc2
-rw-r--r--src/CompilerKit/src/Assemblers/Assembler+AMD64.cc2
-rw-r--r--src/CompilerKit/src/Assemblers/Assembler+ARM64.cc2
-rw-r--r--src/CompilerKit/src/Assemblers/Assembler+PowerPC.cc2
-rw-r--r--src/CompilerKit/src/CodeGenerator+AssemblyFactory.cc4
-rw-r--r--src/CompilerKit/src/Compilers/CCompiler+64x0.cc4
-rw-r--r--src/CompilerKit/src/Compilers/CCompiler+ARM64.cc4
-rw-r--r--src/CompilerKit/src/Compilers/CCompiler+Power64.cc4
-rw-r--r--src/CompilerKit/src/Compilers/CPlusPlusCompiler+AMD64.cc20
-rw-r--r--src/CompilerKit/src/DynamicLinkers/DynamicLinker64+PEF.cc8
-rw-r--r--src/CompilerKit/src/Preprocessor/Preprocessor+Generic.cc4
15 files changed, 32 insertions, 32 deletions
diff --git a/src/CompilerKit/ck-osx-san.json b/src/CompilerKit/ck-osx-san.json
index 193b3a2..137596f 100644
--- a/src/CompilerKit/ck-osx-san.json
+++ b/src/CompilerKit/ck-osx-san.json
@@ -23,7 +23,7 @@
"-fsanitize=undefined"
],
"cpp_macros": [
- "__NECTI__=202505",
+ "__NECTAR__=202505",
"CK_USE_STRUCTS=1",
"kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
]
diff --git a/src/CompilerKit/ck-osx.json b/src/CompilerKit/ck-osx.json
index 1109f75..392140a 100644
--- a/src/CompilerKit/ck-osx.json
+++ b/src/CompilerKit/ck-osx.json
@@ -18,7 +18,7 @@
"-shared"
],
"cpp_macros": [
- "__NECTI__=202505",
+ "__NECTAR__=202505",
"CK_USE_STRUCTS=1",
"kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
]
diff --git a/src/CompilerKit/ck-posix.json b/src/CompilerKit/ck-posix.json
index 3f6127c..6380ae2 100644
--- a/src/CompilerKit/ck-posix.json
+++ b/src/CompilerKit/ck-posix.json
@@ -17,7 +17,7 @@
"-shared"
],
"cpp_macros": [
- "__NECTI__=202505",
+ "__NECTAR__=202505",
"CK_USE_STRUCTS=1",
"kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
]
diff --git a/src/CompilerKit/src/Assemblers/Assembler+32x0.cc b/src/CompilerKit/src/Assemblers/Assembler+32x0.cc
index 1b8d9f6..dbf2898 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+32x0.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+32x0.cc
@@ -1,6 +1,6 @@
/* ========================================
- Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
+ Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license
======================================== */
diff --git a/src/CompilerKit/src/Assemblers/Assembler+64x0.cc b/src/CompilerKit/src/Assemblers/Assembler+64x0.cc
index 757f5b4..1ddb5d2 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+64x0.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+64x0.cc
@@ -1,6 +1,6 @@
/* ========================================
- Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
+ Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license
======================================== */
diff --git a/src/CompilerKit/src/Assemblers/Assembler+AMD64.cc b/src/CompilerKit/src/Assemblers/Assembler+AMD64.cc
index 7146a53..6d1ca0e 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+AMD64.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+AMD64.cc
@@ -1,6 +1,6 @@
/* ========================================
- Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
+ Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license
======================================== */
diff --git a/src/CompilerKit/src/Assemblers/Assembler+ARM64.cc b/src/CompilerKit/src/Assemblers/Assembler+ARM64.cc
index 5113704..3df2b03 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+ARM64.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+ARM64.cc
@@ -1,6 +1,6 @@
/* ========================================
- Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
+ Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license
======================================== */
diff --git a/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cc b/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cc
index bad9535..d595731 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cc
@@ -1,6 +1,6 @@
/* ========================================
- Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
+ Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license
======================================== */
diff --git a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cc b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cc
index b5da2a8..c132638 100644
--- a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cc
+++ b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cc
@@ -1,6 +1,6 @@
/* ========================================
- Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
+ Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license
======================================== */
@@ -9,7 +9,7 @@
/**
* @file AssemblyFactory.cc
* @author Amlal El Mahrouss (amlal@nekernel.org)
- * @brief Assembly API of NeCTI
+ * @brief Assembly API of Nectar
* @version 0.0.3
* @copyright Copyright (c) 2024-2025 Amlal El Mahrouss
*
diff --git a/src/CompilerKit/src/Compilers/CCompiler+64x0.cc b/src/CompilerKit/src/Compilers/CCompiler+64x0.cc
index f18b22b..42d654b 100644
--- a/src/CompilerKit/src/Compilers/CCompiler+64x0.cc
+++ b/src/CompilerKit/src/Compilers/CCompiler+64x0.cc
@@ -2,7 +2,7 @@
* ========================================================
*
* cc
- * Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+ * Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license.
*
* ========================================================
*/
@@ -321,7 +321,7 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontend64x0::Compile(std::strin
if (expr.find(")") != std::string::npos) expr.erase(expr.find(")"));
- kIfFunction = "__NECTI_IF_PROC_";
+ kIfFunction = "__NECTAR_IF_PROC_";
kIfFunction += std::to_string(time_off._Raw);
syntaxLeaf.fUserValue = "\tlda r12, extern_segment ";
diff --git a/src/CompilerKit/src/Compilers/CCompiler+ARM64.cc b/src/CompilerKit/src/Compilers/CCompiler+ARM64.cc
index e0f08e2..688835e 100644
--- a/src/CompilerKit/src/Compilers/CCompiler+ARM64.cc
+++ b/src/CompilerKit/src/Compilers/CCompiler+ARM64.cc
@@ -2,7 +2,7 @@
* ========================================================
*
* CCompilerARM64
- * Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+ * Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license.
*
* ========================================================
*/
@@ -320,7 +320,7 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontendARM64::Compile(std::stri
if (expr.find(")") != std::string::npos) expr.erase(expr.find(")"));
- kIfFunction = "__NECTI_IF_PROC_";
+ kIfFunction = "__NECTAR_IF_PROC_";
kIfFunction += std::to_string(time_off._Raw);
syntaxLeaf.fUserValue = "\tlda r12, extern_segment ";
diff --git a/src/CompilerKit/src/Compilers/CCompiler+Power64.cc b/src/CompilerKit/src/Compilers/CCompiler+Power64.cc
index 724e7cc..3867be6 100644
--- a/src/CompilerKit/src/Compilers/CCompiler+Power64.cc
+++ b/src/CompilerKit/src/Compilers/CCompiler+Power64.cc
@@ -2,7 +2,7 @@
* ========================================================
*
* CompilerPower64
- * Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+ * Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license.
*
* ========================================================
*/
@@ -321,7 +321,7 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontendPower64::Compile(std::st
if (expr.find(")") != std::string::npos) expr.erase(expr.find(")"));
- kIfFunction = "__NECTI_IF_PROC_";
+ kIfFunction = "__NECTAR_IF_PROC_";
kIfFunction += std::to_string(time_off._Raw);
syntax_leaf.fUserValue =
diff --git a/src/CompilerKit/src/Compilers/CPlusPlusCompiler+AMD64.cc b/src/CompilerKit/src/Compilers/CPlusPlusCompiler+AMD64.cc
index 70de909..54fbc25 100644
--- a/src/CompilerKit/src/Compilers/CPlusPlusCompiler+AMD64.cc
+++ b/src/CompilerKit/src/Compilers/CPlusPlusCompiler+AMD64.cc
@@ -2,7 +2,7 @@
* ========================================================
*
* C++ Compiler Driver
- * Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+ * Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license.
*
* ========================================================
*/
@@ -345,10 +345,10 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontendCPlusPlusAMD64::Compile(
symbol_name_fn.erase(symbol_name_fn.find("("));
}
- syntax_tree.fUserValue = "public_segment .code64 __NECTI_" + symbol_name_fn + "\n";
+ syntax_tree.fUserValue = "public_segment .code64 __NECTAR_" + symbol_name_fn + "\n";
++kFunctionEmbedLevel;
- kOriginMap.push_back({"__NECTI_" + symbol_name_fn, kOrigin});
+ kOriginMap.push_back({"__NECTAR_" + symbol_name_fn, kOrigin});
break;
@@ -474,10 +474,10 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontendCPlusPlusAMD64::Compile(
if (pairRight != valueOfVar) {
if (valueOfVar[0] == '\"') {
- syntax_tree.fUserValue = "segment .data64 __NECTI_LOCAL_VAR_" + varName + ": db " +
+ syntax_tree.fUserValue = "segment .data64 __NECTAR_LOCAL_VAR_" + varName + ": db " +
valueOfVar + ", 0\n\n";
syntax_tree.fUserValue += instr + kRegisterList[kRegisterMap.size() - 1] + ", " +
- "__NECTI_LOCAL_VAR_" + varName + "\n";
+ "__NECTAR_LOCAL_VAR_" + varName + "\n";
kOrigin += 1UL;
} else {
syntax_tree.fUserValue =
@@ -492,16 +492,16 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontendCPlusPlusAMD64::Compile(
if (((int) indexRight - 1) < 0) {
if (valueOfVar[0] == '\"') {
syntax_tree.fUserValue =
- "segment .data64 __NECTI_LOCAL_VAR_" + varName + ": db " + valueOfVar + ", 0\n";
+ "segment .data64 __NECTAR_LOCAL_VAR_" + varName + ": db " + valueOfVar + ", 0\n";
syntax_tree.fUserValue += instr + kRegisterList[kRegisterMap.size()] + ", " +
- "__NECTI_LOCAL_VAR_" + varName + "\n";
+ "__NECTAR_LOCAL_VAR_" + varName + "\n";
kOrigin += 1UL;
} else {
auto mangled = valueOfVar;
if (mangled.find("(") != std::string::npos) {
auto ret = mangled.erase(mangled.find("("));
- mangled = "__NECTI_";
+ mangled = "__NECTAR_";
mangled += ret;
syntax_tree.fUserValue = "jmp " + mangled + "\n";
@@ -660,8 +660,8 @@ CompilerKit::SyntaxLeafList::SyntaxLeaf CompilerFrontendCPlusPlusAMD64::Compile(
break;
}
} else {
- syntax_tree.fUserValue = "__NECTI_LOCAL_RETURN_STRING: db " + subText +
- ", 0\nmov rcx, __NECTI_LOCAL_RETURN_STRING\n";
+ syntax_tree.fUserValue = "__NECTAR_LOCAL_RETURN_STRING: db " + subText +
+ ", 0\nmov rcx, __NECTAR_LOCAL_RETURN_STRING\n";
syntax_tree.fUserValue += "mov rax, rcx\nret\n";
kOrigin += 1UL;
diff --git a/src/CompilerKit/src/DynamicLinkers/DynamicLinker64+PEF.cc b/src/CompilerKit/src/DynamicLinkers/DynamicLinker64+PEF.cc
index 0361873..f3eaaa9 100644
--- a/src/CompilerKit/src/DynamicLinkers/DynamicLinker64+PEF.cc
+++ b/src/CompilerKit/src/DynamicLinkers/DynamicLinker64+PEF.cc
@@ -1,6 +1,6 @@
/* ========================================
- Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
+ Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license
@file DynamicLinker64PEF.cc
@brief: C++ 64-Bit PEF Linker for NeKernel.org's NeKernel
@@ -22,7 +22,7 @@
#include <CompilerKit/Utilities/Compiler.h>
#include <filesystem>
-#define kLinkerVersionStr "NeCTI 64-Bit Linker (Preferred Executable Format)"
+#define kLinkerVersionStr "Nectar 64-Bit Linker (Preferred Executable Format)"
#define kPefNoCpu (0U)
#define kPefNoSubCpu (0U)
@@ -68,8 +68,8 @@ static CompilerKit::STLString kLinkerStart = kPefStart;
static std::vector<CompilerKit::STLString> kObjectList;
static std::vector<CompilerKit::Detail::Blob> kObjectBytes;
-/// @brief NeCTI 64-bit Linker.
-/// @note This linker is made for PEF executable, thus NeCTI based OSes.
+/// @brief Nectar 64-bit Linker.
+/// @note This linker is made for PEF executable, thus Nectar based OSes.
NECTI_MODULE(DynamicLinker64PEF) {
bool is_executable = true;
diff --git a/src/CompilerKit/src/Preprocessor/Preprocessor+Generic.cc b/src/CompilerKit/src/Preprocessor/Preprocessor+Generic.cc
index 4e34ab3..97bf44f 100644
--- a/src/CompilerKit/src/Preprocessor/Preprocessor+Generic.cc
+++ b/src/CompilerKit/src/Preprocessor/Preprocessor+Generic.cc
@@ -2,7 +2,7 @@
* ========================================================
*
* C++ Preprocessor Driver
- * Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license.
+ * Copyright (C) 2024-2025 Amlal El Mahrouss, licensed under the Apache 2.0 license.
*
* ========================================================
*/
@@ -760,7 +760,7 @@ NECTI_MODULE(CPlusPlusPreprocessorMain) {
Detail::bpp_macro macro_zka;
- macro_zka.fName = "__NECTI__";
+ macro_zka.fName = "__NECTAR__";
macro_zka.fValue = "1";
kMacros.push_back(macro_zka);
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-13 03:41:36 +0000