Changeset 274 in vbox for trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

Timestamp:

Jan 24, 2007 1:59:46 PM (18 years ago)

Author:

vboxsync

Message:

Update

File:

• trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

@@ -566 +566 @@
 
             case PATM_ACTION_PENDING_IRQ_AFTER_IRET:
-                Assert(pVM->patm.s.CTXSUFF(pGCState)->Restore.uFlags == (PATM_RESTORE_EAX|PATM_RESTORE_ECX));
+                /* Parameters:
+                 *  edi = GC address to jump to
+                 */
+                Log(("PATMGC: Dispatch pending interrupt (iret); eip=%VGv->%VGv\n", pRegFrame->eip, pRegFrame->edi));
+                Assert(pVM->patm.s.CTXSUFF(pGCState)->Restore.uFlags == (PATM_RESTORE_EAX|PATM_RESTORE_ECX|PATM_RESTORE_EDI));
                 Assert(pVM->patm.s.CTXSUFF(pGCState)->fPIF == 0);
+
+                /* Change EIP to the guest address of the iret. */
+                pRegFrame->eip = pRegFrame->edi;
 
                 pRegFrame->eax = pVM->patm.s.CTXSUFF(pGCState)->Restore.uEAX;
                 pRegFrame->ecx = pVM->patm.s.CTXSUFF(pGCState)->Restore.uECX;
+                pRegFrame->edi = pVM->patm.s.CTXSUFF(pGCState)->Restore.uEDI;
                 pVM->patm.s.CTXSUFF(pGCState)->Restore.uFlags = 0;
                 return VINF_PATM_PENDING_IRQ_AFTER_IRET;