--- np2/i386c/memory.c	2004/03/04 15:55:26	1.14
+++ np2/i386c/memory.c	2004/03/10 23:01:08	1.19
@@ -813,6 +813,7 @@ REG8 MEMCALL i286_memoryread(UINT32 addr
 		}
 #endif
 		else {
+//			TRACEOUT(("out of mem (read8): %x", addr));
 			return(0xff);
 		}
 	}
@@ -844,6 +845,7 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 			}
 #endif
 			else {
+//				TRACEOUT(("out of mem (read16): %x", addr));
 				return(0xffff);
 			}
 		}
@@ -903,7 +905,7 @@ void MEMCALL i286_memorywrite(UINT32 add
 		}
 #endif
 		else {
-			TRACEOUT(("mem_w %x %x", addr, value));
+//			TRACEOUT(("out of mem (write8): %x", addr));
 		}
 	}
 	else {
@@ -932,6 +934,9 @@ void MEMCALL i286_memorywrite_w(UINT32 a
 				mem9821_ww(addr, value);
 			}
 #endif
+			else {
+//				TRACEOUT(("out of mem (write16): %x", addr));
+			}
 		}
 		else {
 			memfn.wr16[(addr >> 15) & 0x1f](addr, value);
@@ -969,7 +974,7 @@ void MEMCALL i286_memorywrite_d(UINT32 a
 	}
 }
 
-#ifdef NP2_MEMORY_ASM
+#if 0
 REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {
 
 	UINT32	address;
@@ -1021,9 +1026,9 @@ void MEMCALL i286_memword_write(UINT seg
 		i286_memorywrite_w(address, value);
 	}
 }
-#endif /* NP2_MEMORY_ASM */
+#endif
 
-void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng) {
+void MEMCALL memp_read(UINT32 address, void *dat, UINT leng) {
 
 	BYTE *out = (BYTE *)dat;
 	UINT pos;
@@ -1054,8 +1059,8 @@ void MEMCALL i286_memx_read(UINT32 addre
 	}
 }
 
-void MEMCALL i286_memx_write(UINT32 address, const void *dat, UINT leng)
-{
+void MEMCALL memp_write(UINT32 address, const void *dat, UINT leng) {
+
 	const BYTE *out = (BYTE *)dat;
 	UINT pos;
 	UINT diff;
@@ -1084,25 +1089,37 @@ void MEMCALL i286_memx_write(UINT32 addr
 		i286_memorywrite(address++, *out++);
 	}
 }
-#endif
 
 
-// ----
+// ---- Logical Space (BIOS)
 
-static UINT32 realaddr(UINT32 addr) {
+static UINT32 physicaladdr(UINT32 addr) {
 
+	UINT32	a;
 	UINT32	pde;
 	UINT32	pte;
 
 	if (CPU_STAT_PAGING) {
-		pde = i286_memoryread_d(CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc));
+		a = CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc);
+		pde = i286_memoryread_d(a);
 		if (!(pde & CPU_PDE_PRESENT)) {
 			goto retdummy;
 		}
-		pte = cpu_memoryread_d((pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc));
+#if 0
+		if (!(pde & CPU_PDE_ACCESS)) {
+			i286_memorywrite_d(a, pde | CPU_PDE_ACCESS);
+		}
+#endif
+		a = (pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc);
+		pte = cpu_memoryread_d(a);
 		if (!(pte & CPU_PTE_PRESENT)) {
 			goto retdummy;
 		}
+#if 0
+		if (!(pte & CPU_PTE_ACCESS)) {
+			i286_memorywrite_d(a, pte | CPU_PTE_ACCESS);
+		}
+#endif
 		addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff);
 	}
 	return(addr);
@@ -1111,7 +1128,61 @@ retdummy:
 	return(0x01000000);		// てきとーにメモリが存在しない場所
 }
 
