VirtualBox

Changeset 56286 in vbox for trunk


Ignore:
Timestamp:
Jun 9, 2015 11:06:39 AM (9 years ago)
Author:
vboxsync
Message:

Cleaned up all grep hits for 'VMMGC'.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/vmm.h

    r55863 r56286  
    535535 * @{
    536536 */
    537 VMMRCDECL(int)      VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...);
    538 VMMRCDECL(void)     VMMGCGuestToHost(PVM pVM, int rc);
    539 VMMRCDECL(void)     VMMGCLogFlushIfFull(PVM pVM);
     537VMMRCDECL(int)      VMMRCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...);
     538VMMRCDECL(void)     VMMRCGuestToHost(PVM pVM, int rc);
     539VMMRCDECL(void)     VMMRCLogFlushIfFull(PVM pVM);
    540540/** @} */
    541541#endif /* IN_RC */

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

    r56047 r56286  
    7878/** Drag in necessary library bits.
    7979 * The runtime lives here (in VMMR0.r0) and VBoxDD*R0.r0 links against us. */
    80 PFNRT g_VMMGCDeps[] =
     80PFNRT g_VMMR0Deps[] =
    8181{
    8282    (PFNRT)RTCrc32,

  • trunk/src/VBox/VMM/VMMR3/MM.cpp

    r55489 r56286  
    535300000000a0523000-00000000a0536000 00002aaab3d0c000 LOCKED  autofree         alloc once (PDM_DEVICE)
    545400000000a0522000-00000000a0523000                  DYNAMIC                  fence
    55 00000000a051e000-00000000a0522000 00002aaab36f5000 LOCKED  autofree         VBoxDD2GC.gc
     5500000000a051e000-00000000a0522000 00002aaab36f5000 LOCKED  autofree         VBoxDD2RC.rc
    565600000000a051d000-00000000a051e000                  DYNAMIC                  fence
    57 00000000a04eb000-00000000a051d000 00002aaab36c3000 LOCKED  autofree         VBoxDDGC.gc
     5700000000a04eb000-00000000a051d000 00002aaab36c3000 LOCKED  autofree         VBoxDDRC.rc
    585800000000a04ea000-00000000a04eb000                  DYNAMIC                  fence
    595900000000a04e9000-00000000a04ea000 00002aaab36c2000 LOCKED  autofree         ram range (High ROM Region)
    606000000000a04e8000-00000000a04e9000                  DYNAMIC                  fence
    61 00000000a040e000-00000000a04e8000 00002aaab2e6d000 LOCKED  autofree         VMMGC.gc
     6100000000a040e000-00000000a04e8000 00002aaab2e6d000 LOCKED  autofree         VMMRC.rc
    626200000000a0208000-00000000a040e000 00002aaab2c67000 LOCKED  autofree         alloc once (PATM)
    636300000000a01f7000-00000000a0208000 00002aaaab92d000 LOCKED  autofree         alloc once (SELM)

  • trunk/src/VBox/VMM/VMMR3/TRPM.cpp

    r56052 r56286  
    636636     * Get the trap handler addresses.
    637637     *
    638      * If VMMGC.gc is screwed, so are we. We'll assert here since it elsewise
     638     * If VMMRC.rc is screwed, so are we. We'll assert here since it elsewise
    639639     * would make init order impossible if we should assert the presence of these
    640640     * exports in TRPMR3Init().
    … …  
    643643    RT_ZERO(aRCPtrs);
    644644    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerInterupt", &aRCPtrs[TRPM_HANDLER_INT]);
    645     AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMGC.gc!\n"));
     645    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMRC.rc!\n"));
    646646
    647647    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerGeneric",  &aRCPtrs[TRPM_HANDLER_TRAP]);
    648     AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerGeneric in VMMGC.gc!\n"));
     648    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerGeneric in VMMRC.rc!\n"));
    649649
    650650    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerTrap08",   &aRCPtrs[TRPM_HANDLER_TRAP_08]);
    651     AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap08 in VMMGC.gc!\n"));
     651    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap08 in VMMRC.rc!\n"));
    652652
    653653    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerTrap12",   &aRCPtrs[TRPM_HANDLER_TRAP_12]);
    654     AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap12 in VMMGC.gc!\n"));
     654    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap12 in VMMRC.rc!\n"));
    655655
    656656    RTSEL SelCS = CPUMGetHyperCS(pVCpu);
    … …  
    11811181
    11821182    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerInterupt", &aGCPtrs[TRPM_HANDLER_INT]);
    1183     AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMGC.gc!\n"));
     1183    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMRC.rc!\n"));
    11841184
    11851185    if (    iTrap < TRPM_HANDLER_INT_BASE

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

    r56051 r56286  
    568568
    569569    /*
    570      * Call VMMGCInit():
     570     * Call VMMRCInit():
    571571     *      -# resolve the address.
    572572     *      -# setup stackframe and EIP to use the trampoline.
    … …  
    574574     */
    575575    RTRCPTR RCPtrEP;
    576     int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     576    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
    577577    if (RT_SUCCESS(rc))
    578578    {
    … …  
    583583        CPUMPushHyper(pVCpu, vmmGetBuildType());          /* Param 3: Version argument. */
    584584        CPUMPushHyper(pVCpu, VMMGetSvnRev());             /* Param 2: Version argument. */
    585         CPUMPushHyper(pVCpu, VMMGC_DO_VMMGC_INIT);        /* Param 1: Operation. */
     585        CPUMPushHyper(pVCpu, VMMRC_DO_VMMRC_INIT);        /* Param 1: Operation. */
    586586        CPUMPushHyper(pVCpu, pVM->pVMRC);                 /* Param 0: pVM */
    587587        CPUMPushHyper(pVCpu, 6 * sizeof(RTRCPTR));        /* trampoline param: stacksize.  */

  • trunk/src/VBox/VMM/VMMR3/VMMTests.cpp

    r56051 r56286  
    192192 * @param   uVariation  The testcase variation id.
    193193 */
    194 static int vmmR3DoGCTest(PVM pVM, VMMGCOPERATION enmTestcase, unsigned uVariation)
     194static int vmmR3DoGCTest(PVM pVM, VMMRCOPERATION enmTestcase, unsigned uVariation)
    195195{
    196196    PVMCPU pVCpu = &pVM->aCpus[0];
    197197
    198198    RTRCPTR RCPtrEP;
    199     int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     199    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
    200200    if (RT_FAILURE(rc))
    201201        return rc;
    … …  
    253253
    254254    RTRCPTR RCPtrEP;
    255     int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     255    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
    256256    if (RT_FAILURE(rc))
    257257        return rc;
    … …  
    260260    vmmR3TestClearStack(pVCpu);
    261261    CPUMPushHyper(pVCpu, uVariation);
    262     CPUMPushHyper(pVCpu, u8Trap + VMMGC_DO_TESTCASE_TRAP_FIRST);
     262    CPUMPushHyper(pVCpu, u8Trap + VMMRC_DO_TESTCASE_TRAP_FIRST);
    263263    CPUMPushHyper(pVCpu, pVM->pVMRC);
    264264    CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
    … …  
    346346
    347347    /*
    348      * Setup stack for calling VMMGCEntry().
     348     * Setup stack for calling VMMRCEntry().
    349349     */
    350350    RTRCPTR RCPtrEP;
    351     rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     351    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
    352352    if (RT_SUCCESS(rc))
    353353    {
    354         RTPrintf("VMM: VMMGCEntry=%RRv\n", RCPtrEP);
     354        RTPrintf("VMM: VMMRCEntry=%RRv\n", RCPtrEP);
    355355
    356356        /*
    … …  
    369369# endif
    370370        {
    371             /* see triple fault warnings in SELM and VMMGC.cpp. */
     371            /* see triple fault warnings in SELM and VMMRC.cpp. */
    372372            vmmR3DoTrapTest(pVM, 0x8, 1, VERR_TRPM_PANIC,       0x00000000, "vmmGCTestTrap8_FaultEIP", "#DF [#PG] WP");
    373373            SELMR3Relocate(pVM); /* this resets the busy flag of the Trap 08 TSS */
    … …  
    391391         * Set a debug register and perform a context switch.
    392392         */
    393         rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
     393        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
    394394        if (rc != VINF_SUCCESS)
    395395        {
    … …  
    405405        rc = DBGFR3BpSetReg(pUVM, &Addr, 0,  ~(uint64_t)0, X86_DR7_RW_EO, 1, &iBp0);
    406406        AssertReleaseRC(rc);
    407         rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
     407        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
    408408        if (rc != VINF_SUCCESS)
    409409        {
    … …  
    412412        }
    413413
    414         /* a bad one at VMMGCEntry */
    415         RTPrintf("VMM: testing hardware bp at VMMGCEntry (hit)\n");
     414        /* a bad one at VMMRCEntry */
     415        RTPrintf("VMM: testing hardware bp at VMMRCEntry (hit)\n");
    416416        DBGFR3AddrFromFlat(pUVM, &Addr, RCPtrEP);
    417417        RTUINT iBp1;
    418418        rc = DBGFR3BpSetReg(pUVM, &Addr, 0,  ~(uint64_t)0, X86_DR7_RW_EO, 1, &iBp1);
    419419        AssertReleaseRC(rc);
    420         rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
     420        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
    421421        if (rc != VINF_EM_DBG_HYPER_BREAKPOINT)
    422422        {
    423             RTPrintf("VMM: DR1=VMMGCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
     423            RTPrintf("VMM: DR1=VMMRCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
    424424            return RT_FAILURE(rc) ? rc : VERR_IPE_UNEXPECTED_INFO_STATUS;
    425425        }
    … …  
    436436
    437437        /* engage the breakpoint again and try single stepping. */
    438         RTPrintf("VMM: testing hardware bp at VMMGCEntry + stepping\n");
    439         rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
     438        RTPrintf("VMM: testing hardware bp at VMMRCEntry + stepping\n");
     439        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
    440440        if (rc != VINF_EM_DBG_HYPER_BREAKPOINT)
    441441        {
    442             RTPrintf("VMM: DR1=VMMGCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
     442            RTPrintf("VMM: DR1=VMMRCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
    443443            return RT_FAILURE(rc) ? rc : VERR_IPE_UNEXPECTED_INFO_STATUS;
    444444        }
    … …  
    474474            return VERR_GENERAL_FAILURE;
    475475        }
    476         rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
     476        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
    477477        if (rc != VINF_SUCCESS)
    478478        {
    … …  
    488488        {
    489489            uint64_t StartTick = ASMReadTSC();
    490             rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_INTERRUPT_MASKING, 0);
     490            rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_INTERRUPT_MASKING, 0);
    491491            if (rc != VINF_SUCCESS)
    492492            {
    … …  
    504504        CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
    505505        CPUMPushHyper(pVCpu, 0);
    506         CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HYPER_INTERRUPT);
     506        CPUMPushHyper(pVCpu, VMMRC_DO_TESTCASE_HYPER_INTERRUPT);
    507507        CPUMPushHyper(pVCpu, pVM->pVMRC);
    508508        CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
    … …  
    566566            CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
    567567            CPUMPushHyper(pVCpu, 0);
    568             CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_NOP);
     568            CPUMPushHyper(pVCpu, VMMRC_DO_TESTCASE_NOP);
    569569            CPUMPushHyper(pVCpu, pVM->pVMRC);
    570570            CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
    … …  
    608608    }
    609609    else
    610         AssertMsgFailed(("Failed to resolved VMMGC.gc::VMMGCEntry(), rc=%Rrc\n", rc));
     610        AssertMsgFailed(("Failed to resolved VMMRC.rc::VMMRCEntry(), rc=%Rrc\n", rc));
    611611#endif
    612612    return rc;
    … …  
    676676
    677677    /*
    678      * Setup stack for calling VMMGCEntry().
     678     * Setup stack for calling VMMRCEntry().
    679679     */
    680680    RTRCPTR RCPtrEP;
    681     rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     681    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
    682682    if (RT_SUCCESS(rc))
    683683    {
    684         RTPrintf("VMM: VMMGCEntry=%RRv\n", RCPtrEP);
     684        RTPrintf("VMM: VMMRCEntry=%RRv\n", RCPtrEP);
    685685
    686686        pHyperCtx = CPUMGetHyperCtxPtr(pVCpu);
    … …  
    707707            CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
    708708            CPUMPushHyper(pVCpu, 0);
    709             CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HM_NOP);
     709            CPUMPushHyper(pVCpu, VMMRC_DO_TESTCASE_HM_NOP);
    710710            CPUMPushHyper(pVCpu, pVM->pVMRC);
    711711            CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
    … …  
    751751    }
    752752    else
    753         AssertMsgFailed(("Failed to resolved VMMGC.gc::VMMGCEntry(), rc=%Rrc\n", rc));
     753        AssertMsgFailed(("Failed to resolved VMMRC.rc::VMMRCEntry(), rc=%Rrc\n", rc));
    754754
    755755    return rc;

  • trunk/src/VBox/VMM/VMMRC/TRPMRC.cpp

    r56013 r56286  
    8585    LogFlow(("TRPMGCHyperReturnToHost: rc=%Rrc\n", rc));
    8686    TRPMResetTrap(pVCpu);
    87     VMMGCGuestToHost(pVM, rc);
     87    VMMRCGuestToHost(pVM, rc);
    8888    AssertReleaseFailed();
    8989}

  • trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

    r56047 r56286  
    121121*******************************************************************************/
    122122RT_C_DECLS_BEGIN
    123 /** Defined in VMMGC0.asm or VMMGC99.asm.
     123/** Defined in VMMRC0.asm or VMMRC99.asm.
    124124 * @{ */
    125125extern const TRPMGCHYPER g_aTrap0bHandlers[1];

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

    r54308 r56286  
    5858 * @returns VBox status code.
    5959 * @param   pVM         Pointer to the VM.
    60  * @param   uOperation  Which operation to execute (VMMGCOPERATION).
     60 * @param   uOperation  Which operation to execute (VMMRCOPERATION).
    6161 * @param   uArg        Argument to that operation.
    6262 */
    63 VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
     63VMMRCDECL(int) VMMRCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
    6464{
    6565    /* todo */
    … …  
    6969         * Init RC modules.
    7070         */
    71         case VMMGC_DO_VMMGC_INIT:
     71        case VMMRC_DO_VMMRC_INIT:
    7272        {
    7373            /*
    … …  
    9292
    9393            int rc = RTRCInit(u64TS);
    94             Log(("VMMGCEntry: VMMGC_DO_VMMGC_INIT - uArg=%u (svn revision) u64TS=%RX64; rc=%Rrc\n", uArg, u64TS, rc));
     94            Log(("VMMRCEntry: VMMRC_DO_VMMRC_INIT - uArg=%u (svn revision) u64TS=%RX64; rc=%Rrc\n", uArg, u64TS, rc));
    9595            AssertRCReturn(rc, rc);
    9696
    … …  
    107107         * It spins for a while with interrupts enabled.
    108108         */
    109         case VMMGC_DO_TESTCASE_HYPER_INTERRUPT:
     109        case VMMRC_DO_TESTCASE_HYPER_INTERRUPT:
    110110        {
    111111            uint32_t volatile i = 0;
    … …  
    121121         * profiling of the switcher.
    122122         */
    123         case VMMGC_DO_TESTCASE_NOP:
     123        case VMMRC_DO_TESTCASE_NOP:
    124124            return 0;
    125125
    … …  
    127127         * Testcase executes a privileged instruction to force a world switch. (in both SVM & VMX)
    128128         */
    129         case VMMGC_DO_TESTCASE_HM_NOP:
     129        case VMMRC_DO_TESTCASE_HM_NOP:
    130130            ASMRdMsr_Low(MSR_IA32_SYSENTER_CS);
    131131            return 0;
    … …  
    134134         * Delay for ~100us.
    135135         */
    136         case VMMGC_DO_TESTCASE_INTERRUPT_MASKING:
     136        case VMMRC_DO_TESTCASE_INTERRUPT_MASKING:
    137137        {
    138138            uint64_t u64MaxTicks = (SUPGetCpuHzFromGip(g_pSUPGlobalInfoPage) != ~(uint64_t)0
    … …  
    162162         */
    163163        default:
    164             if (    uOperation >= VMMGC_DO_TESTCASE_TRAP_FIRST
    165                 &&  uOperation < VMMGC_DO_TESTCASE_TRAP_LAST)
     164            if (    uOperation >= VMMRC_DO_TESTCASE_TRAP_FIRST
     165                &&  uOperation < VMMRC_DO_TESTCASE_TRAP_LAST)
    166166                return vmmGCTest(pVM, uOperation, uArg);
    167167            return VERR_INVALID_PARAMETER;
    … …  
    192192 * @param   pVM             Pointer to the VM.
    193193 */
    194 VMMRCDECL(void) VMMGCLogFlushIfFull(PVM pVM)
     194VMMRCDECL(void) VMMRCLogFlushIfFull(PVM pVM)
    195195{
    196196    if (    pVM->vmm.s.pRCLoggerRC
    … …  
    210210 * @param   rc          The status code.
    211211 */
    212 VMMRCDECL(void) VMMGCGuestToHost(PVM pVM, int rc)
     212VMMRCDECL(void) VMMRCGuestToHost(PVM pVM, int rc)
    213213{
    214214    pVM->vmm.s.pfnRCToHost(rc);
    … …  
    273273    switch (uOperation)
    274274    {
    275         //case VMMGC_DO_TESTCASE_TRAP_0:
    276         //case VMMGC_DO_TESTCASE_TRAP_1:
    277         //case VMMGC_DO_TESTCASE_TRAP_2:
    278 
    279         case VMMGC_DO_TESTCASE_TRAP_3:
     275        //case VMMRC_DO_TESTCASE_TRAP_0:
     276        //case VMMRC_DO_TESTCASE_TRAP_1:
     277        //case VMMRC_DO_TESTCASE_TRAP_2:
     278
     279        case VMMRC_DO_TESTCASE_TRAP_3:
    280280        {
    281281            if (uArg <= 1)
    … …  
    284284        }
    285285
    286         //case VMMGC_DO_TESTCASE_TRAP_4:
    287         //case VMMGC_DO_TESTCASE_TRAP_5:
    288         //case VMMGC_DO_TESTCASE_TRAP_6:
    289         //case VMMGC_DO_TESTCASE_TRAP_7:
    290 
    291         case VMMGC_DO_TESTCASE_TRAP_8:
     286        //case VMMRC_DO_TESTCASE_TRAP_4:
     287        //case VMMRC_DO_TESTCASE_TRAP_5:
     288        //case VMMRC_DO_TESTCASE_TRAP_6:
     289        //case VMMRC_DO_TESTCASE_TRAP_7:
     290
     291        case VMMRC_DO_TESTCASE_TRAP_8:
    292292        {
    293293#ifndef DEBUG_bird /** @todo dynamic check that this won't triple fault... */
    … …  
    300300        }
    301301
    302         //VMMGC_DO_TESTCASE_TRAP_9,
    303         //VMMGC_DO_TESTCASE_TRAP_0A,
    304         //VMMGC_DO_TESTCASE_TRAP_0B,
    305         //VMMGC_DO_TESTCASE_TRAP_0C,
    306 
    307         case VMMGC_DO_TESTCASE_TRAP_0D:
     302        //VMMRC_DO_TESTCASE_TRAP_9,
     303        //VMMRC_DO_TESTCASE_TRAP_0A,
     304        //VMMRC_DO_TESTCASE_TRAP_0B,
     305        //VMMRC_DO_TESTCASE_TRAP_0C,
     306
     307        case VMMRC_DO_TESTCASE_TRAP_0D:
    308308        {
    309309            if (uArg <= 1)
    … …  
    312312        }
    313313
    314         case VMMGC_DO_TESTCASE_TRAP_0E:
     314        case VMMRC_DO_TESTCASE_TRAP_0E:
    315315        {
    316316            if (uArg <= 1)

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

    r55028 r56286  
    11; $Id$
    22;; @file
    3 ; VMMGC - Raw-mode Context Assembly Macros.
     3; VMMRC - Raw-mode Context Assembly Macros.
    44;
    55
    66;
    7 ; Copyright (C) 2006-2012 Oracle Corporation
     7; Copyright (C) 2006-2015 Oracle Corporation
    88;
    99; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616;
    1717
    18 %ifndef __VMMGC_mac__
    19 %define __VMMGC_mac__
     18%ifndef __VMMRC_mac__
     19%define __VMMRC_mac__
    2020
    2121%include "VBox/asmdefs.mac"

  • trunk/src/VBox/VMM/VMMRC/VMMRCA.asm

    r49893 r56286  
    11; $Id$
    22;; @file
    3 ; VMMGC - Raw-mode Context Virtual Machine Monitor assembly routines.
    4 ;
    5 
    6 ;
    7 ; Copyright (C) 2006-2012 Oracle Corporation
     3; VMMRC - Raw-mode Context Virtual Machine Monitor assembly routines.
     4;
     5
     6;
     7; Copyright (C) 2006-2015 Oracle Corporation
    88;
    99; This file is part of VirtualBox Open Source Edition (OSE), as

  • trunk/src/VBox/VMM/VMMRC/VMMRCDeps.cpp

    r44528 r56286  
    11/* $Id$ */
    22/** @file
    3  * VMMGC Runtime Dependencies.
     3 * VMMRC Runtime Dependencies.
    44 */
    55
    … …  
    2626#endif // RT_OS_SOLARIS || RT_OS_FREEBSD
    2727
    28 PFNRT g_VMMGCDeps[] =
     28PFNRT g_VMMRCDeps[] =
    2929{
    3030    (PFNRT)memset,

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

    r55229 r56286  
    6262%define CPUM_HANDLER_TYPEMASK           0ffh
    6363%define CPUM_HANDLER_CTXCORE_IN_EBP     RT_BIT(31)
    64 
    65 %define VMMGCRET_USED_FPU               040000000h
    6664
    6765

  • trunk/src/VBox/VMM/include/VMMInternal.h

    r56047 r56286  
    465465
    466466/**
    467  * The VMMGCEntry() codes.
    468  */
    469 typedef enum VMMGCOPERATION
     467 * The VMMRCEntry() codes.
     468 */
     469typedef enum VMMRCOPERATION
    470470{
    471471    /** Do GC module init. */
    472     VMMGC_DO_VMMGC_INIT = 1,
     472    VMMRC_DO_VMMRC_INIT = 1,
    473473
    474474    /** The first Trap testcase. */
    475     VMMGC_DO_TESTCASE_TRAP_FIRST = 0x0dead000,
     475    VMMRC_DO_TESTCASE_TRAP_FIRST = 0x0dead000,
    476476    /** Trap 0 testcases, uArg selects the variation. */
    477     VMMGC_DO_TESTCASE_TRAP_0 = VMMGC_DO_TESTCASE_TRAP_FIRST,
     477    VMMRC_DO_TESTCASE_TRAP_0 = VMMRC_DO_TESTCASE_TRAP_FIRST,
    478478    /** Trap 1 testcases, uArg selects the variation. */
    479     VMMGC_DO_TESTCASE_TRAP_1,
     479    VMMRC_DO_TESTCASE_TRAP_1,
    480480    /** Trap 2 testcases, uArg selects the variation. */
    481     VMMGC_DO_TESTCASE_TRAP_2,
     481    VMMRC_DO_TESTCASE_TRAP_2,
    482482    /** Trap 3 testcases, uArg selects the variation. */
    483     VMMGC_DO_TESTCASE_TRAP_3,
     483    VMMRC_DO_TESTCASE_TRAP_3,
    484484    /** Trap 4 testcases, uArg selects the variation. */
    485     VMMGC_DO_TESTCASE_TRAP_4,
     485    VMMRC_DO_TESTCASE_TRAP_4,
    486486    /** Trap 5 testcases, uArg selects the variation. */
    487     VMMGC_DO_TESTCASE_TRAP_5,
     487    VMMRC_DO_TESTCASE_TRAP_5,
    488488    /** Trap 6 testcases, uArg selects the variation. */
    489     VMMGC_DO_TESTCASE_TRAP_6,
     489    VMMRC_DO_TESTCASE_TRAP_6,
    490490    /** Trap 7 testcases, uArg selects the variation. */
    491     VMMGC_DO_TESTCASE_TRAP_7,
     491    VMMRC_DO_TESTCASE_TRAP_7,
    492492    /** Trap 8 testcases, uArg selects the variation. */
    493     VMMGC_DO_TESTCASE_TRAP_8,
     493    VMMRC_DO_TESTCASE_TRAP_8,
    494494    /** Trap 9 testcases, uArg selects the variation. */
    495     VMMGC_DO_TESTCASE_TRAP_9,
     495    VMMRC_DO_TESTCASE_TRAP_9,
    496496    /** Trap 0a testcases, uArg selects the variation. */
    497     VMMGC_DO_TESTCASE_TRAP_0A,
     497    VMMRC_DO_TESTCASE_TRAP_0A,
    498498    /** Trap 0b testcases, uArg selects the variation. */
    499     VMMGC_DO_TESTCASE_TRAP_0B,
     499    VMMRC_DO_TESTCASE_TRAP_0B,
    500500    /** Trap 0c testcases, uArg selects the variation. */
    501     VMMGC_DO_TESTCASE_TRAP_0C,
     501    VMMRC_DO_TESTCASE_TRAP_0C,
    502502    /** Trap 0d testcases, uArg selects the variation. */
    503     VMMGC_DO_TESTCASE_TRAP_0D,
     503    VMMRC_DO_TESTCASE_TRAP_0D,
    504504    /** Trap 0e testcases, uArg selects the variation. */
    505     VMMGC_DO_TESTCASE_TRAP_0E,
     505    VMMRC_DO_TESTCASE_TRAP_0E,
    506506    /** The last trap testcase (exclusive). */
    507     VMMGC_DO_TESTCASE_TRAP_LAST,
     507    VMMRC_DO_TESTCASE_TRAP_LAST,
    508508    /** Testcase for checking interrupt forwarding. */
    509     VMMGC_DO_TESTCASE_HYPER_INTERRUPT,
     509    VMMRC_DO_TESTCASE_HYPER_INTERRUPT,
    510510    /** Switching testing and profiling stub. */
    511     VMMGC_DO_TESTCASE_NOP,
     511    VMMRC_DO_TESTCASE_NOP,
    512512    /** Testcase for checking interrupt masking.. */
    513     VMMGC_DO_TESTCASE_INTERRUPT_MASKING,
     513    VMMRC_DO_TESTCASE_INTERRUPT_MASKING,
    514514    /** Switching testing and profiling stub. */
    515     VMMGC_DO_TESTCASE_HM_NOP,
     515    VMMRC_DO_TESTCASE_HM_NOP,
    516516
    517517    /** The usual 32-bit hack. */
    518     VMMGC_DO_32_BIT_HACK = 0x7fffffff
    519 } VMMGCOPERATION;
     518    VMMRC_DO_32_BIT_HACK = 0x7fffffff
     519} VMMRCOPERATION;
    520520
    521521
    … …  
    551551/**
    552552 * World switcher assembly routine.
    553  * It will call VMMGCEntry().
    554  *
    555  * @returns return code from VMMGCEntry().
     553 * It will call VMMRCEntry().
     554 *
     555 * @returns return code from VMMRCEntry().
    556556 * @param   pVM     Pointer to the VM.
    557  * @param   uArg    See VMMGCEntry().
     557 * @param   uArg    See VMMRCEntry().
    558558 * @internal
    559559 */
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