Changeset 56627 in vbox for trunk/src/VBox

Timestamp:

Jun 24, 2015 7:41:37 PM (9 years ago)

Author:

vboxsync

Message:

PGMPhys: The s_abPlayItSafe bits in dealing with PGMPAGETYPE_SPECIAL_ALIAS_MMIO pages screws up VBOX_STRICT assertions, triggering often with VBOX_WITH_2ND_IEM_STEP, so try the pvZeroPG now. Redefined what VINF_EM_DBG_STOP and VINF_EM_DBG_BREAKPOINT means when returned by access handlers and PGMPhysRead/Write APIs.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (3 diffs)

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

@@ -1246 +1246 @@
         }
         else
-        {
+# ifdef VBOX_WITH_2ND_IEM_STEP
+            *ppv = pVM->pgm.s.CTXALLSUFF(pvZeroPg);
+# else
+        {
+            /* This kind of screws up the TLB entry if accessed from a different section afterwards. */
             static uint8_t s_abPlayItSafe[0x1000*2];  /* I don't dare return the zero page at the moment. */
             *ppv = (uint8_t *)((uintptr_t)&s_abPlayItSafe[0x1000] & ~(uintptr_t)0xfff);
         }
+# endif
         *ppMap = NULL;
         return VINF_SUCCESS;
@@ -2428 +2433 @@
  * @retval  VINF_SELM_SYNC_GDT in RC only - read completed.
  *
- * @retval  VINF_EM_DBG_STOP in RC and R0.
- * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0.
+ * @retval  VINF_EM_DBG_STOP in RC and R0 - read completed.
+ * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0 - read completed.
  * @retval  VINF_EM_RAW_EMULATE_INSTR in RC and R0 only.
  *
@@ -3048 +3053 @@
  * @retval  VINF_SELM_SYNC_GDT in RC only - write completed.
  *
- * @retval  VINF_EM_DBG_STOP in RC and R0.
- * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0.
+ * @retval  VINF_EM_DBG_STOP in RC and R0 - write completed.
+ * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0 - write completed.
  * @retval  VINF_EM_RAW_EMULATE_INSTR in RC and R0 only.
  *