ruby-internal 0.7.3 → 0.8.0

data/ext/cached/{ruby-1.9.0 → ruby-1.9.2}/internal/vm/instruction/insns_info.h

@@ -13,7 +13,7 @@
 
 /** -*-c-*-
   This file contains YARV instructions list.
-  
+
   ----
   This file is auto generated by insns2vm.rb
   DO NOT TOUCH!
@@ -171,47 +171,48 @@ enum ruby_vminsn_type {
 
   BIN(opt_length)                = 71,
 
-  BIN(opt_succ)                  = 72,
+  BIN(opt_size)                  = 72,
 
-  BIN(opt_not)                   = 73,
+  BIN(opt_succ)                  = 73,
 
-  BIN(opt_regexpmatch1)          = 74,
+  BIN(opt_not)                   = 74,
 
-  BIN(opt_regexpmatch2)          = 75,
+  BIN(opt_regexpmatch1)          = 75,
 
-  BIN(opt_call_c_function)       = 76,
+  BIN(opt_regexpmatch2)          = 76,
 
-  BIN(bitblt)                    = 77,
+  BIN(opt_call_c_function)       = 77,
 
-  BIN(answer)                    = 78,
+  BIN(bitblt)                    = 78,
 
-};
+  BIN(answer)                    = 79,
 
-#define VM_INSTRUCTION_SIZE 79
+  VM_INSTRUCTION_SIZE            = 80
+};
 
 /** -*-c-*-
   This file contains instruction information for yarv instruction sequence.
-  
+
   ----
   This file is auto generated by insns2vm.rb
   DO NOT TOUCH!
-  
+
   If you want to fix something, you must edit 'template/insns_info.inc.tmpl'
   or insns2vm.rb
  */
 
-#define TS_ISEQ 'S'
 #define TS_OFFSET 'O'
-#define TS_GENTRY 'G'
+#define TS_NUM 'N'
+#define TS_LINDEX 'L'
 #define TS_DINDEX 'D'
-#define TS_VARIABLE '.'
-#define TS_CDHASH 'H'
-#define TS_IC 'C'
+#define TS_VALUE 'V'
 #define TS_ID 'I'
-#define TS_NUM 'N'
+#define TS_GENTRY 'G'
+#define TS_IC 'C'
+#define TS_CDHASH 'H'
+#define TS_ISEQ 'S'
+#define TS_VARIABLE '.'
 #define TS_FUNCPTR 'F'
