Changeset 36056 in vbox for trunk/src/recompiler

Timestamp:

Feb 22, 2011 6:19:03 PM (14 years ago)

Author:

vboxsync

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

70168

Message:

.remstep hacking.

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (5 diffs)
• cpu-exec.c (modified) (1 diff)
• target-i386/translate.c (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -78 +78 @@
 #define REM_COPY_FPU_REG(pDst, pSrc) \
     do { *(PX86FPUMMX)(pDst) = *(const X86FPUMMX *)(pSrc); } while (0)
+
+/** How remR3RunLoggingStep operates. */
+#define REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING
 
 
@@ -951 +954 @@
         int interrupt_request = pVM->rem.s.Env.interrupt_request;
         Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXIT | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_TIMER)));
+#ifdef REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING
+        cpu_single_step(&pVM->rem.s.Env, 0);
+#endif
         Assert(!pVM->rem.s.Env.singlestep_enabled);
+
         /*
          * Now we set the execute single instruction flag and enter the cpu_exec loop.
@@ -1074 +1081 @@
 {
     int rc;
-    Assert(!pVM->rem.s.Env.singlestep_enabled);
+
     Assert(pVM->rem.s.fInREM);
-/* #define REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING - slow (tb flushing?) */
 #ifdef REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING
     cpu_single_step(&pVM->rem.s.Env, 1);
+#else
+    Assert(!pVM->rem.s.Env.singlestep_enabled);
 #endif
 
@@ -1251 +1259 @@
 
 #ifdef REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING
-    cpu_single_step(&pVM->rem.s.Env, 0);
+//    cpu_single_step(&pVM->rem.s.Env, 0);
 #else
     pVM->rem.s.Env.interrupt_request &= ~(CPU_INTERRUPT_SINGLE_INSTR | CPU_INTERRUPT_SINGLE_INSTR_IN_FLIGHT);
@@ -3851 +3859 @@
     else
         pVM->rem.s.Env.state &= ~CPU_EMULATE_SINGLE_STEP;
+#ifdef REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING
+    cpu_single_step(&pVM->rem.s.Env, fEnable);
+#endif
     return VINF_SUCCESS;
 }

trunk/src/recompiler/cpu-exec.c

@@ -372 +372 @@
                                 || !(env->eflags & IF_MASK)
                                 ||  (env->hflags & HF_INHIBIT_IRQ_MASK)
-                                ||  (env->state & (CPU_RAW_HWACC | CPU_EMULATE_SINGLE_STEP))
+                                ||  (env->state & CPU_RAW_HWACC)
                                )
                             {

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

@@ -3157 +3157 @@
 #endif /* VBOX */
 
-    if (s->singlestep_enabled) {
+    if (   s->singlestep_enabled
+#ifdef VBOX
+        && (   !(cpu_single_env->state & CPU_EMULATE_SINGLE_STEP)
+            || !(s->prefix & (PREFIX_REPNZ | PREFIX_REPZ) ))
+#endif
+       ) {
         tcg_gen_helper_0_0(helper_debug);
     } else if (s->tf) {