summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiming Gao <liming.gao@intel.com>2016-07-08 22:49:22 +0800
committerLiming Gao <liming.gao@intel.com>2016-07-11 13:53:54 +0800
commit01dbab7048ef01554ec1fb4bdf55ae823cf97214 (patch)
treef45403f0296475076a76f38bdc69274b44aae92f
parent119748ee58c44a084cfa0e919689d7651abdf01f (diff)
downloadedk2-01dbab7048ef01554ec1fb4bdf55ae823cf97214.tar.gz
edk2-01dbab7048ef01554ec1fb4bdf55ae823cf97214.tar.bz2
edk2-01dbab7048ef01554ec1fb4bdf55ae823cf97214.zip
IntelFsp2Pkg BaseFspSwitchStackLib: Remove MASM/GAS files
Keep NASM file only for new added modules. Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Giri Mudusuru <giri.p.mudusuru@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
-rw-r--r--IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf2
-rw-r--r--IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm77
-rw-r--r--IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s78
3 files changed, 0 insertions, 157 deletions
diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf
index cef8d68f8f..b3c673a0ac 100644
--- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf
+++ b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf
@@ -24,8 +24,6 @@
FspSwitchStackLib.c
[Sources.IA32]
- Ia32/Stack.asm
- Ia32/Stack.s
Ia32/Stack.nasm
[Packages]
diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm
deleted file mode 100644
index 1efab52059..0000000000
--- 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 a21a5b6c61..0000000000
--- 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
-
-