From 5fd0d48f6371f04e910730493ce908807af5c46a Mon Sep 17 00:00:00 2001 From: Kimplul Date: Fri, 7 Jan 2022 17:52:17 +0200 Subject: Renamed region functions to not use sp_* --- common/vmem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'common/vmem.c') diff --git a/common/vmem.c b/common/vmem.c index 33c5dd3..fe77634 100644 --- a/common/vmem.c +++ b/common/vmem.c @@ -4,7 +4,7 @@ stat_t init_uvmem(struct tcb *t, vm_t base, vm_t top) { - return sp_mem_init(&t->sp_r, base, top); + return init_region(&t->sp_r, base, top); } vm_t alloc_uvmem(struct tcb *t, size_t size, vmflags_t flags) @@ -21,7 +21,7 @@ vm_t alloc_fixed_uvmem(struct tcb *t, vm_t start, size_t size, vmflags_t flags) stat_t free_uvmem(struct tcb *t, vm_t va) { - struct sp_mem *m = sp_used_find(&t->sp_r, va); + struct mem_region *m = find_used_region(&t->sp_r, va); if(!m) return -1; @@ -36,7 +36,7 @@ stat_t alloc_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, vmflag { *offset = alloc_page(order, *offset); if(!*offset) - return MEM_REGION_TRY_AGAIN; /* try again */ + return REGION_TRY_AGAIN; /* try again */ map_vpage(b, *offset, vaddr, flags, order); return OK; @@ -50,9 +50,9 @@ stat_t free_uvmem_wrapper(struct vm_branch *b, pm_t *offset, vm_t vaddr, vmflags enum mm_order v_order = 0; stat_vpage(b, vaddr, &paddr, &v_order, 0); if(order != v_order) - return MEM_REGION_TRY_AGAIN; + return REGION_TRY_AGAIN; unmap_vpage(b, vaddr); free_page(order, paddr); - return 0; + return OK; } -- cgit v1.3