Changeset b5e68c8 in mainline for kernel/arch/ppc32/src/interrupt.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/ppc32/src/interrupt.c (modified) (2 diffs)

kernel/arch/ppc32/src/interrupt.c

@@ -54 +54 @@
 void istate_decode(istate_t *istate)
 {
-        printf("r0 =%p\tr1 =%p\tr2 =%p\n", istate->r0, istate->sp, istate->r2);
-        printf("r3 =%p\tr4 =%p\tr5 =%p\n", istate->r3, istate->r4, istate->r5);
-        printf("r6 =%p\tr7 =%p\tr8 =%p\n", istate->r6, istate->r7, istate->r8);
-        printf("r9 =%p\tr10=%p\tr11=%p\n",
+        printf("r0 =%#0" PRIx32 "\tr1 =%p\tr2 =%#0" PRIx32 "\n",
+            istate->r0, (void *) istate->sp, istate->r2);
+        
+        printf("r3 =%#0" PRIx32 "\tr4 =%#0" PRIx32 "\tr5 =%#0" PRIx32 "\n",
+            istate->r3, istate->r4, istate->r5);
+        
+        printf("r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\tr8 =%#0" PRIx32 "\n",
+            istate->r6, istate->r7, istate->r8);
+        
+        printf("r9 =%#0" PRIx32 "\tr10=%#0" PRIx32 "\tr11=%#0" PRIx32 "\n",
             istate->r9, istate->r10, istate->r11);
-        printf("r12=%p\tr13=%p\tr14=%p\n",
+        
+        printf("r12=%#0" PRIx32 "\tr13=%#0" PRIx32 "\tr14=%#0" PRIx32 "\n",
             istate->r12, istate->r13, istate->r14);
-        printf("r15=%p\tr16=%p\tr17=%p\n",
+        
+        printf("r15=%#0" PRIx32 "\tr16=%#0" PRIx32 "\tr17=%#0" PRIx32 "\n",
             istate->r15, istate->r16, istate->r17);
-        printf("r18=%p\tr19=%p\tr20=%p\n",
+        
+        printf("r18=%#0" PRIx32 "\tr19=%#0" PRIx32 "\tr20=%#0" PRIx32 "\n",
             istate->r18, istate->r19, istate->r20);
-        printf("r21=%p\tr22=%p\tr23=%p\n",
+        
+        printf("r21=%#0" PRIx32 "\tr22=%#0" PRIx32 "\tr23=%#0" PRIx32 "\n",
             istate->r21, istate->r22, istate->r23);
-        printf("r24=%p\tr25=%p\tr26=%p\n",
+        
+        printf("r24=%#0" PRIx32 "\tr25=%#0" PRIx32 "\tr26=%#0" PRIx32 "\n",
             istate->r24, istate->r25, istate->r26);
-        printf("r27=%p\tr28=%p\tr29=%p\n",
+        
+        printf("r27=%#0" PRIx32 "\tr28=%#0" PRIx32 "\tr29=%#0" PRIx32 "\n",
             istate->r27, istate->r28, istate->r29);
-        printf("r30=%p\tr31=%p\n", istate->r30, istate->r31);
-        printf("cr =%p\tpc =%p\tlr =%p\n", istate->cr, istate->pc, istate->lr);
-        printf("ctr=%p\txer=%p\tdar=%p\n",
+        
+        printf("r30=%#0" PRIx32 "\tr31=%#0" PRIx32 "\n",
+            istate->r30, istate->r31);
+        
+        printf("cr =%#0" PRIx32 "\tpc =%p\tlr =%p\n",
+            istate->cr, (void *) istate->pc, (void *) istate->lr);
+        
+        printf("ctr=%#0" PRIx32 "\txer=%#0" PRIx32 "\tdar=%#0" PRIx32 "\n",
             istate->ctr, istate->xer, istate->dar);
-        printf("srr1=%p\n", istate->srr1);
+        
+        printf("srr1=%p\n", (void *) istate->srr1);
 }
 
@@ -111 +129 @@
                          */
 #ifdef CONFIG_DEBUG
-                        printf("cpu%" PRIs ": spurious interrupt (inum=%" PRIu8 ")\n",
+                        printf("cpu%u: spurious interrupt (inum=%" PRIu8 ")\n",
                             CPU->id, inum);
 #endif