kamkow1/mop3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite resource subsystem

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-01-18 20:50:45 +01:00
parent 4f7077d458
commit ddafc4eb19
20 changed files with 453 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libmsl/alloc/liballoc.c
View File

@@ -3,32 +3,36 @@
#include <alloc/liballoc.h>
#include <m/proc.h>
#include <m/resource_buffer.h>
static int liballoc_mutex;
static uintptr_t liballoc_map_base = PROC_MAP_BASE;
static int mem_rid_base = 1000000;
void liballoc_init (void) { liballoc_mutex = proc_create_resource_mutex (100, RV_PRIVATE); }
void liballoc_init (void) {
liballoc_mutex = proc_create_resource (100, PR_MUTEX, RV_PRIVATE, NULL);
}
int liballoc_lock (void) {
proc_mutex_lock (liballoc_mutex);
proc_mutex_lock (liballoc_mutex, RV_PRIVATE);
return 0;
}
int liballoc_unlock (void) {
proc_mutex_unlock (liballoc_mutex);
proc_mutex_unlock (liballoc_mutex, RV_PRIVATE);
return 0;
}
void* liballoc_alloc (int pages) {
uintptr_t current_base = liballoc_map_base;
uintptr_t out_paddr;
int mem_rid = proc_create_resource_mem (mem_rid_base++, pages, RV_PRIVATE, &out_paddr);
struct resource_buffer mem_init = {.type = PR_MEM, .u = {.mem = {.pages = (size_t)pages}}};
int mem_rid = proc_create_resource (mem_rid_base++, PR_MEM, RV_PRIVATE, &mem_init);
if (mem_rid < 0)
return NULL;
proc_map (out_paddr, current_base, pages, PM_PRESENT | PM_RW | PM_USER);
proc_map (mem_init.u.mem.paddr, current_base, (size_t)pages, PM_PRESENT | PM_RW | PM_USER);
uintptr_t old_base = current_base;
current_base += pages * PAGE_SIZE;
@@ -36,20 +40,7 @@ void* liballoc_alloc (int pages) {
return (void*)old_base;
}
int liballoc_free (void* ptr, int pages) {
int res;
uintptr_t out_paddr;
res = proc_translate_v2p ((uintptr_t)ptr, &out_paddr);
if (res < 0)
return res;
res = proc_unmap ((uintptr_t)ptr, pages);
if (res < 0)
return res;
return proc_mem_unref (out_paddr, pages);
}
int liballoc_free (void* ptr, int pages) { return 0; }
/** Durand's Ridiculously Amazing Super Duper Memory functions. */

27
libmsl/m/proc.c
View File

@@ -1,3 +1,4 @@
#include <m/resource_buffer.h>
#include <m/syscall.h>
#include <m/syscall_defs.h>
#include <stddef.h>
@@ -15,25 +16,21 @@ 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_mem (int rid, size_t pages, int vis, uintptr_t* out_paddr) {
return syscall (SYS_PROC_CREATE_RESOURCE_MEM, (uintptr_t)rid, (uintptr_t)pages, (uintptr_t)vis,
(uintptr_t)out_paddr, 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) {
return syscall (SYS_PROC_DROP_RESOURCE, (uintptr_t)rid, 0, 0, 0, 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_create_resource_mutex (int rid, int vis) {
return syscall (SYS_PROC_CREATE_RESOURCE_MUTEX, (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_lock (int mutex_rid) {
return syscall (SYS_PROC_MUTEX_LOCK, (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);
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_spawn_thread (uintptr_t vstack_top, size_t stack_size, void* entry) {
@@ -45,8 +42,4 @@ 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_mem_unref (uintptr_t paddr, size_t pages) {
return syscall (SYS_PROC_MEM_UNREF, paddr, (uintptr_t)pages, 0, 0, 0, 0);
}
int proc_sched (void) { return syscall (SYS_PROC_SCHED, 0, 0, 0, 0, 0, 0); }

13
libmsl/m/proc.h
View File

@@ -13,6 +13,9 @@
#define RV_PRIVATE 0
#define RV_PUBLIC 1
#define PR_MEM 0
#define PR_MUTEX 1
#include <stddef.h>
#include <stdint.h>
@@ -20,14 +23,12 @@ 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 (int rid, size_t pages, int vis, uintptr_t* out_paddr);
int proc_drop_resource (int rid);
int proc_create_resource_mutex (int rid, int vis);
int proc_mutex_lock (int mutex_rid);
int proc_mutex_unlock (int mutex_rid);
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_spawn_thread (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);
int proc_mem_unref (uintptr_t paddr, size_t pages);
#endif // _LIBMSL_M_PROC_H