Boot framework rework (#45)

[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 1e5c44ade8af440b76383681fb6dd7b670d0b893..a2459bd64d00f4a8407af62733d1462c52e95b7a 100644 (file)
--- a/lunaix-os/kernel/debug/trace.c
+++ b/lunaix-os/kernel/debug/trace.c
@@ -1,12 +1,13 @@
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/page.h>

-#include <lunaix/mm/vmm.h>

 #include <lunaix/process.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/trace.h>
 #include <lunaix/process.h>
 #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 <sys/abi.h>
 #include <sys/mm/mm_defs.h>

+#include <sys/trace.h>

 
 #include <klibc/string.h>
 
 
 #include <klibc/string.h>
 


@@ -14,36 +15,36 @@
 
 LOG_MODULE("TRACE")
 
 
 LOG_MODULE("TRACE")
 

+extern_autogen(ksymtable);
+

 static struct trace_context trace_ctx;
 
 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)
 {
 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(PG_ALIGNED(mod->start));
-
-            ptr_t end = ROUNDUP(mod->end, PG_SIZE);
-            ptr_t ksym_va =
-              (ptr_t)vmap(mod->start, (end - mod->start), PG_PREM_R, 0);
-
-            assert(ksym_va);
-            trace_ctx.ksym_table = (struct ksyms*)ksym_va;
-        }
-    }
+    trace_ctx.ksym_table = autogen(struct ksyms, ksymtable);

 }
 
 struct ksym_entry*
 trace_sym_lookup(ptr_t addr)
 {
 }
 
 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;
 
     struct ksym_entry* ksent = trace_ctx.ksym_table->syms;
 
     int i = c - 1, j = 0, m = 0;
 

-    if (addr > ksent[i].pc || addr < ksent[j].pc || addr < KERNEL_EXEC) {
+    if (addr > ksent[i].pc || addr < ksent[j].pc || !kernel_addr(addr)) {

         return NULL;
     }
 
         return NULL;
     }
 


@@ -70,16 +71,17 @@ static char*
 ksym_getstr(struct ksym_entry* sym)
 {
     if (!sym) {
 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) {
 }
 
 static inline bool valid_fp(ptr_t ptr) {

-    ptr_t start = ROUNDUP(current_thread->kstack - KSTACK_SIZE, MEM_PAGE);
-    return start < ptr && ptr < current_thread->kstack;
+    ptr_t start = ROUNDUP(current_thread->kstack - KSTACK_SIZE, PAGE_SIZE);
+
+    return (start < ptr && ptr < current_thread->kstack) 
+           || arch_valid_fp(ptr);

 }
 
 int
 }
 
 int


@@ -119,10 +121,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)
 {
 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 {
     } else {

-        DEBUG("%p+%p: %s", inst_pc, sym_pc, sym);
+        trace_log("??? [%p]", inst_pc);

     }
 }
 
     }
 }
 


@@ -135,7 +137,7 @@ trace_printstack_of(ptr_t fp)
     int n = trace_walkback(tbs, fp, NB_TRACEBACK, &fp);
 
     if (fp) {
     int n = trace_walkback(tbs, fp, NB_TRACEBACK, &fp);
 
     if (fp) {

-        DEBUG("...<truncated>");
+        trace_log("...<truncated>");

     }
 
     for (int i = 0; i < n; i++) {
     }
 
     for (int i = 0; i < n; i++) {


@@ -147,33 +149,36 @@ trace_printstack_of(ptr_t fp)
 void
 trace_printstack()
 {
 void
 trace_printstack()
 {

-    trace_printstack_of(abi_get_callframe());
+    if (current_thread) {
+        trace_printstack_isr(current_thread->hstate);
+    }
+    else {
+        trace_printstack_of(abi_get_callframe());
+    }

 }
 
 static void
 }
 
 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
 }
 
 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;
 
     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);
 
 
     trace_printstack_of(fp);
 


@@ -188,9 +193,9 @@ trace_printstack_isr(const isr_param* isrm)
             trace_printswctx(p, false, true);
         }
 
             trace_printswctx(p, false, true);
         }
 

-        fp = saved_fp(p);
+        fp = hart_stack_frame(p);

         if (!valid_fp(fp)) {
         if (!valid_fp(fp)) {

-            DEBUG("??? invalid frame: %p", fp);
+            trace_log("??? invalid frame: %p", fp);

             break;
         }
 
             break;
         }
 


@@ -198,6 +203,8 @@ trace_printstack_isr(const isr_param* isrm)
 
         prev_usrctx = !kernel_context(p);
 
 
         prev_usrctx = !kernel_context(p);
 

-        p = p->execp->saved_prev_ctx;
+        p = hart_parent_state(p);

     }
     }

+
+    trace_log("----- [trace end] -----\n");

 }
\ No newline at end of file
 }
\ No newline at end of file