--- np2/i286c/memory.c	2003/12/01 17:13:36	1.8
+++ np2/i286c/memory.c	2004/04/05 12:02:30	1.21
@@ -1,6 +1,5 @@
 #include	"compiler.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"egcmem.h"
 #include	"pccore.h"
 #include	"iocore.h"
@@ -8,19 +7,19 @@
 #include	"font.h"
 
 
-#define	USE_HIMEM
-// #define	MEMORY_DEBUG
+	BYTE	mem[0x200000];
+
 
 // ---- write byte
 
-static void MEMCALL i286_wt(UINT32 address, REG8 value) {
+static void MEMCALL i286_wt(UINT32 address, REG8 value) {		// MAIN
 
-	mem[address & i286core.s.adrsmask] = (BYTE)value;
+	mem[address & CPU_ADRSMASK] = (BYTE)value;
 }
 
-static void MEMCALL tram_wt(UINT32 address, REG8 value) {
+static void MEMCALL tram_wt(UINT32 address, REG8 value) {		// TRAM
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa2000) {
 		mem[address] = (BYTE)value;
 		tramupdate[LOW12(address >> 1)] = 1;
@@ -50,28 +49,28 @@ static void MEMCALL tram_wt(UINT32 addre
 	}
 }
 
-static void MEMCALL vram_w0(UINT32 address, REG8 value) {
+static void MEMCALL vram_w0(UINT32 address, REG8 value) {		// VRAM
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	mem[address] = (BYTE)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
 
-	I286_REMCLOCK -= vramop.vramwait;
+	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) {
+static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) {		// VRAM
 
 	REG8	mask;
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
@@ -95,12 +94,12 @@ 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;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
@@ -124,11 +123,11 @@ 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;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
 	gdcs.grphdisp |= 1;
@@ -148,11 +147,11 @@ 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;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
 	gdcs.grphdisp |= 2;
@@ -172,17 +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)] = (BYTE)value;
+}
+
+static void MEMCALL i286_wd(UINT32 address, REG8 value) {		// D000¡ÁDFFF
 
-	extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
+	if (CPU_RAM_D000 & (1 << ((address >> 12) & 15))) {
+		mem[address] = (BYTE)value;
+	}
 }
 
-static void MEMCALL i286_wn(UINT32 address, REG8 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;
@@ -191,14 +203,14 @@ 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 & i286core.s.adrsmask]);
+	return(mem[address & CPU_ADRSMASK]);
 }
 
-static REG8 MEMCALL tram_rd(UINT32 address) {
+static REG8 MEMCALL tram_rd(UINT32 address) {					// TRAM
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa4000) {
 		return(mem[address]);
 	}
@@ -213,24 +225,24 @@ 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
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address]);
 }
 
