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

Timestamp:

Apr 4, 2007 8:27:14 AM (18 years ago)

Author:

vboxsync

Message:

Reapplied 20145

File:

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

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

@@ -1218 +1218 @@
     ; we can't do an iret to v86 code, as we run with CPL=1. The iret would attempt a protected mode iret and (most likely) fault.
     test    dword [esp+12], X86_EFL_VM
-    jnz near iret_return_to_v86
+    jnz     near iret_return_to_v86
 
     ;;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1234 +1234 @@
 iret_notring0:
 
+; if interrupts are pending, then we must go back to the host context to handle them! 
+; Note: This is very important as pending pic interrupts can be overriden by apic interrupts if we don't check early enough (Fedora 5 boot)
+; @@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
+    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 :
         ; This section must *always* be executed (!!)
         ; Extract the IOPL from the return flags, save them to our virtual flags and
@@ -1348 +1369 @@
     DD      PATMIretEnd- PATMIretStart
 %ifdef PATM_LOG_PATCHIRET
-    DD      19
+    DD      26
 %else
-    DD      18
+    DD      25
 %endif
     DD      PATM_INTERRUPTFLAG
@@ -1358 +1379 @@
     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