[v4] single-binary: Make riscv cpu.h target independent

[PATCH v4 26/33] target/riscv: Replace target_ulong in riscv_cpu_get_trap_name()

Posted by Anton Johansson via 2 weeks, 4 days ago

Fix cause argument to 64 bit to match env->mcause.

Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/riscv/cpu.h | 2 +-
 target/riscv/cpu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 4c6b977ce2..c2be30795a 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -601,7 +601,7 @@ extern const char * const riscv_int_regnamesh[];
 extern const char * const riscv_fpr_regnames[];
 extern const char * const riscv_rvv_regnames[];
 
-const char *riscv_cpu_get_trap_name(target_ulong cause, bool async);
+const char *riscv_cpu_get_trap_name(uint64_t cause, bool async);
 int riscv_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
                                int cpuid, DumpState *s);
 int riscv_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 353b927dd5..3378c40dbf 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -348,7 +348,7 @@ static const char * const riscv_intr_names[] = {
     "reserved"
 };
 
-const char *riscv_cpu_get_trap_name(target_ulong cause, bool async)
+const char *riscv_cpu_get_trap_name(uint64_t cause, bool async)
 {
     if (async) {
         return (cause < ARRAY_SIZE(riscv_intr_names)) ?
-- 
2.51.0

Re: [PATCH v4 26/33] target/riscv: Replace target_ulong in riscv_cpu_get_trap_name()

Posted by Alistair Francis 2 weeks ago

On Tue, Oct 28, 2025 at 4:24 AM Anton Johansson via
<qemu-devel@nongnu.org> wrote:
>
> Fix cause argument to 64 bit to match env->mcause.
>
> Signed-off-by: Anton Johansson <anjo@rev.ng>
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  target/riscv/cpu.h | 2 +-
>  target/riscv/cpu.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
> index 4c6b977ce2..c2be30795a 100644
> --- a/target/riscv/cpu.h
> +++ b/target/riscv/cpu.h
> @@ -601,7 +601,7 @@ extern const char * const riscv_int_regnamesh[];
>  extern const char * const riscv_fpr_regnames[];
>  extern const char * const riscv_rvv_regnames[];
>
> -const char *riscv_cpu_get_trap_name(target_ulong cause, bool async);
> +const char *riscv_cpu_get_trap_name(uint64_t cause, bool async);
>  int riscv_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
>                                 int cpuid, DumpState *s);
>  int riscv_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 353b927dd5..3378c40dbf 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -348,7 +348,7 @@ static const char * const riscv_intr_names[] = {
>      "reserved"
>  };
>
> -const char *riscv_cpu_get_trap_name(target_ulong cause, bool async)
> +const char *riscv_cpu_get_trap_name(uint64_t cause, bool async)
>  {
>      if (async) {
>          return (cause < ARRAY_SIZE(riscv_intr_names)) ?
> --
> 2.51.0
>
>