From bb432453ab609ca7e8dc8e991775329d10a29e7b Mon Sep 17 00:00:00 2001 From: Amlal Date: Wed, 13 Aug 2025 23:56:41 +0200 Subject: feat! Breaking changes in the DDK. Signed-off-by: Amlal --- dev/ddk/DDKKit/ddk.h | 74 ---------------------- dev/ddk/DDKKit/dev.h | 36 ----------- dev/ddk/DDKKit/io.h | 18 ------ dev/ddk/DDKKit/macros.h | 48 -------------- dev/ddk/DDKKit/net.h | 16 ----- dev/ddk/DDKKit/str.h | 17 ----- dev/ddk/DriverKit/ddk.h | 74 ++++++++++++++++++++++ dev/ddk/DriverKit/dev.h | 36 +++++++++++ dev/ddk/DriverKit/io.h | 18 ++++++ dev/ddk/DriverKit/macros.h | 48 ++++++++++++++ dev/ddk/DriverKit/net.h | 16 +++++ dev/ddk/DriverKit/str.h | 17 +++++ dev/ddk/docs/SPECIFICATION_DDK.md | 2 +- dev/ddk/src/ddk_abi_cxx.cc | 27 ++++++++ dev/ddk/src/ddk_alloc.c | 6 +- dev/ddk/src/ddk_dev.c | 8 +-- dev/ddk/src/ddk_io.c | 4 +- dev/ddk/src/ddk_kernel_call.c | 23 +++---- dev/ddk/src/ddk_kernel_call_dispatch.S | 4 +- dev/ddk/src/ddk_rt_cxx.cc | 25 -------- dev/ddk/src/ddk_str.c | 4 +- dev/ddk/src/ddk_ver.c | 4 +- dev/kernel/DmaKit/DmaPool.h | 1 - dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc | 4 +- dev/libSystem/docs/SPECIFICATION_SYSCALLS.md | 2 +- 25 files changed, 267 insertions(+), 265 deletions(-) delete mode 100644 dev/ddk/DDKKit/ddk.h delete mode 100644 dev/ddk/DDKKit/dev.h delete mode 100644 dev/ddk/DDKKit/io.h delete mode 100644 dev/ddk/DDKKit/macros.h delete mode 100644 dev/ddk/DDKKit/net.h delete mode 100644 dev/ddk/DDKKit/str.h create mode 100644 dev/ddk/DriverKit/ddk.h create mode 100644 dev/ddk/DriverKit/dev.h create mode 100644 dev/ddk/DriverKit/io.h create mode 100644 dev/ddk/DriverKit/macros.h create mode 100644 dev/ddk/DriverKit/net.h create mode 100644 dev/ddk/DriverKit/str.h create mode 100644 dev/ddk/src/ddk_abi_cxx.cc delete mode 100644 dev/ddk/src/ddk_rt_cxx.cc (limited to 'dev') diff --git a/dev/ddk/DDKKit/ddk.h b/dev/ddk/DDKKit/ddk.h deleted file mode 100644 index 5a8929da..00000000 --- a/dev/ddk/DDKKit/ddk.h +++ /dev/null @@ -1,74 +0,0 @@ -/* ------------------------------------------- - - Copyright Amlal El Mahrouss. - - FILE: ddk.h - PURPOSE: DDK Driver model base header. - -------------------------------------------- */ - -#pragma once - -#include - -struct DDK_STATUS_STRUCT; -struct DDK_OBJECT_MANIFEST; - -/// \brief Object handle manifest. -struct DDK_OBJECT_MANIFEST DDK_FINAL { - char* p_name; - int32_t p_kind; - void* p_object; -}; - -/// \brief DDK status ping structure. -struct DDK_STATUS_STRUCT DDK_FINAL { - int32_t s_action_id; - int32_t s_issuer_id; - int32_t s_group_id; - struct DDK_OBJECT_MANIFEST* s_object; -}; - -/// @brief Call Kernel procedure. -/// @param name the procedure name. -/// @param cnt number of elements in **dat** -/// @param dat data argument pointer. -/// @param sz sz of whole data argument pointer. -/// @return result of call -DDK_EXTERN void* ke_call(const char* name, int32_t cnt, void* dat, size_t sz); - -/// @brief add a system call. -/// @param slot system call slot id. -/// @param slotFn, syscall slot. -DDK_EXTERN void ke_set_syscall(const int32_t slot, void (*slotFn)(void* a0)); - -/// @brief Allocates an heap ptr. -/// @param sz size of the allocated struct/type. -/// @return the pointer allocated or **nil**. -DDK_EXTERN void* kalloc(size_t sz); - -/// @brief Frees an heap ptr. -/// @param pointer kernel pointer to free. -DDK_EXTERN void kfree(void* the_ptr); - -/// @brief Gets a Kernel object. -/// @param slot object id (can be 0) -/// @param name the property's name. -/// @return DDK_OBJECT_MANIFEST. -DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* name); - -/// @brief Set a Kernel object. -/// @param slot object id (can be 0) -/// @param name the property's name. -/// @param ddk_pr pointer to a object's DDK_OBJECT_MANIFEST. -/// @return returned object. -DDK_EXTERN void* ke_set_obj(const int32_t slot, const struct DDK_OBJECT_MANIFEST* ddk_pr); - -/// @brief The highest API version of the DDK. -DDK_EXTERN uint32_t kApiVersionHighest; - -/// @brief The lowest API version of the DDK. -DDK_EXTERN uint32_t kApiVersionLowest; - -/// @brief API version in BCD. -DDK_EXTERN uint32_t kApiVersion; diff --git a/dev/ddk/DDKKit/dev.h b/dev/ddk/DDKKit/dev.h deleted file mode 100644 index 59fb48b5..00000000 --- a/dev/ddk/DDKKit/dev.h +++ /dev/null @@ -1,36 +0,0 @@ -/* ------------------------------------------- - - Copyright Amlal El Mahrouss. - - File: dev.h - Purpose: DDK device support. - -------------------------------------------- */ - -#pragma once - -#include - -struct _DDK_DEVICE; - -#define DDK_DEVICE_NAME_LEN (255) - -/// @brief Kernel Device driver. -typedef struct _DDK_DEVICE DDK_FINAL { - char d_name[DDK_DEVICE_NAME_LEN]; // the device name. Could be /./DEVICE_NAME/ - void* (*d_read)(void* arg, int len); // read from device. - void (*d_write)(void* arg, int len); - void (*d_wait)(void); // write to device. - struct _DDK_DEVICE* (*d_open)(const char* path); // open device. - void (*d_close)(struct _DDK_DEVICE* dev); // close device. - void (*d_seek)(struct _DDK_DEVICE* dev, size_t off); - size_t (*d_tell)(struct _DDK_DEVICE* dev); -} DDK_DEVICE, *DDK_DEVICE_PTR; - -/// @brief Open a new device from path. -/// @param path the device's path. -DDK_EXTERN DDK_DEVICE_PTR open(const char* path); - -/// @brief Close any device. -/// @param device valid device. -DDK_EXTERN BOOL close(DDK_DEVICE_PTR device); diff --git a/dev/ddk/DDKKit/io.h b/dev/ddk/DDKKit/io.h deleted file mode 100644 index 28396608..00000000 --- a/dev/ddk/DDKKit/io.h +++ /dev/null @@ -1,18 +0,0 @@ -/* ------------------------------------------- - - Copyright Amlal El Mahrouss. - - Purpose: DDK Text I/O. - -------------------------------------------- */ - -#pragma once - -#include - -/// @brief print character into UART. -DDK_EXTERN void kputc(const char ch); - -/// @brief print string to UART. -/// @param message string to transmit to UART. -DDK_EXTERN void kprint(const char* message); diff --git a/dev/ddk/DDKKit/macros.h b/dev/ddk/DDKKit/macros.h deleted file mode 100644 index 9b7b3d50..00000000 --- a/dev/ddk/DDKKit/macros.h +++ /dev/null @@ -1,48 +0,0 @@ -/* ------------------------------------------- - - Copyright 2025 Amlal El Mahrouss. - - FILE: ddk.h - PURPOSE: DDK Driver model base header. - -------------------------------------------- */ - -#pragma once - -#include -#include - -#if defined(__cplusplus) -#define BOOL bool -#define YES true -#define NO false -#define DDK_EXTERN extern "C" __declspec(dllexport) -#define nil nullptr -#undef NULL -#define NULL 0 -#define DDK_FINAL final -#else -#define BOOL char -#define YES 1 -#define NO 0 -#define DDK_EXTERN extern __declspec(dllexport) -#define nil ((void*) 0) -#undef NULL -#define NULL ((void*) 0) -#define DDK_FINAL -#endif // defined(__cplusplus) - -#ifndef __DDK__ -#undef DDK_EXTERN -#if defined(__cplusplus) -#define DDK_EXTERN extern "C" __declspec(dllimport) -#else -#define DDK_EXTERN __declspec(dllimport) -#endif -#endif - -#define ATTRIBUTE(X) __attribute__((X)) - -#ifndef __NEOSKRNL__ -#error !!! Do not include header in EL0/Ring 3 mode !!! -#endif // __NEOSKRNL__ \ No newline at end of file diff --git a/dev/ddk/DDKKit/net.h b/dev/ddk/DDKKit/net.h deleted file mode 100644 index ea85dee7..00000000 --- a/dev/ddk/DDKKit/net.h +++ /dev/null @@ -1,16 +0,0 @@ -/* ------------------------------------------- - - Copyright Amlal El Mahrouss. - - FILE: net.h - PURPOSE: Network model base header. - -------------------------------------------- */ - -#pragma once - -#include - -struct DDK_NET_MANIFEST; - -/// @brief IFS hooks to plug into the FileMgr. diff --git a/dev/ddk/DDKKit/str.h b/dev/ddk/DDKKit/str.h deleted file mode 100644 index fbf6506d..00000000 --- a/dev/ddk/DDKKit/str.h +++ /dev/null @@ -1,17 +0,0 @@ -/* ------------------------------------------- - - Copyright Amlal El Mahrouss. - - Purpose: DDK Strings. - -------------------------------------------- */ - -#pragma once - -#include - -/// @brief DDK equivalent of POSIX's string.h -/// @file str.h - -DDK_EXTERN size_t kstrlen(const char* in); -DDK_EXTERN int kstrncpy(char* dst, const char* src, size_t len); diff --git a/dev/ddk/DriverKit/ddk.h b/dev/ddk/DriverKit/ddk.h new file mode 100644 index 00000000..254137f9 --- /dev/null +++ b/dev/ddk/DriverKit/ddk.h @@ -0,0 +1,74 @@ +/* ------------------------------------------- + + Copyright Amlal El Mahrouss. + + FILE: ddk.h + PURPOSE: DDK Driver model base header. + +------------------------------------------- */ + +#pragma once + +#include + +struct DDK_STATUS_STRUCT; +struct DDK_OBJECT_MANIFEST; + +/// \brief Object handle manifest. +struct DDK_OBJECT_MANIFEST DDK_FINAL { + char* p_name; + int32_t p_kind; + void* p_object; +}; + +/// \brief DDK status ping structure. +struct DDK_STATUS_STRUCT DDK_FINAL { + int32_t s_action_id; + int32_t s_issuer_id; + int32_t s_group_id; + struct DDK_OBJECT_MANIFEST* s_object; +}; + +/// @brief Call Kernel procedure. +/// @param name the procedure name. +/// @param cnt number of elements in **dat** +/// @param dat data argument pointer. +/// @param sz sz of whole data argument pointer. +/// @return result of call +DDK_EXTERN void* ke_call_dispatch(const char* name, int32_t cnt, void* dat, size_t sz); + +/// @brief add a system call. +/// @param slot system call slot id. +/// @param slotFn, syscall slot. +DDK_EXTERN void ke_set_syscall(const int32_t slot, void (*slotFn)(void* a0)); + +/// @brief Allocates an heap ptr. +/// @param sz size of the allocated struct/type. +/// @return the pointer allocated or **nil**. +DDK_EXTERN void* kalloc(size_t sz); + +/// @brief Frees an heap ptr. +/// @param pointer kernel pointer to free. +DDK_EXTERN void kfree(void* the_ptr); + +/// @brief Gets a Kernel object. +/// @param slot object id (can be 0) +/// @param name the property's name. +/// @return DDK_OBJECT_MANIFEST. +DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* name); + +/// @brief Set a Kernel object. +/// @param slot object id (can be 0) +/// @param name the property's name. +/// @param ddk_pr pointer to a object's DDK_OBJECT_MANIFEST. +/// @return returned object. +DDK_EXTERN void* ke_set_obj(const int32_t slot, const struct DDK_OBJECT_MANIFEST* ddk_pr); + +/// @brief The highest API version of the DDK. +DDK_EXTERN uint32_t kApiVersionHighest; + +/// @brief The lowest API version of the DDK. +DDK_EXTERN uint32_t kApiVersionLowest; + +/// @brief API version in BCD. +DDK_EXTERN uint32_t kApiVersion; diff --git a/dev/ddk/DriverKit/dev.h b/dev/ddk/DriverKit/dev.h new file mode 100644 index 00000000..adb1c1d0 --- /dev/null +++ b/dev/ddk/DriverKit/dev.h @@ -0,0 +1,36 @@ +/* ------------------------------------------- + + Copyright Amlal El Mahrouss. + + File: dev.h + Purpose: DDK device support. + +------------------------------------------- */ + +#pragma once + +#include + +struct _DDK_DEVICE; + +#define DDK_DEVICE_NAME_LEN (255) + +/// @brief Kernel Device driver. +typedef struct _DDK_DEVICE DDK_FINAL { + char d_name[DDK_DEVICE_NAME_LEN]; // the device name. Could be /./DEVICE_NAME/ + void* (*d_read)(void* arg, int len); // read from device. + void (*d_write)(void* arg, int len); + void (*d_wait)(void); // write to device. + struct _DDK_DEVICE* (*d_open)(const char* path); // open device. + void (*d_close)(struct _DDK_DEVICE* dev); // close device. + void (*d_seek)(struct _DDK_DEVICE* dev, size_t off); + size_t (*d_tell)(struct _DDK_DEVICE* dev); +} DDK_DEVICE, *DDK_DEVICE_PTR; + +/// @brief Open a new device from path. +/// @param path the device's path. +DDK_EXTERN DDK_DEVICE_PTR open(const char* path); + +/// @brief Close any device. +/// @param device valid device. +DDK_EXTERN BOOL close(DDK_DEVICE_PTR device); diff --git a/dev/ddk/DriverKit/io.h b/dev/ddk/DriverKit/io.h new file mode 100644 index 00000000..805696e6 --- /dev/null +++ b/dev/ddk/DriverKit/io.h @@ -0,0 +1,18 @@ +/* ------------------------------------------- + + Copyright Amlal El Mahrouss. + + Purpose: DDK Text I/O. + +------------------------------------------- */ + +#pragma once + +#include + +/// @brief print character into UART. +DDK_EXTERN void kputc(const char ch); + +/// @brief print string to UART. +/// @param message string to transmit to UART. +DDK_EXTERN void kprint(const char* message); diff --git a/dev/ddk/DriverKit/macros.h b/dev/ddk/DriverKit/macros.h new file mode 100644 index 00000000..9b7b3d50 --- /dev/null +++ b/dev/ddk/DriverKit/macros.h @@ -0,0 +1,48 @@ +/* ------------------------------------------- + + Copyright 2025 Amlal El Mahrouss. + + FILE: ddk.h + PURPOSE: DDK Driver model base header. + +------------------------------------------- */ + +#pragma once + +#include +#include + +#if defined(__cplusplus) +#define BOOL bool +#define YES true +#define NO false +#define DDK_EXTERN extern "C" __declspec(dllexport) +#define nil nullptr +#undef NULL +#define NULL 0 +#define DDK_FINAL final +#else +#define BOOL char +#define YES 1 +#define NO 0 +#define DDK_EXTERN extern __declspec(dllexport) +#define nil ((void*) 0) +#undef NULL +#define NULL ((void*) 0) +#define DDK_FINAL +#endif // defined(__cplusplus) + +#ifndef __DDK__ +#undef DDK_EXTERN +#if defined(__cplusplus) +#define DDK_EXTERN extern "C" __declspec(dllimport) +#else +#define DDK_EXTERN __declspec(dllimport) +#endif +#endif + +#define ATTRIBUTE(X) __attribute__((X)) + +#ifndef __NEOSKRNL__ +#error !!! Do not include header in EL0/Ring 3 mode !!! +#endif // __NEOSKRNL__ \ No newline at end of file diff --git a/dev/ddk/DriverKit/net.h b/dev/ddk/DriverKit/net.h new file mode 100644 index 00000000..63f89367 --- /dev/null +++ b/dev/ddk/DriverKit/net.h @@ -0,0 +1,16 @@ +/* ------------------------------------------- + + Copyright Amlal El Mahrouss. + + FILE: net.h + PURPOSE: Network model base header. + +------------------------------------------- */ + +#pragma once + +#include + +struct DDK_NET_MANIFEST; + +/// @brief IFS hooks to plug into the FileMgr. diff --git a/dev/ddk/DriverKit/str.h b/dev/ddk/DriverKit/str.h new file mode 100644 index 00000000..b2c0ce72 --- /dev/null +++ b/dev/ddk/DriverKit/str.h @@ -0,0 +1,17 @@ +/* ------------------------------------------- + + Copyright Amlal El Mahrouss. + + Purpose: DDK Strings. + +------------------------------------------- */ + +#pragma once + +#include + +/// @brief DDK equivalent of POSIX's string.h +/// @file str.h + +DDK_EXTERN size_t kstrlen(const char* in); +DDK_EXTERN int kstrncpy(char* dst, const char* src, size_t len); diff --git a/dev/ddk/docs/SPECIFICATION_DDK.md b/dev/ddk/docs/SPECIFICATION_DDK.md index 57710d1f..d7d333d3 100644 --- a/dev/ddk/docs/SPECIFICATION_DDK.md +++ b/dev/ddk/docs/SPECIFICATION_DDK.md @@ -5,7 +5,7 @@ =================================== - Programming Language: C/C++ -- Build System: Make/BTB +- Build System: Make/NeBuild - Purpose: Driver Tool Kit, which you link against ddk.sys =================================== diff --git a/dev/ddk/src/ddk_abi_cxx.cc b/dev/ddk/src/ddk_abi_cxx.cc new file mode 100644 index 00000000..fc590c0e --- /dev/null +++ b/dev/ddk/src/ddk_abi_cxx.cc @@ -0,0 +1,27 @@ +/* ------------------------------------------- + + DDK + Copyright Amlal El Mahrouss. + + Author: Amlal El Mahrouss + Purpose: DDK C++ ABI. + +------------------------------------------- */ + +#include + +void* operator new(size_t sz) { + return ::kalloc(sz); +} + +void operator delete(void* ptr) { + ::kfree(ptr); +} + +void* operator new[](size_t sz) { + return ::kalloc(sz); +} + +void operator delete[](void* ptr) { + ::kfree(ptr); +} diff --git a/dev/ddk/src/ddk_alloc.c b/dev/ddk/src/ddk_alloc.c index 0b428b15..08527f4d 100644 --- a/dev/ddk/src/ddk_alloc.c +++ b/dev/ddk/src/ddk_alloc.c @@ -6,7 +6,7 @@ ------------------------------------------- */ -#include +#include /** \brief Allocates a new heap on the Kernel's side. @@ -16,7 +16,7 @@ DDK_EXTERN void* kalloc(size_t sz) { if (!sz) ++sz; - void* ptr = ke_call("mm_alloc_ptr", 1, &sz, sizeof(size_t)); + void* ptr = ke_call_dispatch("mm_alloc_ptr", 1, &sz, sizeof(size_t)); return ptr; } @@ -28,5 +28,5 @@ DDK_EXTERN void* kalloc(size_t sz) { DDK_EXTERN void kfree(void* ptr) { if (!ptr) return; - ke_call("mm_free_ptr", 1, ptr, 0); + ke_call_dispatch("mm_free_ptr", 1, ptr, 0); } diff --git a/dev/ddk/src/ddk_dev.c b/dev/ddk/src/ddk_dev.c index 4cd7dcdd..32ec2442 100644 --- a/dev/ddk/src/ddk_dev.c +++ b/dev/ddk/src/ddk_dev.c @@ -6,14 +6,14 @@ ------------------------------------------- */ -#include -#include +#include +#include /// @brief Open a new binary device from path. DDK_EXTERN DDK_DEVICE_PTR open(const char* devicePath) { if (!devicePath) return nil; - return ke_call("dk_open_dev", 1, (void*) devicePath, kstrlen(devicePath)); + return ke_call_dispatch("dk_open_dev", 1, (void*) devicePath, kstrlen(devicePath)); } /// @brief Close any device. @@ -21,6 +21,6 @@ DDK_EXTERN DDK_DEVICE_PTR open(const char* devicePath) { DDK_EXTERN BOOL close(DDK_DEVICE_PTR device) { if (!device) return NO; - ke_call("dk_close_dev", 1, device, sizeof(DDK_DEVICE)); + ke_call_dispatch("dk_close_dev", 1, device, sizeof(DDK_DEVICE)); return YES; } diff --git a/dev/ddk/src/ddk_io.c b/dev/ddk/src/ddk_io.c index ba6d4e55..c6cdd457 100644 --- a/dev/ddk/src/ddk_io.c +++ b/dev/ddk/src/ddk_io.c @@ -6,14 +6,14 @@ ------------------------------------------- */ -#include +#include DDK_EXTERN void kputc(const char ch) { char assembled[2] = {0}; assembled[0] = ch; assembled[1] = 0; - ke_call("ke_put_string", 1, assembled, 1); + ke_call_dispatch("ke_put_string", 1, assembled, 1); } /// @brief print string to UART. diff --git a/dev/ddk/src/ddk_kernel_call.c b/dev/ddk/src/ddk_kernel_call.c index 10f31e18..95d2e577 100644 --- a/dev/ddk/src/ddk_kernel_call.c +++ b/dev/ddk/src/ddk_kernel_call.c @@ -1,36 +1,37 @@ /* ------------------------------------------- + DDK Copyright Amlal El Mahrouss. - Purpose: DDK Kernel call. + Author: Amlal El Mahrouss + Purpose: DDK kernel dispatch system. ------------------------------------------- */ -#include +#include #include /// @brief this is an internal call, do not use it. -DDK_EXTERN ATTRIBUTE(naked) void* ke_call_dispatch(const char* name, int32_t cnt, void* data, +DDK_EXTERN ATTRIBUTE(naked) void* __ke_call_dispatch(const char* name, int32_t cnt, void* data, size_t sz); -/// @brief Interupt Kernel and call it's RPC. +/// @brief Interrupt Kernel and call it's RPC. /// @param KernelRpcName RPC name /// @param cnt number of elements in **data** pointer. /// @param data data pointer. /// @param sz The size of the whole data pointer. /// @retval void* Kernel call was successful. /// @retval nil Kernel call failed, call KernelLastError(void) -DDK_EXTERN void* ke_call(const char* name, int32_t cnt, void* data, size_t sz) { - if (!name || *name == 0 || cnt == 0) return nil; - - return ke_call_dispatch(name, cnt, data, sz); +DDK_EXTERN void* ke_call_dispatch(const char* name, int32_t cnt, void* data, size_t sz) { + if (name == nil || *name == 0 || data == nil || cnt == 0) return nil; + return __ke_call_dispatch(name, cnt, data, sz); } /// @brief Add system call. /// @param slot system call slot /// @param slotFn, syscall slot. DDK_EXTERN void ke_set_syscall(const int slot, void (*slotFn)(void* a0)) { - ke_call("ke_set_syscall", slot, slotFn, 1); + ke_call_dispatch("ke_set_syscall", slot, slotFn, 1); } /// @brief Get a Kernel object. @@ -39,7 +40,7 @@ DDK_EXTERN void ke_set_syscall(const int slot, void (*slotFn)(void* a0)) { /// @return Object manifest. DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* name) { struct DDK_OBJECT_MANIFEST* manifest = - (struct DDK_OBJECT_MANIFEST*) ke_call("cfkit_get_kobj", slot, (void*) name, 1); + (struct DDK_OBJECT_MANIFEST*) ke_call_dispatch("cfkit_get_kobj", slot, (void*) name, 1); if (!manifest) return nil; @@ -52,5 +53,5 @@ DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* na /// @param ddk_pr pointer to a object's DDK_OBJECT_MANIFEST. /// @return property's object. DDK_EXTERN void* ke_set_obj(const int slot, const struct DDK_OBJECT_MANIFEST* ddk_pr) { - return ke_call("cfkit_set_kobj", slot, (void*) ddk_pr, 1); + return ke_call_dispatch("cfkit_set_kobj", slot, (void*) ddk_pr, 1); } diff --git a/dev/ddk/src/ddk_kernel_call_dispatch.S b/dev/ddk/src/ddk_kernel_call_dispatch.S index 9b32d0c2..c66d9d49 100644 --- a/dev/ddk/src/ddk_kernel_call_dispatch.S +++ b/dev/ddk/src/ddk_kernel_call_dispatch.S @@ -3,7 +3,7 @@ compiler: gnu */ -.globl ke_call_dispatch +.globl __ke_call_dispatch .text @@ -13,7 +13,7 @@ #if defined(__DDK_AMD64__) /* args rcx, rdx, r8, r9 */ -ke_call_dispatch: +__ke_call_dispatch: int $0x33 ret diff --git a/dev/ddk/src/ddk_rt_cxx.cc b/dev/ddk/src/ddk_rt_cxx.cc deleted file mode 100644 index 3d57e2b9..00000000 --- a/dev/ddk/src/ddk_rt_cxx.cc +++ /dev/null @@ -1,25 +0,0 @@ -/* ------------------------------------------- - - Copyright Amlal El Mahrouss. - - Purpose: DDK C++ runtime. - -------------------------------------------- */ - -#include - -void* operator new(size_t sz) { - return ::kalloc(sz); -} - -void operator delete(void* ptr) { - ::kfree(ptr); -} - -void* operator new[](size_t sz) { - return ::kalloc(sz); -} - -void operator delete[](void* ptr) { - ::kfree(ptr); -} diff --git a/dev/ddk/src/ddk_str.c b/dev/ddk/src/ddk_str.c index d50a5d03..514cddc7 100644 --- a/dev/ddk/src/ddk_str.c +++ b/dev/ddk/src/ddk_str.c @@ -2,11 +2,11 @@ Copyright Amlal El Mahrouss. - Purpose: DDK Strings. + Purpose: DDK String API. ------------------------------------------- */ -#include +#include DDK_EXTERN size_t kstrlen(const char* in) { if (in == nil) return 0; diff --git a/dev/ddk/src/ddk_ver.c b/dev/ddk/src/ddk_ver.c index 41c6c612..9be3134e 100644 --- a/dev/ddk/src/ddk_ver.c +++ b/dev/ddk/src/ddk_ver.c @@ -2,11 +2,11 @@ Copyright Amlal El Mahrouss. - Purpose: DDK version symbols. + Purpose: DDK version system. ------------------------------------------- */ -#include +#include #ifndef kDDKVersionHighest #define kDDKVersionHighest 1 diff --git a/dev/kernel/DmaKit/DmaPool.h b/dev/kernel/DmaKit/DmaPool.h index db12eb25..99f43725 100644 --- a/dev/kernel/DmaKit/DmaPool.h +++ b/dev/kernel/DmaKit/DmaPool.h @@ -29,7 +29,6 @@ #define kNeDMABestAlign (8) #endif - namespace Kernel { /// @brief DMA pool base pointer, here we're sure that AHCI or whatever tricky standard sees it. inline UInt8* kDmaPoolPtr = (UInt8*) kNeDMAPoolStart; diff --git a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc index 4a667549..64f146f3 100644 --- a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc +++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc @@ -32,10 +32,9 @@ #include #include -/// @note: _hal_switch_context is internal - /////////////////////////////////////////////////////////////////////////////////////// +/// @note: _hal_switch_context is internal. /// @brief The **HAL** namespace. /////////////////////////////////////////////////////////////////////////////////////// @@ -70,6 +69,7 @@ struct HAL_APIC_MADT final SDT_OBJECT { UInt8 List[1]; // Records List }; +/// @brief Local APIC Descriptor Table. struct LAPIC final { UInt8 Type; UInt8 Length; diff --git a/dev/libSystem/docs/SPECIFICATION_SYSCALLS.md b/dev/libSystem/docs/SPECIFICATION_SYSCALLS.md index b4b11c8c..89f61498 100644 --- a/dev/libSystem/docs/SPECIFICATION_SYSCALLS.md +++ b/dev/libSystem/docs/SPECIFICATION_SYSCALLS.md @@ -3,7 +3,7 @@ =================================== - **Programming Language**: C / C++ -- **Build System**: Make / BTB (Build the Build) +- **Build System**: Make / NeBuild - **Purpose**: System Call Interface (SCI) for NeKernel =================================== -- cgit v1.2.3