Changeset 84439d7 in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2010-12-05T09:34:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

75732da

Parents:

56b962d (diff), 35537a7 (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 with development/

File:

• kernel/arch/mips32/src/debugger.c (modified) (4 diffs)

kernel/arch/mips32/src/debugger.c

@@ -191 +191 @@
         }
         
-        printf("Adding breakpoint on address %p\n", argv->intval);
+        printf("Adding breakpoint on address %p\n", (void *) argv->intval);
         
         cur->address = (uintptr_t) argv->intval;
@@ -267 +267 @@
                             breakpoints[i].address);
                         
-                        printf("%-4u %7" PRIs " %p %-8s %-9s %-10s %s\n", i,
-                            breakpoints[i].counter, breakpoints[i].address,
+                        printf("%-4u %7zu %p %-8s %-9s %-10s %s\n", i,
+                            breakpoints[i].counter, (void *) breakpoints[i].address,
                             ((breakpoints[i].flags & BKPOINT_INPROG) ? "true" :
                             "false"), ((breakpoints[i].flags & BKPOINT_ONESHOT)
@@ -366 +366 @@
                 
                 if (!(cur->flags & BKPOINT_FUNCCALL)) {
-                        printf("***Breakpoint %u: %p in %s.\n", i, fireaddr,
+                        printf("***Breakpoint %u: %p in %s.\n", i,
+                            (void *) fireaddr,
                             symtab_fmt_name_lookup(fireaddr));
                 }
@@ -381 +382 @@
                 cur->flags |= BKPOINT_INPROG;
         } else {
-                printf("***Breakpoint %d: %p in %s.\n", i, fireaddr,
+                printf("***Breakpoint %d: %p in %s.\n", i,
+                    (void *) fireaddr,
                     symtab_fmt_name_lookup(fireaddr));