--- np2/i386c/ia32/cpu_mem.c	2004/01/07 14:49:10	1.4
+++ np2/i386c/ia32/cpu_mem.c	2012/01/08 18:49:31	1.32
@@ -1,7 +1,5 @@
-/*	$Id: cpu_mem.c,v 1.4 2004/01/07 14:49:10 monaka Exp $	*/
-
 /*
- * Copyright (c) 2002-2003 NONAKA Kimihiro
+ * Copyright (c) 2002-2004 NONAKA Kimihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,590 +27,609 @@
 #include "cpu.h"
 #include "memory.h"
 
-// ¤¢¤È¤Ç¡Ä
-// extern DWORD cpumem_addrmask;		// -> CPU_STAT_ADRSMASK
-
-BYTE *cpumem = 0;
-DWORD extmem_size = 0;
-BYTE protectmem_size = 0;
 
 /*
- * initialize 1MB-16MB memory
+ * memory access check
  */
-
-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;
+static int MEMCALL check_limit_upstairs(descriptor_t *sdp, UINT32 offset, UINT len);
+static void MEMCALL cpu_memoryread_check(descriptor_t *sdp, UINT32 offset, UINT len, int e);
+static void MEMCALL cpu_memorywrite_check(descriptor_t *sdp, UINT32 offset, UINT len, int e);
+
+static int MEMCALL
+check_limit_upstairs(descriptor_t *sdp, UINT32 offset, UINT len)
+{
+	UINT32 limit;
+	UINT32 end;
+
+	__ASSERT(sdp != NULL);
+	__ASSERT(len > 0);
+
+	len--;
+	end = offset + len;
+	limit = SEG_IS_32BIT(sdp) ? 0xffffffff : 0x0000ffff;
+
+	if (SEG_IS_DATA(sdp) && SEG_IS_EXPANDDOWN_DATA(sdp)) {
+		/* expand-down data segment */
+		if (sdp->u.seg.limit == 0) {
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |       |   |       |
+			 * |       |   +  [1]  + 0000FFFFh
+			 * | valid |   |       |
+			 * |       |   +-------+ 0000FFFFh - len -1
+			 * |       |   | valid |
+			 * +-------+   +-------+ 00000000h
+			 */
+			if (!SEG_IS_32BIT(sdp)) {
+				if ((len > limit)		/* len check */
+				 || (end > limit)) {		/* [1] */
+					goto exc;
+				}
+			} else {
+				sdp->flag |= CPU_DESC_FLAG_WHOLEADR;
+			}
+		} else {
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |  [2]  |   |       |
+			 * +-------+   +.......+ FFFFFFFFh - len - 1
+			 * |       |   |  [2]  |
+			 * |       |   +.......+ 0000FFFFh
+			 * | valid |   |       |
+			 * |       |   +-------+ 0000FFFFh - len - 1
+			 * |       |   | valid |
+			 * +-------+   +-------+ seg.limit
+			 * |  [1]  |   |  [1]  |
+			 * +-------+   +-------+ 00000000h
+			 */
+			if ((len > limit - sdp->u.seg.limit)	/* len check */
+			 || (end < offset)			/* wrap check */
+			 || (offset < sdp->u.seg.limit) 	/* [1] */
+			 || (end > limit)) {			/* [2] */
+				goto exc;
+			}
 		}
-		if (size <= LOWMEM - 0x100000) {
-			extmem_size = 0;
-			cpumem = 0;
+	} else {
+		/* expand-up data or code segment */
+		if (sdp->u.seg.limit == limit) {
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |       |   |       |
+			 * |       |   +  [1]  + 0000FFFFh
+			 * | valid |   |       |
+			 * |       |   +-------+ 0000FFFFh - len - 1
+			 * |       |   | valid |
+			 * +-------+   +-------+ 00000000h
+			 */
+			if (!SEG_IS_32BIT(sdp)) {
+				if ((len > limit)		/* len check */
+				 || (offset + len > limit)) {	/* [1] */
+					goto exc;
+				}
+			} else {
+				sdp->flag |= CPU_DESC_FLAG_WHOLEADR;
+			}
 		} else {
-			extmem_size = size - (LOWMEM - 0x100000);
-			cpumem = (BYTE *)malloc(extmem_size);
-			if (cpumem == NULL) {
-				protectmem_size = 0;
-				return FAILURE;
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |       |   |       |
+			 * |       |   +.......+ 0000FFFFh
+			 * |  [1]  |   |  [1]  |
+			 * +.......+   +.......+ seg.limit
+			 * |       |   |       |
+			 * +-------+   +-------+ seg.limit - len - 1
+			 * | valid |   | valid |
+			 * +-------+   +-------+ 00000000h
+			 */
+			if ((len > sdp->u.seg.limit)		/* len check */
+			 || (end < offset)			/* wrap check */
+			 || (end > sdp->u.seg.limit + 1)) {	/* [1] */
+				goto exc;
 			}
-			memset(cpumem, 0, extmem_size);
 		}
 	}
-	protectmem_size = usemem;
-	return SUCCESS;
-}
+	return 1;	/* Ok! */
 
+exc:
+	VERBOSE(("check_limit_upstairs: check failure: offset = 0x%08x, len = %d", offset, len + 1));
+#if defined(DEBUG)
+	segdesc_dump(sdp);
+#endif
+	return 0;
+}
 
-/*
- * memory access check
- */
-void
-cpu_memoryread_check(descriptor_t* sd, DWORD madr, DWORD length, int e)
+static void MEMCALL
+cpu_memoryread_check(descriptor_t *sdp, UINT32 offset, UINT len, int e)
 {
 
-	if (CPU_STAT_PM) {
-		/* invalid */
-		if (!sd->valid) {
-			EXCEPTION(GP_EXCEPTION, 0);
-		}
-
-		/* not present */
-		if (!sd->p) {
-			EXCEPTION(e, 0);
-		}
+	__ASSERT(sdp != NULL);
+	__ASSERT(len > 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 ((madr > sd->u.seg.segend - length + 1)
-			    || (length - 1 > sd->u.seg.limit)) {
-				EXCEPTION(e, 0);
-			}
-			break;
+	if (!SEG_IS_VALID(sdp)) {
+		e = GP_EXCEPTION;
+		goto exc;
+	}
+	if (!SEG_IS_PRESENT(sdp)
+	 || SEG_IS_SYSTEM(sdp)
+	 || (SEG_IS_CODE(sdp) && !SEG_IS_READABLE_CODE(sdp))) {
+		goto exc;
+	}
 
-		case 4:  case 5:	/* ro (expand down) */
-		case 6:  case 7:	/* rw (expand down) */
-		{
-			DWORD uplimit = sd->d ? 0xffffffff : 0x0000ffff;
-			if ((madr <= sd->u.seg.segend)
-			    || (madr > uplimit)
-			    || (uplimit - madr < length - 1)) {
-				EXCEPTION(e, 0);
-			}
-		}
-			break;
+	switch (sdp->type) {
+	case 0:	 case 1:	/* ro */
+	case 2:  case 3:	/* rw */
+	case 4:  case 5:	/* ro (expand down) */
+	case 6:  case 7:	/* rw (expand down) */
+	case 10: case 11:	/* rx */
+	case 14: case 15:	/* rxc */
+		if (!check_limit_upstairs(sdp, offset, len))
+			goto exc;
+		break;
 
-		default:
-			EXCEPTION(e, 0);
-			break;
-		}
+	default:
+		goto exc;
 	}
-	sd->flag |= CPU_DESC_READABLE;
+	sdp->flag |= CPU_DESC_FLAG_READABLE;
+	return;
+
+exc:
+	VERBOSE(("cpu_memoryread_check: check failure: offset = 0x%08x, len = %d", offset, len));
+#if defined(DEBUG)
+	segdesc_dump(sdp);
+#endif
+	EXCEPTION(e, 0);
 }
 
-void
-cpu_memorywrite_check(descriptor_t* sd, DWORD madr, DWORD length, int e)
+static void MEMCALL
+cpu_memorywrite_check(descriptor_t *sdp, UINT32 offset, UINT len, int e)
 {
 
-	if (CPU_STAT_PM) {
-		/* invalid */
-		if (!sd->valid) {
-			EXCEPTION(GP_EXCEPTION, 0);
-		}
+	__ASSERT(sdp != NULL);
+	__ASSERT(len > 0);
 
-		/* not present */
-		if (!sd->p) {
-			EXCEPTION(e, 0);
-		}
-
-		switch (sd->type) {
-		case 2: case 3:	/* rw */
-			if ((madr > sd->u.seg.segend - length + 1)
-			    || (length - 1 > sd->u.seg.limit)) {
-				EXCEPTION(e, 0);
-			}
-			break;
+	if (!SEG_IS_VALID(sdp)) {
+		e = GP_EXCEPTION;
+		goto exc;
+	}
+	if (!SEG_IS_PRESENT(sdp)
+	 || SEG_IS_SYSTEM(sdp)
+	 || SEG_IS_CODE(sdp)
+	 || (SEG_IS_DATA(sdp) && !SEG_IS_WRITABLE_DATA(sdp))) {
+		goto exc;
+	}
 
-		case 6: case 7:	/* rw (expand down) */
-		{
-			DWORD uplimit = sd->d ? 0xffffffff : 0x0000ffff;
-			if ((madr <= sd->u.seg.segend)
-			    || (madr > uplimit)
-			    || (uplimit - madr < length - 1)) {
-				EXCEPTION(e, 0);
-			}
-		}
-			break;
+	switch (sdp->type) {
+	case 2: case 3:	/* rw */
+	case 6: case 7:	/* rw (expand down) */
+		if (!check_limit_upstairs(sdp, offset, len))
+			goto exc;
+		break;
 
-		default:
-			EXCEPTION(e, 0);
-			break;
-		}
+	default:
+		goto exc;
 	}
-	sd->flag |= CPU_DESC_WRITABLE;
+	sdp->flag |= CPU_DESC_FLAG_WRITABLE | CPU_DESC_FLAG_READABLE;
+	return;
+
+exc:
+	VERBOSE(("cpu_memorywrite_check: check failure: offset = 0x%08x, len = %d", offset, len));
+#if defined(DEBUG)
+	segdesc_dump(sdp);
+#endif
+	EXCEPTION(e, 0);
 }
 
-BOOL
-cpu_stack_push_check(descriptor_t* sdp, DWORD esp, DWORD length)
+void MEMCALL
+cpu_stack_push_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len)
 {
+	UINT32 limit;
+	UINT32 start;
 
-	if (!CPU_STAT_PM)
-		return TRUE;
+	__ASSERT(sdp != NULL);
+	__ASSERT(len > 0);
 
-	if (!sdp->valid || !sdp->p)
-		return FALSE;
-#ifdef _DEBUG
-	if (!sdp->s || sdp->u.seg.c || !sdp->u.seg.wr)
-		return FALSE;
-#endif
+	len--;
+
+	if (!SEG_IS_VALID(sdp)
+	 || !SEG_IS_PRESENT(sdp)
+	 || SEG_IS_SYSTEM(sdp)
+	 || SEG_IS_CODE(sdp)
+	 || !SEG_IS_WRITABLE_DATA(sdp)) {
+		goto exc;
+	}
+
+	start = sp - len;
+	limit = SEG_IS_32BIT(sdp) ? 0xffffffff : 0x0000ffff;
 
-	if (!sdp->d)
-		esp &= 0xffff;
-	if (sdp->u.seg.ec) {
-		DWORD limit = (sdp->d) ? 0xffffffff : 0xffff;
-		if ((esp == 0)
-		 || (esp < length)
-		 || (esp - length <= sdp->u.seg.segend)
-		 || (esp > limit))
-			return FALSE;
+	if (SEG_IS_EXPANDDOWN_DATA(sdp)) {
+		/* expand-down stack */
+		if (!SEG_IS_32BIT(sdp)) {
+			if (sp > limit) {			/* [*] */
+				goto exc;
+			}
+		}
+		if (sdp->u.seg.limit == 0) {
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |       |   |  [*]  |
+			 * |       |   +-------+ 0000FFFFh
+			 * | valid |   |       |
+			 * |       |   | valid |
+			 * |       |   |       |
+			 * +-------+   +-------+ 00000000h
+			 */
+			if (!SEG_IS_32BIT(sdp)) {
+				if (sp > limit) {		/* [1] */
+					goto exc;
+				}
+			} else {
+				sdp->flag |= CPU_DESC_FLAG_WHOLEADR;
+			}
+		} else {
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |       |   |  [*]  |
+			 * | valid |   +-------+ 0000FFFFh
+			 * |       |   | valid |
+			 * +-------+   +-------+ seg.limit + len - 1
+			 * |       |   |       |
+			 * +..[1]..+   +..[1]..+ seg.limit
+			 * |       |   |       |
+			 * +-------+   +-------+ 00000000h
+			 */
+			if ((len > limit - sdp->u.seg.limit)	/* len check */
+			 || (start > sp)			/* wrap check */
+			 || (start < sdp->u.seg.limit)) {	/* [1] */
+				goto exc;
+			}
+		}
 	} 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 (sdp->u.seg.limit == limit) {
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |       |   |  [1]  |
+			 * |       |   +-------+ 0000FFFFh
+			 * | valid |   |       |
+			 * |       |   | valid |
+			 * |       |   |       |
+			 * +-------+   +-------+ 00000000h
+			 */
+			if (!SEG_IS_32BIT(sdp)) {
+				if (sp > limit) {		/* [1] */
+					goto exc;
+				}
+			} else {
+				sdp->flag |= CPU_DESC_FLAG_WHOLEADR;
+			}
 		} else {
-			if ((esp < length)
-			 || (esp - 1 > sdp->u.seg.segend))
-				return FALSE;
+			/*
+			 *   32bit       16bit
+			 * +-------+   +-------+ FFFFFFFFh
+			 * |       |   |       |
+			 * |  [1]  |   +  [1]  + 0000FFFFh
+			 * |       |   |       |
+			 * +-------+   +-------+ seg.limit
+			 * | valid |   | valid |
+			 * +.......+   +.......+ len - 1
+			 * |  [+]  |   |  [+]  |
+			 * +-------+   +-------+ 00000000h
+			 *
+			 * [+]: wrap check
+			 */
+			if ((len > sdp->u.seg.limit)		/* len check */
+			 || (start > sp)			/* wrap check */
+			 || (sp > sdp->u.seg.limit + 1)) {	/* [1] */
+				goto exc;
+			}
 		}
 	}
-	return TRUE;
+	return;
+
+exc:
+	VERBOSE(("cpu_stack_push_check: check failure: selector = 0x%04x, sp = 0x%08x, len = %d", s, sp, len));
+#if defined(DEBUG)
+	segdesc_dump(sdp);
+#endif
+	EXCEPTION(SS_EXCEPTION, s & 0xfffc);
 }
 
-BOOL
-cpu_stack_pop_check(descriptor_t* sdp, DWORD esp, DWORD length)
+void MEMCALL
+cpu_stack_pop_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len)
 {
-	DWORD limit;
 
-	if (!CPU_STAT_PM)
-		return TRUE;
-
-	if (!sdp->valid || !sdp->p)
-		return FALSE;
-#ifdef _DEBUG
-	if (!sdp->s || sdp->u.seg.c || !sdp->u.seg.wr)
-		return FALSE;
-#endif
+	__ASSERT(sdp != NULL);
+	__ASSERT(len > 0);
 
-	if (!sdp->d) {
-		esp &= 0xffff;
-		limit = 0xffff;
-	} else {
-		limit = 0xffffffff;
+	if (!SEG_IS_VALID(sdp)
+	 || !SEG_IS_PRESENT(sdp)
+	 || SEG_IS_SYSTEM(sdp)
+	 || SEG_IS_CODE(sdp)
+	 || !SEG_IS_WRITABLE_DATA(sdp)) {
+		goto exc;
 	}
-	if (sdp->u.seg.ec) {
-		if ((esp == limit)
-		 || ((limit  - esp) + 1 < length))
-			return FALSE;
-	} else {
-		/* expand-up stack */
-		if ((esp == limit)
-		 || (sdp->u.seg.segend == 0)
-		 || (esp > sdp->u.seg.segend)
-		 || ((sdp->u.seg.segend - esp) + 1 < length))
-			return FALSE;
-	}
-	return TRUE;
+
+	if (!check_limit_upstairs(sdp, sp, len))
+		goto exc;
+	return;
+
+exc:
+	VERBOSE(("cpu_stack_pop_check: check failure: selector = 0x%04x, sp = 0x%08x, len = %d", s, sp, len));
+#if defined(DEBUG)
+	segdesc_dump(sdp);
+#endif
+	EXCEPTION(SS_EXCEPTION, s & 0xfffc);
 }
 
 
 /*
  * code fetch
  */
-BYTE MEMCALL
-cpu_codefetch(DWORD madr)
+UINT8 MEMCALL
+cpu_codefetch(UINT32 offset)
 {
-	descriptor_t *sd;
-	DWORD addr;
+	const int ucrw = CPU_PAGE_READ_CODE | CPU_STAT_USER_MODE;
+	descriptor_t *sdp;
+	UINT32 addr;
+
+	sdp = &CPU_CS_DESC;
+	addr = sdp->u.seg.segbase + offset;
+
+	if (!CPU_STAT_PM)
+		return cpu_memoryread(addr);
+	if (offset <= sdp->u.seg.limit)
+		return cpu_lmemoryread(addr, ucrw);
 
-	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	if (madr <= sd->u.seg.segend) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + madr;
-		if (!CPU_STAT_PM)
-			return cpu_memoryread(addr);
-		return cpu_lcmemoryread(addr);
-	}
 	EXCEPTION(GP_EXCEPTION, 0);
 	return 0;	/* compiler happy */
 }
 
-WORD MEMCALL
-cpu_codefetch_w(DWORD madr)
+UINT16 MEMCALL
+cpu_codefetch_w(UINT32 offset)
 {
-	descriptor_t *sd;
-	DWORD addr;
+	const int ucrw = CPU_PAGE_READ_CODE | CPU_STAT_USER_MODE;
+	descriptor_t *sdp;
+	UINT32 addr;
+
+	sdp = &CPU_CS_DESC;
+	addr = sdp->u.seg.segbase + offset;
+
+	if (!CPU_STAT_PM)
+		return cpu_memoryread_w(addr);
+	if (offset <= sdp->u.seg.limit - 1)
+		return cpu_lmemoryread_w(addr, ucrw);
 
-	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	if (madr <= sd->u.seg.segend - 1) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + madr;
-		if (!CPU_STAT_PM)
-			return cpu_memoryread_w(addr);
-		return cpu_lcmemoryread_w(addr);
-	}
 	EXCEPTION(GP_EXCEPTION, 0);
 	return 0;	/* compiler happy */
 }
 
