--- np2/i386c/memory.c	2005/03/11 15:12:57	1.30
+++ np2/i386c/memory.c	2005/03/16 08:01:12	1.33
@@ -20,31 +20,37 @@
 	UINT8	mem[0x200000];
 
 
+typedef void (MEMCALL * MEM8WRITE)(UINT32 address, REG8 value);
+typedef REG8 (MEMCALL * MEM8READ)(UINT32 address);
+typedef void (MEMCALL * MEM16WRITE)(UINT32 address, REG16 value);
+typedef REG16 (MEMCALL * MEM16READ)(UINT32 address);
+
+
 // ---- MAIN
 
 static REG8 MEMCALL memmain_rd8(UINT32 address) {
 
-	return(mem[address & CPU_ADRSMASK]);
+	return(mem[address]);
 }
 
 static REG16 MEMCALL memmain_rd16(UINT32 address) {
 
 const UINT8	*ptr;
 
-	ptr = mem + (address & CPU_ADRSMASK);
+	ptr = mem + address;
 	return(LOADINTELWORD(ptr));
 }
 
 static void MEMCALL memmain_wr8(UINT32 address, REG8 value) {
 
-	mem[address & CPU_ADRSMASK] = (UINT8)value;
+	mem[address] = (UINT8)value;
 }
 
 static void MEMCALL memmain_wr16(UINT32 address, REG16 value) {
 
 	UINT8	*ptr;
 
-	ptr = mem + (address & CPU_ADRSMASK);
+	ptr = mem + address;
 	STOREINTELWORD(ptr, value);
 }
 
@@ -76,19 +82,14 @@ static void MEMCALL memnc_wr16(UINT32 ad
 }
 
 
