Changeset 41985 in vbox for trunk/src/VBox

Timestamp:

Jul 2, 2012 3:00:27 PM (13 years ago)

Author:

vboxsync

Message:

VMM: Fixed tstVMM (single stepping ++ in raw-mode code).

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/VMMTests.cpp (modified) (13 diffs)
• VMMRC/TRPMRCHandlersA.asm (modified) (4 diffs)
• VMMSwitcher/AMD64andLegacy.mac (modified) (2 diffs)
• VMMSwitcher/PAEand32Bit.mac (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/VMMTests.cpp

@@ -43 +43 @@
 #include <iprt/x86.h>
 
+static void vmmR3TestClearStack(PVMCPU pVCpu)
+{
+    /* We leave the first 64 bytes of the stack alone because of strict
+       ring-0 long jump code uses it. */
+    memset(pVCpu->vmm.s.pbEMTStackR3 + 64, 0xaa, VMM_STACK_SIZE - 64);
+}
+
 
 /**
@@ -61 +68 @@
         return rc;
 
-    memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
-    CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+    CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
+    vmmR3TestClearStack(pVCpu);
     CPUMPushHyper(pVCpu, uVariation);
     CPUMPushHyper(pVCpu, enmTestcase);
@@ -68 +75 @@
     CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
     CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
-    CPUMSetHyperEIP(pVCpu, pVM->vmm.s.pfnCallTrampolineRC);
     Assert(CPUMGetHyperCR3(pVCpu) && CPUMGetHyperCR3(pVCpu) == PGMGetHyperCR3(pVCpu));
     rc = SUPR3CallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
@@ -100 +106 @@
         return rc;
 
-    memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
-    CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+    CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
+    vmmR3TestClearStack(pVCpu);
     CPUMPushHyper(pVCpu, uVariation);
     CPUMPushHyper(pVCpu, u8Trap + VMMGC_DO_TESTCASE_TRAP_FIRST);
@@ -107 +113 @@
     CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
     CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
-    CPUMSetHyperEIP(pVCpu, pVM->vmm.s.pfnCallTrampolineRC);
     Assert(CPUMGetHyperCR3(pVCpu) && CPUMGetHyperCR3(pVCpu) == PGMGetHyperCR3(pVCpu));
     rc = SUPR3CallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
@@ -221 +226 @@
         vmmR3DoTrapTest(pVM, 0xe, 1, VERR_TRPM_DONT_PANIC,  0x00000000, "vmmGCTestTrap0e_FaultEIP", "#PF (NULL) WP");
         vmmR3DoTrapTest(pVM, 0xe, 2, VINF_SUCCESS,          0x00000000, NULL,                       "#PF w/Tmp Handler");
+        /* This test is no longer relevant as fs and gs are loaded with NULL
+           selectors and we will always return to HC if a #GP occurs while
+           returning to guest code.
         vmmR3DoTrapTest(pVM, 0xe, 4, VINF_SUCCESS,          0x00000000, NULL,                       "#PF w/Tmp Handler and bad fs");
+        */
 
         /*
@@ -266 +275 @@
         if (rc != VINF_SUCCESS)
         {
-            RTPrintf("VMM: failed to resume on hyper breakpoint, rc=%Rrc\n", rc);
+            RTPrintf("VMM: failed to resume on hyper breakpoint, rc=%Rrc = KNOWN BUG\n", rc); /** @todo fix VMMR3ResumeHyper */
             return rc;
         }
@@ -337 +346 @@
          * Interrupt forwarding.
          */
-        CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+        CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
         CPUMPushHyper(pVCpu, 0);
         CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HYPER_INTERRUPT);
@@ -343 +352 @@
         CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
         CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
-        CPUMSetHyperEIP(pVCpu, pVM->vmm.s.pfnCallTrampolineRC);
         Log(("trampoline=%x\n", pVM->vmm.s.pfnCallTrampolineRC));
 
@@ -400 +408 @@
         for (i = 0; i < 1000000; i++)
         {
-            CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+            CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
             CPUMPushHyper(pVCpu, 0);
             CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_NOP);
@@ -406 +414 @@
             CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
             CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
-            CPUMSetHyperEIP(pVCpu, pVM->vmm.s.pfnCallTrampolineRC);
 
             uint64_t TickThisStart = ASMReadTSC();
@@ -533 +540 @@
         for (i = 0; i < 1000000; i++)
         {
-            CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+            CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
             CPUMPushHyper(pVCpu, 0);
             CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HWACCM_NOP);
@@ -539 +546 @@
             CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
             CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
-            CPUMSetHyperEIP(pVCpu, pVM->vmm.s.pfnCallTrampolineRC);
 
             pHyperCtx = CPUMGetHyperCtxPtr(pVCpu);

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm

@@ -612 +612 @@
 .rc_to_host:
     mov     edx, IMP(g_VM)
-%if 0
-    call    [edx + VM.pfnVMMRCToHostAsm]
-%else
     call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
-%endif
     mov     eax, VERR_TRPM_DONT_PANIC
     jmp     .rc_to_host
@@ -695 +691 @@
     mov     edx, IMP(g_VM)
     mov     eax, VERR_TRPM_DONT_PANIC
-%if 0
-    call    [edx + VM.pfnVMMRCToHostAsm]
-%else
     call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
-%endif
 %ifdef DEBUG_STUFF
     COM_S_PRINT 'bad!!!'
@@ -1030 +1022 @@
     mov     edx, IMP(g_VM)
     mov     eax, VINF_EM_RAW_INTERRUPT_HYPER
-%if 0
-    call    [edx + VM.pfnVMMRCToHostAsm]
-%else
     call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
-%endif
 %ifdef DEBUG_STUFF_INT
     COM_S_CHAR '!'
@@ -1256 +1244 @@
     mov     edx, IMP(g_VM)
     mov     eax, VERR_TRPM_PANIC
-%if 0
-    call    [edx + VM.pfnVMMRCToHostAsm]
-%else
     call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
-%endif
     jmp short df_to_host
 

trunk/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac

@@ -583 +583 @@
     ;; the code set up to run by HC.
     ;;
+    push    dword [edx + CPUMCPU.Hyper.eflags]
+    push    cs
     push    dword [edx + CPUMCPU.Hyper.eip]
-    push    dword [edx + CPUMCPU.Hyper.eflags]
     mov     edx, [edx + CPUMCPU.Hyper.edx]      ; !! edx is no longer pointing to CPUMCPU here !!
 
@@ -603 +604 @@
 %endif
 
-    popfd
-    ret
+    iret                                ; Use iret to make debugging and TF/RF work.
 
 ;;

trunk/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac

@@ -463 +463 @@
     ;; the code set up to run by HC.
     ;;
+    push    dword [edx + CPUMCPU.Hyper.eflags]
+    push    cs
     push    dword [edx + CPUMCPU.Hyper.eip]
-    push    dword [edx + CPUMCPU.Hyper.eflags]
     mov     edx, [edx + CPUMCPU.Hyper.edx]      ; !! edx is no longer pointing to CPUMCPU here !!
 
@@ -483 +484 @@
 %endif
 
-    popfd
-    ret
+    iret                                ; Use iret to make debugging and TF/RF work.
 
 ;;