Changeset 848 in vbox for trunk/src

Timestamp:

Feb 12, 2007 4:01:52 PM (18 years ago)

Author:

vboxsync

Message:

AMD64 debugging: Added checks for NMIs and that IF is cleared when doing the context switching.

Location:

trunk/src/VBox/VMM

Files:

• VMMGC/TRPMGCHandlersA.asm (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (1 diff)
• VMMSwitcher/AMD64ToPAE.asm (modified) (3 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm

@@ -885 +885 @@
     mov     edx, IMP(g_VM)
     mov     eax, VINF_EM_RAW_INTERRUPT_HYPER
+%if HC_ARCH_BITS == 64 ; bird debugging tripple-fault/reboot on AMD64, should be removed later!
+    test    dword [esp + CPUMCTXCORE.eflags], X86_EFL_IF
+    jnz     .if_set
+    mov     eax, 0c0caff00h
+    mov     al, [esp + 0h + ESPOFF]
+.if_set:
+%endif
     call    [edx + VM.pfnVMMGCGuestToHostAsm]
 %ifdef DEBUG_STUFF_INT

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -443 +443 @@
                  */
                 default:
+#if HC_ARCH_BITS == 64 /* AMD64 debugging - to be removed */
+                    if ((unsigned)rc - 0xc0caff00U > 0xff)
+                        return rc;
+                    /* fall thru */
+#else
                     return rc;
+#endif 
 
                 /*

trunk/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm

@@ -21 +21 @@
 
 ;%define DEBUG_STUFF 1
+%define STRICT_IF 1
 
 ;*******************************************************************************
@@ -66 +67 @@
     COM64_S_NEWLINE
     COM64_S_CHAR '^'
+%endif
+
+%ifdef STRICT_IF
+    pushf
+    pop     rax
+    test    eax, X86_EFL_IF
+    jz      .if_clear_in
+    mov     eax, 0c0ffee00h
+    ret
+.if_clear_in:
 %endif
 
@@ -707 +718 @@
     ; special registers which may change.
 vmmGCGuestToHostAsm_SkipHyperRegs:
+%ifdef STRICT_IF
+    pushf
+    pop     ecx
+    test    ecx, X86_EFL_IF
+    jz      .if_clear_out
+    mov     eax, 0c0ffee01h
+    cli
+.if_clear_out:
+%endif
     ; str     [edx + CPUM.Hyper.tr] - double fault only, and it won't be right then either.
     sldt    [edx + CPUM.Hyper.ldtr]