VirtualBox

Changeset 13819 in vbox for trunk/src/VBox/VMM/VMMAll


Ignore:
Timestamp:
Nov 4, 2008 11:14:51 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
38810
Message:

VMM: %VH* -> %RH*.

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

Legend:

Unmodified
Added
Removed

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

    r13818 r13819  
    11921192#ifdef LOG_ENABLED
    11931193            if (pCpu->mode == CPUMODE_64BIT)
    1194                 LogFlow(("EMInterpretInstruction at %VGv: OP_MOV %VGv <- %RX64 (%d) &val32=%VHv\n", pRegFrame->rip, pDest, val64, param2.size, &val64));
     1194                LogFlow(("EMInterpretInstruction at %VGv: OP_MOV %VGv <- %RX64 (%d) &val64=%RHv\n", pRegFrame->rip, pDest, val64, param2.size, &val64));
    11951195            else
    1196                 LogFlow(("EMInterpretInstruction at %VGv: OP_MOV %VGv <- %08X  (%d) &val32=%VHv\n", pRegFrame->rip, pDest, (uint32_t)val64, param2.size, &val64));
     1196                LogFlow(("EMInterpretInstruction at %VGv: OP_MOV %VGv <- %08X  (%d) &val64=%RHv\n", pRegFrame->rip, pDest, (uint32_t)val64, param2.size, &val64));
    11971197#endif
    11981198

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

    r12989 r13819  
    162162        {
    163163            STAM_COUNTER_INC(&pVM->mm.s.CTX_SUFF(pPagePool)->cErrors);
    164             AssertMsg(pvPage, ("Invalid HCPhysPage=%VHp specified\n", HCPhysPage));
     164            AssertMsg(pvPage, ("Invalid HCPhysPage=%RHp specified\n", HCPhysPage));
    165165        }
    166166    }
    … …  
    189189        {
    190190            STAM_COUNTER_INC(&pVM->mm.s.CTX_SUFF(pPagePool)->cErrors);
    191             AssertMsg(pvPage, ("Invalid HCPhysPage=%VHp specified\n", HCPhysPage));
     191            AssertMsg(pvPage, ("Invalid HCPhysPage=%RHp specified\n", HCPhysPage));
    192192            return VERR_INVALID_POINTER;
    193193        }

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

    r13818 r13819  
    18371837     */
    18381838    RTHCPHYS HCPhys = PGM_PAGE_GET_HCPHYS(&pRam->aPages[(GCPhys - pRam->GCPhys) >> PAGE_SHIFT]);
    1839     //Log(("PGMDynMapGCPage: GCPhys=%VGp HCPhys=%VHp\n", GCPhys, HCPhys));
     1839    //Log(("PGMDynMapGCPage: GCPhys=%VGp HCPhys=%RHp\n", GCPhys, HCPhys));
    18401840    return PGMDynMapHCPage(pVM, HCPhys, ppv);
    18411841}
    … …  
    19271927        *ppv = pv;
    19281928        STAM_COUNTER_INC(&pVM->pgm.s.StatRCDynMapCacheHits);
    1929         //Log(("PGMGCDynMapHCPage: HCPhys=%VHp pv=%VGv iPage=%d iCache=%d\n", HCPhys, pv, iPage, iCache));
     1929        //Log(("PGMGCDynMapHCPage: HCPhys=%RHp pv=%VGv iPage=%d iCache=%d\n", HCPhys, pv, iPage, iCache));
    19301930        return VINF_SUCCESS;
    19311931    }
    … …  
    19471947    *ppv = pv;
    19481948    ASMInvalidatePage(pv);
    1949     Log4(("PGMGCDynMapHCPage: HCPhys=%VHp pv=%VGv iPage=%d\n", HCPhys, pv, iPage));
     1949    Log4(("PGMGCDynMapHCPage: HCPhys=%RHp pv=%VGv iPage=%d\n", HCPhys, pv, iPage));
    19501950    return VINF_SUCCESS;
    19511951

  • trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

    r13818 r13819  
    13101310# ifdef PGMPOOL_WITH_GCPHYS_TRACKING
    13111311    STAM_PROFILE_START(&pVM->pgm.s.StatTrackDeref, a);
    1312     LogFlow(("SyncPageWorkerTrackDeref: Damn HCPhys=%VHp pShwPage->idx=%#x!!!\n", HCPhys, pShwPage->idx));
     1312    LogFlow(("SyncPageWorkerTrackDeref: Damn HCPhys=%RHp pShwPage->idx=%#x!!!\n", HCPhys, pShwPage->idx));
    13131313
    13141314    /** @todo If this turns out to be a bottle neck (*very* likely) two things can be done:
    … …  
    13391339
    13401340    for (;;)
    1341         AssertReleaseMsgFailed(("HCPhys=%VHp wasn't found!\n", HCPhys));
     1341        AssertReleaseMsgFailed(("HCPhys=%RHp wasn't found!\n", HCPhys));
    13421342# else  /* !PGMPOOL_WITH_GCPHYS_TRACKING */
    13431343    pShwPage->cPresent--;
    … …  
    13771377
    13781378    /* write back, trying to be clever... */
    1379     Log2(("SyncPageWorkerTrackAddRef: u16=%#x pPage->HCPhys=%VHp->%VHp iPTDst=%#x\n",
     1379    Log2(("SyncPageWorkerTrackAddRef: u16=%#x pPage->HCPhys=%RHp->%RHp iPTDst=%#x\n",
    13801380          u16, pPage->HCPhys, (pPage->HCPhys & MM_RAM_FLAGS_NO_REFS_MASK) | ((uint64_t)u16 << MM_RAM_FLAGS_CREFS_SHIFT), iPTDst));
    13811381    *((uint16_t *)&pPage->HCPhys + 3) = u16; /** @todo PAGE FLAGS */
    … …  
    36603660    HCPhys = NIL_RTHCPHYS;
    36613661    rc = pgmRamGCPhys2HCPhys(pPGM, cr3 & GST_CR3_PAGE_MASK, &HCPhys);
    3662     AssertMsgReturn(HCPhys == HCPhysShw, ("HCPhys=%VHp HCPhyswShw=%VHp (cr3)\n", HCPhys, HCPhysShw), false);
     3662    AssertMsgReturn(HCPhys == HCPhysShw, ("HCPhys=%RHp HCPhyswShw=%RHp (cr3)\n", HCPhys, HCPhysShw), false);
    36633663#  if PGM_GST_TYPE == PGM_TYPE_32BIT && defined(IN_RING3)
    36643664    RTGCPHYS GCPhys;
    … …  
    40374037                            else if (HCPhysShw != (HCPhys & SHW_PTE_PG_MASK))
    40384038                            {
    4039                                 AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%VHp HCPhys=%VHp GCPhysGst=%VGp PteSrc=%#RX64 PteDst=%#RX64\n",
     4039                                AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%RHp HCPhys=%RHp GCPhysGst=%VGp PteSrc=%#RX64 PteDst=%#RX64\n",
    40404040                                                GCPtr + off, HCPhysShw, HCPhys, GCPhysGst, (uint64_t)PteSrc.u, (uint64_t)PteDst.u));
    40414041                                cErrors++;
    … …  
    40664066                            else if (HCPhysShw != (PGM_PAGE_GET_HCPHYS(pPhysPage) & SHW_PTE_PG_MASK))
    40674067                            {
    4068                                 AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%VHp HCPhys=%VHp GCPhysGst=%VGp PteSrc=%#RX64 PteDst=%#RX64\n",
     4068                                AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%RHp HCPhys=%RHp GCPhysGst=%VGp PteSrc=%#RX64 PteDst=%#RX64\n",
    40694069                                                GCPtr + off, HCPhysShw, pPhysPage->HCPhys, GCPhysGst, (uint64_t)PteSrc.u, (uint64_t)PteDst.u));
    40704070                                cErrors++;
    … …  
    40904090                                    if (PteDst.n.u1Present)
    40914091                                    {
    4092                                         AssertMsgFailed(("ALL access flagged at %VGv but the page is present! HCPhys=%VHp PteSrc=%#RX64 PteDst=%#RX64\n",
     4092                                        AssertMsgFailed(("ALL access flagged at %VGv but the page is present! HCPhys=%RHp PteSrc=%#RX64 PteDst=%#RX64\n",
    40934093                                                        GCPtr + off, pPhysPage->HCPhys, (uint64_t)PteSrc.u, (uint64_t)PteDst.u));
    40944094                                        cErrors++;
    … …  
    42664266                            else if (HCPhysShw != (HCPhys & X86_PTE_PAE_PG_MASK))
    42674267                            {
    4268                                 AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%VHp HCPhys=%VHp GCPhysGst=%VGp PdeSrc=%#RX64 PteDst=%#RX64\n",
     4268                                AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%RHp HCPhys=%RHp GCPhysGst=%VGp PdeSrc=%#RX64 PteDst=%#RX64\n",
    42694269                                                GCPtr + off, HCPhysShw, HCPhys, GCPhysGst, (uint64_t)PdeSrc.u, (uint64_t)PteDst.u));
    42704270                                cErrors++;
    … …  
    42944294                            else if (HCPhysShw != (pPhysPage->HCPhys & X86_PTE_PAE_PG_MASK))
    42954295                            {
    4296                                 AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%VHp HCPhys=%VHp GCPhysGst=%VGp PdeSrc=%#RX64 PteDst=%#RX64\n",
     4296                                AssertMsgFailed(("Out of sync (phys) at %VGv! HCPhysShw=%RHp HCPhys=%RHp GCPhysGst=%VGp PdeSrc=%#RX64 PteDst=%#RX64\n",
    42974297                                                GCPtr + off, HCPhysShw, pPhysPage->HCPhys, GCPhysGst, (uint64_t)PdeSrc.u, (uint64_t)PteDst.u));
    42984298                                cErrors++;

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

    r13818 r13819  
    953953            pPage->HCPhys = pPageRemap->HCPhys;
    954954
    955             LogFlow(("PGMHandlerPhysicalPageAlias %VGp -> %VGp - %VHp\n", GCPhysPage, GCPhysPageRemap, pPageRemap->HCPhys));
     955            LogFlow(("PGMHandlerPhysicalPageAlias %VGp -> %VGp - %RHp\n", GCPhysPage, GCPhysPageRemap, pPageRemap->HCPhys));
    956956            PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, PGM_PAGE_HNDL_PHYS_STATE_DISABLED);
    957957#ifndef IN_GC
    … …  
    13871387        if (PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) < uState)
    13881388        {
    1389             AssertMsgFailed(("virt handler state mismatch. HCPhys=%VHp GCPhysGst=%VGp iPage=%#x %VGv state=%d expected>=%d %s\n",
     1389            AssertMsgFailed(("virt handler state mismatch. HCPhys=%RHp GCPhysGst=%VGp iPage=%#x %VGv state=%d expected>=%d %s\n",
    13901390                             pPage->HCPhys, GCPhysGst, iPage, GCPtr, PGM_PAGE_GET_HNDL_VIRT_STATE(pPage), uState, R3STRING(pVirt->pszDesc)));
    13911391            pState->cErrors++;

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

    r13818 r13819  
    317317#  ifdef PGMPOOL_WITH_GCPHYS_TRACKING
    318318                    PCX86PTE pGstPte = (PCX86PTE)pgmPoolMonitorGCPtr2CCPtr(pPool, pvAddress, GCPhysFault, sizeof(*pGstPte));
    319                     Log4(("pgmPoolMonitorChainChanging 32_32: deref %VHp GCPhys %VGp\n", uShw.pPT->a[iShw].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PG_MASK));
     319                    Log4(("pgmPoolMonitorChainChanging 32_32: deref %RHp GCPhys %VGp\n", uShw.pPT->a[iShw].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PG_MASK));
    320320                    pgmPoolTracDerefGCPhysHint(pPool, pPage,
    321321                                               uShw.pPT->a[iShw].u & X86_PTE_PAE_PG_MASK,
    … …  
    336336#  ifdef PGMPOOL_WITH_GCPHYS_TRACKING
    337337                        PCX86PTE pGstPte = (PCX86PTE)pgmPoolMonitorGCPtr2CCPtr(pPool, pvAddress, GCPhysFault, sizeof(*pGstPte));
    338                         Log4(("pgmPoolMonitorChainChanging pae_32: deref %VHp GCPhys %VGp\n", uShw.pPT->a[iShw].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PG_MASK));
     338                        Log4(("pgmPoolMonitorChainChanging pae_32: deref %RHp GCPhys %VGp\n", uShw.pPT->a[iShw].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PG_MASK));
    339339                        pgmPoolTracDerefGCPhysHint(pPool, pPage,
    340340                                                   uShw.pPTPae->a[iShw].u & X86_PTE_PAE_PG_MASK,
    … …  
    353353#  ifdef PGMPOOL_WITH_GCPHYS_TRACKING
    354354                    PCX86PTEPAE pGstPte = (PCX86PTEPAE)pgmPoolMonitorGCPtr2CCPtr(pPool, pvAddress, GCPhysFault, sizeof(*pGstPte));
    355                     Log4(("pgmPoolMonitorChainChanging pae: deref %VHp GCPhys %VGp\n", uShw.pPTPae->a[iShw].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PAE_PG_MASK));
     355                    Log4(("pgmPoolMonitorChainChanging pae: deref %RHp GCPhys %VGp\n", uShw.pPTPae->a[iShw].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PAE_PG_MASK));
    356356                    pgmPoolTracDerefGCPhysHint(pPool, pPage,
    357357                                               uShw.pPTPae->a[iShw].u & X86_PTE_PAE_PG_MASK,
    … …  
    373373#  ifdef PGMPOOL_WITH_GCPHYS_TRACKING
    374374                        PCX86PTEPAE pGstPte = (PCX86PTEPAE)pgmPoolMonitorGCPtr2CCPtr(pPool, pvAddress, GCPhysFault, sizeof(*pGstPte));
    375                         Log4(("pgmPoolMonitorChainChanging pae: deref %VHp GCPhys %VGp\n", uShw.pPTPae->a[iShw2].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PAE_PG_MASK));
     375                        Log4(("pgmPoolMonitorChainChanging pae: deref %RHp GCPhys %VGp\n", uShw.pPTPae->a[iShw2].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PAE_PG_MASK));
    376376                        pgmPoolTracDerefGCPhysHint(pPool, pPage,
    377377                                                uShw.pPTPae->a[iShw2].u & X86_PTE_PAE_PG_MASK,
    … …  
    31243124#ifdef LOG_ENABLED
    31253125RTHCPHYS HCPhysPage = PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]);
    3126 Log(("pgmPoolTracDerefGCPhys %VHp vs %VHp\n", HCPhysPage, HCPhys));
     3126Log(("pgmPoolTracDerefGCPhys %RHp vs %RHp\n", HCPhysPage, HCPhys));
    31273127#endif
    31283128            if (PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]) == HCPhys)
    … …  
    31353135        pRam = pRam->CTX_SUFF(pNext);
    31363136    }
    3137     AssertFatalMsgFailed(("HCPhys=%VHp GCPhys=%VGp\n", HCPhys, GCPhys));
     3137    AssertFatalMsgFailed(("HCPhys=%RHp GCPhys=%VGp\n", HCPhys, GCPhys));
    31383138}
    31393139
    … …  
    31833183            if (PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]) == HCPhys)
    31843184            {
    3185                 Log4(("pgmPoolTracDerefGCPhysHint: Linear HCPhys=%VHp GCPhysHint=%VGp GCPhysReal=%VGp\n",
     3185                Log4(("pgmPoolTracDerefGCPhysHint: Linear HCPhys=%RHp GCPhysHint=%VGp GCPhysReal=%VGp\n",
    31863186                      HCPhys, GCPhysHint, pRam->GCPhys + (iPage << PAGE_SHIFT)));
    31873187                pgmTrackDerefGCPhys(pPool, pPage, &pRam->aPages[iPage]);
    … …  
    31923192    }
    31933193
    3194     AssertFatalMsgFailed(("HCPhys=%VHp GCPhysHint=%VGp\n", HCPhys, GCPhysHint));
     3194    AssertFatalMsgFailed(("HCPhys=%RHp GCPhysHint=%VGp\n", HCPhys, GCPhysHint));
    31953195}
    31963196
    … …  
    37993799    int rc = VINF_SUCCESS;
    38003800    STAM_PROFILE_START(&pPool->StatFlushPage, f);
    3801     LogFlow(("pgmPoolFlushPage: pPage=%p:{.Key=%VHp, .idx=%d, .enmKind=%d, .GCPhys=%VGp}\n",
     3801    LogFlow(("pgmPoolFlushPage: pPage=%p:{.Key=%RHp, .idx=%d, .enmKind=%d, .GCPhys=%VGp}\n",
    38023802             pPage, pPage->Core.Key, pPage->idx, pPage->enmKind, pPage->GCPhys));
    38033803
    … …  
    38813881{
    38823882    STAM_PROFILE_START(&pPool->StatFree, a);
    3883     LogFlow(("pgmPoolFreeByPage: pPage=%p:{.Key=%VHp, .idx=%d, enmKind=%d} iUser=%#x iUserTable=%#x\n",
     3883    LogFlow(("pgmPoolFreeByPage: pPage=%p:{.Key=%RHp, .idx=%d, enmKind=%d} iUser=%#x iUserTable=%#x\n",
    38843884             pPage, pPage->Core.Key, pPage->idx, pPage->enmKind, iUser, iUserTable));
    38853885    Assert(pPage->idx >= PGMPOOL_IDX_FIRST);
    … …  
    39793979        {
    39803980            STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
    3981             LogFlow(("pgmPoolAlloc: cached returns %Rrc *ppPage=%p:{.Key=%VHp, .idx=%d}\n", rc2, *ppPage, (*ppPage)->Core.Key, (*ppPage)->idx));
     3981            LogFlow(("pgmPoolAlloc: cached returns %Rrc *ppPage=%p:{.Key=%RHp, .idx=%d}\n", rc2, *ppPage, (*ppPage)->Core.Key, (*ppPage)->idx));
    39823982            return rc2;
    39833983        }
    … …  
    40724072
    40734073    *ppPage = pPage;
    4074     LogFlow(("pgmPoolAlloc: returns %Rrc *ppPage=%p:{.Key=%VHp, .idx=%d, .fCached=%RTbool, .fMonitored=%RTbool}\n",
     4074    LogFlow(("pgmPoolAlloc: returns %Rrc *ppPage=%p:{.Key=%RHp, .idx=%d, .fCached=%RTbool, .fMonitored=%RTbool}\n",
    40754075             rc, pPage, pPage->Core.Key, pPage->idx, pPage->fCached, pPage->fMonitored));
    40764076    STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
    … …  
    40894089void pgmPoolFree(PVM pVM, RTHCPHYS HCPhys, uint16_t iUser, uint32_t iUserTable)
    40904090{
    4091     LogFlow(("pgmPoolFree: HCPhys=%VHp iUser=%#x iUserTable=%#x\n", HCPhys, iUser, iUserTable));
     4091    LogFlow(("pgmPoolFree: HCPhys=%RHp iUser=%#x iUserTable=%#x\n", HCPhys, iUser, iUserTable));
    40924092    PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
    40934093    pgmPoolFreeByPage(pPool, pgmPoolGetPage(pPool, HCPhys), iUser, iUserTable);
    … …  
    41084108    PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
    41094109    PPGMPOOLPAGE pPage = pgmPoolGetPage(pPool, HCPhys);
    4110     Log3(("pgmPoolGetPageByHCPhys: HCPhys=%VHp -> %p:{.idx=%d .GCPhys=%VGp .enmKind=%d}\n",
     4110    Log3(("pgmPoolGetPageByHCPhys: HCPhys=%RHp -> %p:{.idx=%d .GCPhys=%VGp .enmKind=%d}\n",
    41114111          HCPhys, pPage, pPage->idx, pPage->GCPhys, pPage->enmKind));
    41124112    return pPage;
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