Changeset 72496 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jun 10, 2018 5:21:36 PM (7 years ago)

Author:

vboxsync

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

122981

Message:

IEM: Use pVCpu->cpum.s.GstCtx, avoid passing pCtx as a parameter or having it as a local variable.

File:

• trunk/src/VBox/VMM/include/IEMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -636 +636 @@
 /** @def IEM_CTX_ASSERT
  * Asserts that the @a a_fExtrnMbz is present in the CPU context.
- * @param   a_pCtx          The CPUMCTX structure.
+ * @param   a_pVCpu         The cross context virtual CPU structure of the calling thread.
  * @param   a_fExtrnMbz     The mask of CPUMCTX_EXTRN_XXX flags that must be zero.
  */
-#define IEM_CTX_ASSERT(a_pCtx, a_fExtrnMbz)     Assert(!((a_pCtx)->fExtrn & (a_fExtrnMbz)))
+#define IEM_CTX_ASSERT(a_pVCpu, a_fExtrnMbz)     Assert(!((a_pVCpu)->cpum.GstCtx.fExtrn & (a_fExtrnMbz)))
 
 /** @def IEM_CTX_IMPORT_RET
@@ -648 +648 @@
  * Returns on import failure.
  *
- * @param   a_pVCpu         The cross context virtual CPU structure.
- * @param   a_pCtx          The CPUMCTX structure.
+ * @param   a_pVCpu         The cross context virtual CPU structure of the calling thread.
  * @param   a_fExtrnImport  The mask of CPUMCTX_EXTRN_XXX flags to import.
  */
-#define IEM_CTX_IMPORT_RET(a_pVCpu, a_pCtx, a_fExtrnImport) \
+#define IEM_CTX_IMPORT_RET(a_pVCpu, a_fExtrnImport) \
     do { \
-        if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
+        if (!((a_pVCpu)->cpum.GstCtx.fExtrn & (a_fExtrnImport))) \
         { /* likely */ } \
         else \
@@ -668 +667 @@
  * Will call the keep to import the bits as needed.
  *
- * @param   a_pVCpu         The cross context virtual CPU structure.
- * @param   a_pCtx          The CPUMCTX structure.
+ * @param   a_pVCpu         The cross context virtual CPU structure of the calling thread.
  * @param   a_fExtrnImport  The mask of CPUMCTX_EXTRN_XXX flags to import.
  */
-#define IEM_CTX_IMPORT_NORET(a_pVCpu, a_pCtx, a_fExtrnImport) \
+#define IEM_CTX_IMPORT_NORET(a_pVCpu, a_fExtrnImport) \
     do { \
-        if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
+        if (!((a_pVCpu)->cpum.GstCtx.fExtrn & (a_fExtrnImport))) \
         { /* likely */ } \
         else \
@@ -690 +688 @@
  * Jumps on import failure.
  *
- * @param   a_pVCpu         The cross context virtual CPU structure.
- * @param   a_pCtx          The CPUMCTX structure.
+ * @param   a_pVCpu         The cross context virtual CPU structure of the calling thread.
  * @param   a_fExtrnImport  The mask of CPUMCTX_EXTRN_XXX flags to import.
  */
-#define IEM_CTX_IMPORT_JMP(a_pVCpu, a_pCtx, a_fExtrnImport) \
+#define IEM_CTX_IMPORT_JMP(a_pVCpu, a_fExtrnImport) \
     do { \
-        if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
+        if (!((a_pVCpu)->cpum.GstCtx.fExtrn & (a_fExtrnImport))) \
         { /* likely */ } \
         else \