From 08c8605de91d2f04dcb53672a2eca6bd3f77bb18 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 4 Oct 2012 13:52:20 +0000 Subject: * insns.def (getlocal, setlocal): remove old getlocal/setlocal instructions and rename getdaynmic/setdynamic instructions to getlocal/setlocal. * compile.c: ditto. * iseq.c: remove TS_DINDEX. * vm_exec.h (dindex_t): remove type definition of `dindex_t'. * tool/instruction.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- iseq.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'iseq.c') diff --git a/iseq.c b/iseq.c index a6f39bc1f7..9313f6f80e 100644 --- a/iseq.c +++ b/iseq.c @@ -981,16 +981,8 @@ insn_operand_intern(rb_iseq_t *iseq, ret = rb_sprintf("%"PRIuVALUE, op); break; - case TS_LINDEX: - { - rb_iseq_t *liseq = iseq->local_iseq; - int lidx = liseq->local_size - (int)op; - - ret = id_to_name(liseq->local_table[lidx], INT2FIX('*')); - break; - } - case TS_DINDEX:{ - if (insn == BIN(getdynamic) || insn == BIN(setdynamic)) { + case TS_LINDEX:{ + if (insn == BIN(getlocal) || insn == BIN(setlocal)) { if (pnop) { rb_iseq_t *diseq = iseq; VALUE level = *pnop, i; @@ -1312,7 +1304,7 @@ rb_iseq_disasm(VALUE self) * 0004 putobject 2 * 0006 opt_plus * 0008 dup - * 0009 setdynamic num, 0 + * 0009 setlocal num, 0 * 0012 leave * */ @@ -1516,7 +1508,6 @@ iseq_data_to_ary(rb_iseq_t *iseq) break; } case TS_LINDEX: - case TS_DINDEX: case TS_NUM: rb_ary_push(ary, INT2FIX(*seq)); break; -- cgit v1.2.3