summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-23 03:23:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-23 03:23:08 +0000
commit59432db7f7c5a4408dc413e476eeb48904b977ad (patch)
tree0371cc5a898f2a2661983d5cceee26aede16119e
parent39a86bf60a2bf8f69e4385e9a593c4ca7749a1c5 (diff)
* 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
-rw-r--r--ChangeLog8
-rw-r--r--tool/instruction.rb14
-rw-r--r--vm.h1
-rw-r--r--vm_core.h2
4 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ea9f685..70f6c6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 4612e7e..f270a18 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
diff --git a/vm.h b/vm.h
index e3c1df1..cb2db32 100644
--- a/vm.h
+++ b/vm.h
@@ -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;
diff --git a/vm_core.h b/vm_core.h
index e19ff4e..566c096 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -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)