Changeset 14833 in vbox

Timestamp:

Nov 30, 2008 11:14:27 AM (16 years ago)

Author:

vboxsync

Message:

Drop the global VBOX_WITH_NEW_RECOMPILER global.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/VBox/vm.h (modified) (2 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (3 diffs)
• src/VBox/VMM/testcase/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -1068 +1068 @@
 ifdef VBOX_PATH_APP_DOCS
  DEFS += RTPATH_APP_DOCS=\"$(VBOX_PATH_APP_DOCS)\"
-endif
-## @todo eliminate these guys.
-ifdef VBOX_WITH_NEW_RECOMPILER
- DEFS += VBOX_WITH_NEW_RECOMPILER
 endif
 

trunk/include/VBox/vm.h

@@ -751 +751 @@
 #endif
 
-#ifdef VBOX_WITH_NEW_RECOMPILER
 /** @def VM_REM_SIZE
  * Must be multiple of 32 and coherent with REM_ENV_SIZE from REMInternal.h. */
@@ -759 +758 @@
 # define VM_REM_SIZE        (HC_ARCH_BITS == 32 ? 0x10900 : 0x10900)
 #endif
-#else  /* !VBOX_WITH_NEW_RECOMILER */
-#if GC_ARCH_BITS == 32
-# define VM_REM_SIZE        (HC_ARCH_BITS == 32 ? 0x6f00 : 0xbf00)
-#else
-# define VM_REM_SIZE        (HC_ARCH_BITS == 32 ? 0x9f00 : 0xdf00)
-#endif
-#endif /* !VBOX_WITH_NEW_RECOMILER */
         char        padding[VM_REM_SIZE];   /* multiple of 32 */
     } rem;

trunk/src/VBox/VMM/Makefile.kmk

@@ -40 +40 @@
 ifdef VBOX_WITH_R0_LOGGING
 VMMR3_DEFS     += VBOX_WITH_R0_LOGGING
+endif
+ifdef VBOX_WITH_NEW_RECOMPILER
+VMMR3_DEFS     += VBOX_WITH_NEW_RECOMPILER
 endif
 VMMR3_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
@@ -303 +306 @@
 VMMGC_DEFS     += VBOX_WITH_R0_LOGGING
 endif
+ifdef VBOX_WITH_NEW_RECOMPILER
+VMMGC_DEFS     += VBOX_WITH_NEW_RECOMPILER
+endif
 VMMGC_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC
 VMMGC_SYSSUFF   = .gc
@@ -399 +405 @@
 VMMR0_DEFS     += VBOX_WITH_R0_LOGGING
 endif
+ifdef VBOX_WITH_NEW_RECOMPILER
+VMMR0_DEFS     += VBOX_WITH_NEW_RECOMPILER
+endif
 VMMR0_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
 ifeq ($(VBOX_LDR_FMT),pe)

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -92 +92 @@
 tstVMStructGC_DEFS     += VBOX_WITH_R0_LOGGING
 endif
+ifdef VBOX_WITH_NEW_RECOMPILER
+tstVMStructGC_DEFS     += VBOX_WITH_NEW_RECOMPILER
+endif
 tstVMStructGC_SOURCES   = tstVMStructGC.cpp
 tstVMStructGC_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM
@@ -103 +106 @@
 tstVMStructSize_DEFS   += VBOX_WITH_R0_LOGGING
 endif
+ifdef VBOX_WITH_NEW_RECOMPILER
+tstVMStructSize_DEFS   += VBOX_WITH_NEW_RECOMPILER
+endif
 ifdef VBOX_WITH_VMI
 tstVMStructSize_DEFS   += VBOX_WITH_VMI
@@ -113 +119 @@
 tstAsmStructs_DEFS     += VBOX_WITH_R0_LOGGING
 endif
+ifdef VBOX_WITH_NEW_RECOMPILER
+tstAsmStruct_DEFS      += VBOX_WITH_NEW_RECOMPILER
+endif
 tstAsmStructs_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstAsmStructs_SOURCES   = tstAsmStructs.cpp
@@ -120 +129 @@
 ifdef VBOX_WITH_R0_LOGGING
 tstAsmStructsGC_DEFS   += VBOX_WITH_R0_LOGGING
+endif
+ifdef VBOX_WITH_NEW_RECOMPILER
+tstAsmStructGC_DEFS    += VBOX_WITH_NEW_RECOMPILER
 endif
 tstAsmStructsGC_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)