Changeset 074c9bd in mainline for kernel/arch/ia32/src/interrupt.c

Timestamp:

2010-07-15T10:39:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5c16ce7

Parents:

41ce4d9 (diff), 4003861 (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) (1 diff)

kernel/arch/ia32/src/interrupt.c

@@ -65 +65 @@
 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 =%p\teip=%p\tefl=%p\terr=%p\n",
+            istate->cs, istate->eip, istate->eflags, istate->error_word);
+
+        printf("ds =%p\tes =%p\tfs =%p\tgs =%p\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 =%p\n", istate->ss);
+
+        printf("eax=%p\tebx=%p\tecx=%p\tedx=%p\n",
+            istate->eax, istate->ebx, istate->ecx, istate->edx);
+        printf("esi=%p\tedi=%p\tebp=%p\tesp=%p\n",
+            istate->esi, istate->edi, istate->ebp,
+            istate_from_uspace(istate) ? istate->esp : (uintptr_t)&istate->esp);
 }