-DWORD MEMCALL
-cpu_codefetch_d(DWORD madr)
+UINT32 MEMCALL
+cpu_codefetch_d(UINT32 offset)
 {
-	descriptor_t *sd;
-	DWORD addr;
+	const int ucrw = CPU_PAGE_READ_CODE | CPU_STAT_USER_MODE;
+	descriptor_t *sdp;
+	UINT32 addr;
+
+	sdp = &CPU_CS_DESC;
+	addr = sdp->u.seg.segbase + offset;
+
+	if (!CPU_STAT_PM)
+		return cpu_memoryread_d(addr);
+
+	if (offset <= sdp->u.seg.limit - 3)
+		return cpu_lmemoryread_d(addr, ucrw);
 
-	sd = &CPU_STAT_SREG(CPU_CS_INDEX);
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	if (madr <= sd->u.seg.segend - 3) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + madr;
-		if (!CPU_STAT_PM)
-			return cpu_memoryread_d(addr);
-		return cpu_lcmemoryread_d(addr);
-	}
 	EXCEPTION(GP_EXCEPTION, 0);
 	return 0;	/* compiler happy */
 }
 
-
 /*
- * virtual address -> linear address
+ * additional physical address memory access functions
  */
-BYTE MEMCALL
-cpu_vmemoryread(int idx, DWORD madr)
+UINT64 MEMCALL
+cpu_memoryread_q(UINT32 paddr)
 {
-	descriptor_t *sd;
-	DWORD addr;
-
-	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
+	UINT64 value;
 
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
-	}
+	value = cpu_memoryread_d(paddr);
+	value += (UINT64)cpu_memoryread_d(paddr + 4) << 32;
 
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	for (;;) {
-		if ((sd->flag & CPU_DESC_READABLE)
-		    || (madr <= sd->u.seg.segend)) {
-			addr = CPU_STAT_SREGBASE(idx) + madr;
-			if (!CPU_STAT_PM)
-				return cpu_memoryread(addr);
-			return cpu_lmemoryread(addr);
-		}
-		cpu_memoryread_check(sd, madr, 1,
-		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
-	}
-	/*NOTREACHED*/
+	return value;
 }
 
