--- np2/i386c/ia32/paging.c	2004/01/23 16:17:51	1.5
+++ np2/i386c/ia32/paging.c	2004/01/27 15:56:57	1.7
@@ -1,4 +1,4 @@
-/*	$Id: paging.c,v 1.5 2004/01/23 16:17:51 monaka Exp $	*/
+/*	$Id: paging.c,v 1.7 2004/01/27 15:56:57 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -239,14 +239,16 @@ cpu_linear_memory_read(DWORD laddr, DWOR
 			break;
 		}
 
-		if (length == r)
+		length -= r;
+		if (length == 0)
 			break;
 
 		laddr += r;
-		length -= r;
 		remain -= r;
-		if (remain <= 0)
+		if (remain <= 0) {
+			/* next page */
 			remain += 0x1000;
+		}
 	}
 
 	return value;
@@ -285,7 +287,7 @@ cpu_linear_memory_write(DWORD laddr, DWO
 		case 3:
 			cpu_memorywrite_w(paddr, value & 0xffff);
 			value >>= 16;
-			cpu_memorywrite(paddr, value & 0xff);
+			cpu_memorywrite(paddr + 2, value & 0xff);
 			value >>= 8;
 			break;
 
@@ -298,14 +300,16 @@ cpu_linear_memory_write(DWORD laddr, DWO
 			break;
 		}
 
-		if (length == r)
+		length -= r;
+		if (length == 0)
 			break;
 
 		laddr += r;
-		length -= r;
 		remain -= r;
-		if (remain <= 0)
+		if (remain <= 0) {
+			/* next page */
 			remain += 0x1000;
+		}
 	}
 }
 
@@ -327,14 +331,17 @@ paging_check(DWORD laddr, DWORD length, 
 		paddr = paging(laddr, crw, pl);
 
 		r = (remain > length) ? length : remain;
-		if (length == r)
+
+		length -= r;
+		if (length == 0)
 			break;
 
 		laddr += r;
-		length -= r;
 		remain -= r;
-		if (remain <= 0)
+		if (remain <= 0) {
+			/* next page */
 			remain += 0x1000;
+		}
 	}
 }
 
@@ -347,7 +354,7 @@ paging(DWORD laddr, int crw, int user_mo
 	DWORD pte_addr;	/* page table entry address */
 	DWORD pte;	/* page table entry */
 	DWORD bit;
-	DWORD err = 0;
+	DWORD err;
 
 #if defined(IA32_SUPPORT_TLB)
 	if (tlb_lookup(laddr, crw, &paddr))