Changeset 41976 in vbox for trunk/include/VBox/vmm

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78849

Message:

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

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (1 diff)
• vm.h (modified) (3 diffs)
• vm.mac (modified) (4 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -341 +341 @@
 VMMDECL(int)            CPUMSetHyperEFlags(PVMCPU pVCpu, uint32_t Efl);
 VMMDECL(void)           CPUMSetHyperEIP(PVMCPU pVCpu, uint32_t u32EIP);
+VMM_INT_DECL(void)      CPUMSetHyperState(PVMCPU pVCpu, uint32_t u32EIP, uint32_t u32ESP, uint32_t u32EAX, uint32_t u32EDX);
 VMMDECL(void)           CPUMSetHyperDR0(PVMCPU pVCpu, RTGCUINTREG uDr0);
 VMMDECL(void)           CPUMSetHyperDR1(PVMCPU pVCpu, RTGCUINTREG uDr1);

trunk/include/VBox/vmm/vm.h

@@ -794 +794 @@
      * Depending on how the host handles the rc status given in @a eax, this may
      * return and let the caller resume whatever it was doing prior to the call.
+     *
+     *
+     * @param   eax         The return code, register.
+     * @remark  Assume interrupts disabled.
+     * @remark  This method pointer lives here because TRPM needs it.
+     */
+    RTRCPTR                     pfnVMMRCToHostAsm/*(int32_t eax)*/;
+
+    /**
+     * VMMSwitcher assembly entry point returning to host context without saving the
+     * raw-mode context (hyper) registers.
+     *
+     * Unlike pfnVMMRC2HCAsm, this will not return to the caller.  Instead it
+     * expects the caller to save a RC context in CPUM where one might return if the
+     * return code indicate that this is possible.
+     *
      * This method pointer lives here because TRPM needs it.
      *
      * @param   eax         The return code, register.
      * @remark  Assume interrupts disabled.
+     * @remark  This method pointer lives here because TRPM needs it.
      */
-    RTRCPTR                     pfnVMMGCGuestToHostAsm/*(int32_t eax)*/;
+    RTRCPTR                     pfnVMMRCToHostAsmNoReturn/*(int32_t eax)*/;
 
     /** @name Various items that are frequently accessed.
@@ -824 +841 @@
     bool                        fUseLargePages;
     /** @} */
+
+    /** Alignment padding.. */
+    uint32_t                    uPadding1;
 
     /** @name Debugging
@@ -869 +889 @@
     /** Padding - the unions must be aligned on a 64 bytes boundary and the unions
      *  must start at the same offset on both 64-bit and 32-bit hosts. */
-    uint8_t                     abAlignment3[(HC_ARCH_BITS == 32 ? 24 : 0) + 48];
+    uint8_t                     abAlignment3[(HC_ARCH_BITS == 32 ? 24 : 0) + 40];
 
     /** CPUM part. */

trunk/include/VBox/vmm/vm.mac

@@ -4 +4 @@
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2012 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -55 +55 @@
     .cbSelf                 resd 1
     .offVMCPU               resd 1
-    .pfnVMMGCGuestToHostAsm resd 1
+    .pfnVMMRCToHostAsm      resd 1
+    .pfnVMMRCToHostAsmNoReturn resd 1
     .fRecompileUser         resb 1
     .fRecompileSupervisor   resb 1
@@ -64 +65 @@
     .fFaultTolerantMaster   resb 1
     .fUseLargePages         resb 1
+
+    .uPadding1              resd 1
 
     .hTraceBufRC            RTRCPTR_RES 1
@@ -93 +96 @@
 %endif
 %if HC_ARCH_BITS == 32
-    .abAlignment3           resb 24
+    .abAlignment3           resb 16
 %else
 ;    .abAlignment3           resb 16