feat: capability list to enable greater flexibility of devices

[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 3d712c04db4d97531d5af52064500709e90b71cd..1c909197bc8f0a594ba34ed4f91c73dabdc6e917 100644 (file)
--- a/lunaix-os/kernel/debug/trace.c
+++ b/lunaix-os/kernel/debug/trace.c
@@ -77,6 +77,10 @@ ksym_getstr(struct ksym_entry* sym)
                    trace_ctx.ksym_table->ksym_label_off + sym->label_off);
 }
 
                    trace_ctx.ksym_table->ksym_label_off + sym->label_off);
 }
 

+static inline bool valid_fp(ptr_t ptr) {
+    return KERNEL_STACK < ptr && ptr < KERNEL_EXEC_END;
+}
+

 int
 trace_walkback(struct trace_record* tb_buffer,
                ptr_t fp,
 int
 trace_walkback(struct trace_record* tb_buffer,
                ptr_t fp,


@@ -87,17 +91,23 @@ trace_walkback(struct trace_record* tb_buffer,
     struct ksym_entry* current = NULL;
     int i = 0;
 
     struct ksym_entry* current = NULL;
     int i = 0;
 

-    while (frame && i < limit) {
+    while (valid_fp((ptr_t)frame) && i < limit) {

         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++;
     }
 

+    if (!valid_fp((ptr_t)frame)) {
+        frame = NULL;
+    }
+

     if (last_fp) {
         *last_fp = (ptr_t)frame;
     }
     if (last_fp) {
         *last_fp = (ptr_t)frame;
     }


@@ -105,19 +115,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 +151,13 @@ 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);
+
+    ptr_t sym_pc = sym ? sym->pc : p->execp->eip;
+    trace_print_code_entry(sym_pc, p->execp->eip, ksym_getstr(sym));

 }
 
 void
 }
 
 void


@@ -145,10 +165,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 +189,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