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

Timestamp:

Oct 17, 2024 12:02:12 PM (4 months ago)

Author:

vboxsync

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

165262

Message:

VMM/IEM: Reduced the number of arguments for iemNativeEmitTlbLookup. bugref:10720

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllN8veRecompBltIn.cpp (modified) (2 diffs)
• IEMAllN8veRecompFuncs.h (modified) (9 diffs)

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

@@ -1473 +1473 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<false>(pReNative, off, &TlbState,
-                                            IEM_F_MODE_X86_IS_FLAT(pReNative->fExec) ? UINT8_MAX : X86_SREG_CS,
-                                            1 /*cbMem*/, 0 /*fAlignMask*/, IEM_ACCESS_TYPE_EXEC,
-                                            idxLabelTlbLookup, idxLabelTlbMiss, idxRegGCPhys, offInstr);
+        off = iemNativeEmitTlbLookup<false, 1 /*cbMem*/, 0 /*fAlignMask*/,
+                                     IEM_ACCESS_TYPE_EXEC>(pReNative, off, &TlbState,
+                                                           IEM_F_MODE_X86_IS_FLAT(pReNative->fExec) ? UINT8_MAX : X86_SREG_CS,
+                                                           idxLabelTlbLookup, idxLabelTlbMiss, idxRegGCPhys, offInstr);
 
 # ifdef IEM_WITH_TLB_STATISTICS
@@ -1771 +1771 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<false, true>(pReNative, off, &TlbState, fIsFlat ? UINT8_MAX : X86_SREG_CS,
-                                                  1 /*cbMem*/, 0 /*fAlignMask*/, IEM_ACCESS_TYPE_EXEC,
-                                                  idxLabelTlbLookup, idxLabelTlbMiss, idxRegDummy);
+        off = iemNativeEmitTlbLookup<false, 1 /*cbMem*/, 0 /*fAlignMask*/,
+                                     IEM_ACCESS_TYPE_EXEC, true>(pReNative, off, &TlbState, fIsFlat ? UINT8_MAX : X86_SREG_CS,
+                                                                 idxLabelTlbLookup, idxLabelTlbMiss, idxRegDummy);
 
 # ifdef IEM_WITH_TLB_STATISTICS

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

@@ -1779 +1779 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<true>(pReNative, off, &TlbState, iSegReg, cbMem, cbMem - 1,
-                                           IEM_ACCESS_TYPE_WRITE, idxLabelTlbLookup, idxLabelTlbMiss, idxRegMemResult);
+        off = iemNativeEmitTlbLookup<true, cbMem, cbMem - 1, IEM_ACCESS_TYPE_WRITE>(pReNative, off, &TlbState, iSegReg,
+                                                                                    idxLabelTlbLookup, idxLabelTlbMiss,
+                                                                                    idxRegMemResult);
 
         /*
@@ -2455 +2456 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<true>(pReNative, off, &TlbState, iSegReg, cbMem, cbMem - 1, IEM_ACCESS_TYPE_READ,
-                                           idxLabelTlbLookup, idxLabelTlbMiss, idxRegMemResult);
+        off = iemNativeEmitTlbLookup<true, cbMem, cbMem - 1, IEM_ACCESS_TYPE_READ>(pReNative, off, &TlbState, iSegReg,
+                                                                                   idxLabelTlbLookup, idxLabelTlbMiss,
+                                                                                   idxRegMemResult);
 
         /*
@@ -7608 +7610 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<true>(pReNative, off, &TlbState, iSegReg, a_cbMem, a_fAlignMaskAndCtl,
-                                           a_enmOp == kIemNativeEmitMemOp_Store ? IEM_ACCESS_TYPE_WRITE : IEM_ACCESS_TYPE_READ,
-                                           idxLabelTlbLookup, idxLabelTlbMiss, idxRegMemResult, offDisp);
+        off = iemNativeEmitTlbLookup<true, a_cbMem, a_fAlignMaskAndCtl,
+                                     a_enmOp == kIemNativeEmitMemOp_Store ? IEM_ACCESS_TYPE_WRITE : IEM_ACCESS_TYPE_READ
+                                    >(pReNative, off, &TlbState, iSegReg, idxLabelTlbLookup, idxLabelTlbMiss,
+                                      idxRegMemResult, offDisp);
 
         /*
@@ -8263 +8266 @@
      * Assert sanity.
      */
