--- np2/i386c/ia32/cpu_mem.c	2004/01/27 15:54:45	1.8
+++ np2/i386c/ia32/cpu_mem.c	2004/03/05 14:17:35	1.12
@@ -1,4 +1,4 @@
-/*	$Id: cpu_mem.c,v 1.8 2004/01/27 15:54:45 monaka Exp $	*/
+/*	$Id: cpu_mem.c,v 1.12 2004/03/05 14:17:35 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -31,50 +31,14 @@
 #include "cpu.h"
 #include "memory.h"
 
-#define	cpumem		i386core.e.ext
-#define	extmem_size	i386core.e.extsize
-
-
-/*
- * initialize 1MB-16MB memory
- */
-
-int
-init_cpumem(UINT8 usemem)
-{
-	UINT32	size;
-
-	size = usemem << 20;
-	if (size >= (LOWMEM - 0x100000)) {
-		size -= (LOWMEM - 0x100000);
-	}
-	else {
-		size = 0;
-	}
-	if (extmem_size != size) {
-		if (cpumem) {
-			free(cpumem);
-			cpumem = 0;
-		}
-		if (size) {
-			cpumem = (BYTE *)malloc(size);
-			if (cpumem == NULL) {
-				size = 0;
-			}
-		}
-		extmem_size = size;
-	}
-	return SUCCESS;
-}
-
 
 /*
  * memory access check
  */
 void
