Changeset 87466 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Jan 28, 2021 4:33:07 PM (4 years ago)

Author:

vboxsync

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

142486

Message:

VMM/HM,gvm: Started splitting up the HVMCPU and HVM structures. Created assembly version of gvm.h. bugref:9217

Location:

trunk/src/VBox/VMM/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstAsmStructs.cpp (modified) (2 diffs)
• tstAsmStructsAsm.asm (modified) (1 diff)
• tstVMStructSize.cpp (modified) (2 diffs)

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

@@ -584 +584 @@
                 $(DEPTH)/include/VBox/vmm/cpum.mac \
                 $(DEPTH)/include/VBox/vmm/vm.mac \
+                $(DEPTH)/include/VBox/vmm/gvm.mac \
                 $(DEPTH)/include/VBox/sup.mac \
                 $(DEPTH)/include/iprt/x86.mac \

trunk/src/VBox/VMM/testcase/tstAsmStructs.cpp

@@ -27 +27 @@
 #include "VMMInternal.h"
 #include <VBox/vmm/vm.h>
+#define GVM_C_STYLE_STRUCTURES
+#include <VBox/vmm/gvm.h>
 #include <VBox/vmm/hm_vmx.h>
 
@@ -35 +37 @@
 typedef HMCPU::HMCPUUNION::HMCPUVMX HMCPUVMX;
 typedef HMCPU::HMCPUUNION::HMCPUSVM HMCPUSVM;
+typedef HMR0PERVCPU::HMR0CPUUNION::HMR0CPUVMX HMR0CPUVMX;
+typedef HMR0PERVCPU::HMR0CPUUNION::HMR0CPUSVM HMR0CPUSVM;
 
 /* For sup.mac simplifications. */

trunk/src/VBox/VMM/testcase/tstAsmStructsAsm.asm

@@ -28 +28 @@
 %include "VBox/vmm/cpum.mac"
 %include "VBox/vmm/vm.mac"
+%include "VBox/vmm/gvm.mac"
 %include "VBox/sup.mac"
 %ifdef DO_GLOBALS

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -375 +375 @@
     CHECK_MEMBER_ALIGNMENT(HM, aPatches, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, vmx, 8);
-    CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.pfnStartVm, 8);
+    CHECK_MEMBER_ALIGNMENT(HMR0PERVCPU, vmx.pfnStartVm, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.VmcsInfo, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.VmcsInfoNstGst, 8);
@@ -381 +381 @@
     CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.LastError, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, svm, 8);
-    CHECK_MEMBER_ALIGNMENT(HMCPU, svm.pfnVMRun, 8);
+    CHECK_MEMBER_ALIGNMENT(HMR0PERVCPU, svm.pfnVMRun, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, Event, 8);
     CHECK_MEMBER_ALIGNMENT(HMCPU, Event.u64IntInfo, 8);