riscv: Generalize CPU init routine for the base CPU
PATCH v2 1/4 riscv: Generalize CPU init routine for the base CPU
From: Bin Meng <[email protected]>
There is no need to have two functions that have exactly the same codes for 32-bit and 64-bit base CPUs.
---
(no changes since v1)
target/riscv/cpu.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
target/riscv/cpu.c +5 -13
@@ -126,9 +126,7 @@ static void riscv_any_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } -#if defined(TARGET_RISCV32 ) - -static void riscv_base32_cpu_init (Object *obj) +static void riscv_base_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */
@@ -136,6 +134,8 @@ static void riscv_base32_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } +#if defined(TARGET_RISCV32 ) +static void rv32gcsu_priv1_10_0_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -173,14 +173,6 @@ static void rv32imafcu_nommu_cpu_init(Object *obj)#elif defined(TARGET_RISCV64 ) -static void riscv_base64_cpu_init (Object *obj) -{ -CPURISCVState *env = &RISCV_CPU (obj)->env; -/* We set this in the realise function */ -set_misa (env,0 ); -set_resetvec (env,DEFAULT_RSTVEC ); -} -static void rv64gcsu_priv1_10_0_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -603,13 +595,13 @@ static const TypeInfo riscv_cpu_type_infos[] = { }, DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 ) - DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base32_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32imcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32gcsu_priv1_10_0_cpu_init), #elif defined(TARGET_RISCV64) - DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base64_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rv64gcsu_priv1_10_0_cpu_init),#endif
Signature · 1 line
2.7.4
PATCH v2 2/4 riscv: Generalize CPU init routine for the gcsu CPU
From: Bin Meng <[email protected]>
There is no need to have two functions that have almost the same codes for 32-bit and 64-bit gcsu CPUs.
---
Changes in v2:
- Change the function names to rvxx_*
target/riscv/cpu.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
target/riscv/cpu.c +6 -14
@@ -134,16 +134,16 @@ static void riscv_base_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } -#if defined(TARGET_RISCV32 ) - -static void rv32gcsu_priv1_10_0_cpu_init (Object *obj) +static void rvxx_gcsu_priv1_10_0_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); +set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 );set_resetvec (env,DEFAULT_RSTVEC ); } +#if defined(TARGET_RISCV32 ) +static void rv32imcu_nommu_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -173,14 +173,6 @@ static void rv32imafcu_nommu_cpu_init(Object *obj)#elif defined(TARGET_RISCV64 ) -static void rv64gcsu_priv1_10_0_cpu_init (Object *obj) -{ -CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RV64 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); -set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); -} -static void rv64imacu_nommu_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -599,11 +591,11 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32imcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32imafcu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init), #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64imacu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rv64gcsu_priv1_10_0_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rvxx_gcsu_priv1_10_0_cpu_init),#endif };
Signature · 1 line
2.7.4
PATCH v2 3/4 riscv: Generalize CPU init routine for the imacu CPU
In reply to Bin MengFrom: Bin Meng <[email protected]>
There is no need to have two functions that have almost the same codes for 32-bit and 64-bit imacu CPUs.
---
Changes in v2:
- Change the function names to rvxx_*
target/riscv/cpu.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)
target/riscv/cpu.c +10 -21
@@ -142,23 +142,23 @@ static void rvxx_gcsu_priv1_10_0_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } -#if defined(TARGET_RISCV32 ) - -static void rv32imcu_nommu_cpu_init (Object *obj) +static void rvxx_imacu_nommu_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RV32 |RVI |RVM |RVC |RVU ); +set_misa (env,RVXLEN |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,0x8090 ); +set_resetvec (env,DEFAULT_RSTVEC );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); } -static void rv32imacu_nommu_cpu_init (Object *obj) +#if defined(TARGET_RISCV32 ) + +static void rv32imcu_nommu_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RV32 |RVI |RVM |RVA |RVC |RVU ); +set_misa (env,RV32 |RVI |RVM |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); +set_resetvec (env,0x8090 );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); }
@@ -171,17 +171,6 @@ static void rv32imafcu_nommu_cpu_init(Object *obj) qdev_prop_set_bit(DEVICE(obj), "mmu", false); } -#elif defined(TARGET_RISCV64 ) - -static void rv64imacu_nommu_cpu_init (Object *obj) -{ -CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RV64 |RVI |RVM |RVA |RVC |RVU ); -set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); -qdev_prop_set_bit (DEVICE (obj),"mmu" , false); -} -#endif static ObjectClass *riscv_cpu_class_by_name (const char *cpu_model)
@@ -589,12 +578,12 @@ static const TypeInfo riscv_cpu_type_infos[] = {#if defined(TARGET_RISCV32 ) DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32imcu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32imacu_nommu_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init), #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64imacu_nommu_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rvxx_imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rvxx_gcsu_priv1_10_0_cpu_init),#endif };
Signature · 1 line
2.7.4
PATCH v2 4/4 riscv: Keep the CPU init routine names consistent
In reply to Bin MengFrom: Bin Meng <[email protected]>
Adding a _ to keep some consistency among the CPU init routines.
---
(no changes since v1)
target/riscv/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
target/riscv/cpu.c +4 -4
@@ -153,7 +153,7 @@ static void rvxx_imacu_nommu_cpu_init(Object *obj)#if defined(TARGET_RISCV32 ) -static void rv32imcu_nommu_cpu_init (Object *obj) +static void rv32_imcu_nommu_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVC |RVU );
@@ -162,7 +162,7 @@ static void rv32imcu_nommu_cpu_init(Object *obj)qdev_prop_set_bit (DEVICE (obj),"mmu" , false); } -static void rv32imafcu_nommu_cpu_init (Object *obj) +static void rv32_imafcu_nommu_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVC |RVU );
@@ -577,9 +577,9 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 ) DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32imcu_nommu_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32_imcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_imacu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32imafcu_nommu_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_gcsu_priv1_10_0_cpu_init), #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init),
Signature · 1 line
2.7.4
Alistair Francis
AppliedQuoted 8 lines · Bin Meng
From: Bin Meng <[email protected]>
There is no need to have two functions that have exactly the same codes for 32-bit and 64-bit base CPUs.
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Applied to riscv-to-apply branch.
Alistair
Quoted 66 lines
---
(no changes since v1)
target/riscv/cpu.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)target/riscv/cpu.c +5
-14@@ -126,9 +126,7 @@ static void riscv_any_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } -#if defined(TARGET_RISCV32 ) - -static void riscv_base32_cpu_init (Object *obj) +static void riscv_base_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ @@ -136,6 +134,8 @@ static void riscv_base32_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); } +#if defined(TARGET_RISCV32 ) +static void rv32gcsu_priv1_10_0_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;@@ -173,14 +173,6 @@ static void rv32imafcu_nommu_cpu_init(Object *obj)#elif defined(TARGET_RISCV64 ) -static void riscv_base64_cpu_init (Object *obj) -{ -CPURISCVState *env = &RISCV_CPU (obj)->env; -/* We set this in the realise function */ -set_misa (env,0 ); -set_resetvec (env,DEFAULT_RSTVEC ); -} -static void rv64gcsu_priv1_10_0_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;@@ -603,13 +595,13 @@ static const TypeInfo riscv_cpu_type_infos[] = { }, DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 ) - DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base32_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32imcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32gcsu_priv1_10_0_cpu_init), #elif defined(TARGET_RISCV64) -DEFINE_CPU (TYPE_RISCV_CPU_BASE64 , riscv_base64_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rv64gcsu_priv1_10_0_cpu_init),#endif --2.7.4