Changeset 15300 in vbox

Timestamp:

Dec 11, 2008 12:02:12 PM (16 years ago)

Author:

vboxsync

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

40723

Message:

dynamic REM selector

Location:

trunk/src/recompiler_new

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxREMWrapper.cpp (modified) (4 diffs)
• VBoxRecompiler.c (modified) (1 diff)

trunk/src/recompiler_new/Makefile.kmk

@@ -27 +27 @@
 #
 VBOX_PATH_RECOMPILER_SRC := $(PATH_SUB_CURRENT)
+
+# For 32-bit targets when enabled 64-bit guests we build 2 REM DLLs: 
+#  with 64-bit support (slow and buggy at the moment) VBOXREM64
+#  only 32-bit support (faster, stable, but not suitable for 64-bit guests) VBOXREM32
+# During the runtime, we load appropriate library from VBOXREM, depending on guest settings.
+# 64-bit targets have 64-bit enabled REM by default, so is not part of this mess
+if1of (x86, $(KBUILD_TARGET_ARCH))
+ ifdef VBOX_WITH_64_BITS_GUESTS
+   VBOX_USE_REM64 := 1
+ endif
+endif
+
 
 TEMPLATE_DUMMY = dummy template (move to kBuild) ## @todo Will be there in the next update, remove this.
@@ -59 +71 @@
 endif
 
-
-# VBOX_WITH_64_BITS_GUESTS = 1
-
-# For 32-bit targets when enabled 64-bit guests we build 2 REM DLLs:
-#  with 64-bit support (slow and buggy at the moment) VBOXREM64
-#  only 32-bit support (faster, stable, but not suitable for 64-bit guests) VBOXREM
-# During the runtime, we load appropriate library, depending on guest settings.
-if1of (x86, $(KBUILD_TARGET_ARCH))
- ifdef VBOX_WITH_64_BITS_GUESTS
-  USE_VBOXREM64 := 1
- endif
-else
- USE_VBOXREM64 :=
-endif
-
-
 #
 # Target lists (some of them anyways).
@@ -81 +77 @@
  SYSMODS     += VBoxREM2
 endif
-ifeq ($(KBUILD_TARGET),win)
- DLLS        += VBoxREM
-else
- ## @todo this is wrong, proper DLLS are DLLS not IMPORT_LIBS. nice try ;-)
- IMPORT_LIBS += VBoxREM
+
+ifndef VBOX_USE_REM64
+ ifeq ($(KBUILD_TARGET),win)
+  DLLS        += VBoxREM
+ else
+  ## @todo this is wrong, proper DLLS are DLLS not IMPORT_LIBS. nice try ;-)
+  IMPORT_LIBS += VBoxREM
+ endif
 endif
 
@@ -199 +198 @@
 
 
-ifdef USE_VBOXREM64
-#
-# The VBoxREM64 module, for targeting 64-bit guests on 32-bit systems.
-#
-# Currently we never mix USE_VBOXREM64 and VBoxREM2, so can always use VBoxREM
-## @todo: assert for that? use $(REM_MOD) instead?
-# But loading logic got to be updated too.
-ifeq ($(KBUILD_TARGET), win)
- DLL                      += VBoxREM64
-else
- ## @todo see comment above.
- IMPORT_LIBS              += VBoxREM64
-endif
-VBoxREM64_EXTENDS          = $(REM_MOD)
-VBoxREM64_EXTENDS_BY       = appending
-VBoxREM64_DEFS             = VBOX_ENABLE_VBOXREM64
+ifdef VBOX_USE_REM64
+ # kmk doesn't work the way it should wrt EXTENDS and variable value evaluation
+ VBoxREM32_EXTENDS := $(REM_MOD)
+ VBoxREM32_EXTEND_BY := appending 
+ VBoxREM32_TEMPLATE := $(VBoxREM_TEMPLATE)
+ VBoxREM32_DEFS := $($(REM_MOD)_DEFS)
+ VBoxREM32_INCS := $($(REM_MOD)_INCS)
+ VBoxREM32_SOURCES := $($(REM_MOD)_SOURCES)
+ VBoxREM32_LIBS := $($(REM_MOD)_LIBS) $(LIB_VMM) $(LIB_RUNTIME)
+
+ VBoxREM64_EXTENDS = $(REM_MOD)
+ VBoxREM64_EXTEND_BY = appending 
+ VBoxREM64_TEMPLATE := $(VBoxREM_TEMPLATE)
+ VBoxREM64_DEFS := $($(REM_MOD)_DEFS) VBOX_ENABLE_VBOXREM64
+ VBoxREM64_INCS := $($(REM_MOD)_INCS)
+ VBoxREM64_SOURCES := $($(REM_MOD)_SOURCES)
+ VBoxREM64_LIBS := $($(REM_MOD)_LIBS) $(LIB_VMM) $(LIB_RUNTIME)
+
+ VBoxREMSel_TEMPLATE    = VBOXR3
+ VBoxREMSel_NAME        = VBoxREM
+ VBoxREMSel_DEFS        = IN_REM_R3 $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)    \
+                          VBOX_WITH_NEW_RECOMPILER VBOX_USE_BITNESS_SELECTOR
+ VBoxREMSel_SOURCES     = VBoxREMWrapper.cpp 
+
+ ifeq ($(KBUILD_TARGET), win)
+  DLL                  += VBoxREM32 VBoxREM64 VBoxREMSel
+ else
+  IMPORT_LIBS          += VBoxREM32 VBoxREM64 VBoxREMSel
+ endif
+
 endif # USE_VBOXREM64
 

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -179 +179 @@
 # define USE_REM_IMPORT_JUMP_GLUE
 #endif
