From: ZhengXiang Qin <[email protected]>
TCG plugins may read registers from the vcpu_init_cb() callback. For
vtype, this reaches read_vtype() before env->xl has been initialized.
In that case read_vtype() currently hits g_assert_not_reached() because
env->xl is zero. Fall back to the CPU's maximum XLEN only for this
early-init case.
Fixes: 638181a180bd ("core/cpu-common: initialise plugin state before thread
creation")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3545
Signed-off-by: ZhengXiang Qin <[email protected]>
Reviewed-by: Daniel Henrique Barboza <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Alistair Francis <[email protected]>
(cherry picked from commit 46d96da1309869af6261d1997623b7a5212814d8)
Signed-off-by: Michael Tokarev <[email protected]>
diff --git a/target/riscv/csr.c b/target/riscv/csr.c
index 60dba08b99c..c8f510709ae 100644
--- a/target/riscv/csr.c
+++ b/target/riscv/csr.c
@@ -919,7 +919,16 @@ static RISCVException read_vtype(CPURISCVState *env, int
csrno,
target_ulong *val)
{
uint64_t vill;
- switch (env->xl) {
+ int xl = env->xl;
+ /*
+ * TCG plugins can read registers before env->xl is initialized.
+ * Fall back to the CPU's maximum XLEN in that early-init case.
+ */
+ if (xl == 0) {
+ xl = riscv_cpu_mxl(env);
+ }
+
+ switch (xl) {
case MXL_RV32:
vill = (uint32_t)env->vill << 31;
break;
--
2.47.3
