Remove private definition for IPF stack alignment, and use public definition called...

[mirror_edk2.git] / EdkModulePkg / Universal / Ebc / Dxe / Ipf / EbcSupport.c

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
index ea4308e263870cb07029909fc2043223d383a658..eceb59185bd9b9aaad522e58b6d75c2a04bb4091 100644 (file)
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
@@ -32,12 +32,6 @@ Abstract:
 //\r
 #define EBC_THUNK_ALIGNMENT 16\r
 \r
 //\r
 #define EBC_THUNK_ALIGNMENT 16\r
 \r

-//\r
-// Per the IA-64 Software Conventions and Runtime Architecture Guide,\r
-// section 3.3.4, IPF stack must always be 16-byte aligned.\r
-//\r
-#define IPF_STACK_ALIGNMENT 16\r
-\r

 //\r
 // Opcodes for IPF instructions. We'll need to hand-create thunk code (stuffing\r
 // bits) to insert a jump to the interpreter.\r
 //\r
 // Opcodes for IPF instructions. We'll need to hand-create thunk code (stuffing\r
 // bits) to insert a jump to the interpreter.\r


@@ -899,8 +893,8 @@ Returns:
   //\r
   FrameSize   = (UINTN) FramePtr - (UINTN) EbcSp + 64;\r
   Source      = (VOID *) EbcSp;\r
   //\r
   FrameSize   = (UINTN) FramePtr - (UINTN) EbcSp + 64;\r
   Source      = (VOID *) EbcSp;\r

-  Destination = (VOID *) ((UINT8 *) EbcSp - FrameSize - IPF_STACK_ALIGNMENT);\r
-  Destination = (VOID *) ((UINTN) ((UINTN) Destination + IPF_STACK_ALIGNMENT - 1) &~((UINTN) IPF_STACK_ALIGNMENT - 1));\r
+  Destination = (VOID *) ((UINT8 *) EbcSp - FrameSize - CPU_STACK_ALIGNMENT);\r
+  Destination = (VOID *) ((UINTN) ((UINTN) Destination + CPU_STACK_ALIGNMENT - 1) &~((UINTN) CPU_STACK_ALIGNMENT - 1));\r

   gBS->CopyMem (Destination, Source, FrameSize);\r
   EbcAsmLLCALLEX ((UINTN) CallAddr, (UINTN) Destination);\r
 }\r
   gBS->CopyMem (Destination, Source, FrameSize);\r
   EbcAsmLLCALLEX ((UINTN) CallAddr, (UINTN) Destination);\r
 }\r