From patchwork Tue Mar 5 16:50:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 159678 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5186706jad; Tue, 5 Mar 2019 08:54:30 -0800 (PST) X-Google-Smtp-Source: APXvYqxe4ce/S/b+ck4J2duGyaNghaMFLX5XCjJXqG8bku6j+3kuXztb+VrNNHzqs3CxDFLzFZwD X-Received: by 2002:a81:a60e:: with SMTP id d14mr1762829ywh.7.1551804869945; Tue, 05 Mar 2019 08:54:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551804869; cv=none; d=google.com; s=arc-20160816; b=0h4oANiNr3RybJiOnh/3NdiMB3nXp5zkOCIYWjQTUZKjQ7q5NJbC3JBAJHUTyyxMRj 1i6V6pfGtlQbvidJ7y+QTDFmngwzec2xvWKpeAPD6NQS3enD/AkW7qOUjo65tJOja/Bd uPwMp7fnWaNkgxBhTwhPyOCr6Ik30qyQqXBUcr5wm6uneY36zjMm29DC3pM0RfxhgfeZ LWE/P9eIzB4Z4/QHXWURSIIbyd+q0gGAIvL3eDDNjVCCLvtc/d61uelREASUs0rGdqLX v3aBm9ur8eqAFrXYrCnKtTuX1aT0kfI8lzUGxCKGPQUZIpSyIKce0IVBvvl3rC1IEHRP 55uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=v4325gmRL4QffFle00Tby6w8CnK7f4KEu9qGRCsu9L8=; b=Yq1twNjARmCo7ZKkA6ZwBgzHZOMmFnmtjQcdTSYrMYFEKcNR497awrLC3yTQHjwAQS fQI8Tq7I7tgBlWHnxFe5CkEPtD3/qJKQXrip9UP/K1ftaXQt4zpFa5ZipQida4wfyotG BPlwRG7xudgLO7Css+lTh8tLvN2LWSpS09jsJKvu1NUmXLqfZ8KJf61w1dQ91jtXwkpF jKDpWmRmNyshEblX8PkjJIxeghx5WzvgTKkKSIkYP6R406Xuw9jgyiW4eIupRwEl/vbY zE0Ryypbub/WE8Wj2XbAW/Bvt8Eqmqiy3o5uyRjihRM64lZ4C06X01PgpPBDsXWHaruc Kyyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LS0Gr78m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b32si5413381ybi.1.2019.03.05.08.54.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2019 08:54:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LS0Gr78m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:45754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DKn-00040B-EX for patch@linaro.org; Tue, 05 Mar 2019 11:54:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DHY-0001bZ-5K for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1DHX-0000sQ-3l for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:08 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45679) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1DHW-0000rR-SF for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:07 -0500 Received: by mail-wr1-x42f.google.com with SMTP id w17so10240829wrn.12 for ; Tue, 05 Mar 2019 08:51:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=v4325gmRL4QffFle00Tby6w8CnK7f4KEu9qGRCsu9L8=; b=LS0Gr78mKUhtonYGsOow9I1mBa2UlB7NngHwRa+HEbu26Y6lf8IBeOPSgaZwm8S1Ub 2SR1sXsR+9DcWYJcaLUmRcPk7iXnWPQzwMUdK04KCrKnyqGwEsaxeY5jmNCtXfvkAIIE j+LR8cksEpwn2qnGV9ZtZTBQqRBOvXYlPE7ftb2KZ1m8ibExbeIPxQs/NE3+1zxHRLBr DqX8uqT4LhfZCKMTehIYFwFUMSB0Xv8/raNso459fjiAEABIwX8EN4O6+3ZWIf7GIseT O7waGtc3KHbixDz0Oa4bryzZHxvsceW9JLNTqhOB0RaarhqQqORyVxpv+4wwNdgfNBF6 wPkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v4325gmRL4QffFle00Tby6w8CnK7f4KEu9qGRCsu9L8=; b=i424tyekmcGozSBGq5fRDwAKO0i3pBNA27P90ndtcIPZ8ONdly5Aor/BnKk3B2KsqY qpuODqRT4wsl4/Kzlo7XYsDbj5KIyeKDs//cdox4gvwAiw8EtBCplXXMjuctFrl0rHFa 3RKOofYY/dLA+BnSClltKzawS3MyHIUPNA/6xwuLHQP9a5CzpZsqGV5e1qt3M0L/WinD adGvQw0A356QPgi6hM3KL8QuY3oylyMs5PHN/lQlvVP/ZIyfUgw+J/+5mutSxsPnnDdp URUHOAo6wAh3y1GoYznCBN6+7a0/5VsTnCfk9RbI9YLnNvsDbd+TUgbd0O4Ug0eAcmpE rhaw== X-Gm-Message-State: APjAAAUUPzEWdp2KiY+tyTqjXeE2yK0jZtH+ni8lQc8/PTMIEzYcA+i+ rm6h/LzZtlF9rvZJ9kYIrMceSHLKUJY= X-Received: by 2002:adf:fc12:: with SMTP id i18mr16737008wrr.201.1551804665612; Tue, 05 Mar 2019 08:51:05 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 2sm10071495wrg.89.2019.03.05.08.51.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 08:51:04 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2019 16:50:39 +0000 Message-Id: <20190305165051.26860-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305165051.26860-1-peter.maydell@linaro.org> References: <20190305165051.26860-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PULL 10/22] target/arm: Restructure handle_fp_1src_{single, double} 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This will allow sharing code that adjusts rmode beyond the existing users. Tested-by: Laurent Desnogues Signed-off-by: Richard Henderson Message-id: 20190301200501.16533-10-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 90 +++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 41 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 0cfd07d3abd..90336318194 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5688,55 +5688,59 @@ static void handle_fp_1src_half(DisasContext *s, int opcode, int rd, int rn) /* Floating-point data-processing (1 source) - single precision */ static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn) { + void (*gen_fpst)(TCGv_i32, TCGv_i32, TCGv_ptr); + TCGv_i32 tcg_op, tcg_res; TCGv_ptr fpst; - TCGv_i32 tcg_op; - TCGv_i32 tcg_res; + int rmode = -1; - fpst = get_fpstatus_ptr(false); tcg_op = read_fp_sreg(s, rn); tcg_res = tcg_temp_new_i32(); switch (opcode) { case 0x0: /* FMOV */ tcg_gen_mov_i32(tcg_res, tcg_op); - break; + goto done; case 0x1: /* FABS */ gen_helper_vfp_abss(tcg_res, tcg_op); - break; + goto done; case 0x2: /* FNEG */ gen_helper_vfp_negs(tcg_res, tcg_op); - break; + goto done; case 0x3: /* FSQRT */ gen_helper_vfp_sqrts(tcg_res, tcg_op, cpu_env); - break; + goto done; case 0x8: /* FRINTN */ case 0x9: /* FRINTP */ case 0xa: /* FRINTM */ case 0xb: /* FRINTZ */ case 0xc: /* FRINTA */ - { - TCGv_i32 tcg_rmode = tcg_const_i32(arm_rmode_to_sf(opcode & 7)); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - gen_helper_rints(tcg_res, tcg_op, fpst); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - tcg_temp_free_i32(tcg_rmode); + rmode = arm_rmode_to_sf(opcode & 7); + gen_fpst = gen_helper_rints; break; - } case 0xe: /* FRINTX */ - gen_helper_rints_exact(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rints_exact; break; case 0xf: /* FRINTI */ - gen_helper_rints(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rints; break; default: - abort(); + g_assert_not_reached(); } - write_fp_sreg(s, rd, tcg_res); - + fpst = get_fpstatus_ptr(false); + if (rmode >= 0) { + TCGv_i32 tcg_rmode = tcg_const_i32(rmode); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + gen_fpst(tcg_res, tcg_op, fpst); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + tcg_temp_free_i32(tcg_rmode); + } else { + gen_fpst(tcg_res, tcg_op, fpst); + } tcg_temp_free_ptr(fpst); + + done: + write_fp_sreg(s, rd, tcg_res); tcg_temp_free_i32(tcg_op); tcg_temp_free_i32(tcg_res); } @@ -5744,9 +5748,10 @@ static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn) /* Floating-point data-processing (1 source) - double precision */ static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn) { + void (*gen_fpst)(TCGv_i64, TCGv_i64, TCGv_ptr); + TCGv_i64 tcg_op, tcg_res; TCGv_ptr fpst; - TCGv_i64 tcg_op; - TCGv_i64 tcg_res; + int rmode = -1; switch (opcode) { case 0x0: /* FMOV */ @@ -5754,48 +5759,51 @@ static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn) return; } - fpst = get_fpstatus_ptr(false); tcg_op = read_fp_dreg(s, rn); tcg_res = tcg_temp_new_i64(); switch (opcode) { case 0x1: /* FABS */ gen_helper_vfp_absd(tcg_res, tcg_op); - break; + goto done; case 0x2: /* FNEG */ gen_helper_vfp_negd(tcg_res, tcg_op); - break; + goto done; case 0x3: /* FSQRT */ gen_helper_vfp_sqrtd(tcg_res, tcg_op, cpu_env); - break; + goto done; case 0x8: /* FRINTN */ case 0x9: /* FRINTP */ case 0xa: /* FRINTM */ case 0xb: /* FRINTZ */ case 0xc: /* FRINTA */ - { - TCGv_i32 tcg_rmode = tcg_const_i32(arm_rmode_to_sf(opcode & 7)); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - gen_helper_rintd(tcg_res, tcg_op, fpst); - - gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); - tcg_temp_free_i32(tcg_rmode); + rmode = arm_rmode_to_sf(opcode & 7); + gen_fpst = gen_helper_rintd; break; - } case 0xe: /* FRINTX */ - gen_helper_rintd_exact(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rintd_exact; break; case 0xf: /* FRINTI */ - gen_helper_rintd(tcg_res, tcg_op, fpst); + gen_fpst = gen_helper_rintd; break; default: - abort(); + g_assert_not_reached(); } - write_fp_dreg(s, rd, tcg_res); - + fpst = get_fpstatus_ptr(false); + if (rmode >= 0) { + TCGv_i32 tcg_rmode = tcg_const_i32(rmode); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + gen_fpst(tcg_res, tcg_op, fpst); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, fpst); + tcg_temp_free_i32(tcg_rmode); + } else { + gen_fpst(tcg_res, tcg_op, fpst); + } tcg_temp_free_ptr(fpst); + + done: + write_fp_dreg(s, rd, tcg_res); tcg_temp_free_i64(tcg_op); tcg_temp_free_i64(tcg_res); }