--- np2/i286c/memory.c	2003/11/28 08:01:32	1.4
+++ np2/i286c/memory.c	2003/12/22 01:44:59	1.15
@@ -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,26 +7,33 @@
 #include	"font.h"
 
 
-#define	USE_HIMEM
+	BYTE	mem[0x200000];
+
+
+#define	USE_HIMEM		0x10fff0
+
+#if defined(TRACE)
+#define	MEMORY_DEBUG
+#endif
 
 // ---- write byte
 
-static void MEMCALL i286_wt(UINT32 address, BYTE value) {
+static void MEMCALL i286_wt(UINT32 address, REG8 value) {
 
-	mem[address & extmem.adrsmask] = value;
+	mem[address & CPU_ADRSMASK] = (BYTE)value;
 }
 
-static void MEMCALL tram_wt(UINT32 address, BYTE value) {
+static void MEMCALL tram_wt(UINT32 address, REG8 value) {
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa2000) {
-		mem[address] = value;
+		mem[address] = (BYTE)value;
 		tramupdate[LOW12(address >> 1)] = 1;
 		gdcs.textdisp |= 1;
 	}
 	else if (address < 0xa3fe0) {
 		if (!(address & 1)) {
-			mem[address] = value;
+			mem[address] = (BYTE)value;
 			tramupdate[LOW12(address >> 1)] = 1;
 			gdcs.textdisp |= 1;
 		}
@@ -35,7 +41,7 @@ static void MEMCALL tram_wt(UINT32 addre
 	else if (address < 0xa4000) {
 		if (!(address & 1)) {
 			if ((!(address & 2)) || (gdcs.msw_accessable)) {
-				mem[address] = value;
+				mem[address] = (BYTE)value;
 				tramupdate[LOW12(address >> 1)] = 1;
 				gdcs.textdisp |= 1;
 			}
@@ -44,33 +50,33 @@ 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)] = value;
+			fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value;
 		}
 	}
 }
 
-static void MEMCALL vram_w0(UINT32 address, BYTE value) {
+static void MEMCALL vram_w0(UINT32 address, REG8 value) {
 
-	I286_REMCLOCK -= vramop.vramwait;
-	mem[address] = value;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
+	mem[address] = (BYTE)value;
 	vramupdate[LOW15(address)] |= 1;
 	gdcs.grphdisp |= 1;
 }
 
-static void MEMCALL vram_w1(UINT32 address, BYTE value) {
+static void MEMCALL vram_w1(UINT32 address, REG8 value) {
 
-	I286_REMCLOCK -= vramop.vramwait;
-	mem[address + VRAM_STEP] = value;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
+	mem[address + VRAM_STEP] = (BYTE)value;
 	vramupdate[LOW15(address)] |= 2;
 	gdcs.grphdisp |= 2;
 }
 
-static void MEMCALL grcg_rmw0(UINT32 address, BYTE value) {
+static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) {
 
-	BYTE	mask;
+	REG8	mask;
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
@@ -94,12 +100,12 @@ static void MEMCALL grcg_rmw0(UINT32 add
 	}
 }
 
-static void MEMCALL grcg_rmw1(UINT32 address, BYTE value) {
+static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) {
 
-	BYTE	mask;
+	REG8	mask;
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
@@ -123,11 +129,11 @@ static void MEMCALL grcg_rmw1(UINT32 add
 	}
 }
 
-static void MEMCALL grcg_tdw0(UINT32 address, BYTE value) {
+static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) {
 
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
 	gdcs.grphdisp |= 1;
@@ -147,11 +153,11 @@ static void MEMCALL grcg_tdw0(UINT32 add
 	(void)value;
 }
 
-static void MEMCALL grcg_tdw1(UINT32 address, BYTE value) {
+static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) {
 
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
 	gdcs.grphdisp |= 2;
@@ -171,17 +177,18 @@ static void MEMCALL grcg_tdw1(UINT32 add
 	(void)value;
 }
 
-static void MEMCALL egc_wt(UINT32 address, BYTE value) {
+static void MEMCALL egc_wt(UINT32 address, REG8 value) {
 
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	egc_write(address, value);
 }
 
-static void MEMCALL emmc_wt(UINT32 address, BYTE value) {
+static void MEMCALL emmc_wt(UINT32 address, REG8 value) {
 
-	extmem.pageptr[(address >> 14) & 3][LOW14(address)] = value;
+	extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
 }
 
-static void MEMCALL i286_wn(UINT32 address, BYTE value) {
+static void MEMCALL i286_wn(UINT32 address, REG8 value) {
 
 	(void)address;
 	(void)value;
@@ -190,14 +197,14 @@ static void MEMCALL i286_wn(UINT32 addre
 
 // ---- read byte
 
-static BYTE MEMCALL i286_rd(UINT32 address) {
+static REG8 MEMCALL i286_rd(UINT32 address) {
 
-	return(mem[address & extmem.adrsmask]);
+	return(mem[address & CPU_ADRSMASK]);
 }
 
-static BYTE MEMCALL tram_rd(UINT32 address) {
+static REG8 MEMCALL tram_rd(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa4000) {
 		return(mem[address]);
 	}
@@ -212,24 +219,24 @@ static BYTE MEMCALL tram_rd(UINT32 addre
 	return(mem[address]);
 }
 
-static BYTE MEMCALL vram_r0(UINT32 address) {
+static REG8 MEMCALL vram_r0(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address]);
 }
 
-static BYTE MEMCALL vram_r1(UINT32 address) {
+static REG8 MEMCALL vram_r1(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address + VRAM_STEP]);
 }
 
-static BYTE MEMCALL grcg_tcr0(UINT32 address) {
+static REG8 MEMCALL grcg_tcr0(UINT32 address) {
 
 const BYTE	*vram;
-	BYTE	ret;
+	REG8	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	vram = mem + LOW15(address);
 	ret = 0;
 	if (!(grcg.modereg & 1)) {
@@ -244,15 +251,15 @@ const BYTE	*vram;
 	if (!(grcg.modereg & 8)) {
 		ret |= vram[VRAM0_E] ^ grcg.tile[3].b[0];
 	}
-	return(~ret);
+	return(ret ^ 0xff);
 }
 
-static BYTE MEMCALL grcg_tcr1(UINT32 address) {
+static REG8 MEMCALL grcg_tcr1(UINT32 address) {
 
-	BYTE	*vram;
-	BYTE	ret;
+const BYTE	*vram;
+	REG8	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -267,22 +274,23 @@ static BYTE MEMCALL grcg_tcr1(UINT32 add
 	if (!(grcg.modereg & 8)) {
 		ret |= vram[VRAM1_E] ^ grcg.tile[3].b[0];
 	}
-	return(~ret);
+	return(ret ^ 0xff);
 }
 
-static BYTE MEMCALL egc_rd(UINT32 address) {
+static REG8 MEMCALL egc_rd(UINT32 address) {
 
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	return(egc_read(address));
 }
 
-static BYTE MEMCALL emmc_rd(UINT32 address) {
+static REG8 MEMCALL emmc_rd(UINT32 address) {
 
 	return(extmem.pageptr[(address >> 14) & 3][LOW14(address)]);
 }
 
-static BYTE MEMCALL i286_itf(UINT32 address) {
+static REG8 MEMCALL i286_itf(UINT32 address) {
 
-	if (itf.bank) {
+	if (CPU_ITFBANK) {
 		address = ITF_ADRS + LOW15(address);
 	}
 	return(mem[address]);
@@ -291,16 +299,17 @@ static BYTE MEMCALL i286_itf(UINT32 addr
 
 // ---- write word
 
-static void MEMCALL i286w_wt(UINT32 address, UINT16 value) {
+static void MEMCALL i286w_wt(UINT32 address, REG16 value) {
 
 	BYTE	*ptr;
 
-	ptr = mem + (address & extmem.adrsmask);
+	ptr = mem + (address & CPU_ADRSMASK);
 	STOREINTELWORD(ptr, value);
 }
 
-static void MEMCALL tramw_wt(UINT32 address, UINT16 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;
@@ -346,7 +355,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);					\
@@ -355,7 +364,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);							\
@@ -401,7 +410,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);							\
@@ -426,31 +435,32 @@ static void MEMCALL tramw_wt(UINT32 addr
 	(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 vramw_w0(UINT32 address, REG16 value) GRCGW_NON(0)
+static void MEMCALL vramw_w1(UINT32 address, REG16 value) GRCGW_NON(1)
+static void MEMCALL grcgw_rmw0(UINT32 address, REG16 value) GRCGW_RMW(0)
+static void MEMCALL grcgw_rmw1(UINT32 address, REG16 value) GRCGW_RMW(1)
+static void MEMCALL grcgw_tdw0(UINT32 address, REG16 value) GRCGW_TDW(0)
+static void MEMCALL grcgw_tdw1(UINT32 address, REG16 value) GRCGW_TDW(1)
 
-static void MEMCALL egcw_wt(UINT32 address, UINT16 value) {
+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, (BYTE)value);
-			egc_write(address + 1, (BYTE)(value >> 8));
+			egc_write(address, (REG8)value);
+			egc_write(address + 1, (REG8)(value >> 8));
 		}
 		else {
-			egc_write(address + 1, (BYTE)(value >> 8));
-			egc_write(address, (BYTE)value);
+			egc_write(address + 1, (REG8)(value >> 8));
+			egc_write(address, (REG8)value);
 		}
 	}
 }
 
-static void MEMCALL emmcw_wt(UINT32 address, UINT16 value) {
+static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {
 
 	BYTE	*ptr;
 
@@ -460,11 +470,11 @@ static void MEMCALL emmcw_wt(UINT32 addr
 	}
 	else {
 		extmem.pageptr[(address >> 14) & 3][0x3fff] = (BYTE)value;
-		extmem.pageptr[((address + 1)>> 14) & 3][0] = (BYTE)(value >> 8);
+		extmem.pageptr[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8);
 	}
 }
 
-static void MEMCALL i286w_wn(UINT32 address, UINT16 value) {
+static void MEMCALL i286w_wn(UINT32 address, REG16 value) {
 
 	(void)address;
 	(void)value;
@@ -473,17 +483,17 @@ static void MEMCALL i286w_wn(UINT32 addr
 
 // ---- read word
 
-static UINT16 MEMCALL i286w_rd(UINT32 address) {
+static REG16 MEMCALL i286w_rd(UINT32 address) {
 
 	BYTE	*ptr;
 
-	ptr = mem + (address & extmem.adrsmask);
+	ptr = mem + (address & CPU_ADRSMASK);
 	return(LOADINTELWORD(ptr));
 }
 
-static UINT16 MEMCALL tramw_rd(UINT32 address) {
+static REG16 MEMCALL tramw_rd(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < (0xa4000 - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
@@ -492,13 +502,13 @@ static UINT16 MEMCALL tramw_rd(UINT32 ad
 	}
 	else if (address < 0xa4fff) {
 		if (address & 1) {
-			UINT16 ret;
+			REG16 ret;
 			ret = fontrom[cgwindow.high + ((address >> 1) & 0x0f)];
 			ret += fontrom[cgwindow.low + (((address + 1) >> 1) & 0x0f)] << 8;
 			return(ret);
 		}
 		else {
-			UINT16 ret;
+			REG16 ret;
 			ret = fontrom[cgwindow.low + ((address >> 1) & 0x0f)];
 			ret += fontrom[cgwindow.high + ((address >> 1) & 0x0f)] << 8;
 			return(ret);
@@ -510,24 +520,24 @@ static UINT16 MEMCALL tramw_rd(UINT32 ad
 	return(LOADINTELWORD(mem + address));
 }
 
-static UINT16 MEMCALL vramw_r0(UINT32 address) {
+static REG16 MEMCALL vramw_r0(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(LOADINTELWORD(mem + address));
 }
 
-static UINT16 MEMCALL vramw_r1(UINT32 address) {
+static REG16 MEMCALL vramw_r1(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(LOADINTELWORD(mem + address + VRAM_STEP));
 }
 
-static UINT16 MEMCALL grcgw_tcr0(UINT32 address) {
+static REG16 MEMCALL grcgw_tcr0(UINT32 address) {
 
 	BYTE	*vram;
-	UINT16	ret;
+	REG16	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -542,15 +552,15 @@ static UINT16 MEMCALL grcgw_tcr0(UINT32 
 	if (!(grcg.modereg & 8)) {
 		ret |= LOADINTELWORD(vram + VRAM0_E) ^ grcg.tile[3].w;
 	}
-	return(~ret);
+	return((UINT16)~ret);
 }
 
-static UINT16 MEMCALL grcgw_tcr1(UINT32 address) {
+static REG16 MEMCALL grcgw_tcr1(UINT32 address) {
 
 	BYTE	*vram;
-	UINT16	ret;
+	REG16	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -565,42 +575,50 @@ static UINT16 MEMCALL grcgw_tcr1(UINT32 
 	if (!(grcg.modereg & 8)) {
 		ret |= LOADINTELWORD(vram + VRAM1_E) ^ grcg.tile[3].w;
 	}
-	return(~ret);
+	return((UINT16)(~ret));
 }
 
-static UINT16 MEMCALL egcw_rd(UINT32 address) {
+static REG16 MEMCALL egcw_rd(UINT32 address) {
 
-	UINT16 ret;
+	REG16	ret;
 
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	if (!(address & 1)) {
 		return(egc_read_w(address));
 	}
 	else {
 		if (!(egc.sft & 0x1000)) {
 			ret = egc_read(address);
-			ret += (UINT16)egc_read(address + 1) << 8;
+			ret += egc_read(address + 1) << 8;
 			return(ret);
 		}
 		else {
-			UINT16 ret;
-			ret = (UINT16)egc_read(address + 1) << 8;
+			ret = egc_read(address + 1) << 8;
 			ret += egc_read(address);
 			return(ret);
 		}
 	}
 }
 
-static UINT16 MEMCALL emmcw_rd(UINT32 address) {
+static REG16 MEMCALL emmcw_rd(UINT32 address) {
 
-	BYTE	*ptr;
+const BYTE	*ptr;
+	REG16	ret;
 
-	ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address);
-	return(LOADINTELWORD(ptr));
+	if ((address & 0x3fff) != 0x3fff) {
+		ptr = extmem.pageptr[(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;
+		return(ret);
+	}
 }
 
-static UINT16 MEMCALL i286w_itf(UINT32 address) {
+static REG16 MEMCALL i286w_itf(UINT32 address) {
 
-	if (itf.bank) {
+	if (CPU_ITFBANK) {
 		address = ITF_ADRS + LOW15(address);
 	}
 	return(LOADINTELWORD(mem + address));
@@ -609,83 +627,88 @@ static UINT16 MEMCALL i286w_itf(UINT32 a
 
 // ---- 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);
+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	rd8;
+	MEM8WRITE	wr8;
+	MEM16READ	rd16;
+	MEM16WRITE	wr16;
+} VACCTBL;
 
-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
+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_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
+		   {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 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_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
+		   {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 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 BYTE MEMCALL i286_nonram_r(UINT32 address) {
+
+static REG8 MEMCALL i286_nonram_r(UINT32 address) {
 
 	(void)address;
 	return(0xff);
 }
 
-static UINT16 MEMCALL i286_nonram_rw(UINT32 address) {
+static REG16 MEMCALL i286_nonram_rw(UINT32 address) {
 
 	(void)address;
 	return(0xffff);
@@ -693,47 +716,132 @@ static UINT16 MEMCALL i286_nonram_rw(UIN
 
 void MEMCALL i286_vram_dispatch(UINT func) {
 
-	UINT	proc;
+const VACCTBL	*vacc;
+
+	vacc = vacctbl + (func & 0x0f);
 
-	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];
+	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)) {							// 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;
+		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 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));
 	}
 }
 
-BYTE MEMCALL i286_memoryread(UINT32 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) {
 		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 +849,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 +883,70 @@ 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);
 	}
 }
+#endif
 
-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] = (BYTE)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] = (BYTE)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)) {
+		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));
 	}
 }
 
-BYTE MEMCALL i286_membyte_read(UINT seg, UINT off) {
+REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {
 
 	UINT32	address;
 
-	address = (seg << 4) + off;
+	address = (seg << 4) + LOW16(off);
 	if (address < I286_MEMREADMAX) {
 		return(mem[address]);
 	}
@@ -846,11 +955,11 @@ BYTE MEMCALL i286_membyte_read(UINT seg,
 	}
 }
 
-UINT16 MEMCALL i286_memword_read(UINT seg, UINT off) {
+REG16 MEMCALL i286_memword_read(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,26 +968,26 @@ UINT16 MEMCALL i286_memword_read(UINT se
 	}
 }
 
-void MEMCALL i286_membyte_write(UINT seg, UINT off, BYTE value) {
+void MEMCALL i286_membyte_write(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] = (BYTE)value;
 	}
 	else {
 		i286_memorywrite(address, value);
 	}
 }
 
-void MEMCALL i286_memword_write(UINT seg, UINT off, UINT16 value) {
+void MEMCALL i286_memword_write(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);
@@ -893,6 +1002,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) {
@@ -931,6 +1041,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) {