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

Timestamp:

Sep 21, 2012 9:40:25 AM (12 years ago)

Author:

vboxsync

Message:

VMM: HM cleanup.

Location:

trunk/src/VBox/VMM/testcase

Files:

• Makefile.kmk (modified) (4 diffs)
• tstAsmStructs.cpp (modified) (1 diff)
• tstAsmStructsAsm.asm (modified) (1 diff)
• tstVMM-HM.cpp (moved) (moved from trunk/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp )
• tstVMStruct.h (modified) (3 diffs)
• tstVMStructDTrace.cpp (modified) (1 diff)
• tstVMStructRC.cpp (modified) (1 diff)
• tstVMStructSize.cpp (modified) (4 diffs)

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

@@ -36 +36 @@
  PROGRAMS  += tstGlobalConfig tstInstrEmul
  ifdef VBOX_WITH_RAW_MODE
-  PROGRAMS  += tstVMM tstVMM-HwAccm
+  PROGRAMS  += tstVMM tstVMM-HM
   ifneq ($(KBUILD_TARGET),win)
    PROGRAMS += tstVMMFork
@@ -256 +256 @@
  tstVMM_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 
- tstVMM-HwAccm_TEMPLATE = VBOXR3EXE
- tstVMM-HwAccm_SOURCES  = tstVMM-HwAccm.cpp
- tstVMM-HwAccm_LIBS     = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+ tstVMM-HM_TEMPLATE     = VBOXR3EXE
+ tstVMM-HM_SOURCES      = tstVMM-HM.cpp
+ tstVMM-HM_LIBS         = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 
  tstVMMFork_TEMPLATE    = VBOXR3EXE
@@ -396 +396 @@
                 $(VBOX_PATH_VMM_SRC)/include/CPUMInternal.mac \
                 $(VBOX_PATH_VMM_SRC)/include/TRPMInternal.mac \
-                $(VBOX_PATH_VMM_SRC)/include/HWACCMInternal.mac \
+                $(VBOX_PATH_VMM_SRC)/include/HMInternal.mac \
                 $(VBOX_PATH_VMM_SRC)/include/VMMInternal.mac \
                 $(VBOX_PATH_VMM_SRC)/testcase/Makefile.kmk \
@@ -423 +423 @@
                 $(DEPTH)/include/iprt/x86.mac \
                 $(VBOX_PATH_VMM_SRC)/include/CPUMInternal.mac \
-                $(VBOX_PATH_VMM_SRC)/include/HWACCMInternal.mac \
+                $(VBOX_PATH_VMM_SRC)/include/HMInternal.mac \
                 $(VBOX_PATH_VMM_SRC)/include/VMMInternal.mac \
                 $(VBOX_PATH_VMM_SRC)/include/VMMSwitcher.mac \

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

@@ -23 +23 @@
 #include <VBox/vmm/trpm.h>
 #include "TRPMInternal.h"
-#include "HWACCMInternal.h"
+#include "HMInternal.h"
 #include "VMMSwitcher.h"
 #include "VMMInternal.h"

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

@@ -24 +24 @@
 
 %include "CPUMInternal.mac"
-%include "HWACCMInternal.mac"
+%include "HMInternal.mac"
 %include "TRPMInternal.mac"
 %include "VMMInternal.mac"

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -1329 +1329 @@
     GEN_CHECK_OFF(VM, fPATMEnabled);
     GEN_CHECK_OFF(VM, fCSAMEnabled);
-    GEN_CHECK_OFF(VM, fHWACCMEnabled);
+    GEN_CHECK_OFF(VM, fHMEnabled);
     GEN_CHECK_OFF(VM, fHwVirtExtForced);
     GEN_CHECK_OFF(VM, fFaultTolerantMaster);
@@ -1356 +1356 @@
     GEN_CHECK_OFF(VM, vmm);
     GEN_CHECK_OFF(VM, pgm);
-    GEN_CHECK_OFF(VM, hwaccm);
+    GEN_CHECK_OFF(VM, hm);
     GEN_CHECK_OFF(VM, trpm);
     GEN_CHECK_OFF(VM, selm);
