--- np2/i386c/ia32/ia32.mcr	2008/01/25 18:02:18	1.23
+++ np2/i386c/ia32/ia32.mcr	2011/01/15 17:17:23	1.26
@@ -1,5 +1,3 @@
-/*	$Id: ia32.mcr,v 1.23 2008/01/25 18:02:18 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -89,17 +87,8 @@ do { \
 /*
  * instruction pointer
  */
-#define	SET_EIP(v) \
-do { \
-	UINT32 __new_ip = (v); \
-	if (__new_ip > CPU_STAT_CS_LIMIT) { \
-		VERBOSE(("SET_EIP: new_ip = %08x, limit = %08x", __new_ip, CPU_STAT_CS_LIMIT)); \
-		EXCEPTION(GP_EXCEPTION, 0); \
-	} \
-	CPU_EIP = __new_ip; \
-} while (/*CONSTCOND*/ 0)
-
-#define	ADD_EIP(v) \
+/* コードフェッチに使用するので、OpSize の影響を受けてはいけない */
+#define	_ADD_EIP(v) \
 do { \
 	UINT32 __tmp_ip = CPU_EIP + (v); \
 	if (!CPU_STATSAVE.cpu_inst_default.op_32) { \
@@ -108,41 +97,40 @@ do { \
 	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) \
@@ -708,17 +696,17 @@ do { \
 #define	REGPUSH(reg, clock) \
 do { \
 	UINT16 new_sp = CPU_SP - 2; \
+	CPU_WORKCLOCK(clock); \
 	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 { \
 	UINT32 new_esp = CPU_ESP - 4; \
+	CPU_WORKCLOCK(clock); \
 	cpu_vmemorywrite_d(CPU_SS_INDEX, new_esp, reg); \
 	CPU_ESP = new_esp; \
-	CPU_WORKCLOCK(clock); \
 } while (/*CONSTCOND*/ 0)
 
 #define	REGPUSH0(reg) \
@@ -780,16 +768,16 @@ do { \
 
 #define	REGPOP(reg, clock) \
 do { \
+	CPU_WORKCLOCK(clock); \
 	(reg) = cpu_vmemoryread_w(CPU_SS_INDEX, CPU_SP); \
 	CPU_SP += 2; \
-	CPU_WORKCLOCK(clock); \
 } while (/*CONSTCOND*/ 0)
 
 #define	REGPOP_32(reg, clock) \
 do { \
+	CPU_WORKCLOCK(clock); \
 	(reg) = cpu_vmemoryread_d(CPU_SS_INDEX, CPU_ESP); \
 	CPU_ESP += 4; \
-	CPU_WORKCLOCK(clock); \
 } while (/*CONSTCOND*/ 0)
 
 #define	REGPOP0(reg) \
@@ -885,44 +873,51 @@ do { \
  */
 #define	JMPSHORT(clock) \
 do { \
-	UINT32 __ip; \
+	UINT32 __new_ip; \
+	UINT32 __dest; \
 	CPU_WORKCLOCK(clock); \
-	__ip = __CBD(cpu_codefetch(CPU_EIP)); \
-	__ip++; \
-	ADD_EIP(__ip); \
+	GET_PCBYTESD(__dest); \
+	__new_ip = CPU_EIP + __dest; \
+	if (!CPU_INST_OP32) { \
+		__new_ip &= 0xffff; \
+	} \
+	if (__new_ip > CPU_STAT_CS_LIMIT) { \
+		EXCEPTION(GP_EXCEPTION, 0); \
+	} \
+	CPU_EIP = __new_ip; \
 } while (/*CONSTCOND*/ 0)
 
 #define	JMPNEAR(clock) \
 do { \
-	UINT32 __ip; \
+	UINT16 __new_ip; \
+	SINT16 __dest; \
 	CPU_WORKCLOCK(clock); \
-	__ip = __CWDE(cpu_codefetch_w(CPU_EIP)); \
-	__ip += 2; \
-	ADD_EIP(__ip); \
+	GET_PCWORDS(__dest); \
+	__new_ip = CPU_IP + __dest; \
+	if (__new_ip > CPU_STAT_CS_LIMIT) { \
+		EXCEPTION(GP_EXCEPTION, 0); \
+	} \
+	CPU_EIP = __new_ip; \
 } while (/*CONSTCOND*/ 0)
 
-#define	JMPNEAR_4(clock) \
+#define	JMPNEAR32(clock) \
 do { \
-	UINT32 __ip; \
+	UINT32 __new_ip; \
+	UINT32 __dest; \
 	CPU_WORKCLOCK(clock); \
-	__ip = cpu_codefetch_d(CPU_EIP); \
-	__ip += 4; \
-	ADD_EIP(__ip); \
+	GET_PCDWORD(__dest); \
+	__new_ip = CPU_EIP + __dest; \
+	if (__new_ip > CPU_STAT_CS_LIMIT) { \
+		EXCEPTION(GP_EXCEPTION, 0); \
+	} \
+	CPU_EIP = __new_ip; \
 } while (/*CONSTCOND*/ 0)
 
-#if !defined(IA32_SUPPORT_PREFETCH_QUEUE)
 #define	JMPNOP(clock, d) \
 do { \
 	CPU_WORKCLOCK(clock); \
-	ADD_EIP((d)); \
+	_ADD_EIP((d)); \
 } while (/*CONSTCOND*/ 0)
-#else
-#define	JMPNOP(clock, d) \
-do { \
-	CPU_WORKCLOCK(clock); \
-	ADD_EIP((d)); \
-} while (/*CONSTCOND*/ 0)
-#endif
 
 
 /*