-cpu_memoryread_check(descriptor_t* sd, DWORD offset, DWORD length, int e)
+cpu_memoryread_check(descriptor_t *sd, UINT32 offset, UINT length, int e)
 {
-	DWORD uplimit;
+	UINT32 uplimit;
 
 	if (CPU_STAT_PM) {
 		/* invalid */
@@ -88,52 +52,52 @@ cpu_memoryread_check(descriptor_t* sd, D
 			VERBOSE(("cpu_memoryread_check: not present"));
 			EXCEPTION(e, 0);
 		}
+	}
 
-		switch (sd->type) {
-		case 0:	 case 1:	/* ro */
-		case 2:  case 3:	/* rw */
-		case 10: case 11:	/* rx */
-		case 14: case 15:	/* rxc */
-			if (offset > sd->u.seg.limit - length + 1) {
-				VERBOSE(("cpu_memoryread_check: offset(%08x) > sd->u.seg.limit(%08x) - length(%08x) + 1", offset, sd->u.seg.limit, length));
-				EXCEPTION(e, 0);
-			}
-			if (length - 1 > sd->u.seg.limit) {
-				VERBOSE(("cpu_memoryread_check: length(%08x) - 1 > sd->u.seg.limit(%08x)", length, sd->u.seg.limit));
-				EXCEPTION(e, 0);
-			}
-			break;
-
-		case 4:  case 5:	/* ro (expand down) */
-		case 6:  case 7:	/* rw (expand down) */
-			uplimit = sd->d ? 0xffffffff : 0x0000ffff;
-			if (offset <= sd->u.seg.limit) {
-				VERBOSE(("cpu_memoryread_check: offset(%08x) <= sd->u.seg.limit(%08x)", offset, sd->u.seg.limit));
-				EXCEPTION(e, 0);
-			}
-			if (offset > uplimit) {
-				VERBOSE(("cpu_memoryread_check: offset(%08x) > uplimit(%08x)", offset, uplimit));
-				EXCEPTION(e, 0);
-			}
-			if (uplimit - offset < length - 1) {
-				VERBOSE(("cpu_memoryread_check: uplimit(%08x) - offset(%08x) < length(%08x) - 1", uplimit, offset, length));
-				EXCEPTION(e, 0);
-			}
-			break;
+	switch (sd->type) {
+	case 0:	 case 1:	/* ro */
+	case 2:  case 3:	/* rw */
+	case 10: case 11:	/* rx */
+	case 14: case 15:	/* rxc */
+		if (offset > sd->u.seg.limit - length + 1) {
+			VERBOSE(("cpu_memoryread_check: offset(%08x) > sd->u.seg.limit(%08x) - length(%08x) + 1", offset, sd->u.seg.limit, length));
+			EXCEPTION(e, 0);
+		}
+		if (length - 1 > sd->u.seg.limit) {
+			VERBOSE(("cpu_memoryread_check: length(%08x) - 1 > sd->u.seg.limit(%08x)", length, sd->u.seg.limit));
+			EXCEPTION(e, 0);
+		}
+		break;
 
-		default:
-			VERBOSE(("cpu_memoryread_check: invalid type (type = %d)", sd->type));
+	case 4:  case 5:	/* ro (expand down) */
+	case 6:  case 7:	/* rw (expand down) */
+		uplimit = sd->d ? 0xffffffff : 0x0000ffff;
+		if (offset <= sd->u.seg.limit) {
+			VERBOSE(("cpu_memoryread_check: offset(%08x) <= sd->u.seg.limit(%08x)", offset, sd->u.seg.limit));
+			EXCEPTION(e, 0);
+		}
+		if (offset > uplimit) {
+			VERBOSE(("cpu_memoryread_check: offset(%08x) > uplimit(%08x)", offset, uplimit));
 			EXCEPTION(e, 0);
-			break;
 		}
+		if (uplimit - offset < length - 1) {
+			VERBOSE(("cpu_memoryread_check: uplimit(%08x) - offset(%08x) < length(%08x) - 1", uplimit, offset, length));
+			EXCEPTION(e, 0);
+		}
+		break;
+
+	default:
+		VERBOSE(("cpu_memoryread_check: invalid type (type = %d)", sd->type));
+		EXCEPTION(e, 0);
+		break;
 	}
 	sd->flag |= CPU_DESC_FLAG_READABLE;
 }
 
 void
-cpu_memorywrite_check(descriptor_t* sd, DWORD offset, DWORD length, int e)
+cpu_memorywrite_check(descriptor_t *sd, UINT32 offset, UINT length, int e)
 {
-	DWORD uplimit;
+	UINT32 uplimit;
 
 	if (CPU_STAT_PM) {
 		/* invalid */
@@ -152,178 +116,290 @@ cpu_memorywrite_check(descriptor_t* sd, 
 			VERBOSE(("cpu_memorywrite_check: system segment"));
 			EXCEPTION(e, 0);
 		}
+	}
 
-		switch (sd->type) {
-		case 2: case 3:	/* rw */
-			if (offset > sd->u.seg.limit - length + 1) {
-				VERBOSE(("cpu_memorywrite_check: offset(%08x) > sd->u.seg.limit(%08x) - length(%08x) + 1", offset, sd->u.seg.limit, length));
-				EXCEPTION(e, 0);
-			}
-			if (length - 1 > sd->u.seg.limit) {
-				VERBOSE(("cpu_memorywrite_check: length(%08x) - 1 > sd->u.seg.limit(%08x)", length, sd->u.seg.limit));
-				EXCEPTION(e, 0);
-			}
-			break;
-
-		case 6: case 7:	/* rw (expand down) */
-			uplimit = sd->d ? 0xffffffff : 0x0000ffff;
-			if (offset <= sd->u.seg.limit) {
-				VERBOSE(("cpu_memorywrite_check: offset(%08x) <= sd->u.seg.limit(%08x)", offset, sd->u.seg.limit));
-				EXCEPTION(e, 0);
-			}
-			if (offset > uplimit) {
-				VERBOSE(("cpu_memorywrite_check: offset(%08x) > uplimit(%08x)", offset, uplimit));
-				EXCEPTION(e, 0);
-			}
-			if (uplimit - offset < length - 1) {
-				VERBOSE(("cpu_memorywrite_check: uplimit(%08x) - offset(%08x) < length(%08x) - 1", uplimit, offset, length));
-				EXCEPTION(e, 0);
-			}
-			break;
+	switch (sd->type) {
+	case 2: case 3:	/* rw */
+		if (offset > sd->u.seg.limit - length + 1) {
+			VERBOSE(("cpu_memorywrite_check: offset(%08x) > sd->u.seg.limit(%08x) - length(%08x) + 1", offset, sd->u.seg.limit, length));
+			EXCEPTION(e, 0);
+		}
+		if (length - 1 > sd->u.seg.limit) {
+			VERBOSE(("cpu_memorywrite_check: length(%08x) - 1 > sd->u.seg.limit(%08x)", length, sd->u.seg.limit));
+			EXCEPTION(e, 0);
+		}
+		break;
 
-		default:
-			VERBOSE(("cpu_memorywrite_check: invalid type (type = %d)", sd->type));
+	case 6: case 7:	/* rw (expand down) */
+		uplimit = sd->d ? 0xffffffff : 0x0000ffff;
+		if (offset <= sd->u.seg.limit) {
+			VERBOSE(("cpu_memorywrite_check: offset(%08x) <= sd->u.seg.limit(%08x)", offset, sd->u.seg.limit));
+			EXCEPTION(e, 0);
+		}
+		if (offset > uplimit) {
+			VERBOSE(("cpu_memorywrite_check: offset(%08x) > uplimit(%08x)", offset, uplimit));
 			EXCEPTION(e, 0);
-			break;
 		}
+		if (uplimit - offset < length - 1) {
+			VERBOSE(("cpu_memorywrite_check: uplimit(%08x) - offset(%08x) < length(%08x) - 1", uplimit, offset, length));
+			EXCEPTION(e, 0);
+		}
+		break;
+
+	default:
+		VERBOSE(("cpu_memorywrite_check: invalid type (type = %d)", sd->type));
+		EXCEPTION(e, 0);
+		break;
 	}
 	sd->flag |= CPU_DESC_FLAG_WRITABLE;
 }
 
 BOOL
-cpu_stack_push_check(descriptor_t* sdp, DWORD esp, DWORD length)
+cpu_stack_push_check(descriptor_t *sd, UINT32 esp, UINT length)
 {
-	DWORD limit;
+	UINT32 limit;
 
-	if (!CPU_STAT_PM)
-		return TRUE;
-
-	if (!sdp->valid || !sdp->p)
-		return FALSE;
-	if (!sdp->s || sdp->u.seg.c || !sdp->u.seg.wr)
-		return FALSE;
-
-	if (!sdp->d) {
-		esp &= 0xffff;
-		limit = 0xffff;
-	} else {
-		limit = 0xffffffff;
-	}
-	if (sdp->u.seg.ec) {
-		/* expand-down stack */
-		if ((esp == 0)
-		 || (esp < length)
-		 || (esp - length <= sdp->u.seg.limit)
-		 || (esp > limit))
+	if (CPU_STAT_PM) {
+		if (!sd->valid || !sd->p)
 			return FALSE;
-	} else {
-		/* expand-up stack */
-		if (esp == 0) {
-			if ((sdp->d && (sdp->u.seg.segend != 0xffffffff))
-			 || (!sdp->d && (sdp->u.seg.segend != 0xffff)))
-				return FALSE;
+		if (!sd->s || sd->u.seg.c || !sd->u.seg.wr)
+			return FALSE;
+
+		if (!sd->d) {
+			esp &= 0xffff;
+			limit = 0xffff;
 		} else {
-			if ((esp < length)
-			 || (esp - 1 > sdp->u.seg.limit))
+			limit = 0xffffffff;
+		}
+		if (sd->u.seg.ec) {
+			/* expand-down stack */
+			if ((esp == 0)
+			 || (esp < length)
+			 || (esp - length <= sd->u.seg.limit)
+			 || (esp > limit))
 				return FALSE;
+		} else {
+			/* expand-up stack */
+			if (esp == 0) {
+				if ((sd->d && (sd->u.seg.segend != 0xffffffff))
+				 || (!sd->d && (sd->u.seg.segend != 0xffff)))
+					return FALSE;
+			} else {
+				if ((esp < length)
+				 || (esp - 1 > sd->u.seg.limit))
+					return FALSE;
+			}
 		}
 	}
 	return TRUE;
 }
 
 BOOL
-cpu_stack_pop_check(descriptor_t* sdp, DWORD esp, DWORD length)
+cpu_stack_pop_check(descriptor_t *sd, UINT32 esp, UINT length)
 {
-	DWORD limit;
-
-	if (!CPU_STAT_PM)
-		return TRUE;
+	UINT32 limit;
 
-	if (!sdp->valid || !sdp->p)
-		return FALSE;
-	if (!sdp->s || sdp->u.seg.c || !sdp->u.seg.wr)
-		return FALSE;
-
-	if (!sdp->d) {
-		esp &= 0xffff;
-		limit = 0xffff;
-	} else {
-		limit = 0xffffffff;
-	}
-	if (sdp->u.seg.ec) {
-		/* expand-down stack */
-		if ((esp == limit)
-		 || ((limit - esp) + 1 < length))
+	if (CPU_STAT_PM) {
+		if (!sd->valid || !sd->p)
 			return FALSE;
-	} else {
-		/* expand-up stack */
-		if ((esp == limit)
-		 || (sdp->u.seg.segend == 0)
-		 || (esp > sdp->u.seg.limit)
-		 || ((sdp->u.seg.limit - esp) + 1 < length))
+		if (!sd->s || sd->u.seg.c || !sd->u.seg.wr)
 			return FALSE;
+
+		if (!sd->d) {
+			esp &= 0xffff;
+			limit = 0xffff;
+		} else {
+			limit = 0xffffffff;
+		}
+		if (sd->u.seg.ec) {
+			/* expand-down stack */
+			if ((esp == limit)
+			 || ((limit - esp) + 1 < length))
+				return FALSE;
+		} else {
+			/* expand-up stack */
+			if ((esp == limit)
+			 || (sd->u.seg.segend == 0)
+			 || (esp > sd->u.seg.limit)
+			 || ((sd->u.seg.limit - esp) + 1 < length))
+				return FALSE;
+		}
 	}
 	return TRUE;
 }
 
 
-#undef	OVERRUN_CHECK
+#if defined(IA32_SUPPORT_PREFETCH_QUEUE)
+/*
+ * code prefetch
+ */
+#define	CPU_PREFETCHQ_MASK	(CPU_PREFETCH_QUEUE_LENGTH - 1)
 
-#if defined(OVERRUN_CHECK)
-#define	OVERRUN_EXCEPTION()	EXCEPTION(GP_EXCEPTION, 0)
-#else
-#define	OVERRUN_EXCEPTION()
-#endif
+INLINE static MEMCALL void
+cpu_prefetch(UINT32 address)
+{
+	UINT offset = address & CPU_PREFETCHQ_MASK;
+	UINT length = CPU_PREFETCH_QUEUE_LENGTH - offset;
+
+	cpu_memory_access_la_region(address, length, CPU_PAGE_READ_CODE, CPU_STAT_USER_MODE, CPU_PREFETCHQ + offset);
+	CPU_PREFETCHQ_REMAIN = length;
+}
+
+INLINE static MEMCALL UINT8
+cpu_prefetchq(UINT32 address)
+{
+	UINT8 v;
+
+	CPU_PREFETCHQ_REMAIN--;
+	v = CPU_PREFETCHQ[address & CPU_PREFETCHQ_MASK];
+	return v;
+}
+
+INLINE static MEMCALL UINT16
+cpu_prefetchq_w(UINT32 address)
+{
+	BYTE *p;
+	UINT16 v;
+
+	CPU_PREFETCHQ_REMAIN -= 2;
+	p = CPU_PREFETCHQ + (address & CPU_PREFETCHQ_MASK);
+	v = LOADINTELWORD(p);
+	return v;
+}
+
+INLINE static MEMCALL UINT32
+cpu_prefetchq_3(UINT32 address)
+{
+	BYTE *p;
+	UINT32 v;
+
+	CPU_PREFETCHQ_REMAIN -= 3;
+	p = CPU_PREFETCHQ + (address & CPU_PREFETCHQ_MASK);
+	v = LOADINTELWORD(p);
+	v += (UINT32)*p << 16;
+	return v;
+}
+
+INLINE static MEMCALL UINT32
+cpu_prefetchq_d(UINT32 address)
+{
+	BYTE *p;
+	UINT32 v;
+
+	CPU_PREFETCHQ_REMAIN -= 4;
+	p = CPU_PREFETCHQ + (address & CPU_PREFETCHQ_MASK);
+	v = LOADINTELDWORD(p);
+	return v;
+}
+#endif	/* IA32_SUPPORT_PREFETCH_QUEUE */
 
 /*
  * code fetch
  */
-BYTE MEMCALL
-cpu_codefetch(DWORD offset)
+UINT8 MEMCALL
+cpu_codefetch(UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 
 	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
 	if (offset <= sd->u.seg.limit) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + offset;
+		addr = sd->u.seg.segbase + offset;
+#if defined(IA32_SUPPORT_PREFETCH_QUEUE)
+		if (CPU_PREFETCHQ_REMAIN == 0) {
+			cpu_prefetch(addr);
+		}
+		return cpu_prefetchq(addr);
+#else	/* IA32_SUPPORT_PREFETCH_QUEUE */
 		if (!CPU_STAT_PM)
 			return cpu_memoryread(addr);
 		return cpu_lcmemoryread(addr);
+#endif	/* IA32_SUPPORT_PREFETCH_QUEUE */
 	}
 	EXCEPTION(GP_EXCEPTION, 0);
 	return 0;	/* compiler happy */
 }
 
-WORD MEMCALL
-cpu_codefetch_w(DWORD offset)
+UINT16 MEMCALL
+cpu_codefetch_w(UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
+#if defined(IA32_SUPPORT_PREFETCH_QUEUE)
+	UINT16 v;
+#endif
 
 	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
 	if (offset <= sd->u.seg.limit - 1) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + offset;
+		addr = sd->u.seg.segbase + offset;
+#if defined(IA32_SUPPORT_PREFETCH_QUEUE)
+		if (CPU_PREFETCHQ_REMAIN == 0) {
+			cpu_prefetch(addr);
+		}
+		if (CPU_PREFETCHQ_REMAIN >= 2) {
+			return cpu_prefetchq_w(addr);
+		}
+
+		v = cpu_prefetchq(addr);
+		addr++;
+		cpu_prefetch(addr);
+		v |= cpu_prefetchq(addr) << 8;
+		return v;
+#else	/* IA32_SUPPORT_PREFETCH_QUEUE */
 		if (!CPU_STAT_PM)
 			return cpu_memoryread_w(addr);
 		return cpu_lcmemoryread_w(addr);
+#endif	/* IA32_SUPPORT_PREFETCH_QUEUE */
 	}
 	EXCEPTION(GP_EXCEPTION, 0);
 	return 0;	/* compiler happy */
 }
 
-DWORD MEMCALL
-cpu_codefetch_d(DWORD offset)
+UINT32 MEMCALL
+cpu_codefetch_d(UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
+#if defined(IA32_SUPPORT_PREFETCH_QUEUE)
+	UINT32 v;
+#endif
 
 	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
 	if (offset <= sd->u.seg.limit - 3) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + offset;
+		addr = sd->u.seg.segbase + offset;
+#if defined(IA32_SUPPORT_PREFETCH_QUEUE)
+		if (CPU_PREFETCHQ_REMAIN == 0) {
+			cpu_prefetch(addr);
+		}
+		if (CPU_PREFETCHQ_REMAIN >= 4) {
+			return cpu_prefetchq_d(addr);
+		} else {
+			switch (CPU_PREFETCHQ_REMAIN) {
+			case 1:
+				v = cpu_prefetchq(addr);
+				cpu_prefetch(addr + 1);
+				v += (UINT32)cpu_prefetchq_3(addr + 1) << 8;
+				break;
+
+			case 2:
+				v = cpu_prefetchq_w(addr);
+				cpu_prefetch(addr + 2);
+				v += (UINT32)cpu_prefetchq_w(addr + 2) << 16;
+				break;
+
+			case 3:
+				v = cpu_prefetchq_3(addr);
+				cpu_prefetch(addr + 3);
+				v += (UINT32)cpu_prefetchq(addr + 3) << 24;
+				break;
+			}
+			return v;
+		}
+#else	/* IA32_SUPPORT_PREFETCH_QUEUE */
 		if (!CPU_STAT_PM)
 			return cpu_memoryread_d(addr);
 		return cpu_lcmemoryread_d(addr);
+#endif	/* IA32_SUPPORT_PREFETCH_QUEUE */
 	}
 	EXCEPTION(GP_EXCEPTION, 0);
 	return 0;	/* compiler happy */
@@ -333,11 +409,11 @@ cpu_codefetch_d(DWORD offset)
 /*
  * virtual address -> linear address
  */
-BYTE MEMCALL
-cpu_vmemoryread(int idx, DWORD offset)
+UINT8 MEMCALL
+cpu_vmemoryread(int idx, UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -374,21 +450,21 @@ cpu_vmemoryread(int idx, DWORD offset)
 			break;
 		}
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
+	addr = sd->u.seg.segbase + 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);
 	return 0;	/* compiler happy */
 }
 
-WORD MEMCALL
-cpu_vmemoryread_w(int idx, DWORD offset)
+UINT16 MEMCALL
+cpu_vmemoryread_w(int idx, UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -425,21 +501,21 @@ cpu_vmemoryread_w(int idx, DWORD offset)
 			break;
 		}
 	} 
