From 7c989698a14b2626702ffb8812e78c7fd274af75 Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Mon, 27 Nov 2017 13:09:42 -0800 Subject: [PATCH] WIP better CSR names, and include only existing Change-Id: I1a234ee07c417ba56da10a61fc2bdbdcc60490a8 --- src/target/riscv/riscv-013.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index 9e57a2245..a63d168c9 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -1186,9 +1186,40 @@ static int init_registers(struct target *target) r->group = "float"; r->feature = &feature_fpu; } else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) { - sprintf(reg_name, "csr%d", number - GDB_REGNO_CSR0); r->group = "csr"; r->feature = &feature_csr; + r->exist = true; + switch (number) { + case CSR_FFLAGS: + strcpy(reg_name, "fflags"); + r->exist = riscv_supports_extension(target, 'F'); + r->group = "float"; + r->feature = &feature_fpu; + break; + case CSR_FRM: + strcpy(reg_name, "frm"); + r->exist = riscv_supports_extension(target, 'F'); + r->group = "float"; + r->feature = &feature_fpu; + break; + case CSR_FCSR: + strcpy(reg_name, "fcsr"); + r->exist = riscv_supports_extension(target, 'F'); + r->group = "float"; + r->feature = &feature_fpu; + break; + case CSR_CYCLE: + strcpy(reg_name, "cycle"); + break; + case CSR_TIME: + strcpy(reg_name, "time"); + break; + case CSR_INSTRET: + strcpy(reg_name, "instret"); + break; + default: + sprintf(reg_name, "csr%d", number - GDB_REGNO_CSR0); + } } else if (number == GDB_REGNO_PRIV) { sprintf(reg_name, "priv"); r->group = "general";