From patchwork Tue May 27 19:12:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 353081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44F2C140093 for ; Wed, 28 May 2014 05:16:21 +1000 (EST) Received: from localhost ([::1]:37291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpMrD-0006x3-5W for incoming@patchwork.ozlabs.org; Tue, 27 May 2014 15:16:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpMoc-000421-Hk for qemu-devel@nongnu.org; Tue, 27 May 2014 15:13:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpMoW-0007PG-Gx for qemu-devel@nongnu.org; Tue, 27 May 2014 15:13:38 -0400 Received: from mail-vc0-x229.google.com ([2607:f8b0:400c:c03::229]:49587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpMoW-0007P0-AL for qemu-devel@nongnu.org; Tue, 27 May 2014 15:13:32 -0400 Received: by mail-vc0-f169.google.com with SMTP id ij19so11304678vcb.0 for ; Tue, 27 May 2014 12:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=6GT6rBq71WWn8AYmFfjbn9zoLQf5QKh1+a4+3ElfFLQ=; b=Wp+1Ls7Mm80brI1c7zcWHbM0ntv9WOfh9axYi4v4TYYcdbuKXXG1FeAEX6L7egrtVa J38ylqFDLogOYwULNbCjX18iaD1tv3SWUmmRSvYHIFU87R0qT6eKeTXUG7FR8bRFIw30 vrhQCKjrf/eGj+rBa6STPG2D/l8JKs/PZdwq/+bHvN7AZdtpKJg9+wsz2usIwZrVfYXr P1km5EY32G1A9Vp3Hi7lC1XswVKqWRQGbtCxzEeOtTwRNpQb8MGRpK2pmBCOLQbJ8vBc r66cDFkvSUf+E0prVJ9p7Iz9906UfRh0JtM6QwYGHcsph6DzKBiEF75c7qYJd5e8uqwg PYmw== X-Received: by 10.220.195.196 with SMTP id ed4mr3309632vcb.42.1401218011467; Tue, 27 May 2014 12:13:31 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id c7sm16924148vei.16.2014.05.27.12.13.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 May 2014 12:13:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 27 May 2014 12:12:33 -0700 Message-Id: <1401217965-28228-7-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1401217965-28228-1-git-send-email-rth@twiddle.net> References: <1401217965-28228-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400c:c03::229 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 06/18] tcg: Move side effects out of dh_sizemask X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Moving them into dh_arg instead. Signed-off-by: Richard Henderson --- include/exec/helper-gen.h | 18 ++++++------------ include/exec/helper-head.h | 5 ++--- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 208d1d2..21089aa 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -9,8 +9,7 @@ #define DEF_HELPER_FLAGS_0(name, flags, ret) \ static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \ { \ - int sizemask; \ - sizemask = dh_is_64bit(ret); \ + int sizemask = dh_sizemask(ret, 0); \ tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 0, NULL); \ } @@ -18,8 +17,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1)) \ { \ TCGArg args[1]; \ - int sizemask = 0; \ - dh_sizemask(ret, 0); \ + int sizemask = dh_sizemask(ret, 0); \ dh_arg(t1, 1); \ tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 1, args); \ } @@ -29,8 +27,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1 dh_arg_decl(t2, 2)) \ { \ TCGArg args[2]; \ - int sizemask = 0; \ - dh_sizemask(ret, 0); \ + int sizemask = dh_sizemask(ret, 0); \ dh_arg(t1, 1); \ dh_arg(t2, 2); \ tcg_gen_callN(&tcg_ctx, HELPER(name), flags, sizemask, dh_retvar(ret), 2, args); \ @@ -41,8 +38,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1 dh_arg_decl(t2, 2), dh_arg_decl(t3, 3)) \ { \ TCGArg args[3]; \ - int sizemask = 0; \ - dh_sizemask(ret, 0); \ + int sizemask = dh_sizemask(ret, 0); \ dh_arg(t1, 1); \ dh_arg(t2, 2); \ dh_arg(t3, 3); \ @@ -54,8 +50,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1 dh_arg_decl(t2, 2), dh_arg_decl(t3, 3), dh_arg_decl(t4, 4)) \ { \ TCGArg args[4]; \ - int sizemask = 0; \ - dh_sizemask(ret, 0); \ + int sizemask = dh_sizemask(ret, 0); \ dh_arg(t1, 1); \ dh_arg(t2, 2); \ dh_arg(t3, 3); \ @@ -69,8 +64,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ dh_arg_decl(t4, 4), dh_arg_decl(t5, 5)) \ { \ TCGArg args[5]; \ - int sizemask = 0; \ - dh_sizemask(ret, 0); \ + int sizemask = dh_sizemask(ret, 0); \ dh_arg(t1, 1); \ dh_arg(t2, 2); \ dh_arg(t3, 3); \ diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h index 0b5bd83..253e4d5 100644 --- a/include/exec/helper-head.h +++ b/include/exec/helper-head.h @@ -109,12 +109,11 @@ #define dh_is_signed(t) dh_is_signed_##t #define dh_sizemask(t, n) \ - sizemask |= dh_is_64bit(t) << (n*2); \ - sizemask |= dh_is_signed(t) << (n*2+1) + ((dh_is_64bit(t) << (n*2)) | (dh_is_signed(t) << (n*2+1))) #define dh_arg(t, n) \ args[n - 1] = glue(GET_TCGV_, dh_alias(t))(glue(arg, n)); \ - dh_sizemask(t, n) + sizemask |= dh_sizemask(t, n) #define dh_arg_decl(t, n) glue(TCGv_, dh_alias(t)) glue(arg, n)