--- np2/i386c/memory.c	2004/04/14 20:39:12	1.26
+++ np2/i386c/memory.c	2005/03/18 06:49:17	1.34
@@ -3,653 +3,93 @@
 #ifndef NP2_MEMORY_ASM
 
 #include	"cpucore.h"
-#include	"egcmem.h"
-#include	"mem9821.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"memtram.h"
+#include	"memvram.h"
+#include	"memegc.h"
+#if defined(SUPPORT_PC9821)
+#include	"memvga.h"
+#endif
+#include	"memems.h"
+#include	"memepp.h"
 #include	"vram.h"
 #include	"font.h"
 
 
-	BYTE	mem[0x200000];
-
-
-// ---- write byte
-
-static void MEMCALL i286_wt(UINT32 address, REG8 value) {		// MAIN
-
-	mem[address & CPU_ADRSMASK] = (BYTE)value;
-}
-
-static void MEMCALL tram_wt(UINT32 address, REG8 value) {		// TRAM
-
-	CPU_REMCLOCK -= MEMWAIT_TRAM;
-	if (address < 0xa2000) {
-		mem[address] = (BYTE)value;
-		tramupdate[LOW12(address >> 1)] = 1;
-		gdcs.textdisp |= 1;
-	}
-	else if (address < 0xa3fe0) {
-		if (!(address & 1)) {
-			mem[address] = (BYTE)value;
-			tramupdate[LOW12(address >> 1)] = 1;
-			gdcs.textdisp |= 1;
-		}
-	}
-	else if (address < 0xa4000) {
-		if (!(address & 1)) {
-			if ((!(address & 2)) || (gdcs.msw_accessable)) {
-				mem[address] = (BYTE)value;
-				tramupdate[LOW12(address >> 1)] = 1;
-				gdcs.textdisp |= 1;
-			}
-		}
-	}
-	else if (address < 0xa5000) {
-		if ((address & 1) && (cgwindow.writable & 1)) {
-			cgwindow.writable |= 0x80;
-			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
-		}
-	}
-}
-
-static void MEMCALL vram_w0(UINT32 address, REG8 value) {		// VRAM
-
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	mem[address] = (BYTE)value;
-	vramupdate[LOW15(address)] |= 1;
-	gdcs.grphdisp |= 1;
-}
-
-static void MEMCALL vram_w1(UINT32 address, REG8 value) {		// VRAM
-
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	mem[address + VRAM_STEP] = (BYTE)value;
-	vramupdate[LOW15(address)] |= 2;
-	gdcs.grphdisp |= 2;
-}
-
-static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) {		// VRAM
-
-	REG8	mask;
-	BYTE	*vram;
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	mask = ~value;
-	address = LOW15(address);
-	vramupdate[address] |= 1;
-	gdcs.grphdisp |= 1;
-	vram = mem + address;
-	if (!(grcg.modereg & 1)) {
-		vram[VRAM0_B] &= mask;
-		vram[VRAM0_B] |= (value & grcg.tile[0].b[0]);
-	}
-	if (!(grcg.modereg & 2)) {
-		vram[VRAM0_R] &= mask;
-		vram[VRAM0_R] |= (value & grcg.tile[1].b[0]);
-	}
-	if (!(grcg.modereg & 4)) {
-		vram[VRAM0_G] &= mask;
-		vram[VRAM0_G] |= (value & grcg.tile[2].b[0]);
-	}
-	if (!(grcg.modereg & 8)) {
-		vram[VRAM0_E] &= mask;
-		vram[VRAM0_E] |= (value & grcg.tile[3].b[0]);
-	}
-}
-
-static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) {		// VRAM
-
-	REG8	mask;
-	BYTE	*vram;
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	mask = ~value;
-	address = LOW15(address);
-	vramupdate[address] |= 2;
-	gdcs.grphdisp |= 2;
-	vram = mem + address;
-	if (!(grcg.modereg & 1)) {
-		vram[VRAM1_B] &= mask;
-		vram[VRAM1_B] |= (value & grcg.tile[0].b[0]);
-	}
-	if (!(grcg.modereg & 2)) {
-		vram[VRAM1_R] &= mask;
-		vram[VRAM1_R] |= (value & grcg.tile[1].b[0]);
-	}
-	if (!(grcg.modereg & 4)) {
-		vram[VRAM1_G] &= mask;
-		vram[VRAM1_G] |= (value & grcg.tile[2].b[0]);
-	}
-	if (!(grcg.modereg & 8)) {
-		vram[VRAM1_E] &= mask;
-		vram[VRAM1_E] |= (value & grcg.tile[3].b[0]);
-	}
-}
-
-static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) {		// VRAM
-
-	BYTE	*vram;
+	UINT8	mem[0x200000];
 
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	address = LOW15(address);
-	vramupdate[address] |= 1;
-	gdcs.grphdisp |= 1;
-	vram = mem + address;
-	if (!(grcg.modereg & 1)) {
-		vram[VRAM0_B] = grcg.tile[0].b[0];
-	}
-	if (!(grcg.modereg & 2)) {
-		vram[VRAM0_R] = grcg.tile[1].b[0];
-	}
-	if (!(grcg.modereg & 4)) {
-		vram[VRAM0_G] = grcg.tile[2].b[0];
-	}
-	if (!(grcg.modereg & 8)) {
-		vram[VRAM0_E] = grcg.tile[3].b[0];
-	}
-	(void)value;
-}
-
-static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) {		// VRAM
-
-	BYTE	*vram;
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	address = LOW15(address);
-	vramupdate[address] |= 2;
-	gdcs.grphdisp |= 2;
-	vram = mem + address;
-	if (!(grcg.modereg & 1)) {
-		vram[VRAM1_B] = grcg.tile[0].b[0];
-	}
-	if (!(grcg.modereg & 2)) {
-		vram[VRAM1_R] = grcg.tile[1].b[0];
-	}
-	if (!(grcg.modereg & 4)) {
-		vram[VRAM1_G] = grcg.tile[2].b[0];
-	}
-	if (!(grcg.modereg & 8)) {
-		vram[VRAM1_E] = grcg.tile[3].b[0];
-	}
-	(void)value;
-}
-
-static void MEMCALL egc_wt(UINT32 address, REG8 value) {		// VRAM
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	egc_write(address, value);
-}
-
-static void MEMCALL emmc_wt(UINT32 address, REG8 value) {		// EMS
-
-	CPU_EMSPTR[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
-}
 
-static void MEMCALL i286_wd(UINT32 address, REG8 value) {		// D000¡ÁDFFF
-
-	if (CPU_RAM_D000 & (1 << ((address >> 12) & 15))) {
-		mem[address] = (BYTE)value;
-	}
-}
-
-static void MEMCALL i286_wb(UINT32 address, REG8 value) {		// F800¡ÁFFFF
-
-	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
-}
-
-static void MEMCALL i286_wn(UINT32 address, REG8 value) {		// NONE
-
-	(void)address;
-	(void)value;
-}
-
-
-// ---- read byte
-
-static REG8 MEMCALL i286_rd(UINT32 address) {					// MAIN
-
-	return(mem[address & CPU_ADRSMASK]);
-}
+typedef void (MEMCALL * MEM8WRITE)(UINT32 address, REG8 value);
+typedef REG8 (MEMCALL * MEM8READ)(UINT32 address);
+typedef void (MEMCALL * MEM16WRITE)(UINT32 address, REG16 value);
+typedef REG16 (MEMCALL * MEM16READ)(UINT32 address);
 
-static REG8 MEMCALL tram_rd(UINT32 address) {					// TRAM
 
-	CPU_REMCLOCK -= MEMWAIT_TRAM;
-	if (address < 0xa4000) {
-		return(mem[address]);
-	}
-	else if (address < 0xa5000) {
-		if (address & 1) {
-			return(fontrom[cgwindow.high + ((address >> 1) & 0x0f)]);
-		}
-		else {
-			return(fontrom[cgwindow.low + ((address >> 1) & 0x0f)]);
-		}
-	}
-	return(mem[address]);
-}
+// ---- MAIN
 
-static REG8 MEMCALL vram_r0(UINT32 address) {					// VRAM
+static REG8 MEMCALL memmain_rd8(UINT32 address) {
 
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address]);
 }
 
