--- np2/i386c/ia32/ia32.mcr	2004/02/20 16:09:04	1.13
+++ np2/i386c/ia32/ia32.mcr	2008/01/25 18:07:30	1.24
@@ -1,4 +1,4 @@
-/*	$Id: ia32.mcr,v 1.13 2004/02/20 16:09:04 monaka Exp $	*/
+/*	$Id: ia32.mcr,v 1.24 2008/01/25 18:07:30 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -12,8 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,6 +35,13 @@
 #define	__CBD(src)	((UINT32)((SINT8)(src)))
 #define	__CWDE(src)	((SINT16)(src))
 
+#ifndef	PTR_TO_UINT32
+#define	PTR_TO_UINT32(p)	((UINT32)((unsigned long)(p)))
+#endif
+#ifndef	UINT32_TO_PTR
+#define	UINT32_TO_PTR(v)	((void *)((unsigned long)(UINT32)(v)))
+#endif
+
 #define	SWAP_BYTE(p, q) \
 do { \
 	UINT8 __tmp = (p); \
@@ -100,44 +105,52 @@ do { \
 	if (!CPU_STATSAVE.cpu_inst_default.op_32) { \
 		__tmp_ip &= 0xffff; \
 	} \
-	CPU_EIP = __tmp_ip; \
+	SET_EIP(__tmp_ip); \
 } while (/*CONSTCOND*/ 0)
 
+#define	_ADD_EIP(v) \
+do { \
+	UINT32 __tmp_ip = CPU_EIP + (v); \
+	if (!CPU_STATSAVE.cpu_inst_default.op_32) { \
+		__tmp_ip &= 0xffff; \
+	} \
+	CPU_EIP = __tmp_ip; \
+} while (/*CONSTCOND*/ 0)
 
 #define	GET_PCBYTE(v) \
 do { \
 	(v) = cpu_codefetch(CPU_EIP); \
-	ADD_EIP(1); \
+	_ADD_EIP(1); \
 } while (/*CONSTCOND*/ 0)
 
 #define	GET_PCBYTES(v) \
 do { \
 	(v) = __CBW(cpu_codefetch(CPU_EIP)); \
-	ADD_EIP(1); \
+	_ADD_EIP(1); \
 } while (/*CONSTCOND*/ 0)
 
 #define	GET_PCBYTESD(v) \
 do { \
 	(v) = __CBD(cpu_codefetch(CPU_EIP)); \
-	ADD_EIP(1); \
+	_ADD_EIP(1); \
 } while (/*CONSTCOND*/ 0)
 
 #define	GET_PCWORD(v) \
 do { \
 	(v) = cpu_codefetch_w(CPU_EIP); \
-	ADD_EIP(2); \
+	_ADD_EIP(2); \
 } while (/*CONSTCOND*/ 0)
 
 #define	GET_PCWORDS(v) \
 do { \
 	(v) = __CWDE(cpu_codefetch_w(CPU_EIP)); \
-	ADD_EIP(2); \
+	_ADD_EIP(2); \
 } while (/*CONSTCOND*/ 0)
 
 #define	GET_PCDWORD(v) \
 do { \
 	(v) = cpu_codefetch_d(CPU_EIP); \
-	ADD_EIP(4); \
+	_ADD_EIP(4); \
 } while (/*CONSTCOND*/ 0)
 
 #define	PREPART_EA_REG8(b, d_s) \
@@ -681,48 +694,69 @@ do { \
 	(s) = __b; \
 } while (/*CONSTCOND*/ 0)
 
