Changeset 7bdcc45 in mainline for kernel/generic/src/debug/debug.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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:

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

kernel/generic/src/debug/debug.c

@@ -52 +52 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s+%" PRIp "->%s\n", call_site_sym, call_site_off,
-                    fn_sym);
+                printf("%s()+%p->%s()\n", call_site_sym,
+                    (void *) call_site_off, fn_sym);
         else
-                printf("->%s\n", fn_sym);
+                printf("->%s()\n", fn_sym);
 }
 
@@ -67 +67 @@
         if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
             &call_site_off) == EOK)
-                printf("%s+%" PRIp "<-%s\n", call_site_sym, call_site_off,
-                    fn_sym);
+                printf("%s()+%p<-%s()\n", call_site_sym,
+                    (void *) call_site_off, fn_sym);
         else
-                printf("<-%s\n", fn_sym);
+                printf("<-%s()\n", fn_sym);
 }