Changeset 1143 in vbox

Timestamp:

Mar 2, 2007 8:28:55 AM (18 years ago)

Author:

vboxsync

Message:

Incorrect checking of pending interrupts. Potential problems with sti/iret combinations.
(irq would not be dispatched, but we would execute iret natively)

File:

• trunk/src/VBox/VMM/PATM/PATMA.asm (modified) (3 diffs)

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -1143 +1143 @@
     jz      iret_clearIF
 
-    ; if interrupts are pending, then we must go back to the host context to handle them!
-    ; @@todo fix this properly, so we can dispatch pending interrupts in GC
-    test    dword [ss:PATM_VM_FORCEDACTIONS], VM_FF_INTERRUPT_APIC | VM_FF_INTERRUPT_PIC | VM_FF_TIMER | VM_FF_REQUEST
-    jz      iret_continue
-
-    ; Go to our hypervisor trap handler to dispatch the pending irq
-    mov     dword [ss:PATM_TEMP_EAX], eax
-    mov     dword [ss:PATM_TEMP_ECX], ecx
-    mov     dword [ss:PATM_TEMP_EDI], edi
-    mov     dword [ss:PATM_TEMP_RESTORE_FLAGS], PATM_RESTORE_EAX | PATM_RESTORE_ECX | PATM_RESTORE_EDI
-    mov     eax, PATM_ACTION_PENDING_IRQ_AFTER_IRET
-    lock    or dword [ss:PATM_PENDINGACTION], eax
-    mov     ecx, PATM_ACTION_MAGIC
-    mov     edi, PATM_CURINSTRADDR
-
-    popfd
-
-    db      0fh, 0bh        ; illegal instr (hardcoded assumption in PATMHandleIllegalInstrTrap)
-    ; does not return
-
-iret_continue:
+    ; force ring 1 CS RPL
     or      dword [esp+8], 1
 iret_notring0:
@@ -1278 +1258 @@
     DD      PATMIretEnd- PATMIretStart
 %ifdef PATM_LOG_PATCHIRET
-    DD      26
+    DD      19
 %else
-    DD      25
+    DD      18
 %endif
     DD      PATM_INTERRUPTFLAG
@@ -1288 +1268 @@
     DD      0
 %endif
-    DD      PATM_VM_FORCEDACTIONS
-    DD      0
-    DD      PATM_TEMP_EAX
-    DD      0
-    DD      PATM_TEMP_ECX
-    DD      0
-    DD      PATM_TEMP_EDI
-    DD      0
-    DD      PATM_TEMP_RESTORE_FLAGS
-    DD      0
-    DD      PATM_PENDINGACTION
-    DD      0
-    DD      PATM_CURINSTRADDR
-    DD      0
     DD      PATM_VMFLAGS
     DD      0