--- np2/i286c/memory.c	2003/12/19 23:16:06	1.14
+++ np2/i286c/memory.c	2004/03/29 05:50:29	1.20
@@ -10,8 +10,6 @@
 	BYTE	mem[0x200000];
 
 
-#define	USE_HIMEM		0x10fff0
-
 #if defined(TRACE)
 #define	MEMORY_DEBUG
 #endif
@@ -185,7 +183,12 @@ static void MEMCALL egc_wt(UINT32 addres
 
 static void MEMCALL emmc_wt(UINT32 address, REG8 value) {
 
-	extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
+	i286core.e.ems[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
+}
+
+static void MEMCALL i286_wb(UINT32 address, REG8 value) {
+
+	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
 }
 
 static void MEMCALL i286_wn(UINT32 address, REG8 value) {
@@ -285,13 +288,13 @@ static REG8 MEMCALL egc_rd(UINT32 addres
 
 static REG8 MEMCALL emmc_rd(UINT32 address) {
 
-	return(extmem.pageptr[(address >> 14) & 3][LOW14(address)]);
+	return(i286core.e.ems[(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]);
 }
@@ -445,19 +448,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);
-	}
-	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) {
@@ -465,15 +456,21 @@ static void MEMCALL emmcw_wt(UINT32 addr
 	BYTE	*ptr;
 
 	if ((address & 0x3fff) != 0x3fff) {
-		ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address);
+		ptr = i286core.e.ems[(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);
+		i286core.e.ems[(address >> 14) & 3][0x3fff] = (BYTE)value;
+		i286core.e.ems[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8);
 	}
 }
 
+static void MEMCALL i286w_wb(UINT32 address, REG16 value) {
+
+	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
+	mem[address + 0x1c8001 - 0xe8000] = (BYTE)(value >> 8);
+}
+
 static void MEMCALL i286w_wn(UINT32 address, REG16 value) {
 
 	(void)address;
@@ -580,24 +577,8 @@ 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) {
@@ -606,20 +587,20 @@ const BYTE	*ptr;
 	REG16	ret;
 
 	if ((address & 0x3fff) != 0x3fff) {
-		ptr = extmem.pageptr[(address >> 14) & 3] + LOW14(address);
+		ptr = i286core.e.ems[(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 = i286core.e.ems[(address >> 14) & 3][0x3fff];
+		ret += i286core.e.ems[((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 +621,17 @@ typedef struct {
 } 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;
@@ -654,7 +646,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
@@ -672,7 +664,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
@@ -683,6 +675,12 @@ static MEMFN memfn = {
 			emmcw_wt,	emmcw_wt,	i286w_wn,	i286w_wn,		// c0
 			vramw_w0,	i286w_wn,	i286w_wn,	i286w_wn}};		// e0
 
+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},
@@ -714,6 +712,34 @@ 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) {
 
 const VACCTBL	*vacc;
@@ -942,11 +968,11 @@ void MEMCALL i286_memorywrite_w(UINT32 a
 	}
 }
 
-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]);
 	}
@@ -955,11 +981,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));
 	}
@@ -968,11 +994,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;
 	}
@@ -981,11 +1007,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);
 	}
@@ -994,7 +1020,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;
@@ -1002,6 +1028,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) {
@@ -1031,8 +1058,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;
@@ -1040,6 +1066,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) {
@@ -1069,7 +1096,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);
@@ -1088,7 +1115,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;