Changeset 72493 in vbox for trunk/src/recompiler

Timestamp:

Jun 10, 2018 4:08:44 PM (7 years ago)

Author:

vboxsync

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

122978

Message:

IEM,REM,++: Removed code related IEM_VERIFICATION_MODE and friends because it (1) adds aditional complexity and mess, (2) suffers bit rot as it's infrequently used, and (3) prevents using pVCpu->cpum.GstCtx directly.

Location:

trunk/src/recompiler

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxRecompiler.c (modified) (7 diffs)
• cpu-exec.c (modified) (2 diffs)

trunk/src/recompiler/Makefile.kmk

@@ -68 +68 @@
 #VBoxRemPrimary_DEFS           += DEBUG_ALL_LOGGING DEBUG_DISAS DEBUG_PCALL CONFIG_DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.
 #VBoxRemPrimary_DEFS           += DEBUG_DISAS DEBUG_PCALL CONFIG_DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.
-ifdef IEM_VERIFICATION_MODE
- VBoxRemPrimary_DEFS          += IEM_VERIFICATION_MODE
-endif
 ifdef VBOX_WITH_RAW_MODE
  VBoxRemPrimary_DEFS          += VBOX_WITH_RAW_MODE

trunk/src/recompiler/VBoxRecompiler.c

@@ -1412 +1412 @@
     uint32_t u32CR0;
 
-#ifdef IEM_VERIFICATION_MODE
-    return false;
-#endif
-
     /* Update counter. */
     env->pVM->rem.s.cCanExecuteRaw++;
@@ -4263 +4259 @@
 REMR3DECL(void) REMR3NotifyInterruptSet(PVM pVM, PVMCPU pVCpu)
 {
-#ifndef IEM_VERIFICATION_MODE
     LogFlow(("REMR3NotifyInterruptSet: fInRem=%d interrupts %s\n", pVM->rem.s.fInREM,
              (pVM->rem.s.Env.eflags & IF_MASK) && !(pVM->rem.s.Env.hflags & HF_INHIBIT_IRQ_MASK) ? "enabled" : "disabled"));
     if (pVM->rem.s.fInREM)
-    {
-        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                       CPU_INTERRUPT_EXTERNAL_HARD);
-    }
-#endif
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request, CPU_INTERRUPT_EXTERNAL_HARD);
 }
 
@@ -4302 +4293 @@
 REMR3DECL(void) REMR3NotifyTimerPending(PVM pVM, PVMCPU pVCpuDst)
 {
-#ifndef IEM_VERIFICATION_MODE
 #ifndef DEBUG_bird
     LogFlow(("REMR3NotifyTimerPending: fInRem=%d\n", pVM->rem.s.fInREM));
@@ -4319 +4309 @@
     else
         LogIt(RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("REMR3NotifyTimerPending: !fInREM; cpu state=%d\n", VMCPU_GET_STATE(pVCpuDst)));
-#endif
 }
 
@@ -4331 +4320 @@
 REMR3DECL(void) REMR3NotifyDmaPending(PVM pVM)
 {
-#ifndef IEM_VERIFICATION_MODE
     LogFlow(("REMR3NotifyDmaPending: fInRem=%d\n", pVM->rem.s.fInREM));
     if (pVM->rem.s.fInREM)
-    {
-        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                       CPU_INTERRUPT_EXTERNAL_DMA);
-    }
-#endif
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request, CPU_INTERRUPT_EXTERNAL_DMA);
 }
 
@@ -4350 +4334 @@
 REMR3DECL(void) REMR3NotifyQueuePending(PVM pVM)
 {
-#ifndef IEM_VERIFICATION_MODE
     LogFlow(("REMR3NotifyQueuePending: fInRem=%d\n", pVM->rem.s.fInREM));
     if (pVM->rem.s.fInREM)
-    {
-        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                       CPU_INTERRUPT_EXTERNAL_EXIT);
-    }
-#endif
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request, CPU_INTERRUPT_EXTERNAL_EXIT);
 }
 
@@ -4369 +4348 @@
 REMR3DECL(void) REMR3NotifyFF(PVM pVM)
 {
-#ifndef IEM_VERIFICATION_MODE
     LogFlow(("REMR3NotifyFF: fInRem=%d\n", pVM->rem.s.fInREM));
     if (pVM->rem.s.fInREM)
-    {
-        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request,
-                       CPU_INTERRUPT_EXTERNAL_EXIT);
-    }
-#endif
+        ASMAtomicOrS32((int32_t volatile *)&cpu_single_env->interrupt_request, CPU_INTERRUPT_EXTERNAL_EXIT);
 }
 

trunk/src/recompiler/cpu-exec.c

@@ -350 +350 @@
                                  env->exception_next_eip,
                                  env->exception_is_int == EXCEPTION_IS_INT_VALUE_HARDWARE_IRQ);
-#  ifdef IEM_VERIFICATION_MODE /* Ugly hacks */
-                    cpu_loop_exit();
-#  endif
                     /* successfully delivered */
                     env->old_exception = -1;
@@ -450 +447 @@
                         /* Clear CPU_INTERRUPT_SINGLE_INSTR and leave CPU_INTERRUPT_SINGLE_INSTR_IN_FLIGHT set. */
                         ASMAtomicAndS32((int32_t volatile *)&env->interrupt_request, ~CPU_INTERRUPT_SINGLE_INSTR);
-#  ifdef IEM_VERIFICATION_MODE
-                        env->exception_index = ret = EXCP_SINGLE_INSTR;
-                        cpu_loop_exit();
-#  endif
                     }
 # endif /* VBOX */