From a91e91c537bf77afc49c2aef4b65d91237cbd786 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 15 Oct 2012 17:22:57 +0000
Subject: * vm_core.h (VM_CALL_*): rename VM_CALL_*_BIT   to VM_CALL_* (remove
 `_BIT' suffix).   Add comments on each macros.   Remove unused macro
 VM_CALL_TAILRECURSION_BIT. * compile.c, iseq.c, insns.def, vm_insnhelper.c:
 ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 insns.def | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'insns.def')

diff --git a/insns.def b/insns.def
index 6e516fbd8d..19218d66c8 100644
--- a/insns.def
+++ b/insns.def
@@ -959,12 +959,12 @@ DEFINE_INSN
 send
 (CALL_INFO ci)
 (...)
-(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
+(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
 {
     ci->argc = ci->orig_argc;
     ci->blockptr = 0;
 
-    if (!LIKELY(ci->flag & VM_CALL_ARGS_SKIP_SETUP)) {
+    if (UNLIKELY(!(ci->flag & VM_CALL_ARGS_SKIP_SETUP))) {
 	vm_caller_setup_args(th, reg_cfp, ci);
     }
     vm_search_method(ci, ci->recv = TOPN(ci->argc));
@@ -980,12 +980,12 @@ DEFINE_INSN
 invokesuper
 (CALL_INFO ci)
 (...)
-(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
+(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
 {
     ci->argc = ci->orig_argc;
-    ci->blockptr = !(ci->flag & VM_CALL_ARGS_BLOCKARG_BIT) ? GET_BLOCK_PTR() : 0;
+    ci->blockptr = !(ci->flag & VM_CALL_ARGS_BLOCKARG) ? GET_BLOCK_PTR() : 0;
 
-    if (!LIKELY(ci->flag & VM_CALL_ARGS_SKIP_SETUP)) {
+    if (UNLIKELY(!(ci->flag & VM_CALL_ARGS_SKIP_SETUP))) {
 	vm_caller_setup_args(th, reg_cfp, ci);
     }
     ci->recv = GET_SELF();
-- 
cgit v1.2.3

