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.

1) Update all implementations of ReportStatusCodeExtractDebugInfo() to use an argument of type BASE_LIST instead of VA_LIST.
2) Update the implementation of DebugPrint() in PeiDxeDebugLibReportStatusCode to convert a VA_LIST to a BASE_LIST before passing the data to report status code.
3) Update status code listeners to use the BASE_LIST based APIs in the PrintLib instead of the VA_LIST based APIs, since ReportStatusCodeExtractDebugInfo() was updated to return a parameter of type BASE_LIST.



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

1 files changed, 4 insertions, 4 deletions

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index f37748185..b4d677ef4 100644
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -244,14 +244,14 @@ EFIAPI
 ReportStatusCodeExtractDebugInfo (

   IN CONST EFI_STATUS_CODE_DATA  *Data,

   OUT UINT32                     *ErrorLevel,

-  OUT VA_LIST                    *Marker,

+  OUT BASE_LIST                  *Marker,

   OUT CHAR8                      **Format

   )

 {

   EFI_DEBUG_INFO  *DebugInfo;

 

-  ASSERT (Data       != NULL);

-  ASSERT (ErrorLevel != NULL);

+  ASSERT (Data          != NULL);

+  ASSERT (ErrorLevel    != NULL);

   ASSERT (Marker     != NULL);

   ASSERT (Format     != NULL);

 

@@ -273,7 +273,7 @@ ReportStatusCodeExtractDebugInfo (
   // The first 12 * UINTN bytes of the string are really an

   // argument stack to support varargs on the Format string.

   //

-  *Marker = (VA_LIST) (DebugInfo + 1);

+  *Marker = (BASE_LIST) (DebugInfo + 1);

   *Format = (CHAR8 *)(((UINT64 *)*Marker) + 12);

 

   return TRUE;