Changeset cefb126 in mainline for kernel/arch/amd64/src/debugger.c

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/arch/amd64/src/debugger.c (modified) (4 diffs)

kernel/arch/amd64/src/debugger.c

@@ -230 +230 @@
                                 return;
                         
-                        printf("*** Found ZERO on address %lx (slot %d) ***\n",
+                        printf("*** Found ZERO on address %" PRIp " (slot %d) ***\n",
                             breakpoints[slot].address, slot);
                 } else {
-                        printf("Data watchpoint - new data: %lx\n",
+                        printf("Data watchpoint - new data: %" PRIp "\n",
                             *((unative_t *) breakpoints[slot].address));
                 }
         }
         
-        printf("Reached breakpoint %d:%lx (%s)\n", slot, getip(istate),
+        printf("Reached breakpoint %d:%" PRIp " (%s)\n", slot, getip(istate),
             symtab_fmt_name_lookup(getip(istate)));
         
@@ -349 +349 @@
 {
 #ifdef __32_BITS__
-        printf("#  Count Address    In symbol\n");
-        printf("-- ----- ---------- ---------\n");
+        printf("[nr] [count] [address ] [in symbol\n");
 #endif
         
 #ifdef __64_BITS__
-        printf("#  Count Address            In symbol\n");
-        printf("-- ----- ------------------ ---------\n");
+        printf("[nr] [count] [address         ] [in symbol\n");
 #endif
         
@@ -365 +363 @@
                         
 #ifdef __32_BITS__
-                        printf("%-2u %-5" PRIs " %p %s\n", i,
+                        printf("%-4u %7" PRIs " %p %s\n", i,
                             breakpoints[i].counter, breakpoints[i].address,
                             symbol);
@@ -371 +369 @@
                         
 #ifdef __64_BITS__
-                        printf("%-2u %-5" PRIs " %p %s\n", i,
+                        printf("%-4u %7" PRIs " %p %s\n", i,
                             breakpoints[i].counter, breakpoints[i].address,
                             symbol);