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, 1 insertions, 234 deletions

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index 02f86b774c..3c938cee53 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 #  CPU driver installs CPU Architecture Protocol and CPU MP protocol.

 #

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

+#  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>

 #  Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

@@ -58,14 +58,10 @@
   CpuPageTable.c

 

 [Sources.IA32]

-  Ia32/CpuAsm.asm

   Ia32/CpuAsm.nasm

-  Ia32/CpuAsm.S

 

 [Sources.X64]

-  X64/CpuAsm.asm

   X64/CpuAsm.nasm

-  X64/CpuAsm.S

 

 [Protocols]

   gEfiCpuArchProtocolGuid                       ## PRODUCES

diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
deleted file mode 100644
index e034bc2e2e..0000000000
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.S
+++ /dev/null
@@ -1,57 +0,0 @@
-#------------------------------------------------------------------------------

-#*

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

-#*

-#*    CpuAsm.S

-#*

-#*   Abstract:

-#*

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

-

-

-#.MMX

-#.XMM

-

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

-# VOID

-# SetCodeSelector (

-#   UINT16 Selector

-#   );

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

-ASM_GLOBAL ASM_PFX(SetCodeSelector)

-ASM_PFX(SetCodeSelector):

-    movl    4(%esp), %ecx

-    subl    $0x10, %esp 

-    leal    setCodeSelectorLongJump, %eax 

-    movl    %eax, (%esp)

-    movw    %cx, 4(%esp)

-    .byte   0xFF, 0x2C, 0x24   # jmp *(%esp)  note:(FWORD jmp) 

-setCodeSelectorLongJump:

-    addl    $0x10, %esp 

-    ret

-

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

-# VOID

-# SetDataSelectors (

-#   UINT16 Selector

-#   );

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

-ASM_GLOBAL ASM_PFX(SetDataSelectors)

-ASM_PFX(SetDataSelectors):

-    movl    4(%esp), %ecx

-    movw    %cx, %ss

-    movw    %cx, %ds

-    movw    %cx, %es

-    movw    %cx, %fs

-    movw    %cx, %gs

-    ret

-

-#END

-

diff --git a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm b/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
deleted file mode 100644
index 7f8f0d6f3a..0000000000
--- a/UefiCpuPkg/CpuDxe/Ia32/CpuAsm.asm
+++ /dev/null
@@ -1,58 +0,0 @@
-      TITLE   CpuAsm.asm:

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

-;*

-;*   Copyright (c) 2006 - 2013, 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.

-;*

-;*    CpuAsm.asm

-;*

-;*   Abstract:

-;*

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

-

-    .686

-    .model  flat,C

-    .code

-

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

-; VOID

-; SetCodeSelector (

-;   UINT16 Selector

-;   );

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

-SetCodeSelector PROC PUBLIC

-    mov     ecx, [esp+4]

-    sub     esp, 0x10

-    lea     eax, setCodeSelectorLongJump

-    mov     [esp], eax

-    mov     [esp+4], cx

-    jmp     fword ptr [esp]

-setCodeSelectorLongJump:

-    add     esp, 0x10

-    ret

-SetCodeSelector ENDP

-

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

-; VOID

-; SetDataSelectors (

-;   UINT16 Selector

-;   );

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

-SetDataSelectors PROC PUBLIC

-    mov     ecx, [esp+4]

-    mov     ss, cx

-    mov     ds, cx

-    mov     es, cx

-    mov     fs, cx

-    mov     gs, cx

-    ret

-SetDataSelectors ENDP

-

-

-END

diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S b/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
deleted file mode 100644
index e82cadf369..0000000000
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.S
+++ /dev/null
@@ -1,60 +0,0 @@
-#      TITLE   CpuAsm.S: 

-

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

-#*

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

-#*

-#*    CpuAsm.S

-#*

-#*   Abstract:

-#*

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

-

-

-#text  SEGMENT

-

-

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

-# VOID

-# SetCodeSelector (

-#   UINT16 Selector

-#   );

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

-ASM_GLOBAL ASM_PFX(SetCodeSelector)

-ASM_PFX(SetCodeSelector):

-    subq    $0x10, %rsp 

-    leaq    L_setCodeSelectorLongJump(%rip), %rax 

-    movq    %rax, (%rsp) 

-    movw    %cx, 4(%rsp)

-    .byte   0xFF, 0x2C, 0x24     # jmp (%rsp) note:fword jmp

-L_setCodeSelectorLongJump:

-    addq    $0x10, %rsp

-    ret

-

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

-# VOID

-# SetDataSelectors (

-#   UINT16 Selector

-#   );

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

-ASM_GLOBAL ASM_PFX(SetDataSelectors)

-ASM_PFX(SetDataSelectors):

-    movw    %cx, %ss

-    movw    %cx, %ds

-    movw    %cx, %es

-    movw    %cx, %fs

-    movw    %cx, %gs

-    ret

-

-#text  ENDS

-

-#END

-

-

diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm b/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
deleted file mode 100644
index c71b06a81e..0000000000
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-      TITLE   CpuAsm.asm: 

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

-;*

-;*   Copyright (c) 2008 - 2013, 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.             

-;*   

-;*    CpuAsm.asm

-;*  

-;*   Abstract:

-;*

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

-

-    .code

-

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

-; VOID

-; SetCodeSelector (

-;   UINT16 Selector

-;   );

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

-SetCodeSelector PROC PUBLIC

-    sub     rsp, 0x10

-    lea     rax, setCodeSelectorLongJump

-    mov     [rsp], rax

-    mov     [rsp+4], cx

-    jmp     fword ptr [rsp]

-setCodeSelectorLongJump:

-    add     rsp, 0x10

-    ret

-SetCodeSelector ENDP

-

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

-; VOID

-; SetDataSelectors (

-;   UINT16 Selector

-;   );

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

-SetDataSelectors PROC PUBLIC

-    mov     ss, cx

-    mov     ds, cx

-    mov     es, cx

-    mov     fs, cx

-    mov     gs, cx

-    ret

-SetDataSelectors ENDP

-

-END

-