--- np2/i386c/ia32/cpu_mem.c	2004/01/23 14:33:26	1.6
+++ np2/i386c/ia32/cpu_mem.c	2005/03/09 17:12:34	1.20
@@ -1,7 +1,7 @@
-/*	$Id: cpu_mem.c,v 1.6 2004/01/23 14:33:26 monaka Exp $	*/
+/*	$Id: cpu_mem.c,v 1.20 2005/03/09 17:12:34 yui 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
@@ -31,54 +31,14 @@
 #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
  */
 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 */
@@ -92,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);
+		}
+		if (uplimit - offset < length - 1) {
+			VERBOSE(("cpu_memoryread_check: uplimit(%08x) - offset(%08x) < length(%08x) - 1", uplimit, offset, length));
 			EXCEPTION(e, 0);
-			break;
 		}
+		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 */
@@ -156,315 +116,346 @@ 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);
-			break;
 		}
+		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;
+
+	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)
+void
+cpu_stack_push_check(UINT16 s, descriptor_t *sd, UINT32 esp, UINT length)
 {
-	DWORD limit;
+	UINT32 limit;
 
-	if (!CPU_STAT_PM)
-		return TRUE;
+	if (CPU_STAT_PM) {
+		if (!sd->valid || !sd->p) {
+			VERBOSE(("cpu_stack_push_check: valid = %d, present = %d", sd->valid, sd->p));
+			EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+		}
+		if (!sd->s || sd->u.seg.c || !sd->u.seg.wr) {
+			VERBOSE(("cpu_stack_push_check: s = %d, c = %d, wr", sd->s, sd->u.seg.c, sd->u.seg.wr));
+			EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+		}
 
-	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))
-			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->d) {
+			limit = 0xffff;
+		} else {
+			limit = 0xffffffff;
+		}
+		if (sd->u.seg.ec) {
+			/* expand-down stack */
+			if ((esp == 0)
+			 || (esp < length)
+			 || (esp - length <= sd->u.seg.limit)
+			 || (esp > limit)) {
+				VERBOSE(("cpu_stack_push_check: expand-down, esp = %08x, length = %08x", esp, length));
+				VERBOSE(("cpu_stack_push_check: limit = %08x, seglimit = %08x", limit, sd->u.seg.limit));
+				VERBOSE(("cpu_stack_push_check: segbase = %08x, segend = %08x", sd->u.seg.segbase, sd->u.seg.segend));
+				EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+			}
 		} else {
-			if ((esp < length)
-			 || (esp - 1 > sdp->u.seg.limit))
-				return FALSE;
+			/* expand-up stack */
+			if (esp == 0) {
+				if ((sd->d && (sd->u.seg.segend != 0xffffffff))
+				 || (!sd->d && (sd->u.seg.segend != 0xffff))) {
+					VERBOSE(("cpu_stack_push_check: expand-up, esp = %08x, length = %08x", esp, length));
+					VERBOSE(("cpu_stack_push_check: limit = %08x, seglimit = %08x", limit, sd->u.seg.limit));
+					VERBOSE(("cpu_stack_push_check: segbase = %08x, segend = %08x", sd->u.seg.segbase, sd->u.seg.segend));
+					EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+				}
+			} else {
+				if ((esp < length)
+				 || (esp - 1 > sd->u.seg.limit)) {
+					VERBOSE(("cpu_stack_push_check: expand-up, esp = %08x, length = %08x", esp, length));
+					VERBOSE(("cpu_stack_push_check: limit = %08x, seglimit = %08x", limit, sd->u.seg.limit));
+					VERBOSE(("cpu_stack_push_check: segbase = %08x, segend = %08x", sd->u.seg.segbase, sd->u.seg.segend));
+					EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+				}
+			}
 		}
 	}
-	return TRUE;
 }
 
