1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for numeric/one of

Long1 Huang posted 1 patch 2 years, 4 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/edk2 tags/patchew/507a7c3ef092de00a5252327a0de1b0d7733aaf3.1638237205.git.long1.huang@intel.com
BaseTools/Source/C/VfrCompile/VfrFormPkg.h | 2 +-
BaseTools/Source/C/VfrCompile/VfrSyntax.g  | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
[edk2-devel] [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for numeric/one of
Posted by Long1 Huang 2 years, 4 months ago 
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3752

Add Bit mask to numeric/one of opcode to set correctly Flags for Bit Field.
VfrSyntax.g: Set "LFlags &= EDKII_IFR_DISPLAY_BIT" before "LFlags |= (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()

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>

Signed-off-by: Long1 Huang <long1.huang@intel.com>
---
 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;
     }
 
-    if (LFlags & EFI_IFR_DISPLAY) {
+    if (LFlags & EDKII_IFR_DISPLAY_BIT) {
       mOneOf->Flags = LFlags;
     } else {
       mOneOf->Flags = 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);
                                                           } else if ((_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) && (_GET_CURRQEST_VARTINFO().mIsBitVar)) {
+                                                            LFlags &= EDKII_IFR_DISPLAY_BIT;
                                                             LFlags |= (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);
                                                           } else if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) {
+                                                            LFlags &= EDKII_IFR_DISPLAY_BIT;
+                                                            LFlags |= (EDKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE()));
                                                             _PCATCH(OObj.SetFlagsForBitField (HFlags, LFlags), LineNum);
                                                           }
                                                        >>
-- 
2.32.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for numeric/one of
Posted by Dandan Bi 2 years, 4 months ago 
Reviewed-by: Dandan Bi <dandan.bi@intel.com>


Thanks,
Dandan

> -----Original Message-----
> From: Huang, Long1 <long1.huang@intel.com>
> Sent: Tuesday, November 30, 2021 9:55 AM
> To: devel@edk2.groups.io
> Cc: Huang, Long1 <long1.huang@intel.com>; Feng, Bob C
> <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen,
> Christine <yuwei.chen@intel.com>; Bi, Dandan <dandan.bi@intel.com>
> Subject: [PATCH] BaseTools/VfrCompile: Correct Bit Field Flags for
> numeric/one of
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3752
> 
> Add Bit mask to numeric/one of opcode to set correctly Flags for Bit Field.
> VfrSyntax.g: Set "LFlags &= EDKII_IFR_DISPLAY_BIT" before "LFlags |=
> (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()
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> 
> Signed-off-by: Long1 Huang <long1.huang@intel.com>
> ---
>  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;     } -    if (LFlags & EFI_IFR_DISPLAY) {+    if (LFlags &
> EDKII_IFR_DISPLAY_BIT) {       mOneOf->Flags = LFlags;     } else {       mOneOf-
> >Flags = 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);                                                           } else if
> ((_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID)
> && (_GET_CURRQEST_VARTINFO().mIsBitVar)) {+
> LFlags &= EDKII_IFR_DISPLAY_BIT;                                                             LFlags |=
> (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);                                                           } else if
> (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID)
> {+                                                            LFlags &= EDKII_IFR_DISPLAY_BIT;+
> LFlags |= (EDKII_IFR_NUMERIC_SIZE_BIT & (_GET_CURRQEST_VARSIZE()));
> _PCATCH(OObj.SetFlagsForBitField (HFlags, LFlags),
> LineNum);                                                           }                                                        >>--
> 2.32.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84184): https://edk2.groups.io/g/devel/message/84184
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]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.