Changeset 464 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2007 2:58:15 PM (18 years ago)

Author:

vboxsync

Message:

Renamed CR4 masks

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (1 diff)
• CPUMInternal.h (modified) (1 diff)
• CPUMInternal.mac (modified) (1 diff)
• VMMSwitcher/AMD64ToPAE.asm (modified) (1 diff)
• VMMSwitcher/PAEand32Bit.mac (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -125 +125 @@
         Log(("The CPU doesn't support FXSAVE/FXRSTOR!\n"));
         /* No FXSAVE implies no SSE */
-        pVM->cpum.s.CR4.Mask   = X86_CR4_PVI | X86_CR4_VME;
-        pVM->cpum.s.CR4.OSFSXR = 0;
+        pVM->cpum.s.CR4.AndMask = X86_CR4_PVI | X86_CR4_VME;
+        pVM->cpum.s.CR4.OrMask  = 0;
     }
     else
     {
-        pVM->cpum.s.CR4.Mask   = X86_CR4_OSXMMEEXCPT | X86_CR4_PVI | X86_CR4_VME;
-        pVM->cpum.s.CR4.OSFSXR = X86_CR4_OSFSXR;
+        pVM->cpum.s.CR4.AndMask = X86_CR4_OSXMMEEXCPT | X86_CR4_PVI | X86_CR4_VME;
+        pVM->cpum.s.CR4.OrMask  = X86_CR4_OSFSXR;
     }
 

trunk/src/VBox/VMM/CPUMInternal.h

@@ -317 +317 @@
     struct
     {
-        uint32_t Mask;
-        uint32_t OSFSXR;
+        uint32_t AndMask;
+        uint32_t OrMask;
     } CR4;
 

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -377 +377 @@
     .CPUFeatures.ecx      resd    1
     ; CR4 masks
-    .CR4.Mask             resd    1
-    .CR4.OSFSXR           resd    1
+    .CR4.AndMask          resd    1
+    .CR4.OrMask           resd    1
     ; entered rawmode?
     .fRawEntered          resb    1

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

@@ -230 +230 @@
 
     ;
-    ; CR4.Mask and CR4.OSFSXR are set in CPUMR3Init based on the presence of
+    ; CR4.AndMask and CR4.OrMask are set in CPUMR3Init based on the presence of
     ; FXSAVE support on the host CPU
     ;
-    and     ecx, [rdx + CPUM.CR4.Mask]
+    and     ecx, [rdx + CPUM.CR4.AndMask]
     or      eax, ecx
-    or      eax, [rdx + CPUM.CR4.OSFSXR]
+    or      eax, [rdx + CPUM.CR4.OrMask]
     mov     cr4, rax
     DEBUG_CHAR('c')                     ; trashes esi

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

@@ -193 +193 @@
 
     ;
-    ; CR4.Mask and CR4.OSFSXR are set in CPUMR3Init based on the presence of
+    ; CR4.AndMask and CR4.OrMask are set in CPUMR3Init based on the presence of
     ; FXSAVE support on the host CPU
     ;
-    and     ecx, [edx + CPUM.CR4.Mask]
+    and     ecx, [edx + CPUM.CR4.AndMask]
     or      eax, ecx
-    or      eax, [edx + CPUM.CR4.OSFSXR]
+    or      eax, [edx + CPUM.CR4.OrMask]
     mov     cr4, eax