1. Patchew
  2. QEMU
  3. View series

[PATCH] target/riscv: Initialize riscv_excp_names[] and riscv_intr_names[] using designated initializer

frank.chang@sifive.com posted 1 patch 1 month, 3 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20251217063955.1037737-1-frank.chang@sifive.com
Maintainers: Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>
There is a newer version of this series
target/riscv/cpu.c | 89 +++++++++++++++++++++++-----------------------
1 file changed, 45 insertions(+), 44 deletions(-)
[PATCH] target/riscv: Initialize riscv_excp_names[] and riscv_intr_names[] using designated initializer
Posted by frank.chang@sifive.com 1 month, 3 weeks ago 
From: Frank Chang <frank.chang@sifive.com>

Use designated initializers to initialize riscv_excp_names[] and
riscv_intr_names[] so that we don't have to explicitly add "reserved"
items.

Signed-off-by: Frank Chang <frank.chang@sifive.com>
Reviewed-by: Max Chou <max.chou@sifive.com>
---
 target/riscv/cpu.c | 89 +++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index aa58ba8b99a..ee859093f78 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -305,60 +305,61 @@ const char * const riscv_rvv_regnames[] = {
 };
 
 static const char * const riscv_excp_names[] = {
-    "misaligned_fetch",
-    "fault_fetch",
-    "illegal_instruction",
-    "breakpoint",
-    "misaligned_load",
-    "fault_load",
-    "misaligned_store",
-    "fault_store",
-    "user_ecall",
-    "supervisor_ecall",
-    "hypervisor_ecall",
-    "machine_ecall",
-    "exec_page_fault",
-    "load_page_fault",
-    "reserved",
-    "store_page_fault",
-    "double_trap",
-    "reserved",
-    "reserved",
-    "reserved",
-    "guest_exec_page_fault",
-    "guest_load_page_fault",
-    "reserved",
-    "guest_store_page_fault",
+    [RISCV_EXCP_INST_ADDR_MIS] = "misaligned_fetch",
+    [RISCV_EXCP_INST_ACCESS_FAULT] = "fault_fetch",
+    [RISCV_EXCP_ILLEGAL_INST] = "illegal_instruction",
+    [RISCV_EXCP_BREAKPOINT] = "breakpoint",
+    [RISCV_EXCP_LOAD_ADDR_MIS] = "misaligned_load",
+    [RISCV_EXCP_LOAD_ACCESS_FAULT] = "fault_load",
+    [RISCV_EXCP_STORE_AMO_ADDR_MIS] = "misaligned_store",
+    [RISCV_EXCP_STORE_AMO_ACCESS_FAULT] = "fault_store",
+    [RISCV_EXCP_U_ECALL] = "user_ecall",
+    [RISCV_EXCP_S_ECALL] = "supervisor_ecall",
+    [RISCV_EXCP_VS_ECALL] = "hypervisor_ecall",
+    [RISCV_EXCP_M_ECALL] = "machine_ecall",
+    [RISCV_EXCP_INST_PAGE_FAULT] = "exec_page_fault",
+    [RISCV_EXCP_LOAD_PAGE_FAULT] = "load_page_fault",
+    [RISCV_EXCP_STORE_PAGE_FAULT] = "store_page_fault",
+    [RISCV_EXCP_DOUBLE_TRAP] = "double_trap",
+    [RISCV_EXCP_SW_CHECK] = "sw_check",
+    [RISCV_EXCP_HW_ERR] = "hw_error",
+    [RISCV_EXCP_INST_GUEST_PAGE_FAULT] = "guest_exec_page_fault",
+    [RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT] = "guest_load_page_fault",
+    [RISCV_EXCP_VIRT_INSTRUCTION_FAULT] = "virt_illegal_instruction",
+    [RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT] = "guest_store_page_fault",
+    [RISCV_EXCP_SEMIHOST] = "semihost",
 };
 
 static const char * const riscv_intr_names[] = {
-    "u_software",
-    "s_software",
-    "vs_software",
-    "m_software",
-    "u_timer",
-    "s_timer",
-    "vs_timer",
-    "m_timer",
-    "u_external",
-    "s_external",
-    "vs_external",
-    "m_external",
-    "reserved",
-    "reserved",
-    "reserved",
-    "reserved"
+    [IRQ_U_SOFT] = "u_software",
+    [IRQ_S_SOFT] = "s_software",
+    [IRQ_VS_SOFT] = "vs_software",
+    [IRQ_M_SOFT] = "m_software",
+    [IRQ_U_TIMER] = "u_timer",
+    [IRQ_S_TIMER] = "s_timer",
+    [IRQ_VS_TIMER] = "vs_timer",
+    [IRQ_M_TIMER] = "m_timer",
+    [IRQ_U_EXT] = "u_external",
+    [IRQ_S_EXT] = "s_external",
+    [IRQ_VS_EXT] = "vs_external",
+    [IRQ_M_EXT] = "m_external",
+    [IRQ_S_GEXT] = "s_guest_external",
+    [IRQ_PMU_OVF] = "counter_overflow",
 };
 
 const char *riscv_cpu_get_trap_name(target_ulong cause, bool async)
 {
     if (async) {
-        return (cause < ARRAY_SIZE(riscv_intr_names)) ?
-               riscv_intr_names[cause] : "(unknown)";
+        if ((cause < ARRAY_SIZE(riscv_intr_names)) && riscv_intr_names[cause]) {
+            return riscv_intr_names[cause];
+        }
     } else {
-        return (cause < ARRAY_SIZE(riscv_excp_names)) ?
-               riscv_excp_names[cause] : "(unknown)";
+        if ((cause < ARRAY_SIZE(riscv_excp_names)) && riscv_excp_names[cause]) {
+            return riscv_excp_names[cause];
+        }
     }
+
+    return "(unknown)";
 }
 
 void riscv_cpu_set_misa_ext(CPURISCVState *env, uint32_t ext)
