Changeset 15305 in vbox for trunk/src/recompiler_new

Timestamp:

Dec 11, 2008 3:31:29 PM (16 years ago)

Author:

vboxsync

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

40730

Message:

REM: implement config check heuristic, to select which REM to load

File:

• trunk/src/recompiler_new/VBoxREMWrapper.cpp (modified) (3 diffs)

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -1944 +1944 @@
 
 #ifdef VBOX_USE_BITNESS_SELECTOR
+static bool isRem64Needed(PVM pVM)
+{
+    PCFGMNODE pRoot = CFGMR3GetRoot(pVM);
+    uint64_t u64Value = 0;
+
+    CFGMR3QueryIntegerDef(pRoot, "Rem64Enabled", &u64Value, 0);
+
+    return u64Value == 1;
+}
+
 /**
  * Loads real REM object, resolves all exports (imports are done by native loader).
@@ -1953 +1963 @@
     size_t  offFilename;
     char    szPath[RTPATH_MAX];
-    bool use64 = (VMR3GetGuestBitness(pVM) == 64);
-    int rc = RTPathAppPrivateArch(szPath, sizeof(szPath) - 32);
+    int     rc = RTPathAppPrivateArch(szPath, sizeof(szPath) - 32);
     AssertRCReturn(rc, rc);
     offFilename = strlen(szPath);
@@ -1961 +1970 @@
      * Load the VBoxREM32/64 object/DLL.
      */
-    strcpy(&szPath[offFilename], use64 ? "/VBoxREM64" : "/VBoxREM32");
+    strcpy(&szPath[offFilename], isRem64Needed(pVM) ? "/VBoxREM64" : "/VBoxREM32");
     rc = RTLdrLoad(szPath, &g_ModREM2);
     if (RT_SUCCESS(rc))