From cc4e9ee5b65e5f35b7517e19dce5a5c62e0b2250 Mon Sep 17 00:00:00 2001
From: crimsonwoods <crimsonwoods@gmail.com>
Date: Thu, 21 Mar 2013 22:58:33 +0900
Subject: fix the type of value that is returned by bit-shift expression.

---
 src/opcode.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/opcode.h')

diff --git a/src/opcode.h b/src/opcode.h
index 7c2ec204d..6b2288d48 100644
--- a/src/opcode.h
+++ b/src/opcode.h
@@ -20,17 +20,17 @@
 #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_Ax(i)  ((int32_t)((((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)
 
 #define MKOPCODE(op)  ((op) & 0x7f)
-#define MKARG_A(c)    (((c) & 0x1ff) << 23)
-#define MKARG_B(c)    (((c) & 0x1ff) << 14)
+#define MKARG_A(c)    ((mrb_code)((c) & 0x1ff) << 23)
+#define MKARG_B(c)    ((mrb_code)((c) & 0x1ff) << 14)
 #define MKARG_C(c)    (((c) & 0x7f) <<  7)
-#define MKARG_Bx(v)   (((v) & 0xffff) << 7)
+#define MKARG_Bx(v)   ((mrb_code)((v) & 0xffff) << 7)
 #define MKARG_sBx(v)  MKARG_Bx((v)+MAXARG_sBx)
 #define MKARG_Ax(v)   (((v) & 0x1ffffff) << 7)
 #define MKARG_PACK(b,n1,c,n2) ((((b) & ((1<<n1)-1)) << (7+n2))|(((c) & ((1<<n2)-1)) << 7))
-- 
cgit v1.2.3


From f4b943771881b01b40b34ca38ccdd62bb5eaaa66 Mon Sep 17 00:00:00 2001
From: crimsonwoods <crimsonwoods@gmail.com>
Date: Thu, 21 Mar 2013 23:07:18 +0900
Subject: fix comment.

---
 src/opcode.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/opcode.h')

diff --git a/src/opcode.h b/src/opcode.h
index 6b2288d48..8678ef73d 100644
--- a/src/opcode.h
+++ b/src/opcode.h
@@ -10,9 +10,12 @@
 #define MAXARG_Bx        (0xffff)
 #define MAXARG_sBx       (MAXARG_Bx>>1)         /* `sBx' is signed */
 
-/* instructions OP:A:B:C = 7:9:9:7 (32 bits) */
-/*              OP:A:Bx  = 7:9:16            */
-/*              OP:Ax    = 7:25              */
+/* instructions: packed 32 bit      */
+/* -------------------------------  */
+/*     A:B:C:OP = 9: 9: 7: 7        */
+/*      A:Bx:OP =    9:16: 7        */
+/*        Ax:OP =      25: 7        */
+/*   A:Bz:Cz:OP = 9:14: 2: 7        */
 
 #define GET_OPCODE(i) ((int)(((mrb_code)(i)) & 0x7f))
 #define GETARG_A(i)   ((int)((((mrb_code)(i)) >> 23) & 0x1ff))
-- 
cgit v1.2.3