-static REG8 MEMCALL vram_r1(UINT32 address) {
+static REG8 MEMCALL vram_r1(UINT32 address) {					// VRAM
 
-	I286_REMCLOCK -= vramop.vramwait;
+	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;
 	REG8	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	vram = mem + LOW15(address);
 	ret = 0;
 	if (!(grcg.modereg & 1)) {
@@ -248,12 +260,12 @@ const BYTE	*vram;
 	return(ret ^ 0xff);
 }
 
-static REG8 MEMCALL grcg_tcr1(UINT32 address) {
+static REG8 MEMCALL grcg_tcr1(UINT32 address) {					// VRAM
 
 const BYTE	*vram;
 	REG8	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -271,20 +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 (i286core.s.itfbank) {
-		address = ITF_ADRS + LOW15(address);
+	if (CPU_ITFBANK) {
+		address += VRAM_STEP;
 	}
 	return(mem[address]);
 }
@@ -296,12 +309,13 @@ static void MEMCALL i286w_wt(UINT32 addr
 
 	BYTE	*ptr;
 
-	ptr = mem + (address & i286core.s.adrsmask);
+	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;
@@ -347,7 +361,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 
 #define GRCGW_NON(page) {											\
-	I286_REMCLOCK -= vramop.vramwait;								\
+	CPU_REMCLOCK -= MEMWAIT_VRAM;									\
 	STOREINTELWORD(mem + address + VRAM_STEP*(page), value);		\
 	vramupdate[LOW15(address)] |= (1 << page);						\
 	vramupdate[LOW15(address + 1)] |= (1 << page);					\
@@ -356,7 +370,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_RMW(page) {											\
 	BYTE	*vram;													\
-	I286_REMCLOCK -= vramop.grcgwait;								\
+	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -402,7 +416,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_TDW(page) {											\
 	BYTE	*vram;													\
-	I286_REMCLOCK -= vramop.grcgwait;								\
+	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -436,19 +450,8 @@ static void MEMCALL grcgw_tdw1(UINT32 ad
 
 static void MEMCALL egcw_wt(UINT32 address, REG16 value) {
 
-	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);
-		}
-	}
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
+	egc_write_w(address, value);
 }
 
 static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {
@@ -456,15 +459,45 @@ static void MEMCALL emmcw_wt(UINT32 addr
 	BYTE	*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] = (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;
@@ -478,13 +511,13 @@ static REG16 MEMCALL i286w_rd(UINT32 add
 
 	BYTE	*ptr;
 
-	ptr = mem + (address & i286core.s.adrsmask);
+	ptr = mem + (address & CPU_ADRSMASK);
 	return(LOADINTELWORD(ptr));
 }
 
 static REG16 MEMCALL tramw_rd(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < (0xa4000 - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
@@ -513,13 +546,13 @@ static REG16 MEMCALL tramw_rd(UINT32 add
 
 static REG16 MEMCALL vramw_r0(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(LOADINTELWORD(mem + address));
 }
 
 static REG16 MEMCALL vramw_r1(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(LOADINTELWORD(mem + address + VRAM_STEP));
 }
 
@@ -528,7 +561,7 @@ static REG16 MEMCALL grcgw_tcr0(UINT32 a
 	BYTE	*vram;
 	REG16	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -551,7 +584,7 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a
 	BYTE	*vram;
 	REG16	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -571,23 +604,8 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a
 
 static REG16 MEMCALL egcw_rd(UINT32 address) {
 
-	REG16	ret;
-
-	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);
-		}
-	}
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
+	return(egc_read_w(address));
 }
 
 static REG16 MEMCALL emmcw_rd(UINT32 address) {
@@ -596,20 +614,20 @@ const BYTE	*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 (i286core.s.itfbank) {
-		address = ITF_ADRS + LOW15(address);
+	if (CPU_ITFBANK) {
+		address += VRAM_STEP;
 	}
 	return(LOADINTELWORD(mem + address));
 }
@@ -622,69 +640,89 @@ typedef REG8 (MEMCALL * MEM8READ)(UINT32
 typedef void (MEMCALL * MEM16WRITE)(UINT32 address, REG16 value);
 typedef REG16 (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
+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 MEM8READ memory_read[] = {
-			i286_rd,	i286_rd,	i286_rd,	i286_rd,		// 00
+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_itf};		// f0
+			vram_r0,	i286_rd,	i286_rd,	i286_rb},		// e0
 
-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
+		   {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
 
-static MEM16READ memword_read[] = {
-			i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 00
+		   {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
+			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 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
+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},
+			{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) {
@@ -699,133 +737,72 @@ static REG16 MEMCALL i286_nonram_rw(UINT
 	return(0xffff);
 }
 
-void MEMCALL i286_vram_dispatch(UINT func) {
 
-	UINT	proc;
+void MEMCALL i286_memorymap(UINT type) {
 
-	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;
-	}
-}
+const MMAPTBL	*mm;
 
-#if defined(MEMORY_DEBUG)
-static REG8 MEMCALL _i286_memoryread(UINT32 address) {
+	mm = mmaptbl + (type & 1);
 
-	if (address < I286_MEMREADMAX) {
-		return(mem[address]);
-	}
-#if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
-		address -= 0x100000;
-		if (address < extmemmng_size) {
-			return(extmemmng_ptr[address]);
-		}
-		else {
-			return(0xff);
-		}
-	}
-#endif
-	else {
-		return(memory_read[(address >> 15) & 0x1f](address));
-	}
+	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;
 }
 
-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 >= (0x10fff0 - 1)) {
-		address -= 0x100000;
-		if (address == (0x00fff0 - 1)) {
-			ret = mem[0x100000 + address];
-		}
-		else if (address < extmemmng_size) {
-			ret = extmemmng_ptr[address];
-		}
-		else {
-			ret = 0xff;
-		}
-		address++;
-		if (address < extmemmng_size) {
-			ret += extmemmng_ptr[address] << 8;
-		}
-		else {
-			ret += 0xff00;
-		}
-		return(ret);
-	}
-#endif
-	else if ((address & 0x7fff) != 0x7fff) {
-		return(memword_read[(address >> 15) & 0x1f](address));
-	}
-	else {
-		ret = memory_read[(address >> 15) & 0x1f](address);
-		address++;
-		ret += memory_read[(address >> 15) & 0x1f](address) << 8;
-		return(ret);
-	}
-}
+void MEMCALL i286_vram_dispatch(UINT func) {
 
-REG8 MEMCALL i286_memoryread(UINT32 address) {
+const VACCTBL	*vacc;
 
-	REG8	r;
+	vacc = vacctbl + (func & 0x0f);
 
-	r = _i286_memoryread(address);
-	if (r & 0xffffff00) {
-		TRACEOUT(("error i286_memoryread %x %x", address, r));
+	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;
 	}
-	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) {
 		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);
@@ -833,7 +810,7 @@ REG8 MEMCALL i286_memoryread(UINT32 addr
 	}
 #endif
 	else {
-		return(memory_read[(address >> 15) & 0x1f](address));
+		return(memfn.rd8[(address >> 15) & 0x1f](address));
 	}
 }
 
@@ -845,20 +822,20 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 		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;
@@ -867,16 +844,15 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 	}
 #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);
 	}
 }
-#endif
 
 void MEMCALL i286_memorywrite(UINT32 address, REG8 value) {
 
@@ -884,15 +860,15 @@ void MEMCALL i286_memorywrite(UINT32 add
 		mem[address] = (BYTE)value;
 	}
 #if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
+	else if (address >= USE_HIMEM) {
 		address -= 0x100000;
-		if (address < extmemmng_size) {
-			extmemmng_ptr[address] = (BYTE)value;
+		if (address < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[address] = (BYTE)value;
 		}
 	}
 #endif
 	else {
-		memory_write[(address >> 15) & 0x1f](address, value);
+		memfn.wr8[(address >> 15) & 0x1f](address, value);
 	}
 }
 
@@ -902,35 +878,35 @@ void MEMCALL i286_memorywrite_w(UINT32 a
 		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)) {
+		if (address == (USE_HIMEM - 0x100000 - 1)) {
 			mem[address] = (BYTE)value;
 		}
-		else if (address < extmemmng_size) {
-			extmemmng_ptr[address] = (BYTE)value;
+		else if (address < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[address] = (BYTE)value;
 		}
 		address++;
-		if (address < extmemmng_size) {
-			extmemmng_ptr[address] = (BYTE)(value >> 8);
+		if (address < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[address] = (BYTE)(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, (BYTE)value);
 		address++;
-		memory_write[(address >> 15) & 0x1f](address, (BYTE)(value >> 8));
+		memfn.wr8[(address >> 15) & 0x1f](address, (BYTE)(value >> 8));
 	}
 }
 
-REG8 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]);
 	}
@@ -939,11 +915,11 @@ 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;
 
-	address = (seg << 4) + off;
+	address = (seg << 4) + LOW16(off);
 	if (address < (I286_MEMREADMAX - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
@@ -952,11 +928,11 @@ 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) + off;
+	address = (seg << 4) + LOW16(off);
 	if (address < I286_MEMWRITEMAX) {
 		mem[address] = (BYTE)value;
 	}
@@ -965,11 +941,11 @@ void MEMCALL i286_membyte_write(UINT seg
 	}
 }
 
-void MEMCALL i286_memword_write(UINT seg, UINT off, REG16 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);
 	}
@@ -978,7 +954,7 @@ 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;
 	UINT32	adrs;
@@ -986,6 +962,7 @@ void MEMCALL i286_memstr_read(UINT seg, 
 
 	out = (BYTE *)dat;
 	adrs = seg << 4;
+	off = LOW16(off);
 	if ((I286_MEMREADMAX >= 0x10000) &&
 		(adrs < (I286_MEMREADMAX - 0x10000))) {
 		if (leng) {
@@ -1015,8 +992,7 @@ 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;
 	UINT32	adrs;
@@ -1024,6 +1000,7 @@ void MEMCALL i286_memstr_write(UINT seg,
 
 	out = (BYTE *)dat;
 	adrs = seg << 4;
+	off = LOW16(off);
 	if ((I286_MEMWRITEMAX >= 0x10000) &&
 		(adrs < (I286_MEMWRITEMAX - 0x10000))) {
 		if (leng) {
@@ -1053,7 +1030,7 @@ 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);
@@ -1072,7 +1049,7 @@ 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;