--- np2/i386c/ia32/cpu_mem.c	2003/12/11 15:03:16	1.2
+++ np2/i386c/ia32/cpu_mem.c	2004/03/12 13:34:08	1.14
@@ -1,4 +1,4 @@
-/*	$Id: cpu_mem.c,v 1.2 2003/12/11 15:03:16 monaka Exp $	*/
+/*	$Id: cpu_mem.c,v 1.14 2004/03/12 13:34:08 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -31,270 +31,424 @@
 #include "cpu.h"
 #include "memory.h"
 
-// ¤¢¤È¤Ç¡Ä
-extern DWORD cpumem_addrmask;
-
-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 madr, DWORD length, int e)
+cpu_memoryread_check(descriptor_t *sd, UINT32 offset, UINT length, int e)
 {
+	UINT32 uplimit;
 
 	if (CPU_STAT_PM) {
 		/* invalid */
 		if (!sd->valid) {
+			VERBOSE(("cpu_memoryread_check: invalid"));
 			EXCEPTION(GP_EXCEPTION, 0);
 		}
 
 		/* not present */
 		if (!sd->p) {
+			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 ((madr > sd->u.seg.segend - length + 1)
-			    || (length - 1 > sd->u.seg.limit)) {
-				EXCEPTION(e, 0);
-			}
-			break;
-
-		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);
-			}
+	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);
 		}
-			break;
+		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:
+	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_READABLE;
+	sd->flag |= CPU_DESC_FLAG_READABLE;
 }
 
 void
-cpu_memorywrite_check(descriptor_t* sd, DWORD madr, DWORD length, int e)
+cpu_memorywrite_check(descriptor_t *sd, UINT32 offset, UINT length, int e)
 {
+	UINT32 uplimit;
 
 	if (CPU_STAT_PM) {
 		/* invalid */
 		if (!sd->valid) {
+			VERBOSE(("cpu_memorywrite_check: invalid"));
 			EXCEPTION(GP_EXCEPTION, 0);
 		}
 
 		/* not present */
 		if (!sd->p) {
+			VERBOSE(("cpu_memorywrite_check: not present"));
 			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 (!sd->s) {
+			VERBOSE(("cpu_memorywrite_check: system segment"));
+			EXCEPTION(e, 0);
+		}
+	}
 
-		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);
-			}
+	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);
 		}
