MdePkg: Remove X86 ASM and S files

NASM has replaced ASM and S files.
1. Remove ASM from all modules.
2. Remove S files from the drivers only.
3. https://bugzilla.tianocore.org/show_bug.cgi?id=881
After NASM is updated, S files can be removed from Library.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>

23 files changed, 1 insertions, 1287 deletions

diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
index af08b7d6d9..da6589a6a4 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
+++ b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
@@ -4,7 +4,7 @@
 #  Base Memory Library that uses MMX registers for high performance.

 #  Optimized for use in DXE.

 #

-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2006 - 2018, 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

@@ -74,52 +74,30 @@
   Ia32/CopyMem.nasm

   Ia32/CopyMem.S

   Ia32/ScanMem64.nasm

-  Ia32/ScanMem64.asm

   Ia32/ScanMem32.nasm

-  Ia32/ScanMem32.asm

   Ia32/ScanMem16.nasm

-  Ia32/ScanMem16.asm

   Ia32/ScanMem8.nasm

-  Ia32/ScanMem8.asm

   Ia32/CompareMem.nasm

-  Ia32/CompareMem.asm

   Ia32/SetMem64.nasm

-  Ia32/SetMem64.asm

   Ia32/SetMem32.nasm

-  Ia32/SetMem32.asm

   Ia32/SetMem16.nasm

-  Ia32/SetMem16.asm

   Ia32/ZeroMem.nasm

-  Ia32/ZeroMem.asm

   Ia32/SetMem.nasm

-  Ia32/SetMem.asm

   Ia32/CopyMem.nasm

-  Ia32/CopyMem.asm

   Ia32/IsZeroBuffer.nasm

 

 [Sources.X64]

   X64/ZeroMem.nasm

-  X64/ZeroMem.asm

   X64/ScanMem64.nasm

-  X64/ScanMem64.asm

   X64/ScanMem32.nasm

-  X64/ScanMem32.asm

   X64/ScanMem16.nasm

-  X64/ScanMem16.asm

   X64/ScanMem8.nasm

-  X64/ScanMem8.asm

   X64/CompareMem.nasm

-  X64/CompareMem.asm

   X64/SetMem64.nasm

-  X64/SetMem64.asm

   X64/SetMem32.nasm

-  X64/SetMem32.asm

   X64/SetMem16.nasm

-  X64/SetMem16.asm

   X64/SetMem.nasm

-  X64/SetMem.asm

   X64/CopyMem.nasm

-  X64/CopyMem.asm

   X64/ScanMem64.nasm

   X64/ScanMem64.S

   X64/ScanMem32.nasm

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
deleted file mode 100644
index 5a0792d592..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
+++ /dev/null
@@ -1,56 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   CompareMem.Asm

-;

-; Abstract:

-;

-;   CompareMem function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .code

-

-;------------------------------------------------------------------------------

-; INTN

-; EFIAPI

-; InternalMemCompareMem (

-;   IN      CONST VOID                *DestinationBuffer,

-;   IN      CONST VOID                *SourceBuffer,

-;   IN      UINTN                     Length

-;   );

-;------------------------------------------------------------------------------

-InternalMemCompareMem   PROC    USES    esi edi

-    mov     esi, [esp + 12]

-    mov     edi, [esp + 16]

-    mov     ecx, [esp + 20]

-    repe    cmpsb

-    movzx   eax, byte ptr [esi - 1]

-    movzx   edx, byte ptr [edi - 1]

-    sub     eax, edx

-    ret

-InternalMemCompareMem   ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm
deleted file mode 100644
index 38e1da7d81..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm
+++ /dev/null
@@ -1,77 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   CopyMem.asm

-;

-; Abstract:

-;

-;   CopyMem function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .mmx

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  EFIAPI

-;  InternalMemCopyMem (

-;    IN VOID   *Destination,

-;    IN VOID   *Source,

-;    IN UINTN  Count

-;    );

-;------------------------------------------------------------------------------

-InternalMemCopyMem  PROC    USES    esi edi

-    mov     esi, [esp + 16]             ; esi <- Source

-    mov     edi, [esp + 12]             ; edi <- Destination

-    mov     edx, [esp + 20]             ; edx <- Count

-    lea     eax, [esi + edx - 1]        ; eax <- End of Source

-    cmp     esi, edi

-    jae     @F

-    cmp     eax, edi                    ; Overlapped?

-    jae     @CopyBackward               ; Copy backward if overlapped

-@@:

-    mov     ecx, edx

-    and     edx, 7

-    shr     ecx, 3                      ; ecx <- # of Qwords to copy

