From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.87011.1638325258507232152 for ; Tue, 30 Nov 2021 18:20:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=E+8sU1ul; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: dandan.bi@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10184"; a="216382971" X-IronPort-AV: E=Sophos;i="5.87,277,1631602800"; d="scan'208";a="216382971" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2021 18:20:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,277,1631602800"; d="scan'208";a="511807730" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga007.fm.intel.com with ESMTP; 30 Nov 2021 18:20:57 -0800 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 18:20:57 -0800 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 18:20:57 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Tue, 30 Nov 2021 18:20:57 -0800 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.42) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Tue, 30 Nov 2021 18:20:56 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OMEFJ05CCi2RDl1zM2mIaxeA+be5AgJ0N9A/8PBRspn4WTb9gydZhOf+qIEvdJ0NIEcb/q4RyLguVYpHICKdOivxr438Y3BWsuKXrdWtAVQzNtc96Us6SoKAm5G4cwkPXIU6cRKyLauPHf7Por3OdWIQOi5VYqqs3gpFEXnmPML93GJT9IdxTdJ7OC5HCkO6a8O1d8ZwpzUEuXeBqJnha05Y7gc+XlPICpkHzYO+hG8ggn31TshG1Depr2mcmP0cwzGp1y2ktJ9hg2DFkgHsPCbOZwb1zxF8AzPeqM1O2NOejAxZafwy3EvHvsXlfEaaU02bSc3hPQknEisi3wiD5A== 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=QrnOuY/reTIdqT5Iur80UHQBNiyB8GO/OklARcXqQYM=; b=cyCLBUAdMf9x7pGLoXj49mmzrgEB/kWK5kP1EZIGmBduLzg9Zuaow8OGX5ESTdKQzgtTFKm4pTxMylMD4VcYXeJw95K6KvhZUeSRrAinkPSqNQ7i+Q4d3PWWpGoL6n0Rl3+lkYkVqFvdNtCIHbGVO31pzmZMlaSOdVbwXZIYhiEreKDUkr/QIaTgkNGhJipc2FhXkOVN9hI9n6fhxZcZQKpx6VDwnv2d9bd1LmMgq8qoa55uhs6zCtVdlssa6XIlX9gMCRD/ZDjebNIWyWMayq69noBBTj5ks+gYiq87sJF3ox7zCmtGUXF8UtQuyXnlDN6C28foF3lda8VMOVfh/A== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QrnOuY/reTIdqT5Iur80UHQBNiyB8GO/OklARcXqQYM=; b=E+8sU1ulWmMzq95Afq9oLcVRyExibu8tMcioyuUVYIZSepYqOUcdh131qlPdpGlyukLOdjmaSEY9eM+K79nYYrLLECSZ7eFU83CZeQxnM2z4KvFlUbWzTt91o0xaF066MpWMy3oyppceTczdXgViJRsA9gVupPQ1uKrC2c6lNGA= Received: from DM4PR11MB5453.namprd11.prod.outlook.com (2603:10b6:5:398::15) by DM6PR11MB4026.namprd11.prod.outlook.com (2603:10b6:5:198::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.24; Wed, 1 Dec 2021 02:20:55 +0000 Received: from DM4PR11MB5453.namprd11.prod.outlook.com ([fe80::2d57:4233:5c9f:df7b]) by DM4PR11MB5453.namprd11.prod.outlook.com ([fe80::2d57:4233:5c9f:df7b%9]) with mapi id 15.20.4734.023; Wed, 1 Dec 2021 02:20:55 +0000 From: "Dandan Bi" To: "Huang, Long1" , "devel@edk2.groups.io" CC: "Feng, Bob C" , Liming Gao , "Chen, Christine" Subject: Re: [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for numeric/one of Thread-Topic: [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for numeric/one of Thread-Index: AQHX5Y1VO+Jj7ukJ1kuBCGiuNqY5WKwc6JFQ Date: Wed, 1 Dec 2021 02:20:55 +0000 Message-ID: References: <507a7c3ef092de00a5252327a0de1b0d7733aaf3.1638237205.git.long1.huang@intel.com> In-Reply-To: <507a7c3ef092de00a5252327a0de1b0d7733aaf3.1638237205.git.long1.huang@intel.com> Accept-Language: zh-CN, 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-office365-filtering-correlation-id: 1d2c9955-736d-41e6-8489-08d9b47134b2 x-ms-traffictypediagnostic: DM6PR11MB4026: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:597; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AROAfPWX29XHjyLH0L+mulUCQUcOUnuor+hWZoWBH48HOcG4NbPO15CTkNlMxi+GzTe3+w4AvSsg7hIsmw52SwffMlUib9H737tTTvIoh7hO4nASH3TZ4Nt4ynnfzRJ0XvPOgqdTm7VCTYPQEp3iPCjThkkTtL8fQaKmMSHwXp0+KDRoV4s60rwo+P/TqZZ1TNedRaHy3cs0nQfmUN8KGZaTuJKkhrQ9eH1nsGlSzDcxqjE+8vmSWBKEx4jxcxjyGSlAzFBty87YaxcEQs+6eN/gXsZ1BsvciXt2C4gjuGRHkue4fnIdkGkJyxwBPgRVXbxcRYvrHdusTz7bgcBVHhEMocVYFadmkQasw64Cf0PO5xGasvU2teaEZTGpE5IXTiRXw77PJEb0zNexPa8BDofRmhqsCZZ0LsHKjba7RdptVrEKf8/YnMHXPREP2fKajE56mBWhLX293WWJeEIsvnkquEQQpcIGliwfPAyBxASfWTiQKuGqlg8wLjFxeUbtYn4yw7TSYc4/E1e0z9HdrzRk37Rrp2cSOzH99FZcNfyyLLmD2j7ZA03fEh1o6B3xArFdkMi25XBNBt7khcXd7y5dkI8p/7A2aEgyvuHmMEghuATfas0t104dq/p4/Z7a6oOqIxoOCoxwjSPN5Mt2t/k4pJckrchp+02n9i4bA7WCX2IuxgsOdwbU9V15m0U3xUVx2zEu+5tfrDxr+vtBrUzgfIgJDj4ac6SiTPkj2/HjnZVkVVTP7/NjpVna6LIbku5tlsJ7DcU37Al4BGXf+AWpkKSVR+pkxgDG7I7Bu74= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR11MB5453.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(86362001)(83380400001)(66476007)(76116006)(66556008)(66946007)(54906003)(71200400001)(122000001)(316002)(53546011)(8676002)(5660300002)(7696005)(26005)(110136005)(4326008)(186003)(2906002)(64756008)(38070700005)(9686003)(107886003)(82960400001)(38100700002)(33656002)(6506007)(55016003)(8936002)(52536014)(66446008)(508600001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?MYAebUISQLtgF9tuwDxXrkpiO0gpbhCqpFM5R4tJJVsfch5IosPhz8hL8N/4?= =?us-ascii?Q?GvvuUgc8jivrA/tvfcPXSfPwPLtBLs81sRuOznhUAMxw+HjjkK20WrXcxek6?= =?us-ascii?Q?T/XA4+Wi98ryV14pJYRRDJBmQcyxPkoKd1mekEgpWzQmYjG1DXiit6x0z0Me?= =?us-ascii?Q?Hh2hZiDzq/mi7J2JGVVwFGiCyfStwe/vJglYxXjoMqN2/64tg2MIJGCvGcQ5?= =?us-ascii?Q?fXlRBfo407X2KYzfiQKkNCxX6j2puO8uEsmiUdopGzDYV1doeQAomviYBwOI?= =?us-ascii?Q?7rNtlvBRne/9nC3wqEUfF2vZbJZ30+TDJpVYMnpuYuZXU2VNK+r6jUGCdzuv?= =?us-ascii?Q?T7BtfDdMWb3HfWJQgB5c9wqxTVjCzRZws4dKgjA2uzLeKlbRIiur5YYjSt79?= =?us-ascii?Q?PQXjagLaOsr7FXbeGEhKIghWYHV0IDoAVxmzba9pb2LPyoz77uIOi9Xdt+A2?= =?us-ascii?Q?nTuiuzkO6yueSqmulOnn6+NbouyqMrfJXQw5a4t5Bfc9OGw2NPzEl8s1V27T?= =?us-ascii?Q?IrQIj+d4tl+XJXGrECtAa4AHxK1LwNLroYi4t6YyLh2X1J9G7QL/GI6fg1o2?= =?us-ascii?Q?MK1FxKHIZDmJafsW/SlA5+h9OQb6c7oPLNjCUT3XHhm1r/DGZZXiF9DezwL6?= =?us-ascii?Q?oLu9KcEcBTFwe92JBIwaYy5TrPPTEiA/5HRoc+/tmyuirrGHifGZwFw4kd0k?= =?us-ascii?Q?hWokLvgl6UMO8/aKubdkYYb1Bmc0LmKjweDNuaNSrOuFieZGZv64wNMGLlgc?= =?us-ascii?Q?YehtU7dA2SdV6Y15ztrKZg5JnPAUpzO8keWWUqgCJrBwjAdebaV9TLMJPCzA?= =?us-ascii?Q?y0T+wDQN3ru6RBXZE7RH+kooUOtDEGW5jDdTBXeomM4b11bjm789xqWwCpJ5?= =?us-ascii?Q?8/OEMwWzDvunRMq+7ldJ2BeoeMmcLXJkGpx73HJ8uuFA3TjfFHKZpqk95W3v?= =?us-ascii?Q?snSfsAW8o44Z7ODJDLBgvLlzCp4v0GgaryacJmb3JvBnxNC0IaiKQt6ZBSk4?= =?us-ascii?Q?Mxi6ljzydxDECtZb/uukUUzDCNJQjrTxNQJj/zaxOEEslEeBCS6xUrDuHFoO?= =?us-ascii?Q?S47UHhHFvSWJQlgARyfizsIWX/aJGlnfrMl8p3fVSeVso+mux8JSNAAQsMjy?= =?us-ascii?Q?pN7l05+vFSOqTcI4nMmuY/eQ/qTNpEil68u9pADjU/G68VdrVd1Mk05VYYY4?= =?us-ascii?Q?AM51F0i5eLiwKCiyf4c1lsNobzSZ7r0MEYciNgTOYN/HN+1ZONC2gSHUn3Ue?= =?us-ascii?Q?cNk8DpvwibP2YeyE+py049/4fd7pzetzMB9ug6GcOXq8h8Q629gDV9OEHyEy?= =?us-ascii?Q?YRmD3abIaRteLkl2JcTwR34i6Ys9iLPnmo2NjXY8Bcmtd/1No+9SqqnjwzGx?= =?us-ascii?Q?R46/0g7Xsx1EwGzBAJVZDMFrIATQWs9B9qhliEBPgLszi7hK+l6aW8UGl4mN?= =?us-ascii?Q?GG/90gmr0ZQrobwuIXilZ0xDZWohcJfXuhWjhVGIbFKz3oG+BXumYCWoKyyK?= =?us-ascii?Q?kFt8Tm8YQtErHPj7BPAQpp5y3KmvxyofrAUNanX5d0qtzMS692UHliRO5pX6?= =?us-ascii?Q?eSsVfrEBkUIKZKldk92TSEkIF+v7uaPC8Sb8v9G2ZKIdTH59qgOa2LZrVhp4?= =?us-ascii?Q?Uw=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5453.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d2c9955-736d-41e6-8489-08d9b47134b2 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Dec 2021 02:20:55.7566 (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: fOW8wo3/fNxkCUKSRNKbUKQI7OJKctePOSeAzb5x7mxMXg3QUCXaFfNf12XXPRs0NBWZ+b98+2/9FHZlps/cJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4026 Return-Path: dandan.bi@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Dandan Bi Thanks, Dandan > -----Original Message----- > From: Huang, Long1 > Sent: Tuesday, November 30, 2021 9:55 AM > To: devel@edk2.groups.io > Cc: Huang, Long1 ; Feng, Bob C > ; Liming Gao ; Chen, > Christine ; Bi, Dandan > Subject: [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for > numeric/one of >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3752 >=20 > Add Bit mask to numeric/one of opcode to set correctly Flags for Bit Fiel= d. > VfrSyntax.g: Set "LFlags &=3D EDKII_IFR_DISPLAY_BIT" before "LFlags |=3D > (EDKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE()));" > VfrFormPkg.h: update "if (LFlags & EFI_IFR_DISPLAY)" with "if (LFlags & > EDKII_IFR_DISPLAY_BIT)" in SetFlagsForBitField() >=20 > Cc: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > Cc: Dandan Bi >=20 > Signed-off-by: Long1 Huang > --- > BaseTools/Source/C/VfrCompile/VfrFormPkg.h | 2 +- > BaseTools/Source/C/VfrCompile/VfrSyntax.g | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h > b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h > index 1cea4f0e25..9ef6f07787 100644 > --- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h > +++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h > @@ -1455,7 +1455,7 @@ public: > return Ret; } - if (LFlags & EFI_IFR_DISPLAY) {+ if (LFl= ags & > EDKII_IFR_DISPLAY_BIT) { mOneOf->Flags =3D LFlags; } else { = mOneOf- > >Flags =3D LFlags | EDKII_IFR_DISPLAY_UINT_DEC_BIT;diff --git > a/BaseTools/Source/C/VfrCompile/VfrSyntax.g > b/BaseTools/Source/C/VfrCompile/VfrSyntax.g > index 3f896c6f1a..55fd067f8a 100644 > --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g > +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g > @@ -2930,6 +2930,7 @@ vfrNumericFlags [CIfrNumeric & NObj, UINT32 > LineNum] : > } > _PCATCH(NObj.SetFlags (HFlags, LFlags, IsDisplaySpecified), > LineNum); } els= e if > ((_GET_CURRQEST_VARTINFO().mVarStoreId !=3D EFI_VARSTORE_ID_INVALID) > && (_GET_CURRQEST_VARTINFO().mIsBitVar)) {+ > LFlags &=3D EDKII_IFR_DISPLAY_BIT; = LFlags |=3D > (EDKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE())); > _PCATCH(NObj.SetFlagsForBitField (HFlags, LFlags, IsDisplaySpecified), > LineNum); }@@ -= 3105,6 +3106,8 @@ > vfrOneofFlagsField [CIfrOneOf & OObj, UINT32 LineNum] : > } > _PCATCH(OObj.SetFlags (HFlags, LFlags), > LineNum); } els= e if > (_GET_CURRQEST_VARTINFO().mVarStoreId !=3D EFI_VARSTORE_ID_INVALID) > {+ LFlags &=3D= EDKII_IFR_DISPLAY_BIT;+ > LFlags |=3D (EDKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE())); > _PCATCH(OObj.SetFlagsForBitField (HFlags, LFlags), > LineNum); } = >>-- > 2.32.0.windows.1