-			break;
+		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:
+	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_WRITABLE;
+	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)
 {
+	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;
-#ifdef _DEBUG
-	if (!sdp->s || sdp->u.seg.c || !sdp->u.seg.wr)
-		return FALSE;
-#endif
+		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 {
+			/* 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);
+				}
+			}
+		}
+	}
+}
 
-	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;
-	} else {
-		/* expand-up stack */
-		if (esp == 0) {
-			if ((sdp->d && (sdp->u.seg.segend != 0xffffffff))
-			 || (!sdp->d && (sdp->u.seg.segend != 0xffff)))
-				return FALSE;
+void
+cpu_stack_pop_check(UINT16 s, descriptor_t *sd, UINT32 esp, UINT length)
+{
+	UINT32 limit;
+
+	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 (!sd->d) {
+			limit = 0xffff;
 		} else {
-			if ((esp < length)
-			 || (esp - 1 > sdp->u.seg.segend))
-				return FALSE;
+			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;
 }
 
-BOOL
-cpu_stack_pop_check(descriptor_t* sdp, DWORD esp, DWORD length)
+
+#if defined(IA32_SUPPORT_PREFETCH_QUEUE)
+/*
+ * code prefetch
+ */
+#define	CPU_PREFETCHQ_MASK	(CPU_PREFETCH_QUEUE_LENGTH - 1)
+
+INLINE static MEMCALL void
+cpu_prefetch(UINT32 address)
 {
-	DWORD limit;
+	UINT offset = address & CPU_PREFETCHQ_MASK;
+	UINT length = CPU_PREFETCH_QUEUE_LENGTH - offset;
 
-	if (!CPU_STAT_PM)
-		return TRUE;
+	cpu_memory_access_la_region(address, length, CPU_PAGE_READ_CODE, CPU_STAT_USER_MODE, CPU_PREFETCHQ + offset);
+	CPU_PREFETCHQ_REMAIN = (SINT8)length;
+}
 
-	if (!sdp->valid || !sdp->p)
-		return FALSE;
-#ifdef _DEBUG
-	if (!sdp->s || sdp->u.seg.c || !sdp->u.seg.wr)
-		return FALSE;
-#endif
+INLINE static MEMCALL UINT8
+cpu_prefetchq(UINT32 address)
+{
+	UINT8 v;
 
-	if (!sdp->d) {
-		esp &= 0xffff;
-		limit = 0xffff;
-	} else {
-		limit = 0xffffffff;
-	}
-	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;
+	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[2]) << 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 */
+
+#if defined(IA32_SUPPORT_DEBUG_REGISTER)
+INLINE static void
+check_memory_break_point(UINT32 address, UINT length, UINT rw)
+{
+	int i;
+
+	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)
+
+			 && ((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	check_memory_break_point(address, length, rw)
+#endif
 
 /*
  * code fetch
  */
-BYTE MEMCALL
-cpu_codefetch(DWORD madr)
+UINT8 MEMCALL
+cpu_codefetch(UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
 
 	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 (offset <= sd->u.seg.limit) {
+		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 madr)
+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 (!CPU_INST_AS32)
-		madr &= 0xffff;
-	if (madr <= sd->u.seg.segend - 1) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + madr;
+	if (offset <= sd->u.seg.limit - 1) {
+		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 += (UINT16)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 madr)
+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 (!CPU_INST_AS32)
-		madr &= 0xffff;
-	if (madr <= sd->u.seg.segend - 3) {
-		addr = CPU_STAT_SREGBASE(CPU_CS_INDEX) + madr;
+	if (offset <= sd->u.seg.limit - 3) {
+		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);
+				addr++;
+				cpu_prefetch(addr);
+				v += (UINT32)cpu_prefetchq_3(addr) << 8;
+				break;
+
+			case 2:
+				v = cpu_prefetchq_w(addr);
+				addr += 2;
+				cpu_prefetch(addr);
+				v += (UINT32)cpu_prefetchq_w(addr) << 16;
+				break;
+
+			case 3:
+				v = cpu_prefetchq_3(addr);
+				addr += 3;
+				cpu_prefetch(addr);
+				v += (UINT32)cpu_prefetchq(addr) << 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 */
@@ -304,318 +458,309 @@ cpu_codefetch_d(DWORD madr)
 /*
  * virtual address -> linear address
  */
-BYTE MEMCALL
-cpu_vmemoryread(int idx, DWORD madr)
+UINT8 MEMCALL
+cpu_vmemoryread(int idx, UINT32 offset)
 {
 	descriptor_t *sd;
-	DWORD addr;
+	UINT32 addr;
+	int exc;
 
 	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
 
 	sd = &CPU_STAT_SREG(idx);
 	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
+		exc = GP_EXCEPTION;
+		goto err;
 	}
 
-	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,
+	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)
+				goto range_failure;
+			break;
+
+		default:
+			if (offset > sd->u.seg.limit)
+				goto range_failure;
+			break;
+		}
+	}
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 1, CPU_DR7_RW_RO);
+	if (!CPU_STAT_PM)
+		return cpu_memoryread(addr);
+	return cpu_lmemoryread(addr, CPU_STAT_USER_MODE);
+
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
+	} else {
+		exc = GP_EXCEPTION;
 	}
-	/*NOTREACHED*/
+	VERBOSE(("cpu_vmemoryread: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
+err:
+	EXCEPTION(exc, 0);
+	return 0;	/* compiler happy */
 }
 
-WORD MEMCALL
-cpu_vmemoryread_w(int idx, DWORD madr)
+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);
 
 	sd = &CPU_STAT_SREG(idx);
 	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
+		exc = GP_EXCEPTION;
+		goto err;
 	}
 
-	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,
+	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)
+				goto range_failure;
+			break;
+
+		default:
+			if (offset > sd->u.seg.limit - 1)
+				goto range_failure;
+			break;
+		}
+	} 
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 2, CPU_DR7_RW_RO);
+	if (!CPU_STAT_PM)
+		return cpu_memoryread_w(addr);
+	return cpu_lmemoryread_w(addr, CPU_STAT_USER_MODE);
+
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
+	} else {
+		exc = GP_EXCEPTION;
 	}
