Changeset 65367 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 19, 2017 10:47:28 AM (8 years ago)

Author:

vboxsync

Message:

IEM: build fix for code tlb and wp fix.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (4 diffs)

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

@@ -923 +923 @@
 #ifdef VBOX_STRICT
 # ifdef IEM_WITH_CODE_TLB
+    NOREF(pVCpu);
 # else
     pVCpu->iem.s.cbOpcode = 0;
@@ -1478 +1479 @@
 #ifdef IN_RING3
 //__debugbreak();
-#else
-    longjmp(*CTX_SUFF(pVCpu->iem.s.pJmpBuf), VERR_INTERNAL_ERROR);
-#endif
     for (;;)
     {
@@ -1748 +1746 @@
         pvDst  = (uint8_t *)pvDst + cbMaxRead;
     }
+#else
+    RT_NOREF(pvDst, cbDst);
+    longjmp(*CTX_SUFF(pVCpu->iem.s.pJmpBuf), VERR_INTERNAL_ERROR);
+#endif
 }
 
@@ -7601 +7603 @@
         if (   (fAccess & IEM_ACCESS_TYPE_WRITE)
             && !(fFlags & X86_PTE_RW)
-            && (   pVCpu->iem.s.uCpl != 0
+            && (   pVCpu->iem.s.uCpl != 3
                 || (IEM_GET_CTX(pVCpu)->cr0 & X86_CR0_WP)))
         {