mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 17:23:56 -06:00
target/riscv: Add itrigger_enabled field to CPURISCVState
Avoid calling riscv_itrigger_enabled() when calculate the tbflags. As the itrigger enable status can only be changed when write tdata1, migration load or itrigger fire, update env->itrigger_enabled at these places. Signed-off-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <20221013062946.7530-5-zhiwei_liu@linux.alibaba.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
91809598a0
commit
577f028694
4 changed files with 20 additions and 2 deletions
|
@ -21,6 +21,8 @@
|
|||
#include "qemu/error-report.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "migration/cpu.h"
|
||||
#include "sysemu/cpu-timers.h"
|
||||
#include "debug.h"
|
||||
|
||||
static bool pmp_needed(void *opaque)
|
||||
{
|
||||
|
@ -229,11 +231,24 @@ static bool debug_needed(void *opaque)
|
|||
return riscv_feature(env, RISCV_FEATURE_DEBUG);
|
||||
}
|
||||
|
||||
static int debug_post_load(void *opaque, int version_id)
|
||||
{
|
||||
RISCVCPU *cpu = opaque;
|
||||
CPURISCVState *env = &cpu->env;
|
||||
|
||||
if (icount_enabled()) {
|
||||
env->itrigger_enabled = riscv_itrigger_enabled(env);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_debug = {
|
||||
.name = "cpu/debug",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.needed = debug_needed,
|
||||
.post_load = debug_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINTTL(env.trigger_cur, RISCVCPU),
|
||||
VMSTATE_UINTTL_ARRAY(env.tdata1, RISCVCPU, RV_MAX_TRIGGERS),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue