Moved the MdePkg to OldMdePkg so that new code in MdePkg does not break existing builds. Also updated the SPD and FPD files UiNames

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2616 6f19259b-4bc3-4df7-8a09-765794883524

22 files changed, 0 insertions, 1389 deletions

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
deleted file mode 100644
index 725367b2f9..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
+++ /dev/null
@@ -1,53 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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 share the same version of this file:
-#
-#       BaseMemoryLibRepStr
-#       BaseMemoryLibMmx
-#       BaseMemoryLibSse2
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemCompareMem
-
-#------------------------------------------------------------------------------
-# INTN
-# EFIAPI
-# InternalMemCompareMem (
-#   IN      CONST VOID                *DestinationBuffer,
-#   IN      CONST VOID                *SourceBuffer,
-#   IN      UINTN                     Length
-#   );
-#------------------------------------------------------------------------------
-_InternalMemCompareMem:
-    push    %esi
-    push    %edi
-    movl    12(%esp), %esi
-    movl    16(%esp), %edi
-    movl    20(%esp), %ecx
-    repe    cmpsb
-    movzbl  -1(%esi), %eax
-    movzbl  -1(%edi), %edx
-    subl    %edx, %eax
-    pop     %edi
-    pop     %esi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
deleted file mode 100644
index 1d0e7fad39..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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 share the same version of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;

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

-

-    .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/BaseMemoryLibSse2/Ia32/CopyMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
deleted file mode 100644
index ddbcbaf1b1..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
+++ /dev/null
@@ -1,85 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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:
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemCopyMem
-
-#------------------------------------------------------------------------------
-#  VOID *
-#  EFIAPI
-#  InternalMemCopyMem (
-#    IN VOID   *Destination,
-#    IN VOID   *Source,
-#    IN UINTN  Count
-#    );
-#------------------------------------------------------------------------------
-_InternalMemCopyMem:
-    push    %esi
-    push    %edi
-    movl    16(%esp), %esi              # esi <- Source
-    movl    12(%esp), %edi              # edi <- Destination
-    movl    20(%esp), %edx              # edx <- Count
-    leal    -1(%esi,%edx,), %eax        # eax <- End of Source
-    cmpl    %edi, %esi
-    jae     L0
-    cmpl    %edi, %eax                  # Overlapped?
-    jae     L_CopyBackward               # Copy backward if overlapped
-L0:
-    xorl    %ecx, %ecx
-    subl    %edi, %ecx
-    andl    $15, %ecx                   # ecx + edi aligns on 16-byte boundary
-    jz      L1
-    cmpl    %edx, %ecx
-    cmova   %edx, %ecx
-    subl    %ecx, %edx                  # edx <- remaining bytes to copy
-    rep
-    movsb
-L1:
-    movl    %edx, %ecx
-    andl    $15, %edx
-    shrl    $4, %ecx                    # ecx <- # of DQwords to copy
-    jz      L_CopyBytes
-    addl    $-16, %esp
-    movdqu  %xmm0, (%esp)
-L2:
-    movdqu  (%esi), %xmm0
-    movntdq %xmm0, (%edi)
-    addl    $16, %esi
-    addl    $16, %edi
-    loop    L2
-    mfence
-    movdqu  (%esp),%xmm0
-    addl    $16, %esp                   # stack cleanup
-    jmp     L_CopyBytes
-L_CopyBackward:
-    movl    %eax, %esi                  # esi <- Last byte in Source
-    leal    -1(%edi,%edx,), %edi        # edi <- Last byte in Destination
-    std
-L_CopyBytes:
-    movl    %edx, %ecx
-    rep
-    movsb
-    cld
-    movl    12(%esp), %eax              # eax <- Destination as return value
-    pop     %edi
-    pop     %esi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
deleted file mode 100644
index 77fb786d98..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
+++ /dev/null
@@ -1,84 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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

-    .xmm

-    .code

-

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

-;  VOID *

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

-@@:

-    xor     ecx, ecx

-    sub     ecx, edi

-    and     ecx, 15                     ; ecx + edi aligns on 16-byte boundary

-    jz      @F

-    cmp     ecx, edx

-    cmova   ecx, edx

-    sub     edx, ecx                    ; edx <- remaining bytes to copy

-    rep     movsb

-@@:

-    mov     ecx, edx

-    and     edx, 15

-    shr     ecx, 4                      ; ecx <- # of DQwords to copy

-    jz      @CopyBytes

-    add     esp, -16

-    movdqu  [esp], xmm0                 ; save xmm0

-@@:

-    movdqu  xmm0, [esi]                 ; esi may not be 16-bytes aligned

