Changeset 89c57b6 in mainline for kernel/arch/arm32/src/exception.c

Timestamp:

2011-04-13T14:45:41Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/arm32/src/exception.c (modified) (2 diffs)

kernel/arch/arm32/src/exception.c

@@ -35 +35 @@
 
 #include <arch/exception.h>
-#include <arch/memstr.h>
 #include <arch/regutils.h>
 #include <arch/machine_func.h>
@@ -175 +174 @@
 void istate_decode(istate_t *istate)
 {
-        printf("r0 =%#0.8lx\tr1 =%#0.8lx\tr2 =%#0.8lx\tr3 =%#0.8lx\n",
+        printf("r0 =%#0" PRIx32 "\tr1 =%#0" PRIx32 "\t"
+            "r2 =%#0" PRIx32 "\tr3 =%#0" PRIx32 "\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        printf("r4 =%#0.8lx\tr5 =%#0.8lx\tr6 =%#0.8lx\tr7 =%#0.8lx\n",
+        printf("r4 =%#" PRIx32 "\tr5 =%#0" PRIx32 "\t"
+            "r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\n",
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf("r8 =%#0.8lx\tr9 =%#0.8lx\tr10=%#0.8lx\tfp =%#0.8lx\n",
-            istate->r8, istate->r9, istate->r10, istate->fp);
-        printf("r12=%#0.8lx\tsp =%#0.8lx\tlr =%#0.8lx\tspsr=%#0.8lx\n",
-            istate->r12, istate->sp, istate->lr, istate->spsr);
+        printf("r8 =%#0" PRIx32 "\tr9 =%#0" PRIx32 "\t"
+            "r10=%#0" PRIx32 "\tfp =%p\n",
+            istate->r8, istate->r9, istate->r10,
+            (void *) istate->fp);
+        printf("r12=%#0" PRIx32 "\tsp =%p\tlr =%p\tspsr=%p\n",
+            istate->r12, (void *) istate->sp,
+            (void *) istate->lr, (void *) istate->spsr);
 }