-BOOL
-cpu_stack_pop_check(descriptor_t* sdp, DWORD esp, DWORD length)
+void
+cpu_stack_pop_check(UINT16 s, 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 (CPU_STAT_PM) {
+		if (!sd->valid || !sd->p) {
+			VERBOSE(("cpu_stack_pop_check: valid = %d, present = %d", sd->valid, sd->p));
+			EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+		}
+		if (!sd->s || sd->u.seg.c || !sd->u.seg.wr) {
+			VERBOSE(("cpu_stack_pop_check: s = %d, c = %d, wr", sd->s, sd->u.seg.c, sd->u.seg.wr));
+			EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+		}
 
-	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))
-			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))
-			return FALSE;
+		if (!sd->d) {
+			limit = 0xffff;
+		} else {
+			limit = 0xffffffff;
+		}
+		if (sd->u.seg.ec) {
+			/* expand-down stack */
+			if ((esp == limit)
+			 || ((limit - esp) + 1 < length)) {
+				VERBOSE(("cpu_stack_pop_check: expand-up, esp = %08x, length = %08x", esp, length));
+				VERBOSE(("cpu_stack_pop_check: limit = %08x, seglimit = %08x", limit, sd->u.seg.limit));
+				VERBOSE(("cpu_stack_pop_check: segbase = %08x, segend = %08x", sd->u.seg.segbase, sd->u.seg.segend));
+				EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+			}
+		} else {
+			/* expand-up stack */
+			if ((esp == limit)
+			 || (sd->u.seg.segend == 0)
+			 || (esp > sd->u.seg.limit)
+			 || ((sd->u.seg.limit - esp) + 1 < length)) {
+				VERBOSE(("cpu_stack_pop_check: expand-up, esp = %08x, length = %08x", esp, length));
+				VERBOSE(("cpu_stack_pop_check: limit = %08x, seglimit = %08x", limit, sd->u.seg.limit));
+				VERBOSE(("cpu_stack_pop_check: segbase = %08x, segend = %08x", sd->u.seg.segbase, sd->u.seg.segend));
+				EXCEPTION(SS_EXCEPTION, s & 0xfffc);
+			}
+		}
 	}
-	return TRUE;
 }
 
+#if defined(IA32_SUPPORT_DEBUG_REGISTER)
+INLINE static void
+check_memory_break_point(UINT32 address, UINT length, UINT rw)
+{
+	int i;
 
-#define	AS32_NOCHECK
-#undef	OVERRUN_CHECK
+	if (CPU_STAT_BP && !(CPU_EFLAG & RF_FLAG)) {
+		for (i = 0; i < CPU_DEBUG_REG_INDEX_NUM; i++) {
+			if ((CPU_STAT_BP & (1 << i))
+			 && (CPU_DR7_GET_RW(i) & rw)
 
-#if defined(OVERRUN_CHECK)
-#define	OVERRUN_EXCEPTION()	EXCEPTION(GP_EXCEPTION, 0)
+			 && ((address <= CPU_DR(i) && address + length > CPU_DR(i))
+			  || (address > CPU_DR(i) && address < CPU_DR(i) + CPU_DR7_GET_LEN(i)))) {
+				CPU_STAT_BP_EVENT |= CPU_STAT_BP_EVENT_B(i);
+			}
+		}
+	}
+}
 #else
-#define	OVERRUN_EXCEPTION()
+#define	check_memory_break_point(address, length, rw)
 #endif
 
+
 /*
  * code fetch
  */
-BYTE MEMCALL
-cpu_codefetch(DWORD offset)
+#define	ucrw	(CPU_PAGE_READ_CODE | CPU_STAT_USER_MODE)
+
+UINT8 MEMCALL
+cpu_codefetch(UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
+#if defined(IA32_SUPPORT_TLB)
+	TLB_ENTRY_T *ep;
+#endif
 
 	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)
+		addr = sd->u.seg.segbase + offset;
+		if (!CPU_STAT_PAGING)
 			return cpu_memoryread(addr);
-		return cpu_lcmemoryread(addr);
+#if defined(IA32_SUPPORT_TLB)
+		ep = tlb_lookup(addr, ucrw);
+		if (ep != NULL && ep->memp != NULL) {
+			return ep->memp[addr & 0xfff];
+		}
+#endif
+		return cpu_linear_memory_read_b(addr, ucrw);
 	}
 	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_TLB)
