Index: dev/gxemul/cons/gxemul_cons.c
===================================================================
--- dev/gxemul/cons/gxemul_cons.c	(revision 255108)
+++ dev/gxemul/cons/gxemul_cons.c	(working copy)
@@ -99,18 +99,16 @@
  * XXXRW: Should be using FreeBSD's bus routines here, but they are not
  * available until later in the boot.
  */
-typedef	uint64_t	paddr_t;
-typedef	uint64_t	vaddr_t;
 
-static inline vaddr_t
-mips_phys_to_uncached(paddr_t phys)            
+static inline intptr_t
+mips_phys_to_uncached(intptr_t phys)            
 {
 
 	return (MIPS_PHYS_TO_DIRECT_UNCACHED(phys));
 }
 
 static inline uint8_t
-mips_ioread_uint8(vaddr_t vaddr)
+mips_ioread_uint8(intptr_t vaddr)
 {
 	uint8_t v;
 
@@ -119,7 +117,7 @@
 }
 
 static inline void
-mips_iowrite_uint8(vaddr_t vaddr, uint8_t v)
+mips_iowrite_uint8(intptr_t vaddr, uint8_t v)
 {
 
 	__asm__ __volatile__ ("sb %0, 0(%1)" : : "r" (v), "r" (vaddr));