-WORD MEMCALL
-cpu_vmemoryread_w(int idx, DWORD madr)
+void MEMCALL
+cpu_memorywrite_q(UINT32 paddr, UINT64 value)
 {
-	descriptor_t *sd;
-	DWORD addr;
-
-	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
-
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
-	}
 
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	for (;;) {
-		if ((sd->flag & CPU_DESC_READABLE)
-		    || (madr <= sd->u.seg.segend - 1)) {
-			addr = CPU_STAT_SREGBASE(idx) + madr;
-			if (!CPU_STAT_PM)
-				return cpu_memoryread_w(addr);
-			return cpu_lmemoryread_w(addr);
-		}
-		cpu_memoryread_check(sd, madr, 2,
-		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
-	}
-	/*NOTREACHED*/
+	cpu_memorywrite_d(paddr, (UINT32)value);
+	cpu_memorywrite_d(paddr + 4, (UINT32)(value >> 32));
 }
 
-DWORD MEMCALL
-cpu_vmemoryread_d(int idx, DWORD madr)
+REG80 MEMCALL
+cpu_memoryread_f(UINT32 paddr)
 {
-	descriptor_t *sd;
-	DWORD addr;
-
-	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
-
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
-	}
+	REG80 value;
+	int i;
 
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	for (;;) {
-		if ((sd->flag & CPU_DESC_READABLE)
-		    || (madr <= sd->u.seg.segend - 3)) {
-			addr = CPU_STAT_SREGBASE(idx) + madr;
-			if (!CPU_STAT_PM)
-				return cpu_memoryread_d(addr);
-			return cpu_lmemoryread_d(addr);
-		}
-		cpu_memoryread_check(sd, madr, 4,
-		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
+	for (i = 0; i < (int)sizeof(REG80); ++i) {
+		value.b[i] = cpu_memoryread(paddr + i);
 	}
-	/*NOTREACHED*/
+	return value;
 }
 
-/* vaddr memory write */
 void MEMCALL
-cpu_vmemorywrite(int idx, DWORD madr, BYTE val)
+cpu_memorywrite_f(UINT32 paddr, const REG80 *value)
 {
-	descriptor_t *sd;
-	DWORD addr;
-
-	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
-
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
-	}
+	int i;
 
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	for (;;) {
-		if ((sd->flag & CPU_DESC_WRITABLE)
-		    || (madr <= sd->u.seg.segend)) {
-			addr = CPU_STAT_SREGBASE(idx) + madr;
-			if (!CPU_STAT_PM) {
-				/* real mode */
-				cpu_memorywrite(addr, val);
-			} else {
-				/* protected mode */
-				cpu_lmemorywrite(addr, val);
-			}
-			return;
-		}
-		cpu_memorywrite_check(sd, madr, 1,
-		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
+	for (i = 0; i < (int)sizeof(REG80); ++i) {
+		cpu_memorywrite(paddr + i, value->b[i]);
 	}
-	/*NOTREACHED*/
 }
 
-void MEMCALL
-cpu_vmemorywrite_w(int idx, DWORD madr, WORD val)
+/*
+ * virtual address memory access functions
+ */
+#define	CHOOSE_EXCEPTION(sreg) \
+	(((sreg) == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION)
+
+#include "cpu_mem.mcr"
+
+VIRTUAL_ADDRESS_MEMORY_ACCESS_FUNCTION(b, UINT8, 1)
+VIRTUAL_ADDRESS_MEMORY_ACCESS_FUNCTION(w, UINT16, 2)
+VIRTUAL_ADDRESS_MEMORY_ACCESS_FUNCTION(d, UINT32, 4)
+
+UINT64 MEMCALL
+cpu_vmemoryread_q(int idx, UINT32 offset)
 {
-	descriptor_t *sd;
-	DWORD addr;
+	descriptor_t *sdp;
+	UINT32 addr;
+	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
 
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
-	}
+	sdp = &CPU_STAT_SREG(idx);
+	addr = sdp->u.seg.segbase + offset;
 
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	for (;;) {
-		if ((sd->flag & CPU_DESC_WRITABLE)
-		    || (madr <= sd->u.seg.segend - 1)) {
-			addr = CPU_STAT_SREGBASE(idx) + madr;
-			if (!CPU_STAT_PM) {
-				/* real mode */
-				cpu_memorywrite_w(addr, val);
-			} else {
-				/* protected mode */
-				cpu_lmemorywrite_w(addr, val);
-			}
-			return;
-		}
-		cpu_memorywrite_check(sd, madr, 2,
-		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
-	}
-	/*NOTREACHED*/
+	if (!CPU_STAT_PM)
+		return cpu_memoryread_q(addr);
+
+	if (!SEG_IS_VALID(sdp)) {
+		exc = GP_EXCEPTION;
+		goto err;
+	}
+	if (!(sdp->flag & CPU_DESC_FLAG_READABLE)) {
+		cpu_memoryread_check(sdp, offset, 8, CHOOSE_EXCEPTION(idx));
+	} else if (!(sdp->flag & CPU_DESC_FLAG_WHOLEADR)) {
+		if (!check_limit_upstairs(sdp, offset, 8))
+			goto range_failure;
+	} 
+	return cpu_lmemoryread_q(addr, CPU_PAGE_READ_DATA | CPU_STAT_USER_MODE);
+
+range_failure:
+	VERBOSE(("cpu_vmemoryread_q: type = %d, offset = %08x, limit = %08x", sdp->type, offset, sdp->u.seg.limit));
+	exc = CHOOSE_EXCEPTION(idx);
+err:
+	EXCEPTION(exc, 0);
+	return 0;	/* compiler happy */
 }
 
 void MEMCALL
-cpu_vmemorywrite_d(int idx, DWORD madr, DWORD val)
+cpu_vmemorywrite_q(int idx, UINT32 offset, UINT64 value)
 {
-	descriptor_t *sd;
-	DWORD addr;
+	descriptor_t *sdp;
+	UINT32 addr;
+	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
 
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
-	}
+	sdp = &CPU_STAT_SREG(idx);
+	addr = sdp->u.seg.segbase + offset;
 
-	if (!CPU_INST_AS32)
-		madr &= 0xffff;
-	for (;;) {
-		if ((sd->flag & CPU_DESC_WRITABLE)
-		    || (madr <= sd->u.seg.segend - 3)) {
-			addr = CPU_STAT_SREGBASE(idx) + madr;
-			if (!CPU_STAT_PM) {
-				/* real mode */
-				cpu_memorywrite_d(addr, val);
-			} else {
-				/* protected mode */
-				cpu_lmemorywrite_d(addr, val);
-			}
-			return;
-		}
-		cpu_memorywrite_check(sd, madr, 4,
-		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
+	if (!CPU_STAT_PM) {
+		cpu_memorywrite_q(addr, value);
+		return;
 	}
-	/*NOTREACHED*/
-}
 
-/*
- * physical address memory function
- */
-void MEMCALL
-cpu_memorywrite_d(DWORD address, DWORD value)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-
-	if (adr < LOWMEM - 3) {
-		__i286_memorywrite_d(adr, value);
-	} else if (adr < LOWMEM) {
-		cpu_memorywrite_w(adr, value & 0xffff);
-		cpu_memorywrite_w(adr + 2, (value >> 16) & 0xffff);
-	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 3) {
-			STOREINTELDWORD(cpumem + adr, value);
-		} else if (adr < extmem_size) {
-			cpu_memorywrite_w(adr, value & 0xffff);
-			cpu_memorywrite_w(adr + 2, (value >> 16) & 0xffff);
-		}
+	if (!SEG_IS_VALID(sdp)) {
+		exc = GP_EXCEPTION;
+		goto err;
 	}
-}
-
-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 {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 1) {
-			STOREINTELWORD(cpumem + adr, value);
-		} else if (adr == extmem_size - 1) {
-			cpumem[adr] = value & 0xff;
-		}
+	if (!(sdp->flag & CPU_DESC_FLAG_WRITABLE)) {
+		cpu_memorywrite_check(sdp, offset, 8, CHOOSE_EXCEPTION(idx));
+	} else if (!(sdp->flag & CPU_DESC_FLAG_WHOLEADR)) {
+		if (!check_limit_upstairs(sdp, offset, 8))
+			goto range_failure;
 	}
+	cpu_lmemorywrite_q(addr, value, CPU_PAGE_WRITE_DATA | CPU_STAT_USER_MODE);
+	return;
+
+range_failure:
+	VERBOSE(("cpu_vmemorywrite_q: type = %d, offset = %08x, limit = %08x", sdp->type, offset, sdp->u.seg.limit));
+	exc = CHOOSE_EXCEPTION(idx);
+err:
+	EXCEPTION(exc, 0);
 }
 
-void MEMCALL
-cpu_memorywrite(DWORD address, BYTE value)
+REG80 MEMCALL
+cpu_vmemoryread_f(int idx, UINT32 offset)
 {
-	DWORD adr = address & CPU_STAT_ADRSMASK;
+	descriptor_t *sdp;
+	UINT32 addr;
+	int exc;
 
-	if (adr < LOWMEM) {
-		__i286_memorywrite(adr, value);
-	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size) {
-			cpumem[adr] = value;
-		}
-	}
-}
+	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
 
-DWORD MEMCALL
-cpu_memoryread_d(DWORD address)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-	DWORD val;
+	sdp = &CPU_STAT_SREG(idx);
+	addr = sdp->u.seg.segbase + offset;
 
-	if (adr < LOWMEM - 3) {
-		val = __i286_memoryread_d(adr);
-	} else if (adr < LOWMEM) {
-		val = cpu_memoryread_w(adr);
-		val |= (DWORD)cpu_memoryread_w(adr + 2) << 16;
-	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 3) {
-			val = LOADINTELDWORD(cpumem + adr);
-		} else {
-			val = cpu_memoryread_w(adr);
-			val |= (DWORD)cpu_memoryread_w(adr + 2) << 16;
-		}
+	if (!CPU_STAT_PM)
+		return cpu_memoryread_f(addr);
+
+	if (!SEG_IS_VALID(sdp)) {
+		exc = GP_EXCEPTION;
+		goto err;
+	}
+	if (!(sdp->flag & CPU_DESC_FLAG_READABLE)) {
+		cpu_memoryread_check(sdp, offset, 10, CHOOSE_EXCEPTION(idx));
+	} else if (!(sdp->flag & CPU_DESC_FLAG_WHOLEADR)) {
+		if (!check_limit_upstairs(sdp, offset, 10))
+			goto range_failure;
+	} 
+	return cpu_lmemoryread_f(addr, CPU_PAGE_READ_DATA | CPU_STAT_USER_MODE);
+
+range_failure:
+	VERBOSE(("cpu_vmemoryread_f: type = %d, offset = %08x, limit = %08x", sdp->type, offset, sdp->u.seg.limit));
+	exc = CHOOSE_EXCEPTION(idx);
+err:
+	EXCEPTION(exc, 0);
+	{
+		REG80 dummy;
+		memset(&dummy, 0, sizeof(dummy));
+		return dummy;	/* compiler happy */
 	}
-	return val;
 }
 
