UefiCpuPkg: Remove X86 ASM and S files

NASM has replaced ASM and S files.
1. Remove ASM from all modules expect for the ones in ResetVector directory.
The ones in ResetVector directory are included by Vtf0.nasmb. They are
also nasm style.
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: Eric Dong <eric.dong@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

5 files changed, 0 insertions, 165 deletions

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S
deleted file mode 100644
index ede19f21c3..0000000000
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S
+++ /dev/null
@@ -1,38 +0,0 @@
-#------------------------------------------------------------------------------

-#*

-#*   Copyright (c) 2012, 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.

-#*

-#*    AsmFuncs.S

-#*

-#*   Abstract:

-#*

-#*     Assembly function to set segment selectors.

-#

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

-

-.text

-

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

-# 

-# VOID

-# EFIAPI

-# AsmSetDataSelectors (

-#   IN UINT16   SelectorValue

-#   );

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

-ASM_GLOBAL ASM_PFX(AsmSetDataSelectors)

-ASM_PFX(AsmSetDataSelectors):

-    movl    4(%esp),  %eax

-    movw    %ax, %ss

-    movw    %ax, %ds

-    movw    %ax, %es

-    movw    %ax, %fs

-    movw    %ax, %gs 

-    ret

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm
deleted file mode 100644
index 79496c48d7..0000000000
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm
+++ /dev/null
@@ -1,45 +0,0 @@
-;------------------------------------------------------------------------------ ;

-; Copyright (c) 2012, 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:

-;

-;   AsmFuncs.Asm

-;

-; Abstract:

-;

-;   Assembly function to set segment selectors.

-;

-; Notes:

-;

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

-

-.686

-.model  flat,C

-

-.code

-

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

-; VOID

-; EFIAPI

-; AsmSetDataSelectors (

-;   IN UINT16   SelectorValue

-;   );

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

-AsmSetDataSelectors   PROC near public

-  mov     eax, [esp + 4]

-  mov     ds, ax

-  mov     es, ax

-  mov     fs, ax

-  mov     gs, ax

-  mov     ss, ax   

-  ret

-AsmSetDataSelectors   ENDP

-

-END

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 47fecd7d6d..407aab6735 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -37,14 +37,10 @@
   S3Resume.c

 

 [Sources.IA32]

-  Ia32/AsmFuncs.asm

   Ia32/AsmFuncs.nasm

-  Ia32/AsmFuncs.S

 

 [Sources.X64]

-  X64/AsmFuncs.asm

   X64/AsmFuncs.nasm

-  X64/AsmFuncs.S

 

 [Packages]

   MdePkg/MdePkg.dec

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S
deleted file mode 100644
index 2ced09f35c..0000000000
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S
+++ /dev/null
@@ -1,37 +0,0 @@
-#------------------------------------------------------------------------------

-#*

-#*   Copyright (c) 2012, 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.

-#*

-#*    AsmFuncs.S

-#*

-#*   Abstract:

-#*

-#*     Assembly function to set segment selectors.

-#

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

-

-.text

-

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

-# 

-# VOID

-# EFIAPI

-# AsmSetDataSelectors (

-#   IN UINT16   SelectorValue

-#   );

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

-ASM_GLOBAL ASM_PFX(AsmSetDataSelectors)

-ASM_PFX(AsmSetDataSelectors):

-    movw    %cx, %ss

-    movw    %cx, %ds

-    movw    %cx, %es

-    movw    %cx, %fs

-    movw    %cx, %gs 

-    ret

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm
deleted file mode 100644
index eb014a5862..0000000000
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-;------------------------------------------------------------------------------ ;

-; Copyright (c) 2012, 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:

-;

-;   AsmFuncs.Asm

-;

-; Abstract:

-;

-;   Assembly function to set segment selectors.

-;

-; Notes:

-;

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

-

-.code

-

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

-; VOID

-; EFIAPI

-; AsmSetDataSelectors (

-;   IN UINT16   SelectorValue

-;   );

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

-AsmSetDataSelectors   PROC

-  mov     ds, cx

-  mov     es, cx

-  mov     fs, cx

-  mov     gs, cx

-  mov     ss, cx   

-  ret

-AsmSetDataSelectors   ENDP

-

-END