Changeset 56634 in vbox for trunk/src/VBox

Timestamp:

Jun 25, 2015 11:05:39 AM (9 years ago)

Author:

vboxsync

Message:

VGA MMIO write handler may return VINF_EM_RAW_EMULATE_INSTR as it turns out.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IOMAllMMIO.cpp (modified) (1 diff)
• PGMAllPhys.cpp (modified) (2 diffs)

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

@@ -10723 +10723 @@
                       || rcStrict == VINF_EM_RAW_EMULATE_INSTR
                       || rcStrict == VINF_EM_RAW_TO_R3
+                      || rcStrict == VINF_EM_RAW_EMULATE_IO_BLOCK
                       /* raw-mode / virt handlers only: */
                       || rcStrict == VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT

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

@@ -2014 +2014 @@
                   || rcStrict == VINF_EM_SUSPEND
                   || rcStrict == VINF_EM_RESET
+                  || rcStrict == VINF_EM_RAW_EMULATE_IO_BLOCK
                   //|| rcStrict == VINF_EM_HALT       /* ?? */
                   //|| rcStrict == VINF_EM_NO_MEMORY  /* ?? */

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

@@ -73 +73 @@
      || (a_rcStrict) == ((a_fWrite) ? VINF_IOM_R3_MMIO_WRITE : VINF_IOM_R3_MMIO_READ) \
      || (a_rcStrict) == VINF_IOM_R3_MMIO_READ_WRITE \
+     \
+     || ((a_fWrite) ? (a_rcStrict) == VINF_EM_RAW_EMULATE_IO_BLOCK : false) \
      \
      || (a_rcStrict) == VINF_EM_RAW_EMULATE_INSTR  \
@@ -3060 +3062 @@
  * @retval  VINF_IOM_R3_MMIO_READ_WRITE in RC and R0.
  *
+ * @retval  VINF_EM_RAW_EMULATE_IO_BLOCK in R0 only.
+ *
  * @retval  VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT in RC only - write completed.
  * @retval  VINF_EM_RAW_EMULATE_INSTR_LDT_FAULT in RC only.