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

Timestamp:

Jun 8, 2018 5:12:24 PM (7 years ago)

Author:

vboxsync

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

122970

Message:

IEM,NEM: Define minimum CPUMCTX set for IEM and hook it up to NEM for fetching missing bits as needed. bugref:9044 [build fix]

File:

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

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

@@ -808 +808 @@
  */
 #define IEM_CTX_IMPORT_RET(a_pVCpu, a_pCtx, a_fExtrnImport) \
-    if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
-    { /* likely */ } \
-    else do {  \
-        int rcCtxImport = iemCtxImport(a_pVCpu, a_pCtx, a_fExtrnImport); \
-        AssertRCReturn(rcCtxImport, rcCtxImport); \
+    do { \
+        if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
+        { /* likely */ } \
+        else \
+        { \
+            int rcCtxImport = iemCtxImport(a_pVCpu, a_pCtx, a_fExtrnImport); \
+            AssertRCReturn(rcCtxImport, rcCtxImport); \
+        } \
     } while (0)
 
@@ -825 +828 @@
  */
 #define IEM_CTX_IMPORT_NORET(a_pVCpu, a_pCtx, a_fExtrnImport) \
-    if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
-    { /* likely */ } \
-    else do {  \
-        int rcCtxImport = iemCtxImport(a_pVCpu, a_pCtx, a_fExtrnImport); \
-        AssertLogRelRC(rcCtxImport); \
+    do { \
+        if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
+        { /* likely */ } \
+        else \
+        { \
+            int rcCtxImport = iemCtxImport(a_pVCpu, a_pCtx, a_fExtrnImport); \
+            AssertLogRelRC(rcCtxImport); \
+        } \
     } while (0)
 
@@ -844 +850 @@
  */
 #define IEM_CTX_IMPORT_JMP(a_pVCpu, a_pCtx, a_fExtrnImport) \
-    if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
-    { /* likely */ } \
-    else do {  \
-        int rcCtxImport = iemCtxImport(a_pVCpu, a_pCtx, a_fExtrnImport); \
-        AssertRCStmt(rcCtxImport, longjmp(*pVCpu->iem.s.CTX_SUFF(pJmpBuf), rcCtxImport)); \
+    do { \
+        if (!((a_pCtx)->fExtrn & (a_fExtrnImport))) \
+        { /* likely */ } \
+        else \
+        { \
+            int rcCtxImport = iemCtxImport(a_pVCpu, a_pCtx, a_fExtrnImport); \
+            AssertRCStmt(rcCtxImport, longjmp(*pVCpu->iem.s.CTX_SUFF(pJmpBuf), rcCtxImport)); \
+        } \
     } while (0)