--- np2/i386c/ia32/cpu_mem.c	2008/03/22 04:03:07	1.22
+++ np2/i386c/ia32/cpu_mem.c	2012/01/08 11:32:16	1.28
@@ -1,5 +1,3 @@
-/*	$Id: cpu_mem.c,v 1.22 2008/03/22 04:03:07 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2004 NONAKA Kimihiro
  * All rights reserved.
@@ -66,7 +64,7 @@ check_limit_upstairs(descriptor_t *sdp, 
 			if (!SEG_IS_32BIT(sdp)) {
 				if ((len > limit)		/* len check */
 				 || (end > limit)) {		/* [1] */
-					return 0;
+					goto exc;
 				}
 			} else {
 				sdp->flag |= CPU_DESC_FLAG_WHOLEADR;
@@ -90,7 +88,7 @@ check_limit_upstairs(descriptor_t *sdp, 
 			 || (end < offset)			/* wrap check */
 			 || (offset < sdp->u.seg.limit) 	/* [1] */
 			 || (end > limit)) {			/* [2] */
-				return 0;
+				goto exc;
 			}
 		}
 	} else {
@@ -109,7 +107,7 @@ check_limit_upstairs(descriptor_t *sdp, 
 			if (!SEG_IS_32BIT(sdp)) {
 				if ((len > limit)		/* len check */
 				 || (offset + len > limit)) {	/* [1] */
-					return 0;
+					goto exc;
 				}
 			} else {
 				sdp->flag |= CPU_DESC_FLAG_WHOLEADR;
@@ -129,12 +127,19 @@ check_limit_upstairs(descriptor_t *sdp, 
 			 */
 			if ((len > sdp->u.seg.limit)		/* len check */
 			 || (end < offset)			/* wrap check */
-			 || (end > sdp->u.seg.limit)) {		/* [1] */
-				return 0;
+			 || (end > sdp->u.seg.limit + 1)) {	/* [1] */
+				goto exc;
 			}
 		}
 	}
 	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;
 }
 
 static void MEMCALL
@@ -172,8 +177,7 @@ cpu_memoryread_check(descriptor_t *sdp, 
 	return;
 
 exc:
-	VERBOSE(("cpu_memoryread_check: check failure."));
-	VERBOSE(("offset = 0x%08x, len = %d", offset, len));
+	VERBOSE(("cpu_memoryread_check: check failure: offset = 0x%08x, len = %d", offset, len));
 #if defined(DEBUG)
 	segdesc_dump(sdp);
 #endif
@@ -212,15 +216,14 @@ cpu_memorywrite_check(descriptor_t *sdp,
 	return;
 
 exc:
-	VERBOSE(("cpu_memorywrite_check: check failure."));
-	VERBOSE(("offset = 0x%08x, len = %d", offset, len));
+	VERBOSE(("cpu_memorywrite_check: check failure: offset = 0x%08x, len = %d", offset, len));
 #if defined(DEBUG)
 	segdesc_dump(sdp);
 #endif
 	EXCEPTION(e, 0);
 }
 
-void
+void MEMCALL
 cpu_stack_push_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len)
 {
 	UINT32 limit;
@@ -229,6 +232,8 @@ cpu_stack_push_check(UINT16 s, descripto
 	__ASSERT(sdp != NULL);
 	__ASSERT(len > 0);
 
+	len--;
+
 	if (!SEG_IS_VALID(sdp)
 	 || !SEG_IS_PRESENT(sdp)
 	 || SEG_IS_SYSTEM(sdp)
@@ -237,7 +242,6 @@ cpu_stack_push_check(UINT16 s, descripto
 		goto exc;
 	}
 
-	len--;
 	start = sp - len;
 	limit = SEG_IS_32BIT(sdp) ? 0xffffffff : 0x0000ffff;
 
@@ -322,7 +326,7 @@ cpu_stack_push_check(UINT16 s, descripto
 			 */
 			if ((len > sdp->u.seg.limit)		/* len check */
 			 || (start > sp)			/* wrap check */
-			 || (sp > sdp->u.seg.limit)) {		/* [1] */
+			 || (sp > sdp->u.seg.limit + 1)) {	/* [1] */
 				goto exc;
 			}
 		}
@@ -330,15 +334,14 @@ cpu_stack_push_check(UINT16 s, descripto
 	return;
 
 exc:
-	VERBOSE(("cpu_stack_push_check: check failure."));
-	VERBOSE(("s = 0x%04x, sp = 0x%08x, len = %d", s, sp, len));
+	VERBOSE(("cpu_stack_push_check: check failure: selector = %04x, sp = 0x%08x, len = %d", s, sp, len));
 #if defined(DEBUG)
 	segdesc_dump(sdp);
 #endif
 	EXCEPTION(SS_EXCEPTION, s & 0xfffc);
 }
 
-void
+void MEMCALL
 cpu_stack_pop_check(UINT16 s, descriptor_t *sdp, UINT32 sp, UINT len)
 {
 
@@ -358,8 +361,7 @@ cpu_stack_pop_check(UINT16 s, descriptor
 	return;
 
 exc:
-	VERBOSE(("cpu_stack_pop_check: check failure."));
-	VERBOSE(("s = 0x%04x, sp = 0x%08x, len = %d", s, sp, len));
+	VERBOSE(("cpu_stack_pop_check: check failure: selector = %04x, sp = 0x%08x, len = %d", s, sp, len));
 #if defined(DEBUG)
 	segdesc_dump(sdp);
 #endif
@@ -399,21 +401,17 @@ cpu_codefetch(UINT32 offset)
 {
 	descriptor_t *sdp;
 	UINT32 addr;
-#if defined(IA32_SUPPORT_TLB)
 	TLB_ENTRY_T *ep;
-#endif
 
 	sdp = &CPU_CS_DESC;
 	if (offset <= sdp->u.seg.limit) {
 		addr = sdp->u.seg.segbase + offset;
 		if (!CPU_STAT_PAGING)
 			return cpu_memoryread(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);
@@ -425,17 +423,14 @@ cpu_codefetch_w(UINT32 offset)
 {
 	descriptor_t *sdp;
 	UINT32 addr;
-#if defined(IA32_SUPPORT_TLB)
 	TLB_ENTRY_T *ep;
 	UINT16 value;
-#endif
 
 	sdp = &CPU_CS_DESC;
 	if (offset <= sdp->u.seg.limit - 1) {
 		addr = sdp->u.seg.segbase + offset;
 		if (!CPU_STAT_PAGING)
 			return cpu_memoryread_w(addr);
-#if defined(IA32_SUPPORT_TLB)
 		ep = tlb_lookup(addr, ucrw);
 		if (ep != NULL && ep->memp != NULL) {
 			if ((addr + 1) & 0x00000fff) {
@@ -448,7 +443,6 @@ cpu_codefetch_w(UINT32 offset)
 				return value;
 			}
 		}
-#endif
 		return cpu_linear_memory_read_w(addr, ucrw);
 	}
 	EXCEPTION(GP_EXCEPTION, 0);
@@ -460,18 +454,15 @@ cpu_codefetch_d(UINT32 offset)
 {
 	descriptor_t *sdp;
 	UINT32 addr;
-#if defined(IA32_SUPPORT_TLB)
 	TLB_ENTRY_T *ep[2];
 	UINT32 value;
 	UINT remain;
-#endif
 
 	sdp = &CPU_CS_DESC;
 	if (offset <= sdp->u.seg.limit - 3) {
 		addr = sdp->u.seg.segbase + offset;
 		if (!CPU_STAT_PAGING)
 			return cpu_memoryread_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);
@@ -505,7 +496,6 @@ cpu_codefetch_d(UINT32 offset)
 				return value;
 			}
 		}
-#endif
 		return cpu_linear_memory_read_d(addr, ucrw);
 	}
 	EXCEPTION(GP_EXCEPTION, 0);