-    jz      @CopyBytes

-    push    eax

-    push    eax

-    movq    [esp], mm0                  ; save mm0

-@@:

-    movq    mm0, [esi]

-    movq    [edi], mm0

-    add     esi, 8

-    add     edi, 8

-    loop    @B

-    movq    mm0, [esp]                  ; restore mm0

-    pop     ecx                         ; stack cleanup

-    pop     ecx                         ; stack cleanup

-    jmp     @CopyBytes

-@CopyBackward:

-    mov     esi, eax                    ; esi <- Last byte in Source

-    lea     edi, [edi + edx - 1]        ; edi <- Last byte in Destination

-    std

-@CopyBytes:

-    mov     ecx, edx

-    rep     movsb

-    cld

-    mov     eax, [esp + 12]

-    ret

-InternalMemCopyMem  ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
deleted file mode 100644
index 0ee190e46a..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
+++ /dev/null
@@ -1,55 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem16 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT16                    Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem16    PROC    USES    edi

-    mov     ecx, [esp + 12]

-    mov     edi, [esp + 8]

-    mov     eax, [esp + 16]

-    repne   scasw

-    lea     eax, [edi - 2]

-    cmovnz  eax, ecx

-    ret

-InternalMemScanMem16    ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
deleted file mode 100644
index adbf295621..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
+++ /dev/null
@@ -1,55 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ScanMem32.Asm

-;

-; Abstract:

-;

-;   ScanMem32 function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem32 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT32                    Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem32    PROC    USES    edi

-    mov     ecx, [esp + 12]

-    mov     edi, [esp + 8]

-    mov     eax, [esp + 16]

-    repne   scasd

-    lea     eax, [edi - 4]

-    cmovnz  eax, ecx

-    ret

-InternalMemScanMem32    ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
deleted file mode 100644
index 0a0f5d0468..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
+++ /dev/null
@@ -1,64 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ScanMem64.Asm

-;

-; Abstract:

-;

-;   ScanMem64 function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem64 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT64                    Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem64    PROC    USES    edi

-    mov     ecx, [esp + 12]

-    mov     eax, [esp + 16]

-    mov     edx, [esp + 20]

-    mov     edi, [esp + 8]

-@@:

-    cmp     eax, [edi]

-    lea     edi, [edi + 8]

-    loopne  @B

-    jne     @F

-    cmp     edx, [edi - 4]

-    jecxz   @F

-    jne     @B

-@@:

-    lea     eax, [edi - 8]

-    cmovne  eax, ecx

-    ret

-InternalMemScanMem64    ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
deleted file mode 100644
index c64d41d6c1..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
+++ /dev/null
@@ -1,55 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ScanMem8.Asm

-;

-; Abstract:

-;

-;   ScanMem8 function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem8 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT8                     Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem8 PROC    USES    edi

-    mov     ecx, [esp + 12]

-    mov     edi, [esp + 8]

-    mov     al, [esp + 16]

-    repne   scasb

-    lea     eax, [edi - 1]

-    cmovnz  eax, ecx

-    ret

-InternalMemScanMem8 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm
deleted file mode 100644
index e43ea08684..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm
+++ /dev/null
@@ -1,70 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem.asm

-;

-; Abstract:

-;

-;   SetMem function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .mmx

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT8  Value

-;    )

-;------------------------------------------------------------------------------

-InternalMemSetMem   PROC    USES    edi

-    mov     al, [esp + 16]

-    mov     ah, al

-    shrd    edx, eax, 16

-    shld    eax, edx, 16

-    mov     ecx, [esp + 12]             ; ecx <- Count

-    mov     edi, [esp + 8]              ; edi <- Buffer

-    mov     edx, ecx

-    and     edx, 7

-    shr     ecx, 3                      ; # of Qwords to set

-    jz      @SetBytes

-    add     esp, -10h

-    movq    [esp], mm0                  ; save mm0

-    movq    [esp + 8], mm1              ; save mm1

-    movd    mm0, eax

-    movd    mm1, eax

-    psllq   mm0, 32

-    por     mm0, mm1                    ; fill mm0 with 8 Value's

-@@:

-    movq    [edi], mm0

-    add     edi, 8

-    loop    @B

-    movq    mm0, [esp]                  ; restore mm0

-    movq    mm1, [esp + 8]              ; restore mm1

-    add     esp, 10h                    ; stack cleanup

-@SetBytes:

-    mov     ecx, edx

-    rep     stosb

-    mov     eax, [esp + 8]              ; eax <- Buffer as return value

-    ret

