VirtualBox

Changeset 13435 in vbox


Ignore:
Timestamp:
Oct 21, 2008 12:21:12 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
38203
Message:

w64 unwind hacking: renamed SUPDRV_WITH_UNWIND_HACK to RT_WITH_W64_UNWIND_HACK, fixed license headers and file properties, and some minor adjustments.

Location:
trunk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

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

    r13421 r13435  
    879879if defined(VBOX_WITH_NETFLT)
    880880 ServicesR0_SOURCES.win.amd64 += Network/win/SrvIntNetR0A-win.asm
    881  ServicesR0_DEFS.win.amd64    += SUPDRV_WITH_UNWIND_HACK
     881 ServicesR0_DEFS.win.amd64    += RT_WITH_W64_UNWIND_HACK
    882882endif
    883883

  • trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

    r13421 r13435  
    33013301
    33023302
    3303 #ifdef SUPDRV_WITH_UNWIND_HACK
     3303#ifdef RT_WITH_W64_UNWIND_HACK
    33043304# if defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)
    33053305#  define INTNET_DECL_CALLBACK(type) DECLASM(DECLHIDDEN(type))
    … …  
    33133313
    33143314# else
    3315 #  error "UNSUPPORTED (SUPDRV_WITH_UNWIND_HACK)"
     3315#  error "UNSUPPORTED (RT_WITH_W64_UNWIND_HACK)"
    33163316# endif
    33173317#else

  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r13407 r13435  
    173173 VBoxDrv_DEFS        += VBOX_WITH_IDT_PATCHING
    174174endif
    175 VBoxDrv_DEFS.amd64    = SUPDRV_WITH_UNWIND_HACK
     175VBoxDrv_DEFS.amd64    = RT_WITH_W64_UNWIND_HACK
    176176VBoxDrv_SDKS          = W2K3DDK WINPSDKINCS
    177177VBoxDrv_INCS         := $(PATH_SUB_CURRENT)

  • trunk/src/VBox/HostDrivers/Support/SUPDrv.c

    r13317 r13435  
    152152static DECLCALLBACK(void) supdrvGipMpEvent(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvUser);
    153153
    154 #ifdef SUPDRV_WITH_UNWIND_HACK
     154#ifdef RT_WITH_W64_UNWIND_HACK
    155155DECLASM(int)    supdrvNtWrapVMMR0EntryEx(PFNRT pfnVMMR0EntryEx, PVM pVM, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession);
    156156DECLASM(int)    supdrvNtWrapVMMR0EntryFast(PFNRT pfnVMMR0EntryFast, PVM pVM, unsigned uOperation);
    … …  
    267267DECLASM(void)  UNWIND_WRAP(AssertMsg1)(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction);
    268268/* AssertMsg2             - can't wrap this buster. */
    269 #endif /* SUPDRV_WITH_UNWIND_HACK */
     269#endif /* RT_WITH_W64_UNWIND_HACK */
    270270
    271271
    … …  
    707707                     pObj, pObj->enmType, pObj->pvUser1, pObj->pvUser2, pObj->CreatorProcess, RTProcSelf(), pObj->pfnDestructor));
    708708                if (pObj->pfnDestructor)
    709 #ifdef SUPDRV_WITH_UNWIND_HACK
     709#ifdef RT_WITH_W64_UNWIND_HACK
    710710                    supdrvNtWrapObjDestructor((PFNRT)pObj->pfnDestructor, pObj, pObj->pvUser1, pObj->pvUser2);
    711711#else
    … …  
    871871        {
    872872            case SUP_IOCTL_FAST_DO_RAW_RUN:
    873 #ifdef SUPDRV_WITH_UNWIND_HACK
     873#ifdef RT_WITH_W64_UNWIND_HACK
    874874                supdrvNtWrapVMMR0EntryFast((PFNRT)pDevExt->pfnVMMR0EntryFast, pSession->pVM, SUP_VMMR0_DO_RAW_RUN);
    875875#else
    … …  
    878878                break;
    879879            case SUP_IOCTL_FAST_DO_HWACC_RUN:
    880 #ifdef SUPDRV_WITH_UNWIND_HACK
     880#ifdef RT_WITH_W64_UNWIND_HACK
    881881                supdrvNtWrapVMMR0EntryFast((PFNRT)pDevExt->pfnVMMR0EntryFast, pSession->pVM, SUP_VMMR0_DO_HWACC_RUN);
    882882#else
    … …  
    885885                break;
    886886            case SUP_IOCTL_FAST_DO_NOP:
    887 #ifdef SUPDRV_WITH_UNWIND_HACK
     887#ifdef RT_WITH_W64_UNWIND_HACK
    888888                supdrvNtWrapVMMR0EntryFast((PFNRT)pDevExt->pfnVMMR0EntryFast, pSession->pVM, SUP_VMMR0_DO_NOP);
    889889#else
    … …  
    12741274                /* execute */
    12751275                if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
    1276 #ifdef SUPDRV_WITH_UNWIND_HACK
     1276#ifdef RT_WITH_W64_UNWIND_HACK
    12771277                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.uOperation, NULL, pReq->u.In.u64Arg, pSession);
    12781278#else
    … …  
    12921292                /* execute */
    12931293                if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
    1294 #ifdef SUPDRV_WITH_UNWIND_HACK
     1294#ifdef RT_WITH_W64_UNWIND_HACK
    12951295                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.uOperation, pVMMReq, pReq->u.In.u64Arg, pSession);
    12961296#else
    … …  
    18631863             pObj, pObj->enmType, pObj->pvUser1, pObj->pvUser2, pObj->CreatorProcess, RTProcSelf(), pObj->pfnDestructor));
    18641864        if (pObj->pfnDestructor)
    1865 #ifdef SUPDRV_WITH_UNWIND_HACK
     1865#ifdef RT_WITH_W64_UNWIND_HACK
    18661866            supdrvNtWrapObjDestructor((PFNRT)pObj->pfnDestructor, pObj, pObj->pvUser1, pObj->pvUser2);
    18671867#else
    … …  
    28402840                &&  !memcmp(pCur->pFactory->szName, pszName, cchName))
    28412841            {
    2842 #ifdef SUPDRV_WITH_UNWIND_HACK
     2842#ifdef RT_WITH_W64_UNWIND_HACK
    28432843                void *pvFactory = supdrvNtWrapQueryFactoryInterface((PFNRT)pCur->pFactory->pfnQueryFactoryInterface, pCur->pFactory, pSession, pszInterfaceUuid);
    28442844#else
    … …  
    38593859    {
    38603860        Log(("supdrvIOCtl_LdrLoad: calling pfnModuleInit=%p\n", pImage->pfnModuleInit));
    3861 #ifdef SUPDRV_WITH_UNWIND_HACK
     3861#ifdef RT_WITH_W64_UNWIND_HACK
    38623862        rc = supdrvNtWrapModuleInit((PFNRT)pImage->pfnModuleInit);
    38633863#else
    … …  
    43334333    {
    43344334        LogFlow(("supdrvIOCtl_LdrLoad: calling pfnModuleTerm=%p\n", pImage->pfnModuleTerm));
    4335 #ifdef SUPDRV_WITH_UNWIND_HACK
     4335#ifdef RT_WITH_W64_UNWIND_HACK
    43364336        supdrvNtWrapModuleTerm(pImage->pfnModuleTerm);
    43374337#else

  • trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

    r12653 r13435  
    241241
    242242
    243 /** @def SUPDRV_WITH_UNWIND_HACK
     243/** @def RT_WITH_W64_UNWIND_HACK
    244244 * Changes a function name into the wrapped version if we've
    245245 * enabled the unwind hack.
    … …  
    250250 * we're doing here and get kind of confused and may BSOD. */
    251251#ifdef DOXYGEN_RUNNING
    252 # define SUPDRV_WITH_UNWIND_HACK
     252# define RT_WITH_W64_UNWIND_HACK
    253253#endif
    254254/** @def UNWIND_WRAP
    255  * If SUPDRV_WITH_UNWIND_HACK is defined, the name will be prefixed with
     255 * If RT_WITH_W64_UNWIND_HACK is defined, the name will be prefixed with
    256256 * 'supdrvNtWrap'.
    257257 * @param Name  The function to wrapper.  */
    258 #ifdef SUPDRV_WITH_UNWIND_HACK
     258#ifdef RT_WITH_W64_UNWIND_HACK
    259259# define UNWIND_WRAP(Name)  supdrvNtWrap##Name
    260260#else

  • trunk/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm

    r13421 r13435  
    4949
    5050
    51 %ifdef SUPDRV_WITH_UNWIND_HACK
     51%ifdef RT_WITH_W64_UNWIND_HACK
    5252 %ifdef RT_ARCH_AMD64
    5353
    … …  
    293293
    294294 %endif ; RT_ARCH_AMD64
    295 %endif ; SUPDRV_WITH_UNWIND_HACK
    296 
     295%endif ; RT_WITH_W64_UNWIND_HACK
     296

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

    r13421 r13435  
    3838VBoxNetFlt_LDFLAGS.win.amd64 = -Entry:DriverEntry
    3939VBoxNetFlt_SOURCES.win.amd64 += win/VBoxNetFltA-win.asm
    40 VBoxNetFlt_DEFS.win.amd64    += SUPDRV_WITH_UNWIND_HACK
     40VBoxNetFlt_DEFS.win.amd64    += RT_WITH_W64_UNWIND_HACK
    4141VBoxNetFlt_LIBS.win = \
    4242        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c

    r13421 r13435  
    374374}
    375375
    376 #ifdef SUPDRV_WITH_UNWIND_HACK
     376#ifdef RT_WITH_W64_UNWIND_HACK
    377377# if defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)
    378378#  define NETFLT_DECL_CALLBACK(type) DECLASM(DECLHIDDEN(type))
    … …  
    390390
    391391# else
    392 #  error "UNSUPPORTED (SUPDRV_WITH_UNWIND_HACK)"
     392#  error "UNSUPPORTED (RT_WITH_W64_UNWIND_HACK)"
    393393# endif
    394394#else
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