Message ID | 20230824221440.484675-19-dbarboza@ventanamicro.com |
---|---|
State | New |
Headers | show |
Series | riscv: 'max' CPU, detect user choice in TCG | expand |
On Thu, Aug 24, 2023 at 07:14:38PM -0300, Daniel Henrique Barboza wrote: > Before adding support to detect if an extension was user set we need to > handle how we're enabling extensions in riscv_init_max_cpu_extensions(). > object_property_set_bool() calls the set() callback for the property, > and we're going to use this callback to set the 'multi_ext_user_opts' > hash. > > This means that, as is today, all extensions we're setting for the 'max' > CPU will be seen as user set in the future. Let's change set_bool() to > isa_ext_update_enabled() that will just enable/disable the flag on a > certain offset. > > Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > --- > target/riscv/cpu.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index adfe671bd4..ae8c35402f 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -2163,24 +2163,24 @@ static void riscv_init_max_cpu_extensions(Object *obj) > set_misa(env, env->misa_mxl, env->misa_ext | RVG | RVJ | RVV); > > for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { > - object_property_set_bool(obj, prop->name, true, NULL); > + isa_ext_update_enabled(cpu, prop->offset, true); > } > > /* set vector version */ > env->vext_ver = VEXT_VERSION_1_00_0; > > /* Zfinx is not compatible with F. Disable it */ > - object_property_set_bool(obj, "zfinx", false, NULL); > - object_property_set_bool(obj, "zdinx", false, NULL); > - object_property_set_bool(obj, "zhinx", false, NULL); > - object_property_set_bool(obj, "zhinxmin", false, NULL); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zfinx), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zdinx), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinx), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinxmin), false); > > - object_property_set_bool(obj, "zce", false, NULL); > - object_property_set_bool(obj, "zcmp", false, NULL); > - object_property_set_bool(obj, "zcmt", false, NULL); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zce), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmp), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmt), false); > > if (env->misa_mxl != MXL_RV32) { > - object_property_set_bool(obj, "zcf", false, NULL); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcf), false); > } > } > > -- > 2.41.0 > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index adfe671bd4..ae8c35402f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2163,24 +2163,24 @@ static void riscv_init_max_cpu_extensions(Object *obj) set_misa(env, env->misa_mxl, env->misa_ext | RVG | RVJ | RVV); for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { - object_property_set_bool(obj, prop->name, true, NULL); + isa_ext_update_enabled(cpu, prop->offset, true); } /* set vector version */ env->vext_ver = VEXT_VERSION_1_00_0; /* Zfinx is not compatible with F. Disable it */ - object_property_set_bool(obj, "zfinx", false, NULL); - object_property_set_bool(obj, "zdinx", false, NULL); - object_property_set_bool(obj, "zhinx", false, NULL); - object_property_set_bool(obj, "zhinxmin", false, NULL); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zfinx), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zdinx), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinx), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinxmin), false); - object_property_set_bool(obj, "zce", false, NULL); - object_property_set_bool(obj, "zcmp", false, NULL); - object_property_set_bool(obj, "zcmt", false, NULL); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zce), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmp), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmt), false); if (env->misa_mxl != MXL_RV32) { - object_property_set_bool(obj, "zcf", false, NULL); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcf), false); } }