diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | insnhelper.ci | 30 |
2 files changed, 19 insertions, 15 deletions
@@ -1,3 +1,7 @@ +Sun Aug 26 06:04:13 2007 Koichi Sasada <ko1@atdot.net> + + * insnhelper.ci (vm_setup_method): reorder code for branch prediction. + Sun Aug 26 05:54:49 2007 Koichi Sasada <ko1@atdot.net> * insnhelper.ci (vm_call_method): fix to relaxant safe level check diff --git a/insnhelper.ci b/insnhelper.ci index 7f1a8ef6f2..d0c9306ea0 100644 --- a/insnhelper.ci +++ b/insnhelper.ci @@ -425,17 +425,9 @@ vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, /* stack overflow check */ CHECK_STACK_OVERFLOW(cfp, iseq->stack_max + 0x10); - if (flag & VM_CALL_TAILCALL_BIT) { - VALUE *p_rsp; - cfp = ++th->cfp; /* pop cf */ - p_rsp = th->cfp->sp; - - /* copy arguments */ - for (i=0; i < (sp - rsp); i++) { - p_rsp[i] = rsp[i]; - } - - sp -= rsp - p_rsp; + if (LIKELY(!(flag & VM_CALL_TAILCALL_BIT))) { + if (0) printf("local_size: %d, arg_size: %d\n", + iseq->local_size, iseq->arg_size); /* clear local variables */ for (i = 0; i < iseq->local_size - iseq->arg_size; i++) { @@ -445,10 +437,20 @@ vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, vm_push_frame(th, iseq, FRAME_MAGIC_METHOD, recv, (VALUE) blockptr, iseq->iseq_encoded + opt_pc, sp, 0, 0); + + cfp->sp = rsp - 1 /* recv */; } else { - if (0) printf("local_size: %d, arg_size: %d\n", - iseq->local_size, iseq->arg_size); + VALUE *p_rsp; + cfp = ++th->cfp; /* pop cf */ + p_rsp = th->cfp->sp; + + /* copy arguments */ + for (i=0; i < (sp - rsp); i++) { + p_rsp[i] = rsp[i]; + } + + sp -= rsp - p_rsp; /* clear local variables */ for (i = 0; i < iseq->local_size - iseq->arg_size; i++) { @@ -458,8 +460,6 @@ vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, vm_push_frame(th, iseq, FRAME_MAGIC_METHOD, recv, (VALUE) blockptr, iseq->iseq_encoded + opt_pc, sp, 0, 0); - - cfp->sp = rsp - 1 /* recv */; } } |