From patchwork Thu Aug 9 04:21:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 143667 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1608198ljj; Wed, 8 Aug 2018 21:31:16 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwf3VGGqf+zF/MVcwRhtTMeHG6D/ejoTFuXp1URzqnZmn78ZCVnC0MVxER/CGEEHxOmc2/5 X-Received: by 2002:a0c:aac9:: with SMTP id g9-v6mr435641qvb.78.1533789076400; Wed, 08 Aug 2018 21:31:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533789076; cv=none; d=google.com; s=arc-20160816; b=Khl0qMgfLwho3kQu2/RFmgaHUX+ZyuElV7yiNRVrJLHKY6KSwPJ/719hwyLWQQDD4b OstoXd/vLEPHQL+1AKp1w3oUmdaKMdd/OA0+lYPXbGyd+qWQ1D5yQrkmrLRdINV8481W p7ZzG0w5D3/8ZAWe8jcgD6s0RKOeCDtxv9UMYj3u+pxbLcHI04aEx12nHTLGOW2VOKyS GWp97Des4EiEDmM5jEJ4rXcPOYQ90PVgsGrLYfF0YJg8HXDiX9V0MkK9YU86uGu6XnCX lE6SXHNJiQPzXIVH53MOGiF4j2oNJP9a48ow7W/dWoA7wew98/RaiN/+V8y38ouoZYlR rlwA== 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=fNJ5/L5RBIqFhK3h+FZqh+tESQTq1Q27XJeHHblUUck=; b=uNxg8AJ3KgxuXFswuRtnG0aSk5yBTlmTiSj+OhmHrXan7/bjv2XM3iWS2ASgtL3SPd ZCHsyaLfUdut2SJR4U6jiE+ipOLR+PRUckU8bzmRAB8cFMP5+EOnLidYh1yjl/UDOln+ BXYTYfAFV7Kz0XfFDL09LxhO2ufcFeW/KEMBtdkbU2AuBdKK45ZvarZj4ZjboX4apAn5 Rk/+tFzx6YHQYIUDuTVy0ud1zEcCxa7XpMaLv8l2U19GGBMa5NyMcI02urVncFXwGn5Q HWlvKKggpM9LIwfCzdKracRbwtIKtENYu0SaBAvGPMZmEEMdF/VHVz9bo3gZLdiiEzDN uM+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kP7KD5nC; 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 k40-v6si1671450qtk.339.2018.08.08.21.31.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 08 Aug 2018 21:31:16 -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=kP7KD5nC; 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]:47272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fncbT-0000xQ-Oy for patch@linaro.org; Thu, 09 Aug 2018 00:31:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fncSv-0000rI-76 for qemu-devel@nongnu.org; Thu, 09 Aug 2018 00:22:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fncSu-0007JP-4G for qemu-devel@nongnu.org; Thu, 09 Aug 2018 00:22:25 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:44433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fncSt-0007Iz-UB for qemu-devel@nongnu.org; Thu, 09 Aug 2018 00:22:24 -0400 Received: by mail-pf1-x434.google.com with SMTP id k21-v6so2183604pff.11 for ; Wed, 08 Aug 2018 21:22:23 -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=fNJ5/L5RBIqFhK3h+FZqh+tESQTq1Q27XJeHHblUUck=; b=kP7KD5nCIfkHjDomauBY20QJnAgliTo/LVf3KXl5VCtnJrO/fhxX+G+zcfyLJJY2wp 01etFP3Dsiw7w7LschECc3whELreUESnylJ/MAfdNvtzxrTm8PpJ0OU1ryB1M/TPj+Gl P2IFtfxh0UeGg7mTZRQdYcaAqwpkv2Oi6PRNk= 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=fNJ5/L5RBIqFhK3h+FZqh+tESQTq1Q27XJeHHblUUck=; b=ByKfooa+0/res3KSuw/WpWjt/dvcP5HLifiBSN1CjjXaVjmUOkyEyrmhlGm/EC1dYz fF4fgbvpnoCkMsQf36sV9pBLcMxQ5svGuDPIcW2GyTdLqS0I8y+vojL4OJRa7FFPRXs/ w8u+32DAz2VoEe3hngRVyYJzcxtXnq3tGDYXDYwYWgOlZBrAogBD7kZ1cy1ts65W7jtL AMJttTEcpBGA44RNF6qCy5QGpR1VlieYckjQHJtDM2W0XlSznMvGvtZcDDHukA7i7qHk Toc10b6lPTnj2JLE0efWZX3/QDklKEFFXsf2Ha1DjUEl1r0U2DXLgLYiNnvNxcqGkYoH SRvA== X-Gm-Message-State: AOUpUlFvwSVKZEhhEql0uiNT5uPtjyyw2HHZenU86VBcA7UCAX5Pxe7m RViCHsS+rUAnQcmKuIRVmJL3x8qDKyo= X-Received: by 2002:a63:a042:: with SMTP id u2-v6mr528895pgn.80.1533788542675; Wed, 08 Aug 2018 21:22:22 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id m30-v6sm7355799pff.121.2018.08.08.21.22.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Aug 2018 21:22:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 21:21:56 -0700 Message-Id: <20180809042206.15726-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180809042206.15726-1-richard.henderson@linaro.org> References: <20180809042206.15726-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::434 Subject: [Qemu-devel] [PATCH 10/20] 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: laurent.desnogues@gmail.com, peter.maydell@linaro.org, alex.bennee@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. 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 Reviewed-by: Peter Maydell diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 18b3c92c2e..33d06f2340 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) { #ifdef CONFIG_USER_ONLY diff --git a/target/arm/helper.c b/target/arm/helper.c index fb79b27cf6..64ff71b722 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4344,7 +4344,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) { @@ -4402,7 +4402,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; @@ -12352,7 +12352,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 b29dc49c4f..4a0ca8c906 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;