Save/Restore missing volatile registers (XMM0-5) save/restore in Page Fault handler.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / SmmBaseHelper / X64 / PageFaultHandler.asm

diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
index d1c7bf972df808d4d8f3f311f622a0654fbedcdc..d58a04bcfbcb4b6bb53a94312c7bdc083a11e57f 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------
 ;
-; Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
 ; This program and the accompanying materials
 ; are licensed and made available under the terms and conditions of the BSD License
 ; which accompanies this distribution.  The full text of the license may be found at
@@ -32,10 +32,28 @@ PageFaultHandlerHook PROC
     push    r9
     push    r10
     push    r11
+
+    add     rsp, -10h * 6 - 8          ; reserve memory to store XMM registers and make address 16-byte alignment
+    movdqa  [rsp], xmm0
+    movdqa  [rsp + 10h], xmm1
+    movdqa  [rsp + 20h], xmm2
+    movdqa  [rsp + 30h], xmm3
+    movdqa  [rsp + 40h], xmm4
+    movdqa  [rsp + 50h], xmm5
+
     add     rsp, -20h
     call    PageFaultHandler
     add     rsp, 20h
-    test    al, al
+
+    movdqa  xmm0, [rsp]
+    movdqa  xmm1, [rsp + 10h] 
+    movdqa  xmm2, [rsp + 20h]
+    movdqa  xmm3, [rsp + 30h]
+    movdqa  xmm4, [rsp + 40h]
+    movdqa  xmm5, [rsp + 50h]
+    add     rsp, 10h * 6 + 8
+    
+    test    al, al                      ; set ZF flag
     pop     r11
     pop     r10
     pop     r9
@@ -43,7 +61,7 @@ PageFaultHandlerHook PROC
     pop     rdx
     pop     rcx
     pop     rax                         ; restore all volatile registers
-    jnz     @F
+    jnz     @F                          ; check ZF flag
     jmp     mOriginalHandler
 @@:
     add     rsp, 08h                    ; skip error code for PF