From nobody Sat Feb 7 05:01:09 2026 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496637071710620.9409139399985; Sun, 4 Jun 2017 21:31:11 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6190E21945DEE; Sun, 4 Jun 2017 21:30:03 -0700 (PDT) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D531621945DDD for ; Sun, 4 Jun 2017 21:30:01 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jun 2017 21:31:06 -0700 Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by FMSMGA003.fm.intel.com with ESMTP; 04 Jun 2017 21:31:05 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,299,1493708400"; d="scan'208";a="864568026" From: Dandan Bi To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 12:30:39 +0800 Message-Id: <1496637040-369220-2-git-send-email-dandan.bi@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1496637040-369220-1-git-send-email-dandan.bi@intel.com> References: <1496637040-369220-1-git-send-email-dandan.bi@intel.com> Subject: [edk2] [RFC v2 1/2] BaseTool/VfrCompile: Support Union type in VFR X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Eric Dong , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" V2: Update VfrCompiler to use member variable instead of global varable to indicate whether current date type is Union. Cc: Eric Dong Cc: Liming Gao Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi --- BaseTools/Source/C/VfrCompile/VfrSyntax.g | 19 ++++++++++++++++++- BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 16 ++++++++++++++-- BaseTools/Source/C/VfrCompile/VfrUtilityLib.h | 3 ++- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C= /VfrCompile/VfrSyntax.g index 406dbc5..9e1212a 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -155,10 +155,11 @@ VfrParserStart ( #token Label("label") "label" #token Timeout("timeout") "timeout" #token Inventory("inventory") "inventory" #token NonNvDataMap("_NON_NV_DATA_MAP") "_NON_NV_DATA_MAP" #token Struct("struct") "struct" +#token Union("union") "union" #token Boolean("BOOLEAN") "BOOLEAN" #token Uint64("UINT64") "UINT64" #token Uint32("UINT32") "UINT32" #token Uint16("UINT16") "UINT16" #token Char16("CHAR16") "CHAR16" @@ -270,10 +271,11 @@ vfrProgram > [UINT8 Return] : mConstantOnlyInExpression =3D FALSE; >> ( vfrPragmaPackDefinition | vfrDataStructDefinition + | vfrDataUnionDefinition )* vfrFormSetDefinition << $Return =3D mParserStatus; >> ; =20 @@ -318,12 +320,27 @@ vfrPragmaPackDefinition : | pragmaPackNumber } "\)" ; =20 + vfrDataUnionDefinition : + { TypeDef } Union << gCVfrVarDataTypeDB.D= eclareDataTypeBegin (TRUE); >> + { NonNvDataMap } + { + N1:StringIdentifier << _PCATCH(gCVfrVarDat= aTypeDB.SetNewTypeName (N1->getText()), N1); >> + } + OpenBrace + vfrDataStructFields + CloseBrace + { + N2:StringIdentifier << _PCATCH(gCVfrVarDat= aTypeDB.SetNewTypeName (N2->getText()), N2); >> + } + ";" << gCVfrVarDataTypeDB.= DeclareDataTypeEnd ();>> + ; + vfrDataStructDefinition : - { TypeDef } Struct << gCVfrVarDataTypeDB.= DeclareDataTypeBegin (); >> + { TypeDef } Struct << gCVfrVarDataTypeDB.= DeclareDataTypeBegin (FALSE); >> { NonNvDataMap } { N1:StringIdentifier << _PCATCH(gCVfrVarDat= aTypeDB.SetNewTypeName (N1->getText()), N1); >> } OpenBrace diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/So= urce/C/VfrCompile/VfrUtilityLib.cpp index 2f97975..186b9c9 100644 --- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp @@ -776,10 +776,11 @@ CVfrVarDataTypeDB::InternalTypesListInit ( if (New !=3D NULL) { strcpy (New->mTypeName, gInternalTypesTable[Index].mTypeName); New->mType =3D gInternalTypesTable[Index].mType; New->mAlign =3D gInternalTypesTable[Index].mAlign; New->mTotalSize =3D gInternalTypesTable[Index].mSize; + New->mIsUnionType =3D FALSE; if (strcmp (gInternalTypesTable[Index].mTypeName, "EFI_HII_DATE") = =3D=3D 0) { SVfrDataField *pYearField =3D new SVfrDataField; SVfrDataField *pMonthField =3D new SVfrDataField; SVfrDataField *pDayField =3D new SVfrDataField; =20 @@ -964,11 +965,11 @@ CVfrVarDataTypeDB::Pack ( return VFR_RETURN_SUCCESS; } =20 VOID CVfrVarDataTypeDB::DeclareDataTypeBegin ( - VOID + BOOLEAN IsUnionType ) { SVfrDataType *pNewType =3D NULL; =20 pNewType =3D new SVfrDataType; @@ -976,10 +977,11 @@ CVfrVarDataTypeDB::DeclareDataTypeBegin ( pNewType->mType =3D EFI_IFR_TYPE_OTHER; pNewType->mAlign =3D DEFAULT_ALIGN; pNewType->mTotalSize =3D 0; pNewType->mMembers =3D NULL; pNewType->mNext =3D NULL; + pNewType->mIsUnionType =3D IsUnionType; =20 mNewDataType =3D pNewType; } =20 EFI_VFR_RETURN_CODE @@ -1018,12 +1020,14 @@ CVfrVarDataTypeDB::DataTypeAddField ( { SVfrDataField *pNewField =3D NULL; SVfrDataType *pFieldType =3D NULL; SVfrDataField *pTmp; UINT32 Align; + UINT32 MaxDataTypeSize; =20 CHECK_ERROR_RETURN (GetDataType (TypeName, &pFieldType), VFR_RETURN_SUCC= ESS); + MaxDataTypeSize =3D mNewDataType->mTotalSize; =20 if (strlen (FieldName) >=3D MAX_NAME_LEN) { return VFR_RETURN_INVALID_PARAMETER; } =20 @@ -1055,11 +1059,19 @@ CVfrVarDataTypeDB::DataTypeAddField ( pTmp->mNext =3D pNewField; pNewField->mNext =3D NULL; } =20 mNewDataType->mAlign =3D MIN (mPackAlign, MAX (pFieldType->mAlign, m= NewDataType->mAlign)); - mNewDataType->mTotalSize =3D pNewField->mOffset + (pNewField->mFieldType= ->mTotalSize) * ((ArrayNum =3D=3D 0) ? 1 : ArrayNum); + + if (mNewDataType->mIsUnionType) { + if (MaxDataTypeSize < pNewField->mFieldType->mTotalSize) { + mNewDataType->mTotalSize =3D pNewField->mFieldType->mTotalSize; + } + pNewField->mOffset =3D 0; + } else { + mNewDataType->mTotalSize =3D pNewField->mOffset + (pNewField->mFieldTy= pe->mTotalSize) * ((ArrayNum =3D=3D 0) ? 1 : ArrayNum); + } =20 return VFR_RETURN_SUCCESS; } =20 VOID diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h b/BaseTools/Sour= ce/C/VfrCompile/VfrUtilityLib.h index 59509c3..13b75e4 100644 --- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h +++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h @@ -124,10 +124,11 @@ struct SVfrDataType { UINT8 mType; UINT32 mAlign; UINT32 mTotalSize; SVfrDataField *mMembers; SVfrDataType *mNext; + BOOLEAN mIsUnionType; }; =20 #define VFR_PACK_ASSIGN 0x01 #define VFR_PACK_SHOW 0x02 #define VFR_PACK_PUSH 0x04 @@ -201,11 +202,11 @@ private: =20 public: CVfrVarDataTypeDB (VOID); ~CVfrVarDataTypeDB (VOID); =20 - VOID DeclareDataTypeBegin (VOID); + VOID DeclareDataTypeBegin (BOOLEAN); EFI_VFR_RETURN_CODE SetNewTypeName (IN CHAR8 *); EFI_VFR_RETURN_CODE DataTypeAddField (IN CHAR8 *, IN CHAR8 *, IN UINT32); VOID DeclareDataTypeEnd (VOID); =20 EFI_VFR_RETURN_CODE GetDataType (IN CHAR8 *, OUT SVfrDataType **); --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel