Changeset 101193 in vbox

Timestamp:

Sep 20, 2023 12:53:00 PM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: Some libunwind/darwin adjustments. bugref:10370

File:

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

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

@@ -66 +66 @@
 #else
 # include <iprt/formats/dwarf.h>
-extern "C" void __register_frame_info(void *begin, void *ob); /* found no header for these two */
+# if defined(RT_OS_DARWIN)
+#  define IEMNATIVE_USE_LIBUNWIND
+extern "C" void  __register_frame(const void *pvFde);
+extern "C" void  __deregister_frame(const void *pvFde);
+# else
+extern "C" void  __register_frame_info(void *pvBegin, void *pvObj); /* found no header for these two */
+extern "C" void *__deregister_frame_info(void *pvBegin);           /* (returns pvObj from __register_frame_info call) */
+# endif
 #endif
 
@@ -160 +167 @@
 typedef struct IEMEXECMEMCHUNKEHFRAME
 {
+# ifdef IEMNATIVE_USE_LIBUNWIND
+    /** The offset of the FDA into abEhFrame. */
+    uintptr_t               offFda;
+# else
     /** struct object storage area. */
     uint8_t                 abObject[1024];
+# endif
     /** The dwarf ehframe data for the chunk. */
     uint8_t                 abEhFrame[512];
@@ -435 +447 @@
      * Generate the CIE first.
      */
+#ifdef IEMNATIVE_USE_LIBUNWIND /* libunwind (llvm, darwin) only supports v1 and v3. */
+    uint8_t const iDwarfVer = 3;
+#else
+    uint8_t const iDwarfVer = 4;
+#endif
     RTPTRUNION const PtrCie = Ptr;
     *Ptr.pu32++ = 123;                                      /* The CIE length will be determined later. */
     *Ptr.pu32++ = 0 /*UINT32_MAX*/;                         /* I'm a CIE in .eh_frame speak. */
-    *Ptr.pb++   = 4;                                        /* DwARF v4. */
+    *Ptr.pb++   = iDwarfVer;                                /* DwARF version */
     *Ptr.pb++   = 0;                                        /* Augmentation. */
-    *Ptr.pb++   = sizeof(uintptr_t);                        /* Address size. */
-    *Ptr.pb++   = 0;                                        /* Segment selector size. */
+    if (iDwarfVer >= 4)
+    {
+        *Ptr.pb++   = sizeof(uintptr_t);                    /* Address size. */
+        *Ptr.pb++   = 0;                                    /* Segment selector size. */
+    }
     Ptr = iemDwarfPutLeb128(Ptr, 1);                        /* Code alignment factor (LEB128 = 1). */
     Ptr = iemDwarfPutLeb128(Ptr, -8);                       /* Data alignment factor (LEB128 = -8). */
@@ -462 +482 @@
      * Generate an FDE for the whole chunk area.
      */
+#ifdef IEMNATIVE_USE_LIBUNWIND
+    pEhFrame->offFda = Ptr.u - (uintptr_t)&pEhFrame->abEhFrame[0];
+#endif
     RTPTRUNION const PtrFde = Ptr;
     *Ptr.pu32++ = 123;                                      /* The CIE length will be determined later. */
@@ -573 +596 @@
             {
                 iemExecMemAllocatorInitEhFrameForChunk(pExecMemAllocator, pEhFrame, pvChunk);
+#  ifdef IEMNATIVE_USE_LIBUNWIND
+                __register_frame(&pEhFrame->abEhFrame[pEhFrame->offFda]);
+#  else
                 memset(pEhFrame->abObject, 0xf6, sizeof(pEhFrame->abObject)); /* color the memory to better spot usage */
                 __register_frame_info(pEhFrame->abEhFrame, pEhFrame->abObject);
+#  endif
             }
             else