From nobody Sat May 4 16:50:38 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+84146+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+84146+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=mKyNG/ceKEXXNksNmTs4i83v9qhIH7cZFc6a9maB3Iw9+vdQoRp1ELr8L65/gfd98SVXxN6eiDHhrXkbJhwSNvCuEIonduwggWPuHEzP5pw0sNhLKMxEa5CkoleGqhq6iqGgj0j32MFhnSfkYdQ0zL4Xnb0NqLSVzaWj1XzHnv4= 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=1cZ2OahvsUkKYZKgRKZr/A7EtLybnAtkmQzxgXfvY5s=; b=Bg6yerTt8Hi0Z7rTeV3Y4h45eG/XZnmXJ+QCnaDVTTPzpOqy/1IRSlqZSmXRmCBoqrkemYDlog7fYe6gaZpwhCGUdQr3svZdR4r++YK2rgj6cFDI1TofzsxCp6b659fsbjlT77u4haCdHzx45CnKUiGSsgpdXxSSZ2GRnNCmHgo= 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+84146+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 1638238225244369.5307804031089; Mon, 29 Nov 2021 18:10:25 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id VkB0YY1788612xNVJlyJhvU4; Mon, 29 Nov 2021 18:10:24 -0800 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.70993.1638237316262050298 for ; Mon, 29 Nov 2021 17:55:16 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10183"; a="216815301" X-IronPort-AV: E=Sophos;i="5.87,273,1631602800"; d="scan'208";a="216815301" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2021 17:55:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,273,1631602800"; d="scan'208";a="511956921" X-Received: from unknown (HELO longh.ccr.corp.intel.com) ([10.239.154.78]) by orsmga008.jf.intel.com with ESMTP; 29 Nov 2021 17:55:13 -0800 From: "Long1 Huang" To: devel@edk2.groups.io Cc: Long1 Huang , Bob Feng , Liming Gao , Yuwei Chen , Dandan Bi Subject: [edk2-devel] [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for numeric/one of Date: Tue, 30 Nov 2021 09:54:55 +0800 Message-Id: <507a7c3ef092de00a5252327a0de1b0d7733aaf3.1638237205.git.long1.huang@intel.com> 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: VydEwoEq817QSjwt2JO9CFdZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638238224; bh=1LNHTe771UqRwmDt1oXcnD9W/AUGcDONad0hLp+A6P8=; h=Cc:Date:From:Reply-To:Subject:To; b=XyicUhV8gjWO/hvriXvqi9GBzFc2SsWws2a0YR8uf9sZi9vqs+QGGkg15wEbWXQBvaf XoK6v4E1zjuVrNNJJgsRfKh03Sv0E4WSb206I0ARJQ3/NZlNCISwHJqk9rFZUFOrlu40A 9CeDOLVsMI4Lr92j7I8NVYVFlER/x6ALdeM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638238227140100001 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() Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Dandan Bi Signed-off-by: Long1 Huang Reviewed-by: Dandan Bi --- 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 (#84146): https://edk2.groups.io/g/devel/message/84146 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-