From nobody Sat Feb 7 07:25:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1750699330; cv=none; d=zohomail.com; s=zohoarc; b=QH1i+W8/+222H79RxSE1k9cJvFiwPQ4B0vl8Mg0eiotXLXWJ8EDvA3RQqiST7kS7WaB7edYKlFdYEftuBbehjJov29BAhHskThunA8f1X9PB5rat6GxBk5KxVRcdHn04DV8CjuLDkHaeaXpnKG3ut2xKKbAScJkUVureaNtEibg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750699330; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BDqc6xvB3Efmye7dJiJOwmjCf6rKsctE8jjHmloXd8I=; b=ah+VlQX3rQKe/LFfiLKhLLhfHRZW+4IeM9ym+MDooIQwMHgcJEHYHbz11krCk8ijO6EYsz94WVNbqeljUGQMptuwwaYE3QIuaMUa2zFlo63mVvLHRDAUhs9V/4+4N7ZgNI5iMFlyDhzHkEPJ3qtoDbM24lyjk2KDu6UERow6vRY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750699330643718.3417383110457; Mon, 23 Jun 2025 10:22:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTkra-0004UF-04; Mon, 23 Jun 2025 13:21:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTkrL-0004QR-PU for qemu-devel@nongnu.org; Mon, 23 Jun 2025 13:21:32 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTkrJ-0006Cp-Rn for qemu-devel@nongnu.org; Mon, 23 Jun 2025 13:21:31 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-235ef62066eso60215145ad.3 for ; Mon, 23 Jun 2025 10:21:29 -0700 (PDT) Received: from grind.. ([191.255.35.152]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d873845esm90847525ad.243.2025.06.23.10.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 10:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1750699288; x=1751304088; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BDqc6xvB3Efmye7dJiJOwmjCf6rKsctE8jjHmloXd8I=; b=o19qAVFn4txB3cpdTzv8eodocnxiu0T9vhwgHJ0TuIZE66xXweyY5nVR3ncqNNYOIu 3FgwGgeBypcxeJByib8kHLfwsXLx0LVEnybecJsR60UmPqSltsneoXd/rsnU/uvAcTVB hQxjgGv94eK76yhSpF3BS0AM8IlJJTvN7JlqMq5wGewM/ENX4uDdIZ7tm4jIChbSP1lq o1Ui0KEhEr13jPdcHUorCJNG+2Uhe/scxtWK9/WmQbYH6GdjrPpaBtfO1t9HIO6JMxY/ xfc06sBD6HwLyaZUhWjIRp3yST4ZbGKmHeeLyUGBaV6phzqPWBPifTFdag3lYJZMV2Oj EuMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750699288; x=1751304088; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BDqc6xvB3Efmye7dJiJOwmjCf6rKsctE8jjHmloXd8I=; b=MXQwstcBb8RPjPcZc3aEqaUYT44XyZ/ei5bOGAl3gJAyTGVwwH7cJD5SpS8VQ+DHV0 lz7J776fgAGsNqKOyr9I7nIhKjMiKMWhp6aNzK+gGW1suQur6rw96uDfkPkXAyiIbkrO VhL3gIvrAPxT+mwWoX48foAWoToVv1LIq1ppxIu0eRBkb7ph9srGI5KnU7bAmpLvMqUB S43meUI3jWXnZ3Hv1z+wBTJP8py45f7rKEnG6/JBFxXBdRBxvkG6EvwyIAVdiq4UyvyM oxeEEHCJmuY+5w3vvrL677KJ2WxRzsBiECW+vM9mJJyIMbCEXP5owGeu4eQ9EPPhXNzc yUfA== X-Gm-Message-State: AOJu0Yx1iFmMHwAcul4QyoaiSA+8GxpZwY+acmutVRQTyLLjzzm2XlQa BQRJBh2uDARMH3Xw/eAJVC7JRPALCmnPi0QAy75C+wb0XA1F5gdYUheSV9LB5/m1tMg9zfemb8i VqPeD4IU= X-Gm-Gg: ASbGncuKihOdwMssFZZ8ppYEiw3G2cnwXVcrLTpwt6Cm61SkOtTya1AI/2Soj418EA6 Gp8yh9kX3ff1ziPC5TgoP3gD1xfCHjvjbIlmma2Rf9aW8Yb3523xPsxCzmxo8j2S2Nj1az7CFMm AHUIiz28uZNeAlv1MAhhgik+YJIU5jLoLf7DtqkHKzQB6fSMiOzszffZ1+IKNsSTUJr6xQebPHg /SdaZRnfVoWvvAQt0J2xKtK8CkrjZE7GHcjUy18vuHPAKXpHCKiBxaDV9cm0VNYoNtyWcewAR9c Sww1wwzxGoDqEsbPTjqlJGrxTFoN+d7Cern4kZ+jzbnhDgvHD1CdH3+6UrBpKpkX X-Google-Smtp-Source: AGHT+IEUByln5o1Klzn0DH8+iv1KvSyApBvkHeCsK0Ub8sgyEQX1T56sqg1h2o5n/vzB4a8+uU3Mvg== X-Received: by 2002:a17:902:d50a:b0:236:748f:541f with SMTP id d9443c01a7336-237d9891ca5mr216546745ad.33.1750699287846; Mon, 23 Jun 2025 10:21:27 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@dabbelt.com, Daniel Henrique Barboza Subject: [PATCH 1/3] target/riscv/cpu: add riscv_dump_csr() helper Date: Mon, 23 Jun 2025 14:21:17 -0300 Message-ID: <20250623172119.997166-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623172119.997166-1-dbarboza@ventanamicro.com> References: <20250623172119.997166-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x632.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1750699331713116600 Content-Type: text/plain; charset="utf-8" riscv_cpu_dump_state() is using the same pattern to print a CSR given its number. Add a helper to avoid code repetition. While we're at it fix the identation of the 'flags & CPU_DUMP_VPU' block. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 54 +++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index e3f8ecef68..67e4eda4f9 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -515,6 +515,21 @@ char *riscv_cpu_get_name(RISCVCPU *cpu) return cpu_model_from_type(typename); } =20 +static void riscv_dump_csr(CPURISCVState *env, int csrno, FILE *f) +{ + target_ulong val =3D 0; + RISCVException res =3D 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 =3D=3D RISCV_EXCP_NONE) { + qemu_fprintf(f, " %-8s " TARGET_FMT_lx "\n", + csr_ops[csrno].name, val); + } +} + static void riscv_cpu_dump_state(CPUState *cs, FILE *f, int flags) { RISCVCPU *cpu =3D RISCV_CPU(cs); @@ -565,18 +580,7 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f= , int flags) }; =20 for (i =3D 0; i < ARRAY_SIZE(dump_csrs); ++i) { - int csrno =3D dump_csrs[i]; - target_ulong val =3D 0; - RISCVException res =3D 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 =3D=3D RISCV_EXCP_NONE) { - qemu_fprintf(f, " %-8s " TARGET_FMT_lx "\n", - csr_ops[csrno].name, val); - } + riscv_dump_csr(env, dump_csrs[i], f); } } #endif @@ -589,12 +593,8 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f= , int flags) } } if (flags & CPU_DUMP_FPU) { - target_ulong val =3D 0; - RISCVException res =3D riscv_csrrw_debug(env, CSR_FCSR, &val, 0, 0= ); - if (res =3D=3D RISCV_EXCP_NONE) { - qemu_fprintf(f, " %-8s " TARGET_FMT_lx "\n", - csr_ops[CSR_FCSR].name, val); - } + riscv_dump_csr(env, CSR_FCSR, f); + for (i =3D 0; i < 32; i++) { qemu_fprintf(f, " %-8s %016" PRIx64, riscv_fpr_regnames[i], env->fpr[i]); @@ -612,22 +612,12 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *= f, int flags) CSR_VL, CSR_VTYPE, CSR_VLENB, - }; - for (i =3D 0; i < ARRAY_SIZE(dump_rvv_csrs); ++i) { - int csrno =3D dump_rvv_csrs[i]; - target_ulong val =3D 0; - RISCVException res =3D riscv_csrrw_debug(env, csrno, &val, 0, = 0); + }; + uint16_t vlenb =3D cpu->cfg.vlenb; =20 - /* - * Rely on the smode, hmode, etc, predicates within csr.c - * to do the filtering of the registers that are present. - */ - if (res =3D=3D RISCV_EXCP_NONE) { - qemu_fprintf(f, " %-8s " TARGET_FMT_lx "\n", - csr_ops[csrno].name, val); - } + for (i =3D 0; i < ARRAY_SIZE(dump_rvv_csrs); ++i) { + riscv_dump_csr(env, dump_rvv_csrs[i], f); } - uint16_t vlenb =3D cpu->cfg.vlenb; =20 for (i =3D 0; i < 32; i++) { qemu_fprintf(f, " %-8s ", riscv_rvv_regnames[i]); --=20 2.49.0 From nobody Sat Feb 7 07:25:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1750699332; cv=none; d=zohomail.com; s=zohoarc; b=KO4Utki09VsXAkcTu0UJrayW0hAePAsF18C++MtjBOCtAnCtNdIMjnRKuzYEwByrIqCyUhJZd9Mgn+vo7u5BmgPR579VUGcVP5DbSQEOvw2LREhaTgtPv2vVhDOx0NgxA1/R/N4rfWsupv5lJVqSMbEjaaD4kC3FhiuutHKmObI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750699332; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0trTbrlEckBm1D/wCLK5pgkruWisL1/jrSdP5YRGaVY=; b=UJBfs1n9f93L4qQN0uiHEbo3ezM69ze1LY24CDVDz9DcYb3B6udyD2f6VTpPwaL3F2r92VsKZLgHq/FOxndYbXoTeCAQgGUIvaIxyyf+jTWtZZXkN6gc75D0jPVlpmvDIq3M8OcGVMic4e79m5oJLZ8UaWluzz9K/trksuUuL5c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750699332765688.1510468114225; Mon, 23 Jun 2025 10:22:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTkrf-0004Ut-Nx; Mon, 23 Jun 2025 13:21:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTkrO-0004R3-El for qemu-devel@nongnu.org; Mon, 23 Jun 2025 13:21:35 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTkrM-0006DL-OX for qemu-devel@nongnu.org; Mon, 23 Jun 2025 13:21:34 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-236377f00a1so41504135ad.3 for ; Mon, 23 Jun 2025 10:21:32 -0700 (PDT) Received: from grind.. ([191.255.35.152]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d873845esm90847525ad.243.2025.06.23.10.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 10:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1750699290; x=1751304090; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0trTbrlEckBm1D/wCLK5pgkruWisL1/jrSdP5YRGaVY=; b=FWDED78Csyr9Y1J0LUWgPTAwvxW6iy2lgTLJvJ3uhQyJYe0/8NsNH/a3PtMrVizHQS jP9DimSaBu6lABZTi1Aq5Ee6tv3u0kqOs3O+z5Abz3EdvnRK2TgcyttUnhRWIlvCW+rv w6EXlOfvTWdFAU0LgK50PcOabO2H1QhMi+iLEfch76agwoYJ+aMrCtCOCt9E0ILxbIxf kYu0iplbepU3Dz/LuPNLev0HF2p+47GvfXSP6wbz9bkPdy8FNDDdOB6ha3/5/VutgBuN BkU0CZLlccej82k950u3gw2XyCto43PxyDvfv/kFnmchUA7vv7uRuwhcwMf0CNrQhTnc F5Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750699290; x=1751304090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0trTbrlEckBm1D/wCLK5pgkruWisL1/jrSdP5YRGaVY=; b=VDHk31hLlJFUUei97SHTsM9aT21KjAQtKhtffxLevfiE1R+8C7hegCVslwO+udz8RL AM7gZ4K9IE9LpGFaJAc4b+qSzYWn45xNM87w007GiPF57CM3SAG2tNKce6YkZ+RDO6ba S5xVridSRvNgYfIJqSkX3CCcNtysVYaPQm8qHQ8JJZsMBfjWONHEOPljTvtSlu38IeL6 mPZGb0mrlXyWQcUimf7FVhNnNDodT7yh5OWNF1ZNO1YI8y1iIHNoRhlyqdxnZpluwese Avs0I35X540UenJg7fNOsBHUhFCMdCoKpiLv8DLuRXGOEvHgFJZMqhKx2/8529Ecqzox hQWA== X-Gm-Message-State: AOJu0Yyhtc2s8sSqSRT9ZhAqdYQFJ/AJDXwkfoV+ecJNIK6Z4yrrTnYr Mzk5Ehf1BTkghuADaEvkLF7llTt3QORiE8RqcxxXBLYQ53V5tnQ/PKUQd3vRafInOfEUo7YJuJk lF5MyT30= X-Gm-Gg: ASbGncuRwKuE4JTnKXdu0T5gzsVNImkSHgVL4viNLy1T2/PYDapGK+r1kMbs25VFc2A RhhIH8ibpLECPxooa7V1CxuX9s1x5XC0AHVBDjYUAmWlWI3a4weTZWfs/2fn+k6ki4NvUFv6A9p lyTPQlJJGBR/yuQj1QnVY83JdMlUA8JbOYu7DFwKSKdxZI8igAxV5F9wq7T0gC8Nh2dS1U2KXWV 3riFr4gniVUXMldPemIgQOhJSvZNwqAH2+dWf69OYEqVoaIOkc87tdO0hTmCm3OReBsQQItce03 Ia/czTpK02Z62WId6bRZAT+FvT3iSOAbzS1pwSYLSnolSy3/4k0MDR4/MOBLgTmK X-Google-Smtp-Source: AGHT+IHufz60AlBSXwE2Mmah7pM7H1tLCjNJ2PFTwAA90KfaJlbOkWadh/52HZR8R6WNgf0ggF1wLg== X-Received: by 2002:a17:902:f68f:b0:234:d2fb:2d28 with SMTP id d9443c01a7336-237d96e2305mr222750045ad.2.1750699290527; Mon, 23 Jun 2025 10:21:30 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@dabbelt.com, Daniel Henrique Barboza Subject: [PATCH 2/3] target/riscv/cpu: print all FPU CSRs in riscv_cpu_dump_state() Date: Mon, 23 Jun 2025 14:21:18 -0300 Message-ID: <20250623172119.997166-3-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623172119.997166-1-dbarboza@ventanamicro.com> References: <20250623172119.997166-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x636.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1750699333424116600 Content-Type: text/plain; charset="utf-8" We're missing fflags and frm. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 67e4eda4f9..95d0b88937 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -593,6 +593,8 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f,= int flags) } } if (flags & CPU_DUMP_FPU) { + riscv_dump_csr(env, CSR_FFLAGS, f); + riscv_dump_csr(env, CSR_FRM, f); riscv_dump_csr(env, CSR_FCSR, f); =20 for (i =3D 0; i < 32; i++) { --=20 2.49.0 From nobody Sat Feb 7 07:25:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1750699340; cv=none; d=zohomail.com; s=zohoarc; b=jeiUqS13/ZuKwpxjsiS547UpLL6QlYZ2m1Rc/IHFgmJ1RmJxv+ARBNFX1KsC9RuI+AjGECUKL0ZG0ajM9paunOyFhGfgaiQVUjCjJ5IAlbOMbFHX8Y8M2zrXSOO2RRhjBcDfJWyOhRHxbTFkPOOPFVrjYCa1YN3NPnXhLMoHFyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750699340; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ghnsqsuTP2eOK0pz8lkELt9NeubIcUGu0srdYwhqGo0=; b=H7e965RiBwLTjJZMi6ubnrNBIRVPsnBeFUhvjL2NwBTcsNYC5rr5ZteG+wmKGKIFj8O0qV+R7zH0fo3d8me+9pWkuaetynU8IFBQb4U0MW6dP+AeTS7VOrDTKVeHk+2zhNGIu136LPzsK0YSPw7m11k+2j0M2AKlqmy5AlNESyc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750699340624392.5548133510491; Mon, 23 Jun 2025 10:22:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTkrg-0004Uv-5q; Mon, 23 Jun 2025 13:21:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTkrR-0004Rn-Cs for qemu-devel@nongnu.org; Mon, 23 Jun 2025 13:21:38 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTkrP-0006E2-9J for qemu-devel@nongnu.org; Mon, 23 Jun 2025 13:21:37 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-b2fd091f826so3399552a12.1 for ; Mon, 23 Jun 2025 10:21:34 -0700 (PDT) Received: from grind.. ([191.255.35.152]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d873845esm90847525ad.243.2025.06.23.10.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 10:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1750699293; x=1751304093; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ghnsqsuTP2eOK0pz8lkELt9NeubIcUGu0srdYwhqGo0=; b=e0QnvmOccgoIae82scl+dOWRHpwcsjGnwMk/aJxtpv7xAwwr/7rbv+xs/bw1F3h1sd g84jY50my21g1kO+/aWaDYBRzkKUhRPUcY1exo7qCDEMnGPBxLBbzhssfe4C+7REsiV1 duIkDhzAZaaX8zKZtb2WwBA/8UmR0UhYSfB+MHs5HnwGOMXtaCZ1POxzVUVcjs4UvlR6 UYtcFde33AC3wif9HlgY/MRfZJMHPW9EmpMt3wGbL/CuttnNJO8P8ZtbejYCBnYSHCzR En3TfC7nRk+4FsT5fqiVuftuwCFnWgEQr1dcxAlc6U/ofDGtN++Q8daCNFaGPAnlrT/k MSTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750699293; x=1751304093; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ghnsqsuTP2eOK0pz8lkELt9NeubIcUGu0srdYwhqGo0=; b=qdILnH6QmMFeFV1YMC6ak2LEPo1Ie0uGZiCAD4Nw56MHk2PrSffD5nRbtNl7lRo11p gnol3kJ7ojSoW4xFFV4LHvnbeEIXztohaTd5ZWk8lQyAAfKQGIvowNYSI2dng78jwuUg 4DUF4T54kKM3l/qgu18eJw3tHL3JGnRMHhrtv0zAEMliz46gl+OeA708F3j4mTEO8zmg wfTjEKm9d0/l76etMtvvJ2xaD/eFfLYwbmLAtBa1vM1bV+d3i81Z5PTe/heICP3uzUtV jX0R+PRMdxs5Kg4iDCvAE8kXluTkkscfSnjXsa9YMadz0V/ypW7ME185j1+1XNkQfWJF eUUQ== X-Gm-Message-State: AOJu0YzuGfNfRhx/us6q85HEPYg/X62meolgMn6H6GMRntNA5g8AHDW4 ZHl5NBsyLIyNol+SdMDpnKicY7fL9O0n78wu5IqusKQX3vbDYYrjkEzhXZPETr4CzIrKY2HvzCC ZDkZmKMQ= X-Gm-Gg: ASbGncunMiSQgWIy3UefIrKA5cQ5HFAwBfJCxsEkHwugrlRFeeVVu++fEL/Ts9z3BSz UJl68BW1pK0GcKHWyt2HzoxbT/6o2oLQCstCbHqJk2pUH4qjtqQm+Kj/ZT4K6r8soKP0LP++Vq7 sU57xrjH4gn2zHvsEcntImjdXkJ6wVH0KSPP/7HRT0JqoT979byRmx2tK+lWllnTo5jh9m+jMbT tDggiTraUm6YU012aCeHE8GaMYY4NCCqC0aUjEAY+iA+KfQVE5ptOzS9IULXtFmYkWaQ4lUznjj q8k/jUmOqMDieTLCiaNwxXkkhqpEwhoI58Vrv6jJjLlrNJVA9ZEBI9x+FIHcOcqK4kqSU88tRdw = X-Google-Smtp-Source: AGHT+IFK04sa0p5ov4RETysY0BD2GYY07uznPn5FOVaf/tnK0nmIeC10L9o06hevZcIJGAf0ASkgRw== X-Received: by 2002:a17:902:b417:b0:231:c3c1:babb with SMTP id d9443c01a7336-2380249777emr3446225ad.18.1750699293228; Mon, 23 Jun 2025 10:21:33 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@dabbelt.com, Daniel Henrique Barboza Subject: [PATCH 3/3] target/riscv: print all available CSRs in riscv_cpu_dump_state() Date: Mon, 23 Jun 2025 14:21:19 -0300 Message-ID: <20250623172119.997166-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623172119.997166-1-dbarboza@ventanamicro.com> References: <20250623172119.997166-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=dbarboza@ventanamicro.com; helo=mail-pg1-x52e.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1750699341792116600 Content-Type: text/plain; charset="utf-8" At this moment we're printing a small selection of CSRs. There's no particular reason to not print all of them. We're ignoring the note about CSR_SSTATUS being ommited because it can be read via CSR_MSTATUS. There's a huge list of CSRs that would fall in this category and it would be an extra burden to manage them, not mentioning having to document "we're not listing X because it's the same value as Y" to users. Remove 'dump_csrs' and use the existing 'csr_ops' array to print all available CSRs. Create two helpers in csr.c to identify FPU and VPU CSRs and skip them - they'll be printed in the FPU/VPU blocks later. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 55 ++++++++++++++++------------------------------ target/riscv/cpu.h | 2 ++ target/riscv/csr.c | 18 +++++++++++++++ 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 95d0b88937..ed1bf18625 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -544,44 +544,27 @@ 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 - { - static const int dump_csrs[] =3D { - CSR_MHARTID, - CSR_MSTATUS, - CSR_MSTATUSH, - /* - * CSR_SSTATUS is intentionally omitted here as its value - * can be figured out by looking at CSR_MSTATUS - */ - 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 (i =3D 0; i < ARRAY_SIZE(csr_ops); i++) { + int csrno =3D i; =20 - for (i =3D 0; i < ARRAY_SIZE(dump_csrs); ++i) { - riscv_dump_csr(env, dump_csrs[i], f); + /* + * Early skip when possible since we're going + * through a lot of NULL entries. + */ + if (csr_ops[csrno].predicate =3D=3D NULL) { + continue; } + + /* + * FPU and VPU CSRs will be printed in the + * CPU_DUMP_FPU/CPU_DUMP_VPU blocks later. + */ + if (riscv_csr_is_fpu(csrno) || + riscv_csr_is_vpu(csrno)) { + continue; + } + + riscv_dump_csr(env, csrno, f); } #endif =20 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 4a862da615..ecdf709c2d 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -967,6 +967,8 @@ bool riscv_cpu_accelerator_compatible(RISCVCPU *cpu); =20 /* CSR function table */ extern riscv_csr_operations csr_ops[CSR_TABLE_SIZE]; +bool riscv_csr_is_fpu(int csrno); +bool riscv_csr_is_vpu(int csrno); =20 extern const bool valid_vm_1_10_32[], valid_vm_1_10_64[]; =20 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 6296ecd1e1..229257b31b 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -5799,6 +5799,24 @@ static RISCVException write_jvt(CPURISCVState *env, = int csrno, return RISCV_EXCP_NONE; } =20 +bool riscv_csr_is_fpu(int csrno) +{ + if (!csr_ops[csrno].predicate) { + return false; + } + + return csr_ops[csrno].predicate =3D=3D fs; +} + +bool riscv_csr_is_vpu(int csrno) +{ + if (!csr_ops[csrno].predicate) { + return false; + } + + return csr_ops[csrno].predicate =3D=3D vs; +} + /* * Control and Status Register function table * riscv_csr_operations::predicate() must be provided for an implemented C= SR --=20 2.49.0