--- np2/i386c/ia32/cpu_mem.c	2004/01/23 14:33:26	1.6
+++ np2/i386c/ia32/cpu_mem.c	2004/02/05 16:41:32	1.10
@@ -1,4 +1,4 @@
-/*	$Id: cpu_mem.c,v 1.6 2004/01/23 14:33:26 monaka Exp $	*/
+/*	$Id: cpu_mem.c,v 1.10 2004/02/05 16:41:32 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -31,46 +31,6 @@
 #include "cpu.h"
 #include "memory.h"
 
-BYTE *cpumem = 0;
-DWORD extmem_size = 0;
-BYTE protectmem_size = 0;
-
-
-/*
- * initialize 1MB-16MB memory
- */
-
-int
-init_cpumem(BYTE usemem)
-{
-	DWORD size;
-
-	if (usemem > 13)
-		usemem = 13;
-	size = usemem << 20;
-
-	if (extmem_size != size - (LOWMEM - 0x100000)) {
-		if (cpumem) {
-			free(cpumem);
-			cpumem = 0;
-		}
-		if (size <= LOWMEM - 0x100000) {
-			extmem_size = 0;
-			cpumem = 0;
-		} else {
-			extmem_size = size - (LOWMEM - 0x100000);
-			cpumem = (BYTE *)malloc(extmem_size);
-			if (cpumem == NULL) {
-				protectmem_size = 0;
-				return FAILURE;
-			}
-			memset(cpumem, 0, extmem_size);
-		}
-	}
-	protectmem_size = usemem;
-	return SUCCESS;
-}
-
 
 /*
  * memory access check
@@ -271,15 +231,6 @@ cpu_stack_pop_check(descriptor_t* sdp, D
 }
 
 
-#define	AS32_NOCHECK
-#undef	OVERRUN_CHECK
-
-#if defined(OVERRUN_CHECK)
-#define	OVERRUN_EXCEPTION()	EXCEPTION(GP_EXCEPTION, 0)
-#else
-#define	OVERRUN_EXCEPTION()
-#endif
-
 /*
  * code fetch
  */
