From patchwork Fri Jun 14 10:44:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 166808 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1890575ilk; Fri, 14 Jun 2019 03:47:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqxw8xkbAzB5+f1mv9KFYz+mTGSkRnaiIrr6CCWRnl0TD9JIcAloXDWwFxdx2sUDWIimZmUE X-Received: by 2002:a37:490d:: with SMTP id w13mr58973810qka.179.1560509277694; Fri, 14 Jun 2019 03:47:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560509277; cv=none; d=google.com; s=arc-20160816; b=LUdjX5j2l/mGrd4w4A0VsIPA5mraNJ8Pow7uVxLriPki+TGaJYXnWVvbslAKY56LwA g06ZGjWdxw2vJXzZA2JOZtdhAFOJgEhvF15KuDW+WfmJuXS4jBgRn8JudQqkpg6DfO62 xDaSG8S1uRrlPq1bPrFsa0O/ZYcrqxlUDBbPwZwe/lxwQbbGh/pnqgtVWKKXc3L2D+VB gy2sJtdc0y4TFdjlF0xjtM8pfdMCgcqzAOp9qhZSxaeo7FbLM3Yhivp9sRatkWuRntYY 0om3ERLR3z7c5YKGNPsQDta6jvwZ4rhlXf/2nf2Swx1WZnRIrtXBVzCu5TOHL+lt893S 8Hog== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=LB0bsaVvZA3zcHPIjDXxrbeOwWsnpZuqgC546jWarVg=; b=lXexMDg9TF1/dGwbJ1tcrJiTFIAtysZDm7L2BKW4B/ROKRpwwuIhZEst+Qzo9LtaT5 qPQ7Go/M4AJG2FVbarM08UCvwNgjzPOgy3ldFtB77iF5fXOaMzhiBmU1fl60J8LM+Buk FRSrqt0OHkxIkMdkrrwe7P/2BDo+l1uNFqXvlebEMO3EVSsxub2JxrQqMmJ6ZWPHKzha nJErQIMxtR9bLkhp7/kk0x09LpC/8N/H309+nlabwcsp7Xd13n4oN6D2G1pQrddRFhce rMD0qUugwQ5wlPmHTy+gLOOJVAPOQoGhSsgj2+s0dlKK1kgg4cM0yeC4bV9sAesN3TfO KxCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YwuECIDa; 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 w50si1632187qta.42.2019.06.14.03.47.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jun 2019 03:47:57 -0700 (PDT) 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=YwuECIDa; 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 ([::1]:50110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbjkT-0008WN-7b for patch@linaro.org; Fri, 14 Jun 2019 06:47:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57637) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbjhe-0007wZ-V5 for qemu-devel@nongnu.org; Fri, 14 Jun 2019 06:45:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbjhd-00075v-Jv for qemu-devel@nongnu.org; Fri, 14 Jun 2019 06:45:02 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbjhd-000751-Dv for qemu-devel@nongnu.org; Fri, 14 Jun 2019 06:45:01 -0400 Received: by mail-wr1-x444.google.com with SMTP id p11so2005991wre.7 for ; Fri, 14 Jun 2019 03:45:01 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=LB0bsaVvZA3zcHPIjDXxrbeOwWsnpZuqgC546jWarVg=; b=YwuECIDa7tIxSn4IleGBjVqDNCpwhKkSmQfRQZe3z6Ena/KgZTI/E00OBVPv5v9M+Z +LCwlQqGngExMbgO0YHSeyDtjaR0slsoJ7f0KNru9pnwvcQ58Md/xuYRgUy5WU2gCo8k /Tz+/hTzZzbrViPOD2QYaYmtOSdvqyfQIJRNDazSJffSlh76/SAsi5yJbYJseXL9zJtQ 2fSAhZtso90rqbyCIgTqXe8vsqxOHkZtAiwpLjbWKGTJPk5vuM7EhtYQL7qTYe6f6q0y jtZ4V8ddOz1w1c7inxYfevB8CyXjoUt9FzDDeJmVKDrPD+Syh0pZIfpDh6xS7YFQdlgX VzkA== 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:mime-version:content-transfer-encoding; bh=LB0bsaVvZA3zcHPIjDXxrbeOwWsnpZuqgC546jWarVg=; b=TrHMyY/r6TZQZmisqXNrAJ2C3huqiR00VAGo0xbopSCT7PPcvFsxD+y7qcJSZ481hY BMXSNweAsu93RqyoQ/u6gyQtAzZwha1PR1XENz978iGZskHstXIDokvjE4nFXBPFJACP OsgGSsrNtk6TQqXQp9ql9g7Yj9vFHq2zqklTV4VzDGTeqbH2ciBG0hpmfo7akAzDk3AQ KsB0jICLnYyymzgzd2zLFc4H6nMOEGYqaL3GITooHYNurymK5c9xZLTXCR7Dh6U76z28 4p0/SvvqJsEoQ53FSjmUvD74/gZ2kzM/BvUFV06+N8K08z8zNSuQKqcsXwAdXEh0/wqo d9OQ== X-Gm-Message-State: APjAAAVhwBUelIrMRipMNk5TgHy01kGeWnnbrqznY0Bhfe1VXB+FdjV5 woOcNozGJ6W0vxGrNcc7/2G6pQ== X-Received: by 2002:adf:e6c6:: with SMTP id y6mr1388772wrm.191.1560509100350; Fri, 14 Jun 2019 03:45:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y24sm2091238wmi.10.2019.06.14.03.44.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jun 2019 03:44:59 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Fri, 14 Jun 2019 11:44:56 +0100 Message-Id: <20190614104457.24703-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614104457.24703-1-peter.maydell@linaro.org> References: <20190614104457.24703-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::444 Subject: [Qemu-devel] [PATCH 1/2] target/arm: Fix typos in trans function prototypes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In several places cut and paste errors meant we were using the wrong type for the 'arg' struct in trans_ functions called by the decodetree decoder, because we were using the _sp version of the struct in the _dp function. These were harmless, because the two structs were identical and so decodetree made them typedefs of the same underlying structure (and we'd have had a compile error if they were not harmless), but we should clean them up anyway. Signed-off-by: Peter Maydell --- target/arm/translate-vfp.inc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c index 709fc65374d..85187bcc9dc 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -835,7 +835,7 @@ static bool trans_VMOV_64_sp(DisasContext *s, arg_VMOV_64_sp *a) return true; } -static bool trans_VMOV_64_dp(DisasContext *s, arg_VMOV_64_sp *a) +static bool trans_VMOV_64_dp(DisasContext *s, arg_VMOV_64_dp *a) { TCGv_i32 tmp; @@ -910,7 +910,7 @@ static bool trans_VLDR_VSTR_sp(DisasContext *s, arg_VLDR_VSTR_sp *a) return true; } -static bool trans_VLDR_VSTR_dp(DisasContext *s, arg_VLDR_VSTR_sp *a) +static bool trans_VLDR_VSTR_dp(DisasContext *s, arg_VLDR_VSTR_dp *a) { uint32_t offset; TCGv_i32 addr; @@ -1500,7 +1500,7 @@ static void gen_VMLA_dp(TCGv_i64 vd, TCGv_i64 vn, TCGv_i64 vm, TCGv_ptr fpst) tcg_temp_free_i64(tmp); } -static bool trans_VMLA_dp(DisasContext *s, arg_VMLA_sp *a) +static bool trans_VMLA_dp(DisasContext *s, arg_VMLA_dp *a) { return do_vfp_3op_dp(s, gen_VMLA_dp, a->vd, a->vn, a->vm, true); } @@ -1538,7 +1538,7 @@ static void gen_VMLS_dp(TCGv_i64 vd, TCGv_i64 vn, TCGv_i64 vm, TCGv_ptr fpst) tcg_temp_free_i64(tmp); } -static bool trans_VMLS_dp(DisasContext *s, arg_VMLS_sp *a) +static bool trans_VMLS_dp(DisasContext *s, arg_VMLS_dp *a) { return do_vfp_3op_dp(s, gen_VMLS_dp, a->vd, a->vn, a->vm, true); } @@ -1580,7 +1580,7 @@ static void gen_VNMLS_dp(TCGv_i64 vd, TCGv_i64 vn, TCGv_i64 vm, TCGv_ptr fpst) tcg_temp_free_i64(tmp); } -static bool trans_VNMLS_dp(DisasContext *s, arg_VNMLS_sp *a) +static bool trans_VNMLS_dp(DisasContext *s, arg_VNMLS_dp *a) { return do_vfp_3op_dp(s, gen_VNMLS_dp, a->vd, a->vn, a->vm, true); } @@ -1614,7 +1614,7 @@ static void gen_VNMLA_dp(TCGv_i64 vd, TCGv_i64 vn, TCGv_i64 vm, TCGv_ptr fpst) tcg_temp_free_i64(tmp); } -static bool trans_VNMLA_dp(DisasContext *s, arg_VNMLA_sp *a) +static bool trans_VNMLA_dp(DisasContext *s, arg_VNMLA_dp *a) { return do_vfp_3op_dp(s, gen_VNMLA_dp, a->vd, a->vn, a->vm, true); } @@ -1624,7 +1624,7 @@ static bool trans_VMUL_sp(DisasContext *s, arg_VMUL_sp *a) return do_vfp_3op_sp(s, gen_helper_vfp_muls, a->vd, a->vn, a->vm, false); } -static bool trans_VMUL_dp(DisasContext *s, arg_VMUL_sp *a) +static bool trans_VMUL_dp(DisasContext *s, arg_VMUL_dp *a) { return do_vfp_3op_dp(s, gen_helper_vfp_muld, a->vd, a->vn, a->vm, false); } @@ -1648,7 +1648,7 @@ static void gen_VNMUL_dp(TCGv_i64 vd, TCGv_i64 vn, TCGv_i64 vm, TCGv_ptr fpst) gen_helper_vfp_negd(vd, vd); } -static bool trans_VNMUL_dp(DisasContext *s, arg_VNMUL_sp *a) +static bool trans_VNMUL_dp(DisasContext *s, arg_VNMUL_dp *a) { return do_vfp_3op_dp(s, gen_VNMUL_dp, a->vd, a->vn, a->vm, false); } @@ -1658,7 +1658,7 @@ static bool trans_VADD_sp(DisasContext *s, arg_VADD_sp *a) return do_vfp_3op_sp(s, gen_helper_vfp_adds, a->vd, a->vn, a->vm, false); } -static bool trans_VADD_dp(DisasContext *s, arg_VADD_sp *a) +static bool trans_VADD_dp(DisasContext *s, arg_VADD_dp *a) { return do_vfp_3op_dp(s, gen_helper_vfp_addd, a->vd, a->vn, a->vm, false); } @@ -1668,7 +1668,7 @@ static bool trans_VSUB_sp(DisasContext *s, arg_VSUB_sp *a) return do_vfp_3op_sp(s, gen_helper_vfp_subs, a->vd, a->vn, a->vm, false); } -static bool trans_VSUB_dp(DisasContext *s, arg_VSUB_sp *a) +static bool trans_VSUB_dp(DisasContext *s, arg_VSUB_dp *a) { return do_vfp_3op_dp(s, gen_helper_vfp_subd, a->vd, a->vn, a->vm, false); } @@ -1678,7 +1678,7 @@ static bool trans_VDIV_sp(DisasContext *s, arg_VDIV_sp *a) return do_vfp_3op_sp(s, gen_helper_vfp_divs, a->vd, a->vn, a->vm, false); } -static bool trans_VDIV_dp(DisasContext *s, arg_VDIV_sp *a) +static bool trans_VDIV_dp(DisasContext *s, arg_VDIV_dp *a) { return do_vfp_3op_dp(s, gen_helper_vfp_divd, a->vd, a->vn, a->vm, false); } @@ -1741,7 +1741,7 @@ static bool trans_VFM_sp(DisasContext *s, arg_VFM_sp *a) return true; } -static bool trans_VFM_dp(DisasContext *s, arg_VFM_sp *a) +static bool trans_VFM_dp(DisasContext *s, arg_VFM_dp *a) { /* * VFNMA : fd = muladd(-fd, fn, fm) @@ -2201,7 +2201,7 @@ static bool trans_VRINTR_sp(DisasContext *s, arg_VRINTR_sp *a) return true; } -static bool trans_VRINTR_dp(DisasContext *s, arg_VRINTR_sp *a) +static bool trans_VRINTR_dp(DisasContext *s, arg_VRINTR_dp *a) { TCGv_ptr fpst; TCGv_i64 tmp; @@ -2257,7 +2257,7 @@ static bool trans_VRINTZ_sp(DisasContext *s, arg_VRINTZ_sp *a) return true; } -static bool trans_VRINTZ_dp(DisasContext *s, arg_VRINTZ_sp *a) +static bool trans_VRINTZ_dp(DisasContext *s, arg_VRINTZ_dp *a) { TCGv_ptr fpst; TCGv_i64 tmp; From patchwork Fri Jun 14 10:44:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 166809 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1897183ilk; Fri, 14 Jun 2019 03:55:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwscDGltRdmsjRgjwzVqCndhC7f772DpaFv/wQYKAGGPqHUZMxsfzkpMQl/obhLFcEwylBM X-Received: by 2002:ac8:444c:: with SMTP id m12mr13541809qtn.306.1560509746921; Fri, 14 Jun 2019 03:55:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560509746; cv=none; d=google.com; s=arc-20160816; b=t/8WU93c5BdtZ30/5st5LJlx8s7Z+W1aF4PP4x7IhkfV38yV4nX26PoKAMSe8p0Jxx kI4xKnY4zXsm7kj/trWBXAoN/RCUIouparHm4g4GWZtJf+S4f3Hb/GiaVkhF9H3lRrq3 gy9JXmeShcvL9Ry4+9NCEc7AP6I+IoDglCvKWa4LnpKq715hOZVvSiYA7t/aPgd8LcA9 haOTdRXjOrZ6viUGocOHHqxQ8SbdG22a2D6EPPBwXMcFKv7iKLDK4RRqXYzHT9hDnYAT QDHulDWBUr2ZGcQpMAv15+lzw4HXp5WWflW/gvqqBkdSHevnVxBiQUxtOFll5b5XBluR JV/w== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=08Z7f4ISnw8IsjRb+rdkg212YqVM77nn40XmfzlB6eY=; b=nOslfXoLKk7wTbaN6MUa8OyEZOvy5rApvuMUreGViO1rmNzUkEOaO+5/Ki1eKTIq8r dLr8a8lu4DUVFZbmjpY11rirR4D2htX+Pr3AWaeMSJqjtYWvP1xP84iHJzSWQywjOr/W azX5tJQ7KzxJLSq3BSLU28GYa4z8SokEMQehHERe289AoutPIDQVsEqdpx1UWFOJQEuK HdRsUDoYt2B3P7yAenbtpemY3OzwYp1/MaSk4xIu2eZnEeYB4WiuqfxhRZ0Bzx6ZXcgc 9h373TpZE6D4JMYoHR1lwbZ/iju4gwQh6YuOKsAWXz/Xh5Ba6XSUIuzb/2YjMDLOMirj h5tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HBOOEWHY; 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 d52si1558492qta.322.2019.06.14.03.55.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jun 2019 03:55:46 -0700 (PDT) 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=HBOOEWHY; 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 ([::1]:50130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbjry-0003ZF-Tz for patch@linaro.org; Fri, 14 Jun 2019 06:55:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57659) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbjhg-0007xP-Eb for qemu-devel@nongnu.org; Fri, 14 Jun 2019 06:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbjhe-00077Y-TU for qemu-devel@nongnu.org; Fri, 14 Jun 2019 06:45:04 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36104) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbjhe-00076H-LX for qemu-devel@nongnu.org; Fri, 14 Jun 2019 06:45:02 -0400 Received: by mail-wm1-x342.google.com with SMTP id u8so1835984wmm.1 for ; Fri, 14 Jun 2019 03:45:02 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=08Z7f4ISnw8IsjRb+rdkg212YqVM77nn40XmfzlB6eY=; b=HBOOEWHYhDoCDaVMxHlMQskSwEIpWvgwGujwDhIOBvMmKXeKs/2nOg9US7rvOE92VJ md4O4MyvJyCmfXru1ocEXzs4XTh0I4RGfHxzSKJxUZDluUKFStFNhYi4TEmxj5M0L18F y1cA0MksR0JX7wNOYbtCeXLIk15DRAjPA+iUVtrBFyRA7lt5a5gn/+0TyFBb+Q0r9f8f KtcW6R53WH4kiHZwMWwF7Cd+lyaMgs1GZF5MTViVpCvENuUiaomeS8Ng9B8oXJ6TUxVa 41iMo5ia7225Mv0+C6/1syaaZc8uRwzBB9F9ClUWZvGuR8ZfPVuK4TSOnSzqb0rBo4XB wJTQ== 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:mime-version:content-transfer-encoding; bh=08Z7f4ISnw8IsjRb+rdkg212YqVM77nn40XmfzlB6eY=; b=Ly4VzWPjm7eHyo70X8Rn+QcmJc/gQbZY3BByPLVUlBpO1Uly6KgUIcG61iSgacR5/f wGpxpCybHMBdkbrJoFKkgkteKPgpQDSAL8hIbrQt6xqUbpRMr8+nlCEyPCa8L3VneoTU 2RKIXyA5e2yDlpafRR1DOMP211Su5Yg/Po3BMwa0ME6oTZnj0lWzbOV8pbdP9Nk4LGPG Qc1Ab3z2TIh/Dlg4bCXqKBXjT1OE6EAfl1kkfOsuy4ZH7QEoeS4Q5GR/lkOkfMGfokXx HOvm2xsUgwpnYPnWZ1g1X/gqhiDTxnO55R8875OHMYacxPMVjOGeG+YQbYqea+WHowM/ kRxQ== X-Gm-Message-State: APjAAAXngjKMKprABJ5GfhR7THLroYOvsY8JdwCa4N6hQiCOr0VFDCBY eWFdpb1NO9lAZb7BjPd1v8GynQbrXh9OQg== X-Received: by 2002:a1c:7f96:: with SMTP id a144mr7296493wmd.124.1560509101448; Fri, 14 Jun 2019 03:45:01 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y24sm2091238wmi.10.2019.06.14.03.45.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jun 2019 03:45:00 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Fri, 14 Jun 2019 11:44:57 +0100 Message-Id: <20190614104457.24703-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614104457.24703-1-peter.maydell@linaro.org> References: <20190614104457.24703-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::342 Subject: [Qemu-devel] [PATCH 2/2] target/arm: Only implement doubles if the FPU supports them X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The architecture permits FPUs which have only single-precision support, not double-precision; Cortex-M4 and Cortex-M33 are both like that. Add the necessary checks on the MVFR0 FPDP field so that we UNDEF any double-precision instructions on CPUs like this. Note that even if FPDP==0 the insns like VMOV-to/from-gpreg, VLDM/VSTM, VLDR/VSTR which take double precision registers still exist. Signed-off-by: Peter Maydell --- target/arm/cpu.h | 6 +++ target/arm/translate-vfp.inc.c | 84 ++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 92298624215..29be1f7ea97 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3382,6 +3382,12 @@ static inline bool isar_feature_aa32_fpshvec(const ARMISARegisters *id) return FIELD_EX64(id->mvfr0, MVFR0, FPSHVEC) > 0; } +static inline bool isar_feature_aa32_fpdp(const ARMISARegisters *id) +{ + /* Return true if CPU supports double precision floating point */ + return FIELD_EX64(id->mvfr0, MVFR0, FPDP) > 0; +} + /* * We always set the FP and SIMD FP16 fields to indicate identical * levels of support (assuming SIMD is implemented at all), so diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c index 85187bcc9dc..a3df81d3b07 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -173,6 +173,11 @@ static bool trans_VSEL(DisasContext *s, arg_VSEL *a) ((a->vm | a->vn | a->vd) & 0x10)) { return false; } + + if (dp && !dc_isar_feature(aa32_fpdp, s)) { + return false; + } + rd = a->vd; rn = a->vn; rm = a->vm; @@ -301,6 +306,11 @@ static bool trans_VMINMAXNM(DisasContext *s, arg_VMINMAXNM *a) ((a->vm | a->vn | a->vd) & 0x10)) { return false; } + + if (dp && !dc_isar_feature(aa32_fpdp, s)) { + return false; + } + rd = a->vd; rn = a->vn; rm = a->vm; @@ -382,6 +392,11 @@ static bool trans_VRINT(DisasContext *s, arg_VRINT *a) ((a->vm | a->vd) & 0x10)) { return false; } + + if (dp && !dc_isar_feature(aa32_fpdp, s)) { + return false; + } + rd = a->vd; rm = a->vm; @@ -440,6 +455,11 @@ static bool trans_VCVT(DisasContext *s, arg_VCVT *a) if (dp && !dc_isar_feature(aa32_fp_d32, s) && (a->vm & 0x10)) { return false; } + + if (dp && !dc_isar_feature(aa32_fpdp, s)) { + return false; + } + rd = a->vd; rm = a->vm; @@ -1268,6 +1288,10 @@ static bool do_vfp_3op_dp(DisasContext *s, VFPGen3OpDPFn *fn, return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!dc_isar_feature(aa32_fpshvec, s) && (veclen != 0 || s->vec_stride != 0)) { return false; @@ -1413,6 +1437,10 @@ static bool do_vfp_2op_dp(DisasContext *s, VFPGen2OpDPFn *fn, int vd, int vm) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!dc_isar_feature(aa32_fpshvec, s) && (veclen != 0 || s->vec_stride != 0)) { return false; @@ -1773,6 +1801,10 @@ static bool trans_VFM_dp(DisasContext *s, arg_VFM_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -1878,6 +1910,10 @@ static bool trans_VMOV_imm_dp(DisasContext *s, arg_VMOV_imm_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!dc_isar_feature(aa32_fpshvec, s) && (veclen != 0 || s->vec_stride != 0)) { return false; @@ -2028,6 +2064,10 @@ static bool trans_VCMP_dp(DisasContext *s, arg_VCMP_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2097,6 +2137,10 @@ static bool trans_VCVT_f64_f16(DisasContext *s, arg_VCVT_f64_f16 *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2159,6 +2203,10 @@ static bool trans_VCVT_f16_f64(DisasContext *s, arg_VCVT_f16_f64 *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2215,6 +2263,10 @@ static bool trans_VRINTR_dp(DisasContext *s, arg_VRINTR_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2272,6 +2324,10 @@ static bool trans_VRINTZ_dp(DisasContext *s, arg_VRINTZ_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2327,6 +2383,10 @@ static bool trans_VRINTX_dp(DisasContext *s, arg_VRINTX_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2351,6 +2411,10 @@ static bool trans_VCVT_sp(DisasContext *s, arg_VCVT_sp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2375,6 +2439,10 @@ static bool trans_VCVT_dp(DisasContext *s, arg_VCVT_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2425,6 +2493,10 @@ static bool trans_VCVT_int_dp(DisasContext *s, arg_VCVT_int_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2461,6 +2533,10 @@ static bool trans_VJCVT(DisasContext *s, arg_VJCVT *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2550,6 +2626,10 @@ static bool trans_VCVT_fix_dp(DisasContext *s, arg_VCVT_fix_dp *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; } @@ -2642,6 +2722,10 @@ static bool trans_VCVT_dp_int(DisasContext *s, arg_VCVT_dp_int *a) return false; } + if (!dc_isar_feature(aa32_fpdp, s)) { + return false; + } + if (!vfp_access_check(s)) { return true; }