tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg: Update code to be more C11 compliant by using __func__ 

__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among
others support, while __func__ was standardized in C99.

Since it's more standard, replace __FUNCTION__ with __func__ throughout
UefiCpuPkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
This commit is contained in:
Rebecca Cran 2023-04-06 13:49:10 -06:00 committed by mergify[bot]
parent 1639b6bf07
commit 089013a697
13 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UefiCpuPkg/CpuDxe/CpuDxe.c
View File

@ -1078,7 +1078,7 @@ IntersectMemoryDescriptor (
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE, EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
"%a: %a: add [%Lx, %Lx): %r\n", "%a: %a: add [%Lx, %Lx): %r\n",
gEfiCallerBaseName, gEfiCallerBaseName,
__FUNCTION__, __func__,
IntersectionBase, IntersectionBase,
IntersectionEnd, IntersectionEnd,
Status Status
@ -1091,7 +1091,7 @@ IntersectMemoryDescriptor (
"%a: %a: desc [%Lx, %Lx) type %u cap %Lx conflicts " "%a: %a: desc [%Lx, %Lx) type %u cap %Lx conflicts "
"with aperture [%Lx, %Lx) cap %Lx\n", "with aperture [%Lx, %Lx) cap %Lx\n",
gEfiCallerBaseName, gEfiCallerBaseName,
__FUNCTION__, __func__,
Descriptor->BaseAddress, Descriptor->BaseAddress,
Descriptor->BaseAddress + Descriptor->Length, Descriptor->BaseAddress + Descriptor->Length,
(UINT32)Descriptor->GcdMemoryType, (UINT32)Descriptor->GcdMemoryType,
@ -1132,7 +1132,7 @@ AddMemoryMappedIoSpace (
DEBUG_ERROR, DEBUG_ERROR,
"%a: %a: GetMemorySpaceMap(): %r\n", "%a: %a: GetMemorySpaceMap(): %r\n",
gEfiCallerBaseName, gEfiCallerBaseName,
__FUNCTION__, __func__,
Status Status
)); ));
return Status; return Status;
@ -1215,7 +1215,7 @@ AddLocalApicMemorySpace (
DEBUG_INFO, DEBUG_INFO,
"%a: %a: AllocateMemorySpace() Status - %r\n", "%a: %a: AllocateMemorySpace() Status - %r\n",
gEfiCallerBaseName, gEfiCallerBaseName,
__FUNCTION__, __func__,
Status Status
)); ));
} }

6
UefiCpuPkg/CpuDxeRiscV64/CpuDxe.c
View File