-    movntdq [edi], xmm0                 ; edi should be 16-bytes aligned

-    add     esi, 16

-    add     edi, 16

-    loop    @B

-    mfence

-    movdqu  xmm0, [esp]                 ; restore xmm0

-    add     esp, 16                     ; 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]             ; eax <- Destination as return value

-    ret

-InternalMemCopyMem  ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
deleted file mode 100644
index 5e65b9667a..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
+++ /dev/null
@@ -1,50 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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 share the same version of this file:
-#
-#       BaseMemoryLibRepStr
-#       BaseMemoryLibMmx
-#       BaseMemoryLibSse2
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemScanMem16
-
-#------------------------------------------------------------------------------
-# CONST VOID *
-# EFIAPI
-# InternalMemScanMem16 (
-#   IN      CONST VOID                *Buffer,
-#   IN      UINTN                     Length,
-#   IN      UINT16                    Value
-#   );
-#------------------------------------------------------------------------------
-_InternalMemScanMem16:
-    push    %edi
-    movl    12(%esp), %ecx
-    movl    8(%esp), %edi
-    movl    16(%esp), %eax
-    repne   scasw
-    leal    -2(%edi), %eax
-    cmovnz  %ecx, %eax
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
deleted file mode 100644
index 57fab61b77..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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 share the same version of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;

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

-

-    .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/BaseMemoryLibSse2/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
deleted file mode 100644
index 5d46ed2bc1..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
+++ /dev/null
@@ -1,50 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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 share the same version of this file:
-#
-#       BaseMemoryLibRepStr
-#       BaseMemoryLibMmx
-#       BaseMemoryLibSse2
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemScanMem32
-
-#------------------------------------------------------------------------------
-# CONST VOID *
-# EFIAPI
-# InternalMemScanMem32 (
-#   IN      CONST VOID                *Buffer,
-#   IN      UINTN                     Length,
-#   IN      UINT32                    Value
-#   );
-#------------------------------------------------------------------------------
-_InternalMemScanMem32:
-    push    %edi
-    movl    12(%esp), %ecx
-    movl    8(%esp), %edi
-    movl    16(%esp), %eax
-    repne   scasl
-    leal    -4(%edi), %eax
-    cmovnz  %ecx, %eax
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
deleted file mode 100644
index 6ac857ce16..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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 share the same version of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;

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

-

-    .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/BaseMemoryLibSse2/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
deleted file mode 100644
index 3ba69650ab..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
+++ /dev/null
@@ -1,59 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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 share the same version of this file:
-#
-#       BaseMemoryLibRepStr
-#       BaseMemoryLibMmx
-#       BaseMemoryLibSse2
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemScanMem64
-
-#------------------------------------------------------------------------------
-# CONST VOID *
-# EFIAPI
-# InternalMemScanMem64 (
-#   IN      CONST VOID                *Buffer,
-#   IN      UINTN                     Length,
-#   IN      UINT64                    Value
-#   );
-#------------------------------------------------------------------------------
-_InternalMemScanMem64:
-    push    %edi
-    movl    12(%esp), %ecx
-    movl    16(%esp), %eax
-    movl    20(%esp), %edx
-    movl    8(%esp), %edi
-L0:
-    cmpl    (%edi), %eax
-    leal    8(%edi), %edi
-    loopne  L0
-    jne     L1
-    cmpl    -4(%edi), %edx
-    jecxz   L1
-    jne     L0
-L1:
-    leal    -8(%edi), %eax
-    cmovne  %ecx, %eax
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
deleted file mode 100644
index ca54f13738..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
+++ /dev/null
@@ -1,62 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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 share the same version of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;

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

-

-    .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/BaseMemoryLibSse2/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
deleted file mode 100644
index 7a834a5635..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
+++ /dev/null
@@ -1,50 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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 share the same version of this file:
-#
-#       BaseMemoryLibRepStr
-#       BaseMemoryLibMmx
-#       BaseMemoryLibSse2
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemScanMem8
-
-#------------------------------------------------------------------------------
-# CONST VOID *
-# EFIAPI
-# InternalMemScanMem8 (
-#   IN      CONST VOID                *Buffer,
-#   IN      UINTN                     Length,
-#   IN      UINT8                     Value
-#   );
-#------------------------------------------------------------------------------
-_InternalMemScanMem8:
-    push    %edi
-    movl    12(%esp), %ecx
-    movl    8(%esp), %edi
-    movb    16(%esp), %al
-    repne   scasb
-    leal    -1(%edi), %eax
-    cmovnz  %ecx, %eax
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
deleted file mode 100644
index a3f65b64fa..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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 share the same version of this file:

-;

-;       BaseMemoryLibRepStr

-;       BaseMemoryLibMmx

-;       BaseMemoryLibSse2

-;

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

-

-    .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/BaseMemoryLibSse2/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
deleted file mode 100644
index 86bba889f2..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
+++ /dev/null
@@ -1,76 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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
-    .xmm:
-    .code:
-
-#------------------------------------------------------------------------------
-#  VOID *
-#  _mem_SetMem (
-#    IN VOID   *Buffer,
-#    IN UINTN  Count,
-#    IN UINT8  Value
-#    );
-#------------------------------------------------------------------------------
-.globl _InternalMemSetMem
-_InternalMemSetMem:
-    push    %edi
-    movl    12(%esp), %edx              # edx <- Count
-    movl    8(%esp), %edi               # edi <- Buffer
-    movb    16(%esp), %al               # al <- Value
-    xorl    %ecx, %ecx
-    subl    %edi, %ecx
-    andl    $15, %ecx                   # ecx + edi aligns on 16-byte boundary
-    jz      L0
-    cmpl    %edx, %ecx
-    cmova   %edx, %ecx
-    subl    %ecx, %edx
-    rep
-    stosb
-L0:
-    movl    %edx, %ecx
-    andl    $15, %edx
-    shrl    $4, %ecx                    # ecx <- # of DQwords to set
-    jz      L_SetBytes
-    movb    %al, %ah                    # ax <- Value | (Value << 8)
-    addl    $-16, %esp
-    movdqu  %xmm0, (%esp)
-    movd    %eax, %xmm0
-    pshuflw $0, %xmm0, %xmm0
-    movlhps %xmm0, %xmm0
-L1:
-    movntdq %xmm0, (%edi)
-    addl    $16, %edi
-    loop   L1
-    mfence
-    movdqu  (%esp), %xmm0
-    addl    $16, %esp                   # stack cleanup
-L_SetBytes:
-    movl    %edx, %ecx
-    rep
-    stosb
-    movl    8(%esp), %eax               # eax <- Buffer as return value
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
deleted file mode 100644
index a4de29c521..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
+++ /dev/null
@@ -1,75 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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

-    .xmm

-    .code

-

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

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT8  Value

-;    );

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

-InternalMemSetMem   PROC    USES    edi

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

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

-    mov     al, [esp + 16]              ; al <- Value

-    xor     ecx, ecx

-    sub     ecx, edi

-    and     ecx, 15                     ; ecx + edi aligns on 16-byte boundary

-    jz      @F

-    cmp     ecx, edx

-    cmova   ecx, edx

-    sub     edx, ecx

-    rep     stosb

-@@:

-    mov     ecx, edx

-    and     edx, 15

-    shr     ecx, 4                      ; ecx <- # of DQwords to set

-    jz      @SetBytes

-    mov     ah, al                      ; ax <- Value | (Value << 8)

-    add     esp, -16

-    movdqu  [esp], xmm0                 ; save xmm0

-    movd    xmm0, eax

-    pshuflw xmm0, xmm0, 0               ; xmm0[0..63] <- Value repeats 8 times

-    movlhps xmm0, xmm0                  ; xmm0 <- Value repeats 16 times

-@@:

-    movntdq [edi], xmm0                 ; edi should be 16-byte aligned

-    add     edi, 16

-    loop    @B

-    mfence

-    movdqu  xmm0, [esp]                 ; restore xmm0

-    add     esp, 16                     ; 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/BaseMemoryLibSse2/Ia32/SetMem16.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
deleted file mode 100644
index 8ec96a9b6c..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
+++ /dev/null
@@ -1,69 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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:
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemSetMem16
-
-#------------------------------------------------------------------------------
-#  VOID *
-#  EFIAPI
-#  InternalMemSetMem16 (
-#    IN VOID   *Buffer,
-#    IN UINTN  Count,
-#    IN UINT16 Value
-#    )
-#------------------------------------------------------------------------------
-_InternalMemSetMem16:
-    push    %edi
-    movl    12(%esp), %edx
-    movl    8(%esp), %edi
-    xorl    %ecx, %ecx
-    subl    %edi, %ecx
-    andl    $15, %ecx                   # ecx + edi aligns on 16-byte boundary
-    movl    16(%esp), %eax
-    jz      L0
-    shrl    %ecx
-    cmpl    %edx, %ecx
-    cmova   %edx, %ecx
-    subl    %ecx, %edx
-    rep
-    stosw
-L0:
-    movl    %edx, %ecx
-    andl    $7, %edx
-    shrl    $3, %ecx
-    jz      L_SetWords
-    movd    %eax, %xmm0
-    pshuflw $0, %xmm0, %xmm0
-    movlhps %xmm0, %xmm0
-L1:
-    movntdq %xmm0, (%edi)
-    addl    $16, %edi
-    loop    L1
-    mfence
-L_SetWords:
-    movl    %edx, %ecx
-    rep
-    stosw
-    movl    8(%esp), %eax
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
deleted file mode 100644
index a709899fe2..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
+++ /dev/null
@@ -1,71 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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

