Changeset 64626 in vbox for trunk/src/VBox/Devices/testcase

Timestamp:

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

Author:

vboxsync

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

111851

Message:

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

Location:

trunk/src/VBox/Devices/testcase

Files:

• Makefile.kmk (modified) (3 diffs)
• tstDeviceStructSize.cpp (modified) (2 diffs)
• tstDeviceStructSizeRC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -35 +35 @@
         $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
         $(if $(VBOX_WITH_LSILOGIC),VBOX_WITH_LSILOGIC,) \
-        $(if $(VBOX_WITH_NEW_APIC),VBOX_WITH_NEW_APIC,) \
         $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,) \
         $(if $(VBOX_WITH_NVME_IMPL),VBOX_WITH_NVME_IMPL,) \
@@ -76 +75 @@
         $(VBOX_PATH_DEVICES_SRC)/Bus \
         $(VBOX_DEVICES_TEST_OUT_DIR)
- ifdef VBOX_WITH_NEW_APIC
  tstDeviceStructSizeRC_INCS     += $(VBOX_PATH_VMM_DEVICES_SRC)
- endif
 endif # VBOX_WITH_RAW_MODE
 
@@ -98 +95 @@
  tstDeviceStructSize.cpp_DEPS = $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h
 endif
-ifdef VBOX_WITH_NEW_APIC
  tstDeviceStructSize_INCS     += $(VBOX_PATH_VMM_DEVICES_SRC)
-endif
 
 #

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -57 +57 @@
 #include "../PC/DevRTC.cpp"
 # undef LOG_GROUP
-#ifdef VBOX_WITH_NEW_APIC
 # include "../../VMM/VMMR3/APIC.cpp"
-#else
-# include "../PC/DevAPIC.cpp"
-#endif
 #undef LOG_GROUP
 #ifdef VBOX_WITH_NEW_IOAPIC
@@ -289 +285 @@
     CHECK_MEMBER_ALIGNMENT(AHCI, lock, 8);
     CHECK_MEMBER_ALIGNMENT(AHCIPort, StatDMA, 8);
-#ifdef VBOX_WITH_NEW_APIC
+
     CHECK_MEMBER_ALIGNMENT(APICDEV, pDevInsR0, 8);
     CHECK_MEMBER_ALIGNMENT(APICDEV, pDevInsRC, 8);
-#else
-# ifdef VBOX_WITH_STATISTICS
-    CHECK_MEMBER_ALIGNMENT(APICDeviceInfo, StatMMIOReadGC, 8);
-# endif
-#endif
+
     CHECK_MEMBER_ALIGNMENT(ATADevState, cTotalSectors, 8);
     CHECK_MEMBER_ALIGNMENT(ATADevState, StatATADMA, 8);

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -59 +59 @@
 #include "../PC/DevRTC.cpp"
 # undef LOG_GROUP
-#ifdef VBOX_WITH_NEW_APIC
 # include "../../VMM/VMMR3/APIC.cpp"
-#else
-# include "../PC/DevAPIC.cpp"
-#endif
 #undef LOG_GROUP
 #ifdef VBOX_WITH_NEW_IOAPIC
@@ -693 +689 @@
     GEN_CHECK_OFF(RTCSTATE, CurHintPeriod);
 
-#ifdef VBOX_WITH_NEW_APIC
     GEN_CHECK_SIZE(APIC);
     GEN_CHECK_OFF(APIC, pApicDevR0);
@@ -752 +747 @@
     GEN_CHECK_OFF(APICCPU, StatIcrFullWrite);
 # endif /* VBOX_WITH_STATISTICS */
