VirtualBox

Changeset 19297 in vbox for trunk


Ignore:
Timestamp:
May 1, 2009 5:03:40 PM (16 years ago)
Author:
vboxsync
Message:

Renamed src/recompiler_new to src/recompiler.

Location:
trunk
Files:
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r19009 r19297  
    240240 VBOX_WITHOUT_ADDITIONS=1
    241241endif
    242 
    243 ## Enable new TCG-based recompiler
    244 VBOX_WITH_NEW_RECOMPILER = 1
    245242
    246243# Don't create the additions ISO.

  • trunk/src/Makefile.kmk

    r14158 r19297  
    3737 include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
    3838 include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
    39  ifdef VBOX_WITH_NEW_RECOMPILER
    40   include $(PATH_SUB_CURRENT)/recompiler_new/Makefile.kmk
    41  else
    42   include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
    43  endif
     39 include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
    4440 ifneq ($(wildcard $(PATH_SUB_CURRENT)/apps),)
    4541  include $(PATH_SUB_CURRENT)/apps/Makefile.kmk
    … …  
    6864else  # !VBOX_ONLY_ADDITIONS
    6965 # Build IPRT first because xpcom (IPC, nspr, python) depends on it.
    70  SUBDIRS = VBox/Runtime bldprogs libs VBox
    71 
    72  ifdef VBOX_WITH_NEW_RECOMPILER
    73    SUBDIRS += recompiler_new
    74  else
    75    SUBDIRS += recompiler
    76  endif
     66 SUBDIRS = VBox/Runtime bldprogs libs VBox recompiler
    7767 ifneq ($(wildcard apps),)
    7868  SUBDIRS += apps

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r18798 r19297  
    135135        VMMGC.gc \
    136136        VMMR0.r0
    137 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    138  ifndef VBOX_WITH_NEW_RECOMPILER
    139   VBOX_LNX_STRIP_OBJ += \
    140          VBoxREM2.rel
    141  endif
    142 endif
    143137
    144138# Do not strip anything of these files

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r19053 r19297  
    222222        VBoxREM64.so
    223223
    224 ifndef VBOX_WITH_NEW_RECOMPILER
    225  SOLARIS_STRIP_OBJ_64 = VBoxREM2.rel
    226 endif
    227 
    228224VBOX_SOL_PYTHON_DIR_64 = 64
    229225
    … …  
    354350        $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_QTLIBS)) \
    355351        $(addprefix $(SOLARIS_VBOXINST_DIR_32)/,$(SOLARIS_STRIP_BIN_32)) \
    356         $(if $(VBOX_WITH_NEW_RECOMPILER),,$(addprefix $(SOLARIS_VBOXINST_DIR_64)/,$(SOLARIS_STRIP_OBJ_64))) \
    357352        $(addprefix $(SOLARIS_OUT_BIN_32)/,VBoxPython.so) \
    358353        $(addprefix $(SOLARIS_OUT_BIN_64)/,VBoxPython.so)

  • trunk/src/VBox/VMM/CPUM.cpp

    r19075 r19297  
    317317                                       | 0;
    318318    pCPUM->aGuestCpuIdStd[1].ecx      &= 0
    319 #ifdef VBOX_WITH_NEW_RECOMPILER
    320319                                       | X86_CPUID_FEATURE_ECX_SSE3
    321 #endif
    322320                                       | X86_CPUID_FEATURE_ECX_MONITOR
    323321                                       //| X86_CPUID_FEATURE_ECX_CPLDS - no CPL qualified debug store.
    … …  
    508506        if (pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_AMD)
    509507        {
    510    
     508
    511509        }
    512510#endif

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

    r19288 r19297  
    4040ifdef VBOX_WITH_R0_LOGGING
    4141VMMR3_DEFS     += VBOX_WITH_R0_LOGGING
    42 endif
    43 ifdef VBOX_WITH_NEW_RECOMPILER
    44 VMMR3_DEFS     += VBOX_WITH_NEW_RECOMPILER
    4542endif
    4643VMMR3_DEFS.darwin.x86 = \
    … …  
    308305VMMGC_DEFS     += VBOX_WITH_R0_LOGGING
    309306endif
    310 ifdef VBOX_WITH_NEW_RECOMPILER
    311 VMMGC_DEFS     += VBOX_WITH_NEW_RECOMPILER
    312 endif
    313307ifeq ($(KBUILD_TARGET_ARCH),x86)
    314308VMMGC_DEFS.darwin = \
    … …  
    411405VMMR0_DEFS     += VBOX_WITH_R0_LOGGING
    412406endif
    413 ifdef VBOX_WITH_NEW_RECOMPILER
    414 VMMR0_DEFS     += VBOX_WITH_NEW_RECOMPILER
    415 endif
    416407VMMR0_DEFS.darwin.x86 = \
    417408        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 \

  • trunk/src/VBox/VMM/REMInternal.h

    r18927 r19297  
    211211    uint32_t                abPadding[HC_ARCH_BITS == 32 ? 6 : 4];
    212212
    213 #ifdef VBOX_WITH_NEW_RECOMPILER
    214213#if GC_ARCH_BITS == 32
    215214# define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0xff00 : 0xff00)
    … …  
    217216# define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0xff00 : 0xff00)
    218217#endif
    219 #else  /* !VBOX_WITH_NEW_RECOMPILER */
    220 #if GC_ARCH_BITS == 32
    221 # define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x6550 : 0xb4a0)
    222 #else
    223 # define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x9440 : 0xd4a0)
    224 #endif
    225 #endif /* !VBOX_WITH_NEW_RECOMILER */
    226218
    227219    /** Recompiler CPU state. */
    … …  
    252244void    remR3DmaRun(CPUState *env);
    253245void    remR3TimersRun(CPUState *env);
    254 # ifdef VBOX_WITH_NEW_RECOMPILER
    255246int     remR3NotifyTrap(CPUState *env, uint32_t uTrap, uint32_t uErrorCode, RTGCPTR pvNextEIP);
    256 # else
    257 int remR3NotifyTrap(CPUState *env, uint32_t uTrap, uint32_t uErrorCode, uint32_t pvNextEIP);
    258 # endif
    259247void    remR3TrapStat(CPUState *env, uint32_t uTrap);
    260248void    remR3CpuId(CPUState *env, unsigned uOperator, void *pvEAX, void *pvEBX, void *pvECX, void *pvEDX);

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

    r18837 r19297  
    9191tstVMStructGC_DEFS     += VBOX_WITH_R0_LOGGING
    9292endif
    93 ifdef VBOX_WITH_NEW_RECOMPILER
    94 tstVMStructGC_DEFS     += VBOX_WITH_NEW_RECOMPILER
    95 endif
    9693tstVMStructGC_SOURCES   = tstVMStructGC.cpp
    9794tstVMStructGC_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM
    … …  
    105102tstVMStructSize_DEFS   += VBOX_WITH_R0_LOGGING
    106103endif
    107 ifdef VBOX_WITH_NEW_RECOMPILER
    108 tstVMStructSize_DEFS   += VBOX_WITH_NEW_RECOMPILER
    109 endif
    110104ifdef VBOX_WITH_VMI
    111105tstVMStructSize_DEFS   += VBOX_WITH_VMI
    … …  
    118112tstAsmStructs_DEFS     += VBOX_WITH_R0_LOGGING
    119113endif
    120 ifdef VBOX_WITH_NEW_RECOMPILER
    121 tstAsmStruct_DEFS      += VBOX_WITH_NEW_RECOMPILER
    122 endif
    123114tstAsmStructs_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)
    124115tstAsmStructs_SOURCES   = tstAsmStructs.cpp
    … …  
    128119ifdef VBOX_WITH_R0_LOGGING
    129120tstAsmStructsGC_DEFS   += VBOX_WITH_R0_LOGGING
    130 endif
    131 ifdef VBOX_WITH_NEW_RECOMPILER
    132 tstAsmStructGC_DEFS    += VBOX_WITH_NEW_RECOMPILER
    133121endif
    134122tstAsmStructsGC_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)

  • trunk/src/recompiler/Makefile.kmk

    r18914 r19297  
    109109$(REM_MOD)_DEFS           += IN_REM_R3 REM_INCLUDE_CPU_H
    110110#$(REM_MOD)_DEFS           += REM_PHYS_ADDR_IN_TLB
    111 $(REM_MOD)_DEFS           += VBOX_WITH_NEW_RECOMPILER
    112111#$(REM_MOD)_DEFS           += DEBUG_ALL_LOGGING DEBUG_DISAS DEBUG_PCALL DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.
    113112#$(REM_MOD)_DEFS           += DEBUG_TMP_LOGGING # log qemu parts to "/tmp/vbox-qemu.log" - does not work with VBoxREM2.
    … …  
    206205VBoxREMWrapper_NAME        = VBoxREM
    207206VBoxREMWrapper_DEFS        = IN_REM_R3 $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
    208 VBoxREMWrapper_DEFS       += VBOX_WITH_NEW_RECOMPILER
    209207 ifdef VBOX_USE_REM64
    210208VBoxREMWrapper_DEFS       += VBOX_USE_BITNESS_SELECTOR
    … …  
    299297testmath_LDFLAGS        = -g
    300298testmath_DEFS           = MATHTEST_STANDALONE
    301 testmath_DEFS          += VBOX_WITH_NEW_RECOMPILER
    302299testmath_SOURCES        = Sun/testmath.c
    303300
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette