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

Timestamp:

2010-07-15T10:39:23Z (14 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/amd64/src/interrupt.c (modified) (1 diff)

kernel/arch/amd64/src/interrupt.c

@@ -65 +65 @@
 void istate_decode(istate_t *istate)
 {
-        printf("error_word=%#llx\n", istate->error_word);
-        printf("cs =%#0.16llx\trflags=%#0.16llx\n", istate->cs,
-            istate->rflags);
-        printf("rax=%#0.16llx\trbx=%#0.16llx\trcx=%#0.16llx\n", istate->rax,
-            istate->rcx, istate->rdx);
-        printf("rsi=%#0.16llx\trdi=%#0.16llx\tr8 =%#0.16llx\n", istate->rsi,
-            istate->rdi, istate->r8);
-        printf("r9 =%#0.16llx\tr10=%#0.16llx\tr11=%#0.16llx\n", istate->r9,
-            istate->r10, istate->r11);
+        printf("cs =%p\trip=%p\trfl=%p\terr=%p\n",
+            istate->cs, istate->rip, istate->rflags, istate->error_word);
+
+        if (istate_from_uspace(istate))
+                printf("ss =%p\n", istate->ss);
+        
+        printf("rax=%p\trbx=%p\trcx=%p\trdx=%p\n",
+            istate->rax, istate->rbx, istate->rcx, istate->rdx);
+        printf("rsi=%p\trdi=%p\trbp=%p\trsp=%p\n",
+            istate->rsi, istate->rdi, istate->rbp,
+            istate_from_uspace(istate) ? istate->rsp : (uintptr_t)&istate->rsp);
+        printf("r8 =%p\tr9 =%p\tr10=%p\tr11=%p\n",
+            istate->r8, istate->r9, istate->r10, istate->r11);
+        printf("r12=%p\tr13=%p\tr14=%p\tr15=%p\n",
+            istate->r12, istate->r13, istate->r14, istate->r15);
 }