diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 11:02:13 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 11:02:13 +0000 |
| commit | f39d5332307e87b70afd3cb661f4fb0db88642ac (patch) | |
| tree | 5ef3be1e07b3f194f6d226fd2f8c56d37b5d3256 /vm_trace.c | |
| parent | dd80f0da18562bf70e7f11fbce538fa88d4239cf (diff) | |
| download | ruby-f39d5332307e87b70afd3cb661f4fb0db88642ac.tar.gz | |
introduce EC_*_TAG() instead of TH_*_TAG()
* eval_intern.h:
introduce EC_*_TAG() macros instead of TH_*_TAG() macros.
* TH_PUSH_TAG() -> EC_PUSH_TAG()
* TH_POP_TAG() -> EC_POP_TAG()
* TH_TMPPOP_TAG() -> EC_TMPPOP_TAG()
* TH_REPUSH_TAG() -> EC_REPUSH_TAG()
* TH_EXEC_TAG() -> EC_EXEC_TAG()
* TH_JUMP_TAG() -> EC_JUMP_TAG()
rb_threadptr_tag_state() , rb_ec_tag_jump() also accept `ec` instead of `th`.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_trace.c')
| -rw-r--r-- | vm_trace.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vm_trace.c b/vm_trace.c index 11a4f34a36..ec325e166c 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -285,11 +285,11 @@ exec_hooks_protected(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t /* TODO: Support !RUBY_EVENT_HOOK_FLAG_SAFE hooks */ - TH_PUSH_TAG(th); - if ((state = TH_EXEC_TAG()) == TAG_NONE) { + EC_PUSH_TAG(th->ec); + if ((state = EC_EXEC_TAG()) == TAG_NONE) { exec_hooks_body(th, list, trace_arg); } - TH_POP_TAG(); + EC_POP_TAG(); if (raised) { rb_threadptr_set_raised(th); @@ -354,7 +354,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p) } rb_vm_pop_frame(th->ec); } - TH_JUMP_TAG(th, state); + EC_JUMP_TAG(th->ec, state); } } } @@ -388,11 +388,11 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg) raised = rb_threadptr_reset_raised(th); - TH_PUSH_TAG(th); - if ((state = TH_EXEC_TAG()) == TAG_NONE) { + EC_PUSH_TAG(th->ec); + if ((state = EC_EXEC_TAG()) == TAG_NONE) { result = (*func)(arg); } - TH_POP_TAG(); + EC_POP_TAG(); if (raised) { rb_threadptr_set_raised(th); @@ -405,7 +405,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg) #if defined RUBY_USE_SETJMPEX && RUBY_USE_SETJMPEX RB_GC_GUARD(result); #endif - TH_JUMP_TAG(th, state); + EC_JUMP_TAG(th->ec, state); } return result; @@ -1600,7 +1600,7 @@ rb_postponed_job_flush(rb_vm_t *vm) /* mask POSTPONED_JOB dispatch */ th->interrupt_mask |= block_mask; { - TH_PUSH_TAG(th); + EC_PUSH_TAG(th->ec); if (EXEC_TAG() == TAG_NONE) { int index; while ((index = vm->postponed_job_index) > 0) { @@ -1610,7 +1610,7 @@ rb_postponed_job_flush(rb_vm_t *vm) } } } - TH_POP_TAG(); + EC_POP_TAG(); } /* restore POSTPONED_JOB mask */ th->interrupt_mask &= ~(saved_mask ^ block_mask); |