Changeset 15272 in vbox for trunk/src/recompiler_new

Timestamp:

Dec 10, 2008 6:47:19 PM (16 years ago)

Author:

vboxsync

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

40690

Message:

recompiler: support for 64-bit enabled REM library on 32-bit hosts (disabled by USE_VBOXREM64 in Makefile.kmk now)

Location:

trunk/src/recompiler_new

Files:

• Makefile.kmk (modified) (5 diffs)
• Sun/config.h (modified) (1 diff)
• VBoxRecompiler.c (modified) (2 diffs)
• tcg/tcg.c (modified) (1 diff)

trunk/src/recompiler_new/Makefile.kmk

@@ -27 +27 @@
 # differences) to cross-compile code to Linux/ELF and dynamically generate invocation wrappers.
 if1of (win.amd64, $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
- REM_MOD              += VBoxREM2
+ REM_MOD              = VBoxREM2
  SYSMODS              += VBoxREM2
 else
- REM_MOD              += VBoxREM
+ REM_MOD              = VBoxREM
 endif
 
@@ -40 +40 @@
  $(REM_MOD)_SDKS.win.x86    = W32API
  $(REM_MOD)_ASFLAGS         = -x assembler-with-cpp
- $(REM_MOD)_CFLAGS          = -Wall -g
+ $(REM_MOD)_CFLAGS          = -Wall -g -fno-omit-frame-pointer -fno-strict-aliasing
  $(REM_MOD)_CFLAGS.debug    = -O0
  $(REM_MOD)_CFLAGS.release += -fno-gcse -O2
@@ -77 +77 @@
 endif
 
+# For 32-bit targets 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))
+ USE_VBOXREM64 := 1
+else
+ USE_VBOXREM64 :=
+endif
+
+# Disable for now, while debugged enough
+USE_VBOXREM64 = 
+
 OTHER_CLEAN          +=
 
@@ -178 +191 @@
 $(REM_MOD)_DEFS.win.x86   += GCC_WITH_BUGGY_REGPARM
 
+ifdef USE_VBOXREM64
+ # 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
+  IMPORT_LIBS          += VBoxREM64
+ endif
+ # Something fishy goes on within kmk's tool selection algorithm/variable evaluation
+ # as for now g++ is always selected to compile VBoxREM64, while VBoxREM compiled with gcc
+ VBoxREM64_TOOL = $(VBoxREM_TOOL)
+ VBoxREM64_TEMPLATE = $(VBoxREM_TEMPLATE)
+ VBoxREM64_CFLAGS += $(VBoxREM_CFLAGS)
+ VBoxREM64_DEFS += $(VBoxREM_DEFS) VBOX_ENABLE_VBOXREM64
+ VBoxREM64_INCS += $(VBoxREM_INCS)
+ VBoxREM64_LIBS += $(VBoxREM_LIBS)
+ VBoxREM64_SOURCES = $(VBoxREM_SOURCES)
+endif
 
 ifdef USE_REM_IMP
@@ -203 +235 @@
 VBoxREMImp_SONAME           = VBoxREM$(SUFF_DLL)
  endif
-VBoxREMImp_LDFLAGS.darwin   = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM.dylib
 VBoxREMImp_LDFLAGS.l4       = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib
 

trunk/src/recompiler_new/Sun/config.h

@@ -27 +27 @@
 
 #ifdef VBOX_WITH_64_BITS_GUESTS
-#define TARGET_X86_64
+# if (TCG_TARGET_REG_BITS == 64) || defined (VBOX_ENABLE_VBOXREM64)
+#  define TARGET_X86_64
+# endif
 #endif
 

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -3493 +3493 @@
      * Disassemble.
      */
-    off = env->eip - (RTGCUINTPTR)pvPC;
+    off = env->eip - (RTGCUINTPTR)(uintptr_t)pvPC;
     Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;
     Cpu.pfnReadBytes = NULL;            /** @todo make cs:eip reader for the disassembler. */
@@ -3594 +3594 @@
      * Disassemble.
      */
-    off = env->eip - (RTGCUINTPTR)pvPC;
+    off = env->eip - (RTGCUINTPTR)(uintptr_t)pvPC;
     Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;
     Cpu.pfnReadBytes = NULL;            /** @todo make cs:eip reader for the disassembler. */

trunk/src/recompiler_new/tcg/tcg.c

@@ -77 +77 @@
 #endif
 #endif
-
 
 static void patch_reloc(uint8_t *code_ptr, int type,