Not sure as to whether virtualise or not here, just commenting out for the moment as watchpoints are nor critical to this RFC.
Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> --- exec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/exec.c b/exec.c index 71ec173..200d18b 100644 --- a/exec.c +++ b/exec.c @@ -1847,11 +1847,15 @@ static const MemoryRegionOps notdirty_mem_ops = { static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) { CPUState *cpu = current_cpu; +#if 0 CPUArchState *env = cpu->env_ptr; target_ulong pc, cs_base; +#endif target_ulong vaddr; CPUWatchpoint *wp; +#if 0 int cpu_flags; +#endif if (cpu->watchpoint_hit) { /* We re-entered the check after replacing the TB. Now raise @@ -1878,8 +1882,11 @@ static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) cpu->exception_index = EXCP_DEBUG; cpu_loop_exit(cpu); } else { +#if 0 +/* FIXME: Virtualise cpu_get_tb_cpu_state */ cpu_get_tb_cpu_state(env, &pc, &cs_base, &cpu_flags); tb_gen_code(cpu, pc, cs_base, cpu_flags, 1); +#endif cpu_resume_from_signal(cpu, NULL); } } -- 1.9.1