Changeset 89c57b6 in mainline for kernel/arch/ia32/src/interrupt.c

Timestamp:

2011-04-13T14:45:41Z (14 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/ia32/src/interrupt.c (modified) (2 diffs)

kernel/arch/ia32/src/interrupt.c

@@ -62 +62 @@
 void (* enable_irqs_function)(uint16_t irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
+const char *irqs_info = NULL;
 
 void istate_decode(istate_t *istate)
 {
-        printf("error_word=%p\n", istate->error_word);
-        printf("eflags=%p\n", istate->eflags);
-
-        printf("cs =%p\tds =%p\tes =%p\n", istate->cs, istate->ds, istate->es);
-        printf("fs =%p\tgs =%p", istate->fs, istate->gs);
+        printf("cs =%#0" PRIx32 "\teip=%p\t"
+            "efl=%#0" PRIx32 "\terr=%#0" PRIx32 "\n",
+            istate->cs, (void *) istate->eip,
+            istate->eflags, istate->error_word);
+        
+        printf("ds =%#0" PRIx32 "\tes =%#0" PRIx32 "\t"
+            "fs =%#0" PRIx32 "\tgs =%#0" PRIx32 "\n",
+            istate->ds, istate->es, istate->fs, istate->gs);
+        
         if (istate_from_uspace(istate))
-                printf("\tss =%p\n", istate->ss);
-        else
-                printf("\n");
-
-        printf("eax=%p\tebx=%p\tecx=%p\n", istate->eax, istate->ebx,
-            istate->ecx);
-        printf("edx=%p\tedi=%p\tesi=%p\n", istate->edx, istate->edi,
-            istate->esi);
-        printf("ebp=%p\tesp=%p\teip=%p\n", istate->ebp,
-            istate_from_uspace(istate) ? istate->esp : (uintptr_t) &istate->esp,
-            istate->eip);
+                printf("ss =%#0" PRIx32 "\n", istate->ss);
+        
+        printf("eax=%#0" PRIx32 "\tebx=%#0" PRIx32 "\t"
+            "ecx=%#0" PRIx32 "\tedx=%#0" PRIx32 "\n",
+            istate->eax, istate->ebx, istate->ecx, istate->edx);
+        
+        printf("esi=%p\tedi=%p\tebp=%p\tesp=%p\n",
+            (void *) istate->esi, (void *) istate->edi,
+            (void *) istate->ebp,
+            istate_from_uspace(istate) ? ((void *) istate->esp) :
+            &istate->esp);
 }
 
@@ -143 +148 @@
         );
         
-        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0.8x.",
-            (unative_t) mxcsr);
-        panic_badtrap(istate, n, "SIMD FP exception, MXCSR=%#0.8x");
+        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0" PRIx32 ".",
+            mxcsr);
+        panic_badtrap(istate, n, "SIMD FP exception");
 }