--- np2/i386c/memory.c	2003/12/22 07:41:15	1.3
+++ np2/i386c/memory.c	2004/03/09 16:31:18	1.17
@@ -5,6 +5,7 @@
 #include	"cpucore.h"
 #include	"memory.h"
 #include	"egcmem.h"
+#include	"mem9821.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"vram.h"
@@ -14,7 +15,7 @@
 	BYTE	mem[0x200000];
 
 
-#define	USE_HIMEM
+#define	USE_HIMEM		0x110000
 
 // ---- write byte
 
@@ -25,7 +26,7 @@ static void MEMCALL i286_wt(UINT32 addre
 
 static void MEMCALL tram_wt(UINT32 address, REG8 value) {
 
-	CPU_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa2000) {
 		mem[address] = (BYTE)value;
 		tramupdate[LOW12(address >> 1)] = 1;
@@ -57,7 +58,7 @@ static void MEMCALL tram_wt(UINT32 addre
 
 static void MEMCALL vram_w0(UINT32 address, REG8 value) {
 
-	CPU_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	mem[address] = (BYTE)value;
 	vramupdate[LOW15(address)] |= 1;
 	gdcs.grphdisp |= 1;
@@ -65,7 +66,7 @@ static void MEMCALL vram_w0(UINT32 addre
 
 static void MEMCALL vram_w1(UINT32 address, REG8 value) {
 
-	CPU_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	mem[address + VRAM_STEP] = (BYTE)value;
 	vramupdate[LOW15(address)] |= 2;
 	gdcs.grphdisp |= 2;
@@ -76,7 +77,7 @@ static void MEMCALL grcg_rmw0(UINT32 add
 	REG8	mask;
 	BYTE	*vram;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
@@ -105,7 +106,7 @@ static void MEMCALL grcg_rmw1(UINT32 add
 	REG8	mask;
 	BYTE	*vram;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
@@ -133,7 +134,7 @@ static void MEMCALL grcg_tdw0(UINT32 add
 
 	BYTE	*vram;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
 	gdcs.grphdisp |= 1;
@@ -157,7 +158,7 @@ static void MEMCALL grcg_tdw1(UINT32 add
 
 	BYTE	*vram;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
 	gdcs.grphdisp |= 2;
@@ -179,12 +180,13 @@ static void MEMCALL grcg_tdw1(UINT32 add
 
 static void MEMCALL egc_wt(UINT32 address, REG8 value) {
 
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	egc_write(address, value);
 }
 
-static void MEMCALL emmc_wt(UINT32 address, REG8 value) {
+static void MEMCALL i286_wb(UINT32 address, REG8 value) {
 
-	extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
+	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
 }
 
 static void MEMCALL i286_wn(UINT32 address, REG8 value) {
@@ -203,7 +205,7 @@ static REG8 MEMCALL i286_rd(UINT32 addre
 
 static REG8 MEMCALL tram_rd(UINT32 address) {
 
-	CPU_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa4000) {
 		return(mem[address]);
 	}
@@ -220,13 +222,13 @@ static REG8 MEMCALL tram_rd(UINT32 addre
 
 static REG8 MEMCALL vram_r0(UINT32 address) {
 
-	CPU_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address]);
 }
 
 static REG8 MEMCALL vram_r1(UINT32 address) {
 
-	CPU_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address + VRAM_STEP]);
 }
 
@@ -235,7 +237,7 @@ static REG8 MEMCALL grcg_tcr0(UINT32 add
 const BYTE	*vram;
 	REG8	ret;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	vram = mem + LOW15(address);
 	ret = 0;
 	if (!(grcg.modereg & 1)) {
@@ -258,7 +260,7 @@ static REG8 MEMCALL grcg_tcr1(UINT32 add
 const BYTE	*vram;
 	REG8	ret;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -278,18 +280,14 @@ const BYTE	*vram;
 
 static REG8 MEMCALL egc_rd(UINT32 address) {
 
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	return(egc_read(address));
 }
 
-static REG8 MEMCALL emmc_rd(UINT32 address) {
-
-	return(extmem.pageptr[(address >> 14) & 3][LOW14(address)]);
-}
-
-static REG8 MEMCALL i286_itf(UINT32 address) {
+static REG8 MEMCALL i286_rb(UINT32 address) {
 
 	if (CPU_ITFBANK) {
-		address = ITF_ADRS + LOW15(address);
+		address += VRAM_STEP;
 	}
 	return(mem[address]);
 }
@@ -307,6 +305,7 @@ static void MEMCALL i286w_wt(UINT32 addr
 
 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;
@@ -352,7 +351,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 
 #define GRCGW_NON(page) {											\
-	CPU_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);					\
@@ -361,7 +360,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_RMW(page) {											\
 	BYTE	*vram;													\
-	CPU_REMCLOCK -= vramop.grcgwait;								\
+	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -407,7 +406,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_TDW(page) {											\
 	BYTE	*vram;													\
-	CPU_REMCLOCK -= vramop.grcgwait;								\
+	CPU_REMCLOCK -= MEMWAIT_GRCG;									\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -441,6 +440,7 @@ 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);
 	}
@@ -456,18 +456,10 @@ static void MEMCALL egcw_wt(UINT32 addre
 	}
 }
 
-static void MEMCALL emmcw_wt(UINT32 address, REG16 value) {
+static void MEMCALL i286w_wb(UINT32 address, REG16 value) {
 
-	BYTE	*ptr;
-
-	if ((address & 0x3fff) != 0x3fff) {
-		ptr = extmem.pageptr[(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);
-	}
+	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
+	mem[address + 0x1c8001 - 0xe8000] = (BYTE)(value >> 8);
 }
 
 static void MEMCALL i286w_wn(UINT32 address, REG16 value) {
@@ -489,7 +481,7 @@ static REG16 MEMCALL i286w_rd(UINT32 add
 
 static REG16 MEMCALL tramw_rd(UINT32 address) {
 
-	CPU_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < (0xa4000 - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
@@ -518,13 +510,13 @@ static REG16 MEMCALL tramw_rd(UINT32 add
 
 static REG16 MEMCALL vramw_r0(UINT32 address) {
 
-	CPU_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(LOADINTELWORD(mem + address));
 }
 
 static REG16 MEMCALL vramw_r1(UINT32 address) {
 
-	CPU_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(LOADINTELWORD(mem + address + VRAM_STEP));
 }
 
@@ -533,7 +525,7 @@ static REG16 MEMCALL grcgw_tcr0(UINT32 a
 	BYTE	*vram;
 	REG16	ret;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -556,7 +548,7 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a
 	BYTE	*vram;
 	REG16	ret;
 
-	CPU_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -578,6 +570,7 @@ static REG16 MEMCALL egcw_rd(UINT32 addr
 
 	REG16	ret;
 
+	CPU_REMCLOCK -= MEMWAIT_GRCG;
 	if (!(address & 1)) {
 		return(egc_read_w(address));
 	}
@@ -595,26 +588,10 @@ static REG16 MEMCALL egcw_rd(UINT32 addr
 	}
 }
 
-static REG16 MEMCALL emmcw_rd(UINT32 address) {
-
-const BYTE	*ptr;
-	REG16	ret;
-
-	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 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));
 }
@@ -627,69 +604,91 @@ 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;
+	MEM8READ	ird8;
+	MEM8WRITE	ewr8;
+	MEM8WRITE	bwr8;
+	MEM16READ	brd16;
+	MEM16READ	ird16;
+	MEM16WRITE	ewr16;
+	MEM16WRITE	bwr16;
+} 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
+			i286_rd,	i286_rd,	i286_rd,	i286_rd,		// c0
+			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
+			i286_wn,	i286_wn,	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
+			i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// c0
+			vramw_r0,	i286w_rd,	i286w_rd,	i286w_rb},		// e0
+
+		   {i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 00
+			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 20
+			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 40
+			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 60
+			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 80
+			tramw_wt,	vramw_w0,	vramw_w0,	vramw_w0,		// a0
+			i286w_wn,	i286w_wn,	i286w_wn,	i286w_wn,		// 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,	i286_wn,
+			i286w_rd,	i286w_rb,	i286w_wn,	i286w_wn},
+		   {i286_rb,	i286_rb,	i286_wt,	i286_wb,
+			i286w_rb,	i286w_rb,	i286w_wt,	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) {
@@ -704,165 +703,267 @@ 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[0xd0000 >> 15] = mm->ewr8;
+	memfn.wr8[0xd8000 >> 15] = mm->ewr8;
+	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[0xd0000 >> 15] = mm->ewr16;
+	memfn.wr16[0xd8000 >> 15] = mm->ewr16;
+	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) {
 
-	UINT	proc;
+const VACCTBL	*vacc;
 
-	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;
+	vacc = vacctbl + (func & 0x0f);
+#if defined(SUPPORT_PC9821)
+	if (!(func & 0x20)) {
+#endif
+		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;
+		}
+#if defined(SUPPORT_PC9821)
+	}
+	else {
+		memfn.rd8[0xa8000 >> 15] = mem9821_b0r;
+		memfn.rd8[0xb0000 >> 15] = mem9821_b0r;
+		memfn.rd8[0xb8000 >> 15] = vacc->rd8;
+		memfn.rd8[0xe0000 >> 15] = mem9821_b2r;
+
+		memfn.wr8[0xa8000 >> 15] = mem9821_b0w;
+		memfn.wr8[0xb0000 >> 15] = mem9821_b0w;
+		memfn.wr8[0xb8000 >> 15] = vacc->wr8;
+		memfn.wr8[0xe0000 >> 15] = mem9821_b2w;
+
+		memfn.rd16[0xa8000 >> 15] = mem9821_b0rw;
+		memfn.rd16[0xb0000 >> 15] = mem9821_b0rw;
+		memfn.rd16[0xb8000 >> 15] = vacc->rd16;
+		memfn.rd16[0xe0000 >> 15] = mem9821_b2rw;
+
+		memfn.wr16[0xa8000 >> 15] = mem9821_b0ww;
+		memfn.wr16[0xb0000 >> 15] = mem9821_b0ww;
+		memfn.wr16[0xb8000 >> 15] = vacc->wr16;
+		memfn.wr16[0xe0000 >> 15] = mem9821_b2ww;
 	}
-#if defined(USE_ASM)
-	i286a_vram_dispatch(func);
 #endif
 }
 
-REG8 MEMCALL __i286_memoryread(UINT32 address) {
 
-	if (address < I286_MEMREADMAX) {
-		return(mem[address]);
+REG8 MEMCALL i286_memoryread(UINT32 addr) {
+
+	UINT32	pos;
+
+	if (addr < I286_MEMREADMAX) {
+		return(mem[addr]);
 	}
-#if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
-		address -= 0x100000;
-		if (address < CPU_EXTMEMSIZE) {
-			return(CPU_EXTMEM[address]);
+	else if (addr >= USE_HIMEM) {
+		pos = (addr & CPU_ADRSMASK) - 0x100000;
+		if (pos < CPU_EXTMEMSIZE) {
+			return(CPU_EXTMEM[pos]);
+		}
+		else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
+			return(memfn.rd8[(addr >> 15) & 0x1f](addr - 0x00f00000));
+		}
+#if defined(SUPPORT_PC9821)
+		else if (addr >= 0xfff00000) {
+			return(mem9821_r(addr));
 		}
+#endif
 		else {
 			return(0xff);
 		}
 	}
-#endif
 	else {
-		return(memory_read[(address >> 15) & 0x1f](address));
+		return(memfn.rd8[(addr >> 15) & 0x1f](addr));
 	}
 }
 
-REG16 MEMCALL __i286_memoryread_w(UINT32 address) {
+REG16 MEMCALL i286_memoryread_w(UINT32 addr) {
 
+	UINT32	pos;
 	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 < CPU_EXTMEMSIZE) {
-			ret = CPU_EXTMEM[address];
-		}
-		else {
-			ret = 0xff;
-		}
-		address++;
-		if (address < CPU_EXTMEMSIZE) {
-			ret += CPU_EXTMEM[address] << 8;
-		}
-		else {
-			ret += 0xff00;
-		}
-		return(ret);
+	if (addr < (I286_MEMREADMAX - 1)) {
+		return(LOADINTELWORD(mem + addr));
 	}
+	else if ((addr + 1) & 0x7fff) {				// non 32kb boundary
+		if (addr >= USE_HIMEM) {
+			pos = (addr & CPU_ADRSMASK) - 0x100000;
+			if (pos < CPU_EXTMEMSIZE) {
+				return(LOADINTELWORD(CPU_EXTMEM + pos));
+			}
+			else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
+				return(memfn.rd16[(addr >> 15) & 0x1f](addr - 0x00f00000));
+			}
+#if defined(SUPPORT_PC9821)
+			else if (addr >= 0xfff00000) {
+				return(mem9821_rw(addr));
+			}
 #endif
-	else if ((address & 0x7fff) != 0x7fff) {
-		return(memword_read[(address >> 15) & 0x1f](address));
+			else {
+				return(0xffff);
+			}
+		}
+		return(memfn.rd16[(addr >> 15) & 0x1f](addr));
 	}
 	else {
-		ret = memory_read[(address >> 15) & 0x1f](address);
-		address++;
-		ret += memory_read[(address >> 15) & 0x1f](address) << 8;
+		ret = i286_memoryread(addr);
+		ret += (REG16)(i286_memoryread(addr + 1) << 8);
 		return(ret);
 	}
 }
 
-UINT32 MEMCALL __i286_memoryread_d(UINT32 address) {
-
-	UINT32 ret;
+UINT32 MEMCALL i286_memoryread_d(UINT32 addr) {
 
-	ret = __i286_memoryread_w(address);
-	ret |= (UINT32)__i286_memoryread_w(address + 2) << 16;
+	UINT32	pos;
+	UINT32	ret;
 
-	return ret;
-}
-
-void MEMCALL __i286_memorywrite(UINT32 address, REG8 value) {
-
-	if (address < I286_MEMWRITEMAX) {
-		mem[address] = (BYTE)value;
+	if (addr < (I286_MEMREADMAX - 3)) {
+		return(LOADINTELDWORD(mem + addr));
 	}
-#if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
-		address -= 0x100000;
-		if (address < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[address] = (BYTE)value;
+	else if (addr >= USE_HIMEM) {
+		pos = (addr & CPU_ADRSMASK) - 0x100000;
+		if ((pos + 3) < CPU_EXTMEMSIZE) {
+			return(LOADINTELDWORD(CPU_EXTMEM + pos));
 		}
 	}
-#endif
+	if (!(addr & 1)) {
+		ret = i286_memoryread_w(addr);
+		ret += (UINT32)i286_memoryread_w(addr + 2) << 16;
+	}
 	else {
-		memory_write[(address >> 15) & 0x1f](address, value);
+		ret = i286_memoryread(addr);
+		ret += (UINT32)i286_memoryread_w(addr + 1) << 8;
+		ret += (UINT32)i286_memoryread(addr + 3) << 24;
 	}
+	return(ret);
 }
 
-void MEMCALL __i286_memorywrite_w(UINT32 address, REG16 value) {
+void MEMCALL i286_memorywrite(UINT32 addr, REG8 value) {
 
-	if (address < (I286_MEMWRITEMAX - 1)) {
-		STOREINTELWORD(mem + address, value);
+	UINT32	pos;
+
+	if (addr < I286_MEMWRITEMAX) {
+		mem[addr] = (BYTE)value;
 	}
-#if defined(USE_HIMEM)
-	else if (address >= (0x10fff0 - 1)) {
-		address -= 0x100000;
-		if (address == (0x00fff0 - 1)) {
-			mem[address] = (BYTE)value;
+	else if (addr >= USE_HIMEM) {
+		pos = (addr & CPU_ADRSMASK) - 0x100000;
+		if (pos < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[pos] = (BYTE)value;
 		}
-		else if (address < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[address] = (BYTE)value;
+		else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
+			memfn.wr8[(addr >> 15) & 0x1f](addr - 0x00f00000, value);
 		}
-		address++;
-		if (address < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[address] = (BYTE)(value >> 8);
+#if defined(SUPPORT_PC9821)
+		else if (addr >= 0xfff00000) {
+			mem9821_w(addr, value);
 		}
+#endif
+	}
+	else {
+		memfn.wr8[(addr >> 15) & 0x1f](addr, value);
+	}
+}
+
+void MEMCALL i286_memorywrite_w(UINT32 addr, REG16 value) {
+
+	UINT32	pos;
+
+	if (addr < (I286_MEMWRITEMAX - 1)) {
+		STOREINTELWORD(mem + addr, value);
 	}
+	else if ((addr + 1) & 0x7fff) {				// non 32kb boundary
+		if (addr >= USE_HIMEM) {
+			pos = (addr & CPU_ADRSMASK) - 0x100000;
+			if (pos < CPU_EXTMEMSIZE) {
+				STOREINTELWORD(CPU_EXTMEM + pos, value);
+			}
+			else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
+				memfn.wr16[(addr >> 15) & 0x1f](addr - 0x00f00000, value);
+			}
+#if defined(SUPPORT_PC9821)
+			else if (addr >= 0xfff00000) {
+				mem9821_ww(addr, value);
+			}
 #endif
-	else if ((address & 0x7fff) != 0x7fff) {
-		memword_write[(address >> 15) & 0x1f](address, value);
+		}
+		else {
+			memfn.wr16[(addr >> 15) & 0x1f](addr, value);
+		}
 	}
 	else {
-		memory_write[(address >> 15) & 0x1f](address, (BYTE)value);
-		address++;
-		memory_write[(address >> 15) & 0x1f](address, (BYTE)(value >> 8));
+		i286_memorywrite(addr, (UINT8)value);
+		i286_memorywrite(addr + 1, (UINT8)(value >> 8));
 	}
 }
 
-void MEMCALL __i286_memorywrite_d(UINT32 address, UINT32 value) {
+void MEMCALL i286_memorywrite_d(UINT32 addr, UINT32 value) {
 
-	__i286_memorywrite_w(address, value & 0xffff);
-	__i286_memorywrite_w(address + 2, (WORD)(value >> 16));
+	UINT32	pos;
+
+	if (addr < (I286_MEMWRITEMAX - 3)) {
+		STOREINTELDWORD(mem + addr, value);
+		return;
+	}
+	else if (addr >= USE_HIMEM) {
+		pos = (addr & CPU_ADRSMASK) - 0x100000;
+		if ((pos + 3) < CPU_EXTMEMSIZE) {
+			STOREINTELDWORD(CPU_EXTMEM + pos, value);
+			return;
+		}
+	}
+	if (!(addr & 1)) {
+		i286_memorywrite_w(addr, (UINT16)value);
+		i286_memorywrite_w(addr + 2, (UINT16)(value >> 16));
+	}
+	else {
+		i286_memorywrite(addr, (UINT8)value);
+		i286_memorywrite_w(addr + 1, (UINT16)(value >> 8));
+		i286_memorywrite(addr + 3, (UINT8)(value >> 24));
+	}
 }
 
 #if 0
@@ -919,122 +1020,219 @@ void MEMCALL i286_memword_write(UINT seg
 }
 #endif
 
-void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) {
+void MEMCALL memp_read(UINT32 address, void *dat, UINT leng) {
 
-	BYTE	*out;
-	UINT32	adrs;
-	UINT	size;
+	BYTE *out = (BYTE *)dat;
+	UINT pos;
+	UINT diff;
 
-	out = (BYTE *)dat;
-	adrs = seg << 4;
-	off = LOW16(off);
-	if ((I286_MEMREADMAX >= 0x10000) &&
-		(adrs < (I286_MEMREADMAX - 0x10000))) {
-		if (leng) {
-			size = 0x10000 - off;
-			if (size >= leng) {
-				CopyMemory(out, mem + adrs + off, leng);
-				return;
-			}
-			CopyMemory(out, mem + adrs + off, size);
-			out += size;
-			leng -= size;
-		}
-		while(leng >= 0x10000) {
-			CopyMemory(out, mem + adrs, 0x10000);
-			out += 0x10000;
-			leng -= 0x10000;
+	/* fast memory access */
+	if (address + leng < I286_MEMREADMAX) {
+		CopyMemory(dat, mem + address, leng);
+		return;
+	} else if (address >= USE_HIMEM) {
+		pos = (address & CPU_ADRSMASK) - 0x100000;
+		if (pos + leng < CPU_EXTMEMSIZE) {
+			CopyMemory(dat, CPU_EXTMEM + pos, leng);
+			return;
 		}
-		if (leng) {
-			CopyMemory(out, mem + adrs, leng);
+		if (pos < CPU_EXTMEMSIZE) {
+			diff = CPU_EXTMEMSIZE - pos;
+			CopyMemory(out, CPU_EXTMEM + pos, diff);
+			out += diff;
+			leng -= diff;
+			address += diff;
 		}
 	}
-	else {
-		while(leng--) {
-			*out++ = i286_memoryread(adrs + off);
-			off = LOW16(off + 1);
-		}
+
+	/* slow memory access */
+	while (leng-- > 0) {
+		*out++ = i286_memoryread(address++);
 	}
 }
 
-void MEMCALL i286_memstr_write(UINT seg, UINT off,
-												const void *dat, UINT leng) {
+void MEMCALL memp_write(UINT32 address, const void *dat, UINT leng) {
 
-	BYTE	*out;
-	UINT32	adrs;
-	UINT	size;
+	const BYTE *out = (BYTE *)dat;
+	UINT pos;
+	UINT diff;
 
-	out = (BYTE *)dat;
-	adrs = seg << 4;
-	off = LOW16(off);
-	if ((I286_MEMWRITEMAX >= 0x10000) &&
-		(adrs < (I286_MEMWRITEMAX - 0x10000))) {
-		if (leng) {
-			size = 0x10000 - off;
-			if (size >= leng) {
-				CopyMemory(mem + adrs + off, out, leng);
-				return;
-			}
-			CopyMemory(mem + adrs + off, out, size);
-			out += size;
-			leng -= size;
+	/* fast memory access */
+	if (address + leng < I286_MEMREADMAX) {
+		CopyMemory(mem + address, dat, leng);
+		return;
+	} else if (address >= USE_HIMEM) {
+		pos = (address & CPU_ADRSMASK) - 0x100000;
+		if (pos + leng < CPU_EXTMEMSIZE) {
+			CopyMemory(CPU_EXTMEM + pos, dat, leng);
+			return;
+		}
+		if (pos < CPU_EXTMEMSIZE) {
+			diff = CPU_EXTMEMSIZE - pos;
+			CopyMemory(CPU_EXTMEM + pos, dat, diff);
+			out += diff;
+			leng -= diff;
+			address += diff;
 		}
-		while(leng >= 0x10000) {
-			CopyMemory(mem + adrs, out, 0x10000);
-			out += 0x10000;
-			leng -= 0x10000;
+	}
+
+	/* slow memory access */
+	while (leng-- > 0) {
+		i286_memorywrite(address++, *out++);
+	}
+}
+
+
+// ---- Logical Space (BIOS)
+
+static UINT32 physicaladdr(UINT32 addr) {
+
+	UINT32	pde;
+	UINT32	pte;
+
+	if (CPU_STAT_PAGING) {
+		pde = i286_memoryread_d(CPU_STAT_PDE_BASE + ((addr >> 20) & 0xffc));
+		if (!(pde & CPU_PDE_PRESENT)) {
+			goto retdummy;
 		}
-		if (leng) {
-			CopyMemory(mem + adrs, out, leng);
+		pte = cpu_memoryread_d((pde & CPU_PDE_BASEADDR_MASK) + ((addr >> 10) & 0xffc));
+		if (!(pte & CPU_PTE_PRESENT)) {
+			goto retdummy;
 		}
+		addr = (pte & CPU_PTE_BASEADDR_MASK) + (addr & 0x00000fff);
+	}
+	return(addr);
+
+retdummy:
+	return(0x01000000);		// てきとーにメモリが存在しない場所
+}
+
+
+REG8 MEMCALL meml_read8(UINT seg, UINT off) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (CPU_STAT_PAGING) {
+		addr = physicaladdr(addr);
+	}
+	return(i286_memoryread(addr));
+}
+
+REG16 MEMCALL meml_read16(UINT seg, UINT off) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (!CPU_STAT_PAGING) {
+		return(i286_memoryread_w(addr));
+	}
+	else if ((addr + 1) & 0xfff) {
+		return(i286_memoryread_w(physicaladdr(addr)));
+	}
+	return(meml_read8(seg, off) + (meml_read8(seg, off + 1) << 8));
+}
+
+void MEMCALL meml_write8(UINT seg, UINT off, REG8 dat) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (CPU_STAT_PAGING) {
+		addr = physicaladdr(addr);
+	}
+	i286_memorywrite(addr, dat);
+}
+
+void MEMCALL meml_write16(UINT seg, UINT off, REG16 dat) {
+
+	UINT32	addr;
+
+	addr = (seg << 4) + LOW16(off);
+	if (!CPU_STAT_PAGING) {
+		i286_memorywrite_w(addr, dat);
+	}
+	else if ((addr + 1) & 0xfff) {
+		i286_memorywrite_w(physicaladdr(addr), dat);
 	}
 	else {
-		while(leng--) {
-			i286_memorywrite(adrs + off, *out++);
-			off = LOW16(off + 1);
-		}
+		meml_write8(seg, off, (REG8)dat);
+		meml_write8(seg, off + 1, (REG8)(dat >> 8));
 	}
 }
 
-void MEMCALL i286_memx_read(UINT32 address, void *dat, UINT leng) {
+void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) {
 
-	if ((address + leng) < I286_MEMREADMAX) {
-		CopyMemory(dat, mem + address, leng);
+	UINT32	adrs;
+	UINT	size;
+
+	while(leng) {
+		off = LOW16(off);
+		adrs = (seg << 4) + off;
+		size = 0x1000 - (adrs & 0xfff);
+		size = min(size, leng);
+		size = min(size, 0x10000 - off);
+		memp_read(physicaladdr(adrs), dat, size);
+		off += size;
+		dat = ((BYTE *)dat) + size;
+		leng -= size;
+	}
+}
+
+void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng) {
+
+	UINT32	adrs;
+	UINT	size;
+
+	while(leng) {
+		off = LOW16(off);
+		adrs = (seg << 4) + off;
+		size = 0x1000 - (adrs & 0xfff);
+		size = min(size, leng);
+		size = min(size, 0x10000 - off);
+		memp_write(physicaladdr(adrs), dat, size);
+		off += size;
+		dat = ((BYTE *)dat) + size;
+		leng -= size;
+	}
+}
+
+void MEMCALL meml_read(UINT32 address, void *dat, UINT leng) {
+
+	UINT	size;
+
+	if (!CPU_STAT_PAGING) {
+		memp_read(address, dat, leng);
 	}
 	else {
-		BYTE *out = (BYTE *)dat;
-		if (address < I286_MEMREADMAX) {
-			CopyMemory(out, mem + address, I286_MEMREADMAX - address);
-			out += I286_MEMREADMAX - address;
-			leng -= I286_MEMREADMAX - address;
-			address = I286_MEMREADMAX;
-		}
-		while(leng--) {
-			*out++ = i286_memoryread(address++);
+		while(leng) {
+			size = 0x1000 - (address & 0xfff);
+			size = min(size, leng);
+			memp_read(physicaladdr(address), dat, size);
+			address += size;
+			dat = ((BYTE *)dat) + size;
+			leng -= size;
 		}
 	}
 }
 
-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;
+	UINT	size;
 
-	if ((address + leng) < I286_MEMWRITEMAX) {
-		CopyMemory(mem + address, dat, leng);
+	if (!CPU_STAT_PAGING) {
+		memp_write(address, dat, leng);
 	}
 	else {
-		out = (BYTE *)dat;
-		if (address < I286_MEMWRITEMAX) {
-			CopyMemory(mem + address, out, I286_MEMWRITEMAX - address);
-			out += I286_MEMWRITEMAX - address;
-			leng -= I286_MEMWRITEMAX - address;
-			address = I286_MEMWRITEMAX;
-		}
-		while(leng--) {
-			i286_memorywrite(address++, *out++);
+		while(leng) {
+			size = 0x1000 - (address & 0xfff);
+			size = min(size, leng);
+			memp_write(physicaladdr(address), dat, size);
+			address += size;
+			dat = ((BYTE *)dat) + size;
+			leng -= size;
 		}
 	}
 }
-
 #endif