Series Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
> Sent: Thursday, April 6, 2023 3:23 PM
> To: devel@edk2.groups.io; Gao, Liming <gaolim...@byosoft.com.cn>; Kinney,
> Michael D <michael.d.kin...@intel.com>; Jiang, Guomin
> <guomin.ji...@intel.com>; Xu, Wei6 <wei6...@intel.com>; Dong, Guo
> <guo.d...@intel.com>; Ni, Ray <ray...@intel.com>; Rhodes, Sean
> <sean@starlabs.systems>; Lu, James <james...@intel.com>; Guo, Gua
> <gua....@intel.com>; Andrew Fish <af...@apple.com>; Wu, Hao A
> <hao.a...@intel.com>; Maciej Rabeda <maciej.rab...@linux.intel.com>; Siyuan
> Fu <siyuan...@intel.com>; Yao, Jiewen
> <jiewen....@intel.com>; Wang, Jian J <jian.j.w...@intel.com>; Lu, Xiaoyu1
> <xiaoyu1...@intel.com>; Ard Biesheuvel
> <ardb+tianoc...@kernel.org>; Sami Mujawar <sami.muja...@arm.com>; Supreeth
> Venkatesh <supreeth.venkat...@arm.com>; Michael
> Kubacki <mikub...@linux.microsoft.com>; Desimone, Nathaniel L
> <nathaniel.l.desim...@intel.com>; Sean Brogan
> <sean.bro...@microsoft.com>
> Cc: Rebecca Cran <rebe...@bsdio.com>; Leif Lindholm
> <quic_llind...@quicinc.com>; Abner Chang <abner.ch...@amd.com>; Nickle Wang
> <nick...@nvidia.com>; Igor Kulchytskyy <ig...@ami.com>; Daniel Schaefer
> <g...@danielschaefer.me>; Xu, Min M <min.m...@intel.com>;
> Justen, Jordan L <jordan.l.jus...@intel.com>; Gerd Hoffmann
> <kra...@redhat.com>; Peter Grehan <gre...@freebsd.org>; Aktas, Erdem
> <erdemak...@google.com>; James Bottomley <j...@linux.ibm.com>; Tom Lendacky
> <thomas.lenda...@amd.com>; Michael Roth
> <michael.r...@amd.com>; Sunil V L <suni...@ventanamicro.com>; Warkentin,
> Andrei <andrei.warken...@intel.com>
> Subject: [edk2-devel] [PATCH 01/18] ArmPkg: 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
> ArmPkg.
>
> Visual Studio versions before VS 2015 don't support __func__ and so
> will fail to compile. A workaround is to define __func__ as
> __FUNCTION__ :
>
> #define __func__ __FUNCTION__
>
> Signed-off-by: Rebecca Cran <rebe...@bsdio.com>
> ---
> ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c
> | 4 +--
> ArmPkg/Drivers/CpuDxe/MemoryAttribute.c
> | 10 +++---
> ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> | 4 +--
> ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
> | 2 +-
> ArmPkg/Library/LinuxBootBootManagerLib/LinuxBootBm.c
> | 2 +-
> ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> | 32 ++++++++++----------
> ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> | 2 +-
> ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> | 2 +-
>
> ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> | 2 +-
>
> ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> | 2 +-
>
> ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> | 2 +-
>
> ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> | 2 +-
> ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> | 2 +-
> 13 files changed, 34 insertions(+), 34 deletions(-)
>
> diff --git a/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c
> b/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c
> index cd12fcda27e9..d560c42fc9f3 100644
> --- a/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c
> +++ b/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c
> @@ -137,7 +137,7 @@ CpuArchEventProtocolNotify (
> DEBUG ((
> DEBUG_ERROR,
> "%a: Cpu->RegisterInterruptHandler() - %r\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> return;
> @@ -153,7 +153,7 @@ CpuArchEventProtocolNotify (
> DEBUG ((
> DEBUG_ERROR,
> "%a: Cpu->RegisterInterruptHandler() - %r\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> }
> diff --git a/ArmPkg/Drivers/CpuDxe/MemoryAttribute.c
> b/ArmPkg/Drivers/CpuDxe/MemoryAttribute.c
> index cbc8261a68b7..61ba8fbbae4e 100644
> --- a/ArmPkg/Drivers/CpuDxe/MemoryAttribute.c
> +++ b/ArmPkg/Drivers/CpuDxe/MemoryAttribute.c
> @@ -92,7 +92,7 @@ GetMemoryAttributes (
> DEBUG ((
> DEBUG_VERBOSE,
> "%a: BaseAddress == 0x%lx, Length == 0x%lx\n",
> - __FUNCTION__,
> + __func__,
> BaseAddress,
> Length
> ));
> @@ -113,7 +113,7 @@ GetMemoryAttributes (
> DEBUG ((
> DEBUG_VERBOSE,
> "%a: RegionAddress == 0x%lx, RegionLength == 0x%lx, RegionAttributes
> == 0x%lx\n",
> - __FUNCTION__,
> + __func__,
> (UINT64)RegionAddress,
> (UINT64)RegionLength,
> (UINT64)RegionAttributes
> @@ -130,7 +130,7 @@ GetMemoryAttributes (
> DEBUG ((
> DEBUG_VERBOSE,
> "%a: Union == %lx, Intersection == %lx\n",
> - __FUNCTION__,
> + __func__,
> (UINT64)Union,
> (UINT64)Intersection
> ));
> @@ -188,7 +188,7 @@ SetMemoryAttributes (
> DEBUG ((
> DEBUG_INFO,
> "%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
> - __FUNCTION__,
> + __func__,
> (UINTN)BaseAddress,
> (UINTN)Length,
> (UINTN)Attributes
> @@ -272,7 +272,7 @@ ClearMemoryAttributes (
> DEBUG ((
> DEBUG_INFO,
> "%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
> - __FUNCTION__,
> + __func__,
> (UINTN)BaseAddress,
> (UINTN)Length,
> (UINTN)Attributes
> diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> index 7acfd2e89a92..7ed758fbbc69 100644
> --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
> @@ -139,7 +139,7 @@ ReplaceTableEntry (
> (((RegionStart ^ (UINTN)Entry) & ~BlockMask) == 0))
> {
> DisableMmu = TRUE;
> - DEBUG ((DEBUG_WARN, "%a: splitting block entry with MMU disabled\n",
> __FUNCTION__));
> + DEBUG ((DEBUG_WARN, "%a: splitting block entry with MMU disabled\n",
> __func__));
> }
>
> mReplaceLiveEntryFunc (Entry, Value, RegionStart, DisableMmu);
> @@ -233,7 +233,7 @@ UpdateRegionMappingRecursive (
> DEBUG ((
> DEBUG_VERBOSE,
> "%a(%d): %llx - %llx set %lx clr %lx\n",
> - __FUNCTION__,
> + __func__,
> Level,
> RegionStart,
> RegionEnd,
> diff --git a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
> b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
> index 7bcd34849507..02b0c27e4df3 100644
> --- a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
> +++ b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
> @@ -65,7 +65,7 @@ LibResetSystem (
> ArmCallSmc (&ArmSmcArgs);
>
> // We should never be here
> - DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__));
> + DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __func__));
> CpuDeadLoop ();
> return EFI_UNSUPPORTED;
> }
> diff --git a/ArmPkg/Library/LinuxBootBootManagerLib/LinuxBootBm.c
> b/ArmPkg/Library/LinuxBootBootManagerLib/LinuxBootBm.c
> index 5a44af5a755d..75998eabb1c6 100644
> --- a/ArmPkg/Library/LinuxBootBootManagerLib/LinuxBootBm.c
> +++ b/ArmPkg/Library/LinuxBootBootManagerLib/LinuxBootBm.c
> @@ -151,7 +151,7 @@ PlatformBootManagerAfterConsole (
> LOAD_OPTION_ACTIVE
> );
> } else {
> - DEBUG ((DEBUG_ERROR, "%a: PcdLinuxBootFileGuid was not set!\n",
> __FUNCTION__));
> + DEBUG ((DEBUG_ERROR, "%a: PcdLinuxBootFileGuid was not set!\n",
> __func__));
> }
> }
>
> diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> index 2fb1a4aa4fb8..08998ffe4d17 100644
> --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> @@ -195,7 +195,7 @@ FilterAndProcess (
> DEBUG ((
> DEBUG_VERBOSE,
> "%a: %g: %r\n",
> - __FUNCTION__,
> + __func__,
> ProtocolGuid,
> Status
> ));
> @@ -266,7 +266,7 @@ IsPciDisplay (
> &Pci
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
> + DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __func__, ReportText, Status));
> return FALSE;
> }
>
> @@ -330,7 +330,7 @@ Connect (
> DEBUG ((
> EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
> "%a: %s: %r\n",
> - __FUNCTION__,
> + __func__,
> ReportText,
> Status
> ));
> @@ -356,7 +356,7 @@ AddOutput (
> DEBUG ((
> DEBUG_ERROR,
> "%a: %s: handle %p: device path not found\n",
> - __FUNCTION__,
> + __func__,
> ReportText,
> Handle
> ));
> @@ -368,7 +368,7 @@ AddOutput (
> DEBUG ((
> DEBUG_ERROR,
> "%a: %s: adding to ConOut: %r\n",
> - __FUNCTION__,
> + __func__,
> ReportText,
> Status
> ));
> @@ -380,7 +380,7 @@ AddOutput (
> DEBUG ((
> DEBUG_ERROR,
> "%a: %s: adding to ErrOut: %r\n",
> - __FUNCTION__,
> + __func__,
> ReportText,
> Status
> ));
> @@ -390,7 +390,7 @@ AddOutput (
> DEBUG ((
> DEBUG_VERBOSE,
> "%a: %s: added to ConOut and ErrOut\n",
> - __FUNCTION__,
> + __func__,
> ReportText
> ));
> }
> @@ -547,7 +547,7 @@ GetPlatformOptions (
> DEBUG ((
> DEBUG_ERROR,
> "%a: failed to register \"%s\": %r\n",
> - __FUNCTION__,
> + __func__,
> BootOptions[Index].Description,
> Status
> ));
> @@ -575,7 +575,7 @@ GetPlatformOptions (
> DEBUG ((
> DEBUG_ERROR,
> "%a: failed to register hotkey for \"%s\": %r\n",
> - __FUNCTION__,
> + __func__,
> BootOptions[Index].Description,
> Status
> ));
> @@ -757,7 +757,7 @@ HandleCapsules (
> BOOLEAN NeedReset;
> EFI_STATUS Status;
>
> - DEBUG ((DEBUG_INFO, "%a: processing capsules ...\n", __FUNCTION__));
> + DEBUG ((DEBUG_INFO, "%a: processing capsules ...\n", __func__));
>
> Status = gBS->LocateProtocol (
> &gEsrtManagementProtocolGuid,
> @@ -785,7 +785,7 @@ HandleCapsules (
> DEBUG ((
> DEBUG_ERROR,
> "%a: failed to process capsule %p - %r\n",
> - __FUNCTION__,
> + __func__,
> CapsuleHeader,
> Status
> ));
> @@ -800,7 +800,7 @@ HandleCapsules (
> DEBUG ((
> DEBUG_WARN,
> "%a: capsule update successful, resetting ...\n",
> - __FUNCTION__
> + __func__
> ));
>
> gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
> @@ -868,7 +868,7 @@ BootDiscoveryPolicyHandler (
> DEBUG ((
> DEBUG_INFO,
> "%a - Unexpected DiscoveryPolicy (0x%x). Run Minimal Discovery
> Policy\n",
> - __FUNCTION__,
> + __func__,
> DiscoveryPolicy
> ));
> return EFI_SUCCESS;
> @@ -884,14 +884,14 @@ BootDiscoveryPolicyHandler (
> DEBUG_INFO,
> "%a - Failed to locate gEfiBootManagerPolicyProtocolGuid."
> "Driver connect will be skipped.\n",
> - __FUNCTION__
> + __func__
> ));
> return Status;
> }
>
> Status = BMPolicy->ConnectDeviceClass (BMPolicy, Class);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n", __func__,
> Status));
> return Status;
> }
>
> @@ -1096,7 +1096,7 @@ PlatformBootManagerUnableToBoot (
> DEBUG ((
> DEBUG_WARN,
> "%a: rebooting after refreshing all boot options\n",
> - __FUNCTION__
> + __func__
> ));
> gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
> }
> diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> index 3b12e26abf6e..905058850056 100644
> --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> @@ -741,7 +741,7 @@ AddSmbiosProcessorTypeTable (
> DEBUG ((
> DEBUG_ERROR,
> "[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n",
> - __FUNCTION__,
> + __func__,
> DEBUG_LINE_NUMBER,
> Status
> ));
> diff --git
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> index c9f25b750254..38f3864b160e 100644
> --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> @@ -287,7 +287,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) {
> DEBUG ((
> DEBUG_ERROR,
> "[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n",
> - __FUNCTION__,
> + __func__,
> DEBUG_LINE_NUMBER,
> Status
> ));
> diff --git
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> index 22fb5eccaa63..8867de4815a2 100644
> ---
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> +++
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> @@ -184,7 +184,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscSystemManufacturer) {
> DEBUG ((
> DEBUG_ERROR,
> "[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n",
> - __FUNCTION__,
> + __func__,
> DEBUG_LINE_NUMBER,
> Status
> ));
> diff --git
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> index 3441e7798860..feb42e6f5dee 100644
> ---
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> +++
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> @@ -214,7 +214,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBaseBoardManufacturer) {
> DEBUG ((
> DEBUG_ERROR,
> "[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n",
> - __FUNCTION__,
> + __func__,
> DEBUG_LINE_NUMBER,
> Status
> ));
> diff --git
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> index d161970c023e..6b3b63b0e8d5 100644
> ---
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> +++
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> @@ -179,7 +179,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscChassisManufacturer) {
> DEBUG ((
> DEBUG_ERROR,
> "[%a]:[%dL] Smbios Type03 Table Log Failed! %r \n",
> - __FUNCTION__,
> + __func__,
> DEBUG_LINE_NUMBER,
> Status
> ));
> diff --git
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> index 386b8800e29b..951ac2a905b6 100644
> ---
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> +++
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> @@ -161,7 +161,7 @@ SMBIOS_MISC_TABLE_FUNCTION
> (MiscNumberOfInstallableLanguages) {
> DEBUG ((
> DEBUG_ERROR,
> "[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n",
> - __FUNCTION__,
> + __func__,
> DEBUG_LINE_NUMBER,
> Status
> ));
> diff --git
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> index fdf6262aa7f5..fa1ea95f2bc3 100644
> ---
> a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> +++
> b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> @@ -69,7 +69,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBootInformation) {
> DEBUG ((
> DEBUG_ERROR,
> "[%a]:[%dL] Smbios Type32 Table Log Failed! %r \n",
> - __FUNCTION__,
> + __func__,
> DEBUG_LINE_NUMBER,
> Status
> ));
> --
> 2.34.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102715): https://edk2.groups.io/g/devel/message/102715
Mute This Topic: https://groups.io/mt/98115219/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe:
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
