Changeset 13960 in vbox for trunk/include/VBox

Timestamp:

Nov 7, 2008 1:04:45 PM (16 years ago)

Author:

vboxsync

Message:

Moved guest and host CPU contexts into per-VCPU array.

Location:

trunk/include/VBox

Files:

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

trunk/include/VBox/cpum.h

@@ -891 +891 @@
 VMMDECL(void)           CPUMHyperSetCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore);
 VMMDECL(PCPUMCTX)       CPUMQueryGuestCtxPtr(PVM pVM);
+VMMDECL(PCPUMCTX)       CPUMQueryGuestCtxPtrEx(PVM pVM, PVMCPU pVCpu);
 VMMDECL(int)            CPUMQueryHyperCtxPtr(PVM pVM, PCPUMCTX *ppCtx);
 VMMDECL(PCCPUMCTXCORE)  CPUMGetGuestCtxCore(PVM pVM);
@@ -899 +900 @@
 VMMDECL(uint32_t)       CPUMRawGetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore);
 VMMDECL(void)           CPUMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t eflags);
-VMMDECL(int)            CPUMHandleLazyFPU(PVM pVM);
-VMMDECL(int)            CPUMRestoreHostFPUState(PVM pVM);
+VMMDECL(int)            CPUMHandleLazyFPU(PVM pVM, PVMCPU pVCpu);
+VMMDECL(int)            CPUMRestoreHostFPUState(PVM pVM, PVMCPU pVCpu);
 
 /** @name Changed flags
@@ -928 +929 @@
 VMMDECL(bool)           CPUMIsHostUsingSysEnter(PVM pVM);
 VMMDECL(bool)           CPUMIsHostUsingSysCall(PVM pVM);
-VMMDECL(bool)           CPUMIsGuestFPUStateActive(PVM pVM);
+VMMDECL(bool)           CPUMIsGuestFPUStateActive(PVMCPU pVCPU);
 VMMDECL(void)           CPUMDeactivateGuestFPUState(PVM pVM);
 VMMDECL(bool)           CPUMIsGuestDebugStateActive(PVM pVM);
@@ -966 +967 @@
 VMMR3DECL(int)          CPUMR3TermCPU(PVM pVM);
 VMMR3DECL(void)         CPUMR3Reset(PVM pVM);
-VMMR3DECL(int)          CPUMR3QueryGuestCtxRCPtr(PVM pVM, RCPTRTYPE(PCPUMCTX) *ppCtx);
 # ifdef DEBUG
 VMMR3DECL(void)         CPUMR3SaveEntryCtx(PVM pVM);
@@ -1006 +1006 @@
  */
 VMMR0DECL(int)          CPUMR0Init(PVM pVM);
-VMMR0DECL(int)          CPUMR0LoadGuestFPU(PVM pVM, PCPUMCTX pCtx);
-VMMR0DECL(int)          CPUMR0SaveGuestFPU(PVM pVM, PCPUMCTX pCtx);
-VMMR0DECL(int)          CPUMR0SaveGuestDebugState(PVM pVM, PCPUMCTX pCtx, bool fDR6);
-VMMR0DECL(int)          CPUMR0LoadGuestDebugState(PVM pVM, PCPUMCTX pCtx, bool fDR6);
+VMMR0DECL(int)          CPUMR0LoadGuestFPU(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
+VMMR0DECL(int)          CPUMR0SaveGuestFPU(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
+VMMR0DECL(int)          CPUMR0SaveGuestDebugState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, bool fDR6);
+VMMR0DECL(int)          CPUMR0LoadGuestDebugState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, bool fDR6);
 
 /** @} */

trunk/include/VBox/vm.h

@@ -107 +107 @@
         struct CPUMCPU      s;
 #endif
-        char                padding[4096];      /* multiple of 32 */
+        char                padding[2048];      /* multiple of 32 */
     } cpum;
     /** VMM part. */
@@ -570 +570 @@
     STAMPROFILEADV      StatSwitcherTSS;
 
-/** @todo Realign everything on 64 byte boundraries to better match the
+/** @todo Realign everything on 64 byte boundaries to better match the
  *        cache-line size. */
     /* padding - the unions must be aligned on 32 bytes boundraries. */
@@ -581 +581 @@
         struct CPUM s;
 #endif
-        char        padding[4416];      /* multiple of 32 */
+        char        padding[4096];      /* multiple of 32 */
     } cpum;
 

trunk/include/VBox/vm.mac

@@ -95 +95 @@
 
     alignb 64
-    .cpum                 resb 4416
+    .cpum                 resb 4096
     .vmm                  resb 1024
 
 endstruc
 
+;;
+; This is part of  the VMCPU structure.
+struc VMCPU
+    .fForcedActions     resd 1
+    .enmState           resd 1
+    .pVMR3              RTR3PTR_RES 1
+    .pVMR0              RTR0PTR_RES 1
+    .pVMRC              RTRCPTR_RES 1
+    .idCpu              resd 1
+
+    .hNativeThread      RTR0PTR_RES 1
+
+    alignb 64
+
+    .cpum               resb 2048
+endstruc
+
 
 %endif