From patchwork Sat Feb 23 01:22:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159084 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2391100jaa; Fri, 22 Feb 2019 17:22:36 -0800 (PST) X-Google-Smtp-Source: AHgI3Ibw4hpc4HpeK3BEfz5ec4h0wtmeAGgiGMZ/opGZjjGaO1iihGs1fF5vt2aN0W0Vju+WZcQl X-Received: by 2002:a81:b189:: with SMTP id p131mr5824942ywh.84.1550884955994; Fri, 22 Feb 2019 17:22:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550884955; cv=none; d=google.com; s=arc-20160816; b=z7ZQd4UXKL0ShOR7zP6ANWymohX4KOYbyQT2IDk2ees9wyln9oikupke3hDctcbI6J z40HbWSjo4CtpG6zoy/QDgrz9MTLB4mnnz1mFJBlv2LA5WMMuU7xJyMi7L/c8D6hnl0c 9f6ykNf7YKSM3mucMypQD2lW/J0aBc3KKuUwy+8n07Z/qnZ1Z/I0in3tXuDdLPhMrx5O Z0gcBgBqrs9GzNODGqQmVnbyIft9Wt6pklM4898P9hIqYrG+9LNYbE8uvvcGuew/ltuP inNK2IY5jhLi0R/Vqc4mQf3fhMRdF4kxD/UsZ3x4JoyvVaizY7321wOKdmlT3OcY5pVA v8iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=mC+SpBVBrDJzRk6F8MWOq394R2QevDYVB9531egPSiM=; b=S6aeobJni24uMf5u9Oqx1Lt1i5GLNSIhJAUHUMuElbf5Powt4pl+U9or2eoFKWLOGh cQ20GMUbLxPeqJ0jdELOuxl9SJ3dyuRAFJXcYTYRMXTRxiDLIYAINqNaHpYVBx+JJ9yR +XenwWGnxAI3o5KToM1vKbptA5TdP4ZAymfuQs1Snehp1uq7OT3kMB7MX9+KCew/YC4F MZ8A9rcOaQgXbr0RpeJw3/TVfS/ubAotjB/mJxAdOb+SNHt5Ll6HisdIkSWwL+xv06nA pRZgNl/m3z2jdX1HkhrfL1FXzUvV4sxFsOGA+yJem4hTPv39AGAGJx1yhNgTjGnPX+qT b0qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zNAuy8AT; 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 n16si2005156ywh.128.2019.02.22.17.22.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Feb 2019 17:22:35 -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=zNAuy8AT; 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]:59402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxM1T-0008JB-FH for patch@linaro.org; Fri, 22 Feb 2019 20:22:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxM17-0008IZ-0f for qemu-devel@nongnu.org; Fri, 22 Feb 2019 20:22:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxM15-0000Td-Tw for qemu-devel@nongnu.org; Fri, 22 Feb 2019 20:22:13 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:34047) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxM15-0000OU-Lf for qemu-devel@nongnu.org; Fri, 22 Feb 2019 20:22:11 -0500 Received: by mail-pl1-x630.google.com with SMTP id d15so1859014plr.1 for ; Fri, 22 Feb 2019 17:22:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mC+SpBVBrDJzRk6F8MWOq394R2QevDYVB9531egPSiM=; b=zNAuy8ATtn7pMyAcNpdY3Ylfl3BR6zRPqRQ0eD801A6SfLrR9Kv1rKtrt99cQj48VS r7TONhfCX1XBBpFsjKeaFqUm87LVLY4KhvHjj93QGNMlMYi80W/w/p0iFQNwd2on06xQ Yd6dg3+PoVli5W2X8HJW3ZIl2u1tQLdERXfLXUHF5kIANX3Q6aqSx2MvzrAwfvm4MUX4 vbBtlsZXEzZXkancR2I0PSrGzpn5QC4O0iMyGEk7YDedwdCKaY8W9Rb1ZMA/4vwsl/EV VFSDPB42Xb1HHKPMRAFgAgLsqL6VFTcuy0QcP3hp3ONZ90IqROGTZ4aQsx6t5pg7KXmY 7A/A== 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:in-reply-to :references; bh=mC+SpBVBrDJzRk6F8MWOq394R2QevDYVB9531egPSiM=; b=XkQOqkSUZDL8I9jFi7kBkEd1SDlkbly5wUK0uPGzbE31Uh5qNTwvLmWAsfVAcLOl1m RopBJgjj7kJPzzwLfZAf2hVFie1/GWr50jM8fF6hgSYBgZpmygZfoMlK+q8sjRWjoehR aT8dfZ2vcGgt1QyhqCFXjUbITBqBeDfjVCX7wbFpuuHrzgyEY9bi6M3+rgh3yey/Z7FB bD0gDaJmMrVQZxhAF/Xy6zwpyWjbFTfAMGBbtYVbtCSHClcfU/QOrwb8+YrxGsaY2vk9 i0dYXy37576T8jMUIPb7qZJB0rTi10IQq+TNAHgrPk6Yd9ewO3A8FHdhaCe5EE8jJfxI do/Q== X-Gm-Message-State: AHQUAuaInkRgjn2Oot6LN5cuHIEo1uMZSCX4Py8ovW83D5bqIwABKHCN MY9sIAhR1ElIbyAE2QWiE7zJGPJYb2g= X-Received: by 2002:a17:902:e90b:: with SMTP id cs11mr6902533plb.197.1550884930034; Fri, 22 Feb 2019 17:22:10 -0800 (PST) Received: from localhost.localdomain (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id m67sm5607497pfj.70.2019.02.22.17.22.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 17:22:09 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2019 17:22:05 -0800 Message-Id: <20190223012206.30498-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190223012206.30498-1-richard.henderson@linaro.org> References: <20190223012206.30498-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::630 Subject: [Qemu-devel] [PATCH 1/2] 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will allow sharing code that adjusts rmode beyond the existing users. Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 90 +++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 41 deletions(-) -- 2.17.1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index d3c8eaf089..fcbf6b16cf 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5505,55 +5505,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); } @@ -5561,9 +5565,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 */ @@ -5571,48 +5576,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); }