diff options
author | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-05-30 23:45:50 +0000 |
---|---|---|
committer | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-05-30 23:45:50 +0000 |
commit | 2075236eefe532097caa04aa2606e2b7cda4e420 (patch) | |
tree | dc41df028a32c2b9133a1069b8e9c2e4db334aca /MdePkg/Include/Base.h | |
parent | 37e97c51dd30f457b161a7fed8ddd6db0f90fc35 (diff) | |
download | edk2-2075236eefe532097caa04aa2606e2b7cda4e420.zip edk2-2075236eefe532097caa04aa2606e2b7cda4e420.tar.gz edk2-2075236eefe532097caa04aa2606e2b7cda4e420.tar.bz2 |
This checkin addresses the compatibility issue of passing arguments of type VA_LIST between components. The type VA_LIST is mapped onto the compiler specific implementation of varargs. As a result, modules build with different compilers may not use the same VA_LIST structure. The solution to this issue is to define a new type called BASE_LIST that is a compiler independent method of passing varargs between modules.
Add BASE_LIST type to Base.h
Add BAS_ARG() macro to Base.h
Add 4 functions to PrintLib.h that use BASE_LIST.
Change ReportStatsuCodeExtractDebugInfo() from ReportStatusCodeLib.h to take a BASE_LIST argument instead of a VA_LIST argument
Add the 4 new functions to BasePrintLib implementation that use BASE_LIST
Update BaseReportStatusCodeLib implementation of ReportStatsuCodeExtractDebugInfo() to use a BASE_LIST argument instead of a VA_LIST argument
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8404 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Include/Base.h')
-rw-r--r-- | MdePkg/Include/Base.h | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 0e5ea19..4c806e1 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -333,6 +333,15 @@ struct _LIST_ENTRY { // }
//
+/**
+ Return the size of argument that has been aligned to sizeof (UINTN).
+
+ @param n The parameter size is to be aligned.
+
+ @return The aligned size
+**/
+#define _INT_SIZE_OF(n) ((sizeof (n) + sizeof (UINTN) - 1) &~(sizeof (UINTN) - 1))
+
#if defined(__GNUC__)
//
// Use GCC builtin macros for variable argument lists.
@@ -346,15 +355,6 @@ typedef __builtin_va_list VA_LIST; #define VA_END(Marker) __builtin_va_end (Marker)
#else
-/**
- Return the size of argument that has been aligned to sizeof (UINTN).
-
- @param n The parameter size is to be aligned.
-
- @return The aligned size
-**/
-#define _INT_SIZE_OF(n) ((sizeof (n) + sizeof (UINTN) - 1) &~(sizeof (UINTN) - 1))
-
///
/// Pointer to the start of a variable argument list. Same as CHAR8 *.
///
@@ -409,6 +409,29 @@ typedef CHAR8 *VA_LIST; #endif
+///
+/// Pointer to the start of a variable argument list stored in a memory buffer. Same as UINT8 *.
+///
+typedef UINTN *BASE_LIST;
+
+/**
+ 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 Pointer to the beginning of a variable argument list.
+ @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 BASE_ARG(Marker, TYPE) (*(TYPE *)((UINT8 *)(Marker = (BASE_LIST)((UINT8 *)Marker + _INT_SIZE_OF (TYPE))) - _INT_SIZE_OF (TYPE)))
+
/**
Macro that returns the byte offset of a field in a data structure.
|