From patchwork Thu Aug 9 03:40:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 143647 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1576494ljj; Wed, 8 Aug 2018 20:45:50 -0700 (PDT) X-Google-Smtp-Source: AA+uWPz7U6UkCVl2sUcyNm4Ugng6yK5fEHpz/3gebbuhHPnR0kNDkh2pPXiJhS5m2z/ujP4VNJSo X-Received: by 2002:aed:3ea5:: with SMTP id n34-v6mr366447qtf.275.1533786350435; Wed, 08 Aug 2018 20:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533786350; cv=none; d=google.com; s=arc-20160816; b=aoQb6kgs7E8Bl52cVzXfmS7JOTVbjHLedJAOqH2DmhHahmBZBavnvA7dMrgX6infgT /wY7AsCVtKPC+tSeXQnAJQWIulxeGOfSIfpuPmL8Yg8233NSU8l/dmHYuAd0C+hpv1eY nuIxb24cV56NUA2zVRDebUIUZZ9UD5WnRHCgIFTwQyaQB1qqW/ONcn8du7KTufJdiIrq kC+jyDjKpAo4PAB550ahQZjoLLSzN1v9wVJfCyTa65gTXSttQkaIQ0Jpuz5qw3Rp6oRb jhQ0rCtuol5MfR/fo6UdJt7C/moSkzVL9x//XIP0oNFngv2Hd4hH6RR6/AIDmNpK+hgF awhg== 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=0FcppwMQ/VVPQuPzY24/U6P82x5KiB0C2CbAGzzrE6M=; b=yTw4Ltr990GIunb8R6DJjl6wL45p6CXYwITyA6uJA2z0pkiWNDI/cpxMRBqZd8ItMD Nz0LTtJWa6JKulwsKSMyTUwD00EPJ6Sa4HVjFv1sj45FvPV3l7t/VRRzH/0AGKpR7hYN PgVPrUNn7vHwwKXeGu1yzLHRc+ZbNH1+3VhTj+KKwltTuTRRZTtU/ukW7enpQTfxUXpE 28PY+RqrLaG7Y31JoZkfXky2cWA4USZTboPmZ1c8ppyrui1JmAjGcc4kHvjRIYkPoZ1O VkPDw7suMKd9QNhjt921fXXCBxS8wyE+3wGYD5ZCXmyhB0ssGKwpBT8Ph5VoYycJo0sP J4SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S7aUEd8E; 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 j34-v6si927086qte.55.2018.08.08.20.45.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 08 Aug 2018 20:45:50 -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=S7aUEd8E; 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]:46409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnbtV-00028x-Sd for patch@linaro.org; Wed, 08 Aug 2018 23:45:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnboj-0006pU-0Z for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnboi-0003FL-1u for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:53 -0400 Received: from mail-pl0-x232.google.com ([2607:f8b0:400e:c01::232]:44408) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnboh-0003Eu-QF for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:51 -0400 Received: by mail-pl0-x232.google.com with SMTP id ba4-v6so1929280plb.11 for ; Wed, 08 Aug 2018 20:40:51 -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=0FcppwMQ/VVPQuPzY24/U6P82x5KiB0C2CbAGzzrE6M=; b=S7aUEd8E98RC6F4SCcmW7rtz+ScXjJ7QNFP2Q/byL5piRugE/64bj9hfQyNmRHKl7d CUgQpXtRZdfTODq8DIqFxQyPBHEqGCPiXBE04SMAGdTyXz2PlaDRfsOZGi0mz/NxXfjb 4h/OXJjTUgoNIA97CT95XvbJxDjHxsiuPwizI= 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=0FcppwMQ/VVPQuPzY24/U6P82x5KiB0C2CbAGzzrE6M=; b=YHNSd4KpA/x9CssaRWv7id6QKHQ13ZD30RDQnWSqakQ4y/y1nAsTSg/hA1ijKcajGW hjEHBIsxVYoZh/wzAAXUuiWcrUD686P7+FN6yPlg9ELjd3srweKxzSaIh5hMSz1TJQ7l HdxbaNXzi9Bg+of/EyoPW6gxh5WzDm01mbV3MijpJDU79c0gtNC6vQh4B6LUsjI0NvNP X0aTfe0YEznULpVkF9k4McyFxiXhbbD/8OmhdLw38CevRed8p8GhaWQeeGtHkLvdLJTQ ZvFFIftDS3kSfK5/l62iepvXd5brlsL5ctjyMFn8JXwrOY9TYIK3SpQroAirQvdnLp0V PV0Q== X-Gm-Message-State: AOUpUlH+cTRPuI82iLN5aZ9A7GBWdgcl1kw37e2YOgTm9P0EKsvsHR/N 9jtUCm6tOK82Dqs4GLDja8b1lJ0gci0= X-Received: by 2002:a17:902:2e83:: with SMTP id r3-v6mr431443plb.80.1533786050462; Wed, 08 Aug 2018 20:40:50 -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 q78-v6sm9674103pfi.185.2018.08.08.20.40.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Aug 2018 20:40:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 20:40:32 -0700 Message-Id: <20180809034033.10579-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180809034033.10579-1-richard.henderson@linaro.org> References: <20180809034033.10579-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::232 Subject: [Qemu-devel] [PATCH 10/11] target/arm: Dump SVE state if enabled 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, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Also fold the FPCR/FPSR state onto the same line as PSTATE, and mention but do not dump disabled FPU state. Cc: qemu-stable@nongnu.org (3.0.1) Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 95 +++++++++++++++++++++++++++++++++----- 1 file changed, 83 insertions(+), 12 deletions(-) -- 2.17.1 Reviewed-by: Alex Bennée Tested-by: Alex Bennée diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 358f169c75..b29dc49c4f 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -152,8 +152,7 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f, } else { ns_status = ""; } - - cpu_fprintf(f, "\nPSTATE=%08x %c%c%c%c %sEL%d%c\n", + cpu_fprintf(f, "PSTATE=%08x %c%c%c%c %sEL%d%c", psr, psr & PSTATE_N ? 'N' : '-', psr & PSTATE_Z ? 'Z' : '-', @@ -163,17 +162,89 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f, el, psr & PSTATE_SP ? 'h' : 't'); - if (flags & CPU_DUMP_FPU) { - int numvfpregs = 32; - for (i = 0; i < numvfpregs; i++) { - uint64_t *q = aa64_vfp_qreg(env, i); - uint64_t vlo = q[0]; - uint64_t vhi = q[1]; - cpu_fprintf(f, "q%02d=%016" PRIx64 ":%016" PRIx64 "%c", - i, vhi, vlo, (i & 1 ? '\n' : ' ')); + if (!(flags & CPU_DUMP_FPU)) { + cpu_fprintf(f, "\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 */ + + for (i = 0; i <= FFR_PRED_NUM; i++) { + bool eol; + if (i == FFR_PRED_NUM) { + cpu_fprintf(f, "FFR="); + /* It's last, so end the line. */ + eol = true; + } else { + cpu_fprintf(f, "P%02d=", i); + switch (zcr_len) { + case 0: + eol = i % 8 == 7; + break; + case 1: + eol = i % 6 == 5; + break; + case 2: + case 3: + eol = i % 3 == 2; + break; + default: + /* More than one quadword per predicate. */ + eol = true; + break; + } + } + for (j = zcr_len / 4; j >= 0; j--) { + int digits; + if (j * 4 + 4 <= zcr_len + 1) { + digits = 16; + } else { + digits = (zcr_len % 4 + 1) * 4; + } + cpu_fprintf(f, "%0*" PRIx64 "%s", digits, + env->vfp.pregs[i].p[j], + j ? ":" : eol ? "\n" : " "); + } + } + + for (i = 0; i < 32; i++) { + if (zcr_len == 0) { + cpu_fprintf(f, "Z%02d=%016" PRIx64 ":%016" PRIx64 "%s", + i, env->vfp.zregs[i].d[1], + env->vfp.zregs[i].d[0], i & 1 ? "\n" : " "); + } else if (zcr_len == 1) { + cpu_fprintf(f, "Z%02d=%016" PRIx64 ":%016" PRIx64 + ":%016" PRIx64 ":%016" PRIx64 "\n", + i, env->vfp.zregs[i].d[3], env->vfp.zregs[i].d[2], + env->vfp.zregs[i].d[1], env->vfp.zregs[i].d[0]); + } else { + for (j = zcr_len; j >= 0; j--) { + bool odd = (zcr_len - j) % 2 != 0; + if (j == zcr_len) { + cpu_fprintf(f, "Z%02d[%x-%x]=", i, j, j - 1); + } else if (!odd) { + if (j > 0) { + cpu_fprintf(f, " [%x-%x]=", j, j - 1); + } else { + cpu_fprintf(f, " [%x]=", j); + } + } + cpu_fprintf(f, "%016" PRIx64 ":%016" PRIx64 "%s", + env->vfp.zregs[i].d[j * 2 + 1], + env->vfp.zregs[i].d[j * 2], + odd || j == 0 ? "\n" : ":"); + } + } + } + } else { + for (i = 0; i < 32; i++) { + uint64_t *q = aa64_vfp_qreg(env, i); + cpu_fprintf(f, "Q%02d=%016" PRIx64 ":%016" PRIx64 "%s", + i, q[1], q[0], (i & 1 ? "\n" : " ")); } - cpu_fprintf(f, "FPCR: %08x FPSR: %08x\n", - vfp_get_fpcr(env), vfp_get_fpsr(env)); } }