Changeset 90ed058 in mainline for kernel/arch/ia32/src/interrupt.c

Timestamp:

2010-07-01T16:33:58Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49ace23

Parents:

873c681 (diff), eee047c (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 ia32 interrupt handler and trap frame improvements.

File:

• kernel/arch/ia32/src/interrupt.c (modified) (1 diff)

kernel/arch/ia32/src/interrupt.c

@@ -65 +65 @@
 void istate_decode(istate_t *istate)
 {
-        printf("error_word=%#lx\n", istate->error_word);
-        printf("cs =%#0.8lx\teflags=%#0.8lx\n", istate->cs, istate->eflags);
-        printf("eax=%#0.8lx\tecx=%#0.8lx\tedx=%#0.8lx\n",
-            istate->eax, istate->ecx, istate->edx);
+        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);
+        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);
 }