VirtualBox

Changeset 41736 in vbox for trunk/src/VBox/VMM


Ignore:
Timestamp:
Jun 15, 2012 12:39:37 AM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
78544
Message:

DISCPUMODE: s/mode/uCpuMode/ - found and removed a bunch of uncessary cpu mode setting before calilng the API.

Location:
trunk/src/VBox/VMM
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/VMMAll/EMAll.cpp

    r41735 r41736  
    364364        State.GCPtr = NIL_RTGCPTR;
    365365    }
    366     return DISInstrWithReader(InstrGC, (DISCPUMODE)pDis->mode, emReadBytes, &State, pDis, pOpsize);
     366    return DISInstrWithReader(InstrGC, (DISCPUMODE)pDis->uCpuMode, emReadBytes, &State, pDis, pOpsize);
    367367}
    368368
    … …  
    377377    State.GCPtr = InstrGC;
    378378
    379     return DISInstrWithReader(InstrGC, (DISCPUMODE)pDis->mode, emReadBytes, &State, pDis, pOpsize);
     379    return DISInstrWithReader(InstrGC, (DISCPUMODE)pDis->uCpuMode, emReadBytes, &State, pDis, pOpsize);
    380380}
    381381
    … …  
    503503        uint32_t     cbOp;
    504504        PDISCPUSTATE pDis = &pVCpu->em.s.DisState;
    505         pDis->mode = SELMGetCpuModeFromSelector(pVCpu, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid);
     505        pDis->uCpuMode = SELMGetCpuModeFromSelector(pVCpu, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid);
    506506        rc = emDisCoreOne(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, (RTGCUINTPTR)pbCode, &cbOp);
    507507        if (RT_SUCCESS(rc))
    … …  
    557557        uint32_t     cbOp;
    558558        PDISCPUSTATE pDis = &pVCpu->em.s.DisState;
    559         pDis->mode = SELMGetCpuModeFromSelector(pVCpu, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid);
     559        pDis->uCpuMode = SELMGetCpuModeFromSelector(pVCpu, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid);
    560560        rc = emDisCoreOne(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, (RTGCUINTPTR)pbCode, &cbOp);
    561561        if (RT_SUCCESS(rc))
    … …  
    10091009static int emInterpretPop(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
    10101010{
    1011     Assert(pDis->mode != DISCPUMODE_64BIT);    /** @todo check */
     1011    Assert(pDis->uCpuMode != DISCPUMODE_64BIT);    /** @todo check */
    10121012    DISQPVPARAMVAL param1;
    10131013    NOREF(pvFault);
    … …  
    15611561            }
    15621562#ifdef LOG_ENABLED
    1563             if (pDis->mode == DISCPUMODE_64BIT)
     1563            if (pDis->uCpuMode == DISCPUMODE_64BIT)
    15641564                LogFlow(("EMInterpretInstruction at %RGv: OP_MOV %RGv <- %RX64 (%d) &val64=%RHv\n", (RTGCPTR)pRegFrame->rip, pDest, val64, param2.size, &val64));
    15651565            else
    … …  
    16241624            }
    16251625#ifdef LOG_ENABLED
    1626             if (pDis->mode == DISCPUMODE_64BIT)
     1626            if (pDis->uCpuMode == DISCPUMODE_64BIT)
    16271627                LogFlow(("EMInterpretInstruction: OP_MOV %RGv -> %RX64 (%d)\n", pSrc, val64, param1.size));
    16281628            else
    … …  
    18701870static int emInterpretCmpXchg8b(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
    18711871{
    1872     Assert(pDis->mode != DISCPUMODE_64BIT);    /** @todo check */
     1872    Assert(pDis->uCpuMode != DISCPUMODE_64BIT);    /** @todo check */
    18731873    DISQPVPARAMVAL param1;
    18741874    NOREF(pvFault);
    … …  
    19241924static int emInterpretXAdd(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
    19251925{
    1926     Assert(pDis->mode != DISCPUMODE_64BIT);    /** @todo check */
     1926    Assert(pDis->uCpuMode != DISCPUMODE_64BIT);    /** @todo check */
    19271927    DISQPVPARAMVAL param1;
    19281928    void *pvParamReg2;

  • trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

    r41734 r41736  
    107107            rc = EMInterpretDisasOne(pVM, pVCpu, pRegFrame, pDis, &cbOp);
    108108            if (     RT_SUCCESS(rc)
    109                 &&   pDis->mode == DISCPUMODE_32BIT  /** @todo why does this matter? */
     109                &&   pDis->uCpuMode == DISCPUMODE_32BIT  /** @todo why does this matter? */
    110110                &&  !(pDis->fPrefix & (DISPREFIX_REPNE | DISPREFIX_REP | DISPREFIX_SEG)))
    111111            {

  • trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

    r41735 r41736  
    797797               )
    798798            {
    799                 Assert(pDis->mode == DISCPUMODE_64BIT);
     799                Assert(pDis->uCpuMode == DISCPUMODE_64BIT);
    800800
    801801                Log(("pgmPoolMonitorIsReused: OP_STOSQ\n"));
    … …  
    890890    NOREF(pVM);
    891891
    892     Assert(pDis->mode == DISCPUMODE_32BIT || pDis->mode == DISCPUMODE_64BIT);
     892    Assert(pDis->uCpuMode == DISCPUMODE_32BIT || pDis->uCpuMode == DISCPUMODE_64BIT);
    893893    Assert(pRegFrame->rcx <= 0x20);
    894894
    … …  
    11981198        if (    pDis->pCurInstr->opcode == OP_STOSWD
    11991199            &&  !pRegFrame->eflags.Bits.u1DF
    1200             &&  pDis->uOpMode == pDis->mode
    1201             &&  pDis->uAddrMode == pDis->mode)
     1200            &&  pDis->uOpMode == pDis->uCpuMode
     1201            &&  pDis->uAddrMode == pDis->uCpuMode)
    12021202        {
    12031203            bool fValidStosd = false;
    12041204
    1205             if (    pDis->mode == DISCPUMODE_32BIT
     1205            if (    pDis->uCpuMode == DISCPUMODE_32BIT
    12061206                &&  pDis->fPrefix == DISPREFIX_REP
    12071207                &&  pRegFrame->ecx <= 0x20
    … …  
    12151215            }
    12161216            else
    1217             if (    pDis->mode == DISCPUMODE_64BIT
     1217            if (    pDis->uCpuMode == DISCPUMODE_64BIT
    12181218                &&  pDis->fPrefix == (DISPREFIX_REP | DISPREFIX_REX)
    12191219                &&  pRegFrame->rcx <= 0x20

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

    r41735 r41736  
    29822982            PDISCPUSTATE pDis = &pVCpu->hwaccm.s.DisState;
    29832983
    2984             pDis->mode = enmMode;
     2984            pDis->uCpuMode = enmMode;
    29852985            rc = EMInterpretDisasOneEx(pVM, pVCpu, pbCode, pRegFrame, pDis, &cbOp);
    29862986            Assert(RT_FAILURE(rc) || pDis->pCurInstr->opcode == OP_INVLPG);

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

    r41734 r41736  
    31893189    PPATCHINFO pPatch = &pPatchRec->patch;
    31903190    int rc = VERR_PATCHING_REFUSED;
    3191     DISCPUSTATE cpu;
    31923191    uint32_t orgOffsetPatchMem = ~0;
    31933192    bool fInserted;
    … …  
    32153214    pPatch->pPatchBlockOffset = pVM->patm.s.offPatchMem;
    32163215    pPatch->uCurPatchOffset   = 0;
    3217 
    3218     cpu.mode = (pPatch->flags & PATMFL_CODE32) ? DISCPUMODE_32BIT : DISCPUMODE_16BIT;
    32193216
    32203217    /* Note: Set the PATM interrupt flag here; it was cleared before the patched call. (!!!) */
    … …  
    64536450        if (disret && (cpu.pCurInstr->opcode == OP_SYSEXIT || cpu.pCurInstr->opcode == OP_HLT || cpu.pCurInstr->opcode == OP_INT3))
    64546451        {
    6455             cpu.mode = (pPatch->patch.flags & PATMFL_CODE32) ? DISCPUMODE_32BIT : DISCPUMODE_16BIT;
    64566452            disret = patmR3DisInstr(pVM, &pPatch->patch, pNewEip, PATMGCVirtToHCVirt(pVM, &cacheRec, pNewEip), PATMREAD_RAWCODE,
    64576453                                    &cpu, &cbInstr);

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

    r41692 r41736  
    510510            }
    511511
    512             cpu.mode = SELMGetCpuModeFromSelector(VMMGetCpu0(pVM), pRegFrame->eflags, pRegFrame->cs, 0);
    513             if (cpu.mode != DISCPUMODE_32BIT)
     512            DISCPUMODE enmCpuMode = SELMGetCpuModeFromSelector(VMMGetCpu0(pVM), pRegFrame->eflags, pRegFrame->cs, 0);
     513            if (enmCpuMode != DISCPUMODE_32BIT)
    514514            {
    515515                AssertFailed();
    … …  
    523523            rc = VBOXSTRICTRC_TODO(rcStrict);
    524524#else
    525             rc = DISInstr(&pRec->patch.aPrivInstr[0], (DISCPUMODE)cpu.mode, &cpu, &cbOp);
     525            rc = DISInstr(&pRec->patch.aPrivInstr[0], enmCpuMode, &cpu, &cbOp);
    526526            if (RT_FAILURE(rc))
    527527            {
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