X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/b632f535c4a6882bdca0317fb88cbe6e165f24eb..8c06c883e7b13c115d5ff207f79d4b68fccd5ad6:/lunaix-os/kernel/debug/trace.c diff --git a/lunaix-os/kernel/debug/trace.c b/lunaix-os/kernel/debug/trace.c index ae183d4..62ceb0e 100644 --- a/lunaix-os/kernel/debug/trace.c +++ b/lunaix-os/kernel/debug/trace.c @@ -27,7 +27,7 @@ trace_modksyms_init(struct boot_handoff* bhctx) ptr_t end = ROUNDUP(mod->end, PG_SIZE); ptr_t ksym_va = - (ptr_t)vmm_vmap(mod->start, (end - mod->start), PG_PREM_R); + (ptr_t)vmap(mod->start, (end - mod->start), PG_PREM_R, 0); assert(ksym_va); trace_ctx.ksym_table = (struct ksyms*)ksym_va; @@ -113,11 +113,11 @@ trace_printstack_of(ptr_t fp) int n = trace_walkback(tbs, fp, NB_TRACEBACK, &fp); if (fp) { - kprintf(KDEBUG "...\n"); + kprintf(KDEBUG "..."); } for (int i = 0; i < n; i++) { - kprintf(KDEBUG "%p: %s\n", tbs[i].pc, tbs[i].symbol); + kprintf(KDEBUG "%p: %s", tbs[i].pc, tbs[i].symbol); } } @@ -133,11 +133,11 @@ trace_printswctx(const isr_param* p, char* direction) struct ksym_entry* sym = trace_sym_lookup(p->execp->eip); - kprintf(KDEBUG ">> (sw:%s) iv:%d, errno:%p <<\n", + kprintf(KDEBUG ">> (sw:%s) iv:%d, errno:%p <<", direction, p->execp->vector, p->execp->err_code); - kprintf(KDEBUG "%p:%s\n", p->execp->eip, ksym_getstr(sym)); + kprintf(KDEBUG "%p:%s", p->execp->eip, ksym_getstr(sym)); } void @@ -145,9 +145,8 @@ trace_printstack_isr(const isr_param* isrm) { isr_param* p = isrm; ptr_t fp = cpu_get_fp(); - int prev_fromusr = uspace_context(p); + int prev_fromusr = 0; - kprintf(KDEBUG "\n"); kprintf(KDEBUG "stack trace (pid=%d)\n", __current->pid); trace_printstack_of(fp); @@ -170,5 +169,4 @@ trace_printstack_isr(const isr_param* isrm) p = p->execp->saved_prev_ctx; } - kprintf(KDEBUG "\n"); } \ No newline at end of file