Changeset 973ef9fc in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/mips32/src/debugger.c (modified) (11 diffs)

kernel/arch/mips32/src/debugger.c

@@ -134 +134 @@
  *
  */
-bool is_jump(unative_t instr)
+bool is_jump(sysarg_t instr)
 {
         unsigned int i;
@@ -166 +166 @@
                         return 0;
                 } else if ((breakpoints[i].address == (uintptr_t) argv->intval +
-                    sizeof(unative_t)) || (breakpoints[i].address ==
-                    (uintptr_t) argv->intval - sizeof(unative_t))) {
+                    sizeof(sysarg_t)) || (breakpoints[i].address ==
+                    (uintptr_t) argv->intval - sizeof(sysarg_t))) {
                         printf("Adjacent breakpoints not supported, conflict "
                             "with %d.\n", i);
@@ -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;
-        cur->instruction = ((unative_t *) cur->address)[0];
-        cur->nextinstruction = ((unative_t *) cur->address)[1];
+        cur->instruction = ((sysarg_t *) cur->address)[0];
+        cur->nextinstruction = ((sysarg_t *) cur->address)[1];
         if (argv == &add_argv) {
                 cur->flags = 0;
@@ -209 +209 @@
         
         /* Set breakpoint */
-        *((unative_t *) cur->address) = 0x0d;
+        *((sysarg_t *) cur->address) = 0x0d;
         smc_coherence(cur->address);
         
@@ -247 +247 @@
         smc_coherence(((uint32_t *) cur->address)[1]);
         
-        cur->address = NULL;
+        cur->address = (uintptr_t) NULL;
         
         irq_spinlock_unlock(&bkpoint_lock, true);
@@ -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)
@@ -289 +289 @@
         
         for (i = 0; i < BKPOINTS_MAX; i++)
-                breakpoints[i].address = NULL;
+                breakpoints[i].address = (uintptr_t) NULL;
         
 #ifdef CONFIG_KCONSOLE
@@ -341 +341 @@
                 /* Reinst only breakpoint */
                 if ((breakpoints[i].flags & BKPOINT_REINST) &&
-                    (fireaddr == breakpoints[i].address + sizeof(unative_t))) {
+                    (fireaddr == breakpoints[i].address + sizeof(sysarg_t))) {
                         cur = &breakpoints[i];
                         break;
@@ -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));
                 
@@ -417 +419 @@
                 /* Remove one-shot breakpoint */
                 if ((cur->flags & BKPOINT_ONESHOT))
-                        cur->address = NULL;
+                        cur->address = (uintptr_t) NULL;
                 
                 /* Remove in-progress flag */