--- np2/i386c/ia32/cpu_io.c	2004/02/05 16:43:44	1.3
+++ np2/i386c/ia32/cpu_io.c	2012/01/08 18:25:34	1.12
@@ -1,5 +1,3 @@
-/*	$Id: cpu_io.c,v 1.3 2004/02/05 16:43:44 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -28,43 +24,42 @@
  */
 
 #include "compiler.h"
+
 #include "cpu.h"
 #include "pccore.h"
 #include "iocore.h"
+#include "memory.h"
 
+static void CPUCALL check_io(UINT port, UINT len);
 
-static void
-check_io(WORD port, DWORD len)
+static void CPUCALL
+check_io(UINT port, UINT len) 
 {
-	WORD off;
-	BYTE bit;
-	BYTE map;
+	UINT off;
+	UINT16 map;
+	UINT16 mask;
 
 	if (CPU_STAT_IOLIMIT == 0) {
 		VERBOSE(("check_io: CPU_STAT_IOLIMIT == 0 (port = %04x, len = %d)", port, len));
 		EXCEPTION(GP_EXCEPTION, 0);
 	}
 
+	if ((port + len) / 8 >= CPU_STAT_IOLIMIT) {
+		VERBOSE(("check_io: out of range: CPU_STAT_IOLIMIT(%08x) (port = %04x, len = %d)", CPU_STAT_IOLIMIT, port, len));
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
+
 	off = port / 8;
-	bit = 1 << (port % 8);
-	for (; len > 0; ++off, bit = 0x01) {
-		if (off >= CPU_STAT_IOLIMIT) {
-			VERBOSE(("check_io: off(%08x) >= CPU_STAT_IOLIMIT(%08x) (port = %04x, len = %d)", off, CPU_STAT_IOLIMIT, port, len));
-			EXCEPTION(GP_EXCEPTION, 0);
-		}
-
-		map = cpu_kmemoryread(CPU_STAT_IOADDR + off);
-		for (; (len > 0) && (bit != 0x00); bit <<= 1, --len) {
-			if (map & bit) {
-				VERBOSE(("check_io: (bitmap(0x%02x) & bit(0x%02x)) != 0 (port = %04x, len = %d)", map, bit, port, len));
-				EXCEPTION(GP_EXCEPTION, 0);
-			}
-		}
+	mask = ((1 << len) - 1) << (port % 8);
+	map = cpu_kmemoryread_w(CPU_STAT_IOADDR + off);
+	if (map & mask) {
+		VERBOSE(("check_io: (bitmap(0x%04x) & bit(0x%04x)) != 0 (CPU_STAT_IOADDR=0x%08x, offset=0x%04x, port = 0x%04x, len = %d)", map, mask, CPU_STAT_IOADDR, off, port, len));
+		EXCEPTION(GP_EXCEPTION, 0);
 	}
 }
 
-BYTE
-cpu_in(WORD port)
+UINT8 IOINPCALL
+cpu_in(UINT port)
 {
 
 	if (CPU_STAT_PM && (CPU_STAT_VM86 || (CPU_STAT_CPL > CPU_STAT_IOPL))) {
@@ -73,8 +68,8 @@ cpu_in(WORD port)
 	return iocore_inp8(port);
 }
 
-WORD
-cpu_in_w(WORD port)
+UINT16 IOINPCALL
+cpu_in_w(UINT port)
 {
 
 	if (CPU_STAT_PM && (CPU_STAT_VM86 || (CPU_STAT_CPL > CPU_STAT_IOPL))) {
@@ -83,8 +78,8 @@ cpu_in_w(WORD port)
 	return iocore_inp16(port);
 }
 
-DWORD
-cpu_in_d(WORD port)
+UINT32 IOINPCALL
+cpu_in_d(UINT port)
 {
 
 	if (CPU_STAT_PM && (CPU_STAT_VM86 || (CPU_STAT_CPL > CPU_STAT_IOPL))) {
@@ -93,8 +88,8 @@ cpu_in_d(WORD port)
 	return iocore_inp32(port);
 }
 
-void
-cpu_out(WORD port, BYTE data)
+void IOOUTCALL
+cpu_out(UINT port, UINT8 data)
 {
 
 	if (CPU_STAT_PM && (CPU_STAT_VM86 || (CPU_STAT_CPL > CPU_STAT_IOPL))) {
@@ -103,8 +98,8 @@ cpu_out(WORD port, BYTE data)
 	iocore_out8(port, data);
 }
 
-void
-cpu_out_w(WORD port, WORD data)
+void IOOUTCALL
+cpu_out_w(UINT port, UINT16 data)
 {
 
 	if (CPU_STAT_PM && (CPU_STAT_VM86 || (CPU_STAT_CPL > CPU_STAT_IOPL))) {
@@ -113,8 +108,8 @@ cpu_out_w(WORD port, WORD data)
 	iocore_out16(port, data);
 }
 
-void
-cpu_out_d(WORD port, DWORD data)
+void IOOUTCALL
+cpu_out_d(UINT port, UINT32 data)
 {
 
 	if (CPU_STAT_PM && (CPU_STAT_VM86 || (CPU_STAT_CPL > CPU_STAT_IOPL))) {