[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/5] target/riscv: Move/refactor ISA extension checks
From: |
Tsukasa OI |
Subject: |
[PATCH 5/5] target/riscv: Move/refactor ISA extension checks |
Date: |
Fri, 13 May 2022 18:45:50 +0900 |
We should separate "check" and "configure" steps as possible.
This commit separates both steps except vector/Zfinx-related checks.
Signed-off-by: Tsukasa OI <research_trasio@irq.a4lg.com>
---
target/riscv/cpu.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 5371b0fd17..f654a6727f 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -635,11 +635,23 @@ static void riscv_cpu_realize(DeviceState *dev, Error
**errp)
return;
}
+ if ((cpu->cfg.ext_zve32f || cpu->cfg.ext_zve64f) && !cpu->cfg.ext_f) {
+ error_setg(errp, "Zve32f/Zve64f extensions require F extension");
+ return;
+ }
+
+ /* Set the ISA extensions, checks should have happened above */
if (cpu->cfg.ext_zdinx || cpu->cfg.ext_zhinx ||
cpu->cfg.ext_zhinxmin) {
cpu->cfg.ext_zfinx = true;
}
+ if (cpu->cfg.ext_zfinx && !cpu->cfg.ext_f) {
+ error_setg(errp,
+ "Zfinx cannot be supported together with F extension");
+ return;
+ }
+
if (cpu->cfg.ext_zk) {
cpu->cfg.ext_zkn = true;
cpu->cfg.ext_zkr = true;
@@ -663,7 +675,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error
**errp)
cpu->cfg.ext_zksh = true;
}
- /* Set the ISA extensions, checks should have happened above */
if (cpu->cfg.ext_i) {
ext |= RVI;
}
@@ -734,20 +745,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error
**errp)
}
set_vext_version(env, vext_version);
}
- if ((cpu->cfg.ext_zve32f || cpu->cfg.ext_zve64f) && !cpu->cfg.ext_f) {
- error_setg(errp, "Zve32f/Zve64f extension depends upon RVF.");
- return;
- }
if (cpu->cfg.ext_j) {
ext |= RVJ;
}
- if (cpu->cfg.ext_zfinx && ((ext & (RVF | RVD)) || cpu->cfg.ext_zfh ||
- cpu->cfg.ext_zfhmin)) {
- error_setg(errp,
- "'Zfinx' cannot be supported together with 'F', 'D',
'Zfh',"
- " 'Zfhmin'");
- return;
- }
set_misa(env, env->misa_mxl, ext);
}
--
2.34.1
- [PATCH 0/5] target/riscv: Enhanced ISA extension checks, Tsukasa OI, 2022/05/13
- [PATCH 1/5] target/riscv: Fix "G" extension expansion typing, Tsukasa OI, 2022/05/13
- [PATCH 2/5] target/riscv: Disable "G" by default, Tsukasa OI, 2022/05/13
- [PATCH 3/5] target/riscv: Change "G" expansion, Tsukasa OI, 2022/05/13
- [PATCH 4/5] target/riscv: FP extension requirements, Tsukasa OI, 2022/05/13
- [PATCH 5/5] target/riscv: Move/refactor ISA extension checks,
Tsukasa OI <=
- [PATCH v2 0/5] target/riscv: Enhanced ISA extension checks, Tsukasa OI, 2022/05/14
- [PATCH v2 3/5] target/riscv: Change "G" expansion, Tsukasa OI, 2022/05/14