@@ -290,10 +241,6 @@ cpu_codefetch(DWORD offset)
 	DWORD addr;
 
 	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (offset <= sd->u.seg.limit) {
 		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + offset;
 		if (!CPU_STAT_PM)
@@ -311,10 +258,6 @@ cpu_codefetch_w(DWORD offset)
 	DWORD addr;
 
 	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (offset <= sd->u.seg.limit - 1) {
 		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + offset;
 		if (!CPU_STAT_PM)
@@ -332,10 +275,6 @@ cpu_codefetch_d(DWORD offset)
 	DWORD addr;
 
 	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (offset <= sd->u.seg.limit - 3) {
 		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + offset;
 		if (!CPU_STAT_PM)
@@ -365,10 +304,6 @@ cpu_vmemoryread(int idx, DWORD offset)
 		goto err;
 	}
 
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (!(sd->flag & CPU_DESC_FLAG_READABLE)) {
 		cpu_memoryread_check(sd, offset, 1,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
@@ -398,7 +333,7 @@ cpu_vmemoryread(int idx, DWORD offset)
 	addr = CPU_STAT_SREGBASE(idx) + offset;
 	if (!CPU_STAT_PM)
 		return cpu_memoryread(addr);
-	return cpu_lmemoryread(addr);
+	return cpu_lmemoryread(addr, CPU_STAT_USER_MODE);
 
 err:
 	EXCEPTION(exc, 0);
@@ -420,10 +355,6 @@ cpu_vmemoryread_w(int idx, DWORD offset)
 		goto err;
 	}
 
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (!(sd->flag & CPU_DESC_FLAG_READABLE)) {
 		cpu_memoryread_check(sd, offset, 2,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
@@ -453,7 +384,7 @@ cpu_vmemoryread_w(int idx, DWORD offset)
 	addr = CPU_STAT_SREGBASE(idx) + offset;
 	if (!CPU_STAT_PM)
 		return cpu_memoryread_w(addr);
-	return cpu_lmemoryread_w(addr);
+	return cpu_lmemoryread_w(addr, CPU_STAT_USER_MODE);
 
 err:
 	EXCEPTION(exc, 0);
@@ -475,10 +406,6 @@ cpu_vmemoryread_d(int idx, DWORD offset)
 		goto err;
 	}
 
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (!(sd->flag & CPU_DESC_FLAG_READABLE)) {
 		cpu_memoryread_check(sd, offset, 4,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
@@ -508,7 +435,7 @@ cpu_vmemoryread_d(int idx, DWORD offset)
 	addr = CPU_STAT_SREGBASE(idx) + offset;
 	if (!CPU_STAT_PM)
 		return cpu_memoryread_d(addr);
-	return cpu_lmemoryread_d(addr);
+	return cpu_lmemoryread_d(addr, CPU_STAT_USER_MODE);
 
 err:
 	EXCEPTION(exc, 0);
@@ -531,10 +458,6 @@ cpu_vmemorywrite(int idx, DWORD offset, 
 		goto err;
 	}
 
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (!(sd->flag & CPU_DESC_FLAG_WRITABLE)) {
 		cpu_memorywrite_check(sd, offset, 1,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
@@ -567,7 +490,7 @@ cpu_vmemorywrite(int idx, DWORD offset, 
 		cpu_memorywrite(addr, val);
 	} else {
 		/* protected mode */
-		cpu_lmemorywrite(addr, val);
+		cpu_lmemorywrite(addr, val, CPU_STAT_USER_MODE);
 	}
 	return;
 
@@ -590,10 +513,6 @@ cpu_vmemorywrite_w(int idx, DWORD offset
 		goto err;
 	}
 
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (!(sd->flag & CPU_DESC_FLAG_WRITABLE)) {
 		cpu_memorywrite_check(sd, offset, 2,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
@@ -626,7 +545,7 @@ cpu_vmemorywrite_w(int idx, DWORD offset
 		cpu_memorywrite_w(addr, val);
 	} else {
 		/* protected mode */
-		cpu_lmemorywrite_w(addr, val);
+		cpu_lmemorywrite_w(addr, val, CPU_STAT_USER_MODE);
 	}
 	return;
 
@@ -649,10 +568,6 @@ cpu_vmemorywrite_d(int idx, DWORD offset
 		goto err;
 	}
 
-#ifndef	AS32_NOCHECK
-	if (!CPU_INST_AS32)
-		offset &= 0xffff;
-#endif
 	if (!(sd->flag & CPU_DESC_FLAG_WRITABLE)) {
 		cpu_memorywrite_check(sd, offset, 4,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
@@ -685,291 +600,10 @@ cpu_vmemorywrite_d(int idx, DWORD offset
 		cpu_memorywrite_d(addr, val);
 	} else {
 		/* protected mode */
-		cpu_lmemorywrite_d(addr, val);
+		cpu_lmemorywrite_d(addr, val, CPU_STAT_USER_MODE);
 	}
 	return;
 
 err:
 	EXCEPTION(exc, 0);
 }
-
-/*
- * physical address memory function
- */
-void MEMCALL
-cpu_memorywrite_d(DWORD address, DWORD value)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-	DWORD diff;
-	DWORD off;
-
-	if (adr < LOWMEM - 3) {
-		__i286_memorywrite_d(adr, value);
-	} else if (adr < LOWMEM) {
-		diff = LOWMEM - adr;
-
-		switch (diff) {
-		default:
-			ia32_panic("cpu_memorywrite_d: diff(%d)", diff);
-			break;
-
-		case 3:
-			__i286_memorywrite_w(adr, value & 0xffff);
-			value >>= 16;
-			__i286_memorywrite(adr + 2, value & 0xff);
-			value >>= 8;
-			break;
-
-		case 2:
-			__i286_memorywrite_w(adr, value & 0xffff);
-			value >>= 16;
-			break;
-
-		case 1:
-			__i286_memorywrite(adr, value & 0xff);
-			value >>= 8;
-			break;
-		}
-
-		if (extmem_size > 0) {
-			off = 0;
-
-			switch (4 - diff) {
-			case 3:
-				cpumem[off++] = value & 0xff;
-				value >>= 8;
-				if (off >= extmem_size) {
-					OVERRUN_EXCEPTION();
-					break;
-				}
-				/*FALLTHROUGH*/
-			case 2:
-				cpumem[off++] = value & 0xff;
-				if (off >= extmem_size) {
-					OVERRUN_EXCEPTION();
-					break;
-				}
-				value >>= 8;
-				/*FALLTHROUGH*/
-			case 1:
-				cpumem[off] = value & 0xff;
-				break;
-			}
-		} else {
-			OVERRUN_EXCEPTION();
-		}
-	} else if (extmem_size > 0) {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 3) {
-			STOREINTELDWORD(cpumem + adr, value);
-		} else if (adr < extmem_size) {
-			diff = extmem_size - adr;
-			value >>= (8 * (4 - diff));
-
-			switch (diff) {
-			default:
-				ia32_panic("cpu_memorywrite_d: diff(%d)", diff);
-				break;
-
-			case 3:
-				cpumem[extmem_size - 3] = value & 0xff;
-				value >>= 8;
-				/*FALLTHROUGH*/
-			case 2:
-				cpumem[extmem_size - 2] = value & 0xff;
-				value >>= 8;
-				/*FALLTHROUGH*/
-			case 1:
-				cpumem[extmem_size - 1] = value & 0xff;
-				break;
-			}
-			OVERRUN_EXCEPTION();
-		} else {
-			OVERRUN_EXCEPTION();
-		}
-	} else {
-		OVERRUN_EXCEPTION();
-	}
-}
-
-void MEMCALL
-cpu_memorywrite_w(DWORD address, WORD value)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-
-	if (adr < LOWMEM - 1) {
-		__i286_memorywrite_w(adr, value);
-	} else if (adr < LOWMEM) {
-		__i286_memorywrite(adr, value & 0xff);
-		cpumem[adr - (LOWMEM - 1)] = (value >> 8) & 0xff;
-	} else if (extmem_size > 0) {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 1) {
-			STOREINTELWORD(cpumem + adr, value);
-		} else if (adr == extmem_size - 1) {
-			cpumem[adr] = value & 0xff;
-			OVERRUN_EXCEPTION();
-		} else {
-			OVERRUN_EXCEPTION();
-		}
-	} else {
-		OVERRUN_EXCEPTION();
-	}
-}
-
-void MEMCALL
-cpu_memorywrite(DWORD address, BYTE value)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-
-	if (adr < LOWMEM) {
-		__i286_memorywrite(adr, value);
-	} else if (extmem_size > 0) {
-		adr -= LOWMEM;
-		if (adr < extmem_size) {
-			cpumem[adr] = value;
-		} else {
-			OVERRUN_EXCEPTION();
-		}
-	} else {
-		OVERRUN_EXCEPTION();
-	}
-}
-
-DWORD MEMCALL
-cpu_memoryread_d(DWORD address)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-	DWORD val;
-	DWORD diff;
-
-	if (adr < LOWMEM - 3) {
-		val = __i286_memoryread_d(adr);
-	} else if (adr < LOWMEM) {
-		diff = LOWMEM - adr;
-
-		switch (diff) {
-		default:
-			ia32_panic("cpu_memoryread_d: diff(%d)", diff);
-			val = 0;	/* compiler happy */
-			break;
-
-		case 3:
-			val = __i286_memoryread_w(adr);
-			val |= __i286_memoryread(adr + 2);
-			if (extmem_size > 0) {
-				val |= cpumem[0] << 24;
-			} else {
-				val |= 0xff000000;
-				OVERRUN_EXCEPTION();
-			}
-			break;
-
-		case 2:
-			val = __i286_memoryread_w(adr);
-			if (extmem_size > 1) {
-				val |= (DWORD)LOADINTELWORD(cpumem) << 16;
-			} else {
-				val |= 0xffff0000;
-				OVERRUN_EXCEPTION();
-			}
-			break;
-
-		case 1:
-			val = __i286_memoryread(adr);
-			if (extmem_size > 2) {
-				val |= (DWORD)LOADINTELWORD(cpumem) << 8;
-				val |= (DWORD)cpumem[2] << 24;
-			} else {
-				val |= 0xffffff00;
-				OVERRUN_EXCEPTION();
-			}
-			break;
-		}
-	} else if (extmem_size > 0) {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 3) {
-			val = LOADINTELDWORD(cpumem + adr);
-		} else if (adr < extmem_size) {
-			diff = extmem_size - adr;
-			val = 0;
-
-			switch (diff) {
-			default:
-				ia32_panic("cpu_memoryread_d: diff(%d)", diff);
-				break;
-
-			case 3:
-				val |= cpumem[extmem_size - 3];
-				/*FALLTHROUGH*/
-			case 2:
-				val |= (cpumem[extmem_size - 2] << (8 * (diff - 2)));
-				/*FALLTHROUGH*/
-			case 1:
-				val |= (cpumem[extmem_size - 1] << (8 * (diff - 1)));
-				break;
-			}
-			val |= ((DWORD)-1) << (8 * diff);
-			OVERRUN_EXCEPTION();
-		} else {
-			val = (DWORD)-1;
-			OVERRUN_EXCEPTION();
-		}
-	} else {
-		val = (DWORD)-1;
-		OVERRUN_EXCEPTION();
-	}
-	return val;
-}
-
-WORD MEMCALL
-cpu_memoryread_w(DWORD address)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-	WORD val;
-
-	if (adr < LOWMEM - 1) {
-		val = __i286_memoryread_w(adr);
-	} else if (adr < LOWMEM) {
-		val = __i286_memoryread(adr);
-		val |= (WORD)cpumem[0] << 8;
-	} else if (extmem_size > 0) {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 1) {
-			val = LOADINTELWORD(cpumem + adr);
-		} else if (adr == extmem_size - 1) {
-			val = 0xff00 | cpumem[adr];
-			OVERRUN_EXCEPTION();
-		} else {
-			val = (WORD)-1;
-			OVERRUN_EXCEPTION();
-		}
-	} else {
-		val = (WORD)-1;
-		OVERRUN_EXCEPTION();
-	}
-	return val;
-}
-
-BYTE MEMCALL
-cpu_memoryread(DWORD address)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-	BYTE val;
-
-	if (adr < LOWMEM) {
-		val = __i286_memoryread(adr);
-	} else if (extmem_size > 0) {
-		adr -= LOWMEM;
-		if (adr < extmem_size) {
-			val = cpumem[adr];
-		} else {
-			val = (BYTE)-1;
-			OVERRUN_EXCEPTION();
-		}
-	} else {
-		val = (BYTE)-1;
-		OVERRUN_EXCEPTION();
-	}
-	return val;
-}