From patchwork Fri Feb 17 15:42:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pranith Kumar X-Patchwork-Id: 9580179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4DD20600C5 for ; Fri, 17 Feb 2017 15:42:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40C4228713 for ; Fri, 17 Feb 2017 15:42:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 357942871F; Fri, 17 Feb 2017 15:42:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B748E28713 for ; Fri, 17 Feb 2017 15:42:31 +0000 (UTC) Received: from localhost ([::1]:54353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cekg2-0007f0-5x for patchwork-qemu-devel@patchwork.kernel.org; Fri, 17 Feb 2017 10:42:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cekff-0007XA-HQ for qemu-devel@nongnu.org; Fri, 17 Feb 2017 10:42:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cekfa-0006hk-Kz for qemu-devel@nongnu.org; Fri, 17 Feb 2017 10:42:07 -0500 Received: from mail-yb0-x242.google.com ([2607:f8b0:4002:c09::242]:34899) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cekfa-0006hN-H0 for qemu-devel@nongnu.org; Fri, 17 Feb 2017 10:42:02 -0500 Received: by mail-yb0-x242.google.com with SMTP id u130so59316ybb.2 for ; Fri, 17 Feb 2017 07:42:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XXs23AlYXV37o2oqmENzrgWF0cGFg7jPeH3Dii2reDY=; b=q9FrkdlqHjyiCYS1Ypf1jwYd/YnUc+wAZeQlWyG8ilQwOOAlHXsCDMc1PXInM4yBPJ 6JMdy0cKpMyMvj8UP2iWt4J4+UbiXro9NugR/QRlw5Awd+OjMICwSPbmxA0ZezqSppky FXElskOHerlcnED/8vmMwvoHecNySYxUEUaGv/SSDtlzPV/rdwY28B+083519lWAU/H/ 0y9+JBFibodXArw1vPbg3Gm4VAXeY4BdxKAdi84rlU4FDQNUHhql8z8f3vZrjH59W3Oz bKVC0pypF3yze+x5bHihQCoK/cbWcMrsK9K37NmJOES94F7Gk2OEDZqHSCaNv4EnC71k gO6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XXs23AlYXV37o2oqmENzrgWF0cGFg7jPeH3Dii2reDY=; b=Nh9G2fIWudVH1Qw1pcRMzfQaKy9msDWdQhIy1SNVaoCwSoL23/La5d+xNUsPl+PR7E xj46MwexZqBB/57Cr93MTRtgTn9arQRDYrYz+MjY2zjoHdGp4o/anfMJ6dj5tL8tRpsX FyeSJWf2SY2azKy2oiRgzvlyAEDGhL/No/wZ/h1ip4IWwKESCT6vB0EcoAY4asS/S81+ 1gUr0E6074M7Tyrl7vl/wG3sd40jVTvlrkM+D6F+dd4Ih/fxLQ/fNlYFmdYS7krOp+xK WRDrITQj/xRAMferntwDGVInrO1w/1CzMAnNUikDpvO37HHfFZZVmKsYXkmGC1oOkFPs VCKg== X-Gm-Message-State: AMke39lKYtAcpacs2ZXGAMruJhU6MdpWdEhDnnhx8qcz7zsm1G9hDWoymuFWgES5J6OB4g== X-Received: by 10.37.24.67 with SMTP id 64mr6352247yby.0.1487346121679; Fri, 17 Feb 2017 07:42:01 -0800 (PST) Received: from localhost.localdomain (c-73-207-178-95.hsd1.ga.comcast.net. [73.207.178.95]) by smtp.gmail.com with ESMTPSA id m75sm3889363ywd.52.2017.02.17.07.42.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2017 07:42:00 -0800 (PST) From: Pranith Kumar To: alex.bennee@linaro.org Date: Fri, 17 Feb 2017 10:42:00 -0500 Message-Id: <20170217154200.10504-1-bobby.prani@gmail.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4002:c09::242 Subject: [Qemu-devel] (no subject) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Subject: [PATCH] aarch64: Change ext type to TCGType to fix warnings To fix the following warnings: In file included from /users/pranith/qemu/tcg/tcg.c:255: /users/pranith/qemu/tcg/aarch64/tcg-target.inc.c:879:24: warning: implicit conversion from enumeration type 'TCGMemOp' (aka 'enum TCGMemOp') to different enumeration type 'TCGType' (aka 'enum TCGType') [-Wenum-conversion] tcg_out_cmp(s, ext, a, b, b_const); ~~~~~~~~~~~ ^~~ /users/pranith/qemu/tcg/aarch64/tcg-target.inc.c:893:36: warning: implicit conversion from enumeration type 'TCGMemOp' (aka 'enum TCGMemOp') to different enumeration type 'TCGType' (aka 'enum TCGType') [-Wenum-conversion] tcg_out_insn(s, 3201, CBZ, ext, a, offset); ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ /users/pranith/qemu/tcg/aarch64/tcg-target.inc.c:389:65: note: expanded from macro 'tcg_out_insn' glue(tcg_out_insn_,FMT)(S, glue(glue(glue(I,FMT),_),OP), ## __VA_ARGS__) ^ /users/pranith/qemu/tcg/aarch64/tcg-target.inc.c:895:37: warning: implicit conversion from enumeration type 'TCGMemOp' (aka 'enum TCGMemOp') to different enumeration type 'TCGType' (aka 'enum TCGType') [-Wenum-conversion] tcg_out_insn(s, 3201, CBNZ, ext, a, offset); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ /users/pranith/qemu/tcg/aarch64/tcg-target.inc.c:389:65: note: expanded from macro 'tcg_out_insn' glue(tcg_out_insn_,FMT)(S, glue(glue(glue(I,FMT),_),OP), ## __VA_ARGS__) ^ /users/pranith/qemu/tcg/aarch64/tcg-target.inc.c:1610:27: warning: implicit conversion from enumeration type 'TCGType' (aka 'enum TCGType') to different enumeration type 'TCGMemOp' (aka 'enum TCGMemOp') [-Wenum-conversion] tcg_out_brcond(s, ext, a2, a0, a1, const_args[1], arg_label(args[3])); ~~~~~~~~~~~~~~ ^~~ Signed-off-by: Pranith Kumar --- tcg/aarch64/tcg-target.inc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index 6d227a5a6a..290de6dae6 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -866,7 +866,7 @@ static inline void tcg_out_goto_label(TCGContext *s, TCGLabel *l) } } -static void tcg_out_brcond(TCGContext *s, TCGMemOp ext, TCGCond c, TCGArg a, +static void tcg_out_brcond(TCGContext *s, TCGType ext, TCGCond c, TCGArg a, TCGArg b, bool b_const, TCGLabel *l) { intptr_t offset; @@ -937,7 +937,7 @@ static void tcg_out_addsubi(TCGContext *s, int ext, TCGReg rd, } } -static inline void tcg_out_addsub2(TCGContext *s, int ext, TCGReg rl, +static inline void tcg_out_addsub2(TCGContext *s, TCGType ext, TCGReg rl, TCGReg rh, TCGReg al, TCGReg ah, tcg_target_long bl, tcg_target_long bh, bool const_bl, bool const_bh, bool sub)