Changeset 14475 in vbox for trunk/src/recompiler_new

Timestamp:

Nov 21, 2008 4:49:38 PM (16 years ago)

Author:

vboxsync

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

39751

Message:

new REM works on Win/amd64 hosts

Location:

trunk/src/recompiler_new

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxREMWrapper.cpp (modified) (4 diffs)
• VBoxRecompiler.c (modified) (2 diffs)
• cpu-all.h (modified) (1 diff)
• osdep.h (modified) (1 diff)

trunk/src/recompiler_new/Makefile.kmk

@@ -24 +24 @@
 
 # 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.
+# thing as C99, a lot of GCC extensions deployed by QEMU and calling convention 
+# differences) to cross-compile code to Linux/ELF and dynamically 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
 
@@ -49 +46 @@
  $(REM_MOD)_CFLAGS.profile  = $($(REM_MOD)_CFLAGS.release)
  $(REM_MOD)_CFLAGS.kprofile = $($(REM_MOD)_CFLAGS.release)
+
+ IMPORT_LIBS          += VBoxREMImp
 else
  $(REM_MOD)_TEMPLATE  = VBOXR3NP
+
+ IMPORT_LIBS          += VBoxREM
 endif
 
@@ -152 +153 @@
 #$(REM_MOD)_DEFS          += DEBUG_DISAS DEBUG_PCALL DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.
 
-$(REM_MOD)_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(REM_MOD).dylib -undefined  dynamic_lookup
+$(REM_MOD)_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(REM_MOD).dylib -undefined dynamic_lookup
 $(REM_MOD)_LDFLAGS.l4      = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib -Wl,--no-undefined
 $(REM_MOD)_LDFLAGS.linux   = $(VBOX_LD_as_needed)
@@ -163 +164 @@
         $(LIB_RUNTIME)
 
+#
+# The VBoxREM import library.
+#
+# This is a HACK to get around (a) the cyclic dependency between VBoxVMM and
+# VBoxREM during linking and (b) the recursive build ordering which means VBoxREM
+# won't be built until after all the other DLLs.
+#
+VBoxREMImp_TEMPLATE         = VBOXR3
+if1of ($(KBUILD_TARGET), os2 win)
+VBoxREMImp_INST             = $(INST_LIB)
+else
+VBoxREMImp_NAME             = VBoxREM
+VBoxREMImp_INST             = $(INST_LIB)
+endif
+VBoxREMImp_SOURCES.win      = VBoxREM.def
+VBoxREMImp_SOURCES.os2      = $(PATH_VBoxREMImp)/VBoxREMOS2.def
+ifeq ($(filter win os2,$(KBUILD_TARGET)),)
+VBoxREMImp_SOURCES          = $(PATH_VBoxREMImp)/VBoxREMImp.c
+VBoxREMImp_CLEAN            = $(PATH_VBoxREMImp)/VBoxREMImp.c
+endif
+ifneq ($(filter-out darwin os2 win,$(KBUILD_TARGET)),)
+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
+
+$$(PATH_VBoxREMImp)/VBoxREMImp.c: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(VBOX_PATH_RECOMPILER_SRC)/Sun/deftoimp.sed $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,,$@)
+        $(QUIET)$(APPEND) -t $@ '#ifdef VBOX_HAVE_VISIBILITY_HIDDEN'
+        $(QUIET)$(APPEND)    $@ '# define EXPORT __attribute__((visibility("default")))'
+        $(QUIET)$(APPEND)    $@ '#else'
+        $(QUIET)$(APPEND)    $@ '# define EXPORT'
+        $(QUIET)$(APPEND)    $@ '#endif'
+        $(QUIET)$(APPEND)    $@ ''
+        $(QUIET)$(SED) -f $(VBOX_PATH_RECOMPILER_SRC)/Sun/deftoimp.sed --append $@ $<
+
+$$(PATH_VBoxREMImp)/VBoxREMOS2.def: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(SED) \
+                -e 's/^[ \t][ \t]*REMR3/    _REMR3/' \
+                -e 's/\.[Dd][Ll][Ll]//' \
+                -e 's/^LIBRARY .*/LIBRARY VBoxREM INITINSTANCE TERMINSTANCE\nDATA MULTIPLE\n/' \
+                --output $@ \
+                $<
 
 

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -799 +799 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL }
 };
