--- np2/i286c/memory.c	2004/04/05 12:02:30	1.21
+++ np2/i286c/memory.c	2005/02/16 09:31:55	1.26
@@ -1,74 +1,90 @@
 #include	"compiler.h"
+
+#ifndef NP2_MEMORY_ASM
+
 #include	"cpucore.h"
-#include	"egcmem.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];
+	UINT8	mem[0x200000];
 
 
-// ---- write byte
+// ---- MAIN
 
-static void MEMCALL i286_wt(UINT32 address, REG8 value) {		// MAIN
+static REG8 MEMCALL memmain_rd8(UINT32 address) {
 
-	mem[address & CPU_ADRSMASK] = (BYTE)value;
+	return(mem[address & CPU_ADRSMASK]);
 }
 
-static void MEMCALL tram_wt(UINT32 address, REG8 value) {		// TRAM
+static REG16 MEMCALL memmain_rd16(UINT32 address) {
 
-	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;
-		}
-	}
+const UINT8	*ptr;
+
+	ptr = mem + (address & CPU_ADRSMASK);
+	return(LOADINTELWORD(ptr));
 }
 
-static void MEMCALL vram_w0(UINT32 address, REG8 value) {		// VRAM
+static void MEMCALL memmain_wr8(UINT32 address, REG8 value) {
 
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	mem[address] = (BYTE)value;
-	vramupdate[LOW15(address)] |= 1;
-	gdcs.grphdisp |= 1;
+	mem[address & CPU_ADRSMASK] = (UINT8)value;
 }
 
-static void MEMCALL vram_w1(UINT32 address, REG8 value) {		// VRAM
+static void MEMCALL memmain_wr16(UINT32 address, REG16 value) {
 
-	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	mem[address + VRAM_STEP] = (BYTE)value;
-	vramupdate[LOW15(address)] |= 2;
-	gdcs.grphdisp |= 2;
+	UINT8	*ptr;
+
+	ptr = mem + (address & CPU_ADRSMASK);
+	STOREINTELWORD(ptr, value);
+}
+
+
+// ---- N/C
+
+static REG8 MEMCALL memnc_rd8(UINT32 address) {
+
+	(void)address;
+	return(0xff);
+}
+
+static REG16 MEMCALL memnc_rd16(UINT32 address) {
+
+	(void)address;
+	return(0xffff);
+}
+
+static void MEMCALL memnc_wr8(UINT32 address, REG8 value) {
+
+	(void)address;
+	(void)value;
+}
+
+static void MEMCALL memnc_wr16(UINT32 address, REG16 value) {
+
+	(void)address;
+	(void)value;
 }
 
+
+
+
+
+// ---- write byte
+
 static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) {		// VRAM
 
 	REG8	mask;
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
@@ -97,7 +113,7 @@ static void MEMCALL grcg_rmw0(UINT32 add
 static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) {		// VRAM
 
 	REG8	mask;
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
@@ -125,7 +141,7 @@ static void MEMCALL grcg_rmw1(UINT32 add
 
 static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) {		// VRAM
 
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
@@ -149,7 +165,7 @@ static void MEMCALL grcg_tdw0(UINT32 add
 
 static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) {		// VRAM
 
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
@@ -174,72 +190,15 @@ static void MEMCALL grcg_tdw1(UINT32 add
 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;
+	memegc_wr8(address, value);
 }
 
 
 // ---- read byte
 
-static REG8 MEMCALL i286_rd(UINT32 address) {					// MAIN
-
-	return(mem[address & CPU_ADRSMASK]);
-}
-
-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]);
-}
-
-static REG8 MEMCALL vram_r0(UINT32 address) {					// VRAM
-
-	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
 
-const BYTE	*vram;
+const UINT8	*vram;
 	REG8	ret;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
@@ -262,7 +221,7 @@ const BYTE	*vram;
 
 static REG8 MEMCALL grcg_tcr1(UINT32 address) {					// VRAM
 
-const BYTE	*vram;
+const UINT8	*vram;
 	REG8	ret;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
@@ -286,90 +245,14 @@ const BYTE	*vram;
 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)]);
-}
-
-static REG8 MEMCALL i286_rb(UINT32 address) {					// F800-FFFF
-
-	if (CPU_ITFBANK) {
-		address += VRAM_STEP;
-	}
-	return(mem[address]);
+	return(memegc_rd8(address));
 }
 
 
 // ---- write word
 
