From df0688efa326a03a22bcbc36d1900926b7b1c986 Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Mon, 7 Sep 2026 19:19:24 -0400 Subject: split syscall info into api subfolder. untyped syscalls --- sys/syscall.c | 4 +-- sys/syscall.h | 32 +++++++++++++++--------- sys/syscall_objdir.c | 46 ++++++++++++++++++++++++++++++++++ sys/syscall_untyped.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++ sys/syscall_vtt.c | 17 ++++++------- 5 files changed, 144 insertions(+), 24 deletions(-) create mode 100644 sys/syscall_objdir.c create mode 100644 sys/syscall_untyped.c (limited to 'sys') diff --git a/sys/syscall.c b/sys/syscall.c index 6c3fa33..68a5ae6 100644 --- a/sys/syscall.c +++ b/sys/syscall.c @@ -23,8 +23,8 @@ _syscall_handle_generic( static const syscall_handle_t s_syscall_handles[128] = { [JOVE_OBJ_NONE] = NULL, - [JOVE_OBJ_UNTYPED] = _syscall_handle_generic, - [JOVE_OBJ_OBJDIR] = _syscall_handle_generic, + [JOVE_OBJ_UNTYPED] = _syscall_handle_untyped, + [JOVE_OBJ_OBJDIR] = _syscall_handle_objdir, [JOVE_OBJ_PAGEDIR] = _syscall_handle_generic, [JOVE_OBJ_PROCESSOR] = _syscall_handle_generic, [JOVE_OBJ_PROCESS] = _syscall_handle_generic, diff --git a/sys/syscall.h b/sys/syscall.h index 6ad221f..ea75152 100644 --- a/sys/syscall.h +++ b/sys/syscall.h @@ -1,15 +1,27 @@ #ifndef _JOVE_SYS_SYSCALL_H #define _JOVE_SYS_SYSCALL_H 1 +#include "api/syscall.h" #include "hal/obj.h" #include -struct syscall_header -{ - uint16_t callid; - uint16_t pathlen; - uint16_t path[]; -}; +#define CHECK_TOOSMALL(required, present, fail_msg) \ + do { if(present < required) { \ + kprintf("%s: %s\n", __func__, fail_msg); \ + return ETOOSMALL; \ + } } while(0) + +#define CHECK_OBJEXISTS(obj, fail_msg) \ +do { if(obj == NULL) { \ + kprintf("%s: %s\n", __func__, fail_msg); \ + return EBADOBJ; \ +} } while(0) + +#define CHECK_OBJTYPE(obj, type, fail_msg) \ + do { if(obj_gettype(obj) != type) { \ + kprintf("%s: %s\n", __func__, fail_msg); \ + return EBADOBJ; \ + } } while(0) #define SYSCALL_FUNCTION_ARGS \ jove_owned_obj_t*, /*PCB object*/ \ @@ -25,12 +37,8 @@ typedef int (*syscall_handle_t)(SYSCALL_FUNCTION_ARGS); int _syscall_handle_generic(SYSCALL_FUNCTION_ARGS); int _syscall_handle_arch(SYSCALL_FUNCTION_ARGS); -#define SYSCALL_VTT_WRITE 0 -struct syscall_vtt_write -{ - size_t len; - char data[]; -}; int _syscall_handle_vtt(SYSCALL_FUNCTION_ARGS); +int _syscall_handle_objdir(SYSCALL_FUNCTION_ARGS); +int _syscall_handle_untyped(SYSCALL_FUNCTION_ARGS); #endif diff --git a/sys/syscall_objdir.c b/sys/syscall_objdir.c new file mode 100644 index 0000000..cf1e5b7 --- /dev/null +++ b/sys/syscall_objdir.c @@ -0,0 +1,46 @@ +#include "hal/process.h" +#include "jove.h" +#include "lib/printf.h" +#include "syscall.h" + +int +s_syscall_objdir_objtype( + jove_owned_obj_t *objdir, + jove_owned_obj_t *target_dir, + size_t payload_size, + void *payload_data) +{ + int bytes_needed = sizeof(struct syscall_generic_objpath); + CHECK_TOOSMALL(bytes_needed, payload_size, "Message is too small for this payload!"); + + struct syscall_generic_objpath *payload = payload_data; + bytes_needed += payload->second_pathlen * 2; + CHECK_TOOSMALL(bytes_needed, payload_size, "Message is too small for second target path!"); + + int retval = 0; + jove_owned_obj_t *second_obj = objdir_getobj(objdir, payload->second_path, payload->second_pathlen); + CHECK_OBJEXISTS(second_obj, "Second target does not exist!"); + + retval = obj_gettype(second_obj); + obj_release(second_obj); + return retval; +} + +int +_syscall_handle_objdir( + jove_owned_obj_t *pcb_obj, + jove_owned_obj_t *objdir, + jove_owned_obj_t *message_obj, + jove_owned_obj_t *target_obj, + struct syscall_header *header, + size_t bytes_left, + void *payload) +{ + switch(header->callid) { + case SYSCALL_OBJDIR_OBJTYPE: + return s_syscall_objdir_objtype(objdir, target_obj, bytes_left, payload); + default: + kprintf("syscall_handle_objdir: Objdir does not support syscall %i\n", header->callid); + return EOOB; + } +} diff --git a/sys/syscall_untyped.c b/sys/syscall_untyped.c new file mode 100644 index 0000000..52a0715 --- /dev/null +++ b/sys/syscall_untyped.c @@ -0,0 +1,69 @@ +#include "arch/x86_64/hal/obj.h" +#include "hal/memory.h" +#include "jove.h" +#include "lib/printf.h" +#include "syscall.h" + +static int +s_syscall_untyped_split( + jove_owned_obj_t *objdir, + jove_owned_obj_t *target_obj, + size_t payload_bytes, + void *payload_data) +{ + int bytes_needed = sizeof(struct syscall_untyped_split); + CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for payload!"); + + struct syscall_untyped_split *payload = payload_data; + bytes_needed += payload->dest_pathlen * 2; + CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for destination path!"); + + jove_owned_obj_t *dst_obj = objdir_getobj(objdir, payload->dest_path, payload->dest_pathlen); + CHECK_OBJTYPE(dst_obj, JOVE_OBJ_NONE, "Destination path is occupied!"); + + return untyped_split(target_obj, dst_obj, payload->bytes); +} + +static int +s_syscall_untyped_merge( + jove_owned_obj_t *objdir, + jove_owned_obj_t *target_obj, + size_t payload_bytes, + void *payload_data) +{ + int bytes_needed = sizeof(struct syscall_generic_objpath); + CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for payload!"); + + struct syscall_generic_objpath *payload = payload_data; + bytes_needed += payload->second_pathlen * 2; + CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for second path!"); + + jove_owned_obj_t *snd_obj = objdir_getobj(objdir, payload->second_path, payload->second_pathlen); + CHECK_OBJTYPE(snd_obj, JOVE_OBJ_UNTYPED, "Second object is not an untyped!"); + + return untyped_merge(target_obj, snd_obj); +} + + +int _syscall_handle_untyped( + jove_owned_obj_t* pcb_obj, + jove_owned_obj_t* objdir, + jove_owned_obj_t* message_obj, + jove_owned_obj_t* target_obj, + struct syscall_header* header, + size_t payload_bytes, + void* payload) +{ + switch(header->callid) { + case SYSCALL_UNTYPED_SIZE: + return untyped_size(target_obj); + case SYSCALL_UNTYPED_ALIGN: + return untyped_align(target_obj); + case SYSCALL_UNTYPED_SPLIT: + return s_syscall_untyped_split(objdir, target_obj, payload_bytes, payload); + default: + kprintf("syscall_untyped: Untyped object does not support syscall %i\n", header->callid); + return EBADARG; + } + return 0; +} diff --git a/sys/syscall_vtt.c b/sys/syscall_vtt.c index 4b58b2c..4dadd6c 100644 --- a/sys/syscall_vtt.c +++ b/sys/syscall_vtt.c @@ -9,16 +9,13 @@ s_syscall_vtt_write( size_t payload_bytes, void *payload_data) { - if(payload_bytes < sizeof(struct syscall_vtt_write)) { - kprintf("syscall_vtt_write: message is too small for this syscall!\n"); - return EOOB; - } - struct syscall_vtt_write *payload = payload_data; - if(payload_bytes < sizeof(struct syscall_vtt_write) + payload->len) { - kprintf("syscall_vtt_write: message is to small for payload! (%i vs %i)\n", - payload->len, payload_bytes); - return EOOB; - } + size_t bytes_needed = sizeof(struct syscall_generic_write); + CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for this syscall!"); + + struct syscall_generic_write *payload = payload_data; + bytes_needed += payload->len * 2; + CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for write buffer!"); + return vt_write(vtt, payload->data, payload->len); } -- cgit v1.2.3