--- np2/i386c/ia32/ia32.mcr	2004/02/05 16:43:44	1.8
+++ np2/i386c/ia32/ia32.mcr	2004/02/18 20:11:37	1.11
@@ -1,4 +1,4 @@
-/*	$Id: ia32.mcr,v 1.8 2004/02/05 16:43:44 monaka Exp $	*/
+/*	$Id: ia32.mcr,v 1.11 2004/02/18 20:11:37 yui Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -97,8 +97,8 @@ do { \
 #define	ADD_EIP(v) \
 do { \
 	DWORD __tmp_ip = CPU_EIP + (v); \
-	if (!CPU_STATSAVE.cpu_inst_default.op_32) {\
-		__tmp_ip &= 0x0000ffff; \
+	if (!CPU_STATSAVE.cpu_inst_default.op_32) { \
+		__tmp_ip &= 0xffff; \
 	} \
 	CPU_EIP = __tmp_ip; \
 } while (/*CONSTCOND*/ 0)
@@ -598,7 +598,7 @@ do { \
 do { \
 	CPU_FLAGL &= (Z_FLAG | S_FLAG | A_FLAG | P_FLAG); \
 	(r) = (SQWORD)(d) * (SQWORD)(s); \
-	CPU_OV = (DWORD)(((r) + 0x80000000ULL) >> 32); \
+	CPU_OV = (DWORD)(((r) + QWORD_CONST(0x80000000)) >> 32); \
 	if (CPU_OV) { \
 		CPU_FLAGL |= C_FLAG; \
 	} \
@@ -705,14 +705,14 @@ do { \
 #define	REGPUSH0(reg) \
 do { \
 	CPU_SP -= 2; \
-	cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_SP, reg); \
+	cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_SP, (WORD)reg); \
 } 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, reg); \
+	cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_ESP, (WORD)reg); \
 } while (/*CONSTCOND*/ 0)
 
 /* Operand Size == 32 && Stack Size == 16 */