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

Timestamp:

Sep 25, 2023 12:54:00 AM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: Fixed EXC_BAD_INSTRUCTION issue. bugref:10370

File:

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

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

@@ -72 +72 @@
 # include <iprt/formats/dwarf.h>
 # if defined(RT_OS_DARWIN)
+#  include <libkern/OSCacheControl.h>
 #  define IEMNATIVE_USE_LIBUNWIND
 extern "C" void  __register_frame(const void *pvFde);
@@ -284 +285 @@
      * expect the caller to call iemExecMemAllocatorReadyForUse when done
      * writing to the allocation.
+     *
+     * See also https://developer.apple.com/documentation/apple-silicon/porting-just-in-time-compilers-to-apple-silicon
+     * for details.
      */
     /** @todo detect if this is necessary... it wasn't required on 10.15 or
@@ -445 +449 @@
 #ifdef RT_OS_DARWIN
     /* See iemExecMemAllocatorAllocTailCode for the explanation. */
-# if 0 /** @todo getting weird EXC_BAD_INSTRUCTION exceptions, trying to figure out / work around why... */
-    int rc2 = RTMemProtect(pv, cb, RTMEM_PROT_NONE);
-    AssertRC(rc2); RT_NOREF(pVCpu);
-# endif
     int rc = RTMemProtect(pv, cb, RTMEM_PROT_EXEC | RTMEM_PROT_READ);
     AssertRC(rc); RT_NOREF(pVCpu);
-# if 0 /** @todo getting weird EXC_BAD_INSTRUCTION exceptions, trying to figure out / work around why... */
-    ASMProbeReadBuffer(pv, cb);
-#  ifdef RT_ARCH_ARM64
-    __asm__ __volatile__("dmb sy\n\t"
-                         "dsb sy\n\t"
-                         "isb\n\t"
-                         ::: "memory");
-#  endif
-# endif
+
+    /*
+     * Flush the instruction cache:
+     *      https://developer.apple.com/documentation/apple-silicon/porting-just-in-time-compilers-to-apple-silicon
+     */
+    /* sys_dcache_flush(pv, cb); - not necessary */
+    sys_icache_invalidate(pv, cb);
 #else
     RT_NOREF(pVCpu, pv, cb);
@@ -837 +835 @@
 
     /* Allocate a chunk. */
-#ifdef RT_OS_DARWIN /** @todo oh carp! This isn't going to work very well with the unpredictability of the simple heap... */
+#ifdef RT_OS_DARWIN
     void *pvChunk = RTMemPageAllocEx(pExecMemAllocator->cbChunk, 0);
 #else
@@ -1839 +1837 @@
         iemTbAllocatorProcessDelayedFrees(pVCpu, pVCpu->iem.s.pTbAllocatorR3);
 
-#if 1 /** @todo getting weird EXC_BAD_INSTRUCTION exceptions, trying to figure out / work around why... */
     PIEMNATIVEINSTR const paFinalInstrBuf = (PIEMNATIVEINSTR)iemExecMemAllocatorAlloc(pVCpu, off * sizeof(IEMNATIVEINSTR));
     AssertReturn(paFinalInstrBuf, pTb);
     memcpy(paFinalInstrBuf, pReNative->pInstrBuf, off * sizeof(paFinalInstrBuf[0]));
-#else
-    IEMNATIVEINSTR volatile * const paFinalInstrBuf
-        = (IEMNATIVEINSTR volatile *)iemExecMemAllocatorAlloc(pVCpu, off * sizeof(IEMNATIVEINSTR));
-    AssertReturn(paFinalInstrBuf, pTb);
-    for (uint32_t i = 0; i < off; i++)
-        paFinalInstrBuf[i] = pReNative->pInstrBuf[i];
-    __asm__ __volatile__("dmb sy\n\t" ::: "memory");
-#endif
 
     /*