SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/microblaze: Convert to tcg_ops restore_state_to_opc

Browse Source 
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-24 20:29:48 +10:00
parent 584fd3422f
commit 52b8d9a630
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/microblaze/cpu.c
View File

@ -100,6 +100,16 @@ static void mb_cpu_synchronize_from_tb(CPUState *cs,
cpu->env.iflags = tb->flags & IFLAGS_TB_MASK; cpu->env.iflags = tb->flags & IFLAGS_TB_MASK;
} }
static void mb_restore_state_to_opc(CPUState *cs,
const TranslationBlock *tb,
const uint64_t *data)
{
MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
cpu->env.pc = data[0];
cpu->env.iflags = data[1];
}
static bool mb_cpu_has_work(CPUState *cs) static bool mb_cpu_has_work(CPUState *cs)
{ {
return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
@ -373,6 +383,7 @@ static const struct SysemuCPUOps mb_sysemu_ops = {
static const struct TCGCPUOps mb_tcg_ops = { static const struct TCGCPUOps mb_tcg_ops = {
.initialize = mb_tcg_init, .initialize = mb_tcg_init,
.synchronize_from_tb = mb_cpu_synchronize_from_tb, .synchronize_from_tb = mb_cpu_synchronize_from_tb,
.restore_state_to_opc = mb_restore_state_to_opc,
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
.tlb_fill = mb_cpu_tlb_fill, .tlb_fill = mb_cpu_tlb_fill,

7
target/microblaze/translate.c
View File

@ -1946,10 +1946,3 @@ void mb_tcg_init(void)
cpu_res_addr = cpu_res_addr =
tcg_global_mem_new(cpu_env, offsetof(CPUMBState, res_addr), "res_addr"); tcg_global_mem_new(cpu_env, offsetof(CPUMBState, res_addr), "res_addr");
} }
void restore_state_to_opc(CPUMBState *env, TranslationBlock *tb,
target_ulong *data)
{
env->pc = data[0];
env->iflags = data[1];
}