--- np2/i286c/i286c.mcr	2003/11/30 16:17:12	1.15
+++ np2/i286c/i286c.mcr	2003/12/03 07:59:57	1.16
@@ -1,8 +1,8 @@
 
 #if defined(X11) && (defined(i386) || defined(__i386__))
-#define	INHIBIT_WORDP(m)	((m) >= 0x9ffff)
+#define	INHIBIT_WORDP(m)	((m) >= (I286_MEMWRITEMAX - 1))
 #elif (defined(ARM) || defined(X11)) && defined(BYTESEX_LITTLE)
-#define	INHIBIT_WORDP(m)	(((m) & 1) || ((m) >= 0xa0000))
+#define	INHIBIT_WORDP(m)	(((m) & 1) || ((m) >= I286_MEMWRITEMAX))
 #else
 #define	INHIBIT_WORDP(m)	(1)
 #endif
@@ -502,5 +502,5 @@ extern UINT calc_a(UINT op, UINT32 *seg)
 	}
 
 
-#define	INT_NUM(a, b)		i286_intnum(a, b)
+#define	INT_NUM(a, b)		i286_intnum((a), (REG16)(b))