-static REG8 MEMCALL vram_r1(UINT32 address) {					// VRAM
-
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	return(mem[address + VRAM_STEP]);
-}
-
-static REG8 MEMCALL grcg_tcr0(UINT32 address) {					// VRAM
+static REG16 MEMCALL memmain_rd16(UINT32 address) {
 
-const BYTE	*vram;
-	REG8	ret;
+const UINT8	*ptr;
 
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	vram = mem + LOW15(address);
-	ret = 0;
-	if (!(grcg.modereg & 1)) {
-		ret |= vram[VRAM0_B] ^ grcg.tile[0].b[0];
-	}
-	if (!(grcg.modereg & 2)) {
-		ret |= vram[VRAM0_R] ^ grcg.tile[1].b[0];
-	}
-	if (!(grcg.modereg & 4)) {
-		ret |= vram[VRAM0_G] ^ grcg.tile[2].b[0];
-	}
-	if (!(grcg.modereg & 8)) {
-		ret |= vram[VRAM0_E] ^ grcg.tile[3].b[0];
-	}
-	return(ret ^ 0xff);
-}
-
-static REG8 MEMCALL grcg_tcr1(UINT32 address) {					// VRAM
-
-const BYTE	*vram;
-	REG8	ret;
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	ret = 0;
-	vram = mem + LOW15(address);
-	if (!(grcg.modereg & 1)) {
-		ret |= vram[VRAM1_B] ^ grcg.tile[0].b[0];
-	}
-	if (!(grcg.modereg & 2)) {
-		ret |= vram[VRAM1_R] ^ grcg.tile[1].b[0];
-	}
-	if (!(grcg.modereg & 4)) {
-		ret |= vram[VRAM1_G] ^ grcg.tile[2].b[0];
-	}
-	if (!(grcg.modereg & 8)) {
-		ret |= vram[VRAM1_E] ^ grcg.tile[3].b[0];
-	}
-	return(ret ^ 0xff);
-}
-
-static REG8 MEMCALL egc_rd(UINT32 address) {					// VRAM
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	return(egc_read(address));
-}
-
-static REG8 MEMCALL emmc_rd(UINT32 address) {					// EMS
-
-	return(CPU_EMSPTR[(address >> 14) & 3][LOW14(address)]);
+	ptr = mem + address;
+	return(LOADINTELWORD(ptr));
 }
 
-static REG8 MEMCALL i286_rb(UINT32 address) {					// F800-FFFF
+static void MEMCALL memmain_wr8(UINT32 address, REG8 value) {
 
-	if (CPU_ITFBANK) {
-		address += VRAM_STEP;
-	}
-	return(mem[address]);
+	mem[address] = (UINT8)value;
 }
 
+static void MEMCALL memmain_wr16(UINT32 address, REG16 value) {
 
-// ---- write word
-
-static void MEMCALL i286w_wt(UINT32 address, REG16 value) {
+	UINT8	*ptr;
 
-	BYTE	*ptr;
-
-	ptr = mem + (address & CPU_ADRSMASK);
+	ptr = mem + address;
 	STOREINTELWORD(ptr, value);
 }
 
-static void MEMCALL tramw_wt(UINT32 address, REG16 value) {
-
-	CPU_REMCLOCK -= MEMWAIT_TRAM;
-	if (address < 0xa1fff) {
-		STOREINTELWORD(mem + address, value);
-		tramupdate[LOW12(address >> 1)] = 1;
-		tramupdate[LOW12((address + 1) >> 1)] = 1;
-		gdcs.textdisp |= 1;
-	}
-	else if (address == 0xa1fff) {
-		STOREINTELWORD(mem + address, value);
-		tramupdate[0] = 1;
-		tramupdate[0xfff] = 1;
-		gdcs.textdisp |= 1;
-	}
-	else if (address < 0xa3fe0) {
-		if (address & 1) {
-			address++;
-			value >>= 8;
-		}
-		mem[address] = (BYTE)value;
-		tramupdate[LOW12(address >> 1)] = 1;
-		gdcs.textdisp |= 1;
-	}
-	else if (address < 0xa3fff) {
-		if (address & 1) {
-			address++;
-			value >>= 8;
-		}
-		if ((!(address & 2)) || (gdcs.msw_accessable)) {
-			mem[address] = (BYTE)value;
-			tramupdate[LOW12(address >> 1)] = 1;
-			gdcs.textdisp |= 1;
-		}
-	}
-	else if (address < 0xa5000) {
-		if (!(address & 1)) {
-			value >>= 8;
-		}
-		if (cgwindow.writable & 1) {
-			cgwindow.writable |= 0x80;
-			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
-		}
-	}
-}
-
 
-#define GRCGW_NON(page) {											\
-	CPU_REMCLOCK -= MEMWAIT_VRAM;									\
-	STOREINTELWORD(mem + address + VRAM_STEP*(page), value);		\
-	vramupdate[LOW15(address)] |= (1 << page);						\
-	vramupdate[LOW15(address + 1)] |= (1 << page);					\
-	gdcs.grphdisp |= (1 << page);									\
-}
-
-#define GRCGW_RMW(page) {											\
-	BYTE	*vram;													\
-	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
-	address = LOW15(address);										\
-	vramupdate[address] |= (1 << page);								\
-	vramupdate[address + 1] |= (1 << page);							\
-	gdcs.grphdisp |= (1 << page);									\
-	vram = mem + address + (VRAM_STEP * (page));					\
-	if (!(grcg.modereg & 1)) {										\
-		BYTE tmp;													\
-		tmp = (BYTE)value;											\
-		vram[VRAM0_B+0] &= (~tmp);									\
-		vram[VRAM0_B+0] |= (tmp & grcg.tile[0].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
-		vram[VRAM0_B+1] &= (~tmp);									\
-		vram[VRAM0_B+1] |= (tmp & grcg.tile[0].b[0]);				\
-	}																\
-	if (!(grcg.modereg & 2)) {										\
-		BYTE tmp;													\
-		tmp = (BYTE)value;											\
-		vram[VRAM0_R+0] &= (~tmp);									\
-		vram[VRAM0_R+0] |= (tmp & grcg.tile[1].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
-		vram[VRAM0_R+1] &= (~tmp);									\
-		vram[VRAM0_R+1] |= (tmp & grcg.tile[1].b[0]);				\
-	}																\
-	if (!(grcg.modereg & 4)) {										\
-		BYTE tmp;													\
-		tmp = (BYTE)value;											\
-		vram[VRAM0_G+0] &= (~tmp);									\
-		vram[VRAM0_G+0] |= (tmp & grcg.tile[2].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
-		vram[VRAM0_G+1] &= (~tmp);									\
-		vram[VRAM0_G+1] |= (tmp & grcg.tile[2].b[0]);				\
-	}																\
-	if (!(grcg.modereg & 8)) {										\
-		BYTE tmp;													\
-		tmp = (BYTE)value;											\
-		vram[VRAM0_E+0] &= (~tmp);									\
-		vram[VRAM0_E+0] |= (tmp & grcg.tile[3].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
-		vram[VRAM0_E+1] &= (~tmp);									\
-		vram[VRAM0_E+1] |= (tmp & grcg.tile[3].b[0]);				\
-	}																\
-}
-
-#define GRCGW_TDW(page) {											\
-	BYTE	*vram;													\
-	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
-	address = LOW15(address);										\
-	vramupdate[address] |= (1 << page);								\
-	vramupdate[address + 1] |= (1 << page);							\
-	gdcs.grphdisp |= (1 << page);									\
-	vram = mem + address + (VRAM_STEP * (page));					\
-	if (!(grcg.modereg & 1)) {										\
-		vram[VRAM0_B+0] = grcg.tile[0].b[0];						\
-		vram[VRAM0_B+1] = grcg.tile[0].b[0];						\
-	}																\
-	if (!(grcg.modereg & 2)) {										\
-		vram[VRAM0_R+0] = grcg.tile[1].b[0];						\
-		vram[VRAM0_R+1] = grcg.tile[1].b[0];						\
-	}																\
-	if (!(grcg.modereg & 4)) {										\
-		vram[VRAM0_G+0] = grcg.tile[2].b[0];						\
-		vram[VRAM0_G+1] = grcg.tile[2].b[0];						\
-	}																\
-	if (!(grcg.modereg & 8)) {										\
-		vram[VRAM0_E+0] = grcg.tile[3].b[0];						\
-		vram[VRAM0_E+1] = grcg.tile[3].b[0];						\
-	}																\
-	(void)value;													\
-}
-
-static void MEMCALL vramw_w0(UINT32 address, REG16 value) GRCGW_NON(0)
-static void MEMCALL vramw_w1(UINT32 address, REG16 value) GRCGW_NON(1)
-static void MEMCALL grcgw_rmw0(UINT32 address, REG16 value) GRCGW_RMW(0)
-static void MEMCALL grcgw_rmw1(UINT32 address, REG16 value) GRCGW_RMW(1)
-static void MEMCALL grcgw_tdw0(UINT32 address, REG16 value) GRCGW_TDW(0)
-static void MEMCALL grcgw_tdw1(UINT32 address, REG16 value) GRCGW_TDW(1)
-
-static void MEMCALL egcw_wt(UINT32 address, REG16 value) {
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	egc_write_w(address, value);
-}
-
-static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {
-
-	BYTE	*ptr;
-
-	if ((address & 0x3fff) != 0x3fff) {
-		ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address);
-		STOREINTELWORD(ptr, value);
-	}
-	else {
-		CPU_EMSPTR[(address >> 14) & 3][0x3fff] = (BYTE)value;
-		CPU_EMSPTR[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8);
-	}
-}
-
-static void MEMCALL i286w_wd(UINT32 address, REG16 value) {
+// ---- N/C
 
-	BYTE	*ptr;
-	UINT16	bit;
+static REG8 MEMCALL memnc_rd8(UINT32 address) {
 
-	ptr = mem + address;
-	bit = 1 << ((address >> 12) & 15);
-	if ((address + 1) & 0xfff) {
-		if (CPU_RAM_D000 & bit) {
-			STOREINTELWORD(ptr, value);
-		}
-	}
-	else {
-		if (CPU_RAM_D000 & bit) {
-			ptr[0] = (UINT8)value;
-		}
-		if (CPU_RAM_D000 & (bit << 1)) {
-			ptr[1] = (UINT8)(value >> 8);
-		}
-	}
+	(void)address;
+	return(0xff);
 }
 
-static void MEMCALL i286w_wb(UINT32 address, REG16 value) {
-
-	BYTE	*ptr;
+static REG16 MEMCALL memnc_rd16(UINT32 address) {
 
-	ptr = mem + (address + 0x1c8000 - 0xe8000);
-	STOREINTELWORD(ptr, value);
+	(void)address;
+	return(0xffff);
 }
 
-static void MEMCALL i286w_wn(UINT32 address, REG16 value) {
+static void MEMCALL memnc_wr8(UINT32 address, REG8 value) {
 
 	(void)address;
 	(void)value;
 }
 
+static void MEMCALL memnc_wr16(UINT32 address, REG16 value) {
 
-// ---- read word
-
-static REG16 MEMCALL i286w_rd(UINT32 address) {
-
-	BYTE	*ptr;
-
-	ptr = mem + (address & CPU_ADRSMASK);
-	return(LOADINTELWORD(ptr));
-}
-
-static REG16 MEMCALL tramw_rd(UINT32 address) {
-
-	CPU_REMCLOCK -= MEMWAIT_TRAM;
-	if (address < (0xa4000 - 1)) {
-		return(LOADINTELWORD(mem + address));
-	}
-	else if (address == 0xa3fff) {
-		return(mem[address] + (fontrom[cgwindow.low] << 8));
-	}
-	else if (address < 0xa4fff) {
-		if (address & 1) {
-			REG16 ret;
-			ret = fontrom[cgwindow.high + ((address >> 1) & 0x0f)];
-			ret += fontrom[cgwindow.low + (((address + 1) >> 1) & 0x0f)] << 8;
-			return(ret);
-		}
-		else {
-			REG16 ret;
-			ret = fontrom[cgwindow.low + ((address >> 1) & 0x0f)];
-			ret += fontrom[cgwindow.high + ((address >> 1) & 0x0f)] << 8;
-			return(ret);
-		}
-	}
-	else if (address == 0xa4fff) {
-		return((mem[0xa5000] << 8) | fontrom[cgwindow.high + 15]);
-	}
-	return(LOADINTELWORD(mem + address));
-}
-
-static REG16 MEMCALL vramw_r0(UINT32 address) {
-
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	return(LOADINTELWORD(mem + address));
-}
-
-static REG16 MEMCALL vramw_r1(UINT32 address) {
-
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	return(LOADINTELWORD(mem + address + VRAM_STEP));
-}
-
-static REG16 MEMCALL grcgw_tcr0(UINT32 address) {
-
-	BYTE	*vram;
-	REG16	ret;
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	ret = 0;
-	vram = mem + LOW15(address);
-	if (!(grcg.modereg & 1)) {
-		ret |= LOADINTELWORD(vram + VRAM0_B) ^ grcg.tile[0].w;
-	}
-	if (!(grcg.modereg & 2)) {
-		ret |= LOADINTELWORD(vram + VRAM0_R) ^ grcg.tile[1].w;
-	}
-	if (!(grcg.modereg & 4)) {
-		ret |= LOADINTELWORD(vram + VRAM0_G) ^ grcg.tile[2].w;
-	}
-	if (!(grcg.modereg & 8)) {
-		ret |= LOADINTELWORD(vram + VRAM0_E) ^ grcg.tile[3].w;
-	}
-	return((UINT16)~ret);
-}
-
-static REG16 MEMCALL grcgw_tcr1(UINT32 address) {
-
-	BYTE	*vram;
-	REG16	ret;
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	ret = 0;
-	vram = mem + LOW15(address);
-	if (!(grcg.modereg & 1)) {
-		ret |= LOADINTELWORD(vram + VRAM1_B) ^ grcg.tile[0].w;
-	}
-	if (!(grcg.modereg & 2)) {
-		ret |= LOADINTELWORD(vram + VRAM1_R) ^ grcg.tile[1].w;
-	}
-	if (!(grcg.modereg & 4)) {
-		ret |= LOADINTELWORD(vram + VRAM1_G) ^ grcg.tile[2].w;
-	}
-	if (!(grcg.modereg & 8)) {
-		ret |= LOADINTELWORD(vram + VRAM1_E) ^ grcg.tile[3].w;
-	}
-	return((UINT16)(~ret));
-}
-
-static REG16 MEMCALL egcw_rd(UINT32 address) {
-
-	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	return(egc_read_w(address));
-}
-
-static REG16 MEMCALL emmcw_rd(UINT32 address) {
-
-const BYTE	*ptr;
-	REG16	ret;
-
-	if ((address & 0x3fff) != 0x3fff) {
-		ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address);
-		return(LOADINTELWORD(ptr));
-	}
-	else {
-		ret = CPU_EMSPTR[(address >> 14) & 3][0x3fff];
-		ret += CPU_EMSPTR[((address + 1) >> 14) & 3][0] << 8;
-		return(ret);
-	}
-}
-
-static REG16 MEMCALL i286w_rb(UINT32 address) {
-
-	if (CPU_ITFBANK) {
-		address += VRAM_STEP;
-	}
-	return(LOADINTELWORD(mem + address));
+	(void)address;
+	(void)value;
 }
 
 
-// ---- table
-
-typedef void (MEMCALL * MEM8WRITE)(UINT32 address, REG8 value);
-typedef REG8 (MEMCALL * MEM8READ)(UINT32 address);
-typedef void (MEMCALL * MEM16WRITE)(UINT32 address, REG16 value);
-typedef REG16 (MEMCALL * MEM16READ)(UINT32 address);
+// ---- memory 000000-0ffffff + 64KB
 
 typedef struct {
-	MEM8READ	rd8[0x20];
-	MEM8WRITE	wr8[0x20];
-	MEM16READ	rd16[0x20];
-	MEM16WRITE	wr16[0x20];
-} MEMFN;
+	MEM8READ	rd8[0x22];
+	MEM8WRITE	wr8[0x22];
+	MEM16READ	rd16[0x22];
+	MEM16WRITE	wr16[0x22];
+} MEMFN0;
 
 typedef struct {
 	MEM8READ	brd8;		// E8000-F7FFF byte read
@@ -667,79 +107,70 @@ typedef struct {
 	MEM16WRITE	wr16;
 } VACCTBL;
 
-static MEMFN memfn = {
-		   {i286_rd,	i286_rd,	i286_rd,	i286_rd,		// 00
-			i286_rd,	i286_rd,	i286_rd,	i286_rd,		// 20
-			i286_rd,	i286_rd,	i286_rd,	i286_rd,		// 40
-			i286_rd,	i286_rd,	i286_rd,	i286_rd,		// 60
-			i286_rd,	i286_rd,	i286_rd,	i286_rd,		// 80
-			tram_rd,	vram_r0,	vram_r0,	vram_r0,		// a0
-			emmc_rd,	emmc_rd,	i286_rd,	i286_rd,		// c0
-			vram_r0,	i286_rd,	i286_rd,	i286_rb},		// e0
-
-		   {i286_wt,	i286_wt,	i286_wt,	i286_wt,		// 00
-			i286_wt,	i286_wt,	i286_wt,	i286_wt,		// 20
-			i286_wt,	i286_wt,	i286_wt,	i286_wt,		// 40
-			i286_wt,	i286_wt,	i286_wt,	i286_wt,		// 60
-			i286_wt,	i286_wt,	i286_wt,	i286_wt,		// 80
-			tram_wt,	vram_w0,	vram_w0,	vram_w0,		// a0
-			emmc_wt,	emmc_wt,	i286_wd,	i286_wd,		// c0
-			vram_w0,	i286_wn,	i286_wn,	i286_wn},		// e0
-
-		   {i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 00
-			i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 20
-			i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 40
-			i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 60
-			i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 80
-			tramw_rd,	vramw_r0,	vramw_r0,	vramw_r0,		// a0
-			emmcw_rd,	emmcw_rd,	i286w_rd,	i286w_rd,		// c0
-			vramw_r0,	i286w_rd,	i286w_rd,	i286w_rb},		// e0
-
-		   {i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 00
-			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 20
-			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 40
-			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 60
-			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 80
-			tramw_wt,	vramw_w0,	vramw_w0,	vramw_w0,		// a0
-			emmcw_wt,	emmcw_wt,	i286w_wd,	i286w_wd,		// c0
-			vramw_w0,	i286w_wn,	i286w_wn,	i286w_wn}};		// e0
+static MEMFN0 memfn0 = {
+	   {memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 00
+		memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 20
+		memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 40
+		memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 60
+		memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 80
+		memtram_rd8,	memvram0_rd8,	memvram0_rd8,	memvram0_rd8,	// a0
+		memems_rd8,		memems_rd8,		memmain_rd8,	memmain_rd8,	// c0
+		memvram0_rd8,	memmain_rd8,	memmain_rd8,	memf800_rd8,	// e0
+		memmain_rd8,	memmain_rd8},
+
+	   {memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 00
+		memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 20
+		memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 40
+		memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 60
+		memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 80
+		memtram_wr8,	memvram0_wr8,	memvram0_wr8,	memvram0_wr8,	// a0
+		memems_wr8,		memems_wr8,		memd000_wr8,	memd000_wr8,	// c0
+		memvram0_wr8,	memnc_wr8,		memnc_wr8,		memnc_wr8,		// e0
+		memmain_wr8,	memmain_wr8},
+
+	   {memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 00
+		memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 20
+		memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 40
+		memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 60
+		memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 80
+		memtram_rd16,	memvram0_rd16,	memvram0_rd16,	memvram0_rd16,	// a0
+		memems_rd16,	memems_rd16,	memmain_rd16,	memmain_rd16,	// c0
+		memvram0_rd16,	memmain_rd16,	memmain_rd16,	memf800_rd16,	// e0
+		memmain_rd16,	memmain_rd16},
+
+	   {memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 00
+		memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 20
+		memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 40
+		memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 60
+		memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 80
+		memtram_wr16,	memvram0_wr16,	memvram0_wr16,	memvram0_wr16,	// a0
+		memems_wr16,	memems_wr16,	memd000_wr16,	memd000_wr16,	// c0
+		memvram0_wr16,	memnc_wr16,		memnc_wr16,		memnc_wr16,		// e0
+		memmain_wr16,	memmain_wr16}};
 
 static const MMAPTBL mmaptbl[2] = {
-		   {i286_rd,	i286_rb,	i286_wn,
-			i286w_rd,	i286w_rb,	i286w_wn},
-		   {i286_rb,	i286_rb,	i286_wb,
-			i286w_rb,	i286w_rb,	i286w_wb}};
+		   {memmain_rd8,	memf800_rd8,	memnc_wr8,
+			memmain_rd16,	memf800_rd16,	memnc_wr16},
+		   {memf800_rd8,	memf800_rd8,	memepson_wr8,
+			memf800_rd16,	memf800_rd16,	memepson_wr16}};
 
 static const VACCTBL vacctbl[0x10] = {
-			{vram_r0,	vram_w0,	vramw_r0,	vramw_w0},		// 00
-			{vram_r1,	vram_w1,	vramw_r1,	vramw_w1},
-			{vram_r0,	vram_w0,	vramw_r0,	vramw_w0},
-			{vram_r1,	vram_w1,	vramw_r1,	vramw_w1},
-			{vram_r0,	vram_w0,	vramw_r0,	vramw_w0},		// 40
-			{vram_r1,	vram_w1,	vramw_r1,	vramw_w1},
-			{vram_r0,	vram_w0,	vramw_r0,	vramw_w0},
-			{vram_r1,	vram_w1,	vramw_r1,	vramw_w1},
-			{grcg_tcr0,	grcg_tdw0,	grcgw_tcr0,	grcgw_tdw0},	// 80 tdw/tcr
-			{grcg_tcr1,	grcg_tdw1,	grcgw_tcr1,	grcgw_tdw1},
-			{egc_rd,	egc_wt,		egcw_rd,	egcw_wt},
-			{egc_rd,	egc_wt,		egcw_rd,	egcw_wt},
-			{vram_r0,	grcg_rmw0,	vramw_r0,	grcgw_rmw0},	// c0 rmw
-			{vram_r1,	grcg_rmw1,	vramw_r1,	grcgw_rmw1},
-			{egc_rd,	egc_wt,		egcw_rd,	egcw_wt},
-			{egc_rd,	egc_wt,		egcw_rd,	egcw_wt}};
-
-
-static REG8 MEMCALL i286_nonram_r(UINT32 address) {
-
-	(void)address;
-	return(0xff);
-}
-
-static REG16 MEMCALL i286_nonram_rw(UINT32 address) {
-
-	(void)address;
-	return(0xffff);
-}
+		{memvram0_rd8,	memvram0_wr8,	memvram0_rd16,	memvram0_wr16},	// 00
+		{memvram1_rd8,	memvram1_wr8,	memvram1_rd16,	memvram1_wr16},
+		{memvram0_rd8,	memvram0_wr8,	memvram0_rd16,	memvram0_wr16},
+		{memvram1_rd8,	memvram1_wr8,	memvram1_rd16,	memvram1_wr16},
+		{memvram0_rd8,	memvram0_wr8,	memvram0_rd16,	memvram0_wr16},	// 40
+		{memvram1_rd8,	memvram1_wr8,	memvram1_rd16,	memvram1_wr16},
+		{memvram0_rd8,	memvram0_wr8,	memvram0_rd16,	memvram0_wr16},
+		{memvram1_rd8,	memvram1_wr8,	memvram1_rd16,	memvram1_wr16},
+		{memtcr0_rd8,	memtdw0_wr8,	memtcr0_rd16,	memtdw0_wr16},	// 80
+		{memtcr1_rd8,	memtdw1_wr8,	memtcr1_rd16,	memtdw1_wr16},
+		{memegc_rd8,	memegc_wr8,		memegc_rd16,	memegc_wr16},
+		{memegc_rd8,	memegc_wr8,		memegc_rd16,	memegc_wr16},
+		{memvram0_rd8,	memrmw0_wr8,	memvram0_rd16,	memrmw0_wr16},	// c0
+		{memvram1_rd8,	memrmw1_wr8,	memvram1_rd16,	memrmw1_wr16},
+		{memegc_rd8,	memegc_wr8,		memegc_rd16,	memegc_wr16},
+		{memegc_rd8,	memegc_wr8,		memegc_rd16,	memegc_wr16}};
 
 
 void MEMCALL i286_memorymap(UINT type) {
@@ -748,19 +179,19 @@ const MMAPTBL	*mm;
 
 	mm = mmaptbl + (type & 1);
 
-	memfn.rd8[0xe8000 >> 15] = mm->brd8;
-	memfn.rd8[0xf0000 >> 15] = mm->brd8;
-	memfn.rd8[0xf8000 >> 15] = mm->ird8;
-	memfn.wr8[0xe8000 >> 15] = mm->bwr8;
-	memfn.wr8[0xf0000 >> 15] = mm->bwr8;
-	memfn.wr8[0xf8000 >> 15] = mm->bwr8;
-
-	memfn.rd16[0xe8000 >> 15] = mm->brd16;
-	memfn.rd16[0xf0000 >> 15] = mm->brd16;
-	memfn.rd16[0xf8000 >> 15] = mm->ird16;
-	memfn.wr16[0xe8000 >> 15] = mm->bwr16;
-	memfn.wr16[0xf0000 >> 15] = mm->bwr16;
-	memfn.wr16[0xf8000 >> 15] = mm->bwr16;
+	memfn0.rd8[0xe8000 >> 15] = mm->brd8;
+	memfn0.rd8[0xf0000 >> 15] = mm->brd8;
+	memfn0.rd8[0xf8000 >> 15] = mm->ird8;
+	memfn0.wr8[0xe8000 >> 15] = mm->bwr8;
+	memfn0.wr8[0xf0000 >> 15] = mm->bwr8;
+	memfn0.wr8[0xf8000 >> 15] = mm->bwr8;
+
+	memfn0.rd16[0xe8000 >> 15] = mm->brd16;
+	memfn0.rd16[0xf0000 >> 15] = mm->brd16;
+	memfn0.rd16[0xf8000 >> 15] = mm->ird16;
+	memfn0.wr16[0xe8000 >> 15] = mm->bwr16;
+	memfn0.wr16[0xf0000 >> 15] = mm->bwr16;
+	memfn0.wr16[0xf8000 >> 15] = mm->bwr16;
 }
 
 void MEMCALL i286_vram_dispatch(UINT func) {
@@ -769,332 +200,348 @@ const VACCTBL	*vacc;
 
 #if defined(SUPPORT_PC9821)
 	if (!(func & 0x20)) {
-#endif
+#endif	// defined(SUPPORT_PC9821)
 		vacc = vacctbl + (func & 0x0f);
-		memfn.rd8[0xa8000 >> 15] = vacc->rd8;
-		memfn.rd8[0xb0000 >> 15] = vacc->rd8;
-		memfn.rd8[0xb8000 >> 15] = vacc->rd8;
-		memfn.rd8[0xe0000 >> 15] = vacc->rd8;
-
-		memfn.wr8[0xa8000 >> 15] = vacc->wr8;
-		memfn.wr8[0xb0000 >> 15] = vacc->wr8;
-		memfn.wr8[0xb8000 >> 15] = vacc->wr8;
-		memfn.wr8[0xe0000 >> 15] = vacc->wr8;
-
-		memfn.rd16[0xa8000 >> 15] = vacc->rd16;
-		memfn.rd16[0xb0000 >> 15] = vacc->rd16;
-		memfn.rd16[0xb8000 >> 15] = vacc->rd16;
-		memfn.rd16[0xe0000 >> 15] = vacc->rd16;
-
-		memfn.wr16[0xa8000 >> 15] = vacc->wr16;
-		memfn.wr16[0xb0000 >> 15] = vacc->wr16;
-		memfn.wr16[0xb8000 >> 15] = vacc->wr16;
-		memfn.wr16[0xe0000 >> 15] = vacc->wr16;
-
-		if (!(func & 0x10)) {							// digital
-			memfn.wr8[0xe0000 >> 15] = i286_wn;
-			memfn.wr16[0xe0000 >> 15] = i286w_wn;
-			memfn.rd8[0xe0000 >> 15] = i286_nonram_r;
-			memfn.rd16[0xe0000 >> 15] = i286_nonram_rw;
+
+		memfn0.rd8[0xa8000 >> 15] = vacc->rd8;
+		memfn0.rd8[0xb0000 >> 15] = vacc->rd8;
+		memfn0.rd8[0xb8000 >> 15] = vacc->rd8;
+		memfn0.rd8[0xe0000 >> 15] = vacc->rd8;
+
+		memfn0.wr8[0xa8000 >> 15] = vacc->wr8;
+		memfn0.wr8[0xb0000 >> 15] = vacc->wr8;
+		memfn0.wr8[0xb8000 >> 15] = vacc->wr8;
+		memfn0.wr8[0xe0000 >> 15] = vacc->wr8;
+
+		memfn0.rd16[0xa8000 >> 15] = vacc->rd16;
+		memfn0.rd16[0xb0000 >> 15] = vacc->rd16;
+		memfn0.rd16[0xb8000 >> 15] = vacc->rd16;
+		memfn0.rd16[0xe0000 >> 15] = vacc->rd16;
+
+		memfn0.wr16[0xa8000 >> 15] = vacc->wr16;
+		memfn0.wr16[0xb0000 >> 15] = vacc->wr16;
+		memfn0.wr16[0xb8000 >> 15] = vacc->wr16;
+		memfn0.wr16[0xe0000 >> 15] = vacc->wr16;
+
+		if (!(func & (1 << VOPBIT_ANALOG))) {					// digital
+			memfn0.rd8[0xe0000 >> 15] = memnc_rd8;
+			memfn0.wr8[0xe0000 >> 15] = memnc_wr8;
+			memfn0.rd16[0xe0000 >> 15] = memnc_rd16;
+			memfn0.wr16[0xe0000 >> 15] = memnc_wr16;
 		}
 #if defined(SUPPORT_PC9821)
 	}
 	else {
-		memfn.rd8[0xa8000 >> 15] = mem9821_b0r;
-		memfn.rd8[0xb0000 >> 15] = mem9821_b0r;
-		memfn.rd8[0xb8000 >> 15] = i286_nonram_r;
-		memfn.rd8[0xe0000 >> 15] = mem9821_b2r;
-
-		memfn.wr8[0xa8000 >> 15] = mem9821_b0w;
-		memfn.wr8[0xb0000 >> 15] = mem9821_b0w;
-		memfn.wr8[0xb8000 >> 15] = i286_wn;
-		memfn.wr8[0xe0000 >> 15] = mem9821_b2w;
-
-		memfn.rd16[0xa8000 >> 15] = mem9821_b0rw;
-		memfn.rd16[0xb0000 >> 15] = mem9821_b0rw;
-		memfn.rd16[0xb8000 >> 15] = i286_nonram_rw;
-		memfn.rd16[0xe0000 >> 15] = mem9821_b2rw;
-
-		memfn.wr16[0xa8000 >> 15] = mem9821_b0ww;
-		memfn.wr16[0xb0000 >> 15] = mem9821_b0ww;
-		memfn.wr16[0xb8000 >> 15] = i286w_wn;
-		memfn.wr16[0xe0000 >> 15] = mem9821_b2ww;
+		memfn0.rd8[0xa8000 >> 15] = memvga0_rd8;
+		memfn0.rd8[0xb0000 >> 15] = memvga1_rd8;
+		memfn0.rd8[0xb8000 >> 15] = memnc_rd8;
+		memfn0.rd8[0xe0000 >> 15] = memvgaio_rd8;
+
+		memfn0.wr8[0xa8000 >> 15] = memvga0_wr8;
+		memfn0.wr8[0xb0000 >> 15] = memvga1_wr8;
+		memfn0.wr8[0xb8000 >> 15] = memnc_wr8;
+		memfn0.wr8[0xe0000 >> 15] = memvgaio_wr8;
+
+		memfn0.rd16[0xa8000 >> 15] = memvga0_rd16;
+		memfn0.rd16[0xb0000 >> 15] = memvga1_rd16;
+		memfn0.rd16[0xb8000 >> 15] = memnc_rd16;
+		memfn0.rd16[0xe0000 >> 15] = memvgaio_rd16;
+
+		memfn0.wr16[0xa8000 >> 15] = memvga0_wr16;
+		memfn0.wr16[0xb0000 >> 15] = memvga1_wr16;
+		memfn0.wr16[0xb8000 >> 15] = memnc_wr16;
+		memfn0.wr16[0xe0000 >> 15] = memvgaio_wr16;
 	}
-#endif
+#endif	// defined(SUPPORT_PC9821)
 }
 
 
-REG8 MEMCALL i286_memoryread(UINT32 addr) {
+// ---- memory f00000-fffffff
+
+typedef struct {
+	MEM8READ	rd8[8];
+	MEM8WRITE	wr8[8];
+	MEM16READ	rd16[8];
+	MEM16WRITE	wr16[8];
+} MEMFNF;
 
-	UINT32	pos;
 
-	if (addr < I286_MEMREADMAX) {
-		return(mem[addr]);
+static REG8 MEMCALL memsys_rd8(UINT32 address) {
+
+	address -= 0xf00000;
+	return(memfn0.rd8[address >> 15](address));
+}
+
+static REG16 MEMCALL memsys_rd16(UINT32 address) {
+
+	address -= 0xf00000;
+	return(memfn0.rd16[address >> 15](address));
+}
+
+static void MEMCALL memsys_wr8(UINT32 address, REG8 value) {
+
+	address -= 0xf00000;
+	memfn0.wr8[address >> 15](address, value);
+}
+
+static void MEMCALL memsys_wr16(UINT32 address, REG16 value) {
+
+	address -= 0xf00000;
+	memfn0.wr16[address >> 15](address, value);
+}
+
+#if defined(SUPPORT_PC9821)
+static const MEMFNF memfnf = {
+	   {memvgaf_rd8,	memvgaf_rd8,	memvgaf_rd8,	memvgaf_rd8,
+		memnc_rd8,		memsys_rd8,		memsys_rd8,		memsys_rd8},
+	   {memvgaf_wr8,	memvgaf_wr8,	memvgaf_wr8,	memvgaf_wr8,
+		memnc_wr8,		memsys_wr8,		memsys_wr8,		memsys_wr8},
+
+	   {memvgaf_rd16,	memvgaf_rd16,	memvgaf_rd16,	memvgaf_rd16,
+		memnc_rd16,		memsys_rd16,	memsys_rd16,	memsys_rd16},
+	   {memvgaf_wr16,	memvgaf_wr16,	memvgaf_wr16,	memvgaf_wr16,
+		memnc_wr16,		memsys_wr16,	memsys_wr16,	memsys_wr16}};
+#else
+static const MEMFNF memfnf = {
+	   {memnc_rd8,		memnc_rd8,		memnc_rd8,		memnc_rd8,
+		memnc_rd8,		memsys_rd8,		memsys_rd8,		memsys_rd8},
+	   {memnc_wr8,		memnc_wr8,		memnc_wr8,		memnc_wr8,
+		memnc_wr8,		memsys_wr8,		memsys_wr8,		memsys_wr8},
+
+	   {memnc_rd16,		memnc_rd16,		memnc_rd16,		memnc_rd16,
+		memnc_rd16,		memsys_rd16,	memsys_rd16,	memsys_rd16},
+	   {memnc_wr16,		memnc_wr16,		memnc_wr16,		memnc_wr16,
+		memnc_wr16,		memsys_wr16,	memsys_wr16,	memsys_wr16}};
+#endif
+
+
+// ----
+
+REG8 MEMCALL i286_memoryread(UINT32 address) {
+
+	if (address < I286_MEMREADMAX) {
+		return(mem[address]);
 	}
-	else if (addr >= USE_HIMEM) {
-		pos = (addr & CPU_ADRSMASK) - 0x100000;
-		if (pos < CPU_EXTMEMSIZE) {
-			return(CPU_EXTMEM[pos]);
+	else {
+		address = address & CPU_ADRSMASK;
+		if (address < USE_HIMEM) {
+			return(memfn0.rd8[address >> 15](address));
 		}
-		else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
-			return(memfn.rd8[(addr >> 15) & 0x1f](addr - 0x00f00000));
+		else if (address < CPU_EXTLIMIT16) {
+			return(CPU_EXTMEMBASE[address]);
 		}
-#if defined(SUPPORT_PC9821)
-		else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) {
-			return(mem9821_r(addr));
+		else if (address < 0x00f00000) {
+			return(0xff);
 		}
-		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-			return(mem9821_r(addr));
+		else if (address < 0x01000000) {
+			return(memfnf.rd8[(address >> 17) & 7](address));
 		}
-#endif
+#if defined(CPU_EXTLIMIT)
+		else if (address < CPU_EXTLIMIT) {
+			return(CPU_EXTMEMBASE[address]);
+		}
+#endif	// defined(CPU_EXTLIMIT)
+#if defined(SUPPORT_PC9821)
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			return(memvgaf_rd8(address));
+		}
+#endif	// defined(SUPPORT_PC9821)
 		else {
-//			TRACEOUT(("out of mem (read8): %x", addr));
+//			TRACEOUT(("out of mem (read8): %x", address));
 			return(0xff);
 		}
 	}
-	else {
-		return(memfn.rd8[(addr >> 15) & 0x1f](addr));
-	}
 }
 
-REG16 MEMCALL i286_memoryread_w(UINT32 addr) {
+REG16 MEMCALL i286_memoryread_w(UINT32 address) {
 
-	UINT32	pos;
 	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
-		if (addr >= USE_HIMEM) {
-			pos = (addr & CPU_ADRSMASK) - 0x100000;
-			if (pos < CPU_EXTMEMSIZE) {
-				return(LOADINTELWORD(CPU_EXTMEM + pos));
-			}
-			else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
-				return(memfn.rd16[(addr >> 15) & 0x1f](addr - 0x00f00000));
-			}
+	else if ((address + 1) & 0x7fff) {			// non 32kb boundary
+		address = address & CPU_ADRSMASK;
+		if (address < USE_HIMEM) {
+			return(memfn0.rd16[address >> 15](address));
+		}
+		else if (address < CPU_EXTLIMIT16) {
+			return(LOADINTELWORD(CPU_EXTMEMBASE + address));
+		}
+		else if (address < 0x00f00000) {
+			return(0xffff);
+		}
+		else if (address < 0x01000000) {
+			return(memfnf.rd16[(address >> 17) & 7](address));
+		}
+#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 >= 0x00f00000) && (addr < 0x00f80000)) {
-				return(mem9821_rw(addr));
-			}
-			else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-				return(mem9821_rw(addr));
-			}
-#endif
-			else {
-//				TRACEOUT(("out of mem (read16): %x", addr));
-				return(0xffff);
-			}
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			return(memvgaf_rd16(address));
+		}
+#endif	// defined(SUPPORT_PC9821)
+		else {
+//			TRACEOUT(("out of mem (read16): %x", address));
+			return(0xffff);
 		}
-		return(memfn.rd16[(addr >> 15) & 0x1f](addr));
 	}
 	else {
-		ret = i286_memoryread(addr);
-		ret += (REG16)(i286_memoryread(addr + 1) << 8);
+		ret = i286_memoryread(address + 0);
+		ret += (REG16)(i286_memoryread(address + 1) << 8);
 		return(ret);
 	}
 }
 
-UINT32 MEMCALL i286_memoryread_d(UINT32 addr) {
+UINT32 MEMCALL i286_memoryread_d(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) - 0x100000;
-		if ((pos + 3) < CPU_EXTMEMSIZE) {
-			return(LOADINTELDWORD(CPU_EXTMEM + pos));
+	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 = i286_memoryread_w(address + 0);
+		ret += (UINT32)i286_memoryread_w(address + 2) << 16;
 	}
 	else {
-		ret = i286_memoryread(addr);
-		ret += (UINT32)i286_memoryread_w(addr + 1) << 8;
-		ret += (UINT32)i286_memoryread(addr + 3) << 24;
+		ret = i286_memoryread(address + 0);
+		ret += (UINT32)i286_memoryread_w(address + 1) << 8;
+		ret += (UINT32)i286_memoryread(address + 3) << 24;
 	}
 	return(ret);
 }
 
-void MEMCALL i286_memorywrite(UINT32 addr, REG8 value) {
+void MEMCALL i286_memorywrite(UINT32 address, REG8 value) {
 
-	UINT32	pos;
-
-	if (addr < I286_MEMWRITEMAX) {
-		mem[addr] = (BYTE)value;
+	if (address < I286_MEMWRITEMAX) {
+		mem[address] = (UINT8)value;
 	}
-	else if (addr >= USE_HIMEM) {
-		pos = (addr & CPU_ADRSMASK) - 0x100000;
-		if (pos < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[pos] = (BYTE)value;
+	else {
+		address = address & CPU_ADRSMASK;
+		if (address < USE_HIMEM) {
+			memfn0.wr8[address >> 15](address, value);
 		}
-		else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
-			memfn.wr8[(addr >> 15) & 0x1f](addr - 0x00f00000, value);
+		else if (address < CPU_EXTLIMIT16) {
+			CPU_EXTMEMBASE[address] = (UINT8)value;
 		}
-#if defined(SUPPORT_PC9821)
-		else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) {
-			mem9821_w(addr, value);
+		else if (address < 0x00f00000) {
 		}
-		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-			mem9821_w(addr, value);
+		else if (address < 0x01000000) {
+			memfnf.wr8[(address >> 17) & 7](address, value);
 		}
-#endif
+#if defined(CPU_EXTLIMIT)
+		else if (address < CPU_EXTLIMIT) {
+			CPU_EXTMEMBASE[address] = (UINT8)value;
+		}
+#endif	// defined(CPU_EXTLIMIT)
+#if defined(SUPPORT_PC9821)
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			memvgaf_wr8(address, value);
+		}
+#endif	// defined(SUPPORT_PC9821)
 		else {
-//			TRACEOUT(("out of mem (write8): %x", addr));
+//			TRACEOUT(("out of mem (write8): %x", address));
 		}
 	}
-	else {
-		memfn.wr8[(addr >> 15) & 0x1f](addr, value);
-	}
 }
 
-void MEMCALL i286_memorywrite_w(UINT32 addr, REG16 value) {
+void MEMCALL i286_memorywrite_w(UINT32 address, REG16 value) {
 
-	UINT32	pos;
-
-	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
-		if (addr >= USE_HIMEM) {
-			pos = (addr & CPU_ADRSMASK) - 0x100000;
-			if (pos < CPU_EXTMEMSIZE) {
-				STOREINTELWORD(CPU_EXTMEM + pos, value);
-			}
-			else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
-				memfn.wr16[(addr >> 15) & 0x1f](addr - 0x00f00000, 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 (address < CPU_EXTLIMIT16) {
+			STOREINTELWORD(CPU_EXTMEMBASE + address, value);
+		}
+		else if (address < 0x00f00000) {
+		}
+		else if (address < 0x01000000) {
+			memfnf.wr16[(address >> 17) & 7](address, 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 >= 0x00f00000) && (addr < 0x00f80000)) {
-				mem9821_ww(addr, value);
-			}
-			else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-				mem9821_ww(addr, value);
-			}
-#endif
-			else {
-//				TRACEOUT(("out of mem (write16): %x", addr));
-			}
+		else if ((address >= 0xfff00000) && (address < 0xfff80000)) {
+			memvgaf_wr16(address, value);
 		}
+#endif	// defined(SUPPORT_PC9821)
 		else {
-			memfn.wr16[(addr >> 15) & 0x1f](addr, value);
+//			TRACEOUT(("out of mem (write16): %x", address));
 		}
 	}
 	else {
-		i286_memorywrite(addr, (UINT8)value);
-		i286_memorywrite(addr + 1, (UINT8)(value >> 8));
+		i286_memorywrite(address + 0, (UINT8)value);
+		i286_memorywrite(address + 1, (UINT8)(value >> 8));
 	}
 }
 
-void MEMCALL i286_memorywrite_d(UINT32 addr, UINT32 value) {
+void MEMCALL i286_memorywrite_d(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) - 0x100000;
-		if ((pos + 3) < CPU_EXTMEMSIZE) {
-			STOREINTELDWORD(CPU_EXTMEM + pos, value);
+	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)) {
+		i286_memorywrite_w(address + 0, (UINT16)value);
+		i286_memorywrite_w(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));
+		i286_memorywrite(address + 0, (UINT8)value);
+		i286_memorywrite_w(address + 1, (UINT16)(value >> 8));
+		i286_memorywrite(address + 3, (UINT8)(value >> 24));
 	}
 }
 
-#if 0
-REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < I286_MEMREADMAX) {
-		return(mem[address]);
-	}
-	else {
-		return(i286_memoryread(address));
-	}
-}
-
-REG16 MEMCALL i286_memword_read(UINT seg, UINT off) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < (I286_MEMREADMAX - 1)) {
-		return(LOADINTELWORD(mem + address));
-	}
-	else {
-		return(i286_memoryread_w(address));
-	}
-}
-
-void MEMCALL i286_membyte_write(UINT seg, UINT off, REG8 value) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < I286_MEMWRITEMAX) {
-		mem[address] = (BYTE)value;
-	}
-	else {
-		i286_memorywrite(address, value);
-	}
-}
-
-void MEMCALL i286_memword_write(UINT seg, UINT off, REG16 value) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < (I286_MEMWRITEMAX - 1)) {
-		STOREINTELWORD(mem + address, value);
-	}
-	else {
-		i286_memorywrite_w(address, value);
-	}
-}
-#endif
 
 void MEMCALL memp_read(UINT32 address, void *dat, UINT leng) {
 
-	BYTE *out = (BYTE *)dat;
-	UINT pos;
+	UINT8 *out = (UINT8 *)dat;
 	UINT diff;
 
 	/* fast memory access */
-	if (address + leng < I286_MEMREADMAX) {
+	if ((address + leng) < I286_MEMREADMAX) {
 		CopyMemory(dat, mem + address, leng);
 		return;
-	} else if (address >= USE_HIMEM) {
-		pos = (address & CPU_ADRSMASK) - 0x100000;
-		if (pos + leng < CPU_EXTMEMSIZE) {
-			CopyMemory(dat, CPU_EXTMEM + pos, leng);
+	}
+	address = address & CPU_ADRSMASK;
+	if ((address >= USE_HIMEM) && (address < CPU_EXTLIMIT16)) {
+		diff = CPU_EXTLIMIT16 - address;
+		if (diff >= leng) {
+			CopyMemory(dat, CPU_EXTMEMBASE + address, leng);
 			return;
 		}
-		if (pos < CPU_EXTMEMSIZE) {
-			diff = CPU_EXTMEMSIZE - pos;
-			CopyMemory(out, CPU_EXTMEM + pos, diff);
-			out += diff;
-			leng -= diff;
-			address += diff;
-		}
+		CopyMemory(dat, CPU_EXTMEMBASE + address, diff);
+		out += diff;
+		leng -= diff;
+		address += diff;
 	}
 
 	/* slow memory access */
@@ -1105,27 +552,25 @@ void MEMCALL memp_read(UINT32 address, v
 
 void MEMCALL memp_write(UINT32 address, const void *dat, UINT leng) {
 
-	const BYTE *out = (BYTE *)dat;
-	UINT pos;
+	const UINT8 *out = (UINT8 *)dat;
 	UINT diff;
 
 	/* fast memory access */
-	if (address + leng < I286_MEMREADMAX) {
+	if ((address + leng) < I286_MEMREADMAX) {
 		CopyMemory(mem + address, dat, leng);
 		return;
-	} else if (address >= USE_HIMEM) {
-		pos = (address & CPU_ADRSMASK) - 0x100000;
-		if (pos + leng < CPU_EXTMEMSIZE) {
-			CopyMemory(CPU_EXTMEM + pos, dat, leng);
+	}
+	address = address & CPU_ADRSMASK;
+	if ((address >= USE_HIMEM) && (address < CPU_EXTLIMIT16)) {
+		diff = CPU_EXTLIMIT16 - address;
+		if (diff >= leng) {
+			CopyMemory(CPU_EXTMEMBASE + address, dat, leng);
 			return;
 		}
-		if (pos < CPU_EXTMEMSIZE) {
-			diff = CPU_EXTMEMSIZE - pos;
-			CopyMemory(CPU_EXTMEM + pos, dat, diff);
-			out += diff;
-			leng -= diff;
-			address += diff;
-		}
+		CopyMemory(CPU_EXTMEMBASE + address, dat, diff);
+		out += diff;
+		leng -= diff;
+		address += diff;
 	}
 
 	/* slow memory access */
@@ -1241,7 +686,7 @@ void MEMCALL meml_readstr(UINT seg, UINT
 		}
 		memp_read(addr, dat, size);
 		off += size;
-		dat = ((BYTE *)dat) + size;
+		dat = ((UINT8 *)dat) + size;
 		leng -= size;
 	}
 }
@@ -1264,7 +709,7 @@ void MEMCALL meml_writestr(UINT seg, UIN
 		}
 		memp_write(addr, dat, size);
 		off += size;
-		dat = ((BYTE *)dat) + size;
+		dat = ((UINT8 *)dat) + size;
 		leng -= size;
 	}
 }
@@ -1282,7 +727,7 @@ void MEMCALL meml_read(UINT32 address, v
 			size = min(size, leng);
 			memp_read(physicaladdr(address, FALSE), dat, size);
 			address += size;
-			dat = ((BYTE *)dat) + size;
+			dat = ((UINT8 *)dat) + size;
 			leng -= size;
 		}
 	}
@@ -1301,10 +746,11 @@ void MEMCALL meml_write(UINT32 address, 
 			size = min(size, leng);
 			memp_write(physicaladdr(address, TRUE), dat, size);
 			address += size;
-			dat = ((BYTE *)dat) + size;
+			dat = ((UINT8 *)dat) + size;
 			leng -= size;
 		}
 	}
 }
+
 #endif