-#else
-    /* PC/DevAPIC.cpp */
-    GEN_CHECK_SIZE(APICState);
-    GEN_CHECK_OFF(APICState, apicbase);
-    GEN_CHECK_OFF(APICState, id);
-    GEN_CHECK_OFF(APICState, arb_id);
-    GEN_CHECK_OFF(APICState, tpr);
-    GEN_CHECK_OFF(APICState, spurious_vec);
-    GEN_CHECK_OFF(APICState, log_dest);
-    GEN_CHECK_OFF(APICState, dest_mode);
-    GEN_CHECK_OFF(APICState, isr);
-    GEN_CHECK_OFF(APICState, isr.au32Bitmap[1]);
-    GEN_CHECK_OFF(APICState, tmr);
-    GEN_CHECK_OFF(APICState, tmr.au32Bitmap[1]);
-    GEN_CHECK_OFF(APICState, irr);
-    GEN_CHECK_OFF(APICState, irr.au32Bitmap[1]);
-    GEN_CHECK_OFF(APICState, lvt);
-    GEN_CHECK_OFF(APICState, lvt[1]);
-    GEN_CHECK_OFF(APICState, lvt[APIC_LVT_NB - 1]);
-    GEN_CHECK_OFF(APICState, esr);
-    GEN_CHECK_OFF(APICState, icr);
-    GEN_CHECK_OFF(APICState, icr[1]);
-    GEN_CHECK_OFF(APICState, divide_conf);
-    GEN_CHECK_OFF(APICState, count_shift);
-    GEN_CHECK_OFF(APICState, initial_count);
-    GEN_CHECK_OFF(APICState, initial_count_load_time);
-    GEN_CHECK_OFF(APICState, next_time);
-    GEN_CHECK_OFF(APICState, pTimerR3);
-    GEN_CHECK_OFF(APICState, pTimerR0);
-    GEN_CHECK_OFF(APICState, pTimerRC);
-    GEN_CHECK_OFF(APICState, fTimerArmed);
-    GEN_CHECK_OFF(APICState, uHintedInitialCount);
-    GEN_CHECK_OFF(APICState, uHintedCountShift);
-    GEN_CHECK_OFF(APICState, pszDesc);
-# ifdef VBOX_WITH_STATISTICS
-    GEN_CHECK_OFF(APICState, StatTimerSetInitialCount);
-    GEN_CHECK_OFF(APICState, StatTimerSetLvtNoRelevantChange);
-# endif
-
-    GEN_CHECK_SIZE(APICDeviceInfo);
-    GEN_CHECK_OFF(APICDeviceInfo, pDevInsR3);
-    GEN_CHECK_OFF(APICDeviceInfo, pApicHlpR3);
-    GEN_CHECK_OFF(APICDeviceInfo, paLapicsR3);
-    GEN_CHECK_OFF(APICDeviceInfo, pCritSectR3);
-    GEN_CHECK_OFF(APICDeviceInfo, pDevInsR0);
-    GEN_CHECK_OFF(APICDeviceInfo, pApicHlpR0);
-    GEN_CHECK_OFF(APICDeviceInfo, paLapicsR0);
-    GEN_CHECK_OFF(APICDeviceInfo, pCritSectR0);
-    GEN_CHECK_OFF(APICDeviceInfo, pDevInsRC);
-    GEN_CHECK_OFF(APICDeviceInfo, pApicHlpRC);
-    GEN_CHECK_OFF(APICDeviceInfo, paLapicsRC);
-    GEN_CHECK_OFF(APICDeviceInfo, pCritSectRC);
-    GEN_CHECK_OFF(APICDeviceInfo, enmMode);
-    GEN_CHECK_OFF(APICDeviceInfo, cTPRPatchAttempts);
-    GEN_CHECK_OFF(APICDeviceInfo, cCpus);
-# ifdef VBOX_WITH_STATISTICS
-    GEN_CHECK_OFF(APICDeviceInfo, StatMMIOReadGC);
-    GEN_CHECK_OFF(APICDeviceInfo, StatMMIOWriteHC);
-# endif
-#endif  /* VBOX_WITH_NEW_APIC */
 
 #ifdef VBOX_WITH_NEW_IOAPIC