Changeset 41976 in vbox for trunk/src/VBox/VMM/VMMRC

Timestamp:

Jul 1, 2012 2:16:40 PM (12 years ago)

Author:

vboxsync

Message:

VMM: Switcher and TRPM fixes wrt hypervisor traps and tstVMM.

Location:

trunk/src/VBox/VMM/VMMRC

Files:

• TRPMRCHandlersA.asm (modified) (7 diffs)
• VMMRC.cpp (modified) (2 diffs)

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

@@ -452 +452 @@
 %endif
     mov     edx, IMP(g_VM)
-    call    [edx + VM.pfnVMMGCGuestToHostAsm]
+    call    [edx + VM.pfnVMMRCToHostAsm]
 
     ; We shouldn't ever return this way. So, raise a special IPE if we do.
@@ -458 +458 @@
     mov     eax, VERR_TRPM_IPE_3
     mov     edx, IMP(g_VM)
-    call    [edx + VM.pfnVMMGCGuestToHostAsm]
+    call    [edx + VM.pfnVMMRCToHostAsm]
     jmp     .gc_panic_again
 
@@ -611 +611 @@
     ;
 .rc_to_host:
-    mov     ecx, ebx
     mov     edx, IMP(g_VM)
-    call    [edx + VM.pfnVMMGCGuestToHostAsm]
-    jmp short .rc_continue
+%if 0
+    call    [edx + VM.pfnVMMRCToHostAsm]
+%else
+    call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
+%endif
+    mov     eax, VERR_TRPM_DONT_PANIC
+    jmp     .rc_to_host
 
     ;
@@ -691 +695 @@
     mov     edx, IMP(g_VM)
     mov     eax, VERR_TRPM_DONT_PANIC
-    call    [edx + VM.pfnVMMGCGuestToHostAsm]
+%if 0
+    call    [edx + VM.pfnVMMRCToHostAsm]
+%else
+    call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
+%endif
 %ifdef DEBUG_STUFF
     COM_S_PRINT 'bad!!!'
@@ -912 +920 @@
     mov     edx, IMP(g_VM)
     mov     eax, VINF_EM_RAW_INTERRUPT
-    call    [edx + VM.pfnVMMGCGuestToHostAsm]
+    call    [edx + VM.pfnVMMRCToHostAsm]
 
     ;
@@ -1022 +1030 @@
     mov     edx, IMP(g_VM)
     mov     eax, VINF_EM_RAW_INTERRUPT_HYPER
-    call    [edx + VM.pfnVMMGCGuestToHostAsm]
+%if 0
+    call    [edx + VM.pfnVMMRCToHostAsm]
+%else
+    call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
+%endif
 %ifdef DEBUG_STUFF_INT
     COM_S_CHAR '!'
@@ -1244 +1256 @@
     mov     edx, IMP(g_VM)
     mov     eax, VERR_TRPM_PANIC
-    call    [edx + VM.pfnVMMGCGuestToHostAsm]
+%if 0
+    call    [edx + VM.pfnVMMRCToHostAsm]
+%else
+    call    [edx + VM.pfnVMMRCToHostAsmNoReturn]
+%endif
     jmp short df_to_host
 

trunk/src/VBox/VMM/VMMRC/VMMRC.cpp

@@ -205 +205 @@
 VMMRCDECL(void) VMMGCGuestToHost(PVM pVM, int rc)
 {
-    pVM->vmm.s.pfnGuestToHostRC(rc);
+    pVM->vmm.s.pfnRCToHost(rc);
 }
 
@@ -216 +216 @@
 DECLASM(void) vmmRCProbeFireHelper(PVM pVM)
 {
-    pVM->vmm.s.pfnGuestToHostRC(VINF_VMM_CALL_TRACER);
+    pVM->vmm.s.pfnRCToHost(VINF_VMM_CALL_TRACER);
 }