--- np2/i286c/memory.c	2003/11/29 00:36:00	1.5
+++ np2/i286c/memory.c	2003/12/08 00:55:31	1.10
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"memory.h"
 #include	"egcmem.h"
 #include	"pccore.h"
@@ -9,18 +9,20 @@
 
 
 #define	USE_HIMEM
+#if defined(TRACE)
 #define	MEMORY_DEBUG
+#endif
 
 // ---- write byte
 
 static void MEMCALL i286_wt(UINT32 address, REG8 value) {
 
-	mem[address & extmem.adrsmask] = (BYTE)value;
+	mem[address & CPU_ADRSMASK] = (BYTE)value;
 }
 
 static void MEMCALL tram_wt(UINT32 address, REG8 value) {
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= vramop.tramwait;
 	if (address < 0xa2000) {
 		mem[address] = (BYTE)value;
 		tramupdate[LOW12(address >> 1)] = 1;
@@ -52,7 +54,7 @@ static void MEMCALL tram_wt(UINT32 addre
 
 static void MEMCALL vram_w0(UINT32 address, REG8 value) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= vramop.vramwait;
 	mem[address] = (BYTE)value;
 	vramupdate[LOW15(address)] |= 1;
 	gdcs.grphdisp |= 1;
@@ -60,7 +62,7 @@ static void MEMCALL vram_w0(UINT32 addre
 
 static void MEMCALL vram_w1(UINT32 address, REG8 value) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= vramop.vramwait;
 	mem[address + VRAM_STEP] = (BYTE)value;
 	vramupdate[LOW15(address)] |= 2;
 	gdcs.grphdisp |= 2;
@@ -71,7 +73,7 @@ static void MEMCALL grcg_rmw0(UINT32 add
 	REG8	mask;
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
@@ -100,7 +102,7 @@ static void MEMCALL grcg_rmw1(UINT32 add
 	REG8	mask;
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	mask = ~value;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
@@ -128,7 +130,7 @@ static void MEMCALL grcg_tdw0(UINT32 add
 
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	address = LOW15(address);
 	vramupdate[address] |= 1;
 	gdcs.grphdisp |= 1;
@@ -152,7 +154,7 @@ static void MEMCALL grcg_tdw1(UINT32 add
 
 	BYTE	*vram;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	address = LOW15(address);
 	vramupdate[address] |= 2;
 	gdcs.grphdisp |= 2;
@@ -193,12 +195,12 @@ static void MEMCALL i286_wn(UINT32 addre
 
 static REG8 MEMCALL i286_rd(UINT32 address) {
 
-	return(mem[address & extmem.adrsmask]);
+	return(mem[address & CPU_ADRSMASK]);
 }
 
 static REG8 MEMCALL tram_rd(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= vramop.tramwait;
 	if (address < 0xa4000) {
 		return(mem[address]);
 	}
@@ -215,13 +217,13 @@ static REG8 MEMCALL tram_rd(UINT32 addre
 
 static REG8 MEMCALL vram_r0(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= vramop.vramwait;
 	return(mem[address]);
 }
 
 static REG8 MEMCALL vram_r1(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= vramop.vramwait;
 	return(mem[address + VRAM_STEP]);
 }
 
@@ -230,7 +232,7 @@ static REG8 MEMCALL grcg_tcr0(UINT32 add
 const BYTE	*vram;
 	REG8	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	vram = mem + LOW15(address);
 	ret = 0;
 	if (!(grcg.modereg & 1)) {
@@ -253,7 +255,7 @@ static REG8 MEMCALL grcg_tcr1(UINT32 add
 const BYTE	*vram;
 	REG8	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -283,7 +285,7 @@ static REG8 MEMCALL emmc_rd(UINT32 addre
 
 static REG8 MEMCALL i286_itf(UINT32 address) {
 
-	if (itf.bank) {
+	if (CPU_ITFBANK) {
 		address = ITF_ADRS + LOW15(address);
 	}
 	return(mem[address]);
@@ -296,7 +298,7 @@ static void MEMCALL i286w_wt(UINT32 addr
 
 	BYTE	*ptr;
 
-	ptr = mem + (address & extmem.adrsmask);
+	ptr = mem + (address & CPU_ADRSMASK);
 	STOREINTELWORD(ptr, value);
 }
 
@@ -347,7 +349,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 
 #define GRCGW_NON(page) {											\
-	I286_REMCLOCK -= vramop.vramwait;								\
+	CPU_REMCLOCK -= vramop.vramwait;								\
 	STOREINTELWORD(mem + address + VRAM_STEP*(page), value);		\
 	vramupdate[LOW15(address)] |= (1 << page);						\
 	vramupdate[LOW15(address + 1)] |= (1 << page);					\
@@ -356,7 +358,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_RMW(page) {											\
 	BYTE	*vram;													\
-	I286_REMCLOCK -= vramop.grcgwait;								\
+	CPU_REMCLOCK -= vramop.grcgwait;								\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -402,7 +404,7 @@ static void MEMCALL tramw_wt(UINT32 addr
 
 #define GRCGW_TDW(page) {											\
 	BYTE	*vram;													\
-	I286_REMCLOCK -= vramop.grcgwait;								\
+	CPU_REMCLOCK -= vramop.grcgwait;								\
 	address = LOW15(address);										\
 	vramupdate[address] |= (1 << page);								\
 	vramupdate[address + 1] |= (1 << page);							\
@@ -461,7 +463,7 @@ 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);
 	}
 }
 
@@ -478,13 +480,13 @@ static REG16 MEMCALL i286w_rd(UINT32 add
 
 	BYTE	*ptr;
 
-	ptr = mem + (address & extmem.adrsmask);
+	ptr = mem + (address & CPU_ADRSMASK);
 	return(LOADINTELWORD(ptr));
 }
 
 static REG16 MEMCALL tramw_rd(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.tramwait;
+	CPU_REMCLOCK -= vramop.tramwait;
 	if (address < (0xa4000 - 1)) {
 		return(LOADINTELWORD(mem + address));
 	}
@@ -513,13 +515,13 @@ static REG16 MEMCALL tramw_rd(UINT32 add
 
 static REG16 MEMCALL vramw_r0(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= vramop.vramwait;
 	return(LOADINTELWORD(mem + address));
 }
 
 static REG16 MEMCALL vramw_r1(UINT32 address) {
 
-	I286_REMCLOCK -= vramop.vramwait;
+	CPU_REMCLOCK -= vramop.vramwait;
 	return(LOADINTELWORD(mem + address + VRAM_STEP));
 }
 
@@ -528,7 +530,7 @@ static REG16 MEMCALL grcgw_tcr0(UINT32 a
 	BYTE	*vram;
 	REG16	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -543,7 +545,7 @@ static REG16 MEMCALL grcgw_tcr0(UINT32 a
 	if (!(grcg.modereg & 8)) {
 		ret |= LOADINTELWORD(vram + VRAM0_E) ^ grcg.tile[3].w;
 	}
-	return(~ret);
+	return((UINT16)~ret);
 }
 
 static REG16 MEMCALL grcgw_tcr1(UINT32 address) {
@@ -551,7 +553,7 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a
 	BYTE	*vram;
 	REG16	ret;
 
-	I286_REMCLOCK -= vramop.grcgwait;
+	CPU_REMCLOCK -= vramop.grcgwait;
 	ret = 0;
 	vram = mem + LOW15(address);
 	if (!(grcg.modereg & 1)) {
@@ -592,15 +594,23 @@ static REG16 MEMCALL egcw_rd(UINT32 addr
 
 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 REG16 MEMCALL i286w_itf(UINT32 address) {
 
-	if (itf.bank) {
+	if (CPU_ITFBANK) {
 		address = ITF_ADRS + LOW15(address);
 	}
 	return(LOADINTELWORD(mem + address));
@@ -733,8 +743,8 @@ static REG8 MEMCALL _i286_memoryread(UIN
 #if defined(USE_HIMEM)
 	else if (address >= 0x10fff0) {
 		address -= 0x100000;
-		if (address < extmemmng_size) {
-			return(extmemmng_ptr[address]);
+		if (address < CPU_EXTMEMSIZE) {
+			return(CPU_EXTMEM[address]);
 		}
 		else {
 			return(0xff);
@@ -759,15 +769,15 @@ static REG16 MEMCALL _i286_memoryread_w(
 		if (address == (0x00fff0 - 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;
@@ -789,9 +799,10 @@ static REG16 MEMCALL _i286_memoryread_w(
 REG8 MEMCALL i286_memoryread(UINT32 address) {
 
 	REG8	r;
+
 	r = _i286_memoryread(address);
 	if (r & 0xffffff00) {
-		TRACEOUT(("error i286_memoryread %x", r));
+		TRACEOUT(("error i286_memoryread %x %x", address, r));
 	}
 	return(r);
 }
@@ -802,7 +813,7 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 
 	r = _i286_memoryread_w(address);
 	if (r & 0xffff0000) {
-		TRACEOUT(("error i286_memoryread_w %x", r));
+		TRACEOUT(("error i286_memoryread_w %x %x", address, r));
 	}
 	return(r);
 }
@@ -815,8 +826,8 @@ REG8 MEMCALL i286_memoryread(UINT32 addr
 #if defined(USE_HIMEM)
 	else if (address >= 0x10fff0) {
 		address -= 0x100000;
-		if (address < extmemmng_size) {
-			return(extmemmng_ptr[address]);
+		if (address < CPU_EXTMEMSIZE) {
+			return(CPU_EXTMEM[address]);
 		}
 		else {
 			return(0xff);
@@ -841,15 +852,15 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a
 		if (address == (0x00fff0 - 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;
@@ -877,8 +888,8 @@ void MEMCALL i286_memorywrite(UINT32 add
 #if defined(USE_HIMEM)
 	else if (address >= 0x10fff0) {
 		address -= 0x100000;
-		if (address < extmemmng_size) {
-			extmemmng_ptr[address] = (BYTE)value;
+		if (address < CPU_EXTMEMSIZE) {
+			CPU_EXTMEM[address] = (BYTE)value;
 		}
 	}
 #endif
@@ -898,12 +909,12 @@ void MEMCALL i286_memorywrite_w(UINT32 a
 		if (address == (0x00fff0 - 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