Changeset 1182 in vbox for trunk/src/recompiler/new/exec-all.h

Timestamp:

Mar 4, 2007 7:34:24 PM (18 years ago)

Author:

vboxsync

Message:

Restore the PGM_DYNAMIC_RAM_ALLOC tests and #include <VBox/pgm.h> to make sure it's defined.

File:

• trunk/src/recompiler/new/exec-all.h (modified) (3 diffs)

trunk/src/recompiler/new/exec-all.h

@@ -26 +26 @@
 #ifdef VBOX
 # include <VBox/tm.h>
+# include <VBox/pgm.h> /* PGM_DYNAMIC_RAM_ALLOC */
 # ifndef LOG_GROUP
 #  define LOG_GROUP LOG_GROUP_REM
-# endif 
+# endif
 # include <VBox/log.h>
 # include "REMInternal.h"
@@ -603 +604 @@
 # ifdef VBOX
 target_ulong remR3PhysGetPhysicalAddressCode(CPUState *env, target_ulong addr, CPUTLBEntry *pTLBEntry);
+#  ifdef PGM_DYNAMIC_RAM_ALLOC
 target_ulong remR3HCVirt2GCPhys(void *env, void *addr);
-# endif 
+#  endif
+# endif
 /* NOTE: this function can trigger an exception */
 /* NOTE2: the returned address is not exactly the physical address: it
@@ -636 +639 @@
 # ifdef VBOX
         /* deal with non-MMIO access handlers. */
-        return remR3PhysGetPhysicalAddressCode(env, addr, &env->tlb_table[is_user][index]); 
+        return remR3PhysGetPhysicalAddressCode(env, addr, &env->tlb_table[is_user][index]);
 # else
         cpu_abort(env, "Trying to execute code outside RAM or ROM at 0x%08lx\n", addr);
 # endif
     }
-# ifdef VBOX
+# if defined(VBOX) && defined(PGM_DYNAMIC_RAM_ALLOC)
     return remR3HCVirt2GCPhys(env, (void *)(addr + env->tlb_table[is_user][index].addend));
 # else
     return addr + env->tlb_table[is_user][index].addend - (unsigned long)phys_ram_base;
-# endif 
+# endif
 }
 #endif