Skip to content

Commit

Permalink
target/riscv: Fix the relationship between Zhinxmin and Zhinx
Browse files Browse the repository at this point in the history
Just like zfh and zfhmin, Zhinxmin is part of Zhinx so Zhinxmin
will be enabled when Zhinx is enabled.

Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Message-ID: <20230215020539.4788-3-liweiwei@iscas.ac.cn>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
  • Loading branch information
Weiwei Li authored and palmer-dabbelt committed Mar 1, 2023
1 parent 1d2cb5a commit a0d805f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions target/riscv/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -754,8 +754,11 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)
}

/* Set the ISA extensions, checks should have happened above */
if (cpu->cfg.ext_zdinx || cpu->cfg.ext_zhinx ||
cpu->cfg.ext_zhinxmin) {
if (cpu->cfg.ext_zhinx) {
cpu->cfg.ext_zhinxmin = true;
}

if (cpu->cfg.ext_zdinx || cpu->cfg.ext_zhinxmin) {
cpu->cfg.ext_zfinx = true;
}

Expand Down

0 comments on commit a0d805f

Please sign in to comment.