Changeset 14447

Timestamp:

11/21/08 10:58:22 (2 months ago)

Author:

vboxsync

Message:

New REM compiles on Win/AMD64 (using wrapper yet), not tested if runs

Files:

• trunk/src/recompiler_new/Makefile.kmk (modified) (3 diffs)
• trunk/src/recompiler_new/fpu/softfloat-native.h (modified) (1 diff)
• trunk/src/recompiler_new/osdep.h (modified) (1 diff)

trunk/src/recompiler_new/Makefile.kmk

@@ -23 +23 @@
-include $(KBUILD_PATH)/subheader.kmk
-
+# For 64-bit Windows we currently use gcc (due to MSVC unaware of such a novel 
+# thing as C99, a lot of GCC extensions deployed by QEMU
+# and calling convention differences) to cross-compile code to Linux/ELF 
+# and generate invocation wrappers.
+if1of (win.amd64, $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
+ REM_MOD              += VBoxREM2
+ SYSMODS              += VBoxREM2
+ DLLS                 += VBoxREM
+# IMPORT_LIBS          += VBoxREMImp
+else
+ REM_MOD              += VBoxREM
+ IMPORT_LIBS          += VBoxREM
+endif
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-OTHER_CLEAN          += 
@@ -81 +104 @@
-endif
-
-
-
+
-        Sun/testmath.c
-$(REM_MOD)_SOURCES.win.x86  = $(REM_MOD).def
-ifneq ($(REM_MOD),VBoxREM2)
- $(REM_MOD)_POST_CMDS       = $(VBOX_SIGN_IMAGE_CMDS)
+endif
+
+ifeq ($(REM_MOD),VBoxREM2)
+#
+# The VBoxREM2 wrapper.
+#
+VBoxREM_TEMPLATE       = VBOXR3
+VBoxREM_DEFS           = IN_REM_R3 $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
+VBoxREM_SOURCES        =   \
+        VBoxREMWrapper.cpp \
+        VBoxREMWrapperA.asm
+VBoxREM_LIBS           =   \
+        $(LIB_VMM)         \
+        $(LIB_RUNTIME)
+
+$(REM_MOD)_TEMPLATE        = VBOXNOCRTGAS
+$(REM_MOD)_DEFS           += LOG_USE_C99 $(ARCH_BITS_DEFS)
+$(REM_MOD)_CFLAGS.amd64    = -O2
+$(REM_MOD)_CFLAGS.debug    = -O0
+
+# This doesn't fit in IPRT because it requires GAS and is LGPL.
+$(REM_MOD)_SOURCES        += \
+        Sun/e_powl-$(KBUILD_TARGET_ARCH).S
+
+$(REM_MOD)_INCS           += \
+        Sun/crt
+$(REM_MOD)_LIBS           = \
+        $(PATH_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB)
+$(REM_MOD)_SYSSUFF        = .rel
+
-endif
-
@@ -109 +161 @@
-#$(REM_MOD)_LIBS           =    \
-        $(LIB_VMM)              \
-
+
+
-
-

trunk/src/recompiler_new/fpu/softfloat-native.h

@@ -3 +3 @@
-
-#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
-
-
+ 
+ 
-#elif defined(_MSC_VER)
-
-
+
+
+
+
-#else
-
+ 
-#endif
-

trunk/src/recompiler_new/osdep.h

@@ -5 +5 @@
-
-#include <iprt/alloc.h>
-#include <iprt/alloca.h>
-#include <iprt/stdarg.h>
-#include <iprt/string.h>