-// ---- table
-
-typedef void (MEMCALL * MEM8WRITE)(UINT32 address, REG8 value);
-typedef REG8 (MEMCALL * MEM8READ)(UINT32 address);
-typedef void (MEMCALL * MEM16WRITE)(UINT32 address, REG16 value);
-typedef REG16 (MEMCALL * MEM16READ)(UINT32 address);
+// ---- memory 000000-0ffffff + 64KB
 
 typedef struct {
-	MEM8READ	rd8[0x20];
-	MEM8WRITE	wr8[0x20];
-	MEM16READ	rd16[0x20];
-	MEM16WRITE	wr16[0x20];
-} MEMFN;
+	MEM8READ	rd8[0x22];
+	MEM8WRITE	wr8[0x22];
+	MEM16READ	rd16[0x22];
+	MEM16WRITE	wr16[0x22];
+} MEMFN0;
 
 typedef struct {
 	MEM8READ	brd8;		// E8000-F7FFF byte read
@@ -106,7 +107,7 @@ typedef struct {
 	MEM16WRITE	wr16;
 } VACCTBL;
 
-static MEMFN memfn = {
+static MEMFN0 memfn0 = {
 	   {memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 00
 		memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 20
 		memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 40
@@ -114,7 +115,8 @@ static MEMFN memfn = {
 		memmain_rd8,	memmain_rd8,	memmain_rd8,	memmain_rd8,	// 80
 		memtram_rd8,	memvram0_rd8,	memvram0_rd8,	memvram0_rd8,	// a0
 		memems_rd8,		memems_rd8,		memmain_rd8,	memmain_rd8,	// c0
-		memvram0_rd8,	memmain_rd8,	memmain_rd8,	memf800_rd8},	// e0
+		memvram0_rd8,	memmain_rd8,	memmain_rd8,	memf800_rd8,	// e0
+		memmain_rd8,	memmain_rd8},
 
 	   {memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 00
 		memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 20
@@ -123,7 +125,8 @@ static MEMFN memfn = {
 		memmain_wr8,	memmain_wr8,	memmain_wr8,	memmain_wr8,	// 80
 		memtram_wr8,	memvram0_wr8,	memvram0_wr8,	memvram0_wr8,	// a0
 		memems_wr8,		memems_wr8,		memd000_wr8,	memd000_wr8,	// c0
-		memvram0_wr8,	memnc_wr8,		memnc_wr8,		memnc_wr8},		// e0
+		memvram0_wr8,	memnc_wr8,		memnc_wr8,		memnc_wr8,		// e0
+		memmain_wr8,	memmain_wr8},
 
 	   {memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 00
 		memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 20
@@ -132,7 +135,8 @@ static MEMFN memfn = {
 		memmain_rd16,	memmain_rd16,	memmain_rd16,	memmain_rd16,	// 80
 		memtram_rd16,	memvram0_rd16,	memvram0_rd16,	memvram0_rd16,	// a0
 		memems_rd16,	memems_rd16,	memmain_rd16,	memmain_rd16,	// c0
-		memvram0_rd16,	memmain_rd16,	memmain_rd16,	memf800_rd16},	// e0
+		memvram0_rd16,	memmain_rd16,	memmain_rd16,	memf800_rd16,	// e0
+		memmain_rd16,	memmain_rd16},
 
 	   {memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 00
 		memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 20
@@ -141,7 +145,8 @@ static MEMFN memfn = {
 		memmain_wr16,	memmain_wr16,	memmain_wr16,	memmain_wr16,	// 80
 		memtram_wr16,	memvram0_wr16,	memvram0_wr16,	memvram0_wr16,	// a0
 		memems_wr16,	memems_wr16,	memd000_wr16,	memd000_wr16,	// c0
-		memvram0_wr16,	memnc_wr16,		memnc_wr16,		memnc_wr16}};	// e0
+		memvram0_wr16,	memnc_wr16,		memnc_wr16,		memnc_wr16,		// e0
+		memmain_wr16,	memmain_wr16}};
 
 static const MMAPTBL mmaptbl[2] = {
 		   {memmain_rd8,	memf800_rd8,	memnc_wr8,
@@ -174,19 +179,19 @@ 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[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[0xe8000 >> 15] = mm->bwr16;
-	memfn.wr16[0xf0000 >> 15] = mm->bwr16;
-	memfn.wr16[0xf8000 >> 15] = mm->bwr16;
+	memfn0.rd8[0xe8000 >> 15] = mm->brd8;
+	memfn0.rd8[0xf0000 >> 15] = mm->brd8;
+	memfn0.rd8[0xf8000 >> 15] = mm->ird8;
+	memfn0.wr8[0xe8000 >> 15] = mm->bwr8;
+	memfn0.wr8[0xf0000 >> 15] = mm->bwr8;
+	memfn0.wr8[0xf8000 >> 15] = mm->bwr8;
+
+	memfn0.rd16[0xe8000 >> 15] = mm->brd16;
+	memfn0.rd16[0xf0000 >> 15] = mm->brd16;
+	memfn0.rd16[0xf8000 >> 15] = mm->ird16;
+	memfn0.wr16[0xe8000 >> 15] = mm->bwr16;
+	memfn0.wr16[0xf0000 >> 15] = mm->bwr16;
+	memfn0.wr16[0xf8000 >> 15] = mm->bwr16;
 }
 
 void MEMCALL i286_vram_dispatch(UINT func) {
@@ -197,78 +202,143 @@ const VACCTBL	*vacc;
 	if (!(func & 0x20)) {
 #endif
 		vacc = vacctbl + (func & 0x0f);
-		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;
+		memfn0.rd8[0xa8000 >> 15] = vacc->rd8;
+		memfn0.rd8[0xb0000 >> 15] = vacc->rd8;
+		memfn0.rd8[0xb8000 >> 15] = vacc->rd8;
+		memfn0.rd8[0xe0000 >> 15] = vacc->rd8;
+
+		memfn0.wr8[0xa8000 >> 15] = vacc->wr8;
+		memfn0.wr8[0xb0000 >> 15] = vacc->wr8;
+		memfn0.wr8[0xb8000 >> 15] = vacc->wr8;
+		memfn0.wr8[0xe0000 >> 15] = vacc->wr8;
+
+		memfn0.rd16[0xa8000 >> 15] = vacc->rd16;
+		memfn0.rd16[0xb0000 >> 15] = vacc->rd16;
+		memfn0.rd16[0xb8000 >> 15] = vacc->rd16;
+		memfn0.rd16[0xe0000 >> 15] = vacc->rd16;
+
+		memfn0.wr16[0xa8000 >> 15] = vacc->wr16;
+		memfn0.wr16[0xb0000 >> 15] = vacc->wr16;
+		memfn0.wr16[0xb8000 >> 15] = vacc->wr16;
+		memfn0.wr16[0xe0000 >> 15] = vacc->wr16;
 
 		if (!(func & 0x10)) {							// digital
-			memfn.rd8[0xe0000 >> 15] = memnc_rd8;
-			memfn.wr8[0xe0000 >> 15] = memnc_wr8;
-			memfn.rd16[0xe0000 >> 15] = memnc_rd16;
-			memfn.wr16[0xe0000 >> 15] = memnc_wr16;
+			memfn0.rd8[0xe0000 >> 15] = memnc_rd8;
+			memfn0.wr8[0xe0000 >> 15] = memnc_wr8;
+			memfn0.rd16[0xe0000 >> 15] = memnc_rd16;
+			memfn0.wr16[0xe0000 >> 15] = memnc_wr16;
 		}
 #if defined(SUPPORT_PC9821)
 	}
 	else {
-		memfn.rd8[0xa8000 >> 15] = memvga0_rd8;
-		memfn.rd8[0xb0000 >> 15] = memvga0_rd8;
-		memfn.rd8[0xb8000 >> 15] = memnc_rd8;
-		memfn.rd8[0xe0000 >> 15] = memvgaio_rd8;
-
-		memfn.wr8[0xa8000 >> 15] = memvga0_wr8;
-		memfn.wr8[0xb0000 >> 15] = memvga0_wr8;
-		memfn.wr8[0xb8000 >> 15] = memnc_wr8;
-		memfn.wr8[0xe0000 >> 15] = memvgaio_wr8;
-
-		memfn.rd16[0xa8000 >> 15] = memvga0_rd16;
-		memfn.rd16[0xb0000 >> 15] = memvga0_rd16;
-		memfn.rd16[0xb8000 >> 15] = memnc_rd16;
-		memfn.rd16[0xe0000 >> 15] = memvgaio_rd16;
-
-		memfn.wr16[0xa8000 >> 15] = memvga0_wr16;
-		memfn.wr16[0xb0000 >> 15] = memvga0_wr16;
-		memfn.wr16[0xb8000 >> 15] = memnc_wr16;
-		memfn.wr16[0xe0000 >> 15] = memvgaio_wr16;
+		memfn0.rd8[0xa8000 >> 15] = memvga0_rd8;
+		memfn0.rd8[0xb0000 >> 15] = memvga1_rd8;
+		memfn0.rd8[0xb8000 >> 15] = memnc_rd8;
+		memfn0.rd8[0xe0000 >> 15] = memvgaio_rd8;
+
+		memfn0.wr8[0xa8000 >> 15] = memvga0_wr8;
+		memfn0.wr8[0xb0000 >> 15] = memvga1_wr8;
+		memfn0.wr8[0xb8000 >> 15] = memnc_wr8;
+		memfn0.wr8[0xe0000 >> 15] = memvgaio_wr8;
+
+		memfn0.rd16[0xa8000 >> 15] = memvga0_rd16;
+		memfn0.rd16[0xb0000 >> 15] = memvga1_rd16;
+		memfn0.rd16[0xb8000 >> 15] = memnc_rd16;
+		memfn0.rd16[0xe0000 >> 15] = memvgaio_rd16;
+
+		memfn0.wr16[0xa8000 >> 15] = memvga0_wr16;
+		memfn0.wr16[0xb0000 >> 15] = memvga1_wr16;
+		memfn0.wr16[0xb8000 >> 15] = memnc_wr16;
+		memfn0.wr16[0xe0000 >> 15] = memvgaio_wr16;
 	}
 #endif
 }
 
 
-REG8 MEMCALL i286_memoryread(UINT32 addr) {
+// ---- memory f00000-fffffff
 
-	UINT32	pos;
+typedef struct {
+	MEM8READ	rd8[8];
+	MEM8WRITE	wr8[8];
+	MEM16READ	rd16[8];
+	MEM16WRITE	wr16[8];
+} MEMFNF;
+
+
+static REG8 MEMCALL memsys_rd8(UINT32 address) {
+
+	address -= 0xf00000;
+	return(memfn0.rd8[address >> 15](address));
+}
+
+static REG16 MEMCALL memsys_rd16(UINT32 address) {
+
+	address -= 0xf00000;
+	return(memfn0.rd16[address >> 15](address));
+}
+
+static void MEMCALL memsys_wr8(UINT32 address, REG8 value) {
+
+	address -= 0xf00000;
+	memfn0.wr8[address >> 15](address, value);
+}
+
+static void MEMCALL memsys_wr16(UINT32 address, REG16 value) {
+
+	address -= 0xf00000;
+	memfn0.wr16[address >> 15](address, value);
+}
+
+#if defined(SUPPORT_PC9821)
+static const MEMFNF memfnf = {
+	   {memvgaf_rd8,	memvgaf_rd8,	memvgaf_rd8,	memvgaf_rd8,
+		memnc_rd8,		memsys_rd8,		memsys_rd8,		memsys_rd8},
+	   {memvgaf_wr8,	memvgaf_wr8,	memvgaf_wr8,	memvgaf_wr8,
+		memnc_wr8,		memsys_wr8,		memsys_wr8,		memsys_wr8},
+
+	   {memvgaf_rd16,	memvgaf_rd16,	memvgaf_rd16,	memvgaf_rd16,
+		memnc_rd16,		memsys_rd16,	memsys_rd16,	memsys_rd16},
+	   {memvgaf_wr16,	memvgaf_wr16,	memvgaf_wr16,	memvgaf_wr16,
+		memnc_wr16,		memsys_wr16,	memsys_wr16,	memsys_wr16}};
+#else
+static const MEMFNF memfnf = {
+	   {memnc_rd8,		memnc_rd8,		memnc_rd8,		memnc_rd8,
+		memnc_rd8,		memsys_rd8,		memsys_rd8,		memsys_rd8},
+	   {memnc_wr8,		memnc_wr8,		memnc_wr8,		memnc_wr8,
+		memnc_wr8,		memsys_wr8,		memsys_wr8,		memsys_wr8},
+
+	   {memnc_rd16,		memnc_rd16,		memnc_rd16,		memnc_rd16,
+		memnc_rd16,		memsys_rd16,	memsys_rd16,	memsys_rd16},
+	   {memnc_wr16,		memnc_wr16,		memnc_wr16,		memnc_wr16,
+		memnc_wr16,		memsys_wr16,	memsys_wr16,	memsys_wr16}};
+#endif
+
+
+// ----
+
+REG8 MEMCALL i286_memoryread(UINT32 addr) {
 
 	if (addr < I286_MEMREADMAX) {
 		return(mem[addr]);
 	}
-	else if (addr >= USE_HIMEM) {
-		pos = (addr & CPU_ADRSMASK) - 0x100000;
-		if (pos < CPU_EXTMEMSIZE) {
-			return(CPU_EXTMEM[pos]);
+	else {
+		addr = addr & CPU_ADRSMASK;
+		if (addr < USE_HIMEM) {
+			return(memfn0.rd8[addr >> 15](addr));
 		}
-		else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
-			return(memfn.rd8[(addr >> 15) & 0x1f](addr - 0x00f00000));
+		else if (addr < CPU_EXTLIMIT16) {
+			return(CPU_EXTMEMBASE[addr]);
 		}
-#if defined(SUPPORT_PC9821)
-		else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) {
-			return(memvgaf_rd8(addr));
+		else if (addr < 0x00f00000) {
+			return(0xff);
+		}
+		else if (addr < 0x01000000) {
+			return(memfnf.rd8[(addr >> 17) & 7](addr));
+		}
+		else if (addr < CPU_EXTLIMIT) {
+			return(CPU_EXTMEMBASE[addr]);
 		}
+#if defined(SUPPORT_PC9821)
 		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
 			return(memvgaf_rd8(addr));
 		}
@@ -278,42 +348,41 @@ REG8 MEMCALL i286_memoryread(UINT32 addr
 			return(0xff);
 		}
 	}
-	else {
-		return(memfn.rd8[(addr >> 15) & 0x1f](addr));
-	}
 }
 
 REG16 MEMCALL i286_memoryread_w(UINT32 addr) {
 
-	UINT32	pos;
 	REG16	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));
-			}
+		addr = addr & CPU_ADRSMASK;
+		if (addr < USE_HIMEM) {
+			return(memfn0.rd16[addr >> 15](addr));
+		}
+		else if (addr < CPU_EXTLIMIT16) {
+			return(LOADINTELWORD(CPU_EXTMEMBASE + addr));
+		}
+		else if (addr < 0x00f00000) {
+			return(0xffff);
+		}
+		else if (addr < 0x01000000) {
+			return(memfnf.rd16[(addr >> 17) & 7](addr));
+		}
+		else if (addr < CPU_EXTLIMIT) {
+			return(LOADINTELWORD(CPU_EXTMEMBASE + addr));
+		}
 #if defined(SUPPORT_PC9821)
-			else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) {
-				return(memvgaf_rd16(addr));
-			}
-			else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-				return(memvgaf_rd16(addr));
-			}
+		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
+			return(memvgaf_rd16(addr));
+		}
 #endif