-	/*NOTREACHED*/
+	VERBOSE(("cpu_vmemoryread_w: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
+err:
+	EXCEPTION(exc, 0);
+	return 0;	/* compiler happy */
 }
 
-DWORD MEMCALL
-cpu_vmemoryread_d(int idx, DWORD madr)
+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);
 
 	sd = &CPU_STAT_SREG(idx);
 	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
+		exc = GP_EXCEPTION;
+		goto err;
 	}
 
-	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,
+	if (!(sd->flag & CPU_DESC_FLAG_READABLE)) {
+		cpu_memoryread_check(sd, offset, 4,
 		    (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)
+				goto range_failure;
+			break;
+
+		default:
+			if (offset > sd->u.seg.limit - 3)
+				goto range_failure;
+			break;
+		}
 	}
-	/*NOTREACHED*/
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 4, CPU_DR7_RW_RO);
+	if (!CPU_STAT_PM)
+		return cpu_memoryread_d(addr);
+	return cpu_lmemoryread_d(addr, CPU_STAT_USER_MODE);
+
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
+	} else {
+		exc = GP_EXCEPTION;
+	}
+	VERBOSE(("cpu_vmemoryread_d: 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 madr, 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);
 
 	sd = &CPU_STAT_SREG(idx);
 	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
+		exc = GP_EXCEPTION;
+		goto err;
 	}
 
-	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,
+	if (!(sd->flag & CPU_DESC_FLAG_WRITABLE)) {
+		cpu_memorywrite_check(sd, offset, 1,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
-	}
-	/*NOTREACHED*/
-}
-
-void MEMCALL
-cpu_vmemorywrite_w(int idx, DWORD madr, WORD val)
-{
-	descriptor_t *sd;
-	DWORD addr;
-
-	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
+	} else {
+		switch (sd->type) {
+		case 6: case 7:
+			if (offset <= sd->u.seg.limit)
+				goto range_failure;
+			break;
 
-	sd = &CPU_STAT_SREG(idx);
-	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
+		default:
+			if (offset > sd->u.seg.limit)
+				goto range_failure;
+			break;
+		}
 	}
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 1, CPU_DR7_RW_RW);
+	if (!CPU_STAT_PM) {
+		/* real mode */
+		cpu_memorywrite(addr, val);
+	} else {
+		/* protected mode */
+		cpu_lmemorywrite(addr, val, CPU_STAT_USER_MODE);
+	}
+	return;
 
-	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);
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
+	} else {
+		exc = GP_EXCEPTION;
 	}
