From patchwork Fri Oct 22 13:38:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 516135 Delivered-To: patch@linaro.org Received: by 2002:ac0:bf50:0:0:0:0:0 with SMTP id o16csp1110179imj; Fri, 22 Oct 2021 06:55:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1HvNOZcAExqXCznxhNeoLieTuJvbuJdAlDNlYvQ0edWRPUbENfKsaMWQ+nN/oxQM0QWx5 X-Received: by 2002:a9d:5911:: with SMTP id t17mr53373oth.30.1634910925392; Fri, 22 Oct 2021 06:55:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634910925; cv=none; d=google.com; s=arc-20160816; b=P5bsnQQsieMJrPjQKUNrgzdlYovo0E+nZ+2uhQDc7AhPs2a3D5jC0ZzoIDnTUKJRm0 ikXY1/H1JGXmNUiZsTfeeYNZOOKOQBRu+CRGLDKfoXOMlfMR7AR05Ce9HjreiKhUwhdg UdqlwyT3961z2e6h5lj+1sDgw4UcplJwutjY3yZxaqWdVA9UaFYj8Opk4CKH2LSQ2iMx P/DTRhfP30xWF7tsEzbEcsljADJdYMRiyP+gctwvEYAzdZ0vQeqczENTSBlNdJpu8RFg vcFvpZf79f+clFno/1WZn3MfQEZ8dSTmOiewXG7n6xN2MaUmF+GSOKt0M4/38dlTmOq6 1U/A== 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:wdcironportexception:ironport-sdr:ironport-sdr :dkim-signature; bh=0UQlTjnmqRZ9o7iuUbZ/RqMe4FAyqREmV8iYMUViXuQ=; b=s2loUskaix3nokL1Yh2L2NYp70wKA5YahPzeyx3q49K/h1cEPfdgHlrN0yyhN459M2 paicvGYogGIw749/ndMJ/vmAIRDcXqDC1SlkIrh6B0at6iXTW+A+reLOo3SzmNs7468b 5NiitJE/lXgUMMU6VImDUjxrcWTkSYPeKL/sxuNn8IRFm1BInYPkqMPA5rutkoil6+GZ NXkzjlQP3bPglxS5dXxlg8uuDG7rjnxU40i3aWPrRhi6i+j5w/RJIh72oJsj4iTDmTuZ uNCGfciDj2T6LezECWyX8gpHRAlAFxsUXWwFeNUHQMG+U8A4ydmmi3vvJU/WGzYV1vze WDQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=CQTS8kCu; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b="ePzcD/Jc"; 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=QUARANTINE sp=NONE dis=NONE) header.from=opensource.wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x28si9094006ott.81.2021.10.22.06.55.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Oct 2021 06:55:25 -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=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=CQTS8kCu; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b="ePzcD/Jc"; 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=QUARANTINE sp=NONE dis=NONE) header.from=opensource.wdc.com Received: from localhost ([::1]:58282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mdv12-00031d-J4 for patch@linaro.org; Fri, 22 Oct 2021 09:55:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mdumc-0001oF-Cy for qemu-devel@nongnu.org; Fri, 22 Oct 2021 09:40:30 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:39690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mdumZ-0001Qs-UT for qemu-devel@nongnu.org; Fri, 22 Oct 2021 09:40:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1634910026; x=1666446026; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NukPHe0iX3t5gd8afqd9RhYtpIE/sHpPRoxsNoRCGq4=; b=CQTS8kCuq5Cioi2N89Sf77dKIG/lposRux1oFyLOtZuBIHk5rCLvjxs5 uj2cFzMiaxFZeJwF3fevOCeu9y7dwUqeGuCJAqCm8O5Tbn5iRXXjnJ9vt kWkgLmaj30RDXMJeCZ181QFzM6sRFGRnv1YmW6y4lSIVxvonnqjurGWBh 2IPEvW9saUwmShVggjuppHto7rqb7UyCwNiGHKYmMRxWNZMiadsCajYCw 8S2MHjpdIIZDXOZFGS8VAN7hYAu6R17l2XpnaNDks47BfAeCumtABTyLA P7RNTev32PawtA/PYI5j/ROR6A+BJATYz4+magW0k+M27AZyA0Ih0Em7X g==; X-IronPort-AV: E=Sophos;i="5.87,172,1631548800"; d="scan'208";a="183617893" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 22 Oct 2021 21:40:25 +0800 IronPort-SDR: oRV9JD/ZVhgo439QA30m3U+KGztaWZg/uYH/Rkjqv2eO3yqMC9uOjctD3hrRiwA70EJ4S2l/I3 jXG7dtBG7hvooYmLqKSAKx9ZGFMoa1C8sgGPFFqGyurTnh75fIO5uUq/LAqPUg6nxpRzdBwpQZ h3JOg5JW/tTNyepoWLOPpWj57fOiP5qy5D99lGdyFFYQnk7eViAvPRfZpCXCo7v2tQLvspjsY8 O+0GOVCeR37p8G9oileb57FtDNlpyIB8oijd4DaB9Yw+cv9sIV7CP3F8bDUQlObYzDUBi+YvPa L6Cs/L0EKobAle+e76C29YN/ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2021 06:16:01 -0700 IronPort-SDR: REF48Jri0nfK6XtJs+MMf7YG/l0UWpe/Bu7Ddsibnp29zDy4flbJI2Pl+KTiUBIUvYh3dA0BUk fbuVBugWJYh5AiIW8vqkCSd00Kpkrh2I97wl7uS2TMmA4lJ4Zybz75UfzP1NoT/FlKZ9Bx/rIN 8FQ2MMLMC3uCCOThKkLghwedBBap4ISJgcmjc3oGDcGcf+THE9fRLBk41WREaez/awKyHp6OIy wnGXuGjcz5T/ogIVh4wv/1nzfWbNI8aEdGhSkrF735TWpF2Cvmlmpjn3A9ntQARlkr1/fzraV9 phs= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2021 06:40:27 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4HbQTQ69rQz1RtVm for ; Fri, 22 Oct 2021 06:40:26 -0700 (PDT) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1634910026; x=1637502027; bh=NukPHe0iX3t5gd8afq d9RhYtpIE/sHpPRoxsNoRCGq4=; b=ePzcD/Jc3FfE9X5DTSGPF/PTzU8K0LZzT4 pGWQ7HPaRwJjrN2GxPFCMWv79LABAuH28Cft4Di+Et0QEbVIFAv3s6azq7jtAjQi a6Xnd1Jo/oJj7E5r/I+pE6DhruRVhGFuDL4xF+HCEQeWihI4HtrjDMfWhLD6gwra ncacOQ73xuLOAz23YjaUR5sGTFwdGX3M8ONzKcM8jnWAbXI6egmLT6GwJFF5w69c +hn96+l/ZlMMTYhIcysTkmwId8xBvhGP7qvmTlwFWQ+AuPndzp6NFPOZwVXYo5QP aC9fYFqdq4zH+nQe/IKDiT+dx94jgGRvPp5f+rUrp8k8tnjQj2dA== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 5Xr-a8PHU_3E for ; Fri, 22 Oct 2021 06:40:26 -0700 (PDT) Received: from toolbox.wdc.com (unknown [10.225.165.39]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4HbQTL6PVxz1RtVl; Fri, 22 Oct 2021 06:40:22 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Richard Henderson , Alistair Francis Subject: [PULL 21/33] target/riscv: Use riscv_csrrw_debug for cpu_dump Date: Fri, 22 Oct 2021 23:38:00 +1000 Message-Id: <20211022133812.3972903-22-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211022133812.3972903-1-alistair.francis@opensource.wdc.com> References: <20211022133812.3972903-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.153.144; envelope-from=prvs=9222bbd82=alistair.francis@opensource.wdc.com; helo=esa5.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" From: Richard Henderson Use the official debug read interface to the csrs, rather than referencing the env slots directly. Put the list of csrs to dump into a table. Reviewed-by: Alistair Francis Signed-off-by: Richard Henderson Message-id: 20211020031709.359469-15-richard.henderson@linaro.org Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 89 +++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 44 deletions(-) -- 2.31.1 diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index dd9eccd68e..788fa0b11c 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -242,51 +242,52 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f, int flags) #endif qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "pc ", env->pc); #ifndef CONFIG_USER_ONLY - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mhartid ", env->mhartid); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mstatus ", (target_ulong)env->mstatus); - if (riscv_cpu_mxl(env) == MXL_RV32) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mstatush ", - (target_ulong)(env->mstatus >> 32)); - } - if (riscv_has_ext(env, RVH)) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "hstatus ", env->hstatus); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "vsstatus", - (target_ulong)env->vsstatus); - } - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mip ", env->mip); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mie ", env->mie); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mideleg ", env->mideleg); - if (riscv_has_ext(env, RVH)) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "hideleg ", env->hideleg); - } - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "medeleg ", env->medeleg); - if (riscv_has_ext(env, RVH)) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "hedeleg ", env->hedeleg); - } - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mtvec ", env->mtvec); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "stvec ", env->stvec); - if (riscv_has_ext(env, RVH)) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "vstvec ", env->vstvec); - } - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mepc ", env->mepc); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "sepc ", env->sepc); - if (riscv_has_ext(env, RVH)) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "vsepc ", env->vsepc); - } - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mcause ", env->mcause); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "scause ", env->scause); - if (riscv_has_ext(env, RVH)) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "vscause ", env->vscause); - } - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mtval ", env->mtval); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "stval ", env->stval); - if (riscv_has_ext(env, RVH)) { - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "htval ", env->htval); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mtval2 ", env->mtval2); + { + static const int dump_csrs[] = { + CSR_MHARTID, + CSR_MSTATUS, + CSR_MSTATUSH, + CSR_HSTATUS, + CSR_VSSTATUS, + CSR_MIP, + CSR_MIE, + CSR_MIDELEG, + CSR_HIDELEG, + CSR_MEDELEG, + CSR_HEDELEG, + CSR_MTVEC, + CSR_STVEC, + CSR_VSTVEC, + CSR_MEPC, + CSR_SEPC, + CSR_VSEPC, + CSR_MCAUSE, + CSR_SCAUSE, + CSR_VSCAUSE, + CSR_MTVAL, + CSR_STVAL, + CSR_HTVAL, + CSR_MTVAL2, + CSR_MSCRATCH, + CSR_SSCRATCH, + CSR_SATP, + }; + + for (int i = 0; i < ARRAY_SIZE(dump_csrs); ++i) { + int csrno = dump_csrs[i]; + target_ulong val = 0; + RISCVException res = riscv_csrrw_debug(env, csrno, &val, 0, 0); + + /* + * Rely on the smode, hmode, etc, predicates within csr.c + * to do the filtering of the registers that are present. + */ + if (res == RISCV_EXCP_NONE) { + qemu_fprintf(f, " %-8s " TARGET_FMT_lx "\n", + csr_ops[csrno].name, val); + } + } } - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mscratch", env->mscratch); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "sscratch", env->sscratch); - qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "satp ", env->satp); #endif for (i = 0; i < 32; i++) {