Save&restore execution point (`pc`) in `c->cibase->pc`; fix #5261

`mrb_fiber_resume()` can be called from C; ref #3056
parent 04561cd9
...@@ -231,7 +231,7 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr ...@@ -231,7 +231,7 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr
if (vmexec) { if (vmexec) {
c->vmexec = TRUE; c->vmexec = TRUE;
value = mrb_vm_exec(mrb, c->ci->proc, c->ci->pc); value = mrb_vm_exec(mrb, c->ci->proc, c->cibase->pc);
mrb->c = old_c; mrb->c = old_c;
} }
else { else {
...@@ -357,6 +357,7 @@ mrb_fiber_yield(mrb_state *mrb, mrb_int len, const mrb_value *a) ...@@ -357,6 +357,7 @@ mrb_fiber_yield(mrb_state *mrb, mrb_int len, const mrb_value *a)
if (c->vmexec) { if (c->vmexec) {
c->vmexec = FALSE; c->vmexec = FALSE;
mrb->c->ci->acc = CI_ACC_RESUMED; mrb->c->ci->acc = CI_ACC_RESUMED;
c->cibase->pc = c->ci->pc;
c->ci--; /* pop callinfo for yield */ c->ci--; /* pop callinfo for yield */
} }
MARK_CONTEXT_MODIFY(mrb->c); MARK_CONTEXT_MODIFY(mrb->c);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment