From 2ab308d67852a7ab176a43e0837c6545fa255457 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Wed, 14 Jan 2026 20:56:09 +0100 Subject: [PATCH] Drop m_ prefix from libmsl --- init/init.c | 69 +++++++---------------------------------- libmsl/amd64/syscall.c | 4 +-- libmsl/amd64/syscall.h | 4 +-- libmsl/init/__premain.c | 6 ++-- libmsl/m/proc.c | 34 ++++++++++---------- libmsl/m/proc.h | 22 ++++++------- libmsl/m/syscall.h | 2 +- 7 files changed, 47 insertions(+), 94 deletions(-) diff --git a/init/init.c b/init/init.c index c7b545a..b0f2a78 100644 --- a/init/init.c +++ b/init/init.c @@ -7,69 +7,22 @@ char c = 'a'; void app_main (void) { - /* uintptr_t out_paddr; */ - /* int mem_rid = m_proc_create_resource_mem (16, RV_PRIVATE, &out_paddr); */ + uintptr_t out_paddr; + int mem_rid = proc_create_resource_mem (16, RV_PRIVATE, &out_paddr); - /* m_proc_map (out_paddr, M_PROC_MAP_BASE, 16, PM_PRESENT | PM_RW | PM_USER); */ + proc_map (out_paddr, PROC_MAP_BASE, 16, PM_PRESENT | PM_RW | PM_USER); - /* memset ((void*)M_PROC_MAP_BASE, 0, M_PAGE_SIZE * 16); */ + memset ((void*)PROC_MAP_BASE, 0, PAGE_SIZE * 16); - /* m_proc_unmap (M_PROC_MAP_BASE, 16); */ + proc_unmap (PROC_MAP_BASE, 16); - /* m_proc_drop_resource (mem_rid); */ + proc_drop_resource (mem_rid); - /* m_proc_test (); */ + proc_test ('a'); - /* int mutex_rid = m_proc_create_resource_mutex (RV_PRIVATE); */ + int mutex_rid = proc_create_resource_mutex (RV_PRIVATE); - /* m_proc_mutex_lock (mutex_rid); */ - /* m_proc_test (); */ - /* m_proc_mutex_unlock (mutex_rid); */ - - if (c > 'z') - c = 'a'; - - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - m_proc_test (c++); - - __asm__ volatile ("dupa: nop; nop; nop; jmp dupa"); - /* for (volatile uint64_t i = 0; i < 1000*1000*100; i++); */ - - /* if (c > 'z') */ - /* c = 'a'; */ - - /* m_proc_test ('k'); */ - /* m_proc_test ('l'); */ - /* m_proc_test ('m'); */ - /* m_proc_test ('n'); */ - /* m_proc_test ('o'); */ - /* m_proc_test ('p'); */ - /* m_proc_test ('r'); */ - /* m_proc_test ('s'); */ - /* m_proc_test ('t'); */ - /* m_proc_test ('u'); */ + proc_mutex_lock (mutex_rid); + proc_test ('b'); + proc_mutex_unlock (mutex_rid); } diff --git a/libmsl/amd64/syscall.c b/libmsl/amd64/syscall.c index a40309e..8258f0d 100644 --- a/libmsl/amd64/syscall.c +++ b/libmsl/amd64/syscall.c @@ -2,8 +2,8 @@ #include #include -int msl_amd64_syscall (int syscall_num, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, - uintptr_t a5, uintptr_t a6) { +int amd64_syscall (int syscall_num, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, + uintptr_t a5, uintptr_t a6) { uint64_t result; __asm__ volatile ("movq %[a4], %%r10\n" "movq %[a5], %%r8\n" diff --git a/libmsl/amd64/syscall.h b/libmsl/amd64/syscall.h index d4b6677..88df496 100644 --- a/libmsl/amd64/syscall.h +++ b/libmsl/amd64/syscall.h @@ -3,7 +3,7 @@ #include -int msl_amd64_syscall (int syscall_num, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, - uintptr_t a5, uintptr_t a6); +int amd64_syscall (int syscall_num, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, + uintptr_t a5, uintptr_t a6); #endif // _LIBMSL_AMD64_SYSCALL_H diff --git a/libmsl/init/__premain.c b/libmsl/init/__premain.c index 035f52a..f929442 100644 --- a/libmsl/init/__premain.c +++ b/libmsl/init/__premain.c @@ -6,7 +6,7 @@ extern volatile uint8_t __bss_end[]; extern void app_main (void); -static void msl_clear_bss (void) { +static void clear_bss (void) { uint8_t* p = (uint8_t*)__bss_start; while (p < __bss_end) { *p++ = 0; @@ -14,9 +14,9 @@ static void msl_clear_bss (void) { } void __premain (void) { - msl_clear_bss (); + clear_bss (); app_main (); - m_proc_quit (); + proc_quit (); } diff --git a/libmsl/m/proc.c b/libmsl/m/proc.c index c0ea7c2..3e6099f 100644 --- a/libmsl/m/proc.c +++ b/libmsl/m/proc.c @@ -3,35 +3,35 @@ #include #include -int m_proc_quit (void) { return m_syscall (SYS_PROC_QUIT, 0, 0, 0, 0, 0, 0); } +int proc_quit (void) { return syscall (SYS_PROC_QUIT, 0, 0, 0, 0, 0, 0); } -int m_proc_test (char c) { return m_syscall (SYS_PROC_TEST, (uintptr_t)c, 0, 0, 0, 0, 0); } +int proc_test (char c) { return syscall (SYS_PROC_TEST, (uintptr_t)c, 0, 0, 0, 0, 0); } -int m_proc_map (uintptr_t paddr, uintptr_t vaddr, size_t pages, uint32_t flags) { - return m_syscall (SYS_PROC_MAP, paddr, vaddr, (uintptr_t)pages, (uintptr_t)flags, 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 m_proc_unmap (uintptr_t vaddr, size_t pages) { - return m_syscall (SYS_PROC_UNMAP, vaddr, (uintptr_t)pages, 0, 0, 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 m_proc_create_resource_mem (size_t pages, int vis, uintptr_t* out_paddr) { - return m_syscall (SYS_PROC_CREATE_RESOURCE_MEM, (uintptr_t)pages, (uintptr_t)vis, - (uintptr_t)out_paddr, 0, 0, 0); +int proc_create_resource_mem (size_t pages, int vis, uintptr_t* out_paddr) { + return syscall (SYS_PROC_CREATE_RESOURCE_MEM, (uintptr_t)pages, (uintptr_t)vis, + (uintptr_t)out_paddr, 0, 0, 0); } -int m_proc_drop_resource (int rid) { - return m_syscall (SYS_PROC_DROP_RESOURCE, (uintptr_t)rid, 0, 0, 0, 0, 0); +int proc_drop_resource (int rid) { + return syscall (SYS_PROC_DROP_RESOURCE, (uintptr_t)rid, 0, 0, 0, 0, 0); } -int m_proc_create_resource_mutex (int vis) { - return m_syscall (SYS_PROC_CREATE_RESOURCE_MUTEX, (uintptr_t)vis, 0, 0, 0, 0, 0); +int proc_create_resource_mutex (int vis) { + return syscall (SYS_PROC_CREATE_RESOURCE_MUTEX, (uintptr_t)vis, 0, 0, 0, 0, 0); } -int m_proc_mutex_lock (int mutex_rid) { - return m_syscall (SYS_PROC_MUTEX_LOCK, (uintptr_t)mutex_rid, 0, 0, 0, 0, 0); +int proc_mutex_lock (int mutex_rid) { + return syscall (SYS_PROC_MUTEX_LOCK, (uintptr_t)mutex_rid, 0, 0, 0, 0, 0); } -int m_proc_mutex_unlock (int mutex_rid) { - return m_syscall (SYS_PROC_MUTEX_UNLOCK, (uintptr_t)mutex_rid, 0, 0, 0, 0, 0); +int proc_mutex_unlock (int mutex_rid) { + return syscall (SYS_PROC_MUTEX_UNLOCK, (uintptr_t)mutex_rid, 0, 0, 0, 0, 0); } diff --git a/libmsl/m/proc.h b/libmsl/m/proc.h index 771074b..a586d8f 100644 --- a/libmsl/m/proc.h +++ b/libmsl/m/proc.h @@ -2,8 +2,8 @@ #define _LIBMSL_M_PROC_H #if defined(__x86_64__) -#define M_PROC_MAP_BASE 0x0000700000000000 -#define M_PAGE_SIZE 4096 +#define PROC_MAP_BASE 0x0000700000000000 +#define PAGE_SIZE 4096 #endif #define PM_PRESENT (1 << 0) @@ -16,14 +16,14 @@ #include #include -int m_proc_quit (void); -int m_proc_test (char c); -int m_proc_map (uintptr_t paddr, uintptr_t vaddr, size_t pages, uint32_t flags); -int m_proc_unmap (uintptr_t vaddr, size_t pages); -int m_proc_create_resource_mem (size_t pages, int vis, uintptr_t* out_paddr); -int m_proc_drop_resource (int rid); -int m_proc_create_resource_mutex (int vis); -int m_proc_mutex_lock (int mutex_rid); -int m_proc_mutex_unlock (int mutex_rid); +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_mem (size_t pages, int vis, uintptr_t* out_paddr); +int proc_drop_resource (int rid); +int proc_create_resource_mutex (int vis); +int proc_mutex_lock (int mutex_rid); +int proc_mutex_unlock (int mutex_rid); #endif // _LIBMSL_M_PROC_H diff --git a/libmsl/m/syscall.h b/libmsl/m/syscall.h index c7b7c4b..9b33656 100644 --- a/libmsl/m/syscall.h +++ b/libmsl/m/syscall.h @@ -5,7 +5,7 @@ #if defined(__x86_64__) #include -#define m_syscall msl_amd64_syscall +#define syscall amd64_syscall #endif #endif // _LIBMSL_M_SYSCALL_H