diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-11-09 10:35:48 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-11-09 10:35:48 +0100 |
| commit | 84d91a9fd9c3363d0e0db581356d4cd58c03d1db (patch) | |
| tree | b7dc4d89141a8758fcd2e6447fd528d8423098ae | |
| parent | 67716b2871b1117510b26bc1aaf6fce7195272dc (diff) | |
IMP: Important changes to the SCI, add SysCalls.h file and SYSCALL_DECL macro.
| -rw-r--r-- | dev/SCIKit/Macros.h | 15 | ||||
| -rw-r--r-- | dev/SCIKit/SysCalls.h | 10 | ||||
| -rw-r--r-- | dev/ZKAKit/NewKit/Defines.h | 10 | ||||
| -rw-r--r-- | dev/ZKAKit/src/Json.cc | 2 | ||||
| -rw-r--r-- | dev/ZKAKit/src/Network/IPC.cc | 4 |
5 files changed, 33 insertions, 8 deletions
diff --git a/dev/SCIKit/Macros.h b/dev/SCIKit/Macros.h index 114b74ef..2143c4d5 100644 --- a/dev/SCIKit/Macros.h +++ b/dev/SCIKit/Macros.h @@ -1,3 +1,12 @@ +/* ------------------------------------------- + +Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved. + +File: Macros.h +Purpose: SCIKit Macros header. + +------------------------------------------- */ + #pragma once /***********************************************************************************/ @@ -39,3 +48,9 @@ typedef IOObject FSObject; typedef SCIObject DLLObject; typedef SCIObject ThreadObject; typedef SCIObject SocketObject; + +#ifdef SYSCALL_DECL +#undef SYSCALL_DECL +#endif // SYSCALL_DECL + +#define SYSCALL_DECL(NAME, ...) IMPORT_C VoidPtr NAME(__VA_ARGS__);
\ No newline at end of file diff --git a/dev/SCIKit/SysCalls.h b/dev/SCIKit/SysCalls.h new file mode 100644 index 00000000..6504c9c2 --- /dev/null +++ b/dev/SCIKit/SysCalls.h @@ -0,0 +1,10 @@ +/* ------------------------------------------- + +Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved. + +File: Macros.h +Purpose: SCIKit Macros header. + +------------------------------------------- */ + +#pragma once diff --git a/dev/ZKAKit/NewKit/Defines.h b/dev/ZKAKit/NewKit/Defines.h index 03a1523e..d7ad9792 100644 --- a/dev/ZKAKit/NewKit/Defines.h +++ b/dev/ZKAKit/NewKit/Defines.h @@ -174,7 +174,7 @@ namespace Kernel }; } // namespace Kernel -#define cDeduceEndian(address, value) \ +#define DEDUCE_ENDIAN(address, value) \ (((reinterpret_cast<Kernel::Char*>(address)[0]) == (value)) \ ? (Kernel::Endian::kEndianBig) \ : (Kernel::Endian::kEndianLittle)) @@ -184,8 +184,8 @@ namespace Kernel #define VoidStar Kernel::VoidPtr -#ifdef kInitCxx -#undef kInitCxx -#endif // ifdef kInitCxx +#ifdef INIT_OBJECT +#undef INIT_OBJECT +#endif // ifdef INIT_OBJECT -#define kInitCxx(OBJ, TYPE, ...) TYPE OBJ = TYPE(__VA_ARGS__) +#define INIT_OBJECT(OBJ, TYPE, ...) TYPE OBJ = TYPE(__VA_ARGS__) diff --git a/dev/ZKAKit/src/Json.cc b/dev/ZKAKit/src/Json.cc index 4c8e9b1c..50274206 100644 --- a/dev/ZKAKit/src/Json.cc +++ b/dev/ZKAKit/src/Json.cc @@ -9,4 +9,4 @@ using namespace Kernel; /// @brief Undefined object, is null in length. -kInitCxx(Kernel::JSON::kNull, Kernel::JSON); +INIT_OBJECT(Kernel::JSON::kNull, Kernel::JSON); diff --git a/dev/ZKAKit/src/Network/IPC.cc b/dev/ZKAKit/src/Network/IPC.cc index 01d3414e..8c348299 100644 --- a/dev/ZKAKit/src/Network/IPC.cc +++ b/dev/ZKAKit/src/Network/IPC.cc @@ -14,7 +14,7 @@ using namespace Kernel; /// @brief The internal sanitize function. Bool ipc_int_sanitize_packet(IPC_MESSAGE_STRUCT* pckt) { - auto endian = cDeduceEndian(pckt, ((Char*)pckt)[0]); + auto endian = DEDUCE_ENDIAN(pckt, ((Char*)pckt)[0]); switch (endian) { @@ -92,7 +92,7 @@ namespace Kernel if (*pckt_in) { - auto endian = cDeduceEndian((*pckt_in), ((Char*)(*pckt_in))[0]); + auto endian = DEDUCE_ENDIAN((*pckt_in), ((Char*)(*pckt_in))[0]); (*pckt_in)->IpcHeaderMagic = cXPCOMHeaderMagic; |