Changeset b5e68c8 in mainline for kernel/arch/ia64/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/ia64/src/interrupt.c (modified) (1 diff)

kernel/arch/ia64/src/interrupt.c

@@ -135 +135 @@
 void istate_decode(istate_t *istate)
 {
-        printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
-            istate->ar_bspstore);
-        printf("ar.rnat=%#018llx\tar.rsc=%#018llx\n", istate->ar_rnat,
-            istate->ar_rsc);
-        printf("ar.ifs=%#018llx\tar.pfs=%#018llx\n", istate->ar_ifs,
-            istate->ar_pfs);
-        printf("cr.isr=%#018llx\tcr.ipsr=%#018llx\t\n", istate->cr_isr.value,
-            istate->cr_ipsr);
-        
-        printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei,
+        printf("ar.bsp=%p\tar.bspstore=%p\n",
+            (void *) istate->ar_bsp, (void *) istate->ar_bspstore);
+        printf("ar.rnat=%#0" PRIx64 "\tar.rsc=%#0" PRIx64 "\n",
+            istate->ar_rnat, istate->ar_rsc);
+        printf("ar.ifs=%#0" PRIx64 "\tar.pfs=%#0" PRIx64 "\n",
+            istate->ar_ifs, istate->ar_pfs);
+        printf("cr.isr=%#0" PRIx64 "\tcr.ipsr=%#0" PRIx64 "\n",
+            istate->cr_isr.value, istate->cr_ipsr.value);
+        
+        printf("cr.iip=%#0" PRIx64 ", #%u\t(%s)\n",
+            istate->cr_iip, istate->cr_isr.ei,
             symtab_fmt_name_lookup(istate->cr_iip));
-        printf("cr.iipa=%#018llx\t(%s)\n", istate->cr_iipa,
+        printf("cr.iipa=%#0" PRIx64 "\t(%s)\n", istate->cr_iipa,
             symtab_fmt_name_lookup(istate->cr_iipa));
-        printf("cr.ifa=%#018llx\t(%s)\n", istate->cr_ifa,
+        printf("cr.ifa=%#0" PRIx64 "\t(%s)\n", istate->cr_ifa,
             symtab_fmt_name_lookup(istate->cr_ifa));
 }