Changeset 60307 in vbox for trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

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.

File:

• trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (4 diffs)

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 */