remove MISA ext_N flags from cpu->cfg,
v3 cover remove MISA ext_N flags from cpu->cfg,
Hi,
This new version has a new patch (3) that removes the 'multi_letter' attribute from isa_ext_data that became redundant after the changes made in patch 2. The change was proposed by Weiwei Li in the v2.
All patches but patch 3 are acked.
Changes from v2:
- patch 3 (new)
- remove 'multi_letter' from isa_ext_data
- v2 link: https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06493.html
Daniel Henrique Barboza (20):
target/riscv: sync env->misa_ext* with cpu->cfg in realize() target/riscv: remove MISA properties from isa_edata_arr[] target/riscv/cpu.c: remove 'multi_letter' from isa_ext_data target/riscv: introduce riscv_cpu_add_misa_properties() target/riscv: remove cpu->cfg.ext_a
target/riscv: remove cpu->cfg.ext_c
target/riscv: remove cpu->cfg.ext_d
target/riscv: remove cpu->cfg.ext_f
target/riscv: remove cpu->cfg.ext_i
target/riscv: remove cpu->cfg.ext_e
target/riscv: remove cpu->cfg.ext_m
target/riscv: remove cpu->cfg.ext_s
target/riscv: remove cpu->cfg.ext_u
target/riscv: remove cpu->cfg.ext_h
target/riscv: remove cpu->cfg.ext_j
target/riscv: remove cpu->cfg.ext_v
target/riscv: remove riscv_cpu_sync_misa_cfg() target/riscv: remove cfg.ext_g setup from rv64_thead_c906_cpu_init() target/riscv: add RVG and remove cpu->cfg.ext_g target/riscv/cpu.c: redesign register_cpu_props()
target/riscv/cpu.c | 386 +++++++++++++++++++++++---------------------- target/riscv/cpu.h | 19 +-- 2 files changed, 202 insertions(+), 203 deletions(-)
Signature · 1 line
2.39.2
PATCH v3 1/20 target/riscv: sync env->misa_ext* with cpu->cfg in realize()
When riscv_cpu_realize() starts we're guaranteed to have cpu->cfg.ext_N properties updated. The same can't be said about env->misa_ext*, since the user might enable/disable MISA extensions in the command line, and env->misa_ext* won't caught these changes. The current solution is to sync everything at the end of validate_set_extensions(), checking every cpu->cfg.ext_N value to do a set_misa() in the end.
The last change we're making in the MISA cfg flags are in the G extension logic, enabling IMAFG if cpu->cfg_ext.g is enabled. Otherwise we're not making any changes in MISA bits ever since realize() starts.
There's no reason to postpone misa_ext updates until the end of the validation. Let's do it earlier, during realize(), in a new helper called riscv_cpu_sync_misa_cfg(). If cpu->cfg.ext_g is enabled, do it again by updating env->misa_ext* directly.
This is a pre-requisite to allow riscv_cpu_validate_set_extensions() to use riscv_has_ext() instead of cpu->cfg.ext_N to validate the MISA extensions, which is our end goal here.
--- target/riscv/cpu.c | 94 +++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 38 deletions(-)
target/riscv/cpu.c +56 -38
@@ -804,12 +804,11 @@ static void riscv_cpu_disas_set_info(CPUState *s, disassemble_info *info)/* * Check consistency between chosen extensions while setting -* cpu->cfg accordingly, doing a set_misa() in the end. +* cpu->cfg accordingly. */ static void riscv_cpu_validate_set_extensions (RISCVCPU *cpu,Error **errp) {CPURISCVState *env = &cpu->env; -uint32_t ext =0 ;/* Do some ISA extension error checking */ if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m &&
@@ -824,6 +823,9 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_d = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true; + + env->misa_ext |=RVI |RVM |RVA |RVF |RVD ; + env->misa_ext_mask = env->misa_ext; }if (cpu->cfg.ext_i && cpu->cfg.ext_e) {
@@ -962,39 +964,8 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zksh = true; } -if (cpu->cfg.ext_i) { - ext |=RVI ; - } -if (cpu->cfg.ext_e) { - ext |=RVE ; - } -if (cpu->cfg.ext_m) { - ext |=RVM ; - } -if (cpu->cfg.ext_a) { - ext |=RVA ; - } -if (cpu->cfg.ext_f) { - ext |=RVF ; - } -if (cpu->cfg.ext_d) { - ext |=RVD ; - } -if (cpu->cfg.ext_c) { - ext |=RVC ; - } -if (cpu->cfg.ext_s) { - ext |=RVS ; - } -if (cpu->cfg.ext_u) { - ext |=RVU ; - } -if (cpu->cfg.ext_h) { - ext |=RVH ; - }if (cpu->cfg.ext_v) {int vext_version =VEXT_VERSION_1_00_0 ; - ext |=RVV ;if (!is_power_of_2 (cpu->cfg.vlen)) {error_setg (errp,"Vector extension VLEN must be power of 2" );
@@ -1032,11 +1003,6 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) }set_vext_version (env, vext_version); } -if (cpu->cfg.ext_j) { - ext |=RVJ ; - } - -set_misa (env, env->misa_mxl, ext); }#ifndef CONFIG_USER_ONLY
@@ -1121,6 +1087,50 @@ static void riscv_cpu_finalize_features(RISCVCPU *cpu, Error **errp)#endif } +static void riscv_cpu_sync_misa_cfg (CPURISCVState *env) +{ +uint32_t ext =0 ; + +if (riscv_cpu_cfg (env)->ext_i) { + ext |=RVI ; + } +if (riscv_cpu_cfg (env)->ext_e) { + ext |=RVE ; + } +if (riscv_cpu_cfg (env)->ext_m) { + ext |=RVM ; + } +if (riscv_cpu_cfg (env)->ext_a) { + ext |=RVA ; + } +if (riscv_cpu_cfg (env)->ext_f) { + ext |=RVF ; + } +if (riscv_cpu_cfg (env)->ext_d) { + ext |=RVD ; + } +if (riscv_cpu_cfg (env)->ext_c) { + ext |=RVC ; + } +if (riscv_cpu_cfg (env)->ext_s) { + ext |=RVS ; + } +if (riscv_cpu_cfg (env)->ext_u) { + ext |=RVU ; + } +if (riscv_cpu_cfg (env)->ext_h) { + ext |=RVH ; + } +if (riscv_cpu_cfg (env)->ext_v) { + ext |=RVV ; + } +if (riscv_cpu_cfg (env)->ext_j) { + ext |=RVJ ; + } + + env->misa_ext = env->misa_ext_mask = ext; +} +static void riscv_cpu_realize (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev);
@@ -1156,6 +1166,14 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_priv_version (env, priv_version); } +/* +* We can't be sure of whether we set defaults during cpu_init() +* or whether the user enabled/disabled some bits via cpu->cfg +* flags. Sync env->misa_ext with cpu->cfg now to allow us to +* use just env->misa_ext later. +*/ +riscv_cpu_sync_misa_cfg (env); +/* Force disable extensions if priv spec version does not match */ for (i =0 ; i <ARRAY_SIZE (isa_edata_arr); i++) { if (isa_ext_is_enabled(cpu, &isa_edata_arr[i]) &&
Signature · 1 line
2.39.2
Re: [PATCH v3 01/20] target/riscv: sync env->misa_ext* with cpu->cfg in realize()
Quoted 108 lines · Daniel Henrique Barboza
When
riscv_cpu_realize()starts we're guaranteed to havecpu->cfg.ext_Nproperties updated. The same can't be said about env->misa_ext*, since the user might enable/disable MISA extensions in the command line, and env->misa_ext* won't caught these changes. The current solution is to sync everything at the end ofvalidate_set_extensions(), checking everycpu->cfg.ext_Nvalue to do aset_misa()in the end.The last change we're making in the MISA cfg flags are in the G extension logic, enabling IMAFG if
cpu->cfg_ext.gis enabled. Otherwise we're not making any changes in MISA bits ever sincerealize()starts.There's no reason to postpone
misa_extupdates until the end of the validation. Let's do it earlier, duringrealize(), in a new helper calledriscv_cpu_sync_misa_cfg(). Ifcpu->cfg.ext_gis enabled, do it again by updating env->misa_ext* directly.This is a pre-requisite to allow
riscv_cpu_validate_set_extensions()to useriscv_has_ext()instead ofcpu->cfg.ext_Nto validate the MISA extensions, which is our end goal here.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>--- target/riscv/cpu.c | 94 +++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 38 deletions(-)target/riscv/cpu.c +4
-38@@ -804,12 +804,11 @@ static void riscv_cpu_disas_set_info(CPUState *s, disassemble_info *info)/* * Check consistency between chosen extensions while setting -* cpu->cfg accordingly, doing a set_misa() in the end. +* cpu->cfg accordingly. */ static void riscv_cpu_validate_set_extensions (RISCVCPU *cpu,Error **errp) {CPURISCVState *env = &cpu->env; -uint32_t ext =0 ;/* Do some ISA extension error checking */ if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m &&@@ -824,6 +823,9 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_d = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true; + + env->misa_ext |=RVI |RVM |RVA |RVF |RVD ; + env->misa_ext_mask = env->misa_ext; }if (cpu->cfg.ext_i && cpu->cfg.ext_e) {@@ -962,39 +964,8 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zksh = true; } -if (cpu->cfg.ext_i) { - ext |=RVI ; - } -if (cpu->cfg.ext_e) { - ext |=RVE ; - } -if (cpu->cfg.ext_m) { - ext |=RVM ; - } -if (cpu->cfg.ext_a) { - ext |=RVA ; - } -if (cpu->cfg.ext_f) { - ext |=RVF ; - } -if (cpu->cfg.ext_d) { - ext |=RVD ; - } -if (cpu->cfg.ext_c) { - ext |=RVC ; - } -if (cpu->cfg.ext_s) { - ext |=RVS ; - } -if (cpu->cfg.ext_u) { - ext |=RVU ; - } -if (cpu->cfg.ext_h) { - ext |=RVH ; - }if (cpu->cfg.ext_v) {int vext_version =VEXT_VERSION_1_00_0 ; - ext |=RVV ;if (!is_power_of_2 (cpu->cfg.vlen)) {error_setg (errp,"Vector extension VLEN must be power of 2" );@@ -1032,11 +1003,6 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) }set_vext_version (env, vext_version); } -if (cpu->cfg.ext_j) { - ext |=RVJ ; - } - -set_misa (env, env->misa_mxl, ext); }#ifndef CONFIG_USER_ONLY
target/riscv/cpu.c static void riscv_cpu_finalize_features(RISCVCPU *cpu, Error **errp) · line 1094
Quoted 8 lines
target/riscv/cpu.c +5
-0@@ -1121,6 +1087,50 @@ static void riscv_cpu_finalize_features(RISCVCPU *cpu, Error **errp)#endif } +static void riscv_cpu_sync_misa_cfg (CPURISCVState *env) +{ +uint32_t ext =0 ; + +if (riscv_cpu_cfg (env)->ext_i) {
It's probably worth storing riscv_cpu_cfg(env) in a variable
But either way:
Alistair
Quoted 61 lines
target/riscv/cpu.c +47
-1+ ext |=RVI ; + } +if (riscv_cpu_cfg (env)->ext_e) { + ext |=RVE ; + } +if (riscv_cpu_cfg (env)->ext_m) { + ext |=RVM ; + } +if (riscv_cpu_cfg (env)->ext_a) { + ext |=RVA ; + } +if (riscv_cpu_cfg (env)->ext_f) { + ext |=RVF ; + } +if (riscv_cpu_cfg (env)->ext_d) { + ext |=RVD ; + } +if (riscv_cpu_cfg (env)->ext_c) { + ext |=RVC ; + } +if (riscv_cpu_cfg (env)->ext_s) { + ext |=RVS ; + } +if (riscv_cpu_cfg (env)->ext_u) { + ext |=RVU ; + } +if (riscv_cpu_cfg (env)->ext_h) { + ext |=RVH ; + } +if (riscv_cpu_cfg (env)->ext_v) { + ext |=RVV ; + } +if (riscv_cpu_cfg (env)->ext_j) { + ext |=RVJ ; + } + + env->misa_ext = env->misa_ext_mask = ext; +} +static void riscv_cpu_realize (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev);@@ -1156,6 +1166,14 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_priv_version (env, priv_version); } +/* +* We can't be sure of whether we set defaults during cpu_init() +* or whether the user enabled/disabled some bits via cpu->cfg +* flags. Sync env->misa_ext with cpu->cfg now to allow us to +* use just env->misa_ext later. +*/ +riscv_cpu_sync_misa_cfg (env); +/* Force disable extensions if priv spec version does not match */ for (i =0 ; i <ARRAY_SIZE (isa_edata_arr); i++) { if (isa_ext_is_enabled(cpu, &isa_edata_arr[i]) && --2.39.2
PATCH v3 2/20 target/riscv: remove MISA properties from isa_edata_arr[]
In reply to Daniel Henrique BarbozaThe code that disables extensions if there's a priv version mismatch uses cpu->cfg.ext_N properties to do its job.
We're aiming to not rely on cpu->cfg.ext_N props for MISA bits. Split the MISA related verifications in a new function, removing it from isa_edata_arr[].
We're also erroring it out instead of disabling, making the cpu_init() function responsible for running an adequate priv spec for the MISA extensions it wants to use.
Note that the RVV verification is being ignored since we're always have at least PRIV_VERSION_1_10_0.
--- target/riscv/cpu.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
target/riscv/cpu.c +17 -2
@@ -72,10 +72,11 @@ struct isa_ext_data {* 4. Non-standard extensions (starts with 'X') must be listed after all * standard extensions. They must be separated from other multi-letter * extensions by an underscore. +* +* Single letter extensions are checked in riscv_cpu_validate_misa_priv() +* instead. */ static const struct isa_ext_data isa_edata_arr[] = { -ISA_EXT_DATA_ENTRY (h, false,PRIV_VERSION_1_12_0 , ext_h), -ISA_EXT_DATA_ENTRY (v, false,PRIV_VERSION_1_10_0 , ext_v),ISA_EXT_DATA_ENTRY (zicbom, true,PRIV_VERSION_1_12_0 , ext_icbom),ISA_EXT_DATA_ENTRY (zicboz, true,PRIV_VERSION_1_12_0 , ext_icboz),ISA_EXT_DATA_ENTRY (zicond, true,PRIV_VERSION_1_12_0 , ext_zicond),
@@ -1131,6 +1132,14 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env) env->misa_ext = env->misa_ext_mask = ext; } +static void riscv_cpu_validate_misa_priv (CPURISCVState *env,Error **errp) +{ +if (riscv_has_ext (env,RVH ) && env->priv_ver <PRIV_VERSION_1_12_0 ) { +error_setg (errp,"H extension requires priv spec 1.12.0" ); +return ; + } +} +static void riscv_cpu_realize (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev);
@@ -1174,6 +1183,12 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)*/ riscv_cpu_sync_misa_cfg (env); +riscv_cpu_validate_misa_priv (env, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +/* Force disable extensions if priv spec version does not match */ for (i =0 ; i <ARRAY_SIZE (isa_edata_arr); i++) { if (isa_ext_is_enabled(cpu, &isa_edata_arr[i]) &&
Signature · 1 line
2.39.2
Re: [PATCH v3 02/20] target/riscv: remove MISA properties from isa_edata_arr[]
Quoted 12 lines · Daniel Henrique Barboza
The code that disables extensions if there's a priv version mismatch uses
cpu->cfg.ext_Nproperties to do its job.We're aiming to not rely on
cpu->cfg.ext_Nprops for MISA bits. Split the MISA related verifications in a new function, removing it from isa_edata_arr[].We're also erroring it out instead of disabling, making the
cpu_init()function responsible for running an adequate priv spec for the MISA extensions it wants to use.
Quoted 5 lines
Note that the RVV verification is being ignored since we're always have at least
PRIV_VERSION_1_10_0.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 54 lines
--- target/riscv/cpu.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)target/riscv/cpu.c +17
-3@@ -72,10 +72,11 @@ struct isa_ext_data {* 4. Non-standard extensions (starts with 'X') must be listed after all * standard extensions. They must be separated from other multi-letter * extensions by an underscore. +* +* Single letter extensions are checked in riscv_cpu_validate_misa_priv() +* instead. */ static const struct isa_ext_data isa_edata_arr[] = { -ISA_EXT_DATA_ENTRY (h, false,PRIV_VERSION_1_12_0 , ext_h), -ISA_EXT_DATA_ENTRY (v, false,PRIV_VERSION_1_10_0 , ext_v),ISA_EXT_DATA_ENTRY (zicbom, true,PRIV_VERSION_1_12_0 , ext_icbom),ISA_EXT_DATA_ENTRY (zicboz, true,PRIV_VERSION_1_12_0 , ext_icboz),ISA_EXT_DATA_ENTRY (zicond, true,PRIV_VERSION_1_12_0 , ext_zicond),@@ -1131,6 +1132,14 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env) env->misa_ext = env->misa_ext_mask = ext; } +static void riscv_cpu_validate_misa_priv (CPURISCVState *env,Error **errp) +{ +if (riscv_has_ext (env,RVH ) && env->priv_ver <PRIV_VERSION_1_12_0 ) { +error_setg (errp,"H extension requires priv spec 1.12.0" ); +return ; + } +} +static void riscv_cpu_realize (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev);@@ -1174,6 +1183,12 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)*/ riscv_cpu_sync_misa_cfg (env); +riscv_cpu_validate_misa_priv (env, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +/* Force disable extensions if priv spec version does not match */ for (i =0 ; i <ARRAY_SIZE (isa_edata_arr); i++) { if (isa_ext_is_enabled(cpu, &isa_edata_arr[i]) && --2.39.2
PATCH v3 3/20 target/riscv/cpu.c: remove 'multi_letter' from isa_ext_data
In reply to Daniel Henrique BarbozaWe don't have MISA extensions in isa_edata_arr[] anymore. Remove the redundant 'multi_letter' field from isa_ext_data.
--- target/riscv/cpu.c | 118 ++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 60 deletions(-)
target/riscv/cpu.c +58 -60
@@ -48,13 +48,12 @@ static const char riscv_single_letter_exts[] = "IEMAFDQCPVH";struct isa_ext_data {const char *name; -bool multi_letter;int min_version;int ext_enable_offset; }; -#define ISA_EXT_DATA_ENTRY (_name, _m_letter, _min_ver, _prop) \ -{#_name, _m_letter, _min_ver, offsetof(struct RISCVCPUConfig, _prop)} +#define ISA_EXT_DATA_ENTRY (_name, _min_ver, _prop) \ +{#_name, _min_ver, offsetof(struct RISCVCPUConfig, _prop)}/** * Here are the ordering rules of extension naming defined by RISC-V
@@ -77,61 +76,61 @@ struct isa_ext_data {* instead. */ static const struct isa_ext_data isa_edata_arr[] = { -ISA_EXT_DATA_ENTRY (zicbom, true,PRIV_VERSION_1_12_0 , ext_icbom), -ISA_EXT_DATA_ENTRY (zicboz, true,PRIV_VERSION_1_12_0 , ext_icboz), -ISA_EXT_DATA_ENTRY (zicond, true,PRIV_VERSION_1_12_0 , ext_zicond), -ISA_EXT_DATA_ENTRY (zicsr, true,PRIV_VERSION_1_10_0 , ext_icsr), -ISA_EXT_DATA_ENTRY (zifencei, true,PRIV_VERSION_1_10_0 , ext_ifencei), -ISA_EXT_DATA_ENTRY (zihintpause, true,PRIV_VERSION_1_10_0 , ext_zihintpause), -ISA_EXT_DATA_ENTRY (zawrs, true,PRIV_VERSION_1_12_0 , ext_zawrs), -ISA_EXT_DATA_ENTRY (zfh, true,PRIV_VERSION_1_11_0 , ext_zfh), -ISA_EXT_DATA_ENTRY (zfhmin, true,PRIV_VERSION_1_12_0 , ext_zfhmin), -ISA_EXT_DATA_ENTRY (zfinx, true,PRIV_VERSION_1_12_0 , ext_zfinx), -ISA_EXT_DATA_ENTRY (zdinx, true,PRIV_VERSION_1_12_0 , ext_zdinx), -ISA_EXT_DATA_ENTRY (zba, true,PRIV_VERSION_1_12_0 , ext_zba), -ISA_EXT_DATA_ENTRY (zbb, true,PRIV_VERSION_1_12_0 , ext_zbb), -ISA_EXT_DATA_ENTRY (zbc, true,PRIV_VERSION_1_12_0 , ext_zbc), -ISA_EXT_DATA_ENTRY (zbkb, true,PRIV_VERSION_1_12_0 , ext_zbkb), -ISA_EXT_DATA_ENTRY (zbkc, true,PRIV_VERSION_1_12_0 , ext_zbkc), -ISA_EXT_DATA_ENTRY (zbkx, true,PRIV_VERSION_1_12_0 , ext_zbkx), -ISA_EXT_DATA_ENTRY (zbs, true,PRIV_VERSION_1_12_0 , ext_zbs), -ISA_EXT_DATA_ENTRY (zk, true,PRIV_VERSION_1_12_0 , ext_zk), -ISA_EXT_DATA_ENTRY (zkn, true,PRIV_VERSION_1_12_0 , ext_zkn), -ISA_EXT_DATA_ENTRY (zknd, true,PRIV_VERSION_1_12_0 , ext_zknd), -ISA_EXT_DATA_ENTRY (zkne, true,PRIV_VERSION_1_12_0 , ext_zkne), -ISA_EXT_DATA_ENTRY (zknh, true,PRIV_VERSION_1_12_0 , ext_zknh), -ISA_EXT_DATA_ENTRY (zkr, true,PRIV_VERSION_1_12_0 , ext_zkr), -ISA_EXT_DATA_ENTRY (zks, true,PRIV_VERSION_1_12_0 , ext_zks), -ISA_EXT_DATA_ENTRY (zksed, true,PRIV_VERSION_1_12_0 , ext_zksed), -ISA_EXT_DATA_ENTRY (zksh, true,PRIV_VERSION_1_12_0 , ext_zksh), -ISA_EXT_DATA_ENTRY (zkt, true,PRIV_VERSION_1_12_0 , ext_zkt), -ISA_EXT_DATA_ENTRY (zve32f, true,PRIV_VERSION_1_12_0 , ext_zve32f), -ISA_EXT_DATA_ENTRY (zve64f, true,PRIV_VERSION_1_12_0 , ext_zve64f), -ISA_EXT_DATA_ENTRY (zve64d, true,PRIV_VERSION_1_12_0 , ext_zve64d), -ISA_EXT_DATA_ENTRY (zvfh, true,PRIV_VERSION_1_12_0 , ext_zvfh), -ISA_EXT_DATA_ENTRY (zvfhmin, true,PRIV_VERSION_1_12_0 , ext_zvfhmin), -ISA_EXT_DATA_ENTRY (zhinx, true,PRIV_VERSION_1_12_0 , ext_zhinx), -ISA_EXT_DATA_ENTRY (zhinxmin, true,PRIV_VERSION_1_12_0 , ext_zhinxmin), -ISA_EXT_DATA_ENTRY (smaia, true,PRIV_VERSION_1_12_0 , ext_smaia), -ISA_EXT_DATA_ENTRY (ssaia, true,PRIV_VERSION_1_12_0 , ext_ssaia), -ISA_EXT_DATA_ENTRY (sscofpmf, true,PRIV_VERSION_1_12_0 , ext_sscofpmf), -ISA_EXT_DATA_ENTRY (sstc, true,PRIV_VERSION_1_12_0 , ext_sstc), -ISA_EXT_DATA_ENTRY (svadu, true,PRIV_VERSION_1_12_0 , ext_svadu), -ISA_EXT_DATA_ENTRY (svinval, true,PRIV_VERSION_1_12_0 , ext_svinval), -ISA_EXT_DATA_ENTRY (svnapot, true,PRIV_VERSION_1_12_0 , ext_svnapot), -ISA_EXT_DATA_ENTRY (svpbmt, true,PRIV_VERSION_1_12_0 , ext_svpbmt), -ISA_EXT_DATA_ENTRY (xtheadba, true,PRIV_VERSION_1_11_0 , ext_xtheadba), -ISA_EXT_DATA_ENTRY (xtheadbb, true,PRIV_VERSION_1_11_0 , ext_xtheadbb), -ISA_EXT_DATA_ENTRY (xtheadbs, true,PRIV_VERSION_1_11_0 , ext_xtheadbs), -ISA_EXT_DATA_ENTRY (xtheadcmo, true,PRIV_VERSION_1_11_0 , ext_xtheadcmo), -ISA_EXT_DATA_ENTRY (xtheadcondmov, true,PRIV_VERSION_1_11_0 , ext_xtheadcondmov), -ISA_EXT_DATA_ENTRY (xtheadfmemidx, true,PRIV_VERSION_1_11_0 , ext_xtheadfmemidx), -ISA_EXT_DATA_ENTRY (xtheadfmv, true,PRIV_VERSION_1_11_0 , ext_xtheadfmv), -ISA_EXT_DATA_ENTRY (xtheadmac, true,PRIV_VERSION_1_11_0 , ext_xtheadmac), -ISA_EXT_DATA_ENTRY (xtheadmemidx, true,PRIV_VERSION_1_11_0 , ext_xtheadmemidx), -ISA_EXT_DATA_ENTRY (xtheadmempair, true,PRIV_VERSION_1_11_0 , ext_xtheadmempair), -ISA_EXT_DATA_ENTRY (xtheadsync, true,PRIV_VERSION_1_11_0 , ext_xtheadsync), -ISA_EXT_DATA_ENTRY (xventanacondops, true,PRIV_VERSION_1_12_0 , ext_XVentanaCondOps), +ISA_EXT_DATA_ENTRY (zicbom,PRIV_VERSION_1_12_0 , ext_icbom), +ISA_EXT_DATA_ENTRY (zicboz,PRIV_VERSION_1_12_0 , ext_icboz), +ISA_EXT_DATA_ENTRY (zicond,PRIV_VERSION_1_12_0 , ext_zicond), +ISA_EXT_DATA_ENTRY (zicsr,PRIV_VERSION_1_10_0 , ext_icsr), +ISA_EXT_DATA_ENTRY (zifencei,PRIV_VERSION_1_10_0 , ext_ifencei), +ISA_EXT_DATA_ENTRY (zihintpause,PRIV_VERSION_1_10_0 , ext_zihintpause), +ISA_EXT_DATA_ENTRY (zawrs,PRIV_VERSION_1_12_0 , ext_zawrs), +ISA_EXT_DATA_ENTRY (zfh,PRIV_VERSION_1_11_0 , ext_zfh), +ISA_EXT_DATA_ENTRY (zfhmin,PRIV_VERSION_1_12_0 , ext_zfhmin), +ISA_EXT_DATA_ENTRY (zfinx,PRIV_VERSION_1_12_0 , ext_zfinx), +ISA_EXT_DATA_ENTRY (zdinx,PRIV_VERSION_1_12_0 , ext_zdinx), +ISA_EXT_DATA_ENTRY (zba,PRIV_VERSION_1_12_0 , ext_zba), +ISA_EXT_DATA_ENTRY (zbb,PRIV_VERSION_1_12_0 , ext_zbb), +ISA_EXT_DATA_ENTRY (zbc,PRIV_VERSION_1_12_0 , ext_zbc), +ISA_EXT_DATA_ENTRY (zbkb,PRIV_VERSION_1_12_0 , ext_zbkb), +ISA_EXT_DATA_ENTRY (zbkc,PRIV_VERSION_1_12_0 , ext_zbkc), +ISA_EXT_DATA_ENTRY (zbkx,PRIV_VERSION_1_12_0 , ext_zbkx), +ISA_EXT_DATA_ENTRY (zbs,PRIV_VERSION_1_12_0 , ext_zbs), +ISA_EXT_DATA_ENTRY (zk,PRIV_VERSION_1_12_0 , ext_zk), +ISA_EXT_DATA_ENTRY (zkn,PRIV_VERSION_1_12_0 , ext_zkn), +ISA_EXT_DATA_ENTRY (zknd,PRIV_VERSION_1_12_0 , ext_zknd), +ISA_EXT_DATA_ENTRY (zkne,PRIV_VERSION_1_12_0 , ext_zkne), +ISA_EXT_DATA_ENTRY (zknh,PRIV_VERSION_1_12_0 , ext_zknh), +ISA_EXT_DATA_ENTRY (zkr,PRIV_VERSION_1_12_0 , ext_zkr), +ISA_EXT_DATA_ENTRY (zks,PRIV_VERSION_1_12_0 , ext_zks), +ISA_EXT_DATA_ENTRY (zksed,PRIV_VERSION_1_12_0 , ext_zksed), +ISA_EXT_DATA_ENTRY (zksh,PRIV_VERSION_1_12_0 , ext_zksh), +ISA_EXT_DATA_ENTRY (zkt,PRIV_VERSION_1_12_0 , ext_zkt), +ISA_EXT_DATA_ENTRY (zve32f,PRIV_VERSION_1_12_0 , ext_zve32f), +ISA_EXT_DATA_ENTRY (zve64f,PRIV_VERSION_1_12_0 , ext_zve64f), +ISA_EXT_DATA_ENTRY (zve64d,PRIV_VERSION_1_12_0 , ext_zve64d), +ISA_EXT_DATA_ENTRY (zvfh,PRIV_VERSION_1_12_0 , ext_zvfh), +ISA_EXT_DATA_ENTRY (zvfhmin,PRIV_VERSION_1_12_0 , ext_zvfhmin), +ISA_EXT_DATA_ENTRY (zhinx,PRIV_VERSION_1_12_0 , ext_zhinx), +ISA_EXT_DATA_ENTRY (zhinxmin,PRIV_VERSION_1_12_0 , ext_zhinxmin), +ISA_EXT_DATA_ENTRY (smaia,PRIV_VERSION_1_12_0 , ext_smaia), +ISA_EXT_DATA_ENTRY (ssaia,PRIV_VERSION_1_12_0 , ext_ssaia), +ISA_EXT_DATA_ENTRY (sscofpmf,PRIV_VERSION_1_12_0 , ext_sscofpmf), +ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc), +ISA_EXT_DATA_ENTRY (svadu,PRIV_VERSION_1_12_0 , ext_svadu), +ISA_EXT_DATA_ENTRY (svinval,PRIV_VERSION_1_12_0 , ext_svinval), +ISA_EXT_DATA_ENTRY (svnapot,PRIV_VERSION_1_12_0 , ext_svnapot), +ISA_EXT_DATA_ENTRY (svpbmt,PRIV_VERSION_1_12_0 , ext_svpbmt), +ISA_EXT_DATA_ENTRY (xtheadba,PRIV_VERSION_1_11_0 , ext_xtheadba), +ISA_EXT_DATA_ENTRY (xtheadbb,PRIV_VERSION_1_11_0 , ext_xtheadbb), +ISA_EXT_DATA_ENTRY (xtheadbs,PRIV_VERSION_1_11_0 , ext_xtheadbs), +ISA_EXT_DATA_ENTRY (xtheadcmo,PRIV_VERSION_1_11_0 , ext_xtheadcmo), +ISA_EXT_DATA_ENTRY (xtheadcondmov,PRIV_VERSION_1_11_0 , ext_xtheadcondmov), +ISA_EXT_DATA_ENTRY (xtheadfmemidx,PRIV_VERSION_1_11_0 , ext_xtheadfmemidx), +ISA_EXT_DATA_ENTRY (xtheadfmv,PRIV_VERSION_1_11_0 , ext_xtheadfmv), +ISA_EXT_DATA_ENTRY (xtheadmac,PRIV_VERSION_1_11_0 , ext_xtheadmac), +ISA_EXT_DATA_ENTRY (xtheadmemidx,PRIV_VERSION_1_11_0 , ext_xtheadmemidx), +ISA_EXT_DATA_ENTRY (xtheadmempair,PRIV_VERSION_1_11_0 , ext_xtheadmempair), +ISA_EXT_DATA_ENTRY (xtheadsync,PRIV_VERSION_1_11_0 , ext_xtheadsync), +ISA_EXT_DATA_ENTRY (xventanacondops,PRIV_VERSION_1_12_0 , ext_XVentanaCondOps), }; static bool isa_ext_is_enabled(RISCVCPU *cpu,
@@ -1671,8 +1670,7 @@ static void riscv_isa_string_ext(RISCVCPU *cpu, char **isa_str, int max_str_len)int i;for (i =0 ; i <ARRAY_SIZE (isa_edata_arr); i++) { -if (isa_edata_arr[i].multi_letter && -isa_ext_is_enabled (cpu, &isa_edata_arr[i])) { +if (isa_ext_is_enabled (cpu, &isa_edata_arr[i])) { new =g_strconcat (old,"_" , isa_edata_arr[i].name,NULL );g_free (old); old = new;
Signature · 1 line
2.39.2
Re: [PATCH v3 03/20] target/riscv/cpu.c: remove 'multi_letter' from isa_ext_data
Quoted 6 lines · Daniel Henrique Barboza
We don't have MISA extensions in isa_edata_arr[] anymore. Remove the redundant '
multi_letter' field fromisa_ext_data.Suggested-by Weiwei Li <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>---
Weiwei Li
Quoted 150 lines
target/riscv/cpu.c | 118 ++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 60 deletions(-)target/riscv/cpu.c +58
-60@@ -48,13 +48,12 @@ static const char riscv_single_letter_exts[] = "IEMAFDQCPVH";struct isa_ext_data {const char *name; -bool multi_letter;int min_version;int ext_enable_offset; }; -#define ISA_EXT_DATA_ENTRY (_name, _m_letter, _min_ver, _prop) \ -{#_name, _m_letter, _min_ver, offsetof(struct RISCVCPUConfig, _prop)} +#define ISA_EXT_DATA_ENTRY (_name, _min_ver, _prop) \ +{#_name, _min_ver, offsetof(struct RISCVCPUConfig, _prop)}/** * Here are the ordering rules of extension naming defined by RISC-V @@ -77,61 +76,61 @@ struct isa_ext_data {* instead. */ static const struct isa_ext_data isa_edata_arr[] = { -ISA_EXT_DATA_ENTRY (zicbom, true,PRIV_VERSION_1_12_0 , ext_icbom), -ISA_EXT_DATA_ENTRY (zicboz, true,PRIV_VERSION_1_12_0 , ext_icboz), -ISA_EXT_DATA_ENTRY (zicond, true,PRIV_VERSION_1_12_0 , ext_zicond), -ISA_EXT_DATA_ENTRY (zicsr, true,PRIV_VERSION_1_10_0 , ext_icsr), -ISA_EXT_DATA_ENTRY (zifencei, true,PRIV_VERSION_1_10_0 , ext_ifencei), -ISA_EXT_DATA_ENTRY (zihintpause, true,PRIV_VERSION_1_10_0 , ext_zihintpause), -ISA_EXT_DATA_ENTRY (zawrs, true,PRIV_VERSION_1_12_0 , ext_zawrs), -ISA_EXT_DATA_ENTRY (zfh, true,PRIV_VERSION_1_11_0 , ext_zfh), -ISA_EXT_DATA_ENTRY (zfhmin, true,PRIV_VERSION_1_12_0 , ext_zfhmin), -ISA_EXT_DATA_ENTRY (zfinx, true,PRIV_VERSION_1_12_0 , ext_zfinx), -ISA_EXT_DATA_ENTRY (zdinx, true,PRIV_VERSION_1_12_0 , ext_zdinx), -ISA_EXT_DATA_ENTRY (zba, true,PRIV_VERSION_1_12_0 , ext_zba), -ISA_EXT_DATA_ENTRY (zbb, true,PRIV_VERSION_1_12_0 , ext_zbb), -ISA_EXT_DATA_ENTRY (zbc, true,PRIV_VERSION_1_12_0 , ext_zbc), -ISA_EXT_DATA_ENTRY (zbkb, true,PRIV_VERSION_1_12_0 , ext_zbkb), -ISA_EXT_DATA_ENTRY (zbkc, true,PRIV_VERSION_1_12_0 , ext_zbkc), -ISA_EXT_DATA_ENTRY (zbkx, true,PRIV_VERSION_1_12_0 , ext_zbkx), -ISA_EXT_DATA_ENTRY (zbs, true,PRIV_VERSION_1_12_0 , ext_zbs), -ISA_EXT_DATA_ENTRY (zk, true,PRIV_VERSION_1_12_0 , ext_zk), -ISA_EXT_DATA_ENTRY (zkn, true,PRIV_VERSION_1_12_0 , ext_zkn), -ISA_EXT_DATA_ENTRY (zknd, true,PRIV_VERSION_1_12_0 , ext_zknd), -ISA_EXT_DATA_ENTRY (zkne, true,PRIV_VERSION_1_12_0 , ext_zkne), -ISA_EXT_DATA_ENTRY (zknh, true,PRIV_VERSION_1_12_0 , ext_zknh), -ISA_EXT_DATA_ENTRY (zkr, true,PRIV_VERSION_1_12_0 , ext_zkr), -ISA_EXT_DATA_ENTRY (zks, true,PRIV_VERSION_1_12_0 , ext_zks), -ISA_EXT_DATA_ENTRY (zksed, true,PRIV_VERSION_1_12_0 , ext_zksed), -ISA_EXT_DATA_ENTRY (zksh, true,PRIV_VERSION_1_12_0 , ext_zksh), -ISA_EXT_DATA_ENTRY (zkt, true,PRIV_VERSION_1_12_0 , ext_zkt), -ISA_EXT_DATA_ENTRY (zve32f, true,PRIV_VERSION_1_12_0 , ext_zve32f), -ISA_EXT_DATA_ENTRY (zve64f, true,PRIV_VERSION_1_12_0 , ext_zve64f), -ISA_EXT_DATA_ENTRY (zve64d, true,PRIV_VERSION_1_12_0 , ext_zve64d), -ISA_EXT_DATA_ENTRY (zvfh, true,PRIV_VERSION_1_12_0 , ext_zvfh), -ISA_EXT_DATA_ENTRY (zvfhmin, true,PRIV_VERSION_1_12_0 , ext_zvfhmin), -ISA_EXT_DATA_ENTRY (zhinx, true,PRIV_VERSION_1_12_0 , ext_zhinx), -ISA_EXT_DATA_ENTRY (zhinxmin, true,PRIV_VERSION_1_12_0 , ext_zhinxmin), -ISA_EXT_DATA_ENTRY (smaia, true,PRIV_VERSION_1_12_0 , ext_smaia), -ISA_EXT_DATA_ENTRY (ssaia, true,PRIV_VERSION_1_12_0 , ext_ssaia), -ISA_EXT_DATA_ENTRY (sscofpmf, true,PRIV_VERSION_1_12_0 , ext_sscofpmf), -ISA_EXT_DATA_ENTRY (sstc, true,PRIV_VERSION_1_12_0 , ext_sstc), -ISA_EXT_DATA_ENTRY (svadu, true,PRIV_VERSION_1_12_0 , ext_svadu), -ISA_EXT_DATA_ENTRY (svinval, true,PRIV_VERSION_1_12_0 , ext_svinval), -ISA_EXT_DATA_ENTRY (svnapot, true,PRIV_VERSION_1_12_0 , ext_svnapot), -ISA_EXT_DATA_ENTRY (svpbmt, true,PRIV_VERSION_1_12_0 , ext_svpbmt), -ISA_EXT_DATA_ENTRY (xtheadba, true,PRIV_VERSION_1_11_0 , ext_xtheadba), -ISA_EXT_DATA_ENTRY (xtheadbb, true,PRIV_VERSION_1_11_0 , ext_xtheadbb), -ISA_EXT_DATA_ENTRY (xtheadbs, true,PRIV_VERSION_1_11_0 , ext_xtheadbs), -ISA_EXT_DATA_ENTRY (xtheadcmo, true,PRIV_VERSION_1_11_0 , ext_xtheadcmo), -ISA_EXT_DATA_ENTRY (xtheadcondmov, true,PRIV_VERSION_1_11_0 , ext_xtheadcondmov), -ISA_EXT_DATA_ENTRY (xtheadfmemidx, true,PRIV_VERSION_1_11_0 , ext_xtheadfmemidx), -ISA_EXT_DATA_ENTRY (xtheadfmv, true,PRIV_VERSION_1_11_0 , ext_xtheadfmv), -ISA_EXT_DATA_ENTRY (xtheadmac, true,PRIV_VERSION_1_11_0 , ext_xtheadmac), -ISA_EXT_DATA_ENTRY (xtheadmemidx, true,PRIV_VERSION_1_11_0 , ext_xtheadmemidx), -ISA_EXT_DATA_ENTRY (xtheadmempair, true,PRIV_VERSION_1_11_0 , ext_xtheadmempair), -ISA_EXT_DATA_ENTRY (xtheadsync, true,PRIV_VERSION_1_11_0 , ext_xtheadsync), -ISA_EXT_DATA_ENTRY (xventanacondops, true,PRIV_VERSION_1_12_0 , ext_XVentanaCondOps), +ISA_EXT_DATA_ENTRY (zicbom,PRIV_VERSION_1_12_0 , ext_icbom), +ISA_EXT_DATA_ENTRY (zicboz,PRIV_VERSION_1_12_0 , ext_icboz), +ISA_EXT_DATA_ENTRY (zicond,PRIV_VERSION_1_12_0 , ext_zicond), +ISA_EXT_DATA_ENTRY (zicsr,PRIV_VERSION_1_10_0 , ext_icsr), +ISA_EXT_DATA_ENTRY (zifencei,PRIV_VERSION_1_10_0 , ext_ifencei), +ISA_EXT_DATA_ENTRY (zihintpause,PRIV_VERSION_1_10_0 , ext_zihintpause), +ISA_EXT_DATA_ENTRY (zawrs,PRIV_VERSION_1_12_0 , ext_zawrs), +ISA_EXT_DATA_ENTRY (zfh,PRIV_VERSION_1_11_0 , ext_zfh), +ISA_EXT_DATA_ENTRY (zfhmin,PRIV_VERSION_1_12_0 , ext_zfhmin), +ISA_EXT_DATA_ENTRY (zfinx,PRIV_VERSION_1_12_0 , ext_zfinx), +ISA_EXT_DATA_ENTRY (zdinx,PRIV_VERSION_1_12_0 , ext_zdinx), +ISA_EXT_DATA_ENTRY (zba,PRIV_VERSION_1_12_0 , ext_zba), +ISA_EXT_DATA_ENTRY (zbb,PRIV_VERSION_1_12_0 , ext_zbb), +ISA_EXT_DATA_ENTRY (zbc,PRIV_VERSION_1_12_0 , ext_zbc), +ISA_EXT_DATA_ENTRY (zbkb,PRIV_VERSION_1_12_0 , ext_zbkb), +ISA_EXT_DATA_ENTRY (zbkc,PRIV_VERSION_1_12_0 , ext_zbkc), +ISA_EXT_DATA_ENTRY (zbkx,PRIV_VERSION_1_12_0 , ext_zbkx), +ISA_EXT_DATA_ENTRY (zbs,PRIV_VERSION_1_12_0 , ext_zbs), +ISA_EXT_DATA_ENTRY (zk,PRIV_VERSION_1_12_0 , ext_zk), +ISA_EXT_DATA_ENTRY (zkn,PRIV_VERSION_1_12_0 , ext_zkn), +ISA_EXT_DATA_ENTRY (zknd,PRIV_VERSION_1_12_0 , ext_zknd), +ISA_EXT_DATA_ENTRY (zkne,PRIV_VERSION_1_12_0 , ext_zkne), +ISA_EXT_DATA_ENTRY (zknh,PRIV_VERSION_1_12_0 , ext_zknh), +ISA_EXT_DATA_ENTRY (zkr,PRIV_VERSION_1_12_0 , ext_zkr), +ISA_EXT_DATA_ENTRY (zks,PRIV_VERSION_1_12_0 , ext_zks), +ISA_EXT_DATA_ENTRY (zksed,PRIV_VERSION_1_12_0 , ext_zksed), +ISA_EXT_DATA_ENTRY (zksh,PRIV_VERSION_1_12_0 , ext_zksh), +ISA_EXT_DATA_ENTRY (zkt,PRIV_VERSION_1_12_0 , ext_zkt), +ISA_EXT_DATA_ENTRY (zve32f,PRIV_VERSION_1_12_0 , ext_zve32f), +ISA_EXT_DATA_ENTRY (zve64f,PRIV_VERSION_1_12_0 , ext_zve64f), +ISA_EXT_DATA_ENTRY (zve64d,PRIV_VERSION_1_12_0 , ext_zve64d), +ISA_EXT_DATA_ENTRY (zvfh,PRIV_VERSION_1_12_0 , ext_zvfh), +ISA_EXT_DATA_ENTRY (zvfhmin,PRIV_VERSION_1_12_0 , ext_zvfhmin), +ISA_EXT_DATA_ENTRY (zhinx,PRIV_VERSION_1_12_0 , ext_zhinx), +ISA_EXT_DATA_ENTRY (zhinxmin,PRIV_VERSION_1_12_0 , ext_zhinxmin), +ISA_EXT_DATA_ENTRY (smaia,PRIV_VERSION_1_12_0 , ext_smaia), +ISA_EXT_DATA_ENTRY (ssaia,PRIV_VERSION_1_12_0 , ext_ssaia), +ISA_EXT_DATA_ENTRY (sscofpmf,PRIV_VERSION_1_12_0 , ext_sscofpmf), +ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc), +ISA_EXT_DATA_ENTRY (svadu,PRIV_VERSION_1_12_0 , ext_svadu), +ISA_EXT_DATA_ENTRY (svinval,PRIV_VERSION_1_12_0 , ext_svinval), +ISA_EXT_DATA_ENTRY (svnapot,PRIV_VERSION_1_12_0 , ext_svnapot), +ISA_EXT_DATA_ENTRY (svpbmt,PRIV_VERSION_1_12_0 , ext_svpbmt), +ISA_EXT_DATA_ENTRY (xtheadba,PRIV_VERSION_1_11_0 , ext_xtheadba), +ISA_EXT_DATA_ENTRY (xtheadbb,PRIV_VERSION_1_11_0 , ext_xtheadbb), +ISA_EXT_DATA_ENTRY (xtheadbs,PRIV_VERSION_1_11_0 , ext_xtheadbs), +ISA_EXT_DATA_ENTRY (xtheadcmo,PRIV_VERSION_1_11_0 , ext_xtheadcmo), +ISA_EXT_DATA_ENTRY (xtheadcondmov,PRIV_VERSION_1_11_0 , ext_xtheadcondmov), +ISA_EXT_DATA_ENTRY (xtheadfmemidx,PRIV_VERSION_1_11_0 , ext_xtheadfmemidx), +ISA_EXT_DATA_ENTRY (xtheadfmv,PRIV_VERSION_1_11_0 , ext_xtheadfmv), +ISA_EXT_DATA_ENTRY (xtheadmac,PRIV_VERSION_1_11_0 , ext_xtheadmac), +ISA_EXT_DATA_ENTRY (xtheadmemidx,PRIV_VERSION_1_11_0 , ext_xtheadmemidx), +ISA_EXT_DATA_ENTRY (xtheadmempair,PRIV_VERSION_1_11_0 , ext_xtheadmempair), +ISA_EXT_DATA_ENTRY (xtheadsync,PRIV_VERSION_1_11_0 , ext_xtheadsync), +ISA_EXT_DATA_ENTRY (xventanacondops,PRIV_VERSION_1_12_0 , ext_XVentanaCondOps), }; static bool isa_ext_is_enabled(RISCVCPU *cpu,@@ -1671,8 +1670,7 @@ static void riscv_isa_string_ext(RISCVCPU *cpu, char **isa_str, int max_str_len)int i;for (i =0 ; i <ARRAY_SIZE (isa_edata_arr); i++) { -if (isa_edata_arr[i].multi_letter && -isa_ext_is_enabled (cpu, &isa_edata_arr[i])) { +if (isa_ext_is_enabled (cpu, &isa_edata_arr[i])) { new =g_strconcat (old,"_" , isa_edata_arr[i].name,NULL );g_free (old); old = new;
Re: [PATCH v3 03/20] target/riscv/cpu.c: remove 'multi_letter' from isa_ext_data
In reply to Daniel Henrique BarbozaQuoted 6 lines · Daniel Henrique Barboza
We don't have MISA extensions in isa_edata_arr[] anymore. Remove the redundant '
multi_letter' field fromisa_ext_data.Suggested-by Weiwei Li <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 155 lines
--- target/riscv/cpu.c | 118 ++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 60 deletions(-)target/riscv/cpu.c +58
-61@@ -48,13 +48,12 @@ static const char riscv_single_letter_exts[] = "IEMAFDQCPVH";struct isa_ext_data {const char *name; -bool multi_letter;int min_version;int ext_enable_offset; }; -#define ISA_EXT_DATA_ENTRY (_name, _m_letter, _min_ver, _prop) \ -{#_name, _m_letter, _min_ver, offsetof(struct RISCVCPUConfig, _prop)} +#define ISA_EXT_DATA_ENTRY (_name, _min_ver, _prop) \ +{#_name, _min_ver, offsetof(struct RISCVCPUConfig, _prop)}/** * Here are the ordering rules of extension naming defined by RISC-V @@ -77,61 +76,61 @@ struct isa_ext_data {* instead. */ static const struct isa_ext_data isa_edata_arr[] = { -ISA_EXT_DATA_ENTRY (zicbom, true,PRIV_VERSION_1_12_0 , ext_icbom), -ISA_EXT_DATA_ENTRY (zicboz, true,PRIV_VERSION_1_12_0 , ext_icboz), -ISA_EXT_DATA_ENTRY (zicond, true,PRIV_VERSION_1_12_0 , ext_zicond), -ISA_EXT_DATA_ENTRY (zicsr, true,PRIV_VERSION_1_10_0 , ext_icsr), -ISA_EXT_DATA_ENTRY (zifencei, true,PRIV_VERSION_1_10_0 , ext_ifencei), -ISA_EXT_DATA_ENTRY (zihintpause, true,PRIV_VERSION_1_10_0 , ext_zihintpause), -ISA_EXT_DATA_ENTRY (zawrs, true,PRIV_VERSION_1_12_0 , ext_zawrs), -ISA_EXT_DATA_ENTRY (zfh, true,PRIV_VERSION_1_11_0 , ext_zfh), -ISA_EXT_DATA_ENTRY (zfhmin, true,PRIV_VERSION_1_12_0 , ext_zfhmin), -ISA_EXT_DATA_ENTRY (zfinx, true,PRIV_VERSION_1_12_0 , ext_zfinx), -ISA_EXT_DATA_ENTRY (zdinx, true,PRIV_VERSION_1_12_0 , ext_zdinx), -ISA_EXT_DATA_ENTRY (zba, true,PRIV_VERSION_1_12_0 , ext_zba), -ISA_EXT_DATA_ENTRY (zbb, true,PRIV_VERSION_1_12_0 , ext_zbb), -ISA_EXT_DATA_ENTRY (zbc, true,PRIV_VERSION_1_12_0 , ext_zbc), -ISA_EXT_DATA_ENTRY (zbkb, true,PRIV_VERSION_1_12_0 , ext_zbkb), -ISA_EXT_DATA_ENTRY (zbkc, true,PRIV_VERSION_1_12_0 , ext_zbkc), -ISA_EXT_DATA_ENTRY (zbkx, true,PRIV_VERSION_1_12_0 , ext_zbkx), -ISA_EXT_DATA_ENTRY (zbs, true,PRIV_VERSION_1_12_0 , ext_zbs), -ISA_EXT_DATA_ENTRY (zk, true,PRIV_VERSION_1_12_0 , ext_zk), -ISA_EXT_DATA_ENTRY (zkn, true,PRIV_VERSION_1_12_0 , ext_zkn), -ISA_EXT_DATA_ENTRY (zknd, true,PRIV_VERSION_1_12_0 , ext_zknd), -ISA_EXT_DATA_ENTRY (zkne, true,PRIV_VERSION_1_12_0 , ext_zkne), -ISA_EXT_DATA_ENTRY (zknh, true,PRIV_VERSION_1_12_0 , ext_zknh), -ISA_EXT_DATA_ENTRY (zkr, true,PRIV_VERSION_1_12_0 , ext_zkr), -ISA_EXT_DATA_ENTRY (zks, true,PRIV_VERSION_1_12_0 , ext_zks), -ISA_EXT_DATA_ENTRY (zksed, true,PRIV_VERSION_1_12_0 , ext_zksed), -ISA_EXT_DATA_ENTRY (zksh, true,PRIV_VERSION_1_12_0 , ext_zksh), -ISA_EXT_DATA_ENTRY (zkt, true,PRIV_VERSION_1_12_0 , ext_zkt), -ISA_EXT_DATA_ENTRY (zve32f, true,PRIV_VERSION_1_12_0 , ext_zve32f), -ISA_EXT_DATA_ENTRY (zve64f, true,PRIV_VERSION_1_12_0 , ext_zve64f), -ISA_EXT_DATA_ENTRY (zve64d, true,PRIV_VERSION_1_12_0 , ext_zve64d), -ISA_EXT_DATA_ENTRY (zvfh, true,PRIV_VERSION_1_12_0 , ext_zvfh), -ISA_EXT_DATA_ENTRY (zvfhmin, true,PRIV_VERSION_1_12_0 , ext_zvfhmin), -ISA_EXT_DATA_ENTRY (zhinx, true,PRIV_VERSION_1_12_0 , ext_zhinx), -ISA_EXT_DATA_ENTRY (zhinxmin, true,PRIV_VERSION_1_12_0 , ext_zhinxmin), -ISA_EXT_DATA_ENTRY (smaia, true,PRIV_VERSION_1_12_0 , ext_smaia), -ISA_EXT_DATA_ENTRY (ssaia, true,PRIV_VERSION_1_12_0 , ext_ssaia), -ISA_EXT_DATA_ENTRY (sscofpmf, true,PRIV_VERSION_1_12_0 , ext_sscofpmf), -ISA_EXT_DATA_ENTRY (sstc, true,PRIV_VERSION_1_12_0 , ext_sstc), -ISA_EXT_DATA_ENTRY (svadu, true,PRIV_VERSION_1_12_0 , ext_svadu), -ISA_EXT_DATA_ENTRY (svinval, true,PRIV_VERSION_1_12_0 , ext_svinval), -ISA_EXT_DATA_ENTRY (svnapot, true,PRIV_VERSION_1_12_0 , ext_svnapot), -ISA_EXT_DATA_ENTRY (svpbmt, true,PRIV_VERSION_1_12_0 , ext_svpbmt), -ISA_EXT_DATA_ENTRY (xtheadba, true,PRIV_VERSION_1_11_0 , ext_xtheadba), -ISA_EXT_DATA_ENTRY (xtheadbb, true,PRIV_VERSION_1_11_0 , ext_xtheadbb), -ISA_EXT_DATA_ENTRY (xtheadbs, true,PRIV_VERSION_1_11_0 , ext_xtheadbs), -ISA_EXT_DATA_ENTRY (xtheadcmo, true,PRIV_VERSION_1_11_0 , ext_xtheadcmo), -ISA_EXT_DATA_ENTRY (xtheadcondmov, true,PRIV_VERSION_1_11_0 , ext_xtheadcondmov), -ISA_EXT_DATA_ENTRY (xtheadfmemidx, true,PRIV_VERSION_1_11_0 , ext_xtheadfmemidx), -ISA_EXT_DATA_ENTRY (xtheadfmv, true,PRIV_VERSION_1_11_0 , ext_xtheadfmv), -ISA_EXT_DATA_ENTRY (xtheadmac, true,PRIV_VERSION_1_11_0 , ext_xtheadmac), -ISA_EXT_DATA_ENTRY (xtheadmemidx, true,PRIV_VERSION_1_11_0 , ext_xtheadmemidx), -ISA_EXT_DATA_ENTRY (xtheadmempair, true,PRIV_VERSION_1_11_0 , ext_xtheadmempair), -ISA_EXT_DATA_ENTRY (xtheadsync, true,PRIV_VERSION_1_11_0 , ext_xtheadsync), -ISA_EXT_DATA_ENTRY (xventanacondops, true,PRIV_VERSION_1_12_0 , ext_XVentanaCondOps), +ISA_EXT_DATA_ENTRY (zicbom,PRIV_VERSION_1_12_0 , ext_icbom), +ISA_EXT_DATA_ENTRY (zicboz,PRIV_VERSION_1_12_0 , ext_icboz), +ISA_EXT_DATA_ENTRY (zicond,PRIV_VERSION_1_12_0 , ext_zicond), +ISA_EXT_DATA_ENTRY (zicsr,PRIV_VERSION_1_10_0 , ext_icsr), +ISA_EXT_DATA_ENTRY (zifencei,PRIV_VERSION_1_10_0 , ext_ifencei), +ISA_EXT_DATA_ENTRY (zihintpause,PRIV_VERSION_1_10_0 , ext_zihintpause), +ISA_EXT_DATA_ENTRY (zawrs,PRIV_VERSION_1_12_0 , ext_zawrs), +ISA_EXT_DATA_ENTRY (zfh,PRIV_VERSION_1_11_0 , ext_zfh), +ISA_EXT_DATA_ENTRY (zfhmin,PRIV_VERSION_1_12_0 , ext_zfhmin), +ISA_EXT_DATA_ENTRY (zfinx,PRIV_VERSION_1_12_0 , ext_zfinx), +ISA_EXT_DATA_ENTRY (zdinx,PRIV_VERSION_1_12_0 , ext_zdinx), +ISA_EXT_DATA_ENTRY (zba,PRIV_VERSION_1_12_0 , ext_zba), +ISA_EXT_DATA_ENTRY (zbb,PRIV_VERSION_1_12_0 , ext_zbb), +ISA_EXT_DATA_ENTRY (zbc,PRIV_VERSION_1_12_0 , ext_zbc), +ISA_EXT_DATA_ENTRY (zbkb,PRIV_VERSION_1_12_0 , ext_zbkb), +ISA_EXT_DATA_ENTRY (zbkc,PRIV_VERSION_1_12_0 , ext_zbkc), +ISA_EXT_DATA_ENTRY (zbkx,PRIV_VERSION_1_12_0 , ext_zbkx), +ISA_EXT_DATA_ENTRY (zbs,PRIV_VERSION_1_12_0 , ext_zbs), +ISA_EXT_DATA_ENTRY (zk,PRIV_VERSION_1_12_0 , ext_zk), +ISA_EXT_DATA_ENTRY (zkn,PRIV_VERSION_1_12_0 , ext_zkn), +ISA_EXT_DATA_ENTRY (zknd,PRIV_VERSION_1_12_0 , ext_zknd), +ISA_EXT_DATA_ENTRY (zkne,PRIV_VERSION_1_12_0 , ext_zkne), +ISA_EXT_DATA_ENTRY (zknh,PRIV_VERSION_1_12_0 , ext_zknh), +ISA_EXT_DATA_ENTRY (zkr,PRIV_VERSION_1_12_0 , ext_zkr), +ISA_EXT_DATA_ENTRY (zks,PRIV_VERSION_1_12_0 , ext_zks), +ISA_EXT_DATA_ENTRY (zksed,PRIV_VERSION_1_12_0 , ext_zksed), +ISA_EXT_DATA_ENTRY (zksh,PRIV_VERSION_1_12_0 , ext_zksh), +ISA_EXT_DATA_ENTRY (zkt,PRIV_VERSION_1_12_0 , ext_zkt), +ISA_EXT_DATA_ENTRY (zve32f,PRIV_VERSION_1_12_0 , ext_zve32f), +ISA_EXT_DATA_ENTRY (zve64f,PRIV_VERSION_1_12_0 , ext_zve64f), +ISA_EXT_DATA_ENTRY (zve64d,PRIV_VERSION_1_12_0 , ext_zve64d), +ISA_EXT_DATA_ENTRY (zvfh,PRIV_VERSION_1_12_0 , ext_zvfh), +ISA_EXT_DATA_ENTRY (zvfhmin,PRIV_VERSION_1_12_0 , ext_zvfhmin), +ISA_EXT_DATA_ENTRY (zhinx,PRIV_VERSION_1_12_0 , ext_zhinx), +ISA_EXT_DATA_ENTRY (zhinxmin,PRIV_VERSION_1_12_0 , ext_zhinxmin), +ISA_EXT_DATA_ENTRY (smaia,PRIV_VERSION_1_12_0 , ext_smaia), +ISA_EXT_DATA_ENTRY (ssaia,PRIV_VERSION_1_12_0 , ext_ssaia), +ISA_EXT_DATA_ENTRY (sscofpmf,PRIV_VERSION_1_12_0 , ext_sscofpmf), +ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc), +ISA_EXT_DATA_ENTRY (svadu,PRIV_VERSION_1_12_0 , ext_svadu), +ISA_EXT_DATA_ENTRY (svinval,PRIV_VERSION_1_12_0 , ext_svinval), +ISA_EXT_DATA_ENTRY (svnapot,PRIV_VERSION_1_12_0 , ext_svnapot), +ISA_EXT_DATA_ENTRY (svpbmt,PRIV_VERSION_1_12_0 , ext_svpbmt), +ISA_EXT_DATA_ENTRY (xtheadba,PRIV_VERSION_1_11_0 , ext_xtheadba), +ISA_EXT_DATA_ENTRY (xtheadbb,PRIV_VERSION_1_11_0 , ext_xtheadbb), +ISA_EXT_DATA_ENTRY (xtheadbs,PRIV_VERSION_1_11_0 , ext_xtheadbs), +ISA_EXT_DATA_ENTRY (xtheadcmo,PRIV_VERSION_1_11_0 , ext_xtheadcmo), +ISA_EXT_DATA_ENTRY (xtheadcondmov,PRIV_VERSION_1_11_0 , ext_xtheadcondmov), +ISA_EXT_DATA_ENTRY (xtheadfmemidx,PRIV_VERSION_1_11_0 , ext_xtheadfmemidx), +ISA_EXT_DATA_ENTRY (xtheadfmv,PRIV_VERSION_1_11_0 , ext_xtheadfmv), +ISA_EXT_DATA_ENTRY (xtheadmac,PRIV_VERSION_1_11_0 , ext_xtheadmac), +ISA_EXT_DATA_ENTRY (xtheadmemidx,PRIV_VERSION_1_11_0 , ext_xtheadmemidx), +ISA_EXT_DATA_ENTRY (xtheadmempair,PRIV_VERSION_1_11_0 , ext_xtheadmempair), +ISA_EXT_DATA_ENTRY (xtheadsync,PRIV_VERSION_1_11_0 , ext_xtheadsync), +ISA_EXT_DATA_ENTRY (xventanacondops,PRIV_VERSION_1_12_0 , ext_XVentanaCondOps), }; static bool isa_ext_is_enabled(RISCVCPU *cpu,@@ -1671,8 +1670,7 @@ static void riscv_isa_string_ext(RISCVCPU *cpu, char **isa_str, int max_str_len)int i;for (i =0 ; i <ARRAY_SIZE (isa_edata_arr); i++) { -if (isa_edata_arr[i].multi_letter && -isa_ext_is_enabled (cpu, &isa_edata_arr[i])) { +if (isa_ext_is_enabled (cpu, &isa_edata_arr[i])) { new =g_strconcat (old,"_" , isa_edata_arr[i].name,NULL );g_free (old); old = new; --2.39.2
PATCH v3 4/20 target/riscv: introduce riscv_cpu_add_misa_properties()
In reply to Daniel Henrique BarbozaEver since RISCVCPUConfig got introduced users are able to set CPU extensions in the command line. User settings are reflected in the cpu->cfg object for later use. These properties are used in the target/riscv/cpu.c code, most notably in riscv_cpu_validate_set_extensions(), where most of our realize time validations are made.
And then there's env->misa_ext, the field where the MISA extensions are set, that is read everywhere else. We need to keep env->misa_ext updated with cpu->cfg settings, since our validations rely on it, forcing us to make register_cpu_props() write cpu->cfg.ext_N flags to cover for named CPUs that aren't used named properties but also needs to go through the same validation steps. Failing to so will make those name CPUs fail validation (see c66ffcd5358b for more info). Not only that, but we also need to sync env->misa_ext with cpu->cfg again during realize() time to catch any change the user might have done, since the rest of the code relies on that.
Making cpu->cfg.ext_N and env->misa_ext reflect each other is not needed. What we want is a way for users to enable/disable MISA extensions, and there's nothing stopping us from letting the user write env->misa_ext directly. Here are the artifacts that will enable us to do that:
- RISCVCPUMisaExtConfig will declare each MISA property;
- cpu_set_misa_ext_cfg() is the setter for each property. We'll write env->misa_ext and env->misa_ext_mask with the appropriate misa_bit; cutting off cpu->cfg.ext_N from the logic;
- cpu_get_misa_ext_cfg() is a getter that will retrieve the current val of the property based on env->misa_ext;
- riscv_cpu_add_misa_properties() will be called in register_cpu_props() to init all MISA properties from the misa_ext_cfgs[] array.
With this infrastructure we'll start to get rid of each cpu->cfg.ext_N attribute in the next patches.
--- target/riscv/cpu.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)
target/riscv/cpu.c +65 -0
@@ -1393,6 +1393,69 @@ static void riscv_cpu_init(Object *obj)#endif /* CONFIG_USER_ONLY */ } +typedef struct RISCVCPUMisaExtConfig { +const char *name; +const char *description; +target_ulong misa_bit; +bool enabled; +}RISCVCPUMisaExtConfig ; + +static void cpu_set_misa_ext_cfg (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +const RISCVCPUMisaExtConfig *misa_ext_cfg = opaque; +target_ulong misa_bit = misa_ext_cfg->misa_bit; +RISCVCPU *cpu =RISCV_CPU (obj); +CPURISCVState *env = &cpu->env; +bool value; + +if (!visit_type_bool (v, name, &value, errp)) { +return ; + } + +if (value) { + env->misa_ext |= misa_bit; + env->misa_ext_mask |= misa_bit; + }else { + env->misa_ext &= ~misa_bit; + env->misa_ext_mask &= ~misa_bit; + } +} + +static void cpu_get_misa_ext_cfg (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +const RISCVCPUMisaExtConfig *misa_ext_cfg = opaque; +target_ulong misa_bit = misa_ext_cfg->misa_bit; +RISCVCPU *cpu =RISCV_CPU (obj); +CPURISCVState *env = &cpu->env; +bool value; + + value = env->misa_ext & misa_bit; + +visit_type_bool (v, name, &value, errp); +} + +static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = {}; + +static void riscv_cpu_add_misa_properties (Object *cpu_obj) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (misa_ext_cfgs); i++) { +const RISCVCPUMisaExtConfig *misa_cfg = &misa_ext_cfgs[i]; + +object_property_add (cpu_obj, misa_cfg->name,"bool" , + cpu_get_misa_ext_cfg, + cpu_set_misa_ext_cfg, +NULL , (void *)misa_cfg); +object_property_set_description (cpu_obj, misa_cfg->name, + misa_cfg->description); +object_property_set_bool (cpu_obj, misa_cfg->name, + misa_cfg->enabled,NULL ); + } +} +static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("i" ,RISCVCPU , cfg.ext_i, true),
@@ -1530,6 +1593,8 @@ static void register_cpu_props(Object *obj)return ; } +riscv_cpu_add_misa_properties (obj); +for (prop = riscv_cpu_extensions; prop && prop->name; prop++) {qdev_property_add_static (dev, prop); }
Signature · 1 line
2.39.2
Re: [PATCH v3 04/20] target/riscv: introduce riscv_cpu_add_misa_properties()
Quoted 32 lines · Daniel Henrique Barboza
Ever since RISCVCPUConfig got introduced users are able to set CPU extensions in the command line. User settings are reflected in the
cpu->cfgobject for later use. These properties are used in thetarget/riscv/cpu.ccode, most notably inriscv_cpu_validate_set_extensions(), where most of our realize time validations are made.And then there's
env->misa_ext, the field where the MISA extensions are set, that is read everywhere else. We need to keepenv->misa_extupdated withcpu->cfgsettings, since our validations rely on it, forcing us to makeregister_cpu_props()writecpu->cfg.ext_Nflags to cover for named CPUs that aren't used named properties but also needs to go through the same validation steps. Failing to so will make those name CPUs fail validation (seec66ffcd5358bfor more info). Not only that, but we also need to syncenv->misa_extwithcpu->cfgagain duringrealize()time to catch any change the user might have done, since the rest of the code relies on that.Making
cpu->cfg.ext_Nandenv->misa_extreflect each other is not needed. What we want is a way for users to enable/disable MISA extensions, and there's nothing stopping us from letting the user writeenv->misa_extdirectly. Here are the artifacts that will enable us to do that:- RISCVCPUMisaExtConfig will declare each MISA property;
-
cpu_set_misa_ext_cfg()is the setter for each property. We'll writeenv->misa_extandenv->misa_ext_maskwith the appropriatemisa_bit; cutting offcpu->cfg.ext_Nfrom the logic;-
cpu_get_misa_ext_cfg()is a getter that will retrieve the current val of the property based onenv->misa_ext;
Quoted 8 lines
-
riscv_cpu_add_misa_properties()will be called inregister_cpu_props()to init all MISA properties from the misa_ext_cfgs[] array.With this infrastructure we'll start to get rid of each
cpu->cfg.ext_Nattribute in the next patches.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 91 lines
--- target/riscv/cpu.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)target/riscv/cpu.c +65
-1@@ -1393,6 +1393,69 @@ static void riscv_cpu_init(Object *obj)#endif /* CONFIG_USER_ONLY */ } +typedef struct RISCVCPUMisaExtConfig { +const char *name; +const char *description; +target_ulong misa_bit; +bool enabled; +}RISCVCPUMisaExtConfig ; + +static void cpu_set_misa_ext_cfg (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +const RISCVCPUMisaExtConfig *misa_ext_cfg = opaque; +target_ulong misa_bit = misa_ext_cfg->misa_bit; +RISCVCPU *cpu =RISCV_CPU (obj); +CPURISCVState *env = &cpu->env; +bool value; + +if (!visit_type_bool (v, name, &value, errp)) { +return ; + } + +if (value) { + env->misa_ext |= misa_bit; + env->misa_ext_mask |= misa_bit; + }else { + env->misa_ext &= ~misa_bit; + env->misa_ext_mask &= ~misa_bit; + } +} + +static void cpu_get_misa_ext_cfg (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +const RISCVCPUMisaExtConfig *misa_ext_cfg = opaque; +target_ulong misa_bit = misa_ext_cfg->misa_bit; +RISCVCPU *cpu =RISCV_CPU (obj); +CPURISCVState *env = &cpu->env; +bool value; + + value = env->misa_ext & misa_bit; + +visit_type_bool (v, name, &value, errp); +} + +static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = {}; + +static void riscv_cpu_add_misa_properties (Object *cpu_obj) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (misa_ext_cfgs); i++) { +const RISCVCPUMisaExtConfig *misa_cfg = &misa_ext_cfgs[i]; + +object_property_add (cpu_obj, misa_cfg->name,"bool" , + cpu_get_misa_ext_cfg, + cpu_set_misa_ext_cfg, +NULL , (void *)misa_cfg); +object_property_set_description (cpu_obj, misa_cfg->name, + misa_cfg->description); +object_property_set_bool (cpu_obj, misa_cfg->name, + misa_cfg->enabled,NULL ); + } +} +static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("i" ,RISCVCPU , cfg.ext_i, true),@@ -1530,6 +1593,8 @@ static void register_cpu_props(Object *obj)return ; } +riscv_cpu_add_misa_properties (obj); +for (prop = riscv_cpu_extensions; prop && prop->name; prop++) {qdev_property_add_static (dev, prop); } --2.39.2
PATCH v3 5/20 target/riscv: remove cpu->cfg.ext_a
In reply to Daniel Henrique BarbozaCreate 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.
--- target/riscv/cpu.c | 16 ++++++++-------- target/riscv/cpu.h | 1 - 2 files changed, 8 insertions(+), 9 deletions(-)
target/riscv/cpu.c +8 -8
@@ -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 ;
target/riscv/cpu.h +0 -1
@@ -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;
Signature · 1 line
2.39.2
Re: [PATCH v3 05/20] target/riscv: remove cpu->cfg.ext_a
Quoted 9 lines · Daniel Henrique Barboza
Create a new "a" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVA. Instances of
cpu->cfg.ext_aand similar are replaced withriscv_has_ext(env, RVA).Remove the old "a" property and '
ext_a' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 87 lines
--- target/riscv/cpu.c | 16 ++++++++-------- target/riscv/cpu.h | 1 - 2 files changed, 8 insertions(+), 9 deletions(-)target/riscv/cpu.c +8
-8@@ -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 ;target/riscv/cpu.h +0
-2@@ -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
PATCH v3 6/20 target/riscv: remove cpu->cfg.ext_c
In reply to Daniel Henrique BarbozaCreate a new "c" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVC. Instances of cpu->cfg.ext_c and similar are replaced with riscv_has_ext(env, RVC).
Remove the old "c" property and 'ext_c' from RISCVCPUConfig.
--- target/riscv/cpu.c | 7 +++---- target/riscv/cpu.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-)
target/riscv/cpu.c +3 -4
@@ -400,7 +400,6 @@ static void rv64_thead_c906_cpu_init(Object *obj)set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.ext_g = true; - cpu->cfg.ext_c = true; cpu->cfg.ext_u = true; cpu->cfg.ext_s = true; cpu->cfg.ext_icsr = true;
@@ -1108,7 +1107,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_cpu_cfg (env)->ext_d) { ext |=RVD ; } -if (riscv_cpu_cfg (env)->ext_c) { +if (riscv_has_ext (env,RVC )) { ext |=RVC ; }if (riscv_cpu_cfg (env)->ext_s) {
@@ -1438,6 +1437,8 @@ static void cpu_get_misa_ext_cfg(Object *obj, Visitor *v, const char *name,static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { {.name ="a" , .description ="Atomic instructions" , .misa_bit =RVA , .enabled = true}, + {.name ="c" , .description ="Compressed instructions" , + .misa_bit =RVC , .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1466,7 +1467,6 @@ static Property riscv_cpu_extensions[] = {DEFINE_PROP_BOOL ("m" ,RISCVCPU , cfg.ext_m, 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),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true), DEFINE_PROP_BOOL("v", RISCVCPU, cfg.ext_v, false),
@@ -1580,7 +1580,6 @@ static void register_cpu_props(Object *obj) cpu->cfg.ext_f = misa_ext &RVF ; cpu->cfg.ext_d = misa_ext &RVD ; cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_c = misa_ext &RVC ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ; cpu->cfg.ext_h = misa_ext &RVH ;
target/riscv/cpu.h +0 -1
@@ -424,7 +424,6 @@ struct RISCVCPUConfig {bool ext_m;bool ext_f;bool ext_d; -bool ext_c;bool ext_s;bool ext_u;bool ext_h;
Signature · 1 line
2.39.2
Re: [PATCH v3 06/20] target/riscv: remove cpu->cfg.ext_c
Quoted 9 lines · Daniel Henrique Barboza
Create a new "c" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVC. Instances of
cpu->cfg.ext_cand similar are replaced withriscv_has_ext(env, RVC).Remove the old "c" property and '
ext_c' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 67 lines
--- target/riscv/cpu.c | 7 +++---- target/riscv/cpu.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-)target/riscv/cpu.c +3
-4@@ -400,7 +400,6 @@ static void rv64_thead_c906_cpu_init(Object *obj)set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.ext_g = true; - cpu->cfg.ext_c = true; cpu->cfg.ext_u = true; cpu->cfg.ext_s = true; cpu->cfg.ext_icsr = true;@@ -1108,7 +1107,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_cpu_cfg (env)->ext_d) { ext |=RVD ; } -if (riscv_cpu_cfg (env)->ext_c) { +if (riscv_has_ext (env,RVC )) { ext |=RVC ; }if (riscv_cpu_cfg (env)->ext_s) {@@ -1438,6 +1437,8 @@ static void cpu_get_misa_ext_cfg(Object *obj, Visitor *v, const char *name,static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { {.name ="a" , .description ="Atomic instructions" , .misa_bit =RVA , .enabled = true}, + {.name ="c" , .description ="Compressed instructions" , + .misa_bit =RVC , .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1466,7 +1467,6 @@ static Property riscv_cpu_extensions[] = {DEFINE_PROP_BOOL ("m" ,RISCVCPU , cfg.ext_m, 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),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true), DEFINE_PROP_BOOL("v", RISCVCPU, cfg.ext_v, false),@@ -1580,7 +1580,6 @@ static void register_cpu_props(Object *obj) cpu->cfg.ext_f = misa_ext &RVF ; cpu->cfg.ext_d = misa_ext &RVD ; cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_c = misa_ext &RVC ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ; cpu->cfg.ext_h = misa_ext &RVH ;target/riscv/cpu.h +0
-2@@ -424,7 +424,6 @@ struct RISCVCPUConfig {bool ext_m;bool ext_f;bool ext_d; -bool ext_c;bool ext_s;bool ext_u;bool ext_h; --2.39.2
PATCH v3 7/20 target/riscv: remove cpu->cfg.ext_d
In reply to Daniel Henrique BarbozaCreate a new "d" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVD. Instances of cpu->cfg.ext_d and similar are replaced with riscv_has_ext(env, RVD).
Remove the old "d" property and 'ext_d' from RISCVCPUConfig.
--- target/riscv/cpu.c | 13 ++++++------- target/riscv/cpu.h | 1 - 2 files changed, 6 insertions(+), 8 deletions(-)
target/riscv/cpu.c +6 -7
@@ -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 &&riscv_has_ext (env,RVA ) && - cpu->cfg.ext_f && cpu->cfg.ext_d && + cpu->cfg.ext_f &&riscv_has_ext (env,RVD ) && 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_f = true; - cpu->cfg.ext_d = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;
@@ -874,7 +873,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_d && !cpu->cfg.ext_f) { +if (riscv_has_ext (env,RVD ) && !cpu->cfg.ext_f) {error_setg (errp,"D extension requires F extension" );return ; }
@@ -894,7 +893,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zve32f = true; } -if (cpu->cfg.ext_zve64d && !cpu->cfg.ext_d) { +if (cpu->cfg.ext_zve64d && !riscv_has_ext (env,RVD )) {error_setg (errp,"Zve64d/V extensions require D extension" );return ; }
@@ -1104,7 +1103,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_cpu_cfg (env)->ext_f) { ext |=RVF ; } -if (riscv_cpu_cfg (env)->ext_d) { +if (riscv_has_ext (env,RVD )) { ext |=RVD ; }if (riscv_has_ext (env,RVC )) {
@@ -1439,6 +1438,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVA, .enabled = true}, {.name = "c", .description = "Compressed instructions", .misa_bit = RVC, .enabled = true}, + {.name = "d", .description = "Double-precision float point", + .misa_bit = RVD, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1466,7 +1467,6 @@ static Property riscv_cpu_extensions[] = {DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false),DEFINE_PROP_BOOL ("m" ,RISCVCPU , cfg.ext_m, true),DEFINE_PROP_BOOL ("f" ,RISCVCPU , cfg.ext_f, true), -DEFINE_PROP_BOOL ("d" ,RISCVCPU , cfg.ext_d, true),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true), DEFINE_PROP_BOOL("v", RISCVCPU, cfg.ext_v, false),
@@ -1578,7 +1578,6 @@ static void register_cpu_props(Object *obj) cpu->cfg.ext_e = misa_ext &RVE ; cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_f = misa_ext &RVF ; - cpu->cfg.ext_d = misa_ext &RVD ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ;
target/riscv/cpu.h +0 -1
@@ -423,7 +423,6 @@ struct RISCVCPUConfig {bool ext_g;bool ext_m;bool ext_f; -bool ext_d;bool ext_s;bool ext_u;bool ext_h;
Signature · 1 line
2.39.2
Re: [PATCH v3 07/20] target/riscv: remove cpu->cfg.ext_d
Quoted 9 lines · Daniel Henrique Barboza
Create a new "d" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVD. Instances of
cpu->cfg.ext_dand similar are replaced withriscv_has_ext(env, RVD).Remove the old "d" property and '
ext_d' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 92 lines
--- target/riscv/cpu.c | 13 ++++++------- target/riscv/cpu.h | 1 - 2 files changed, 6 insertions(+), 8 deletions(-)target/riscv/cpu.c +6
-7@@ -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 &&riscv_has_ext (env,RVA ) && - cpu->cfg.ext_f && cpu->cfg.ext_d && + cpu->cfg.ext_f &&riscv_has_ext (env,RVD ) && 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_f = true; - cpu->cfg.ext_d = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;@@ -874,7 +873,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_d && !cpu->cfg.ext_f) { +if (riscv_has_ext (env,RVD ) && !cpu->cfg.ext_f) {error_setg (errp,"D extension requires F extension" );return ; }@@ -894,7 +893,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zve32f = true; } -if (cpu->cfg.ext_zve64d && !cpu->cfg.ext_d) { +if (cpu->cfg.ext_zve64d && !riscv_has_ext (env,RVD )) {error_setg (errp,"Zve64d/V extensions require D extension" );return ; }@@ -1104,7 +1103,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_cpu_cfg (env)->ext_f) { ext |=RVF ; } -if (riscv_cpu_cfg (env)->ext_d) { +if (riscv_has_ext (env,RVD )) { ext |=RVD ; }if (riscv_has_ext (env,RVC )) {@@ -1439,6 +1438,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVA, .enabled = true}, {.name = "c", .description = "Compressed instructions", .misa_bit = RVC, .enabled = true}, + {.name = "d", .description = "Double-precision float point", + .misa_bit = RVD, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1466,7 +1467,6 @@ static Property riscv_cpu_extensions[] = {DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false),DEFINE_PROP_BOOL ("m" ,RISCVCPU , cfg.ext_m, true),DEFINE_PROP_BOOL ("f" ,RISCVCPU , cfg.ext_f, true), -DEFINE_PROP_BOOL ("d" ,RISCVCPU , cfg.ext_d, true),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true), DEFINE_PROP_BOOL("v", RISCVCPU, cfg.ext_v, false),@@ -1578,7 +1578,6 @@ static void register_cpu_props(Object *obj) cpu->cfg.ext_e = misa_ext &RVE ; cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_f = misa_ext &RVF ; - cpu->cfg.ext_d = misa_ext &RVD ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ;target/riscv/cpu.h +0
-2@@ -423,7 +423,6 @@ struct RISCVCPUConfig {bool ext_g;bool ext_m;bool ext_f; -bool ext_d;bool ext_s;bool ext_u;bool ext_h; --2.39.2
PATCH v3 8/20 target/riscv: remove cpu->cfg.ext_f
In reply to Daniel Henrique BarbozaCreate a new "f" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVF. Instances of cpu->cfg.ext_f and similar are replaced with riscv_has_ext(env, RVF).
Remove the old "f" property and 'ext_f' from RISCVCPUConfig.
--- target/riscv/cpu.c | 20 ++++++++++---------- target/riscv/cpu.h | 1 - 2 files changed, 10 insertions(+), 11 deletions(-)
target/riscv/cpu.c +10 -10
@@ -812,12 +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 &&riscv_has_ext (env,RVA ) && - cpu->cfg.ext_f &&riscv_has_ext (env,RVD ) && +riscv_has_ext (env,RVF ) && +riscv_has_ext (env,RVD ) && 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_f = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;
@@ -854,7 +854,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_f && !cpu->cfg.ext_icsr) { +if (riscv_has_ext (env,RVF ) && !cpu->cfg.ext_icsr) {error_setg (errp,"F extension requires Zicsr" );return ; }
@@ -868,12 +868,12 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zfhmin = true; } -if (cpu->cfg.ext_zfhmin && !cpu->cfg.ext_f) { +if (cpu->cfg.ext_zfhmin && !riscv_has_ext (env,RVF )) {error_setg (errp,"Zfh/Zfhmin extensions require F extension" );return ; } -if (riscv_has_ext (env,RVD ) && !cpu->cfg.ext_f) { +if (riscv_has_ext (env,RVD ) && !riscv_has_ext (env,RVF )) {error_setg (errp,"D extension requires F extension" );return ; }
@@ -898,7 +898,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_zve32f && !cpu->cfg.ext_f) { +if (cpu->cfg.ext_zve32f && !riscv_has_ext (env,RVF )) {error_setg (errp,"Zve32f/Zve64f extensions require F extension" );return ; }
@@ -931,7 +931,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_setg (errp,"Zfinx extension requires Zicsr" );return ; } -if (cpu->cfg.ext_f) { +if (riscv_has_ext (env,RVF )) {error_setg (errp,"Zfinx cannot be supported together with F extension" );return ;
@@ -1100,7 +1100,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVA )) { ext |=RVA ; } -if (riscv_cpu_cfg (env)->ext_f) { +if (riscv_has_ext (env,RVF )) { ext |=RVF ; }if (riscv_has_ext (env,RVD )) {
@@ -1440,6 +1440,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVC, .enabled = true}, {.name = "d", .description = "Double-precision float point", .misa_bit = RVD, .enabled = true}, + {.name = "f", .description = "Single-precision float point", + .misa_bit = RVF, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1466,7 +1468,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 ("f" ,RISCVCPU , cfg.ext_f, true),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true), DEFINE_PROP_BOOL("v", RISCVCPU, cfg.ext_v, false),
@@ -1577,7 +1578,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_f = misa_ext &RVF ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ;
target/riscv/cpu.h +0 -1
@@ -422,7 +422,6 @@ struct RISCVCPUConfig {bool ext_e;bool ext_g;bool ext_m; -bool ext_f;bool ext_s;bool ext_u;bool ext_h;
Signature · 1 line
2.39.2
Re: [PATCH v3 08/20] target/riscv: remove cpu->cfg.ext_f
Quoted 9 lines · Daniel Henrique Barboza
Create a new "f" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVF. Instances of
cpu->cfg.ext_fand similar are replaced withriscv_has_ext(env, RVF).Remove the old "f" property and '
ext_f' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 116 lines
--- target/riscv/cpu.c | 20 ++++++++++---------- target/riscv/cpu.h | 1 - 2 files changed, 10 insertions(+), 11 deletions(-)target/riscv/cpu.c +10
-10@@ -812,12 +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 &&riscv_has_ext (env,RVA ) && - cpu->cfg.ext_f &&riscv_has_ext (env,RVD ) && +riscv_has_ext (env,RVF ) && +riscv_has_ext (env,RVD ) && 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_f = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;@@ -854,7 +854,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_f && !cpu->cfg.ext_icsr) { +if (riscv_has_ext (env,RVF ) && !cpu->cfg.ext_icsr) {error_setg (errp,"F extension requires Zicsr" );return ; }@@ -868,12 +868,12 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zfhmin = true; } -if (cpu->cfg.ext_zfhmin && !cpu->cfg.ext_f) { +if (cpu->cfg.ext_zfhmin && !riscv_has_ext (env,RVF )) {error_setg (errp,"Zfh/Zfhmin extensions require F extension" );return ; } -if (riscv_has_ext (env,RVD ) && !cpu->cfg.ext_f) { +if (riscv_has_ext (env,RVD ) && !riscv_has_ext (env,RVF )) {error_setg (errp,"D extension requires F extension" );return ; }@@ -898,7 +898,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_zve32f && !cpu->cfg.ext_f) { +if (cpu->cfg.ext_zve32f && !riscv_has_ext (env,RVF )) {error_setg (errp,"Zve32f/Zve64f extensions require F extension" );return ; }@@ -931,7 +931,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_setg (errp,"Zfinx extension requires Zicsr" );return ; } -if (cpu->cfg.ext_f) { +if (riscv_has_ext (env,RVF )) {error_setg (errp,"Zfinx cannot be supported together with F extension" );return ;@@ -1100,7 +1100,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVA )) { ext |=RVA ; } -if (riscv_cpu_cfg (env)->ext_f) { +if (riscv_has_ext (env,RVF )) { ext |=RVF ; }if (riscv_has_ext (env,RVD )) {@@ -1440,6 +1440,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVC, .enabled = true}, {.name = "d", .description = "Double-precision float point", .misa_bit = RVD, .enabled = true}, + {.name = "f", .description = "Single-precision float point", + .misa_bit = RVF, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1466,7 +1468,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 ("f" ,RISCVCPU , cfg.ext_f, true),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true), DEFINE_PROP_BOOL("v", RISCVCPU, cfg.ext_v, false),@@ -1577,7 +1578,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_f = misa_ext &RVF ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ;target/riscv/cpu.h +0
-2@@ -422,7 +422,6 @@ struct RISCVCPUConfig {bool ext_e;bool ext_g;bool ext_m; -bool ext_f;bool ext_s;bool ext_u;bool ext_h; --2.39.2
PATCH v3 9/20 target/riscv: remove cpu->cfg.ext_i
In reply to Daniel Henrique BarbozaCreate a new "i" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVI. Instances of cpu->cfg.ext_i and similar are replaced with riscv_has_ext(env, RVI).
Remove the old "i" property and 'ext_i' from RISCVCPUConfig.
--- target/riscv/cpu.c | 15 +++++++-------- target/riscv/cpu.h | 1 - 2 files changed, 7 insertions(+), 9 deletions(-)
target/riscv/cpu.c +7 -8
@@ -810,13 +810,12 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)CPURISCVState *env = &cpu->env;/* Do some ISA extension error checking */ -if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m && +if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && cpu->cfg.ext_m &&riscv_has_ext (env,RVA ) &&riscv_has_ext (env,RVF ) &&riscv_has_ext (env,RVD ) && 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_icsr = true; cpu->cfg.ext_ifencei = true;
@@ -825,13 +824,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) env->misa_ext_mask = env->misa_ext; } -if (cpu->cfg.ext_i && cpu->cfg.ext_e) { +if (riscv_has_ext (env,RVI ) && cpu->cfg.ext_e) {error_setg (errp,"I and E extensions are incompatible" );return ; } -if (!cpu->cfg.ext_i && !cpu->cfg.ext_e) { +if (!riscv_has_ext (env,RVI ) && !cpu->cfg.ext_e) {error_setg (errp,"Either I or E extension must be set" );return ;
@@ -843,7 +842,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_h && !cpu->cfg.ext_i) { +if (cpu->cfg.ext_h && !riscv_has_ext (env,RVI )) {error_setg (errp,"H depends on an I base integer ISA with 32 x registers" );return ;
@@ -1088,7 +1087,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env) {uint32_t ext =0 ; -if (riscv_cpu_cfg (env)->ext_i) { +if (riscv_has_ext (env,RVI )) { ext |=RVI ; }if (riscv_cpu_cfg (env)->ext_e) {
@@ -1442,6 +1441,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVD, .enabled = true}, {.name = "f", .description = "Single-precision float point", .misa_bit = RVF, .enabled = true}, + {.name = "i", .description = "Base integer instruction set", + .misa_bit = RVI, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1464,7 +1465,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ -DEFINE_PROP_BOOL ("i" ,RISCVCPU , cfg.ext_i, true),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),
@@ -1575,7 +1575,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_i = misa_ext &RVI ; cpu->cfg.ext_e = misa_ext &RVE ; cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_v = misa_ext &RVV ;
target/riscv/cpu.h +0 -1
@@ -418,7 +418,6 @@ typedef struct { } RISCVSATPMap;struct RISCVCPUConfig { -bool ext_i;bool ext_e;bool ext_g;bool ext_m;
Signature · 1 line
2.39.2
Re: [PATCH v3 09/20] target/riscv: remove cpu->cfg.ext_i
Quoted 9 lines · Daniel Henrique Barboza
Create a new "i" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVI. Instances of
cpu->cfg.ext_iand similar are replaced withriscv_has_ext(env, RVI).Remove the old "i" property and '
ext_i' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 99 lines
--- target/riscv/cpu.c | 15 +++++++-------- target/riscv/cpu.h | 1 - 2 files changed, 7 insertions(+), 9 deletions(-)target/riscv/cpu.c +7
-8@@ -810,13 +810,12 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)CPURISCVState *env = &cpu->env;/* Do some ISA extension error checking */ -if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m && +if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && cpu->cfg.ext_m &&riscv_has_ext (env,RVA ) &&riscv_has_ext (env,RVF ) &&riscv_has_ext (env,RVD ) && 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_icsr = true; cpu->cfg.ext_ifencei = true;@@ -825,13 +824,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) env->misa_ext_mask = env->misa_ext; } -if (cpu->cfg.ext_i && cpu->cfg.ext_e) { +if (riscv_has_ext (env,RVI ) && cpu->cfg.ext_e) {error_setg (errp,"I and E extensions are incompatible" );return ; } -if (!cpu->cfg.ext_i && !cpu->cfg.ext_e) { +if (!riscv_has_ext (env,RVI ) && !cpu->cfg.ext_e) {error_setg (errp,"Either I or E extension must be set" );return ;@@ -843,7 +842,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_h && !cpu->cfg.ext_i) { +if (cpu->cfg.ext_h && !riscv_has_ext (env,RVI )) {error_setg (errp,"H depends on an I base integer ISA with 32 x registers" );return ;@@ -1088,7 +1087,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env) {uint32_t ext =0 ; -if (riscv_cpu_cfg (env)->ext_i) { +if (riscv_has_ext (env,RVI )) { ext |=RVI ; }if (riscv_cpu_cfg (env)->ext_e) {@@ -1442,6 +1441,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVD, .enabled = true}, {.name = "f", .description = "Single-precision float point", .misa_bit = RVF, .enabled = true}, + {.name = "i", .description = "Base integer instruction set", + .misa_bit = RVI, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1464,7 +1465,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ -DEFINE_PROP_BOOL ("i" ,RISCVCPU , cfg.ext_i, true),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),@@ -1575,7 +1575,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_i = misa_ext &RVI ; cpu->cfg.ext_e = misa_ext &RVE ; cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_v = misa_ext &RVV ;target/riscv/cpu.h +0
-2@@ -418,7 +418,6 @@ typedef struct { } RISCVSATPMap;struct RISCVCPUConfig { -bool ext_i;bool ext_e;bool ext_g;bool ext_m; --2.39.2
PATCH v3 10/20 target/riscv: remove cpu->cfg.ext_e
In reply to Daniel Henrique BarbozaCreate a new "e" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVE. Instances of cpu->cfg.ext_e and similar are replaced with riscv_has_ext(env, RVE).
Remove the old "e" property and 'ext_e' from RISCVCPUConfig.
--- target/riscv/cpu.c | 10 +++++----- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-)
target/riscv/cpu.c +5 -5
@@ -824,13 +824,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) env->misa_ext_mask = env->misa_ext; } -if (riscv_has_ext (env,RVI ) && cpu->cfg.ext_e) { +if (riscv_has_ext (env,RVI ) &&riscv_has_ext (env,RVE )) {error_setg (errp,"I and E extensions are incompatible" );return ; } -if (!riscv_has_ext (env,RVI ) && !cpu->cfg.ext_e) { +if (!riscv_has_ext (env,RVI ) && !riscv_has_ext (env,RVE )) {error_setg (errp,"Either I or E extension must be set" );return ;
@@ -1090,7 +1090,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVI )) { ext |=RVI ; } -if (riscv_cpu_cfg (env)->ext_e) { +if (riscv_has_ext (env,RVE )) { ext |=RVE ; }if (riscv_cpu_cfg (env)->ext_m) {
@@ -1443,6 +1443,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVF, .enabled = true}, {.name = "i", .description = "Base integer instruction set", .misa_bit = RVI, .enabled = true}, + {.name = "e", .description = "Base integer instruction set (embedded)", + .misa_bit = RVE, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1465,7 +1467,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard 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 ("s" ,RISCVCPU , cfg.ext_s, true),
@@ -1575,7 +1576,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_e = misa_ext &RVE ; cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ;
target/riscv/cpu.h +0 -1
@@ -418,7 +418,6 @@ typedef struct { } RISCVSATPMap;struct RISCVCPUConfig { -bool ext_e;bool ext_g;bool ext_m;bool ext_s;
Signature · 1 line
2.39.2
Re: [PATCH v3 10/20] target/riscv: remove cpu->cfg.ext_e
Quoted 9 lines · Daniel Henrique Barboza
Create a new "e" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVE. Instances of
cpu->cfg.ext_eand similar are replaced withriscv_has_ext(env, RVE).Remove the old "e" property and '
ext_e' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 75 lines
--- target/riscv/cpu.c | 10 +++++----- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-)target/riscv/cpu.c +5
-5@@ -824,13 +824,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) env->misa_ext_mask = env->misa_ext; } -if (riscv_has_ext (env,RVI ) && cpu->cfg.ext_e) { +if (riscv_has_ext (env,RVI ) &&riscv_has_ext (env,RVE )) {error_setg (errp,"I and E extensions are incompatible" );return ; } -if (!riscv_has_ext (env,RVI ) && !cpu->cfg.ext_e) { +if (!riscv_has_ext (env,RVI ) && !riscv_has_ext (env,RVE )) {error_setg (errp,"Either I or E extension must be set" );return ;@@ -1090,7 +1090,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVI )) { ext |=RVI ; } -if (riscv_cpu_cfg (env)->ext_e) { +if (riscv_has_ext (env,RVE )) { ext |=RVE ; }if (riscv_cpu_cfg (env)->ext_m) {@@ -1443,6 +1443,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVF, .enabled = true}, {.name = "i", .description = "Base integer instruction set", .misa_bit = RVI, .enabled = true}, + {.name = "e", .description = "Base integer instruction set (embedded)", + .misa_bit = RVE, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1465,7 +1467,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard 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 ("s" ,RISCVCPU , cfg.ext_s, true),@@ -1575,7 +1576,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_e = misa_ext &RVE ; cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ;target/riscv/cpu.h +0
-2@@ -418,7 +418,6 @@ typedef struct { } RISCVSATPMap;struct RISCVCPUConfig { -bool ext_e;bool ext_g;bool ext_m;bool ext_s; --2.39.2
PATCH v3 11/20 target/riscv: remove cpu->cfg.ext_m
In reply to Daniel Henrique BarbozaCreate a new "m" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVM. Instances of cpu->cfg.ext_m and similar are replaced with riscv_has_ext(env, RVM).
Remove the old "m" property and 'ext_m' from RISCVCPUConfig.
--- target/riscv/cpu.c | 10 +++++----- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-)
target/riscv/cpu.c +5 -5
@@ -810,13 +810,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)CPURISCVState *env = &cpu->env;/* Do some ISA extension error checking */ -if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && cpu->cfg.ext_m && +if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && +riscv_has_ext (env,RVM ) &&riscv_has_ext (env,RVA ) &&riscv_has_ext (env,RVF ) &&riscv_has_ext (env,RVD ) && cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) {warn_report ("Setting G will also set IMAFD_Zicsr_Zifencei" ); - cpu->cfg.ext_m = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;
@@ -1093,7 +1093,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVE )) { ext |=RVE ; } -if (riscv_cpu_cfg (env)->ext_m) { +if (riscv_has_ext (env,RVM )) { ext |=RVM ; }if (riscv_has_ext (env,RVA )) {
@@ -1445,6 +1445,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVI, .enabled = true}, {.name = "e", .description = "Base integer instruction set (embedded)", .misa_bit = RVE, .enabled = false}, + {.name = "m", .description = "Integer multiplication and division", + .misa_bit = RVM, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1468,7 +1470,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("m" ,RISCVCPU , cfg.ext_m, true),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),
@@ -1576,7 +1577,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ;
target/riscv/cpu.h +0 -1
@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_m;bool ext_s;bool ext_u;bool ext_h;
Signature · 1 line
2.39.2
Re: [PATCH v3 11/20] target/riscv: remove cpu->cfg.ext_m
Quoted 9 lines · Daniel Henrique Barboza
Create a new "m" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVM. Instances of
cpu->cfg.ext_mand similar are replaced withriscv_has_ext(env, RVM).Remove the old "m" property and '
ext_m' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 75 lines
--- target/riscv/cpu.c | 10 +++++----- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-)target/riscv/cpu.c +5
-5@@ -810,13 +810,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)CPURISCVState *env = &cpu->env;/* Do some ISA extension error checking */ -if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && cpu->cfg.ext_m && +if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && +riscv_has_ext (env,RVM ) &&riscv_has_ext (env,RVA ) &&riscv_has_ext (env,RVF ) &&riscv_has_ext (env,RVD ) && cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) {warn_report ("Setting G will also set IMAFD_Zicsr_Zifencei" ); - cpu->cfg.ext_m = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;@@ -1093,7 +1093,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVE )) { ext |=RVE ; } -if (riscv_cpu_cfg (env)->ext_m) { +if (riscv_has_ext (env,RVM )) { ext |=RVM ; }if (riscv_has_ext (env,RVA )) {@@ -1445,6 +1445,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVI, .enabled = true}, {.name = "e", .description = "Base integer instruction set (embedded)", .misa_bit = RVE, .enabled = false}, + {.name = "m", .description = "Integer multiplication and division", + .misa_bit = RVM, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1468,7 +1470,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("m" ,RISCVCPU , cfg.ext_m, true),DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),@@ -1576,7 +1577,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_m = misa_ext &RVM ; cpu->cfg.ext_v = misa_ext &RVV ; cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ;target/riscv/cpu.h +0
-2@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_m;bool ext_s;bool ext_u;bool ext_h; --2.39.2
PATCH v3 12/20 target/riscv: remove cpu->cfg.ext_s
In reply to Daniel Henrique BarbozaCreate a new "s" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVS. Instances of cpu->cfg.ext_s and similar are replaced with riscv_has_ext(env, RVS).
Remove the old "s" property and 'ext_s' from RISCVCPUConfig.
--- target/riscv/cpu.c | 11 +++++------ target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 7 deletions(-)
target/riscv/cpu.c +5 -6
@@ -401,7 +401,6 @@ static void rv64_thead_c906_cpu_init(Object *obj) cpu->cfg.ext_g = true; cpu->cfg.ext_u = true; - cpu->cfg.ext_s = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true;
@@ -836,7 +835,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_s && !cpu->cfg.ext_u) { +if (riscv_has_ext (env,RVS ) && !cpu->cfg.ext_u) {error_setg (errp,"Setting S extension without U extension is illegal" );return ;
@@ -848,7 +847,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_h && !cpu->cfg.ext_s) { +if (cpu->cfg.ext_h && !riscv_has_ext (env,RVS )) {error_setg (errp,"H extension implicitly requires S-mode" );return ; }
@@ -1108,7 +1107,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVC )) { ext |=RVC ; } -if (riscv_cpu_cfg (env)->ext_s) { +if (riscv_has_ext (env,RVS )) { ext |=RVS ; }if (riscv_cpu_cfg (env)->ext_u) {
@@ -1447,6 +1446,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVE, .enabled = false}, {.name = "m", .description = "Integer multiplication and division", .misa_bit = RVM, .enabled = true}, + {.name = "s", .description = "Supervisor-level instructions", + .misa_bit = RVS, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1470,7 +1471,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_BOOL ("h" ,RISCVCPU , cfg.ext_h, true),
@@ -1578,7 +1578,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ; cpu->cfg.ext_h = misa_ext &RVH ; cpu->cfg.ext_j = misa_ext &RVJ ;
target/riscv/cpu.h +0 -1
@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_s;bool ext_u;bool ext_h;bool ext_j;
Signature · 1 line
2.39.2
Re: [PATCH v3 12/20] target/riscv: remove cpu->cfg.ext_s
Quoted 9 lines · Daniel Henrique Barboza
Create a new "s" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVS. Instances of
cpu->cfg.ext_sand similar are replaced withriscv_has_ext(env, RVS).Remove the old "s" property and '
ext_s' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 85 lines
--- target/riscv/cpu.c | 11 +++++------ target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 7 deletions(-)target/riscv/cpu.c +5
-6@@ -401,7 +401,6 @@ static void rv64_thead_c906_cpu_init(Object *obj) cpu->cfg.ext_g = true; cpu->cfg.ext_u = true; - cpu->cfg.ext_s = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true;@@ -836,7 +835,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_s && !cpu->cfg.ext_u) { +if (riscv_has_ext (env,RVS ) && !cpu->cfg.ext_u) {error_setg (errp,"Setting S extension without U extension is illegal" );return ;@@ -848,7 +847,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_h && !cpu->cfg.ext_s) { +if (cpu->cfg.ext_h && !riscv_has_ext (env,RVS )) {error_setg (errp,"H extension implicitly requires S-mode" );return ; }@@ -1108,7 +1107,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVC )) { ext |=RVC ; } -if (riscv_cpu_cfg (env)->ext_s) { +if (riscv_has_ext (env,RVS )) { ext |=RVS ; }if (riscv_cpu_cfg (env)->ext_u) {@@ -1447,6 +1446,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVE, .enabled = false}, {.name = "m", .description = "Integer multiplication and division", .misa_bit = RVM, .enabled = true}, + {.name = "s", .description = "Supervisor-level instructions", + .misa_bit = RVS, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1470,7 +1471,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_BOOL ("h" ,RISCVCPU , cfg.ext_h, true),@@ -1578,7 +1578,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_s = misa_ext &RVS ; cpu->cfg.ext_u = misa_ext &RVU ; cpu->cfg.ext_h = misa_ext &RVH ; cpu->cfg.ext_j = misa_ext &RVJ ;target/riscv/cpu.h +0
-2@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_s;bool ext_u;bool ext_h;bool ext_j; --2.39.2
PATCH v3 13/20 target/riscv: remove cpu->cfg.ext_u
In reply to Daniel Henrique BarbozaCreate a new "u" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVU. Instances of cpu->cfg.ext_u and similar are replaced with riscv_has_ext(env, RVU).
Remove the old "u" property and 'ext_u' from RISCVCPUConfig.
--- target/riscv/cpu.c | 9 ++++----- target/riscv/cpu.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-)
target/riscv/cpu.c +4 -5
@@ -400,7 +400,6 @@ static void rv64_thead_c906_cpu_init(Object *obj)set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.ext_g = true; - cpu->cfg.ext_u = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true;
@@ -835,7 +834,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (riscv_has_ext (env,RVS ) && !cpu->cfg.ext_u) { +if (riscv_has_ext (env,RVS ) && !riscv_has_ext (env,RVU )) {error_setg (errp,"Setting S extension without U extension is illegal" );return ;
@@ -1110,7 +1109,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVS )) { ext |=RVS ; } -if (riscv_cpu_cfg (env)->ext_u) { +if (riscv_has_ext (env,RVU )) { ext |=RVU ; }if (riscv_cpu_cfg (env)->ext_h) {
@@ -1448,6 +1447,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVM, .enabled = true}, {.name = "s", .description = "Supervisor-level instructions", .misa_bit = RVS, .enabled = true}, + {.name = "u", .description = "User-level instructions", + .misa_bit = RVU, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1471,7 +1472,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_BOOL ("h" ,RISCVCPU , cfg.ext_h, true),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),
@@ -1578,7 +1578,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_u = misa_ext &RVU ; cpu->cfg.ext_h = misa_ext &RVH ; cpu->cfg.ext_j = misa_ext &RVJ ;
target/riscv/cpu.h +0 -1
@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_u;bool ext_h;bool ext_j;bool ext_v;
Signature · 1 line
2.39.2
Re: [PATCH v3 13/20] target/riscv: remove cpu->cfg.ext_u
Quoted 9 lines · Daniel Henrique Barboza
Create a new "u" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVU. Instances of
cpu->cfg.ext_uand similar are replaced withriscv_has_ext(env, RVU).Remove the old "u" property and '
ext_u' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 76 lines
--- target/riscv/cpu.c | 9 ++++----- target/riscv/cpu.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-)target/riscv/cpu.c +4
-5@@ -400,7 +400,6 @@ static void rv64_thead_c906_cpu_init(Object *obj)set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.ext_g = true; - cpu->cfg.ext_u = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true;@@ -835,7 +834,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (riscv_has_ext (env,RVS ) && !cpu->cfg.ext_u) { +if (riscv_has_ext (env,RVS ) && !riscv_has_ext (env,RVU )) {error_setg (errp,"Setting S extension without U extension is illegal" );return ;@@ -1110,7 +1109,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVS )) { ext |=RVS ; } -if (riscv_cpu_cfg (env)->ext_u) { +if (riscv_has_ext (env,RVU )) { ext |=RVU ; }if (riscv_cpu_cfg (env)->ext_h) {@@ -1448,6 +1447,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVM, .enabled = true}, {.name = "s", .description = "Supervisor-level instructions", .misa_bit = RVS, .enabled = true}, + {.name = "u", .description = "User-level instructions", + .misa_bit = RVU, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1471,7 +1472,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_BOOL ("h" ,RISCVCPU , cfg.ext_h, true),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),@@ -1578,7 +1578,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_u = misa_ext &RVU ; cpu->cfg.ext_h = misa_ext &RVH ; cpu->cfg.ext_j = misa_ext &RVJ ;target/riscv/cpu.h +0
-2@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_u;bool ext_h;bool ext_j;bool ext_v; --2.39.2
PATCH v3 14/20 target/riscv: remove cpu->cfg.ext_h
In reply to Daniel Henrique BarbozaCreate a new "h" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVH. Instances of cpu->cfg.ext_h and similar are replaced with riscv_has_ext(env, RVH).
Remove the old "h" property and 'ext_h' from RISCVCPUConfig.
--- target/riscv/cpu.c | 10 +++++----- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-)
target/riscv/cpu.c +5 -5
@@ -840,13 +840,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_h && !riscv_has_ext (env,RVI )) { +if (riscv_has_ext (env,RVH ) && !riscv_has_ext (env,RVI )) {error_setg (errp,"H depends on an I base integer ISA with 32 x registers" );return ; } -if (cpu->cfg.ext_h && !riscv_has_ext (env,RVS )) { +if (riscv_has_ext (env,RVH ) && !riscv_has_ext (env,RVS )) {error_setg (errp,"H extension implicitly requires S-mode" );return ; }
@@ -1112,7 +1112,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVU )) { ext |=RVU ; } -if (riscv_cpu_cfg (env)->ext_h) { +if (riscv_has_ext (env,RVH )) { ext |=RVH ; }if (riscv_cpu_cfg (env)->ext_v) {
@@ -1449,6 +1449,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVS, .enabled = true}, {.name = "u", .description = "User-level instructions", .misa_bit = RVU, .enabled = true}, + {.name = "h", .description = "Hypervisor", + .misa_bit = RVH, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1473,7 +1475,6 @@ static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false), -DEFINE_PROP_BOOL ("h" ,RISCVCPU , cfg.ext_h, true),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false), DEFINE_PROP_BOOL("Zifencei", RISCVCPU, cfg.ext_ifencei, true),
@@ -1578,7 +1579,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_h = misa_ext &RVH ; cpu->cfg.ext_j = misa_ext &RVJ ;/*
target/riscv/cpu.h +0 -1
@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_h;bool ext_j;bool ext_v;bool ext_zba;
Signature · 1 line
2.39.2
Re: [PATCH v3 14/20] target/riscv: remove cpu->cfg.ext_h
Quoted 9 lines · Daniel Henrique Barboza
Create a new "h" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVH. Instances of
cpu->cfg.ext_hand similar are replaced withriscv_has_ext(env, RVH).Remove the old "h" property and '
ext_h' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 75 lines
--- target/riscv/cpu.c | 10 +++++----- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-)target/riscv/cpu.c +5
-5@@ -840,13 +840,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_h && !riscv_has_ext (env,RVI )) { +if (riscv_has_ext (env,RVH ) && !riscv_has_ext (env,RVI )) {error_setg (errp,"H depends on an I base integer ISA with 32 x registers" );return ; } -if (cpu->cfg.ext_h && !riscv_has_ext (env,RVS )) { +if (riscv_has_ext (env,RVH ) && !riscv_has_ext (env,RVS )) {error_setg (errp,"H extension implicitly requires S-mode" );return ; }@@ -1112,7 +1112,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVU )) { ext |=RVU ; } -if (riscv_cpu_cfg (env)->ext_h) { +if (riscv_has_ext (env,RVH )) { ext |=RVH ; }if (riscv_cpu_cfg (env)->ext_v) {@@ -1449,6 +1449,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVS, .enabled = true}, {.name = "u", .description = "User-level instructions", .misa_bit = RVU, .enabled = true}, + {.name = "h", .description = "Hypervisor", + .misa_bit = RVH, .enabled = true}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1473,7 +1475,6 @@ static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false), -DEFINE_PROP_BOOL ("h" ,RISCVCPU , cfg.ext_h, true),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false), DEFINE_PROP_BOOL("Zifencei", RISCVCPU, cfg.ext_ifencei, true),@@ -1578,7 +1579,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_h = misa_ext &RVH ; cpu->cfg.ext_j = misa_ext &RVJ ;/* target/riscv/cpu.h +0
-2@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_h;bool ext_j;bool ext_v;bool ext_zba; --2.39.2
PATCH v3 15/20 target/riscv: remove cpu->cfg.ext_j
In reply to Daniel Henrique BarbozaCreate a new "j" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVJ. Instances of cpu->cfg.ext_j and similar are replaced with riscv_has_ext(env, RVJ).
Remove the old "j" property and 'ext_j' from RISCVCPUConfig.
--- target/riscv/cpu.c | 6 +++--- target/riscv/cpu.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)
target/riscv/cpu.c +3 -3
@@ -1118,7 +1118,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_cpu_cfg (env)->ext_v) { ext |=RVV ; } -if (riscv_cpu_cfg (env)->ext_j) { +if (riscv_has_ext (env,RVJ )) { ext |=RVJ ; }
@@ -1451,6 +1451,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVU, .enabled = true}, {.name = "h", .description = "Hypervisor", .misa_bit = RVH, .enabled = true}, + {.name = "x-j", .description = "Dynamic translated languages", + .misa_bit = RVJ, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1547,7 +1549,6 @@ static Property riscv_cpu_extensions[] = {/* These are experimental so mark with 'x-' */ DEFINE_PROP_BOOL ("x-zicond" ,RISCVCPU , cfg.ext_zicond, false), -DEFINE_PROP_BOOL ("x-j" ,RISCVCPU , cfg.ext_j, false),/* ePMP 0.9.3 */ DEFINE_PROP_BOOL ("x-epmp" ,RISCVCPU , cfg.epmp, false), DEFINE_PROP_BOOL("x-smaia", RISCVCPU, cfg.ext_smaia, false),
@@ -1579,7 +1580,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_j = misa_ext &RVJ ;/* * We don't want to set the default riscv_cpu_extensions
target/riscv/cpu.h +0 -1
@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_j;bool ext_v;bool ext_zba;bool ext_zbb;
Signature · 1 line
2.39.2
Re: [PATCH v3 15/20] target/riscv: remove cpu->cfg.ext_j
Quoted 9 lines · Daniel Henrique Barboza
Create a new "j" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVJ. Instances of
cpu->cfg.ext_jand similar are replaced withriscv_has_ext(env, RVJ).Remove the old "j" property and '
ext_j' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 59 lines
--- target/riscv/cpu.c | 6 +++--- target/riscv/cpu.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)target/riscv/cpu.c +3
-3@@ -1118,7 +1118,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_cpu_cfg (env)->ext_v) { ext |=RVV ; } -if (riscv_cpu_cfg (env)->ext_j) { +if (riscv_has_ext (env,RVJ )) { ext |=RVJ ; }@@ -1451,6 +1451,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVU, .enabled = true}, {.name = "h", .description = "Hypervisor", .misa_bit = RVH, .enabled = true}, + {.name = "x-j", .description = "Dynamic translated languages", + .misa_bit = RVJ, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1547,7 +1549,6 @@ static Property riscv_cpu_extensions[] = {/* These are experimental so mark with 'x-' */ DEFINE_PROP_BOOL ("x-zicond" ,RISCVCPU , cfg.ext_zicond, false), -DEFINE_PROP_BOOL ("x-j" ,RISCVCPU , cfg.ext_j, false),/* ePMP 0.9.3 */ DEFINE_PROP_BOOL ("x-epmp" ,RISCVCPU , cfg.epmp, false), DEFINE_PROP_BOOL("x-smaia", RISCVCPU, cfg.ext_smaia, false),@@ -1579,7 +1580,6 @@ static void register_cpu_props(Object *obj)*/ if (cpu->env.misa_ext !=0 ) { cpu->cfg.ext_v = misa_ext &RVV ; - cpu->cfg.ext_j = misa_ext &RVJ ;/* * We don't want to set the default riscv_cpu_extensions target/riscv/cpu.h +0
-2@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_j;bool ext_v;bool ext_zba;bool ext_zbb; --2.39.2
PATCH v3 16/20 target/riscv: remove cpu->cfg.ext_v
In reply to Daniel Henrique BarbozaCreate a new "v" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVV. Instances of cpu->cfg.ext_v and similar are replaced with riscv_has_ext(env, RVV).
Remove the old "v" property and 'ext_v' from RISCVCPUConfig.
--- target/riscv/cpu.c | 12 +++++------- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 8 deletions(-)
target/riscv/cpu.c +5 -7
@@ -876,7 +876,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) }/* The V vector extension depends on the Zve64d extension */ -if (cpu->cfg.ext_v) { +if (riscv_has_ext (env,RVV )) { cpu->cfg.ext_zve64d = true; }
@@ -958,7 +958,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zksh = true; } -if (cpu->cfg.ext_v) { +if (riscv_has_ext (env,RVV )) {int vext_version =VEXT_VERSION_1_00_0 ;if (!is_power_of_2 (cpu->cfg.vlen)) { error_setg(errp,
@@ -1115,7 +1115,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVH )) { ext |=RVH ; } -if (riscv_cpu_cfg (env)->ext_v) { +if (riscv_has_ext (env,RVV )) { ext |=RVV ; }if (riscv_has_ext (env,RVJ )) {
@@ -1453,6 +1453,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVH, .enabled = true}, {.name = "x-j", .description = "Dynamic translated languages", .misa_bit = RVJ, .enabled = false}, + {.name = "v", .description = "Vector operations", + .misa_bit = RVV, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1476,7 +1478,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),
@@ -1569,7 +1570,6 @@ static Property riscv_cpu_extensions[] = {static void register_cpu_props (Object *obj) {RISCVCPU *cpu =RISCV_CPU (obj); -uint32_t misa_ext = cpu->env.misa_ext;Property *prop;DeviceState *dev =DEVICE (obj);
@@ -1579,8 +1579,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_v = misa_ext &RVV ; -/* * We don't want to set the default riscv_cpu_extensions * in this case.
target/riscv/cpu.h +0 -1
@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_v;bool ext_zba;bool ext_zbb;bool ext_zbc;
Signature · 1 line
2.39.2
Re: [PATCH v3 16/20] target/riscv: remove cpu->cfg.ext_v
Quoted 9 lines · Daniel Henrique Barboza
Create a new "v" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVV. Instances of
cpu->cfg.ext_vand similar are replaced withriscv_has_ext(env, RVV).Remove the old "v" property and '
ext_v' from RISCVCPUConfig.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 86 lines
--- target/riscv/cpu.c | 12 +++++------- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 8 deletions(-)target/riscv/cpu.c +5
-7@@ -876,7 +876,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) }/* The V vector extension depends on the Zve64d extension */ -if (cpu->cfg.ext_v) { +if (riscv_has_ext (env,RVV )) { cpu->cfg.ext_zve64d = true; }@@ -958,7 +958,7 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->cfg.ext_zksh = true; } -if (cpu->cfg.ext_v) { +if (riscv_has_ext (env,RVV )) {int vext_version =VEXT_VERSION_1_00_0 ;if (!is_power_of_2 (cpu->cfg.vlen)) { error_setg(errp,@@ -1115,7 +1115,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env)if (riscv_has_ext (env,RVH )) { ext |=RVH ; } -if (riscv_cpu_cfg (env)->ext_v) { +if (riscv_has_ext (env,RVV )) { ext |=RVV ; }if (riscv_has_ext (env,RVJ )) {@@ -1453,6 +1453,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVH, .enabled = true}, {.name = "x-j", .description = "Dynamic translated languages", .misa_bit = RVJ, .enabled = false}, + {.name = "v", .description = "Vector operations", + .misa_bit = RVV, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1476,7 +1478,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false), -DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),@@ -1569,7 +1570,6 @@ static Property riscv_cpu_extensions[] = {static void register_cpu_props (Object *obj) {RISCVCPU *cpu =RISCV_CPU (obj); -uint32_t misa_ext = cpu->env.misa_ext;Property *prop;DeviceState *dev =DEVICE (obj);@@ -1579,8 +1579,6 @@ static void register_cpu_props(Object *obj)* later on. */ if (cpu->env.misa_ext !=0 ) { - cpu->cfg.ext_v = misa_ext &RVV ; -/* * We don't want to set the default riscv_cpu_extensions * in this case. target/riscv/cpu.h +0
-2@@ -419,7 +419,6 @@ typedef struct {struct RISCVCPUConfig {bool ext_g; -bool ext_v;bool ext_zba;bool ext_zbb;bool ext_zbc; --2.39.2
PATCH v3 17/20 target/riscv: remove riscv_cpu_sync_misa_cfg()
In reply to Daniel Henrique BarbozaThis function was created to move the sync between cpu->cfg.ext_N bit changes to env->misa_ext* from the validation step to an ealier step, giving us a guarantee that we could use either cpu->cfg.ext_N or riscv_has_ext(env,N) in the validation.
We don't have any cpu->cfg.ext_N left that has an existing MISA bit (cfg.ext_g will be handled shortly). The function is now a no-op, simply copying the existing values of misa_ext* back to misa_ext*.
Remove it.
--- target/riscv/cpu.c | 52 ---------------------------------------------- 1 file changed, 52 deletions(-)
target/riscv/cpu.c +0 -52
@@ -1081,50 +1081,6 @@ static void riscv_cpu_finalize_features(RISCVCPU *cpu, Error **errp)#endif } -static void riscv_cpu_sync_misa_cfg (CPURISCVState *env) -{ -uint32_t ext =0 ; - -if (riscv_has_ext (env,RVI )) { - ext |=RVI ; - } -if (riscv_has_ext (env,RVE )) { - ext |=RVE ; - } -if (riscv_has_ext (env,RVM )) { - ext |=RVM ; - } -if (riscv_has_ext (env,RVA )) { - ext |=RVA ; - } -if (riscv_has_ext (env,RVF )) { - ext |=RVF ; - } -if (riscv_has_ext (env,RVD )) { - ext |=RVD ; - } -if (riscv_has_ext (env,RVC )) { - ext |=RVC ; - } -if (riscv_has_ext (env,RVS )) { - ext |=RVS ; - } -if (riscv_has_ext (env,RVU )) { - ext |=RVU ; - } -if (riscv_has_ext (env,RVH )) { - ext |=RVH ; - } -if (riscv_has_ext (env,RVV )) { - ext |=RVV ; - } -if (riscv_has_ext (env,RVJ )) { - ext |=RVJ ; - } - - env->misa_ext = env->misa_ext_mask = ext; -} -static void riscv_cpu_validate_misa_priv (CPURISCVState *env,Error **errp) {if (riscv_has_ext (env,RVH ) && env->priv_ver <PRIV_VERSION_1_12_0 ) {
@@ -1168,14 +1124,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_priv_version (env, priv_version); } -/* -* We can't be sure of whether we set defaults during cpu_init() -* or whether the user enabled/disabled some bits via cpu->cfg -* flags. Sync env->misa_ext with cpu->cfg now to allow us to -* use just env->misa_ext later. -*/ -riscv_cpu_sync_misa_cfg (env); -riscv_cpu_validate_misa_priv (env, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err);
Signature · 1 line
2.39.2
Re: [PATCH v3 17/20] target/riscv: remove riscv_cpu_sync_misa_cfg()
Quoted 6 lines · Daniel Henrique Barboza
This function was created to move the sync between
cpu->cfg.ext_Nbit changes to env->misa_ext* from the validation step to an ealier step, giving us a guarantee that we could use eithercpu->cfg.ext_Norriscv_has_ext(env,N)in the validation.
Quoted 8 lines
We don't have any
cpu->cfg.ext_Nleft that has an existing MISA bit (cfg.ext_g will be handled shortly). The function is now a no-op, simply copying the existing values of misa_ext* back to misa_ext*.Remove it.
Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 78 lines
--- target/riscv/cpu.c | 52 ---------------------------------------------- 1 file changed, 52 deletions(-)target/riscv/cpu.c +0
-53@@ -1081,50 +1081,6 @@ static void riscv_cpu_finalize_features(RISCVCPU *cpu, Error **errp)#endif } -static void riscv_cpu_sync_misa_cfg (CPURISCVState *env) -{ -uint32_t ext =0 ; - -if (riscv_has_ext (env,RVI )) { - ext |=RVI ; - } -if (riscv_has_ext (env,RVE )) { - ext |=RVE ; - } -if (riscv_has_ext (env,RVM )) { - ext |=RVM ; - } -if (riscv_has_ext (env,RVA )) { - ext |=RVA ; - } -if (riscv_has_ext (env,RVF )) { - ext |=RVF ; - } -if (riscv_has_ext (env,RVD )) { - ext |=RVD ; - } -if (riscv_has_ext (env,RVC )) { - ext |=RVC ; - } -if (riscv_has_ext (env,RVS )) { - ext |=RVS ; - } -if (riscv_has_ext (env,RVU )) { - ext |=RVU ; - } -if (riscv_has_ext (env,RVH )) { - ext |=RVH ; - } -if (riscv_has_ext (env,RVV )) { - ext |=RVV ; - } -if (riscv_has_ext (env,RVJ )) { - ext |=RVJ ; - } - - env->misa_ext = env->misa_ext_mask = ext; -} -static void riscv_cpu_validate_misa_priv (CPURISCVState *env,Error **errp) {if (riscv_has_ext (env,RVH ) && env->priv_ver <PRIV_VERSION_1_12_0 ) {@@ -1168,14 +1124,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_priv_version (env, priv_version); } -/* -* We can't be sure of whether we set defaults during cpu_init() -* or whether the user enabled/disabled some bits via cpu->cfg -* flags. Sync env->misa_ext with cpu->cfg now to allow us to -* use just env->misa_ext later. -*/ -riscv_cpu_sync_misa_cfg (env); -riscv_cpu_validate_misa_priv (env, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err); --2.39.2
PATCH v3 18/20 target/riscv: remove cfg.ext_g setup from rv64_thead_c906_cpu_init()
In reply to Daniel Henrique BarbozaThis CPU is enabling G via cfg.ext_g and, at the same time, setting IMAFD in set_misa() and cfg.ext_icsr.
riscv_cpu_validate_set_extensions() is already doing that, so there's no need for cpu_init() setups to worry about setting G and its extensions.
--- target/riscv/cpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
target/riscv/cpu.c +1 -2
@@ -396,11 +396,10 @@ static void rv64_thead_c906_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;RISCVCPU *cpu =RISCV_CPU (obj); -set_misa (env,MXL_RV64 ,RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); +set_misa (env,MXL_RV64 ,RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.ext_g = true; - cpu->cfg.ext_icsr = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true; cpu->cfg.ext_xtheadba = true;
Signature · 1 line
2.39.2
Re: [PATCH v3 18/20] target/riscv: remove cfg.ext_g setup from rv64_thead_c906_cpu_init()
Quoted 9 lines · Daniel Henrique Barboza
This CPU is enabling G via cfg.ext_g and, at the same time, setting IMAFD in
set_misa()and cfg.ext_icsr.
riscv_cpu_validate_set_extensions()is already doing that, so there's no need forcpu_init()setups to worry about setting G and its extensions.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 25 lines
--- target/riscv/cpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)target/riscv/cpu.c +1
-3@@ -396,11 +396,10 @@ static void rv64_thead_c906_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;RISCVCPU *cpu =RISCV_CPU (obj); -set_misa (env,MXL_RV64 ,RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); +set_misa (env,MXL_RV64 ,RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.ext_g = true; - cpu->cfg.ext_icsr = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true; cpu->cfg.ext_xtheadba = true; --2.39.2
PATCH v3 19/20 target/riscv: add RVG and remove cpu->cfg.ext_g
In reply to Daniel Henrique BarbozaWe're still have one RISCVCPUConfig MISA flag, 'ext_g'. We'll remove it the same way we did with the others: create a "g" RISCVCPUMisaExtConfig property, remove the old "g" property, remove all instances of 'cfg.ext_g' and use riscv_has_ext(env, RVG).
The caveat is that we don't have RVG, so add it. RVG will be used right off the bat in set_misa() of rv64_thead_c906_cpu_init() because the CPU is enabling G via the now removed 'ext_g' flag.
After this patch, there are no more MISA extensions represented by flags in RISCVCPUConfig.
--- target/riscv/cpu.c | 17 ++++++++--------- target/riscv/cpu.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-)
target/riscv/cpu.c +8 -9
@@ -396,10 +396,9 @@ static void rv64_thead_c906_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;RISCVCPU *cpu =RISCV_CPU (obj); -set_misa (env,MXL_RV64 ,RVC |RVS |RVU ); +set_misa (env,MXL_RV64 ,RVG |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_11_0 ); - cpu->cfg.ext_g = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true; cpu->cfg.ext_xtheadba = true;
@@ -807,12 +806,11 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)CPURISCVState *env = &cpu->env;/* Do some ISA extension error checking */ -if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && -riscv_has_ext (env,RVM ) && -riscv_has_ext (env,RVA ) && -riscv_has_ext (env,RVF ) && -riscv_has_ext (env,RVD ) && - cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) { +if (riscv_has_ext (env,RVG ) && + !(riscv_has_ext (env,RVI ) &&riscv_has_ext (env,RVM ) && +riscv_has_ext (env,RVA ) &&riscv_has_ext (env,RVF ) && +riscv_has_ext (env,RVD ) && + cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) {warn_report ("Setting G will also set IMAFD_Zicsr_Zifencei" ); cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;
@@ -1402,6 +1400,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVJ, .enabled = false}, {.name = "v", .description = "Vector operations", .misa_bit = RVV, .enabled = false}, + {.name = "g", .description = "General purpose (IMAFD_Zicsr_Zifencei)", + .misa_bit = RVG, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)
@@ -1424,7 +1424,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ -DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),
target/riscv/cpu.h +1 -1
@@ -81,6 +81,7 @@#define RVU RV('U')#define RVH RV('H')#define RVJ RV('J') +#define RVG RV('G')/* Privileged specification version */
@@ -418,7 +419,6 @@ typedef struct { } RISCVSATPMap;struct RISCVCPUConfig { -bool ext_g;bool ext_zba;bool ext_zbb;bool ext_zbc;
Signature · 1 line
2.39.2
Re: [PATCH v3 19/20] target/riscv: add RVG and remove cpu->cfg.ext_g
Quoted 10 lines · Daniel Henrique Barboza
We're still have one RISCVCPUConfig MISA flag, '
ext_g'. We'll remove it the same way we did with the others: create a "g" RISCVCPUMisaExtConfig property, remove the old "g" property, remove all instances of 'cfg.ext_g' and useriscv_has_ext(env, RVG).The caveat is that we don't have RVG, so add it. RVG will be used right off the bat in
set_misa()ofrv64_thead_c906_cpu_init()because the CPU is enabling G via the now removed 'ext_g' flag.
Quoted 5 lines
After this patch, there are no more MISA extensions represented by flags in RISCVCPUConfig.
Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 80 lines
--- target/riscv/cpu.c | 17 ++++++++--------- target/riscv/cpu.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-)target/riscv/cpu.c +8
-9@@ -396,10 +396,9 @@ static void rv64_thead_c906_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;RISCVCPU *cpu =RISCV_CPU (obj); -set_misa (env,MXL_RV64 ,RVC |RVS |RVU ); +set_misa (env,MXL_RV64 ,RVG |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_11_0 ); - cpu->cfg.ext_g = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true; cpu->cfg.ext_xtheadba = true;@@ -807,12 +806,11 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)CPURISCVState *env = &cpu->env;/* Do some ISA extension error checking */ -if (cpu->cfg.ext_g && !(riscv_has_ext (env,RVI ) && -riscv_has_ext (env,RVM ) && -riscv_has_ext (env,RVA ) && -riscv_has_ext (env,RVF ) && -riscv_has_ext (env,RVD ) && - cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) { +if (riscv_has_ext (env,RVG ) && + !(riscv_has_ext (env,RVI ) &&riscv_has_ext (env,RVM ) && +riscv_has_ext (env,RVA ) &&riscv_has_ext (env,RVF ) && +riscv_has_ext (env,RVD ) && + cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) {warn_report ("Setting G will also set IMAFD_Zicsr_Zifencei" ); cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true;@@ -1402,6 +1400,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVJ, .enabled = false}, {.name = "v", .description = "Vector operations", .misa_bit = RVV, .enabled = false}, + {.name = "g", .description = "General purpose (IMAFD_Zicsr_Zifencei)", + .misa_bit = RVG, .enabled = false}, };static void riscv_cpu_add_misa_properties (Object *cpu_obj)@@ -1424,7 +1424,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ -DEFINE_PROP_BOOL ("g" ,RISCVCPU , cfg.ext_g, false),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),target/riscv/cpu.h +1
-2@@ -81,6 +81,7 @@#define RVU RV('U')#define RVH RV('H')#define RVJ RV('J') +#define RVG RV('G')/* Privileged specification version */ @@ -418,7 +419,6 @@ typedef struct { } RISCVSATPMap;struct RISCVCPUConfig { -bool ext_g;bool ext_zba;bool ext_zbb;bool ext_zbc; --2.39.2
PATCH v3 20/20 target/riscv/cpu.c: redesign register_cpu_props()
In reply to Daniel Henrique BarbozaThe function is now a no-op for all cpu_init() callers that are setting a non-zero misa value in set_misa(), since it's no longer used to sync cpu->cfg props with env->misa_ext bits. Remove it in those cases.
While we're at it, rename the function to match what it's actually
doing: create user properties to set/remove CPU extensions. Make a note that it will overwrite env->misa_ext with the defaults set by each user property.
Update the MISA bits comment in cpu.h as well.
--- target/riscv/cpu.c | 41 ++++++++++------------------------------- target/riscv/cpu.h | 5 +---- 2 files changed, 11 insertions(+), 35 deletions(-)
target/riscv/cpu.c +10 -31
@@ -221,7 +221,7 @@ static const char * const riscv_intr_names[] = { "reserved" }; -static void register_cpu_props (Object *obj); +static void riscv_cpu_add_user_properties (Object *obj);const char *riscv_cpu_get_trap_name (target_ulong cause,bool async) {
@@ -349,7 +349,6 @@ static void riscv_any_cpu_init(Object *obj)#endif set_priv_version (env,PRIV_VERSION_1_12_0 ); -register_cpu_props (obj); }#if defined(TARGET_RISCV64 )
@@ -358,7 +357,7 @@ static void rv64_base_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ set_misa (env,MXL_RV64 ,0 ); -register_cpu_props (obj); +riscv_cpu_add_user_properties (obj);/* Set latest version of privileged specification */ set_priv_version (env,PRIV_VERSION_1_12_0 );#ifndef CONFIG_USER_ONLY
@@ -370,7 +369,6 @@ static void rv64_sifive_u_cpu_init(Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,MXL_RV64 ,RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 );#ifndef CONFIG_USER_ONLY set_satp_mode_max_supported (RISCV_CPU (obj),VM_1_10_SV39 );
@@ -383,7 +381,6 @@ static void rv64_sifive_e_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV64 ,RVI |RVM |RVA |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY
@@ -429,7 +426,7 @@ static void rv128_base_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ set_misa (env,MXL_RV128 ,0 ); -register_cpu_props (obj); +riscv_cpu_add_user_properties (obj);/* Set latest version of privileged specification */ set_priv_version (env,PRIV_VERSION_1_12_0 );#ifndef CONFIG_USER_ONLY
@@ -442,7 +439,7 @@ static void rv32_base_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ set_misa (env,MXL_RV32 ,0 ); -register_cpu_props (obj); +riscv_cpu_add_user_properties (obj);/* Set latest version of privileged specification */ set_priv_version (env,PRIV_VERSION_1_12_0 );#ifndef CONFIG_USER_ONLY
@@ -454,7 +451,6 @@ static void rv32_sifive_u_cpu_init(Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,MXL_RV32 ,RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 );#ifndef CONFIG_USER_ONLY set_satp_mode_max_supported (RISCV_CPU (obj),VM_1_10_SV32 );
@@ -467,7 +463,6 @@ static void rv32_sifive_e_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV32 ,RVI |RVM |RVA |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY
@@ -481,7 +476,6 @@ static void rv32_ibex_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV32 ,RVI |RVM |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY
@@ -496,7 +490,6 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV32 ,RVI |RVM |RVA |RVF |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY
@@ -514,7 +507,7 @@ static void riscv_host_cpu_init(Object *obj)#elif defined(TARGET_RISCV64 )set_misa (env,MXL_RV64 ,0 );#endif - register_cpu_props(obj); + riscv_cpu_add_user_properties(obj); }#endif
@@ -1508,30 +1501,16 @@ static Property riscv_cpu_extensions[] = { };/* -* Register CPU props based on env.misa_ext. If a non-zero -* value was set, register only the required cpu->cfg.ext_* -* properties and leave. env.misa_ext = 0 means that we want -* all the default properties to be registered. +* Add CPU properties with user-facing flags. +* +* This will overwrite existing env->misa_ext values with the +* defaults set via riscv_cpu_add_misa_properties(). */ -static void register_cpu_props (Object *obj) +static void riscv_cpu_add_user_properties (Object *obj) { -RISCVCPU *cpu =RISCV_CPU (obj);Property *prop;DeviceState *dev =DEVICE (obj); -/* -* If misa_ext is not zero, set cfg properties now to -* allow them to be read during riscv_cpu_realize() -* later on. -*/ -if (cpu->env.misa_ext !=0 ) { -/* -* We don't want to set the default riscv_cpu_extensions -* in this case. -*/ -return ; - } -riscv_cpu_add_misa_properties (obj);for (prop = riscv_cpu_extensions; prop && prop->name; prop++) {
target/riscv/cpu.h +1 -4
@@ -65,10 +65,7 @@#define RV (x) ((target_ulong)1 << (x - 'A')) -/* -* Consider updating register_cpu_props() when adding -* new MISA bits here. -*/ +/* Consider updating misa_ext_cfgs[] when adding new MISA bits here */ #define RVI RV('I')#define RVE RV('E')/* E and I are mutually exclusive */ #define RVM RV('M')
Signature · 1 line
2.39.2
Re: [PATCH v3 20/20] target/riscv/cpu.c: redesign register_cpu_props()
Quoted 10 lines · Daniel Henrique Barboza
The function is now a no-op for all
cpu_init()callers that are setting a non-zero misa value inset_misa(), since it's no longer used to synccpu->cfgprops withenv->misa_extbits. Remove it in those cases.While we're at it, rename the function to match what it's actually
doing: create user properties to set/remove CPU extensions. Make a note that it will overwriteenv->misa_extwith the defaults set by each user property.
Quoted 4 lines
Update the MISA bits comment in
cpu.has well.Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Weiwei Li <[email protected]>
Alistair
Quoted 166 lines
--- target/riscv/cpu.c | 41 ++++++++++------------------------------- target/riscv/cpu.h | 5 +---- 2 files changed, 11 insertions(+), 35 deletions(-)target/riscv/cpu.c +10
-31@@ -221,7 +221,7 @@ static const char * const riscv_intr_names[] = { "reserved" }; -static void register_cpu_props (Object *obj); +static void riscv_cpu_add_user_properties (Object *obj);const char *riscv_cpu_get_trap_name (target_ulong cause,bool async) {@@ -349,7 +349,6 @@ static void riscv_any_cpu_init(Object *obj)#endif set_priv_version (env,PRIV_VERSION_1_12_0 ); -register_cpu_props (obj); }#if defined(TARGET_RISCV64 )@@ -358,7 +357,7 @@ static void rv64_base_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ set_misa (env,MXL_RV64 ,0 ); -register_cpu_props (obj); +riscv_cpu_add_user_properties (obj);/* Set latest version of privileged specification */ set_priv_version (env,PRIV_VERSION_1_12_0 );#ifndef CONFIG_USER_ONLY @@ -370,7 +369,6 @@ static void rv64_sifive_u_cpu_init(Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,MXL_RV64 ,RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 );#ifndef CONFIG_USER_ONLY set_satp_mode_max_supported (RISCV_CPU (obj),VM_1_10_SV39 );@@ -383,7 +381,6 @@ static void rv64_sifive_e_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV64 ,RVI |RVM |RVA |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY @@ -429,7 +426,7 @@ static void rv128_base_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ set_misa (env,MXL_RV128 ,0 ); -register_cpu_props (obj); +riscv_cpu_add_user_properties (obj);/* Set latest version of privileged specification */ set_priv_version (env,PRIV_VERSION_1_12_0 );#ifndef CONFIG_USER_ONLY @@ -442,7 +439,7 @@ static void rv32_base_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ set_misa (env,MXL_RV32 ,0 ); -register_cpu_props (obj); +riscv_cpu_add_user_properties (obj);/* Set latest version of privileged specification */ set_priv_version (env,PRIV_VERSION_1_12_0 );#ifndef CONFIG_USER_ONLY @@ -454,7 +451,6 @@ static void rv32_sifive_u_cpu_init(Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,MXL_RV32 ,RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 );#ifndef CONFIG_USER_ONLY set_satp_mode_max_supported (RISCV_CPU (obj),VM_1_10_SV32 );@@ -467,7 +463,6 @@ static void rv32_sifive_e_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV32 ,RVI |RVM |RVA |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY @@ -481,7 +476,6 @@ static void rv32_ibex_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV32 ,RVI |RVM |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_11_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY @@ -496,7 +490,6 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj)RISCVCPU *cpu =RISCV_CPU (obj);set_misa (env,MXL_RV32 ,RVI |RVM |RVA |RVF |RVC |RVU ); -register_cpu_props (obj);set_priv_version (env,PRIV_VERSION_1_10_0 ); cpu->cfg.mmu = false;#ifndef CONFIG_USER_ONLY @@ -514,7 +507,7 @@ static void riscv_host_cpu_init(Object *obj)#elif defined(TARGET_RISCV64 )set_misa (env,MXL_RV64 ,0 );#endif - register_cpu_props(obj); + riscv_cpu_add_user_properties(obj); }#endif @@ -1508,30 +1501,16 @@ static Property riscv_cpu_extensions[] = { };/* -* Register CPU props based on env.misa_ext. If a non-zero -* value was set, register only the required cpu->cfg.ext_* -* properties and leave. env.misa_ext = 0 means that we want -* all the default properties to be registered. +* Add CPU properties with user-facing flags. +* +* This will overwrite existing env->misa_ext values with the +* defaults set via riscv_cpu_add_misa_properties(). */ -static void register_cpu_props (Object *obj) +static void riscv_cpu_add_user_properties (Object *obj) { -RISCVCPU *cpu =RISCV_CPU (obj);Property *prop;DeviceState *dev =DEVICE (obj); -/* -* If misa_ext is not zero, set cfg properties now to -* allow them to be read during riscv_cpu_realize() -* later on. -*/ -if (cpu->env.misa_ext !=0 ) { -/* -* We don't want to set the default riscv_cpu_extensions -* in this case. -*/ -return ; - } -riscv_cpu_add_misa_properties (obj);for (prop = riscv_cpu_extensions; prop && prop->name; prop++) {target/riscv/cpu.h +1
-5@@ -65,10 +65,7 @@#define RV (x) ((target_ulong)1 << (x - 'A')) -/* -* Consider updating register_cpu_props() when adding -* new MISA bits here. -*/ +/* Consider updating misa_ext_cfgs[] when adding new MISA bits here */ #define RVI RV('I')#define RVE RV('E')/* E and I are mutually exclusive */ #define RVM RV('M') --2.39.2
Quoted 27 lines · Daniel Henrique Barboza
Hi,
This new version has a new patch (3) that removes the '
multi_letter' attribute fromisa_ext_datathat became redundant after the changes made in patch 2. The change was proposed by Weiwei Li in the v2.All patches but patch 3 are acked.
Changes from v2:
- patch 3 (new)
- remove 'multi_letter' fromisa_ext_data
- v2 link: https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06493.htmlDaniel Henrique Barboza (20):
target/riscv: sync env->misa_ext* withcpu->cfginrealize()target/riscv: remove MISA properties from isa_edata_arr[]target/riscv/cpu.c: remove 'multi_letter' fromisa_ext_datatarget/riscv: introduceriscv_cpu_add_misa_properties()target/riscv: removecpu->cfg.ext_a
target/riscv: removecpu->cfg.ext_c
target/riscv: removecpu->cfg.ext_d
target/riscv: removecpu->cfg.ext_f
target/riscv: removecpu->cfg.ext_i
target/riscv: removecpu->cfg.ext_e
target/riscv: removecpu->cfg.ext_m
target/riscv: removecpu->cfg.ext_s
Quoted 8 lines
target/riscv: remove
cpu->cfg.ext_u
target/riscv: removecpu->cfg.ext_h
target/riscv: removecpu->cfg.ext_j
target/riscv: removecpu->cfg.ext_v
target/riscv: removeriscv_cpu_sync_misa_cfg()target/riscv: remove cfg.ext_g setup fromrv64_thead_c906_cpu_init()target/riscv: add RVG and removecpu->cfg.ext_gtarget/riscv/cpu.c: redesignregister_cpu_props()
Thanks for the cleanup. Do you mind rebasing it on
https://github.com/alistair23/qemu/tree/riscv-to-apply.next then I will apply it
Alistair
Quoted 9 lines
target/riscv/cpu.c | 386 +++++++++++++++++++++++---------------------- target/riscv/cpu.h | 19 +-- 2 files changed, 202 insertions(+), 203 deletions(-)--
2.39.2