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

Timestamp:

Jan 24, 2007 1:54:15 PM (18 years ago)

Author:

vboxsync

Message:

Update

File:

• trunk/src/VBox/VMM/EM.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -81 +81 @@
 static int emR3RawForcedActions(PVM pVM, PCPUMCTX pCtx);
 static int emR3RawExecute(PVM pVM, bool *pfFFDone);
-DECLINLINE(int) emR3RawExecuteInstruction(PVM pVM, const char *pszPrefix);
+DECLINLINE(int) emR3RawExecuteInstruction(PVM pVM, const char *pszPrefix, int gcret = VINF_SUCCESS);
 static int emR3HighPriorityPostForcedActions(PVM pVM, int rc);
 static int emR3ForcedActions(PVM pVM, int rc);
@@ -950 +950 @@
  *
  * @param   pVM         VM handle.
+ * @param   gcret       GC return code
  * @param   pszPrefix   Disassembly prefix. If not NULL we'll disassemble the
  *                      instruction and prefix the log output with this text.
  */
 #ifdef LOG_ENABLED
-static int emR3RawExecuteInstructionWorker(PVM pVM, const char *pszPrefix)
+static int emR3RawExecuteInstructionWorker(PVM pVM, int gcret, const char *pszPrefix)
 #else
-static int emR3RawExecuteInstructionWorker(PVM pVM)
+static int emR3RawExecuteInstructionWorker(PVM pVM, int gcret)
 #endif
 {
@@ -1015 +1016 @@
                     Log(("PATCH: IF=1 -> emulate last instruction as it can't be interrupted!!\n"));
                     return emR3RawExecuteInstruction(pVM, "PATCHIR");
+                }
+                else
+                if (gcret == VINF_PATM_PENDING_IRQ_AFTER_IRET)
+                {
+                    /* special case: iret, that sets IF,  detected a pending irq/event */
+                    return emR3RawExecuteInstruction(pVM, "PATCHIRET");
                 }
                 return VINF_EM_RESCHEDULE_REM;
@@ -1102 +1109 @@
  * @param   pszPrefix   Disassembly prefix. If not NULL we'll disassemble the
  *                      instruction and prefix the log output with this text.
+ * @param   gcret       GC return code
  */
-DECLINLINE(int) emR3RawExecuteInstruction(PVM pVM, const char *pszPrefix)
+DECLINLINE(int) emR3RawExecuteInstruction(PVM pVM, const char *pszPrefix, int gcret)
 {
 #ifdef LOG_ENABLED
-    return emR3RawExecuteInstructionWorker(pVM, pszPrefix);
+    return emR3RawExecuteInstructionWorker(pVM, gcret, pszPrefix);
 #else
-    return emR3RawExecuteInstructionWorker(pVM);
+    return emR3RawExecuteInstructionWorker(pVM, gcret);
 #endif
 }
@@ -1709 +1717 @@
                     return VINF_SUCCESS; */
                 }
-                else 
-                if (gcret == VINF_PATM_PENDING_IRQ_AFTER_IRET)
-                {
-                    /* special case: iret, that sets IF,  detected a pending irq/event */
-                    return emR3RawExecuteInstruction(pVM, "PATCHIRET");
-                }
                 return VINF_EM_RESCHEDULE_REM;
             }
@@ -2063 +2065 @@
         case VINF_PATM_PATCH_TRAP_PF:
         case VINF_PATM_PATCH_INT3:
-        case VINF_PATM_PENDING_IRQ_AFTER_IRET:
             rc = emR3PatchTrap(pVM, pCtx, rc);
             break;
@@ -2215 +2216 @@
             /** @todo skip instruction and go directly to the halt state. (see REM for implementation details) */
             rc = emR3RawPrivileged(pVM);
+            break;
+
+        case VINF_PATM_PENDING_IRQ_AFTER_IRET:
+            rc = emR3RawExecuteInstruction(pVM, "EMUL: ", VINF_PATM_PENDING_IRQ_AFTER_IRET);
             break;