1 files changed, 26 insertions, 20 deletions

diff --git a/src/vm.c b/src/vm.c
index c9e80e0ed..cdef6ab2d 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1,4 +1,4 @@
-/*
+ /*
 ** vm.c - virtual machine for mruby
 **
 ** See Copyright Notice in mruby.h
@@ -92,12 +92,12 @@ stack_init(mrb_state *mrb)
 {
   struct mrb_context *c = mrb->c;
 
-  /* assert(mrb->stack == NULL); */
+  /* mrb_assert(mrb->stack == NULL); */
   c->stbase = (mrb_value *)mrb_calloc(mrb, STACK_INIT_SIZE, sizeof(mrb_value));
   c->stend = c->stbase + STACK_INIT_SIZE;
   c->stack = c->stbase;
 
-  /* assert(ci == NULL); */
+  /* mrb_assert(ci == NULL); */
   c->cibase = (mrb_callinfo *)mrb_calloc(mrb, CALLINFO_INIT_SIZE, sizeof(mrb_callinfo));
   c->ciend = c->cibase + CALLINFO_INIT_SIZE;
   c->ci = c->cibase;
@@ -205,6 +205,9 @@ top_env(mrb_state *mrb, struct RProc *proc)
   return e;
 }
 
+#define CI_ACC_SKIP    -1
+#define CI_ACC_DIRECT  -2
+
 static mrb_callinfo*
 cipush(mrb_state *mrb)
 {
@@ -260,7 +263,7 @@ ecall(mrb_state *mrb, int i)
   ci = cipush(mrb);
   ci->stackidx = mrb->c->stack - mrb->c->stbase;
   ci->mid = ci[-1].mid;
-  ci->acc = -1;
+  ci->acc = CI_ACC_SKIP;
   ci->argc = 0;
   ci->proc = p;
   ci->nregs = p->body.irep->nregs;
@@ -362,14 +365,13 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
     ci->proc = p;
     ci->stackidx = mrb->c->stack - mrb->c->stbase;
     ci->argc = argc;
-    ci->target_class = p->target_class;
+    ci->target_class = c;
     if (MRB_PROC_CFUNC_P(p)) {
       ci->nregs = argc + 2;
     }
     else {
       ci->nregs = p->body.irep->nregs + n;
     }
-    ci->acc = -1;
     mrb->c->stack = mrb->c->stack + n;
 
     stack_extend(mrb, ci->nregs, 0);
@@ -385,12 +387,15 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
 
     if (MRB_PROC_CFUNC_P(p)) {
       int ai = mrb_gc_arena_save(mrb);
+
+      ci->acc = CI_ACC_DIRECT;
       val = p->body.func(mrb, self);
-      mrb_gc_arena_restore(mrb, ai);
       mrb->c->stack = mrb->c->stbase + mrb->c->ci->stackidx;
       cipop(mrb);
+      mrb_gc_arena_restore(mrb, ai);
     }
     else {
+      ci->acc = CI_ACC_SKIP;
       val = mrb_run(mrb, p, self);
     }
   }
@@ -429,7 +434,7 @@ mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_v
   else {
     ci->nregs = p->body.irep->nregs + 1;
   }
-  ci->acc = -1;
+  ci->acc = CI_ACC_SKIP;
   mrb->c->stack = mrb->c->stack + n;
 
   stack_extend(mrb, ci->nregs, 0);
@@ -544,7 +549,7 @@ void mrb_gv_val_set(mrb_state *mrb, mrb_sym sym, mrb_value val);
 mrb_value
 mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
 {
-  /* assert(mrb_proc_cfunc_p(proc)) */
+  /* mrb_assert(mrb_proc_cfunc_p(proc)) */
   mrb_irep *irep = proc->body.irep;
   mrb_code *pc = irep->iseq;
   mrb_value *pool = irep->pool;
@@ -897,12 +902,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
       else {
         ci->argc = n;
       }
-      if (c->tt == MRB_TT_ICLASS) {
-        ci->target_class = c->c;
-      }
-      else {
-        ci->target_class = c;
-      }
+      ci->target_class = c;
 
       ci->pc = pc + 1;
       ci->acc = a;
@@ -1054,7 +1054,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
       else {
         ci->argc = n;
       }
-      ci->target_class = m->target_class;
+      ci->target_class = c;
       ci->pc = pc + 1;
 
       /* prepare stack */
@@ -1259,9 +1259,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
           cipop(mrb);
           ci = mrb->c->ci;
           mrb->c->stack = mrb->c->stbase + ci[1].stackidx;
-          if (ci[1].acc < 0 && prev_jmp) {
+          if (ci[1].acc == CI_ACC_SKIP && prev_jmp) {
             mrb->jmp = prev_jmp;
-            longjmp(*(jmp_buf*)mrb->jmp, 1);
+            mrb_longjmp(mrb);
           }
           while (eidx > ci->eidx) {
             ecall(mrb, --eidx);
@@ -1339,7 +1339,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
         acc = ci->acc;
         pc = ci->pc;
         regs = mrb->c->stack = mrb->c->stbase + ci->stackidx;
-        if (acc < 0) {
+        if (acc == CI_ACC_SKIP) {
           mrb->jmp = prev_jmp;
           return v;
         }
@@ -1384,7 +1384,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
       /* replace callinfo */
       ci = mrb->c->ci;
       ci->mid = mid;
-      ci->target_class = m->target_class;
+      ci->target_class = c;
       if (n == CALL_MAXARGS) {
         ci->argc = -1;
       }
@@ -2127,3 +2127,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
   }
   END_DISPATCH;
 }
+
+void
+mrb_longjmp(mrb_state *mrb)
+{
+  longjmp(*(jmp_buf*)mrb->jmp, 1);
+}