commit d09d7665187911f9aedf0951818a45b7485acbb0
author Pete Delaney <piet.delaney@imgtec.com> Thu Mar 28 19:53:13 2013 -0700
committer Pete Delaney <piet.delaney@imgtec.com> Thu Mar 28 20:40:42 2013 -0700
tree 578ddf992c018db50bb570f38db136668b96b178
parent 82820720b5e36c9770227d12e688ea2d196ecfe4

exec: Introduce helper to set dirty flags.

NOTE: Cherry picked from git.qemu.org
      51d7a9eb2b64e787c90bea1027308087eac22065

This new helper/hook is used in the next patch to add
an extra call in a single place.

Change-Id: If8bfcc457f44b207d3aa7f284e337fe43e3408f6
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Signed-off-by: Chris Dearman <Chris.Dearman@imgtec.com>
Signed-off-by: Duane Sand <Duane.Sand@imgtec.com>

exec.c

diff --git a/exec.c b/exec.c
index 90c5c6b..bf7dc0f 100644
--- a/exec.c
+++ b/exec.c
@@ -3310,6 +3310,18 @@
 }
 
 #else
+
+static void invalidate_and_set_dirty(target_phys_addr_t addr,
+                                     target_phys_addr_t length)
+{
+    if (!cpu_physical_memory_is_dirty(addr)) {
+        /* invalidate code */
+        tb_invalidate_phys_page_range(addr, addr + length, 0);
+        /* set dirty bit */
+        cpu_physical_memory_set_dirty_flags(addr, (0xff & ~CODE_DIRTY_FLAG));
+    }
+}
+
 void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
                             int len, int is_write)
 {
@@ -3362,13 +3374,7 @@
                 /* RAM case */
                 ptr = qemu_get_ram_ptr(addr1);
                 memcpy(ptr, buf, l);
-                if (!cpu_physical_memory_is_dirty(addr1)) {
-                    /* invalidate code */
-                    tb_invalidate_phys_page_range(addr1, addr1 + l, 0);
-                    /* set dirty bit */
-                    cpu_physical_memory_set_dirty_flags(
-                        addr1, (0xff & ~CODE_DIRTY_FLAG));
-                }
+                invalidate_and_set_dirty(addr1, l);
             }
         } else {
             if ((pd & ~TARGET_PAGE_MASK) > IO_MEM_ROM &&
@@ -3439,13 +3445,7 @@
             /* ROM/RAM case */
             ptr = qemu_get_ram_ptr(addr1);
             memcpy(ptr, buf, l);
-           if (!cpu_physical_memory_is_dirty(addr1)) {
-               /* invalidate code */
-               tb_invalidate_phys_page_range(addr1, addr1 + l, 0);
-               /* set dirty bit */
-               cpu_physical_memory_set_dirty_flags(
-                   addr1, (0xff & ~CODE_DIRTY_FLAG));
-           }
+            invalidate_and_set_dirty(addr1, l);
         }
         len -= l;
         buf += l;
@@ -3576,13 +3576,7 @@
                 l = TARGET_PAGE_SIZE;
                 if (l > access_len)
                     l = access_len;
-                if (!cpu_physical_memory_is_dirty(addr1)) {
-                    /* invalidate code */
-                    tb_invalidate_phys_page_range(addr1, addr1 + l, 0);
-                    /* set dirty bit */
-                    cpu_physical_memory_set_dirty_flags(
-                        addr1, (0xff & ~CODE_DIRTY_FLAG));
-                }
+                invalidate_and_set_dirty(addr1, l);
                 addr1 += l;
                 access_len -= l;
             }
@@ -3780,13 +3774,7 @@
         /* RAM case */
         ptr = qemu_get_ram_ptr(addr1);
         stl_p(ptr, val);
-        if (!cpu_physical_memory_is_dirty(addr1)) {
-            /* invalidate code */
-            tb_invalidate_phys_page_range(addr1, addr1 + 4, 0);
-            /* set dirty bit */
-            cpu_physical_memory_set_dirty_flags(addr1,
-                (0xff & ~CODE_DIRTY_FLAG));
-        }
+        invalidate_and_set_dirty(addr1, 4);
     }
 }