--- np2/i386c/memory.c	2005/03/16 08:01:12	1.33
+++ np2/i386c/memory.c	2012/01/29 14:53:54	1.40
@@ -173,7 +173,7 @@ static const VACCTBL vacctbl[0x10] = {
 		{memegc_rd8,	memegc_wr8,		memegc_rd16,	memegc_wr16}};
 
 
-void MEMCALL i286_memorymap(UINT type) {
+void MEMCALL memm_arch(UINT type) {
 
 const MMAPTBL	*mm;
 
@@ -194,14 +194,15 @@ const MMAPTBL	*mm;
 	memfn0.wr16[0xf8000 >> 15] = mm->bwr16;
 }
 
-void MEMCALL i286_vram_dispatch(UINT func) {
+void MEMCALL memm_vram(UINT func) {
 
 const VACCTBL	*vacc;
 
 #if defined(SUPPORT_PC9821)
 	if (!(func & 0x20)) {
-#endif
+#endif	// defined(SUPPORT_PC9821)
 		vacc = vacctbl + (func & 0x0f);
+
 		memfn0.rd8[0xa8000 >> 15] = vacc->rd8;
 		memfn0.rd8[0xb0000 >> 15] = vacc->rd8;
 		memfn0.rd8[0xb8000 >> 15] = vacc->rd8;
@@ -222,7 +223,7 @@ const VACCTBL	*vacc;
 		memfn0.wr16[0xb8000 >> 15] = vacc->wr16;
 		memfn0.wr16[0xe0000 >> 15] = vacc->wr16;
 
-		if (!(func & 0x10)) {							// digital
+		if (!(func & (1 << VOPBIT_ANALOG))) {					// digital
 			memfn0.rd8[0xe0000 >> 15] = memnc_rd8;
 			memfn0.wr8[0xe0000 >> 15] = memnc_wr8;
 			memfn0.rd16[0xe0000 >> 15] = memnc_rd16;
@@ -251,7 +252,7 @@ const VACCTBL	*vacc;
 		memfn0.wr16[0xb8000 >> 15] = memnc_wr16;
 		memfn0.wr16[0xe0000 >> 15] = memvgaio_wr16;
 	}
-#endif
+#endif	// defined(SUPPORT_PC9821)
 }
 
 
@@ -316,202 +317,211 @@ static const MEMFNF memfnf = {
 
 // ----
 
-REG8 MEMCALL i286_memoryread(UINT32 addr) {
+REG8 MEMCALL memp_read8(UINT32 address) {
 
-	if (addr < I286_MEMREADMAX) {
-		return(mem[addr]);
+	if (address < I286_MEMREADMAX) {
+		return(mem[address]);
 	}
 	else {
-		addr = addr & CPU_ADRSMASK;
-		if (addr < USE_HIMEM) {
-			return(memfn0.rd8[addr >> 15](addr));
+		address = address & CPU_ADRSMASK;
+		if (address < USE_HIMEM) {
+			return(memfn0.rd8[address >> 15](address));
 		}
-		else if (addr < CPU_EXTLIMIT16) {
-			return(CPU_EXTMEMBASE[addr]);
+		else if (address < CPU_EXTLIMIT16) {
+			return(CPU_EXTMEMBASE[address]);
 		}
-		else if (addr < 0x00f00000) {
+		else if (address < 0x00f00000) {
 			return(0xff);
 		}
-		else if (addr < 0x01000000) {
-			return(memfnf.rd8[(addr >> 17) & 7](addr));
+		else if (address < 0x01000000) {
+			return(memfnf.rd8[(address >> 17) & 7](address));
 		}
-		else if (addr < CPU_EXTLIMIT) {
-			return(CPU_EXTMEMBASE[addr]);
+#if defined(CPU_EXTLIMIT)
+		else if (address < CPU_EXTLIMIT) {
+			return(CPU_EXTMEMBASE[address]);
 		}
+#endif	// defined(CPU_EXTLIMIT)
 #if defined(SUPPORT_PC9821)
-		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-			return(memvgaf_rd8(addr));
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			return(memvgaf_rd8(address));
 		}
-#endif
+#endif	// defined(SUPPORT_PC9821)
 		else {
-//			TRACEOUT(("out of mem (read8): %x", addr));
+//			TRACEOUT(("out of mem (read8): %x", address));
 			return(0xff);
 		}
 	}
 }
 
-REG16 MEMCALL i286_memoryread_w(UINT32 addr) {
+REG16 MEMCALL memp_read16(UINT32 address) {
 
 	REG16	ret;
 
-	if (addr < (I286_MEMREADMAX - 1)) {
-		return(LOADINTELWORD(mem + addr));
+	if (address < (I286_MEMREADMAX - 1)) {
+		return(LOADINTELWORD(mem + address));
 	}
-	else if ((addr + 1) & 0x7fff) {				// non 32kb boundary
-		addr = addr & CPU_ADRSMASK;
-		if (addr < USE_HIMEM) {
-			return(memfn0.rd16[addr >> 15](addr));
+	else if ((address + 1) & 0x7fff) {			// non 32kb boundary
+		address = address & CPU_ADRSMASK;
+		if (address < USE_HIMEM) {
+			return(memfn0.rd16[address >> 15](address));
 		}
-		else if (addr < CPU_EXTLIMIT16) {
-			return(LOADINTELWORD(CPU_EXTMEMBASE + addr));
+		else if (address < CPU_EXTLIMIT16) {
+			return(LOADINTELWORD(CPU_EXTMEMBASE + address));
 		}
-		else if (addr < 0x00f00000) {
+		else if (address < 0x00f00000) {
 			return(0xffff);
 		}
-		else if (addr < 0x01000000) {
-			return(memfnf.rd16[(addr >> 17) & 7](addr));
+		else if (address < 0x01000000) {
+			return(memfnf.rd16[(address >> 17) & 7](address));
 		}
-		else if (addr < CPU_EXTLIMIT) {
-			return(LOADINTELWORD(CPU_EXTMEMBASE + addr));
+#if defined(CPU_EXTLIMIT)
+		else if (address < CPU_EXTLIMIT) {
+			return(LOADINTELWORD(CPU_EXTMEMBASE + address));
 		}
+#endif	// defined(CPU_EXTLIMIT)
 #if defined(SUPPORT_PC9821)
-		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-			return(memvgaf_rd16(addr));
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			return(memvgaf_rd16(address));
 		}
-#endif
+#endif	// defined(SUPPORT_PC9821)
 		else {
-//			TRACEOUT(("out of mem (read16): %x", addr));
+//			TRACEOUT(("out of mem (read16): %x", address));
 			return(0xffff);
 		}
 	}
 	else {
-		ret = i286_memoryread(addr);
-		ret += (REG16)(i286_memoryread(addr + 1) << 8);
+		ret = memp_read8(address + 0);
+		ret += (REG16)(memp_read8(address + 1) << 8);
 		return(ret);
 	}
 }
 
-UINT32 MEMCALL i286_memoryread_d(UINT32 addr) {
+UINT32 MEMCALL memp_read32(UINT32 address) {
 
 	UINT32	pos;
 	UINT32	ret;
 
-	if (addr < (I286_MEMREADMAX - 3)) {
-		return(LOADINTELDWORD(mem + addr));
+	if (address < (I286_MEMREADMAX - 3)) {
+		return(LOADINTELDWORD(mem + address));
 	}
-	else if (addr >= USE_HIMEM) {
-		pos = addr & CPU_ADRSMASK;
+	else if (address >= USE_HIMEM) {
+		pos = address & CPU_ADRSMASK;
 		if ((pos >= USE_HIMEM) && ((pos + 3) < CPU_EXTLIMIT16)) {
 			return(LOADINTELDWORD(CPU_EXTMEMBASE + pos));
 		}
 	}
-	if (!(addr & 1)) {
-		ret = i286_memoryread_w(addr);
-		ret += (UINT32)i286_memoryread_w(addr + 2) << 16;
+	if (!(address & 1)) {
+		ret = memp_read16(address + 0);
+		ret += (UINT32)memp_read16(address + 2) << 16;
 	}
 	else {
-		ret = i286_memoryread(addr);
-		ret += (UINT32)i286_memoryread_w(addr + 1) << 8;
-		ret += (UINT32)i286_memoryread(addr + 3) << 24;
+		ret = memp_read8(address + 0);
+		ret += (UINT32)memp_read16(address + 1) << 8;
+		ret += (UINT32)memp_read8(address + 3) << 24;
 	}
 	return(ret);
 }
 
-void MEMCALL i286_memorywrite(UINT32 addr, REG8 value) {
+void MEMCALL memp_write8(UINT32 address, REG8 value) {
 
-	if (addr < I286_MEMWRITEMAX) {
-		mem[addr] = (UINT8)value;
+	if (address < I286_MEMWRITEMAX) {
+		mem[address] = (UINT8)value;
 	}
 	else {
-		addr = addr & CPU_ADRSMASK;
-		if (addr < USE_HIMEM) {
-			memfn0.wr8[addr >> 15](addr, value);
+		address = address & CPU_ADRSMASK;
+		if (address < USE_HIMEM) {
+			memfn0.wr8[address >> 15](address, value);
 		}
-		else if (addr < CPU_EXTLIMIT16) {
-			CPU_EXTMEMBASE[addr] = (UINT8)value;
+		else if (address < CPU_EXTLIMIT16) {
+			CPU_EXTMEMBASE[address] = (UINT8)value;
 		}
-		else if (addr < 0x00f00000) {
+		else if (address < 0x00f00000) {
 		}
-		else if (addr < 0x01000000) {
-			memfnf.wr8[(addr >> 17) & 7](addr, value);
+		else if (address < 0x01000000) {
+			memfnf.wr8[(address >> 17) & 7](address, value);
 		}
-		else if (addr < CPU_EXTLIMIT) {
-			CPU_EXTMEMBASE[addr] = (UINT8)value;
+#if defined(CPU_EXTLIMIT)
+		else if (address < CPU_EXTLIMIT) {
+			CPU_EXTMEMBASE[address] = (UINT8)value;
 		}
+#endif	// defined(CPU_EXTLIMIT)
 #if defined(SUPPORT_PC9821)
-		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-			memvgaf_wr8(addr, value);
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			memvgaf_wr8(address, value);
 		}
-#endif
+#endif	// defined(SUPPORT_PC9821)
 		else {
-//			TRACEOUT(("out of mem (write8): %x", addr));
+//			TRACEOUT(("out of mem (write8): %x", address));
 		}
 	}
 }
 
-void MEMCALL i286_memorywrite_w(UINT32 addr, REG16 value) {
+void MEMCALL memp_write16(UINT32 address, REG16 value) {
 
-	if (addr < (I286_MEMWRITEMAX - 1)) {
-		STOREINTELWORD(mem + addr, value);
+	if (address < (I286_MEMWRITEMAX - 1)) {
+		STOREINTELWORD(mem + address, value);
 	}
-	else if ((addr + 1) & 0x7fff) {				// non 32kb boundary
-		addr = addr & CPU_ADRSMASK;
-		if (addr < USE_HIMEM) {
-			memfn0.wr16[addr >> 15](addr, value);
+	else if ((address + 1) & 0x7fff) {			// non 32kb boundary
+		address = address & CPU_ADRSMASK;
+		if (address < USE_HIMEM) {
+			memfn0.wr16[address >> 15](address, value);
 		}
-		else if (addr < CPU_EXTLIMIT16) {
-			STOREINTELWORD(CPU_EXTMEMBASE + addr, value);
+		else if (address < CPU_EXTLIMIT16) {
+			STOREINTELWORD(CPU_EXTMEMBASE + address, value);
 		}
-		else if (addr < 0x00f00000) {
+		else if (address < 0x00f00000) {
 		}
-		else if (addr < 0x01000000) {
-			memfnf.wr16[(addr >> 17) & 7](addr, value);
+		else if (address < 0x01000000) {
+			memfnf.wr16[(address >> 17) & 7](address, value);
 		}
-		else if (addr < CPU_EXTLIMIT) {
-			STOREINTELWORD(CPU_EXTMEMBASE + addr, value);
+#if defined(CPU_EXTLIMIT)
+		else if (address < CPU_EXTLIMIT) {
+			STOREINTELWORD(CPU_EXTMEMBASE + address, value);
 		}
+#endif	// defined(CPU_EXTLIMIT)
 #if defined(SUPPORT_PC9821)
-		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-			memvgaf_wr16(addr, value);
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			memvgaf_wr16(address, value);
 		}
-#endif
+#endif	// defined(SUPPORT_PC9821)
 		else {
-//			TRACEOUT(("out of mem (write16): %x", addr));
+//			TRACEOUT(("out of mem (write16): %x", address));
 		}
 	}
 	else {
-		i286_memorywrite(addr, (UINT8)value);
-		i286_memorywrite(addr + 1, (UINT8)(value >> 8));
+		memp_write8(address + 0, (UINT8)value);
+		memp_write8(address + 1, (UINT8)(value >> 8));
 	}
 }
 
-void MEMCALL i286_memorywrite_d(UINT32 addr, UINT32 value) {
+void MEMCALL memp_write32(UINT32 address, UINT32 value) {
 
 	UINT32	pos;
 
-	if (addr < (I286_MEMWRITEMAX - 3)) {
-		STOREINTELDWORD(mem + addr, value);
+	if (address < (I286_MEMWRITEMAX - 3)) {
+		STOREINTELDWORD(mem + address, value);
 		return;
 	}
-	else if (addr >= USE_HIMEM) {
-		pos = addr & CPU_ADRSMASK;
+	else if (address >= USE_HIMEM) {
+		pos = address & CPU_ADRSMASK;
 		if ((pos >= USE_HIMEM) && ((pos + 3) < CPU_EXTLIMIT16)) {
 			STOREINTELDWORD(CPU_EXTMEMBASE + pos, value);
 			return;
 		}
 	}
-	if (!(addr & 1)) {
-		i286_memorywrite_w(addr, (UINT16)value);
-		i286_memorywrite_w(addr + 2, (UINT16)(value >> 16));
+	if (!(address & 1)) {
+		memp_write16(address + 0, (UINT16)value);
+		memp_write16(address + 2, (UINT16)(value >> 16));
 	}
 	else {
-		i286_memorywrite(addr, (UINT8)value);
-		i286_memorywrite_w(addr + 1, (UINT16)(value >> 8));
-		i286_memorywrite(addr + 3, (UINT8)(value >> 24));
+		memp_write8(address + 0, (UINT8)value);
+		memp_write16(address + 1, (UINT16)(value >> 8));
+		memp_write8(address + 3, (UINT8)(value >> 24));
 	}
 }
 
-void MEMCALL memp_read(UINT32 address, void *dat, UINT leng) {
+
+void MEMCALL memp_reads(UINT32 address, void *dat, UINT leng) {
 
 	UINT8 *out = (UINT8 *)dat;
 	UINT diff;
@@ -536,11 +546,11 @@ void MEMCALL memp_read(UINT32 address, v
 
 	/* slow memory access */
 	while (leng-- > 0) {
-		*out++ = i286_memoryread(address++);
+		*out++ = memp_read8(address++);
 	}
 }
 
-void MEMCALL memp_write(UINT32 address, const void *dat, UINT leng) {
+void MEMCALL memp_writes(UINT32 address, const void *dat, UINT leng) {
 
 	const UINT8 *out = (UINT8 *)dat;
 	UINT diff;
@@ -565,26 +575,26 @@ void MEMCALL memp_write(UINT32 address, 
 
 	/* slow memory access */
 	while (leng-- > 0) {
-		i286_memorywrite(address++, *out++);
+		memp_write8(address++, *out++);
 	}
 }
 
 
 // ---- Logical Space (BIOS)
 
-static UINT32 physicaladdr(UINT32 addr, BOOL wr) {
+static UINT32 MEMCALL physicaladdr(UINT32 addr, BOOL wr) {
 
 	UINT32	a;
 	UINT32	pde;
 	UINT32	pte;
 
 	a = CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc);
-	pde = i286_memoryread_d(a);
+	pde = memp_read32(a);
 	if (!(pde & CPU_PDE_PRESENT)) {
 		goto retdummy;
 	}
 	if (!(pde & CPU_PDE_ACCESS)) {
-		i286_memorywrite(a, (UINT8)(pde | CPU_PDE_ACCESS));
+		memp_write8(a, (UINT8)(pde | CPU_PDE_ACCESS));
 	}
 	a = (pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc);
 	pte = cpu_memoryread_d(a);
@@ -592,20 +602,59 @@ static UINT32 physicaladdr(UINT32 addr, 
 		goto retdummy;
 	}
 	if (!(pte & CPU_PTE_ACCESS)) {
-		i286_memorywrite(a, (UINT8)(pte | CPU_PTE_ACCESS));
+		memp_write8(a, (UINT8)(pte | CPU_PTE_ACCESS));
 	}
 	if ((wr) && (!(pte & CPU_PTE_DIRTY))) {
-		i286_memorywrite(a, (UINT8)(pte | CPU_PTE_DIRTY));
+		memp_write8(a, (UINT8)(pte | CPU_PTE_DIRTY));
 	}
 	addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff);
 	return(addr);
 
-retdummy:
-	return(0x01000000);		// てきとーにメモリが存在しない場所
+ retdummy:
+	return(0x01000000);	/* XXX */
+}
+
+
+void MEMCALL meml_reads(UINT32 address, void *dat, UINT leng) {
+
+	UINT	size;
+
+	if (!CPU_STAT_PAGING) {
+		memp_reads(address, dat, leng);
+	}
+	else {
+		while(leng) {
+			size = 0x1000 - (address & 0xfff);
+			size = min(size, leng);
+			memp_reads(physicaladdr(address, FALSE), dat, size);
+			address += size;
+			dat = ((UINT8 *)dat) + size;
+			leng -= size;
+		}
+	}
+}
+
+void MEMCALL meml_writes(UINT32 address, const void *dat, UINT leng) {
+
+	UINT	size;
+
+	if (!CPU_STAT_PAGING) {
+		memp_writes(address, dat, leng);
+	}
+	else {
+		while(leng) {
+			size = 0x1000 - (address & 0xfff);
+			size = min(size, leng);
+			memp_writes(physicaladdr(address, TRUE), dat, size);
+			address += size;
+			dat = ((UINT8 *)dat) + size;
+			leng -= size;
+		}
+	}
 }
 
 
-REG8 MEMCALL meml_read8(UINT seg, UINT off) {
+REG8 MEMCALL memr_read8(UINT seg, UINT off) {
 
 	UINT32	addr;
 
@@ -613,24 +662,24 @@ REG8 MEMCALL meml_read8(UINT seg, UINT o
 	if (CPU_STAT_PAGING) {
 		addr = physicaladdr(addr, FALSE);
 	}
-	return(i286_memoryread(addr));
+	return(memp_read8(addr));
 }
 
-REG16 MEMCALL meml_read16(UINT seg, UINT off) {
+REG16 MEMCALL memr_read16(UINT seg, UINT off) {
 
 	UINT32	addr;
 
 	addr = (seg << 4) + LOW16(off);
 	if (!CPU_STAT_PAGING) {
-		return(i286_memoryread_w(addr));
+		return(memp_read16(addr));
 	}
 	else if ((addr + 1) & 0xfff) {
-		return(i286_memoryread_w(physicaladdr(addr, FALSE)));
+		return(memp_read16(physicaladdr(addr, FALSE)));
 	}
-	return(meml_read8(seg, off) + (meml_read8(seg, off + 1) << 8));
+	return(memr_read8(seg, off) + (memr_read8(seg, off + 1) << 8));
 }
 
-void MEMCALL meml_write8(UINT seg, UINT off, REG8 dat) {
+void MEMCALL memr_write8(UINT seg, UINT off, REG8 dat) {
 
 	UINT32	addr;
 
@@ -638,27 +687,27 @@ void MEMCALL meml_write8(UINT seg, UINT 
 	if (CPU_STAT_PAGING) {
 		addr = physicaladdr(addr, TRUE);
 	}
-	i286_memorywrite(addr, dat);
+	memp_write8(addr, dat);
 }
 
-void MEMCALL meml_write16(UINT seg, UINT off, REG16 dat) {
+void MEMCALL memr_write16(UINT seg, UINT off, REG16 dat) {
 
 	UINT32	addr;
 
 	addr = (seg << 4) + LOW16(off);
 	if (!CPU_STAT_PAGING) {
-		i286_memorywrite_w(addr, dat);
+		memp_write16(addr, dat);
 	}
 	else if ((addr + 1) & 0xfff) {
-		i286_memorywrite_w(physicaladdr(addr, TRUE), dat);
+		memp_write16(physicaladdr(addr, TRUE), dat);
 	}
 	else {
-		meml_write8(seg, off, (REG8)dat);
-		meml_write8(seg, off + 1, (REG8)(dat >> 8));
+		memr_write8(seg, off, (REG8)dat);
+		memr_write8(seg, off + 1, (REG8)(dat >> 8));
 	}
 }
 
-void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) {
+void MEMCALL memr_reads(UINT seg, UINT off, void *dat, UINT leng) {
 
 	UINT32	addr;
 	UINT	rem;
@@ -674,14 +723,14 @@ void MEMCALL meml_readstr(UINT seg, UINT
 			size = min(size, rem);
 			addr = physicaladdr(addr, FALSE);
 		}
-		memp_read(addr, dat, size);
+		memp_reads(addr, dat, size);
 		off += size;
 		dat = ((UINT8 *)dat) + size;
 		leng -= size;
 	}
 }
 
-void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng) {
+void MEMCALL memr_writes(UINT seg, UINT off, const void *dat, UINT leng) {
 
 	UINT32	addr;
 	UINT	rem;
@@ -697,50 +746,11 @@ void MEMCALL meml_writestr(UINT seg, UIN
 			size = min(size, rem);
 			addr = physicaladdr(addr, TRUE);
 		}
-		memp_write(addr, dat, size);
+		memp_writes(addr, dat, size);
 		off += size;
 		dat = ((UINT8 *)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, FALSE), dat, size);
-			address += size;
-			dat = ((UINT8 *)dat) + size;
-			leng -= size;
-		}
-	}
-}
-
-void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng) {
-
-	UINT	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, TRUE), dat, size);
-			address += size;
-			dat = ((UINT8 *)dat) + size;
-			leng -= size;
-		}
-	}
-}
-
 #endif
-