+	TLB_ENTRY_T *ep;
+	UINT16 value;
+#endif
 
 	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)
+		addr = sd->u.seg.segbase + offset;
+		if (!CPU_STAT_PAGING)
 			return cpu_memoryread_w(addr);
-		return cpu_lcmemoryread_w(addr);
+#if defined(IA32_SUPPORT_TLB)
+		ep = tlb_lookup(addr, ucrw);
+		if (ep != NULL && ep->memp != NULL) {
+			if ((addr + 1) & 0x00000fff) {
+				return LOADINTELWORD(ep->memp + (addr & 0xfff));
+			}
+			value = ep->memp[0xfff];
+			ep = tlb_lookup(addr + 1, ucrw);
+			if (ep != NULL && ep->memp != NULL) {
+				value += (UINT16)ep->memp[0] << 8;
+				return value;
+			}
+		}
+#endif
+		return cpu_linear_memory_read_w(addr, ucrw);
 	}
 	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_TLB)
+	TLB_ENTRY_T *ep[2];
+	UINT32 value;
+	UINT remain;
+#endif
 
 	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)
+		addr = sd->u.seg.segbase + offset;
+		if (!CPU_STAT_PAGING)
 			return cpu_memoryread_d(addr);
-		return cpu_lcmemoryread_d(addr);
+#if defined(IA32_SUPPORT_TLB)
+		ep[0] = tlb_lookup(addr, ucrw);
+		if (ep[0] != NULL && ep[0]->memp != NULL) {
+			remain = 0x1000 - (addr & 0xfff);
+			if (remain >= 4) {
+				return LOADINTELDWORD(ep[0]->memp + (addr & 0xfff));
+			}
+			ep[1] = tlb_lookup(addr + remain, ucrw);
+			if (ep[1] != NULL && ep[1]->memp != NULL) {
+				switch (remain) {
+				case 3:
+					value = ep[0]->memp[0xffd];
+					value += (UINT32)LOADINTELWORD(ep[0]->memp + 0xffe) << 8;
+					value += (UINT32)ep[1]->memp[0] << 24;
+					break;
+
+				case 2:
+					value = LOADINTELWORD(ep[0]->memp + 0xffe);
+					value += (UINT32)LOADINTELWORD(ep[1]->memp + 0) << 16;
+					break;
+
+				case 1:
+					value = ep[0]->memp[0xfff];
+					value += (UINT32)LOADINTELWORD(ep[1]->memp + 0) << 8;
+					value += (UINT32)ep[1]->memp[2] << 24;
+					break;
+
+				default:
+					ia32_panic("cpu_codefetch_d(): out of range. (remain = %d)\n", remain);
+					return (UINT32)-1;
+				}
+				return value;
+			}
+		}
+#endif
+		return cpu_linear_memory_read_d(addr, ucrw);
 	}
 	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 offset)
+UINT64 MEMCALL
+cpu_memoryread_q(UINT32 address)
 {
-	descriptor_t *sd;
-	DWORD addr;
-	int exc;
+	UINT64 value;
 
-	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
+	value = cpu_memoryread_d(address);
+	value += (UINT64)cpu_memoryread_d(address + 4) << 32;
 
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		exc = GP_EXCEPTION;
-		goto err;
-	}
+	return value;
+}
 
