From b3dfc99a0ac690cf3de2348a8887bfa4bef243bc Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 31 Mar 2025 15:21:56 +0200 Subject: dev/user: user.sys shall be the main component which handles syscalls, as a DDK driver. Signed-off-by: Amlal El Mahrouss --- dev/boot/amd64-ci.make | 2 +- dev/boot/amd64-desktop.make | 2 +- dev/kernel/HALKit/AMD64/HalSystemCallInstall.cc | 7 ------- dev/user/libsci.json | 20 -------------------- dev/user/user.json | 20 ++++++++++++++++++++ 5 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 dev/kernel/HALKit/AMD64/HalSystemCallInstall.cc delete mode 100644 dev/user/libsci.json create mode 100644 dev/user/user.json diff --git a/dev/boot/amd64-ci.make b/dev/boot/amd64-ci.make index ed73f3d3..a77806c4 100644 --- a/dev/boot/amd64-ci.make +++ b/dev/boot/amd64-ci.make @@ -75,7 +75,7 @@ BOOTLOADER=bootz.efi KERNEL=vmkrnl.efi SYSCHK=chk.efi BOOTNET=net.efi -SCIKIT=libuser.dylib +SCIKIT=user.sys .PHONY: invalid-recipe invalid-recipe: diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make index 6e92330e..649e0925 100644 --- a/dev/boot/amd64-desktop.make +++ b/dev/boot/amd64-desktop.make @@ -75,7 +75,7 @@ BOOTLOADER=bootz.efi KERNEL=vmkrnl.efi SYSCHK=chk.efi BOOTNET=net.efi -SCIKIT=libuser.dylib +SCIKIT=user.sys .PHONY: invalid-recipe invalid-recipe: diff --git a/dev/kernel/HALKit/AMD64/HalSystemCallInstall.cc b/dev/kernel/HALKit/AMD64/HalSystemCallInstall.cc deleted file mode 100644 index 899e6fd7..00000000 --- a/dev/kernel/HALKit/AMD64/HalSystemCallInstall.cc +++ /dev/null @@ -1,7 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#include diff --git a/dev/user/libsci.json b/dev/user/libsci.json deleted file mode 100644 index ed9a8739..00000000 --- a/dev/user/libsci.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "./"], - "sources_path": ["src/*.cc", "src/*.o"], - "output_name": "libuser.dylib", - "compiler_flags": [ - "-fPIC", - "-ffreestanding", - "-shared", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17" - ], - "cpp_macros": [ - "kSCIVersion=0x0100", - "kSCIVersionHighest=0x0100", - "kSCIVersionLowest=0x0100" - ] -} diff --git a/dev/user/user.json b/dev/user/user.json new file mode 100644 index 00000000..481280f8 --- /dev/null +++ b/dev/user/user.json @@ -0,0 +1,20 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "./"], + "sources_path": ["src/*.cc", "src/*.o"], + "output_name": "user.sys", + "compiler_flags": [ + "-fPIC", + "-ffreestanding", + "-shared", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17" + ], + "cpp_macros": [ + "kSCIVersion=0x0100", + "kSCIVersionHighest=0x0100", + "kSCIVersionLowest=0x0100" + ] +} -- cgit v1.2.3