-- 
2.43.0
Re: [PATCH] target/riscv: Initialize riscv_excp_names[] and riscv_intr_names[] using designated initializer
Posted by Daniel Henrique Barboza 1 month, 3 weeks ago 

On 12/17/25 3:39 AM, frank.chang@sifive.com wrote:
> From: Frank Chang <frank.chang@sifive.com>
> 
> Use designated initializers to initialize riscv_excp_names[] and
> riscv_intr_names[] so that we don't have to explicitly add "reserved"
> items.

You also added entries that were missing before in both arrays (sw_check,
hw_error, semihost, counter_overflow ...). Not sure if it's worth sending a
v2 just to amend the commit msg though.

> 
> Signed-off-by: Frank Chang <frank.chang@sifive.com>
> Reviewed-by: Max Chou <max.chou@sifive.com>
> ---
Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>

>   target/riscv/cpu.c | 89 +++++++++++++++++++++++-----------------------
>   1 file changed, 45 insertions(+), 44 deletions(-)
> 
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index aa58ba8b99a..ee859093f78 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -305,60 +305,61 @@ const char * const riscv_rvv_regnames[] = {
>   };
>   
>   static const char * const riscv_excp_names[] = {
> -    "misaligned_fetch",
> -    "fault_fetch",
> -    "illegal_instruction",
> -    "breakpoint",
> -    "misaligned_load",
> -    "fault_load",
> -    "misaligned_store",
> -    "fault_store",
> -    "user_ecall",
> -    "supervisor_ecall",
> -    "hypervisor_ecall",
> -    "machine_ecall",
> -    "exec_page_fault",
> -    "load_page_fault",
> -    "reserved",
> -    "store_page_fault",
> -    "double_trap",
> -    "reserved",
> -    "reserved",
> -    "reserved",
> -    "guest_exec_page_fault",
> -    "guest_load_page_fault",
> -    "reserved",
> -    "guest_store_page_fault",
> +    [RISCV_EXCP_INST_ADDR_MIS] = "misaligned_fetch",
> +    [RISCV_EXCP_INST_ACCESS_FAULT] = "fault_fetch",
> +    [RISCV_EXCP_ILLEGAL_INST] = "illegal_instruction",
> +    [RISCV_EXCP_BREAKPOINT] = "breakpoint",
> +    [RISCV_EXCP_LOAD_ADDR_MIS] = "misaligned_load",
> +    [RISCV_EXCP_LOAD_ACCESS_FAULT] = "fault_load",
> +    [RISCV_EXCP_STORE_AMO_ADDR_MIS] = "misaligned_store",
> +    [RISCV_EXCP_STORE_AMO_ACCESS_FAULT] = "fault_store",
> +    [RISCV_EXCP_U_ECALL] = "user_ecall",
> +    [RISCV_EXCP_S_ECALL] = "supervisor_ecall",
> +    [RISCV_EXCP_VS_ECALL] = "hypervisor_ecall",
> +    [RISCV_EXCP_M_ECALL] = "machine_ecall",
> +    [RISCV_EXCP_INST_PAGE_FAULT] = "exec_page_fault",
> +    [RISCV_EXCP_LOAD_PAGE_FAULT] = "load_page_fault",
> +    [RISCV_EXCP_STORE_PAGE_FAULT] = "store_page_fault",
> +    [RISCV_EXCP_DOUBLE_TRAP] = "double_trap",
> +    [RISCV_EXCP_SW_CHECK] = "sw_check",
> +    [RISCV_EXCP_HW_ERR] = "hw_error",
> +    [RISCV_EXCP_INST_GUEST_PAGE_FAULT] = "guest_exec_page_fault",
> +    [RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT] = "guest_load_page_fault",
> +    [RISCV_EXCP_VIRT_INSTRUCTION_FAULT] = "virt_illegal_instruction",
> +    [RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT] = "guest_store_page_fault",
> +    [RISCV_EXCP_SEMIHOST] = "semihost",
>   };
>   
>   static const char * const riscv_intr_names[] = {
> -    "u_software",
> -    "s_software",
> -    "vs_software",
> -    "m_software",
> -    "u_timer",
> -    "s_timer",
> -    "vs_timer",
> -    "m_timer",
> -    "u_external",
> -    "s_external",
> -    "vs_external",
> -    "m_external",
> -    "reserved",
> -    "reserved",
> -    "reserved",
> -    "reserved"
> +    [IRQ_U_SOFT] = "u_software",
> +    [IRQ_S_SOFT] = "s_software",
> +    [IRQ_VS_SOFT] = "vs_software",
> +    [IRQ_M_SOFT] = "m_software",
> +    [IRQ_U_TIMER] = "u_timer",
> +    [IRQ_S_TIMER] = "s_timer",
> +    [IRQ_VS_TIMER] = "vs_timer",
> +    [IRQ_M_TIMER] = "m_timer",
> +    [IRQ_U_EXT] = "u_external",
> +    [IRQ_S_EXT] = "s_external",
> +    [IRQ_VS_EXT] = "vs_external",
> +    [IRQ_M_EXT] = "m_external",
> +    [IRQ_S_GEXT] = "s_guest_external",
> +    [IRQ_PMU_OVF] = "counter_overflow",
>   };
>   
>   const char *riscv_cpu_get_trap_name(target_ulong cause, bool async)
>   {
>       if (async) {
> -        return (cause < ARRAY_SIZE(riscv_intr_names)) ?
> -               riscv_intr_names[cause] : "(unknown)";
> +        if ((cause < ARRAY_SIZE(riscv_intr_names)) && riscv_intr_names[cause]) {
> +            return riscv_intr_names[cause];
> +        }
>       } else {
> -        return (cause < ARRAY_SIZE(riscv_excp_names)) ?
> -               riscv_excp_names[cause] : "(unknown)";
> +        if ((cause < ARRAY_SIZE(riscv_excp_names)) && riscv_excp_names[cause]) {
> +            return riscv_excp_names[cause];
> +        }
>       }
> +
> +    return "(unknown)";
>   }
>   
>   void riscv_cpu_set_misa_ext(CPURISCVState *env, uint32_t ext)
Re: [PATCH] target/riscv: Initialize riscv_excp_names[] and riscv_intr_names[] using designated initializer
Posted by Frank Chang 1 month, 3 weeks ago 
Hi Daniel,

