Cryptlib: Define the va functions for EFIAPI

It turned out that my previous crash fix(*) was wrong.
We actually always used the gcc built-in va functions instead of
the "real" va functions for EFIAPI, and we are just lucky that
ERR_add_error_data didn't crash before.

This commit copies the va functions from MdePkg/Include/Base.h
in edk2 and introdues NO_BUILTIN_VA_FUNCS for x86_64, so that all
the x86_64 build will adopt the new va functions. For safety,
I also added EFIAPI to all the functions which use va_* to avoid
the potential trouble.

(*) a7f4b26cc35204165bd04e75c34e8e7aa2a87ecc

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>

1 files changed, 75 insertions, 0 deletions

diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h
index e5e1adc0..004c3e8e 100644
--- a/Cryptlib/Include/OpenSslSupport.h
+++ b/Cryptlib/Include/OpenSslSupport.h
@@ -47,6 +47,9 @@ typedef VOID  *FILE;
 #define va_arg    VA_ARG

 #define va_start  VA_START

 #define va_end    VA_END

+

+# if !defined(NO_BUILTIN_VA_FUNCS)

+

 typedef __builtin_va_list VA_LIST;

 

 #define VA_START(Marker, Parameter)  __builtin_va_start (Marker, Parameter)

@@ -57,6 +60,78 @@ typedef __builtin_va_list VA_LIST;
 

 #define VA_COPY(Dest, Start)         __builtin_va_copy (Dest, Start)

 

+# else

+

+#define _INT_SIZE_OF(n) ((sizeof (n) + sizeof (UINTN) - 1) &~(sizeof (UINTN) - 1))

+///

+/// Variable used to traverse the list of arguments. This type can vary by

+/// implementation and could be an array or structure.

+///

+typedef CHAR8 *VA_LIST;

+

+/**

+  Retrieves a pointer to the beginning of a variable argument list, based on

+  the name of the parameter that immediately precedes the variable argument list.

+

+  This function initializes Marker to point to the beginning of the variable

+  argument list that immediately follows Parameter.  The method for computing the

+  pointer to the next argument in the argument list is CPU-specific following the

+  EFIAPI ABI.

+

+  @param   Marker       The VA_LIST used to traverse the list of arguments.

+  @param   Parameter    The name of the parameter that immediately precedes

+                        the variable argument list.

+

+  @return  A pointer to the beginning of a variable argument list.

+

+**/

+#define VA_START(Marker, Parameter) (Marker = (VA_LIST) ((UINTN) & (Parameter) + _INT_SIZE_OF (Parameter)))

+

+/**

+  Returns an argument of a specified type from a variable argument list and updates

+  the pointer to the variable argument list to point to the next argument.

+

+  This function returns an argument of the type specified by TYPE from the beginning

+  of the variable argument list specified by Marker.  Marker is then updated to point

+  to the next argument in the variable argument list.  The method for computing the

+  pointer to the next argument in the argument list is CPU-specific following the EFIAPI ABI.

+

+  @param   Marker   VA_LIST used to traverse the list of arguments.

+  @param   TYPE     The type of argument to retrieve from the beginning

+                    of the variable argument list.

+

+  @return  An argument of the type specified by TYPE.

+

+**/

+#define VA_ARG(Marker, TYPE)   (*(TYPE *) ((Marker += _INT_SIZE_OF (TYPE)) - _INT_SIZE_OF (TYPE)))

+

+/**

+  Terminates the use of a variable argument list.

+

+  This function initializes Marker so it can no longer be used with VA_ARG().

+  After this macro is used, the only way to access the variable argument list is

+  by using VA_START() again.

+

+  @param   Marker   VA_LIST used to traverse the list of arguments.

+

+**/

+#define VA_END(Marker)      (Marker = (VA_LIST) 0)

+

+/**

+  Initializes a VA_LIST as a copy of an existing VA_LIST.

+

+  This macro initializes Dest as a copy of Start, as if the VA_START macro had been applied to Dest

+  followed by the same sequence of uses of the VA_ARG macro as had previously been used to reach

+  the present state of Start.

+

+  @param   Dest   VA_LIST used to traverse the list of arguments.

+  @param   Start  VA_LIST used to traverse the list of arguments.

+

+**/

+#define VA_COPY(Dest, Start)  ((void)((Dest) = (Start)))

+

+# endif

+

 #else // __CC_ARM

 #define va_start(Marker, Parameter)   __va_start(Marker, Parameter)

 #define va_arg(Marker, TYPE)          __va_arg(Marker, TYPE)