From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue, 4 Jul 2006 09:47:34 +0000 (+0000)
Subject: fix for IO_MEM_ROMD support
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=856074ec70ffba4f1b8d73be88f3cfc782532156;p=qemu.git

fix for IO_MEM_ROMD support


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2034 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/exec.c b/exec.c
index dd42f77d8e..88acff0917 100644
--- a/exec.c
+++ b/exec.c
@@ -1513,9 +1513,11 @@ int tlb_set_page_exec(CPUState *env, target_ulong vaddr,
             te->addr_code = -1;
         }
         if (prot & PAGE_WRITE) {
-            if ((pd & ~TARGET_PAGE_MASK) == IO_MEM_ROM) {
-                /* ROM: access is ignored (same as unassigned) */
-                te->addr_write = vaddr | IO_MEM_ROM;
+            if ((pd & ~TARGET_PAGE_MASK) == IO_MEM_ROM || 
+                (pd & IO_MEM_ROMD)) {
+                /* write access calls the I/O callback */
+                te->addr_write = vaddr | 
+                    (pd & ~(TARGET_PAGE_MASK | IO_MEM_ROMD));
             } else if ((pd & ~TARGET_PAGE_MASK) == IO_MEM_RAM && 
                        !cpu_physical_memory_is_dirty(pd)) {
                 te->addr_write = vaddr | IO_MEM_NOTDIRTY;