-WORD MEMCALL
-cpu_memoryread_w(DWORD address)
+void MEMCALL
+cpu_vmemorywrite_f(int idx, UINT32 offset, const REG80 *value)
 {
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-	WORD val;
+	descriptor_t *sdp;
+	UINT32 addr;
+	int exc;
 
-	if (adr < LOWMEM - 1) {
-		val = __i286_memoryread_w(adr);
-	} else if (adr < LOWMEM) {
-		val = cpu_memoryread(adr);
-		val |= (WORD)cpumem[adr - (LOWMEM - 1)] << 8;
-	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 1) {
-			val = LOADINTELWORD(cpumem + adr);
-		} else if (adr == extmem_size - 1) {
-			val = 0xff00 | cpumem[adr];
-		} else {
-			val = (WORD)-1;
-		}
-	}
-	return val;
-}
+	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
 
-BYTE MEMCALL
-cpu_memoryread(DWORD address)
-{
-	DWORD adr = address & CPU_STAT_ADRSMASK;
-	BYTE val;
+	sdp = &CPU_STAT_SREG(idx);
+	addr = sdp->u.seg.segbase + offset;
 
-	if (adr < LOWMEM) {
-		val = __i286_memoryread(adr);
-	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size) {
-			val = cpumem[adr];
-		} else {
-			val = (BYTE)-1;
-		}
-	}
-	return val;
+	if (!CPU_STAT_PM) {
+		cpu_memorywrite_f(addr, value);
+		return;
+	}
+
+	if (!SEG_IS_VALID(sdp)) {
+		exc = GP_EXCEPTION;
+		goto err;
+	}
+	if (!(sdp->flag & CPU_DESC_FLAG_WRITABLE)) {
+		cpu_memorywrite_check(sdp, offset, 10, CHOOSE_EXCEPTION(idx));
+	} else if (!(sdp->flag & CPU_DESC_FLAG_WHOLEADR)) {
+		if (!check_limit_upstairs(sdp, offset, 10))
+			goto range_failure;
+	}
+	cpu_lmemorywrite_f(addr, value, CPU_PAGE_WRITE_DATA | CPU_STAT_USER_MODE);
+	return;
+
+range_failure:
+	VERBOSE(("cpu_vmemorywrite_f: type = %d, offset = %08x, limit = %08x", sdp->type, offset, sdp->u.seg.limit));
+	exc = CHOOSE_EXCEPTION(idx);
+err:
+	EXCEPTION(exc, 0);
 }