-			else {
-//				TRACEOUT(("out of mem (read16): %x", addr));
-				return(0xffff);
-			}
+		else {
+//			TRACEOUT(("out of mem (read16): %x", addr));
+			return(0xffff);
 		}
-		return(memfn.rd16[(addr >> 15) & 0x1f](addr));
 	}
 	else {
 		ret = i286_memoryread(addr);
@@ -331,9 +400,9 @@ UINT32 MEMCALL i286_memoryread_d(UINT32 
 		return(LOADINTELDWORD(mem + addr));
 	}
 	else if (addr >= USE_HIMEM) {
-		pos = (addr & CPU_ADRSMASK) - 0x100000;
-		if ((pos + 3) < CPU_EXTMEMSIZE) {
-			return(LOADINTELDWORD(CPU_EXTMEM + pos));
+		pos = addr & CPU_ADRSMASK;
+		if ((pos >= USE_HIMEM) && ((pos + 3) < CPU_EXTLIMIT16)) {
+			return(LOADINTELDWORD(CPU_EXTMEMBASE + pos));
 		}
 	}
 	if (!(addr & 1)) {
@@ -350,23 +419,26 @@ UINT32 MEMCALL i286_memoryread_d(UINT32 
 
 void MEMCALL i286_memorywrite(UINT32 addr, REG8 value) {
 
-	UINT32	pos;
-
 	if (addr < I286_MEMWRITEMAX) {
-		mem[addr] = (BYTE)value;
+		mem[addr] = (UINT8)value;
 	}
-	else if (addr >= USE_HIMEM) {
-		pos = (addr & CPU_ADRSMASK) - 0x100000;
-		if (pos < CPU_EXTMEMSIZE) {
-			CPU_EXTMEM[pos] = (BYTE)value;
+	else {
+		addr = addr & CPU_ADRSMASK;
+		if (addr < USE_HIMEM) {
+			memfn0.wr8[addr >> 15](addr, value);
 		}
-		else if ((addr >= 0x00fa0000) && (addr < 0x01000000)) {
-			memfn.wr8[(addr >> 15) & 0x1f](addr - 0x00f00000, value);
+		else if (addr < CPU_EXTLIMIT16) {
+			CPU_EXTMEMBASE[addr] = (UINT8)value;
 		}
-#if defined(SUPPORT_PC9821)
-		else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) {
-			memvgaf_wr8(addr, value);
+		else if (addr < 0x00f00000) {
+		}
+		else if (addr < 0x01000000) {
+			memfnf.wr8[(addr >> 17) & 7](addr, value);
+		}
+		else if (addr < CPU_EXTLIMIT) {
+			CPU_EXTMEMBASE[addr] = (UINT8)value;
 		}
+#if defined(SUPPORT_PC9821)
 		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
 			memvgaf_wr8(addr, value);
 		}
@@ -375,41 +447,36 @@ void MEMCALL i286_memorywrite(UINT32 add
 //			TRACEOUT(("out of mem (write8): %x", addr));
 		}
 	}
-	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);
-			}
+		addr = addr & CPU_ADRSMASK;
+		if (addr < USE_HIMEM) {
+			memfn0.wr16[addr >> 15](addr, value);
+		}
+		else if (addr < CPU_EXTLIMIT16) {
+			STOREINTELWORD(CPU_EXTMEMBASE + addr, value);
+		}
+		else if (addr < 0x00f00000) {
+		}
+		else if (addr < 0x01000000) {
+			memfnf.wr16[(addr >> 17) & 7](addr, value);
+		}
+		else if (addr < CPU_EXTLIMIT) {
+			STOREINTELWORD(CPU_EXTMEMBASE + addr, value);
+		}
 #if defined(SUPPORT_PC9821)
-			else if ((addr >= 0x00f00000) && (addr < 0x00f80000)) {
-				memvgaf_wr16(addr, value);
-			}
-			else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
-				memvgaf_wr16(addr, value);
-			}
-#endif
-			else {
-//				TRACEOUT(("out of mem (write16): %x", addr));
-			}
+		else if ((addr >= 0xfff00000) && (addr < 0xfff80000)) {
+			memvgaf_wr16(addr, value);
 		}
+#endif
 		else {
-			memfn.wr16[(addr >> 15) & 0x1f](addr, value);
+//			TRACEOUT(("out of mem (write16): %x", addr));
 		}
 	}
 	else {
@@ -427,9 +494,9 @@ void MEMCALL i286_memorywrite_d(UINT32 a
 		return;
 	}
 	else if (addr >= USE_HIMEM) {
-		pos = (addr & CPU_ADRSMASK) - 0x100000;
-		if ((pos + 3) < CPU_EXTMEMSIZE) {
-			STOREINTELDWORD(CPU_EXTMEM + pos, value);
+		pos = addr & CPU_ADRSMASK;
+		if ((pos >= USE_HIMEM) && ((pos + 3) < CPU_EXTLIMIT16)) {
+			STOREINTELDWORD(CPU_EXTMEMBASE + pos, value);
 			return;
 		}
 	}
@@ -444,83 +511,27 @@ void MEMCALL i286_memorywrite_d(UINT32 a
 	}
 }
 
-#if 0
-REG8 MEMCALL i286_membyte_read(UINT seg, UINT off) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < I286_MEMREADMAX) {
-		return(mem[address]);
-	}
-	else {
-		return(i286_memoryread(address));
-	}
-}
-
-REG16 MEMCALL i286_memword_read(UINT seg, UINT off) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < (I286_MEMREADMAX - 1)) {
-		return(LOADINTELWORD(mem + address));
-	}
-	else {
-		return(i286_memoryread_w(address));
-	}
-}
-
-void MEMCALL i286_membyte_write(UINT seg, UINT off, REG8 value) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < I286_MEMWRITEMAX) {
-		mem[address] = (BYTE)value;
-	}
-	else {
-		i286_memorywrite(address, value);
-	}
-}
-
-void MEMCALL i286_memword_write(UINT seg, UINT off, REG16 value) {
-
-	UINT32	address;
-
-	address = (seg << 4) + LOW16(off);
-	if (address < (I286_MEMWRITEMAX - 1)) {
-		STOREINTELWORD(mem + address, value);
-	}
-	else {
-		i286_memorywrite_w(address, value);
-	}
-}
-#endif
-
 void MEMCALL memp_read(UINT32 address, void *dat, UINT leng) {
 
-	BYTE *out = (BYTE *)dat;
-	UINT pos;
+	UINT8 *out = (UINT8 *)dat;
 	UINT diff;
 
 	/* fast memory access */
-	if (address + leng < I286_MEMREADMAX) {
+	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);
+	}
+	address = address & CPU_ADRSMASK;
+	if ((address >= USE_HIMEM) && (address < CPU_EXTLIMIT16)) {
+		diff = CPU_EXTLIMIT16 - address;
+		if (diff >= leng) {
+			CopyMemory(dat, CPU_EXTMEMBASE + address, leng);
 			return;
 		}
-		if (pos < CPU_EXTMEMSIZE) {
-			diff = CPU_EXTMEMSIZE - pos;
-			CopyMemory(out, CPU_EXTMEM + pos, diff);
-			out += diff;
-			leng -= diff;
-			address += diff;
-		}
+		CopyMemory(dat, CPU_EXTMEMBASE + address, diff);
+		out += diff;
+		leng -= diff;
+		address += diff;
 	}
 
 	/* slow memory access */
