Changeset 64626 in vbox for trunk/src/recompiler

Timestamp:

Nov 10, 2016 10:31:39 AM (8 years ago)

Author:

vboxsync

Message:

Recompiler, VMM, Devices: Purge the old APIC and the VBOX_WITH_NEW_APIC define.

Location:

trunk/src/recompiler

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxREMWrapper.cpp (modified) (2 diffs)
• VBoxRecompiler.c (modified) (3 diffs)

trunk/src/recompiler/Makefile.kmk

@@ -70 +70 @@
 ifdef IEM_VERIFICATION_MODE
  VBoxRemPrimary_DEFS          += IEM_VERIFICATION_MODE
-endif
-ifdef VBOX_WITH_NEW_APIC
- VBoxRemPrimary_DEFS          += VBOX_WITH_NEW_APIC
 endif
 ifdef VBOX_WITH_RAW_MODE

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -534 +534 @@
 
 /* VMM args */
-#ifdef VBOX_WITH_NEW_APIC
 static const REMPARMDESC g_aArgsAPICUpdatePendingInterrupts[] =
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PVMCPU),             NULL }
 };
-#endif
 static const REMPARMDESC g_aArgsCPUMGetGuestCpl[] =
 {
@@ -1217 +1215 @@
 static REMFNDESC g_aVMMImports[] =
 {
-#ifdef VBOX_WITH_NEW_APIC
     { "APICUpdatePendingInterrupts",            VMM_FN(APICUpdatePendingInterrupts),    &g_aArgsAPICUpdatePendingInterrupts[0],     RT_ELEMENTS(g_aArgsAPICUpdatePendingInterrupts),       REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
-#endif
     { "CPUMR3RemEnter",                         VMM_FN(CPUMR3RemEnter),                 &g_aArgsCPUMR3RemEnter[0],                  RT_ELEMENTS(g_aArgsCPUMR3RemEnter),                    REMFNDESC_FLAGS_RET_INT,    sizeof(uint32_t),   NULL },
     { "CPUMR3RemLeave",                         VMM_FN(CPUMR3RemLeave),                 &g_aArgsCPUMR3RemLeave[0],                  RT_ELEMENTS(g_aArgsCPUMR3RemLeave),                    REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -51 +51 @@
 #include <VBox/vmm/dbgf.h>
 #include <VBox/dbg.h>
-#ifdef VBOX_WITH_NEW_APIC
-# include <VBox/vmm/apic.h>
-#endif
+#include <VBox/vmm/apic.h>
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/patm.h>
@@ -2535 +2533 @@
      */
     pVM->rem.s.Env.interrupt_request &= ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER);
-#ifdef VBOX_WITH_NEW_APIC
     if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC))
         APICUpdatePendingInterrupts(pVCpu);
-#endif
     if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
         pVM->rem.s.Env.interrupt_request |= CPU_INTERRUPT_HARD;
@@ -4501 +4497 @@
     int     rc;
 
-#ifdef VBOX_WITH_NEW_APIC
     if (VMCPU_FF_TEST_AND_CLEAR(env->pVCpu, VMCPU_FF_UPDATE_APIC))
         APICUpdatePendingInterrupts(env->pVCpu);
-#endif
 
     /* When we fail to forward interrupts directly in raw mode, we fall back to the recompiler.