From 80b76666074aa94f165e3db7b3dda2145ca6efc0 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 21 Mar 2024 22:39:57 +0100 Subject: unstable, kernel+api: important breaking changes. Signed-off-by: Amlal El Mahrouss --- Public/Kits/System.Core/Containers/ODF.hxx | 43 ---- Public/Kits/System.Core/Containers/XIFF.hxx | 42 ---- Public/Kits/System.Core/Defs.hxx | 190 ---------------- Public/Kits/System.Core/File.hxx | 71 ------ Public/Kits/System.Core/Headers/Containers/ODF.hxx | 43 ++++ .../Kits/System.Core/Headers/Containers/XIFF.hxx | 42 ++++ Public/Kits/System.Core/Headers/Defs.hxx | 248 +++++++++++++++++++++ Public/Kits/System.Core/Headers/File.hxx | 70 ++++++ Public/Kits/System.Core/Headers/Heap.hxx | 63 ++++++ Public/Kits/System.Core/Headers/Hint.hxx | 18 ++ Public/Kits/System.Core/Headers/Thread.hxx | 49 ++++ Public/Kits/System.Core/Heap.cxx | 45 ---- Public/Kits/System.Core/Heap.hxx | 79 ------- Public/Kits/System.Core/HeapRuntime.cxx | 44 ---- Public/Kits/System.Core/Hint.hxx | 18 -- Public/Kits/System.Core/InitRuntime.cxx | 14 -- Public/Kits/System.Core/Makefile | 2 +- Public/Kits/System.Core/New+Delete.cxx | 50 ----- Public/Kits/System.Core/RISCV/.gitkeep | 0 Public/Kits/System.Core/Sources/DllMain.cxx | 14 ++ Public/Kits/System.Core/Sources/Heap.cxx | 83 +++++++ Public/Kits/System.Core/Sources/New+Delete.cxx | 65 ++++++ Public/Kits/System.Core/System.Core.hxx | 14 -- Public/Kits/System.Core/System.hxx | 18 -- Public/Kits/System.Core/Threading.hxx | 34 --- 25 files changed, 696 insertions(+), 663 deletions(-) delete mode 100644 Public/Kits/System.Core/Containers/ODF.hxx delete mode 100644 Public/Kits/System.Core/Containers/XIFF.hxx delete mode 100644 Public/Kits/System.Core/Defs.hxx delete mode 100644 Public/Kits/System.Core/File.hxx create mode 100644 Public/Kits/System.Core/Headers/Containers/ODF.hxx create mode 100644 Public/Kits/System.Core/Headers/Containers/XIFF.hxx create mode 100644 Public/Kits/System.Core/Headers/Defs.hxx create mode 100644 Public/Kits/System.Core/Headers/File.hxx create mode 100644 Public/Kits/System.Core/Headers/Heap.hxx create mode 100644 Public/Kits/System.Core/Headers/Hint.hxx create mode 100644 Public/Kits/System.Core/Headers/Thread.hxx delete mode 100644 Public/Kits/System.Core/Heap.cxx delete mode 100644 Public/Kits/System.Core/Heap.hxx delete mode 100644 Public/Kits/System.Core/HeapRuntime.cxx delete mode 100644 Public/Kits/System.Core/Hint.hxx delete mode 100644 Public/Kits/System.Core/InitRuntime.cxx delete mode 100644 Public/Kits/System.Core/New+Delete.cxx create mode 100644 Public/Kits/System.Core/RISCV/.gitkeep create mode 100644 Public/Kits/System.Core/Sources/DllMain.cxx create mode 100644 Public/Kits/System.Core/Sources/Heap.cxx create mode 100644 Public/Kits/System.Core/Sources/New+Delete.cxx delete mode 100644 Public/Kits/System.Core/System.Core.hxx delete mode 100644 Public/Kits/System.Core/System.hxx delete mode 100644 Public/Kits/System.Core/Threading.hxx (limited to 'Public/Kits/System.Core') diff --git a/Public/Kits/System.Core/Containers/ODF.hxx b/Public/Kits/System.Core/Containers/ODF.hxx deleted file mode 100644 index 3c4e81fc..00000000 --- a/Public/Kits/System.Core/Containers/ODF.hxx +++ /dev/null @@ -1,43 +0,0 @@ -/** =========================================== - (C) Mahrouss Logic - ===========================================*/ - -#ifndef __ODF__ -#define __ODF__ - -#include - -/** - * @brief Open Document Format - * @file ODF.hxx -*/ - -/// @brief four-character code for ODF. -#define kFourCCLength_ODF 4 - -/// @brief Document file header. -typedef struct ODFFileHeader -{ - CHAR f_Ident[kFourCCLength_ODF]; - - INT32 f_DocumentKind; - INT32 f_DocumentSize; - - INT64 f_MetaForkOffset; - INT64 f_DocumentForkOffset; - - CHAR f_Padding[4]; -} PACKED ODFFileHeader; - -/// @brief ODF Fork header -typedef struct ODFForkHeader -{ - CHAR f_MetadataName[255]; - - INT32 f_MetadataKind; - INT32 f_MetadataSize; - - CHAR f_Padding; -} PACKED ODFForkHeader; - -#endif // !__ODF__ \ No newline at end of file diff --git a/Public/Kits/System.Core/Containers/XIFF.hxx b/Public/Kits/System.Core/Containers/XIFF.hxx deleted file mode 100644 index 622a5a87..00000000 --- a/Public/Kits/System.Core/Containers/XIFF.hxx +++ /dev/null @@ -1,42 +0,0 @@ -/** =========================================== - (C) Mahrouss Logic - ===========================================*/ - -#ifndef __XIFF__ -#define __XIFF__ - -/** --------------------------------------------------- - - * THIS FILE CONTAINS CODE FOR THE eXtended Information File Format. - * XIFF is used to make setup programs/audio/video files. - -------------------------------------------------------- */ - -#include - -/// @brief four-character code for XIFF. -#define kFourCCLength_XIFF 4 - -#define kXIFFContainerVideo "XVFF" -#define kXIFFContainerAudio "XAFF" -#define kXIFFContainerInstaller "XNFF" -#define kXIFFContainerGeneric "XIFF" -#define kXIFFContainerBinary "XBFF" - -/*** - * @brief Generic XIFF header - * Used by XIFF based containers. - */ - -struct PACKED XiffHeader final { - BYTE f_Magic[kFourCCLength_XIFF]; // XIFF string (includes \0) - DWORD f_Size; // overall size of header (XiffHeader) in bytes - DWORD f_FormatType; // format type. generic - BYTE f_SpecificMag[kFourCCLength_XIFF]; // The sub header magic - DWORD f_SpecificSize; // length of the format data - DWORD f_SpecificFormatType; // format type. generic -}; - -typedef struct XiffHeader XiffHeader; - -#endif // ifndef __XIFF__ diff --git a/Public/Kits/System.Core/Defs.hxx b/Public/Kits/System.Core/Defs.hxx deleted file mode 100644 index 6d0fb99a..00000000 --- a/Public/Kits/System.Core/Defs.hxx +++ /dev/null @@ -1,190 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#ifndef __cplusplus -#error This API is meant to be used with C++. -#endif - -#ifdef CA_MUST_PASS -#undef CA_MUST_PASS -#endif - -#include - -#ifdef _DEBUG -#define CA_MUST_PASS(e) { if (!e) { __assert_chk_fail() } } -#else -#define CA_MUST_PASS(e) CA_UNREFERENCED_PARAMETER(e) -#endif - -#ifdef __cplusplus - -#define CA_EXTERN_C extern "C" - -#else - -#define CA_EXTERN_C extern - -#endif - -CA_EXTERN_C void __assert_chk_fail(void); - -#define CA_STDCALL __attribute__((stdcall)) -#define CA_CDECL __attribute__((cdecl)) -#define CA_MSCALL __attribute__((ms_abi)) - -#define CA_PASCAL CA_STDCALL - -typedef __UINT8_TYPE__ BYTE; -typedef __UINT16_TYPE__ WORD; -typedef __UINT32_TYPE__ DWORD; -typedef __UINT64_TYPE__ QWORD; - -typedef char CHAR; -typedef CHAR* PCHAR; - -typedef void* PVOID; -typedef void VOID; - -typedef __UINTPTR_TYPE__ UINT_PTR; -typedef __INTPTR_TYPE__ INT_PTR; -typedef __UINT64_TYPE__ UINT64; -typedef __INT64_TYPE__ INT64; -typedef __UINT32_TYPE__ UINT32; -typedef __INT32_TYPE__ INT32; - -typedef __WCHAR_TYPE__ WCHAR; -typedef WCHAR* PWCHAR; - -typedef CHAR BOOL; - -#define TRUE 1 -#define FALSE 0 - -#define CA_PTR * - -#define CA_FAR __far -#define CA_NEAR __near - -#define CA_UNREFERENCED_PARAMETER(e) ((VOID)e) - -#ifdef __x86_64__ -# define _M_AMD64 2 -#endif - -#ifdef __aarch64__ -# define _M_AARCH64 3 -#endif - -#ifdef __powerpc64__ -# define _M_PPC64 4 -#endif - -#ifdef __64x0__ -# define _M_64000 5 -#endif - -#ifdef __riscv__ -# define _M_RISCV 6 -#endif - -#define CA_STATIC static -#define CA_INLINE inline -#define CA_CONST const - -#ifdef __cplusplus -#define CA_CONSTEXPR constexpr -#else -#define CA_CONSTEXPR -#endif // __cplusplus - -CA_INLINE ObjectPtr kInstanceObject; - -enum HcProcessCall { - kProcessCallAllocPtr = 1, - kProcessCallFreePtr, - kProcessCallSizePtr, - kProcessCallCheckPtr, - kProcessCallAllocStack, - kProcessCallOpenHandle, - kProcessCallCloseHandle, - kProcessCallsCount = 7, -}; - -#include - -class SystemException { - public: - explicit SystemException() = default; - virtual ~SystemException() = default; - - public: - HCORE_COPY_DEFAULT(SystemException); - - public: - virtual const char *Name() = 0; - virtual const char *Reason() = 0; - -}; - -/// @brief Object exception -/// Throws when the object isn't found. -class ObjectNotFoundException : public SystemException { - public: - explicit ObjectNotFoundException() = default; - virtual ~ObjectNotFoundException() = default; - - public: - HCORE_COPY_DEFAULT(ObjectNotFoundException); - - public: - const char *Name() override { return "ObjectNotFoundException"; } - const char *Reason() override { return mReason; } - - private: - const char *mReason{ - "System.Core: ObjectNotFoundException: Catastrophic failure!"}; -}; - -/// @brief pointer exception -/// Throws when the object isn't found. -class PointerException : public SystemException { - public: - explicit PointerException() = default; - virtual ~PointerException() = default; - - public: - HCORE_COPY_DEFAULT(PointerException); - - public: - const char *Name() override { return "PointerException"; } - const char *Reason() override { return mReason; } - - private: - const char *mReason{ - "System.Core: PointerException: Catastrophic failure!"}; -}; - -/// @brief pointer exception -/// Throws when the object isn't found. -class NullPointerException : public SystemException { - public: - explicit NullPointerException() = default; - virtual ~NullPointerException() = default; - - public: - HCORE_COPY_DEFAULT(NullPointerException); - - public: - const char *Name() override { return "NullPointerException"; } - const char *Reason() override { return mReason; } - - private: - const char *mReason{ - "System.Core: NullPointerException: Catastrophic failure!"}; -}; diff --git a/Public/Kits/System.Core/File.hxx b/Public/Kits/System.Core/File.hxx deleted file mode 100644 index 7ae70faf..00000000 --- a/Public/Kits/System.Core/File.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#ifndef __FILE_API__ -#define __FILE_API__ - -#include -#include - -/// @brief SOM class, translated to C++ - -namespace System { -class File final { - public: - explicit File(const char *path) { - mHandle = kInstanceObject->Invoke(kInstanceObject, kProcessCallOpenHandle, - 0, path); - } - - ~File() { - kInstanceObject->Invoke(kInstanceObject, kProcessCallCloseHandle, 0, - mHandle); - } - - public: - HCORE_COPY_DEFAULT(File); - - public: - voidPtr Read(UIntPtr off, SizeT sz) { return (VoidPtr)kInstanceObject->Invoke(kInstanceObject, mHandle, 2, off, sz); } - voidPtr Read(SizeT sz) { return (VoidPtr)kInstanceObject->Invoke(kInstanceObject, mHandle, 3, sz); } - - void Write(VoidPtr buf, UIntPtr off, SizeT sz) { kInstanceObject->Invoke(kInstanceObject, mHandle, 4, buf, off, sz); } - void Write(VoidPtr buf, SizeT sz) { kInstanceObject->Invoke(kInstanceObject, mHandle, 5, buf, sz); } - - void Seek(UIntPtr off) { kInstanceObject->Invoke(kInstanceObject, mHandle, 5); } - void Rewind() { kInstanceObject->Invoke(kInstanceObject, mHandle, 6); } - - public: - const char *MIME(); - void MIME(const char *mime); - - private: - IntPtr mHandle; -}; - -typedef File *FilePtr; - -/// @brief file exception -/// Throws when the file isn't found or invalid. -class FileException : public SystemException { - public: - explicit FileException() = default; - virtual ~FileException() = default; - - public: - HCORE_COPY_DEFAULT(FileException); - - public: - const char *Name() override { return "FileException"; } - const char *Reason() override { return mReason; } - - private: - const char *mReason{"System.Core: FileException: Catastrophic failure!"}; -}; - -} // namespace System - -#endif // ifndef __FILE_API__ diff --git a/Public/Kits/System.Core/Headers/Containers/ODF.hxx b/Public/Kits/System.Core/Headers/Containers/ODF.hxx new file mode 100644 index 00000000..53098c3f --- /dev/null +++ b/Public/Kits/System.Core/Headers/Containers/ODF.hxx @@ -0,0 +1,43 @@ +/** =========================================== + (C) Mahrouss Logic + ===========================================*/ + +#ifndef __ODF__ +#define __ODF__ + +#include + +/** + * @brief Open Document Format + * @file ODF.hxx +*/ + +/// @brief four-character code for ODF. +#define kFourCCLength_ODF 4 + +/// @brief Document file header. +typedef struct ODFFileHeader +{ + CharacterType f_Ident[kFourCCLength_ODF]; + + Int32Type f_DocumentKind; + Int32Type f_DocumentSize; + + Int64Type f_MetaForkOffset; + Int64Type f_DocumentForkOffset; + + CharacterType f_Padding[4]; +} PACKED ODFFileHeader; + +/// @brief ODF Fork header +typedef struct ODFForkHeader +{ + CharacterType f_MetadataName[255]; + + Int32Type f_MetadataKind; + Int32Type f_MetadataSize; + + CharacterType f_Padding; +} PACKED ODFForkHeader; + +#endif // !__ODF__ \ No newline at end of file diff --git a/Public/Kits/System.Core/Headers/Containers/XIFF.hxx b/Public/Kits/System.Core/Headers/Containers/XIFF.hxx new file mode 100644 index 00000000..e14868a6 --- /dev/null +++ b/Public/Kits/System.Core/Headers/Containers/XIFF.hxx @@ -0,0 +1,42 @@ +/** =========================================== + (C) Mahrouss Logic + ===========================================*/ + +#ifndef __XIFF__ +#define __XIFF__ + +/** --------------------------------------------------- + + * THIS FILE CONTAINS CODE FOR THE eXtended Information File Format. + * XIFF is used to make setup programs/audio/video files. + +------------------------------------------------------- */ + +#include + +/// @brief four-character code for XIFF. +#define kFourCCLength_XIFF 4 + +#define kXIFFContainerVideo "XVFF" +#define kXIFFContainerAudio "XAFF" +#define kXIFFContainerInstaller "XNFF" +#define kXIFFContainerGeneric "XIFF" +#define kXIFFContainerBinary "XBFF" + +/*** + * @brief Generic XIFF header + * Used by XIFF based containers. + */ + +struct PACKED XiffHeader final { + ByteType f_Magic[kFourCCLength_XIFF]; // XIFF string (includes \0) + DWordType f_Size; // overall size of header (XiffHeader) in bytes + DWordType f_FormatType; // format type. generic + ByteType f_SpecificMag[kFourCCLength_XIFF]; // The sub header magic + DWordType f_SpecificSize; // length of the format data + DWordType f_SpecificFormatType; // format type. generic +}; + +typedef struct XiffHeader XiffHeader; + +#endif // ifndef __XIFF__ diff --git a/Public/Kits/System.Core/Headers/Defs.hxx b/Public/Kits/System.Core/Headers/Defs.hxx new file mode 100644 index 00000000..367849da --- /dev/null +++ b/Public/Kits/System.Core/Headers/Defs.hxx @@ -0,0 +1,248 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#pragma once + +#ifndef __cplusplus +#error This API is meant to be used with C++. +#endif + +#ifdef CA_MUST_PASS +#undef CA_MUST_PASS +#endif + +#ifdef _DEBUG +#define CA_MUST_PASS(e) { if (!e) { __assert_chk_fail() } } +#else +#define CA_MUST_PASS(e) CA_UNREFERENCED_PARAMETER(e) +#endif + +#ifdef __cplusplus + +#define CA_EXTERN_C extern "C" + +#else + +#define CA_EXTERN_C extern + +#endif + +CA_EXTERN_C void __assert_chk_fail(void); + +#define CA_STDCALL __attribute__((stdcall)) +#define CA_CDECL __attribute__((cdecl)) +#define CA_MSCALL __attribute__((ms_abi)) + +#define CA_PASCAL CA_STDCALL + +typedef __UINT8_TYPE__ ByteType; +typedef __UINT16_TYPE__ WordType; +typedef __UINT32_TYPE__ DWordType; +typedef __UINT64_TYPE__ QWordType; +typedef __SIZE_TYPE__ SizeType; + +typedef char CharacterType; +typedef CharacterType* PtrCharacterType; + +typedef void* PtrVoidType; +typedef void VoidType; + +typedef __UINTPTR_TYPE__ UIntPtrType; +typedef __INTPTR_TYPE__ IntPtrType; +typedef __UINT64_TYPE__ UInt64Type; +typedef __INT64_TYPE__ Int64Type; +typedef __UINT32_TYPE__ UInt32Type; +typedef __INT32_TYPE__ Int32Type; + +typedef CharacterType BooleanType; + +#define CA_COPY_DELETE(KLASS) \ + KLASS &operator=(const KLASS &) = delete; \ + KLASS(const KLASS &) = delete; + + +#define CA_COPY_DEFAULT(KLASS) \ + KLASS &operator=(const KLASS &) = default; \ + KLASS(const KLASS &) = default; + + +#define CA_MOVE_DELETE(KLASS) \ + KLASS &operator=(KLASS &&) = delete; \ + KLASS(KLASS &&) = delete; + + +#define CA_MOVE_DEFAULT(KLASS) \ + KLASS &operator=(KLASS &&) = default; \ + KLASS(KLASS &&) = default; + + +#define Yes 1 +#define No 0 + +#define CA_PTR * + +#define CA_FAR __far +#define CA_NEAR __near + +#define CA_UNREFERENCED_PARAMETER(e) ((VoidType)e) + +#ifdef __x86_64__ +# define _M_AMD64 2 +#endif + +#ifdef __aarch64__ +# define _M_AARCH64 3 +#endif + +#ifdef __powerpc64__ +# define _M_PPC64 4 +#endif + +#ifdef __64x0__ +# define _M_64000 5 +#endif + +#ifdef __riscv__ +# define _M_RISCV 6 +#endif + +#define CA_STATIC static +#define CA_INLINE inline +#define CA_CONST const + +#ifdef __cplusplus +#define CA_CONSTEXPR constexpr +#else +#define CA_CONSTEXPR +#endif // __cplusplus + +enum HcProcessCall { + kProcessCallAllocPtr = 1, + kProcessCallFreePtr, + kProcessCallSizePtr, + kProcessCallCheckPtr, + kProcessCallAllocStack, + /// @brief Open a specific handle (can be used as sel to call methods related to it.) + kProcessCallOpenHandle, + kProcessCallCloseHandle, + /// @brief Number of process calls. + kProcessCallsCount = 7, +}; + +#include + +class SystemException { + public: + explicit SystemException() = default; + virtual ~SystemException() = default; + + public: + CA_COPY_DEFAULT(SystemException); + + public: + virtual const char *Name() = 0; + virtual const char *Reason() = 0; + +}; + +/// @brief Object exception +/// Throws when the object isn't found. +class ObjectNotFoundException : public SystemException { + public: + explicit ObjectNotFoundException() = default; + virtual ~ObjectNotFoundException() = default; + + public: + CA_COPY_DEFAULT(ObjectNotFoundException); + + public: + const char *Name() override { return "ObjectNotFoundException"; } + const char *Reason() override { return mReason; } + + private: + const char *mReason{ + "System.Core: ObjectNotFoundException: Catastrophic failure!"}; +}; + +/// @brief pointer exception +/// Throws when the object isn't found. +class PointerException : public SystemException { + public: + explicit PointerException() = default; + virtual ~PointerException() = default; + + public: + CA_COPY_DEFAULT(PointerException); + + public: + const char *Name() override { return "PointerException"; } + const char *Reason() override { return mReason; } + + private: + const char *mReason{ + "System.Core: PointerException: Catastrophic failure!"}; +}; + +/// @brief pointer exception +/// Throws when the object isn't found. +class NullPointerException : public SystemException { + public: + explicit NullPointerException() = default; + virtual ~NullPointerException() = default; + + public: + CA_COPY_DEFAULT(NullPointerException); + + public: + const char *Name() override { return "NullPointerException"; } + const char *Reason() override { return mReason; } + + private: + const char *mReason{ + "System.Core: NullPointerException: Catastrophic failure!"}; +}; + +#define kObjectGlobalNamespaceSystem "HCORE_ROOT\\" +#define kObjectGlobalNamespaceUser "HCORE_USER_ROOT\\" + +enum { + kObjectTypeProcess, + kObjectTypeFile, + kObjectTypeDevice, + kObjectTypeNetwork, + kObjectTypeInvalid, + KObjectTypeUserDefined = 0xCF, + kObjectTypeCount = 5, +}; + +/** + * @brief GUID type, something you can also find in CFKit. + * @author AMlal El Mahrouss + */ +typedef struct GUID final { + DWordType Data1; + WordType Data2; + WordType Data3; + ByteType Data4[8]; +} GUIDType, *PtrGUIDType; + +/// \brief Object handle. +/// \author Amlal El Mahrouss +typedef struct Object final { + CharacterType ObjectName[255]; + DWordType ObjectType; + CharacterType ObjectNamespace[255]; + + VoidType(*Release)(struct Object* Self); + IntPtrType(*Invoke)(struct Object* Self, DWordType Sel, ...); + VoidType(*Query)(struct Object* Self, PtrVoidType* Dst, SizeType SzDst, struct GUID* GuidOf); +} Object, *ObjectPtr; + +#define object_cast reinterpret_cast + +CA_EXTERN_C ObjectPtr HcGetInstanceObject(void); + +CA_INLINE ObjectPtr kInstanceObject; diff --git a/Public/Kits/System.Core/Headers/File.hxx b/Public/Kits/System.Core/Headers/File.hxx new file mode 100644 index 00000000..48331c15 --- /dev/null +++ b/Public/Kits/System.Core/Headers/File.hxx @@ -0,0 +1,70 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#ifndef __FILE_API__ +#define __FILE_API__ + +#include + +/// @brief SOM class, translated to C++ + +namespace System { +class FileInterface final { + public: + explicit FileInterface(const char *path) { + mHandle = kInstanceObject->Invoke(kInstanceObject, kProcessCallOpenHandle, + 0, path); + } + + ~FileInterface() { + kInstanceObject->Invoke(kInstanceObject, kProcessCallCloseHandle, 0, + mHandle); + } + + public: + CA_COPY_DEFAULT(FileInterface); + + public: + PtrVoidType Read(UIntPtrType off, SizeType sz) { return (PtrVoidType)kInstanceObject->Invoke(kInstanceObject, mHandle, 2, off, sz); } + PtrVoidType Read(SizeType sz) { return (PtrVoidType)kInstanceObject->Invoke(kInstanceObject, mHandle, 3, sz); } + + void Write(PtrVoidType buf, UIntPtrType off, SizeType sz) { kInstanceObject->Invoke(kInstanceObject, mHandle, 4, buf, off, sz); } + void Write(PtrVoidType buf, SizeType sz) { kInstanceObject->Invoke(kInstanceObject, mHandle, 5, buf, sz); } + + void Seek(UIntPtrType off) { kInstanceObject->Invoke(kInstanceObject, mHandle, 5); } + void Rewind() { kInstanceObject->Invoke(kInstanceObject, mHandle, 6); } + + public: + const char *MIME(); + void MIME(const char *mime); + + private: + IntPtrType mHandle; +}; + +typedef FileInterface *FilePtr; + +/// @brief file exception +/// Throws when the file isn't found or invalid. +class FileException : public SystemException { + public: + explicit FileException() = default; + virtual ~FileException() = default; + + public: + CA_COPY_DEFAULT(FileException); + + public: + const char *Name() override { return "FileException"; } + const char *Reason() override { return mReason; } + + private: + const char *mReason{"System.Core: FileException: Catastrophic failure!"}; +}; + +} // namespace System + +#endif // ifndef __FILE_API__ diff --git a/Public/Kits/System.Core/Headers/Heap.hxx b/Public/Kits/System.Core/Headers/Heap.hxx new file mode 100644 index 00000000..43eaacab --- /dev/null +++ b/Public/Kits/System.Core/Headers/Heap.hxx @@ -0,0 +1,63 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#pragma once + +#include + +namespace System { +class MemoryException; + +typedef PtrVoidType HeapPtr; + +enum { + kHeapExpandable = 2, + kHeapNoExecute = 4, + kHeapShared = 6, + kHeapReadOnly = 8, + kHeapNoFlags = 0 +}; + +class HeapInterface final { + private: + explicit HeapInterface(); + + public: + ~HeapInterface(); + + public: + CA_COPY_DEFAULT(HeapInterface); + + public: + static HeapInterface *Shared() noexcept; + + public: + void Delete(HeapPtr me) noexcept; + SizeType Size(HeapPtr me) noexcept; + HeapPtr New(const SizeType &sz, + const DWordType flags = kHeapNoFlags); +}; + + +/// @brief heap exception +/// Throws when the heap pointer isn't found or invalid. +class HeapException : public SystemException { + public: + explicit HeapException() = default; + virtual ~HeapException() = default; + + public: + CA_COPY_DEFAULT(HeapException); + + public: + const char *Name() override { return "HeapException"; } + const char *Reason() override { return mReason; } + + private: + const char *mReason{"System.Core: HeapException: Catastrophic failure!"}; +}; + +} // namespace System \ No newline at end of file diff --git a/Public/Kits/System.Core/Headers/Hint.hxx b/Public/Kits/System.Core/Headers/Hint.hxx new file mode 100644 index 00000000..86faf455 --- /dev/null +++ b/Public/Kits/System.Core/Headers/Hint.hxx @@ -0,0 +1,18 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#pragma once + +#define _Input +#define _Output + +#define _Optional + +#define _StrictCheckInput +#define _StrictCheckOutput + +#define _InOut +#define _StrictInOut diff --git a/Public/Kits/System.Core/Headers/Thread.hxx b/Public/Kits/System.Core/Headers/Thread.hxx new file mode 100644 index 00000000..306419b3 --- /dev/null +++ b/Public/Kits/System.Core/Headers/Thread.hxx @@ -0,0 +1,49 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +// +// Created by Amlal on 3/18/24 +// + +#ifndef __THREAD_API__ +#define __THREAD_API__ + +#include + +/// @brief Thread Information Block, which holds information about the running thread. +typedef PtrVoidType PtrThread; + +/// @brief Creates a new thread. +/// @param StartProc +/// @param OptionalHeap +/// @param OptionalStack +/// @param Detach +/// @param Join +/// @return +PtrThread HcCreateThread(_Input PtrVoidType StartProc, + _Optional _InOut PtrVoidType OptionalHeap, + _Optional _InOut PtrVoidType OptionalStack, + _Optional _Input BooleanType Detach, + _Optional _Input BooleanType Join); + +/// @brief Destroys the thread object. +/// @param ThreadPtr +/// @return +BooleanType HcDestroyThread(_Input PtrThread ThreadPtr); + +/// @brief Stops the thread. +/// @param ThreadPtr +/// @return +BooleanType HcStopThread(_Input PtrThread ThreadPtr); + +/// @brief Resumes it. +/// @param ThreadPtr +/// @return +BooleanType HcResumeThread(_Input PtrThread ThreadPtr); + +QWordType HcProcessIdThread(_Input PtrThread ThreadPtr); + +#endif // __THREAD_API__ diff --git a/Public/Kits/System.Core/Heap.cxx b/Public/Kits/System.Core/Heap.cxx deleted file mode 100644 index 55850b1a..00000000 --- a/Public/Kits/System.Core/Heap.cxx +++ /dev/null @@ -1,45 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#include -#include - -using namespace System; - -/// @brief Shared instance of the heap. -/// @return -Heap* Heap::Shared() noexcept { - static Heap* heap = nullptr; - - if (!heap) { - heap = new Heap(); - } - - return heap; -} - -Heap::Heap() { - CA_MUST_PASS(HcProcessHeapExists(kInstanceObject, (VoidPtr)this)); -} - -Heap::~Heap() { delete this; } - -void Heap::Delete(HeapPtr me) noexcept { - CA_MUST_PASS(me); - HcFreeProcessHeap(kInstanceObject, me); -} - -SizeT Heap::Size(HeapPtr me) noexcept { - CA_MUST_PASS(me); - return HcProcessHeapSize(kInstanceObject, me); -} - -HeapPtr Heap::New(const SizeT& sz, const Int32 flags) { - SizeT _sz = sz; - if (!_sz) ++_sz; - - return HcAllocateProcessHeap(kInstanceObject, _sz, flags); -} \ No newline at end of file diff --git a/Public/Kits/System.Core/Heap.hxx b/Public/Kits/System.Core/Heap.hxx deleted file mode 100644 index ff0fc75a..00000000 --- a/Public/Kits/System.Core/Heap.hxx +++ /dev/null @@ -1,79 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include -#include - -#define kAllocationTypes 2 - -CA_EXTERN_C PVOID HcAllocateProcessHeap(ObjectPtr refObj, QWORD sz, - DWORD flags); -CA_EXTERN_C BOOL HcProcessHeapExists(ObjectPtr refObj, PVOID ptr); -CA_EXTERN_C QWORD HcProcessHeapSize(ObjectPtr refObj, PVOID ptr); -CA_EXTERN_C VOID HcFreeProcessHeap(ObjectPtr refObj, PVOID ptr); -CA_EXTERN_C ObjectPtr HcGetInstanceObject(void); - -enum HcAllocationKind { - kStandardAllocation = 0xC, - kArrayAllocation = 0xD, -}; - -namespace System { -using namespace HCore; - -class MemoryException; - -typedef PVOID HeapPtr; - -enum { - kHeapExpandable = 2, - kHeapNoExecute = 4, - kHeapShared = 6, - kHeapReadOnly = 8, - kHeapNoFlags = 0 -}; - -class Heap final { - private: - explicit Heap(); - - public: - ~Heap(); - - public: - HCORE_COPY_DEFAULT(Heap); - - public: - static Heap *Shared() noexcept; - - public: - void Delete(HeapPtr me) noexcept; - SizeT Size(HeapPtr me) noexcept; - HeapPtr New(const SizeT &sz, const Int32 flags = kHeapNoFlags); -}; - - -/// @brief heap exception -/// Throws when the heap pointer isn't found or invalid. -class HeapException : public SystemException { - public: - explicit HeapException() = default; - virtual ~HeapException() = default; - - public: - HCORE_COPY_DEFAULT(HeapException); - - public: - const char *Name() override { return "HeapException"; } - const char *Reason() override { return mReason; } - - private: - const char *mReason{"System.Core: HeapException: Catastrophic failure!"}; -}; - -} // namespace System \ No newline at end of file diff --git a/Public/Kits/System.Core/HeapRuntime.cxx b/Public/Kits/System.Core/HeapRuntime.cxx deleted file mode 100644 index c2f1f0e9..00000000 --- a/Public/Kits/System.Core/HeapRuntime.cxx +++ /dev/null @@ -1,44 +0,0 @@ -/** =========================================== - (C) Mahrouss Logic - ===========================================*/ - -#include - -/// @brief Allocate from the user's heap. -/// @param refObj Process object. -/// @param sz size of object. -/// @param flags flags. -/// @return -CA_EXTERN_C PVOID HcAllocateProcessHeap(ObjectPtr refObj, QWORD sz, - DWORD flags) { - CA_MUST_PASS(sz); - CA_MUST_PASS(flags); - - return (PVOID)refObj->Invoke(refObj, kProcessCallAllocPtr, sz, flags); -} - -/// @brief Free pointer from the user's heap. -/// @param refObj Process object. -/// @param ptr the pointer to free. -CA_EXTERN_C VOID HcFreeProcessHeap(ObjectPtr refObj, PVOID ptr) { - CA_MUST_PASS(ptr); - CA_UNREFERENCED_PARAMETER(refObj->Invoke(refObj, kProcessCallFreePtr, ptr)); -} - -/// @brief Get pointer size. -/// @param refObj Process object. -/// @param ptr the pointer to find. -/// @return the size. -CA_EXTERN_C QWORD HcProcessHeapSize(ObjectPtr refObj, PVOID ptr) { - CA_MUST_PASS(ptr); - return refObj->Invoke(refObj, kProcessCallSizePtr, ptr); -} - -/// @brief Check if the pointer exists. -/// @param refObj Process object. -/// @param ptr the pointer to check. -/// @return if it exists -CA_EXTERN_C BOOL HcProcessHeapExists(ObjectPtr refObj, PVOID ptr) { - CA_MUST_PASS(ptr); - return refObj->Invoke(refObj, kProcessCallCheckPtr, ptr); -} diff --git a/Public/Kits/System.Core/Hint.hxx b/Public/Kits/System.Core/Hint.hxx deleted file mode 100644 index 86faf455..00000000 --- a/Public/Kits/System.Core/Hint.hxx +++ /dev/null @@ -1,18 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#define _Input -#define _Output - -#define _Optional - -#define _StrictCheckInput -#define _StrictCheckOutput - -#define _InOut -#define _StrictInOut diff --git a/Public/Kits/System.Core/InitRuntime.cxx b/Public/Kits/System.Core/InitRuntime.cxx deleted file mode 100644 index 8d5596ca..00000000 --- a/Public/Kits/System.Core/InitRuntime.cxx +++ /dev/null @@ -1,14 +0,0 @@ -/** =========================================== - (C) Mahrouss Logic - ===========================================*/ - -#include - -/// @brief Inits the process runtime -/// @return if it was succesful or not. -DWORD HcInitRuntime(VOID) { - kInstanceObject = HcGetInstanceObject(); - CA_MUST_PASS(kInstanceObject); - - return 0; -} \ No newline at end of file diff --git a/Public/Kits/System.Core/Makefile b/Public/Kits/System.Core/Makefile index fb0f3e87..13fdf960 100644 --- a/Public/Kits/System.Core/Makefile +++ b/Public/Kits/System.Core/Makefile @@ -9,7 +9,7 @@ OUTPUT=System.Core.dll .PHONY: build-core-amd64 build-core-amd64: - $(CC) -I../ -I$(HOME) -I../../../Private/ $(CCFLAGS) $(wildcard *.cxx) $(wildcard AMD64/*.s) -o $(OUTPUT) + $(CC) -I../ -I$(HOME) -I../../../Private/ $(CCFLAGS) $(wildcard Sources/*.cxx) $(wildcard AMD64/*.s) -o $(OUTPUT) .PHONY: all all: build-core diff --git a/Public/Kits/System.Core/New+Delete.cxx b/Public/Kits/System.Core/New+Delete.cxx deleted file mode 100644 index 507cb7a3..00000000 --- a/Public/Kits/System.Core/New+Delete.cxx +++ /dev/null @@ -1,50 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#include - -void* operator new[](size_t sz) -{ - if (sz == 0) - ++sz; - - return HcAllocateProcessHeap(kInstanceObject, sz, kStandardAllocation); -} - -void* operator new(size_t sz) -{ - if (sz == 0) - ++sz; - - return HcAllocateProcessHeap(kInstanceObject, sz, kArrayAllocation); -} - -void operator delete[](void* ptr) -{ - if (ptr == nullptr) - return; - - HcFreeProcessHeap(kInstanceObject, ptr); -} - -void operator delete(void* ptr) -{ - if (ptr == nullptr) - return; - - HcFreeProcessHeap(kInstanceObject, ptr); -} - -void operator delete(void* ptr, size_t sz) -{ - if (ptr == nullptr) - return; - - (void)sz; - - HcFreeProcessHeap(kInstanceObject, ptr); -} - diff --git a/Public/Kits/System.Core/RISCV/.gitkeep b/Public/Kits/System.Core/RISCV/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Public/Kits/System.Core/Sources/DllMain.cxx b/Public/Kits/System.Core/Sources/DllMain.cxx new file mode 100644 index 00000000..9412cbbb --- /dev/null +++ b/Public/Kits/System.Core/Sources/DllMain.cxx @@ -0,0 +1,14 @@ +/** =========================================== + (C) Mahrouss Logic + ===========================================*/ + +#include + +/// @brief Inits the DLL. +/// @return if it was succesful or not. +DWordType __DllMain(VoidType) { + kInstanceObject = HcGetInstanceObject(); + CA_MUST_PASS(kInstanceObject); + + return 0; +} \ No newline at end of file diff --git a/Public/Kits/System.Core/Sources/Heap.cxx b/Public/Kits/System.Core/Sources/Heap.cxx new file mode 100644 index 00000000..b3f43ad3 --- /dev/null +++ b/Public/Kits/System.Core/Sources/Heap.cxx @@ -0,0 +1,83 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#include + +/// @brief Allocate from the user's heap. +/// @param refObj Process object. +/// @param sz size of object. +/// @param flags flags. +/// @return +CA_EXTERN_C PtrVoidType HcAllocateProcessHeap(ObjectPtr refObj, QWordType sz, + DWordType flags) { + CA_MUST_PASS(sz); + CA_MUST_PASS(flags); + + return (PtrVoidType)refObj->Invoke(refObj, kProcessCallAllocPtr, sz, flags); +} + +/// @brief Free pointer from the user's heap. +/// @param refObj Process object. +/// @param ptr the pointer to free. +CA_EXTERN_C VoidType HcFreeProcessHeap(ObjectPtr refObj, PtrVoidType ptr) { + CA_MUST_PASS(ptr); + CA_UNREFERENCED_PARAMETER(refObj->Invoke(refObj, kProcessCallFreePtr, ptr)); +} + +/// @brief Get pointer size. +/// @param refObj Process object. +/// @param ptr the pointer to find. +/// @return the size. +CA_EXTERN_C QWordType HcProcessHeapSize(ObjectPtr refObj, PtrVoidType ptr) { + CA_MUST_PASS(ptr); + return refObj->Invoke(refObj, kProcessCallSizePtr, ptr); +} + +/// @brief Check if the pointer exists. +/// @param refObj Process object. +/// @param ptr the pointer to check. +/// @return if it exists +CA_EXTERN_C BooleanType HcProcessHeapExists(ObjectPtr refObj, PtrVoidType ptr) { + CA_MUST_PASS(ptr); + return refObj->Invoke(refObj, kProcessCallCheckPtr, ptr); +} + +using namespace System; + +/// @brief Shared instance of the heap. +/// @return +HeapInterface* HeapInterface::Shared() noexcept { + static HeapInterface* heap = nullptr; + + if (!heap) { + heap = new HeapInterface(); + } + + return heap; +} + +HeapInterface::HeapInterface() { + CA_MUST_PASS(HcProcessHeapExists(kInstanceObject, (PtrVoidType)this)); +} + +HeapInterface::~HeapInterface() { delete this; } + +void HeapInterface::Delete(HeapPtr me) noexcept { + CA_MUST_PASS(me); + HcFreeProcessHeap(kInstanceObject, me); +} + +SizeType HeapInterface::Size(HeapPtr me) noexcept { + CA_MUST_PASS(me); + return HcProcessHeapSize(kInstanceObject, me); +} + +HeapPtr HeapInterface::New(const SizeType& sz, const DWordType flags) { + SizeType _sz = sz; + if (!_sz) ++_sz; + + return HcAllocateProcessHeap(kInstanceObject, _sz, flags); +} diff --git a/Public/Kits/System.Core/Sources/New+Delete.cxx b/Public/Kits/System.Core/Sources/New+Delete.cxx new file mode 100644 index 00000000..019db66c --- /dev/null +++ b/Public/Kits/System.Core/Sources/New+Delete.cxx @@ -0,0 +1,65 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#include + +#define kAllocationTypes 2 + +enum HcAllocationKind { + kStandardAllocation = 0xC, + kArrayAllocation = 0xD, +}; + +CA_EXTERN_C PtrVoidType HcAllocateProcessHeap(ObjectPtr refObj, QWordType sz, + DWordType flags); +CA_EXTERN_C BooleanType HcProcessHeapExists(ObjectPtr refObj, PtrVoidType ptr); +CA_EXTERN_C QWordType HcProcessHeapSize(ObjectPtr refObj, PtrVoidType ptr); +CA_EXTERN_C VoidType HcFreeProcessHeap(ObjectPtr refObj, PtrVoidType ptr); + +typedef SizeType size_t; + +void* operator new[](size_t sz) +{ + if (sz == 0) + ++sz; + + return HcAllocateProcessHeap(kInstanceObject, sz, kStandardAllocation); +} + +void* operator new(size_t sz) +{ + if (sz == 0) + ++sz; + + return HcAllocateProcessHeap(kInstanceObject, sz, kArrayAllocation); +} + +void operator delete[](void* ptr) +{ + if (ptr == nullptr) + return; + + HcFreeProcessHeap(kInstanceObject, ptr); +} + +void operator delete(void* ptr) +{ + if (ptr == nullptr) + return; + + HcFreeProcessHeap(kInstanceObject, ptr); +} + +void operator delete(void* ptr, size_t sz) +{ + if (ptr == nullptr) + return; + + (void)sz; + + HcFreeProcessHeap(kInstanceObject, ptr); +} + diff --git a/Public/Kits/System.Core/System.Core.hxx b/Public/Kits/System.Core/System.Core.hxx deleted file mode 100644 index 96ab45be..00000000 --- a/Public/Kits/System.Core/System.Core.hxx +++ /dev/null @@ -1,14 +0,0 @@ -/** =========================================== - (C) Mahrouss Logic - ===========================================*/ - -#pragma once - -/// Process Heap API -#include - -/// File API & Device API. -#include - -/// Process & Threading API -#include diff --git a/Public/Kits/System.Core/System.hxx b/Public/Kits/System.Core/System.hxx deleted file mode 100644 index 05028d87..00000000 --- a/Public/Kits/System.Core/System.hxx +++ /dev/null @@ -1,18 +0,0 @@ -/*** =========================================== - (C) Mahrouss Logic - ===========================================*/ - -#pragma once - -/** --------------------------------------------------- - - * THIS FILE CONTAINS CODE FOR THE STANDARD HCORE API. - -------------------------------------------------------- */ - -#include -#include -#include -#include - -using namespace HCore; diff --git a/Public/Kits/System.Core/Threading.hxx b/Public/Kits/System.Core/Threading.hxx deleted file mode 100644 index bddbbf3f..00000000 --- a/Public/Kits/System.Core/Threading.hxx +++ /dev/null @@ -1,34 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -// -// Created by Amlal on 3/18/24 -// - -#ifndef __THREAD_API__ -#define __THREAD_API__ - -#include - -/// @brief Thread Information Block variant for scheduling. -struct PACKED ThreadInformationBlock final { - const UINT_PTR StartAddress; // Start Address - const UINT_PTR StartHeap; // Allocation Heap - const UINT_PTR StartStack; // Stack Pointer. - const WORD ThreadID; // Execution Thread ID. -}; - -ThreadInformationBlock* HcCreateThread(_Input PVOID Start, - _Optional _InOut PVOID HeapOpt, - _Optional _InOut PVOID StackOpt); - -BOOL HcDestroyThread(_Input ThreadInformationBlock* TIB); - -BOOL HcStopThread(_Input ThreadInformationBlock* TIB); - -BOOL HcResumeThread(_Input ThreadInformationBlock* TIB); - -#endif // __THREAD_API__ -- cgit v1.2.3