@@ -531,27 +542,25 @@ void MEMCALL memp_read(UINT32 address, v
 
 void MEMCALL memp_write(UINT32 address, const void *dat, UINT leng) {
 
-	const BYTE *out = (BYTE *)dat;
-	UINT pos;
+	const UINT8 *out = (UINT8 *)dat;
 	UINT diff;
 
 	/* fast memory access */
-	if (address + leng < I286_MEMREADMAX) {
+	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);
+	}
+	address = address & CPU_ADRSMASK;
+	if ((address >= USE_HIMEM) && (address < CPU_EXTLIMIT16)) {
+		diff = CPU_EXTLIMIT16 - address;
+		if (diff >= leng) {
+			CopyMemory(CPU_EXTMEMBASE + address, dat, leng);
 			return;
 		}
-		if (pos < CPU_EXTMEMSIZE) {
-			diff = CPU_EXTMEMSIZE - pos;
-			CopyMemory(CPU_EXTMEM + pos, dat, diff);
-			out += diff;
-			leng -= diff;
-			address += diff;
-		}
+		CopyMemory(CPU_EXTMEMBASE + address, dat, diff);
+		out += diff;
+		leng -= diff;
+		address += diff;
 	}
 
 	/* slow memory access */
@@ -667,7 +676,7 @@ void MEMCALL meml_readstr(UINT seg, UINT
 		}
 		memp_read(addr, dat, size);
 		off += size;
-		dat = ((BYTE *)dat) + size;
+		dat = ((UINT8 *)dat) + size;
 		leng -= size;
 	}
 }
@@ -690,7 +699,7 @@ void MEMCALL meml_writestr(UINT seg, UIN
 		}
 		memp_write(addr, dat, size);
 		off += size;
-		dat = ((BYTE *)dat) + size;
+		dat = ((UINT8 *)dat) + size;
 		leng -= size;
 	}
 }
@@ -708,7 +717,7 @@ void MEMCALL meml_read(UINT32 address, v
 			size = min(size, leng);
 			memp_read(physicaladdr(address, FALSE), dat, size);
 			address += size;
-			dat = ((BYTE *)dat) + size;
+			dat = ((UINT8 *)dat) + size;
 			leng -= size;
 		}
 	}
@@ -727,7 +736,7 @@ void MEMCALL meml_write(UINT32 address, 
 			size = min(size, leng);
 			memp_write(physicaladdr(address, TRUE), dat, size);
 			address += size;
-			dat = ((BYTE *)dat) + size;
+			dat = ((UINT8 *)dat) + size;
 			leng -= size;
 		}
 	}