From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org 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 3523121E256B6 for ; Thu, 25 Jan 2018 01:49:28 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jan 2018 01:54:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,411,1511856000"; d="scan'208";a="13363391" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga006.jf.intel.com with ESMTP; 25 Jan 2018 01:54:56 -0800 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 25 Jan 2018 01:54:56 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 25 Jan 2018 01:54:56 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.213]) with mapi id 14.03.0319.002; Thu, 25 Jan 2018 17:54:54 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Add comments for the Structure Pcd definition in PcdValueInit.c file Thread-Index: AQHTk/a4fwKlczDcHke+qVlxudlsZqOEXSRA Date: Thu, 25 Jan 2018 09:54:53 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1AC6F7@SHSMSX104.ccr.corp.intel.com> References: <20180123030305.10300-1-bob.c.feng@intel.com> In-Reply-To: <20180123030305.10300-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Add comments for the Structure Pcd definition in PcdValueInit.c file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jan 2018 09:49:28 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Feng, Bob C >Sent: Tuesday, January 23, 2018 11:03 AM >To: edk2-devel@lists.01.org >Cc: Feng, Bob C ; Gao, Liming >Subject: [Patch] BaseTools: Add comments for the Structure Pcd definition = in >PcdValueInit.c file > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >--- > BaseTools/Source/Python/Workspace/BuildClassObject.py | 4 ++++ > BaseTools/Source/Python/Workspace/DecBuildData.py | 2 ++ > BaseTools/Source/Python/Workspace/DscBuildData.py | 2 +- > 3 files changed, 7 insertions(+), 1 deletion(-) > >diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py >b/BaseTools/Source/Python/Workspace/BuildClassObject.py >index 0e3081cfc5..8d02e78b27 100644 >--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py >+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py >@@ -117,10 +117,12 @@ class StructurePcd(PcdClassObject): > self.DefaultValues =3D collections.OrderedDict({}) > self.PcdMode =3D None > self.SkuOverrideValues =3D collections.OrderedDict({}) > self.FlexibleFieldName =3D None > self.StructName =3D None >+ self.PcdDefineLineNo =3D 0 >+ self.PkgPath =3D "" > def __repr__(self): > return self.TypeName > > def AddDefaultValue (self, FieldName, Value, FileName=3D"", LineNo=3D= 0): > if FieldName in self.DefaultValues: >@@ -169,10 +171,12 @@ class StructurePcd(PcdClassObject): > self.PcdMode =3D PcdObject.PcdMode if PcdObject.PcdMode else >self.PcdMode > self.DefaultFromDSC=3DNone > self.SkuOverrideValues =3D PcdObject.SkuOverrideValues if >PcdObject.SkuOverrideValues else self.SkuOverrideValues > self.FlexibleFieldName =3D PcdObject.FlexibleFieldName if >PcdObject.FlexibleFieldName else self.FlexibleFieldName > self.StructName =3D PcdObject.DatumType if PcdObject.DatumTyp= e else >self.StructName >+ self.PcdDefineLineNo =3D PcdObject.PcdDefineLineNo if >PcdObject.PcdDefineLineNo else self.PcdDefineLineNo >+ self.PkgPath =3D PcdObject.PkgPath if PcdObject.PkgPath else >self.PkgPath > > ## LibraryClassObject > # > # This Class defines LibraryClassObject used in BuildDatabase > # >diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py >b/BaseTools/Source/Python/Workspace/DecBuildData.py >index 13fb8686b6..2fd3820dcc 100644 >--- a/BaseTools/Source/Python/Workspace/DecBuildData.py >+++ b/BaseTools/Source/Python/Workspace/DecBuildData.py >@@ -381,10 +381,12 @@ class DecBuildData(PackageBuildClassObject): > dep_pkgs.append(item.DefaultValue) > elif item.DatumType =3D=3D item.TokenCName: > struct_pcd.copy(item) > struct_pcd.TokenValue =3D struct_pcd.TokenValue.strip= ("{").strip() > struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName= =3D >pcdname.split(".") >+ struct_pcd.PcdDefineLineNo =3D LineNo >+ struct_pcd.PkgPath =3D self.MetaFile.File > else: > struct_pcd.AddDefaultValue(item.TokenCName, >item.DefaultValue,self.MetaFile.File,LineNo) > > struct_pcd.PackageDecs =3D dep_pkgs > >diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py >b/BaseTools/Source/Python/Workspace/DscBuildData.py >index b042c4306a..60aa4868ed 100644 >--- a/BaseTools/Source/Python/Workspace/DscBuildData.py >+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py >@@ -1284,11 +1284,11 @@ class DscBuildData(PlatformBuildClassObject): > CApp =3D CApp + ' UINT32 Size;\n' > CApp =3D CApp + ' UINT32 FieldSize;\n' > CApp =3D CApp + ' CHAR8 *Value;\n' > CApp =3D CApp + ' UINT32 OriginalSize;\n' > CApp =3D CApp + ' VOID *OriginalPcd;\n' >- CApp =3D CApp + ' %s *Pcd;\n' % (Pcd.DatumType) >+ CApp =3D CApp + ' %s *Pcd; // From %s Line %d \n' % >(Pcd.DatumType, Pcd.PkgPath, Pcd.PcdDefineLineNo) > CApp =3D CApp + '\n' > > Pcd.DefaultValue =3D Pcd.DefaultValue.strip() > PcdDefaultValue =3D StringToArray(Pcd.DefaultValue) > >-- >2.14.3.windows.1