refactor: make pci device driver loading passive, pci bus scanner will not load them...

[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 ae183d4f03afecf15a7497d03f0a5d7253aaf65c..1235884c68704417f821f36501fa8249133fd2de 100644 (file)
--- 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 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;
 
             assert(ksym_va);
             trace_ctx.ksym_table = (struct ksyms*)ksym_va;


@@ -91,8 +91,10 @@ trace_walkback(struct trace_record* tb_buffer,
         ptr_t pc = *(frame + 1);
 
         current = trace_sym_lookup(pc);
         ptr_t pc = *(frame + 1);
 
         current = trace_sym_lookup(pc);

-        tb_buffer[i] = (struct trace_record){ .pc = current ? current->pc : pc,
-                                              .symbol = ksym_getstr(current) };
+        tb_buffer[i] =
+          (struct trace_record){ .pc = pc,
+                                 .sym_pc = current ? current->pc : 0,
+                                 .symbol = ksym_getstr(current) };

 
         frame = (ptr_t*)*frame;
         i++;
 
         frame = (ptr_t*)*frame;
         i++;


@@ -105,19 +107,27 @@ trace_walkback(struct trace_record* tb_buffer,
     return i;
 }
 
     return i;
 }
 

+static inline void
+trace_print_code_entry(ptr_t sym_pc, ptr_t inst_pc, char* sym)
+{
+    DEBUG("%p+%p: %s", sym_pc, inst_pc - sym_pc, sym);
+}
+

 void
 trace_printstack_of(ptr_t fp)
 {
     struct trace_record tbs[NB_TRACEBACK];
 
 void
 trace_printstack_of(ptr_t fp)
 {
     struct trace_record tbs[NB_TRACEBACK];
 

+    // Let's get our Stackwalker does his job ;)

     int n = trace_walkback(tbs, fp, NB_TRACEBACK, &fp);
 
     if (fp) {
     int n = trace_walkback(tbs, fp, NB_TRACEBACK, &fp);
 
     if (fp) {

-        kprintf(KDEBUG "...<truncated>\n");
+        DEBUG("...<truncated>");

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

-        kprintf(KDEBUG "%p: %s\n", tbs[i].pc, tbs[i].symbol);
+        struct trace_record* tb = &tbs[i];
+        trace_print_code_entry(tb->sym_pc, tb->pc, tb->symbol);

     }
 }
 
     }
 }
 


@@ -133,11 +143,12 @@ trace_printswctx(const isr_param* p, char* direction)
 
     struct ksym_entry* sym = trace_sym_lookup(p->execp->eip);
 
 
     struct ksym_entry* sym = trace_sym_lookup(p->execp->eip);
 

-    kprintf(KDEBUG ">> (sw:%s) iv:%d, errno:%p <<\n",
-            direction,
-            p->execp->vector,
-            p->execp->err_code);
-    kprintf(KDEBUG "%p:%s\n", p->execp->eip, ksym_getstr(sym));
+    DEBUG(">> (sw:%s) iv:%d, errno:%p <<",
+          direction,
+          p->execp->vector,
+          p->execp->err_code);
+
+    trace_print_code_entry(sym->pc, p->execp->eip, ksym_getstr(sym));

 }
 
 void
 }
 
 void


@@ -145,10 +156,9 @@ trace_printstack_isr(const isr_param* isrm)
 {
     isr_param* p = isrm;
     ptr_t fp = cpu_get_fp();
 {
     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);
+    DEBUG("stack trace (pid=%d)\n", __current->pid);

 
     trace_printstack_of(fp);
 
 
     trace_printstack_of(fp);
 


@@ -170,5 +180,4 @@ trace_printstack_isr(const isr_param* isrm)
 
         p = p->execp->saved_prev_ctx;
     }
 
         p = p->execp->saved_prev_ctx;
     }

-    kprintf(KDEBUG "\n");

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