From b97967ab660243b723f246db03c2e4a82e125f3f Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sun, 7 Jul 2024 07:02:46 +0300 Subject: simplify assertions + No real point having multiple different levels of assertions, just say you assert something and be done with it --- arch/riscv64/kernel/vmem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/riscv64/kernel/vmem.c') diff --git a/arch/riscv64/kernel/vmem.c b/arch/riscv64/kernel/vmem.c index 68869a3..b97082f 100644 --- a/arch/riscv64/kernel/vmem.c +++ b/arch/riscv64/kernel/vmem.c @@ -436,6 +436,7 @@ struct vmem *init_mapping() struct vmem *init_vmem(void *fdt) { UNUSED(fdt); + struct vmem *b = create_vmem(); __populate_dmap(b); /* update which memory branch to use */ @@ -597,7 +598,7 @@ void mark_rpc_invalid(struct tcb *t, vm_t top) struct vmem *b = t->arch.rpc_leaf; int top_idx = t->arch.rpc_idx; int bottom_idx = (top - RPC_STACK_BASE) / BASE_PAGE_SIZE; - catastrophic_assert(bottom_idx < top_idx); + assert(bottom_idx < top_idx); while (top_idx != bottom_idx) { pm_t *pte = (pm_t *)&b->leaf[top_idx]; @@ -614,7 +615,7 @@ void mark_rpc_valid(struct tcb *t, vm_t bottom) struct vmem *b = t->arch.rpc_leaf; int bottom_idx = t->arch.rpc_idx; int top_idx = (bottom - RPC_STACK_BASE) / BASE_PAGE_SIZE; - catastrophic_assert(bottom_idx < top_idx); + assert(bottom_idx < top_idx); while (top_idx != bottom_idx) { pm_t *pte = (pm_t *)&b->leaf[bottom_idx]; -- cgit v1.3