UefiCpuPkg/PiSmmCpuDxeSmm: patch "gSmiStack" with PatchInstructionX86()

[mirror_edk2.git] / UefiCpuPkg / PiSmmCpuDxeSmm / X64 / SmiException.nasm

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
index bc8d95d8dc99e6edaa5aea563921d887e844174c..a8a9af300869a49789c1a435bc81a4315d510de2 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.nasm
@@ -1,5 +1,5 @@
 ;------------------------------------------------------------------------------ ;\r
-; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
 ; This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r
@@ -19,7 +19,6 @@
 ;-------------------------------------------------------------------------------\r
 \r
 extern  ASM_PFX(SmiPFHandler)\r
-extern  ASM_PFX(gSmiMtrrs)\r
 \r
 global  ASM_PFX(gcSmiIdtr)\r
 global  ASM_PFX(gcSmiGdtr)\r
@@ -130,7 +129,7 @@ ASM_PFX(gcPsd):
             DD      GDT_SIZE\r
             DD      0\r
             times   24 DB 0\r
-            DQ      ASM_PFX(gSmiMtrrs)\r
+            DQ      0\r
 PSD_SIZE  equ $ -   ASM_PFX(gcPsd)\r
 \r
 ;\r
@@ -290,7 +289,7 @@ ASM_PFX(PageFaultIdtHandlerSmmProfile):
 \r
 ;; call into exception handler\r
     mov     rcx, [rbp + 8]\r
-    mov     rax, ASM_PFX(SmiPFHandler)\r
+    lea     rax, [ASM_PFX(SmiPFHandler)]\r
 \r
 ;; Prepare parameter and call\r
     mov     rdx, rsp\r