From 3eef2cd194d86d32a5dc1fc2c21ddbfe6d23f01e Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Mon, 30 May 2016 18:52:07 -0700
Subject: [PATCH] MdePkg BaseMemoryLibOptDxe: Convert Ia32/ScanMem16.asm to
 NASM

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

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

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index fd4369650c..3a25a326c3 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -38,6 +38,7 @@
   Ia32/ScanMem64.S
   Ia32/ScanMem32.nasm
   Ia32/ScanMem32.S
+  Ia32/ScanMem16.nasm
   Ia32/ScanMem16.S
   Ia32/ScanMem8.S
   Ia32/CompareMem.S
@@ -51,6 +52,7 @@
   Ia32/ScanMem64.asm
   Ia32/ScanMem32.nasm
   Ia32/ScanMem32.asm
+  Ia32/ScanMem16.nasm
   Ia32/ScanMem16.asm
   Ia32/ScanMem8.asm
   Ia32/CompareMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.nasm b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.nasm
new file mode 100644
index 0000000000..38c986ada1
--- /dev/null
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.nasm
@@ -0,0 +1,54 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006 - 2008, 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:
+;
+;   ScanMem16.Asm
+;
+; Abstract:
+;
+;   ScanMem16 function
+;
+; Notes:
+;
+;   The following BaseMemoryLib instances contain the same copy of this file:
+;
+;       BaseMemoryLibRepStr
+;       BaseMemoryLibMmx
+;       BaseMemoryLibSse2
+;       BaseMemoryLibOptDxe
+;       BaseMemoryLibOptPei
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; CONST VOID *
+; EFIAPI
+; InternalMemScanMem16 (
+;   IN      CONST VOID                *Buffer,
+;   IN      UINTN                     Length,
+;   IN      UINT16                    Value
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(InternalMemScanMem16)
+ASM_PFX(InternalMemScanMem16):
+    push    edi
+    mov     ecx, [esp + 12]
+    mov     edi, [esp + 8]
+    mov     eax, [esp + 16]
+    repne   scasw
+    lea     eax, [edi - 2]
+    cmovnz  eax, ecx
+    pop     edi
+    ret
+