-InternalMemSetMem   ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm
deleted file mode 100644
index 8d5bca0e70..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm
+++ /dev/null
@@ -1,63 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem16.asm

-;

-; Abstract:

-;

-;   SetMem16 function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .mmx

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem16 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT16 Value

-;    )

-;------------------------------------------------------------------------------

-InternalMemSetMem16 PROC    USES    edi

-    mov     eax, [esp + 16]

-    shrd    edx, eax, 16

-    shld    eax, edx, 16

-    mov     edx, [esp + 12]

-    mov     edi, [esp + 8]

-    mov     ecx, edx

-    and     edx, 3

-    shr     ecx, 2

-    jz      @SetWords

-    movd    mm0, eax

-    movd    mm1, eax

-    psllq   mm0, 32

-    por     mm0, mm1

-@@:

-    movq    [edi], mm0

-    add     edi, 8

-    loop    @B

-@SetWords:

-    mov     ecx, edx

-    rep     stosw

-    mov     eax, [esp + 8]

-    ret

-InternalMemSetMem16 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm
deleted file mode 100644
index 031c48a32d..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm
+++ /dev/null
@@ -1,59 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem32.asm

-;

-; Abstract:

-;

-;   SetMem32 function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .mmx

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem32 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT32 Value

-;    );

-;------------------------------------------------------------------------------

-InternalMemSetMem32 PROC

-    mov     eax, [esp + 4]              ; eax <- Buffer as return value

-    mov     ecx, [esp + 8]              ; ecx <- Count

-    movd    mm0, dword ptr [esp + 12]             ; mm0 <- Value

-    shr     ecx, 1                      ; ecx <- number of qwords to set

-    mov     edx, eax                    ; edx <- Buffer

-    jz      @SetDwords

-    movq    mm1, mm0

-    psllq   mm1, 32

-    por     mm0, mm1

-@@:

-    movq    qword ptr [edx], mm0

-    lea     edx, [edx + 8]              ; use "lea" to avoid change in flags

-    loop    @B

-@SetDwords:

-    jnc     @F

-    movd    dword ptr [edx], mm0

-@@:

-    ret

-InternalMemSetMem32 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
deleted file mode 100644
index 42870bdc38..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
+++ /dev/null
@@ -1,50 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem64.asm

-;

-; Abstract:

-;

-;   SetMem64 function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .mmx

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem64 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT64 Value

-;    )

-;------------------------------------------------------------------------------

-InternalMemSetMem64 PROC

-    mov     eax, [esp + 4]

-    mov     ecx, [esp + 8]

-    movq    mm0, [esp + 12]

-    mov     edx, eax

-@@:

-    movq    [edx], mm0

-    add     edx, 8

-    loop    @B

-    ret

-InternalMemSetMem64 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm
deleted file mode 100644
index 1676b35b9a..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm
+++ /dev/null
@@ -1,56 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ZeroMem.asm

-;

-; Abstract:

-;

-;   ZeroMem function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .686

-    .model  flat,C

-    .mmx

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  InternalMemZeroMem (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count

-;    );

-;------------------------------------------------------------------------------

-InternalMemZeroMem  PROC    USES    edi

-    mov     edi, [esp + 8]

-    mov     ecx, [esp + 12]

-    mov     edx, ecx

-    shr     ecx, 3

-    jz      @ZeroBytes

-    pxor    mm0, mm0

-@@:

-    movq    [edi], mm0

-    add     edi, 8

-    loop    @B

-@ZeroBytes:

-    and     edx, 7

-    xor     eax, eax

-    mov     ecx, edx

-    rep     stosb

-    mov     eax, [esp + 8]

-    ret

-InternalMemZeroMem  ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
deleted file mode 100644
index 0ef05b2fa2..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   CompareMem.Asm

-;

-; Abstract:

-;

-;   CompareMem function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; INTN

-; EFIAPI

-; InternalMemCompareMem (

-;   IN      CONST VOID                *DestinationBuffer,

-;   IN      CONST VOID                *SourceBuffer,

-;   IN      UINTN                     Length

-;   );

-;------------------------------------------------------------------------------

-InternalMemCompareMem   PROC    USES    rsi rdi

-    mov     rsi, rcx

-    mov     rdi, rdx

-    mov     rcx, r8

-    repe    cmpsb

-    movzx   rax, byte ptr [rsi - 1]

-    movzx   rdx, byte ptr [rdi - 1]

-    sub     rax, rdx

-    ret

-InternalMemCompareMem   ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.asm
deleted file mode 100644
index 6e74985e35..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.asm
+++ /dev/null
@@ -1,70 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   CopyMem.asm

