| Message ID | 20210514052435.2203156-1-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | target/riscv: Remove unnecessary riscv_*_names[] declaration | expand |
On 5/14/21 7:24 AM, Bin Meng wrote: > riscv_excp_names[] and riscv_intr_names[] are only referenced by > target/riscv/cpu.c locally. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > target/riscv/cpu.h | 2 -- > target/riscv/cpu.c | 4 ++-- > 2 files changed, 2 insertions(+), 4 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On Fri, May 14, 2021 at 3:24 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > riscv_excp_names[] and riscv_intr_names[] are only referenced by > target/riscv/cpu.c locally. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > > target/riscv/cpu.h | 2 -- > target/riscv/cpu.c | 4 ++-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 7e879fb9ca..adba2ff533 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -318,8 +318,6 @@ static inline bool riscv_feature(CPURISCVState *env, int feature) > > extern const char * const riscv_int_regnames[]; > extern const char * const riscv_fpr_regnames[]; > -extern const char * const riscv_excp_names[]; > -extern const char * const riscv_intr_names[]; > > const char *riscv_cpu_get_trap_name(target_ulong cause, bool async); > void riscv_cpu_do_interrupt(CPUState *cpu); > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 3191fd0082..7ee31f97a3 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -51,7 +51,7 @@ const char * const riscv_fpr_regnames[] = { > "f30/ft10", "f31/ft11" > }; > > -const char * const riscv_excp_names[] = { > +static const char * const riscv_excp_names[] = { > "misaligned_fetch", > "fault_fetch", > "illegal_instruction", > @@ -78,7 +78,7 @@ const char * const riscv_excp_names[] = { > "guest_store_page_fault", > }; > > -const char * const riscv_intr_names[] = { > +static const char * const riscv_intr_names[] = { > "u_software", > "s_software", > "vs_software", > -- > 2.25.1 > >
On Fri, May 14, 2021 at 3:24 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > riscv_excp_names[] and riscv_intr_names[] are only referenced by > target/riscv/cpu.c locally. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Thanks! Applied to riscv-to-apply.next Alistair > --- > > target/riscv/cpu.h | 2 -- > target/riscv/cpu.c | 4 ++-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 7e879fb9ca..adba2ff533 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -318,8 +318,6 @@ static inline bool riscv_feature(CPURISCVState *env, int feature) > > extern const char * const riscv_int_regnames[]; > extern const char * const riscv_fpr_regnames[]; > -extern const char * const riscv_excp_names[]; > -extern const char * const riscv_intr_names[]; > > const char *riscv_cpu_get_trap_name(target_ulong cause, bool async); > void riscv_cpu_do_interrupt(CPUState *cpu); > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 3191fd0082..7ee31f97a3 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -51,7 +51,7 @@ const char * const riscv_fpr_regnames[] = { > "f30/ft10", "f31/ft11" > }; > > -const char * const riscv_excp_names[] = { > +static const char * const riscv_excp_names[] = { > "misaligned_fetch", > "fault_fetch", > "illegal_instruction", > @@ -78,7 +78,7 @@ const char * const riscv_excp_names[] = { > "guest_store_page_fault", > }; > > -const char * const riscv_intr_names[] = { > +static const char * const riscv_intr_names[] = { > "u_software", > "s_software", > "vs_software", > -- > 2.25.1 > >
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 7e879fb9ca..adba2ff533 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -318,8 +318,6 @@ static inline bool riscv_feature(CPURISCVState *env, int feature) extern const char * const riscv_int_regnames[]; extern const char * const riscv_fpr_regnames[]; -extern const char * const riscv_excp_names[]; -extern const char * const riscv_intr_names[]; const char *riscv_cpu_get_trap_name(target_ulong cause, bool async); void riscv_cpu_do_interrupt(CPUState *cpu); diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 3191fd0082..7ee31f97a3 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -51,7 +51,7 @@ const char * const riscv_fpr_regnames[] = { "f30/ft10", "f31/ft11" }; -const char * const riscv_excp_names[] = { +static const char * const riscv_excp_names[] = { "misaligned_fetch", "fault_fetch", "illegal_instruction", @@ -78,7 +78,7 @@ const char * const riscv_excp_names[] = { "guest_store_page_fault", }; -const char * const riscv_intr_names[] = { +static const char * const riscv_intr_names[] = { "u_software", "s_software", "vs_software",
riscv_excp_names[] and riscv_intr_names[] are only referenced by target/riscv/cpu.c locally. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- target/riscv/cpu.h | 2 -- target/riscv/cpu.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)