Changeset 18662 in vbox for trunk/src/recompiler_new/exec.c

Timestamp:

Apr 2, 2009 6:35:32 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45589

Message:

src/recompiler_new: Clean out the VBOX_WITH_NEW_PHYS_CODE #ifdefs.

File:

• trunk/src/recompiler_new/exec.c (modified) (5 diffs)

trunk/src/recompiler_new/exec.c

@@ -493 +493 @@
           pd[i].phys_offset = IO_MEM_UNASSIGNED;
     }
-#if defined(VBOX) && !defined(VBOX_WITH_NEW_PHYS_CODE)
-    pd = ((PhysPageDesc *)pd) + (index & (L2_SIZE - 1));
-    if (RT_UNLIKELY((pd->phys_offset & ~TARGET_PAGE_MASK) == IO_MEM_RAM_MISSING))
-        remR3GrowDynRange(pd->phys_offset & TARGET_PAGE_MASK);
-    return pd;
-#else
     return ((PhysPageDesc *)pd) + (index & (L2_SIZE - 1));
-#endif
 }
 
@@ -2121 +2114 @@
     start1 = start + (unsigned long)phys_ram_base;
 #else
-    start1 = (unsigned long)remR3TlbGCPhys2Ptr(first_cpu, start, 1 /*fWritable*/); /** @todo this can be harmful with VBOX_WITH_NEW_PHYS_CODE, fix interface/whatever. */
+    start1 = (unsigned long)remR3TlbGCPhys2Ptr(first_cpu, start, 1 /*fWritable*/); /** @todo page replacing (sharing or read only) may cause trouble, fix interface/whatever. */
 #endif
     for(env = first_cpu; env != NULL; env = env->next_cpu) {
@@ -2709 +2702 @@
             } else {
                 p->phys_offset = phys_offset;
-#if !defined(VBOX) || defined(VBOX_WITH_NEW_PHYS_CODE)
         if ((phys_offset & ~TARGET_PAGE_MASK) <= IO_MEM_ROM ||
             (phys_offset & IO_MEM_ROMD))
-#else
-        if (   (phys_offset & ~TARGET_PAGE_MASK) <= IO_MEM_ROM
-            || (phys_offset & IO_MEM_ROMD)
-            || (phys_offset & ~TARGET_PAGE_MASK) == IO_MEM_RAM_MISSING)
-#endif
                     phys_offset += TARGET_PAGE_SIZE;
             }
@@ -2722 +2709 @@
             p = phys_page_find_alloc(addr >> TARGET_PAGE_BITS, 1);
             p->phys_offset = phys_offset;
-#if !defined(VBOX) || defined(VBOX_WITH_NEW_PHYS_CODE)
         if ((phys_offset & ~TARGET_PAGE_MASK) <= IO_MEM_ROM ||
             (phys_offset & IO_MEM_ROMD))
-#else
-        if (   (phys_offset & ~TARGET_PAGE_MASK) <= IO_MEM_ROM
-            || (phys_offset & IO_MEM_ROMD)
-            || (phys_offset & ~TARGET_PAGE_MASK) == IO_MEM_RAM_MISSING)
-#endif
                 phys_offset += TARGET_PAGE_SIZE;
             else {
@@ -3237 +3218 @@
     cpu_register_io_memory(IO_MEM_UNASSIGNED >> IO_MEM_SHIFT, unassigned_mem_read, unassigned_mem_write, NULL);
     cpu_register_io_memory(IO_MEM_NOTDIRTY >> IO_MEM_SHIFT, error_mem_read, notdirty_mem_write, NULL);
-#if defined(VBOX) && !defined(VBOX_WITH_NEW_PHYS_CODE)
-    cpu_register_io_memory(IO_MEM_RAM_MISSING >> IO_MEM_SHIFT, unassigned_mem_read, unassigned_mem_write, NULL);
-    io_mem_nb = 6;
-#else
     io_mem_nb = 5;
-#endif
 
     io_mem_watch = cpu_register_io_memory(0, watch_mem_read,