-	/*NOTREACHED*/
+	VERBOSE(("cpu_vmemorywrite: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
+err:
+	EXCEPTION(exc, 0);
 }
 
 void MEMCALL
-cpu_vmemorywrite_d(int idx, DWORD madr, DWORD 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);
 
 	sd = &CPU_STAT_SREG(idx);
 	if (!sd->valid) {
-		EXCEPTION(GP_EXCEPTION, 0);
+		exc = GP_EXCEPTION;
+		goto err;
 	}
 
-	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,
+	if (!(sd->flag & CPU_DESC_FLAG_WRITABLE)) {
+		cpu_memorywrite_check(sd, offset, 2,
 		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * physical address memory function
- */
-void MEMCALL
-cpu_memorywrite_d(DWORD address, DWORD value)
-{
-	DWORD adr = address & cpumem_addrmask;
+	} else {
+		switch (sd->type) {
+		case 6: case 7:
+			if (offset - 1 <= sd->u.seg.limit)
+				goto range_failure;
+			break;
 
-	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 {
-			ia32_panic("cpu_memorywrite_d: out of universe.");
+		default:
+			if (offset > sd->u.seg.limit - 1)
+				goto range_failure;
+			break;
 		}
 	}
-}
-
-void MEMCALL
-cpu_memorywrite_w(DWORD address, WORD value)
-{
-	DWORD adr = address & cpumem_addrmask;
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 2, CPU_DR7_RW_RW);
+	if (!CPU_STAT_PM) {
+		/* real mode */
+		cpu_memorywrite_w(addr, val);
+	} else {
+		/* protected mode */
+		cpu_lmemorywrite_w(addr, val, CPU_STAT_USER_MODE);
+	}
+	return;
 
-	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 {
-			ia32_panic("cpu_memorywrite_w: out of universe.");
-		}
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
+	} else {
+		exc = GP_EXCEPTION;
 	}
+	VERBOSE(("cpu_vmemorywrite_w: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
+err:
+	EXCEPTION(exc, 0);
 }
 
 void MEMCALL
-cpu_memorywrite(DWORD address, BYTE value)
+cpu_vmemorywrite_d(int idx, UINT32 offset, UINT32 val)
 {
-	DWORD adr = address & cpumem_addrmask;
+	descriptor_t *sd;
+	UINT32 addr;
+	int exc;
 
-	if (adr < LOWMEM) {
-		__i286_memorywrite(adr, value);
-	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size) {
-			cpumem[adr] = value;
-		} else {
-			ia32_panic("cpu_memorywrite: out of universe.");
-		}
-	}
-}
+	__ASSERT((unsigned int)idx < CPU_SEGREG_NUM);
 
-DWORD MEMCALL
-cpu_memoryread_d(DWORD address)
-{
-	DWORD adr = address & cpumem_addrmask;
-	DWORD val;
+	sd = &CPU_STAT_SREG(idx);
+	if (!sd->valid) {
+		exc = GP_EXCEPTION;
+		goto err;
+	}
 
-	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;
+	if (!(sd->flag & CPU_DESC_FLAG_WRITABLE)) {
+		cpu_memorywrite_check(sd, offset, 4,
+		    (idx == CPU_SS_INDEX) ? SS_EXCEPTION : GP_EXCEPTION);
 	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 3) {
-			val = LOADINTELDWORD(cpumem + adr);
-		} else {
-			ia32_panic("cpu_memoryread_d: out of universe.");
-			val = (DWORD)-1;
+		switch (sd->type) {
+		case 6: case 7:
+			if (offset - 3 <= sd->u.seg.limit)
+				goto range_failure;
+			break;
+
+		default:
+			if (offset > sd->u.seg.limit - 3)
+				goto range_failure;
+			break;
 		}
 	}
-	return val;
-}
-
-WORD MEMCALL
-cpu_memoryread_w(DWORD address)
-{
-	DWORD adr = address & cpumem_addrmask;
-	WORD val;
-
-	if (adr < LOWMEM - 1) {
-		val = __i286_memoryread_w(adr);
-	} else if (adr < LOWMEM) {
-		val = cpu_memoryread(adr);
-		val |= (WORD)cpumem[adr - (LOWMEM - 1)] << 8;
+	addr = sd->u.seg.segbase + offset;
+	check_memory_break_point(addr, 4, CPU_DR7_RW_RW);
+	if (!CPU_STAT_PM) {
+		/* real mode */
+		cpu_memorywrite_d(addr, val);
 	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size - 1) {
-			val = LOADINTELWORD(cpumem + adr);
-		} else {
-			ia32_panic("cpu_memoryread_w: out of universe.");
-			val = (WORD)-1;
-		}
+		/* protected mode */
+		cpu_lmemorywrite_d(addr, val, CPU_STAT_USER_MODE);
 	}
-	return val;
-}
+	return;
 
-BYTE MEMCALL
-cpu_memoryread(DWORD address)
-{
-	DWORD adr = address & cpumem_addrmask;
-	BYTE val;
-
-	if (adr < LOWMEM) {
-		val = __i286_memoryread(adr);
+range_failure:
+	if (idx == CPU_SS_INDEX) {
+		exc = SS_EXCEPTION;
 	} else {
-		adr -= LOWMEM;
-		if (adr < extmem_size) {
-			val = cpumem[adr];
-		} else {
-			ia32_panic("cpu_memoryread: out of universe.");
-			val = (BYTE)-1;
-		}
+		exc = GP_EXCEPTION;
 	}
-	return val;
+	VERBOSE(("cpu_vmemorywrite_d: type = %d, offset = %08x, limit = %08x", sd->type, offset, sd->u.seg.limit));
+err:
+	EXCEPTION(exc, 0);
 }