[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 11/16] target/riscv/tcg: add riscv_cpu_write_misa_bit()
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v7 11/16] target/riscv/tcg: add riscv_cpu_write_misa_bit() |
Date: |
Tue, 31 Oct 2023 17:39:11 -0300 |
We have two instances of the setting/clearing a MISA bit from
env->misa_ext and env->misa_ext_mask pattern. And the next patch will
end up adding one more.
Create a helper to avoid code repetition.
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
---
target/riscv/tcg/tcg-cpu.c | 44 ++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
index 70cd07efd7..b62890e568 100644
--- a/target/riscv/tcg/tcg-cpu.c
+++ b/target/riscv/tcg/tcg-cpu.c
@@ -42,6 +42,20 @@ static bool cpu_cfg_ext_is_user_set(uint32_t ext_offset)
GUINT_TO_POINTER(ext_offset));
}
+static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, uint32_t bit,
+ bool enabled)
+{
+ CPURISCVState *env = &cpu->env;
+
+ if (enabled) {
+ env->misa_ext |= bit;
+ env->misa_ext_mask |= bit;
+ } else {
+ env->misa_ext &= ~bit;
+ env->misa_ext_mask &= ~bit;
+ }
+}
+
static void riscv_cpu_synchronize_from_tb(CPUState *cs,
const TranslationBlock *tb)
{
@@ -711,20 +725,14 @@ static void cpu_set_misa_ext_cfg(Object *obj, Visitor *v,
const char *name,
return;
}
- if (value) {
- if (vendor_cpu) {
- g_autofree char *cpuname = riscv_cpu_get_name(cpu);
- error_setg(errp, "'%s' CPU does not allow enabling extensions",
- cpuname);
- return;
- }
-
- env->misa_ext |= misa_bit;
- env->misa_ext_mask |= misa_bit;
- } else {
- env->misa_ext &= ~misa_bit;
- env->misa_ext_mask &= ~misa_bit;
+ if (value && vendor_cpu) {
+ g_autofree char *cpuname = riscv_cpu_get_name(cpu);
+ error_setg(errp, "'%s' CPU does not allow enabling extensions",
+ cpuname);
+ return;
}
+
+ riscv_cpu_write_misa_bit(cpu, misa_bit, value);
}
static void cpu_get_misa_ext_cfg(Object *obj, Visitor *v, const char *name,
@@ -768,7 +776,6 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = {
*/
static void riscv_cpu_add_misa_properties(Object *cpu_obj)
{
- CPURISCVState *env = &RISCV_CPU(cpu_obj)->env;
bool use_def_vals = riscv_cpu_is_generic(cpu_obj);
int i;
@@ -789,13 +796,8 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj)
NULL, (void *)misa_cfg);
object_property_set_description(cpu_obj, name, desc);
if (use_def_vals) {
- if (misa_cfg->enabled) {
- env->misa_ext |= bit;
- env->misa_ext_mask |= bit;
- } else {
- env->misa_ext &= ~bit;
- env->misa_ext_mask &= ~bit;
- }
+ riscv_cpu_write_misa_bit(RISCV_CPU(cpu_obj), bit,
+ misa_cfg->enabled);
}
}
}
--
2.41.0
- [PATCH v7 01/16] target/riscv: create TYPE_RISCV_VENDOR_CPU, (continued)
- [PATCH v7 01/16] target/riscv: create TYPE_RISCV_VENDOR_CPU, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 02/16] target/riscv/tcg: do not use "!generic" CPU checks, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 03/16] target/riscv: add rv64i CPU, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 04/16] target/riscv: add zicbop extension flag, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 05/16] target/riscv/tcg: add 'zic64b' support, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 06/16] riscv-qmp-cmds.c: expose named features in cpu_model_expansion, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 07/16] target/riscv: add rva22u64 profile definition, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 08/16] target/riscv/kvm: add 'rva22u64' flag as unavailable, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 09/16] target/riscv/tcg: add user flag for profile support, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 10/16] target/riscv/tcg: add MISA user options hash, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 11/16] target/riscv/tcg: add riscv_cpu_write_misa_bit(),
Daniel Henrique Barboza <=
- [PATCH v7 12/16] target/riscv/tcg: handle profile MISA bits, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 13/16] target/riscv/tcg: add hash table insert helpers, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 14/16] target/riscv/tcg: honor user choice for G MISA bits, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 15/16] target/riscv/tcg: validate profiles during finalize, Daniel Henrique Barboza, 2023/10/31
- [PATCH v7 16/16] riscv-qmp-cmds.c: add profile flags in cpu-model-expansion, Daniel Henrique Barboza, 2023/10/31