-    .xmm

-    .code

-

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

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem16 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT16 Value

-;    );

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

-InternalMemSetMem16 PROC    USES    edi

-    mov     edx, [esp + 12]

-    mov     edi, [esp + 8]

-    xor     ecx, ecx

-    sub     ecx, edi

-    and     ecx, 15                     ; ecx + edi aligns on 16-byte boundary

-    mov     eax, [esp + 16]

-    jz      @F

-    shr     ecx, 1

-    cmp     ecx, edx

-    cmova   ecx, edx

-    sub     edx, ecx

-    rep     stosw

-@@:

-    mov     ecx, edx

-    and     edx, 7

-    shr     ecx, 3

-    jz      @SetWords

-    movd    xmm0, eax

-    pshuflw xmm0, xmm0, 0

-    movlhps xmm0, xmm0

-@@:

-    movntdq [edi], xmm0                 ; edi should be 16-byte aligned

-    add     edi, 16

-    loop    @B

-    mfence

-@SetWords:

-    mov     ecx, edx

-    rep     stosw

-    mov     eax, [esp + 8]

-    ret

-InternalMemSetMem16 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
deleted file mode 100644
index f91169a6e0..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
+++ /dev/null
@@ -1,68 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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:
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemSetMem32
-
-#------------------------------------------------------------------------------
-#  VOID *
-#  EFIAPI
-#  InternalMemSetMem32 (
-#    IN VOID   *Buffer,
-#    IN UINTN  Count,
-#    IN UINT32 Value
-#    );
-#------------------------------------------------------------------------------
-_InternalMemSetMem32:
-    push    %edi
-    movl    12(%esp), %edx
-    movl    8(%esp), %edi
-    xorl    %ecx, %ecx
-    subl    %edi, %ecx
-    andl    $15, %ecx                   # ecx + edi aligns on 16-byte boundary
-    movl    16(%esp), %eax
-    jz      L0
-    shrl    $2, %ecx
-    cmpl    %edx, %ecx
-    cmova   %edx, %ecx
-    subl    %ecx, %edx
-    rep
-    stosl
-L0:
-    movl    %edx, %ecx
-    andl    $3, %edx
-    shrl    $2, %ecx
-    jz      L_SetDwords
-    movd    %eax, %xmm0
-    pshufd  $0, %xmm0, %xmm0
-L1:
-    movntdq %xmm0, (%edi)
-    addl    $16, %edi
-    loop    L1
-    mfence
-L_SetDwords:
-    movl    %edx, %ecx
-    rep
-    stosl
-    movl    8(%esp), %eax
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
deleted file mode 100644
index 99954a5e4b..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
+++ /dev/null
@@ -1,70 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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

-    .xmm

-    .code

-

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

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem32 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT32 Value

-;    );

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

-InternalMemSetMem32 PROC    USES    edi

-    mov     edx, [esp + 12]

-    mov     edi, [esp + 8]

-    xor     ecx, ecx

-    sub     ecx, edi

-    and     ecx, 15                     ; ecx + edi aligns on 16-byte boundary

-    mov     eax, [esp + 16]

-    jz      @F

-    shr     ecx, 2

-    cmp     ecx, edx

-    cmova   ecx, edx

-    sub     edx, ecx

-    rep     stosd

-@@:

-    mov     ecx, edx

-    and     edx, 3

-    shr     ecx, 2

-    jz      @SetDwords

-    movd    xmm0, eax

-    pshufd  xmm0, xmm0, 0

-@@:

-    movntdq [edi], xmm0

-    add     edi, 16

-    loop    @B

-    mfence

-@SetDwords:

-    mov     ecx, edx

-    rep     stosd

-    mov     eax, [esp + 8]

-    ret

-InternalMemSetMem32 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
deleted file mode 100644
index ef9918f0f9..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
+++ /dev/null
@@ -1,58 +0,0 @@
-#------------------------------------------------------------------------------

-#

-# Copyright (c) 2006, Intel Corporation

-# All rights reserved. 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.S

-#

-# Abstract:

-#

-#   SetMem64 function

-#

-# Notes:

-#

-#------------------------------------------------------------------------------

