From 013a27aec9370221e8afae188a8ed08ed2d406b0 Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sat, 28 May 2022 20:01:58 +0300 Subject: continue documenting source --- common/uapi/ipc.c | 1 + common/uapi/mem.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'common/uapi') diff --git a/common/uapi/ipc.c b/common/uapi/ipc.c index d46ba26..4327c90 100644 --- a/common/uapi/ipc.c +++ b/common/uapi/ipc.c @@ -20,6 +20,7 @@ SYSCALL_DEFINE3(ipc_req)(sys_arg_t pid, sys_arg_t d0, sys_arg_t d1) { struct tcb *r = get_tcb(pid); /* TODO: something like jump_to_callback(t) */ + /* remember difference between ipc_req and ipc_fwd! */ return (struct sys_ret){ d0, d1 }; } diff --git a/common/uapi/mem.c b/common/uapi/mem.c index b953119..9d631ae 100644 --- a/common/uapi/mem.c +++ b/common/uapi/mem.c @@ -10,21 +10,21 @@ SYSCALL_DEFINE2(req_mem)(sys_arg_t size, sys_arg_t flags) { - /* proc_tcb should give the tcb of the TID currently running */ - struct tcb *r = cur_tcb(); + /* get current effective process */ + struct tcb *r = cur_proc(); return (struct sys_ret){ OK, alloc_uvmem(r, size, flags) }; } SYSCALL_DEFINE3(req_fixmem)(sys_arg_t start, sys_arg_t size, sys_arg_t flags) { - struct tcb *r = cur_tcb(); + struct tcb *r = cur_proc(); /* should probably check if the allocation succeeded...? TODO */ return (struct sys_ret){ OK, alloc_fixed_uvmem(r, start, size, flags) }; } SYSCALL_DEFINE1(free_mem)(sys_arg_t start) { - struct tcb *r = cur_tcb(); + struct tcb *r = cur_proc(); vm_t vm_start = (vm_t)start; if (vm_start > __pre_top && vm_start < __post_base) @@ -42,14 +42,14 @@ SYSCALL_DEFINE3(req_pmem)(sys_arg_t paddr, sys_arg_t size, sys_arg_t flags) * outside the RAM area, and I'll probably have to implement some method * that keeps track of used regions outside of RAM. We'll see. */ - struct tcb *r = cur_tcb(); + struct tcb *r = cur_proc(); return (struct sys_ret){ OK, alloc_devmem(r, paddr, size, flags) }; } SYSCALL_DEFINE2(req_sharedmem)(sys_arg_t size, sys_arg_t flags) { /* TODO: check that requester is server */ - struct tcb *t = cur_tcb(); + struct tcb *t = cur_proc(); vm_t start = 0; if ((start = alloc_shared_uvmem(t, size, flags))) return (struct sys_ret){ ERR_OOMEM, 0 }; -- cgit v1.3