On Thu, Dec 18, 2025 at 9:05 PM Daniel Henrique Barboza <
dbarboza@ventanamicro.com> wrote:

>
>
> On 12/17/25 3:39 AM, frank.chang@sifive.com wrote:
> > From: Frank Chang <frank.chang@sifive.com>
> >
> > Use designated initializers to initialize riscv_excp_names[] and
> > riscv_intr_names[] so that we don't have to explicitly add "reserved"
> > items.
>
> You also added entries that were missing before in both arrays (sw_check,
> hw_error, semihost, counter_overflow ...). Not sure if it's worth sending a
> v2 just to amend the commit msg though.
>

Sure, I can do that.

Regards,
Frank Chang


>
> >
> > Signed-off-by: Frank Chang <frank.chang@sifive.com>
> > Reviewed-by: Max Chou <max.chou@sifive.com>
> > ---
> Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>
>
> >   target/riscv/cpu.c | 89 +++++++++++++++++++++++-----------------------
> >   1 file changed, 45 insertions(+), 44 deletions(-)
> >
> > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> > index aa58ba8b99a..ee859093f78 100644
> > --- a/target/riscv/cpu.c
> > +++ b/target/riscv/cpu.c
> > @@ -305,60 +305,61 @@ const char * const riscv_rvv_regnames[] = {
> >   };
> >
> >   static const char * const riscv_excp_names[] = {
> > -    "misaligned_fetch",
> > -    "fault_fetch",
> > -    "illegal_instruction",
> > -    "breakpoint",
> > -    "misaligned_load",
> > -    "fault_load",
> > -    "misaligned_store",
> > -    "fault_store",
> > -    "user_ecall",
> > -    "supervisor_ecall",
> > -    "hypervisor_ecall",
> > -    "machine_ecall",
> > -    "exec_page_fault",
> > -    "load_page_fault",
> > -    "reserved",
> > -    "store_page_fault",
> > -    "double_trap",
> > -    "reserved",
> > -    "reserved",
> > -    "reserved",
> > -    "guest_exec_page_fault",
> > -    "guest_load_page_fault",
> > -    "reserved",
> > -    "guest_store_page_fault",
> > +    [RISCV_EXCP_INST_ADDR_MIS] = "misaligned_fetch",
> > +    [RISCV_EXCP_INST_ACCESS_FAULT] = "fault_fetch",
> > +    [RISCV_EXCP_ILLEGAL_INST] = "illegal_instruction",
> > +    [RISCV_EXCP_BREAKPOINT] = "breakpoint",
> > +    [RISCV_EXCP_LOAD_ADDR_MIS] = "misaligned_load",
> > +    [RISCV_EXCP_LOAD_ACCESS_FAULT] = "fault_load",
> > +    [RISCV_EXCP_STORE_AMO_ADDR_MIS] = "misaligned_store",
> > +    [RISCV_EXCP_STORE_AMO_ACCESS_FAULT] = "fault_store",
> > +    [RISCV_EXCP_U_ECALL] = "user_ecall",
> > +    [RISCV_EXCP_S_ECALL] = "supervisor_ecall",
> > +    [RISCV_EXCP_VS_ECALL] = "hypervisor_ecall",
> > +    [RISCV_EXCP_M_ECALL] = "machine_ecall",
> > +    [RISCV_EXCP_INST_PAGE_FAULT] = "exec_page_fault",
> > +    [RISCV_EXCP_LOAD_PAGE_FAULT] = "load_page_fault",
> > +    [RISCV_EXCP_STORE_PAGE_FAULT] = "store_page_fault",
> > +    [RISCV_EXCP_DOUBLE_TRAP] = "double_trap",
> > +    [RISCV_EXCP_SW_CHECK] = "sw_check",
> > +    [RISCV_EXCP_HW_ERR] = "hw_error",
> > +    [RISCV_EXCP_INST_GUEST_PAGE_FAULT] = "guest_exec_page_fault",
> > +    [RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT] = "guest_load_page_fault",
> > +    [RISCV_EXCP_VIRT_INSTRUCTION_FAULT] = "virt_illegal_instruction",
> > +    [RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT] =
> "guest_store_page_fault",
> > +    [RISCV_EXCP_SEMIHOST] = "semihost",
> >   };
> >
> >   static const char * const riscv_intr_names[] = {
> > -    "u_software",
> > -    "s_software",
> > -    "vs_software",
> > -    "m_software",
> > -    "u_timer",
> > -    "s_timer",
> > -    "vs_timer",
> > -    "m_timer",
> > -    "u_external",
> > -    "s_external",
> > -    "vs_external",
> > -    "m_external",
> > -    "reserved",
> > -    "reserved",
> > -    "reserved",
> > -    "reserved"
> > +    [IRQ_U_SOFT] = "u_software",
> > +    [IRQ_S_SOFT] = "s_software",
> > +    [IRQ_VS_SOFT] = "vs_software",
> > +    [IRQ_M_SOFT] = "m_software",
> > +    [IRQ_U_TIMER] = "u_timer",
> > +    [IRQ_S_TIMER] = "s_timer",
> > +    [IRQ_VS_TIMER] = "vs_timer",
> > +    [IRQ_M_TIMER] = "m_timer",
> > +    [IRQ_U_EXT] = "u_external",
> > +    [IRQ_S_EXT] = "s_external",
> > +    [IRQ_VS_EXT] = "vs_external",
> > +    [IRQ_M_EXT] = "m_external",
> > +    [IRQ_S_GEXT] = "s_guest_external",
> > +    [IRQ_PMU_OVF] = "counter_overflow",
> >   };
> >
> >   const char *riscv_cpu_get_trap_name(target_ulong cause, bool async)
> >   {
> >       if (async) {
> > -        return (cause < ARRAY_SIZE(riscv_intr_names)) ?
> > -               riscv_intr_names[cause] : "(unknown)";
> > +        if ((cause < ARRAY_SIZE(riscv_intr_names)) &&
> riscv_intr_names[cause]) {
> > +            return riscv_intr_names[cause];
> > +        }
> >       } else {
> > -        return (cause < ARRAY_SIZE(riscv_excp_names)) ?
> > -               riscv_excp_names[cause] : "(unknown)";
> > +        if ((cause < ARRAY_SIZE(riscv_excp_names)) &&
> riscv_excp_names[cause]) {
> > +            return riscv_excp_names[cause];
> > +        }
> >       }
> > +
> > +    return "(unknown)";
> >   }
> >
> >   void riscv_cpu_set_misa_ext(CPURISCVState *env, uint32_t ext)
>
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.