--- np2/i286c/memory.c	2003/12/22 01:44:59	1.15
+++ np2/i286c/memory.c	2005/02/07 14:46:11	1.23
@@ -7,33 +7,27 @@
 #include	"font.h"
 
 
-	BYTE	mem[0x200000];
+	UINT8	mem[0x200000];
 
 
-#define	USE_HIMEM		0x10fff0
-
-#if defined(TRACE)
-#define	MEMORY_DEBUG
-#endif
-
 // ---- write byte
 
-static void MEMCALL i286_wt(UINT32 address, REG8 value) {
+static void MEMCALL i286_wt(UINT32 address, REG8 value) {		// MAIN
 
-	mem[address & CPU_ADRSMASK] = (BYTE)value;
+	mem[address & CPU_ADRSMASK] = (UINT8)value;
 }
 
-static void MEMCALL tram_wt(UINT32 address, REG8 value) {
+static void MEMCALL tram_wt(UINT32 address, REG8 value) {		// TRAM
 
 	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa2000) {
-		mem[address] = (BYTE)value;
+		mem[address] = (UINT8)value;
 		tramupdate[LOW12(address >> 1)] = 1;
 		gdcs.textdisp |= 1;
 	}
 	else if (address < 0xa3fe0) {
 		if (!(address & 1)) {
-			mem[address] = (BYTE)value;
+			mem[address] = (UINT8)value;
 			tramupdate[LOW12(address >> 1)] = 1;
 			gdcs.textdisp |= 1;
 		}
@@ -41,7 +35,7 @@ static void MEMCALL tram_wt(UINT32 addre
 	else if (address < 0xa4000) {
 		if (!(address & 1)) {
 			if ((!(address & 2)) || (gdcs.msw_accessable)) {
-				mem[address] = (BYTE)value;
+				mem[address] = (UINT8)value;
 				tramupdate[LOW12(address >> 1)] = 1;
 				gdcs.textdisp |= 1;
 			}
@@ -50,31 +44,31 @@ static void MEMCALL tram_wt(UINT32 addre
 	else if (address < 0xa5000) {
 		if ((address & 1) && (cgwindow.writable & 1)) {
 			cgwindow.writable |= 0x80;
-			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
+			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (UINT8)value;
 		}
 	}
 }
 
-static void MEMCALL vram_w0(UINT32 address, REG8 value) {
+static void MEMCALL vram_w0(UINT32 address, REG8 value) {		// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	mem[address] = (BYTE)value;
+	mem[address] = (UINT8)value;
 	vramupdate[LOW15(address)] |= 1;
 	gdcs.grphdisp |= 1;
 }
 
-static void MEMCALL vram_w1(UINT32 address, REG8 value) {
+static void MEMCALL vram_w1(UINT32 address, REG8 value) {		// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_VRAM;
-	mem[address + VRAM_STEP] = (BYTE)value;
+	mem[address + VRAM_STEP] = (UINT8)value;
 	vramupdate[LOW15(address)] |= 2;
 	gdcs.grphdisp |= 2;
 }
 
-static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) {
+static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) {		// VRAM
 
 	REG8	mask;
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
@@ -100,10 +94,10 @@ static void MEMCALL grcg_rmw0(UINT32 add
 	}
 }
 
-static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) {
+static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) {		// VRAM
 
 	REG8	mask;
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
@@ -129,9 +123,9 @@ static void MEMCALL grcg_rmw1(UINT32 add
 	}
 }
 
-static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) {
+static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) {		// VRAM
 
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
@@ -153,9 +147,9 @@ static void MEMCALL grcg_tdw0(UINT32 add
 	(void)value;
 }
 
-static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) {
+static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) {		// VRAM
 
-	BYTE	*vram;
+	UINT8	*vram;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
@@ -177,18 +171,30 @@ static void MEMCALL grcg_tdw1(UINT32 add
 	(void)value;
 }
 
-static void MEMCALL egc_wt(UINT32 address, REG8 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) {
+static void MEMCALL emmc_wt(UINT32 address, REG8 value) {		// EMS
+
+	CPU_EMSPTR[(address >> 14) & 3][LOW14(address)] = (UINT8)value;
+}
+
+static void MEMCALL i286_wd(UINT32 address, REG8 value) {		// D000¡ÁDFFF
+
+	if (CPU_RAM_D000 & (1 << ((address >> 12) & 15))) {
+		mem[address] = (UINT8)value;
+	}
+}
+
+static void MEMCALL i286_wb(UINT32 address, REG8 value) {		// F800¡ÁFFFF
 
-	extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
+	mem[address + 0x1c8000 - 0xe8000] = (UINT8)value;
 }
 
-static void MEMCALL i286_wn(UINT32 address, REG8 value) {
+static void MEMCALL i286_wn(UINT32 address, REG8 value) {		// NONE
 
 	(void)address;
 	(void)value;
@@ -197,12 +203,12 @@ static void MEMCALL i286_wn(UINT32 addre
 
 // ---- read byte
 
-static REG8 MEMCALL i286_rd(UINT32 address) {
+static REG8 MEMCALL i286_rd(UINT32 address) {					// MAIN
 
 	return(mem[address & CPU_ADRSMASK]);
 }
 
-static REG8 MEMCALL tram_rd(UINT32 address) {
+static REG8 MEMCALL tram_rd(UINT32 address) {					// TRAM
 
 	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa4000) {
@@ -219,21 +225,21 @@ static REG8 MEMCALL tram_rd(UINT32 addre
 	return(mem[address]);
 }
 
-static REG8 MEMCALL vram_r0(UINT32 address) {
+static REG8 MEMCALL vram_r0(UINT32 address) {					// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address]);
 }
 
-static REG8 MEMCALL vram_r1(UINT32 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) {
+static REG8 MEMCALL grcg_tcr0(UINT32 address) {					// VRAM
 
-const BYTE	*vram;
+const UINT8	*vram;
 	REG8	ret;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
@@ -254,9 +260,9 @@ const BYTE	*vram;
 	return(ret ^ 0xff);
 }
 
-static REG8 MEMCALL grcg_tcr1(UINT32 address) {
+static REG8 MEMCALL grcg_tcr1(UINT32 address) {					// VRAM
 
-const BYTE	*vram;
+const UINT8	*vram;
 	REG8	ret;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
@@ -277,21 +283,21 @@ const BYTE	*vram;
 	return(ret ^ 0xff);
 }
 
-static REG8 MEMCALL egc_rd(UINT32 address) {
+static REG8 MEMCALL egc_rd(UINT32 address) {					// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	return(egc_read(address));
 }
 
-static REG8 MEMCALL emmc_rd(UINT32 address) {
+static REG8 MEMCALL emmc_rd(UINT32 address) {					// EMS
 
-	return(extmem.pageptr[(address >> 14) & 3][LOW14(address)]);
+	return(CPU_EMSPTR[(address >> 14) & 3][LOW14(address)]);
 }
 
-static REG8 MEMCALL i286_itf(UINT32 address) {
+static REG8 MEMCALL i286_rb(UINT32 address) {					// F800-FFFF
 
 	if (CPU_ITFBANK) {
-		address = ITF_ADRS + LOW15(address);
+		address += VRAM_STEP;
 	}
 	return(mem[address]);
 }
@@ -301,7 +307,7 @@ static REG8 MEMCALL i286_itf(UINT32 addr
 
 static void MEMCALL i286w_wt(UINT32 address, REG16 value) {
 
-	BYTE	*ptr;
+	UINT8	*ptr;
 
 	ptr = mem + (address & CPU_ADRSMASK);
 	STOREINTELWORD(ptr, value);
@@ -327,7 +333,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 			address++;
 			value >>= 8;
 		}
-		mem[address] = (BYTE)value;
+		mem[address] = (UINT8)value;
 		tramupdate[LOW12(address >> 1)] = 1;
 		gdcs.textdisp |= 1;
 	}
@@ -337,18 +343,18 @@ static void MEMCALL tramw_wt(UINT32 addr
 			value >>= 8;
 		}
 		if ((!(address & 2)) || (gdcs.msw_accessable)) {
-			mem[address] = (BYTE)value;
+			mem[address] = (UINT8)value;
 			tramupdate[LOW12(address >> 1)] = 1;
 			gdcs.textdisp |= 1;
 		}
 	}
 	else if (address < 0xa5000) {
-		if (address & 1) {
+		if (!(address & 1)) {
 			value >>= 8;
 		}
 		if (cgwindow.writable & 1) {
 			cgwindow.writable |= 0x80;
-			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
+			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (UINT8)value;
 		}
 	}
 }
@@ -363,7 +369,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 }
 
 #define GRCGW_RMW(page) {											\
-	BYTE	*vram;													\
+	UINT8	*vram;													\
 	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
@@ -371,45 +377,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);								\
@@ -445,33 +451,51 @@ static void MEMCALL grcgw_tdw1(UINT32 ad
 static void MEMCALL egcw_wt(UINT32 address, REG16 value) {
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	if (!(address & 1)) {
-		egc_write_w(address, value);
-	}
-	else {
-		if (!(egc.sft & 0x1000)) {
-			egc_write(address, (REG8)value);
-			egc_write(address + 1, (REG8)(value >> 8));
-		}
-		else {
-			egc_write(address + 1, (REG8)(value >> 8));
-			egc_write(address, (REG8)value);
-		}
-	}
+	egc_write_w(address, value);
 }
 
 static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {
 
-	BYTE	*ptr;
+	UINT8	*ptr;
 
 	if ((address & 0x3fff) != 0x3fff) {
-		ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address);
+		ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address);
 		STOREINTELWORD(ptr, value);
 	}
 	else {
-		extmem.pageptr[(address >> 14) & 3][0x3fff] = (BYTE)value;
-		extmem.pageptr[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8);
+		CPU_EMSPTR[(address >> 14) & 3][0x3fff] = (UINT8)value;
+		CPU_EMSPTR[((address + 1) >> 14) & 3][0] = (UINT8)(value >> 8);
+	}
+}
+
+static void MEMCALL i286w_wd(UINT32 address, REG16 value) {
+
+	UINT8	*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) {
+
+	UINT8	*ptr;
+
+	ptr = mem + (address + 0x1c8000 - 0xe8000);
+	STOREINTELWORD(ptr, value);
 }
 
 static void MEMCALL i286w_wn(UINT32 address, REG16 value) {
@@ -485,7 +509,7 @@ static void MEMCALL i286w_wn(UINT32 addr
 
 static REG16 MEMCALL i286w_rd(UINT32 address) {
 
-	BYTE	*ptr;
+	UINT8	*ptr;
 
 	ptr = mem + (address & CPU_ADRSMASK);
 	return(LOADINTELWORD(ptr));
@@ -534,7 +558,7 @@ static REG16 MEMCALL vramw_r1(UINT32 add
 
 static REG16 MEMCALL grcgw_tcr0(UINT32 address) {
 
-	BYTE	*vram;
+	UINT8	*vram;
 	REG16	ret;
 
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
@@ -557,7 +581,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;
@@ -580,46 +604,30 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a
 
 static REG16 MEMCALL egcw_rd(UINT32 address) {
 
-	REG16	ret;
-
 	CPU_REMCLOCK -= MEMWAIT_GRCG;
-	if (!(address & 1)) {
-		return(egc_read_w(address));
-	}
-	else {
-		if (!(egc.sft & 0x1000)) {
-			ret = egc_read(address);
-			ret += egc_read(address + 1) << 8;
-			return(ret);
-		}
-		else {
-			ret = egc_read(address + 1) << 8;
-			ret += egc_read(address);
-			return(ret);
-		}
-	}
+	return(egc_read_w(address));
 }
 
 static REG16 MEMCALL emmcw_rd(UINT32 address) {
 
-const BYTE	*ptr;
+const UINT8	*ptr;
 	REG16	ret;
 
 	if ((address & 0x3fff) != 0x3fff) {
-		ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address);
+		ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address);
 		return(LOADINTELWORD(ptr));
 	}
 	else {
-		ret = extmem.pageptr[(address >> 14) & 3][0x3fff];
-		ret += extmem.pageptr[((address + 1) >> 14) & 3][0] << 8;
+		ret = CPU_EMSPTR[(address >> 14) & 3][0x3fff];
+		ret += CPU_EMSPTR[((address + 1) >> 14) & 3][0] << 8;
 		return(ret);
 	}
 }
 
-static REG16 MEMCALL i286w_itf(UINT32 address) {
+static REG16 MEMCALL i286w_rb(UINT32 address) {
 
 	if (CPU_ITFBANK) {
-		address = ITF_ADRS + LOW15(address);
+		address += VRAM_STEP;
 	}
 	return(LOADINTELWORD(mem + address));
 }
@@ -640,6 +648,15 @@ typedef struct {
 } 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;
@@ -654,7 +671,7 @@ static MEMFN memfn = {
 			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
+			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
@@ -662,7 +679,7 @@ static MEMFN memfn = {
 			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
+			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
@@ -672,7 +689,7 @@ static MEMFN memfn = {
 			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
+			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
@@ -680,9 +697,15 @@ static MEMFN memfn = {
 			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
+			emmcw_wt,	emmcw_wt,	i286w_wd,	i286w_wd,		// c0
 			vramw_w0,	i286w_wn,	i286w_wn,	i286w_wn}};		// 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}};
+
 static const VACCTBL vacctbl[0x10] = {
 			{vram_r0,	vram_w0,	vramw_r0,	vramw_w0},		// 00
 			{vram_r1,	vram_w1,	vramw_r1,	vramw_w1},
@@ -714,6 +737,28 @@ static REG16 MEMCALL i286_nonram_rw(UINT
 	return(0xffff);
 }
 
+
+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) {
 
 const VACCTBL	*vacc;
@@ -740,7 +785,7 @@ const VACCTBL	*vacc;
 	memfn.wr16[0xb8000 >> 15] = vacc->wr16;
 	memfn.wr16[0xe0000 >> 15] = vacc->wr16;
 
-	if (!(func & 0x10)) {							// degital
+	if (!(func & 0x10)) {							// digital
 		memfn.wr8[0xe0000 >> 15] = i286_wn;
 		memfn.wr16[0xe0000 >> 15] = i286w_wn;
 		memfn.rd8[0xe0000 >> 15] = i286_nonram_r;
@@ -748,90 +793,6 @@ const VACCTBL	*vacc;
 	}
 }
 
-#if defined(MEMORY_DEBUG)
-static REG8 MEMCALL _i286_memoryread(UINT32 address) {
-
-	if (address < I286_MEMREADMAX) {
-		return(mem[address]);
-	}
-#if defined(USE_HIMEM)
-	else if (address >= USE_HIMEM) {
-		address -= 0x100000;
-		if (address < CPU_EXTMEMSIZE) {
-			return(CPU_EXTMEM[address]);
-		}
-		else {
-			return(0xff);
-		}
-	}
-#endif
-	else {
-		return(memfn.rd8[(address >> 15) & 0x1f](address));
-	}
-}
-
-static REG16 MEMCALL _i286_memoryread_w(UINT32 address) {
-
-	REG16	ret;
-
-	if (address < (I286_MEMREADMAX - 1)) {
-		return(LOADINTELWORD(mem + address));
-	}
-#if defined(USE_HIMEM)
-	else if (address >= (USE_HIMEM - 1)) {
-		address -= 0x100000;
-		if (address == (USE_HIMEM - 0x100000 - 1)) {
-			ret = mem[0x100000 + address];
-		}
-		else if (address < CPU_EXTMEMSIZE) {
-			ret = CPU_EXTMEM[address];
-		}
-		else {
-			ret = 0xff;
-		}
-		address++;
-		if (address < CPU_EXTMEMSIZE) {
-			ret += CPU_EXTMEM[address] << 8;
-		}
-		else {
-			ret += 0xff00;
-		}
-		return(ret);
-	}
-#endif
-	else if ((address & 0x7fff) != 0x7fff) {
-		return(memfn.rd16[(address >> 15) & 0x1f](address));
-	}
-	else {
-		ret = memfn.rd8[(address >> 15) & 0x1f](address);
-		address++;
-		ret += memfn.rd8[(address >> 15) & 0x1f](address) << 8;
-		return(ret);
-	}
-}
-
-REG8 MEMCALL i286_memoryread(UINT32 address) {
-
-	REG8	r;
-
-	r = _i286_memoryread(address);
-	if (r & 0xffffff00) {
-		TRACEOUT(("error i286_memoryread %x %x", address, r));
-	}
-	return(r);
-}
-
-REG16 MEMCALL i286_memoryread_w(UINT32 address) {
-
-	REG16	r;
-
-	r = _i286_memoryread_w(address);
-	if (r & 0xffff0000) {
-		TRACEOUT(("error i286_memoryread_w %x %x", address, r));
-	}
-	return(r);
-}
-#else
 REG8 MEMCALL i286_memoryread(UINT32 address) {
 
 	if (address < I286_MEMREADMAX) {
@@ -892,18 +853,17 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 		return(ret);
 	}
 }
-#endif
 
 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
@@ -921,14 +881,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
@@ -936,13 +896,13 @@ 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));
 	}
 }
 
-REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {
+REG8 MEMCALL meml_read8(UINT seg, UINT off) {
 
 	UINT32	address;
 
@@ -955,7 +915,7 @@ REG8 MEMCALL i286_membyte_read(UINT seg,
 	}
 }
 
-REG16 MEMCALL i286_memword_read(UINT seg, UINT off) {
+REG16 MEMCALL meml_read16(UINT seg, UINT off) {
 
 	UINT32	address;
 
@@ -968,20 +928,20 @@ REG16 MEMCALL i286_memword_read(UINT seg
 	}
 }
 
-void MEMCALL i286_membyte_write(UINT seg, UINT off, REG8 value) {
+void MEMCALL meml_write8(UINT seg, UINT off, REG8 value) {
 
 	UINT32	address;
 
 	address = (seg << 4) + LOW16(off);
 	if (address < I286_MEMWRITEMAX) {
-		mem[address] = (BYTE)value;
+		mem[address] = (UINT8)value;
 	}
 	else {
 		i286_memorywrite(address, value);
 	}
 }
 
-void MEMCALL i286_memword_write(UINT seg, UINT off, REG16 value) {
+void MEMCALL meml_write16(UINT seg, UINT off, REG16 value) {
 
 	UINT32	address;
 
@@ -994,13 +954,13 @@ void MEMCALL i286_memword_write(UINT seg
 	}
 }
 
-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) &&
@@ -1032,14 +992,13 @@ void MEMCALL i286_memstr_read(UINT seg, 
 	}
 }
 
-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) &&
@@ -1071,13 +1030,13 @@ void MEMCALL i286_memstr_write(UINT seg,
 	}
 }
 
-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;
@@ -1090,15 +1049,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;