From d5fb1edfb16a2af29486ffbf5aa32a036da9caa4 Mon Sep 17 00:00:00 2001
From: "Yao, Jiewen" <jiewen.yao@intel.com>
Date: Wed, 11 Feb 2015 02:57:40 +0000
Subject: Update IntelFspPkg according to FSP1.1.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: "Rangarajan, Ravi P" <ravi.p.rangarajan@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16825 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/BaseFspSwitchStackLib/Ia32/Stack.s      | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'IntelFspPkg/Library/BaseFspSwitchStackLib')

diff --git a/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s b/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
index 6932cd8448..4773fe94c2 100644
--- a/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
+++ b/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+# 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
@@ -15,8 +15,6 @@
 #
 #------------------------------------------------------------------------------
 
-ASM_GLOBAL ASM_PFX(Pei2LoaderSwitchStack)
-ASM_GLOBAL ASM_PFX(Loader2PeiSwitchStack)
 
 #------------------------------------------------------------------------------
 # UINT32
@@ -37,27 +35,30 @@ ASM_PFX(Pei2LoaderSwitchStack):
 #------------------------------------------------------------------------------
 ASM_GLOBAL ASM_PFX(Loader2PeiSwitchStack)
 ASM_PFX(Loader2PeiSwitchStack):
-#Save current contexts
+    #
+    #Save current contexts
+    #
     push    $exit
     pushf
-    pushf
     cli
     pusha
-    push    $0x0
-    push    $0x0
+    sub     $0x08, %esp
     sidt    (%esp)
 
+    #
     # Load new stack
+    #
     push   %esp
     call   ASM_PFX(SwapStack)
-    mov    %eax,%esp
+    movl   %eax, %esp
 
+    #
     # Restore previous contexts
+    #
     lidt    (%esp)
-    add     $8,%esp
+    add     $0x08,%esp
     popa
     popf
-    popf
 exit:
     ret
 
-- 
cgit v1.2.3