From 5dfdaa92994096ac7c6713ebd77413271ff4bc41 Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 6 Nov 2017 07:44:28 +0000 Subject: 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 --- insns.def | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'insns.def') 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); } } -- cgit v1.2.3