Changeset 89493 in vbox

Timestamp:

Jun 4, 2021 4:30:29 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144850

Message:

Intel IOMMU: bugref:9967 Address translation, nits.

File:

• trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -2254 +2254 @@
     Assert(pIoPagePrev->fPerm  == pIoPage->fPerm);
 
-    size_t const   cbPrev      = RT_BIT_64(pIoPagePrev->cShift);
-    RTGCPHYS const GCPhysPrev  = pIoPagePrev->GCPhysBase;
-    RTGCPHYS const GCPhys      = pIoPage->GCPhysBase;
+    size_t const   cbPrev     = RT_BIT_64(pIoPagePrev->cShift);
+    RTGCPHYS const GCPhysPrev = pIoPagePrev->GCPhysBase;
+    RTGCPHYS const GCPhys     = pIoPage->GCPhysBase;
 #ifdef RT_STRICT
     /* Paranoia: Ensure offset bits are 0. */
@@ -2282 +2282 @@
     RTGCPHYS       GCPhysAddr  = NIL_RTGCPHYS;
     DMARMEMREQIN   MemReqIn    = pMemReqRemap->In;
-    uint64_t const uAddrIn     = pMemReqRemap->In.AddrRange.uAddr;
-    size_t const   cbAddrIn    = pMemReqRemap->In.AddrRange.cb;
-    uint64_t       uAddrInBase = pMemReqRemap->In.AddrRange.uAddr & X86_PAGE_4K_BASE_MASK;
-    uint64_t       offAddrIn   = pMemReqRemap->In.AddrRange.uAddr & X86_PAGE_4K_OFFSET_MASK;
+    uint64_t const uAddrIn     = MemReqIn.AddrRange.uAddr;
+    size_t const   cbAddrIn    = MemReqIn.AddrRange.cb;
+    uint64_t       uAddrInBase = MemReqIn.AddrRange.uAddr & X86_PAGE_4K_BASE_MASK;
+    uint64_t       offAddrIn   = MemReqIn.AddrRange.uAddr & X86_PAGE_4K_OFFSET_MASK;
     size_t         cbRemaining = cbAddrIn;
 
@@ -2306 +2306 @@
             if (cbRemaining == cbAddrIn)
             {
-                uint64_t const fIoPageMask = X86_GET_PAGE_OFFSET_MASK(IoPage.cShift);
-                uint64_t const offAddrOut  = uAddrIn & fIoPageMask;
+                uint64_t const fOffMask   = X86_GET_PAGE_OFFSET_MASK(IoPage.cShift);
+                uint64_t const offAddrOut = uAddrIn & fOffMask;
                 Assert(!(IoPage.GCPhysBase & fIoPageMask));
                 GCPhysAddr = IoPage.GCPhysBase | offAddrOut;