Changeset 1affcdf3 in mainline for kernel/arch/mips32/src/exception.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/exception.c (modified) (2 diffs)

kernel/arch/mips32/src/exception.c

@@ -74 +74 @@
 void istate_decode(istate_t *istate)
 {
-        printf("epc=%p\tsta=%#010" PRIx32 "\t"
+        printf("epc=%#010" PRIx32 "\tsta=%#010" PRIx32 "\t"
             "lo =%#010" PRIx32 "\thi =%#010" PRIx32 "\n",
-            (void *) istate->epc, istate->status,
-            istate->lo, istate->hi);
+            istate->epc, istate->status, istate->lo, istate->hi);
         
         printf("a0 =%#010" PRIx32 "\ta1 =%#010" PRIx32 "\t"
@@ -107 +106 @@
             istate->s8, istate->at, istate->kt0, istate->kt1);
         
-        printf("sp =%p\tra =%p\tgp =%p\n",
-            (void *) istate->sp, (void *) istate->ra,
-            (void *) istate->gp);
+        printf("sp =%#010" PRIx32 "\tra =%#010" PRIx32 "\t"
+            "gp =%#010" PRIx32 "\n",
+            istate->sp, istate->ra, istate->gp);
 }