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

Timestamp:

Apr 4, 2016 3:23:11 PM (9 years ago)

Author:

vboxsync

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

106369

Message:

VMM: APIC rewrite. Initial commit, work in progress.

Location:

trunk/src/VBox/Devices/testcase

Files:

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

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

@@ -23 +23 @@
 #
 VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices
+VBOX_PATH_VMM_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/VMM/include
 VBOX_DEVICES_TEST_OUT_DIR := $(PATH_TARGET)/Devices/testcase
 BLDDIRS += $(VBOX_DEVICES_TEST_OUT_DIR)
@@ -34 +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_PS2M),VBOX_WITH_NEW_PS2M,) \
         $(if $(VBOX_WITH_NVME_IMPL),VBOX_WITH_NVME_IMPL,) \
@@ -74 +76 @@
         $(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
 
@@ -92 +97 @@
 ifdef VBOX_WITH_RAW_MODE
  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

@@ -58 +58 @@
 #undef LOG_GROUP
 #include "../PC/DevRTC.cpp"
-#undef LOG_GROUP
-#include "../PC/DevAPIC.cpp"
+# undef LOG_GROUP
+#ifdef VBOX_WITH_NEW_APIC
+# include "../../VMM/VMMR3/APIC.cpp"
+#else
+# include "../PC/DevAPIC.cpp"
+#endif
 #undef LOG_GROUP
 #include "../PC/DevIoApic.cpp"
@@ -281 +285 @@
     CHECK_MEMBER_ALIGNMENT(AHCI, lock, 8);
     CHECK_MEMBER_ALIGNMENT(AHCIPort, StatDMA, 8);
-#ifdef VBOX_WITH_STATISTICS
+#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);

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

@@ -60 +60 @@
 #undef LOG_GROUP
 #include "../PC/DevRTC.cpp"
-#undef LOG_GROUP
-#include "../PC/DevAPIC.cpp"
+# undef LOG_GROUP
+#ifdef VBOX_WITH_NEW_APIC
+# include "../../VMM/VMMR3/APIC.cpp"
+#else
+# include "../PC/DevAPIC.cpp"
+#endif
 #undef LOG_GROUP
 #include "../PC/DevIoApic.cpp"
@@ -740 +744 @@
     GEN_CHECK_OFF(RTCSTATE, CurHintPeriod);
 
+#ifdef VBOX_WITH_NEW_APIC
+    GEN_CHECK_SIZE(APIC);
+    GEN_CHECK_OFF(APIC, pApicDevR0);
+    GEN_CHECK_OFF(APIC, pApicDevR3);
+    GEN_CHECK_OFF(APIC, pApicDevRC);
+    GEN_CHECK_OFF(APIC, HCPhysApicPib);
+    GEN_CHECK_OFF(APIC, pvApicPibR0);
+    GEN_CHECK_OFF(APIC, pvApicPibR3);
+    GEN_CHECK_OFF(APIC, pvApicPibRC);
+    GEN_CHECK_OFF(APIC, cbApicPib);
+    GEN_CHECK_OFF(APIC, fVirtApicRegsEnabled);
+    GEN_CHECK_OFF(APIC, fPostedIntrsEnabled);
+    GEN_CHECK_OFF(APIC, fSupportsTscDeadline);
+    GEN_CHECK_OFF(APIC, fIoApicPresent);
+    GEN_CHECK_OFF(APIC, fRZEnabled);
+    GEN_CHECK_OFF(APIC, enmOriginalMode);
+
+    GEN_CHECK_SIZE(APICCPU);
+    GEN_CHECK_OFF(APICCPU, pvApicPageR0);
+    GEN_CHECK_OFF(APICCPU, pvApicPageR3);
+    GEN_CHECK_OFF(APICCPU, pvApicPageRC);
+    GEN_CHECK_OFF(APICCPU, cbApicPage);
+    GEN_CHECK_OFF(APICCPU, uEsrInternal);
+    GEN_CHECK_OFF(APICCPU, uApicBaseMsr);
+    GEN_CHECK_OFF(APICCPU, HCPhysApicPib);
+    GEN_CHECK_OFF(APICCPU, pvApicPibR0);
+    GEN_CHECK_OFF(APICCPU, pvApicPibR3);
+    GEN_CHECK_OFF(APICCPU, pvApicPibRC);
+    GEN_CHECK_OFF(APICCPU, ApicPibLevel);
+    GEN_CHECK_OFF(APICCPU, pTimerR0);
+    GEN_CHECK_OFF(APICCPU, pTimerR3);
+    GEN_CHECK_OFF(APICCPU, pTimerRC);
+    GEN_CHECK_OFF(APICCPU, TimerCritSect);
+    GEN_CHECK_OFF(APICCPU, u64TimerInitial);
+    GEN_CHECK_OFF(APICCPU, uHintedTimerInitialCount);
+    GEN_CHECK_OFF(APICCPU, uHintedTimerShift);
+    GEN_CHECK_OFF(APICCPU, StatMmioReadGC);
+#else
     /* PC/DevAPIC.cpp */
     GEN_CHECK_SIZE(APICState);
@@ -773 +815 @@
     GEN_CHECK_OFF(APICState, uHintedCountShift);
     GEN_CHECK_OFF(APICState, pszDesc);
-#ifdef VBOX_WITH_STATISTICS
+# ifdef VBOX_WITH_STATISTICS
     GEN_CHECK_OFF(APICState, StatTimerSetInitialCount);
     GEN_CHECK_OFF(APICState, StatTimerSetLvtNoRelevantChange);
-#endif
+# endif
 
     GEN_CHECK_SIZE(APICDeviceInfo);
@@ -791 +833 @@
     GEN_CHECK_OFF(APICDeviceInfo, paLapicsRC);
     GEN_CHECK_OFF(APICDeviceInfo, pCritSectRC);
-    GEN_CHECK_OFF(APICDeviceInfo, enmVersion);
+    GEN_CHECK_OFF(APICDeviceInfo, enmMode);
     GEN_CHECK_OFF(APICDeviceInfo, cTPRPatchAttempts);
     GEN_CHECK_OFF(APICDeviceInfo, cCpus);
-#ifdef VBOX_WITH_STATISTICS
+# ifdef VBOX_WITH_STATISTICS
     GEN_CHECK_OFF(APICDeviceInfo, StatMMIOReadGC);
     GEN_CHECK_OFF(APICDeviceInfo, StatMMIOWriteHC);
-#endif
+# endif
+#endif  /* VBOX_WITH_NEW_APIC */
 
     /* PC/DevIoApic.cpp */