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

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

kernel/arch/amd64/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("cs =%p\trip=%p\trfl=%p\terr=%p\n",
+        printf("cs =%0#18" PRIx64 "\trip=%0#18" PRIx64 "\t"
+            "rfl=%0#18" PRIx64 "\terr=%0#18" PRIx64 "\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",
+                printf("ss =%0#18" PRIx64 "\n", istate->ss);
+        
+        printf("rax=%0#18" PRIx64 "\trbx=%0#18" PRIx64 "\t"
+            "rcx=%0#18" PRIx64 "\trdx=%0#18" PRIx64 "\n",
             istate->rax, istate->rbx, istate->rcx, istate->rdx);
-        printf("rsi=%p\trdi=%p\trbp=%p\trsp=%p\n",
+        
+        printf("rsi=%0#18" PRIx64 "\trdi=%0#18" PRIx64 "\t"
+            "rbp=%0#18" PRIx64 "\trsp=%0#18" PRIx64 "\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_from_uspace(istate) ? istate->rsp :
+            (uintptr_t) &istate->rsp);
+        
+        printf("r8 =%0#18" PRIx64 "\tr9 =%0#18" PRIx64 "\t"
+            "r10=%0#18" PRIx64 "\tr11=%0#18" PRIx64 "\n",
             istate->r8, istate->r9, istate->r10, istate->r11);
-        printf("r12=%p\tr13=%p\tr14=%p\tr15=%p\n",
+        
+        printf("r12=%0#18" PRIx64 "\tr13=%0#18" PRIx64 "\t"
+            "r14=%0#18" PRIx64 "\tr15=%0#18" PRIx64 "\n",
             istate->r12, istate->r13, istate->r14, istate->r15);
 }