diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tool/instruction.rb | 14 | ||||
| -rw-r--r-- | vm.h | 1 | ||||
| -rw-r--r-- | vm_core.h | 2 |
4 files changed, 19 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Fri May 23 12:23:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_core.h (rb_num_t): moved form vm.h. + + * tool/instruction.rb (RubyVM::Instruction#sp_increase_c_expr), + tool/instruction.rb (RubyVM::VmBodyGenerator#make_header_operands): + omit unused variables. + Fri May 23 06:15:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * iseq.c (rb_iseq_compile_with_option): get rid of segv. diff --git a/tool/instruction.rb b/tool/instruction.rb index 4612e7ec99..f270a18520 100644 --- a/tool/instruction.rb +++ b/tool/instruction.rb @@ -66,13 +66,14 @@ module RubyVM ret = "int inc = 0;\n" @opes.each_with_index{|(t, v), i| - if t == 'rb_num_t' - ret << " unsigned long #{v} = FIX2INT(opes[#{i}]);\n" + if t == 'rb_num_t' && ((re = /\b#{v}\b/n) =~ @sp_inc || + @defopes.any?{|t, val| re =~ val}) + ret << " #{t} #{v} = FIX2INT(opes[#{i}]);\n" end } @defopes.each_with_index{|((t, var), val), i| - if t == 'rb_num_t' && val != '*' - ret << " unsigned long #{var} = #{val};\n" + if t == 'rb_num_t' && val != '*' && /\b#{var}\b/ =~ @sp_inc + ret << " #{t} #{var} = #{val};\n" end } @@ -707,7 +708,10 @@ module RubyVM break end - ops << " #{type} #{var} = (#{type})GET_OPERAND(#{i+1});" + re = /\b#{var}\b/n + if re =~ insn.body or re =~ insn.sp_inc or insn.rets.any?{|t, v| re =~ v} + ops << " #{type} #{var} = (#{type})GET_OPERAND(#{i+1});" + end n += 1 } @opn = n @@ -13,7 +13,6 @@ #define RUBY_VM_H typedef long OFFSET; -typedef unsigned long rb_num_t; typedef unsigned long lindex_t; typedef unsigned long dindex_t; typedef rb_num_t GENTRY; @@ -88,6 +88,8 @@ #define UNLIKELY(x) (x) #endif /* __GNUC__ >= 3 */ +typedef unsigned long rb_num_t; + #define ISEQ_TYPE_TOP INT2FIX(1) #define ISEQ_TYPE_METHOD INT2FIX(2) #define ISEQ_TYPE_BLOCK INT2FIX(3) |