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

Timestamp:

Sep 25, 2023 11:57:08 PM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: Corrected FNIEMNATIVETB so it clearly indicates that exceptions may be thrown (or longjmps made) from the translation block. Accidentally used the wrong macro and clang-1200.0.32.27 optimized the exception catching away in release builds on arm64. bugref:10370

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllN8veRecompiler.cpp (modified) (1 diff)
• VMMAll/IEMAllThrdRecompiler.cpp (modified) (1 diff)
• include/IEMInternal.h (modified) (2 diffs)

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

@@ -777 +777 @@
     Ptr = iemDwarfPutCfaOffset(Ptr, DWREG_AMD64_R15, 7);    /* R15     = [CFA + 7*-8] */
 #  elif defined(RT_ARCH_ARM64)
+#   if 1
     Ptr = iemDwarfPutCfaDefCfa(Ptr, DWREG_ARM64_BP,  16);   /* CFA     = BP + 0x10 - first stack parameter */
-    //Ptr = iemDwarfPutCfaDefCfa(Ptr, DWREG_ARM64_SP,  IEMNATIVE_FRAME_VAR_SIZE + IEMNATIVE_FRAME_SAVE_REG_SIZE);
+#   else
+    Ptr = iemDwarfPutCfaDefCfa(Ptr, DWREG_ARM64_SP,  IEMNATIVE_FRAME_VAR_SIZE + IEMNATIVE_FRAME_SAVE_REG_SIZE);
+#   endif
     Ptr = iemDwarfPutCfaOffset(Ptr, DWREG_ARM64_LR,   1);   /* Ret PC  = [CFA + 1*-8] */
     Ptr = iemDwarfPutCfaOffset(Ptr, DWREG_ARM64_BP,   2);   /* Ret BP  = [CFA + 2*-8] */

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

@@ -2250 +2250 @@
     {
         pVCpu->iem.s.cTbExecNative++;
-        typedef IEM_DECL_IMPL_TYPE(int, FNIEMNATIVETB, (PVMCPUCC pVCpu, PIEMTB pTb));
 # ifdef LOG_ENABLED
         iemThreadedLogCurInstr(pVCpu, "EXn");
 # endif
-        VBOXSTRICTRC const rcStrict = ((FNIEMNATIVETB *)pTb->Native.paInstructions)(pVCpu, pTb);
+        VBOXSTRICTRC const rcStrict = ((PFNIEMTBNATIVE)pTb->Native.paInstructions)(pVCpu);
         if (RT_LIKELY(   rcStrict == VINF_SUCCESS
                       && pVCpu->iem.s.rcPassUp == VINF_SUCCESS /** @todo this isn't great. */))

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

@@ -779 +779 @@
 typedef IEMTHRDEDCALLENTRY const *PCIEMTHRDEDCALLENTRY;
 
+/** Native IEM TB 'function' typedef.
+ * This will throw/longjmp on occation.  */
+typedef int FNIEMTBNATIVE(PVMCPUCC pVCpu) IEM_NOEXCEPT_MAY_LONGJMP;
+/** Pointer to a native IEM TB entry point function.
+ * This will throw/longjmp on occation.  */
+typedef FNIEMTBNATIVE *PFNIEMTBNATIVE;
+
+
 /**
  * Translation block.
@@ -836 +844 @@
         struct
         {
-            /** The native instructions. */
+            /** The native instructions (PFNIEMTBNATIVE). */
             PIEMNATIVEINSTR     paInstructions;
             /** Number of instructions pointed to by paInstructions. */