--- np2/i386c/ia32/instructions/shift_rotate.mcr	2011/01/15 18:36:12	1.13
+++ np2/i386c/ia32/instructions/shift_rotate.mcr	2011/12/21 18:07:57	1.15
@@ -298,7 +298,7 @@ inst##_EdGdCL(void) \
 }
 
 
-/* Pentium!!! - シフトカウント != 1の場合はOVは不変らすい */
+/* Pentium!!! - シフトカウント != 1の場合はOVは不変らすい */
 
 /*
  * SAR
@@ -881,8 +881,9 @@ do { \
 			CPU_OV = ((s) >> 31) ^ tmp; \
 		} \
 		while ((c)--) { \
-			tmp = (s) & 1; \
+			UINT32 tmp2 = (s) & 1; \
 			(s) = (tmp << 31) | ((s) >> 1); \
+			tmp = tmp2; \
 		} \
 		CPU_FLAGL |= tmp; \
 	} \
@@ -962,9 +963,9 @@ do { \
 			CPU_OV = ((s) + 0x40000000) & 0x80000000; \
 		} \
 		while ((c)--) { \
-			tmp = (s) & 0x80000000; \
+			UINT32 tmp2 = (s) & 0x80000000; \
 			(s) = ((s) << 1) | (tmp & 1); \
-			tmp >>= 31; \
+			tmp = tmp2 >> 31; \
 		} \
 		CPU_FLAGL |= tmp; \
 	} \