From 73c40386d0df6375542ff4e5659ae81bd49cb628 Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Mon, 30 May 2016 18:51:58 -0700
Subject: [PATCH] MdePkg BaseLib: Convert Ia32/FxRestore.asm to NASM

The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert
Ia32/FxRestore.asm to Ia32/FxRestore.nasm

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
 MdePkg/Library/BaseLib/BaseLib.inf         |  1 +
 MdePkg/Library/BaseLib/Ia32/FxRestore.nasm | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 MdePkg/Library/BaseLib/Ia32/FxRestore.nasm

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 649492f0c7..af2969bcce 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -309,6 +309,7 @@
   Ia32/LongJump.asm | INTEL 
   Ia32/Invd.nasm| INTEL
   Ia32/Invd.asm | INTEL 
+  Ia32/FxRestore.nasm| INTEL
   Ia32/FxRestore.asm | INTEL 
   Ia32/FxSave.asm | INTEL 
   Ia32/FlushCacheLine.asm | INTEL 
diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.nasm b/MdePkg/Library/BaseLib/Ia32/FxRestore.nasm
new file mode 100644
index 0000000000..d8f1998ab7
--- /dev/null
+++ b/MdePkg/Library/BaseLib/Ia32/FxRestore.nasm
@@ -0,0 +1,38 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006, 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
+; http://opensource.org/licenses/bsd-license.php.
+;
+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+;
+; Module Name:
+;
+;   FxRestore.Asm
+;
+; Abstract:
+;
+;   AsmFxRestore function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; VOID
+; EFIAPI
+; InternalX86FxRestore (
+;   IN CONST IA32_FX_BUFFER *Buffer
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(InternalX86FxRestore)
+ASM_PFX(InternalX86FxRestore):
+    mov     eax, [esp + 4]              ; Buffer must be 16-byte aligned
+    fxrstor [eax]
+    ret
+