admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2188 from takeru/dont_reset_ridx_eidx

Browse Source 
Don't reset ridx,eidx. And fix for #1949
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-05-04 22:58:53 +09:00
parent 14fe510494 b59ac841af
commit f0be02fcf2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+4 -6
View File
@@ -2251,10 +2251,10 @@ RETRY_TRY_BLOCK:
/* stop VM */
L_STOP:
{
int n = mrb->c->ci->eidx;
while (n--) {
ecall(mrb, n);
int eidx_stop = mrb->c->ci == mrb->c->cibase ? 0 : mrb->c->ci[-1].eidx;
int eidx = mrb->c->ci->eidx;
while (eidx > eidx_stop) {
ecall(mrb, --eidx);
}
}
ERR_PC_CLR(mrb);
@@ -2307,8 +2307,6 @@ mrb_toplevel_run(mrb_state *mrb, struct RProc *proc)
}
ci = cipush(mrb);
ci->acc = CI_ACC_SKIP;
ci->eidx = 0;
ci->ridx = 0;
ci->target_class = mrb->object_class;
v = mrb_context_run(mrb, proc, mrb_top_self(mrb), 0);
cipop(mrb);