-

-.globl _InternalMemSetMem64

-

-#------------------------------------------------------------------------------

-#  VOID *

-#  EFIAPI

-#  InternalMemSetMem64 (

-#    IN VOID   *Buffer,

-#    IN UINTN  Count,

-#    IN UINT64 Value

-#    );

-#------------------------------------------------------------------------------

-_InternalMemSetMem64:

-    movl    4(%esp), %eax

-    movl    8(%esp), %ecx

-    testb   $8, %al

-    movl    %eax, %edx

-    movq    0xc(%esp), %xmm0

-    jz      L1

-    movq    %xmm0, (%edx)

-    addl    $8, %edx

-    decl    %ecx

-L1:

-    shrl    %ecx

-    jz      L_SetQwords

-    movlhps %xmm0, %xmm0

-L2:

-    movntdq %xmm0, (%edx)

-    leal    16(%edx), %edx

-    loop    L2

-    mfence

-L_SetQwords:

-    jnc     L3

-    movq    %xmm0, (%edx)

-L3:

-    ret

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
deleted file mode 100644
index 69406707a6..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
+++ /dev/null
@@ -1,64 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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

-    .xmm

-    .code

-

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

-;  VOID *

-;  EFIAPI

-;  InternalMemSetMem64 (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count,

-;    IN UINT64 Value

-;    )

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

-InternalMemSetMem64 PROC

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

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

-    test    al, 8

-    mov     edx, eax

-    movq    xmm0, [esp + 12]

-    jz      @F

-    movq    [edx], xmm0

-    add     edx, 8

-    dec     ecx

-@@:

-    shr     ecx, 1

-    jz      @SetQwords

-    movlhps xmm0, xmm0

-@@:

-    movntdq [edx], xmm0

-    lea     edx, [edx + 16]

-    loop    @B

-    mfence

-@SetQwords:

-    jnc     @F

-    movq    [edx], xmm0

-@@:

-    ret

-InternalMemSetMem64 ENDP

-

-    END

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
deleted file mode 100644
index 8b4157f741..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
+++ /dev/null
@@ -1,65 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. 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:
-#
-#------------------------------------------------------------------------------
-
-.globl _InternalMemZeroMem
-
-#------------------------------------------------------------------------------
-#  VOID *
-#  EFIAPI
-#  InternalMemZeroMem (
-#    IN VOID   *Buffer,
-#    IN UINTN  Count
-#    );
-#------------------------------------------------------------------------------
-_InternalMemZeroMem:
-    push    %edi
-    movl    8(%esp), %edi
-    movl    12(%esp), %edx
-    xorl    %ecx, %ecx
-    subl    %edi, %ecx
-    xorl    %eax, %eax
-    andl    $15, %ecx
-    jz      L0
-    cmpl    %edx, %ecx
-    cmova   %edx, %ecx
-    subl    %ecx, %edx
-    rep
-    stosb
-L0:
-    movl    %edx, %ecx
-    andl    $15, %edx
-    shrl    $4, %ecx
-    jz      L_ZeroBytes
-    pxor    %xmm0, %xmm0
-L1:
-    movntdq %xmm0, (%edi)
-    addl    $16, %edi
-    loop    L1
-    mfence
-L_ZeroBytes:
-    movl    %edx, %ecx
-    rep
-    stosb
-    movl    8(%esp), %eax
-    pop     %edi
-    ret
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
deleted file mode 100644
index 3792c88879..0000000000
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
+++ /dev/null
@@ -1,67 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006, Intel Corporation

-; All rights reserved. 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

-    .xmm

-    .code

-

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

-;  VOID *

-;  EFIAPI

-;  InternalMemZeroMem (

-;    IN VOID   *Buffer,

-;    IN UINTN  Count

-;    );

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

-InternalMemZeroMem  PROC    USES    edi

-    mov     edi, [esp + 8]

-    mov     edx, [esp + 12]

-    xor     ecx, ecx

-    sub     ecx, edi

-    xor     eax, eax

-    and     ecx, 15

-    jz      @F

-    cmp     ecx, edx

-    cmova   ecx, edx

-    sub     edx, ecx

-    rep     stosb

-@@:

-    mov     ecx, edx

-    and     edx, 15

-    shr     ecx, 4

-    jz      @ZeroBytes

-    pxor    xmm0, xmm0

-@@:

-    movntdq [edi], xmm0

-    add     edi, 16

-    loop    @B

-    mfence

-@ZeroBytes:

-    mov     ecx, edx

-    rep     stosb

-    mov     eax, [esp + 8]

-    ret

-InternalMemZeroMem  ENDP

-

-    END