-#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);
-	} else {
-		switch (sd->type) {
-		case 4: case 5: case 6: case 7:
-			if (offset <= sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
-			break;
+REG80 MEMCALL
+cpu_memoryread_f(UINT32 address)
+{
+	REG80 value;
+	UINT i;
 
-		default:
-			if (offset > sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
-			break;
-		}
+	for (i = 0; i < sizeof(REG80); ++i) {
+		value.b[i] = cpu_memoryread(address + i);
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
-	if (!CPU_STAT_PM)
-		return cpu_memoryread(addr);
-	return cpu_lmemoryread(addr);
-
-err:
-	EXCEPTION(exc, 0);
-	return 0;	/* compiler happy */
+	return value;
 }
 
-WORD MEMCALL
-cpu_vmemoryread_w(int idx, DWORD offset)
+void MEMCALL
+cpu_memorywrite_q(UINT32 address, UINT64 value)
 {
-	descriptor_t *sd;
-	DWORD addr;
-	int exc;
 
-	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
+	cpu_memorywrite_d(address, (UINT32)value);
+	cpu_memorywrite_d(address + 4, (UINT32)(value >> 32));
+}
 
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		exc = GP_EXCEPTION;
-		goto err;
-	}
+void MEMCALL
+cpu_memorywrite_f(UINT32 address, const REG80 *value)
+{
+	UINT i;
 
-#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);
-	} else {
-		switch (sd->type) {
-		case 4: case 5: case 6: case 7:
-			if (offset - 1 <= sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
-			break;
+	for (i = 0; i < sizeof(REG80); ++i) {
+		cpu_memorywrite(address + i, value->b[i]);
+	}
+}
 
-		default:
-			if (offset > sd->u.seg.limit - 1) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
-			break;
-		}
-	} 
-	addr = CPU_STAT_SREGBASE(idx) + offset;
-	if (!CPU_STAT_PM)
-		return cpu_memoryread_w(addr);
-	return cpu_lmemoryread_w(addr);
+/*
+ * virtual address memory access functions
+ */
+#include "cpu_mem.mcr"
 
-err:
-	EXCEPTION(exc, 0);
-	return 0;	/* compiler happy */
-}
+VIRTUAL_ADDRESS_MEMORY_ACCESS_FUNCTION(b, UINT8, 1)
+VIRTUAL_ADDRESS_MEMORY_ACCESS_FUNCTION(w, UINT16, 2)
+VIRTUAL_ADDRESS_MEMORY_ACCESS_FUNCTION(d, UINT32, 4)
 
-DWORD MEMCALL
-cpu_vmemoryread_d(int idx, DWORD offset)
+UINT64 MEMCALL
+cpu_vmemoryread_q(int idx, UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -475,52 +466,45 @@ 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,
+		cpu_memoryread_check(sd, offset, 8,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
 	} else {
 		switch (sd->type) {
 		case 4: case 5: case 6: case 7:
-			if (offset - 3 <= sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+			if (offset - (8 - 1) <= sd->u.seg.limit)
+				goto range_failure;
 			break;
 
 		default:
-			if (offset > sd->u.seg.limit - 3) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+			if (offset > sd->u.seg.limit - (8 - 1))
+				goto range_failure;
 			break;
 		}
+	} 
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 8, CPU_DR7_RW_RO);
+	if (!CPU_STAT_PAGING)
+		return cpu_memoryread_q(addr);
+	return cpu_linear_memory_read_q(addr, CPU_PAGE_READ_DATA | CPU_STAT_USER_MODE);
+
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
+	} else {
+		exc = GP_EXCEPTION;
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
-	if (!CPU_STAT_PM)
-		return cpu_memoryread_d(addr);
-	return cpu_lmemoryread_d(addr);
-
+	VERBOSE(("cpu_vmemoryread_q: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
 err:
 	EXCEPTION(exc, 0);
 	return 0;	/* compiler happy */
 }
 
-/* vaddr memory write */
 void MEMCALL
-cpu_vmemorywrite(int idx, DWORD offset, BYTE val)
+cpu_vmemorywrite_q(int idx, UINT32 offset, UINT64 value)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -531,55 +515,47 @@ 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,
+		cpu_memorywrite_check(sd, offset, 8,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
 	} else {
 		switch (sd->type) {
 		case 6: case 7:
-			if (offset <= sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+			if (offset - (8 - 1) <= sd->u.seg.limit)
+				goto range_failure;
 			break;
 
 		default:
-			if (offset > sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+			if (offset > sd->u.seg.limit - (8 - 1))
+				goto range_failure;
 			break;
 		}
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
-	if (!CPU_STAT_PM) {
-		/* real mode */
-		cpu_memorywrite(addr, val);
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 8, CPU_DR7_RW_RW);
+	if (!CPU_STAT_PAGING) {
+		cpu_memorywrite_q(addr, value);
 	} else {
-		/* protected mode */
-		cpu_lmemorywrite(addr, val);
+		cpu_linear_memory_write_q(addr, value, CPU_PAGE_WRITE_DATA | CPU_STAT_USER_MODE);
 	}
 	return;
 
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
+	} else {
+		exc = GP_EXCEPTION;
+	}
+	VERBOSE(("cpu_vmemorywrite_q: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
 err:
 	EXCEPTION(exc, 0);
 }
 
-void MEMCALL
-cpu_vmemorywrite_w(int idx, DWORD offset, WORD val)
+REG80 MEMCALL
+cpu_vmemoryread_f(int idx, UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -590,55 +566,49 @@ 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,
+	if (!(sd->flag & CPU_DESC_FLAG_READABLE)) {
+		cpu_memoryread_check(sd, offset, 10,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
 	} else {
 		switch (sd->type) {
-		case 6: case 7:
-			if (offset - 1 <= sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+		case 4: case 5: case 6: case 7:
+			if (offset - (10 - 1) <= sd->u.seg.limit)
+				goto range_failure;
 			break;
 
 		default:
-			if (offset > sd->u.seg.limit - 1) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+			if (offset > sd->u.seg.limit - (10 - 1))
+				goto range_failure;
 			break;
 		}
-	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
-	if (!CPU_STAT_PM) {
-		/* real mode */
-		cpu_memorywrite_w(addr, val);
+	} 
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 10, CPU_DR7_RW_RO);
+	if (!CPU_STAT_PAGING)
+		return cpu_memoryread_f(addr);
+	return cpu_linear_memory_read_f(addr, CPU_PAGE_READ_DATA | CPU_STAT_USER_MODE);
+
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
 	} else {
-		/* protected mode */
-		cpu_lmemorywrite_w(addr, val);
+		exc = GP_EXCEPTION;
 	}
-	return;
-
+	VERBOSE(("cpu_vmemoryread_f: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
 err:
 	EXCEPTION(exc, 0);
+	{
+		REG80 dummy;
+		memset(&dummy, 0, sizeof(dummy));
+		return dummy;	/* compiler happy */
+	}
 }
 
 void MEMCALL
-cpu_vmemorywrite_d(int idx, DWORD offset, DWORD val)
+cpu_vmemorywrite_f(int idx, UINT32 offset, const REG80 *value)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
@@ -649,327 +619,38 @@ 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,
+		cpu_memorywrite_check(sd, offset, 10,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
 	} else {
 		switch (sd->type) {
 		case 6: case 7:
-			if (offset - 3 <= sd->u.seg.limit) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+			if (offset - (10 - 1) <= sd->u.seg.limit)
+				goto range_failure;
 			break;
 
 		default:
-			if (offset > sd->u.seg.limit - 3) {
-				if (idx == CPU_SS_INDEX)
-					exc = SS_EXCEPTION;
-				else
-					exc = GP_EXCEPTION;
-				goto err;
-			}
+			if (offset > sd->u.seg.limit - (10 - 1))
+				goto range_failure;
 			break;
 		}
 	}
-	addr = CPU_STAT_SREGBASE(idx) + offset;
-	if (!CPU_STAT_PM) {
-		/* real mode */
-		cpu_memorywrite_d(addr, val);
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 10, CPU_DR7_RW_RW);
+	if (!CPU_STAT_PAGING) {
+		cpu_memorywrite_f(addr, value);
 	} else {
-		/* protected mode */
-		cpu_lmemorywrite_d(addr, val);
+		cpu_linear_memory_write_f(addr, value, CPU_PAGE_WRITE_DATA | 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();
-		}
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_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();
+		exc = GP_EXCEPTION;
 	}
-	return val;
+	VERBOSE(("cpu_vmemorywrite_f: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
+err:
+	EXCEPTION(exc, 0);
 }