@ -296,7 +296,7 @@ CpuSetMemoryAttributes (
IN UINT64 Attributes IN UINT64 Attributes
) )
{ {
DEBUG ((DEBUG_INFO, "%a: Set memory attributes not supported yet\n", __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a: Set memory attributes not supported yet\n", __func__));
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -328,10 +328,10 @@ InitializeCpu (
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
DEBUG ((DEBUG_INFO, " %a: Firmware Context is at 0x%x.\n", __FUNCTION__, FirmwareContext)); DEBUG ((DEBUG_INFO, " %a: Firmware Context is at 0x%x.\n", __func__, FirmwareContext));
mBootHartId = FirmwareContext->BootHartId; mBootHartId = FirmwareContext->BootHartId;
DEBUG ((DEBUG_INFO, " %a: mBootHartId = 0x%x.\n", __FUNCTION__, mBootHartId)); DEBUG ((DEBUG_INFO, " %a: mBootHartId = 0x%x.\n", __func__, mBootHartId));
InitializeCpuExceptionHandlers (NULL); InitializeCpuExceptionHandlers (NULL);

2
UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c
View File

@ -127,7 +127,7 @@ CpuS3DataOnEndOfDxe (
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
DEBUG ((DEBUG_VERBOSE, "%a\n", __FUNCTION__)); DEBUG ((DEBUG_VERBOSE, "%a\n", __func__));
MtrrGetAllMtrrs (&AcpiCpuDataEx->MtrrTable); MtrrGetAllMtrrs (&AcpiCpuDataEx->MtrrTable);
// //

2
UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/CpuExceptionHandlerLib.c
View File

@ -230,7 +230,7 @@ RegisterCpuInterruptHandler (
IN EFI_CPU_INTERRUPT_HANDLER InterruptHandler IN EFI_CPU_INTERRUPT_HANDLER InterruptHandler
) )
{ {
DEBUG ((DEBUG_INFO, "%a: Type:%x Handler: %x\n", __FUNCTION__, ExceptionType, InterruptHandler)); DEBUG ((DEBUG_INFO, "%a: Type:%x Handler: %x\n", __func__, ExceptionType, InterruptHandler));
if (EXCEPT_RISCV_IS_IRQ (ExceptionType)) { if (EXCEPT_RISCV_IS_IRQ (ExceptionType)) {
if (EXCEPT_RISCV_IRQ_INDEX (ExceptionType) > EXCEPT_RISCV_MAX_IRQS) { if (EXCEPT_RISCV_IRQ_INDEX (ExceptionType) > EXCEPT_RISCV_MAX_IRQS) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;

2
UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandlerTestCommon.c
View File

@ -292,7 +292,7 @@ GetBspStackBase (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a: Bsp StackBase = 0x%016lx StackSize = 0x%016lx\n", "%a: Bsp StackBase = 0x%016lx StackSize = 0x%016lx\n",
__FUNCTION__, __func__,
MemoryHob->AllocDescriptor.MemoryBaseAddress, MemoryHob->AllocDescriptor.MemoryBaseAddress,
MemoryHob->AllocDescriptor.MemoryLength MemoryHob->AllocDescriptor.MemoryLength
)); ));

2
UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
View File

@ -463,7 +463,7 @@ MpInitChangeApLoopCallback (
); );
} }
DEBUG ((DEBUG_INFO, "%a() done!\n", __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a() done!\n", __func__));
} }
/** /**

8
UefiCpuPkg/Library/MpInitLib/Microcode.c
View File

@ -170,7 +170,7 @@ ShadowMicrocodePatchWorker (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a: Required microcode patches have been loaded at 0x%lx, with size 0x%lx.\n", "%a: Required microcode patches have been loaded at 0x%lx, with size 0x%lx.\n",
__FUNCTION__, __func__,
CpuMpData->MicrocodePatchAddress, CpuMpData->MicrocodePatchAddress,
CpuMpData->MicrocodePatchRegionSize CpuMpData->MicrocodePatchRegionSize
)); ));
@ -305,7 +305,7 @@ ShadowMicrocodePatchByPcd (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a: 0x%x microcode patches will be loaded into memory, with size 0x%x.\n", "%a: 0x%x microcode patches will be loaded into memory, with size 0x%x.\n",
__FUNCTION__, __func__,
PatchCount, PatchCount,
TotalLoadSize TotalLoadSize
)); ));
@ -365,7 +365,7 @@ GetMicrocodePatchInfoFromHob (
GuidHob = GetFirstGuidHob (&gEdkiiMicrocodePatchHobGuid); GuidHob = GetFirstGuidHob (&gEdkiiMicrocodePatchHobGuid);
if (GuidHob == NULL) { if (GuidHob == NULL) {
DEBUG ((DEBUG_INFO, "%a: Microcode patch cache HOB is not found.\n", __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a: Microcode patch cache HOB is not found.\n", __func__));
return FALSE; return FALSE;
} }
@ -377,7 +377,7 @@ GetMicrocodePatchInfoFromHob (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a: MicrocodeBase = 0x%lx, MicrocodeSize = 0x%lx\n", "%a: MicrocodeBase = 0x%lx, MicrocodeSize = 0x%lx\n",
__FUNCTION__, __func__,
*Address, *Address,
*RegionSize *RegionSize
)); ));

2
UefiCpuPkg/Library/MpInitLib/MpLib.c
View File

@ -1537,7 +1537,7 @@ TimedWaitForApFinish (
DEBUG (( DEBUG ((
DEBUG_VERBOSE, DEBUG_VERBOSE,
"%a: reached FinishedApLimit=%u in %Lu microseconds\n", "%a: reached FinishedApLimit=%u in %Lu microseconds\n",
__FUNCTION__, __func__,
FinishedApLimit, FinishedApLimit,
DivU64x64Remainder ( DivU64x64Remainder (
MultU64x32 (CpuMpData->TotalTime, 1000000), MultU64x32 (CpuMpData->TotalTime, 1000000),

2
UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
View File

@ -758,7 +758,7 @@ PlatformShadowMicrocode (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a: Required microcode patches have been loaded at 0x%lx, with size 0x%lx.\n", "%a: Required microcode patches have been loaded at 0x%lx, with size 0x%lx.\n",
__FUNCTION__, __func__,
CpuMpData->MicrocodePatchAddress, CpuMpData->MicrocodePatchAddress,
CpuMpData->MicrocodePatchRegionSize CpuMpData->MicrocodePatchRegionSize
)); ));

2
UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
View File

@ -932,7 +932,7 @@ InitSmmS3ResumeState (
DEBUG (( DEBUG ((
DEBUG_ERROR, DEBUG_ERROR,
"ERROR:%a(): HOB(gEfiAcpiVariableGuid=%g) needed by S3 resume doesn't exist!\n", "ERROR:%a(): HOB(gEfiAcpiVariableGuid=%g) needed by S3 resume doesn't exist!\n",
__FUNCTION__, __func__,
&gEfiAcpiVariableGuid &gEfiAcpiVariableGuid
)); ));
CpuDeadLoop (); CpuDeadLoop ();

10
UefiCpuPkg/SecCore/SecMain.c
View File

@ -170,7 +170,7 @@ SecStartup (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a() TempRAM Base: 0x%x, TempRAM Size: 0x%x, BootFirmwareVolume 0x%x\n", "%a() TempRAM Base: 0x%x, TempRAM Size: 0x%x, BootFirmwareVolume 0x%x\n",
__FUNCTION__, __func__,
TempRamBase, TempRamBase,
SizeOfRam, SizeOfRam,
BootFirmwareVolume BootFirmwareVolume
@ -242,7 +242,7 @@ SecStartup (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a() BFV Base: 0x%x, BFV Size: 0x%x, TempRAM Base: 0x%x, TempRAM Size: 0x%x, PeiTempRamBase: 0x%x, PeiTempRamSize: 0x%x, StackBase: 0x%x, StackSize: 0x%x\n", "%a() BFV Base: 0x%x, BFV Size: 0x%x, TempRAM Base: 0x%x, TempRAM Size: 0x%x, PeiTempRamBase: 0x%x, PeiTempRamSize: 0x%x, StackBase: 0x%x, StackSize: 0x%x\n",
__FUNCTION__, __func__,
SecCoreData.BootFirmwareVolumeBase, SecCoreData.BootFirmwareVolumeBase,
SecCoreData.BootFirmwareVolumeSize, SecCoreData.BootFirmwareVolumeSize,
SecCoreData.TemporaryRamBase, SecCoreData.TemporaryRamBase,
@ -345,7 +345,7 @@ SecStartupPhase2 (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a() PeiCoreEntryPoint: 0x%x\n", "%a() PeiCoreEntryPoint: 0x%x\n",
__FUNCTION__, __func__,
PeiCoreEntryPoint PeiCoreEntryPoint
)); ));
@ -394,7 +394,7 @@ SecStartupPhase2 (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a() PeiTemporaryRamBase: 0x%x, PeiTemporaryRamSize: 0x%x\n", "%a() PeiTemporaryRamBase: 0x%x, PeiTemporaryRamSize: 0x%x\n",
__FUNCTION__, __func__,
SecCoreData->PeiTemporaryRamBase, SecCoreData->PeiTemporaryRamBase,
SecCoreData->PeiTemporaryRamSize SecCoreData->PeiTemporaryRamSize
)); ));
@ -408,7 +408,7 @@ SecStartupPhase2 (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a() Stack Base: 0x%p, Stack Size: 0x%x\n", "%a() Stack Base: 0x%p, Stack Size: 0x%x\n",
__FUNCTION__, __func__,
SecCoreData->StackBase, SecCoreData->StackBase,
(UINT32)SecCoreData->StackSize (UINT32)SecCoreData->StackSize
)); ));

16
UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTestCommom.c
View File

@ -45,7 +45,7 @@ InitUTContext (
Status = MpServicesUnitTestWhoAmI (LocalContext->MpServices, &BspNumber); Status = MpServicesUnitTestWhoAmI (LocalContext->MpServices, &BspNumber);
UT_ASSERT_NOT_EFI_ERROR (Status); UT_ASSERT_NOT_EFI_ERROR (Status);
DEBUG ((DEBUG_INFO, "%a: BspNumber = 0x%x\n", __FUNCTION__, BspNumber)); DEBUG ((DEBUG_INFO, "%a: BspNumber = 0x%x\n", __func__, BspNumber));
Status = MpServicesUnitTestGetNumberOfProcessors ( Status = MpServicesUnitTestGetNumberOfProcessors (
LocalContext->MpServices, LocalContext->MpServices,
@ -56,7 +56,7 @@ InitUTContext (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a: NumberOfProcessors = 0x%x, NumberOfEnabledProcessors = 0x%x\n", "%a: NumberOfProcessors = 0x%x, NumberOfEnabledProcessors = 0x%x\n",
__FUNCTION__, __func__,
NumberOfProcessors, NumberOfProcessors,
NumberOfEnabledProcessors NumberOfEnabledProcessors
)); ));
@ -89,7 +89,7 @@ InitUTContext (
LocalContext->DisabledApNumber[IndexOfDisabledAPs] = ProcessorNumber; LocalContext->DisabledApNumber[IndexOfDisabledAPs] = ProcessorNumber;
IndexOfDisabledAPs++; IndexOfDisabledAPs++;
DEBUG ((DEBUG_INFO, "%a: AP(0x%x) is disabled and temporarily enable it.\n", __FUNCTION__, ProcessorNumber)); DEBUG ((DEBUG_INFO, "%a: AP(0x%x) is disabled and temporarily enable it.\n", __func__, ProcessorNumber));
Status = MpServicesUnitTestEnableDisableAP ( Status = MpServicesUnitTestEnableDisableAP (
LocalContext->MpServices, LocalContext->MpServices,
ProcessorNumber, ProcessorNumber,
@ -134,7 +134,7 @@ CheckUTContext (
if (BspNumber != LocalContext->BspNumber) { if (BspNumber != LocalContext->BspNumber) {
LocalContext->BspNumber = BspNumber; LocalContext->BspNumber = BspNumber;
DEBUG ((DEBUG_INFO, "%a: New BspNumber = 0x%x\n", __FUNCTION__, BspNumber)); DEBUG ((DEBUG_INFO, "%a: New BspNumber = 0x%x\n", __func__, BspNumber));
} }
ASSERT (BspNumber == LocalContext->BspNumber); ASSERT (BspNumber == LocalContext->BspNumber);
@ -148,11 +148,11 @@ CheckUTContext (
if (NumberOfProcessors != LocalContext->NumberOfProcessors) { if (NumberOfProcessors != LocalContext->NumberOfProcessors) {
LocalContext->NumberOfProcessors = NumberOfProcessors; LocalContext->NumberOfProcessors = NumberOfProcessors;
DEBUG ((DEBUG_INFO, "%a: New NumberOfProcessors = 0x%x\n", __FUNCTION__, NumberOfProcessors)); DEBUG ((DEBUG_INFO, "%a: New NumberOfProcessors = 0x%x\n", __func__, NumberOfProcessors));
} }
if (NumberOfEnabledProcessors != LocalContext->NumberOfProcessors) { if (NumberOfEnabledProcessors != LocalContext->NumberOfProcessors) {
DEBUG ((DEBUG_INFO, "%a: New NumberOfEnabledProcessors = 0x%x\n", __FUNCTION__, NumberOfEnabledProcessors)); DEBUG ((DEBUG_INFO, "%a: New NumberOfEnabledProcessors = 0x%x\n", __func__, NumberOfEnabledProcessors));
for (ProcessorNumber = 0; ProcessorNumber < LocalContext->NumberOfProcessors; ProcessorNumber++) { for (ProcessorNumber = 0; ProcessorNumber < LocalContext->NumberOfProcessors; ProcessorNumber++) {
Status = MpServicesUnitTestGetProcessorInfo ( Status = MpServicesUnitTestGetProcessorInfo (
@ -163,7 +163,7 @@ CheckUTContext (
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
if (!(ProcessorInfoBuffer.StatusFlag & PROCESSOR_ENABLED_BIT)) { if (!(ProcessorInfoBuffer.StatusFlag & PROCESSOR_ENABLED_BIT)) {
DEBUG ((DEBUG_INFO, "%a: AP(0x%x) is disabled unexpectedly and reenable it.\n", __FUNCTION__, ProcessorNumber)); DEBUG ((DEBUG_INFO, "%a: AP(0x%x) is disabled unexpectedly and reenable it.\n", __func__, ProcessorNumber));
Status = MpServicesUnitTestEnableDisableAP ( Status = MpServicesUnitTestEnableDisableAP (
LocalContext->MpServices, LocalContext->MpServices,
ProcessorNumber, ProcessorNumber,
@ -204,7 +204,7 @@ FreeUTContext (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a: Disable AP(0x%x) to restore its state.\n", "%a: Disable AP(0x%x) to restore its state.\n",
__FUNCTION__, __func__,
LocalContext->DisabledApNumber[IndexOfDisabledAPs] LocalContext->DisabledApNumber[IndexOfDisabledAPs]
)); ));

2
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
View File

@ -509,7 +509,7 @@ S3ResumeBootOs (
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"%a() Stack Base: 0x%x, Stack Size: 0x%x\n", "%a() Stack Base: 0x%x, Stack Size: 0x%x\n",
__FUNCTION__, __func__,
TempStackTop, TempStackTop,
sizeof (TempStack) sizeof (TempStack)
)); ));