-static void MEMCALL i286w_wt(UINT32 address, REG16 value) {
-
-	BYTE	*ptr;
-
-	ptr = mem + (address & CPU_ADRSMASK);
-	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;													\
+	UINT8	*vram;													\
 	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
@@ -377,45 +260,45 @@ static void MEMCALL tramw_wt(UINT32 addr
 	gdcs.grphdisp |= (1 << page);									\
 	vram = mem + address + (VRAM_STEP * (page));					\
 	if (!(grcg.modereg & 1)) {										\
-		BYTE tmp;													\
-		tmp = (BYTE)value;											\
+		UINT8 tmp;													\
+		tmp = (UINT8)value;											\
 		vram[VRAM0_B+0] &= (~tmp);									\
 		vram[VRAM0_B+0] |= (tmp & grcg.tile[0].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
+		tmp = (UINT8)(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;											\
+		UINT8 tmp;													\
+		tmp = (UINT8)value;											\
 		vram[VRAM0_R+0] &= (~tmp);									\
 		vram[VRAM0_R+0] |= (tmp & grcg.tile[1].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
+		tmp = (UINT8)(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;											\
+		UINT8 tmp;													\
+		tmp = (UINT8)value;											\
 		vram[VRAM0_G+0] &= (~tmp);									\
 		vram[VRAM0_G+0] |= (tmp & grcg.tile[2].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
+		tmp = (UINT8)(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;											\
+		UINT8 tmp;													\
+		tmp = (UINT8)value;											\
 		vram[VRAM0_E+0] &= (~tmp);									\
 		vram[VRAM0_E+0] |= (tmp & grcg.tile[3].b[0]);				\
-		tmp = (BYTE)(value >> 8);									\
+		tmp = (UINT8)(value >> 8);									\
 		vram[VRAM0_E+1] &= (~tmp);									\
 		vram[VRAM0_E+1] |= (tmp & grcg.tile[3].b[0]);				\
 	}																\
 }
 
 #define GRCGW_TDW(page) {											\
-	BYTE	*vram;													\
+	UINT8	*vram;													\
 	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
@@ -441,8 +324,6 @@ static void MEMCALL tramw_wt(UINT32 addr
 	(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)
@@ -451,114 +332,15 @@ static void MEMCALL grcgw_tdw1(UINT32 ad
 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) {
-
-	BYTE	*ptr;
-	UINT16	bit;
-
-	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);
-		}
-	}
-}
-
-static void MEMCALL i286w_wb(UINT32 address, REG16 value) {
-
-	BYTE	*ptr;
-
-	ptr = mem + (address + 0x1c8000 - 0xe8000);
-	STOREINTELWORD(ptr, value);
-}
-
-static void MEMCALL i286w_wn(UINT32 address, REG16 value) {
-
-	(void)address;
-	(void)value;
+	memegc_wr16(address, 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;
+	UINT8	*vram;
 	REG16	ret;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
@@ -581,7 +363,7 @@ static REG16 MEMCALL grcgw_tcr0(UINT32 a
 
 static REG16 MEMCALL grcgw_tcr1(UINT32 address) {
 
-	BYTE	*vram;
+	UINT8	*vram;
 	REG16	ret;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
@@ -605,31 +387,7 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a
 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));
+	return(memegc_rd16(address));
 }
 
 
@@ -664,78 +422,65 @@ typedef struct {
 } 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
+	   {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_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_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_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
 
 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},
+		{grcg_tcr0,		grcg_tdw0,		grcgw_tcr0,		grcgw_tdw0},	// 80
+		{grcg_tcr1,		grcg_tdw1,		grcgw_tcr1,		grcgw_tdw1},
+		{egc_rd,		egc_wt,			egcw_rd,		egcw_wt},
+		{egc_rd,		egc_wt,			egcw_rd,		egcw_wt},
+		{memvram0_rd8,	grcg_rmw0,		memvram0_rd16,	grcgw_rmw0},	// c0
+		{memvram1_rd8,	grcg_rmw1,		memvram1_rd16,	grcgw_rmw1},
+		{egc_rd,		egc_wt,			egcw_rd,		egcw_wt},
+		{egc_rd,		egc_wt,			egcw_rd,		egcw_wt}};
 
 
 void MEMCALL i286_memorymap(UINT type) {
@@ -785,11 +530,11 @@ const VACCTBL	*vacc;
 	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;
+	if (!(func & (1 << VOPBIT_ANALOG))) {					// digital
+		memfn.rd8[0xe0000 >> 15] = memnc_rd8;
+		memfn.wr8[0xe0000 >> 15] = memnc_wr8;
+		memfn.rd16[0xe0000 >> 15] = memnc_rd16;
+		memfn.wr16[0xe0000 >> 15] = memnc_wr16;
 	}
 }
 
@@ -857,13 +602,13 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 void MEMCALL i286_memorywrite(UINT32 address, REG8 value) {
 
 	if (address < I286_MEMWRITEMAX) {
-		mem[address] = (BYTE)value;
+		mem[address] = (UINT8)value;
 	}
 #if defined(USE_HIMEM)
 	else if (address >= USE_HIMEM) {
 		address -= 0x100000;
 		if (address < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[address] = (BYTE)value;
+			CPU_EXTMEM[address] = (UINT8)value;
 		}
 	}
 #endif
@@ -881,14 +626,14 @@ void MEMCALL i286_memorywrite_w(UINT32 a
 	else if (address >= (USE_HIMEM - 1)) {
 		address -= 0x100000;
 		if (address == (USE_HIMEM - 0x100000 - 1)) {
-			mem[address] = (BYTE)value;
+			mem[address] = (UINT8)value;
 		}
 		else if (address < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[address] = (BYTE)value;
+			CPU_EXTMEM[address] = (UINT8)value;
 		}
 		address++;
 		if (address < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[address] = (BYTE)(value >> 8);
+			CPU_EXTMEM[address] = (UINT8)(value >> 8);
 		}
 	}
 #endif
@@ -896,9 +641,9 @@ void MEMCALL i286_memorywrite_w(UINT32 a
 		memfn.wr16[(address >> 15) & 0x1f](address, value);
 	}
 	else {
-		memfn.wr8[(address >> 15) & 0x1f](address, (BYTE)value);
+		memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)value);
 		address++;
-		memfn.wr8[(address >> 15) & 0x1f](address, (BYTE)(value >> 8));
+		memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)(value >> 8));
 	}
 }
 
@@ -934,7 +679,7 @@ void MEMCALL meml_write8(UINT seg, UINT 
 
 	address = (seg << 4) + LOW16(off);
 	if (address < I286_MEMWRITEMAX) {
-		mem[address] = (BYTE)value;
+		mem[address] = (UINT8)value;
 	}
 	else {
 		i286_memorywrite(address, value);
@@ -956,11 +701,11 @@ void MEMCALL meml_write16(UINT seg, UINT
 
 void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) {
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT32	adrs;
 	UINT	size;
 
-	out = (BYTE *)dat;
+	out = (UINT8 *)dat;
 	adrs = seg << 4;
 	off = LOW16(off);
 	if ((I286_MEMREADMAX >= 0x10000) &&
@@ -994,11 +739,11 @@ void MEMCALL meml_readstr(UINT seg, UINT
 
 void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng) {
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT32	adrs;
 	UINT	size;
 
-	out = (BYTE *)dat;
+	out = (UINT8 *)dat;
 	adrs = seg << 4;
 	off = LOW16(off);
 	if ((I286_MEMWRITEMAX >= 0x10000) &&
@@ -1036,7 +781,7 @@ void MEMCALL meml_read(UINT32 address, v
 		CopyMemory(dat, mem + address, leng);
 	}
 	else {
-		BYTE *out = (BYTE *)dat;
+		UINT8 *out = (UINT8 *)dat;
 		if (address < I286_MEMREADMAX) {
 			CopyMemory(out, mem + address, I286_MEMREADMAX - address);
 			out += I286_MEMREADMAX - address;
@@ -1051,13 +796,13 @@ void MEMCALL meml_read(UINT32 address, v
 
 void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng) {
 
-const BYTE	*out;
+const UINT8	*out;
 
 	if ((address + leng) < I286_MEMWRITEMAX) {
 		CopyMemory(mem + address, dat, leng);
 	}
 	else {
-		out = (BYTE *)dat;
+		out = (UINT8 *)dat;
 		if (address < I286_MEMWRITEMAX) {
 			CopyMemory(mem + address, out, I286_MEMWRITEMAX - address);
 			out += I286_MEMWRITEMAX - address;
@@ -1070,3 +815,5 @@ const BYTE	*out;
 	}
 }
 
+#endif
+