Changeset 101305 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 29, 2023 1:18:28 AM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: Covert zero arg count defer-CImpl instruction emulations as well. Some build fixes for arm. bugref:10371

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllN8veRecompiler.cpp (modified) (1 diff)
• VMMAll/IEMAllThrdPython.py (modified) (4 diffs)
• include/IEMN8veRecompiler.h (modified) (2 diffs)

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

@@ -1922 +1922 @@
     return iemNativeEmitCImplCall3(pReNative, off, pCallEntry->idxInstr, (uintptr_t)a_pfnCImpl, a_cbInstr, a0, a1, a2)
 
+/*
+ * Builtin functions.
+ */
+
+/**
+ * Built-in function that calls a C-implemention function taking zero arguments.
+ */
+static IEM_DECL_IEMNATIVERECOMPFUNC_DEF(iemNativeRecompFunc_BltIn_DeferToCImpl0)
+{
+    PFNIEMCIMPL0 const pfnCImpl = (PFNIEMCIMPL0)(uintptr_t)pCallEntry->auParams[0];
+    uint8_t const      cbInstr  = (uint8_t)pCallEntry->auParams[1];
+    return iemNativeEmitCImplCall(pReNative, off, pCallEntry->idxInstr, (uintptr_t)pfnCImpl, cbInstr, 0, 0, 0, 0);
+}
+
 
 

trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py

@@ -1602 +1602 @@
         ];
 
-    ## List of built-in threaded functions with user argument counts.
+    ## List of built-in threaded functions with user argument counts and
+    ## whether it has a native recompiler implementation.
     katBltIns = (
-        ( 'DeferToCImpl0',                                      2 ),
-        ( 'CheckIrq',                                           0 ),
-        ( 'CheckMode',                                          1 ),
-        ( 'CheckHwInstrBps',                                    0 ),
-        ( 'CheckCsLim',                                         1 ),
-
-        ( 'CheckCsLimAndOpcodes',                               3 ),
-        ( 'CheckOpcodes',                                       3 ),
-        ( 'CheckOpcodesConsiderCsLim',                          3 ),
-
-        ( 'CheckCsLimAndPcAndOpcodes',                          3 ),
-        ( 'CheckPcAndOpcodes',                                  3 ),
-        ( 'CheckPcAndOpcodesConsiderCsLim',                     3 ),
-
-        ( 'CheckCsLimAndOpcodesAcrossPageLoadingTlb',           3 ),
-        ( 'CheckOpcodesAcrossPageLoadingTlb',                   3 ),
-        ( 'CheckOpcodesAcrossPageLoadingTlbConsiderCsLim',      2 ),
-
-        ( 'CheckCsLimAndOpcodesLoadingTlb',                     3 ),
-        ( 'CheckOpcodesLoadingTlb',                             3 ),
-        ( 'CheckOpcodesLoadingTlbConsiderCsLim',                3 ),
-
-        ( 'CheckCsLimAndOpcodesOnNextPageLoadingTlb',           2 ),
-        ( 'CheckOpcodesOnNextPageLoadingTlb',                   2 ),
-        ( 'CheckOpcodesOnNextPageLoadingTlbConsiderCsLim',      2 ),
-
-        ( 'CheckCsLimAndOpcodesOnNewPageLoadingTlb',            2 ),
-        ( 'CheckOpcodesOnNewPageLoadingTlb',                    2 ),
-        ( 'CheckOpcodesOnNewPageLoadingTlbConsiderCsLim',       2 ),
+        ( 'DeferToCImpl0',                                      2, True  ),
+        ( 'CheckIrq',                                           0, False ),
+        ( 'CheckMode',                                          1, False ),
+        ( 'CheckHwInstrBps',                                    0, False ),
+        ( 'CheckCsLim',                                         1, False ),
+
+        ( 'CheckCsLimAndOpcodes',                               3, False ),
+        ( 'CheckOpcodes',                                       3, False ),
+        ( 'CheckOpcodesConsiderCsLim',                          3, False ),
+
+        ( 'CheckCsLimAndPcAndOpcodes',                          3, False ),
+        ( 'CheckPcAndOpcodes',                                  3, False ),
+        ( 'CheckPcAndOpcodesConsiderCsLim',                     3, False ),
+
+        ( 'CheckCsLimAndOpcodesAcrossPageLoadingTlb',           3, False ),
+        ( 'CheckOpcodesAcrossPageLoadingTlb',                   3, False ),
+        ( 'CheckOpcodesAcrossPageLoadingTlbConsiderCsLim',      2, False ),
+
+        ( 'CheckCsLimAndOpcodesLoadingTlb',                     3, False ),
+        ( 'CheckOpcodesLoadingTlb',                             3, False ),
+        ( 'CheckOpcodesLoadingTlbConsiderCsLim',                3, False ),
+
+        ( 'CheckCsLimAndOpcodesOnNextPageLoadingTlb',           2, False ),
+        ( 'CheckOpcodesOnNextPageLoadingTlb',                   2, False ),
+        ( 'CheckOpcodesOnNextPageLoadingTlbConsiderCsLim',      2, False ),
+
+        ( 'CheckCsLimAndOpcodesOnNewPageLoadingTlb',            2, False ),
+        ( 'CheckOpcodesOnNewPageLoadingTlb',                    2, False ),
+        ( 'CheckOpcodesOnNewPageLoadingTlbConsiderCsLim',       2, False ),
     );
 
