--- np2/i386c/memory.c	2003/12/27 11:55:23	1.6
+++ np2/i386c/memory.c	2004/02/20 16:09:04	1.10
@@ -14,7 +14,7 @@
 	BYTE	mem[0x200000];
 
 
-#define	USE_HIMEM
+#define	USE_HIMEM		0x110000
 
 // ---- write byte
 
@@ -183,11 +183,6 @@ static void MEMCALL egc_wt(UINT32 addres
 	egc_write(address, value);
 }
 
-static void MEMCALL emmc_wt(UINT32 address, REG8 value) {
-
-	extmem.pageptr[(address >> 14) & 3][LOW14(address)] = (BYTE)value;
-}
-
 static void MEMCALL i286_wb(UINT32 address, REG8 value) {
 
 	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
@@ -288,11 +283,6 @@ static REG8 MEMCALL egc_rd(UINT32 addres
 	return(egc_read(address));
 }
 
-static REG8 MEMCALL emmc_rd(UINT32 address) {
-
-	return(extmem.pageptr[(address >> 14) & 3][LOW14(address)]);
-}
-
 static REG8 MEMCALL i286_rb(UINT32 address) {
 
 	if (CPU_ITFBANK) {
@@ -465,20 +455,6 @@ static void MEMCALL egcw_wt(UINT32 addre
 	}
 }
 
-static void MEMCALL emmcw_wt(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);
-	}
-}
-
 static void MEMCALL i286w_wb(UINT32 address, REG16 value) {
 
 	mem[address + 0x1c8000 - 0xe8000] = (BYTE)value;
@@ -611,22 +587,6 @@ 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_rb(UINT32 address) {
 
 	if (CPU_ITFBANK) {
@@ -675,8 +635,8 @@ static MEMFN memfn = {
 			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_rb},		// f0
+			i286_rd,	i286_rd,	i286_rd,	i286_rd,		// c0
+			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
@@ -684,7 +644,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
+			i286_wn,	i286_wn,	i286_wn,	i286_wn,		// c0
 			vram_w0,	i286_wn,	i286_wn,	i286_wn},		// e0
 
 		   {i286w_rd,	i286w_rd,	i286w_rd,	i286w_rd,		// 00
@@ -693,7 +653,7 @@ static MEMFN memfn = {
 			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
+			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
@@ -702,7 +662,7 @@ 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
+			i286w_wn,	i286w_wn,	i286w_wn,	i286w_wn,		// c0
 			vramw_w0,	i286w_wn,	i286w_wn,	i286w_wn}};		// e0
 
 static const MMAPTBL mmaptbl[2] = {
@@ -796,7 +756,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;
@@ -805,13 +765,14 @@ const VACCTBL	*vacc;
 }
 
 
-REG8 MEMCALL __i286_memoryread(UINT32 address) {
+REG8 MEMCALL i286_memoryread(UINT32 paddr) {
+
+	UINT32	address = paddr & CPU_ADRSMASK;
 
 	if (address < I286_MEMREADMAX) {
 		return(mem[address]);
 	}
-#if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
+	else if (address >= USE_HIMEM) {
 		address -= 0x100000;
 		if (address < CPU_EXTMEMSIZE) {
 			return(CPU_EXTMEM[address]);
@@ -820,23 +781,22 @@ REG8 MEMCALL __i286_memoryread(UINT32 ad
 			return(0xff);
 		}
 	}
-#endif
 	else {
 		return(memfn.rd8[(address >> 15) & 0x1f](address));
 	}
 }
 
-REG16 MEMCALL __i286_memoryread_w(UINT32 address) {
+REG16 MEMCALL i286_memoryread_w(UINT32 paddr) {
 
+	UINT32	address = paddr & CPU_ADRSMASK;
 	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 < CPU_EXTMEMSIZE) {
@@ -854,55 +814,65 @@ REG16 MEMCALL __i286_memoryread_w(UINT32
 		}
 		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;
+		ret += (REG16)(memfn.rd8[(address >> 15) & 0x1f](address)) << 8;
 		return(ret);
 	}
 }
 
-UINT32 MEMCALL __i286_memoryread_d(UINT32 address) {
-
-	UINT32 ret;
+UINT32 MEMCALL i286_memoryread_d(UINT32 paddr) {
 
-	ret = __i286_memoryread_w(address);
-	ret |= (UINT32)__i286_memoryread_w(address + 2) << 16;
+	UINT32	address = paddr & CPU_ADRSMASK;
+	UINT32	adrs;
+	UINT32	ret;
 
+	if (address < (I286_MEMREADMAX - 3)) {
+		return(LOADINTELDWORD(mem + address));
+	}
+	else if (address >= USE_HIMEM) {
+		adrs = address - 0x100000;
+		if (adrs + 3 < CPU_EXTMEMSIZE) {
+			return(LOADINTELDWORD(CPU_EXTMEM + adrs));
+		}
+	}
+	ret = i286_memoryread_w(address);
+	ret += (UINT32)i286_memoryread_w(address + 2) << 16;
 	return ret;
 }
 
-void MEMCALL __i286_memorywrite(UINT32 address, REG8 value) {
+void MEMCALL i286_memorywrite(UINT32 paddr, REG8 value) {
+
+	UINT32	address = paddr & CPU_ADRSMASK;
 
 	if (address < I286_MEMWRITEMAX) {
 		mem[address] = (BYTE)value;
 	}
-#if defined(USE_HIMEM)
-	else if (address >= 0x10fff0) {
+	else if (address >= USE_HIMEM) {
 		address -= 0x100000;
 		if (address < CPU_EXTMEMSIZE) {
 			CPU_EXTMEM[address] = (BYTE)value;
 		}
 	}
-#endif
 	else {
 		memfn.wr8[(address >> 15) & 0x1f](address, value);
 	}
 }
 
-void MEMCALL __i286_memorywrite_w(UINT32 address, REG16 value) {
+void MEMCALL i286_memorywrite_w(UINT32 paddr, REG16 value) {
+
+	UINT32	address = paddr & CPU_ADRSMASK;
 
 	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 < CPU_EXTMEMSIZE) {
@@ -913,7 +883,6 @@ void MEMCALL __i286_memorywrite_w(UINT32
 			CPU_EXTMEM[address] = (BYTE)(value >> 8);
 		}
 	}
-#endif
 	else if ((address & 0x7fff) != 0x7fff) {
 		memfn.wr16[(address >> 15) & 0x1f](address, value);
 	}
@@ -924,13 +893,27 @@ void MEMCALL __i286_memorywrite_w(UINT32
 	}
 }
 
-void MEMCALL __i286_memorywrite_d(UINT32 address, UINT32 value) {
+void MEMCALL i286_memorywrite_d(UINT32 paddr, UINT32 value) {
 
-	__i286_memorywrite_w(address, value & 0xffff);
-	__i286_memorywrite_w(address + 2, (WORD)(value >> 16));
+	UINT32	address = paddr & CPU_ADRSMASK;
+	UINT32	adrs;
+
+	if (address < (I286_MEMWRITEMAX - 3)) {
+		STOREINTELDWORD(mem + address, value);
+		return;
+	}
+	else if (address >= USE_HIMEM) {
+		adrs = address - 0x100000;
+		if (adrs + 3 < CPU_EXTMEMSIZE) {
+			STOREINTELDWORD(CPU_EXTMEM + adrs, value);
+			return;
+		}
+	}
+	i286_memorywrite_w(address, value & 0xffff);
+	i286_memorywrite_w(address + 2, (WORD)(value >> 16));
 }
 
-#if 0
+#ifdef NP2_MEMORY_ASM
 REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {
 
 	UINT32	address;
@@ -982,7 +965,7 @@ void MEMCALL i286_memword_write(UINT seg
 		i286_memorywrite_w(address, value);
 	}
 }
-#endif
+#endif /* NP2_MEMORY_ASM */
 
 void MEMCALL i286_memstr_read(UINT seg, UINT off, void *dat, UINT leng) {
 
@@ -1022,8 +1005,7 @@ void MEMCALL i286_memstr_read(UINT seg, 
 	}
 }
 
-void MEMCALL i286_memstr_write(UINT seg, UINT off,
-												const void *dat, UINT leng) {
+void MEMCALL i286_memstr_write(UINT seg, UINT off, const void *dat, UINT leng) {
 
 	BYTE	*out;
 	UINT32	adrs;
@@ -1100,6 +1082,4 @@ const BYTE	*out;
 		}
 	}
 }
-
 #endif
-