diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-17 06:59:22 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-17 06:59:22 +0000 |
| commit | c7ae8af92faf7c5566aaa2c0831a51e6b5f16e72 (patch) | |
| tree | 784dfefe4f43f3fe7d6e4e036efb828178bad167 /vm_insnhelper.c | |
| parent | 1fcdec57daea6ca1a26538b2f9ee903dd691571d (diff) | |
| download | ruby-c7ae8af92faf7c5566aaa2c0831a51e6b5f16e72.tar.gz | |
reuse gvar value.
* vm_core.h (EXEC_EVENT_HOOK_VM_TRACE): added to pass vm_event_flags
(== ruby_vm_event_flags) as a macro parameter.
* vm_insnhelper.c (vm_trace): use an added macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index b172c2d20f..5340405236 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3729,13 +3729,13 @@ vm_trace(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE *p { const rb_iseq_t *iseq = reg_cfp->iseq; size_t pos = pc - iseq->body->iseq_encoded; - rb_event_flag_t cur_event_flags = ruby_vm_event_flags; + rb_event_flag_t vm_event_flags = ruby_vm_event_flags; rb_event_flag_t events = rb_iseq_event_flags(iseq, pos); rb_event_flag_t event; - if ((events & cur_event_flags) == 0) { + if ((events & vm_event_flags) == 0) { /* disable trace */ - rb_iseq_trace_set(iseq, cur_event_flags); + rb_iseq_trace_set(iseq, vm_event_flags); return; } @@ -3752,32 +3752,31 @@ vm_trace(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE *p VM_ASSERT(reg_cfp->pc == pc); VM_ASSERT(events != 0); + VM_ASSERT(vm_event_flags & events); /* increment PC because source line is calculated with PC-1 */ - if (events & ruby_vm_event_flags) { - if (event = (events & (RUBY_EVENT_CLASS | RUBY_EVENT_CALL | RUBY_EVENT_B_CALL))) { - VM_ASSERT(event == RUBY_EVENT_CLASS || - event == RUBY_EVENT_CALL || - event == RUBY_EVENT_B_CALL); - reg_cfp->pc++; - vm_dtrace(event, ec); - EXEC_EVENT_HOOK(ec, event, GET_SELF(), 0, 0, 0, Qundef); - reg_cfp->pc--; - } - if (events & RUBY_EVENT_LINE) { - reg_cfp->pc++; - vm_dtrace(RUBY_EVENT_LINE, ec); - EXEC_EVENT_HOOK(ec, RUBY_EVENT_LINE, GET_SELF(), 0, 0, 0, Qundef); - reg_cfp->pc--; - } - if (event = (events & (RUBY_EVENT_END | RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))) { - VM_ASSERT(event == RUBY_EVENT_END || - event == RUBY_EVENT_RETURN || - event == RUBY_EVENT_B_RETURN); - reg_cfp->pc++; - vm_dtrace(RUBY_EVENT_LINE, ec); - EXEC_EVENT_HOOK(ec, event, GET_SELF(), 0, 0, 0, TOPN(0)); - reg_cfp->pc--; - } + if (event = (events & (RUBY_EVENT_CLASS | RUBY_EVENT_CALL | RUBY_EVENT_B_CALL))) { + VM_ASSERT(event == RUBY_EVENT_CLASS || + event == RUBY_EVENT_CALL || + event == RUBY_EVENT_B_CALL); + reg_cfp->pc++; + vm_dtrace(event, ec); + EXEC_EVENT_HOOK_VM_TRACE(ec, event, vm_event_flags, GET_SELF(), 0, 0, 0, Qundef); + reg_cfp->pc--; + } + if (events & RUBY_EVENT_LINE) { + reg_cfp->pc++; + vm_dtrace(RUBY_EVENT_LINE, ec); + EXEC_EVENT_HOOK_VM_TRACE(ec, RUBY_EVENT_LINE, vm_event_flags, GET_SELF(), 0, 0, 0, Qundef); + reg_cfp->pc--; + } + if (event = (events & (RUBY_EVENT_END | RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))) { + VM_ASSERT(event == RUBY_EVENT_END || + event == RUBY_EVENT_RETURN || + event == RUBY_EVENT_B_RETURN); + reg_cfp->pc++; + vm_dtrace(RUBY_EVENT_LINE, ec); + EXEC_EVENT_HOOK_VM_TRACE(ec, event, vm_event_flags, GET_SELF(), 0, 0, 0, TOPN(0)); + reg_cfp->pc--; } } |