From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wjzwl-0004lz-Pi for qemu-devel@nongnu.org; Mon, 12 May 2014 19:47:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wjzwe-0002Pc-Dq for qemu-devel@nongnu.org; Mon, 12 May 2014 19:47:51 -0400 Received: from mail-qa0-x232.google.com ([2607:f8b0:400d:c00::232]:35329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wjzwe-0002PN-AU for qemu-devel@nongnu.org; Mon, 12 May 2014 19:47:44 -0400 Received: by mail-qa0-f50.google.com with SMTP id j15so7927359qaq.9 for ; Mon, 12 May 2014 16:47:43 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 12 May 2014 16:46:59 -0700 Message-Id: <1399938424-6703-6-git-send-email-rth@twiddle.net> In-Reply-To: <1399938424-6703-1-git-send-email-rth@twiddle.net> References: <1399938424-6703-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 05/10] tcg: Inline tcg_gen_helperN List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aurelien@aurel32.net Signed-off-by: Richard Henderson --- include/exec/helper-gen.h | 12 ++++++------ tcg/tcg-op.h | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index abde615..208d1d2 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -11,7 +11,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \ { \ int sizemask; \ sizemask = dh_is_64bit(ret); \ - tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 0, NULL); \ + tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 0, NULL); \ } #define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \ @@ -21,7 +21,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1 int sizemask = 0; \ dh_sizemask(ret, 0); \ dh_arg(t1, 1); \ - tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 1, args); \ + tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 1, args); \ } #define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \ @@ -33,7 +33,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1 dh_sizemask(ret, 0); \ dh_arg(t1, 1); \ dh_arg(t2, 2); \ - tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 2, args); \ + tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 2, args); \ } #define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \ @@ -46,7 +46,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1 dh_arg(t1, 1); \ dh_arg(t2, 2); \ dh_arg(t3, 3); \ - tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 3, args); \ + tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 3, args); \ } #define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \ @@ -60,7 +60,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1 dh_arg(t2, 2); \ dh_arg(t3, 3); \ dh_arg(t4, 4); \ - tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 4, args); \ + tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 4, args); \ } #define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \ @@ -76,7 +76,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ dh_arg(t3, 3); \ dh_arg(t4, 4); \ dh_arg(t5, 5); \ - tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 5, args); \ + tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 5, args); \ } #include "helper.h" diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index f4367a0..719533a 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -23,13 +23,6 @@ */ #include "tcg.h" #include "exec/helper-proto.h" - -static inline void tcg_gen_helperN(void *func, int flags, int sizemask, - TCGArg ret, int nargs, TCGArg *args) -{ - tcg_gen_callN(&tcg_ctx, func, flags, sizemask, ret, nargs, args); -} - #include "exec/helper-gen.h" int gen_new_label(void); -- 1.9.0