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

Timestamp:

Dec 31, 2023 1:06:09 AM (15 months ago)

Author:

vboxsync

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

160908

Message:

VMM/IEM: Debugged TLB lookup code on arm and enabled it there. bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp (modified) (7 diffs)

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

@@ -9968 +9968 @@
 *********************************************************************************************************************************/
 
-#if (defined(RT_ARCH_AMD64) && 1) || (defined(RT_ARCH_ARM64) && 0)
+#if (defined(RT_ARCH_AMD64) && 1) || (defined(RT_ARCH_ARM64) && 1)
 # define IEMNATIVE_WITH_TLB_LOOKUP
 #endif
@@ -10118 +10118 @@
     {
 off = iemNativeEmitBrkEx(pCodeBuf, off, 1); /** @todo this needs testing */
-        /* cmp  seglim, regptr */
+        /* cmp  seglim, regptr */   /** @todo r=bird: why 64-bit compare again? */
         if (pTlbState->idxRegPtr != UINT8_MAX)
             off = iemNativeEmitCmpGprWithGprEx(pCodeBuf, off, pTlbState->idxRegSegLimit, pTlbState->idxRegPtr);
@@ -10136 +10136 @@
         /* cmp  reg1, reg2 (64-bit) / imm (32-bit) */
         if (pTlbState->idxRegPtr != UINT8_MAX)
-            off = iemNativeEmitCmpGprWithGprEx(pCodeBuf, off, pTlbState->idxReg1, pTlbState->idxReg2);
+            off = iemNativeEmitCmpGprWithGprEx(pCodeBuf, off, pTlbState->idxReg1,
+                                               cbMem > 1 ? pTlbState->idxReg2 : pTlbState->idxRegPtr);
         else
             off = iemNativeEmitCmpGpr32WithImmEx(pCodeBuf, off, pTlbState->idxReg1, (uint32_t)(pTlbState->uAbsPtr + cbMem - 1));
@@ -10150 +10151 @@
      */
     iemNativeLabelDefine(pReNative, idxLabelTlbLookup, off);
-# if defined(RT_ARCH_ARM64)
-    off = iemNativeEmitBrkEx(pCodeBuf, off, 0); /** @todo debug on arm */
+# if defined(RT_ARCH_ARM64) && 0
+    off = iemNativeEmitBrkEx(pCodeBuf, off, 0);
 # endif
 
@@ -10397 +10398 @@
     off = iemNativeEmitAddGprImmEx(pCodeBuf, off, pTlbState->idxReg2, RT_UOFFSETOF(VMCPUCC, iem.s.DataTlb.aEntries),
                                    pTlbState->idxReg3 /*iGprTmp*/);
-
+    /* reg2 += pVCpu */
+    off = iemNativeEmitAddTwoGprsEx(pCodeBuf, off, pTlbState->idxReg2, IEMNATIVE_REG_FIXED_PVMCPU);
 # else
 #  error "Port me"
@@ -10411 +10413 @@
     off = iemNativeEmitGprByGprDisp(pCodeBuf, off, pTlbState->idxReg1, pTlbState->idxReg2, RT_UOFFSETOF(IEMTLBENTRY, uTag));
 # elif defined(RT_ARCH_ARM64)
-    pCodeBuf[off++] = Armv8A64MkInstrStLdRUOff(kArmv8A64InstrLdStType_Ld_Dword, pTlbState->idxReg3,
-                                               pTlbState->idxReg2, RT_UOFFSETOF(IEMTLBENTRY, uTag));
+    off = iemNativeEmitLoadGprByGprEx(pCodeBuf, off, pTlbState->idxReg3, pTlbState->idxReg2, RT_UOFFSETOF(IEMTLBENTRY, uTag));
     off = iemNativeEmitCmpGprWithGprEx(pCodeBuf, off, pTlbState->idxReg1, pTlbState->idxReg3);
 # else
@@ -10443 +10444 @@
                                     RT_UOFFSETOF(VMCPUCC, iem.s.DataTlb.uTlbPhysRev));
 # elif defined(RT_ARCH_ARM64)
-    pCodeBuf[off++] = Armv8A64MkInstrStLdRUOff(kArmv8A64InstrLdStType_Ld_Dword, pTlbState->idxReg3,
-                                               pTlbState->idxReg2, RT_UOFFSETOF(IEMTLBENTRY, fFlagsAndPhysRev));
+    off = iemNativeEmitLoadGprByGprEx(pCodeBuf, off, pTlbState->idxReg3, pTlbState->idxReg2,
+                                      RT_UOFFSETOF(IEMTLBENTRY, fFlagsAndPhysRev));
     pCodeBuf[off++] = Armv8A64MkInstrAnd(pTlbState->idxReg1, pTlbState->idxReg1, pTlbState->idxReg3);
-    off = iemNativeEmitLoadGprFromVCpuU64Ex(pCodeBuf, off, pTlbState->idxReg3,  RT_UOFFSETOF(VMCPUCC, iem.s.DataTlb.uTlbPhysRev));
+    off = iemNativeEmitLoadGprFromVCpuU64Ex(pCodeBuf, off, pTlbState->idxReg3, RT_UOFFSETOF(VMCPUCC, iem.s.DataTlb.uTlbPhysRev));
     off = iemNativeEmitCmpGprWithGprEx(pCodeBuf, off, pTlbState->idxReg1, pTlbState->idxReg3);
 # else