summaryrefslogtreecommitdiff
path: root/insns.def
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-06 07:44:28 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-06 07:44:28 +0000
commit5dfdaa92994096ac7c6713ebd77413271ff4bc41 (patch)
treee8d9634d0184a97f1d342a65b20207b03d272b20 /insns.def
parent5845bd6a718573da5f0f7e53368d2a1dda52f420 (diff)
downloadruby-5dfdaa92994096ac7c6713ebd77413271ff4bc41.tar.gz
move rb_thread_t::interrupt_flag and mask
to rb_execution_context_t. * vm_core.h (rb_thread_t): move `rb_thread_t::interrupt_flag` and `rb_thread_t::interrupt_mask` to rb_execution_context_t. RUBY_VM_CHECK_INTS() accepts `ec` instead of `th`. * cont.c (rb_fiber_terminate): to propagate interrupt information, add new parameter `need_interrupt`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r--insns.def14
1 files changed, 7 insertions, 7 deletions
diff --git a/insns.def b/insns.def
index b254193a4c..6e142ed74b 100644
--- a/insns.def
+++ b/insns.def
@@ -994,7 +994,7 @@ leave
}
}
- RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec));
+ RUBY_VM_CHECK_INTS(ec);
if (vm_pop_frame(ec, GET_CFP(), GET_EP())) {
#if OPT_CALL_THREADED_CODE
@@ -1024,7 +1024,7 @@ throw
(VALUE throwobj)
(VALUE val)
{
- RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec));
+ RUBY_VM_CHECK_INTS(ec);
val = vm_throw(ec, GET_CFP(), throw_state, throwobj);
THROW_EXCEPTION(val);
/* unreachable */
@@ -1045,7 +1045,7 @@ jump
()
()
{
- RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec));
+ RUBY_VM_CHECK_INTS(ec);
JUMP(dst);
}
@@ -1061,7 +1061,7 @@ branchif
()
{
if (RTEST(val)) {
- RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec));
+ RUBY_VM_CHECK_INTS(ec);
JUMP(dst);
}
}
@@ -1078,7 +1078,7 @@ branchunless
()
{
if (!RTEST(val)) {
- RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec));
+ RUBY_VM_CHECK_INTS(ec);
JUMP(dst);
}
}
@@ -1095,7 +1095,7 @@ branchnil
()
{
if (NIL_P(val)) {
- RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec));
+ RUBY_VM_CHECK_INTS(ec);
JUMP(dst);
}
}
@@ -1112,7 +1112,7 @@ branchiftype
()
{
if (TYPE(val) == (int)type) {
- RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec));
+ RUBY_VM_CHECK_INTS(ec);
JUMP(dst);
}
}