-#define TS_VALUE 'V'
-#define TS_LINDEX 'L'
 
 static const char *const insn_name_info[] = {
   "nop",
@@ -286,6 +287,7 @@ static const char *const insn_name_info[] = {
   "opt_aref",
   "opt_aset",
   "opt_length",
+  "opt_size",
   "opt_succ",
   "opt_not",
   "opt_regexpmatch1",
@@ -304,8 +306,8 @@ static const char *const insn_operand_info[] = {
   "V", 
   "DN", 
   "DN", 
-  "I", 
-  "I", 
+  "IC", 
+  "IC", 
   "I", 
   "I", 
   "I", 
@@ -349,27 +351,28 @@ static const char *const insn_operand_info[] = {
   "O", 
   "O", 
   "O", 
-  "CO", 
-  "CO", 
-  "O", 
+  "OC", 
+  "OC", 
+  "C", 
   "HO", 
   "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
   "C", 
   "CC", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
   "C", 
   "V", 
   "", 
@@ -387,8 +390,8 @@ static const int insn_len_info[] = {
   2,
   3,
   3,
-  2,
-  2,
+  3,
+  3,
   2,
   2,
   2,
@@ -437,22 +440,23 @@ static const int insn_len_info[] = {
   2,
   3,
   1,
-  1,
-  1,
-  1,
-  1,
-  1,
+  2,
+  2,
+  2,
+  2,
+  2,
   2,
   3,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
   2,
   2,
   1,
@@ -540,6 +544,7 @@ static const int insn_stack_push_num_info[] = {
   1,
   1,
   1,
+  1,
   0,
   1,
   1,
@@ -617,7 +622,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(concatstrings):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -626,13 +631,13 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(toregexp):{
           int inc = 0;
-        rb_num_t cnt = FIX2INT(opes[1]);
+        int cnt = FIX2INT(opes[1]);
         inc += 1 - cnt;;
         return depth + inc;
         }
         case BIN(newarray):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -641,8 +646,8 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(expandarray):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
-        rb_num_t flag = FIX2INT(opes[1]);
+        int num = FIX2INT(opes[0]);
+        int flag = FIX2INT(opes[1]);
         inc += num - 1 + (flag & 1 ? 1 : 0);;
         return depth + inc;
         }
@@ -657,7 +662,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(newhash):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -672,7 +677,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(dupn):{
           int inc = 0;
-        rb_num_t n = FIX2INT(opes[0]);
+        int n = FIX2INT(opes[0]);
         inc += n;;
         return depth + inc;
         }
@@ -696,7 +701,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(adjuststack):{
           int inc = 0;
-        rb_num_t n = FIX2INT(opes[0]);
+        int n = FIX2INT(opes[0]);
         inc -= n;
         return depth + inc;
         }
@@ -711,21 +716,21 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(send):{
           int inc = 0;
-        rb_num_t op_argc = FIX2INT(opes[1]);
-        rb_num_t op_flag = FIX2INT(opes[3]);
-        inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
+        int op_argc = FIX2INT(opes[1]);
+        int op_flag = FIX2INT(opes[3]);
+        inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
         return depth + inc;
         }
         case BIN(invokesuper):{
           int inc = 0;
-        rb_num_t op_argc = FIX2INT(opes[0]);
-        rb_num_t op_flag = FIX2INT(opes[2]);
-        inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
+        int op_argc = FIX2INT(opes[0]);
+        int op_flag = FIX2INT(opes[2]);
+        inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
         return depth + inc;
         }
         case BIN(invokeblock):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -809,6 +814,9 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         case BIN(opt_length):{
           return depth + 0;
         }
+        case BIN(opt_size):{
+          return depth + 0;
+        }
         case BIN(opt_succ):{
           return depth + 0;
         }
@@ -841,29 +849,29 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
 /* some utilities */
 
 static int
-insn_len(int insn)
+insn_len(VALUE insn)
 {
-  return insn_len_info[insn];
+  return insn_len_info[(int)insn];
 }
 
 static const char *
-insn_name(int insn)
+insn_name(VALUE insn)
 {
-  return insn_name_info[insn];
+  return insn_name_info[(int)insn];
 }
 
 static const char *
-insn_op_types(int insn)
+insn_op_types(VALUE insn)
 {
-  return insn_operand_info[insn];
+  return insn_operand_info[(int)insn];
 }
 
 static int
-insn_op_type(int insn, int pos)
+insn_op_type(VALUE insn, long pos)
 {
   int len = insn_len(insn) - 1;
   if(pos < len){
-    return insn_operand_info[insn][pos];
+    return insn_operand_info[(int)insn][pos];
   }
   else{
     return 0;
@@ -872,9 +880,9 @@ insn_op_type(int insn, int pos)
 
 #ifdef USE_INSN_RET_NUM
 static int
-insn_ret_num(int insn)
+insn_ret_num(VALUE insn)
 {
-  return insn_stack_push_num_info[insn];
+  return insn_stack_push_num_info[(int)insn];
 }
 #endif
 void

data/ext/cached/{ruby-1.9.0 → ruby-1.9.2}/internal/vm/iseq/insns_info.inc

@@ -9,27 +9,27 @@
 
 /** -*-c-*-
   This file contains instruction information for yarv instruction sequence.
-  
+
   ----
   This file is auto generated by insns2vm.rb
   DO NOT TOUCH!
-  
+
   If you want to fix something, you must edit 'template/insns_info.inc.tmpl'
   or insns2vm.rb
  */
 
-#define TS_ISEQ 'S'
 #define TS_OFFSET 'O'
-#define TS_GENTRY 'G'
+#define TS_NUM 'N'
+#define TS_LINDEX 'L'
 #define TS_DINDEX 'D'
-#define TS_VARIABLE '.'
-#define TS_CDHASH 'H'
-#define TS_IC 'C'
+#define TS_VALUE 'V'
 #define TS_ID 'I'
-#define TS_NUM 'N'
+#define TS_GENTRY 'G'
+#define TS_IC 'C'
+#define TS_CDHASH 'H'
+#define TS_ISEQ 'S'
+#define TS_VARIABLE '.'
 #define TS_FUNCPTR 'F'
-#define TS_VALUE 'V'
-#define TS_LINDEX 'L'
 
 static const char *const insn_name_info[] = {
   "nop",
@@ -104,6 +104,7 @@ static const char *const insn_name_info[] = {
   "opt_aref",
   "opt_aset",
   "opt_length",
+  "opt_size",
   "opt_succ",
   "opt_not",
   "opt_regexpmatch1",
@@ -122,8 +123,8 @@ static const char *const insn_operand_info[] = {
   "V", 
   "DN", 
   "DN", 
-  "I", 
-  "I", 
+  "IC", 
+  "IC", 
   "I", 
   "I", 
   "I", 
@@ -167,27 +168,28 @@ static const char *const insn_operand_info[] = {
   "O", 
   "O", 
   "O", 
-  "CO", 
-  "CO", 
-  "O", 
+  "OC", 
+  "OC", 
+  "C", 
   "HO", 
   "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
   "C", 
   "CC", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
-  "", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
+  "C", 
   "C", 
   "V", 
   "", 
@@ -205,8 +207,8 @@ static const int insn_len_info[] = {
   2,
   3,
   3,
-  2,
-  2,
+  3,
+  3,
   2,
   2,
   2,
@@ -255,22 +257,23 @@ static const int insn_len_info[] = {
   2,
   3,
   1,
-  1,
-  1,
-  1,
-  1,
-  1,
+  2,
+  2,
+  2,
+  2,
+  2,
   2,
   3,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
   2,
   2,
   1,
@@ -358,6 +361,7 @@ static const int insn_stack_push_num_info[] = {
   1,
   1,
   1,
+  1,
   0,
   1,
   1,
@@ -435,7 +439,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(concatstrings):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -444,13 +448,13 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(toregexp):{
           int inc = 0;
-        rb_num_t cnt = FIX2INT(opes[1]);
+        int cnt = FIX2INT(opes[1]);
         inc += 1 - cnt;;
         return depth + inc;
         }
         case BIN(newarray):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -459,8 +463,8 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(expandarray):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
-        rb_num_t flag = FIX2INT(opes[1]);
+        int num = FIX2INT(opes[0]);
+        int flag = FIX2INT(opes[1]);
         inc += num - 1 + (flag & 1 ? 1 : 0);;
         return depth + inc;
         }
@@ -475,7 +479,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(newhash):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -490,7 +494,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(dupn):{
           int inc = 0;
-        rb_num_t n = FIX2INT(opes[0]);
+        int n = FIX2INT(opes[0]);
         inc += n;;
         return depth + inc;
         }
@@ -514,7 +518,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(adjuststack):{
           int inc = 0;
-        rb_num_t n = FIX2INT(opes[0]);
+        int n = FIX2INT(opes[0]);
         inc -= n;
         return depth + inc;
         }
@@ -529,21 +533,21 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         }
         case BIN(send):{
           int inc = 0;
-        rb_num_t op_argc = FIX2INT(opes[1]);
-        rb_num_t op_flag = FIX2INT(opes[3]);
-        inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
+        int op_argc = FIX2INT(opes[1]);
+        int op_flag = FIX2INT(opes[3]);
+        inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
         return depth + inc;
         }
         case BIN(invokesuper):{
           int inc = 0;
-        rb_num_t op_argc = FIX2INT(opes[0]);
-        rb_num_t op_flag = FIX2INT(opes[2]);
-        inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
+        int op_argc = FIX2INT(opes[0]);
+        int op_flag = FIX2INT(opes[2]);
+        inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));;
         return depth + inc;
         }
         case BIN(invokeblock):{
           int inc = 0;
-        rb_num_t num = FIX2INT(opes[0]);
+        int num = FIX2INT(opes[0]);
         inc += 1 - num;;
         return depth + inc;
         }
@@ -627,6 +631,9 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
         case BIN(opt_length):{
           return depth + 0;
         }
+        case BIN(opt_size):{
+          return depth + 0;
+        }
         case BIN(opt_succ):{
           return depth + 0;
         }
@@ -659,29 +666,29 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
 /* some utilities */
 
 static int
-insn_len(int insn)
+insn_len(VALUE insn)
 {
-  return insn_len_info[insn];
+  return insn_len_info[(int)insn];
 }
 
 static const char *
-insn_name(int insn)
+insn_name(VALUE insn)
 {
-  return insn_name_info[insn];
+  return insn_name_info[(int)insn];
 }
 
 static const char *
-insn_op_types(int insn)
+insn_op_types(VALUE insn)
 {
-  return insn_operand_info[insn];
+  return insn_operand_info[(int)insn];
 }
 
 static int
-insn_op_type(int insn, int pos)
+insn_op_type(VALUE insn, long pos)
 {
   int len = insn_len(insn) - 1;
   if(pos < len){
-    return insn_operand_info[insn][pos];
+    return insn_operand_info[(int)insn][pos];
   }
   else{
     return 0;
@@ -690,9 +697,9 @@ insn_op_type(int insn, int pos)
 
 #ifdef USE_INSN_RET_NUM
 static int
-insn_ret_num(int insn)
+insn_ret_num(VALUE insn)
 {
-  return insn_stack_push_num_info[insn];
+  return insn_stack_push_num_info[(int)insn];
 }
 #endif