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

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

kernel/generic/src/debug/stacktrace.c

@@ -41 +41 @@
 #define STACK_FRAMES_MAX        20
 
-void
-stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
+void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
 {
         int cnt = 0;
@@ -54 +53 @@
                 if (ops->symbol_resolve &&
                     ops->symbol_resolve(ctx->pc, &symbol, &offset)) {
-                        if (offset)
-                                printf("%p: %s+%" PRIp "()\n",
-                                    ctx->fp, symbol, offset);
+                        if (offset)
+                                printf("%p: %s()+%p\n", (void *) ctx->fp,
+                                    symbol, (void *) offset);
                         else
-                                printf("%p: %s()\n",
-                                    ctx->fp, symbol);
-                } else {
-                        printf("%p: %p()\n", ctx->fp, ctx->pc);
-                }
+                                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))
                         break;
+                
                 if (!ops->frame_pointer_prev(ctx, &fp))
                         break;
+                
                 ctx->fp = fp;
                 ctx->pc = pc;