Re: [RESEND PATCH v2 1/5] target/riscv: Reuse the conversion function of priv_spec

[Alistair Francis]

On Wed, May 15, 2024 at 6:03 PM Fea.Wang <fea.wang@sifive.com> wrote:
>
> From: Jim Shu <jim.shu@sifive.com>
>
> Public the conversion function of priv_spec in cpu.h, so that tcg-cpu.c
> could also use it.
>
> Signed-off-by: Jim Shu <jim.shu@sifive.com>
> Signed-off-by: Fea.Wang <fea.wang@sifive.com>
> Reviewed-by: Frank Chang <frank.chang@sifive.com>
> Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>

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

Alistair

> ---
>  target/riscv/cpu.c         |  2 +-
>  target/riscv/cpu.h         |  1 +
>  target/riscv/tcg/tcg-cpu.c | 13 ++++---------
>  3 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 2946ac298a..6dd3d7f4a3 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1786,7 +1786,7 @@ static int priv_spec_from_str(const char *priv_spec_str)
>      return priv_version;
>  }
>
> -static const char *priv_spec_to_str(int priv_version)
> +const char *priv_spec_to_str(int priv_version)
>  {
>      switch (priv_version) {
>      case PRIV_VERSION_1_10_0:
> diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
> index 1501868008..140eb43fcb 100644
> --- a/target/riscv/cpu.h
> +++ b/target/riscv/cpu.h
> @@ -833,4 +833,5 @@ const char *satp_mode_str(uint8_t satp_mode, bool 
> is_32_bit);
>  /* Implemented in th_csr.c */
>  void th_register_custom_csrs(RISCVCPU *cpu);
>
> +const char *priv_spec_to_str(int priv_version);
>  #endif /* RISCV_CPU_H */
> diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
> index f59b5d7f2d..fa186093fb 100644
> --- a/target/riscv/tcg/tcg-cpu.c
> +++ b/target/riscv/tcg/tcg-cpu.c
> @@ -76,16 +76,11 @@ static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, 
> uint32_t bit,
>
>  static const char *cpu_priv_ver_to_str(int priv_ver)
>  {
> -    switch (priv_ver) {
> -    case PRIV_VERSION_1_10_0:
> -        return "v1.10.0";
> -    case PRIV_VERSION_1_11_0:
> -        return "v1.11.0";
> -    case PRIV_VERSION_1_12_0:
> -        return "v1.12.0";
> -    }
> +    const char *priv_spec_str = priv_spec_to_str(priv_ver);
>
> -    g_assert_not_reached();
> +    g_assert(priv_spec_str);
> +
> +    return priv_spec_str;
>  }
>
>  static void riscv_cpu_synchronize_from_tb(CPUState *cs,
> --
> 2.34.1
>
>