Changeset 13649 in vbox

Timestamp:

Oct 29, 2008 12:27:45 PM (17 years ago)

Author:

vboxsync

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

38586

Message:

draft 32-bit recompiler

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/nsprpub/pr/include/md/_solaris64.cfg (modified) (1 diff)
• src/recompiler_new/Makefile.kmk (modified) (3 diffs)
• src/recompiler_new/dyngen-exec.h (modified) (2 diffs)
• src/recompiler_new/dyngen.h (deleted)

trunk/Config.kmk

@@ -1144 +1144 @@
  LIB_VMM         = $(PATH_BIN)/VBoxVMM.so
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
- LIB_REM         = $(PATH_BIN)/VBoxREMImp.so
+ ifdef VBOX_WITH_NEW_RECOMPILER
+  LIB_REM         = $(PATH_BIN)/VBoxREM.so
+ else
+  LIB_REM         = $(PATH_BIN)/VBoxREMImp.so
+ endif
  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.so
  LIB_DDU         = $(PATH_BIN)/VBoxDDU.so

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_solaris64.cfg

@@ -52 +52 @@
 #define PR_ALIGN_OF_INT64   8
 #define PR_ALIGN_OF_DOUBLE  8
-#elif defined(__x86_64)
+#elif defined(__x86_64) || defined(__AMD64)
 #define IS_LITTLE_ENDIAN 1
 #undef  IS_BIG_ENDIAN

trunk/src/recompiler_new/Makefile.kmk

@@ -25 +25 @@
 
 REM_MOD              += VBoxREM
-DLLS                 += VBoxREM
+#DLLS                 += VBoxREM
+IMPORT_LIBS          += VBoxREM
 
 DEFS                 += VBOX_WITH_NEW_RECOMPILER
@@ -106 +107 @@
 $(REM_MOD)_LDFLAGS.solaris = -mimpure-text
 
-$(REM_MOD)_LIBS           =     \
+#$(REM_MOD)_LIBS           =    \
         $(LIB_VMM)              \
-        $(LIB_RUNTIME)
+        $(LIB_RUNTIME)
 
 
 if1of ($(KBUILD_TARGET), linux darwin solaris)
-$(REM_MOD)_DEFS.solaris += 
 # Extra flags for these source modules.
 target-i386/op-helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
@@ -133 +133 @@
 
 include $(KBUILD_PATH)/subfooter.kmk
-
-importlib: $(LIB_REM)

trunk/src/recompiler_new/dyngen-exec.h

@@ -30 +30 @@
 #define __DYNGEN_EXEC_H__
 
+#ifndef VBOX
 /* prevent Solaris from trying to typedef FILE in gcc's
    include/floatingpoint.h which will conflict with the
@@ -36 +37 @@
 #define _FILEDEFED
 #endif
+#endif /* !VBOX */
 
 /* NOTE: standard headers should be used with special care at this