-
 
 /*******************************************************************************
@@ -1944 +1943 @@
 #endif
 
+#ifdef VBOX_USE_BITNESS_SELECTOR
+/**
+ * Loads real REM object, resolves all exports (imports are done by native loader).
+ *
+ * @returns VBox status code.
+ */
+static int remLoadProperObj(PVM pVM)
+{
+    size_t  offFilename;
+    char    szPath[RTPATH_MAX];
+    bool use64 = true;
+    int rc = RTPathAppPrivateArch(szPath, sizeof(szPath) - 32);
+    AssertRCReturn(rc, rc);
+    offFilename = strlen(szPath);
+
+    /*
+     * Load the VBoxREM32/64 object/DLL.
+     */
+    strcpy(&szPath[offFilename], use64 ? "/VBoxREM64" : "/VBoxREM32");
+    rc = RTLdrLoad(szPath, &g_ModREM2);
+    if (RT_SUCCESS(rc))
+    {
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Resolve exports.
+             */
+            unsigned i;
+            for (i = 0; i < RT_ELEMENTS(g_aExports); i++)
+            {
+                void* Value;
+                rc = RTLdrGetSymbol(g_ModREM2, g_aExports[i].pszName, &Value);
+                AssertMsgRC(rc, ("%s rc=%Rrc\n", g_aExports[i].pszName, rc));
+                if (RT_FAILURE(rc))
+                    break;
+                *(void **)g_aExports[i].pv = Value;
+            }
+        }
+    }
+    
+    return rc;
+}
+
+/**
+ * Unloads the real REM object.
+ */
+static void remUnloadProperObj(void)
+{
+    unsigned i;
+
+    /* close module. */
+    RTLdrClose(g_ModREM2);
+    g_ModREM2 = NIL_RTLDRMOD;
+}
+#endif
+
 
 REMR3DECL(int) REMR3Init(PVM pVM)
@@ -1949 +2004 @@
 #ifdef USE_REM_STUBS
     return VINF_SUCCESS;
+#elif VBOX_USE_BITNESS_SELECTOR
+    if (!pfnREMR3Init)
+    {
+        int rc = remLoadProperObj(pVM);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+    return pfnREMR3Init(pVM);
 #else
     if (!pfnREMR3Init)
@@ -1964 +2027 @@
 #ifdef USE_REM_STUBS
     return VINF_SUCCESS;
+#elif VBOX_USE_BITNESS_SELECTOR
+    int rc;
+    Assert(VALID_PTR(pfnREMR3Term));
+    rc = pfnREMR3Term(pVM);
+    remUnloadProperObj();
+    return rc;
 #else
     int rc;

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -245 +245 @@
     uint32_t u32Dummy;
     int rc;
+
+#ifdef VBOX_ENABLE_VBOXREM64
+    LogRel(("Using 64-bit aware REM\n"));
+#endif
 
     /*