+#define	BYTE_NOT(s) \
+do { \
+	(s) ^= 0xff; \
+} while (/*CONSTCOND*/ 0)
+
+#define	WORD_NOT(s) \
+do { \
+	(s) ^= 0xffff; \
+} while (/*CONSTCOND*/ 0)
+
+#define	DWORD_NOT(s) \
+do { \
+	(s) ^= 0xffffffff; \
+} while (/*CONSTCOND*/ 0)
+
 
 /*
  * stack
  */
 #define	REGPUSH(reg, clock) \
 do { \
-	CPU_SP -= 2; \
-	cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_SP, reg); \
+	UINT16 new_sp = CPU_SP - 2; \
+	cpu_vmemorywrite_w(CPU_SS_INDEX, new_sp, reg); \
+	CPU_SP = new_sp; \
 	CPU_WORKCLOCK(clock); \
 } while (/*CONSTCOND*/ 0)
 
 #define	REGPUSH_32(reg, clock) \
 do { \
-	CPU_ESP -= 4; \
-	cpu_vmemorywrite_d(CPU_SS_INDEX, CPU_ESP, reg); \
+	UINT32 new_esp = CPU_ESP - 4; \
+	cpu_vmemorywrite_d(CPU_SS_INDEX, new_esp, reg); \
+	CPU_ESP = new_esp; \
 	CPU_WORKCLOCK(clock); \
 } while (/*CONSTCOND*/ 0)
 
 #define	REGPUSH0(reg) \
 do { \
-	CPU_SP -= 2; \
-	cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_SP, (UINT16)reg); \
+	UINT16 new_sp = CPU_SP - 2; \
+	cpu_vmemorywrite_w(CPU_SS_INDEX, new_sp, (UINT16)reg); \
+	CPU_SP = new_sp; \
 } while (/*CONSTCOND*/ 0)
 
 /* Operand Size == 16 && Stack Size == 32 */
 #define	REGPUSH0_16_32(reg) \
 do { \
-	CPU_ESP -= 2; \
-	cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_ESP, (UINT16)reg); \
+	UINT32 new_esp = CPU_ESP - 2; \
+	cpu_vmemorywrite_w(CPU_SS_INDEX, new_esp, (UINT16)reg); \
+	CPU_ESP = new_esp; \
 } while (/*CONSTCOND*/ 0)
 
 /* Operand Size == 32 && Stack Size == 16 */
 #define	REGPUSH0_32_16(reg) \
 do { \
-	CPU_SP -= 4; \
-	cpu_vmemorywrite_d(CPU_SS_INDEX, CPU_SP, reg); \
+	UINT16 new_sp = CPU_SP - 4; \
+	cpu_vmemorywrite_d(CPU_SS_INDEX, new_sp, reg); \
+	CPU_SP = new_sp; \
 } while (/*CONSTCOND*/ 0)
 
 #define	REGPUSH0_32(reg) \
 do { \
-	CPU_ESP -= 4; \
-	cpu_vmemorywrite_d(CPU_SS_INDEX, CPU_ESP, reg); \
+	UINT32 new_esp = CPU_ESP - 4; \
+	cpu_vmemorywrite_d(CPU_SS_INDEX, new_esp, reg); \
+	CPU_ESP = new_esp; \
 } while (/*CONSTCOND*/ 0)
 
 #define	PUSH0_16(reg) \
@@ -861,8 +895,7 @@ do { \
 do { \
 	UINT32 __ip; \
 	CPU_WORKCLOCK(clock); \
-	__ip = __CBD(cpu_codefetch(CPU_EIP)); \
-	__ip++; \
+	GET_PCBYTESD(__ip); \
 	ADD_EIP(__ip); \
 } while (/*CONSTCOND*/ 0)
 
@@ -870,8 +903,7 @@ do { \
 do { \
 	UINT32 __ip; \
 	CPU_WORKCLOCK(clock); \
-	__ip = __CWDE(cpu_codefetch_w(CPU_EIP)); \
-	__ip += 2; \
+	GET_PCWORDS(__ip); \
 	ADD_EIP(__ip); \
 } while (/*CONSTCOND*/ 0)
 
@@ -879,8 +911,7 @@ do { \
 do { \
 	UINT32 __ip; \
 	CPU_WORKCLOCK(clock); \
-	__ip = cpu_codefetch_d(CPU_EIP); \
-	__ip += 4; \
+	GET_PCDWORD(__ip); \
 	ADD_EIP(__ip); \
 } while (/*CONSTCOND*/ 0)
 
@@ -892,6 +923,29 @@ do { \
 
 
 /*
+ * conditions
+ */
+#define	CC_O	(CPU_OV)
+#define	CC_NO	(!CPU_OV)
+#define	CC_C	(CPU_FLAGL & C_FLAG)
+#define	CC_NC	(!(CPU_FLAGL & C_FLAG))
+#define	CC_Z	(CPU_FLAGL & Z_FLAG)
+#define	CC_NZ	(!(CPU_FLAGL & Z_FLAG))
+#define	CC_NA	(CPU_FLAGL & (Z_FLAG | C_FLAG))
+#define	CC_A	(!(CPU_FLAGL & (Z_FLAG | C_FLAG)))
+#define	CC_S	(CPU_FLAGL & S_FLAG)
+#define	CC_NS	(!(CPU_FLAGL & S_FLAG))
+#define	CC_P	(CPU_FLAGL & P_FLAG)
+#define	CC_NP	(!(CPU_FLAGL & P_FLAG))
+#define	CC_L	(((CPU_FLAGL & S_FLAG) == 0) != (CPU_OV == 0))
+#define	CC_NL	(((CPU_FLAGL & S_FLAG) == 0) == (CPU_OV == 0))
+#define	CC_LE	((CPU_FLAGL & Z_FLAG) || \
+				(((CPU_FLAGL & S_FLAG) == 0) != (CPU_OV == 0)))
+#define	CC_NLE	((!(CPU_FLAGL & Z_FLAG)) && \
+				(((CPU_FLAGL & S_FLAG) == 0) == (CPU_OV == 0)))
+
+
+/*
  * instruction check
  */
 #include "ia32xc.mcr"