Commit ed9f1852 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #436 from masamitsu-murase/modify_reference_to_ci

Modify reference to ci.
parents 72bc9c8e 345ba3a6
......@@ -287,7 +287,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
val = p->body.func(mrb, self);
mrb->arena_idx = ai;
mrb_gc_protect(mrb, val);
mrb->stack = mrb->stbase + ci->stackidx;
mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb);
}
else {
......@@ -331,7 +331,7 @@ mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_v
if (MRB_PROC_CFUNC_P(p)) {
val = p->body.func(mrb, self);
mrb->stack = mrb->stbase + ci->stackidx;
mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb);
}
else {
......@@ -772,7 +772,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE;
/* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx;
regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb);
NEXT;
}
......@@ -830,7 +830,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE;
/* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx;
regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb);
NEXT;
}
......@@ -903,7 +903,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE;
/* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx;
regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb);
NEXT;
}
......@@ -1619,7 +1619,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
mrb->arena_idx = ai;
if (mrb->exc) goto L_RAISE;
/* pop stackpos */
regs = mrb->stack = mrb->stbase + ci->stackidx;
regs = mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb);
NEXT;
}
......
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