@@ -1653 +1654 @@
             '     */',
         ];
-        asLines += ['    kIemThreadedFunc_BltIn_%s,' % (sFuncNm,) for sFuncNm, _ in self.katBltIns];
+        asLines += ['    kIemThreadedFunc_BltIn_%s,' % (sFuncNm,) for sFuncNm, _, _ in self.katBltIns];
 
         iThreadedFunction = 1 + len(self.katBltIns);
@@ -1827 +1828 @@
                 '     */',
             ));
-        for sFuncNm, cArgs in self.katBltIns:
+        for sFuncNm, cArgs, _ in self.katBltIns:
             asFuncTable.append('    iemThreadedFunc_BltIn_%s,' % (sFuncNm,));
             asNameTable.append('    "BltIn_%s",' % (sFuncNm,));
@@ -1963 +1964 @@
                     + '     */\n'
                     );
-        for sFuncNm, _ in self.katBltIns:
-            oOut.write('    NULL, /*BltIn_%s*/\n' % (sFuncNm,))
+        for sFuncNm, _, fHaveRecompFunc in self.katBltIns:
+            if fHaveRecompFunc:
+                oOut.write('    iemNativeRecompFunc_BltIn_%s,\n' % (sFuncNm,))
+            else:
+                oOut.write('    NULL, /*BltIn_%s*/\n' % (sFuncNm,))
 
         iThreadedFunction = 1 + len(self.katBltIns);

trunk/src/VBox/VMM/include/IEMN8veRecompiler.h

@@ -658 +658 @@
         AssertReturn(pu32CodeBuf, UINT32_MAX);
         pu32CodeBuf[off++] = Armv8A64MkInstrStLdRUOff(kArmv8A64InstrLdStType_St_Dword, iGprSrc,
-                                                      ARMV8_A64_BP, (uint32_t)offDisp / 8);
-    }
-    else if (offDisp >= -256 offDisp <= 256)
+                                                      ARMV8_A64_REG_BP, (uint32_t)offDisp / 8);
+    }
+    else if (offDisp >= -256 && offDisp <= 256)
     {
         /* stur w/ signed imm9 (unscaled) */
         uint32_t *pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
         AssertReturn(pu32CodeBuf, UINT32_MAX);
-        pu32CodeBuf[off++] = Armv8A64MkInstrSturLdur(kArmv8A64InstrLdStType_St_Dword, iGprSrc, ARMV8_A64_BP, offDisp);
+        pu32CodeBuf[off++] = Armv8A64MkInstrSturLdur(kArmv8A64InstrLdStType_St_Dword, iGprSrc, ARMV8_A64_REG_BP, offDisp);
     }
     else
@@ -673 +673 @@
         uint32_t *pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
         AssertReturn(pu32CodeBuf, UINT32_MAX);
-        pu32CodeBuf[off++] = Armv8A64MkInstrStLdRegIdx(kArmv8A64InstrLdStType_St_Dword, iGprSrc, ARMV8_A64_BP,
+        pu32CodeBuf[off++] = Armv8A64MkInstrStLdRegIdx(kArmv8A64InstrLdStType_St_Dword, iGprSrc, ARMV8_A64_REG_BP,
                                                        IEMNATIVE_REG_FIXDE_TMP0, kArmv8A64InstrLdStExtend_Sxtw);
     }