--- np2/i386c/memory.c	2004/03/04 15:55:26	1.14
+++ np2/i386c/memory.c	2004/03/04 17:36:05	1.16
@@ -902,9 +902,6 @@ void MEMCALL i286_memorywrite(UINT32 add
 			mem9821_w(addr, value);
 		}
 #endif
-		else {
-			TRACEOUT(("mem_w %x %x", addr, value));
-		}
 	}
 	else {
 		memfn.wr8[(addr >> 15) & 0x1f](addr, value);
@@ -969,7 +966,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 +1018,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 +1051,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,12 +1081,11 @@ 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	pde;
 	UINT32	pte;
@@ -1111,7 +1107,7 @@ retdummy:
 	return(0x01000000);		// てきとーにメモリが存在しない場所
 }
 
-void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) {
+void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) {
 
 	UINT32	adrs;
 	UINT	size;
@@ -1122,14 +1118,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,27 +1136,40 @@ 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) {
 
-#if 0		// テスト
-void MEMCALL cpumem_strread(UINT32 adrs, void *dat, UINT leng) {
+	UINT	size;
+
+	while(leng) {
+		size = 0x1000 - (address & 0xfff);
+		size = min(size, leng);
+		memp_read(physicaladdr(address), dat, size);
+		address += size;
+		dat = ((BYTE *)dat) + size;
+		leng -= size;
+	}
+}
+
+void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng) {
 
 	UINT	size;
 
 	while(leng) {
-		size = 0x1000 - (adrs & 0xfff);
+		size = 0x1000 - (address & 0xfff);
 		size = min(size, leng);
-		i286_memx_read(realaddr(adrs), dat, size);
-		adrs += size;
+		memp_write(physicaladdr(address), dat, size);
+		address += size;
 		dat = ((BYTE *)dat) + size;
 		leng -= size;
 	}
 }
+
 #endif