make log a bit verbose for some useful information

[lunaix-os.git] / lunaix-os / kernel / debug / trace.c

diff --git a/lunaix-os/kernel/debug/trace.c b/lunaix-os/kernel/debug/trace.c
index 173b1cd09d0d14b57d60d748f4297b011ff87d12..452b3cd1d13855a8878ff7d51b8892aab57fd1d8 100644 (file)
--- a/lunaix-os/kernel/debug/trace.c
+++ b/lunaix-os/kernel/debug/trace.c
@@ -3,43 +3,46 @@
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/trace.h>
+#include <lunaix/sections.h>
 
-#include <sys/abi.h>
-#include <sys/mm/mm_defs.h>
+#include <asm/abi.h>
+#include <asm/mm_defs.h>
 #include <sys/trace.h>
 
 #include <klibc/string.h>
 
 #define NB_TRACEBACK 16
 
-LOG_MODULE("TRACE")
+LOG_MODULE("lkdbg")
+
+extern_autogen(ksymtable);
 
 static struct trace_context trace_ctx;
 
+void
+trace_log(const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+
+    kprintf_m("TRACE", fmt, args);
+
+    va_end(args);
+}
+
 void
 trace_modksyms_init(struct boot_handoff* bhctx)
 {
-    struct boot_modent* modents = bhctx->mods.entries;
-    for (size_t i = 0; i < bhctx->mods.mods_num; i++) {
-        struct boot_modent* mod = &bhctx->mods.entries[i];
-        if (streq(mod->str, "modksyms")) {
-            assert(!va_offset(mod->start));
-
-            pte_t pte = mkpte(mod->start, KERNEL_DATA);
-            size_t n = pfn(mod->end) - pfn(mod->start);
-            
-            ptr_t ksym_va = vmap_leaf_ptes(pte, n);
-
-            assert(ksym_va);
-            trace_ctx.ksym_table = (struct ksyms*)ksym_va;
-        }
-    }
+    trace_ctx.ksym_table = autogen(struct ksyms, ksymtable);
+
+    INFO("symbols loaded: %d @0x%lx", 
+            trace_ctx.ksym_table->ksym_count, trace_ctx.ksym_table->syms);
 }
 
 struct ksym_entry*
 trace_sym_lookup(ptr_t addr)
 {
-    int c = trace_ctx.ksym_table->ksym_count;
+    unsigned long c = trace_ctx.ksym_table->ksym_count;
     struct ksym_entry* ksent = trace_ctx.ksym_table->syms;
 
     int i = c - 1, j = 0, m = 0;
@@ -71,15 +74,14 @@ static char*
 ksym_getstr(struct ksym_entry* sym)
 {
     if (!sym) {
-        return "???";
+        return NULL;
     }
 
-    return (char*)((ptr_t)trace_ctx.ksym_table +
-                   trace_ctx.ksym_table->ksym_label_off + sym->label_off);
+    return sym->label;
 }
 
 static inline bool valid_fp(ptr_t ptr) {
-    ptr_t start = ROUNDUP(current_thread->kstack - KSTACK_SIZE, MEM_PAGE);
+    ptr_t start = ROUNDUP(current_thread->kstack - KSTACK_SIZE, PAGE_SIZE);
 
     return (start < ptr && ptr < current_thread->kstack) 
            || arch_valid_fp(ptr);
@@ -122,10 +124,10 @@ trace_walkback(struct trace_record* tb_buffer,
 static inline void
 trace_print_code_entry(ptr_t sym_pc, ptr_t inst_pc, char* sym)
 {
-    if (sym_pc) {
-        DEBUG("%p+%p: %s", sym_pc, inst_pc - sym_pc, sym);
+    if (sym) {
+        trace_log("%s+%p", sym, inst_pc - sym_pc);
     } else {
-        DEBUG("%p+%p: %s", inst_pc, sym_pc, sym);
+        trace_log("??? [%p]", inst_pc);
     }
 }
 
@@ -138,7 +140,7 @@ trace_printstack_of(ptr_t fp)
     int n = trace_walkback(tbs, fp, NB_TRACEBACK, &fp);
 
     if (fp) {
-        DEBUG("...<truncated>");
+        trace_log("...<truncated>");
     }
 
     for (int i = 0; i < n; i++) {
@@ -151,7 +153,7 @@ void
 trace_printstack()
 {
     if (current_thread) {
-        trace_printstack_isr(current_thread->intr_ctx);
+        trace_printstack_isr(current_thread->hstate);
     }
     else {
         trace_printstack_of(abi_get_callframe());
@@ -159,29 +161,27 @@ trace_printstack()
 }
 
 static void
-trace_printswctx(const isr_param* p, bool from_usr, bool to_usr)
+trace_printswctx(const struct hart_state* hstate, bool from_usr, bool to_usr)
 {
 
-    struct ksym_entry* sym = trace_sym_lookup(p->execp->eip);
+    struct ksym_entry* sym = trace_sym_lookup(hart_pc(hstate));
 
-    DEBUG("^^^^^ --- %s", to_usr ? "user" : "kernel");
-    DEBUG("  interrupted on #%d, ecode=%p",
-          p->execp->vector,
-          p->execp->err_code);
-    DEBUG("vvvvv --- %s", from_usr ? "user" : "kernel");
+    trace_log("^^^^^ --- %s", to_usr ? "user" : "kernel");
+    trace_print_transistion_short(hstate);
+    trace_log("vvvvv --- %s", from_usr ? "user" : "kernel");
 
-    ptr_t sym_pc = sym ? sym->pc : p->execp->eip;
-    trace_print_code_entry(sym_pc, p->execp->eip, ksym_getstr(sym));
+    ptr_t sym_pc = sym ? sym->pc : hart_pc(hstate);
+    trace_print_code_entry(sym_pc, hart_pc(hstate), ksym_getstr(sym));
 }
 
 void
-trace_printstack_isr(const isr_param* isrm)
+trace_printstack_isr(const struct hart_state* hstate)
 {
-    isr_param* p = isrm;
+    struct hart_state* p = hstate;
     ptr_t fp = abi_get_callframe();
     int prev_usrctx = 0;
 
-    DEBUG("stack trace (pid=%d)\n", __current->pid);
+    trace_log("stack trace (pid=%d)\n", __current->pid);
 
     trace_printstack_of(fp);
 
@@ -196,9 +196,9 @@ trace_printstack_isr(const isr_param* isrm)
             trace_printswctx(p, false, true);
         }
 
-        fp = saved_fp(p);
+        fp = hart_stack_frame(p);
         if (!valid_fp(fp)) {
-            DEBUG("??? invalid frame: %p", fp);
+            trace_log("??? invalid frame: %p", fp);
             break;
         }
 
@@ -206,8 +206,8 @@ trace_printstack_isr(const isr_param* isrm)
 
         prev_usrctx = !kernel_context(p);
 
-        p = p->execp->saved_prev_ctx;
+        p = hart_parent_state(p);
     }
 
-    DEBUG("----- [trace end] -----\n");
+    trace_log("----- [trace end] -----\n");
 }
\ No newline at end of file