Changeset b5e68c8 in mainline for uspace/lib/c/generic/stacktrace.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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 mainline changes.

File:

• uspace/lib/c/generic/stacktrace.c (modified) (2 diffs)

uspace/lib/c/generic/stacktrace.c

@@ -50 +50 @@
 
         while (stacktrace_fp_valid(&st, fp)) {
-                printf("%p: %p()\n", fp, pc);
+                printf("%p: %p()\n", (void *) fp, (void *) pc);
                 (void) stacktrace_ra_get(&st, fp, &pc);
                 (void) stacktrace_fp_prev(&st, fp, &nfp);
@@ -61 +61 @@
         stacktrace_prepare();
         stacktrace_print_fp_pc(stacktrace_fp_get(), stacktrace_pc_get());
+        
         /*
          * Prevent the tail call optimization of the previous call by
          * making it a non-tail call.
          */
-        (void) stacktrace_fp_get();
+        
+        printf("-- end of stack trace --\n");
 }