Changeset 34198 in vbox

Timestamp:

Nov 19, 2010 1:46:47 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: add debug message and use define for patch size

File:

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

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

@@ -173 +173 @@
     }
 }
+
+#ifdef RT_ARCH_AMD64
+# define FAKEDRI_JMP64_PATCH_SIZE 13
+#endif
 
 static void
@@ -291 +295 @@
 #ifdef RT_ARCH_AMD64
     /*Add rest of mesa function body to free list*/
-    if (sym->st_size-(pEnd-pStart)>=5)
+    if (sym->st_size-(pEnd-pStart)>=FAKEDRI_JMP64_PATCH_SIZE)
     {
         FAKEDRI_PatchNode *pNode = (FAKEDRI_PatchNode *)crAlloc(sizeof(FAKEDRI_PatchNode));
@@ -303 +307 @@
                 pNode->pNext = g_pFreeList;
                 g_pFreeList = pNode;
+# ifndef VBOX_NO_MESA_PATCH_REPORTS
+                crDebug("Added free node %s, func start=%p, free start=%p, size=%#lx",
+                        psFuncName, pNode->pSrcStart, pNode->pDstStart, pNode->pDstEnd-pNode->pDstStart);
+# endif
         }
     }
@@ -314 +322 @@
     FAKEDRI_PatchNode *pFreeNode, *pPatchNode;
     int64_t offset;
-    char patch[13];
+    char patch[FAKEDRI_JMP64_PATCH_SIZE];
 
     pPatchNode = g_pRepatchList;
@@ -326 +334 @@
         while (pFreeNode)
         {
-            if (pFreeNode->pDstEnd-pFreeNode->pDstStart>=13)
+            if (pFreeNode->pDstEnd-pFreeNode->pDstStart>=FAKEDRI_JMP64_PATCH_SIZE)
             {
                 offset = ((intptr_t)pFreeNode->pDstStart-((intptr_t)pPatchNode->pDstStart+5));
@@ -363 +371 @@
                 pPatchNode->psFuncName);
 # endif
-        vboxApplyPatch(pFreeNode->psFuncName, pFreeNode->pDstStart, &patch[0], 13);
+        vboxApplyPatch(pFreeNode->psFuncName, pFreeNode->pDstStart, &patch[0], FAKEDRI_JMP64_PATCH_SIZE);
         /*mark this space as used*/
-        pFreeNode->pDstStart = pFreeNode->pDstStart+13;
+        pFreeNode->pDstStart = pFreeNode->pDstStart+FAKEDRI_JMP64_PATCH_SIZE;
 
         pPatchNode = pPatchNode->pNext;