Changeset 1111 in vbox for trunk/src/recompiler

Timestamp:

Feb 28, 2007 3:30:06 PM (18 years ago)

Author:

vboxsync

Message:

Wrong changes in old sync

Location:

trunk/src/recompiler/new

Files:

• exec.c (modified) (20 diffs)
• target-i386/helper2.c (modified) (1 diff)

trunk/src/recompiler/new/exec.c

@@ -103 +103 @@
 uint32_t phys_ram_dirty_size;
 #endif /* VBOX */
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
 uint8_t *phys_ram_base;
 #endif
@@ -276 +276 @@
           pd[i].phys_offset = IO_MEM_UNASSIGNED;
     }
-#if defined(VBOX) && defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifdef VBOX
     pd = ((PhysPageDesc *)pd) + (index & (L2_SIZE - 1));
     if (RT_UNLIKELY((pd->phys_offset & ~TARGET_PAGE_MASK) == IO_MEM_RAM_MISSING))
@@ -1310 +1310 @@
 #endif /* !VBOX */
 
-#if !defined(VBOX) /* VBOX: we have our own routine. */
+#ifndef VBOX /* VBOX: we have our own routine. */
 void cpu_abort(CPUState *env, const char *fmt, ...)
 {
@@ -1431 +1431 @@
                                     ram_addr + TARGET_PAGE_SIZE,
                                     CODE_DIRTY_FLAG);
-#if defined(VBOX) && defined(REM_MONITOR_CODE_PAGES)
+#ifdef VBOX && defined(REM_MONITOR_CODE_PAGES)
     /** @todo Retest this? This function has changed... */
     remR3ProtectCode(cpu_single_env, ram_addr);
@@ -1497 +1497 @@
     /* we modify the TLB cache so that the dirty bit will be set again
        when accessing the range */
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
     start1 = start + (unsigned long)phys_ram_base;
 #else
@@ -1547 +1547 @@
     if ((tlb_entry->addr_write & ~TARGET_PAGE_MASK) == IO_MEM_RAM) {
         /* RAM case */
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
         ram_addr = (tlb_entry->addr_write & TARGET_PAGE_MASK) + 
             tlb_entry->addend - (unsigned long)phys_ram_base;
@@ -1633 +1633 @@
             /* standard memory */
             address = vaddr;
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
             addend = (unsigned long)phys_ram_base + (pd & TARGET_PAGE_MASK);
 #else
@@ -1855 +1855 @@
     if (flags & PAGE_WRITE)
         flags |= PAGE_WRITE_ORG;
-#if defined(VBOX)
+#ifdef VBOX
     AssertMsgFailed(("We shouldn't be here, and if we should, we must have an env to do the proper locking!\n"));
 #endif
@@ -1950 +1950 @@
         p = phys_page_find_alloc(addr >> TARGET_PAGE_BITS, 1);
         p->phys_offset = phys_offset;
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
         if ((phys_offset & ~TARGET_PAGE_MASK) <= IO_MEM_ROM ||
             (phys_offset & IO_MEM_ROMD))
@@ -2012 +2012 @@
     unsigned long ram_addr;
     int dirty_flags;
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
     ram_addr = addr - (unsigned long)phys_ram_base;
 #else
@@ -2055 +2055 @@
     unsigned long ram_addr;
     int dirty_flags;
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
     ram_addr = addr - (unsigned long)phys_ram_base;
 #else
@@ -2098 +2098 @@
     unsigned long ram_addr;
     int dirty_flags;
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
     ram_addr = addr - (unsigned long)phys_ram_base;
 #else
@@ -2154 +2154 @@
     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(PGM_DYNAMIC_RAM_ALLOC)
+#ifdef VBOX
     cpu_register_io_memory(IO_MEM_RAM_MISSING >> IO_MEM_SHIFT, unassigned_mem_read, unassigned_mem_write, NULL);
     io_mem_nb = 6;
@@ -2293 +2293 @@
                 /* RAM case */
 #ifdef VBOX
-# ifdef PGM_DYNAMIC_RAM_ALLOC 
                 ptr = remR3GCPhys2HCVirt(cpu_single_env, addr1);
-# else
-                ptr = phys_ram_base + addr1;
-# endif
                 remR3PhysWrite(ptr, buf, l);
 #else
@@ -2338 +2334 @@
                 /* RAM case */
 #ifdef VBOX
-# ifdef PGM_DYNAMIC_RAM_ALLOC 
                 ptr = remR3GCPhys2HCVirt(cpu_single_env, (pd & TARGET_PAGE_MASK) + (addr & ~TARGET_PAGE_MASK));
-# else
-                ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
-                    (addr & ~TARGET_PAGE_MASK);
-# endif
                 remR3PhysRead(ptr, buf, l);
 #else
@@ -2389 +2380 @@
             /* ROM/RAM case */
         /* RAM case */
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
             ptr = phys_ram_base + addr1;
 #else
@@ -2426 +2417 @@
     } else {
         /* RAM case */
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
         ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
             (addr & ~TARGET_PAGE_MASK);
@@ -2466 +2457 @@
     } else {
         /* RAM case */
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
         ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
             (addr & ~TARGET_PAGE_MASK);
@@ -2514 +2505 @@
         io_mem_write[io_index][2](io_mem_opaque[io_index], addr, val);
     } else {
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
         ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
             (addr & ~TARGET_PAGE_MASK);
@@ -2546 +2537 @@
         addr1 = (pd & TARGET_PAGE_MASK) + (addr & ~TARGET_PAGE_MASK);
         /* RAM case */
-#if !defined(VBOX) || !defined(PGM_DYNAMIC_RAM_ALLOC)
+#ifndef VBOX
         ptr = phys_ram_base + addr1;
 #else

trunk/src/recompiler/new/target-i386/helper2.c

@@ -586 +586 @@
 
     /* page directory entry */
-# ifdef PGM_DYNAMIC_RAM_ALLOC
     pde_ptr = remR3GCPhys2HCVirt(env, (((env->cr[3] & ~0xfff) + ((addr >> 20) & ~3)) & env->a20_mask));
-# else
-    pde_ptr = phys_ram_base + 
-        (((env->cr[3] & ~0xfff) + ((addr >> 20) & ~3)) & env->a20_mask);
-# endif 
     pde = ldl_raw(pde_ptr);
     /* if PSE bit is set, then we use a 4MB page */