Changeset ad45bde9 in mainline for generic/src/console/cmd.c

Timestamp:

2006-04-23T14:17:44Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

1f41004e

Parents:

6ecc8bce

Message:

Fix pointers output format.
Fix format of slab and zones tables.

File:

• generic/src/console/cmd.c (modified) (5 diffs)

generic/src/console/cmd.c

@@ -459 +459 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-                printf("Calling f(): %p: %s\n", symaddr, symbol);
+                printf("Calling f(): %.*p: %s\n", sizeof(__address) * 2, symaddr, symbol);
                 f =  (__native (*)(void)) symaddr;
-                printf("Result: %p\n", f());
+                printf("Result: %#zx\n", f());
         }
         
@@ -483 +483 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-                printf("Calling f(0x%zX): %p: %s\n", arg1, symaddr, symbol);
+                printf("Calling f(0x%zX): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
                 f =  (__native (*)(__native,...)) symaddr;
-                printf("Result: %p\n", f(arg1));
+                printf("Result: %#zx\n", f(arg1));
         }
         
@@ -508 +508 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-                printf("Calling f(0x%zx,0x%zx): %p: %s\n", 
-                       arg1, arg2, symaddr, symbol);
+                printf("Calling f(0x%zx,0x%zx): %.*p: %s\n", 
+                       arg1, arg2, sizeof(__address) * 2, symaddr, symbol);
                 f =  (__native (*)(__native,__native,...)) symaddr;
-                printf("Result: %p\n", f(arg1, arg2));
+                printf("Result: %#zx\n", f(arg1, arg2));
         }
         
@@ -535 +535 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-                printf("Calling f(0x%zx,0x%zx, 0x%zx): %p: %s\n", 
-                       arg1, arg2, arg3, symaddr, symbol);
+                printf("Calling f(0x%zx,0x%zx, 0x%zx): %.*p: %s\n", 
+                       arg1, arg2, arg3, sizeof(__address) * 2, symaddr, symbol);
                 f =  (__native (*)(__native,__native,__native,...)) symaddr;
-                printf("Result: %p\n", f(arg1, arg2, arg3));
+                printf("Result: %#zx\n", f(arg1, arg2, arg3));
         }
         
@@ -599 +599 @@
                 if (pointer)
                         addr = (__u32 *)(*(__native *)addr);
-                printf("Writing 0x%x -> %p\n", arg1, addr);
+                printf("Writing 0x%x -> %.*p\n", arg1, sizeof(__address) * 2, addr);
                 *addr = arg1;