Changes in kernel/arch/amd64/src/interrupt.c [acc7ce4:9171f12] in mainline

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 =%#0" PRIx64 "\trip=%p\t"
-            "rfl=%#0" PRIx64 "\terr=%#0" PRIx64 "\n",
-            istate->cs, (void *) istate->rip,
-            istate->rflags, istate->error_word);
-        
+        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 =%#0" PRIx64 "\n", istate->ss);
-        
-        printf("rax=%#0" PRIx64 "\trbx=%#0" PRIx64 "\t"
-            "rcx=%#0" PRIx64 "\trdx=%#0" PRIx64 "\n",
+                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",
-            (void *) istate->rsi, (void *) istate->rdi,
-            (void *) istate->rbp,
-            istate_from_uspace(istate) ? ((void *) istate->rsp) :
-            &istate->rsp);
-        
-        printf("r8 =%#0" PRIx64 "\tr9 =%#0" PRIx64 "\t"
-            "r10=%#0" PRIx64 "\tr11=%#0" 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->r8, istate->r9, istate->r10, istate->r11);
-        
-        printf("r12=%#0" PRIx64 "\tr13=%#0" PRIx64 "\t"
-            "r14=%#0" PRIx64 "\tr15=%#0" PRIx64 "\n",
+        printf("r12=%p\tr13=%p\tr14=%p\tr15=%p\n",
             istate->r12, istate->r13, istate->r14, istate->r15);
 }