Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision cb4f078ad0b0beb6ab22ecd75634643d7668acbc)
+++ kernel/arch/amd64/src/interrupt.c	(revision 8d308b91dd790ada0c5d8348bda8fc122a39f6b6)
@@ -66,28 +66,27 @@
 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 =%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 =%#0" PRIx64 "\n", istate->ss);
-	
-	printf("rax=%#0" PRIx64 "\trbx=%#0" PRIx64 "\t"
-	    "rcx=%#0" PRIx64 "\trdx=%#0" PRIx64 "\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",
-	    (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",
+	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 =%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=%#0" PRIx64 "\tr13=%#0" PRIx64 "\t"
-	    "r14=%#0" PRIx64 "\tr15=%#0" PRIx64 "\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);
 }