Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
target/riscv: remove cpu->cfg.ext_j
Create 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.

Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20230406180351.570807-16-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  • Loading branch information
danielhb authored and alistair23 committed May 5, 2023
1 parent b5c042e commit 64f4b54
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions target/riscv/cpu.c
Expand Up @@ -1178,7 +1178,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;
}

Expand Down Expand Up @@ -1511,6 +1511,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)
Expand Down Expand Up @@ -1607,7 +1609,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),

DEFINE_PROP_BOOL("x-zca", RISCVCPU, cfg.ext_zca, false),
DEFINE_PROP_BOOL("x-zcb", RISCVCPU, cfg.ext_zcb, false),
Expand Down Expand Up @@ -1648,7 +1649,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
Expand Down
1 change: 0 additions & 1 deletion target/riscv/cpu.h
Expand Up @@ -423,7 +423,6 @@ typedef struct {

struct RISCVCPUConfig {
bool ext_g;
bool ext_j;
bool ext_v;
bool ext_zba;
bool ext_zbb;
Expand Down

0 comments on commit 64f4b54

Please sign in to comment.