On Thu, Mar 30, 2023 at 3:31 AM Daniel Henrique Barboza
<dbarboza@ventanamicro.com> wrote:
>
> Create a new "a" RISCVCPUMisaExtConfig property that will update
> env->misa_ext* with RVA. Instances of cpu->cfg.ext_a and similar are
> replaced with riscv_has_ext(env, RVA).
>
> Remove the old "a" property and 'ext_a' from RISCVCPUConfig.
>
> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> target/riscv/cpu.c | 16 ++++++++--------
> target/riscv/cpu.h | 1 -
> 2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index d7763ecfa9..63efd1b313 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -812,13 +812,12 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)
>
> /* Do some ISA extension error checking */
> if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m &&
> - cpu->cfg.ext_a && cpu->cfg.ext_f &&
> - cpu->cfg.ext_d &&
> + riscv_has_ext(env, RVA) &&
> + cpu->cfg.ext_f && cpu->cfg.ext_d &&
> cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) {
> warn_report("Setting G will also set IMAFD_Zicsr_Zifencei");
> cpu->cfg.ext_i = true;
> cpu->cfg.ext_m = true;
> - cpu->cfg.ext_a = true;
> cpu->cfg.ext_f = true;
> cpu->cfg.ext_d = true;
> cpu->cfg.ext_icsr = true;
> @@ -862,7 +861,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)
> return;
> }
>
> - if ((cpu->cfg.ext_zawrs) && !cpu->cfg.ext_a) {
> + if ((cpu->cfg.ext_zawrs) && !riscv_has_ext(env, RVA)) {
> error_setg(errp, "Zawrs extension requires A extension");
> return;
> }
> @@ -1100,7 +1099,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)
> if (riscv_cpu_cfg(env)->ext_m) {
> ext |= RVM;
> }
> - if (riscv_cpu_cfg(env)->ext_a) {
> + if (riscv_has_ext(env, RVA)) {
> ext |= RVA;
> }
> if (riscv_cpu_cfg(env)->ext_f) {
> @@ -1436,7 +1435,10 @@ static void cpu_get_misa_ext_cfg(Object *obj, Visitor *v, const char *name,
> visit_type_bool(v, name, &value, errp);
> }
>
> -static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = {};
> +static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = {
> + {.name = "a", .description = "Atomic instructions",
> + .misa_bit = RVA, .enabled = true},
> +};
>
> static void riscv_cpu_add_misa_properties(Object *cpu_obj)
> {
> @@ -1462,7 +1464,6 @@ static Property riscv_cpu_extensions[] = {
> DEFINE_PROP_BOOL("e", RISCVCPU, cfg.ext_e, false),
> DEFINE_PROP_BOOL("g", RISCVCPU, cfg.ext_g, false),
> DEFINE_PROP_BOOL("m", RISCVCPU, cfg.ext_m, true),
> - DEFINE_PROP_BOOL("a", RISCVCPU, cfg.ext_a, true),
> DEFINE_PROP_BOOL("f", RISCVCPU, cfg.ext_f, true),
> DEFINE_PROP_BOOL("d", RISCVCPU, cfg.ext_d, true),
> DEFINE_PROP_BOOL("c", RISCVCPU, cfg.ext_c, true),
> @@ -1576,7 +1577,6 @@ static void register_cpu_props(Object *obj)
> cpu->cfg.ext_i = misa_ext & RVI;
> cpu->cfg.ext_e = misa_ext & RVE;
> cpu->cfg.ext_m = misa_ext & RVM;
> - cpu->cfg.ext_a = misa_ext & RVA;
> cpu->cfg.ext_f = misa_ext & RVF;
> cpu->cfg.ext_d = misa_ext & RVD;
> cpu->cfg.ext_v = misa_ext & RVV;
> diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
> index 638e47c75a..f703888310 100644
> --- a/target/riscv/cpu.h
> +++ b/target/riscv/cpu.h
> @@ -422,7 +422,6 @@ struct RISCVCPUConfig {
> bool ext_e;
> bool ext_g;
> bool ext_m;
> - bool ext_a;
> bool ext_f;
> bool ext_d;
> bool ext_c;
> --
> 2.39.2
>
>