From patchwork Fri Oct 2 12:24:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 525487 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 456761402B6 for ; Fri, 2 Oct 2015 23:14:44 +1000 (AEST) Received: from localhost ([::1]:59478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi0Ac-0001IT-8G for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2015 09:14:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhzO3-0003QI-Qn for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:24:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhzNz-00078u-BL for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:24:31 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:12313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhzNz-00078e-5I for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:24:27 -0400 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id B7FB48495B4A; Fri, 2 Oct 2015 13:24:23 +0100 (IST) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 2 Oct 2015 13:24:26 +0100 Received: from jhogan-linux.le.imgtec.org (192.168.154.110) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Fri, 2 Oct 2015 13:24:25 +0100 From: James Hogan To: Date: Fri, 2 Oct 2015 13:24:12 +0100 Message-ID: <1443788657-14537-2-git-send-email-james.hogan@imgtec.com> X-Mailer: git-send-email 2.4.9 In-Reply-To: <1443788657-14537-1-git-send-email-james.hogan@imgtec.com> References: <1443788657-14537-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.154.110] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Cc: James Hogan , Leon Alrae , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH v3 1/6] tcg-opc.h: Simplify debug_insn_start def 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 We already have a TLADDR_ARGS definition, so rearrange the order slightly and use it in the definition of debug_insn_start, instead of having an #ifdef. Signed-off-by: James Hogan Reviewed-by: Richard Henderson Reviewed-by: Aurelien Jarno --- tcg/tcg-opc.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tcg/tcg-opc.h b/tcg/tcg-opc.h index 02bbf3038709..f72ce9bf195a 100644 --- a/tcg/tcg-opc.h +++ b/tcg/tcg-opc.h @@ -174,17 +174,13 @@ DEF(muluh_i64, 1, 2, 0, IMPL(TCG_TARGET_HAS_muluh_i64)) DEF(mulsh_i64, 1, 2, 0, IMPL(TCG_TARGET_HAS_mulsh_i64)) /* QEMU specific */ -#if TARGET_LONG_BITS > TCG_TARGET_REG_BITS -DEF(debug_insn_start, 0, 0, 2, TCG_OPF_NOT_PRESENT) -#else -DEF(debug_insn_start, 0, 0, 1, TCG_OPF_NOT_PRESENT) -#endif -DEF(exit_tb, 0, 0, 1, TCG_OPF_BB_END) -DEF(goto_tb, 0, 0, 1, TCG_OPF_BB_END) - #define TLADDR_ARGS (TARGET_LONG_BITS <= TCG_TARGET_REG_BITS ? 1 : 2) #define DATA64_ARGS (TCG_TARGET_REG_BITS == 64 ? 1 : 2) +DEF(debug_insn_start, 0, 0, TLADDR_ARGS, TCG_OPF_NOT_PRESENT) +DEF(exit_tb, 0, 0, 1, TCG_OPF_BB_END) +DEF(goto_tb, 0, 0, 1, TCG_OPF_BB_END) + DEF(qemu_ld_i32, 1, TLADDR_ARGS, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS) DEF(qemu_st_i32, 0, TLADDR_ARGS + 1, 1,