Changeset 14755

Timestamp:

11/28/08 03:58:01 (1 month ago)

Author:

vboxsync

Message:

#1865: Converted 4 PGM*2HC* conversion functions to RTR3PTR.

Files:

• trunk/include/VBox/pgm.h (modified) (1 diff)
• trunk/src/VBox/VMM/PATM/CSAM.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/PATM/PATM.cpp (modified) (7 diffs)
• trunk/src/VBox/VMM/PATM/PATMSSM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PGM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (6 diffs)
• trunk/src/VBox/VMM/PGMMap.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/TRPM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (12 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (15 diffs)
• trunk/src/recompiler/VBoxREMWrapper.cpp (modified) (3 diffs)
• trunk/src/recompiler/VBoxRecompiler.c (modified) (4 diffs)
• trunk/src/recompiler_new/VBoxREMWrapper.cpp (modified) (5 diffs)
• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (6 diffs)

trunk/include/VBox/pgm.h

@@ -416 +416 @@
-}
-
-HCPtr(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, PRTHCPTR pHC
-HCPTR)    PGMPhysGCPhys2HC
-HCPtr(PVM pVM, RTGCPTR GCPtr, PRTHCPTR pHC
-HCPtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTHCPTR pHC
+R3Ptr(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, PRTR3PTR pR3
+R3PTR)    PGMPhysGCPhys2R3
+R3Ptr(PVM pVM, RTGCPTR GCPtr, PRTR3PTR pR3
+R3PtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTR3PTR pR3
-VMMDECL(void)       PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead);
-VMMDECL(void)       PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite);

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -578 +578 @@
-    }
-
-HC
+R3
-    if (rc != VINF_SUCCESS)
-    {
@@ -1279 +1279 @@
-            Log(("Jump through jump table\n"));
-
-HC
+R3
-            if (rc2 == VINF_SUCCESS)
-            {
@@ -2328 +2328 @@
-    if (PAGE_ADDRESS(GCPtrIDT) == PAGE_ADDRESS(GCPtrIDT+cGates*sizeof(VBOXIDTE)))
-    {
-HC
-HCPtr(pVM, GCPtrIDT, (PRTHC
+R3
+R3Ptr(pVM, GCPtrIDT, (PRTR3
-        if (RT_FAILURE(rc))
-        {

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

@@ -604 +604 @@
-    {
-        /** @note pPrivInstrHC is probably not valid anymore */
-HCPtr(pVM, pPatch->patch.pPrivInstrGC, (PRTHC
+R3Ptr(pVM, pPatch->patch.pPrivInstrGC, (PRTR3
-        if (rc == VINF_SUCCESS)
-        {
@@ -790 +790 @@
-    {
-        /** @note pPrivInstrHC is probably not valid anymore */
-HCPtr(pVM, pPatch->patch.pPrivInstrGC, (PRTHC
+R3Ptr(pVM, pPatch->patch.pPrivInstrGC, (PRTR3
-        if (rc == VINF_SUCCESS)
-        {
@@ -995 +995 @@
-    }
-
-HC
+R3
-    if (rc != VINF_SUCCESS)
-    {
@@ -4121 +4121 @@
-    }
-    GCPhys = GCPhys + (pInstrGC & PAGE_OFFSET_MASK);
-HC
+R3
-    AssertRCReturn(rc, rc);
-
@@ -4402 +4402 @@
-    uint8_t *pInstrHC;
-
-HCPtr(pVM, pInstrGC, (RTHCPTR *
+R3Ptr(pVM, pInstrGC, (PRTR3PTR
-    if (rc == VINF_SUCCESS)
-    {
@@ -4999 +4999 @@
-
-                /** pPrivInstrHC is probably not valid anymore */
-HCPtr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTHC
+R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3
-                if (rc == VINF_SUCCESS)
-                {
@@ -5218 +5218 @@
-                Assert(!(pPatch->flags & PATMFL_PATCHED_GUEST_CODE));
-                /** @todo -> pPrivInstrHC is probably not valid anymore */
-HCPtr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTHC
+R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3
-                if (rc == VINF_SUCCESS)
-                {

trunk/src/VBox/VMM/PATM/PATMSSM.cpp

@@ -582 +582 @@
-        pPatchRec->patch.pPrivInstrHC   = 0;
-        /* The GC virtual ptr is fixed, but we must convert it manually again to HC. */
-HCPtr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTHC
+R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3
-        /* Can fail due to page or page table not present. */
-

trunk/src/VBox/VMM/PGM.cpp

@@ -1533 +1533 @@
-                pVM->pgm.s.HCPhysShwPaePdpt,
-                pVM->pgm.s.HCPhysShwPaePml4));
- 
+
-        LogRel(("Debug: HCPhysInterPD=%RHp HCPhysInterPaePDPT=%RHp HCPhysInterPaePML4=%RHp\n",
-                pVM->pgm.s.HCPhysInterPD, pVM->pgm.s.HCPhysInterPaePDPT, pVM->pgm.s.HCPhysInterPaePML4));
@@ -2643 +2643 @@
-    PX86PD     pPDSrc = pVM->pgm.s.pGst32BitPdR3;
-    Assert(pPDSrc);
-HC
+R3
-
-    /*

trunk/src/VBox/VMM/PGMInternal.h

@@ -251 +251 @@
-#else
-# define PGM_GCPHYS_2_PTR(pVM, GCPhys, ppv) \
-HCPtr(pVM, GCPhys, 1 /* one page only */, (void **
+R3Ptr(pVM, GCPhys, 1 /* one page only */, (PRTR3PTR
-#endif
-
@@ -271 +271 @@
-#else
-# define PGM_GCPHYS_2_PTR_EX(pVM, GCPhys, ppv) \
-HCPtr(pVM, GCPhys, 1 /* one page only */, (void **
+R3Ptr(pVM, GCPhys, 1 /* one page only */, (PRTR3PTR
-#endif
-
@@ -3182 +3182 @@
- * @param   pHCPtr      Where to store the corresponding HC virtual address.
- *
-
+
+
- */
-DECLINLINE(int) pgmRamGCPhys2HCPtr(PPGM pPGM, RTGCPHYS GCPhys, PRTHCPTR pHCPtr)
@@ -3204 +3205 @@
-    if (pRam->pvR3)
-    {
- /** @todo @bugref{1865,3202}: Code is converting R3 pointer and maybe using it in R0! */
+
-        return VINF_SUCCESS;
-    }
@@ -3211 +3212 @@
-}
-# endif /* !VBOX_WITH_NEW_PHYS_CODE */
-
-
-/**
- * Convert GC Phys to HC Virt.
- *
- * @returns VBox status.
- * @param   PVM         VM handle.
- * @param   pRam        Ram range
- * @param   GCPhys      The GC physical address.
- * @param   pHCPtr      Where to store the corresponding HC virtual address.
- *
- * @deprecated  This will be eliminated. Don't use it.
- */
-DECLINLINE(int) pgmRamGCPhys2HCPtrWithRange(PVM pVM, PPGMRAMRANGE pRam, RTGCPHYS GCPhys, PRTHCPTR pHCPtr)
-{
-    RTGCPHYS off = GCPhys - pRam->GCPhys;
-    Assert(off < pRam->cb);
-
-    if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-    {
-        unsigned idx = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
-        /* Physical chunk in dynamically allocated range not present? */
-        if (RT_UNLIKELY(!pRam->paChunkR3Ptrs[idx]))
-        {
-#ifdef IN_RING3
-            int rc = pgmr3PhysGrowRange(pVM, GCPhys);
-#else
-            int rc = CTXALLMID(VMM, CallHost)(pVM, VMMCALLHOST_PGM_RAM_GROW_RANGE, GCPhys);
-#endif
-            if (rc != VINF_SUCCESS)
-            {
-                *pHCPtr = 0; /* GCC crap */
-                return rc;
-            }
-        }
-        *pHCPtr = (RTHCPTR)(pRam->paChunkR3Ptrs[idx] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
-        return VINF_SUCCESS;
-    }
-    if (pRam->pvR3)
-    {
-        *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvR3 + off); /** @todo @bugref{1865,3202}: Code is converting R3 pointer and maybe using it in R0! */
-        return VINF_SUCCESS;
-    }
-    *pHCPtr = 0; /* GCC crap */
-    return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
-}
-
-#endif /* !IN_RC && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) */
-
@@ -3299 +3253 @@
-    if (pRam->pvR3)
-    {
- /** @todo @bugref{1865,3202}: Code is converting R3 pointer and maybe using it in R0! */
+
-        return VINF_SUCCESS;
-    }

trunk/src/VBox/VMM/PGMMap.cpp

@@ -1097 +1097 @@
-        PX86PD pPD = pVM->pgm.s.pGst32BitPdR3;
-        Assert(pPD);
-HC
+R3
-
-        for (PPGMMAPPING pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)

trunk/src/VBox/VMM/TRPM.cpp

@@ -1319 +1319 @@
-         */
-        PVBOXIDTE   pIDTE;
-HC
+R3
-        if (RT_SUCCESS(rc))
-        {

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

@@ -352 +352 @@
-
-
- Convert sel:addr to a flat GC address
-static RTGCPTR
+* Convert sel:addr to a flat GC address.
+DECLINLINE(RTGCPTR)
-{
-    DIS_SELREG enmPrefixSeg = DISDetectSegReg(pCpu, pParam);
@@ -822 +822 @@
-    }
-
-    /* The destination is always a virtual address */
-    AssertReturn(param1.type == PARMTYPE_ADDRESS, VERR_EM_INTERPRETER);
-
-    RTGCPTR GCPtrPar1 = param1.val.val64;
-    GCPtrPar1 = emConvertToFlatAddr(pVM, pRegFrame, pCpu, &pCpu->param1, GCPtrPar1);
-#ifdef IN_RC
-    pvParam1  = (void *)GCPtrPar1;
-#else
-    rc = PGMPhysGCPtr2HCPtr(pVM, GCPtrPar1, &pvParam1);
-    if (RT_FAILURE(rc))
-    {
-        AssertRC(rc);
-        return VERR_EM_INTERPRETER;
-    }
-#endif
-
-#ifdef IN_RC
-    /* Safety check (in theory it could cross a page boundary and fault there though) */
@@ -849 +833 @@
-    RTGCUINTREG ValPar2 = param2.val.val64;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    Log2(("%s %RGv imm%d=%RX64\n", emGetMnemonic(pCpu), GCPtrPar1, pCpu->param2.size*8, ValPar2));
-
@@ -859 +856 @@
-#ifdef IN_RC
-    MMGCRamDeregisterTrapHandler(pVM);
+#else
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
-#endif
-    if (RT_FAILURE(rc))
@@ -1089 +1088 @@
-    ValPar2 &= 7;
-
-#ifdef IN_RC
-    GCPtrPar1 = emConvertToFlatAddr(pVM, pRegFrame, pCpu, &pCpu->param1, GCPtrPar1);
+#ifdef IN_RC
+    Assert(TRPMHasTrap(pVM));
+    EM_ASSERT_FAULT_RETURN((RTGCPTR)((RTGCUINTPTR)GCPtrPar1 & ~(RTGCUINTPTR)3) == pvFault, VERR_EM_INTERPRETER);
+#endif
+
+#ifdef IN_RC
-    pvParam1  = (void *)GCPtrPar1;
-#else
-
-
-
-
-
-
-
+
+
+
-#endif
-
-    Log2(("emInterpretLockBitTest %s: pvFault=%RGv GCPtrPar1=%RGv imm=%RX64\n", emGetMnemonic(pCpu), pvFault, GCPtrPar1, ValPar2));
-
-
-
-
-
-
-
+
-    RTGCUINTREG32 eflags = 0;
-#ifdef IN_RC
@@ -1117 +1112 @@
-#ifdef IN_RC
-    MMGCRamDeregisterTrapHandler(pVM);
+#else
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
-#endif
-    if (RT_FAILURE(rc))
@@ -1423 +1420 @@
-        return VERR_EM_INTERPRETER;
-
+    uint64_t valpar;
+    switch(param2.type)
+    {
+    case PARMTYPE_IMMEDIATE: /* register actually */
+        valpar = param2.val.val64;
+        break;
+
+    default:
+        return VERR_EM_INTERPRETER;
+    }
+
+    PGMPAGEMAPLOCK Lock;
-    RTGCPTR  GCPtrPar1;
-    void    *pvParam1;
-valpar, 
+
-
-    AssertReturn(pCpu->param1.size == pCpu->param2.size, VERR_EM_INTERPRETER);
@@ -1434 +1443 @@
-        GCPtrPar1 = emConvertToFlatAddr(pVM, pRegFrame, pCpu, &pCpu->param1, GCPtrPar1);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        break;
-
@@ -1470 +1465 @@
-
-    *pcbSize = param2.size;
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
-    return VINF_SUCCESS;
-}
@@ -1490 +1486 @@
-    void    *pvParam1;
-    uint64_t eflags;
+    PGMPAGEMAPLOCK Lock;
-
-    AssertReturn(pCpu->param1.size == 8, VERR_EM_INTERPRETER);
@@ -1498 +1495 @@
-        GCPtrPar1 = emConvertToFlatAddr(pVM, pRegFrame, pCpu, &pCpu->param1, GCPtrPar1);
-
-
-
-
-
-
-
+
+
-        break;
-
@@ -1524 +1517 @@
-
-    *pcbSize = 8;
+    PGMPhysReleasePageMappingLock(pVM, &Lock);
-    return VINF_SUCCESS;
-}

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

@@ -3167 +3167 @@
-    Assert(pPDSrc);
-#   if !defined(IN_RC) && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-HCPtrAssert(pVM, (RTGCPHYS)(cr3 & GST_CR3_PAGE_MASK), sizeof(*pPDSrc)) == 
+R3PtrAssert(pVM, (RTGCPHYS)(cr3 & GST_CR3_PAGE_MASK), sizeof(*pPDSrc)) == (RTR3PTR)
-#   endif
-#  endif /* PGM_GST_TYPE == PGM_TYPE_32BIT */

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

@@ -705 +705 @@
-    return PGMDynMapGCPageOff(pVM, GCPhys, ppv);
-# else
-HCPtr(pVM, GCPhys, 1, 
+R3Ptr(pVM, GCPhys, 1, (PRTR3PTR)
-# endif
-#endif
@@ -850 +850 @@
-
-/**
-
+ring-3 
- *
- * @returns VINF_SUCCESS on success.
@@ -859 +859 @@
- * @returns VERR_PGM_GCPHYS_RANGE_CROSSES_BOUNDARY if the range crosses
- *          a dynamic ram chunk boundary
-
-
-
-
-
-
+
+
+
+
+
+
+
-{
-#ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -900 +901 @@
-#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) /* ASSUMES this is a rare occurence */
-        PRTR3UINTPTR paChunkR3Ptrs = (PRTR3UINTPTR)MMHyperR3ToCC(pVM, pRam->paChunkR3Ptrs);
-HCPtr = (RTHC
+R3Ptr = (RTR3
-#else
-HCPtr = (RTHC
+R3Ptr = (RTR3
-#endif
-    }
-    else if (RT_LIKELY(pRam->pvR3))
-HCPtr = (RTHC
+R3Ptr = (RTR3
-    else
-        return VERR_PGM_PHYS_PAGE_RESERVED;
@@ -914 +915 @@
-
-/**
-HC
-
-HCPtr, NIL_RTHC
+R3
+
+R3Ptr, NIL_RTR3
- * @param   pVM         The VM handle.
- * @param   GCPhys      The GC Physical addresss.
- * @param   cbRange     Physical range.
- */
-HCPTR) PGMPhysGCPhys2HCPtrAssert(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange) /** @todo @bugref{1865}: HCPtr -> R3Ptr */
-
-HCPTR HC
-HCPtr(pVM, GCPhys, cbRange, &HC
+R3PTR) PGMPhysGCPhys2R3PtrAssert(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange)
+
+R3PTR R3
+R3Ptr(pVM, GCPhys, cbRange, &R3
-    if (RT_SUCCESS(rc))
-HC
-HC
+R3
+R3
-}
-
@@ -971 +972 @@
-
-/**
-HC
+R3
- *
- * This uses the current CR3/CR0/CR4 of the guest.
@@ -978 +979 @@
- * @param   pVM         The VM Handle
- * @param   GCPtr       The guest pointer to convert.
-HCPtr      Where to store the HC
-
-HCPtr(PVM pVM, RTGCPTR GCPtr, PRTHCPTR pHCPtr) /** @todo @bugref{1865}: HCPtr -> R3Ptr */
+R3Ptr      Where to store the R3
+
+R3Ptr(PVM pVM, RTGCPTR GCPtr, PRTR3PTR pR3Ptr)
-{
-#ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -989 +990 @@
-    int rc = PGM_GST_PFN(GetPage,pVM)(pVM, (RTGCUINTPTR)GCPtr, NULL, &GCPhys);
-    if (RT_SUCCESS(rc))
-HCPtr(pVM, GCPhys | ((RTGCUINTPTR)GCPtr & PAGE_OFFSET_MASK), 1 /* we always stay within one page */, pHC
+R3Ptr(pVM, GCPhys | ((RTGCUINTPTR)GCPtr & PAGE_OFFSET_MASK), 1 /* we always stay within one page */, pR3
-    return rc;
-}
@@ -995 +996 @@
-
-/**
-
+
+
- *
- * @returns VBox status code.
@@ -1002 +1004 @@
- * @param   cr3         The guest CR3.
- * @param   fFlags      Flags used for interpreting the PD correctly: X86_CR4_PSE and X86_CR4_PAE
-HCPtr      Where to store the HC
+R3Ptr      Where to store the R3
- *
- * @remark  This function is used by the REM at a time where PGM could
@@ -1008 +1010 @@
- *          future DBGF API to cpu state independent conversions.
- */
-HCPtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTHCPTR pHCPtr) /** @todo @bugref{1865}: HCPtr -> R3Ptr */
+R3PtrByGstCR3(PVM pVM, RTGCPTR GCPtr, uint64_t cr3, unsigned fFlags, PRTR3PTR pR3Ptr)
-{
-#ifdef VBOX_WITH_NEW_PHYS_CODE
@@ -1030 +1032 @@
-                if ((fFlags & X86_CR4_PSE) && Pde.b.u1Size)
-                {   /* (big page) */
-
+
+
-                }
-                else
@@ -1040 +1043 @@
-                        X86PTE Pte = pPT->a[((RTGCUINTPTR)GCPtr >> X86_PT_SHIFT) & X86_PT_MASK];
-                        if (Pte.n.u1Present)
-
+
+
-                        rc = VERR_PAGE_NOT_PRESENT;
-                    }
@@ -1070 +1074 @@
-                        if ((fFlags & X86_CR4_PSE) && Pde.b.u1Size)
-                        {   /* (big page) */
-
+
+
-                        }
-                        else
@@ -1080 +1085 @@
-                                X86PTEPAE Pte = pPT->a[((RTGCUINTPTR)GCPtr >> X86_PT_PAE_SHIFT) & X86_PT_PAE_MASK];
-                                if (Pte.n.u1Present)
-
+
+
-                                rc = VERR_PAGE_NOT_PRESENT;
-                            }

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -711 +711 @@
-    { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCPTR), NULL }
-};
-HC
+R3
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_GCPHYS,     sizeof(RTGCPHYS), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(RTUINT), NULL },
-HC
-
-HC
+R3
+
+R3
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
@@ -724 +724 @@
-    { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(unsigned), NULL },
-HC
+R3
-};
-static const REMPARMDESC g_aArgsPGM3PhysGrowRange[] =
@@ -1112 +1112 @@
-    { "PGMGstGetPage",                          (void *)(uintptr_t)&PGMGstGetPage,                  &g_aArgsPGMGstGetPage[0],                   RT_ELEMENTS(g_aArgsPGMGstGetPage),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-    { "PGMInvalidatePage",                      (void *)(uintptr_t)&PGMInvalidatePage,              &g_aArgsPGMInvalidatePage[0],               RT_ELEMENTS(g_aArgsPGMInvalidatePage),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-HCPtr",                    (void *)(uintptr_t)&PGMPhysGCPhys2HCPtr,            &g_aArgsPGMPhysGCPhys2HCPtr[0],             RT_ELEMENTS(g_aArgsPGMPhysGCPhys2HC
-HCPtrByGstCR3",             (void *)(uintptr_t)&PGMPhysGCPtr2HCPtrByGstCR3,     &g_aArgsPGMPhysGCPtr2HCPtrByGstCR3[0],      RT_ELEMENTS(g_aArgsPGMPhysGCPtr2HC
+R3Ptr",                    (void *)(uintptr_t)&PGMPhysGCPhys2R3Ptr,            &g_aArgsPGMPhysGCPhys2R3Ptr[0],             RT_ELEMENTS(g_aArgsPGMPhysGCPhys2R3
+R3PtrByGstCR3",             (void *)(uintptr_t)&PGMPhysGCPtr2R3PtrByGstCR3,     &g_aArgsPGMPhysGCPtr2R3PtrByGstCR3[0],      RT_ELEMENTS(g_aArgsPGMPhysGCPtr2R3
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    { "PGM3PhysGrowRange",                      (void *)(uintptr_t)&PGM3PhysGrowRange,              &g_aArgsPGM3PhysGrowRange[0],               RT_ELEMENTS(g_aArgsPGM3PhysGrowRange),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -3477 +3477 @@
-
-        /* convert eip to physical address. */
-HC
+R3
-                                            GCPtrPC,
-                                            env->cr[3],
@@ -3493 +3493 @@
-    {
-        /* physical address */
-HC
+R3
-        if (RT_FAILURE(rc))
-            return false;
@@ -3572 +3572 @@
-    {
-        /* convert eip to physical address. */
-HC
+R3
-                                            GCPtrPC,
-                                            env->cr[3],
@@ -3589 +3589 @@
-
-        /* physical address */
-HC
+R3
-        if (RT_FAILURE(rc))
-            return false;

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -711 +711 @@
-    { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCPTR), NULL }
-};
-HC
+R3
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_GCPHYS,     sizeof(RTGCPHYS), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(RTUINT), NULL },
-HC
-
-HC
+R3
+
+R3
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
@@ -724 +724 @@
-    { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(unsigned), NULL },
-HC
+R3
-};
-static const REMPARMDESC g_aArgsPGM3PhysGrowRange[] =
@@ -803 +803 @@
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(void*), NULL },
-   
+
-};
-static const REMPARMDESC g_aArgsPGMHandlerIsAddressMonitored[] =
@@ -1128 +1128 @@
-    { "PGMGstGetPage",                          (void *)(uintptr_t)&PGMGstGetPage,                  &g_aArgsPGMGstGetPage[0],                   RT_ELEMENTS(g_aArgsPGMGstGetPage),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-    { "PGMInvalidatePage",                      (void *)(uintptr_t)&PGMInvalidatePage,              &g_aArgsPGMInvalidatePage[0],               RT_ELEMENTS(g_aArgsPGMInvalidatePage),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-HCPtr",                    (void *)(uintptr_t)&PGMPhysGCPhys2HCPtr,            &g_aArgsPGMPhysGCPhys2HCPtr[0],             RT_ELEMENTS(g_aArgsPGMPhysGCPhys2HC
-HCPtrByGstCR3",             (void *)(uintptr_t)&PGMPhysGCPtr2HCPtrByGstCR3,     &g_aArgsPGMPhysGCPtr2HCPtrByGstCR3[0],      RT_ELEMENTS(g_aArgsPGMPhysGCPtr2HC
+R3Ptr",                    (void *)(uintptr_t)&PGMPhysGCPhys2R3Ptr,            &g_aArgsPGMPhysGCPhys2R3Ptr[0],             RT_ELEMENTS(g_aArgsPGMPhysGCPhys2R3
+R3PtrByGstCR3",             (void *)(uintptr_t)&PGMPhysGCPtr2R3PtrByGstCR3,     &g_aArgsPGMPhysGCPtr2R3PtrByGstCR3[0],      RT_ELEMENTS(g_aArgsPGMPhysGCPtr2R3
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    { "PGM3PhysGrowRange",                      (void *)(uintptr_t)&PGM3PhysGrowRange,              &g_aArgsPGM3PhysGrowRange[0],               RT_ELEMENTS(g_aArgsPGM3PhysGrowRange),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
@@ -1180 +1180 @@
-    { "VMR3ReqCall",                            (void *)(uintptr_t)&VMR3ReqCall,                    &g_aArgsVMR3ReqCall[0],                     RT_ELEMENTS(g_aArgsVMR3ReqCall),                       REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-    { "VMR3ReqFree",                            (void *)(uintptr_t)&VMR3ReqFree,                    &g_aArgsVMR3ReqFree[0],                     RT_ELEMENTS(g_aArgsVMR3ReqFree),                       REMFNDESC_FLAGS_RET_INT | REMFNDESC_FLAGS_ELLIPSIS, sizeof(int), NULL },
-    
+
-    { "VMR3GetVMCPUNativeThread",               (void *)(uintptr_t)&VMR3GetVMCPUNativeThread,       &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
-//    { "",                        (void *)(uintptr_t)&,                &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),   NULL },

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1395 +1395 @@
-    int rc;
-
-HC
+R3
-    Assert (RT_SUCCESS(rc));
-
@@ -3571 +3571 @@
-
-        /* convert eip to physical address. */
-HC
+R3
-                                        GCPtrPC,
-                                        env->cr[3],
@@ -3587 +3587 @@
-    {
-        /* physical address */
-HC
+R3
-                                 (void**)&pvPC);
-        if (RT_FAILURE(rc))
@@ -3672 +3672 @@
-    {
-        /* convert eip to physical address. */
-HC
+R3
-                                            GCPtrPC,
-                                            env->cr[3],
@@ -3689 +3689 @@
-
-        /* physical address */
-HC
+R3
-        if (RT_FAILURE(rc))
-            return false;
@@ -4222 +4222 @@
-}
-
- 
- 
- 
- 
-
- 
- 
- 
- 
+
+
+
+
+
+
+
+
+
-/* -+- I/O Ports -+- */
-