+static const REMPARMDESC g_aArgsPGMR3DbgR3Ptr2GCPhys[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(void*), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PRTGCPHYS), NULL }   
+};
+static const REMPARMDESC g_aArgsPGMHandlerIsAddressMonitored[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(RTHCUINTPTR), NULL }
+};
+static const REMPARMDESC g_aArgsRTMemRealloc[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(void*), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(size_t) }
+};
 static const REMPARMDESC g_aArgsSSMR3GetGCPtr[] =
 {
@@ -1132 +1148 @@
     { "PGMR3PhysWriteU32",                      (void *)(uintptr_t)&PGMR3PhysWriteU32,              &g_aArgsPGMR3PhysWriteU32[0],               RT_ELEMENTS(g_aArgsPGMR3PhysWriteU32),                 REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "PGMR3PhysWriteU64",                      (void *)(uintptr_t)&PGMR3PhysWriteU64,              &g_aArgsPGMR3PhysWriteU64[0],               RT_ELEMENTS(g_aArgsPGMR3PhysWriteU32),                 REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
+    { "PGMR3DbgR3Ptr2GCPhys",                   (void *)(uintptr_t)&PGMR3DbgR3Ptr2GCPhys,              &g_aArgsPGMR3DbgR3Ptr2GCPhys[0],               RT_ELEMENTS(g_aArgsPGMR3DbgR3Ptr2GCPhys),                 REMFNDESC_FLAGS_RET_INT,   sizeof(uint64_t),                  NULL },
+    { "PGMHandlerIsAddressMonitored",          (void *)(uintptr_t)&PGMHandlerIsAddressMonitored,              &g_aArgsPGMHandlerIsAddressMonitored[0],               RT_ELEMENTS(g_aArgsPGMHandlerIsAddressMonitored),                 REMFNDESC_FLAGS_RET_INT,   sizeof(bool),                  NULL },
     { "SSMR3GetGCPtr",                          (void *)(uintptr_t)&SSMR3GetGCPtr,                  &g_aArgsSSMR3GetGCPtr[0],                   RT_ELEMENTS(g_aArgsSSMR3GetGCPtr),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "SSMR3GetMem",                            (void *)(uintptr_t)&SSMR3GetMem,                    &g_aArgsSSMR3GetMem[0],                     RT_ELEMENTS(g_aArgsSSMR3GetMem),                       REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
@@ -1162 +1180 @@
     { "VMR3ReqCall",                            (void *)(uintptr_t)&VMR3ReqCall,                    &g_aArgsVMR3ReqCall[0],                     RT_ELEMENTS(g_aArgsVMR3ReqCall),                       REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "VMR3ReqFree",                            (void *)(uintptr_t)&VMR3ReqFree,                    &g_aArgsVMR3ReqFree[0],                     RT_ELEMENTS(g_aArgsVMR3ReqFree),                       REMFNDESC_FLAGS_RET_INT | REMFNDESC_FLAGS_ELLIPSIS, sizeof(int), NULL },
-    { "VMR3GetVMCPUId",                         (void *)(uintptr_t)&VMR3GetVMCPUId,                 &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
+    { "VMR3GetVMCPUId",                         (void *)(uintptr_t)&VMR3GetVMCPUId,                 &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },    
     { "VMR3GetVMCPUNativeThread",               (void *)(uintptr_t)&VMR3GetVMCPUNativeThread,       &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
 //    { "",                        (void *)(uintptr_t)&,                &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),   NULL },
@@ -1184 +1202 @@
     { "RTLogPrintf",                            (void *)(uintptr_t)&RTLogPrintf,                    &g_aArgsRTLogPrintf[0],                     RT_ELEMENTS(g_aArgsRTLogPrintf),                       REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "RTMemAlloc",                             (void *)(uintptr_t)&RTMemAlloc,                     &g_aArgsSIZE_T[0],                          RT_ELEMENTS(g_aArgsSIZE_T),                            REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
+    { "RTMemAllocZ",                            (void *)(uintptr_t)&RTMemAllocZ,                     &g_aArgsSIZE_T[0],                          RT_ELEMENTS(g_aArgsSIZE_T),                            REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
+    { "RTMemRealloc",                           (void *)(uintptr_t)&RTMemRealloc,                     &g_aArgsRTMemRealloc[0],                          RT_ELEMENTS(g_aArgsRTMemRealloc),                            REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
     { "RTMemExecAlloc",                         (void *)(uintptr_t)&RTMemExecAlloc,                 &g_aArgsSIZE_T[0],                          RT_ELEMENTS(g_aArgsSIZE_T),                            REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
+
     { "RTMemExecFree",                          (void *)(uintptr_t)&RTMemExecFree,                  &g_aArgsPTR[0],                             RT_ELEMENTS(g_aArgsPTR),                               REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "RTMemFree",                              (void *)(uintptr_t)&RTMemFree,                      &g_aArgsPTR[0],                             RT_ELEMENTS(g_aArgsPTR),                               REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -218 +218 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static void remAbort(int rc, const char *pszTip);
+void remAbort(int rc, const char *pszTip);
 extern int testmath(void);
 
@@ -4456 +4456 @@
  * @param   pszTip  Hint about why/when this happend.
  */
-static void remAbort(int rc, const char *pszTip)
+void remAbort(int rc, const char *pszTip)
 {
     PVM pVM;

trunk/src/recompiler_new/cpu-all.h

@@ -249 +249 @@
 
 #ifdef VBOX
+void remAbort(int rc, const char *pszTip) __attribute__((__noreturn__));
+
 #ifndef VBOX_WITH_NEW_PHYS_CODE
 void     remR3GrowDynRange(unsigned long physaddr);

trunk/src/recompiler_new/osdep.h

@@ -16 +16 @@
 #endif
 #define qemu_vsnprintf(pszBuf, cbBuf, pszFormat, args) \
-                            RTStrPrintfV((pszBuf), (cbBuf), (pszFormat), (args))
+                               RTStrPrintfV((pszBuf), (cbBuf), (pszFormat), (args))
 #define qemu_vprintf(pszFormat, args) \
-                            RTLogPrintfV((pszFormat), (args))
-#define qemu_printf         RTLogPrintf
-#define qemu_malloc(cb)     RTMemAlloc(cb)
-#define qemu_mallocz(cb)    RTMemAllocZ(cb)
+                               RTLogPrintfV((pszFormat), (args))
+#define qemu_printf            RTLogPrintf
+#define qemu_malloc(cb)        RTMemAlloc(cb)
+#define qemu_mallocz(cb)       RTMemAllocZ(cb)
+#define qemu_realloc(ptr, cb)  RTMemRealloc(ptr, cb)
+
 #define qemu_free(pv)       RTMemFree(pv)
 #define qemu_strdup(psz)    RTStrDup(psz)