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 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@8409 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2009-05-30 23:55:11 +00:00
parent 53d74081d0
commit 9c98c8e106
3 changed files with 12 additions and 12 deletions

View File

@ -61,7 +61,7 @@ OemHookStatusCodeInitialize (
// //
// Cache standard output handle. // Cache standard output handle.
// //
mStdOut = 1; mStdOut = 1;
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -111,7 +111,7 @@ OemHookStatusCodeReport (
UINT32 ErrorLevel; UINT32 ErrorLevel;
UINT32 LineNumber; UINT32 LineNumber;
UINTN CharCount; UINTN CharCount;
VA_LIST Marker; BASE_LIST Marker;
EFI_DEBUG_INFO *DebugInfo; EFI_DEBUG_INFO *DebugInfo;
Buffer[0] = '\0'; Buffer[0] = '\0';
@ -137,7 +137,7 @@ OemHookStatusCodeReport (
mStdOut, mStdOut,
Buffer, Buffer,
CharCount CharCount
); );
return EFI_SUCCESS; return EFI_SUCCESS;
@ -146,7 +146,7 @@ OemHookStatusCodeReport (
// //
// Print DEBUG() information into output buffer. // Print DEBUG() information into output buffer.
// //
CharCount = AsciiVSPrint ( CharCount = AsciiBSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, EFI_STATUS_CODE_DATA_MAX_SIZE,
Format, Format,
@ -159,10 +159,10 @@ OemHookStatusCodeReport (
// Print specific data into output buffer. // Print specific data into output buffer.
// //
DebugInfo = (EFI_DEBUG_INFO *) (Data + 1); DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
Marker = (VA_LIST) (DebugInfo + 1); Marker = (BASE_LIST) (DebugInfo + 1);
Format = (CHAR8 *) (((UINT64 *) Marker) + 12); Format = (CHAR8 *) (((UINT64 *) Marker) + 12);
CharCount = AsciiVSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker); CharCount = AsciiBSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) { } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
// //
// Print ERROR information into output buffer. // Print ERROR information into output buffer.

View File

@ -119,7 +119,7 @@ OemHookStatusCodeReport (
UINT32 ErrorLevel; UINT32 ErrorLevel;
UINT32 LineNumber; UINT32 LineNumber;
UINTN CharCount; UINTN CharCount;
VA_LIST Marker; BASE_LIST Marker;
EFI_DEBUG_INFO *DebugInfo; EFI_DEBUG_INFO *DebugInfo;
Buffer[0] = '\0'; Buffer[0] = '\0';
@ -154,7 +154,7 @@ OemHookStatusCodeReport (
// //
// Print DEBUG() information into output buffer. // Print DEBUG() information into output buffer.
// //
CharCount = AsciiVSPrint ( CharCount = AsciiBSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, EFI_STATUS_CODE_DATA_MAX_SIZE,
Format, Format,
@ -167,10 +167,10 @@ OemHookStatusCodeReport (
// Print specific data into output buffer. // Print specific data into output buffer.
// //
DebugInfo = (EFI_DEBUG_INFO *) (Data + 1); DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
Marker = (VA_LIST) (DebugInfo + 1); Marker = (BASE_LIST) (DebugInfo + 1);
Format = (CHAR8 *) (((UINT64 *) Marker) + 12); Format = (CHAR8 *) (((UINT64 *) Marker) + 12);
CharCount = AsciiVSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker); CharCount = AsciiBSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) { } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
// //
// Print ERROR information into output buffer. // Print ERROR information into output buffer.

View File

@ -448,7 +448,7 @@ Returns:
// TODO: Data - add argument and description to function comment // TODO: Data - add argument and description to function comment
{ {
CHAR8 *Format; CHAR8 *Format;
VA_LIST Marker; BASE_LIST Marker;
CHAR8 PrintBuffer[BYTES_PER_RECORD * 2]; CHAR8 PrintBuffer[BYTES_PER_RECORD * 2];
CHAR8 *Filename; CHAR8 *Filename;
CHAR8 *Description; CHAR8 *Description;
@ -467,7 +467,7 @@ Returns:
// //
// Process DEBUG () macro // Process DEBUG () macro
// //
AsciiVSPrint (PrintBuffer, BYTES_PER_RECORD, Format, Marker); AsciiBSPrint (PrintBuffer, BYTES_PER_RECORD, Format, Marker);
printf (PrintBuffer); printf (PrintBuffer);
} }