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

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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

@@ -66 +66 @@
 void istate_decode(istate_t *istate)
 {
-        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",
+        printf("cs =%0#10" PRIx32 "\teip=%0#10" PRIx32 "\t"
+            "efl=%0#10" PRIx32 "\terr=%0#10" PRIx32 "\n",
+            istate->cs, istate->eip, istate->eflags, istate->error_word);
+        
+        printf("ds =%0#10" PRIx32 "\tes =%0#10" PRIx32 "\t"
+            "fs =%0#10" PRIx32 "\tgs =%0#10" PRIx32 "\n",
             istate->ds, istate->es, istate->fs, istate->gs);
         
         if (istate_from_uspace(istate))
-                printf("ss =%#0" PRIx32 "\n", istate->ss);
-        
-        printf("eax=%#0" PRIx32 "\tebx=%#0" PRIx32 "\t"
-            "ecx=%#0" PRIx32 "\tedx=%#0" PRIx32 "\n",
+                printf("ss =%0#10" PRIx32 "\n", istate->ss);
+        
+        printf("eax=%0#10" PRIx32 "\tebx=%0#10" PRIx32 "\t"
+            "ecx=%0#10" PRIx32 "\tedx=%0#10" 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);
+        printf("esi=%0#10" PRIx32 "\tedi=%0#10" PRIx32 "\t"
+            "ebp=%0#10" PRIx32 "\tesp=%0#10" PRIx32 "\n",
+            istate->esi, istate->edi, istate->ebp,
+            istate_from_uspace(istate) ? istate->esp :
+            (uintptr_t) &istate->esp);
 }