UefiCpuPkg: Update SmmCpuFeatureLib pass XCODE5 tool chain

[mirror_edk2.git] / UefiCpuPkg / Library / SmmCpuFeaturesLib / X64 / SmiException.nasm

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm b/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
index fe1bf3f16574dde8e02c7aea86c5e29614204e6d..b0ab87b0d4e537725a8ea727e252c75e748d6bcb 100644 (file)
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/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
@@ -86,7 +86,7 @@ ASM_PFX(OnException):
     add  rsp, 0x28\r
     mov  ebx, eax\r
     mov  eax, 4\r
-    DB  0x0f, 0x01, 0x0c1 ; VMCALL\r
+    vmcall\r
     jmp $\r
 \r
 global ASM_PFX(OnStmSetup)\r
@@ -95,7 +95,7 @@ ASM_PFX(OnStmSetup):
 ; Check XD disable bit\r
 ;\r
     xor     r8, r8\r
-    mov     rax, ASM_PFX(gStmXdSupported)\r
+    lea     rax, [ASM_PFX(gStmXdSupported)]\r
     mov     al, [rax]\r
     cmp     al, 0\r
     jz      @StmXdDone1\r
@@ -118,7 +118,7 @@ ASM_PFX(OnStmSetup):
   call ASM_PFX(SmmStmSetup)\r
   add  rsp, 0x20\r
 \r
-    mov     rax, ASM_PFX(gStmXdSupported)\r
+    lea     rax, [ASM_PFX(gStmXdSupported)]\r
     mov     al, [rax]\r
     cmp     al, 0\r
     jz      .11\r
@@ -139,7 +139,7 @@ ASM_PFX(OnStmTeardown):
 ; Check XD disable bit\r
 ;\r
     xor     r8, r8\r
-    mov     rax, ASM_PFX(gStmXdSupported)\r
+    lea     rax, [ASM_PFX(gStmXdSupported)]\r
     mov     al, [rax]\r
     cmp     al, 0\r
     jz      @StmXdDone2\r
@@ -162,7 +162,7 @@ ASM_PFX(OnStmTeardown):
   call ASM_PFX(SmmStmTeardown)\r
   add  rsp, 0x20\r
 \r
-    mov     rax, ASM_PFX(gStmXdSupported)\r
+    lea     rax, [ASM_PFX(gStmXdSupported)]\r
     mov     al, [rax]\r
     cmp     al, 0\r
     jz      .12\r
@@ -176,4 +176,3 @@ ASM_PFX(OnStmTeardown):
 \r
 .12:\r
   rsm\r
-\r