From bce9420fb8dd066188900d44248453a11a3d08d5 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 26 Dec 2024 21:49:37 +0100 Subject: META: Overall improvements and fixes to ZkaOS. Signed-off-by: Amlal El Mahrouss --- dev/Boot/Mod/.keep | 0 dev/Boot/Mod/NetBoot/.hgkeep | 0 dev/Boot/Mod/NetBoot/Boot.S | 28 ++++++++ dev/Boot/Mod/NetBoot/Module.cc | 16 +++++ dev/Boot/Mod/NetBoot/NetBoot.h | 26 ++++++++ dev/Boot/Mod/NetBoot/build.json | 24 +++++++ dev/Boot/Mod/SysChk/.hgkeep | 0 dev/Boot/Mod/SysChk/Boot.S | 20 ++++++ dev/Boot/Mod/SysChk/Module.cc | 47 +++++++++++++ dev/Boot/Mod/SysChk/build.json | 24 +++++++ dev/Boot/Modules/.keep | 0 dev/Boot/Modules/NetBoot/.hgkeep | 0 dev/Boot/Modules/NetBoot/Boot.S | 28 -------- dev/Boot/Modules/NetBoot/Module.cc | 16 ----- dev/Boot/Modules/NetBoot/NetBoot.h | 26 -------- dev/Boot/Modules/NetBoot/build.json | 24 ------- dev/Boot/Modules/SysChk/.hgkeep | 0 dev/Boot/Modules/SysChk/Boot.S | 20 ------ dev/Boot/Modules/SysChk/Module.cc | 47 ------------- dev/Boot/Modules/SysChk/build.json | 24 ------- dev/Boot/src/HEL/AMD64/BootMain.cc | 2 +- dev/Kernel/KernelKit/FileMgr.h | 50 ++------------ dev/Kernel/NetworkKit/IPC.h | 22 +++--- dev/Kernel/NewKit/SwapMgr.h | 31 --------- dev/Kernel/NewKit/ThreadMgr.h | 20 ------ dev/Kernel/SystemKit/SwapMgr.h | 18 +++++ dev/Kernel/SystemKit/ThreadMgr.h | 20 ++++++ dev/Kernel/src/KernelPanic.cc | 2 - dev/Kernel/src/Mgr/SwapMgr.cc | 28 ++++++++ dev/Kernel/src/Network/IP.cc | 126 ----------------------------------- dev/Kernel/src/Network/IPAddr.cc | 129 ++++++++++++++++++++++++++++++++++++ dev/Kernel/src/Network/IPC.cc | 115 -------------------------------- dev/Kernel/src/Network/IPCAddr.cc | 0 dev/Kernel/src/Network/IPCMsg.cc | 113 +++++++++++++++++++++++++++++++ dev/Kernel/src/PEFCodeMgr.cc | 4 +- dev/LibSCI/GPU.h | 2 +- dev/LibSCI/SCI.h | 2 +- dev/LibSCI/src/SCI.cc | 2 +- 38 files changed, 517 insertions(+), 539 deletions(-) create mode 100644 dev/Boot/Mod/.keep create mode 100644 dev/Boot/Mod/NetBoot/.hgkeep create mode 100644 dev/Boot/Mod/NetBoot/Boot.S create mode 100644 dev/Boot/Mod/NetBoot/Module.cc create mode 100644 dev/Boot/Mod/NetBoot/NetBoot.h create mode 100644 dev/Boot/Mod/NetBoot/build.json create mode 100644 dev/Boot/Mod/SysChk/.hgkeep create mode 100644 dev/Boot/Mod/SysChk/Boot.S create mode 100644 dev/Boot/Mod/SysChk/Module.cc create mode 100644 dev/Boot/Mod/SysChk/build.json delete mode 100644 dev/Boot/Modules/.keep delete mode 100644 dev/Boot/Modules/NetBoot/.hgkeep delete mode 100644 dev/Boot/Modules/NetBoot/Boot.S delete mode 100644 dev/Boot/Modules/NetBoot/Module.cc delete mode 100644 dev/Boot/Modules/NetBoot/NetBoot.h delete mode 100644 dev/Boot/Modules/NetBoot/build.json delete mode 100644 dev/Boot/Modules/SysChk/.hgkeep delete mode 100644 dev/Boot/Modules/SysChk/Boot.S delete mode 100644 dev/Boot/Modules/SysChk/Module.cc delete mode 100644 dev/Boot/Modules/SysChk/build.json delete mode 100644 dev/Kernel/NewKit/SwapMgr.h delete mode 100644 dev/Kernel/NewKit/ThreadMgr.h create mode 100644 dev/Kernel/SystemKit/SwapMgr.h create mode 100644 dev/Kernel/SystemKit/ThreadMgr.h create mode 100644 dev/Kernel/src/Mgr/SwapMgr.cc delete mode 100644 dev/Kernel/src/Network/IP.cc create mode 100644 dev/Kernel/src/Network/IPAddr.cc delete mode 100644 dev/Kernel/src/Network/IPC.cc create mode 100644 dev/Kernel/src/Network/IPCAddr.cc create mode 100644 dev/Kernel/src/Network/IPCMsg.cc (limited to 'dev') diff --git a/dev/Boot/Mod/.keep b/dev/Boot/Mod/.keep new file mode 100644 index 00000000..e69de29b diff --git a/dev/Boot/Mod/NetBoot/.hgkeep b/dev/Boot/Mod/NetBoot/.hgkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/Boot/Mod/NetBoot/Boot.S b/dev/Boot/Mod/NetBoot/Boot.S new file mode 100644 index 00000000..0527e509 --- /dev/null +++ b/dev/Boot/Mod/NetBoot/Boot.S @@ -0,0 +1,28 @@ +;; /* +;; * ======================================================== +;; * +;; * BootZ +;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. +;; * +;; * ======================================================== +;; */ + +.code64 +.intel_syntax noprefix + +#define kTypeDriver 101 +#define kArchAmd64 122 +#define kHandoverMagic 0xBADCC + +.section .ldr + +.quad kHandoverMagic +.word kTypeDriver + +.text + +.extern main +.global __main + +__main: + ret diff --git a/dev/Boot/Mod/NetBoot/Module.cc b/dev/Boot/Mod/NetBoot/Module.cc new file mode 100644 index 00000000..6277da70 --- /dev/null +++ b/dev/Boot/Mod/NetBoot/Module.cc @@ -0,0 +1,16 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. + * + * ======================================================== + */ + +#include +#include + +EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) +{ + return kEfiOk; +} diff --git a/dev/Boot/Mod/NetBoot/NetBoot.h b/dev/Boot/Mod/NetBoot/NetBoot.h new file mode 100644 index 00000000..cdfe17f9 --- /dev/null +++ b/dev/Boot/Mod/NetBoot/NetBoot.h @@ -0,0 +1,26 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. + * + * ======================================================== + */ + +#pragma once + +#include + +/// @brief the internet header is used to download updates OTA. +typedef struct NetBootInternetHeader +{ + Kernel::Char NB1; /// magic char 1 'N' + Kernel::Char NB2; /// magic char 2 'E' + Kernel::Char NB3; /// magic char 3 'T' + Kernel::Char NB4; /// magic char 4 'B' + + Kernel::Char PatchName[255]; /// example: ColdChoco + Kernel::Int32 PatchLength; /// the patch length. + Kernel::Char PatchTarget[255]; /// the target file. + Kernel::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? +} NetBootInternetHeader; diff --git a/dev/Boot/Mod/NetBoot/build.json b/dev/Boot/Mod/NetBoot/build.json new file mode 100644 index 00000000..9df27b3c --- /dev/null +++ b/dev/Boot/Mod/NetBoot/build.json @@ -0,0 +1,24 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], + "sources_path": [".cc", "*.S"], + "output_name": "netboot.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" + ], + "cpp_macros": [ + "__MINOSKRNL__", + "__ZBAOSLDR__", + "__ZKA_AMD64__", + "kNetBootVersionHighest=0x0100", + "kNetBootVersionLowest=0x0100", + "kNetBootVersion=0x0100" + ] +} diff --git a/dev/Boot/Mod/SysChk/.hgkeep b/dev/Boot/Mod/SysChk/.hgkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/Boot/Mod/SysChk/Boot.S b/dev/Boot/Mod/SysChk/Boot.S new file mode 100644 index 00000000..9fdf4428 --- /dev/null +++ b/dev/Boot/Mod/SysChk/Boot.S @@ -0,0 +1,20 @@ +;; /* +;; * ======================================================== +;; * +;; * BootZ +;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. +;; * +;; * ======================================================== +;; */ + +.code64 +.intel_syntax noprefix + +#define kTypeDriver 101 +#define kArchAmd64 122 +#define kHandoverMagic 0xBADCC + +.section .ldr + +.quad kHandoverMagic +.word kTypeDriver diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc new file mode 100644 index 00000000..a48e524c --- /dev/null +++ b/dev/Boot/Mod/SysChk/Module.cc @@ -0,0 +1,47 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. + * + * ======================================================== + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) +{ + EfiSystemTable* system_table = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; + + EfiInputKey key{}; + + system_table->ConIn->ReadKeyStroke(system_table->ConIn, &key); + + if (key.UnicodeChar == 'F' || + key.UnicodeChar == 'f') + { + UI::ui_draw_background(); + + fb_init(); + + FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_HEIGHT, ZKA_NO_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); + + fb_fini(); + + return kEfiOk; + } + + return kEfiFail; +} diff --git a/dev/Boot/Mod/SysChk/build.json b/dev/Boot/Mod/SysChk/build.json new file mode 100644 index 00000000..cd21e269 --- /dev/null +++ b/dev/Boot/Mod/SysChk/build.json @@ -0,0 +1,24 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], + "sources_path": ["*.cc", "*.S"], + "output_name": "syschk.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" + ], + "cpp_macros": [ + "__MINOSKRNL__", + "__ZBAOSLDR__", + "__ZKA_AMD64__", + "kChkVersionHighest=0x0100", + "kChkVersionLowest=0x0100", + "kChkVersion=0x0100" + ] +} diff --git a/dev/Boot/Modules/.keep b/dev/Boot/Modules/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/Boot/Modules/NetBoot/.hgkeep b/dev/Boot/Modules/NetBoot/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/Boot/Modules/NetBoot/Boot.S b/dev/Boot/Modules/NetBoot/Boot.S deleted file mode 100644 index 0527e509..00000000 --- a/dev/Boot/Modules/NetBoot/Boot.S +++ /dev/null @@ -1,28 +0,0 @@ -;; /* -;; * ======================================================== -;; * -;; * BootZ -;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. -;; * -;; * ======================================================== -;; */ - -.code64 -.intel_syntax noprefix - -#define kTypeDriver 101 -#define kArchAmd64 122 -#define kHandoverMagic 0xBADCC - -.section .ldr - -.quad kHandoverMagic -.word kTypeDriver - -.text - -.extern main -.global __main - -__main: - ret diff --git a/dev/Boot/Modules/NetBoot/Module.cc b/dev/Boot/Modules/NetBoot/Module.cc deleted file mode 100644 index 6277da70..00000000 --- a/dev/Boot/Modules/NetBoot/Module.cc +++ /dev/null @@ -1,16 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. - * - * ======================================================== - */ - -#include -#include - -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) -{ - return kEfiOk; -} diff --git a/dev/Boot/Modules/NetBoot/NetBoot.h b/dev/Boot/Modules/NetBoot/NetBoot.h deleted file mode 100644 index cdfe17f9..00000000 --- a/dev/Boot/Modules/NetBoot/NetBoot.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. - * - * ======================================================== - */ - -#pragma once - -#include - -/// @brief the internet header is used to download updates OTA. -typedef struct NetBootInternetHeader -{ - Kernel::Char NB1; /// magic char 1 'N' - Kernel::Char NB2; /// magic char 2 'E' - Kernel::Char NB3; /// magic char 3 'T' - Kernel::Char NB4; /// magic char 4 'B' - - Kernel::Char PatchName[255]; /// example: ColdChoco - Kernel::Int32 PatchLength; /// the patch length. - Kernel::Char PatchTarget[255]; /// the target file. - Kernel::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? -} NetBootInternetHeader; diff --git a/dev/Boot/Modules/NetBoot/build.json b/dev/Boot/Modules/NetBoot/build.json deleted file mode 100644 index 9df27b3c..00000000 --- a/dev/Boot/Modules/NetBoot/build.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], - "sources_path": [".cc", "*.S"], - "output_name": "netboot.sys", - "compiler_flags": [ - "-ffreestanding", - "-nostdlib", - "-std=c++20", - "-fPIC", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" - ], - "cpp_macros": [ - "__MINOSKRNL__", - "__ZBAOSLDR__", - "__ZKA_AMD64__", - "kNetBootVersionHighest=0x0100", - "kNetBootVersionLowest=0x0100", - "kNetBootVersion=0x0100" - ] -} diff --git a/dev/Boot/Modules/SysChk/.hgkeep b/dev/Boot/Modules/SysChk/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/Boot/Modules/SysChk/Boot.S b/dev/Boot/Modules/SysChk/Boot.S deleted file mode 100644 index 9fdf4428..00000000 --- a/dev/Boot/Modules/SysChk/Boot.S +++ /dev/null @@ -1,20 +0,0 @@ -;; /* -;; * ======================================================== -;; * -;; * BootZ -;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. -;; * -;; * ======================================================== -;; */ - -.code64 -.intel_syntax noprefix - -#define kTypeDriver 101 -#define kArchAmd64 122 -#define kHandoverMagic 0xBADCC - -.section .ldr - -.quad kHandoverMagic -.word kTypeDriver diff --git a/dev/Boot/Modules/SysChk/Module.cc b/dev/Boot/Modules/SysChk/Module.cc deleted file mode 100644 index a48e524c..00000000 --- a/dev/Boot/Modules/SysChk/Module.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. - * - * ======================================================== - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) -{ - EfiSystemTable* system_table = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; - - EfiInputKey key{}; - - system_table->ConIn->ReadKeyStroke(system_table->ConIn, &key); - - if (key.UnicodeChar == 'F' || - key.UnicodeChar == 'f') - { - UI::ui_draw_background(); - - fb_init(); - - FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_HEIGHT, ZKA_NO_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); - - fb_fini(); - - return kEfiOk; - } - - return kEfiFail; -} diff --git a/dev/Boot/Modules/SysChk/build.json b/dev/Boot/Modules/SysChk/build.json deleted file mode 100644 index cd21e269..00000000 --- a/dev/Boot/Modules/SysChk/build.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S"], - "output_name": "syschk.sys", - "compiler_flags": [ - "-ffreestanding", - "-nostdlib", - "-std=c++20", - "-fPIC", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" - ], - "cpp_macros": [ - "__MINOSKRNL__", - "__ZBAOSLDR__", - "__ZKA_AMD64__", - "kChkVersionHighest=0x0100", - "kChkVersionLowest=0x0100", - "kChkVersion=0x0100" - ] -} diff --git a/dev/Boot/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc index 51a49d0f..29238413 100644 --- a/dev/Boot/src/HEL/AMD64/BootMain.cc +++ b/dev/Boot/src/HEL/AMD64/BootMain.cc @@ -232,7 +232,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, root.fKind = kNeFSCatalogKindDir; - partition_factory.Format("FileSystem (A:) ", &root, 1); + partition_factory.Format("Zka HD", &root, 1); UI::ui_draw_background(); diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/Kernel/KernelKit/FileMgr.h index c448519e..07be1089 100644 --- a/dev/Kernel/KernelKit/FileMgr.h +++ b/dev/Kernel/KernelKit/FileMgr.h @@ -209,7 +209,7 @@ namespace Kernel FileStream(const FileStream&); public: - ErrorOr WriteAll(const VoidPtr data) noexcept + ErrorOr Write(const SizeT offset, const VoidPtr data, SizeT len) noexcept { if (this->fFileRestrict != kFileMgrRestrictReadWrite && this->fFileRestrict != kFileMgrRestrictReadWriteBinary && @@ -224,33 +224,14 @@ namespace Kernel if (man) { - man->Write(fFile, data, kFileWriteAll); + man->Write(offset, fFile, data, len); return ErrorOr(0); } return ErrorOr(kErrorInvalidData); } - VoidPtr ReadAll() noexcept - { - if (this->fFileRestrict != kFileMgrRestrictReadWrite && - this->fFileRestrict != kFileMgrRestrictReadWriteBinary && - this->fFileRestrict != kFileMgrRestrictRead && - this->fFileRestrict != kFileMgrRestrictReadBinary) - return nullptr; - - auto man = FSClass::GetMounted(); - - if (man) - { - VoidPtr ret = man->Read(fFile, kFileReadAll, 0); - return ret; - } - - return nullptr; - } - - ErrorOr WriteAll(const Char* fName, const VoidPtr data) noexcept + ErrorOr Write(const Char* name, const VoidPtr data, SizeT len) noexcept { if (this->fFileRestrict != kFileMgrRestrictReadWrite && this->fFileRestrict != kFileMgrRestrictReadWriteBinary && @@ -265,14 +246,14 @@ namespace Kernel if (man) { - man->Write(fName, fFile, data, kFileWriteAll); + man->Write(name, fFile, data, len); return ErrorOr(0); } return ErrorOr(kErrorInvalidData); } - VoidPtr Read(const Char* fName) noexcept + VoidPtr Read(const Char* name, const SizeT sz) noexcept { if (this->fFileRestrict != kFileMgrRestrictReadWrite && this->fFileRestrict != kFileMgrRestrictReadWriteBinary && @@ -284,14 +265,14 @@ namespace Kernel if (man) { - VoidPtr ret = man->Read(fName, fFile, kFileReadAll, 0); + VoidPtr ret = man->Read(name, fFile, kFileReadAll, 0); return ret; } return nullptr; } - VoidPtr Read(SizeT offset, SizeT sz) + VoidPtr Read(SizeT offset, const SizeT sz) { if (this->fFileRestrict != kFileMgrRestrictReadWrite && this->fFileRestrict != kFileMgrRestrictReadWriteBinary && @@ -312,23 +293,6 @@ namespace Kernel return nullptr; } - Void Write(SizeT offset, voidPtr data, SizeT sz) - { - if (this->fFileRestrict != kFileMgrRestrictReadWrite && - this->fFileRestrict != kFileMgrRestrictReadWriteBinary && - this->fFileRestrict != kFileMgrRestrictWrite && - this->fFileRestrict != kFileMgrRestrictWriteBinary) - return; - - auto man = FSClass::GetMounted(); - - if (man) - { - man->Seek(fFile, offset); - man->Write(fFile, data, sz, kFileReadChunk); - } - } - public: /// @brief Leak node pointer. /// @return The node pointer. diff --git a/dev/Kernel/NetworkKit/IPC.h b/dev/Kernel/NetworkKit/IPC.h index 4bc293c4..c6594659 100644 --- a/dev/Kernel/NetworkKit/IPC.h +++ b/dev/Kernel/NetworkKit/IPC.h @@ -27,11 +27,11 @@ namespace Kernel { - struct IPCAddress; - struct IPCMessage; + struct IPC_ADDR; + struct IPC_MSG; /// @brief 128-bit IPC address. - struct PACKED IPCAddress final + struct PACKED IPC_ADDR final { UInt64 UserProcessID; UInt64 UserProcessTeam; @@ -40,18 +40,18 @@ namespace Kernel // some operators. //////////////////////////////////// - bool operator==(const IPCAddress& addr) noexcept + bool operator==(const IPC_ADDR& addr) noexcept { return addr.UserProcessID == this->UserProcessID && addr.UserProcessTeam == this->UserProcessTeam; } - bool operator==(IPCAddress& addr) noexcept + bool operator==(IPC_ADDR& addr) noexcept { return addr.UserProcessID == this->UserProcessID && addr.UserProcessTeam == this->UserProcessTeam; } }; - typedef struct IPCAddress IPCEPAddressKind; + typedef struct IPC_ADDR IPCEPAddressKind; enum { @@ -63,7 +63,7 @@ namespace Kernel constexpr inline auto kIPCMsgSize = 6094U; /// @brief IPC connection header, message cannot be greater than 6K. - typedef struct IPCMessage final + typedef struct IPC_MSG final { UInt32 IpcHeaderMagic; // cRemoteHeaderMagic UInt8 IpcEndianess; // 0 : LE, 1 : BE @@ -76,7 +76,7 @@ namespace Kernel UInt8 IpcData[kIPCMsgSize]; /// @brief Passes the message to target, could be anything, HTTP packet, JSON or whatever. - Bool Pass(IPCMessage* target) noexcept + Bool Pass(IPC_MSG* target) noexcept { if (target && target->IpcFrom == this->IpcTo) { @@ -90,17 +90,17 @@ namespace Kernel return No; } - } PACKED IPCMessage; + } PACKED IPC_MSG; /// @brief Sanitize packet function /// @retval true packet is correct. /// @retval false packet is incorrect and process has crashed. - Bool ipc_sanitize_packet(_Input IPCMessage* pckt_in); + Bool ipc_sanitize_packet(_Input IPC_MSG* pckt_in); /// @brief Construct packet function /// @retval true packet is correct. /// @retval false packet is incorrect and process has crashed. - Bool ipc_construct_packet(_Output _Input IPCMessage** pckt_in); + Bool ipc_construct_packet(_Output _Input IPC_MSG** pckt_in); } // namespace Kernel #endif // INC_IPC_H diff --git a/dev/Kernel/NewKit/SwapMgr.h b/dev/Kernel/NewKit/SwapMgr.h deleted file mode 100644 index 42df9ca6..00000000 --- a/dev/Kernel/NewKit/SwapMgr.h +++ /dev/null @@ -1,31 +0,0 @@ - -/* ------------------------------------------- - - Copyright (C) 2024, Theater Quality Inc, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#include - -#define kSwapMgrBlockMaxSize mib_cast(16) -#define KSwapMgrBlockMagic "SWEP " - -#define kSwapMgrPageFile "/System/pagefile.sys" - -/// @file SwapMgr.h -/// @brief Virtual memory swap manager. - -namespace Kernel -{ - class SwapMgrDisk; - - class SwapMgrDisk - { - static BOOL DumpToDisk(const Char* fork_name, SizeT fork_name_len = 0) - { - return YES; - } - } -} \ No newline at end of file diff --git a/dev/Kernel/NewKit/ThreadMgr.h b/dev/Kernel/NewKit/ThreadMgr.h deleted file mode 100644 index 8148c28d..00000000 --- a/dev/Kernel/NewKit/ThreadMgr.h +++ /dev/null @@ -1,20 +0,0 @@ - -/* ------------------------------------------- - - Copyright (C) 2024, Theater Quality Inc, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#include - -/// @file ThreadMgr.h -/// @brief This file takes care of creating processes/threads from a subsystem context. - -namespace Kernel -{ - class UserSubsystem; - class UserEnvVar; - class UserEnv; -} \ No newline at end of file diff --git a/dev/Kernel/SystemKit/SwapMgr.h b/dev/Kernel/SystemKit/SwapMgr.h new file mode 100644 index 00000000..27296882 --- /dev/null +++ b/dev/Kernel/SystemKit/SwapMgr.h @@ -0,0 +1,18 @@ + +/* ------------------------------------------- + + Copyright (C) 2024, Theater Quality Inc, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#include + +#define kSwapMgrBlockMaxSize mib_cast(16) +#define KSwapMgrBlockMagic "SWEP " + +#define kSwapMgrPageFile "/System/pagefile.sys" + +/// @file SwapMgr.h +/// @brief Virtual memory swap manager. diff --git a/dev/Kernel/SystemKit/ThreadMgr.h b/dev/Kernel/SystemKit/ThreadMgr.h new file mode 100644 index 00000000..8148c28d --- /dev/null +++ b/dev/Kernel/SystemKit/ThreadMgr.h @@ -0,0 +1,20 @@ + +/* ------------------------------------------- + + Copyright (C) 2024, Theater Quality Inc, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#include + +/// @file ThreadMgr.h +/// @brief This file takes care of creating processes/threads from a subsystem context. + +namespace Kernel +{ + class UserSubsystem; + class UserEnvVar; + class UserEnv; +} \ No newline at end of file diff --git a/dev/Kernel/src/KernelPanic.cc b/dev/Kernel/src/KernelPanic.cc index 9b200336..f26925c5 100644 --- a/dev/Kernel/src/KernelPanic.cc +++ b/dev/Kernel/src/KernelPanic.cc @@ -14,8 +14,6 @@ #include #include -#define kWebsiteURL "https://el-mahrouss-logic.com/products/help/" - /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ diff --git a/dev/Kernel/src/Mgr/SwapMgr.cc b/dev/Kernel/src/Mgr/SwapMgr.cc new file mode 100644 index 00000000..47e20982 --- /dev/null +++ b/dev/Kernel/src/Mgr/SwapMgr.cc @@ -0,0 +1,28 @@ +/* ------------------------------------------- + + Copyright (C) 2024, Theater Quality Inc, all rights reserved. + +------------------------------------------- */ + +#include +#include + +namespace Kernel +{ + class SwapMgrDiskMgr; + + class SwapMgrDiskMgr final + { + static BOOL DumpToDisk(const Char* fork_name, const SizeT fork_name_len, VoidPtr data, const SizeT data_len) + { + if (!fork_name || !fork_name_len) + return NO; + + FileStream file(kSwapMgrPageFile, "wb"); + + file.Write(fork_name, data, data_len); + + return YES; + } + } +} \ No newline at end of file diff --git a/dev/Kernel/src/Network/IP.cc b/dev/Kernel/src/Network/IP.cc deleted file mode 100644 index 2a07bc62..00000000 --- a/dev/Kernel/src/Network/IP.cc +++ /dev/null @@ -1,126 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024, Theater Quality Inc, all rights reserved. - -------------------------------------------- */ - -#include -#include - -namespace Kernel -{ - char* RawIPAddress::Address() - { - return fAddr; - } - - RawIPAddress::RawIPAddress(char bytes[4]) - { - rt_copy_memory(bytes, fAddr, 4); - } - - bool RawIPAddress::operator==(const RawIPAddress& ipv4) - { - for (Size index = 0; index < 4; ++index) - { - if (ipv4.fAddr[index] != fAddr[index]) - return false; - } - - return true; - } - - bool RawIPAddress::operator!=(const RawIPAddress& ipv4) - { - for (Size index = 0; index < 4; ++index) - { - if (ipv4.fAddr[index] == fAddr[index]) - return false; - } - - return true; - } - - char& RawIPAddress::operator[](const Size& index) - { - kcout << "[RawIPAddress::operator[]] Fetching Index...\r"; - - static char IP_PLACEHOLDER = '0'; - if (index > 4) - return IP_PLACEHOLDER; - - return fAddr[index]; - } - - RawIPAddress6::RawIPAddress6(char bytes[8]) - { - rt_copy_memory(bytes, fAddr, 8); - } - - char& RawIPAddress6::operator[](const Size& index) - { - kcout << "[RawIPAddress6::operator[]] Fetching Index...\r"; - - static char IP_PLACEHOLDER = '0'; - if (index > 8) - return IP_PLACEHOLDER; - - return fAddr[index]; - } - - bool RawIPAddress6::operator==(const RawIPAddress6& ipv6) - { - for (SizeT index = 0; index < 8; ++index) - { - if (ipv6.fAddr[index] != fAddr[index]) - return false; - } - - return true; - } - - bool RawIPAddress6::operator!=(const RawIPAddress6& ipv6) - { - for (SizeT index = 0; index < 8; ++index) - { - if (ipv6.fAddr[index] == fAddr[index]) - return false; - } - - return true; - } - - ErrorOr IPFactory::ToKString(Ref& ipv6) - { - auto str = StringBuilder::Construct(ipv6.Leak().Address()); - return str; - } - - ErrorOr IPFactory::ToKString(Ref& ipv4) - { - auto str = StringBuilder::Construct(ipv4.Leak().Address()); - return str; - } - - bool IPFactory::IpCheckVersion4(const Char* ip) - { - int cnter = 0; - - for (Size base = 0; base < rt_string_len(ip); ++base) - { - if (ip[base] == '.') - { - cnter = 0; - } - else - { - if (cnter == 3) - return false; - - ++cnter; - } - } - - return true; - } -} // namespace Kernel diff --git a/dev/Kernel/src/Network/IPAddr.cc b/dev/Kernel/src/Network/IPAddr.cc new file mode 100644 index 00000000..f8e3e903 --- /dev/null +++ b/dev/Kernel/src/Network/IPAddr.cc @@ -0,0 +1,129 @@ +/* ------------------------------------------- + + Copyright (C) 2024, Theater Quality Inc, all rights reserved. + +------------------------------------------- */ + +#include +#include + +namespace Kernel +{ + char* RawIPAddress::Address() + { + return fAddr; + } + + RawIPAddress::RawIPAddress(char bytes[4]) + { + rt_copy_memory(bytes, fAddr, 4); + } + + bool RawIPAddress::operator==(const RawIPAddress& ipv4) + { + for (Size index = 0; index < 4; ++index) + { + if (ipv4.fAddr[index] != fAddr[index]) + return false; + } + + return true; + } + + bool RawIPAddress::operator!=(const RawIPAddress& ipv4) + { + for (Size index = 0; index < 4; ++index) + { + if (ipv4.fAddr[index] == fAddr[index]) + return false; + } + + return true; + } + + char& RawIPAddress::operator[](const Size& index) + { + kcout << "[RawIPAddress::operator[]] Fetching Index...\r"; + + static char IP_PLACEHOLDER = '0'; + if (index > 4) + return IP_PLACEHOLDER; + + return fAddr[index]; + } + + RawIPAddress6::RawIPAddress6(char bytes[8]) + { + rt_copy_memory(bytes, fAddr, 8); + } + + char& RawIPAddress6::operator[](const Size& index) + { + kcout << "[RawIPAddress6::operator[]] Fetching Index...\r"; + + static char IP_PLACEHOLDER = '0'; + if (index > 8) + return IP_PLACEHOLDER; + + return fAddr[index]; + } + + bool RawIPAddress6::operator==(const RawIPAddress6& ipv6) + { + for (SizeT index = 0; index < 8; ++index) + { + if (ipv6.fAddr[index] != fAddr[index]) + return false; + } + + return true; + } + + bool RawIPAddress6::operator!=(const RawIPAddress6& ipv6) + { + for (SizeT index = 0; index < 8; ++index) + { + if (ipv6.fAddr[index] == fAddr[index]) + return false; + } + + return true; + } + + ErrorOr IPFactory::ToKString(Ref& ipv6) + { + auto str = StringBuilder::Construct(ipv6.Leak().Address()); + return str; + } + + ErrorOr IPFactory::ToKString(Ref& ipv4) + { + auto str = StringBuilder::Construct(ipv4.Leak().Address()); + return str; + } + + bool IPFactory::IpCheckVersion4(const Char* ip) + { + if (!ip) + return NO; + + Int32 cnter = 0; + + for (SizeT base = 0; base < rt_string_len(ip); ++base) + { + if (ip[base] == '.') + { + cnter = 0; + } + else + { + if (cnter == 3) + return false; + + ++cnter; + } + } + + return true; + } +} // namespace Kernel diff --git a/dev/Kernel/src/Network/IPC.cc b/dev/Kernel/src/Network/IPC.cc deleted file mode 100644 index 44b4665c..00000000 --- a/dev/Kernel/src/Network/IPC.cc +++ /dev/null @@ -1,115 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024, Theater Quality Inc, all rights reserved. - -------------------------------------------- */ - -#include -#include -#include - -using namespace Kernel; - -/// @internal -/// @brief The internal sanitize function. -Bool ipc_int_sanitize_packet(IPCMessage* pckt) -{ - auto endian = rtl_deduce_endianess(pckt, ((Char*)pckt)[0]); - - switch (endian) - { - case Endian::kEndianBig: { - if (pckt->IpcEndianess == kIPCLittleEndian) - goto ipc_check_failed; - - break; - } - case Endian::kEndianLittle: { - if (pckt->IpcEndianess == kIPCBigEndian) - goto ipc_check_failed; - - break; - } - case Endian::kEndianMixed: { - if (pckt->IpcEndianess == kIPCMixedEndian) - goto ipc_check_failed; - - break; - } - default: - goto ipc_check_failed; - } - - if (pckt->IpcFrom == pckt->IpcTo || - pckt->IpcPacketSize > kIPCMsgSize) - { - goto ipc_check_failed; - } - - return pckt->IpcPacketSize > 1 && pckt->IpcHeaderMagic == kIPCHeaderMagic; - -ipc_check_failed: - err_local_get() = kErrorIPC; - return false; -} - -namespace Kernel -{ - /// @brief Sanitize packet function - /// @retval true packet is correct. - /// @retval false packet is incorrect and process has crashed. - Bool ipc_sanitize_packet(IPCMessage* pckt) - { - if (!pckt || - !ipc_int_sanitize_packet(pckt)) - { - UserProcessScheduler::The().GetCurrentProcess().Leak().Crash(); - return false; - } - - return true; - } - - /// @brief Construct packet function - /// @retval true packet is correct. - /// @retval false packet is incorrect and process has crashed. - Bool ipc_construct_packet(_Output IPCMessage** pckt_in) - { - // don't act if it's not even valid. - if (!pckt_in) - return false; - - // don't do anything if it's valid already. - if (*pckt_in) - return true; - - // crash process if the packet pointer of pointer is NULL. - if (!pckt_in) - { - UserProcessScheduler::The().GetCurrentProcess().Leak().Crash(); - return false; - } - - *pckt_in = new IPCMessage(); - - if (*pckt_in) - { - auto endian = rtl_deduce_endianess((*pckt_in), ((Char*)(*pckt_in))[0]); - - (*pckt_in)->IpcHeaderMagic = kIPCHeaderMagic; - - (*pckt_in)->IpcEndianess = static_cast(endian); - (*pckt_in)->IpcPacketSize = sizeof(IPCMessage); - - (*pckt_in)->IpcTo.UserProcessID = 0; - (*pckt_in)->IpcTo.UserProcessTeam = 0; - - (*pckt_in)->IpcFrom.UserProcessID = Kernel::UserProcessScheduler::The().GetCurrentProcess().Leak().ProcessId; - (*pckt_in)->IpcFrom.UserProcessTeam = Kernel::UserProcessScheduler::The().CurrentTeam().mTeamId; - - return Yes; - } - - return No; - } -} // namespace Kernel diff --git a/dev/Kernel/src/Network/IPCAddr.cc b/dev/Kernel/src/Network/IPCAddr.cc new file mode 100644 index 00000000..e69de29b diff --git a/dev/Kernel/src/Network/IPCMsg.cc b/dev/Kernel/src/Network/IPCMsg.cc new file mode 100644 index 00000000..c93f7e7a --- /dev/null +++ b/dev/Kernel/src/Network/IPCMsg.cc @@ -0,0 +1,113 @@ +/* ------------------------------------------- + + Copyright (C) 2024, Theater Quality Inc, all rights reserved. + +------------------------------------------- */ + +#include +#include +#include + +namespace Kernel +{ + /// @internal + /// @brief The internal sanitize function. + Bool ipc_int_sanitize_packet(IPC_MSG* pckt) + { + auto endian = rtl_deduce_endianess(pckt, ((Char*)pckt)[0]); + + switch (endian) + { + case Endian::kEndianBig: { + if (pckt->IpcEndianess == kIPCLittleEndian) + goto ipc_check_failed; + + break; + } + case Endian::kEndianLittle: { + if (pckt->IpcEndianess == kIPCBigEndian) + goto ipc_check_failed; + + break; + } + case Endian::kEndianMixed: { + if (pckt->IpcEndianess == kIPCMixedEndian) + goto ipc_check_failed; + + break; + } + default: + goto ipc_check_failed; + } + + if (pckt->IpcFrom == pckt->IpcTo || + pckt->IpcPacketSize > kIPCMsgSize) + { + goto ipc_check_failed; + } + + return pckt->IpcPacketSize > 1 && pckt->IpcHeaderMagic == kIPCHeaderMagic; + + ipc_check_failed: + err_local_get() = kErrorIPC; + return false; + } + + /// @brief Sanitize packet function + /// @retval true packet is correct. + /// @retval false packet is incorrect and process has crashed. + Bool ipc_sanitize_packet(IPC_MSG* pckt) + { + if (!pckt || + !ipc_int_sanitize_packet(pckt)) + { + UserProcessScheduler::The().GetCurrentProcess().Leak().Crash(); + return false; + } + + return true; + } + + /// @brief Construct packet function + /// @retval true packet is correct. + /// @retval false packet is incorrect and process has crashed. + Bool ipc_construct_packet(_Output IPC_MSG** pckt_in) + { + // don't act if it's not even valid. + if (!pckt_in) + return false; + + // don't do anything if it's valid already. + if (*pckt_in) + return true; + + // crash process if the packet pointer of pointer is NULL. + if (!pckt_in) + { + UserProcessScheduler::The().GetCurrentProcess().Leak().Crash(); + return false; + } + + *pckt_in = new IPC_MSG(); + + if (*pckt_in) + { + auto endian = rtl_deduce_endianess((*pckt_in), ((Char*)(*pckt_in))[0]); + + (*pckt_in)->IpcHeaderMagic = kIPCHeaderMagic; + + (*pckt_in)->IpcEndianess = static_cast(endian); + (*pckt_in)->IpcPacketSize = sizeof(IPC_MSG); + + (*pckt_in)->IpcTo.UserProcessID = 0; + (*pckt_in)->IpcTo.UserProcessTeam = 0; + + (*pckt_in)->IpcFrom.UserProcessID = Kernel::UserProcessScheduler::The().GetCurrentProcess().Leak().ProcessId; + (*pckt_in)->IpcFrom.UserProcessTeam = Kernel::UserProcessScheduler::The().CurrentTeam().mTeamId; + + return Yes; + } + + return No; + } +} // namespace Kernel diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/Kernel/src/PEFCodeMgr.cc index a8205004..c78dac01 100644 --- a/dev/Kernel/src/PEFCodeMgr.cc +++ b/dev/Kernel/src/PEFCodeMgr.cc @@ -66,7 +66,7 @@ namespace Kernel auto kPefHeader = "PEF_CONTAINER"; - fCachedBlob = fFile->Read(kPefHeader); + fCachedBlob = fFile->Read(kPefHeader, mib_cast(16)); PEFContainer* container = reinterpret_cast(fCachedBlob); @@ -123,7 +123,7 @@ namespace Kernel PEFContainer* container = reinterpret_cast(fCachedBlob); - auto blob = fFile->Read(name); + auto blob = fFile->Read(name, mib_cast(16)); PEFCommandHeader* container_header = reinterpret_cast(blob); diff --git a/dev/LibSCI/GPU.h b/dev/LibSCI/GPU.h index 976ad2e5..8a1af4ca 100644 --- a/dev/LibSCI/GPU.h +++ b/dev/LibSCI/GPU.h @@ -10,7 +10,7 @@ Purpose: GFX System Calls. #ifndef SCIKIT_GPU_H #define SCIKIT_GPU_H -#include +#include // ------------------------------------------------------------------------------------------ // // GPU API. diff --git a/dev/LibSCI/SCI.h b/dev/LibSCI/SCI.h index 2eb6ed80..5b32a2fd 100644 --- a/dev/LibSCI/SCI.h +++ b/dev/LibSCI/SCI.h @@ -2,7 +2,7 @@ Copyright (C) 2024, Theater Quality Inc, all rights reserved. -File: LibSCI.h +File: SCI.h Purpose: System Calls. ------------------------------------------- */ diff --git a/dev/LibSCI/src/SCI.cc b/dev/LibSCI/src/SCI.cc index ec6cb937..b08a830f 100644 --- a/dev/LibSCI/src/SCI.cc +++ b/dev/LibSCI/src/SCI.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include +#include /// @file LibSCI.cc /// @brief Source file for the memory functions of the LibSCI. -- cgit v1.2.3