From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 375C9740035 for ; Thu, 21 Mar 2024 07:54:30 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=JNxczqxxx+OeZl3NSVoNfvVSR2BesUnMuMwv7gMBQMU=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1711007669; v=1; b=IwBOijiz0fkaq8rgtu3vuDpC7dd8Owu2ixoEGGWgvEgpBteGFnua57UwEuDkYRcpIcK+GkMW 6RZtBAhtwGjtzvVabRCVE/dIw8DSlFzCncXRWUPsxp7I4rqrHGt9QhP7Ie75c0bhiO1j+kAKsgl xCsKWyqC2fxqpaapfL90XohzL77lSMZpXLzs40ZfL1FGY8TO1eOegooKcVo5/bLsGj0uXSmZlHf ESgV70k6cNNgdmXrgdI5hzbC6McOhJjqncK58Kv86c3R8TAgNN/UGRVvpwUk3Bz8lzuAF2v7Vn9 2CcVJWrGrtfV2pdQVZC7tUDguthaAQJI/SnZH0p6aDbAw== X-Received: by 127.0.0.2 with SMTP id Z04OYY7687511xdK51CnjGrw; Thu, 21 Mar 2024 00:54:29 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by mx.groups.io with SMTP id smtpd.web11.2045.1711007668802025384 for ; Thu, 21 Mar 2024 00:54:28 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,11019"; a="16616059" X-IronPort-AV: E=Sophos;i="6.07,142,1708416000"; d="scan'208";a="16616059" X-Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2024 00:54:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,142,1708416000"; d="scan'208";a="51854074" X-Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa001.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 21 Mar 2024 00:54:29 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 21 Mar 2024 00:54:27 -0700 X-Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Thu, 21 Mar 2024 00:54:27 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 21 Mar 2024 00:54:27 -0700 X-Received: from DS7PR11MB7885.namprd11.prod.outlook.com (2603:10b6:8:d8::12) by DS0PR11MB6351.namprd11.prod.outlook.com (2603:10b6:8:cc::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.11; Thu, 21 Mar 2024 07:54:20 +0000 X-Received: from DS7PR11MB7885.namprd11.prod.outlook.com ([fe80::f7c2:e54e:fc22:34dd]) by DS7PR11MB7885.namprd11.prod.outlook.com ([fe80::f7c2:e54e:fc22:34dd%6]) with mapi id 15.20.7409.010; Thu, 21 Mar 2024 07:54:20 +0000 From: "Yuting Yang" To: "devel@edk2.groups.io" , gaoliming CC: "Chen, Christine" , "Zhang, Zifeng" , "Feng, Bob C" , "He, Haiyang" Subject: Re: [edk2-devel] [Patch V4] BaseTools: VfrCompiler Adds DefaultValueError Thread-Topic: [edk2-devel] [Patch V4] BaseTools: VfrCompiler Adds DefaultValueError Thread-Index: AQHae2IY4QyPjmJZW0+k+8Nkzl0EJbFB0izg Date: Thu, 21 Mar 2024 07:54:20 +0000 Message-ID: References: <17BEB716C0DD8A75.2828@groups.io> In-Reply-To: <17BEB716C0DD8A75.2828@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DS7PR11MB7885:EE_|DS0PR11MB6351:EE_ x-ms-office365-filtering-correlation-id: a3486f49-539c-40ca-01a9-08dc497c1e06 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: w19GL7uaODOGjZ+NuYSRC0tthP2lnLiOLovzZFCUy7FdJuCf5SanrCD89XUN9kDe9LkRLtfJwvgXxghin1NHlpXKJCxCDXZFaEyI8Nk/y5MzbnJnrjdNIaz6lH1J5eDvESfgJ2FmUHJ5lA9GQ86sW8XuYknExdfIWHCiJ4a2hzhUN5dCJuoo/44Et4rAtj4jZqxzEzfpneJ6WLYE6gyzTFcGwcYjccCmR3hF0P86PDRTcdYpX5KqnLOUZwoaCUUF02H9moFr+H1B3+LYscE1LpuhyaVaNwtI0v+4Rj99aNWOQ8si1Y4TirvC0pDJju6+ZLYxngCu8wt/l7CU8GkudUM4T7bSfk18gC02+Y1L33RTjsSHxWraFdJ7fjD/G0q4jIsCq6o6fJT4RpWSwTjROdvK5aFatLHZM+D1UGTR1FOagiECH2CXNMa22EqCO/xIyg9epReLKD+is2FPDtjf1sUrnXUsfJZz3BxrG4tFh5AAy/MMmy9uOX6ev+AKVVhzTcDA/uy5ohXiiqn11oFWNDlQduUtXKY93i7YgqLDHonFgL5fQwMoNI7XxoKMQMciv+h+6pv8b5pYa1Kh3fpa6RCdXVt2nC4Bo7rM6eo4DP9UU91P0tQDg33UYaF375rgzwMvKwVj2t8l3W3Qpn5FItCIULFqUggdauAP7flne0d5yueFkRPE7Tp+/CyTxwYG x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?S2XZPxF1h3FPZTZmcJ7GnpOqQZw8wipUYc8kdQUEKmAQO9IEU+sTEBLJo9Ma?= =?us-ascii?Q?EfaYiuYuznLrWn8aKRw42hwVHXai+cMwRIVQa6sDUgYmA0iNRib5WBEk3Cqg?= =?us-ascii?Q?nbtTQ9gw/eH828FL09qdz6/q30aYN9uHbo4yoYEAuw+eqckK8rM2fn6zz0+X?= =?us-ascii?Q?p7J8rEyqLFKWNquP/h0ZDraONN0+R8jSmfyv6w5Mnk2mMy+bziLZ3H9fnsPc?= =?us-ascii?Q?VfFDkxR3sAqxJbtP6/0igyK/yaSUccz8dVl0fHni40721QUALPzFjvhseQ6/?= =?us-ascii?Q?g42Rh9mz1RJoLmw8HNwP6/fDeQcelu6+jUAIOIPUIaLPWiXGi/v2TbdAXzLV?= =?us-ascii?Q?iKckTIguFwVv275XfJq4XdylMJrcQWmumzeXcHZ3DK4zQ+qGn/i54DRqHlof?= =?us-ascii?Q?UR7/CN7p4hWhI/PkBSECiglIOCx1BTr2hL/OIfRaUil5ytt41YlGaRmgR3j4?= =?us-ascii?Q?CC4W5vU7QPwIaMtc+bYoKfF2MURvbDWwi+8bq5xZ3dXz2vLYDjkin0Ui6ccS?= =?us-ascii?Q?zxV+ubR5b6Rbe9uX6360gdh/Udk9ebi/ABfjZ3umZMGvxUM0WXMjrGZ4lTgl?= =?us-ascii?Q?8xwDYpIpbdN03Mrkx12GC0tpinxWm06NvgLz5VUOBktY33h/ssf9fVrZR+n7?= =?us-ascii?Q?ef/729XnC8hQq5OnidaNxX1sYXUllKSSxjbaR2BjxAiDTAnqgfTghKRDjs/j?= =?us-ascii?Q?icjp0KcETa7vqoLnzJWMQYWP2WS8v15tPlOya8McmqETvdQndCie0TakLNRg?= =?us-ascii?Q?vWfAUqjZGoMYeherSZntjOyd8vhOz9HmDRBeeVxEAAa5+Hf/qmn6Ov+pWJ0V?= =?us-ascii?Q?XfNifGdSwB98Ae27CShM2it4efvwVjVee63T8gy0OGNbaIKVrFgJpHZu+zbQ?= =?us-ascii?Q?syOiD3Dwdfv/0OuSg7QqXP3ucAyckFL/Q4CmtU6l4D+CjL26VlHCzSJGHqgi?= =?us-ascii?Q?XjUgyxm4TJFBV8FVNT1lcb9ZLETHu1nwBIbmzQF4NzKOTpSlTI4yn5coqdjj?= =?us-ascii?Q?H3vn+rCaWVWKSf8Xvq/nTyucdtCbEi3kUj3x+zIdY6oeA1a+UAE2Mhr+zgIc?= =?us-ascii?Q?LTDgoJaPLLm0/mxuwARI1rxeixV97L75nxBh2WcjROPKwica7ZESw6iIMiQK?= =?us-ascii?Q?Tj5pICgmvoiNB9l4Wvr/j6HB5VGGOjidCNsBhYZMyti5AoB/li/DZhYmssvo?= =?us-ascii?Q?saKB7VmBpOZUewIh0F6HefMasJn3zVSzoHE6OJCoSsyPfDsUP9V1+b2M/EYH?= =?us-ascii?Q?m9GAFraxtJRItXXna9+h/MsCHZ3U8jAU2xJUY2gqtebX6wpSpLjddCNVA8el?= =?us-ascii?Q?rOHnyX8/DfNsgaoKNO9a+zVZE/0crKveweZhq6DoMwmtdFCW0vO/aGntBGu5?= =?us-ascii?Q?PMRby62wvCPhHpU164HJ5w5lqzzwGSb2zzMz6kpWtNMtHFWiaRbhTBkfML+s?= =?us-ascii?Q?+psZnr60klEG1n/P6mnvPzfv9nh3a1n59JA/js6nkqIkVf27UGAm5Dn7XXSG?= =?us-ascii?Q?LoWN2973G31Hz6TH38BSjzyctNmL4GcMUUE7p3gesW2VfrfzCxvH2X2NeBSl?= =?us-ascii?Q?qH9c9/s6ONs9uRe/eaXyGav5yZVI+fZgiCydYOw2?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DS7PR11MB7885.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3486f49-539c-40ca-01a9-08dc497c1e06 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2024 07:54:20.7677 (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: hwxb5Ft1h4lOtlWqFKwodeRHNEs0PIiLZfGbE7QCwB6wxCP6NyQYsUZ3d780fZpC+9nlOdgCmPjQFSSnOWC1xQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB6351 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 21 Mar 2024 00:54:28 -0700 Reply-To: devel@edk2.groups.io,yuting2.yang@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: lF5LByyrNdY7CCzu1QBWSeJ8x7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=IwBOijiz; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Hi liming, Gentle reminder, we have removed the whitespace. Please help review the pat= ch~ Thanks, Yuting=20 -----Original Message----- From: devel@edk2.groups.io On Behalf Of Yuting Yang Sent: Thursday, March 21, 2024 3:30 PM To: devel@edk2.groups.io Cc: Rebecca Cran ; Liming Gao = ; Feng, Bob C ; Chen, Christine ; Zhang, Zifeng Subject: [edk2-devel] [Patch V4] BaseTools: VfrCompiler Adds DefaultValueEr= ror Add --catch_default option Raise a DefaultValueError when encountering VFR default definitions to help= remove default variables. Signed-off-by: Yuting Yang Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Christine Chen Cc: Zifeng Zhang --- BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 8 ++++---- BaseTools/Source/C/VfrCompile/VfrCompiler.h | 1 + BaseTools/Source/C/VfrCompile/VfrError.cpp | 3 ++- BaseTools/Source/C/VfrCompile/VfrError.h | 3 ++- BaseTools/Source/C/VfrCompile/VfrFormPkg.h | 1 + BaseTools/Source/C/VfrCompile/VfrSyntax.g | 58 +++++++++++++++++++++++= +++++++++++++++++++++++++++-------- 6 files changed, 60 insertions(+), 14 deletions(-) diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Sour= ce/C/VfrCompile/VfrCompiler.cpp index 5f4d262d85..4031af6e39 100644 --- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp @@ -78,6 +78,7 @@ CVfrCompiler::OptionInitialization ( mOptions.WarningAsError =3D FALSE; mOptions.AutoDefault= =3D FALSE; mOptions.CheckDefault =3D = FALSE;+ mOptions.IsCatchDefaultEnable =3D FALSE; memset (&mOpti= ons.OverrideClassGuid, 0, sizeof (EFI_GUID)); if (Argc =3D=3D 1) {@@ -95= ,6 +96,8 @@ CVfrCompiler::OptionInitialization ( Version (); SET_RUN_STATUS (STATUS_DEAD); return;+ } = else if (stricmp(Argv[Index], "--catch_default") =3D=3D 0){+ mOptions.= IsCatchDefaultEnable =3D TRUE; } else if (stricmp(Argv[Index], "-l") = =3D=3D 0) { mOptions.CreateRecordListFile =3D TRUE; gCIfrRecord= InfoDB.TurnOn ();@@ -179,7 +182,6 @@ CVfrCompiler::OptionInitialization ( goto Fail; } strcpy (mOptions.VfrFileName, Argv[Index]);- = if (mOptions.OutputDirectory =3D=3D NULL) { mOptions.OutputDirector= y =3D (CHAR8 *) malloc (1); if (mOptions.OutputDirectory =3D=3D NULL)= {@@ -679,7 +681,7 @@ CVfrCompiler::Compile ( DebugError (NULL, 0, 0001, "Error opening the input file", "%s", InFil= eName); goto Fail; }-+ InputInfo.IsCatchDefaultEnable =3D mOptions.I= sCatchDefaultEnable; if (mOptions.HasOverrideClassGuid) { InputInfo.O= verrideClassGuid =3D &mOptions.OverrideClassGuid; } else {@@ -937,5 +939,= 3 @@ main ( return GetUtilityStatus (); }--diff --git a/BaseTools/Source/C/VfrCompi= le/VfrCompiler.h b/BaseTools/Source/C/VfrCompile/VfrCompiler.h index b6e207d2ce..974f37c4eb 100644 --- a/BaseTools/Source/C/VfrCompile/VfrCompiler.h +++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.h @@ -52,6 +52,7 @@ typedef struct { BOOLEAN WarningAsError; BOOLEAN AutoDefault; BOOLEAN CheckDefault;+ = BOOLEAN IsCatchDefaultEnable; } OPTIONS; typedef enum {diff --git a/BaseT= ools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrEr= ror.cpp index 65bb8e34fd..8a706f929b 100644 --- a/BaseTools/Source/C/VfrCompile/VfrError.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp @@ -49,7 +49,8 @@ static SVFR_WARNING_HANDLE VFR_WARNING_HANDLE_TABLE [] = =3D { { VFR_WARNING_DEFAULT_VALUE_REDEFINED, ": default value re-defined with = different value"}, { VFR_WARNING_ACTION_WITH_TEXT_TWO, ": Action opcode s= hould not have TextTwo part"}, { VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, = ": Not recommend to use obsoleted framework opcode"},- { VFR_WARNING_CODEU= NDEFINED, ": undefined Warning Code" }+ { VFR_WARNING_CODEUNDEFINED, ": un= defined Warning Code" },+ { VFR_WARNING_UNSUPPORTED, ": pls remove the def= ault values if necessary" } }; CVfrErrorHandle::CVfrErrorHandle (diff --gi= t a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompil= e/VfrError.h index 7d16bd5f74..1b4bc173d2 100644 --- a/BaseTools/Source/C/VfrCompile/VfrError.h +++ b/BaseTools/Source/C/VfrCompile/VfrError.h @@ -47,7 +47,8 @@ typedef enum { VFR_WARNING_DEFAULT_VALUE_REDEFINED =3D 0, VFR_WARNING_ACTION_WITH_TEX= T_TWO, VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,- VFR_WARNING_CODEUNDEFINE= D+ VFR_WARNING_CODEUNDEFINED,+ VFR_WARNING_UNSUPPORTED } EFI_VFR_WARNING_= CODE; typedef struct _SVFR_ERROR_HANDLE {diff --git a/BaseTools/Source/C/V= frCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h index 9ef6f07787..d8fada3bcb 100644 --- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h +++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h @@ -96,6 +96,7 @@ struct SBufferNode { typedef struct { EFI_GUID *OverrideClassGuid;+ BOOLEAN IsCatchDefaultE= nable; } INPUT_INFO_TO_SYNTAX; class CFormPkg {diff --git a/BaseTools/Sour= ce/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g index 55fd067f8a..d7376122d8 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -50,6 +50,7 @@ VfrParserStart ( { ParserBlackBox VfrParser(File)= ; VfrParser.parser()->SetOverrideClassGuid (InputInfo->OverrideClassGuid)= ;+ VfrParser.parser()->SetIsCatchDefaultEnable(InputInfo->IsCatchDefaultEn= able); return VfrParser.parser()->vfrProgram(); } >>@@ -975,7 +976,15 @@ = vfrExtensionData[UINT8 *DataBuff, UINT32 Size, CHAR8 *TypeName, UINT32 Type= Size, vfrStatementDefaultStore : << UINT16 DefaultId =3D EFI_HII_DEFAULT_CLA= SS_STANDARD; >>- D:DefaultStore N:StringIdentifier ","+ D:DefaultStore N:= StringIdentifier "," <<+ = if (mIsCatchDefaultEnable) {+ = gCVfrErrorHandle.HandleWarning (+ = VFR_WARNING_UNSUPPORTED,+ = D->getLine(),+ = D->getText()+ = );+ = }+ = >> Prompt "=3D" "STRING_TOKEN" "\(" S:Number "\)" { "," Attribute = "=3D" A:Number << DefaultId =3D _STOU16(A->getText(), = A->getLine()); >>@@ -1775,7 +1784,11 @@ vfrStatementDefault : CIfrNumeric *NumericQst =3D NULL; >>- D:Default = + D:Default = <<+ if = (mIsCatchDefaultEnable) {+ = DefaultValueError(VFR_RETURN_UNSUPPORTED, D->getLine());+ = }+ = >> ( ( "=3D" vfrConstantValueField[_G= ET_CURRQEST_DATATYPE(), *Val, ArrayType] "," @@ -1970,11 +1983,15 @@ vfrSt= atementInvalid : ; flagsField :- Number - | InteractiveFlag - | ManufacturingFlag - = | DefaultFlag - | ResetRequiredFlag + Number+ | InteractiveFlag+ | Manu= facturingFlag+ | D:DefaultFlag <<+ = if (mIsCatchDefaultE= nable) {+ Defaul= tValueError(VFR_RETURN_UNSUPPORTED, D->getLine());+ = }+ = >>+ | ResetRequiredFlag | ReconnectRequiredFlag | N:NV= AccessFlag << = gCVfrErrorHandle.HandleWarning (@@ -3790,7= +3807,12 @@ oneofoptionFlagsField [UINT8 & HFlags, UINT8 & LFlags] : | RestStyleFlag << $HFlags |=3D 0x2= 0; >> | ReconnectRequiredFlag << $HFlags |= =3D 0x40; >> | ManufacturingFlag << $LFl= ags |=3D 0x20; >>- | DefaultFlag <<= $LFlags |=3D 0x10; >>+ | D:DefaultFlag = <<+ $LFlags |= =3D 0x10;+ if (mIs= CatchDefaultEnable) {+ = DefaultValueError(VFR_RETURN_UNSUPPORTED, D->getLine());+ = }+ = >> | A:NVAccessFlag = << = gCVfrErrorHandle.HandleWarning ( = VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,@@ -4837,6 +4859,7= @@ spanFlags [UINT8 & Flags] : class EfiVfrParser { << private:+ BOOLEAN mIsCatchDefaultEnab= le; UINT8 mParserStatus; BOOLEAN mConstantOnl= yInExpression; @@ -4880,6 +4903,7 @@ public: VOID _PCATCH (IN EFI_VFR_RETURN_CODE, IN ANTLRTokenPtr); = VOID _PCATCH (IN EFI_VFR_RETURN_CODE, IN UINT32); VOID = _PCATCH (IN EFI_VFR_RETURN_CODE, IN UINT32, IN CONST CHAR8 *)= ;+ VOID DefaultValueError (IN EFI_VFR_RETURN_CODE, IN UINT3= 2); VOID syn (ANTLRAbstractToken *, ANTLRChar *, Set= WordType *, ANTLRTokenType, INT32); @@ -4909,6 +4933,7 @@ public: VOID IdEqIdDoSpecial (IN UINT32 &, IN UINT32, IN EF= I_QUESTION_ID, IN CHAR8 *, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UI= NT32, IN EFI_COMPARE_TYPE); VOID IdEqListDoSpecial (IN= UINT32 &, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN UINT16,= IN UINT16 *); VOID SetOverrideClassGuid (IN EFI_GUID *);= + VOID SetIsCatchDefaultEnable (BOOLEAN IsCatchDefaultEnabl= e); >> } @@ -5086,6 +5111,17 @@ EfiVfrParser::_PCATCH ( mParserStatus =3D mParserStatus + gCVfrErrorHandle.HandleError (ReturnCo= de, LineNum, (CHAR8 *) ErrorMsg); } +VOID+EfiVfrParser::DefaultValueError (= + IN EFI_VFR_RETURN_CODE ReturnCode,+ IN UINT32 LineNum+ )+= {+ CHAR8 ErrorMsg[100];+ sprintf(ErrorMsg, "please remove the default val= ue / defaultstore in line %d", LineNum);+ mParserStatus =3D mParserStatus = + gCVfrErrorHandle.HandleError (ReturnCode, LineNum, ErrorMsg);+}+ VOID Efi= VfrParser::syn ( ANTLRAbstractToken *Tok,@@ -5688,6 +5724,12 @@ EfiVfrPa= rser::SetOverrideClassGuid (IN EFI_GUID *OverrideClassGuid) mOverrideClassGuid =3D OverrideClassGuid; } +VOID+EfiVfrParser::SetIsCat= chDefaultEnable (BOOLEAN IsCatchDefaultEnable)+{+ mIsCatchDefaultEnable = =3D IsCatchDefaultEnable;+}+ VOID EfiVfrParser::CheckDuplicateDefaultValue = ( IN EFI_DEFAULT_ID DefaultId,--=20 2.39.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116948): https://edk2.groups.io/g/devel/message/116948 Mute This Topic: https://groups.io/mt/105061128/7976666 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [yuting2.yang@intel.com] = -=3D-=3D-=3D-=3D-=3D-=3D -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116949): https://edk2.groups.io/g/devel/message/116949 Mute This Topic: https://groups.io/mt/105061128/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-