target/riscv: Add H extension state description
In the case of supporting H extension, add H extension description to vmstate_riscv_cpu. Signed-off-by: Yifei Jiang <jiangyifei@huawei.com> Signed-off-by: Yipeng Yin <yinyipeng1@huawei.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-id: 20201026115530.304-5-jiangyifei@huawei.com Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
24beb03e46
commit
35e07821ff
|
@ -68,6 +68,52 @@ static const VMStateDescription vmstate_pmp = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static bool hyper_needed(void *opaque)
|
||||||
|
{
|
||||||
|
RISCVCPU *cpu = opaque;
|
||||||
|
CPURISCVState *env = &cpu->env;
|
||||||
|
|
||||||
|
return riscv_has_ext(env, RVH);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const VMStateDescription vmstate_hyper = {
|
||||||
|
.name = "cpu/hyper",
|
||||||
|
.version_id = 1,
|
||||||
|
.minimum_version_id = 1,
|
||||||
|
.needed = hyper_needed,
|
||||||
|
.fields = (VMStateField[]) {
|
||||||
|
VMSTATE_UINTTL(env.hstatus, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.hedeleg, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.hideleg, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.hcounteren, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.htval, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.htinst, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.hgatp, RISCVCPU),
|
||||||
|
VMSTATE_UINT64(env.htimedelta, RISCVCPU),
|
||||||
|
|
||||||
|
VMSTATE_UINT64(env.vsstatus, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.vstvec, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.vsscratch, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.vsepc, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.vscause, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.vstval, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.vsatp, RISCVCPU),
|
||||||
|
|
||||||
|
VMSTATE_UINTTL(env.mtval2, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.mtinst, RISCVCPU),
|
||||||
|
|
||||||
|
VMSTATE_UINTTL(env.stvec_hs, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.sscratch_hs, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.sepc_hs, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.scause_hs, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.stval_hs, RISCVCPU),
|
||||||
|
VMSTATE_UINTTL(env.satp_hs, RISCVCPU),
|
||||||
|
VMSTATE_UINT64(env.mstatus_hs, RISCVCPU),
|
||||||
|
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const VMStateDescription vmstate_riscv_cpu = {
|
const VMStateDescription vmstate_riscv_cpu = {
|
||||||
.name = "cpu",
|
.name = "cpu",
|
||||||
.version_id = 1,
|
.version_id = 1,
|
||||||
|
@ -119,6 +165,7 @@ const VMStateDescription vmstate_riscv_cpu = {
|
||||||
},
|
},
|
||||||
.subsections = (const VMStateDescription * []) {
|
.subsections = (const VMStateDescription * []) {
|
||||||
&vmstate_pmp,
|
&vmstate_pmp,
|
||||||
|
&vmstate_hyper,
|
||||||
NULL
|
NULL
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue