1. Removed AsmSwitchStackAndBackingStore from BaseLib.h

2. Modified SwitchStack definition update to MWG 0.60e.
3. Added BaseLib/Ipf/InternalSwitchStack.c and removed BaseLib/Ipf/Non-existing.c
4. Updated any references of AsmSwitchStackAndBackingStore to SwichStack on IPF.

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

1 files changed, 19 insertions, 13 deletions

diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 98d832dfd6..6b8d7af4b6 100644
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -1,7 +1,7 @@
 /** @file

   Switch Stack functions.

 

-  Copyright (c) 2006, Intel Corporation<BR>

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

   All rights reserved. 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

@@ -19,14 +19,17 @@
 /**

   Transfers control to a function starting with a new stack.

 

-  Transfers control to the function specified by EntryPoint using the new stack

-  specified by NewStack and passing in the parameters specified by Context1 and

-  Context2. Context1 and Context2 are optional and may be NULL. The function

-  EntryPoint must never return.

+  Transfers control to the function specified by EntryPoint using the

+  new stack specified by NewStack and passing in the parameters specified

+  by Context1 and Context2.  Context1 and Context2 are optional and may

+  be NULL.  The function EntryPoint must never return.  This function

+  supports a variable number of arguments following the NewStack parameter.

+  These additional arguments are ignored on IA-32, x64, and EBC.

+  IPF CPUs expect one additional parameter of type VOID * that specifies

+  the new backing store pointer.

 

   If EntryPoint is NULL, then ASSERT().

   If NewStack is NULL, then ASSERT().

-  For IPF CPUs, if NewStack is not aligned on a 16-byte boundary, then ASSERT().

 

   @param  EntryPoint  A pointer to function to call with the new stack.

   @param  Context1    A pointer to the context to pass into the EntryPoint

@@ -41,16 +44,19 @@ VOID
 EFIAPI

 SwitchStack (

   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,

-  IN      VOID                      *Context1,

-  IN      VOID                      *Context2,

-  IN      VOID                      *NewStack

+  IN      VOID                      *Context1,  OPTIONAL

+  IN      VOID                      *Context2,  OPTIONAL

+  IN      VOID                      *NewStack,

+  ...

   )

 {

+  VA_LIST    Marker;

+

   ASSERT (EntryPoint != NULL && NewStack != NULL);

 

-#ifdef MDE_CPU_IPF

-  ASSERT (((UINTN)NewStack & 0xf) == 0);

-#endif

+  VA_START (Marker, NewStack);

+

+  InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);

 

-  InternalSwitchStack (EntryPoint, Context1, Context2, NewStack);

+  VA_END (Marker);

 }