# into PlatformBuildClassObject form for easier use for AutoGen.\r
#\r
from __future__ import print_function\r
+from __future__ import absolute_import\r
from Common.StringUtils import *\r
from Common.DataType import *\r
from Common.Misc import *\r
from CommonDataClass.CommonClass import SkuInfoClass\r
from Common.TargetTxtClassObject import *\r
from Common.ToolDefClassObject import *\r
-from MetaDataTable import *\r
-from MetaFileTable import *\r
-from MetaFileParser import *\r
+from .MetaDataTable import *\r
+from .MetaFileTable import *\r
+from .MetaFileParser import *\r
\r
-from WorkspaceCommon import GetDeclaredPcd\r
+from .WorkspaceCommon import GetDeclaredPcd\r
from Common.Misc import AnalyzeDscPcd\r
from Common.Misc import ProcessDuplicatedInf\r
import re\r
'''\r
\r
variablePattern = re.compile(r'[\t\s]*0[xX][a-fA-F0-9]+$')\r
-\r
+SkuIdPattern = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*$')\r
## regular expressions for finding decimal and hex numbers\r
Pattern = re.compile('^[1-9]\d*|0$')\r
HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')\r
self.WorkspaceDir = os.getenv("WORKSPACE") if os.getenv("WORKSPACE") else ""\r
self.DefaultStores = None\r
self.SkuIdMgr = SkuClass(self.SkuName, self.SkuIds)\r
+\r
@property\r
def OutputPath(self):\r
if os.getenv("WORKSPACE"):\r
self._RFCLanguages = None\r
self._ISOLanguages = None\r
self._VpdToolGuid = None\r
- self.__Macros = None\r
+ self._MacroDict = None\r
self.DefaultStores = None\r
\r
-\r
## handle Override Path of Module\r
def _HandleOverridePath(self):\r
RecordList = self._RawData[MODEL_META_DATA_COMPONENT, self._Arch]\r
GlobalData.gOverrideDir[ModuleFile.Key] = SourceOverridePath\r
\r
## Get current effective macros\r
- def _GetMacros(self):\r
- if self.__Macros is None:\r
- self.__Macros = {}\r
- self.__Macros.update(GlobalData.gPlatformDefines)\r
- self.__Macros.update(GlobalData.gGlobalDefines)\r
- self.__Macros.update(GlobalData.gCommandLineDefines)\r
- return self.__Macros\r
+ @property\r
+ def _Macros(self):\r
+ if self._MacroDict is None:\r
+ self._MacroDict = {}\r
+ self._MacroDict.update(GlobalData.gPlatformDefines)\r
+ self._MacroDict.update(GlobalData.gGlobalDefines)\r
+ self._MacroDict.update(GlobalData.gCommandLineDefines)\r
+ return self._MacroDict\r
\r
## Get architecture\r
- def _GetArch(self):\r
+ @property\r
+ def Arch(self):\r
return self._Arch\r
\r
- ## Set architecture\r
- #\r
- # Changing the default ARCH to another may affect all other information\r
- # because all information in a platform may be ARCH-related. That's\r
- # why we need to clear all internal used members, in order to cause all\r
- # information to be re-retrieved.\r
- #\r
- # @param Value The value of ARCH\r
- #\r
- def _SetArch(self, Value):\r
- if self._Arch == Value:\r
- return\r
- self._Arch = Value\r
- self._Clear()\r
-\r
## Retrieve all information in [Defines] section\r
#\r
# (Retriving all [Defines] information in one-shot is just to save time.)\r
self._Header = 'DUMMY'\r
\r
## Retrieve platform name\r
- def _GetPlatformName(self):\r
+ @property\r
+ def PlatformName(self):\r
if self._PlatformName is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No PLATFORM_NAME", File=self.MetaFile)\r
return self._PlatformName\r
\r
+ @property\r
+ def Platform(self):\r
+ return self.PlatformName\r
+\r
## Retrieve file guid\r
- def _GetFileGuid(self):\r
+ @property\r
+ def Guid(self):\r
if self._Guid is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._Guid\r
\r
## Retrieve platform version\r
- def _GetVersion(self):\r
+ @property\r
+ def Version(self):\r
if self._Version is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._Version\r
\r
## Retrieve platform description file version\r
- def _GetDscSpec(self):\r
+ @property\r
+ def DscSpecification(self):\r
if self._DscSpecification is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._DscSpecification\r
\r
## Retrieve OUTPUT_DIRECTORY\r
- def _GetOutpuDir(self):\r
+ @property\r
+ def OutputDirectory(self):\r
if self._OutputDirectory is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._OutputDirectory\r
\r
## Retrieve SUPPORTED_ARCHITECTURES\r
- def _GetSupArch(self):\r
+ @property\r
+ def SupArchList(self):\r
if self._SupArchList is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._SupArchList\r
\r
## Retrieve BUILD_TARGETS\r
- def _GetBuildTarget(self):\r
+ @property\r
+ def BuildTargets(self):\r
if self._BuildTargets is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No BUILD_TARGETS", File=self.MetaFile)\r
return self._BuildTargets\r
\r
- def _GetPcdInfoFlag(self):\r
+ @property\r
+ def PcdInfoFlag(self):\r
if self._PcdInfoFlag is None or self._PcdInfoFlag.upper() == 'FALSE':\r
return False\r
elif self._PcdInfoFlag.upper() == 'TRUE':\r
return True\r
else:\r
return False\r
- def _GetVarCheckFlag(self):\r
+\r
+ @property\r
+ def VarCheckFlag(self):\r
if self._VarCheckFlag is None or self._VarCheckFlag.upper() == 'FALSE':\r
return False\r
elif self._VarCheckFlag.upper() == 'TRUE':\r
return False\r
\r
# # Retrieve SKUID_IDENTIFIER\r
- def _GetSkuName(self):\r
+ @property\r
+ def SkuName(self):\r
if self._SkuName is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._SkuName\r
\r
## Override SKUID_IDENTIFIER\r
- def _SetSkuName(self, Value):\r
+ @SkuName.setter\r
+ def SkuName(self, Value):\r
self._SkuName = Value\r
\r
- def _GetFdfFile(self):\r
+ @property\r
+ def FlashDefinition(self):\r
if self._FlashDefinition is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
self._FlashDefinition = ''\r
return self._FlashDefinition\r
\r
- def _GetPrebuild(self):\r
+ @property\r
+ def Prebuild(self):\r
if self._Prebuild is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
self._Prebuild = ''\r
return self._Prebuild\r
\r
- def _GetPostbuild(self):\r
+ @property\r
+ def Postbuild(self):\r
if self._Postbuild is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._Postbuild\r
\r
## Retrieve FLASH_DEFINITION\r
- def _GetBuildNumber(self):\r
+ @property\r
+ def BuildNumber(self):\r
if self._BuildNumber is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._BuildNumber\r
\r
## Retrieve MAKEFILE_NAME\r
- def _GetMakefileName(self):\r
+ @property\r
+ def MakefileName(self):\r
if self._MakefileName is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._MakefileName\r
\r
## Retrieve BsBaseAddress\r
- def _GetBsBaseAddress(self):\r
+ @property\r
+ def BsBaseAddress(self):\r
if self._BsBaseAddress is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._BsBaseAddress\r
\r
## Retrieve RtBaseAddress\r
- def _GetRtBaseAddress(self):\r
+ @property\r
+ def RtBaseAddress(self):\r
if self._RtBaseAddress is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._RtBaseAddress\r
\r
## Retrieve the top address for the load fix address\r
- def _GetLoadFixAddress(self):\r
+ @property\r
+ def LoadFixAddress(self):\r
if self._LoadFixAddress is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._LoadFixAddress\r
\r
## Retrieve RFCLanguage filter\r
- def _GetRFCLanguages(self):\r
+ @property\r
+ def RFCLanguages(self):\r
if self._RFCLanguages is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._RFCLanguages\r
\r
## Retrieve ISOLanguage filter\r
- def _GetISOLanguages(self):\r
+ @property\r
+ def ISOLanguages(self):\r
if self._ISOLanguages is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
if self._ISOLanguages is None:\r
self._ISOLanguages = []\r
return self._ISOLanguages\r
+\r
## Retrieve the GUID string for VPD tool\r
- def _GetVpdToolGuid(self):\r
+ @property\r
+ def VpdToolGuid(self):\r
if self._VpdToolGuid is None:\r
if self._Header is None:\r
self._GetHeaderInfo()\r
return self._VpdToolGuid\r
\r
## Retrieve [SkuIds] section information\r
- def _GetSkuIds(self):\r
+ @property\r
+ def SkuIds(self):\r
if self._SkuIds is None:\r
self._SkuIds = OrderedDict()\r
RecordList = self._RawData[MODEL_EFI_SKU_ID, self._Arch]\r
if not Pattern.match(Record[0]) and not HexPattern.match(Record[0]):\r
EdkLogger.error('build', FORMAT_INVALID, "The format of the Sku ID number is invalid. It only support Integer and HexNumber",\r
File=self.MetaFile, Line=Record[-1])\r
- if not IsValidWord(Record[1]):\r
- EdkLogger.error('build', FORMAT_INVALID, "The format of the Sku ID name is invalid. The correct format is '(a-zA-Z0-9_)(a-zA-Z0-9_-.)*'",\r
+ if not SkuIdPattern.match(Record[1]) or (Record[2] and not SkuIdPattern.match(Record[2])):\r
+ EdkLogger.error('build', FORMAT_INVALID, "The format of the Sku ID name is invalid. The correct format is '(a-zA-Z_)(a-zA-Z0-9_)*'",\r
File=self.MetaFile, Line=Record[-1])\r
self._SkuIds[Record[1].upper()] = (str(DscBuildData.ToInt(Record[0])), Record[1].upper(), Record[2].upper())\r
if TAB_DEFAULT not in self._SkuIds:\r
return self.DefaultStores\r
\r
## Retrieve [Components] section information\r
- def _GetModules(self):\r
+ @property\r
+ def Modules(self):\r
if self._Modules is not None:\r
return self._Modules\r
\r
return self._Modules\r
\r
## Retrieve all possible library instances used in this platform\r
- def _GetLibraryInstances(self):\r
+ @property\r
+ def LibraryInstances(self):\r
if self._LibraryInstances is None:\r
- self._GetLibraryClasses()\r
+ self.LibraryClasses\r
return self._LibraryInstances\r
\r
## Retrieve [LibraryClasses] information\r
- def _GetLibraryClasses(self):\r
+ @property\r
+ def LibraryClasses(self):\r
if self._LibraryClasses is None:\r
self._LibraryInstances = []\r
#\r
\r
if (PcdCName, TokenSpaceGuid) not in self._DecPcds:\r
EdkLogger.error('build', PARSER_ERROR,\r
- "Pcd (%s.%s) defined in DSC is not declared in DEC files. Arch: ['%s']" % (TokenSpaceGuid, PcdCName, self._Arch),\r
+ "Pcd (%s.%s) defined in DSC is not declared in DEC files referenced in INF files in FDF. Arch: ['%s']" % (TokenSpaceGuid, PcdCName, self._Arch),\r
File=self.MetaFile, Line=LineNo)\r
ValueList, IsValid, Index = AnalyzeDscPcd(Setting, PcdType, self._DecPcds[PcdCName, TokenSpaceGuid].DatumType)\r
if not IsValid:\r
if not Valid:\r
EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=self.MetaFile, Line=LineNo,\r
ExtraData="%s.%s" % (TokenSpaceGuid, PcdCName))\r
- if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT):\r
+ if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE):\r
if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.strip() != ValueList[1].strip():\r
EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtype used in DSC file is not the same as its declaration in DEC file.", File=self.MetaFile, Line=LineNo,\r
ExtraData="%s.%s|%s" % (TokenSpaceGuid, PcdCName, Setting))\r
for pcdname in Pcds:\r
pcd = Pcds[pcdname]\r
Pcds[pcdname].SkuInfoList = {TAB_DEFAULT:pcd.SkuInfoList[skuid] for skuid in pcd.SkuInfoList if skuid in available_sku}\r
- if type(pcd) is StructurePcd and pcd.SkuOverrideValues:\r
+ if isinstance(pcd, StructurePcd) and pcd.SkuOverrideValues:\r
Pcds[pcdname].SkuOverrideValues = {TAB_DEFAULT:pcd.SkuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_sku}\r
else:\r
for pcdname in Pcds:\r
pcd = Pcds[pcdname]\r
Pcds[pcdname].SkuInfoList = {skuid:pcd.SkuInfoList[skuid] for skuid in pcd.SkuInfoList if skuid in available_sku}\r
- if type(pcd) is StructurePcd and pcd.SkuOverrideValues:\r
+ if isinstance(pcd, StructurePcd) and pcd.SkuOverrideValues:\r
Pcds[pcdname].SkuOverrideValues = {skuid:pcd.SkuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_sku}\r
return Pcds\r
+\r
def CompleteHiiPcdsDefaultStores(self, Pcds):\r
HiiPcd = [Pcds[pcd] for pcd in Pcds if Pcds[pcd].Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]]\r
DefaultStoreMgr = DefaultStore(self.DefaultStores)\r
def __ParsePcdFromCommandLine(self):\r
if GlobalData.BuildOptionPcd:\r
for i, pcd in enumerate(GlobalData.BuildOptionPcd):\r
- if type(pcd) is tuple:\r
+ if isinstance(pcd, tuple):\r
continue\r
(pcdname, pcdvalue) = pcd.split('=')\r
if not pcdvalue:\r
PcdItem = BuildData.Pcds[key]\r
if (TokenSpaceGuidCName, TokenCName) == (PcdItem.TokenSpaceGuidCName, PcdItem.TokenCName) and FieldName =="":\r
PcdItem.DefaultValue = pcdvalue\r
+ #In command line, the latter full assign value in commandLine should override the former field assign value.\r
+ #For example, --pcd Token.pcd.field="" --pcd Token.pcd=H"{}"\r
+ delete_assign = []\r
+ field_assign = {}\r
+ if GlobalData.BuildOptionPcd:\r
+ for pcdTuple in GlobalData.BuildOptionPcd:\r
+ TokenSpaceGuid, Token, Field = pcdTuple[0], pcdTuple[1], pcdTuple[2]\r
+ if Field:\r
+ if (TokenSpaceGuid, Token) not in field_assign:\r
+ field_assign[TokenSpaceGuid, Token] = []\r
+ field_assign[TokenSpaceGuid, Token].append(pcdTuple)\r
+ else:\r
+ if (TokenSpaceGuid, Token) in field_assign:\r
+ delete_assign.extend(field_assign[TokenSpaceGuid, Token])\r
+ field_assign[TokenSpaceGuid, Token] = []\r
+ for item in delete_assign:\r
+ GlobalData.BuildOptionPcd.remove(item)\r
\r
@staticmethod\r
def HandleFlexiblePcd(TokenSpaceGuidCName, TokenCName, PcdValue, PcdDatumType, GuidDict, FieldName=''):\r
return PcdValue\r
\r
## Retrieve all PCD settings in platform\r
- def _GetPcds(self):\r
+ @property\r
+ def Pcds(self):\r
if self._Pcds is None:\r
self._Pcds = OrderedDict()\r
self.__ParsePcdFromCommandLine()\r
self._Pcds.update(self._GetDynamicVpdPcd(MODEL_PCD_DYNAMIC_EX_VPD))\r
\r
self._Pcds = self.CompletePcdValues(self._Pcds)\r
- self._Pcds = self.OverrideByFdfCommOverAll(self._Pcds)\r
+ self._Pcds = self.OverrideByFdfOverAll(self._Pcds)\r
+ self._Pcds = self.OverrideByCommOverAll(self._Pcds)\r
self._Pcds = self.UpdateStructuredPcds(MODEL_PCD_TYPE_LIST, self._Pcds)\r
self._Pcds = self.CompleteHiiPcdsDefaultStores(self._Pcds)\r
self._Pcds = self._FilterPcdBySkuUsage(self._Pcds)\r
return self._Pcds\r
\r
## Retrieve [BuildOptions]\r
- def _GetBuildOptions(self):\r
+ @property\r
+ def BuildOptions(self):\r
if self._BuildOptions is None:\r
self._BuildOptions = OrderedDict()\r
#\r
return structure_pcd_data\r
\r
@staticmethod\r
- def OverrideByFdfComm(StruPcds):\r
+ def OverrideByFdf(StruPcds,workspace):\r
+ if GlobalData.gFdfParser is None:\r
+ return StruPcds\r
+ StructurePcdInFdf = OrderedDict()\r
+ fdfpcd = GlobalData.gFdfParser.Profile.PcdDict\r
+ fdfpcdlocation = GlobalData.gFdfParser.Profile.PcdLocalDict\r
+ for item in fdfpcd :\r
+ if len(item[2]) and (item[0],item[1]) in StruPcds:\r
+ StructurePcdInFdf[(item[1],item[0],item[2] )] = fdfpcd[item]\r
+ GlobalPcds = {(item[0],item[1]) for item in StructurePcdInFdf}\r
+ for Pcd in StruPcds.values():\r
+ if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) not in GlobalPcds:\r
+ continue\r
+ FieldValues = OrderedDict()\r
+ for item in StructurePcdInFdf:\r
+ if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) == (item[0],item[1]) and item[2]:\r
+ FieldValues[item[2]] = StructurePcdInFdf[item]\r
+ for field in FieldValues:\r
+ if field not in Pcd.PcdFieldValueFromFdf:\r
+ Pcd.PcdFieldValueFromFdf[field] = ["","",""]\r
+ Pcd.PcdFieldValueFromFdf[field][0] = FieldValues[field]\r
+ Pcd.PcdFieldValueFromFdf[field][1] = os.path.relpath(fdfpcdlocation[(Pcd.TokenCName,Pcd.TokenSpaceGuidCName,field)][0],workspace)\r
+ Pcd.PcdFieldValueFromFdf[field][2] = fdfpcdlocation[(Pcd.TokenCName,Pcd.TokenSpaceGuidCName,field)][1]\r
+\r
+ return StruPcds\r
+\r
+ @staticmethod\r
+ def OverrideByComm(StruPcds):\r
StructurePcdInCom = OrderedDict()\r
for item in GlobalData.BuildOptionPcd:\r
if len(item) == 5 and (item[1], item[0]) in StruPcds:\r
Pcd.PcdFieldValueFromComm[field][2] = FieldValues[field][1][1]\r
return StruPcds\r
\r
- def OverrideByFdfCommOverAll(self, AllPcds):\r
+ def OverrideByCommOverAll(self,AllPcds):\r
def CheckStructureInComm(commpcds):\r
if not commpcds:\r
return False\r
if len(commpcds[0]) == 5:\r
return True\r
return False\r
-\r
+ NoFiledValues = OrderedDict()\r
if CheckStructureInComm(GlobalData.BuildOptionPcd):\r
- StructurePcdInCom = {(item[0], item[1], item[2] ):(item[3], item[4]) for item in GlobalData.BuildOptionPcd } if GlobalData.BuildOptionPcd else {}\r
- NoFiledValues = {(item[0], item[1]):StructurePcdInCom[item] for item in StructurePcdInCom if not item[2]}\r
+ StructurePcdInCom = OrderedDict()\r
+ for item in GlobalData.BuildOptionPcd:\r
+ StructurePcdInCom[(item[0], item[1], item[2] )] = (item[3], item[4])\r
+ for item in StructurePcdInCom:\r
+ if not item[2]:\r
+ NoFiledValues[(item[0], item[1])] = StructurePcdInCom[item]\r
else:\r
- NoFiledValues = {(item[0], item[1]):[item[2]] for item in GlobalData.BuildOptionPcd}\r
+ for item in GlobalData.BuildOptionPcd:\r
+ NoFiledValues[(item[0], item[1])] = [item[2]]\r
for Guid, Name in NoFiledValues:\r
if (Name, Guid) in AllPcds:\r
Pcd = AllPcds.get((Name, Guid))\r
if isinstance(self._DecPcds.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName), None), StructurePcd):\r
self._DecPcds.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName)).PcdValueFromComm = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
else:\r
- Pcd.PcdValueFromComm = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
- Pcd.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ Pcd.PcdValueFromComm = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ Pcd.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ else:\r
+ Pcd.PcdValueFromComm = StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])\r
+ Pcd.DefaultValue = StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])\r
for sku in Pcd.SkuInfoList:\r
SkuInfo = Pcd.SkuInfoList[sku]\r
if SkuInfo.DefaultValue:\r
- SkuInfo.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ SkuInfo.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ else:\r
+ SkuInfo.DefaultValue = StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])\r
else:\r
- SkuInfo.HiiDefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ SkuInfo.HiiDefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ else:\r
+ SkuInfo.HiiDefaultValue = StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])\r
for defaultstore in SkuInfo.DefaultStoreDict:\r
- SkuInfo.DefaultStoreDict[defaultstore] = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ SkuInfo.DefaultStoreDict[defaultstore] = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]\r
+ else:\r
+ SkuInfo.DefaultStoreDict[defaultstore] = StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])\r
if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII]]:\r
if Pcd.DatumType == TAB_VOID:\r
if not Pcd.MaxDatumSize:\r
else:\r
PcdInDec = self.DecPcds.get((Name, Guid))\r
if PcdInDec:\r
- PcdInDec.PcdValueFromComm = NoFiledValues[(Guid, Name)][0]\r
+ if PcdInDec.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ PcdInDec.PcdValueFromComm = NoFiledValues[(Guid, Name)][0]\r
+ else:\r
+ PcdInDec.PcdValueFromComm = StringToArray(NoFiledValues[(Guid, Name)][0])\r
+ if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],\r
+ self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE],\r
+ self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG],\r
+ self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC],\r
+ self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX]]:\r
+ self.Pcds[Name, Guid] = copy.deepcopy(PcdInDec)\r
+ if PcdInDec.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ self.Pcds[Name, Guid].DefaultValue = NoFiledValues[( Guid, Name)][0]\r
+ else:\r
+ self.Pcds[Name, Guid].DefaultValue = StringToArray(NoFiledValues[( Guid, Name)][0])\r
+ if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC],\r
+ self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX]]:\r
+ if PcdInDec.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ self.Pcds[Name, Guid].SkuInfoList = {TAB_DEFAULT:SkuInfoClass(TAB_DEFAULT, self.SkuIds[TAB_DEFAULT][0], '', '', '', '', '', NoFiledValues[( Guid, Name)][0])}\r
+ else:\r
+ self.Pcds[Name, Guid].SkuInfoList = {TAB_DEFAULT:SkuInfoClass(TAB_DEFAULT, self.SkuIds[TAB_DEFAULT][0], '', '', '', '', '', StringToArray(NoFiledValues[( Guid, Name)][0]))}\r
+ return AllPcds\r
+\r
+ def OverrideByFdfOverAll(self,AllPcds):\r
+\r
+ if GlobalData.gFdfParser is None:\r
+ return AllPcds\r
+ NoFiledValues = GlobalData.gFdfParser.Profile.PcdDict\r
+ for Name,Guid,Field in NoFiledValues:\r
+ if len(Field):\r
+ continue\r
+ Value = NoFiledValues[(Name,Guid,Field)]\r
+ if (Name,Guid) in AllPcds:\r
+ Pcd = AllPcds.get((Name,Guid))\r
+ if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName), None),StructurePcd):\r
+ self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName)).PcdValueFromComm = Value\r
+ else:\r
+ Pcd.PcdValueFromComm = Value\r
+ Pcd.DefaultValue = Value\r
+ for sku in Pcd.SkuInfoList:\r
+ SkuInfo = Pcd.SkuInfoList[sku]\r
+ if SkuInfo.DefaultValue:\r
+ SkuInfo.DefaultValue = Value\r
+ else:\r
+ SkuInfo.HiiDefaultValue = Value\r
+ for defaultstore in SkuInfo.DefaultStoreDict:\r
+ SkuInfo.DefaultStoreDict[defaultstore] = Value\r
+ if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII]]:\r
+ if Pcd.DatumType == TAB_VOID:\r
+ if not Pcd.MaxDatumSize:\r
+ Pcd.MaxDatumSize = '0'\r
+ CurrentSize = int(Pcd.MaxDatumSize,16) if Pcd.MaxDatumSize.upper().startswith("0X") else int(Pcd.MaxDatumSize)\r
+ OptionSize = len((StringToArray(Pcd.PcdValueFromComm)).split(","))\r
+ MaxSize = max(CurrentSize, OptionSize)\r
+ Pcd.MaxDatumSize = str(MaxSize)\r
+ else:\r
+ PcdInDec = self.DecPcds.get((Name,Guid))\r
+ if PcdInDec:\r
+ PcdInDec.PcdValueFromFdf = Value\r
if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],\r
self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE],\r
self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG]]:\r
self.Pcds[Name, Guid] = copy.deepcopy(PcdInDec)\r
- self.Pcds[Name, Guid].DefaultValue = NoFiledValues[( Guid, Name)][0]\r
+ self.Pcds[Name, Guid].DefaultValue = Value\r
return AllPcds\r
+\r
def UpdateStructuredPcds(self, TypeList, AllPcds):\r
\r
DynamicPcdType = [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT],\r
\r
Pcds = AllPcds\r
DefaultStoreMgr = DefaultStore(self.DefaultStores)\r
- SkuIds = self.SkuIdMgr.AvailableSkuIdSet\r
- SkuIds.update({TAB_DEFAULT:0})\r
+ SkuIds = self.SkuIds\r
DefaultStores = {storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict}\r
\r
S_PcdSet = []\r
File=self.MetaFile, Line = StrPcdSet[str_pcd][0][5])\r
# Add the Structure PCD that only defined in DEC, don't have override in DSC file\r
for Pcd in self.DecPcds:\r
- if type (self._DecPcds[Pcd]) is StructurePcd:\r
+ if isinstance(self._DecPcds[Pcd], StructurePcd):\r
if Pcd not in S_pcd_set:\r
str_pcd_obj_str = StructurePcd()\r
str_pcd_obj_str.copy(self._DecPcds[Pcd])\r
NoDefault = True\r
break\r
nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
- stru_pcd.SkuOverrideValues[skuid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for defaultstorename in DefaultStores} if DefaultStores else {TAB_DEFAULT_STORES_DEFAULT:stru_pcd.DefaultValues})\r
+ stru_pcd.SkuOverrideValues[skuid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for defaultstorename in DefaultStores} if DefaultStores else {}) #{TAB_DEFAULT_STORES_DEFAULT:stru_pcd.DefaultValues})\r
if not NoDefault:\r
stru_pcd.ValueChain.add((skuid, ''))\r
if stru_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]:\r
stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorename])\r
stru_pcd.ValueChain.add((skuid, defaultstoreid))\r
- S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set)\r
+ S_pcd_set = DscBuildData.OverrideByFdf(S_pcd_set,self.WorkspaceDir)\r
+ S_pcd_set = DscBuildData.OverrideByComm(S_pcd_set)\r
Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set)\r
if Str_Pcd_Values:\r
for (skuname, StoreName, PcdGuid, PcdName, PcdValue) in Str_Pcd_Values:\r
\r
str_pcd_obj.MaxDatumSize = self.GetStructurePcdMaxSize(str_pcd_obj)\r
Pcds[str_pcd_obj.TokenCName, str_pcd_obj.TokenSpaceGuidCName] = str_pcd_obj\r
+ Pcds[str_pcd_obj.TokenCName, str_pcd_obj.TokenSpaceGuidCName].CustomAttribute['IsStru']=True\r
\r
for pcdkey in Pcds:\r
pcd = Pcds[pcdkey]\r
if Setting is None:\r
continue\r
PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
+ if MaxDatumSize:\r
+ if int(MaxDatumSize, 0) > 0xFFFF:\r
+ EdkLogger.error('build', FORMAT_INVALID, "The size value must not exceed the maximum value of 0xFFFF (UINT16) for %s." % ".".join((TokenSpaceGuid, PcdCName)),\r
+ File=self.MetaFile, Line=Dummy4)\r
+ if int(MaxDatumSize, 0) < 0:\r
+ EdkLogger.error('build', FORMAT_INVALID, "The size value can't be set to negative value for %s." % ".".join((TokenSpaceGuid, PcdCName)),\r
+ File=self.MetaFile, Line=Dummy4)\r
if (PcdCName, TokenSpaceGuid) in PcdValueDict:\r
PcdValueDict[PcdCName, TokenSpaceGuid][SkuName] = (PcdValue, DatumType, MaxDatumSize)\r
else:\r
PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue, DatumType, MaxDatumSize)}\r
\r
for ((PcdCName, TokenSpaceGuid), PcdSetting) in PcdValueDict.iteritems():\r
- PcdValue = None\r
- DatumType = None\r
- MaxDatumSize = None\r
- if TAB_COMMON in PcdSetting:\r
- PcdValue, DatumType, MaxDatumSize = PcdSetting[TAB_COMMON]\r
- if TAB_DEFAULT in PcdSetting:\r
- PcdValue, DatumType, MaxDatumSize = PcdSetting[TAB_DEFAULT]\r
if self.SkuIdMgr.SystemSkuId in PcdSetting:\r
PcdValue, DatumType, MaxDatumSize = PcdSetting[self.SkuIdMgr.SystemSkuId]\r
+ elif TAB_DEFAULT in PcdSetting:\r
+ PcdValue, DatumType, MaxDatumSize = PcdSetting[TAB_DEFAULT]\r
+ elif TAB_COMMON in PcdSetting:\r
+ PcdValue, DatumType, MaxDatumSize = PcdSetting[TAB_COMMON]\r
+ else:\r
+ PcdValue = None\r
+ DatumType = None\r
+ MaxDatumSize = None\r
\r
Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
PcdCName,\r
None,\r
IsDsc=True)\r
\r
-\r
+ if self.SkuIdMgr.SystemSkuId not in Pcds[PcdCName, TokenSpaceGuid].DscRawValue:\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[self.SkuIdMgr.SystemSkuId] = {}\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[self.SkuIdMgr.SystemSkuId][TAB_DEFAULT_STORES_DEFAULT] = PcdValue\r
return Pcds\r
\r
def GetStructurePcdMaxSize(self, str_pcd):\r
while '[' in FieldName:\r
FieldName = FieldName.rsplit('[', 1)[0]\r
CApp = CApp + ' __FLEXIBLE_SIZE(*Size, %s, %s, %d); // From %s Line %d Value %s \n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1, FieldList[FieldName_ori][1], FieldList[FieldName_ori][2], FieldList[FieldName_ori][0])\r
+ if Pcd.PcdFieldValueFromFdf:\r
+ CApp = CApp + "// From fdf \n"\r
+ for FieldName in Pcd.PcdFieldValueFromFdf:\r
+ FieldName = "." + FieldName\r
+ IsArray = IsFieldValueAnArray(Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][0])\r
+ if IsArray and not (Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][0].startswith('{GUID') and Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][0].endswith('}')):\r
+ try:\r
+ Value = ValueExpressionEx(Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][0], TAB_VOID, self._GuidDict)(True)\r
+ except BadExpression:\r
+ EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " %\r
+ (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName.strip('.'))), Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][1], Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][2]))\r
+ Value, ValueSize = ParseFieldValue(Value)\r
+ CApp = CApp + ' __FLEXIBLE_SIZE(*Size, %s, %s, %d / __ARRAY_ELEMENT_SIZE(%s, %s) + ((%d %% __ARRAY_ELEMENT_SIZE(%s, %s)) ? 1 : 0)); // From %s Line %d Value %s\n' % (Pcd.DatumType, FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."), Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][1], Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][2], Pcd.PcdFieldValueFromFdf[FieldName.strip(".")][0]);\r
+ else:\r
+ NewFieldName = ''\r
+ FieldName_ori = FieldName.strip('.')\r
+ while '[' in FieldName:\r
+ NewFieldName = NewFieldName + FieldName.split('[', 1)[0] + '[0]'\r
+ ArrayIndex = int(FieldName.split('[', 1)[1].split(']', 1)[0])\r
+ FieldName = FieldName.split(']', 1)[1]\r
+ FieldName = NewFieldName + FieldName\r
+ while '[' in FieldName:\r
+ FieldName = FieldName.rsplit('[', 1)[0]\r
+ CApp = CApp + ' __FLEXIBLE_SIZE(*Size, %s, %s, %d); // From %s Line %s Value %s \n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1, Pcd.PcdFieldValueFromFdf[FieldName_ori][1], Pcd.PcdFieldValueFromFdf[FieldName_ori][2], Pcd.PcdFieldValueFromFdf[FieldName_ori][0])\r
if Pcd.PcdFieldValueFromComm:\r
CApp = CApp + "// From Command Line \n"\r
for FieldName in Pcd.PcdFieldValueFromComm:\r
#\r
CApp = CApp + ' FieldSize = __FIELD_SIZE(%s, %s);\n' % (Pcd.DatumType, FieldName)\r
CApp = CApp + ' Value = %s; // From %s Line %d Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ CApp = CApp + ' __STATIC_ASSERT((__FIELD_SIZE(%s, %s) >= %d) || (__FIELD_SIZE(%s, %s) == 0), "Input buffer exceeds the buffer array"); // From %s Line %d Value %s\n' % (Pcd.DatumType, FieldName, ValueSize, Pcd.DatumType, FieldName, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
CApp = CApp + ' memcpy (&Pcd->%s, Value, (FieldSize > 0 && FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize)\r
else:\r
+ if '[' in FieldName and ']' in FieldName:\r
+ Index = int(FieldName.split('[')[1].split(']')[0])\r
+ CApp = CApp + ' __STATIC_ASSERT((%d < __ARRAY_SIZE(Pcd->%s)) || (__ARRAY_SIZE(Pcd->%s) == 0), "array index exceeds the array number"); // From %s Line %d Index of %s\n' % (Index, FieldName.split('[')[0], FieldName.split('[')[0], FieldList[FieldName][1], FieldList[FieldName][2], FieldName)\r
if ValueSize > 4:\r
CApp = CApp + ' Pcd->%s = %dULL; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
else:\r
CApp = CApp + "// SkuName: %s, DefaultStoreName: %s \n" % (TAB_DEFAULT, TAB_DEFAULT_STORES_DEFAULT)\r
inherit_OverrideValues = Pcd.SkuOverrideValues[SkuName]\r
if (SkuName, DefaultStoreName) == (TAB_DEFAULT, TAB_DEFAULT_STORES_DEFAULT):\r
- pcddefaultvalue = Pcd.DefaultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue\r
+ pcddefaultvalue = Pcd.DefaultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT) if Pcd.DefaultFromDSC else None\r
else:\r
- if not Pcd.DscRawValue:\r
- # handle the case that structure pcd is not appear in DSC\r
- self.CopyDscRawValue(Pcd)\r
pcddefaultvalue = Pcd.DscRawValue.get(SkuName, {}).get(DefaultStoreName)\r
for FieldList in [pcddefaultvalue, inherit_OverrideValues.get(DefaultStoreName)]:\r
if not FieldList:\r
IsArray = IsFieldValueAnArray(FieldList[FieldName][0])\r
if IsArray:\r
try:\r
- FieldList[FieldName][0] = ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, self._GuidDict)(True)\r
+ FieldValue = ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, self._GuidDict)(True)\r
except BadExpression:\r
EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " %\r
(".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))\r
try:\r
- Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
+ if IsArray:\r
+ Value, ValueSize = ParseFieldValue (FieldValue)\r
+ else:\r
+ Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
except Exception:\r
EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))\r
if isinstance(Value, str):\r
#\r
CApp = CApp + ' FieldSize = __FIELD_SIZE(%s, %s);\n' % (Pcd.DatumType, FieldName)\r
CApp = CApp + ' Value = %s; // From %s Line %d Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ CApp = CApp + ' __STATIC_ASSERT((__FIELD_SIZE(%s, %s) >= %d) || (__FIELD_SIZE(%s, %s) == 0), "Input buffer exceeds the buffer array"); // From %s Line %d Value %s\n' % (Pcd.DatumType, FieldName, ValueSize, Pcd.DatumType, FieldName, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
CApp = CApp + ' memcpy (&Pcd->%s, Value, (FieldSize > 0 && FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize)\r
else:\r
+ if '[' in FieldName and ']' in FieldName:\r
+ Index = int(FieldName.split('[')[1].split(']')[0])\r
+ CApp = CApp + ' __STATIC_ASSERT((%d < __ARRAY_SIZE(Pcd->%s)) || (__ARRAY_SIZE(Pcd->%s) == 0), "array index exceeds the array number"); // From %s Line %d Index of %s\n' % (Index, FieldName.split('[')[0], FieldName.split('[')[0], FieldList[FieldName][1], FieldList[FieldName][2], FieldName)\r
if ValueSize > 4:\r
CApp = CApp + ' Pcd->%s = %dULL; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
else:\r
def GenerateCommandLineValueStatement(Pcd):\r
CApp = ' Assign_%s_%s_CommandLine_Value(Pcd);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
return CApp\r
+ def GenerateFdfValue(self,Pcd):\r
+ CApp = "// Value in Fdf\n"\r
+ CApp = CApp + "void Assign_%s_%s_Fdf_Value(%s *Pcd){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,Pcd.DatumType)\r
+ CApp = CApp + ' UINT32 FieldSize;\n'\r
+ CApp = CApp + ' CHAR8 *Value;\n'\r
+\r
+ pcddefaultvalue = Pcd.PcdValueFromFdf\r
+ for FieldList in [pcddefaultvalue,Pcd.PcdFieldValueFromFdf]:\r
+ if not FieldList:\r
+ continue\r
+ if pcddefaultvalue and FieldList == pcddefaultvalue:\r
+ IsArray = IsFieldValueAnArray(FieldList)\r
+ if IsArray:\r
+ try:\r
+ FieldList = ValueExpressionEx(FieldList, TAB_VOID)(True)\r
+ except BadExpression:\r
+ EdkLogger.error("Build", FORMAT_INVALID, "Invalid value format for %s.%s, from Fdf: %s" %\r
+ (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldList))\r
+ Value, ValueSize = ParseFieldValue (FieldList)\r
+\r
+ if isinstance(Value, str):\r
+ CApp = CApp + ' Pcd = %s; // From Fdf \n' % (Value)\r
+ elif IsArray:\r
+ #\r
+ # Use memcpy() to copy value into field\r
+ #\r
+ CApp = CApp + ' Value = %s; // From Fdf .\n' % (DscBuildData.IntToCString(Value, ValueSize))\r
+ CApp = CApp + ' memcpy (Pcd, Value, %d);\n' % (ValueSize)\r
+ continue\r
+ for FieldName in FieldList:\r
+ IsArray = IsFieldValueAnArray(FieldList[FieldName][0])\r
+ if IsArray:\r
+ try:\r
+ FieldList[FieldName][0] = ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, self._GuidDict)(True)\r
+ except BadExpression:\r
+ EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " %\r
+ (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))\r
+ except:\r
+ print("error")\r
+ try:\r
+ Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
+ except Exception:\r
+ EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName,FieldName)),FieldList[FieldName][1], FieldList[FieldName][2]))\r
+ if isinstance(Value, str):\r
+ CApp = CApp + ' Pcd->%s = %s; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ elif IsArray:\r
+ #\r
+ # Use memcpy() to copy value into field\r
+ #\r
+ CApp = CApp + ' FieldSize = __FIELD_SIZE(%s, %s);\n' % (Pcd.DatumType, FieldName)\r
+ CApp = CApp + ' Value = %s; // From %s Line %d Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ CApp = CApp + ' memcpy (&Pcd->%s, Value, (FieldSize > 0 && FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize)\r
+ else:\r
+ if ValueSize > 4:\r
+ CApp = CApp + ' Pcd->%s = %dULL; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ else:\r
+ CApp = CApp + ' Pcd->%s = %d; // From %s Line %s Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ CApp = CApp + "}\n"\r
+ return CApp\r
+\r
+ @staticmethod\r
+ def GenerateFdfValueStatement(Pcd):\r
+ CApp = ' Assign_%s_%s_Fdf_Value(Pcd);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+ return CApp\r
\r
def GenerateInitializeFunc(self, SkuName, DefaultStore, Pcd, InitByteValue, CApp):\r
OverrideValues = {DefaultStore:""}\r
if Pcd.SkuOverrideValues:\r
OverrideValues = Pcd.SkuOverrideValues[SkuName]\r
+ if not OverrideValues:\r
+ OverrideValues = {TAB_DEFAULT_STORES_DEFAULT:Pcd.DefaultValues}\r
for DefaultStoreName in OverrideValues:\r
CApp = CApp + 'void\n'\r
CApp = CApp + 'Initialize_%s_%s_%s_%s(\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
else:\r
CApp = CApp + "// SkuName: %s, DefaultStoreName: STANDARD \n" % self.SkuIdMgr.SystemSkuId\r
CApp = CApp + DscBuildData.GenerateInitValueStatement(Pcd, self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT)\r
+ CApp = CApp + DscBuildData.GenerateFdfValueStatement(Pcd)\r
CApp = CApp + DscBuildData.GenerateCommandLineValueStatement(Pcd)\r
#\r
# Set new PCD value and size\r
CApp = CApp + '}\n'\r
CApp = CApp + '\n'\r
return InitByteValue, CApp\r
+ def SkuOverrideValuesEmpty(self,OverrideValues):\r
+ if not OverrideValues:\r
+ return True\r
+ for key in OverrideValues:\r
+ if OverrideValues[key]:\r
+ return False\r
+ return True\r
\r
def GenerateByteArrayValue (self, StructuredPcds):\r
#\r
Pcd = StructuredPcds[PcdName]\r
CApp = CApp + self.GenerateSizeFunction(Pcd)\r
CApp = CApp + self.GenerateDefaultValueAssignFunction(Pcd)\r
+ CApp = CApp + self.GenerateFdfValue(Pcd)\r
CApp = CApp + self.GenerateCommandLineValue(Pcd)\r
- if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],\r
+ if self.SkuOverrideValuesEmpty(Pcd.SkuOverrideValues) or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],\r
self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:\r
CApp = CApp + self.GenerateInitValueFunction(Pcd, self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT)\r
else:\r
continue\r
for DefaultStoreName in Pcd.SkuOverrideValues[SkuName]:\r
CApp = CApp + self.GenerateInitValueFunction(Pcd, SkuName, DefaultStoreName)\r
- if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],\r
+ if self.SkuOverrideValuesEmpty(Pcd.SkuOverrideValues) or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],\r
self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:\r
InitByteValue, CApp = self.GenerateInitializeFunc(self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT, Pcd, InitByteValue, CApp)\r
else:\r
CApp = CApp + ' )\n'\r
CApp = CApp + '{\n'\r
for Pcd in StructuredPcds.values():\r
- if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:\r
+ if self.SkuOverrideValuesEmpty(Pcd.SkuOverrideValues) or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:\r
CApp = CApp + ' Initialize_%s_%s_%s_%s();\n' % (self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
else:\r
for SkuName in self.SkuIdMgr.SkuOverrideOrder():\r
- if SkuName not in Pcd.SkuOverrideValues:\r
+ if SkuName not in self.SkuIdMgr.AvailableSkuIdSet:\r
continue\r
for DefaultStoreName in Pcd.SkuOverrideValues[SkuName]:\r
CApp = CApp + ' Initialize_%s_%s_%s_%s();\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
'include $(MAKEROOT)/Makefiles/app.makefile\n' + 'INCLUDE +='\r
\r
IncSearchList = []\r
- PlatformInc = {}\r
+ PlatformInc = OrderedDict()\r
for Cache in self._Bdb._CACHE_.values():\r
if Cache.MetaFile.Ext.lower() != '.dec':\r
continue\r
CC_FLAGS = LinuxCFLAGS\r
if sys.platform == "win32":\r
CC_FLAGS = WindowsCFLAGS\r
- BuildOptions = {}\r
+ BuildOptions = OrderedDict()\r
for Options in self.BuildOptions:\r
if Options[2] != EDKII_NAME:\r
continue\r
if Tag == "*" or Tag == self._Toolchain:\r
if Arch == "*" or Arch == self.Arch:\r
if Tool not in BuildOptions:\r
- BuildOptions[Tool] = {}\r
+ BuildOptions[Tool] = OrderedDict()\r
if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or self.BuildOptions[Options].startswith('='):\r
BuildOptions[Tool][Attr] = self.BuildOptions[Options]\r
else:\r
Messages = StdErr\r
Messages = Messages.split('\n')\r
MessageGroup = []\r
- if returncode <>0:\r
+ if returncode != 0:\r
CAppBaseFileName = os.path.join(self.OutputPath, PcdValueInitName)\r
File = open (CAppBaseFileName + '.c', 'r')\r
FileData = File.readlines()\r
continue\r
\r
PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
+ if MaxDatumSize:\r
+ if int(MaxDatumSize, 0) > 0xFFFF:\r
+ EdkLogger.error('build', FORMAT_INVALID, "The size value must not exceed the maximum value of 0xFFFF (UINT16) for %s." % ".".join((TokenSpaceGuid, PcdCName)),\r
+ File=self.MetaFile, Line=Dummy4)\r
+ if int(MaxDatumSize, 0) < 0:\r
+ EdkLogger.error('build', FORMAT_INVALID, "The size value can't be set to negative value for %s." % ".".join((TokenSpaceGuid, PcdCName)),\r
+ File=self.MetaFile, Line=Dummy4)\r
SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', '', PcdValue)\r
if (PcdCName, TokenSpaceGuid) in Pcds:\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
PcdValue,\r
'',\r
MaxDatumSize,\r
- {SkuName : SkuInfo},\r
+ OrderedDict({SkuName : SkuInfo}),\r
False,\r
None,\r
IsDsc=True)\r
\r
+ if SkuName not in Pcds[PcdCName, TokenSpaceGuid].DscRawValue:\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName] = {}\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName][TAB_DEFAULT_STORES_DEFAULT] = PcdValue\r
+\r
for pcd in Pcds.values():\r
pcdDecObject = self._DecPcds[pcd.TokenCName, pcd.TokenSpaceGuidCName]\r
# Only fix the value while no value provided in DSC file.\r
else:\r
return False\r
\r
- def CopyDscRawValue(self, Pcd):\r
- if Pcd.DscRawValue is None:\r
- Pcd.DscRawValue = dict()\r
- if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:\r
- if self.SkuIdMgr.SystemSkuId not in Pcd.DscRawValue:\r
- Pcd.DscRawValue[self.SkuIdMgr.SystemSkuId] = {}\r
- Pcd.DscRawValue[self.SkuIdMgr.SystemSkuId][TAB_DEFAULT_STORES_DEFAULT] = Pcd.DefaultValue\r
- for skuname in Pcd.SkuInfoList:\r
- Pcd.DscRawValue[skuname] = {}\r
- if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
- for defaultstore in Pcd.SkuInfoList[skuname].DefaultStoreDict:\r
- Pcd.DscRawValue[skuname][defaultstore] = Pcd.SkuInfoList[skuname].DefaultStoreDict[defaultstore]\r
- else:\r
- Pcd.DscRawValue[skuname][TAB_DEFAULT_STORES_DEFAULT] = Pcd.SkuInfoList[skuname].DefaultValue\r
def CompletePcdValues(self, PcdSet):\r
- Pcds = {}\r
+ Pcds = OrderedDict()\r
DefaultStoreObj = DefaultStore(self._GetDefaultStores())\r
SkuIds = {skuname:skuid for skuname, skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname != TAB_COMMON}\r
DefaultStores = set(storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict)\r
for PcdCName, TokenSpaceGuid in PcdSet:\r
PcdObj = PcdSet[(PcdCName, TokenSpaceGuid)]\r
- self.CopyDscRawValue(PcdObj)\r
+\r
if PcdObj.Type not in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT],\r
self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],\r
self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_VPD],\r
VariableAttrs = {}\r
\r
Pcds = OrderedDict()\r
+ UserDefinedDefaultStores = []\r
#\r
# tdict is a special dict kind of type, used for selecting correct\r
# PCD settings for certain ARCH and SKU\r
DefaultStore = DefaultStore.upper()\r
if DefaultStore == TAB_COMMON:\r
DefaultStore = TAB_DEFAULT_STORES_DEFAULT\r
+ else:\r
+ #The end user define [DefaultStores] and [SKUID_IDENTIFIER.Menufacturing] in DSC\r
+ UserDefinedDefaultStores.append((PcdCName, TokenSpaceGuid))\r
if SkuName not in AvailableSkuIdSet:\r
EdkLogger.error('build', PARAMETER_INVALID, 'Sku %s is not defined in [SkuIds] section' % SkuName,\r
File=self.MetaFile, Line=Dummy5)\r
pcdObject.SkuInfoList[SkuName] = SkuInfo\r
else:\r
SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute, DefaultStore={DefaultStore:DefaultValue})\r
- Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
+ PcdClassObj = PcdClassObject(\r
PcdCName,\r
TokenSpaceGuid,\r
self._PCD_TYPE_STRING_[Type],\r
DefaultValue,\r
'',\r
'',\r
- {SkuName : SkuInfo},\r
+ OrderedDict({SkuName : SkuInfo}),\r
False,\r
None,\r
pcdDecObject.validateranges,\r
pcdDecObject.validlists,\r
pcdDecObject.expressions,\r
IsDsc=True)\r
-\r
-\r
+ if (PcdCName, TokenSpaceGuid) in UserDefinedDefaultStores:\r
+ PcdClassObj.UserDefinedDefaultStoresFlag = True\r
+ Pcds[PcdCName, TokenSpaceGuid] = PcdClassObj\r
+\r
+ Pcds[PcdCName, TokenSpaceGuid].CustomAttribute['DscPosition'] = int(Dummy4)\r
+ if SkuName not in Pcds[PcdCName, TokenSpaceGuid].DscRawValue:\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName] = {}\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName][DefaultStore] = DefaultValue\r
for pcd in Pcds.values():\r
SkuInfoObj = pcd.SkuInfoList.values()[0]\r
pcdDecObject = self._DecPcds[pcd.TokenCName, pcd.TokenSpaceGuidCName]\r
# until the DEC parser has been called.\r
#\r
VpdOffset, MaxDatumSize, InitialValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
+ if MaxDatumSize:\r
+ if int(MaxDatumSize, 0) > 0xFFFF:\r
+ EdkLogger.error('build', FORMAT_INVALID, "The size value must not exceed the maximum value of 0xFFFF (UINT16) for %s." % ".".join((TokenSpaceGuid, PcdCName)),\r
+ File=self.MetaFile, Line=Dummy4)\r
+ if int(MaxDatumSize, 0) < 0:\r
+ EdkLogger.error('build', FORMAT_INVALID, "The size value can't be set to negative value for %s." % ".".join((TokenSpaceGuid, PcdCName)),\r
+ File=self.MetaFile, Line=Dummy4)\r
SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', VpdOffset, InitialValue)\r
if (PcdCName, TokenSpaceGuid) in Pcds:\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
InitialValue,\r
'',\r
MaxDatumSize,\r
- {SkuName : SkuInfo},\r
+ OrderedDict({SkuName : SkuInfo}),\r
False,\r
None,\r
IsDsc=True)\r
+\r
+ if SkuName not in Pcds[PcdCName, TokenSpaceGuid].DscRawValue:\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName] = {}\r
+ Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName][TAB_DEFAULT_STORES_DEFAULT] = InitialValue\r
for pcd in Pcds.values():\r
SkuInfoObj = pcd.SkuInfoList.values()[0]\r
pcdDecObject = self._DecPcds[pcd.TokenCName, pcd.TokenSpaceGuidCName]\r
Module.MetaFile = FilePath\r
self.Modules.append(Module)\r
\r
- def _GetToolChainFamily(self):\r
- self._ToolChainFamily = "MSFT"\r
+ @property\r
+ def ToolChainFamily(self):\r
+ self._ToolChainFamily = TAB_COMPILER_MSFT\r
BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, "target.txt"))\r
if os.path.isfile(BuildConfigurationFile) == True:\r
TargetTxt = TargetTxtClassObject()\r
if TAB_TOD_DEFINES_FAMILY not in ToolDefinition \\r
or self._Toolchain not in ToolDefinition[TAB_TOD_DEFINES_FAMILY] \\r
or not ToolDefinition[TAB_TOD_DEFINES_FAMILY][self._Toolchain]:\r
- self._ToolChainFamily = "MSFT"\r
+ self._ToolChainFamily = TAB_COMPILER_MSFT\r
else:\r
self._ToolChainFamily = ToolDefinition[TAB_TOD_DEFINES_FAMILY][self._Toolchain]\r
return self._ToolChainFamily\r
if (Name, Guid) not in self.Pcds:\r
self.Pcds[Name, Guid] = PcdClassObject(Name, Guid, '', '', '', '', '', {}, False, None)\r
self.Pcds[Name, Guid].DefaultValue = Value\r
+\r
@property\r
def DecPcds(self):\r
if self._DecPcds is None:\r
PkgSet.update(ModuleData.Packages)\r
self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain, PkgSet)\r
return self._DecPcds\r
- _Macros = property(_GetMacros)\r
- Arch = property(_GetArch, _SetArch)\r
- Platform = property(_GetPlatformName)\r
- PlatformName = property(_GetPlatformName)\r
- Guid = property(_GetFileGuid)\r
- Version = property(_GetVersion)\r
- DscSpecification = property(_GetDscSpec)\r
- OutputDirectory = property(_GetOutpuDir)\r
- SupArchList = property(_GetSupArch)\r
- BuildTargets = property(_GetBuildTarget)\r
- SkuName = property(_GetSkuName, _SetSkuName)\r
- PcdInfoFlag = property(_GetPcdInfoFlag)\r
- VarCheckFlag = property(_GetVarCheckFlag)\r
- FlashDefinition = property(_GetFdfFile)\r
- Prebuild = property(_GetPrebuild)\r
- Postbuild = property(_GetPostbuild)\r
- BuildNumber = property(_GetBuildNumber)\r
- MakefileName = property(_GetMakefileName)\r
- BsBaseAddress = property(_GetBsBaseAddress)\r
- RtBaseAddress = property(_GetRtBaseAddress)\r
- LoadFixAddress = property(_GetLoadFixAddress)\r
- RFCLanguages = property(_GetRFCLanguages)\r
- ISOLanguages = property(_GetISOLanguages)\r
- VpdToolGuid = property(_GetVpdToolGuid)\r
- SkuIds = property(_GetSkuIds)\r
- Modules = property(_GetModules)\r
- LibraryInstances = property(_GetLibraryInstances)\r
- LibraryClasses = property(_GetLibraryClasses)\r
- Pcds = property(_GetPcds)\r
- BuildOptions = property(_GetBuildOptions)\r
- ToolChainFamily = property(_GetToolChainFamily)\r
projects / mirror_edk2.git / blobdiff