VirtualBox

Changeset 15414 in vbox


Ignore:
Timestamp:
Dec 13, 2008 4:33:30 AM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
40863
Message:

Corrected VBOX_WITH_HYBIRD_32BIT_KERNEL to VBOX_WITH_HYBRID_32BIT_KERNEL and moved it into src/VBox/VMM.

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r15373 r15414  
    10161016DEFS.amd64   = RT_ARCH_AMD64 __AMD64__
    10171017DEFS.darwin  = RT_OS_DARWIN __DARWIN__
    1018 DEFS.darwin.x86 = VBOX_WITH_HYBIRD_32BIT_KERNEL
    10191018DEFS.freebsd = RT_OS_FREEBSD __FREEBSD__
    10201019DEFS.l4      = RT_OS_L4 __L4__ __L4ENV__ L4API_l4v2 ARCH_$(KBUILD_TARGET_ARCH) __NO_CTYPE _FILE_OFFSET_BITS=64

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

    r14762 r15414  
    968968            return VERR_SSM_UNEXPECTED_DATA;
    969969        }
    970        
     970
    971971        for (unsigned i=0;i<pVM->cCPUs;i++)
    972972        {
    … …  
    14121412     */
    14131413#if HC_ARCH_BITS == 32
    1414 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     1414# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    14151415    if (!(pCtx->efer & MSR_K6_EFER_LMA))
    14161416# endif
    … …  
    14321432            pCtx->SysEnter.cs, pCtx->SysEnter.eip, pCtx->SysEnter.esp);
    14331433    }
    1434 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     1434# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    14351435    else
    14361436# endif
    14371437#endif
    1438 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     1438#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    14391439    {
    14401440        pHlp->pfnPrintf(pHlp,

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

    r14870 r15414  
    7979
    8080/* Sanity check. */
    81 #if defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) && (HC_ARCH_BITS != 32 || R0_ARCH_BITS != 32)
    82 # error "VBOX_WITH_HYBIRD_32BIT_KERNEL is only for 32 bit builds."
     81#if defined(VBOX_WITH_HYBRID_32BIT_KERNEL) && (HC_ARCH_BITS != 32 || R0_ARCH_BITS != 32)
     82# error "VBOX_WITH_HYBRID_32BIT_KERNEL is only for 32 bit builds."
    8383#endif
    8484
    … …  
    8787 * The saved host CPU state.
    8888 *
    89  * @remark  The special VBOX_WITH_HYBIRD_32BIT_KERNEL checks here are for the 10.4.x series
     89 * @remark  The special VBOX_WITH_HYBRID_32BIT_KERNEL checks here are for the 10.4.x series
    9090 *          of Mac OS X where the OS is essentially 32-bit but the cpu mode can be 64-bit.
    9191 */
    … …  
    9898    /** General purpose register, selectors, flags and more
    9999     * @{ */
    100 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     100#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    101101    /** General purpose register ++
    102102     * { */
    … …  
    152152    /** @} */
    153153
    154 #if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     154#if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    155155    /** Control registers.
    156156     * @{ */
    … …  
    192192    uint8_t         auPadding[24+32];
    193193
    194 #elif HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     194#elif HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    195195
    196196    /** Control registers.
    … …  
    235235
    236236    /* padding to get 32byte aligned size */
    237 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     237# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    238238    uint8_t         auPadding[16];
    239239# else
    … …  
    344344    CPUMCTX                 Guest;
    345345
    346     /** 
     346    /**
    347347     * Guest context - misc MSRs
    348348     * Aligned on a 64-byte boundrary.

  • trunk/src/VBox/VMM/CPUMInternal.mac

    r15030 r15414  
    4343%define FPUSTATE_SIZE                   512
    4444
    45 ;; if anyone figures how to do %if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) in
     45;; if anyone figures how to do %if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL) in
    4646; nasm please tell / fix this hack.
    47 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
    48  %define fVBOX_WITH_HYBIRD_32BIT_KERNEL 1
     47%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
     48 %define fVBOX_WITH_HYBRID_32BIT_KERNEL 1
    4949%else
    50  %define fVBOX_WITH_HYBIRD_32BIT_KERNEL 0
     50 %define fVBOX_WITH_HYBRID_32BIT_KERNEL 0
    5151%endif
    5252
    … …  
    200200    .Host.fpu            resb    FPUSTATE_SIZE
    201201
    202 %if HC_ARCH_BITS == 64 || fVBOX_WITH_HYBIRD_32BIT_KERNEL
     202%if HC_ARCH_BITS == 64 || fVBOX_WITH_HYBRID_32BIT_KERNEL
    203203    ;.Host.rax            resq    1 - scratch
    204204    .Host.rbx            resq    1
    … …  
    246246    .Host.csPadding      resw    1
    247247
    248 %if HC_ARCH_BITS == 32 && fVBOX_WITH_HYBIRD_32BIT_KERNEL == 0
     248%if HC_ARCH_BITS == 32 && fVBOX_WITH_HYBRID_32BIT_KERNEL == 0
    249249    .Host.cr0            resd    1
    250250    ;.Host.cr2            resd    1 - scratch
    … …  
    411411    .fChanged             resd    1
    412412    .ulOffCPUM            resd    1
    413     .u32RetCode           resd    1   
     413    .u32RetCode           resd    1
    414414endstruc
    415415

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

    r15404 r15414  
    215215        pVM->fHWACCMEnabled = true;
    216216
    217 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     217#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    218218    /* 64-bit mode is configurable and it depends on both the kernel mode and VT-x.
    219219     * (To use the default, don't set 64bitEnabled in CFGM.) */
    … …  
    820820                CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SEP);
    821821#ifdef VBOX_ENABLE_64_BITS_GUESTS
    822 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL /* remove */
     822# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL /* remove */
    823823                if (pVM->hwaccm.s.fAllow64BitGuests)
    824824# endif
    … …  
    832832#endif
    833833                LogRel(("HWACCM: VMX enabled!\n"));
    834 #if defined(VBOX_ENABLE_64_BITS_GUESTS) && defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     834#if defined(VBOX_ENABLE_64_BITS_GUESTS) && defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    835835                LogRel((pVM->hwaccm.s.fAllow64BitGuests
    836836                        ? "HWACCM: 32-bit and 64-bit guest supported.\n"
    … …  
    935935                CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_RDTSCP);
    936936#ifdef VBOX_ENABLE_64_BITS_GUESTS
    937 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     937# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    938938                if (pVM->hwaccm.s.fAllow64BitGuests)
    939939# endif
    … …  
    953953    }
    954954
    955 #if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     955#if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    956956    if (pVM->fHWACCMEnabled)
    957957    {

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

    r15404 r15414  
    3535#include <iprt/mp.h>
    3636
    37 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) // || defined (VBOX_WITH_64_BITS_GUESTS)
     37#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL) // || defined (VBOX_WITH_64_BITS_GUESTS)
    3838/* Enable 64 bits guest support. */
    3939# define VBOX_ENABLE_64_BITS_GUESTS
    … …  
    201201    bool                        fInjectNMI;
    202202
    203 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     203#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    204204    /** Set if we can support 64-bit guests or not. */
    205205    bool                        fAllow64BitGuests;
    … …  
    208208    /** Explicit alignment padding to make 32-bit gcc align u64RegisterMask
    209209     *  naturally. */
    210 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     210#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    211211    bool                        padding[1];
    212212#else
    … …  
    220220    RTUINT                      uMaxASID;
    221221
    222 #if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     222#if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    223223    /** 32 to 64 bits switcher entrypoint. */
    224224    R0PTRTYPE(PFNHWACCMSWITCHERHC) pfnHost32ToGuest64R0;
    … …  
    242242    RTRCPTR                     uAlignment[1];
    243243# endif
    244 #elif defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     244#elif defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    245245    uint32_t                    u32Alignment[1];
    246246#endif
    … …  
    637637
    638638
    639 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     639# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    640640/**
    641641 * Gets 64-bit GDTR and IDTR on darwin.

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

    r15413 r15414  
    4444VMMR3_DEFS     += VBOX_WITH_NEW_RECOMPILER
    4545endif
    46 VMMR3_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
     46VMMR3_DEFS.darwin     = VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
     47VMMR3_DEFS.darwin.x86 = VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R3
    4748VMMR3_INCS     := \
    4849        $(PATH_SUB_CURRENT) \
    … …  
    309310VMMGC_DEFS     += VBOX_WITH_NEW_RECOMPILER
    310311endif
    311 VMMGC_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC
     312VMMGC_DEFS.darwin     = VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC
     313VMMGC_DEFS.darwin.x86 = VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
    312314VMMGC_SYSSUFF   = .gc
    313315VMMGC_LIBS      = \
    … …  
    408410VMMR0_DEFS     += VBOX_WITH_NEW_RECOMPILER
    409411endif
    410 VMMR0_DEFS.darwin = VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
     412VMMR0_DEFS.darwin     = VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     413VMMR0_DEFS.darwin.x86 = VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
    411414ifeq ($(VBOX_LDR_FMT),pe)
    412415VMMR0_LDFLAGS   = -Entry:VMMR0EntryEx

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

    r15411 r15414  
    15081508        case SUPPAGINGMODE_AMD64_NX:
    15091509        case SUPPAGINGMODE_AMD64_GLOBAL_NX:
    1510 #ifndef VBOX_WITH_HYBIRD_32BIT_KERNEL
     1510#ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
    15111511            if (ARCH_BITS != 64)
    15121512            {

  • trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

    r15404 r15414  
    168168    }
    169169
    170 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     170#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    171171    if (CPUMIsGuestInLongModeEx(pCtx))
    172172    {
    … …  
    258258    AssertReturn((pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU), VINF_SUCCESS);
    259259
    260 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     260#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    261261    if (CPUMIsGuestInLongModeEx(pCtx))
    262262    {
    … …  
    321321
    322322    /* Save the guest's debug state. The caller is responsible for DR7. */
    323 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     323#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    324324    if (CPUMIsGuestInLongModeEx(pCtx))
    325325    {
    … …  
    386386
    387387    /* Activate the guest state DR0-3; DR7 is left to the caller. */
    388 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     388#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    389389    if (CPUMIsGuestInLongModeEx(pCtx))
    390390    {

  • trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

    r15409 r15414  
    10711071
    10721072
    1073 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     1073#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    10741074/**
    10751075 * Save guest FPU/XMM state (64 bits guest mode & 32 bits host only)
    … …  
    11261126# endif
    11271127
    1128 #endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) */
     1128#endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL) */
    11291129
    11301130/**

  • trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

    r15395 r15414  
    5252 %define MAYBE_64_BIT
    5353%endif
    54 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     54%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    5555 %define MAYBE_64_BIT
    5656%endif
    … …  
    214214;* External Symbols                                                            *
    215215;*******************************************************************************
    216 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     216%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    217217extern NAME(SUPR0AbsIs64bit)
    218218extern NAME(SUPR0Abs64bitKernelCS)
    … …  
    226226;*  Global Variables                                                           *
    227227;*******************************************************************************
    228 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     228%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    229229BEGINDATA
    230230;;
    … …  
    262262    mov         ecx, [esp + 4]          ; idxField
    263263    lea         edx, [esp + 8]          ; &u64Data
    264  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     264 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    265265    cmp         byte [NAME(g_fVMXIs64bitHost)], 0
    266266    jz          .legacy_mode
    … …  
    268268    dd          .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    269269.legacy_mode:
    270  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     270 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    271271    vmwrite     ecx, [edx]              ; low dword
    272272    jz          .done
    … …  
    286286    ret
    287287
    288 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     288%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    289289ALIGNCODE(16)
    290290BITS 64
    … …  
    302302    dd      .the_end, NAME(SUPR0AbsKernelCS)
    303303BITS 32
    304 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     304%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    305305ENDPROC VMXWriteVMCS64
    306306
    … …  
    329329    mov         ecx, [esp + 4]          ; idxField
    330330    mov         edx, [esp + 8]          ; pData
    331  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     331 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    332332    cmp         byte [NAME(g_fVMXIs64bitHost)], 0
    333333    jz          .legacy_mode
    … …  
    335335    dd          .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    336336.legacy_mode:
    337  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     337 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    338338    vmread      [edx], ecx              ; low dword
    339339    jz          .done
    … …  
    353353    ret
    354354
    355 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     355%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    356356ALIGNCODE(16)
    357357BITS 64
    … …  
    369369    dd      .the_end, NAME(SUPR0AbsKernelCS)
    370370BITS 32
    371 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     371%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    372372ENDPROC VMXReadVMCS64
    373373
    … …  
    398398    mov     ecx, [esp + 4]              ; idxField
    399399    mov     edx, [esp + 8]              ; pu32Data
    400  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     400 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    401401    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    402402    jz      .legacy_mode
    … …  
    404404    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    405405.legacy_mode:
    406  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     406 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    407407    xor     eax, eax
    408408    vmread  [edx], ecx
    … …  
    417417    ret
    418418
    419 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     419%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    420420ALIGNCODE(16)
    421421BITS 64
    … …  
    434434    dd      .the_end, NAME(SUPR0AbsKernelCS)
    435435BITS 32
    436 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     436%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    437437ENDPROC VMXReadVMCS32
    438438
    … …  
    463463    mov     ecx, [esp + 4]              ; idxField
    464464    mov     edx, [esp + 8]              ; u32Data
    465  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     465 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    466466    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    467467    jz      .legacy_mode
    … …  
    469469    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    470470.legacy_mode:
    471  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     471 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    472472    xor     eax, eax
    473473    vmwrite ecx, edx
    … …  
    482482    ret
    483483
    484 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     484%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    485485ALIGNCODE(16)
    486486BITS 64
    … …  
    498498    dd      .the_end, NAME(SUPR0AbsKernelCS)
    499499BITS 32
    500 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     500%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    501501ENDPROC VMXWriteVMCS32
    502502
    … …  
    519519    vmxon   [rsp]
    520520%else  ; RT_ARCH_X86
    521  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     521 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    522522    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    523523    jz      .legacy_mode
    … …  
    525525    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    526526.legacy_mode:
    527  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     527 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    528528    xor     eax, eax
    529529    vmxon   [esp + 4]
    … …  
    543543    ret
    544544
    545 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     545%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    546546ALIGNCODE(16)
    547547BITS 64
    … …  
    559559    dd      .the_end, NAME(SUPR0AbsKernelCS)
    560560BITS 32
    561 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     561%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    562562ENDPROC VMXEnable
    563563
    … …  
    568568;DECLASM(void) VMXDisable(void);
    569569BEGINPROC VMXDisable
    570 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     570%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    571571    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    572572    jz      .legacy_mode
    … …  
    574574    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    575575.legacy_mode:
    576 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     576%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    577577    vmxoff
    578578.the_end:
    579579    ret
    580580
    581 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     581%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    582582ALIGNCODE(16)
    583583BITS 64
    … …  
    588588    dd      .the_end, NAME(SUPR0AbsKernelCS)
    589589BITS 32
    590 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     590%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    591591ENDPROC VMXDisable
    592592
    … …  
    610610    vmclear [rsp]
    611611%else  ; RT_ARCH_X86
    612  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     612 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    613613    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    614614    jz      .legacy_mode
    … …  
    616616    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    617617.legacy_mode:
    618  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     618 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    619619    xor     eax, eax
    620620    vmclear [esp + 4]
    … …  
    628628    ret
    629629
    630 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     630%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    631631ALIGNCODE(16)
    632632BITS 64
    … …  
    664664    vmptrld [rsp]
    665665%else
    666  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     666 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    667667    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    668668    jz      .legacy_mode
    … …  
    670670    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    671671.legacy_mode:
    672  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     672 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    673673    xor     eax, eax
    674674    vmptrld [esp + 4]
    … …  
    682682    ret
    683683
    684 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     684%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    685685ALIGNCODE(16)
    686686BITS 64
    … …  
    696696    dd      .the_end, NAME(SUPR0AbsKernelCS)
    697697BITS 32
    698 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     698%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    699699ENDPROC VMXActivateVMCS
    700700
    … …  
    719719  %endif
    720720 %else
    721   %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     721  %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    722722    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    723723    jz      .legacy_mode
    … …  
    725725    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    726726.legacy_mode:
    727   %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     727  %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    728728    vmptrst qword [esp+04h]
    729729 %endif
    … …  
    732732    ret
    733733
    734  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     734 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    735735ALIGNCODE(16)
    736736BITS 64
    … …  
    744744    dd      .the_end, NAME(SUPR0AbsKernelCS)
    745745BITS 32
    746  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     746 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    747747%endif
    748748ENDPROC VMXGetActivateVMCS
    … …  
    768768 %endif
    769769%else
    770  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     770 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    771771    cmp         byte [NAME(g_fVMXIs64bitHost)], 0
    772772    jz          .legacy_mode
    … …  
    774774    dd          .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    775775.legacy_mode:
    776  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     776 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    777777    mov         eax, [esp + 4]
    778778    mov         ecx, [esp + 8]
    … …  
    789789    ret
    790790
    791 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     791%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    792792ALIGNCODE(16)
    793793BITS 64
    … …  
    807807    dd      .the_end, NAME(SUPR0AbsKernelCS)
    808808BITS 32
    809 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     809%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    810810ENDPROC VMXR0InvEPT
    811811
    … …  
    831831 %endif
    832832%else
    833  %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     833 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    834834    cmp     byte [NAME(g_fVMXIs64bitHost)], 0
    835835    jz      .legacy_mode
    … …  
    837837    dd      .sixtyfourbit_mode, NAME(SUPR0Abs64bitKernelCS)
    838838.legacy_mode:
    839  %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     839 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    840840    mov         eax, [esp + 4]
    841841    mov         ecx, [esp + 8]
    … …  
    852852    ret
    853853
    854 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     854%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    855855ALIGNCODE(16)
    856856BITS 64
    … …  
    870870    dd      .the_end, NAME(SUPR0AbsKernelCS)
    871871BITS 32
    872 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     872%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    873873ENDPROC VMXR0InvVPID
    874874
    … …  
    934934%endif ; GC_ARCH_BITS != 64
    935935
    936 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     936%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    937937
    938938;/**
    … …  
    988988ENDPROC   hwaccmR0Get64bitCR3
    989989
    990 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     990%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
    991991
    992992
    … …  
    995995; The default setup of the StartVM routines.
    996996;
    997 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     997%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    998998 %define MY_NAME(name)   name %+ _32
    999999%else
    … …  
    10151015
    10161016
    1017 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     1017%ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    10181018 ;
    10191019 ; Write the wrapper procedures.
    … …  
    12541254
    12551255 %include "HWACCMR0Mixed.mac"
    1256 %endif ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     1256%endif ; VBOX_WITH_HYBRID_32BIT_KERNEL

  • trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

    r15410 r15414  
    769769#if !defined(VBOX_ENABLE_64_BITS_GUESTS)
    770770        return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
    771 #elif HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     771#elif HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    772772        pVCpu->hwaccm.s.svm.pfnVMRun = SVMR0VMSwitcherRun64;
    773773#else
    774 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     774# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    775775        if (!pVM->hwaccm.s.fAllow64BitGuests)
    776776            return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
    … …  
    22982298}
    22992299
    2300 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     2300#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    23012301/**
    23022302 * Prepares for and executes VMRUN (64 bits guests from a 32 bits hosts).

  • trunk/src/VBox/VMM/VMMR0/HWSVMR0.h

    r15404 r15414  
    138138VMMR0DECL(int) SVMR0LoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
    139139
    140 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     140#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    141141
    142142/**
    … …  
    165165VMMR0DECL(int) SVMR0Execute64BitsHandler(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, RTRCPTR pfnHandler, uint32_t cbParam, uint32_t *paParam);
    166166
    167 #endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) */
     167#endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL) */
    168168
    169169/**

  • trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

    r15410 r15414  
    4646#if defined(RT_ARCH_AMD64)
    4747# define VMX_IS_64BIT_HOST_MODE()   (true)
    48 #elif defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     48#elif defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    4949# define VMX_IS_64BIT_HOST_MODE()   (g_fVMXIs64bitHost != 0)
    5050#else
    … …  
    5959static uint32_t const g_aIOOpAnd[4] = {0xff, 0xffff, 0, 0xffffffff};
    6060
    61 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     61#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    6262/** See HWACCMR0A.asm. */
    6363extern "C" uint32_t g_fVMXIs64bitHost;
    … …  
    833833        /* Control registers */
    834834        rc  = VMXWriteVMCS(VMX_VMCS_HOST_CR0,               ASMGetCR0());
    835 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     835#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    836836        if (VMX_IS_64BIT_HOST_MODE())
    837837        {
    … …  
    852852
    853853        /* Selector registers. */
    854 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     854#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    855855        if (VMX_IS_64BIT_HOST_MODE())
    856856        {
    … …  
    894894
    895895        /* GDTR & IDTR */
    896 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     896#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    897897        if (VMX_IS_64BIT_HOST_MODE())
    898898        {
    … …  
    927927        }
    928928
    929 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     929#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    930930        if (VMX_IS_64BIT_HOST_MODE())
    931931        {
    … …  
    951951
    952952        /* FS and GS base. */
    953 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     953#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    954954        if (VMX_IS_64BIT_HOST_MODE())
    955955        {
    … …  
    966966        rc  = VMXWriteVMCS(VMX_VMCS32_HOST_SYSENTER_CS,       ASMRdMsr_Low(MSR_IA32_SYSENTER_CS));
    967967        Log2(("VMX_VMCS_HOST_SYSENTER_CS  %08x\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_CS)));
    968 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     968#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    969969        if (VMX_IS_64BIT_HOST_MODE())
    970970        {
    … …  
    11101110    /* Save debug controls (dr7 & IA32_DEBUGCTL_MSR) (forced to 1 on the 'first' VT-x capable CPUs; this actually includes the newest Nehalem CPUs) */
    11111111    val |= VMX_VMCS_CTRL_EXIT_CONTROLS_SAVE_DEBUG;
    1112 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     1112#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    11131113    if (VMX_IS_64BIT_HOST_MODE())
    11141114        val |= VMX_VMCS_CTRL_EXIT_CONTROLS_HOST_AMD64;
    … …  
    15611561#if !defined(VBOX_ENABLE_64_BITS_GUESTS)
    15621562        return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
    1563 #elif HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     1563#elif HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    15641564        pVCpu->hwaccm.s.vmx.pfnStartVM  = VMXR0SwitcherStartVM64;
    15651565#else
    1566 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     1566# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    15671567        if (!pVM->hwaccm.s.fAllow64BitGuests)
    15681568            return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
    … …  
    34873487            Log(("VMX_VMCS_HOST_RIP %RHv\n", val));
    34883488
    3489 # if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     3489# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    34903490            if (VMX_IS_64BIT_HOST_MODE())
    34913491            {
    … …  
    35093509}
    35103510
    3511 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     3511#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    35123512/**
    35133513 * Prepares for and executes VMLAUNCH (64 bits guest mode)
    … …  
    36283628}
    36293629
    3630 #endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL) */
     3630#endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL) */
    36313631
    36323632

  • trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

    r15404 r15414  
    204204
    205205
    206 # if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     206# if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    207207/**
    208208 * Executes the specified handler in 64 mode
    … …  
    350350DECLASM(int) VMXR0StartVM64(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu);
    351351
    352 # if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     352# if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    353353/**
    354354 * Prepares for and executes VMLAUNCH (64 bits guest mode)

  • trunk/src/VBox/VMM/VMMR0/TRPMR0.cpp

    r14515 r15414  
    4646    AssertMsgReturnVoid(uActiveVector < 256, ("uActiveVector=%#x is invalid! (More assertions to come, please enjoy!)\n", uActiveVector));
    4747
    48 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     48#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    4949    /*
    5050     * Check if we're in long mode or not.

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

    r15404 r15414  
    925925
    926926
    927 #if defined(DEBUG) && HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     927#if defined(DEBUG) && HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    928928        case VMMR0_DO_TEST_SWITCHER3264:
    929929            return HWACCMR0TestSwitcher3264(pVM);

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

    r14981 r15414  
    6060    &vmmR3SwitcherPAEToAMD64_Def,
    6161    NULL,   //&vmmR3SwitcherPAETo32Bit_Def,
    62 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     62# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
    6363    &vmmR3SwitcherAMD64ToPAE_Def,
    6464# else
    … …  
    608608            }
    609609
    610 #if defined(RT_ARCH_AMD64) || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     610#if defined(RT_ARCH_AMD64) || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    611611            /*
    612612             * 64-bit HC Code Selector (no argument).
    … …  
    615615            {
    616616                Assert(offSrc < pSwitcher->cbCode);
    617 # if defined(RT_OS_DARWIN) && defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
     617# if defined(RT_OS_DARWIN) && defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
    618618                *uSrc.pu16 = 0x80; /* KERNEL64_CS from i386/seg.h */
    619619# else

  • trunk/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac

    r14979 r15414  
    4949GLOBALNAME Start
    5050
    51 %ifndef VBOX_WITH_HYBIRD_32BIT_KERNEL
     51%ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
    5252BITS 64
    5353
    … …  
    113113
    114114
    115 %else ; VBOX_WITH_HYBIRD_32BIT_KERNEL
     115%else ; VBOX_WITH_HYBRID_32BIT_KERNEL
    116116
    117117
    … …  
    178178
    179179BITS 64
    180 %endif ;!VBOX_WITH_HYBIRD_32BIT_KERNEL
     180%endif ;!VBOX_WITH_HYBRID_32BIT_KERNEL
    181181
    182182
Note: See TracChangeset for help on using the changeset viewer.

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