From patchwork Fri Jun 29 00:15:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 140484 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp197160ljj; Thu, 28 Jun 2018 17:16:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdDVUMr1yNSbV30teWNOCZXsxiQQkPHwbs5xahCyBSCZNbEoc4infdOWkmfA6kjp/xEjfUY X-Received: by 2002:aed:3f5d:: with SMTP id q29-v6mr11069257qtf.403.1530231375374; Thu, 28 Jun 2018 17:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530231375; cv=none; d=google.com; s=arc-20160816; b=uFcdQcPDRDiMwDtC2VepEt45N2S22vaFJe8Bv2Q/fdSr+l50sbwT233ydw6NvJCu8c tI6q09Lma3wb0gx1gYJUyOBpvV/lkyzFHMa2m8yTixq+sEZmKC2Yha4fwCHkIU2xloen jiJfgQBb1logaeLpPix0wSHrpwJUSanqIfoZVKdEKUkTsde8WMLlS3fb+0gDjTiAkjFg KHRveNeGDOKc6hTnPkZ5N0RmFEzhY2f2FJIxxPH7bTAd6sNq28n33jOEbsXpC552EGxE hEMSipshmLYaMj4/Z2uQN/UgE+kUF3kLfab2SuGnfJ7yrBO4+1WnS4QossyhM74G8TPZ 9dmA== 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:arc-authentication-results; bh=bDxeI45M3+Sw5t2d9J5a8/XWQwI0hxpwq9USCSGZuao=; b=KgdYJEdnxrNVfkYw406ayhpBsEJlRxlB5WW3KwgW2+tsmAlhVc35LIetuqhl+cKjPY SldgmRL6IkRGrRmN4OOQL8EP9MJdLkfzS9kt+SOS8QoCGJvChpcrULbRjr9MJglc4HST OSGc0E1Mx48bP0bnoA+W5/f7AK6OboZVJzaE93rMYfBgdGM4JyOsAl/bZuLhkhmcwoIQ 7TMv9pDyDx468bZM7sgtWXSIL5D/eereeTASjr8ajpC2+Yt3EBksQEACkOo6ruQNQWmc cuVCSeRqGlbClAPA7u71SwR9hZMVg90AmEjLjnQoY9GidnyM6EE+dlAQ1sbgdxghipC6 kzXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b1CydImQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 22-v6si2470081qkm.51.2018.06.28.17.16.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Jun 2018 17:16:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b1CydImQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:39234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYh5C-00041n-Nl for patch@linaro.org; Thu, 28 Jun 2018 20:16:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYh4k-00041O-3W for qemu-devel@nongnu.org; Thu, 28 Jun 2018 20:15:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYh4j-0006fH-3U for qemu-devel@nongnu.org; Thu, 28 Jun 2018 20:15:46 -0400 Received: from mail-pl0-x22b.google.com ([2607:f8b0:400e:c01::22b]:45791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYh4i-0006eW-UK for qemu-devel@nongnu.org; Thu, 28 Jun 2018 20:15:45 -0400 Received: by mail-pl0-x22b.google.com with SMTP id bi1-v6so3543378plb.12 for ; Thu, 28 Jun 2018 17:15:44 -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; bh=bDxeI45M3+Sw5t2d9J5a8/XWQwI0hxpwq9USCSGZuao=; b=b1CydImQBA+kFalvu6xO1Q4AseOHN/eGxS4TyZ1Wcg8Z+Cxe+vAjJmxtUp03XERwu9 uWdgSVJBBbyn1xM6uU8RaWrE80PqzBrEFElMrv0+qVnLJ2X/HN7kZYWe4GK3UtIYbHJc P5v2QciPcb/BwKeVFptOKCDUVwf4zwRDpQ1Pc= 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=bDxeI45M3+Sw5t2d9J5a8/XWQwI0hxpwq9USCSGZuao=; b=RlzTXmR7dXRQLOf/yaZrTw8izvIyUCljnKSiJjAvLCJF7F1uvFLSQOdBp9bqztwb/B L5eGyL654cEMR7MZPBbIjrv3dqvnk9cfW2+/RzdlxlB4NLAmgoQ9UeLxTRqfuoBYvVBA T7fu+WJqbtOwr7lmFevQZNyJt5xKz5ezU9m3aeMN3bAOdvSl0HEX6OlhjN5WqKwJGMO6 VfIcwyIjNqzXfp/sXNTutnIoeSIRJn8TVdkJMBqvsB4CO86yP/bI7wC8A5qHZ/Iq4s42 flxxyEwkKgS69+90jTA1ytcrgTojNvCaM7JECYrwkrjd3puymePYJQrxI1YEMeUbnfgu uZ7w== X-Gm-Message-State: APt69E28648/s+zfZZzJUl4/N+dlhztt81Ic6OfYGXI8HD8cLnapKuct vs6t2hOEGEzcrUt6LFgKw+GHt8r+q2w= X-Received: by 2002:a17:902:8645:: with SMTP id y5-v6mr12460240plt.334.1530231343761; Thu, 28 Jun 2018 17:15:43 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-112-211.tukw.qwest.net. [97.126.112.211]) by smtp.gmail.com with ESMTPSA id j3-v6sm11687618pff.35.2018.06.28.17.15.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 17:15:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 17:15:34 -0700 Message-Id: <20180629001538.11415-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629001538.11415-1-richard.henderson@linaro.org> References: <20180629001538.11415-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22b Subject: [Qemu-devel] [PATCH 2/6] target/arm: Fix SVE system register access checks 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" Leave ARM_CP_SVE, removing ARM_CP_FPU; the sve_access_check produced by the flag already includes fp_access_check. If we also check ARM_CP_FPU the double fp_access_check asserts. Reported-by: Laurent Desnogues Signed-off-by: Richard Henderson --- target/arm/helper.c | 8 ++++---- target/arm/translate-a64.c | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Laurent Desnogues diff --git a/target/arm/helper.c b/target/arm/helper.c index b19c7ace78..a855da045b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4393,7 +4393,7 @@ static void zcr_write(CPUARMState *env, const ARMCPRegInfo *ri, static const ARMCPRegInfo zcr_el1_reginfo = { .name = "ZCR_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 1, .crm = 2, .opc2 = 0, - .access = PL1_RW, .type = ARM_CP_SVE | ARM_CP_FPU, + .access = PL1_RW, .type = ARM_CP_SVE, .fieldoffset = offsetof(CPUARMState, vfp.zcr_el[1]), .writefn = zcr_write, .raw_writefn = raw_write }; @@ -4401,7 +4401,7 @@ static const ARMCPRegInfo zcr_el1_reginfo = { static const ARMCPRegInfo zcr_el2_reginfo = { .name = "ZCR_EL2", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 2, .opc2 = 0, - .access = PL2_RW, .type = ARM_CP_SVE | ARM_CP_FPU, + .access = PL2_RW, .type = ARM_CP_SVE, .fieldoffset = offsetof(CPUARMState, vfp.zcr_el[2]), .writefn = zcr_write, .raw_writefn = raw_write }; @@ -4409,14 +4409,14 @@ static const ARMCPRegInfo zcr_el2_reginfo = { static const ARMCPRegInfo zcr_no_el2_reginfo = { .name = "ZCR_EL2", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 2, .opc2 = 0, - .access = PL2_RW, .type = ARM_CP_SVE | ARM_CP_FPU, + .access = PL2_RW, .type = ARM_CP_SVE, .readfn = arm_cp_read_zero, .writefn = arm_cp_write_ignore }; static const ARMCPRegInfo zcr_el3_reginfo = { .name = "ZCR_EL3", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 6, .crn = 1, .crm = 2, .opc2 = 0, - .access = PL3_RW, .type = ARM_CP_SVE | ARM_CP_FPU, + .access = PL3_RW, .type = ARM_CP_SVE, .fieldoffset = offsetof(CPUARMState, vfp.zcr_el[3]), .writefn = zcr_write, .raw_writefn = raw_write }; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index f986340832..45a6c2a3aa 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1633,11 +1633,10 @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread, default: break; } - if ((ri->type & ARM_CP_SVE) && !sve_access_check(s)) { - return; - } if ((ri->type & ARM_CP_FPU) && !fp_access_check(s)) { return; + } else if ((ri->type & ARM_CP_SVE) && !sve_access_check(s)) { + return; } if ((tb_cflags(s->base.tb) & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {