1. Removed AsmSwitchStackAndBackingStore from BaseLib.h

[mirror_edk2.git] / MdePkg / Library / BaseLib / Ia32 / InternalSwitchStack.c

diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
index ab8116b4b5a882236fc2eff75b0a663eff0e33e3..c918f9f5718338ce72185525a707fad3f16e3a00 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
@@ -1,7 +1,7 @@
 /** @file\r
   SwitchStack() function for IA-32.\r
 \r
 /** @file\r
   SwitchStack() function for IA-32.\r
 \r

-  Copyright (c) 2006, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r

   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,10 +17,16 @@
 /**\r
   Transfers control to a function starting with a new stack.\r
 \r
 /**\r
   Transfers control to a function starting with a new stack.\r
 \r

-  Transfers control to the function specified by EntryPoint using the new stack\r
-  specified by NewStack and passing in the parameters specified by Context1 and\r
-  Context2. Context1 and Context2 are optional and may be NULL. The function\r
-  EntryPoint must never return.\r
+  Transfers control to the function specified by EntryPoint using the\r
+  new stack specified by NewStack and passing in the parameters specified\r
+  by Context1 and Context2.  Context1 and Context2 are optional and may\r
+  be NULL.  The function EntryPoint must never return.\r
+  Marker will be ignored on IA-32, x64, and EBC.\r
+  IPF CPUs expect one additional parameter of type VOID * that specifies\r
+  the new backing store pointer.\r
+\r
+  If EntryPoint is NULL, then ASSERT().\r
+  If NewStack is NULL, then ASSERT().\r

 \r
   @param  EntryPoint  A pointer to function to call with the new stack.\r
   @param  Context1    A pointer to the context to pass into the EntryPoint\r
 \r
   @param  EntryPoint  A pointer to function to call with the new stack.\r
   @param  Context1    A pointer to the context to pass into the EntryPoint\r


@@ -29,19 +35,26 @@
                       function.\r
   @param  NewStack    A pointer to the new stack to use for the EntryPoint\r
                       function.\r
                       function.\r
   @param  NewStack    A pointer to the new stack to use for the EntryPoint\r
                       function.\r

+  @param  Marker      VA_LIST marker for the variable argument list.\r

 \r
 **/\r
 VOID\r
 EFIAPI\r
 InternalSwitchStack (\r
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,\r
 \r
 **/\r
 VOID\r
 EFIAPI\r
 InternalSwitchStack (\r
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,\r

-  IN      VOID                      *Context1,\r
-  IN      VOID                      *Context2,\r
-  IN      VOID                      *NewStack\r
+  IN      VOID                      *Context1,   OPTIONAL\r
+  IN      VOID                      *Context2,   OPTIONAL\r
+  IN      VOID                      *NewStack,\r
+  IN      VA_LIST                   Marker\r

   )\r
 {\r
   BASE_LIBRARY_JUMP_BUFFER  JumpBuffer;\r
 \r
   )\r
 {\r
   BASE_LIBRARY_JUMP_BUFFER  JumpBuffer;\r
 \r

+  //\r
+  // Stack should be aligned with CPU_STACK_ALIGNMENT\r
+  //\r
+  ASSERT (((UINTN)NewStack & (CPU_STACK_ALIGNMENT - 1)) == 0);\r
+\r

   JumpBuffer.Eip = (UINTN)EntryPoint;\r
   JumpBuffer.Esp = (UINTN)NewStack - sizeof (VOID*);\r
   JumpBuffer.Esp -= sizeof (Context1) + sizeof (Context2);\r
   JumpBuffer.Eip = (UINTN)EntryPoint;\r
   JumpBuffer.Esp = (UINTN)NewStack - sizeof (VOID*);\r
   JumpBuffer.Esp -= sizeof (Context1) + sizeof (Context2);\r