Changeset 357b5f5 in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (5 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);
@@ -194 +194 @@
         
         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);
         
@@ -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;