Changeset c621f4aa in mainline for kernel/generic/src/debug/stacktrace.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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