-;

-; Abstract:

-;

-;   CopyMem function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; VOID *

-; EFIAPI

-; InternalMemCopyMem (

-;   OUT     VOID                      *DestinationBuffer,

-;   IN      CONST VOID                *SourceBuffer,

-;   IN      UINTN                     Length

-;   );

-;------------------------------------------------------------------------------

-InternalMemCopyMem  PROC    USES    rsi rdi

-    mov     rsi, rdx                    ; rsi <- Source

-    mov     rdi, rcx                    ; rdi <- Destination

-    lea     r9, [rsi + r8 - 1]          ; r9 <- End of Source

-    cmp     rsi, rdi

-    mov     rax, rdi                    ; rax <- Destination as return value

-    jae     @F

-    cmp     r9, rdi

-    jae     @CopyBackward               ; Copy backward if overlapped

-@@:

-    mov     rcx, r8

-    and     r8, 7

-    shr     rcx, 3                      ; rcx <- # of Qwords to copy

-    jz      @CopyBytes

-    DB      49h, 0fh, 7eh, 0c2h         ; movd r10, mm0 (Save mm0 in r10)

-@@:

-    DB      0fh, 6fh, 06h               ; movd mm0, [rsi]

-    DB      0fh, 0e7h, 07h              ; movntq [rdi], mm0

-    add     rsi, 8

-    add     rdi, 8

-    loop    @B

-    mfence

-    DB      49h, 0fh, 6eh, 0c2h         ; movd mm0, r10 (Restore mm0)

-    jmp     @CopyBytes

-@CopyBackward:

-    mov     rsi, r9                     ; rsi <- End of Source

-    lea     rdi, [rdi + r8 - 1]         ; rdi <- End of Destination

-    std                                 ; set direction flag

-@CopyBytes:

-    mov     rcx, r8

-    rep     movsb                       ; Copy bytes backward

-    cld

-    ret

-InternalMemCopyMem  ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
deleted file mode 100644
index a6114db134..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem16 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT16                    Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem16    PROC    USES    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    mov     rcx, rdx

-    repne   scasw

-    lea     rax, [rdi - 2]

-    cmovnz  rax, rcx

-    ret

-InternalMemScanMem16    ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
deleted file mode 100644
index 40ff6c9e93..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ScanMem32.Asm

-;

-; Abstract:

-;

-;   ScanMem32 function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem32 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT32                    Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem32    PROC    USES    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    mov     rcx, rdx

-    repne   scasd

-    lea     rax, [rdi - 4]

-    cmovnz  rax, rcx

-    ret

-InternalMemScanMem32    ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
deleted file mode 100644
index e78da7d019..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ScanMem64.Asm

-;

-; Abstract:

-;

-;   ScanMem64 function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem64 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT64                    Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem64    PROC    USES    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    mov     rcx, rdx

-    repne   scasq

-    lea     rax, [rdi - 8]

-    cmovnz  rax, rcx

-    ret

-InternalMemScanMem64    ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
deleted file mode 100644
index fee239701d..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ScanMem8.Asm

-;

-; Abstract:

-;

-;   ScanMem8 function

-;

-; Notes:

-;

-;   The following BaseMemoryLib instances contain the same copy of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;       BaseMemoryLibOptDxe

-;       BaseMemoryLibOptPei

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; CONST VOID *

-; EFIAPI

