commit 5a3165263ae6782a7fe712a0a0c29c17468b9b68
author Blue Swirl <blauwirbel@gmail.com> Sun Dec 02 21:28:09 2012 +0000
committer Blue Swirl <blauwirbel@gmail.com> Sun Dec 16 08:28:29 2012 +0000
tree b9f55e45941d23b3e2aeb2bf95096eabf2d5e5a3
parent 44209fc4edfd92464eb0413acfd434b687be945a

exec: extract TB watchpoint check

Will be moved by the next patch.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

exec.c

diff --git a/exec.c b/exec.c
index 2e56a8a..a1f617d 100644
--- a/exec.c
+++ b/exec.c
@@ -2987,12 +2987,24 @@
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
+static void tb_check_watchpoint(CPUArchState *env)
+{
+    TranslationBlock *tb;
+
+    tb = tb_find_pc(env->mem_io_pc);
+    if (!tb) {
+        cpu_abort(env, "check_watchpoint: could not find TB for pc=%p",
+                  (void *)env->mem_io_pc);
+    }
+    cpu_restore_state(tb, env, env->mem_io_pc);
+    tb_phys_invalidate(tb, -1);
+}
+
 /* Generate a debug exception if a watchpoint has been hit.  */
 static void check_watchpoint(int offset, int len_mask, int flags)
 {
     CPUArchState *env = cpu_single_env;
     target_ulong pc, cs_base;
-    TranslationBlock *tb;
     target_ulong vaddr;
     CPUWatchpoint *wp;
     int cpu_flags;
@@ -3011,13 +3023,7 @@
             wp->flags |= BP_WATCHPOINT_HIT;
             if (!env->watchpoint_hit) {
                 env->watchpoint_hit = wp;
-                tb = tb_find_pc(env->mem_io_pc);
-                if (!tb) {
-                    cpu_abort(env, "check_watchpoint: could not find TB for "
-                              "pc=%p", (void *)env->mem_io_pc);
-                }
-                cpu_restore_state(tb, env, env->mem_io_pc);
-                tb_phys_invalidate(tb, -1);
+                tb_check_watchpoint(env);
                 if (wp->flags & BP_STOP_BEFORE_ACCESS) {
                     env->exception_index = EXCP_DEBUG;
                     cpu_loop_exit(env);