-	addr = CPU_STAT_SREGBASE(idx) + offset;
+	addr = sd->u.seg.segbase + 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);
 	return 0;	/* compiler happy */
 }
 
-DWORD MEMCALL
-cpu_vmemoryread_d(int idx, DWORD offset)
+UINT32 MEMCALL
+cpu_vmemoryread_d(int idx, UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -476,10 +552,10 @@ cpu_vmemoryread_d(int idx, DWORD offset)
 			break;
 		}
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
+	addr = sd->u.seg.segbase + 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);
@@ -488,10 +564,10 @@ err:
 
 /* vaddr memory write */
 void MEMCALL
-cpu_vmemorywrite(int idx, DWORD offset, BYTE val)
+cpu_vmemorywrite(int idx, UINT32 offset, UINT8 val)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -528,13 +604,13 @@ cpu_vmemorywrite(int idx, DWORD offset, 
 			break;
 		}
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
+	addr = sd->u.seg.segbase + offset;
 	if (!CPU_STAT_PM) {
 		/* real mode */
 		cpu_memorywrite(addr, val);
 	} else {
 		/* protected mode */
-		cpu_lmemorywrite(addr, val);
+		cpu_lmemorywrite(addr, val, CPU_STAT_USER_MODE);
 	}
 	return;
 
