From 239c51a54fe2a1ffc5108f496caae79e5be0cabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 1 Sep 2013 17:12:23 +0200 Subject: translate-all: Change tb_check_watchpoint() argument to CPUState MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Färber --- exec.c | 2 +- translate-all.c | 4 ++-- translate-all.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exec.c b/exec.c index 5f7c47244f..7f945818f9 100644 --- a/exec.c +++ b/exec.c @@ -1605,7 +1605,7 @@ static void check_watchpoint(int offset, int len_mask, int flags) wp->flags |= BP_WATCHPOINT_HIT; if (!cpu->watchpoint_hit) { cpu->watchpoint_hit = wp; - tb_check_watchpoint(env); + tb_check_watchpoint(cpu); if (wp->flags & BP_STOP_BEFORE_ACCESS) { cpu->exception_index = EXCP_DEBUG; cpu_loop_exit(cpu); diff --git a/translate-all.c b/translate-all.c index adcef83490..82d5fa40b3 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1371,9 +1371,9 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr) } #endif /* TARGET_HAS_ICE && !defined(CONFIG_USER_ONLY) */ -void tb_check_watchpoint(CPUArchState *env) +void tb_check_watchpoint(CPUState *cpu) { - CPUState *cpu = ENV_GET_CPU(env); + CPUArchState *env = cpu->env_ptr; TranslationBlock *tb; tb = tb_find_pc(cpu->mem_io_pc); diff --git a/translate-all.h b/translate-all.h index f7e5932d65..02832b2718 100644 --- a/translate-all.h +++ b/translate-all.h @@ -22,6 +22,6 @@ /* translate-all.c */ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len); void cpu_unlink_tb(CPUState *cpu); -void tb_check_watchpoint(CPUArchState *env); +void tb_check_watchpoint(CPUState *cpu); #endif /* TRANSLATE_ALL_H */ -- cgit v1.2.1