Changeset 72743 in vbox

Timestamp:

Jun 29, 2018 7:35:49 AM (7 years ago)

Author:

vboxsync

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

123279

Message:

VMM: Extend HM changed flags. ​bugref:9193 [IEM]

Location:

trunk

Files:

• include/VBox/vmm/iem.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/iem.h

@@ -221 +221 @@
 /** The CPUMCTX_EXTRN_XXX mask needed when calling IEMExecSvmVmexit().
  * IEM will ASSUME the caller has ensured these are already present. */
-# define IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK   (  CPUMCTX_EXTRN_RSP \
-                                              | CPUMCTX_EXTRN_RAX \
-                                              | CPUMCTX_EXTRN_RIP \
-                                              | CPUMCTX_EXTRN_RFLAGS \
-                                              | CPUMCTX_EXTRN_CS \
-                                              | CPUMCTX_EXTRN_SS \
-                                              | CPUMCTX_EXTRN_DS \
-                                              | CPUMCTX_EXTRN_ES \
-                                              | CPUMCTX_EXTRN_GDTR \
-                                              | CPUMCTX_EXTRN_IDTR \
-                                              | CPUMCTX_EXTRN_CR_MASK \
-                                              | CPUMCTX_EXTRN_EFER \
-                                              | CPUMCTX_EXTRN_DR6 \
-                                              | CPUMCTX_EXTRN_DR7 \
-                                              | CPUMCTX_EXTRN_OTHER_MSRS \
-                                              | CPUMCTX_EXTRN_HWVIRT)
+# define IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK         (  CPUMCTX_EXTRN_RSP \
+                                                    | CPUMCTX_EXTRN_RAX \
+                                                    | CPUMCTX_EXTRN_RIP \
+                                                    | CPUMCTX_EXTRN_RFLAGS \
+                                                    | CPUMCTX_EXTRN_CS \
+                                                    | CPUMCTX_EXTRN_SS \
+                                                    | CPUMCTX_EXTRN_DS \
+                                                    | CPUMCTX_EXTRN_ES \
+                                                    | CPUMCTX_EXTRN_GDTR \
+                                                    | CPUMCTX_EXTRN_IDTR \
+                                                    | CPUMCTX_EXTRN_CR_MASK \
+                                                    | CPUMCTX_EXTRN_EFER \
+                                                    | CPUMCTX_EXTRN_DR6 \
+                                                    | CPUMCTX_EXTRN_DR7 \
+                                                    | CPUMCTX_EXTRN_OTHER_MSRS \
+                                                    | CPUMCTX_EXTRN_HWVIRT \
+                                                    | CPUMCTX_EXTRN_APIC_TPR \
+                                                    | CPUMCTX_EXTRN_HM_SVM_HWVIRT_VIRQ)
+
+/** The CPUMCTX_EXTRN_XXX mask needed when calling IEMExecDecodedVmrun().
+ *  IEM will ASSUME the caller has ensured these are already present. */
+# define IEM_CPUMCTX_EXTRN_SVM_VMRUN_MASK          IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK
 #endif
 

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -5303 +5303 @@
      * Get all the state that we might need here.
      */
-#ifdef IN_RING0
-    int rc = HMR0EnsureCompleteBasicContext(pVCpu, IEM_GET_CTX(pVCpu));
-    AssertRCReturn(rc, rc);
-#endif
     IEM_CTX_IMPORT_RET(pVCpu, IEM_CPUMCTX_EXTRN_XCPT_MASK);
     IEM_CTX_ASSERT(pVCpu, IEM_CPUMCTX_EXTRN_XCPT_MASK);
@@ -15144 +15140 @@
 {
     IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 3);
+    IEM_CTX_ASSERT(pVCpu, IEM_CPUMCTX_EXTRN_SVM_VMRUN_MASK);
 
     iemInitExec(pVCpu, false /*fBypassHandlers*/);