From patchwork Fri Oct 5 17:53:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 148279 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp754165lji; Fri, 5 Oct 2018 11:03:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV60cShN87F6rFreddBvJN7cf153CXhjbrwxlywRJMACFhxeSHV6locohFI4B2oMapBoMkmfY X-Received: by 2002:aed:3ae5:: with SMTP id o92-v6mr10690963qte.127.1538762605277; Fri, 05 Oct 2018 11:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538762605; cv=none; d=google.com; s=arc-20160816; b=DkawKLnfc/AmNYvs9NgvP+TMhFI+stCf49hgHL89HX00yyeHu+C1w7MihkwLEtexJg z9t/lyfk5hyEES+GZ2LstR2pehA7fQoq8EoWkN4i1lByud3ED/CHi+xor5P+hKSBeRLn euBpMblfpzE9lRUmitLK9dWYg0JFVxP0AqELo+wNhtAggk62TuMrlfXDW+XWxVXQIPRB 17WSgD5pGxqF+83tFEKEeg2Hc8Ok7ewEcWXPmIM6jptujqHqvcZECS2TWi/BpYqBitby nVB/iVZ99/qRPjJlsMKkuqj5b/orasQV9zPuVSRqFuMJIr/f90MRS0K7K8dSsMs2//oQ W7Pw== 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=J6cZSM5eTgF1dL/g404yUhATpMowIu7KXBvu1wt+GBc=; b=m7Kv7RYhOuySnPmkctDZzTdFq8hFw+nt+U7CvxI6LfzPk/xE8B9fpqxNJv2GrwE8Z2 kDIVKoR90IovNKudQQVlmo2aAUa+KdwohhyttGBN3nqeAJxdKooq0Ap7cO9XGw3+4MOW x17Bt60MbjUVKawswwd9aIaxzBCGFfA2cZttw4c9ll6I5ONJVhyBugBc6lLIphYrhf5Q mygNv6UbExb6lgHyKdyY65wntcxQn1B87H4n0fp8d4zemz/ze91hCdjRhq6w6POhrAi2 kWu4tatl5oXqIkLRoiG2iScLiICraCtSZQqjQBZAltsUFek76/1ivQ8jZsKT7wUm0Y0d e0/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BQ2j+cuB; 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 y3-v6si796141qvk.187.2018.10.05.11.03.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 05 Oct 2018 11:03:25 -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=BQ2j+cuB; 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]:36386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8URg-00010Z-MF for patch@linaro.org; Fri, 05 Oct 2018 14:03:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8UIf-00013U-R6 for qemu-devel@nongnu.org; Fri, 05 Oct 2018 13:54:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8UIf-0003Hi-0Y for qemu-devel@nongnu.org; Fri, 05 Oct 2018 13:54:05 -0400 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]:34944) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g8UIe-0003HF-Qk for qemu-devel@nongnu.org; Fri, 05 Oct 2018 13:54:04 -0400 Received: by mail-oi1-x232.google.com with SMTP id 22-v6so10096508oiz.2 for ; Fri, 05 Oct 2018 10:54:04 -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=J6cZSM5eTgF1dL/g404yUhATpMowIu7KXBvu1wt+GBc=; b=BQ2j+cuBWebj/sXYJI39N+QswsKjdSisJWP+8SXTJw7GSvWiToezJyJqbUYiFPAKIm DqvOwmWzfj+71tNm7WMvoZdFOetnu4H2WTWcXeahODtlNWvKIlWMAlXmc01VrHfdLCRM BVLmgTUk5gfr4nZ7jLfxksKGqbN5/7bBAyxW8= 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=J6cZSM5eTgF1dL/g404yUhATpMowIu7KXBvu1wt+GBc=; b=mAFY7BN7e8qXtj61jjpot8r9njX5oglba1ZI3Gm6Gi6aI22T+Xw/7knr/QCzhtIT5V o6QExKeVenlA5ix5gKi79hgqkFKKNMU/U39kpZnGzmJmvJpVoLsF5aDFQ8+R7jzoz1lo nD3bnup2eZf/j5XBLpQTl0PEKO2lCoxfiTcJ3v3yAacp7BoTi3TNRlb9P9iXT85N673s /Hc23p9tJc8b7o5IYS68bYFOS68JhHUBJ5WXCUDYGtbMbnQOY4ar1hgw8//C8leFJ4mn v0/VpLZXOvkVrAHVweiIczqlZyJRYiSoSTf27K2RLc/8V3csTwUQUglBv/rYUQDFgwqv 9kjg== X-Gm-Message-State: ABuFfoi1h8Y69tIe0NIm18lm5gbT9XSDNSWpnNq9PNFxUBHK8CFGt0b2 N+i+sLpP3BteawGK99LdcnyF3wqlyhjLTOBHgdI= X-Received: by 2002:a54:4f9b:: with SMTP id g27-v6mr360oiy.311.1538762043802; Fri, 05 Oct 2018 10:54:03 -0700 (PDT) Received: from cloudburst.twiddle.net ([187.217.230.84]) by smtp.gmail.com with ESMTPSA id q10-v6sm2672278otg.31.2018.10.05.10.54.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Oct 2018 10:54:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 5 Oct 2018 12:53:40 -0500 Message-Id: <20181005175350.30752-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181005175350.30752-1-richard.henderson@linaro.org> References: <20181005175350.30752-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::232 Subject: [Qemu-devel] [PATCH v3 05/15] target/arm: Adjust aarch64_cpu_dump_state for system mode SVE 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" Use the existing helpers to determine if (1) the fpu is enabled, (2) sve state is enabled, and (3) the current sve vector length. Tested-by: Laurent Desnogues Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.h | 4 ++++ target/arm/helper.c | 6 +++--- target/arm/translate-a64.c | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a4ee83dc77..da4d3888ea 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -920,6 +920,10 @@ target_ulong do_arm_semihosting(CPUARMState *env); void aarch64_sync_32_to_64(CPUARMState *env); void aarch64_sync_64_to_32(CPUARMState *env); +int fp_exception_el(CPUARMState *env, int cur_el); +int sve_exception_el(CPUARMState *env, int cur_el); +uint32_t sve_zcr_len_for_el(CPUARMState *env, int el); + static inline bool is_a64(CPUARMState *env) { return env->aarch64; diff --git a/target/arm/helper.c b/target/arm/helper.c index 3b8d838dbc..a3a3b9672c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4406,7 +4406,7 @@ static const ARMCPRegInfo debug_lpae_cp_reginfo[] = { * take care of raising that exception. * C.f. the ARM pseudocode function CheckSVEEnabled. */ -static int sve_exception_el(CPUARMState *env, int el) +int sve_exception_el(CPUARMState *env, int el) { #ifndef CONFIG_USER_ONLY if (el <= 1) { @@ -4464,7 +4464,7 @@ static int sve_exception_el(CPUARMState *env, int el) /* * Given that SVE is enabled, return the vector length for EL. */ -static uint32_t sve_zcr_len_for_el(CPUARMState *env, int el) +uint32_t sve_zcr_len_for_el(CPUARMState *env, int el) { ARMCPU *cpu = arm_env_get_cpu(env); uint32_t zcr_len = cpu->sve_max_vq - 1; @@ -12547,7 +12547,7 @@ uint32_t HELPER(crc32c)(uint32_t acc, uint32_t val, uint32_t bytes) /* Return the exception level to which FP-disabled exceptions should * be taken, or 0 if FP is enabled. */ -static int fp_exception_el(CPUARMState *env, int cur_el) +int fp_exception_el(CPUARMState *env, int cur_el) { #ifndef CONFIG_USER_ONLY int fpen; diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 8ca3876707..8a24278d79 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -166,11 +166,15 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f, cpu_fprintf(f, "\n"); return; } + if (fp_exception_el(env, el) != 0) { + cpu_fprintf(f, " FPU disabled\n"); + return; + } cpu_fprintf(f, " FPCR=%08x FPSR=%08x\n", vfp_get_fpcr(env), vfp_get_fpsr(env)); - if (arm_feature(env, ARM_FEATURE_SVE)) { - int j, zcr_len = env->vfp.zcr_el[1] & 0xf; /* fix for system mode */ + if (arm_feature(env, ARM_FEATURE_SVE) && sve_exception_el(env, el) == 0) { + int j, zcr_len = sve_zcr_len_for_el(env, el); for (i = 0; i <= FFR_PRED_NUM; i++) { bool eol;