BaseTools: Add comments for the Structure Pcd definition in PcdValueInit.c file

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index e5f1f01556e5eecaff59ee7cd0082731cd2be8d5..83140049ed59cfc2e99ddfd25e2eba4d31df3b4c 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -119,6 +119,8 @@ class StructurePcd(PcdClassObject):
         self.SkuOverrideValues = collections.OrderedDict({})\r
         self.FlexibleFieldName = None\r
         self.StructName = None\r
         self.SkuOverrideValues = collections.OrderedDict({})\r
         self.FlexibleFieldName = None\r
         self.StructName = None\r

+        self.PcdDefineLineNo = 0\r
+        self.PkgPath = ""\r

     def __repr__(self):\r
         return self.TypeName\r
 \r
     def __repr__(self):\r
         return self.TypeName\r
 \r


@@ -171,6 +173,8 @@ class StructurePcd(PcdClassObject):
             self.SkuOverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
             self.FlexibleFieldName = PcdObject.FlexibleFieldName if PcdObject.FlexibleFieldName else self.FlexibleFieldName\r
             self.StructName = PcdObject.DatumType if PcdObject.DatumType else self.StructName\r
             self.SkuOverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
             self.FlexibleFieldName = PcdObject.FlexibleFieldName if PcdObject.FlexibleFieldName else self.FlexibleFieldName\r
             self.StructName = PcdObject.DatumType if PcdObject.DatumType else self.StructName\r

+            self.PcdDefineLineNo = PcdObject.PcdDefineLineNo if PcdObject.PcdDefineLineNo else self.PcdDefineLineNo\r
+            self.PkgPath = PcdObject.PkgPath if PcdObject.PkgPath else self.PkgPath\r

 \r
 ## LibraryClassObject\r
 #\r
 \r
 ## LibraryClassObject\r
 #\r

diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTools/Source/Python/Workspace/DecBuildData.py
index 01f716bfab70da6c94f87946e2dfb9e5b03a08fa..f6b908dee6d50344f8dc32bc737a9ac29b897f84 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DecBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DecBuildData.py
@@ -383,6 +383,8 @@ class DecBuildData(PackageBuildClassObject):
                     struct_pcd.copy(item)\r
                     struct_pcd.TokenValue = struct_pcd.TokenValue.strip("{").strip()\r
                     struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName = pcdname.split(".")\r
                     struct_pcd.copy(item)\r
                     struct_pcd.TokenValue = struct_pcd.TokenValue.strip("{").strip()\r
                     struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName = pcdname.split(".")\r

+                    struct_pcd.PcdDefineLineNo = LineNo\r
+                    struct_pcd.PkgPath = self.MetaFile.File\r

                 else:\r
                     struct_pcd.AddDefaultValue(item.TokenCName, item.DefaultValue,self.MetaFile.File,LineNo)\r
 \r
                 else:\r
                     struct_pcd.AddDefaultValue(item.TokenCName, item.DefaultValue,self.MetaFile.File,LineNo)\r
 \r

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index bc77d1a2b4390c5066165d9f51d008e0f4d0818f..c8dba63015c0ce7ac876a1d20b26a2db7abe3e66 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1295,7 +1295,7 @@ class DscBuildData(PlatformBuildClassObject):
             CApp = CApp + '  CHAR8   *Value;\n'\r
             CApp = CApp + '  UINT32  OriginalSize;\n'\r
             CApp = CApp + '  VOID    *OriginalPcd;\n'\r
             CApp = CApp + '  CHAR8   *Value;\n'\r
             CApp = CApp + '  UINT32  OriginalSize;\n'\r
             CApp = CApp + '  VOID    *OriginalPcd;\n'\r

-            CApp = CApp + '  %s      *Pcd;\n' % (Pcd.DatumType)\r
+            CApp = CApp + '  %s      *Pcd;  // From %s Line %d \n' % (Pcd.DatumType, Pcd.PkgPath, Pcd.PcdDefineLineNo)\r

             CApp = CApp + '\n'\r
 \r
             Pcd.DefaultValue = Pcd.DefaultValue.strip()\r
             CApp = CApp + '\n'\r
 \r
             Pcd.DefaultValue = Pcd.DefaultValue.strip()\r