diff options
| author | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-10-08 10:18:53 +0200 |
|---|---|---|
| committer | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-10-08 10:18:53 +0200 |
| commit | 61eb25f10c521860692a56286b4c40c445c617cb (patch) | |
| tree | 07f0e86865f563d1559685dfb6d085f05726f126 /dev/zka | |
| parent | 1c67d9655979b48a71fd3a9ba087142ed1bb28ea (diff) | |
IMP: Rename newoskrnl.exe to minkrnl.exe, which stands for minimal kernel (it's final name)
Diffstat (limited to 'dev/zka')
| -rw-r--r-- | dev/zka/KernelKit/ThreadLocalStorage.hxx | 2 | ||||
| -rw-r--r-- | dev/zka/KernelRsrc.rsrc | 8 | ||||
| -rw-r--r-- | dev/zka/NewKit/Defines.hxx | 2 | ||||
| -rw-r--r-- | dev/zka/NewKit/String.hxx | 20 | ||||
| -rw-r--r-- | dev/zka/amd64-efi.make | 4 | ||||
| -rw-r--r-- | dev/zka/arm64-efi.make | 2 | ||||
| -rw-r--r-- | dev/zka/doc/TODO-LIST.md | 2 | ||||
| -rw-r--r-- | dev/zka/src/IDLLObject.cxx | 2 | ||||
| -rw-r--r-- | dev/zka/src/IPEFDLLObject.cxx | 2 | ||||
| -rw-r--r-- | dev/zka/src/PEFCodeMgr.cxx | 5 | ||||
| -rw-r--r-- | dev/zka/src/Semaphore.cxx | 2 | ||||
| -rw-r--r-- | dev/zka/src/Stop.cxx | 6 | ||||
| -rw-r--r-- | dev/zka/src/ThreadLocalStorage.cxx | 3 |
13 files changed, 33 insertions, 27 deletions
diff --git a/dev/zka/KernelKit/ThreadLocalStorage.hxx b/dev/zka/KernelKit/ThreadLocalStorage.hxx index a25d8926..65b03d9e 100644 --- a/dev/zka/KernelKit/ThreadLocalStorage.hxx +++ b/dev/zka/KernelKit/ThreadLocalStorage.hxx @@ -9,7 +9,7 @@ #include <NewKit/Defines.hxx> -///! @brief Thread Local Storage for newoskrnl. +///! @brief Thread Local Storage for minkrnl. #define kCookieMag0 'Z' #define kCookieMag1 'K' diff --git a/dev/zka/KernelRsrc.rsrc b/dev/zka/KernelRsrc.rsrc index dd476da2..98c3e3ec 100644 --- a/dev/zka/KernelRsrc.rsrc +++ b/dev/zka/KernelRsrc.rsrc @@ -9,12 +9,12 @@ BEGIN BLOCK "080904E4" BEGIN VALUE "CompanyName", "ZKA Technologies." - VALUE "FileDescription", "ZKA Kernel and System." + VALUE "FileDescription", "ZKA Minimal Kernel." VALUE "FileVersion", KERNEL_VERSION - VALUE "InternalName", "newoskrnl" + VALUE "InternalName", "minkrnl" VALUE "LegalCopyright", "(c) ZKA Technologies, all rights reserved." - VALUE "OriginalFilename", "newoskrnl.exe" - VALUE "ProductName", "ZKA Operating System" + VALUE "OriginalFilename", "minkrnl.exe" + VALUE "ProductName", "ZKA Operating System Kernel." VALUE "ProductVersion", KERNEL_VERSION END END diff --git a/dev/zka/NewKit/Defines.hxx b/dev/zka/NewKit/Defines.hxx index 22065b99..712b1f63 100644 --- a/dev/zka/NewKit/Defines.hxx +++ b/dev/zka/NewKit/Defines.hxx @@ -23,7 +23,7 @@ #endif #endif -/// @brief The **newoskrnl** namespace where it's API resides. +/// @brief The **Kernel** namespace where it's API resides. namespace Kernel { using voidPtr = void*; diff --git a/dev/zka/NewKit/String.hxx b/dev/zka/NewKit/String.hxx index 762efc44..184ccc42 100644 --- a/dev/zka/NewKit/String.hxx +++ b/dev/zka/NewKit/String.hxx @@ -6,30 +6,35 @@ #pragma once +#include <CompilerKit/CompilerKit.hxx> #include <NewKit/Defines.hxx> #include <NewKit/ErrorOr.hxx> #include <NewKit/Utils.hxx> #include <NewKit/Stop.hxx> +#define cMinimumStringSize 8196 + namespace Kernel { + /// @brief StringView class, using dynamic or static memory. class StringView final { public: explicit StringView() { - fSz = 4096; + fDataSz = cMinimumStringSize; - fData = new Char[fSz]; + fData = new Char[fDataSz]; MUST_PASS(fData); - rt_set_memory(fData, 0, fSz); + rt_set_memory(fData, 0, fDataSz); } - explicit StringView(Size Sz) - : fSz(Sz) + explicit StringView(const SizeT& Sz) + : fDataSz(Sz) { MUST_PASS(Sz > 1); + fData = new Char[Sz]; MUST_PASS(fData); @@ -42,8 +47,7 @@ namespace Kernel delete[] fData; } - StringView& operator=(const StringView&) = default; - StringView(const StringView&) = default; + ZKA_COPY_DEFAULT(StringView); Char* Data(); const Char* CData() const; @@ -70,7 +74,7 @@ namespace Kernel private: Char* fData{nullptr}; - Size fSz{0}; + Size fDataSz{0}; Size fCur{0}; friend class StringBuilder; diff --git a/dev/zka/amd64-efi.make b/dev/zka/amd64-efi.make index 5225caba..335eb52c 100644 --- a/dev/zka/amd64-efi.make +++ b/dev/zka/amd64-efi.make @@ -1,6 +1,6 @@ ################################################## # (C) ZKA Technologies, all rights reserved. -# This is the newoskrnl's makefile. +# This is the minkrnl's makefile. ################################################## CC = x86_64-w64-mingw32-g++.exe @@ -39,7 +39,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 = newoskrnl.exe +KERNEL_IMG = minkrnl.exe .PHONY: error error: diff --git a/dev/zka/arm64-efi.make b/dev/zka/arm64-efi.make index be3f9960..261087bf 100644 --- a/dev/zka/arm64-efi.make +++ b/dev/zka/arm64-efi.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 = newoskrnl.so +KERNEL = minkrnl.so .PHONY: error error: diff --git a/dev/zka/doc/TODO-LIST.md b/dev/zka/doc/TODO-LIST.md index 2b4ea96c..dfaa8123 100644 --- a/dev/zka/doc/TODO-LIST.md +++ b/dev/zka/doc/TODO-LIST.md @@ -20,6 +20,6 @@ Status: NEWOSLDR: Need to boot from EPM partition. [ X ] <br> -newoskrnl: New Filesystem is done. [ X ] +minkrnl: New Filesystem is done. [ X ] **Refer to Jira please!** diff --git a/dev/zka/src/IDLLObject.cxx b/dev/zka/src/IDLLObject.cxx index b6b6a348..5220f928 100644 --- a/dev/zka/src/IDLLObject.cxx +++ b/dev/zka/src/IDLLObject.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * newoskrnl + * minkrnl * Copyright ZKA Technologies., all rights reserved. * * ======================================================== diff --git a/dev/zka/src/IPEFDLLObject.cxx b/dev/zka/src/IPEFDLLObject.cxx index 22645dde..e5f91d9a 100644 --- a/dev/zka/src/IPEFDLLObject.cxx +++ b/dev/zka/src/IPEFDLLObject.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * newoskrnl + * minkrnl * Copyright ZKA Technologies., all rights reserved. * * ======================================================== diff --git a/dev/zka/src/PEFCodeMgr.cxx b/dev/zka/src/PEFCodeMgr.cxx index 47643078..dcc0d4db 100644 --- a/dev/zka/src/PEFCodeMgr.cxx +++ b/dev/zka/src/PEFCodeMgr.cxx @@ -89,7 +89,8 @@ namespace Kernel if (fCachedBlob) mm_delete_heap(fCachedBlob); - kcout << "CodeMgrPEF: Warning: Executable format error!\r"; + kcout << "PEFLoader: Warning: Executable format error!\r"; + fCachedBlob = nullptr; } @@ -169,6 +170,8 @@ namespace Kernel rt_copy_memory((VoidPtr)((Char*)blob + sizeof(PEFCommandHeader)), blobRet, container_header->Size); mm_delete_heap(blob); + kcout << "PEFLoader: INFO: Load stub: " << container_header->Name << "!\r"; + return blobRet; } } diff --git a/dev/zka/src/Semaphore.cxx b/dev/zka/src/Semaphore.cxx index 9160228b..88e3b16b 100644 --- a/dev/zka/src/Semaphore.cxx +++ b/dev/zka/src/Semaphore.cxx @@ -47,7 +47,7 @@ namespace Kernel return this->Lock(process); } - /// @brief Wait with process, either wait for process being invalid, or not being run. + /// @brief Wait with process, either wait for it to be being invalid, or not being run. Void Semaphore::WaitForProcess() noexcept { while (fLockingProcess) diff --git a/dev/zka/src/Stop.cxx b/dev/zka/src/Stop.cxx index 6c252206..dd464659 100644 --- a/dev/zka/src/Stop.cxx +++ b/dev/zka/src/Stop.cxx @@ -16,7 +16,7 @@ #include <modules/FB/FB.hxx> #include <modules/FB/Text.hxx> -#define cWebsiteMacro "https://help.el-mahrouss-logic.com/" +#define cWebsiteMacro "https://help.zka-software.com/" /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ @@ -32,7 +32,7 @@ namespace Kernel auto start_y = 10; auto x = 10; - CGDrawString("newoskrnl.exe Stopped working properly so it had to stop.", start_y, x, panicTxt); + CGDrawString("minkrnl.exe stopped working properly so it had to stop.", start_y, x, panicTxt); start_y += 10; // simply offset from previous string and then write the website. @@ -48,7 +48,7 @@ namespace Kernel switch (id) { case RUNTIME_CHECK_PROCESS: { - CGDrawString("0x00000008 No more processes to run, this is because that ZKA ran out of processes.", start_y, x, panicTxt); + CGDrawString("0x00000008 Scheduler error.", start_y, x, panicTxt); RecoveryFactory::Recover(); break; } diff --git a/dev/zka/src/ThreadLocalStorage.cxx b/dev/zka/src/ThreadLocalStorage.cxx index d3514c8d..be773eab 100644 --- a/dev/zka/src/ThreadLocalStorage.cxx +++ b/dev/zka/src/ThreadLocalStorage.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * newoskrnl + * minkrnl * Copyright ZKA Technologies., all rights reserved. * * ======================================================== @@ -12,7 +12,6 @@ #include <KernelKit/UserProcessScheduler.hxx> #include <KernelKit/ThreadLocalStorage.hxx> - /***********************************************************************************/ /// @bugs: 0 /// @file ThreadLocalStorage.cxx |
