Changeset 14574 in vbox

Timestamp:

Nov 25, 2008 2:00:38 PM (16 years ago)

Author:

vboxsync

Message:

new REM makefile cleanup, added external even check in IO check to allow correct compilation of int 15/86 - style timing loops

Location:

trunk/src/recompiler_new

Files:

• Makefile.kmk (modified) (5 diffs)
• target-i386/translate.c (modified) (7 diffs)
• tcg/tcg.h (modified) (1 diff)

trunk/src/recompiler_new/Makefile.kmk

@@ -29 +29 @@
  REM_MOD              += VBoxREM2
  SYSMODS              += VBoxREM2
-
 else
  REM_MOD              += VBoxREM
@@ -69 +68 @@
 #
 $(REM_MOD)_DEFS             = IN_REM_R3 REM_INCLUDE_CPU_H 
-$(REM_MOD)_DEFS            += REM_PHYS_ADDR_IN_TLB
+#$(REM_MOD)_DEFS            += REM_PHYS_ADDR_IN_TLB
 #$(REM_MOD)_DEFS           += DEBUG_ALL_LOGGING 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)_DEFS.linux      = _GNU_SOURCE
@@ -129 +128 @@
 $(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.
@@ -144 +141 @@
 endif
 
-# gcc targets
-if1of ($(KBUILD_TARGET), linux darwin solaris)
-$(REM_MOD)_CFLAGS.debug     = -O0
-$(REM_MOD)_CFLAGS.release  += -fomit-frame-pointer -fno-gcse
-endif
 $(REM_MOD)_CFLAGS.profile  = $($(REM_MOD)_CFLAGS.release)
 $(REM_MOD)_CFLAGS.kprofile = $($(REM_MOD)_CFLAGS.release)
@@ -209 +201 @@
                 $<
 
-
-if1of ($(KBUILD_TARGET), linux darwin solaris)
-# Extra flags for these source modules.
-target-i386/op-helper.c_CFLAGS.x86 = -O2 -fno-strict-aliasing -fno-gcse
-cpu-exec.c_CFLAGS.x86           = -O2 -fno-strict-aliasing -fno-gcse
-cpu-exec.c_CFLAGS.solaris.amd64 = -O2 -fno-strict-aliasing
-endif
-
 #
 # The math testcase as a standalone program for testing and debugging purposes.

trunk/src/recompiler_new/target-i386/translate.c

@@ -867 +867 @@
 }
 
-#ifndef VBOX
-static inline void gen_jmp_im(target_ulong pc)
-#else /* VBOX */
-DECLINLINE(void) gen_jmp_im(target_ulong pc)
-#endif /* VBOX */
-{
-    tcg_gen_movi_tl(cpu_tmp0, pc);
-    tcg_gen_st_tl(cpu_tmp0, cpu_env, offsetof(CPUState, eip));
-}
-
 #ifdef VBOX
 static void gen_check_external_event()
@@ -903 +893 @@
 }
 
-#ifndef VBOX
-static inline void gen_update_eip(target_ulong pc)
+static void gen_check_external_event2()
+{
+    tcg_gen_helper_0_0(helper_check_external_event);
+}
+
+#endif
+
+#ifndef VBOX
+static inline void gen_jmp_im(target_ulong pc)
 #else /* VBOX */
+DECLINLINE(void) gen_jmp_im(target_ulong pc)
+#endif /* VBOX */
+{
+    tcg_gen_movi_tl(cpu_tmp0, pc);
+    tcg_gen_st_tl(cpu_tmp0, cpu_env, offsetof(CPUState, eip));
+}
+
+#ifdef VBOX
 DECLINLINE(void) gen_update_eip(target_ulong pc)
-#endif /* VBOX */
 {
     gen_jmp_im(pc);
-#if defined (VBOX) && defined(VBOX_DUMP_STATE)
+#ifdef VBOX_DUMP_STATE
      tcg_gen_helper_0_0(helper_dump_state);
 #endif
 }
+
 #endif
 
@@ -1095 +1100 @@
                            tcg_const_i32(next_eip - cur_eip));
     }
+#ifdef VBOX
+    gen_check_external_event2(s);
+#endif /* VBOX */
 }
 
@@ -2679 +2687 @@
     int l1, l2, cc_op;
 
+#ifdef VBOX
+        gen_check_external_event(s);
+#endif /* VBOX */
     cc_op = s->cc_op;
     if (s->cc_op != CC_OP_DYNAMIC) {
@@ -2685 +2696 @@
     }
     if (s->jmp_opt) {
-#ifdef VBOX
-        gen_check_external_event(s);
-#endif /* VBOX */
         l1 = gen_new_label();
         gen_jcc1(s, cc_op, b, l1);
@@ -3128 +3136 @@
 {
     if (s->jmp_opt) {
-#ifdef VBOX
-        gen_check_external_event(s);
-#endif /* VBOX */
         if (s->cc_op != CC_OP_DYNAMIC) {
             gen_op_set_cc_op(s->cc_op);
@@ -3145 +3150 @@
 static void gen_jmp(DisasContext *s, target_ulong eip)
 {
+#ifdef VBOX
+    gen_check_external_event(s);
+#endif /* VBOX */
     gen_jmp_tb(s, eip, 0);
 }

trunk/src/recompiler_new/tcg/tcg.h

@@ -397 +397 @@
 #define tcg_abort() \
 do {\
-    remAbort(-1, "TCG fatal error: "__FILE__":"VBOX_STR(__LINE__));\
+    remAbort(-1, "TCG fatal error: "__FILE__":"VBOX_STR(__LINE__));     \
 } while (0)
 extern void qemu_qsort(void* base, size_t nmemb, size_t size,