From 03cad835932205e9ca9e11bed1e6394272ca3f5c Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 3 Aug 2016 01:50:50 +0000 Subject: * vm_core.h: introduce VM_FRAME_RUBYFRAME_P() and VM_FRAME_CFRAME_P(). Most of case, RUBY_VM_NORMAL_ISEQ_P() is no longer needed. * vm_core.h: introduce rb_obj_is_iseq(). * cont.c, vm.c: VM_FRAME_MAGIC_DUMMY with VM_FRAME_FLAG_CFRAME. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_dump.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'vm_dump.c') diff --git a/vm_dump.c b/vm_dump.c index 3e8d98e3fa..c0f0685f0b 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -240,16 +240,13 @@ vm_base_ptr(rb_control_frame_t *cfp) static void vm_stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp) { - int i; - + int i, argc = 0, local_size = 0; VALUE rstr; VALUE *sp = cfp->sp; VALUE *ep = cfp->ep; - int argc = 0, local_size = 0; - rb_iseq_t *iseq = cfp->iseq; - - if (RUBY_VM_NORMAL_ISEQ_P(iseq)) { + if (VM_FRAME_RUBYFRAME_P(cfp)) { + rb_iseq_t *iseq = cfp->iseq; argc = iseq->body->param.lead_num; local_size = iseq->body->local_size; } @@ -317,7 +314,7 @@ rb_vmdebug_debug_print_register(rb_thread_t *th) ptrdiff_t ep = cfp->ep - th->stack; ptrdiff_t cfpi; - if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) { + if (VM_FRAME_RUBYFRAME_P(cfp)) { pc = cfp->pc - cfp->iseq->body->iseq_encoded; } -- cgit v1.2.3