--- np2/i286c/memory.c	2003/10/16 17:57:47	1.1.1.1
+++ np2/i286c/memory.c	2005/03/11 15:12:57	1.28
@@ -1,739 +1,238 @@
 #include	"compiler.h"
-#include	"i286.h"
-#include	"memory.h"
-#include	"egcmem.h"
+
+#ifndef NP2_MEMORY_ASM
+
+#include	"cpucore.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"
 
 
-#define	USE_HIMEM
-
-// ---- write byte
-
-static void MEMCALL i286_wt(UINT32 address, BYTE value) {
-
-	mem[address & extmem.adrsmask] = value;
-}
-
-static void MEMCALL tram_wt(UINT32 address, BYTE value) {
-
-	nevent.remainclock -= vramop.tramwait;
-	if (address < 0xa2000) {
-		mem[address] = value;
-		tramupdate[(address >> 1) & 0x0fff] = 1;
-		gdcs.textdisp |= 1;
-	}
-	else if (address < 0xa3fe0) {
-		if (!(address & 1)) {
-			mem[address] = value;
-			tramupdate[(address >> 1) & 0x0fff] = 1;
-			gdcs.textdisp |= 1;
-		}
-	}
-	else if (address < 0xa4000) {
-		if (!(address & 1)) {
-			if ((!(address & 2)) || (gdcs.msw_accessable)) {
-				mem[address] = value;
-				tramupdate[(address >> 1) & 0x0fff] = 1;
-				gdcs.textdisp |= 1;
-			}
-		}
-	}
-	else if (address < 0xa5000) {
-		if ((address & 1) && (cgwindow.writable & 1)) {
-			cgwindow.writable |= 0x80;
-			font[cgwindow.high + ((address >> 1) & 0x0f)] = value;
-		}
-	}
-}
+	UINT8	mem[0x200000];
 
-static void MEMCALL vram_w0(UINT32 address, BYTE value) {
 
-	nevent.remainclock -= vramop.vramwait;
-	mem[address] = value;
-	vramupdate[address & 0x7fff] |= 1;
-	gdcs.grphdisp |= 1;
-}
+// ---- MAIN
 
-static void MEMCALL vram_w1(UINT32 address, BYTE value) {
+static REG8 MEMCALL memmain_rd8(UINT32 address) {
 
-	nevent.remainclock -= vramop.vramwait;
-	mem[address + VRAM_STEP] = value;
-	vramupdate[address & 0x7fff] |= 2;
-	gdcs.grphdisp |= 2;
+	return(mem[address & CPU_ADRSMASK]);
 }
 
-static void MEMCALL grcg_rmw0(UINT32 address, BYTE value) {
+static REG16 MEMCALL memmain_rd16(UINT32 address) {
 
-	BYTE	mask;
-	BYTE	*vram;
+const UINT8	*ptr;
 
-	nevent.remainclock -= vramop.grcgwait;
-	mask = ~value;
-	address &= 0x7fff;
-	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]);
-	}
+	ptr = mem + (address & CPU_ADRSMASK);
+	return(LOADINTELWORD(ptr));
 }
 
-static void MEMCALL grcg_rmw1(UINT32 address, BYTE value) {
+static void MEMCALL memmain_wr8(UINT32 address, REG8 value) {
 
-	BYTE	mask;
-	BYTE	*vram;
-
-	nevent.remainclock -= vramop.grcgwait;
-	mask = ~value;
-	address &= 0x7fff;
-	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]);
-	}
+	mem[address & CPU_ADRSMASK] = (UINT8)value;
 }
 
