--- np2/i286c/i286c_mn.c	2003/11/24 09:14:01	1.12
+++ np2/i286c/i286c_mn.c	2003/11/29 00:36:00	1.14
@@ -51,7 +51,7 @@ I286FN _add_ea_r8(void) {						// 00: ad
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
 			ADDBYTE(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
@@ -81,7 +81,7 @@ I286FN _add_ea_r16(void) {						// 01: a
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
 			ADDWORD(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -171,7 +171,7 @@ I286FN _or_ea_r8(void) {						// 08: or 
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
 			ORBYTE(dst, src);
-			i286_memorywrite(madr, (BYTE)dst);
+			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
@@ -198,7 +198,7 @@ I286FN _or_ea_r16(void) {							// 09: o
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
 			ORWORD(dst, src);
-			i286_memorywrite_w(madr, (UINT16)dst);
+			i286_memorywrite_w(madr, (REG16)dst);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -269,7 +269,7 @@ I286FN _adc_ea_r8(void) {						// 10: ad
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
 			ADCBYTE(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
@@ -299,7 +299,7 @@ I286FN _adc_ea_r16(void) {						// 11: a
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
 			ADCWORD(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -392,7 +392,7 @@ I286FN _sbb_ea_r8(void) {						// 18: sb
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
 			SBBBYTE(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
@@ -422,7 +422,7 @@ I286FN _sbb_ea_r16(void) {						// 19: s
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
 			SBBWORD(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -513,7 +513,7 @@ I286FN _and_ea_r8(void) {						// 20: an
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
 			ANDBYTE(dst, src);
-			i286_memorywrite(madr, (BYTE)dst);
+			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
@@ -540,7 +540,7 @@ I286FN _and_ea_r16(void) {						// 21: a
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
 			ANDWORD(dst, src);
-			i286_memorywrite_w(madr, (UINT16)dst);
+			i286_memorywrite_w(madr, (REG16)dst);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -619,7 +619,7 @@ I286FN _daa(void) {								// 27: daa
 		I286_AL += 0x60;
 	}
 	I286_FLAGL &= A_FLAG | C_FLAG;
-	I286_FLAGL |= szpcflag[I286_AL];
+	I286_FLAGL |= BYTESZPF(I286_AL);
 }
 
 I286FN _sub_ea_r8(void) {						// 28: sub EA, REG8
@@ -642,7 +642,7 @@ I286FN _sub_ea_r8(void) {						// 28: su
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
 			BYTE_SUB(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
@@ -672,7 +672,7 @@ I286FN _sub_ea_r16(void) {						// 29: s
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
 			WORD_SUB(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -762,7 +762,7 @@ I286FN _das(void) {								// 2f: das
 		I286_AL -= 6;
 	}
 	I286_FLAGL &= A_FLAG | C_FLAG;
-	I286_FLAGL |= szpcflag[I286_AL];
+	I286_FLAGL |= BYTESZPF(I286_AL);
 }
 
 I286FN _xor_ea_r8(void) {						// 30: xor EA, REG8
@@ -784,7 +784,7 @@ I286FN _xor_ea_r8(void) {						// 30: xo
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
 			BYTE_XOR(dst, src);
-			i286_memorywrite(madr, (BYTE)dst);
+			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
@@ -811,7 +811,7 @@ I286FN _xor_ea_r16(void) {						// 31: x
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
 			WORD_XOR(dst, src);
-			i286_memorywrite_w(madr, (UINT16)dst);
+			i286_memorywrite_w(madr, (REG16)dst);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -1071,7 +1071,7 @@ I286FN _bound(void) {						// 62:	bound
 	UINT	vect = 0;
 	UINT	op;
 	UINT32	madr;
-	UINT16	reg;
+	REG16	reg;
 
 	I286_WORKCLOCK(13);										// ToDo
 	GET_PCBYTE(op);
@@ -1079,7 +1079,7 @@ I286FN _bound(void) {						// 62:	bound
 		reg = *(REG16_B53(op));
 		madr = CALC_EA(op);
 		if (reg >= i286_memoryread_w(madr)) {
-			madr += 2;									// ToDo
+			madr += 2;										// ToDo
 			if (reg <= i286_memoryread_w(madr)) {
 				return;
 			}
@@ -1150,7 +1150,7 @@ I286FN _imul_reg_ea_data8(void) {		// 6B
 
 I286FN _insb(void) {						// 6C:	insb
 
-	BYTE	dat;
+	REG8	dat;
 
 	I286_WORKCLOCK(5);
 	dat = iocore_inp8(I286_DX);
@@ -1160,7 +1160,7 @@ I286FN _insb(void) {						// 6C:	insb
 
 I286FN _insw(void) {						// 6D:	insw
 
-	UINT16	dat;
+	REG16	dat;
 
 	I286_WORKCLOCK(5);
 	dat = iocore_inp16(I286_DX);
@@ -1170,22 +1170,22 @@ I286FN _insw(void) {						// 6D:	insw
 
 I286FN _outsb(void) {						// 6E:	outsb
 
-	BYTE	dat;
+	REG8	dat;
 
 	I286_WORKCLOCK(3);
 	dat = i286_memoryread(I286_SI + DS_FIX);
 	I286_SI += STRING_DIR;
-	iocore_out8(I286_DX, dat);
+	iocore_out8(I286_DX, (BYTE)dat);
 }
 
 I286FN _outsw(void) {						// 6F:	outsw
 
-	UINT16	dat;
+	REG16	dat;
 
 	I286_WORKCLOCK(3);
 	dat = i286_memoryread_w(I286_SI + DS_FIX);
 	I286_SI += STRING_DIRx2;
-	iocore_out16(I286_DX, dat);
+	iocore_out16(I286_DX, (UINT16)dat);
 }
 
 I286FN _jo_short(void) {					// 70:	jo short
@@ -1602,7 +1602,7 @@ I286FN _nop(void) {							// 90: nop / b
 #if 1										// call BIOS
 	UINT32	adrs;
 
-	adrs = ((I286_IP - 1) & 0xffff) + CS_BASE;
+	adrs = LOW16(I286_IP - 1) + CS_BASE;
 	if ((adrs >= 0xf8000) && (adrs < 0x100000)) {
 		biosfunc(adrs);
 		ES_BASE = I286_ES << 4;
@@ -1970,15 +1970,14 @@ I286FN _les_r16_ea(void) {					// C4:	le
 
 	UINT	op;
 	UINT32	seg;
-	UINT16	ad;
+	UINT	ad;
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(op)
 	if (op < 0xc0) {
 		ad = GET_EA(op, &seg);
 		*(REG16_B53(op)) = i286_memoryread_w(seg + ad);
-		ad += 2;
-		I286_ES = i286_memoryread_w(seg + ad);
+		I286_ES = i286_memoryread_w(seg + LOW16(ad + 2));
 		ES_BASE = I286_ES << 4;
 	}
 	else {
@@ -1990,15 +1989,14 @@ I286FN _lds_r16_ea(void) {					// C5:	ld
 
 	UINT	op;
 	UINT32	seg;
-	UINT16	ad;
+	UINT	ad;
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(op)
 	if (op < 0xc0) {
 		ad = GET_EA(op, &seg);
 		*(REG16_B53(op)) = i286_memoryread_w(seg + ad);
-		ad += 2;
-		I286_DS = i286_memoryread_w(seg + ad);
+		I286_DS = i286_memoryread_w(seg + LOW16(ad + 2));
 		DS_BASE = I286_DS << 4;
 		DS_FIX = DS_BASE;
 	}
@@ -2016,22 +2014,13 @@ I286FN _mov_ea8_data8(void) {				// C6:	
 		I286_WORKCLOCK(2);
 		GET_PCBYTE(*(REG8_B53(op)))
 	}
-	else {
-#if 1					// 03/11/23
+	else {				// 03/11/23
 		UINT32 ad;
 		BYTE val;
 		I286_WORKCLOCK(3);
 		ad = CALC_EA(op);
 		GET_PCBYTE(val)
 		i286_memorywrite(ad, val);
-#else
-		UINT ad;
-		BYTE val;
-		I286_WORKCLOCK(3);
-		ad = c_get_ea[op]();
-		GET_PCBYTE(val)
-		i286_memorywrite(ad + EA_FIX, val);
-#endif
 	}
 }
 
@@ -2044,22 +2033,13 @@ I286FN _mov_ea16_data16(void) {				// C7
 		I286_WORKCLOCK(2);
 		GET_PCWORD(*(REG16_B53(op)))
 	}
-	else {
-#if 1					// 03/11/23
+	else {				// 03/11/23
 		UINT32	ad;
 		UINT16	val;
 		I286_WORKCLOCK(3);
 		ad = CALC_EA(op);
 		GET_PCWORD(val)
 		i286_memorywrite_w(ad, val);
-#else
-		UINT	ad;
-		UINT16	val;
-		I286_WORKCLOCK(3);
-		ad = c_get_ea[op]();
-		GET_PCWORD(val)
-		i286_memorywrite_w(ad + EA_FIX, val);
-#endif
 	}
 }
 
@@ -2094,7 +2074,7 @@ I286FN _enter(void) {						// C8:	enter	
 			I286_BP = I286_SP;
 			while(level--) {
 #if 1											// なにやってんだヲレ
-				UINT16 val;
+				REG16 val;
 				bp -= 2;
 				I286_SP -= 2;
 				val = i286_memoryread_w(bp + SS_BASE);
@@ -2308,7 +2288,7 @@ I286FN _aad(void) {							// D5:	AAD
 	I286_AL += (BYTE)(I286_AH * mul);
 	I286_AH = 0;
 	I286_FLAGL &= ~(S_FLAG | Z_FLAG | P_FLAG);
-	I286_FLAGL |= szpcflag[I286_AL];
+	I286_FLAGL |= BYTESZPF(I286_AL);
 }
 
 I286FN _setalc(void) {						// D6:	setalc (80286)
@@ -2319,7 +2299,7 @@ I286FN _setalc(void) {						// D6:	setal
 I286FN _xlat(void) {						// D7:	xlat
 
 	I286_WORKCLOCK(5);
-	I286_AL = i286_memoryread(((I286_AL + I286_BX) & 0xffff) + DS_FIX);
+	I286_AL = i286_memoryread(LOW16(I286_AL + I286_BX) + DS_FIX);
 }
 
 I286FN _esc(void) {							// D8:	esc