BaseTool: Error handling for PCD datumtype.

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DecBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTools/Source/Python/Workspace/DecBuildData.py
index 61f15086d0ae0f70e33801ef4539fcc721d5041b..4d6edadc8f9d008bb5a4ca45d92a70aa23c9de29 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DecBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DecBuildData.py
@@ -15,6 +15,7 @@ from Common.String import *
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r
+from collections import OrderedDict\r
 \r
 from Workspace.BuildClassObject import PackageBuildClassObject, StructurePcd, PcdClassObject\r
 \r
@@ -95,6 +96,7 @@ class DecBuildData(PackageBuildClassObject):
         self._Ppis              = None\r
         self._Guids             = None\r
         self._Includes          = None\r
+        self._CommonIncludes    = None\r
         self._LibraryClasses    = None\r
         self._Pcds              = None\r
         self.__Macros           = None\r
@@ -296,7 +298,8 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve public include paths declared in this package\r
     def _GetInclude(self):\r
-        if self._Includes == None:\r
+        if self._Includes == None or self._CommonIncludes is None:\r
+            self._CommonIncludes = []\r
             self._Includes = []\r
             self._PrivateIncludes = []\r
             PublicInclues = []\r
@@ -324,7 +327,8 @@ class DecBuildData(PackageBuildClassObject):
                         PublicInclues.append(File)\r
                     if File in self._PrivateIncludes:\r
                         EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % File, File=self.MetaFile, Line=LineNo)\r
-\r
+                if Record[3] == "COMMON":\r
+                    self._CommonIncludes.append(File)\r
         return self._Includes\r
 \r
     ## Retrieve library class declarations (not used in build at present)\r
@@ -364,7 +368,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
 \r
     def ProcessStructurePcd(self, StructurePcdRawDataSet):\r
-        s_pcd_set = dict()\r
+        s_pcd_set = OrderedDict()\r
         for s_pcd,LineNo in StructurePcdRawDataSet:\r
             if s_pcd.TokenSpaceGuidCName not in s_pcd_set:\r
                 s_pcd_set[s_pcd.TokenSpaceGuidCName] = []\r
@@ -390,11 +394,7 @@ class DecBuildData(PackageBuildClassObject):
                     struct_pcd.AddDefaultValue(item.TokenCName, item.DefaultValue,self.MetaFile.File,LineNo)\r
 \r
             struct_pcd.PackageDecs = dep_pkgs\r
-            if not struct_pcd.StructuredPcdIncludeFile:\r
-                EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The structure Pcd %s.%s header file is not found in %s line %s \n" % (struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName,self.MetaFile.File,LineNo ))\r
-\r
             str_pcd_set.append(struct_pcd)\r
-\r
         return str_pcd_set\r
 \r
     ## Retrieve PCD declarations for given type\r
@@ -442,6 +442,7 @@ class DecBuildData(PackageBuildClassObject):
                                         list(validlists),\r
                                         list(expressions)\r
                                         )\r
+            PcdObj.DefinitionPosition = (self.MetaFile.File,LineNo)\r
             if "." in TokenSpaceGuid:\r
                 StrPcdSet.append((PcdObj,LineNo))\r
             else:\r
@@ -450,8 +451,21 @@ class DecBuildData(PackageBuildClassObject):
         StructurePcds = self.ProcessStructurePcd(StrPcdSet)\r
         for pcd in StructurePcds:\r
             Pcds[pcd.TokenCName, pcd.TokenSpaceGuidCName, self._PCD_TYPE_STRING_[Type]] = pcd\r
+        StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$')\r
+        for pcd in Pcds.values():\r
+            if pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
+                if StructPattern.match(pcd.DatumType) == None:\r
+                    EdkLogger.error('build', FORMAT_INVALID, "DatumType only support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.", pcd.DefinitionPosition[0],pcd.DefinitionPosition[1])\r
+        for struct_pcd in Pcds.values():\r
+            if isinstance(struct_pcd,StructurePcd) and not struct_pcd.StructuredPcdIncludeFile:\r
+                EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The structure Pcd %s.%s header file is not found in %s line %s \n" % (struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName,struct_pcd.DefinitionPosition[0],struct_pcd.DefinitionPosition[1] ))\r
 \r
         return Pcds\r
+    @property\r
+    def CommonIncludes(self):\r
+        if self._CommonIncludes is None:\r
+            self.Includes\r
+        return self._CommonIncludes\r
 \r
 \r
     _Macros = property(_GetMacros)\r