Index: uspace/app/bdsh/tok.c
===================================================================
--- uspace/app/bdsh/tok.c	(revision 422722e64b724fdbff99b610f05f336291dc1b6b)
+++ uspace/app/bdsh/tok.c	(revision e64df9a72bbbfdbe211ee53a9c2961e91eed0659)
@@ -224,6 +224,6 @@
 wchar_t tok_look_char(tokenizer_t *tok)
 {
-	unsigned int old_offset = tok->in_offset;
-	unsigned int old_char_offset = tok->in_char_offset;
+	size_t old_offset = tok->in_offset;
+	size_t old_char_offset = tok->in_char_offset;
 	wchar_t ret = tok_get_char(tok);
 	tok->in_offset = old_offset;
Index: uspace/app/bdsh/tok.h
===================================================================
--- uspace/app/bdsh/tok.h	(revision 422722e64b724fdbff99b610f05f336291dc1b6b)
+++ uspace/app/bdsh/tok.h	(revision e64df9a72bbbfdbe211ee53a9c2961e91eed0659)
@@ -38,6 +38,6 @@
 typedef struct {
 	char *text;
-	unsigned int byte_start;
-	unsigned int char_start;
+	size_t byte_start;
+	size_t char_start;
 	size_t byte_length;
 	size_t char_length;
@@ -47,8 +47,8 @@
 typedef struct {
 	char *in;
-	unsigned int in_offset;
-	unsigned int last_in_offset;
-	unsigned int in_char_offset;
-	unsigned int last_in_char_offset;
+	size_t in_offset;
+	size_t last_in_offset;
+	size_t in_char_offset;
+	size_t last_in_char_offset;
 	
 	char *outbuf;
Index: uspace/lib/c/arch/ia32/include/ddi.h
===================================================================
--- uspace/lib/c/arch/ia32/include/ddi.h	(revision 422722e64b724fdbff99b610f05f336291dc1b6b)
+++ uspace/lib/c/arch/ia32/include/ddi.h	(revision e64df9a72bbbfdbe211ee53a9c2961e91eed0659)
@@ -41,63 +41,81 @@
 static inline uint8_t pio_read_8(ioport8_t *port)
 {
-	uint8_t val;
-	
-	asm volatile (
-		"inb %w[port], %b[val]\n"
-		: [val] "=a" (val)
-		: [port] "d" (port)
-	);
-	
-	return val;
+	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+		uint8_t val;
+		asm volatile (
+			"inb %w[port], %b[val]\n"
+			: [val] "=a" (val)
+			: [port] "d" (port)
+		);
+		return val;
+	} else {
+		return (uint8_t) *port;
+	}
 }
 
 static inline uint16_t pio_read_16(ioport16_t *port)
 {
-	uint16_t val;
-	
-	asm volatile (
-		"inw %w[port], %w[val]\n"
-		: [val] "=a" (val)
-		: [port] "d" (port)
-	);
-	
-	return val;
+	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+		uint16_t val;
+		asm volatile (
+			"inw %w[port], %w[val]\n"
+			: [val] "=a" (val)
+			: [port] "d" (port)
+		);
+		return val;
+	} else {
+		return (uint16_t) *port;
+	}
 }
 
 static inline uint32_t pio_read_32(ioport32_t *port)
 {
-	uint32_t val;
-	
-	asm volatile (
-		"inl %w[port], %[val]\n"
-		: [val] "=a" (val)
-		: [port] "d" (port)
-	);
-	
-	return val;
+	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+		uint32_t val;
+		asm volatile (
+			"inl %w[port], %[val]\n"
+			: [val] "=a" (val)
+			: [port] "d" (port)
+		);
+		return val;
+	} else {
+		return (uint32_t) *port;
+	}
 }
 
 static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-	asm volatile (
-		"outb %b[val], %w[port]\n"
-		:: [val] "a" (val), [port] "d" (port)
-	);
+	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+		asm volatile (
+			"outb %b[val], %w[port]\n"
+			:: [val] "a" (val), [port] "d" (port)
+		);	
+	} else {
+		*port = val;
+	}
 }
 
 static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-	asm volatile (
-		"outw %w[val], %w[port]\n"
-		:: [val] "a" (val), [port] "d" (port)
-	);
+	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+		asm volatile (
+			"outw %w[val], %w[port]\n"
+			:: [val] "a" (val), [port] "d" (port)
+		);
+	} else {
+		*port = val;
+	}
 }
 
 static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-	asm volatile (
-		"outl %[val], %w[port]\n"
-		:: [val] "a" (val), [port] "d" (port)
-	);
+	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+		asm volatile (
+			"outl %[val], %w[port]\n"
+			:: [val] "a" (val), [port] "d" (port)
+		);
+	} else {
+		*port = val;
+	}
 }