Reviewed-by: Giri P Mudusuru <giri.p.mudus...@intel.com> > -----Original Message----- > From: Gao, Liming > Sent: Friday, July 8, 2016 7:49 AM > To: edk2-devel@lists.01.org > Cc: Yao, Jiewen <jiewen....@intel.com>; Mudusuru, Giri P > <giri.p.mudus...@intel.com> > Subject: [Patch 4/5] IntelFsp2Pkg BaseFspSwitchStackLib: Remove MASM/GAS > files > > Keep NASM file only for new added modules. > > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Giri Mudusuru <giri.p.mudus...@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Liming Gao <liming....@intel.com> > --- > .../BaseFspSwitchStackLib.inf | 2 - > .../Library/BaseFspSwitchStackLib/Ia32/Stack.asm | 77 --------------------- > .../Library/BaseFspSwitchStackLib/Ia32/Stack.s | 78 > ---------------------- > 3 files changed, 157 deletions(-) > delete mode 100644 > IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm > delete mode 100644 IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s > > diff --git > a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf > b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf > index cef8d68..b3c673a 100644 > --- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf > +++ b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf > @@ -22,12 +22,10 @@ > > [Sources.IA32] > FspSwitchStackLib.c > > [Sources.IA32] > - Ia32/Stack.asm > - Ia32/Stack.s > Ia32/Stack.nasm > > [Packages] > MdePkg/MdePkg.dec > IntelFsp2Pkg/IntelFsp2Pkg.dec > diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm > b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm > deleted file mode 100644 > index 1efab52..0000000 > --- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm > +++ /dev/null > @@ -1,77 +0,0 @@ > -;------------------------------------------------------------------------------ > -; > -; Copyright (c) 2014 - 2015, 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. > -; > -; Abstract: > -; > -; Switch the stack from temporary memory to permenent memory. > -; > -;------------------------------------------------------------------------------ > - > - .586p > - .model flat,C > - .code > - > -;------------------------------------------------------------------------------ > -; UINT32 > -; EFIAPI > -; Pei2LoaderSwitchStack ( > -; VOID > -; ) > -;------------------------------------------------------------------------------ > -EXTERNDEF C MeasurePoint:PROC > -Pei2LoaderSwitchStack PROC C PUBLIC > - xor eax, eax > - jmp FspSwitchStack > -Pei2LoaderSwitchStack ENDP > - > -;------------------------------------------------------------------------------ > -; UINT32 > -; EFIAPI > -; Loader2PeiSwitchStack ( > -; VOID > -; ) > -;------------------------------------------------------------------------------ > -Loader2PeiSwitchStack PROC C PUBLIC > - jmp FspSwitchStack > -Loader2PeiSwitchStack ENDP > - > -;------------------------------------------------------------------------------ > -; UINT32 > -; EFIAPI > -; FspSwitchStack ( > -; VOID > -; ) > -;------------------------------------------------------------------------------ > -EXTERNDEF C SwapStack:PROC > -FspSwitchStack PROC C PUBLIC > - ; Save current contexts > - push eax > - pushfd > - cli > - pushad > - sub esp, 8 > - sidt fword ptr [esp] > - > - ; Load new stack > - push esp > - call SwapStack > - mov esp, eax > - > - ; Restore previous contexts > - lidt fword ptr [esp] > - add esp, 8 > - popad > - popfd > - add esp, 4 > - ret > -FspSwitchStack ENDP > - > - END > diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s > b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s > deleted file mode 100644 > index a21a5b6..0000000 > --- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s > +++ /dev/null > @@ -1,78 +0,0 @@ > -#------------------------------------------------------------------------------ > -# > -# Copyright (c) 2014 - 2015, 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. > -# > -# Abstract: > -# > -# Switch the stack from temporary memory to permenent memory. > -# > -#------------------------------------------------------------------------------ > - > - > -#------------------------------------------------------------------------------ > -# UINT32 > -# EFIAPI > -# Pei2LoaderSwitchStack ( > -# VOID > -# ) > -#------------------------------------------------------------------------------ > -ASM_GLOBAL ASM_PFX(Pei2LoaderSwitchStack) > -ASM_PFX(Pei2LoaderSwitchStack): > - xorl %eax, %eax > - jmp ASM_PFX(FspSwitchStack) > - > -#------------------------------------------------------------------------------ > -# UINT32 > -# EFIAPI > -# Loader2PeiSwitchStack ( > -# VOID > -# ) > -#------------------------------------------------------------------------------ > -ASM_GLOBAL ASM_PFX(Loader2PeiSwitchStack) > -ASM_PFX(Loader2PeiSwitchStack): > - jmp ASM_PFX(FspSwitchStack) > - > -#------------------------------------------------------------------------------ > -# UINT32 > -# EFIAPI > -# FspSwitchStack ( > -# VOID > -# ) > -#------------------------------------------------------------------------------ > -ASM_GLOBAL ASM_PFX(FspSwitchStack) > -ASM_PFX(FspSwitchStack): > - # > - #Save current contexts > - # > - push %eax > - pushf > - cli > - pusha > - sub $0x08, %esp > - sidt (%esp) > - > - # > - # Load new stack > - # > - push %esp > - call ASM_PFX(SwapStack) > - movl %eax, %esp > - > - # > - # Restore previous contexts > - # > - lidt (%esp) > - add $0x08,%esp > - popa > - popf > - add $0x04,%esp > - ret > - > - > -- > 1.9.5.msysgit.0
_______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
