Changes in kernel/generic/src/debug/stacktrace.c [7e752b2:f6069801] in mainline

File:

• kernel/generic/src/debug/stacktrace.c (modified) (6 diffs)

kernel/generic/src/debug/stacktrace.c

@@ -27 +27 @@
  */
 
-/** @addtogroup genericdebug
+/** @addtogroup genericdebug 
  * @{
  */
@@ -35 +35 @@
 #include <stacktrace.h>
 #include <interrupt.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <symtab.h>
-#include <print.h>
 
 #define STACK_FRAMES_MAX        20
 
-void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
+void
+stack_trace_fp_pc(stack_trace_ops_t *ops, uintptr_t fp, uintptr_t pc)
 {
         int cnt = 0;
-        const char *symbol;
+        char *symbol;
         uintptr_t offset;
-        uintptr_t fp;
-        uintptr_t pc;
-        
-        while (cnt++ < STACK_FRAMES_MAX &&
-            ops->stack_trace_context_validate(ctx)) {
+
+        while (cnt++ < STACK_FRAMES_MAX && ops->frame_pointer_validate(fp)) {
                 if (ops->symbol_resolve &&
-                    ops->symbol_resolve(ctx->pc, &symbol, &offset)) {
-                        if (offset)
-                                printf("%p: %s()+%p\n", (void *) ctx->fp,
-                                    symbol, (void *) offset);
+                    ops->symbol_resolve(pc, &symbol, &offset)) {
+                        if (offset)
+                                printf("%p: %s+%p()\n", fp, symbol, offset);
                         else
-                                printf("%p: %s()\n", (void *) ctx->fp, symbol);
-                } else
-                        printf("%p: %p()\n", (void *) ctx->fp, (void *) ctx->pc);
-                
-                if (!ops->return_address_get(ctx, &pc))
+                                printf("%p: %s()\n", fp, symbol);
+                } else {
+                        printf("%p: %p()\n", fp, pc);
+                }
+                if (!ops->return_address_get(fp, &pc))
                         break;
-                
-                if (!ops->frame_pointer_prev(ctx, &fp))
+                if (!ops->frame_pointer_prev(fp, &fp))
                         break;
-                
-                ctx->fp = fp;
-                ctx->pc = pc;
         }
 }
@@ -74 +66 @@
 void stack_trace(void)
 {
-        stack_trace_context_t ctx = {
-                .fp = frame_pointer_get(),
-                .pc = program_counter_get(),
-                .istate = NULL
-        };
-
-        stack_trace_ctx(&kst_ops, &ctx);
+        stack_trace_fp_pc(&kst_ops, frame_pointer_get(), program_counter_get());
 
         /*
@@ -91 +77 @@
 void stack_trace_istate(istate_t *istate)
 {
-        stack_trace_context_t ctx = {
-                .fp = istate_get_fp(istate),
-                .pc = istate_get_pc(istate),
-                .istate = istate
-        };
-        
         if (istate_from_uspace(istate))
-                stack_trace_ctx(&ust_ops, &ctx);
+                stack_trace_fp_pc(&ust_ops, istate_get_fp(istate),
+                    istate_get_pc(istate));
         else
-                stack_trace_ctx(&kst_ops, &ctx);
+                stack_trace_fp_pc(&kst_ops, istate_get_fp(istate),
+                    istate_get_pc(istate));
 }
 
-static bool
-kernel_symbol_resolve(uintptr_t addr, const char **sp, uintptr_t *op)
+static bool kernel_symbol_resolve(uintptr_t addr, char **sp, uintptr_t *op)
 {
         return (symtab_name_lookup(addr, sp, op) == 0);
@@ -110 +91 @@
 
 stack_trace_ops_t kst_ops = {
-        .stack_trace_context_validate = kernel_stack_trace_context_validate,
+        .frame_pointer_validate = kernel_frame_pointer_validate,
         .frame_pointer_prev = kernel_frame_pointer_prev,
         .return_address_get = kernel_return_address_get,
@@ -117 +98 @@
 
 stack_trace_ops_t ust_ops = {
-        .stack_trace_context_validate = uspace_stack_trace_context_validate,
+        .frame_pointer_validate = uspace_frame_pointer_validate,
         .frame_pointer_prev = uspace_frame_pointer_prev,
         .return_address_get = uspace_return_address_get,