--- np2/i386c/ia32/ia32.mcr	2004/02/06 16:49:51	1.9
+++ np2/i386c/ia32/ia32.mcr	2004/02/19 03:04:01	1.12
@@ -1,4 +1,4 @@
-/*	$Id: ia32.mcr,v 1.9 2004/02/06 16:49:51 monaka Exp $	*/
+/*	$Id: ia32.mcr,v 1.12 2004/02/19 03:04:01 yui Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -325,7 +325,7 @@ do { \
 do { \
 	(d) |= (s); \
 	CPU_OV = 0; \
-	CPU_FLAGL = szpcflag[(BYTE)(d)] & P_FLAG; \
+	CPU_FLAGL = (BYTE)(szpcflag[(BYTE)(d)] & P_FLAG); \
 	if ((d) == 0) { \
 		CPU_FLAGL |= Z_FLAG; \
 	} \
@@ -430,7 +430,7 @@ do { \
 do { \
 	(d) &= (s); \
 	CPU_OV = 0; \
-	CPU_FLAGL = szpcflag[(BYTE)(d)] & P_FLAG; \
+	CPU_FLAGL = (BYTE)(szpcflag[(BYTE)(d)] & P_FLAG); \
 	if ((d) == 0) { \
 		CPU_FLAGL |= Z_FLAG; \
 	} \
@@ -494,7 +494,7 @@ do { \
 do { \
 	(d) ^= (s); \
 	CPU_OV = 0; \
-	CPU_FLAGL = szpcflag[(BYTE)(d)] & P_FLAG; \
+	CPU_FLAGL = (BYTE)(szpcflag[(BYTE)(d)] & P_FLAG); \
 	if ((d) == 0) { \
 		CPU_FLAGL |= Z_FLAG; \
 	} \
@@ -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 */