From patchwork Fri Jul 8 15:14:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 588513 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:bb16:0:0:0:0 with SMTP id jd22csp753103mab; Fri, 8 Jul 2022 08:18:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uktPj4Hp0E0Dv+62w4x4jgNGzn2GOQl2YHCpGrJQaYQD41hNFiq/oQ9SDh/zQ8bxJf19Hu X-Received: by 2002:a05:620a:4016:b0:6b1:4b7d:7440 with SMTP id h22-20020a05620a401600b006b14b7d7440mr2655961qko.587.1657293480595; Fri, 08 Jul 2022 08:18:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657293480; cv=none; d=google.com; s=arc-20160816; b=jJzbuatqlgSl/S1j8hBfsRGh5nss0wxkyOLtvC+yBUYlvWh4iF1IUvMra08bTqt7nD D2g+7MVh2Q319d1o1htPxxWNuknyzo1yoWCkAeyV0Z9RbbQhfWY+ZdyL1E32WGAvkx6L Ex8wQT8CQNOwAecWQUsPbwLYbJlrpC7OLssBlXAGQHr8pxloiy+WjjKjJp+nE6DWg7Ow vqfYS1dOpS92+R0ON2JANzricJKwW1WD3QMl5ZmMBk7oa+1D7ti5bkO+t4WV8aTnym60 LsIqspM+VeVRMtidX30NrvEGdv4lz3o1u4jqcXJgFXlyvR+0VXTUayD42qN4Zglo1M6d pT/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ROIaR2/2j+a5heyURGySBxjwOTFvMLYqmlHWrVr1ZCs=; b=I3e7ZXwUDHhjwaXah/cWZP2SushE08lsXX9ysdOHs3qauMuq86J+SHiHqJA4AFE2XO osJsmXqqu8f6K2PfHKHKGvIH3lbVYOS6MG5+EDHW24OMI3TmDd4oRBzaN4x9LPh+rFzo oRZI6v5EV8DOZmtxEGALZLigR6gie79TcHzMPyPJgk3avpRDmT7Id9SqcgHhRcjfhmQa xJVRxzjy/JEW9lB4KGedGedHAKZo9y1XSNHwJYLg+w31os4aPI5SQuODLgIkfNcUS5XU xve34jZR5A823ajejn/ujVRz49T02VtpLY11Dd+NcVI9Fo03faSoJVInEKjIjhGEKoCB ZsUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UqFq1/TV"; 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=pass (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 t21-20020a05620a451500b006b25f42a306si17401615qkp.467.2022.07.08.08.18.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jul 2022 08:18:00 -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=pass header.i=@linaro.org header.s=google header.b="UqFq1/TV"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9pk0-00028z-6i for patch@linaro.org; Fri, 08 Jul 2022 11:18:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9pi4-00027m-Ss for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:16:02 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:38751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9phy-00024n-S2 for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:16:00 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 89-20020a17090a09e200b001ef7638e536so2218928pjo.3 for ; Fri, 08 Jul 2022 08:15:50 -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=ROIaR2/2j+a5heyURGySBxjwOTFvMLYqmlHWrVr1ZCs=; b=UqFq1/TVBNhb5c6+fH4hnMe/83viqNxKg4+zV/SzExDiHGApEDwulsois1HrtFeYVj 9CQPdoGjcBhfJOeeDF+s8TzY6WJfogWWGcw2PaM1BGO2vdS7lw7+i16yHi0i5zNFBhs0 RzgrEFP3G/KOO0mlzVrzeeBNlafsEEMf1pnSUl6JyHS1yrd3lYY6jUlwP8s/s5oR5Ux5 wqKs8lI8rP39U2lxdnaTmmBi/qaaXd3KPY4hv4cQhFKPgFFrJ+bgDWKo2vJU2tFH8tFB Lw1biauhMlSqalUF9elGyX9MozDGe7ur3uBICA0akQObjZFUKECTN0qfB/WS8rRu2O2z ZCww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ROIaR2/2j+a5heyURGySBxjwOTFvMLYqmlHWrVr1ZCs=; b=dzEA0RdEHLq4SDIqA6UGjxe8hus4LolHWgU46gnHBEUj7lCDjOyYIZ6fGXOR/x8rXl YQvDwu+cMMUbJX/Tkz7DuwrYEFfHaytG2/Z7yrraVyooROWpbXKGc5IbCGYgG4LZU6BS 4LBKxxNolDk0w/Oqk1G03dLjbAeBGslS9+ITLy8ixUg2sGgtXZasypxKDhSg4agJYS/b yGBeVRKMA4vih9FV5AYh30mUOp6el1kvHluDfwDswvTszIfWEnzjzaMlbWCZEJcP8vGj WDquBKDRrrkloejgfA55tmqKbOqsElBVZ4ujyzNI2aO7ZZbwqcQViAnTdc+McCNz9M2M d0ag== X-Gm-Message-State: AJIora+j5yZEb9Bi6zwlbrSdZA2zOWEosnVJJCEPdgl9nxB++CbiMNVk w2k2xKY5exGdobbPyMGhelQionieaxJojNks X-Received: by 2002:a17:903:32c4:b0:16a:4227:cd68 with SMTP id i4-20020a17090332c400b0016a4227cd68mr4070860plr.173.1657293349602; Fri, 08 Jul 2022 08:15:49 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id n17-20020a056a0007d100b0051bada81bc7sm29085774pfu.161.2022.07.08.08.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:15:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v6 01/45] target/arm: Handle SME in aarch64_cpu_dump_state Date: Fri, 8 Jul 2022 20:44:56 +0530 Message-Id: <20220708151540.18136-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220708151540.18136-1-richard.henderson@linaro.org> References: <20220708151540.18136-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Dump SVCR, plus use the correct access check for Streaming Mode. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ae6dca2f01..9c58be8b14 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -878,6 +878,7 @@ static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) int i; int el = arm_current_el(env); const char *ns_status; + bool sve; qemu_fprintf(f, " PC=%016" PRIx64 " ", env->pc); for (i = 0; i < 32; i++) { @@ -904,6 +905,12 @@ static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) el, psr & PSTATE_SP ? 'h' : 't'); + if (cpu_isar_feature(aa64_sme, cpu)) { + qemu_fprintf(f, " SVCR=%08" PRIx64 " %c%c", + env->svcr, + (FIELD_EX64(env->svcr, SVCR, ZA) ? 'Z' : '-'), + (FIELD_EX64(env->svcr, SVCR, SM) ? 'S' : '-')); + } if (cpu_isar_feature(aa64_bti, cpu)) { qemu_fprintf(f, " BTYPE=%d", (psr & PSTATE_BTYPE) >> 10); } @@ -918,7 +925,15 @@ static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) qemu_fprintf(f, " FPCR=%08x FPSR=%08x\n", vfp_get_fpcr(env), vfp_get_fpsr(env)); - if (cpu_isar_feature(aa64_sve, cpu) && sve_exception_el(env, el) == 0) { + if (cpu_isar_feature(aa64_sme, cpu) && FIELD_EX64(env->svcr, SVCR, SM)) { + sve = sme_exception_el(env, el) == 0; + } else if (cpu_isar_feature(aa64_sve, cpu)) { + sve = sve_exception_el(env, el) == 0; + } else { + sve = false; + } + + if (sve) { int j, zcr_len = sve_vqm1_for_el(env, el); for (i = 0; i <= FFR_PRED_NUM; i++) {