From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.96.1680836978023923837 for ; Thu, 06 Apr 2023 20:09:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=J7bhDcpR; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680836977; x=1712372977; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=vgKY6lE7+kZvAQ9qOWF//GUNiVRz0BW47f+F4ESRBnE=; b=J7bhDcpRCecHMUnDdKaU+G31qWu3CFy0EndFknZRu/k15VI8Efx8F+E4 jPUJIiTN5UVAIPMxqpiQ5/vZAshWfGsLwJppuyNUVia+YBjUWdQMyi8Bp tUjUIqq9Bqin1nXFaqE3xgFk9AnRPmvVafYmJetRk8mw2fFcGQeWTwGjt h5/NiTw3uAOadh7fOE12x7HwGXr6vvwkchB6BKnOrQs8rspZbRJ4lJqnS FD3O0C01BrDCtgBRxC2qrQxKP7AYviOsneMvMQDOFefXWREU7r3qiQ8yp Ok9JOo4X+WrRxM5ZzYGWHaND39jg2ZUznJunwWstJOPbww3kVSWJpSTwH g==; X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="408042172" X-IronPort-AV: E=Sophos;i="5.98,324,1673942400"; d="scan'208";a="408042172" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2023 20:09:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="687391597" X-IronPort-AV: E=Sophos;i="5.98,324,1673942400"; d="scan'208";a="687391597" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga002.jf.intel.com with ESMTP; 06 Apr 2023 20:09:36 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 6 Apr 2023 20:09:36 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 6 Apr 2023 20:09:35 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Thu, 6 Apr 2023 20:09:35 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Thu, 6 Apr 2023 20:09:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BhKuLhK64//7XFlj08RH0Lqc9htScZ5oTIInly38ieWsKIQUSekB1INHgIW4X+wwOIZFTvZjDmcnbVGL2jRMzNGbIUb++d/I8LKrf8eL0Cl6cyOOiaTVT/RRXWIlpewpzeYYeEkt16soUjeit0XpSRVUCYrpfLOrLkKnjkIJoGoT2tkOStQMK3j/F+Jfo0Pw3Oqgex3aJ1uL5j5bSBsTIGCoPP3rsekAHNtT7qRpos4n7HnGtvFxAf+R4VJuyicShARaYBkn2c+vEGAsIgEuO4+YjoPgy/krmBk0sCS2QUmsYOcLFfNkrtvmSE3U8MsAlqx03PvdmPQ2yEgeV2iDAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pOGBJ1DX6UhBl9KGvvQcLxNVRoGifW8RYdKXgDxA0Eo=; b=EX94Y0HD2Si5Bky1M/FGaWZvG+VNO7fw345rtTPF9/K8wSOwdEYwWCQmCV4Zgxpm1mZxTSWmmLXSDQkUE3doHaMOQiqPQWE38/7pNP3afKYNr80PP/ae6B/l0wbZUrSR/GT88XHx1okcjth0WbY+Y7ISllGYjO91FFALQH5L6xoSGFuOeBDeCtNB60s+rEbmxPXrWhMiG3OHEY/m8KJKPI57bo+smhycgtOHC6rOpK6zUwP3pvJpnAlGhSkCy3N5MVlcVkdgKl2iY68bxotjf5ZaBSDnKz5IMlByIUWzAORQf0xGBij4iMDGy7i3IFd/jSewcO+K9urzQlBmCW6ICg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by CY8PR11MB7799.namprd11.prod.outlook.com (2603:10b6:930:78::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.30; Fri, 7 Apr 2023 03:09:30 +0000 Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::ae07:e96a:4a24:8a69]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::ae07:e96a:4a24:8a69%7]) with mapi id 15.20.6254.030; Fri, 7 Apr 2023 03:09:30 +0000 From: "Ni, Ray" To: Rebecca Cran , "devel@edk2.groups.io" , "Gao, Liming" , "Kinney, Michael D" , "Jiang, Guomin" , "Xu, Wei6" , "Dong, Guo" , "Rhodes, Sean" , "Lu, James" , "Guo, Gua" , Andrew Fish , "Wu, Hao A" , Maciej Rabeda , Siyuan Fu , "Yao, Jiewen" , "Wang, Jian J" , "Lu, Xiaoyu1" , Ard Biesheuvel , Sami Mujawar , Supreeth Venkatesh , Michael Kubacki , "Desimone, Nathaniel L" , Sean Brogan CC: Leif Lindholm , Abner Chang , Nickle Wang , Igor Kulchytskyy , Daniel Schaefer , "Xu, Min M" , "Justen, Jordan L" , "Gerd Hoffmann" , Peter Grehan , "Aktas, Erdem" , James Bottomley , "Tom Lendacky" , Michael Roth , Sunil V L , "Warkentin, Andrei" Subject: Re: [PATCH 03/18] UefiCpuPkg: Update code to be more C11 compliant by using __func__ Thread-Topic: [PATCH 03/18] UefiCpuPkg: Update code to be more C11 compliant by using __func__ Thread-Index: AQHZaNZ8+TODjg86vEeInFPtT0Adpa8fKwng Date: Fri, 7 Apr 2023 03:09:29 +0000 Message-ID: References: <20230406222319.2281263-1-rebecca@bsdio.com> <20230406222319.2281263-4-rebecca@bsdio.com> In-Reply-To: <20230406222319.2281263-4-rebecca@bsdio.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|CY8PR11MB7799:EE_ x-ms-office365-filtering-correlation-id: 941bb199-e013-48ba-ddaf-08db371580e5 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Q6b12NOqP+/s1wkJrU1xC57Mgee8sUc65MCrP/DFKa7cOXz+o534mrTpbS/ZfuHGclXlN64BXSS6I4Ee/HdShmA9TbWJ+l6Kg+WfIpl/8gOngUUmUo3qkHkTv86Ke0UpvFEH0+J9sLBVswXyJuK4rcZkaO4DWUfN6KJCOytUb9YMdcV6/rWrJgcq3bVnxsQdzn/sh0/HGJgQLPjVbYV3sJIIZnRpt3ehTIc0YfFa3D1oBaYY3eiDOpVjGcGRbdMn4FXR3W0F6GiXNsWD6btzplY217DVubbvYdjTFNSHVJ3ayT277vbdgHvyNDkWKyKg14mCaLr2urYNbTFUxAy9wLZhCDDj7YDY2MarfK0jLA9+JfrhJzsSLS1XgZM9VOqG/RC8Nz/7JCaa5yg0uCVjCr8bgj47rx7Ki2PJrA/zcN1q/K+PyKkJTMXGVc6Bw1aq68XbeO9KyCuD6UX7bVUcn9INGOp5faXTy11I16Lh2b7dgnRUAiiQyxdrl3c/Y/9e2Meg2BySQSKGhI0jwnCwqMVkQ6K2u7JdblLNTQFHMAMuYjWYLDvlGPOIBaVJBPL9LiM/kz9KgELjvKWdgWm66VYZ7GkU8bzoAP1FSr85WpUwms5ph8TQTVxB32g2jxKgW1wAe/E94XNdlg70gx4yAA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN6PR11MB8244.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(136003)(366004)(346002)(396003)(39860400002)(451199021)(83380400001)(30864003)(71200400001)(66476007)(66556008)(33656002)(7696005)(82960400001)(55016003)(7416002)(38100700002)(4326008)(66446008)(66946007)(76116006)(5660300002)(64756008)(8676002)(38070700005)(52536014)(19627235002)(122000001)(15650500001)(8936002)(41300700001)(2906002)(921005)(478600001)(54906003)(86362001)(26005)(110136005)(186003)(316002)(53546011)(6506007)(9686003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?UrRIJDravEP1L0Yj9g5k08Er+PqaMy2aiWcfcn7HqtpM046yLMg/zkx7X7C2?= =?us-ascii?Q?pfLuoqJyQ7HAoA5i4js7kyEA64scTuu4Fh+vCdiIDXrX0cOW7WF3/fO7LmFI?= =?us-ascii?Q?EzCgwEza3ozZ+62Tj90bOOM+8pt24L6ugEtHNTnTx9y0jUghTuPvjMLH5SBT?= =?us-ascii?Q?8dtbiCfCJAhmZNf2eFGfLmyJHrtWLFVUINwHTjD/5ftlSFzU/K32Rly6t3AP?= =?us-ascii?Q?XaT4oUzs9yRU6yAXcrmUGTXfGCOO8KUbhJLD+JSyxPcIy1AsXXErORvSKOBo?= =?us-ascii?Q?7976Qol2yBQV6X1o7TBLe3psFMy52/a8Uq/mvOcejrxRYEtXIskznbkh6JMC?= =?us-ascii?Q?1olnovOEQ0sb97t7c5zo+rvlgqWgNOHe2dxn4SU1wUo8XOGwsVg9A9dQsUVA?= =?us-ascii?Q?sV73ziyc9AGRW5g5i4edCozosg4UJS5951eUzvaEiTgrVBuIOPLK7HOmrmQ2?= =?us-ascii?Q?wEIbKOazTPDlH+sMZNpi3wWJiR3Ad0WI/3lOCzV1GDDwCzO23iY+jkjTEL28?= =?us-ascii?Q?2/R06RRb2hFzyQ/A9FpVStRMqDBtv7OmKdikCgLu2aVvZSjIxb58NfgcbtuI?= =?us-ascii?Q?f7/mHHhP7Pzno8gX6oMPAjMdpcjGrHRFjiIML1bhM/aleXPnONNEyuFelQv5?= =?us-ascii?Q?teaEWu0cqccy2WbXbTPYQ5S6UevvyKfLtp5xijgTWs+r0mDFxVm8o0jF07og?= =?us-ascii?Q?p+QLflFEEL4T4/CxEjbgADqDdSZ+9mq6CeeAjmgBe3ugGVOvizkEUb95LZj2?= =?us-ascii?Q?QjQiK+6PECCYizO9bpOwBKMI/8qs2Oz01e3Pbx/AL4WIFLo3gGRalt7DB0hW?= =?us-ascii?Q?+/mBf84tcse1USXjo8ifKhlTHyOyOM9Ctwty8ai4sSwZLMBoDMVvdcXgqr3k?= =?us-ascii?Q?50N9MKeduyOpxVMIuVqL4PobCoQATpcnbf9LLUzG2ngD3NLClMRzLjCc3Rrt?= =?us-ascii?Q?yAsBB0bBykfeX7Go04NuM7rSHRjQASXb8Z5OmQTRPWrpyHkhPR1XZyyRGL9d?= =?us-ascii?Q?HpptsttcgPVPJemnf23UGJKtqtBYI25cyOj+9bEbKxSRW6vnXPok0SzpZV+O?= =?us-ascii?Q?bLKXVSm45nBZOt0HEqxdgZUM1pqkyYpvVr5wQrk5gr/Izif72ZYCUSLyruhc?= =?us-ascii?Q?dLKJpVsOi9hLclTs2iBHHmL0YbUK9AjDwExSEr/0VbyyCdX0D+hdXNRHJqID?= =?us-ascii?Q?ASYGDxHNKPmNDY7FdcXHOxm97g6Bn3SRW3J9nNo3H67mY42du3loLhtKVc2Z?= =?us-ascii?Q?UawccSKAnXU5bS0IUDmUkHER7nawShqacDoYi3Pi8s+B/KRnIUCwk5sXVXS/?= =?us-ascii?Q?hXZaxY2AFcgEo8czFWdVME5i0vZ+bmdfrnaIyXJo7n6ztShQUcy/hCz4BGRr?= =?us-ascii?Q?QdImZ7Fovo4mcSy4eyHDIMq0DvX6i/dPrPy3Rtd1TxlApp3mQnQKsPx0RdMU?= =?us-ascii?Q?DfnQ7oxcAEY85kJsqL/xxKjGoOtJ3zhnuwpWF3zWs04vtA8pw0xhOtgPkZAQ?= =?us-ascii?Q?/aP6EVS21PCpk/ISccPFdJ3NQtINLitjIhd4JzYLYdstYeaMzvStPE2iEP6C?= =?us-ascii?Q?VoDyEW54rwNT/I67Wpk=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 941bb199-e013-48ba-ddaf-08db371580e5 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Apr 2023 03:09:29.9028 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: A+LV5pODMK6EPKFKRDLGGIYccVePwRWhe560szpB0tUI4r9j2LlTFxINltCZzxVAnvURX8nTHndbkbLhDaDJUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB7799 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Rebecca Cran > Sent: Friday, April 7, 2023 6:23 AM > To: devel@edk2.groups.io; Gao, Liming ; > Kinney, Michael D ; Jiang, Guomin > ; Xu, Wei6 ; Dong, Guo > ; Ni, Ray ; Rhodes, Sean > ; Lu, James ; Guo, Gua > ; Andrew Fish ; Wu, Hao A > ; Maciej Rabeda ; > Siyuan Fu ; Yao, Jiewen ; > Wang, Jian J ; Lu, Xiaoyu1 ; > Ard Biesheuvel ; Sami Mujawar > ; Supreeth Venkatesh > ; Michael Kubacki > ; Desimone, Nathaniel L > ; Sean Brogan > > Cc: Rebecca Cran ; Leif Lindholm > ; Abner Chang ; > Nickle Wang ; Igor Kulchytskyy ; > Daniel Schaefer ; Xu, Min M > ; Justen, Jordan L ; Gerd > Hoffmann ; Peter Grehan ; > Aktas, Erdem ; James Bottomley > ; Tom Lendacky ; > Michael Roth ; Sunil V L > ; Warkentin, Andrei > > Subject: [PATCH 03/18] UefiCpuPkg: Update code to be more C11 compliant > by using __func__ >=20 > __FUNCTION__ is a pre-standard extension that gcc and Visual C++ among > others support, while __func__ was standardized in C99. >=20 > Since it's more standard, replace __FUNCTION__ with __func__ throughout > UefiCpuPkg. >=20 > Visual Studio versions before VS 2015 don't support __func__ and so > will fail to compile. A workaround is to define __func__ as > __FUNCTION__ : >=20 > #define __func__ __FUNCTION__ >=20 > Signed-off-by: Rebecca Cran > --- > UefiCpuPkg/CpuDxe/CpuDxe.c = | 8 ++++---- > UefiCpuPkg/CpuDxeRiscV64/CpuDxe.c = | 6 +++--- > UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c = | 2 +- >=20 > UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/CpuExceptionHan > dlerLib.c | 2 +- >=20 > UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandler > TestCommon.c | 2 +- > UefiCpuPkg/Library/MpInitLib/DxeMpLib.c = | 2 +- > UefiCpuPkg/Library/MpInitLib/Microcode.c = | 8 ++++--- > - > UefiCpuPkg/Library/MpInitLib/MpLib.c = | 2 +- > UefiCpuPkg/Library/MpInitLib/PeiMpLib.c = | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c = | 2 +- > UefiCpuPkg/SecCore/SecMain.c = | 10 +++++----- >=20 > UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTest > Commom.c | 16 ++++++++-------- > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c = | 2 > +- > 13 files changed, 32 insertions(+), 32 deletions(-) >=20 > diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c > index 3febd59d99e0..804ef5d1fe8e 100644 > --- a/UefiCpuPkg/CpuDxe/CpuDxe.c > +++ b/UefiCpuPkg/CpuDxe/CpuDxe.c > @@ -1078,7 +1078,7 @@ IntersectMemoryDescriptor ( > EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE, > "%a: %a: add [%Lx, %Lx): %r\n", > gEfiCallerBaseName, > - __FUNCTION__, > + __func__, > IntersectionBase, > IntersectionEnd, > Status > @@ -1091,7 +1091,7 @@ IntersectMemoryDescriptor ( > "%a: %a: desc [%Lx, %Lx) type %u cap %Lx conflicts " > "with aperture [%Lx, %Lx) cap %Lx\n", > gEfiCallerBaseName, > - __FUNCTION__, > + __func__, > Descriptor->BaseAddress, > Descriptor->BaseAddress + Descriptor->Length, > (UINT32)Descriptor->GcdMemoryType, > @@ -1132,7 +1132,7 @@ AddMemoryMappedIoSpace ( > DEBUG_ERROR, > "%a: %a: GetMemorySpaceMap(): %r\n", > gEfiCallerBaseName, > - __FUNCTION__, > + __func__, > Status > )); > return Status; > @@ -1215,7 +1215,7 @@ AddLocalApicMemorySpace ( > DEBUG_INFO, > "%a: %a: AllocateMemorySpace() Status - %r\n", > gEfiCallerBaseName, > - __FUNCTION__, > + __func__, > Status > )); > } > diff --git a/UefiCpuPkg/CpuDxeRiscV64/CpuDxe.c > b/UefiCpuPkg/CpuDxeRiscV64/CpuDxe.c > index 7551e0653603..25fe3f54c325 100644 > --- a/UefiCpuPkg/CpuDxeRiscV64/CpuDxe.c > +++ b/UefiCpuPkg/CpuDxeRiscV64/CpuDxe.c > @@ -296,7 +296,7 @@ CpuSetMemoryAttributes ( > 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; > } >=20 > @@ -328,10 +328,10 @@ InitializeCpu ( > return EFI_NOT_FOUND; > } >=20 > - 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)); >=20 > mBootHartId =3D FirmwareContext->BootHartId; > - DEBUG ((DEBUG_INFO, " %a: mBootHartId =3D 0x%x.\n", __FUNCTION__, > mBootHartId)); > + DEBUG ((DEBUG_INFO, " %a: mBootHartId =3D 0x%x.\n", __func__, > mBootHartId)); >=20 > InitializeCpuExceptionHandlers (NULL); >=20 > diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c > b/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c > index 59a5d932eee2..86ce5303cab4 100644 > --- a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c > +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c > @@ -127,7 +127,7 @@ CpuS3DataOnEndOfDxe ( > ); > ASSERT_EFI_ERROR (Status); >=20 > - DEBUG ((DEBUG_VERBOSE, "%a\n", __FUNCTION__)); > + DEBUG ((DEBUG_VERBOSE, "%a\n", __func__)); > MtrrGetAllMtrrs (&AcpiCpuDataEx->MtrrTable); >=20 > // > diff --git > a/UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/CpuExceptionHa > ndlerLib.c > b/UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/CpuExceptionHa > ndlerLib.c > index bce089feb0da..73a9dd57658c 100644 > --- > a/UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/CpuExceptionHa > ndlerLib.c > +++ > b/UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/CpuExceptionHa > ndlerLib.c > @@ -230,7 +230,7 @@ RegisterCpuInterruptHandler ( > 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_IRQ_INDEX (ExceptionType) > > EXCEPT_RISCV_MAX_IRQS) { > return EFI_UNSUPPORTED; > diff --git > a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandl > erTestCommon.c > b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHand > lerTestCommon.c > index 17afb592d3c8..9ba70c5b7340 100644 > --- > a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandl > erTestCommon.c > +++ > b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHand > lerTestCommon.c > @@ -292,7 +292,7 @@ GetBspStackBase ( > DEBUG (( > DEBUG_INFO, > "%a: Bsp StackBase =3D 0x%016lx StackSize =3D 0x%016lx\n", > - __FUNCTION__, > + __func__, > MemoryHob->AllocDescriptor.MemoryBaseAddress, > MemoryHob->AllocDescriptor.MemoryLength > )); > diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c > b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c > index 330676b700d1..57ddb86600a7 100644 > --- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c > @@ -463,7 +463,7 @@ MpInitChangeApLoopCallback ( > ); > } >=20 > - DEBUG ((DEBUG_INFO, "%a() done!\n", __FUNCTION__)); > + DEBUG ((DEBUG_INFO, "%a() done!\n", __func__)); > } >=20 > /** > diff --git a/UefiCpuPkg/Library/MpInitLib/Microcode.c > b/UefiCpuPkg/Library/MpInitLib/Microcode.c > index f9f070fa8bf2..11720560afee 100644 > --- a/UefiCpuPkg/Library/MpInitLib/Microcode.c > +++ b/UefiCpuPkg/Library/MpInitLib/Microcode.c > @@ -170,7 +170,7 @@ ShadowMicrocodePatchWorker ( > DEBUG (( > DEBUG_INFO, > "%a: Required microcode patches have been loaded at 0x%lx, with size > 0x%lx.\n", > - __FUNCTION__, > + __func__, > CpuMpData->MicrocodePatchAddress, > CpuMpData->MicrocodePatchRegionSize > )); > @@ -305,7 +305,7 @@ ShadowMicrocodePatchByPcd ( > DEBUG (( > DEBUG_INFO, > "%a: 0x%x microcode patches will be loaded into memory, with size > 0x%x.\n", > - __FUNCTION__, > + __func__, > PatchCount, > TotalLoadSize > )); > @@ -365,7 +365,7 @@ GetMicrocodePatchInfoFromHob ( >=20 > GuidHob =3D GetFirstGuidHob (&gEdkiiMicrocodePatchHobGuid); > if (GuidHob =3D=3D 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; > } >=20 > @@ -377,7 +377,7 @@ GetMicrocodePatchInfoFromHob ( > DEBUG (( > DEBUG_INFO, > "%a: MicrocodeBase =3D 0x%lx, MicrocodeSize =3D 0x%lx\n", > - __FUNCTION__, > + __func__, > *Address, > *RegionSize > )); > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c > b/UefiCpuPkg/Library/MpInitLib/MpLib.c > index e5dc852ed95f..f1f284071441 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c > @@ -1537,7 +1537,7 @@ TimedWaitForApFinish ( > DEBUG (( > DEBUG_VERBOSE, > "%a: reached FinishedApLimit=3D%u in %Lu microseconds\n", > - __FUNCTION__, > + __func__, > FinishedApLimit, > DivU64x64Remainder ( > MultU64x32 (CpuMpData->TotalTime, 1000000), > diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c > b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c > index e732371ddd21..013f89b197d0 100644 > --- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c > @@ -758,7 +758,7 @@ PlatformShadowMicrocode ( > DEBUG (( > DEBUG_INFO, > "%a: Required microcode patches have been loaded at 0x%lx, with size > 0x%lx.\n", > - __FUNCTION__, > + __func__, > CpuMpData->MicrocodePatchAddress, > CpuMpData->MicrocodePatchRegionSize > )); > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > index 240eee6a7d2f..0f7ee0372dbd 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > @@ -932,7 +932,7 @@ InitSmmS3ResumeState ( > DEBUG (( > DEBUG_ERROR, > "ERROR:%a(): HOB(gEfiAcpiVariableGuid=3D%g) needed by S3 resume > doesn't exist!\n", > - __FUNCTION__, > + __func__, > &gEfiAcpiVariableGuid > )); > CpuDeadLoop (); > diff --git a/UefiCpuPkg/SecCore/SecMain.c > b/UefiCpuPkg/SecCore/SecMain.c > index fe03d8019a40..95375850ec76 100644 > --- a/UefiCpuPkg/SecCore/SecMain.c > +++ b/UefiCpuPkg/SecCore/SecMain.c > @@ -170,7 +170,7 @@ SecStartup ( > DEBUG (( > DEBUG_INFO, > "%a() TempRAM Base: 0x%x, TempRAM Size: 0x%x, BootFirmwareVolume > 0x%x\n", > - __FUNCTION__, > + __func__, > TempRamBase, > SizeOfRam, > BootFirmwareVolume > @@ -242,7 +242,7 @@ SecStartup ( > DEBUG (( > 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", > - __FUNCTION__, > + __func__, > SecCoreData.BootFirmwareVolumeBase, > SecCoreData.BootFirmwareVolumeSize, > SecCoreData.TemporaryRamBase, > @@ -345,7 +345,7 @@ SecStartupPhase2 ( > DEBUG (( > DEBUG_INFO, > "%a() PeiCoreEntryPoint: 0x%x\n", > - __FUNCTION__, > + __func__, > PeiCoreEntryPoint > )); >=20 > @@ -394,7 +394,7 @@ SecStartupPhase2 ( > DEBUG (( > DEBUG_INFO, > "%a() PeiTemporaryRamBase: 0x%x, PeiTemporaryRamSize: 0x%x\n", > - __FUNCTION__, > + __func__, > SecCoreData->PeiTemporaryRamBase, > SecCoreData->PeiTemporaryRamSize > )); > @@ -408,7 +408,7 @@ SecStartupPhase2 ( > DEBUG (( > DEBUG_INFO, > "%a() Stack Base: 0x%p, Stack Size: 0x%x\n", > - __FUNCTION__, > + __func__, > SecCoreData->StackBase, > (UINT32)SecCoreData->StackSize > )); > diff --git > a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTe > stCommom.c > b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitT > estCommom.c > index ff79c5e8d43b..7cd3f48d761f 100644 > --- > a/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitTe > stCommom.c > +++ > b/UefiCpuPkg/Test/UnitTest/EfiMpServicesPpiProtocol/EfiMpServicesUnitT > estCommom.c > @@ -45,7 +45,7 @@ InitUTContext ( >=20 > Status =3D MpServicesUnitTestWhoAmI (LocalContext->MpServices, > &BspNumber); > UT_ASSERT_NOT_EFI_ERROR (Status); > - DEBUG ((DEBUG_INFO, "%a: BspNumber =3D 0x%x\n", __FUNCTION__, > BspNumber)); > + DEBUG ((DEBUG_INFO, "%a: BspNumber =3D 0x%x\n", __func__, > BspNumber)); >=20 > Status =3D MpServicesUnitTestGetNumberOfProcessors ( > LocalContext->MpServices, > @@ -56,7 +56,7 @@ InitUTContext ( > DEBUG (( > DEBUG_INFO, > "%a: NumberOfProcessors =3D 0x%x, NumberOfEnabledProcessors =3D > 0x%x\n", > - __FUNCTION__, > + __func__, > NumberOfProcessors, > NumberOfEnabledProcessors > )); > @@ -89,7 +89,7 @@ InitUTContext ( > LocalContext->DisabledApNumber[IndexOfDisabledAPs] =3D > ProcessorNumber; > IndexOfDisabledAPs++; >=20 > - 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 =3D MpServicesUnitTestEnableDisableAP ( > LocalContext->MpServices, > ProcessorNumber, > @@ -134,7 +134,7 @@ CheckUTContext ( >=20 > if (BspNumber !=3D LocalContext->BspNumber) { > LocalContext->BspNumber =3D BspNumber; > - DEBUG ((DEBUG_INFO, "%a: New BspNumber =3D 0x%x\n", > __FUNCTION__, BspNumber)); > + DEBUG ((DEBUG_INFO, "%a: New BspNumber =3D 0x%x\n", __func__, > BspNumber)); > } >=20 > ASSERT (BspNumber =3D=3D LocalContext->BspNumber); > @@ -148,11 +148,11 @@ CheckUTContext ( >=20 > if (NumberOfProcessors !=3D LocalContext->NumberOfProcessors) { > LocalContext->NumberOfProcessors =3D NumberOfProcessors; > - DEBUG ((DEBUG_INFO, "%a: New NumberOfProcessors =3D 0x%x\n", > __FUNCTION__, NumberOfProcessors)); > + DEBUG ((DEBUG_INFO, "%a: New NumberOfProcessors =3D 0x%x\n", > __func__, NumberOfProcessors)); > } >=20 > if (NumberOfEnabledProcessors !=3D LocalContext->NumberOfProcessors) { > - DEBUG ((DEBUG_INFO, "%a: New NumberOfEnabledProcessors =3D > 0x%x\n", __FUNCTION__, NumberOfEnabledProcessors)); > + DEBUG ((DEBUG_INFO, "%a: New NumberOfEnabledProcessors =3D > 0x%x\n", __func__, NumberOfEnabledProcessors)); >=20 > for (ProcessorNumber =3D 0; ProcessorNumber < LocalContext- > >NumberOfProcessors; ProcessorNumber++) { > Status =3D MpServicesUnitTestGetProcessorInfo ( > @@ -163,7 +163,7 @@ CheckUTContext ( > ASSERT_EFI_ERROR (Status); >=20 > 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 =3D MpServicesUnitTestEnableDisableAP ( > LocalContext->MpServices, > ProcessorNumber, > @@ -204,7 +204,7 @@ FreeUTContext ( > DEBUG (( > DEBUG_INFO, > "%a: Disable AP(0x%x) to restore its state.\n", > - __FUNCTION__, > + __func__, > LocalContext->DisabledApNumber[IndexOfDisabledAPs] > )); >=20 > diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > index e82f179569e9..9ea5f6f4e5e5 100644 > --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c > @@ -509,7 +509,7 @@ S3ResumeBootOs ( > DEBUG (( > DEBUG_INFO, > "%a() Stack Base: 0x%x, Stack Size: 0x%x\n", > - __FUNCTION__, > + __func__, > TempStackTop, > sizeof (TempStack) > )); > -- > 2.34.1