Changeset 34204 in vbox for trunk/src

Timestamp:

Nov 19, 2010 3:02:11 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67946

Message:

crOpenGL: use jmp chain only when necessary

File:

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

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

@@ -174 +174 @@
 }
 
-#ifdef RT_ARCH_AMD64
-# define FAKEDRI_JMP64_PATCH_SIZE 13
-#endif
+#define FAKEDRI_JMP64_PATCH_SIZE 13
 
 static void
@@ -186 +184 @@
     void *alPatch;
     void *pMesaEntry;
-    char patch[5];
+    char patch[FAKEDRI_JMP64_PATCH_SIZE];
     void *shift;
 
@@ -237 +235 @@
 #endif
     {
+#ifdef RT_ARCH_AMD64
+        int64_t offset;
+#endif
         /* Try to insert 5 bytes jmp/jmpq to our stub code */
 
@@ -243 +244 @@
             if (crStrcmp(psFuncName, "glXCreateGLXPixmapMESA"))
             {
-                crError("Can't patch size too small.(%s)", psFuncName);
+                crError("Can't patch size is too small.(%s)", psFuncName);
             }
             return;
@@ -249 +250 @@
 
         shift = (void*)((intptr_t)pStart-((intptr_t)dlip.dli_saddr+5));
-#ifndef VBOX_NO_MESA_PATCH_REPORTS
-        crDebug("Inserting jmp[q] with shift %p instead", shift);
-#endif
-
 #ifdef RT_ARCH_AMD64
-        {
-            int64_t offset = (intptr_t)shift;
-
-            if (offset>INT32_MAX || offset<INT32_MIN)
+        offset = (intptr_t)shift;
+        if (offset>INT32_MAX || offset<INT32_MIN)
+        {
+            /*try to insert 64bit abs jmp*/
+            if (sym->st_size>=FAKEDRI_JMP64_PATCH_SIZE)
+            {
+# ifndef VBOX_NO_MESA_PATCH_REPORTS
+                crDebug("Inserting movq/jmp instead");
+# endif
+                /*add 64bit abs jmp*/
+                patch[0] = 0x49; /*movq %r11,imm64*/
+                patch[1] = 0xBB;
+                crMemcpy(&patch[2], &pStart, 8);
+                patch[10] = 0x41; /*jmp *%r11*/
+                patch[11] = 0xFF;
+                patch[12] = 0xE3;
+                pStart = &patch[0];
+                pEnd = &patch[FAKEDRI_JMP64_PATCH_SIZE];
+            }
+            else
             {
                 FAKEDRI_PatchNode *pNode;
@@ -280 +293 @@
             }
         }
-#endif
-
-        patch[0] = 0xE9;
-        crMemcpy(&patch[1], &shift, 4);
+        else
+#endif
+        {
 #ifndef VBOX_NO_MESA_PATCH_REPORTS
-        crDebug("Patch: E9 %x", *((int*)&patch[1]));
-#endif
-        pStart = &patch[0];
-        pEnd = &patch[5];
+            crDebug("Inserting jmp[q] with shift %p instead", shift);
+#endif
+            patch[0] = 0xE9;
+            crMemcpy(&patch[1], &shift, 4);
+            pStart = &patch[0];
+            pEnd = &patch[5];
+        }
     }