GETARG_x should return int, not int32_t

1 files changed, 9 insertions, 9 deletions

diff --git a/src/opcode.h b/src/opcode.h
index 9e7cf7f34..40ba9d126 100644
--- a/src/opcode.h
+++ b/src/opcode.h
@@ -14,15 +14,15 @@
 /*              OP:A:Bx  = 7:9:16            */
 /*              OP:Ax    = 7:25              */
 
-#define GET_OPCODE(i) (((mrb_code)(i)) & 0x7f)
-#define GETARG_A(i)   ((((mrb_code)(i)) >> 23) & 0x1ff)
-#define GETARG_B(i)   ((((mrb_code)(i)) >> 14) & 0x1ff)
-#define GETARG_C(i)   ((((mrb_code)(i)) >>  7) & 0x7f)
-#define GETARG_Bx(i)  ((((mrb_code)(i)) >>  7) & 0xffff)
-#define GETARG_sBx(i) (GETARG_Bx(i)-MAXARG_sBx)
-#define GETARG_Ax(i)  ((((mrb_code)(i)) >>  7) & 0x1ffffff)
-#define GETARG_UNPACK_b(i,n1,n2) ((((mrb_code)(i)) >> (7+n2)) & (((1<<n1)-1)))
-#define GETARG_UNPACK_c(i,n1,n2) ((((mrb_code)(i)) >> 7) & (((1<<n2)-1)))
+#define GET_OPCODE(i) ((int)(((mrb_code)(i)) & 0x7f))
+#define GETARG_A(i)   ((int)((((mrb_code)(i)) >> 23) & 0x1ff))
+#define GETARG_B(i)   ((int)((((mrb_code)(i)) >> 14) & 0x1ff))
+#define GETARG_C(i)   ((int)((((mrb_code)(i)) >>  7) & 0x7f))
+#define GETARG_Bx(i)  ((int)((((mrb_code)(i)) >>  7) & 0xffff))
+#define GETARG_sBx(i) ((int)(GETARG_Bx(i)-MAXARG_sBx))
+#define GETARG_Ax(i)  ((int)((((mrb_code)(i)) >>  7) & 0x1ffffff))
+#define GETARG_UNPACK_b(i,n1,n2) ((int)((((mrb_code)(i)) >> (7+n2)) & (((1<<n1)-1))))
+#define GETARG_UNPACK_c(i,n1,n2) ((int)((((mrb_code)(i)) >> 7) & (((1<<n2)-1))))
 #define GETARG_b(i)   GETARG_UNPACK_b(i,14,2)
 #define GETARG_c(i)   GETARG_UNPACK_c(i,14,2)