Changeset 10648 in vbox

Timestamp:

Jul 15, 2008 12:15:41 PM (17 years ago)

Author:

vboxsync

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

33358

Message:

Moved X86FXSTATE from x86.mac to cpum.mac.

Location:

trunk

Files:

• include/VBox/cpum.mac (modified) (1 diff)
• include/VBox/x86.mac (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllA.asm (modified) (1 diff)
• src/VBox/VMM/testcase/tstAsmStructsAsm.asm (modified) (1 diff)

trunk/include/VBox/cpum.mac

@@ -206 +206 @@
 endstruc
 
+;;
+; FPU/XMM state
+;;
+struc X86FXSTATE
+    ;/** Control word. */
+    .FCW            resw    1
+    ;/** Status word. */
+    .FSW            resw    1
+    ;/** Tag word (it's a byte actually). */
+    .FTW            resb    1
+    .huh1           resb    1
+    ;/** Opcode. */
+    .FOP            resw    1
+    ;/** Instruction pointer. */
+    .FPUIP          resd    1
+    ;/** Code selector. */
+    .CS             resw    1
+    .Rsvrd1         resw    1
+    ;/* - offset 16 - */
+    ;/** Data pointer. */
+    .FPUDP          resd    1
+    ;/** Data segment */
+    .DS             resw    1
+    .Rsrvd2         resw    1
+    .MXCSR          resd    1
+    .MXCSR_MASK     resd    1
+    ;/* - offset 32 - */
+    ; FPU & MMX registers
+    .aRegs          resq    8*2
+    ;/* - offset 160 - */
+    ;/* 8 XMM registers in 32 bits mode; 16 in long mode */
+    .aXMM           resq    16*2
+    ;/* - offset 416 - */
+    .au32RsrvdRest  resd    (512 - 416) / 4
+endstruc
+
 %endif

trunk/include/VBox/x86.mac

@@ -423 +423 @@
 %define X86_TRAP_PF_ID              RT_BIT(4)
 
-;;
-; FPU/XMM state
-;;
-struc X86FXSTATE
-    ;/** Control word. */
-    .FCW            resw    1
-    ;/** Status word. */
-    .FSW            resw    1
-    ;/** Tag word (it's a byte actually). */
-    .FTW            resb    1
-    .huh1           resb    1
-    ;/** Opcode. */
-    .FOP            resw    1
-    ;/** Instruction pointer. */
-    .FPUIP          resd    1
-    ;/** Code selector. */
-    .CS             resw    1
-    .Rsvrd1         resw    1
-    ;/* - offset 16 - */
-    ;/** Data pointer. */
-    .FPUDP          resd    1
-    ;/** Data segment */
-    .DS             resw    1
-    .Rsrvd2         resw    1
-    .MXCSR          resd    1
-    .MXCSR_MASK     resd    1
-    ;/* - offset 32 - */
-    ; FPU & MMX registers
-    .aRegs          resq    8*2
-    ;/* - offset 160 - */
-    ;/* 8 XMM registers in 32 bits mode; 16 in long mode */
-    .aXMM           resq    16*2
-    ;/* - offset 416 - */
-    .au32RsrvdRest  resd    (512 - 416) / 4
-endstruc

trunk/src/VBox/VMM/VMMAll/CPUMAllA.asm

@@ -287 +287 @@
 
 ;;
-; Saves the guest's XMM state
+; Restores the guest's XMM state
 ;
 ; @param    pCtx  x86:[esp+4] GCC:rdi MSC:rcx     CPUMCTX pointer

trunk/src/VBox/VMM/testcase/tstAsmStructsAsm.asm

@@ -33 +33 @@
 %include "VBox/vm.mac"
 %include "VBox/sup.mac"
-%include "VBox/x86.mac"
 %include "../VMMSwitcher/VMMSwitcher.mac"
 %ifdef DO_GLOBALS