Redesign syscalls

libmsl/m/proc.c

@@ -1,44 +0,0 @@
-#include <m/resource_buffer.h>
-#include <m/syscall.h>
-#include <m/syscall_defs.h>
-#include <stddef.h>
-#include <stdint.h>
-
-int proc_quit (void) { return syscall (SYS_PROC_QUIT, 0, 0, 0, 0, 0, 0); }
-
-int proc_test (char c) { return syscall (SYS_PROC_TEST, (uintptr_t)c, 0, 0, 0, 0, 0); }
-
-int proc_map (uintptr_t paddr, uintptr_t vaddr, size_t pages, uint32_t flags) {
-  return syscall (SYS_PROC_MAP, paddr, vaddr, (uintptr_t)pages, (uintptr_t)flags, 0, 0);
-}
-
-int proc_unmap (uintptr_t vaddr, size_t pages) {
-  return syscall (SYS_PROC_UNMAP, vaddr, (uintptr_t)pages, 0, 0, 0, 0);
-}
-
-int proc_create_resource (int rid, int type, int vis, void* buffer) {
-  return syscall (SYS_PROC_CREATE_RESOURCE, (uintptr_t)rid, (uintptr_t)type, (uintptr_t)vis,
-                  (uintptr_t)buffer, 0, 0);
-}
-
-int proc_drop_resource (int rid, int vis) {
-  return syscall (SYS_PROC_DROP_RESOURCE, (uintptr_t)rid, (uintptr_t)vis, 0, 0, 0, 0);
-}
-
-int proc_mutex_lock (int mutex_rid, int vis) {
-  return syscall (SYS_PROC_MUTEX_LOCK, (uintptr_t)mutex_rid, (uintptr_t)vis, 0, 0, 0, 0);
-}
-
-int proc_mutex_unlock (int mutex_rid, int vis) {
-  return syscall (SYS_PROC_MUTEX_UNLOCK, (uintptr_t)mutex_rid, (uintptr_t)vis, 0, 0, 0, 0);
-}
-
-int proc_clone (uintptr_t vstack_top, size_t stack_size, void* entry) {
-  return syscall (SYS_PROC_CLONE, vstack_top, (uintptr_t)stack_size, (uintptr_t)entry, 0, 0, 0);
-}
-
-int proc_translate_v2p (uintptr_t vaddr, uintptr_t* out_paddr) {
-  return syscall (SYS_PROC_TRANSLATE_V2P, vaddr, (uintptr_t)out_paddr, 0, 0, 0, 0);
-}
-
-int proc_sched (void) { return syscall (SYS_PROC_SCHED, 0, 0, 0, 0, 0, 0); }

libmsl/m/proc.h

@@ -1,34 +0,0 @@
-#ifndef _LIBMSL_M_PROC_H
-#define _LIBMSL_M_PROC_H
-
-#if defined(__x86_64__)
-#define PROC_MAP_BASE 0x0000700000000000
-#define PAGE_SIZE     4096
-#endif
-
-#define PM_PRESENT (1 << 0)
-#define PM_RW      (1 << 1)
-#define PM_USER    (1 << 2)
-
-#define RV_PRIVATE 0
-#define RV_PUBLIC  1
-
-#define PR_MEM   0
-#define PR_MUTEX 1
-
-#include <stddef.h>
-#include <stdint.h>
-
-int proc_quit (void);
-int proc_test (char c);
-int proc_map (uintptr_t paddr, uintptr_t vaddr, size_t pages, uint32_t flags);
-int proc_unmap (uintptr_t vaddr, size_t pages);
-int proc_create_resource (int rid, int type, int vis, void* buffer);
-int proc_drop_resource (int rid, int vis);
-int proc_mutex_lock (int mutex_rid, int vis);
-int proc_mutex_unlock (int mutex_rid, int vis);
-int proc_clone (uintptr_t vstack_top, size_t stack_size, void* entry);
-int proc_sched (void);
-int proc_translate_v2p (uintptr_t vaddr, uintptr_t* out_paddr);
-
-#endif // _LIBMSL_M_PROC_H

libmsl/m/src.mk

@@ -1,3 +1,3 @@
-c += m/proc.c
+c += m/system.c
 
-o += m/proc.o
+o += m/system.o

libmsl/m/system.c

@@ -0,0 +1,32 @@
+#include <m/syscall.h>
+#include <m/system.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#define do_syscall1(id, a1, a2, a3, a4, a5, a6, ...)                                               \
+  syscall (id, (uintptr_t)a1, (uintptr_t)a2, (uintptr_t)a3, (uintptr_t)a4, (uintptr_t)a5,          \
+           (uintptr_t)a6)
+
+#define do_syscall(...) do_syscall1 (__VA_ARGS__, 0, 0, 0, 0, 0, 0)
+
+int quit (void) { return do_syscall (SYS_QUIT); }
+
+int test (char c) { return do_syscall (SYS_TEST, c); }
+
+int map (int mem_rid, int vis, uintptr_t vaddr, uint32_t flags) {
+  return do_syscall (SYS_MAP, mem_rid, vis, vaddr, flags);
+}
+
+int unmap (uintptr_t vaddr, size_t pages) { return do_syscall (SYS_UNMAP, vaddr, pages); }
+
+int create_mem (int mem_rid, int vis, size_t pages) {
+  return do_syscall (SYS_CREATE_MEM, mem_rid, vis, pages);
+}
+
+int unlink_mem (int mem_rid, int vis, size_t pages) {
+  return do_syscall (SYS_UNLINK_MEM, mem_rid, vis, pages);
+}
+
+int clone (uintptr_t vstack_top, size_t stack_size, void (*entry) (void)) {
+  return do_syscall (SYS_CLONE, vstack_top, stack_size, entry);
+}

libmsl/m/system.h

@@ -0,0 +1,28 @@
+#ifndef _LIBMSL_M_SYSTEM_H
+#define _LIBMSL_M_SYSTEM_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#if defined(__x86_64__)
+#define PROC_MAP_BASE 0x0000700000000000
+#define PAGE_SIZE     4096
+#endif
+
+#define MAP_PRESENT (1 << 0)
+#define MAP_RW      (1 << 1)
+#define MAP_USER    (1 << 2)
+#define MAP_FLAGS   (MAP_PRESENT | MAP_USER)
+
+#define RV_PRIVATE 0
+#define RV_PUBLIC  1
+
+int quit (void);
+int test (char c);
+int map (int mem_rid, int vis, uintptr_t vaddr, uint32_t flags);
+int unmap (uintptr_t vaddr, size_t pages);
+int create_mem (int mem_rid, int vis, size_t pages);
+int unlink_mem (int mem_rid, int vis, size_t pages);
+int clone (uintptr_t vstack_top, size_t stack_size, void (*entry) (void));
+
+#endif // _LIBMSL_M_SYSTEM_H