On Tue, Jun 15, 2021 at 6:51 PM Bin Meng <bmeng...@gmail.com> wrote:
>
> From: Bin Meng <bin.m...@windriver.com>
>
> Since commit 605def6eeee5 ("target/riscv: Use the RISCVException enum for CSR
> operations")
> the CSR predicate() function was changed to return RISCV_EXCP_NONE
> instead of 0 for a valid CSR, but it forgot to update the dynamic
> CSR XML generation codes in gdbstub.
>
> Fixes: 605def6eeee5 ("target/riscv: Use the RISCVException enum for CSR
> operations")
> Reported-by: Xuzhou Cheng <xuzhou.ch...@windriver.com>
> Signed-off-by: Bin Meng <bin.m...@windriver.com>
> Tested-by: Xuzhou Cheng <xuzhou.ch...@windriver.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
>
> target/riscv/gdbstub.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c
> index ca78682cf4..a7a9c0b1fe 100644
> --- a/target/riscv/gdbstub.c
> +++ b/target/riscv/gdbstub.c
> @@ -170,7 +170,7 @@ static int riscv_gen_dynamic_csr_xml(CPUState *cs, int
> base_reg)
>
> for (i = 0; i < CSR_TABLE_SIZE; i++) {
> predicate = csr_ops[i].predicate;
> - if (predicate && !predicate(env, i)) {
> + if (predicate && (predicate(env, i) == RISCV_EXCP_NONE)) {
> if (csr_ops[i].name) {
> g_string_append_printf(s, "<reg name=\"%s\"",
> csr_ops[i].name);
> } else {
> --
> 2.25.1
>
>
