Changeset 340 in vbox for trunk

Timestamp:

Jan 26, 2007 12:48:25 AM (18 years ago)

Author:

vboxsync

Message:

Import jump glue is required for GCC on Linux/GNU.

File:

• trunk/src/recompiler/new/VBoxREMWrapper.cpp (modified) (7 diffs)

trunk/src/recompiler/new/VBoxREMWrapper.cpp

@@ -158 +158 @@
  * use calling convention wrappers.
  */
-#if defined(__WIN64__) || defined(__DOXYGEN__)
+#if (defined(__AMD64__) && defined(__WIN__)) || defined(__DOXYGEN__)
 # define USE_REM_CALLING_CONVENTION_GLUE
+#endif
+
+/** @def USE_REM_IMPORT_JUMP_GLUE
+ * Define USE_REM_IMPORT_JUMP_GLUE for platforms where we need to 
+ * emit some jump glue to deal with big addresses.
+ */
+#if (defined(__AMD64__) && !defined(USE_REM_CALLING_CONVENTION_GLUE) && !defined(__DARWIN__)) || defined(__DOXYGEN__)
+# define USE_REM_IMPORT_JUMP_GLUE
 #endif
 
@@ -1002 +1010 @@
 
 
-# ifdef USE_REM_CALLING_CONVENTION_GLUE
+# if defined(USE_REM_CALLING_CONVENTION_GLUE) || defined(USE_REM_IMPORT_JUMP_GLUE) 
 /** LIFO of read-write-executable memory chunks used for wrappers. */
 static PREMEXECMEM g_pExecMemHead;
@@ -1040 +1048 @@
 
 
-# ifdef USE_REM_CALLING_CONVENTION_GLUE
+# if defined(USE_REM_CALLING_CONVENTION_GLUE) || defined(USE_REM_IMPORT_JUMP_GLUE) 
 /**
  * Allocates a block of memory for glue code.
@@ -1074 +1082 @@
     return memset((uint8_t *)pCur + RT_ALIGN_Z(sizeof(*pCur), 32), 0xcc, cbAligned);
 }
-
-
+# endif /* USE_REM_CALLING_CONVENTION_GLUE || USE_REM_IMPORT_JUMP_GLUE */
+
+
+# ifdef USE_REM_CALLING_CONVENTION_GLUE
 /**
  * Checks if a function is all straight forward integers.
@@ -1321 +1331 @@
 static int remGenerateImportGlue(PRTUINTPTR pValue, PREMFNDESC pDesc)
 {
-# ifdef USE_REM_CALLING_CONVENTION_GLUE
+# if defined(USE_REM_CALLING_CONVENTION_GLUE) || defined(USE_REM_IMPORT_JUMP_GLUE) 
     if (!pDesc->pvWrapper)
     {
+#  ifdef USE_REM_CALLING_CONVENTION_GLUE
         if (remIsFunctionAllInts(pDesc))
         {
@@ -1382 +1393 @@
 #endif
         }
+#  else  /* !USE_REM_CALLING_CONVENTION_GLUE */
+
+        /*
+         * Generate a jump patch.
+         */
+        uint8_t *pb;
+#   ifdef __AMD64__
+        pDesc->pvWrapper = pb = (uint8_t *)remAllocGlue(32);
+        AssertReturn(pDesc->pvWrapper, VERR_NO_MEMORY);
+        *pb++ = 0xcc;
+        *pb++ = 0xff;
+        *pb++ = 0x24;
+        *pb++ = 0x25;
+        *(uint32_t *)pb = (uintptr_t)pb + 5;
+        pb += 5;
+        *(uint64_t *)pb = (uint64_t)pDesc->pv;
+#   else
+        pDesc->pvWrapper = pb = (uint8_t *)remAllocGlue(8);
+        AssertReturn(pDesc->pvWrapper, VERR_NO_MEMORY);
+        *pb++ = 0xea;
+        *(uint32_t *)pb = (uint32_t)pDesc->pv;
+#   endif
+#  endif /* !USE_REM_CALLING_CONVENTION_GLUE */
     }
     *pValue = (uintptr_t)pDesc->pvWrapper;
-
 # else  /* !USE_REM_CALLING_CONVENTION_GLUE */
     *pValue = (uintptr_t)pDesc->pv;
@@ -1495 +1528 @@
     for (i = 0; i < ELEMENTS(g_aExports); i++)
         *(void **)g_aExports[i].pv = NULL;
-# ifdef USE_REM_CALLING_CONVENTION_GLUE
+# if defined(USE_REM_CALLING_CONVENTION_GLUE) || defined(USE_REM_IMPORT_JUMP_GLUE) 
     for (i = 0; i < ELEMENTS(g_aVMMImports); i++)
         g_aVMMImports[i].pvWrapper = NULL;