ruby-internal 0.7.2 → 0.7.3

data/ext/internal/vm/instruction/insns_info.c.rpp

@@ -2,6 +2,9 @@
 
 #ifdef RUBY_VM
 
+#include "iseq.h"
+#include "vm_core.h"
+
 #ruby <<END
   $:.unshift '../../..'
   require 'ruby_source_dir'

data/ext/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,30 +171,32 @@ enum ruby_vminsn_type {
 
   BIN(opt_length)                = 71,
 
-  BIN(opt_succ)                  = 72,
+  BIN(opt_size)                  = 72,
+
+  BIN(opt_succ)                  = 73,
 
-  BIN(opt_not)                   = 73,
+  BIN(opt_not)                   = 74,
 
-  BIN(opt_regexpmatch1)          = 74,
+  BIN(opt_regexpmatch1)          = 75,
 
-  BIN(opt_regexpmatch2)          = 75,
+  BIN(opt_regexpmatch2)          = 76,
 
-  BIN(opt_call_c_function)       = 76,
+  BIN(opt_call_c_function)       = 77,
 
-  BIN(bitblt)                    = 77,
+  BIN(bitblt)                    = 78,
 
-  BIN(answer)                    = 78,
+  BIN(answer)                    = 79,
 
-  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
  */
@@ -285,6 +287,7 @@ static const char *const insn_name_info[] = {
   "opt_aref",
   "opt_aset",
   "opt_length",
+  "opt_size",
   "opt_succ",
   "opt_not",
   "opt_regexpmatch1",
@@ -303,8 +306,8 @@ static const char *const insn_operand_info[] = {
   "V", 
   "DN", 
   "DN", 
-  "I", 
-  "I", 
+  "IC", 
+  "IC", 
   "I", 
   "I", 
   "I", 
@@ -348,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", 
   "", 
@@ -386,8 +390,8 @@ static const int insn_len_info[] = {
   2,
   3,
   3,
-  2,
-  2,
+  3,
+  3,
   2,
   2,
   2,
@@ -436,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,
@@ -539,6 +544,7 @@ static const int insn_stack_push_num_info[] = {
   1,
   1,
   1,
+  1,
   0,
   1,
   1,
@@ -616,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;
         }
@@ -625,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;
         }
@@ -640,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;
         }
@@ -656,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;
         }
@@ -671,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;
         }
@@ -695,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;
         }
@@ -710,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;
         }
@@ -808,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;
         }
@@ -840,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;
@@ -871,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/internal/vm/iseq/iseq.c

@@ -2,6 +2,7 @@
 #include "insns_info.inc"
 
 #include "internal/node/ruby_internal_node.h"
+#include "internal/node/global_entry.h"
 #include "internal/module/module.h"
 #include "internal/vm/instruction/instruction.h"
 
@@ -247,9 +248,12 @@ static VALUE operand_to_value(VALUE insn, int op_idx, VALUE operand)
 
     case TS_LINDEX:
     case TS_DINDEX:
-    case TS_NUM:
+    case TS_OFFSET:
       return INT2FIX(operand);
 
+    case TS_NUM:
+      return UINT2NUM(operand);
+
     case TS_ISEQ:
     {
       rb_iseq_t * iseq = (rb_iseq_t *)operand;
@@ -269,10 +273,6 @@ static VALUE operand_to_value(VALUE insn, int op_idx, VALUE operand)
       return ID2SYM(rb_intern(rb_id2name(entry->id)));
     }
 
-    case TS_OFFSET:
-      /* TODO */
-      return Qnil;
-
     case TS_VARIABLE:
       /* TODO */
       return Qnil;
@@ -549,7 +549,7 @@ void Init_iseq(void)
       "end",
       "cont",
       "sp",
-      0);
+      (void *)0);
   rb_const_set(rb_cISeq, rb_intern("CatchTableEntry"), rb_cCatchTableEntry);
 
   rb_const_set(rb_cISeq, rb_intern("CATCH_TYPE_RESCUE"), CATCH_TYPE_RESCUE);

data/ext/internal/vm/iseq/iseq_load.inc.rpp

@@ -1,8 +1,9 @@
 #ifndef ruby_internal_iseq_load__inc_
 #define ruby_internal_iseq_load__inc_
 
-#include "internal/yarv-headers/gc.h"
-#include "internal/yarv-headers/iseq.h"
+#include "gc.h"
+#include "iseq.h"
+#include "vm_core.h"
 
 #ruby <<END
   ruby_version_code = RUBY_VERSION.gsub(/\./, '').to_i
@@ -19,9 +20,11 @@
     File.open(iseq_c_location) do |input|
       input.each_line do |line|
         case line
-        when /^(iseq_load|iseq_alloc|iseq_mark|iseq_free|compile_data_free|make_compile_option|make_compile_option_value|prepare_iseq_build|cleanup_iseq_build|set_relation)/
+        when /^(iseq_load|iseq_alloc|iseq_mark|iseq_free|compile_data_free|make_compile_option|make_compile_option_value|prepare_iseq_build|cleanup_iseq_build|set_relation|iseq_memsize)/
           write = true
           puts prev_line
+        when /^static.*iseq_data_type.*=/
+          write = true
         when /^static.*COMPILE_OPTION_DEFAULT.*=/
           write = true
         when /^static.*COMPILE_OPTION_FALSE.*=/

data/ext/mkmf-ruby-internal.rb

@@ -73,7 +73,7 @@ END
       dest_file = rpp_file.sub(/\.rpp$/, '')
       append_to_makefile << <<END
 #{dest_file}: #{rpp_file} #{rb_files.join(' ')}
-\t$(RUBY) #{base_dir}/rubypp.rb #{rpp_file} #{dest_file}
+\trubypp #{rpp_file} #{dest_file}
 END
     end
 
@@ -109,3 +109,23 @@ if ruby_version_code >= 190 then
   end
 end
 
+module Kernel
+  if not method_defined?(:try_const)
+    alias_method :try_const, :try_constant
+  end
+
+  if not method_defined?(:checking_message)
+    def checking_message(checking_for, headers = nil, opt = "")
+      return checking_for
+    end
+  end
+
+  if not method_defined?(:have_const)
+    def have_const(const, headers = nil, opt = "", &b)
+      checking_for checking_message([*const].compact.join(' '), headers, opt) do
+        try_const(const, headers, opt, &b)
+      end
+    end
+  end
+end
+

data/ext/ruby_source_dir.rb

@@ -2,9 +2,13 @@ wd = Dir.pwd()
 metaconfig_dir = File.join(File.dirname(__FILE__), '..')
 Dir.chdir metaconfig_dir
 begin
-  require 'setup.rb'
+  $: << '.' # TODO: hack
+  require 'setup'
   require 'rbconfig'
-  config = ConfigTable.new(Config::CONFIG)
+  if not defined?(RbConfig) then
+    RbConfig = Config
+  end
+  config = ConfigTable.new(RbConfig::CONFIG)
   config.load_standard_entries
   config.load_script 'metaconfig'
   config.load_savefile

data/post-setup.rb

@@ -1,3 +1,4 @@
+$: << '.' # TODO: hack
 require 'run_tests'
 require 'generate_rdoc'