Changeset 66395 in vbox for trunk/src/VBox/Runtime/common/asm

Timestamp:

Apr 3, 2017 8:55:17 AM (8 years ago)

Author:

vboxsync

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

114347

Message:

asm-amd64-x86.h: Added ASMFxRstor & ASMFxSave.

Location:

trunk/src/VBox/Runtime/common/asm

Files:

• ASMFxRstor.asm (copied) (copied from trunk/src/VBox/Runtime/common/asm/ASMXRstor.asm ) (2 diffs)
• ASMFxSave.asm (copied) (copied from trunk/src/VBox/Runtime/common/asm/ASMXSave.asm ) (2 diffs)

trunk/src/VBox/Runtime/common/asm/ASMFxRstor.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; IPRT - ASMXRstor().
+; IPRT - ASMFxRstor().
 ;
 
 ;
-; Copyright (C) 2006-2016 Oracle Corporation
+; Copyright (C) 2006-2017 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -35 +35 @@
 ;;
 ; Loads extended CPU state.
-; @param    pXStateArea Pointer to the XRSTOR state area.
+; @param    pFxState    Pointer to the FXRSTOR state area.
 ;                       msc=rcx, gcc=rdi, x86=[esp+4]
-; @param    fMask       The 64-bit state component mask.
-;                       msc=rdx, gcc=rsi, x86=[esp+8]
 ;
-BEGINPROC_EXPORTED ASMXRstor
+BEGINPROC_EXPORTED ASMFxRstor
 SEH64_END_PROLOGUE
 %ifdef ASM_CALL64_MSC
-        mov     eax, edx
-        shr     rdx, 32
-        xrstor  [rcx]
+        o64 fxrstor [rcx]
 %elifdef ASM_CALL64_GCC
-        mov     rdx, rsi
-        shr     rdx, 32
-        mov     eax, esi
-        xrstor  [rdi]
-%elifdef RT_ARCH_X86
+        o64 fxrstor [rdi]
+%elif ARCH_BITS == 32
         mov     ecx, [esp + 4]
-        mov     eax, [esp + 8]
-        mov     edx, [esp + 12]
-        xrstor  [ecx]
+        fxrstor [ecx]
+%elif ARCH_BITS == 16
+        push    bp
+        mov     bp, sp
+        push    es
+        push    bx
+        les     bx, [bp + 4]
+        fxrstor [es:bx]
+        pop     bx
+        pop     es
+        pop     bp
 %else
  %error "Undefined arch?"
 %endif
         ret
-ENDPROC ASMXRstor
+ENDPROC ASMFxRstor
 

trunk/src/VBox/Runtime/common/asm/ASMFxSave.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; IPRT - ASMXSave().
+; IPRT - ASMFxSave().
 ;
 
 ;
-; Copyright (C) 2006-2016 Oracle Corporation
+; Copyright (C) 2006-2017 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -35 +35 @@
 ;;
 ; Saves extended CPU state.
-; @param    pXStateArea Pointer to the XSAVE state area.
+; @param    pFxState    Pointer to the XSAVE state area.
 ;                       msc=rcx, gcc=rdi, x86=[esp+4]
-; @param    fComponents The 64-bit state component mask.
-;                       msc=rdx, gcc=rsi, x86=[esp+8]
 ;
-BEGINPROC_EXPORTED ASMXSave
+BEGINPROC_EXPORTED ASMFxSave
 SEH64_END_PROLOGUE
 %ifdef ASM_CALL64_MSC
-        mov     eax, edx
-        shr     rdx, 32
-        xsave   [rcx]
+        o64 fxsave [rcx]
 %elifdef ASM_CALL64_GCC
-        mov     rdx, rsi
-        shr     rdx, 32
-        mov     eax, esi
-        xsave   [rdi]
-%elifdef RT_ARCH_X86
+        o64 fxsave [rdi]
+%elif ARCH_BITS == 32
         mov     ecx, [esp + 4]
-        mov     eax, [esp + 8]
-        mov     edx, [esp + 12]
-        xsave   [ecx]
+        fxsave  [ecx]
+%elif ARCH_BITS == 16
+        push    bp
+        mov     bp, sp
+        push    es
+        push    bx
+        les     bx, [bp + 4]
+        fxsave  [es:bx]
+        pop     bx
+        pop     es
+        pop     bp
 %else
  %error "Undefined arch?"
 %endif
         ret
-ENDPROC ASMXSave
+ENDPROC ASMFxSave