sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UefiCpuPkg: Remove X86 ASM and S files

Browse Source 
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>
This commit is contained in:
Liming Gao
2018-06-04 13:36:40 +08:00
parent ec51c05936
commit 236601136f
24 changed files with 7 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.S
View File

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

45
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/Ia32/AsmFuncs.asm
View File

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

4
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
View File

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

37
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.S
View File

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

41
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/X64/AsmFuncs.asm
View File

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