diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | cont.c | 9 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Jul 7 01:52:14 2015 Koichi Sasada <ko1@atdot.net> + + * cont.c (fiber_init): initialize control frame correctly. + This fix does not affect any ordinal execution, but + affects debug prints. + Mon Jul 6 17:59:05 2015 Koichi Sasada <ko1@atdot.net> * vm_insnhelper.c (vm_search_super_method): do not skip calling @@ -1196,14 +1196,15 @@ fiber_init(VALUE fibval, VALUE proc) th->cfp = (void *)(th->stack + th->stack_size); th->cfp--; th->cfp->pc = 0; - th->cfp->sp = th->stack + 1; + th->cfp->sp = th->stack + 2; #if VM_DEBUG_BP_CHECK th->cfp->bp_check = 0; #endif - th->cfp->ep = th->stack; - *th->cfp->ep = VM_ENVVAL_BLOCK_PTR(0); + th->cfp->ep = th->stack + 1; + th->cfp->ep[ 0] = VM_ENVVAL_BLOCK_PTR(0); + th->cfp->ep[-1] = 0; th->cfp->self = Qnil; - th->cfp->flag = 0; + th->cfp->flag = VM_FRAME_MAGIC_DUMMY | VM_FRAME_FLAG_FINISH; th->cfp->iseq = 0; th->cfp->proc = 0; th->cfp->block_iseq = 0; |