Changeset 25070 in vbox

Timestamp:

Nov 28, 2009 2:25:27 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix opengl&compiz on 64bit linuxes

File:

• trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c

@@ -140 +140 @@
     void *alPatch;
     void *pMesaEntry;
+#ifdef RT_ARCH_AMD64
+    char patch[5];
+    void *shift;
+#endif
 
 #ifndef VBOX_NO_MESA_PATCH_REPORTS
+    crDebug("");
     crDebug("vboxPatchMesaExport: %s", psFuncName);
 #endif
@@ -185 +190 @@
     if (sym->st_size<(pEnd-pStart))
     {
+#ifdef RT_ARCH_AMD64
+        /* Try to insert 5 bytes jmpq to our stub code */
+
+        if (5>(pEnd-pStart))
+        {
+            crDebug("Can't patch size too small.(%s)", psFuncName);
+            return;
+        }
+
+        shift = pStart-(dlip.dli_saddr+5);
+# ifndef VBOX_NO_MESA_PATCH_REPORTS
+        crDebug("Size is small, inserting jmpq with shift %p instead", shift);
+# endif
+
+        if ( ((((long)shift)&0x00000000) != 0) 
+             && ((((long)shift)&0x00000000) != 0xFFFFFFFF00000000))
+        {
+            crDebug("Can't patch offset is too big.(%s)", psFuncName);
+            return;
+        }
+
+        patch[0] = 0xE9;
+        patch[1] = ((char*)&shift)[0];
+        patch[2] = ((char*)&shift)[1];
+        patch[3] = ((char*)&shift)[2];
+        patch[4] = ((char*)&shift)[3];
+
+# ifndef VBOX_NO_MESA_PATCH_REPORTS
+        crDebug("Patch: E9 %x", *((int*)&patch[1]));
+# endif
+        pStart = &patch[0];
+        pEnd = &patch[5];
+#else
         crDebug("Can't patch size too small.(%s)", psFuncName);
         return;
+#endif //ifdef RT_ARCH_AMD64
     }