-void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) {
+
+REG8 MEMCALL meml_read8(UINT seg, UINT off) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (CPU_STAT_PAGING) {
+		addr = physicaladdr(addr);
+	}
+	return(i286_memoryread(addr));
+}
+
+REG16 MEMCALL meml_read16(UINT seg, UINT off) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (!CPU_STAT_PAGING) {
+		return(i286_memoryread_w(addr));
+	}
+	else if ((addr + 1) & 0xfff) {
+		return(i286_memoryread_w(physicaladdr(addr)));
+	}
+	return(meml_read8(seg, off) + (meml_read8(seg, off + 1) << 8));
+}
+
+void MEMCALL meml_write8(UINT seg, UINT off, REG8 dat) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (CPU_STAT_PAGING) {
+		addr = physicaladdr(addr);
+	}
+	i286_memorywrite(addr, dat);
+}
+
+void MEMCALL meml_write16(UINT seg, UINT off, REG16 dat) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (!CPU_STAT_PAGING) {
+		i286_memorywrite_w(addr, dat);
+	}
+	else if ((addr + 1) & 0xfff) {
+		i286_memorywrite_w(physicaladdr(addr), dat);
+	}
+	else {
+		meml_write8(seg, off, (REG8)dat);
+		meml_write8(seg, off + 1, (REG8)(dat >> 8));
+	}
+}
+
+void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) {
 
 	UINT32	adrs;
 	UINT	size;
@@ -1122,14 +1193,15 @@ void MEMCALL i286_memstr_read(UINT seg, 
 		size = 0x1000 - (adrs & 0xfff);
 		size = min(size, leng);
 		size = min(size, 0x10000 - off);
-		i286_memx_read(realaddr(adrs), dat, size);
+		memp_read(physicaladdr(adrs), dat, size);
 		off += size;
 		dat = ((BYTE *)dat) + size;
 		leng -= size;
 	}
 }
 
-void MEMCALL i286_memstr_write(UINT seg, UINT off, const void *dat, UINT leng) {
+void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng) {
+
 	UINT32	adrs;
 	UINT	size;
 
@@ -1139,26 +1211,48 @@ void MEMCALL i286_memstr_write(UINT seg,
 		size = 0x1000 - (adrs & 0xfff);
 		size = min(size, leng);
 		size = min(size, 0x10000 - off);
-		i286_memx_write(realaddr(adrs), dat, size);
+		memp_write(physicaladdr(adrs), dat, size);
 		off += size;
 		dat = ((BYTE *)dat) + size;
 		leng -= size;
 	}
 }
 
+void MEMCALL meml_read(UINT32 address, void *dat, UINT leng) {
+
+	UINT	size;
+
+	if (!CPU_STAT_PAGING) {
+		memp_read(address, dat, leng);
+	}
+	else {
+		while(leng) {
+			size = 0x1000 - (address & 0xfff);
+			size = min(size, leng);
+			memp_read(physicaladdr(address), dat, size);
+			address += size;
+			dat = ((BYTE *)dat) + size;
+			leng -= size;
+		}
+	}
+}
 
-#if 0		// テスト
-void MEMCALL cpumem_strread(UINT32 adrs, void *dat, UINT leng) {
+void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng) {
 
 	UINT	size;
 
-	while(leng) {
-		size = 0x1000 - (adrs & 0xfff);
-		size = min(size, leng);
-		i286_memx_read(realaddr(adrs), dat, size);
-		adrs += size;
-		dat = ((BYTE *)dat) + size;
-		leng -= size;
+	if (!CPU_STAT_PAGING) {
+		memp_write(address, dat, leng);
+	}
+	else {
+		while(leng) {
+			size = 0x1000 - (address & 0xfff);
+			size = min(size, leng);
+			memp_write(physicaladdr(address), dat, size);
+			address += size;
+			dat = ((BYTE *)dat) + size;
+			leng -= size;
+		}
 	}
 }
 #endif