From nobody Thu May 2 06:01:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+84145+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84145+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1638238225; cv=none; d=zohomail.com; s=zohoarc; b=Aq+y7/pIVODzBxPsFEk8+NU4vW+qeFtChK4n/bjJpZaQk/QdAM5xrP6x7AWL62MfTjW/IoatlNY7j0bNj0fg9K71r2+s/Sx6IiCR+7iv0UKUS8ZRE6Qev8gWgBTJJoK4spexytlbcb5mG3XbNYBdqd1aVlJ2s58PsxQQT4ul7YA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638238225; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=vizk2CA4+3m5q1+YU79fL2SRYqsJFyRAKbh4zXR/iEE=; b=TMs8vrXbSym0+HxydhRAK32kTd4LOVjTSaQi4bvVwi0tfuOUefzQf5tJjKo4KvVtp1tKwvmY53qETHSUsZlFnTaCWgMemcmeZJO/+0yfvT8ML9ktY4imOlZnudL0PFC3CXPXNiyRQ6bfTwKLPJivV12jS8sMnZ0qHVFZwwaGJIE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84145+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1638238225729893.0784722561202; Mon, 29 Nov 2021 18:10:25 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id f52gYY1788612xrhMmogi2Ty; Mon, 29 Nov 2021 18:10:25 -0800 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web09.56050.1638153419725269000 for ; Sun, 28 Nov 2021 18:37:00 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10181"; a="296694837" X-IronPort-AV: E=Sophos;i="5.87,271,1631602800"; d="scan'208";a="296694837" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2021 18:36:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,272,1631602800"; d="scan'208";a="511486990" X-Received: from unknown (HELO longh.ccr.corp.intel.com) ([10.239.154.78]) by orsmga008.jf.intel.com with ESMTP; 28 Nov 2021 18:36:57 -0800 From: "Long1 Huang" To: devel@edk2.groups.io Cc: Long1 Huang Subject: [edk2-devel] [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for numeric/one of Date: Mon, 29 Nov 2021 10:35:58 +0800 Message-Id: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,long1.huang@intel.com X-Gm-Message-State: rDOzVHFUfcNoXgs0I28PpVTmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638238225; bh=y1NZ+ZyAw66HsyUlCPWv6gUni8QiSXev71FwS69Dxt0=; h=Cc:Date:From:Reply-To:Subject:To; b=LVFSpmAS+3cAQf/CqWqt9VQClrlGCwmzfcJVMH6gacZxbnYTi2uhO7UlsSRYIssCOqL Zrfkzzj/iNc+pRmYHHRnJ/JW80R7jFlWKnH/V8fTW0mXc74NuKbhSbyUJaFbNBU0Emwp1 M5sKAneeVaL9z5tP3R77qUclw5PFPxBAfDk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638238227144100003 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3752 Add Bit mask to numeric/one of opcode to set correctly Flags for Bit Field. VfrSyntax.g: Set "LFlags &=3D EDKII_IFR_DISPLAY_BIT" before "LFlags |=3D (E= DKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE()));" VfrFormPkg.h: update "if (LFlags & EFI_IFR_DISPLAY)" with "if (LFlags & EDK= II_IFR_DISPLAY_BIT)" in SetFlagsForBitField() 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(-) 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; } =20 - if (LFlags & EFI_IFR_DISPLAY) { + if (LFlags & 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.S= etFlags (HFlags, LFlags, IsDisplaySpecified), LineNum); } else if ((_GET= _CURRQEST_VARTINFO().mVarStoreId !=3D EFI_VARSTORE_ID_INVALID) && (_GET_CUR= RQEST_VARTINFO().mIsBitVar)) { + LFlags &=3D ED= KII_IFR_DISPLAY_BIT; LFlags |=3D (E= DKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE())); _PCATCH(NObj.S= etFlagsForBitField (HFlags, LFlags, IsDisplaySpecified), LineNum); } @@ -3105,6 +3106,8 @@ vfrOneofFlagsField [CIfrOneOf & OObj, UINT32 LineNum]= : } _PCATCH(OObj.S= etFlags (HFlags, LFlags), LineNum); } else if (_GET_= CURRQEST_VARTINFO().mVarStoreId !=3D EFI_VARSTORE_ID_INVALID) { + LFlags &=3D ED= KII_IFR_DISPLAY_BIT; + LFlags |=3D (E= DKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE())); _PCATCH(OObj.S= etFlagsForBitField (HFlags, LFlags), LineNum); } >> --=20 2.32.0.windows.1 -=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 (#84145): https://edk2.groups.io/g/devel/message/84145 Mute This Topic: https://groups.io/mt/87394305/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-