diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-17 06:24:55 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-17 06:24:55 +0000 |
| commit | 1a960576262223e6ea1a2ead214cfaf90fc304e6 (patch) | |
| tree | 205f823f742d167a555109901757ef0150004493 /iseq.c | |
| parent | 80facdd93a6ed5519ada32b14703967866aa22f1 (diff) | |
remove `trace_` prefix insns lazily.
* vm_trace.c (update_global_event_hook): set only when tracing is added.
If tracing was off (event flags are decreased), then ignore them.
Next `trace_` prefix instruction will trace off itself (lazy tracing off).
* vm_insnhelper.c (vm_trace): trace-off for when trace is not needed.
* iseq.c (rb_iseq_trace_set): fix trace-off process (it was never off tracing).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'iseq.c')
| -rw-r--r-- | iseq.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -336,8 +336,6 @@ prepare_iseq_build(rb_iseq_t *iseq, return Qtrue; } -static void rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events); - static VALUE finish_iseq_build(rb_iseq_t *iseq) { @@ -2311,15 +2309,16 @@ rb_iseq_defined_string(enum defined_type type) return str; } -#define TRACE_INSN_P(insn) ((insn) >= VM_INSTRUCTION_SIZE/2) #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE #define INSN_CODE(insn) ((VALUE)table[insn]) +#define TRACE_INSN_P(insn, insn_encoded) ((VALUE)table[insn] != insn_encoded) #else #define INSN_CODE(insn) (insn) +#define TRACE_INSN_P(insn, insn_encoded) ((insn_encoded) >= VM_INSTRUCTION_SIZE/2) #endif -static void +void rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events) { unsigned int i; @@ -2335,17 +2334,17 @@ rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events) int insn = (int)code[i]; rb_event_flag_t events = rb_iseq_event_flags(iseq, i); + /* code represents before transformation */ + VM_ASSERT(insn < VM_INSTRUCTION_SIZE/2); + if (events & turnon_events) { - if (!TRACE_INSN_P(insn)) { + if (!TRACE_INSN_P(insn, iseq_encoded[i])) { iseq_encoded[i] = INSN_CODE(insn + VM_INSTRUCTION_SIZE/2); } - else { - /* OK */ - } } - else if (TRACE_INSN_P(insn)) { + else if (TRACE_INSN_P(insn, iseq_encoded[i])) { VM_ASSERT(insn - VM_INSTRUCTION_SIZE/2 >= 0); - iseq_encoded[i] = INSN_CODE(insn - VM_INSTRUCTION_SIZE/2); + iseq_encoded[i] = INSN_CODE(insn); } i += insn_len(insn); } |