-static void MEMCALL grcg_tdw0(UINT32 address, BYTE value) {
+static void MEMCALL memmain_wr16(UINT32 address, REG16 value) {
 
-	BYTE	*vram;
+	UINT8	*ptr;
 
-	nevent.remainclock -= vramop.grcgwait;
-	address &= 0x7fff;
-	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;
+	ptr = mem + (address & CPU_ADRSMASK);
+	STOREINTELWORD(ptr, value);
 }
 
-static void MEMCALL grcg_tdw1(UINT32 address, BYTE value) {
-
-	BYTE	*vram;
 
-	nevent.remainclock -= vramop.grcgwait;
-	address &= 0x7fff;
-	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;
-}
+// ---- N/C
 
-static void MEMCALL egc_wt(UINT32 address, BYTE value) {
+static REG8 MEMCALL memnc_rd8(UINT32 address) {
 
-	egc_write(address, value);
+	(void)address;
+	return(0xff);
 }
 
-static void MEMCALL emmc_wt(UINT32 address, BYTE value) {
+static REG16 MEMCALL memnc_rd16(UINT32 address) {
 
-	extmem.pageptr[(address >> 14) & 3][address & 0x3fff] = value;
+	(void)address;
+	return(0xffff);
 }
 
-static void MEMCALL i286_wn(UINT32 address, BYTE value) {
+static void MEMCALL memnc_wr8(UINT32 address, REG8 value) {
 
 	(void)address;
 	(void)value;
 }
 
-
-// ---- read byte
-
-static BYTE MEMCALL i286_rd(UINT32 address) {
-
-	return(mem[address & extmem.adrsmask]);
-}
-
-static BYTE MEMCALL tram_rd(UINT32 address) {
-
-	nevent.remainclock -= vramop.tramwait;
-	if (address < 0xa4000) {
-		return(mem[address]);
-	}
-	else if (address < 0xa5000) {
-		if (address & 1) {
-			return(font[cgwindow.high + ((address >> 1) & 0x0f)]);
-		}
-		else {
-			return(font[cgwindow.low + ((address >> 1) & 0x0f)]);
-		}
-	}
-	return(mem[address]);
-}
-
-static BYTE MEMCALL vram_r0(UINT32 address) {
-
-	nevent.remainclock -= vramop.vramwait;
-	return(mem[address]);
-}
-
-static BYTE MEMCALL vram_r1(UINT32 address) {
-
-	nevent.remainclock -= vramop.vramwait;
-	return(mem[address + VRAM_STEP]);
-}
-
-static BYTE MEMCALL grcg_tcr0(UINT32 address) {
-
-const BYTE	*vram;
-	BYTE	ret;
-
-	nevent.remainclock -= vramop.grcgwait;
-	vram = mem + (address & 0x7fff);
-	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);
-}
-
-static BYTE MEMCALL grcg_tcr1(UINT32 address) {
-
-	BYTE	*vram;
-	BYTE	ret;
-
-	nevent.remainclock -= vramop.grcgwait;
-	ret = 0;
-	vram = mem + (address & 0x7fff);
-	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);
-}
-
-static BYTE MEMCALL egc_rd(UINT32 address) {
-
-	return(egc_read(address));
-}
-
-static BYTE MEMCALL emmc_rd(UINT32 address) {
-
-	return(extmem.pageptr[(address >> 14) & 3][address & 0x3fff]);
-}
-
-static BYTE MEMCALL i286_itf(UINT32 address) {
-
-	if (itf.bank) {
-		address = ITF_ADRS + (address & 0x7fff);
-	}
-	return(mem[address]);
-}
-
-
-// ---- write word
-
-static void MEMCALL i286w_wt(UINT32 address, UINT16 value) {
-
-	BYTE	*ptr;
-
-	ptr = mem + (address & extmem.adrsmask);
-	STOREINTELWORD(ptr, value);
-}
-
-static void MEMCALL tramw_wt(UINT32 address, UINT16 value) {
-
-	if (address < 0xa1fff) {
-		STOREINTELWORD(mem + address, value);
-		tramupdate[(address >> 1) & 0x0fff] = 1;
-		tramupdate[((address + 1) >> 1) & 0x0fff] = 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[(address >> 1) & 0x0fff] = 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[(address >> 1) & 0x0fff] = 1;
-			gdcs.textdisp |= 1;
-		}
-	}
-	else if (address < 0xa5000) {
-		if (address & 1) {
-			value >>= 8;
-		}
-		if (cgwindow.writable & 1) {
-			cgwindow.writable |= 0x80;
-			font[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
-		}
-	}
-}
-
-
-#define GRCGW_NON(page) {											\
-	nevent.remainclock -= vramop.vramwait;							\
-	STOREINTELWORD(mem + address + VRAM_STEP*(page), value);		\
-	vramupdate[address & 0x7fff] |= (1 << page);					\
-	vramupdate[(address + 1) & 0x7fff] |= (1 << page);				\
-	gdcs.grphdisp |= (1 << page);									\
-}
-
-#define GRCGW_RMW(page) {											\
-	BYTE	*vram;													\
-	nevent.remainclock -= vramop.grcgwait;							\
-	address &= 0x7fff;												\
-	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;													\
-	nevent.remainclock -= vramop.grcgwait;							\
-	address &= 0x7fff;												\
-	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, UINT16 value) GRCGW_NON(0)
-static void MEMCALL vramw_w1(UINT32 address, UINT16 value) GRCGW_NON(1)
-static void MEMCALL grcgw_rmw0(UINT32 address, UINT16 value) GRCGW_RMW(0)
-static void MEMCALL grcgw_rmw1(UINT32 address, UINT16 value) GRCGW_RMW(1)
-static void MEMCALL grcgw_tdw0(UINT32 address, UINT16 value) GRCGW_TDW(0)
-static void MEMCALL grcgw_tdw1(UINT32 address, UINT16 value) GRCGW_TDW(1)
-
-static void MEMCALL egcw_wt(UINT32 address, UINT16 value) {
-
-	if (!(address & 1)) {
-		egc_write_w(address, value);
-	}
-	else {
-		if (!(egc.sft & 0x1000)) {
-			egc_write(address, (BYTE)value);
-			egc_write(address + 1, (BYTE)(value >> 8));
-		}
-		else {
-			egc_write(address + 1, (BYTE)(value >> 8));
-			egc_write(address, (BYTE)value);
-		}
-	}
-}
-
-static void MEMCALL emmcw_wt(UINT32 address, UINT16 value) {
-
-	BYTE	*ptr;
-
-	if ((address & 0x3fff) != 0x3fff) {
-		ptr = extmem.pageptr[(address >> 14) & 3] + (address & 0x3fff);
-		STOREINTELWORD(ptr, value);
-	}
-	else {
-		extmem.pageptr[(address >> 14) & 3][0x3fff] = (BYTE)value;
-		extmem.pageptr[((address + 1)>> 14) & 3][0] = (BYTE)(value >> 8);
-	}
-}
-
-static void MEMCALL i286w_wn(UINT32 address, UINT16 value) {
+static void MEMCALL memnc_wr16(UINT32 address, REG16 value) {
 
 	(void)address;
 	(void)value;
 }
 
 
-// ---- read word
-
-static UINT16 MEMCALL i286w_rd(UINT32 address) {
-
-	BYTE	*ptr;
-
-	ptr = mem + (address & extmem.adrsmask);
-	return(LOADINTELWORD(ptr));
-}
-
-static UINT16 MEMCALL tramw_rd(UINT32 address) {
-
-	nevent.remainclock -= vramop.tramwait;
-	if (address < (0xa4000 - 1)) {
-		return(LOADINTELWORD(mem + address));
-	}
-	else if (address == 0xa3fff) {
-		return(mem[address] + (font[cgwindow.low] << 8));
-	}
-	else if (address < 0xa4fff) {
-		if (address & 1) {
-			UINT16 ret;
-			ret = font[cgwindow.high + ((address >> 1) & 0x0f)];
-			ret += font[cgwindow.low + (((address + 1) >> 1) & 0x0f)] << 8;
-			return(ret);
-		}
-		else {
-			UINT16 ret;
-			ret = font[cgwindow.low + ((address >> 1) & 0x0f)];
-			ret += font[cgwindow.high + ((address >> 1) & 0x0f)] << 8;
-			return(ret);
-		}
-	}
-	else if (address == 0xa4fff) {
-		return((mem[0xa5000] << 8) | font[cgwindow.high + 15]);
-	}
-	return(LOADINTELWORD(mem + address));
-}
-
-static UINT16 MEMCALL vramw_r0(UINT32 address) {
-
-	nevent.remainclock -= vramop.vramwait;
-	return(LOADINTELWORD(mem + address));
-}
-
-static UINT16 MEMCALL vramw_r1(UINT32 address) {
-
-	nevent.remainclock -= vramop.vramwait;
-	return(LOADINTELWORD(mem + address + VRAM_STEP));
-}
-
-static UINT16 MEMCALL grcgw_tcr0(UINT32 address) {
-
-	BYTE	*vram;
-	UINT16	ret;
-
-	nevent.remainclock -= vramop.grcgwait;
-	ret = 0;
-	vram = mem + (address & 0x7fff);
-	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(~ret);
-}
-
-static UINT16 MEMCALL grcgw_tcr1(UINT32 address) {
-
-	BYTE	*vram;
-	UINT16	ret;
-
-	nevent.remainclock -= vramop.grcgwait;
-	ret = 0;
-	vram = mem + (address & 0x7fff);
-	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(~ret);
-}
-
-static UINT16 MEMCALL egcw_rd(UINT32 address) {
-
-	UINT16 ret;
-
-	if (!(address & 1)) {
-		return(egc_read_w(address));
-	}
-	else {
-		if (!(egc.sft & 0x1000)) {
-			ret = egc_read(address);
-			ret += (UINT16)egc_read(address + 1) << 8;
-			return(ret);
-		}
-		else {
-			UINT16 ret;
-			ret = (UINT16)egc_read(address + 1) << 8;
-			ret += egc_read(address);
-			return(ret);
-		}
-	}
-}
-
-static UINT16 MEMCALL emmcw_rd(UINT32 address) {
-
-	BYTE	*ptr;
-
-	ptr = extmem.pageptr[(address >> 14) & 3] + (address & 0x3fff);
-	return(LOADINTELWORD(ptr));
-}
-
-static UINT16 MEMCALL i286w_itf(UINT32 address) {
-
-	if (itf.bank) {
-		address = ITF_ADRS + (address & 0x7fff);
-	}
-	return(LOADINTELWORD(mem + address));
-}
-
-
 // ---- table
 
-typedef void (MEMCALL * MEM8WRITE)(UINT32 address, BYTE value);
-typedef BYTE (MEMCALL * MEM8READ)(UINT32 address);
-typedef void (MEMCALL * MEM16WRITE)(UINT32 address, UINT16 value);
-typedef UINT16 (MEMCALL * MEM16READ)(UINT32 address);
-
-static MEM8WRITE memory_write[] = {
-			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_wn,	i286_wn,		// c0
-			vram_w0,	i286_wn,	i286_wn,	i286_wn};		// e0
-
-static MEM8READ memory_read[] = {
-			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_itf};		// f0
-
-static MEM16WRITE memword_write[] = {
-			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_wn,	i286w_wn,		// c0
-			vramw_w0,	i286w_wn,	i286w_wn,	i286w_wn};		// e0
-
-static MEM16READ memword_read[] = {
-			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_itf};		// e0
-
-static const MEM8WRITE vram_write[] = {
-			vram_w0,	vram_w1,	vram_w0,	vram_w1,		// 00
-			vram_w0,	vram_w1,	vram_w0,	vram_w1,		// 40
-			grcg_tdw0,	grcg_tdw1,	egc_wt,		egc_wt,			// 80 tdw/tcr
-			grcg_rmw0,	grcg_rmw1,	egc_wt,		egc_wt};		// c0 rmw
-
-static const MEM8READ vram_read[] = {
-			vram_r0,	vram_r1,	vram_r0,	vram_r1,		// 00
-			vram_r0,	vram_r1,	vram_r0,	vram_r1,		// 40
-			grcg_tcr0,	grcg_tcr1,	egc_rd,		egc_rd,			// 80 tdw/tcr
-			vram_r0,	vram_r1,	egc_rd,		egc_rd};		// c0 rmw
-
-static const MEM16WRITE vramw_write[] = {
-			vramw_w0,	vramw_w1,	vramw_w0,	vramw_w1,		// 00
-			vramw_w0,	vramw_w1,	vramw_w0,	vramw_w1,		// 40
-			grcgw_tdw0,	grcgw_tdw1,	egcw_wt,	egcw_wt,		// 80 tdw/tcr
-			grcgw_rmw0,	grcgw_rmw1,	egcw_wt,	egcw_wt};		// c0 rmw
-
-static const MEM16READ vramw_read[] = {
-			vramw_r0,	vramw_r1,	vramw_r0,	vramw_r1,		// 00
-			vramw_r0,	vramw_r1,	vramw_r0,	vramw_r1,		// 40
-			grcgw_tcr0,	grcgw_tcr1,	egcw_rd,	egcw_rd,		// 80 tdw/tcr
-			vramw_r0,	vramw_r1,	egcw_rd,	egcw_rd};		// c0 rmw
+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);
+
+typedef struct {
+	MEM8READ	rd8[0x20];
+	MEM8WRITE	wr8[0x20];
+	MEM16READ	rd16[0x20];
+	MEM16WRITE	wr16[0x20];
+} MEMFN;
+
+typedef struct {
+	MEM8READ	brd8;		// E8000-F7FFF byte read
+	MEM8READ	ird8;		// F8000-FFFFF byte read
+	MEM8WRITE	bwr8;		// E8000-FFFFF byte write
+	MEM16READ	brd16;		// E8000-F7FFF word read
+	MEM16READ	ird16;		// F8000-FFFFF word read
+	MEM16WRITE	bwr16;		// F8000-FFFFF word write
+} MMAPTBL;
+
+typedef struct {
+	MEM8READ	rd8;
+	MEM8WRITE	wr8;
+	MEM16READ	rd16;
+	MEM16WRITE	wr16;
+} VACCTBL;
+
+static MEMFN memfn = {
+	   {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] = {
+		   {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] = {
+		{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) {
+
+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;
+}
 
+void MEMCALL i286_vram_dispatch(UINT func) {
 
-static BYTE MEMCALL i286_nonram_r(UINT32 address) {
+const VACCTBL	*vacc;
 
-	(void)address;
-	return(0xff);
-}
+	vacc = vacctbl + (func & 0x0f);
 
-static UINT16 MEMCALL i286_nonram_rw(UINT32 address) {
+	memfn.rd8[0xa8000 >> 15] = vacc->rd8;
+	memfn.rd8[0xb0000 >> 15] = vacc->rd8;
+	memfn.rd8[0xb8000 >> 15] = vacc->rd8;
+	memfn.rd8[0xe0000 >> 15] = vacc->rd8;
 
-	(void)address;
-	return(0xffff);
-}
+	memfn.wr8[0xa8000 >> 15] = vacc->wr8;
+	memfn.wr8[0xb0000 >> 15] = vacc->wr8;
+	memfn.wr8[0xb8000 >> 15] = vacc->wr8;
+	memfn.wr8[0xe0000 >> 15] = vacc->wr8;
 
-void MEMCALL i286_vram_dispatch(UINT func) {
+	memfn.rd16[0xa8000 >> 15] = vacc->rd16;
+	memfn.rd16[0xb0000 >> 15] = vacc->rd16;
+	memfn.rd16[0xb8000 >> 15] = vacc->rd16;
+	memfn.rd16[0xe0000 >> 15] = vacc->rd16;
 
-	UINT	proc;
+	memfn.wr16[0xa8000 >> 15] = vacc->wr16;
+	memfn.wr16[0xb0000 >> 15] = vacc->wr16;
+	memfn.wr16[0xb8000 >> 15] = vacc->wr16;
+	memfn.wr16[0xe0000 >> 15] = vacc->wr16;
 
-	proc = func & 0x0f;
-	memory_write[0xa8000 >> 15] = vram_write[proc];
-	memory_write[0xb0000 >> 15] = vram_write[proc];
-	memory_write[0xb8000 >> 15] = vram_write[proc];
-	memory_write[0xe0000 >> 15] = vram_write[proc];
-
-	memory_read[0xa8000 >> 15] = vram_read[proc];
-	memory_read[0xb0000 >> 15] = vram_read[proc];
-	memory_read[0xb8000 >> 15] = vram_read[proc];
-	memory_read[0xe0000 >> 15] = vram_read[proc];
-
-	memword_write[0xa8000 >> 15] = vramw_write[proc];
-	memword_write[0xb0000 >> 15] = vramw_write[proc];
-	memword_write[0xb8000 >> 15] = vramw_write[proc];
-	memword_write[0xe0000 >> 15] = vramw_write[proc];
-
-	memword_read[0xa8000 >> 15] = vramw_read[proc];
-	memword_read[0xb0000 >> 15] = vramw_read[proc];
-	memword_read[0xb8000 >> 15] = vramw_read[proc];
-	memword_read[0xe0000 >> 15] = vramw_read[proc];
-
-	if (!(func & 0x10)) {							// degital
-		memory_write[0xe0000 >> 15] = i286_wn;
-		memword_write[0xe0000 >> 15] = i286w_wn;
-		memory_read[0xe0000 >> 15] = i286_nonram_r;
-		memword_read[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;
 	}
 }
 
-BYTE MEMCALL i286_memoryread(UINT32 address) {
+REG8 MEMCALL i286_memoryread(UINT32 address) {
 
 	if (address < I286_MEMREADMAX) {
 		return(mem[address]);
 	}
 #if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
+	else if (address >= USE_HIMEM) {
 		address -= 0x100000;
-		if (address < extmemmng_size) {
-			return(extmemmng_ptr[address]);
+		if (address < CPU_EXTMEMSIZE) {
+			return(CPU_EXTMEM[address]);
 		}
 		else {
 			return(0xff);
@@ -741,32 +240,32 @@ BYTE MEMCALL i286_memoryread(UINT32 addr
 	}
 #endif
 	else {
-		return(memory_read[(address >> 15) & 0x1f](address));
+		return(memfn.rd8[(address >> 15) & 0x1f](address));
 	}
 }
 
-UINT16 MEMCALL i286_memoryread_w(UINT32 address) {
+REG16 MEMCALL i286_memoryread_w(UINT32 address) {
 
-	UINT16	ret;
+	REG16	ret;
 
 	if (address < (I286_MEMREADMAX - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
 #if defined(USE_HIMEM)
-	else if (address >= (0x10fff0 - 1)) {
+	else if (address >= (USE_HIMEM - 1)) {
 		address -= 0x100000;
-		if (address == (0x00fff0 - 1)) {
+		if (address == (USE_HIMEM - 0x100000 - 1)) {
 			ret = mem[0x100000 + address];
 		}
-		else if (address < extmemmng_size) {
-			ret = extmemmng_ptr[address];
+		else if (address < CPU_EXTMEMSIZE) {
+			ret = CPU_EXTMEM[address];
 		}
 		else {
 			ret = 0xff;
 		}
 		address++;
-		if (address < extmemmng_size) {
-			ret += extmemmng_ptr[address] << 8;
+		if (address < CPU_EXTMEMSIZE) {
+			ret += CPU_EXTMEM[address] << 8;
 		}
 		else {
 			ret += 0xff00;
@@ -775,69 +274,69 @@ UINT16 MEMCALL i286_memoryread_w(UINT32 
 	}
 #endif
 	else if ((address & 0x7fff) != 0x7fff) {
-		return(memword_read[(address >> 15) & 0x1f](address));
+		return(memfn.rd16[(address >> 15) & 0x1f](address));
 	}
 	else {
-		ret = memory_read[(address >> 15) & 0x1f](address);
+		ret = memfn.rd8[(address >> 15) & 0x1f](address);
 		address++;
-		ret += memory_read[(address >> 15) & 0x1f](address) << 8;
+		ret += memfn.rd8[(address >> 15) & 0x1f](address) << 8;
 		return(ret);
 	}
 }
 
-void MEMCALL i286_memorywrite(UINT32 address, BYTE value) {
+void MEMCALL i286_memorywrite(UINT32 address, REG8 value) {
 
 	if (address < I286_MEMWRITEMAX) {
-		mem[address] = value;
+		mem[address] = (UINT8)value;
 	}
 #if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
+	else if (address >= USE_HIMEM) {
 		address -= 0x100000;
-		if (address < extmemmng_size) {
-			extmemmng_ptr[address] = value;
+		if (address < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[address] = (UINT8)value;
 		}
 	}
 #endif
 	else {
-		memory_write[(address >> 15) & 0x1f](address, value);
+		memfn.wr8[(address >> 15) & 0x1f](address, value);
 	}
 }
 
-void MEMCALL i286_memorywrite_w(UINT32 address, UINT16 value) {
+void MEMCALL i286_memorywrite_w(UINT32 address, REG16 value) {
 
 	if (address < (I286_MEMWRITEMAX - 1)) {
 		STOREINTELWORD(mem + address, value);
 	}
 #if defined(USE_HIMEM)
-	else if (address >= (0x10fff0 - 1)) {
+	else if (address >= (USE_HIMEM - 1)) {
 		address -= 0x100000;
-		if (address == (0x00fff0 - 1)) {
-			mem[address] = (BYTE)value;
+		if (address == (USE_HIMEM - 0x100000 - 1)) {
+			mem[address] = (UINT8)value;
 		}
-		else if (address < extmemmng_size) {
-			extmemmng_ptr[address] = (BYTE)value;
+		else if (address < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[address] = (UINT8)value;
 		}
 		address++;
-		if (address < extmemmng_size) {
-			extmemmng_ptr[address] = (BYTE)(value >> 8);
+		if (address < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[address] = (UINT8)(value >> 8);
 		}
 	}
 #endif
 	else if ((address & 0x7fff) != 0x7fff) {
-		memword_write[(address >> 15) & 0x1f](address, value);
+		memfn.wr16[(address >> 15) & 0x1f](address, value);
 	}
 	else {
-		memory_write[(address >> 15) & 0x1f](address, (BYTE)value);
+		memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)value);
 		address++;
-		memory_write[(address >> 15) & 0x1f](address, (BYTE)(value >> 8));
+		memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)(value >> 8));
 	}
 }
 
-BYTE MEMCALL i286_membyte_read(UINT seg, UINT off) {
+REG8 MEMCALL meml_read8(UINT seg, UINT off) {
 
 	UINT32	address;
 
-	address = (seg << 4) + off;
+	address = (seg << 4) + LOW16(off);
 	if (address < I286_MEMREADMAX) {
 		return(mem[address]);
 	}
@@ -846,11 +345,11 @@ BYTE MEMCALL i286_membyte_read(UINT seg,
 	}
 }
 
-UINT16 MEMCALL i286_memword_read(UINT seg, UINT off) {
+REG16 MEMCALL meml_read16(UINT seg, UINT off) {
 
 	UINT32	address;
 
-	address = (seg << 4) + off;
+	address = (seg << 4) + LOW16(off);
 	if (address < (I286_MEMREADMAX - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
@@ -859,40 +358,41 @@ UINT16 MEMCALL i286_memword_read(UINT se
 	}
 }
 
-void MEMCALL i286_membyte_write(UINT seg, UINT off, BYTE value) {
+void MEMCALL meml_write8(UINT seg, UINT off, REG8 value) {
 
 	UINT32	address;
 
-	address = (seg << 4) + off;
+	address = (seg << 4) + LOW16(off);
 	if (address < I286_MEMWRITEMAX) {
-		mem[address] = value;
+		mem[address] = (UINT8)value;
 	}
 	else {
 		i286_memorywrite(address, value);
 	}
 }
 
-void MEMCALL i286_memword_write(UINT seg, UINT off, UINT16 value) {
+void MEMCALL meml_write16(UINT seg, UINT off, REG16 value) {
 
 	UINT32	address;
 
-	address = (seg << 4) + off;
+	address = (seg << 4) + LOW16(off);
 	if (address < (I286_MEMWRITEMAX - 1)) {
-		STOREINTELWORD(mem + address,  value);
+		STOREINTELWORD(mem + address, value);
 	}
 	else {
 		i286_memorywrite_w(address, value);
 	}
 }
 
-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) {
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT32	adrs;
 	UINT	size;
 
-	out = (BYTE *)dat;
+	out = (UINT8 *)dat;
 	adrs = seg << 4;
+	off = LOW16(off);
 	if ((I286_MEMREADMAX >= 0x10000) &&
 		(adrs < (I286_MEMREADMAX - 0x10000))) {
 		if (leng) {
@@ -917,20 +417,20 @@ void MEMCALL i286_memstr_read(UINT seg, 
 	else {
 		while(leng--) {
 			*out++ = i286_memoryread(adrs + off);
-			off = (off + 1) & 0xffff;
+			off = LOW16(off + 1);
 		}
 	}
 }
 
-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) {
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT32	adrs;
 	UINT	size;
 
-	out = (BYTE *)dat;
+	out = (UINT8 *)dat;
 	adrs = seg << 4;
+	off = LOW16(off);
 	if ((I286_MEMWRITEMAX >= 0x10000) &&
 		(adrs < (I286_MEMWRITEMAX - 0x10000))) {
 		if (leng) {
@@ -955,18 +455,18 @@ void MEMCALL i286_memstr_write(UINT seg,
 	else {
 		while(leng--) {
 			i286_memorywrite(adrs + off, *out++);
-			off = (off + 1) & 0xffff;
+			off = LOW16(off + 1);
 		}
 	}
 }
 
-void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng) {
+void MEMCALL meml_read(UINT32 address, void *dat, UINT leng) {
 
 	if ((address + leng) < I286_MEMREADMAX) {
 		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;
@@ -979,15 +479,15 @@ void MEMCALL i286_memx_read(UINT32 addre
 	}
 }
 
-void MEMCALL i286_memx_write(UINT32 address, const void *dat, UINT leng) {
+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;
@@ -1000,3 +500,5 @@ const BYTE	*out;
 	}
 }
 
+#endif
+