tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

MpInitLib: remove unneeded global ASM_PFX

Browse Source 
global in NASM file is used for symbols that are
referenced in C files.
Remove unneeded global keyword in NASM file.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Ray Ni 2022-05-07 20:34:36 +08:00 committed by mergify[bot]
parent 54aeed7e00
commit 76323c3145
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
View File

@ -1,5 +1,5 @@
;------------------------------------------------------------------------------ ; ;------------------------------------------------------------------------------ ;
; Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR> ; Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.<BR>
; SPDX-License-Identifier: BSD-2-Clause-Patent ; SPDX-License-Identifier: BSD-2-Clause-Patent
; ;
; Module Name: ; Module Name:
@ -24,8 +24,6 @@ SECTION .text
;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC ;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC
;IS IN MACHINE CODE. ;IS IN MACHINE CODE.
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
global ASM_PFX(RendezvousFunnelProc)
ASM_PFX(RendezvousFunnelProc):
RendezvousFunnelProcStart: RendezvousFunnelProcStart:
; At this point CS = 0x(vv00) and ip= 0x0. ; At this point CS = 0x(vv00) and ip= 0x0.
BITS 16 BITS 16
@ -207,8 +205,6 @@ RendezvousFunnelProcEnd:
;SwitchToRealProc procedure follows. ;SwitchToRealProc procedure follows.
;NOT USED IN 32 BIT MODE. ;NOT USED IN 32 BIT MODE.
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
global ASM_PFX(SwitchToRealProc)
ASM_PFX(SwitchToRealProc):
SwitchToRealProcStart: SwitchToRealProcStart:
jmp $ ; Never reach here jmp $ ; Never reach here
SwitchToRealProcEnd: SwitchToRealProcEnd:
@ -219,8 +215,6 @@ SwitchToRealProcEnd:
; The last three parameters (Pm16CodeSegment, SevEsAPJumpTable and WakeupBuffer) are ; The last three parameters (Pm16CodeSegment, SevEsAPJumpTable and WakeupBuffer) are
; specific to SEV-ES support and are not applicable on IA32. ; specific to SEV-ES support and are not applicable on IA32.
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
global ASM_PFX(AsmRelocateApLoop)
ASM_PFX(AsmRelocateApLoop):
AsmRelocateApLoopStart: AsmRelocateApLoopStart:
mov eax, esp mov eax, esp
mov esp, [eax + 16] ; TopOfApStack mov esp, [eax + 16] ; TopOfApStack

10
UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
View File

@ -35,8 +35,6 @@ SECTION .text
;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC ;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PROC
;IS IN MACHINE CODE. ;IS IN MACHINE CODE.
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
global ASM_PFX(RendezvousFunnelProc)
ASM_PFX(RendezvousFunnelProc):
RendezvousFunnelProcStart: RendezvousFunnelProcStart:
; At this point CS = 0x(vv00) and ip= 0x0. ; At this point CS = 0x(vv00) and ip= 0x0.
; Save BIST information to ebp firstly ; Save BIST information to ebp firstly
@ -279,8 +277,6 @@ RendezvousFunnelProcEnd:
; r8 - Code32 Selector Offset ; r8 - Code32 Selector Offset
; r9 - Stack Start ; r9 - Stack Start
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
global ASM_PFX(SwitchToRealProc)
ASM_PFX(SwitchToRealProc):
SwitchToRealProcStart: SwitchToRealProcStart:
BITS 64 BITS 64
cli cli
@ -421,8 +417,6 @@ SwitchToRealProcEnd:
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
; AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfApStack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer); ; AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfApStack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer);
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
global ASM_PFX(AsmRelocateApLoop)
ASM_PFX(AsmRelocateApLoop):
AsmRelocateApLoopStart: AsmRelocateApLoopStart:
BITS 64 BITS 64
cmp qword [rsp + 56], 0 ; SevEsAPJumpTable cmp qword [rsp + 56], 0 ; SevEsAPJumpTable
@ -594,11 +588,11 @@ AsmRelocateApLoopEnd:
;------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------------
global ASM_PFX(AsmGetAddressMap) global ASM_PFX(AsmGetAddressMap)
ASM_PFX(AsmGetAddressMap): ASM_PFX(AsmGetAddressMap):
lea rax, [ASM_PFX(RendezvousFunnelProc)] lea rax, [RendezvousFunnelProcStart]
mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelAddress], rax mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelAddress], rax
mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeEntryOffset], LongModeStart - RendezvousFunnelProcStart mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeEntryOffset], LongModeStart - RendezvousFunnelProcStart
mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelSize], RendezvousFunnelProcEnd - RendezvousFunnelProcStart mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelSize], RendezvousFunnelProcEnd - RendezvousFunnelProcStart
lea rax, [ASM_PFX(AsmRelocateApLoop)] lea rax, [AsmRelocateApLoopStart]
mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddress], rax mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddress], rax
mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize], AsmRelocateApLoopEnd - AsmRelocateApLoopStart mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize], AsmRelocateApLoopEnd - AsmRelocateApLoopStart
mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset], Flat32Start - RendezvousFunnelProcStart mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset], Flat32Start - RendezvousFunnelProcStart