Changeset 14742 in vbox

Timestamp:

Nov 27, 2008 8:49:11 PM (16 years ago)

Author:

vboxsync

Message:

finally fixed timner starvation for real, also REM improvments
by putting external events check into right places and reverted
PIT DRAM refresh rate frequency code to correct one

Location:

trunk/src

Files:

• VBox/Devices/PC/DevPit-i8254.cpp (modified) (2 diffs)
• recompiler_new/VBoxRecompiler.c (modified) (7 diffs)
• recompiler_new/exec-all.h (modified) (1 diff)
• recompiler_new/target-i386/translate.c (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -75 +75 @@
  * Define this to flip the 15usec refresh bit on every read.
  * If not defined, it will be flipped correctly. */
-#define FAKE_REFRESH_CLOCK
+/* #define FAKE_REFRESH_CLOCK */
 #ifdef DOXYGEN_RUNNING
 # define FAKE_REFRESH_CLOCK
@@ -648 +648 @@
         /* bit 5 - mirrors timer 2 output condition. */
         const int fOut = pit_get_out(pThis, 2, u64Now);
-        /* bit 4 - toggled every with each (DRAM?) refresh request, every 15.085 µs. */
+        /* bit 4 - toggled with each (DRAM?) refresh request, every 15085 µs. 
+                   our timer resolution is around 100-1000 µs, thus we can just flip
+                   on every increase of quotient by 1
+         */
 #ifdef FAKE_REFRESH_CLOCK
         pThis->dummy_refresh_clock ^= 1;
         const int fRefresh = pThis->dummy_refresh_clock;
 #else
-        /* To make refresh info statistically correct */
-        const int freq = 15085;
-        const int fRefresh = ((u64Now % freq ) > (freq / 2)) ? 1 : 0;
+        const int fRefresh = (u64Now / 15085 ) & 1;
 #endif
         /* bit 2,3 NMI / parity status stuff. */

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1454 +1454 @@
 bool remR3IsMonitored(CPUState *env, RTGCPTR GCPtr)
 {
-    return PGMHandlerIsAddressMonitored(env->pVM, GCPtr);
+     return PGMHandlerIsAddressMonitored(env->pVM, GCPtr);
 }
 #endif
@@ -1560 +1560 @@
 void remR3TimersRun(CPUState *env)
 {
+    LogFlow(("remR3TimersRun:\n"));
     remR3ProfileStop(STATS_QEMU_RUN_EMULATED_CODE);
     remR3ProfileStart(STATS_QEMU_RUN_TIMERS);
@@ -3926 +3927 @@
     if (pVM->rem.s.fInREM)
     {
-        if (VM_IS_EMT(pVM))
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HARD);
-        else
-            ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                           CPU_INTERRUPT_EXTERNAL_HARD);
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
+                       CPU_INTERRUPT_EXTERNAL_HARD);
     }
 }
@@ -3962 +3960 @@
     if (pVM->rem.s.fInREM)
     {
-        if (VM_IS_EMT(pVM))
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-            ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                           CPU_INTERRUPT_EXTERNAL_TIMER);
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
+                       CPU_INTERRUPT_EXTERNAL_TIMER);
     }
 }
@@ -3982 +3977 @@
     if (pVM->rem.s.fInREM)
     {
-        if (VM_IS_EMT(pVM))
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-            ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                           CPU_INTERRUPT_EXTERNAL_DMA);
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
+                       CPU_INTERRUPT_EXTERNAL_DMA);
     }
 }
@@ -4002 +3994 @@
     if (pVM->rem.s.fInREM)
     {
-        if (VM_IS_EMT(pVM))
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-            ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                           CPU_INTERRUPT_EXTERNAL_EXIT);
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
+                       CPU_INTERRUPT_EXTERNAL_EXIT);
     }
 }
@@ -4022 +4011 @@
     if (pVM->rem.s.fInREM)
     {
-        if (VM_IS_EMT(pVM))
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-            ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                           CPU_INTERRUPT_EXTERNAL_EXIT);
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
+                       CPU_INTERRUPT_EXTERNAL_EXIT);
     }
 }

trunk/src/recompiler_new/exec-all.h

@@ -385 +385 @@
 #  if !defined(REM_PHYS_ADDR_IN_TLB)
 target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr);
+#if 0
+bool         remR3IsVAMonitored(CPUState *env, RTGCPTR GCPtr);
+bool         remR3IsPAMonitored(CPUState *env, RTGCPHYS GCPhys);
+#else
 bool         remR3IsMonitored(CPUState *env, RTGCPTR GCPtr);
+#endif
 #  endif
 # endif

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

@@ -912 +912 @@
     tcg_gen_movi_tl(cpu_tmp0, pc);
     tcg_gen_st_tl(cpu_tmp0, cpu_env, offsetof(CPUState, eip));
-#ifdef VBOX
-    gen_check_external_event2();
-#endif
 }
 
@@ -2671 +2668 @@
     if ((pc & TARGET_PAGE_MASK) == (tb->pc & TARGET_PAGE_MASK) ||
         (pc & TARGET_PAGE_MASK) == ((s->pc - 1) & TARGET_PAGE_MASK))  {
+#ifdef VBOX
+        gen_check_external_event(s);
+#endif /* VBOX */
         /* jump to same page: we can use a direct jump */
         tcg_gen_goto_tb(tb_num);
@@ -2697 +2697 @@
     }
     if (s->jmp_opt) {
-#ifdef VBOX
-        gen_check_external_event(s);
-#endif /* VBOX */
         l1 = gen_new_label();
         gen_jcc1(s, cc_op, b, l1);
@@ -3120 +3117 @@
 static void gen_eob(DisasContext *s)
 {
+#ifdef VBOX
+    gen_check_external_event(s);
+#endif /* VBOX */
     if (s->cc_op != CC_OP_DYNAMIC)
         gen_op_set_cc_op(s->cc_op);
@@ -3154 +3154 @@
 static void gen_jmp(DisasContext *s, target_ulong eip)
 {
-#ifdef VBOX
-    gen_check_external_event(s);
-#endif /* VBOX */
     gen_jmp_tb(s, eip, 0);
 }