@@ -1390 +1390 @@
     GEN_CHECK_OFF(VMCPU, aStatAdHoc);
     GEN_CHECK_OFF(VMCPU, cpum);
-    GEN_CHECK_OFF(VMCPU, hwaccm);
+    GEN_CHECK_OFF(VMCPU, hm);
     GEN_CHECK_OFF(VMCPU, em);
     GEN_CHECK_OFF(VMCPU, iem);

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

@@ -42 +42 @@
 #include "IOMInternal.h"
 #include "REMInternal.h"
-#include "HWACCMInternal.h"
+#include "HMInternal.h"
 #include "PATMInternal.h"
 #include "VMMInternal.h"

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

@@ -70 +70 @@
 #include "IOMInternal.h"
 #include "REMInternal.h"
-#include "HWACCMInternal.h"
+#include "HMInternal.h"
 #include "PATMInternal.h"
 #include "VMMInternal.h"

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

@@ -41 +41 @@
 #include "REMInternal.h"
 #include "SSMInternal.h"
-#include "HWACCMInternal.h"
+#include "HMInternal.h"
 #include "PATMInternal.h"
 #include "VMMInternal.h"
@@ -207 +207 @@
     PRINT_OFFSET(VM, pgm.s.CritSectX);
     CHECK_PADDING_VM(64, pgm);
-    PRINT_OFFSET(VM, hwaccm);
-    CHECK_PADDING_VM(64, hwaccm);
+    PRINT_OFFSET(VM, hm);
+    CHECK_PADDING_VM(64, hm);
     CHECK_PADDING_VM(64, trpm);
     CHECK_PADDING_VM(64, selm);
@@ -227 +227 @@
     PRINT_OFFSET(VMCPU, cpum);
     CHECK_PADDING_VMCPU(64, cpum);
-    CHECK_PADDING_VMCPU(64, hwaccm);
+    CHECK_PADDING_VMCPU(64, hm);
     CHECK_PADDING_VMCPU(64, em);
     CHECK_PADDING_VMCPU(64, iem);
@@ -394 +394 @@
     CHECK_MEMBER_ALIGNMENT(MMHYPERHEAP, Lock, sizeof(uintptr_t));
 
-    /* hwaccm - 32-bit gcc won't align uint64_t naturally, so check. */
-    CHECK_MEMBER_ALIGNMENT(HWACCM, u64RegisterMask, 8);
-    CHECK_MEMBER_ALIGNMENT(HWACCM, vmx.hostCR4, 8);
-    CHECK_MEMBER_ALIGNMENT(HWACCM, vmx.msr.feature_ctrl, 8);
-    CHECK_MEMBER_ALIGNMENT(HWACCM, StatTPRPatchSuccess, 8);
-    CHECK_MEMBER_ALIGNMENT(HWACCMCPU, StatEntry, 8);
-    CHECK_MEMBER_ALIGNMENT(HWACCMCPU, vmx.HCPhysVMCS, sizeof(RTHCPHYS));
-    CHECK_MEMBER_ALIGNMENT(HWACCMCPU, vmx.proc_ctls, 8);
-    CHECK_MEMBER_ALIGNMENT(HWACCMCPU, Event.intInfo, 8);
+    /* hm - 32-bit gcc won't align uint64_t naturally, so check. */
+    CHECK_MEMBER_ALIGNMENT(HM, u64RegisterMask, 8);
+    CHECK_MEMBER_ALIGNMENT(HM, vmx.hostCR4, 8);
+    CHECK_MEMBER_ALIGNMENT(HM, vmx.msr.feature_ctrl, 8);
+    CHECK_MEMBER_ALIGNMENT(HM, StatTPRPatchSuccess, 8);
+    CHECK_MEMBER_ALIGNMENT(HMCPU, StatEntry, 8);
+    CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.HCPhysVMCS, sizeof(RTHCPHYS));
+    CHECK_MEMBER_ALIGNMENT(HMCPU, vmx.proc_ctls, 8);
+    CHECK_MEMBER_ALIGNMENT(HMCPU, Event.intInfo, 8);
 
     /* Make sure the set is large enough and has the correct size. */