@@ -543,10 +619,10 @@ err:
 }
 
 void MEMCALL
-cpu_vmemorywrite_w(int idx, DWORD offset, WORD val)
+cpu_vmemorywrite_w(int idx, UINT32 offset, UINT16 val)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -583,13 +659,13 @@ cpu_vmemorywrite_w(int idx, DWORD offset
 			break;
 		}
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
+	addr = sd->u.seg.segbase + offset;
 	if (!CPU_STAT_PM) {
 		/* real mode */
 		cpu_memorywrite_w(addr, val);
 	} else {
 		/* protected mode */
-		cpu_lmemorywrite_w(addr, val);
+		cpu_lmemorywrite_w(addr, val, CPU_STAT_USER_MODE);
 	}
 	return;
 
@@ -598,10 +674,10 @@ err:
 }
 
 void MEMCALL
-cpu_vmemorywrite_d(int idx, DWORD offset, DWORD val)
+cpu_vmemorywrite_d(int idx, UINT32 offset, UINT32 val)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -638,324 +714,16 @@ cpu_vmemorywrite_d(int idx, DWORD offset
 			break;
 		}
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
+	addr = sd->u.seg.segbase + offset;
 	if (!CPU_STAT_PM) {
 		/* real mode */
 		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;
-				if (off >= extmem_size) {
-					OVERRUN_EXCEPTION();
-					break;
-				}
-				value >>= 8;
-				/*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;
-
-			switch (diff) {
-			default:
-				ia32_panic("cpu_memorywrite_d: diff(%d)", diff);
-				break;
-
-			case 3:
-				cpumem[adr] = value & 0xff;
-				value >>= 8;
-				adr++;
-				/*FALLTHROUGH*/
-			case 2:
-				cpumem[adr] = value & 0xff;
-				value >>= 8;
-				adr++;
-				/*FALLTHROUGH*/
-			case 1:
-				cpumem[adr] = 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);
-		if (extmem_size > 0) {
-			cpumem[0] = (value >> 8) & 0xff;
-		} else {
-			OVERRUN_EXCEPTION();
-		}
-	} 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;
-	int shift;
-
-	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 |= (DWORD)__i286_memoryread(adr + 2) << 16;
-			if (extmem_size > 0) {
-				val |= (DWORD)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 if (extmem_size > 0) {
-				val |= 0xff000000 | ((DWORD)cpumem[0] << 16);
-				OVERRUN_EXCEPTION();
-			} 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 if (extmem_size > 1) {
-				val |= ((DWORD)LOADINTELWORD(cpumem)) << 8;
-				val |= 0xff000000;
-				OVERRUN_EXCEPTION();
-			} else if (extmem_size > 0) {
-				val |= 0xffff0000 | ((DWORD)cpumem[0] << 8);
-				OVERRUN_EXCEPTION();
-			} 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;
-			shift = 0;
-
-			switch (diff) {
-			default:
-				ia32_panic("cpu_memoryread_d: diff(%d)", diff);
-				break;
-
-			case 3:
-				val |= (DWORD)cpumem[adr];
-				shift += 8;
-				adr++;
-				/*FALLTHROUGH*/
-			case 2:
-				val |= (DWORD)cpumem[adr] << shift;
-				shift += 8;
-				adr++;
-				/*FALLTHROUGH*/
-			case 1:
-				val |= (DWORD)cpumem[adr] << shift;
-				shift += 8;
-				break;
-			}
-			val |= ((DWORD)-1) << shift;
-			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);
-		if (extmem_size > 0) {
-			val |= (WORD)cpumem[0] << 8;
-		} else {
-			val |= 0xff00;
-			OVERRUN_EXCEPTION();
-		}
-	} 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;
-}