-; InternalMemScanMem8 (

-;   IN      CONST VOID                *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT8                     Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemScanMem8 PROC    USES    rdi

-    mov     rdi, rcx

-    mov     rcx, rdx

-    mov     rax, r8

-    repne   scasb

-    lea     rax, [rdi - 1]

-    cmovnz  rax, rcx                    ; set rax to 0 if not found

-    ret

-InternalMemScanMem8 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.asm
deleted file mode 100644
index 9ff949cdd2..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.asm
+++ /dev/null
@@ -1,58 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem.asm

-;

-; Abstract:

-;

-;   SetMem function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; VOID *

-; EFIAPI

-; InternalMemSetMem (

-;   OUT     VOID                      *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT8                     Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemSetMem   PROC    USES    rdi

-    mov     rax, r8

-    mov     ah, al

-    DB      48h, 0fh, 6eh, 0c0h         ; movd mm0, rax

-    mov     r8, rcx

-    mov     rdi, r8                     ; rdi <- Buffer

-    mov     rcx, rdx

-    and     edx, 7

-    shr     rcx, 3

-    jz      @SetBytes

-    DB      0fh, 70h, 0C0h, 00h         ; pshufw mm0, mm0, 0h

-@@:

-    DB      0fh, 0e7h, 07h              ; movntq [rdi], mm0

-    add     rdi, 8

-    loop    @B

-    mfence

-@SetBytes:

-    mov     ecx, edx

-    rep     stosb

-    mov     rax, r8

-    ret

-InternalMemSetMem   ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.asm
deleted file mode 100644
index fbd98b0fe9..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.asm
+++ /dev/null
@@ -1,57 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem16.asm

-;

-; Abstract:

-;

-;   SetMem16 function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-; VOID *

-; EFIAPI

-; InternalMemSetMem16 (

-;   OUT     VOID                      *Buffer,

-;   IN      UINTN                     Length,

-;   IN      UINT16                    Value

-;   );

-;------------------------------------------------------------------------------

-InternalMemSetMem16 PROC    USES    rdi

-    mov     rax, r8

-    DB      48h, 0fh, 6eh, 0c0h         ; movd mm0, rax

-    mov     r8, rcx

-    mov     rdi, r8

-    mov     rcx, rdx

-    and     edx, 3

-    shr     rcx, 2

-    jz      @SetWords

-    DB      0fh, 70h, 0C0h, 00h         ; pshufw mm0, mm0, 0h

-@@:

-    DB      0fh, 0e7h, 07h              ; movntq [rdi], mm0

-    add     rdi, 8

-    loop    @B

-    mfence

-@SetWords:

-    mov     ecx, edx

-    rep     stosw

-    mov     rax, r8

-    ret

-InternalMemSetMem16 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.asm
deleted file mode 100644
index a0bdd89bed..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem32.asm

-;

-; Abstract:

-;

-;   SetMem32 function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  InternalMemSetMem32 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT32 Value

-;    )

-;------------------------------------------------------------------------------

-InternalMemSetMem32 PROC

-    DB      49h, 0fh, 6eh, 0c0h         ; movd mm0, r8 (Value)

-    mov     rax, rcx                    ; rax <- Buffer

-    xchg    rcx, rdx                    ; rcx <- Count  rdx <- Buffer

-    shr     rcx, 1                      ; rcx <- # of qwords to set

-    jz      @SetDwords

-    DB      0fh, 70h, 0C0h, 44h         ; pshufw mm0, mm0, 44h

-@@:

-    DB      0fh, 0e7h, 02h              ; movntq [rdx], mm0

-    lea     rdx, [rdx + 8]              ; use "lea" to avoid flag changes

-    loop    @B

-    mfence

-@SetDwords:

-    jnc     @F

-    DB      0fh, 7eh, 02h               ; movd [rdx], mm0

-@@:

-    ret

-InternalMemSetMem32 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.asm
deleted file mode 100644
index f26177fa11..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.asm
+++ /dev/null
@@ -1,46 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   SetMem64.asm

-;

-; Abstract:

-;

-;   SetMem64 function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  InternalMemSetMem64 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT64 Value

-;    )

-;------------------------------------------------------------------------------

-InternalMemSetMem64 PROC

-    DB      49h, 0fh, 6eh, 0c0h         ; movd mm0, r8 (Value)

-    mov     rax, rcx                    ; rax <- Buffer

-    xchg    rcx, rdx                    ; rcx <- Count

-@@:

-    DB      0fh, 0e7h, 02h              ; movntq  [rdx], mm0

-    add     rdx, 8

-    loop    @B

-    mfence

-    ret

-InternalMemSetMem64 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.asm
deleted file mode 100644
index 0fcf50ce8b..0000000000
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; 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:

-;

-;   ZeroMem.asm

-;

-; Abstract:

-;

-;   ZeroMem function

-;

-; Notes:

-;

-;------------------------------------------------------------------------------

-

-    .code

-

-;------------------------------------------------------------------------------

-;  VOID *

-;  InternalMemZeroMem (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count

-;    );

-;------------------------------------------------------------------------------

-InternalMemZeroMem  PROC    USES    rdi

-    mov     rdi, rcx

-    mov     rcx, rdx

-    mov     r8, rdi

-    and     edx, 7

-    shr     rcx, 3

-    jz      @ZeroBytes

-    DB      0fh, 0efh, 0c0h             ; pxor mm0, mm0

-@@:

-    DB      0fh, 0e7h, 7                ; movntq [rdi], mm0

-    add     rdi, 8

-    loop    @B

-    DB      0fh, 0aeh, 0f0h             ; mfence

-@ZeroBytes:

-    xor     eax, eax

-    mov     ecx, edx

-    rep     stosb

-    mov     rax, r8

-    ret

-InternalMemZeroMem  ENDP

-

-    END