diff options
| author | Yao, Jiewen <Jiewen.Yao@intel.com> | 2015-05-04 01:46:32 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-05-04 01:46:32 +0000 |
| commit | 5ac1b13f771f4103828324bb67fe402f1922f3d2 (patch) | |
| tree | 50b0a94e753be39df915865ecb945ed587c47c8d | |
| parent | 41d2b57161663e45f95ece379db1a867334231bd (diff) | |
| download | edk2-5ac1b13f771f4103828324bb67fe402f1922f3d2.tar.gz | |
Fix FSP GCC error on FspApiCallingCheck().
Add comment for ASM.
(Sync patch r17281 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <Jiewen.Yao@intel.com>
Reviewed-by: "Mudusuru, Giri P" <giri.p.mudusuru@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2014.SP1@17283 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm | 4 | ||||
| -rw-r--r-- | IntelFspPkg/FspSecCore/Ia32/FspApiEntry.s | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm b/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm index a01b3c2d49..a0c9b1ed73 100644 --- a/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm +++ b/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm @@ -489,8 +489,8 @@ FspApiCommon PROC C PUBLIC ; Verify the calling condition
;
pushad
- push [esp + 4 * 8 + 4]
- push eax
+ push [esp + 4 * 8 + 4] ; push ApiParam
+ push eax ; push ApiIdx
call FspApiCallingCheck
add esp, 8
cmp eax, 0
diff --git a/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.s b/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.s index e7b82d5e93..8f4093ca19 100644 --- a/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.s +++ b/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.s @@ -703,9 +703,10 @@ FspApiCommonL0: # Verify the calling condition
#
pushal
- pushl %eax
+ pushl 36(%esp) #push ApiParam [esp + 4 * 8 + 4]
+ pushl %eax #push ApiIdx
call ASM_PFX(FspApiCallingCheck)
- addl $0x04, %esp
+ addl $0x08, %esp
cmpl $0x00, %eax
jz FspApiCommonL1
movl %eax, 0x1C(%esp) # mov dword ptr [esp + 4 * 7], eax
|