From 59432db7f7c5a4408dc413e476eeb48904b977ad Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 23 May 2008 03:23:08 +0000 Subject: * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/instruction.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tool') 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 -- cgit v1.2.3