Fix bug that home addresses for register parameters must be allocated for calling...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9303 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/X64/X86LocalApicTimerInitialize.asm b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/X64/X86LocalApicTimerInitialize.asm
index c15b7208da2d0e9e853837cefb80b32a2f998a17..005b55b7e17f5dfdae5830e86b6dbef13f9ffb55 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/X64/X86LocalApicTimerInitialize.asm
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/X64/X86LocalApicTimerInitialize.asm
@@ -31,7 +31,9 @@ EXTERNDEF  InternalX86GetApicBase:PROC
 ;   );\r
 ;------------------------------------------------------------------------------\r
 CpuInitLocalApicTimer    PROC\r
+    sub rsp, 28h  ;Reserve home addresses and make RSP 16-byte aligned\r
     call InternalX86GetApicBase\r
+    add rsp, 28h\r
     mov dword ptr [rax + 3e0h], 0ah\r
     bts dword ptr [rax + 320h], 17\r
     mov dword ptr [rax + 380h], -1\r

diff --git a/OvmfPkg/Sec/X64/SecEntry.S b/OvmfPkg/Sec/X64/SecEntry.S
index 9855ea9d81acb81437523efd58e12b5f1ac29c5b..a1de5e674bb9fdd2f6bf2b1376be66bada3748d5 100644 (file)
--- a/OvmfPkg/Sec/X64/SecEntry.S
+++ b/OvmfPkg/Sec/X64/SecEntry.S
@@ -55,5 +55,6 @@ ASM_PFX(_ModuleEntryPoint):
     movq    %rsi, %rdx
     movq    %rdi, %r8
     movq    %rsp, %r9
+    subq    $0x20, %rsp
     call    ASM_PFX(SecCoreStartupWithStack)
 

diff --git a/OvmfPkg/Sec/X64/SecEntry.asm b/OvmfPkg/Sec/X64/SecEntry.asm
index 8b836de62e398e58a1a5c9e195d071f9fb2fe1a4..fb38548be385a2b0c74c61e0e600dfbef2cee090 100644 (file)
--- a/OvmfPkg/Sec/X64/SecEntry.asm
+++ b/OvmfPkg/Sec/X64/SecEntry.asm
@@ -54,6 +54,7 @@ _ModuleEntryPoint PROC PUBLIC
     mov     rdx, rsi\r
     mov     r8, rdi\r
     mov     r9, rsp\r
+    sub     rsp, 20h\r
     call    SecCoreStartupWithStack\r
 \r
 _ModuleEntryPoint ENDP\r