Changeset 13383

Timestamp:

10/19/08 22:55:30 (3 months ago)

Author:

vboxsync

Message:

cleaned up some mess

Files:

• trunk/src/recompiler_new/Makefile.kmk (modified) (5 diffs)
• trunk/src/recompiler_new/Sun/staged-op-elf-amd64.S (deleted)
• trunk/src/recompiler_new/Sun/staged-op-elf-x86.S (deleted)
• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (4 diffs)

trunk/src/recompiler_new/Makefile.kmk

@@ -31 +31 @@
-$(REM_MOD)_TEMPLATE  = VBOXR3NP
-
-
-OTHER_CLEAN          += 
-
@@ -50 +49 @@
- $(REM_MOD)_DEFS.solaris = HOST_SOLARIS=11
-endif
-$(REM_MOD)_DEFS.solaris += 
-
-$(REM_MOD)_INCS             =     \
@@ -93 +91 @@
-# gcc targets
-if1of ($(KBUILD_TARGET), linux darwin solaris)
-
+ 
-$(REM_MOD)_CFLAGS.release  += -fomit-frame-pointer -fno-gcse
-endif
@@ -115 +113 @@
-
-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
@@ -134 +133 @@
-
-
-#
-# The VBoxREM import library.
-#
-VBoxREMImp_TEMPLATE         = VBOXR3
-ifeq ($(KBUILD_TARGET),darwin)
-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 $@ \
-                $<
-
-include $(KBUILD_PATH)/subfooter.kmk
-

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -3491 +3491 @@
-                                        env->cr[3],
-                                        env->cr[4] & (X86_CR4_PSE | X86_CR4_PAE), /** @todo add longmode flag */
-
+(void**)
-        if (VBOX_FAILURE(rc))
-        {
-            if (!PATMIsPatchGCAddr(env->pVM, GCPtrPC))
-                return false;
-char
+uint8_t
-                + (GCPtrPC - PATMR3QueryPatchMemGC(env->pVM, NULL));
-        }
@@ -3503 +3503 @@
-    {
-        /* physical address */
-
+
+
-        if (VBOX_FAILURE(rc))
-            return false;
@@ -3591 +3592 @@
-                                            env->cr[3],
-                                            env->cr[4] & (X86_CR4_PSE | X86_CR4_PAE),
-
+(void**)
-        if (VBOX_FAILURE(rc))
-        {
-            if (!PATMIsPatchGCAddr(pVM, GCPtrPC))
-                return false;
-char
+uint8_t
-                + (GCPtrPC - PATMR3QueryPatchMemGC(pVM, NULL));
-        }
@@ -3604 +3605 @@
-
-        /* physical address */
-
+(void**)
-        if (VBOX_FAILURE(rc))
-            return false;