From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: Two or more type TXT spf records found.) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 E38CD21106FDE for ; Tue, 4 Sep 2018 07:50:37 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Sep 2018 07:50:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,329,1531810800"; d="scan'208";a="77872991" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 04 Sep 2018 07:50:37 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 4 Sep 2018 07:50:36 -0700 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.126]) by fmsmsx120.amr.corp.intel.com ([169.254.15.100]) with mapi id 14.03.0319.002; Tue, 4 Sep 2018 07:50:36 -0700 From: "Carsey, Jaben" To: "Feng, Bob C" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [Patch] BaseTools: Involve Dec default value to calculate Maxsize Thread-Index: AQHUQyJRe+O6yZ+sf0+6+HdLPFRaYaTgNtgg Date: Tue, 4 Sep 2018 14:50:35 +0000 Message-ID: References: <20180903010553.114896-1-bob.c.feng@intel.com> In-Reply-To: <20180903010553.114896-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODY0MTk0ZTgtZTk3YS00M2ZmLTgzNTktODhkZWJkNzhmYmE5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoibzRVMnRkZ3lpamcwVzZiRlwvR2ZmQ05TdjBHRTB3dVwvSWp5Smd4Y1wvbytDNlJTVVpuXC9XZ0VyV1NIOURJY3h3S1QifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.1.200.106] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Involve Dec default value to calculate Maxsize X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2018 14:50:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey > -----Original Message----- > From: Feng, Bob C > Sent: Sunday, September 02, 2018 6:06 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming ; Zhu, Yonghong > ; Carsey, Jaben ; > Feng, Bob C > Subject: [Patch] BaseTools: Involve Dec default value to calculate Maxsiz= e > Importance: High >=20 > Involve Dec default value to calculate Maxsize for structure PCD >=20 > Cc: Liming Gao > Cc: Yonghong Zhu > Cc: Jaben Carsey > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > --- > .../Source/Python/Workspace/BuildClassObject.py | 34 +++++++++++-----= - > ----- > 1 file changed, 17 insertions(+), 17 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py > b/BaseTools/Source/Python/Workspace/BuildClassObject.py > index 88465c59ea..b2e5309a90 100644 > --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py > +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py > @@ -66,35 +66,35 @@ class PcdClassObject(object): > self.DscDefaultValue =3D Value > self.PcdValueFromComm =3D "" > self.PcdValueFromFdf =3D "" > self.DefinitionPosition =3D ("","") >=20 > + @staticmethod > + def GetPcdMaxSizeWorker(PcdString, MaxSize): > + if PcdString.startswith("{") and PcdString.endswith("}"): > + return max([len(PcdString.split(",")),MaxSize]) > + > + if PcdString.startswith("\"") or PcdString.startswith("\'"): > + return max([len(PcdString)-2+1,MaxSize]) > + > + if PcdString.startswith("L\""): > + return max([2*(len(PcdString)-3+1),MaxSize]) > + > + return max([len(PcdString),MaxSize]) > + > ## Get the maximum number of bytes > def GetPcdMaxSize(self): > if self.DatumType in TAB_PCD_NUMERIC_TYPES: > return MAX_SIZE_TYPE[self.DatumType] >=20 > MaxSize =3D int(self.MaxDatumSize, 10) if self.MaxDatumSize else= 0 > if self.PcdValueFromFdf: > - if self.PcdValueFromFdf.startswith("{") and > self.PcdValueFromFdf.endswith("}"): > - MaxSize =3D max([len(self.PcdValueFromFdf.split(",")),M= axSize]) > - elif self.PcdValueFromFdf.startswith("\"") or > self.PcdValueFromFdf.startswith("\'"): > - MaxSize =3D max([len(self.PcdValueFromFdf)-2+1,MaxSize]= ) > - elif self.PcdValueFromFdf.startswith("L\""): > - MaxSize =3D max([2*(len(self.PcdValueFromFdf)-3+1),MaxS= ize]) > - else: > - MaxSize =3D max([len(self.PcdValueFromFdf),MaxSize]) > - > + MaxSize =3D > self.GetPcdMaxSizeWorker(self.PcdValueFromFdf,MaxSize) > if self.PcdValueFromComm: > - if self.PcdValueFromComm.startswith("{") and > self.PcdValueFromComm.endswith("}"): > - return max([len(self.PcdValueFromComm.split(",")), MaxSi= ze]) > - elif self.PcdValueFromComm.startswith("\"") or > self.PcdValueFromComm.startswith("\'"): > - return max([len(self.PcdValueFromComm)-2+1, MaxSize]) > - elif self.PcdValueFromComm.startswith("L\""): > - return max([2*(len(self.PcdValueFromComm)-3+1), MaxSize]= ) > - else: > - return max([len(self.PcdValueFromComm), MaxSize]) > + MaxSize =3D > self.GetPcdMaxSizeWorker(self.PcdValueFromComm,MaxSize) > + if hasattr(self, "DefaultValueFromDec"): > + MaxSize =3D > self.GetPcdMaxSizeWorker(self.DefaultValueFromDec,MaxSize) > return MaxSize >=20 > ## Get the number of bytes > def GetPcdSize(self): > if self.DatumType in TAB_PCD_NUMERIC_TYPES: > -- > 2.16.2.windows.1