From ace65b453151845bc361f21f3e5b651c35f9f126 Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Wed, 22 May 2024 13:00:41 -0400 Subject: massive refactor for mp and organization --- syscall/dbg_log.c | 19 +++++++++++++++++++ syscall/exit.c | 17 +++++++++++++++++ syscall/handler.c | 23 +++++++++++++++++++++++ syscall/handler.h | 19 +++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 syscall/dbg_log.c create mode 100644 syscall/exit.c create mode 100644 syscall/handler.c create mode 100644 syscall/handler.h (limited to 'syscall') diff --git a/syscall/dbg_log.c b/syscall/dbg_log.c new file mode 100644 index 0000000..9055498 --- /dev/null +++ b/syscall/dbg_log.c @@ -0,0 +1,19 @@ +#include "handler.h" +#include "print.h" +#include "umode_vma.h" +#include "api/errno.h" + +int +_handler_dbg_log(struct sc_dbg_log *u_sc) +{ + struct sc_dbg_log sc; + if(user_vma_read(&sc, u_sc, sizeof(struct sc_dbg_log)) != 0) + return -EFAIL; + + char buf[sc.w]; + if(user_vma_read(buf, sc.s, sc.w) != 0) + return -EFAIL; + + klogf("%s", buf); + return 0; +} diff --git a/syscall/exit.c b/syscall/exit.c new file mode 100644 index 0000000..307ea7a --- /dev/null +++ b/syscall/exit.c @@ -0,0 +1,17 @@ +#include "api/syscall.h" +#include "api/errno.h" +#include "umode_vma.h" +#include "arch/processor.h" +#include "handler.h" + +int +_handler_exit(struct sc_exit *sc) +{ + int exit_code = 0; + if(user_vma_read(&exit_code, &sc->exit_code, sizeof(int)) != 0) + return -EFAIL; + + tcb_t *tcb = tcb_current(); + tcb_kill(tcb, exit_code); + return 0; +} diff --git a/syscall/handler.c b/syscall/handler.c new file mode 100644 index 0000000..5cafdc6 --- /dev/null +++ b/syscall/handler.c @@ -0,0 +1,23 @@ +#include "handler.h" +#include "print.h" +#include "umode_vma.h" +#include "api/errno.h" + +static void *s_handlers[] = { + (void*)_handler_dbg_log, + (void*)_handler_exit +}; +static size_t s_handlers_size = sizeof(s_handlers); + +int +_syscall_handler(void *data) +{ + uintmax_t req_id = 0; + if(user_vma_read(&req_id, data, sizeof(uintmax_t)) != 0) + return -EFAIL; + + if(req_id >= s_handlers_size) return -1; + int (*handle)(void*) = (int (*)(void*))s_handlers[req_id]; + kdbgf("syscall id %i handle %p\n", req_id, handle); + return handle(data); +} diff --git a/syscall/handler.h b/syscall/handler.h new file mode 100644 index 0000000..f746dcc --- /dev/null +++ b/syscall/handler.h @@ -0,0 +1,19 @@ +#ifndef _JOVE_SYSCALL_HANDLER_H +#define _JOVE_SYSCALL_HANDLER_H 1 + +#include "api/syscall.h" +#include "memory.h" + +int _syscall_handler(void *data); + +#define CHECKPTR(p) { \ + page_mapping_t mapping = vm_mapping_get((uintptr_t)p); \ + if(mapping.phys == 0 || /* Mapping must not map to NULL phys page. */ \ + mapping.pf.present == 0 || /* Mapping must be present. */\ + mapping.pf.useraccess == 0 /* Mapping must be useraccess. */) \ + return -1; } + +int _handler_dbg_log(struct sc_dbg_log *sc); +int _handler_exit(struct sc_exit *sc); + +#endif -- cgit v1.2.1