aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-23 08:48:41 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-23 08:48:41 +0000
commit8a203c8d44d79df4a394012bf71afd6b3ef40577 (patch)
tree4cfcfa161f4e7d11fb293dce52ff59c985934237
parentd480f6889ac7d2a04bf65cbc066a8dc82c603e03 (diff)
downloadruby-8a203c8d44d79df4a394012bf71afd6b3ef40577.tar.gz
rename th->state to th->tag_state.
* vm_core.h (rb_thread_t): rename rb_thread_t::state to tag_state to make it clear. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--cont.c4
-rw-r--r--eval_intern.h8
-rw-r--r--vm.c10
-rw-r--r--vm_core.h2
-rw-r--r--vm_eval.c2
-rw-r--r--vm_insnhelper.c11
-rw-r--r--vm_trace.c12
7 files changed, 24 insertions, 25 deletions
diff --git a/cont.c b/cont.c
index 211428620a..20e87c397b 100644
--- a/cont.c
+++ b/cont.c
@@ -413,7 +413,7 @@ cont_save_thread(rb_context_t *cont, rb_thread_t *th)
sth->local_storage = th->local_storage;
sth->safe_level = th->safe_level;
sth->raised_flag = th->raised_flag;
- sth->state = th->state;
+ sth->tag_state = th->tag_state;
sth->status = th->status;
sth->tag = th->tag;
sth->protect_tag = th->protect_tag;
@@ -561,7 +561,7 @@ cont_restore_thread(rb_context_t *cont)
th->ec.cfp = sth->ec.cfp;
th->safe_level = sth->safe_level;
th->raised_flag = sth->raised_flag;
- th->state = sth->state;
+ th->tag_state = sth->tag_state;
th->status = sth->status;
th->tag = sth->tag;
th->protect_tag = sth->protect_tag;
diff --git a/eval_intern.h b/eval_intern.h
index 5f9e57152d..a9b259a52c 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -156,12 +156,12 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
# define VAR_NOCLOBBERED(var) var
#endif
-/* clear th->state, and return the value */
+/* clear th->tag_state, and return the value */
static inline int
rb_threadptr_tag_state(rb_thread_t *th)
{
- enum ruby_tag_type state = th->state;
- th->state = 0;
+ enum ruby_tag_type state = th->tag_state;
+ th->tag_state = TAG_NONE;
return state;
}
@@ -169,7 +169,7 @@ NORETURN(static inline void rb_threadptr_tag_jump(rb_thread_t *, enum ruby_tag_t
static inline void
rb_threadptr_tag_jump(rb_thread_t *th, enum ruby_tag_type st)
{
- th->state = st;
+ th->tag_state = st;
ruby_longjmp(th->tag->buf, 1);
}
diff --git a/vm.c b/vm.c
index a41f175362..1b2088475a 100644
--- a/vm.c
+++ b/vm.c
@@ -1476,7 +1476,7 @@ vm_iter_break(rb_thread_t *th, VALUE val)
}
#endif
- th->state = TAG_BREAK;
+ th->tag_state = TAG_BREAK;
th->errinfo = (VALUE)THROW_DATA_NEW(val, target_cfp, TAG_BREAK);
TH_JUMP_TAG(th, TAG_BREAK);
}
@@ -1787,9 +1787,9 @@ vm_exec(rb_thread_t *th)
if ((state = EXEC_TAG()) == TAG_NONE) {
vm_loop_start:
result = vm_exec_core(th, initial);
- if ((state = th->state) != TAG_NONE) {
+ if ((state = th->tag_state) != TAG_NONE) {
err = (struct vm_throw_data *)result;
- th->state = TAG_NONE;
+ th->tag_state = TAG_NONE;
goto exception_handler;
}
}
@@ -1939,7 +1939,7 @@ vm_exec(rb_thread_t *th)
#endif
}
th->errinfo = Qnil;
- th->state = TAG_NONE;
+ th->tag_state = TAG_NONE;
goto vm_loop_start;
}
}
@@ -1989,7 +1989,7 @@ vm_exec(rb_thread_t *th)
catch_iseq->body->stack_max);
state = 0;
- th->state = TAG_NONE;
+ th->tag_state = TAG_NONE;
th->errinfo = Qnil;
goto vm_loop_start;
}
diff --git a/vm_core.h b/vm_core.h
index 29cc836164..6c1b9665c9 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -744,7 +744,7 @@ typedef struct rb_thread_struct {
VALUE last_status; /* $? */
/* passing state */
- enum ruby_tag_type state;
+ enum ruby_tag_type tag_state;
/* for rb_iterate */
VALUE passed_block_handler;
diff --git a/vm_eval.c b/vm_eval.c
index 5479f08dd5..ef34d124d7 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1136,7 +1136,7 @@ rb_iterate0(VALUE (* it_proc) (VALUE), VALUE data1,
rb_vm_rewind_cfp(th, cfp);
state = 0;
- th->state = TAG_NONE;
+ th->tag_state = TAG_NONE;
th->errinfo = Qnil;
if (state == TAG_RETRY) goto iter_retry;
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 9aaf881a2e..b0e565c83e 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1029,17 +1029,16 @@ vm_throw_continue(rb_thread_t *th, VALUE err)
/* continue throw */
if (FIXNUM_P(err)) {
- th->state = FIX2INT(err);
+ th->tag_state = FIX2INT(err);
}
else if (SYMBOL_P(err)) {
- th->state = TAG_THROW;
+ th->tag_state = TAG_THROW;
}
else if (THROW_DATA_P(err)) {
- th->state = THROW_DATA_STATE((struct vm_throw_data *)err);
+ th->tag_state = THROW_DATA_STATE((struct vm_throw_data *)err);
}
else {
- th->state = TAG_RAISE;
- /*th->state = FIX2INT(rb_ivar_get(err, idThrowState));*/
+ th->tag_state = TAG_RAISE;
}
return err;
}
@@ -1178,7 +1177,7 @@ vm_throw_start(rb_thread_t *const th, rb_control_frame_t *const reg_cfp, enum ru
rb_bug("isns(throw): unsupport throw type");
}
- th->state = state;
+ th->tag_state = state;
return (VALUE)THROW_DATA_NEW(throwobj, escape_cfp, state);
}
diff --git a/vm_trace.c b/vm_trace.c
index 28b067e4a2..d9997ec9cd 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -329,12 +329,12 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
if (th->trace_arg == 0 && /* check reentrant */
trace_arg->self != rb_mRubyVMFrozenCore /* skip special methods. TODO: remove it. */) {
const VALUE errinfo = th->errinfo;
- const enum ruby_tag_type outer_state = th->state;
+ const enum ruby_tag_type outer_state = th->tag_state;
const VALUE old_recursive = th->local_storage_recursive_hash;
int state = 0;
th->local_storage_recursive_hash = th->local_storage_recursive_hash_for_trace;
- th->state = TAG_NONE;
+ th->tag_state = TAG_NONE;
th->errinfo = Qnil;
th->vm->trace_running++;
@@ -366,7 +366,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
}
TH_JUMP_TAG(th, state);
}
- th->state = outer_state;
+ th->tag_state = outer_state;
}
}
}
@@ -399,8 +399,8 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg)
if (!th->trace_arg) th->trace_arg = &dummy_trace_arg;
raised = rb_threadptr_reset_raised(th);
- outer_state = th->state;
- th->state = TAG_NONE;
+ outer_state = th->tag_state;
+ th->tag_state = TAG_NONE;
TH_PUSH_TAG(th);
if ((state = TH_EXEC_TAG()) == TAG_NONE) {
@@ -419,7 +419,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg)
TH_JUMP_TAG(th, state);
}
- th->state = outer_state;
+ th->tag_state = outer_state;
return result;
}