From 95ae0f42a5f22bd913a713db987729520c42a123 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 4 Jul 2025 18:58:57 +0200 Subject: feat: see below. feat: Rework `OpenMSG` into `LibMSG` feat: Rename `generic_kits` to `misc` Signed-off-by: Amlal El Mahrouss --- dev/generic_kits/.keep | 0 dev/generic_kits/BenchKit/Chrono.h | 31 ------------------ dev/generic_kits/BenchKit/X64Chrono.h | 54 -------------------------------- dev/kernel/HALKit/AMD64/HalKernelMain.cc | 2 +- dev/kernel/src/PEFCodeMgr.cc | 12 +++---- dev/libMsg/.keep | 0 dev/libMsg/MsgKit/Network.h | 9 ++++++ dev/libMsg/MsgKit/Server.h | 36 +++++++++++++++++++++ dev/libMsg/obj/.keep | 0 dev/libMsg/script/window_client.json | 7 +++++ dev/libMsg/src/.keep | 0 dev/misc/.keep | 0 dev/misc/BenchKit/Chrono.h | 31 ++++++++++++++++++ dev/misc/BenchKit/X64Chrono.h | 54 ++++++++++++++++++++++++++++++++ dev/open_msg/.keep | 0 dev/open_msg/MsgKit/Server.h | 22 ------------- dev/open_msg/obj/.keep | 0 dev/open_msg/script/window_client.json | 7 ----- dev/open_msg/src/.keep | 0 19 files changed, 144 insertions(+), 121 deletions(-) delete mode 100644 dev/generic_kits/.keep delete mode 100644 dev/generic_kits/BenchKit/Chrono.h delete mode 100644 dev/generic_kits/BenchKit/X64Chrono.h create mode 100644 dev/libMsg/.keep create mode 100644 dev/libMsg/MsgKit/Network.h create mode 100644 dev/libMsg/MsgKit/Server.h create mode 100644 dev/libMsg/obj/.keep create mode 100644 dev/libMsg/script/window_client.json create mode 100644 dev/libMsg/src/.keep create mode 100644 dev/misc/.keep create mode 100644 dev/misc/BenchKit/Chrono.h create mode 100644 dev/misc/BenchKit/X64Chrono.h delete mode 100644 dev/open_msg/.keep delete mode 100644 dev/open_msg/MsgKit/Server.h delete mode 100644 dev/open_msg/obj/.keep delete mode 100644 dev/open_msg/script/window_client.json delete mode 100644 dev/open_msg/src/.keep (limited to 'dev') diff --git a/dev/generic_kits/.keep b/dev/generic_kits/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/generic_kits/BenchKit/Chrono.h b/dev/generic_kits/BenchKit/Chrono.h deleted file mode 100644 index 394f16fd..00000000 --- a/dev/generic_kits/BenchKit/Chrono.h +++ /dev/null @@ -1,31 +0,0 @@ -/* ------------------------------------------- - -Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#ifndef BENCHKIT_CHRONO_H -#define BENCHKIT_CHRONO_H - -#include -#include - -namespace Kernel { -class ChronoInterface; - -/// @brief a Chronometer interface used for benchmarking. -class ChronoInterface { - public: - ChronoInterface() = default; - virtual ~ChronoInterface() = default; - - NE_COPY_DEFAULT(ChronoInterface); - - virtual void Start() = 0; - virtual void Stop() = 0; - virtual void Reset() = 0; - virtual UInt64 GetElapsedTime() const = 0; -}; -} // namespace Kernel - -#endif // BENCHKIT_CHRONO_H diff --git a/dev/generic_kits/BenchKit/X64Chrono.h b/dev/generic_kits/BenchKit/X64Chrono.h deleted file mode 100644 index 229146cb..00000000 --- a/dev/generic_kits/BenchKit/X64Chrono.h +++ /dev/null @@ -1,54 +0,0 @@ -/* ------------------------------------------- - -Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#include - -#if defined(__NE_AMD64__) - -namespace Kernel { -class X64Chrono; -struct X64ChronoTraits; - -struct X64ChronoTraits { - private: - STATIC UInt64 TickImpl_(void) { - UInt64 a = 0, d = 0; - __asm__ volatile("rdtsc" : "=a"(a), "=d"(d)); - return (d << 32) | a; - } - - friend X64Chrono; -}; - -/// @brief X86_64 hardware chrono implementation using the `rdtsc` instruction. -class X64Chrono : public ChronoInterface { - public: - X64Chrono() = default; - ~X64Chrono() override = default; - - NE_COPY_DEFAULT(X64Chrono); - - public: - void Start() override { fStart = X64ChronoTraits::TickImpl_(); } - - void Stop() override { fStop = X64ChronoTraits::TickImpl_(); } - - void Reset() override { - fStart = 0; - fStop = 0; - } - - UInt64 GetElapsedTime() const override { return fStop - fStart; } - - private: - UInt64 fStart = 0; - UInt64 fStop = 0; -}; -} // namespace Kernel - -#endif // defined(__NE_AMD64__) \ No newline at end of file diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 446a1e85..2ddf980f 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/dev/kernel/src/PEFCodeMgr.cc b/dev/kernel/src/PEFCodeMgr.cc index dfd3601b..f5f0eeb5 100644 --- a/dev/kernel/src/PEFCodeMgr.cc +++ b/dev/kernel/src/PEFCodeMgr.cc @@ -203,17 +203,17 @@ const Char* PEFLoader::Path() { const Char* PEFLoader::AsString() { #ifdef __32x0__ - return "32x0 PEF."; + return "32x0 PEF"; #elif defined(__64x0__) - return "64x0 PEF."; + return "64x0 PEF"; #elif defined(__x86_64__) - return "x86_64 PEF."; + return "x86_64 PEF"; #elif defined(__aarch64__) - return "AARCH64 PEF."; + return "AARCH64 PEF"; #elif defined(__powerpc64__) - return "POWER64 PEF."; + return "POWER64 PEF"; #else - return "???? PEF."; + return "???? PEF"; #endif // __32x0__ || __64x0__ || __x86_64__ || __powerpc64__ } diff --git a/dev/libMsg/.keep b/dev/libMsg/.keep new file mode 100644 index 00000000..e69de29b diff --git a/dev/libMsg/MsgKit/Network.h b/dev/libMsg/MsgKit/Network.h new file mode 100644 index 00000000..c7b562a2 --- /dev/null +++ b/dev/libMsg/MsgKit/Network.h @@ -0,0 +1,9 @@ +/* ------------------------------------------- + + Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#include \ No newline at end of file diff --git a/dev/libMsg/MsgKit/Server.h b/dev/libMsg/MsgKit/Server.h new file mode 100644 index 00000000..33d10407 --- /dev/null +++ b/dev/libMsg/MsgKit/Server.h @@ -0,0 +1,36 @@ +/* ------------------------------------------- + + Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#ifdef __cplusplus +#include +#else +#include +#endif + +struct LIBMSG_EXPR; + +/// @brief an expression chain of LibMSG. +struct LIBMSG_EXPR final { +#ifdef __cplusplus + CF::CFString* l_key{nullptr}; + CF::CFString* l_value{nullptr}; +#else + VoidPtr l_key{nullptr}; + VoidPtr l_value{nullptr}; +#endif + + LIBMSG_EXPR* l_head{nullptr}; + LIBMSG_EXPR* l_tail{nullptr}; + LIBMSG_EXPR* l_child{nullptr}; +}; + +typedef Void (*libmsg_func_t)(LIBMSG_EXPR* arg); + +IMPORT_C Void libmsg_init_library(libmsg_func_t* funcs, SizeT cnt); +IMPORT_C UInt32 libmsg_eval_library(struct LIBMSG_EXPR* head); +IMPORT_C UInt32 libmsg_close_library(Void); diff --git a/dev/libMsg/obj/.keep b/dev/libMsg/obj/.keep new file mode 100644 index 00000000..e69de29b diff --git a/dev/libMsg/script/window_client.json b/dev/libMsg/script/window_client.json new file mode 100644 index 00000000..4c8a21ba --- /dev/null +++ b/dev/libMsg/script/window_client.json @@ -0,0 +1,7 @@ +{ + "id": 1, + "pos": { "x": 100, "y": 100 }, + "size": { "w": 300, "h": 200 }, + "title": "Window Client", + "on-click": "_OnClickCSymbol" +} \ No newline at end of file diff --git a/dev/libMsg/src/.keep b/dev/libMsg/src/.keep new file mode 100644 index 00000000..e69de29b diff --git a/dev/misc/.keep b/dev/misc/.keep new file mode 100644 index 00000000..e69de29b diff --git a/dev/misc/BenchKit/Chrono.h b/dev/misc/BenchKit/Chrono.h new file mode 100644 index 00000000..394f16fd --- /dev/null +++ b/dev/misc/BenchKit/Chrono.h @@ -0,0 +1,31 @@ +/* ------------------------------------------- + +Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#ifndef BENCHKIT_CHRONO_H +#define BENCHKIT_CHRONO_H + +#include +#include + +namespace Kernel { +class ChronoInterface; + +/// @brief a Chronometer interface used for benchmarking. +class ChronoInterface { + public: + ChronoInterface() = default; + virtual ~ChronoInterface() = default; + + NE_COPY_DEFAULT(ChronoInterface); + + virtual void Start() = 0; + virtual void Stop() = 0; + virtual void Reset() = 0; + virtual UInt64 GetElapsedTime() const = 0; +}; +} // namespace Kernel + +#endif // BENCHKIT_CHRONO_H diff --git a/dev/misc/BenchKit/X64Chrono.h b/dev/misc/BenchKit/X64Chrono.h new file mode 100644 index 00000000..706ce883 --- /dev/null +++ b/dev/misc/BenchKit/X64Chrono.h @@ -0,0 +1,54 @@ +/* ------------------------------------------- + +Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#include + +#if defined(__NE_AMD64__) + +namespace Kernel { +class X64Chrono; +struct X64ChronoTraits; + +struct X64ChronoTraits { + private: + STATIC UInt64 TickImpl_(void) { + UInt64 a = 0, d = 0; + __asm__ volatile("rdtsc" : "=a"(a), "=d"(d)); + return (d << 32) | a; + } + + friend X64Chrono; +}; + +/// @brief X86_64 hardware chrono implementation using the `rdtsc` instruction. +class X64Chrono : public ChronoInterface { + public: + X64Chrono() = default; + ~X64Chrono() override = default; + + NE_COPY_DEFAULT(X64Chrono); + + public: + void Start() override { fStart = X64ChronoTraits::TickImpl_(); } + + void Stop() override { fStop = X64ChronoTraits::TickImpl_(); } + + void Reset() override { + fStart = 0; + fStop = 0; + } + + UInt64 GetElapsedTime() const override { return fStop - fStart; } + + private: + UInt64 fStart = 0; + UInt64 fStop = 0; +}; +} // namespace Kernel + +#endif // defined(__NE_AMD64__) \ No newline at end of file diff --git a/dev/open_msg/.keep b/dev/open_msg/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/open_msg/MsgKit/Server.h b/dev/open_msg/MsgKit/Server.h deleted file mode 100644 index 54183472..00000000 --- a/dev/open_msg/MsgKit/Server.h +++ /dev/null @@ -1,22 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#include -#include - -struct OPENMSG_EXPR; - -struct OPENMSG_EXPR { - Kernel::KString* l_head; - Kernel::MutableArray l_args; -}; - -typedef Kernel::Void (*openmsg_func_t)(OPENMSG_EXPR* arg); - -EXTERN_C Kernel::Void openmsg_init_library(openmsg_func_t* funcs, Kernel::SizeT cnt); -EXTERN_C Kernel::UInt32 openmsg_close_library(Kernel::Void); diff --git a/dev/open_msg/obj/.keep b/dev/open_msg/obj/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/open_msg/script/window_client.json b/dev/open_msg/script/window_client.json deleted file mode 100644 index 4c8a21ba..00000000 --- a/dev/open_msg/script/window_client.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": 1, - "pos": { "x": 100, "y": 100 }, - "size": { "w": 300, "h": 200 }, - "title": "Window Client", - "on-click": "_OnClickCSymbol" -} \ No newline at end of file diff --git a/dev/open_msg/src/.keep b/dev/open_msg/src/.keep deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3