summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--doc/style/cpp_style.md2
-rw-r--r--public/frameworks/KernelTest.fwrk/headers/TestCase.h2
-rw-r--r--src/boot/amd64-ci.make6
-rw-r--r--src/boot/amd64-desktop.make8
-rw-r--r--src/boot/arm64-desktop.make8
-rw-r--r--src/boot/modules/BootNet/README.md2
-rw-r--r--src/boot/src/HEL/ARM64/BootEFI.cpp2
-rw-r--r--src/boot/src/boot_rsrc.rsrc2
-rw-r--r--src/kernel/CompilerKit/Version.h8
-rw-r--r--src/kernel/HALKit/ARM64/HalHandoverStub.s2
-rw-r--r--src/kernel/amd64-ci.make2
-rw-r--r--src/kernel/amd64-desktop.make2
-rw-r--r--src/kernel/arm64-desktop.make6
-rw-r--r--src/kernel/kernel_rsrc.rsrc8
15 files changed, 32 insertions, 32 deletions
diff --git a/.gitignore b/.gitignore
index fc911573..3988bf16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,8 +26,8 @@ build/
*.pdf
*.aux
-ne_kernel
-ne_bootz
+neoskrnl.exe
+bootzldr.exe
neoskrnl/neoskrnl.xcodeproj/project.xcworkspace/xcshareddata/
diff --git a/doc/style/cpp_style.md b/doc/style/cpp_style.md
index 3069285e..85764082 100644
--- a/doc/style/cpp_style.md
+++ b/doc/style/cpp_style.md
@@ -6,7 +6,7 @@ NeKernel uses the Google C++ Style. But applied to low-level systems. We use C++
## No Exceptions, Never.
-NeKernel bans the usage of exceptions in ne_kernel, ne_bootz, etc.
+NeKernel bans the usage of exceptions in neoskrnl, bootzldr, etc.
Unless it is a program space and not to be deemed performance dependent.
## Templates, Containers, and ZOA over C with Classes.
diff --git a/public/frameworks/KernelTest.fwrk/headers/TestCase.h b/public/frameworks/KernelTest.fwrk/headers/TestCase.h
index 7f97798d..81cecc75 100644
--- a/public/frameworks/KernelTest.fwrk/headers/TestCase.h
+++ b/public/frameworks/KernelTest.fwrk/headers/TestCase.h
@@ -36,7 +36,7 @@
inline Void KTTestCase##NAME::Run() { \
auto ret = FN() == YES; \
if (!ret) { \
- PrintOut(nullptr, "[KERNEL-TEST] TEST FAILED!"); \
+ PrintOut(nullptr, "[KERNEL_IMG-TEST] TEST FAILED!"); \
KT_MUST_PASS(ret, ret, true); \
} \
} \
diff --git a/src/boot/amd64-ci.make b/src/boot/amd64-ci.make
index 28017bf3..1d3fcce0 100644
--- a/src/boot/amd64-ci.make
+++ b/src/boot/amd64-ci.make
@@ -69,8 +69,8 @@ FLAG_GNU=-fshort-wchar -Wall -Wpedantic -Wextra -Werror -D__EFI_x86_64__ -mno-re
-DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DEBUG_MACRO) $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
-std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_API__ -DBOOTZ_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT
-BOOTLOADER=ne_bootz
-KERNEL=ne_kernel
+BOOTLOADER=bootzldr.exe
+KERNEL_IMG=neoskrnl.exe
SYSCHK=chk.efi
BOOTNET=net.efi
SCIKIT=libSystem.dll
@@ -130,7 +130,7 @@ efi:
$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
BINS=*.bin
-EXECUTABLES=ne_bootz ne_kernel OVMF.fd
+EXECUTABLES=bootzldr.exe neoskrnl.exe OVMF.fd
TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
diff --git a/src/boot/amd64-desktop.make b/src/boot/amd64-desktop.make
index 35904c89..e842742f 100644
--- a/src/boot/amd64-desktop.make
+++ b/src/boot/amd64-desktop.make
@@ -71,8 +71,8 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -D__nekernel_allow_non_nekernel_pe -Wall
-DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
-std=c++20 -DBOOTZ_GPT_SUPPORT -D__HAVE_NE_API__ -DBOOTZ_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT -Wl,--disable-reloc-section
-BOOTLOADER=ne_bootz
-KERNEL=ne_kernel
+BOOTLOADER=bootzldr.exe
+KERNEL_IMG=neoskrnl.exe
SYSCHK=chk.efi
BOOTNET=net.efi
MEMTEST=memtest.efi
@@ -92,7 +92,7 @@ all: compile-amd64
$(LD_GNU) $(OBJ) $(LD_FLAGS) -o src/$(BOOTLOADER)
$(COPY) src/$(BOOTLOADER) src/root/EFI/BOOT/BOOTX64.EFI
$(COPY) src/$(BOOTLOADER) src/root/EFI/BOOT/BOOTZ.EFI
- $(COPY) ../kernel/$(KERNEL) src/root/$(KERNEL)
+ $(COPY) ../kernel/$(KERNEL_IMG) src/root/$(KERNEL_IMG)
$(COPY) ./modules/SysChk/$(SYSCHK) src/root/$(SYSCHK)
$(COPY) ./modules/BootNet/$(BOOTNET) src/root/$(BOOTNET)
$(COPY) ./modules/MemoryTest/$(MEMTEST) src/root/$(MEMTEST)
@@ -146,7 +146,7 @@ efi:
$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
BINS=*.bin
-EXECUTABLES=ne_bootz ne_kernel OVMF.fd
+EXECUTABLES=bootzldr.exe neoskrnl.exe OVMF.fd
TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
diff --git a/src/boot/arm64-desktop.make b/src/boot/arm64-desktop.make
index 55004175..d74f775c 100644
--- a/src/boot/arm64-desktop.make
+++ b/src/boot/arm64-desktop.make
@@ -47,8 +47,8 @@ FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-
-target aarch64-unknown-windows \
-std=c++20 -DBOOTZ_EPM_SUPPORT -D__nekernel_allow_non_nekernel_pe -DBOOTZ_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTZ_STANDALONE__ -D__NEKERNEL__ -D__BOOTZ__ -D__HAVE_NE_API__ -D__NE__ -I../ -I../kernel
-BOOT_LOADER=ne_bootz
-KERNEL=ne_kernel
+BOOT_LOADER=bootzldr.exe
+KERNEL_IMG=neoskrnl.exe
SYSCHK=chk.efi
STARTUP=startup.efi
@@ -62,7 +62,7 @@ all: compile
$(LD_GNU) $(OBJ) $(LD_FLAGS) /out:src/$(BOOT_LOADER)
$(COPY) src/$(BOOT_LOADER) src/root/EFI/BOOT/BOOTAA64.EFI
$(COPY) src/$(BOOT_LOADER) src/root/EFI/BOOT/BootZ.EFI
- $(COPY) ../kernel/$(KERNEL) src/root/$(KERNEL)
+ $(COPY) ../kernel/$(KERNEL_IMG) src/root/$(KERNEL_IMG)
$(COPY) ./modules/SysChk/$(SYSCHK) src/root/$(SYSCHK)
$(COPY) src/$(BOOT_LOADER) src/root/$(BOOT_LOADER)
@@ -94,7 +94,7 @@ efi:
$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGAARCH64_QEMU_EFI.fd -O OVMF.fd
BINS=*.bin
-EXECUTABLES=ne_bootz ne_kernel OVMF.fd
+EXECUTABLES=bootzldr.exe neoskrnl.exe OVMF.fd
TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
diff --git a/src/boot/modules/BootNet/README.md b/src/boot/modules/BootNet/README.md
index 9c013d6f..fb5e71aa 100644
--- a/src/boot/modules/BootNet/README.md
+++ b/src/boot/modules/BootNet/README.md
@@ -1,5 +1,5 @@
# BootNet
-This module network boots a copy of `ne_kernel` via its NetBoot protocol.
+This module network boots a copy of `neoskrnl.exe` via its NetBoot protocol.
This is for EFI modules only, as the NeBoot firmware already supports it.
diff --git a/src/boot/src/HEL/ARM64/BootEFI.cpp b/src/boot/src/HEL/ARM64/BootEFI.cpp
index a92b9a62..2cfacc22 100644
--- a/src/boot/src/HEL/ARM64/BootEFI.cpp
+++ b/src/boot/src/HEL/ARM64/BootEFI.cpp
@@ -124,7 +124,7 @@ EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTa
kHandoverHeader->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
- Boot::BootFileReader reader_kernel(L"ne_kernel", image_handle);
+ Boot::BootFileReader reader_kernel(L"neoskrnl.exe", image_handle);
reader_kernel.ReadAll(0);
diff --git a/src/boot/src/boot_rsrc.rsrc b/src/boot/src/boot_rsrc.rsrc
index b0c86e51..2c4e469f 100644
--- a/src/boot/src/boot_rsrc.rsrc
+++ b/src/boot/src/boot_rsrc.rsrc
@@ -13,7 +13,7 @@ BEGIN
VALUE "FileVersion", BOOTLOADER_VERSION
VALUE "InternalName", "bootz"
VALUE "LegalCopyright", "Copyright (C) 2024-2026, Amlal El Mahrouss licensed under the Apache 2.0 license."
- VALUE "OriginalFilename", "ne_bootz"
+ VALUE "OriginalFilename", "bootzldr.exe"
VALUE "ProductName", "bootz"
VALUE "ProductVersion", BOOTLOADER_VERSION
END
diff --git a/src/kernel/CompilerKit/Version.h b/src/kernel/CompilerKit/Version.h
index 090bec7c..8cce72b9 100644
--- a/src/kernel/CompilerKit/Version.h
+++ b/src/kernel/CompilerKit/Version.h
@@ -6,10 +6,10 @@
#ifndef COMPILERKIT_VERSION_H
#define COMPILERKIT_VERSION_H
-#define BOOTLOADER_VERSION "v0.1.3-bootz"
-#define KERNEL_VERSION "v0.1.3-krnl"
+#define BOOTLOADER_VERSION "v0.1.4-bootz"
+#define KERNEL_VERSION "v0.1.4-neoskrnl"
-#define BOOTLOADER_VERSION_BCD (0x0103)
-#define KERNEL_VERSION_BCD (0x0103)
+#define BOOTLOADER_VERSION_BCD (0x0104)
+#define KERNEL_VERSION_BCD (0x0104)
#endif
diff --git a/src/kernel/HALKit/ARM64/HalHandoverStub.s b/src/kernel/HALKit/ARM64/HalHandoverStub.s
index 5fe7a24a..8699bb11 100644
--- a/src/kernel/HALKit/ARM64/HalHandoverStub.s
+++ b/src/kernel/HALKit/ARM64/HalHandoverStub.s
@@ -15,5 +15,5 @@
.word 100
;; // CPU (ARM64)
.word 0
- ;; // TYPE (KERNEL)
+ ;; // TYPE (KERNEL_IMG)
.word 122
diff --git a/src/kernel/amd64-ci.make b/src/kernel/amd64-ci.make
index 71e350e5..e9d8548c 100644
--- a/src/kernel/amd64-ci.make
+++ b/src/kernel/amd64-ci.make
@@ -35,7 +35,7 @@ LDFLAGS = -e hal_init_platform --subsystem=17 --image-base 0x4000000
LDOBJ = obj/*.obj
# This file is the Kernel, responsible of task, memory, driver, sci, disk and device management.
-KERNEL_IMG = ne_kernel
+KERNEL_IMG = neoskrnl.exe
.PHONY: error
error:
diff --git a/src/kernel/amd64-desktop.make b/src/kernel/amd64-desktop.make
index 73bb2f43..44092379 100644
--- a/src/kernel/amd64-desktop.make
+++ b/src/kernel/amd64-desktop.make
@@ -38,7 +38,7 @@ LDFLAGS = -e hal_init_platform --subsystem=17 --image-base 0x10000000
LDOBJ = obj/*.obj
# This file is the Kernel, responsible of task, memory, driver, sci, disk and device management.
-KERNEL_IMG = ne_kernel
+KERNEL_IMG = neoskrnl.exe
.PHONY: error
error:
diff --git a/src/kernel/arm64-desktop.make b/src/kernel/arm64-desktop.make
index 1ca80a9e..334ed81b 100644
--- a/src/kernel/arm64-desktop.make
+++ b/src/kernel/arm64-desktop.make
@@ -23,7 +23,7 @@ LDFLAGS = -subsystem:efi_application -entry:hal_init_platform /nodefaultlib
LDOBJ = obj/*.obj
# This file is the Kernel, responsible of task management and memory.
-KERNEL = ne_kernel
+KERNEL_IMG = neoskrnl.exe
.PHONY: error
error:
@@ -46,7 +46,7 @@ OBJCOPY=x86_64-w64-mingw32-objcopy
.PHONY: link-arm64-epm
link-arm64-epm:
- $(LD) $(LDFLAGS) $(LDOBJ) /out:$(KERNEL)
+ $(LD) $(LDFLAGS) $(LDOBJ) /out:$(KERNEL_IMG)
.PHONY: all
all: nekernel-arm64-epm link-arm64-epm
@@ -61,4 +61,4 @@ help:
.PHONY: clean
clean:
- rm -f $(LDOBJ) $(wildcard *.o) $(KERNEL)
+ rm -f $(LDOBJ) $(wildcard *.o) $(KERNEL_IMG)
diff --git a/src/kernel/kernel_rsrc.rsrc b/src/kernel/kernel_rsrc.rsrc
index e6effe51..cc0c2eb3 100644
--- a/src/kernel/kernel_rsrc.rsrc
+++ b/src/kernel/kernel_rsrc.rsrc
@@ -8,12 +8,12 @@ BEGIN
BEGIN
BLOCK "080904E4"
BEGIN
- VALUE "CompanyName", "Amlal El Mahrouss"
- VALUE "FileDescription", "NeKernel"
+ VALUE "CompanyName", "Amlal El Mahrouss & Ne.app"
+ VALUE "FileDescription", "NeSystem OS Kernel"
VALUE "FileVersion", KERNEL_VERSION
VALUE "InternalName", "ne_kernel"
- VALUE "LegalCopyright", "(c) 2024-2026 Amlal El Mahrouss, licensed under the Apache 2.0 license."
- VALUE "OriginalFilename", "ne_kernel"
+ VALUE "LegalCopyright", "(c) 2024-2026 Amlal El Mahrouss and Ne.app, licensed under the Apache 2.0 license."
+ VALUE "OriginalFilename", "neoskrnl.exe"
VALUE "ProductName", "NeKernel"
VALUE "ProductVersion", KERNEL_VERSION
END
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-31 19:14:41 +0000