From patchwork Wed Feb 6 05:28:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157571 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6012900jaa; Tue, 5 Feb 2019 21:31:19 -0800 (PST) X-Google-Smtp-Source: AHgI3IZh+0JSiHyndHZVHAUan83mIKfimkoNU5oOUP03bptAHVnueBkn//xYwHPL6J6SVr+tTUnF X-Received: by 2002:a25:2d43:: with SMTP id s3mr4148203ybe.67.1549431079676; Tue, 05 Feb 2019 21:31:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549431079; cv=none; d=google.com; s=arc-20160816; b=SBn77lYRbcaRRYcwTViZ8Fl4cowVqq88nLlatlvuIWCdsx6fMsW3t84tSKyXn/AyJl YXt2VXvBkzUfntgPOsFSpT3H1v1aGQRJyygTzOfwvgHwwRjHZBvusgG48Pa1nlTri0oX klPYX5gpfwmtrj8WT15UOv2B7wWJJgkIwnTAKKtQaSAv1b0FMY0S4jI8vabVzy4FEimF l8yOjqzixr+/1/5WloT+spAyjgL0gZNmU4agqc1kF/yjdcX5EA7eEYN38mXad6tMkQ/9 uATyYmWvjSjQVjph/R0Rz9vl2OOXGPz0zvWyxKhUEY7xA4bF0+ollZxCMv/HqQVxK4xI G9FQ== 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=zZQkf4a5k7qrShiELsVl07fSsipQr63jb6Qv20mG5js=; b=UYcFp5DdS0QqiHikofBvhrLD28MRDQUubNtK4y5lasM57lINPud8fK4j8JJ4XXbT8A 34Ed6YF5Z/dGp2O/bsqZzrF8iX8ia14WbXt3/58+5QV2QyY8KQkwKHefiVc7zr5YRjTR 9nHtqFrxR78Veby9+xITDDPoAahhbuuh4hnSIYT/K1+VKzXMYQLd5WOTNSsPevfcqApQ OTJ4CAIHb1vZ0hSGmeYnOyLQtintVixSSERLfmyZDQLRb9gZuFnd1Pgkl9Fi9WOIeJpQ K2U+aZLnSVCuXzco9TZLIODx9ZU2kDNLYtw1MAlaG808ci/90m5MyqhaWyeyGfO9H0IK egHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CcYB05ij; 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 p201si851284yba.101.2019.02.05.21.31.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 21:31:19 -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=CcYB05ij; 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]:45387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grFnr-0004dr-4k for patch@linaro.org; Wed, 06 Feb 2019 00:31:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grFlg-0003kS-MG for qemu-devel@nongnu.org; Wed, 06 Feb 2019 00:29:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grFlf-00068w-Tw for qemu-devel@nongnu.org; Wed, 06 Feb 2019 00:29:04 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:35712) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grFlf-00068e-OR for qemu-devel@nongnu.org; Wed, 06 Feb 2019 00:29:03 -0500 Received: by mail-wm1-x341.google.com with SMTP id t200so1254299wmt.0 for ; Tue, 05 Feb 2019 21:29:03 -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=zZQkf4a5k7qrShiELsVl07fSsipQr63jb6Qv20mG5js=; b=CcYB05ijfZo0uLKHeYuSvP38deJWfXO5gqxPAokbgTZdVWgKw1MwGL7CL7fmM2Px3G ize9TPxsiVw2rhiAaWSJ1VtIVVbXXg0PVHWQ7jYeyAnlLLuXltvpiV9sk5fytC/EH+50 C+b6x8kr2kmU0lseBKG7GgJ44BTLUjvam+5IpaM3lXQo8FPh73n1AXhrYAcMbh24nnF9 Ne9um2QoZHY2oeMbj3cHISEadwkCd7ZBGzPy3bJdO7qjKk6qxbVwRMNdVienOYMMAQto fw7UygnOuvenrHxNGXVbxxa3dNX1mu6tC6ZJsjk/BwTDalQPYDJoPpn22u0ytKCQ53mG mGyQ== 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=zZQkf4a5k7qrShiELsVl07fSsipQr63jb6Qv20mG5js=; b=cJTkECXRpLl8mGwMO/RJYhuUlsLMeYUkEtQhcx1Q3SooHZmNE4aaBt8SuSV+3zAUkp fB9jsz9L72aCTz9ErjyV4Mv68X+Ur6jasmbmfaD5torVbLWip2Sp5rbg1Pdcb3OSpI1N 9Q3RcEmkmMcn0ekAZf7cUNve4ndVQ0o+r6LyOYL3hVFFr1QDSAc0E5I5cQu3S5zj4xRI EO+aqAOZ6Ofq7A4MI+hin7uQpyZF/YR6TZtZdQszUXalslUuUyk4N/8zwTdYxKTRaaOa /VRvJczx+ckOmIPlZwPsym3motofF7S/0xrgXKUqbiPVo0ukn7FxbDRzwwYi26S2IgyI Yuaw== X-Gm-Message-State: AHQUAuYINUF4nKMACR1OSWJ0J9jenvzBK1cP207lg2WfCqf5Xn0JVEcH jwuUM9YJNSGJWOHQuDT159rIXUP6mUbG7w== X-Received: by 2002:a1c:dcd4:: with SMTP id t203mr1510238wmg.139.1549430942348; Tue, 05 Feb 2019 21:29:02 -0800 (PST) Received: from cloudburst.twiddle.net (host81-133-38-158.in-addr.btopenworld.com. [81.133.38.158]) by smtp.gmail.com with ESMTPSA id g9sm19057394wmg.44.2019.02.05.21.29.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Feb 2019 21:29:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 05:28:55 +0000 Message-Id: <20190206052857.5077-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190206052857.5077-1-richard.henderson@linaro.org> References: <20190206052857.5077-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v2 1/3] target/arm: Force result size into dp after operation 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" Rather than a complex set of cases testing for writeback, adjust DP after performing the operation. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) -- 2.17.2 diff --git a/target/arm/translate.c b/target/arm/translate.c index 66cf28c8cb..eb25895876 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -3970,6 +3970,7 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) tcg_gen_or_i32(tmp, tmp, tmp2); tcg_temp_free_i32(tmp2); gen_vfp_msr(tmp); + dp = 0; /* always a single precision result */ break; } case 7: /* vcvtt.f16.f32, vcvtt.f16.f64 */ @@ -3993,20 +3994,25 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) tcg_gen_or_i32(tmp, tmp, tmp2); tcg_temp_free_i32(tmp2); gen_vfp_msr(tmp); + dp = 0; /* always a single precision result */ break; } case 8: /* cmp */ gen_vfp_cmp(dp); + dp = -1; /* no write back */ break; case 9: /* cmpe */ gen_vfp_cmpe(dp); + dp = -1; /* no write back */ break; case 10: /* cmpz */ gen_vfp_cmp(dp); + dp = -1; /* no write back */ break; case 11: /* cmpez */ gen_vfp_F1_ld0(dp); gen_vfp_cmpe(dp); + dp = -1; /* no write back */ break; case 12: /* vrintr */ { @@ -4047,10 +4053,12 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) break; } case 15: /* single<->double conversion */ - if (dp) + if (dp) { gen_helper_vfp_fcvtsd(cpu_F0s, cpu_F0d, cpu_env); - else + } else { gen_helper_vfp_fcvtds(cpu_F0d, cpu_F0s, cpu_env); + } + dp = !dp; /* result size is opposite */ break; case 16: /* fuito */ gen_vfp_uito(dp, 0); @@ -4084,15 +4092,19 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) break; case 24: /* ftoui */ gen_vfp_toui(dp, 0); + dp = 0; /* always an integer result */ break; case 25: /* ftouiz */ gen_vfp_touiz(dp, 0); + dp = 0; /* always an integer result */ break; case 26: /* ftosi */ gen_vfp_tosi(dp, 0); + dp = 0; /* always an integer result */ break; case 27: /* ftosiz */ gen_vfp_tosiz(dp, 0); + dp = 0; /* always an integer result */ break; case 28: /* ftosh */ if (!arm_dc_feature(s, ARM_FEATURE_VFP3)) { @@ -4126,20 +4138,8 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) return 1; } - /* Write back the result. */ - if (op == 15 && (rn >= 8 && rn <= 11)) { - /* Comparison, do nothing. */ - } else if (op == 15 && dp && ((rn & 0x1c) == 0x18 || - (rn & 0x1e) == 0x6)) { - /* VCVT double to int: always integer result. - * VCVT double to half precision is always a single - * precision result. - */ - gen_mov_vreg_F0(0, rd); - } else if (op == 15 && rn == 15) { - /* conversion */ - gen_mov_vreg_F0(!dp, rd); - } else { + /* Write back the result, if any. */ + if (dp >= 0) { gen_mov_vreg_F0(dp, rd); }