+    AssertCompile(a_cBitsVar == 16 || a_cBitsVar  == 32 || a_cBitsVar  == 64);
+    AssertCompile(a_cBitsFlat == 0 || a_cBitsFlat == 32 || a_cBitsFlat == 64);
+    AssertCompile(!a_fIsSegReg || a_cBitsVar < 64);
     IEMNATIVE_ASSERT_VAR_IDX(pReNative, idxVarValue);
     PIEMNATIVEVAR const pVarValue = &pReNative->Core.aVars[IEMNATIVE_VAR_IDX_UNPACK(idxVarValue)];
@@ -8310 +8316 @@
      * (Code structure is very similar to that of PUSH)
      */
+    RT_CONSTEXPR
     uint8_t const cbMem       = a_cBitsVar / 8;
     bool const    fIsIntelSeg = a_fIsSegReg && IEM_IS_GUEST_CPU_INTEL(pReNative->pVCpu);
-    uint8_t const cbMemAccess = !fIsIntelSeg || (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_16BIT
+    uint8_t const cbMemAccess = !a_fIsSegReg || !fIsIntelSeg || (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_16BIT
                               ? cbMem : sizeof(uint16_t);
     uint8_t const idxRegRsp   = iemNativeRegAllocTmpForGuestReg(pReNative, &off, IEMNATIVEGSTREG_GPR(X86_GREG_xSP),
@@ -8473 +8480 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<true>(pReNative, off, &TlbState, iSegReg, cbMemAccess, cbMemAccess - 1,
-                                           IEM_ACCESS_TYPE_WRITE, idxLabelTlbLookup, idxLabelTlbMiss, idxRegMemResult);
+        if (!a_fIsSegReg || cbMemAccess == cbMem)
+        {
+            Assert(cbMemAccess == cbMem);
+            off = iemNativeEmitTlbLookup<true, cbMem, cbMem - 1, IEM_ACCESS_TYPE_WRITE>(pReNative, off, &TlbState,
+                                                                                        iSegReg, idxLabelTlbLookup,
+                                                                                        idxLabelTlbMiss, idxRegMemResult);
+        }
+        else
+        {
+            Assert(cbMemAccess == sizeof(uint16_t));
+            off = iemNativeEmitTlbLookup<true, sizeof(uint16_t), sizeof(uint16_t) - 1,
+                                         IEM_ACCESS_TYPE_WRITE>(pReNative, off, &TlbState, iSegReg,
+                                                                idxLabelTlbLookup, idxLabelTlbMiss, idxRegMemResult);
+        }
 
         /*
@@ -8492 +8511 @@
                     break;
                 case 4:
-                    if (!fIsIntelSeg)
+                    if (!a_fIsSegReg || !fIsIntelSeg)
                         off = iemNativeEmitStoreGpr32ByGprEx(pCodeBuf, off, idxRegValue, idxRegMemResult);
                     else
@@ -8816 +8835 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<true>(pReNative, off, &TlbState, iSegReg, cbMem, cbMem - 1, IEM_ACCESS_TYPE_READ,
-                                           idxLabelTlbLookup, idxLabelTlbMiss, idxRegMemResult);
+        off = iemNativeEmitTlbLookup<true, cbMem, cbMem - 1, IEM_ACCESS_TYPE_READ>(pReNative, off, &TlbState, iSegReg,
+                                                                                   idxLabelTlbLookup, idxLabelTlbMiss,
+                                                                                   idxRegMemResult);
 
         /*
@@ -9414 +9434 @@
          * TlbLookup:
          */
-        off = iemNativeEmitTlbLookup<true>(pReNative, off, &TlbState, iSegReg, a_cbMem, a_fAlignMaskAndCtl, a_fAccess,
-                                           idxLabelTlbLookup, idxLabelTlbMiss, idxRegMemResult);
+        off = iemNativeEmitTlbLookup<true, a_cbMem, a_fAlignMaskAndCtl, a_fAccess>(pReNative, off, &TlbState, iSegReg,
+                                                                                   idxLabelTlbLookup, idxLabelTlbMiss,
+                                                                                   idxRegMemResult);
 # ifdef IEM_WITH_TLB_STATISTICS
         off = iemNativeEmitIncStamCounterInVCpu(pReNative, off, TlbState.idxReg1, TlbState.idxReg2,