--- np2/i286c/memory.c	2004/03/29 05:50:29	1.20
+++ np2/i286c/memory.c	2004/04/05 12:02:30	1.21
@@ -10,18 +10,14 @@
 	BYTE	mem[0x200000];
 
 
-#if defined(TRACE)
-#define	MEMORY_DEBUG
-#endif
-
 // ---- write byte
 
-static void MEMCALL i286_wt(UINT32 address, REG8 value) {
+static void MEMCALL i286_wt(UINT32 address, REG8 value) {		// MAIN
 
 	mem[address & CPU_ADRSMASK] = (BYTE)value;
 }
 
-static void MEMCALL tram_wt(UINT32 address, REG8 value) {
+static void MEMCALL tram_wt(UINT32 address, REG8 value) {		// TRAM
 
 	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa2000) {
@@ -53,7 +49,7 @@ 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
 
 	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	mem[address] = (BYTE)value;
@@ -61,7 +57,7 @@ static void MEMCALL vram_w0(UINT32 addre
 	gdcs.grphdisp |= 1;
 }
 
-static void MEMCALL vram_w1(UINT32 address, REG8 value) {
+static void MEMCALL vram_w1(UINT32 address, REG8 value) {		// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	mem[address + VRAM_STEP] = (BYTE)value;
@@ -69,7 +65,7 @@ static void MEMCALL vram_w1(UINT32 addre
 	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;
@@ -98,7 +94,7 @@ 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;
@@ -127,7 +123,7 @@ 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;
 
@@ -151,7 +147,7 @@ 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;
 
@@ -175,23 +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
 
-	i286core.e.ems[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
+	if (CPU_RAM_D000 & (1 << ((address >> 12) & 15))) {
+		mem[address] = (BYTE)value;
+	}
 }
 
-static void MEMCALL i286_wb(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) {
+static void MEMCALL i286_wn(UINT32 address, REG8 value) {		// NONE
 
 	(void)address;
 	(void)value;
@@ -200,12 +203,12 @@ static void MEMCALL i286_wn(UINT32 addre
 
 // ---- read byte
 
-static REG8 MEMCALL i286_rd(UINT32 address) {
+static REG8 MEMCALL i286_rd(UINT32 address) {					// MAIN
 
 	return(mem[address & CPU_ADRSMASK]);
 }
 
-static REG8 MEMCALL tram_rd(UINT32 address) {
+static REG8 MEMCALL tram_rd(UINT32 address) {					// TRAM
 
 	CPU_REMCLOCK -= MEMWAIT_TRAM;
 	if (address < 0xa4000) {
@@ -222,19 +225,19 @@ static REG8 MEMCALL tram_rd(UINT32 addre
 	return(mem[address]);
 }
 
-static REG8 MEMCALL vram_r0(UINT32 address) {
+static REG8 MEMCALL vram_r0(UINT32 address) {					// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address]);
 }
 
-static REG8 MEMCALL vram_r1(UINT32 address) {
+static REG8 MEMCALL vram_r1(UINT32 address) {					// VRAM
 
 	CPU_REMCLOCK -= MEMWAIT_VRAM;
 	return(mem[address + VRAM_STEP]);
 }
 
-static REG8 MEMCALL grcg_tcr0(UINT32 address) {
+static REG8 MEMCALL grcg_tcr0(UINT32 address) {					// VRAM
 
 const BYTE	*vram;
 	REG8	ret;
@@ -257,7 +260,7 @@ 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;
@@ -280,18 +283,18 @@ 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(i286core.e.ems[(address >> 14) & 3][LOW14(address)]);
+	return(CPU_EMSPTR[(address >> 14) & 3][LOW14(address)]);
 }
 
-static REG8 MEMCALL i286_rb(UINT32 address) {
+static REG8 MEMCALL i286_rb(UINT32 address) {					// F800-FFFF
 
 	if (CPU_ITFBANK) {
 		address += VRAM_STEP;
@@ -456,19 +459,43 @@ static void MEMCALL emmcw_wt(UINT32 addr
 	BYTE	*ptr;
 
 	if ((address & 0x3fff) != 0x3fff) {
-		ptr = i286core.e.ems[(address >> 14) & 3] + LOW14(address);
+		ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address);
 		STOREINTELWORD(ptr, value);
 	}
 	else {
-		i286core.e.ems[(address >> 14) & 3][0x3fff] = (BYTE)value;
-		i286core.e.ems[((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) {
 
-	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
-	mem[address + 0x1c8001 - 0xe8000] = (BYTE)(value >> 8);
+	BYTE	*ptr;
+
+	ptr = mem + (address + 0x1c8000 - 0xe8000);
+	STOREINTELWORD(ptr, value);
 }
 
 static void MEMCALL i286w_wn(UINT32 address, REG16 value) {
@@ -587,12 +614,12 @@ const BYTE	*ptr;
 	REG16	ret;
 
 	if ((address & 0x3fff) != 0x3fff) {
-		ptr = i286core.e.ems[(address >> 14) & 3] + LOW14(address);
+		ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address);
 		return(LOADINTELWORD(ptr));
 	}
 	else {
-		ret = i286core.e.ems[(address >> 14) & 3][0x3fff];
-		ret += i286core.e.ems[((address + 1) >> 14) & 3][0] << 8;
+		ret = CPU_EMSPTR[(address >> 14) & 3][0x3fff];
+		ret += CPU_EMSPTR[((address + 1) >> 14) & 3][0] << 8;
 		return(ret);
 	}
 }
@@ -621,14 +648,12 @@ typedef struct {
 } MEMFN;
 
 typedef struct {
-	MEM8READ	brd8;
-	MEM8READ	ird8;
-	MEM8WRITE	ewr8;
-	MEM8WRITE	bwr8;
-	MEM16READ	brd16;
-	MEM16READ	ird16;
-	MEM16WRITE	ewr16;
-	MEM16WRITE	bwr16;
+	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 {
@@ -654,7 +679,7 @@ static MEMFN memfn = {
 			i286_wt,	i286_wt,	i286_wt,	i286_wt,		// 60
 			i286_wt,	i286_wt,	i286_wt,	i286_wt,		// 80
 			tram_wt,	vram_w0,	vram_w0,	vram_w0,		// a0
-			emmc_wt,	emmc_wt,	i286_wn,	i286_wn,		// c0
+			emmc_wt,	emmc_wt,	i286_wd,	i286_wd,		// c0
 			vram_w0,	i286_wn,	i286_wn,	i286_wn},		// e0
 
 		   {i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 00
@@ -672,14 +697,14 @@ static MEMFN memfn = {
 			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 60
 			i286w_wt,	i286w_wt,	i286w_wt,	i286w_wt,		// 80
 			tramw_wt,	vramw_w0,	vramw_w0,	vramw_w0,		// a0
-			emmcw_wt,	emmcw_wt,	i286w_wn,	i286w_wn,		// c0
+			emmcw_wt,	emmcw_wt,	i286w_wd,	i286w_wd,		// c0
 			vramw_w0,	i286w_wn,	i286w_wn,	i286w_wn}};		// e0
 
 static const MMAPTBL mmaptbl[2] = {
-		   {i286_rd,	i286_rb,	i286_wn,	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}};
+		   {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
@@ -722,9 +747,6 @@ const MMAPTBL	*mm;
 	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;
@@ -732,9 +754,6 @@ const MMAPTBL	*mm;
 	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;
@@ -766,7 +785,7 @@ const VACCTBL	*vacc;
 	memfn.wr16[0xb8000 >> 15] = vacc->wr16;
 	memfn.wr16[0xe0000 >> 15] = vacc->wr16;
 
-	if (!(func & 0x10)) {							// degital
+	if (!(func & 0x10)) {							// digital
 		memfn.wr8[0xe0000 >> 15] = i286_wn;
 		memfn.wr16[0xe0000 >> 15] = i286w_wn;
 		memfn.rd8[0xe0000 >> 15] = i286_nonram_r;
@@ -774,90 +793,6 @@ const VACCTBL	*vacc;
 	}
 }
 
-#if defined(MEMORY_DEBUG)
-static REG8 MEMCALL _i286_memoryread(UINT32 address) {
-
-	if (address < I286_MEMREADMAX) {
-		return(mem[address]);
-	}
-#if defined(USE_HIMEM)
-	else if (address >= USE_HIMEM) {
-		address -= 0x100000;
-		if (address < CPU_EXTMEMSIZE) {
-			return(CPU_EXTMEM[address]);
-		}
-		else {
-			return(0xff);
-		}
-	}
-#endif
-	else {
-		return(memfn.rd8[(address >> 15) & 0x1f](address));
-	}
-}
-
-static REG16 MEMCALL _i286_memoryread_w(UINT32 address) {
-
-	REG16	ret;
-
-	if (address < (I286_MEMREADMAX - 1)) {
-		return(LOADINTELWORD(mem + address));
-	}
-#if defined(USE_HIMEM)
-	else if (address >= (USE_HIMEM - 1)) {
-		address -= 0x100000;
-		if (address == (USE_HIMEM - 0x100000 - 1)) {
-			ret = mem[0x100000 + address];
-		}
-		else if (address < CPU_EXTMEMSIZE) {
-			ret = CPU_EXTMEM[address];
-		}
-		else {
-			ret = 0xff;
-		}
-		address++;
-		if (address < CPU_EXTMEMSIZE) {
-			ret += CPU_EXTMEM[address] << 8;
-		}
-		else {
-			ret += 0xff00;
-		}
-		return(ret);
-	}
-#endif
-	else if ((address & 0x7fff) != 0x7fff) {
-		return(memfn.rd16[(address >> 15) & 0x1f](address));
-	}
-	else {
-		ret = memfn.rd8[(address >> 15) & 0x1f](address);
-		address++;
-		ret += memfn.rd8[(address >> 15) & 0x1f](address) << 8;
-		return(ret);
-	}
-}
-
-REG8 MEMCALL i286_memoryread(UINT32 address) {
-
-	REG8	r;
-
-	r = _i286_memoryread(address);
-	if (r & 0xffffff00) {
-		TRACEOUT(("error i286_memoryread %x %x", address, r));
-	}
-	return(r);
-}
-
-REG16 MEMCALL i286_memoryread_w(UINT32 address) {
-
-	REG16	r;
-
-	r = _i286_memoryread_w(address);
-	if (r & 0xffff0000) {
-		TRACEOUT(("error i286_memoryread_w %x %x", address, r));
-	}
-	return(r);
-}
-#else
 REG8 MEMCALL i286_memoryread(UINT32 address) {
 
 	if (address < I286_MEMREADMAX) {
@@ -918,7 +853,6 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 		return(ret);
 	}
 }
-#endif
 
 void MEMCALL i286_memorywrite(UINT32 address, REG8 value) {