self.OutputPath = os.path.dirname(self.DscFile)\r
self.DefaultStores = None\r
self.SkuIdMgr = SkuClass(self.SkuName, self.SkuIds)\r
- arraystr = self.SkuIdMgr.DumpSkuIdArrary()\r
\r
## XXX[key] = value\r
def __setitem__(self, key, value):\r
## Override SKUID_IDENTIFIER\r
def _SetSkuName(self, Value):\r
self._SkuName = Value\r
- self._Pcds = None\r
\r
def _GetFdfFile(self):\r
if self._FlashDefinition == None:\r
skuobj.DefaultStoreDict['STANDARD'] = copy.deepcopy(skuobj.DefaultStoreDict[mindefaultstorename])\r
return Pcds\r
\r
+ def RecoverCommandLinePcd(self):\r
+ pcdset = []\r
+ if GlobalData.BuildOptionPcd:\r
+ for pcd in GlobalData.BuildOptionPcd:\r
+ if pcd[2] == "":\r
+ pcdset.append((pcd[0],pcd[1],pcd[3]))\r
+ else:\r
+ pcdobj = self._Pcds.get((pcd[1],pcd[0]))\r
+ if pcdobj:\r
+ pcdset.append((pcd[0],pcd[1], pcdobj.DefaultValue))\r
+ else:\r
+ pcdset.append((pcd[0],pcd[1],pcd[3]))\r
+ GlobalData.BuildOptionPcd = pcdset\r
+ def GetFieldValueFromComm(self,ValueStr,TokenSpaceGuidCName, TokenCName, FieldName):\r
+ PredictedFieldType = "VOID*"\r
+ if ValueStr.startswith('L'):\r
+ if not ValueStr[1]:\r
+ EdkLogger.error("build", FORMAT_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", H"{...}"')\r
+ ValueStr = ValueStr[0] + '"' + ValueStr[1:] + '"'\r
+ PredictedFieldType = "VOID*"\r
+ elif ValueStr.startswith('H') or ValueStr.startswith('{'):\r
+ EdkLogger.error("build", FORMAT_INVALID, 'Currently we do not support assign H"{...}" format for Pcd field.', ExtraData="%s.%s.%s from command line" % (TokenSpaceGuidCName, TokenCName, FieldName))\r
+ ValueStr = ValueStr[1:]\r
+ PredictedFieldType = "VOID*"\r
+ elif ValueStr.upper() in ['TRUE', '0X1', '0X01', '1', 'FALSE', '0X0', '0X00', '0']:\r
+ PredictedFieldType = "BOOLEAN"\r
+ elif ValueStr.isdigit() or ValueStr.upper().startswith('0X'):\r
+ PredictedFieldType = TAB_UINT16\r
+ else:\r
+ if not ValueStr[0]:\r
+ EdkLogger.error("build", FORMAT_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", H"{...}"')\r
+ ValueStr = '"' + ValueStr + '"'\r
+ PredictedFieldType = "VOID*"\r
+ IsValid, Cause = CheckPcdDatum(PredictedFieldType, ValueStr)\r
+ if not IsValid:\r
+ EdkLogger.error("build", FORMAT_INVALID, Cause, ExtraData="%s.%s.%s from command line" % (TokenSpaceGuidCName, TokenCName, FieldName))\r
+ if PredictedFieldType == 'BOOLEAN':\r
+ ValueStr = ValueStr.upper()\r
+ if ValueStr == 'TRUE' or ValueStr == '1':\r
+ ValueStr = '1'\r
+ elif ValueStr == 'FALSE' or ValueStr == '0':\r
+ ValueStr = '0'\r
+ return ValueStr\r
+ def __ParsePcdFromCommandLine(self):\r
+ if GlobalData.BuildOptionPcd:\r
+ for i, pcd in enumerate(GlobalData.BuildOptionPcd):\r
+ if type(pcd) is tuple:\r
+ continue\r
+ (pcdname, pcdvalue) = pcd.split('=')\r
+ if not pcdvalue:\r
+ EdkLogger.error('build', AUTOGEN_ERROR, "No Value specified for the PCD %s." % (pcdname))\r
+ if '.' in pcdname:\r
+ (Name1, Name2) = pcdname.split('.',1)\r
+ if "." in Name2:\r
+ (Name3, FieldName) = Name2.split(".",1)\r
+ if ((Name3,Name1)) in self.DecPcds:\r
+ HasTokenSpace = True\r
+ TokenCName = Name3\r
+ TokenSpaceGuidCName = Name1\r
+ else:\r
+ FieldName = Name2\r
+ TokenCName = Name1\r
+ TokenSpaceGuidCName = ''\r
+ HasTokenSpace = False\r
+ else:\r
+ if ((Name2,Name1)) in self.DecPcds:\r
+ HasTokenSpace = True\r
+ TokenCName = Name2\r
+ TokenSpaceGuidCName = Name1\r
+ FieldName =""\r
+ else:\r
+ FieldName = Name2\r
+ TokenCName = Name1\r
+ TokenSpaceGuidCName = ''\r
+ HasTokenSpace = False\r
+ else:\r
+ FieldName = ""\r
+ TokenCName = pcdname\r
+ TokenSpaceGuidCName = ''\r
+ HasTokenSpace = False\r
+ TokenSpaceGuidCNameList = []\r
+ FoundFlag = False\r
+ PcdDatumType = ''\r
+ NewValue = ''\r
+ if not HasTokenSpace:\r
+ for key in self.DecPcds:\r
+ if TokenCName == key[0]:\r
+ if TokenSpaceGuidCName:\r
+ EdkLogger.error(\r
+ 'build',\r
+ AUTOGEN_ERROR,\r
+ "The Pcd %s is found under multiple different TokenSpaceGuid: %s and %s." % (TokenCName, TokenSpaceGuidCName, key[1])\r
+ )\r
+ else:\r
+ TokenSpaceGuidCName = key[1]\r
+ FoundFlag = True\r
+ else:\r
+ if (TokenCName, TokenSpaceGuidCName) in self.DecPcds:\r
+ FoundFlag = True\r
+ if FieldName:\r
+ NewValue = self.GetFieldValueFromComm(pcdvalue, TokenSpaceGuidCName, TokenCName, FieldName)\r
+ GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, FieldName,NewValue,("build command options",1))\r
+ else:\r
+ for key in self.DecPcds:\r
+ PcdItem = self.DecPcds[key]\r
+ if HasTokenSpace:\r
+ if (PcdItem.TokenCName, PcdItem.TokenSpaceGuidCName) == (TokenCName, TokenSpaceGuidCName):\r
+ PcdDatumType = PcdItem.DatumType\r
+ if pcdvalue.startswith('H'):\r
+ try:\r
+ pcdvalue = ValueExpressionEx(pcdvalue[1:], PcdDatumType, self._GuidDict)(True)\r
+ except BadExpression, Value:\r
+ if Value.result > 1:\r
+ EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %\r
+ (TokenSpaceGuidCName, TokenCName, pcdvalue, Value))\r
+ pcdvalue = 'H' + pcdvalue\r
+ NewValue = BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)\r
+ FoundFlag = True\r
+ else:\r
+ if PcdItem.TokenCName == TokenCName:\r
+ if not PcdItem.TokenSpaceGuidCName in TokenSpaceGuidCNameList:\r
+ if len (TokenSpaceGuidCNameList) < 1:\r
+ TokenSpaceGuidCNameList.append(PcdItem.TokenSpaceGuidCName)\r
+ PcdDatumType = PcdItem.DatumType\r
+ TokenSpaceGuidCName = PcdItem.TokenSpaceGuidCName\r
+ if pcdvalue.startswith('H'):\r
+ try:\r
+ pcdvalue = ValueExpressionEx(pcdvalue[1:], PcdDatumType, self._GuidDict)(True)\r
+ except BadExpression, Value:\r
+ EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %\r
+ (TokenSpaceGuidCName, TokenCName, pcdvalue, Value))\r
+ pcdvalue = 'H' + pcdvalue\r
+ NewValue = BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)\r
+ FoundFlag = True\r
+ else:\r
+ EdkLogger.error(\r
+ 'build',\r
+ AUTOGEN_ERROR,\r
+ "The Pcd %s is found under multiple different TokenSpaceGuid: %s and %s." % (TokenCName, PcdItem.TokenSpaceGuidCName, TokenSpaceGuidCNameList[0])\r
+ )\r
+ GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, FieldName,NewValue,("build command options",1))\r
+ if not FoundFlag:\r
+ if HasTokenSpace:\r
+ EdkLogger.error('build', AUTOGEN_ERROR, "The Pcd %s.%s is not found in the DEC file." % (TokenSpaceGuidCName, TokenCName))\r
+ else:\r
+ EdkLogger.error('build', AUTOGEN_ERROR, "The Pcd %s is not found in the DEC file." % (TokenCName))\r
+ for BuildData in self._Bdb._CACHE_.values():\r
+ if BuildData.MetaFile.Ext == '.dec' or BuildData.MetaFile.Ext == '.dsc':\r
+ continue\r
+ for key in BuildData.Pcds:\r
+ PcdItem = BuildData.Pcds[key]\r
+ if (TokenSpaceGuidCName, TokenCName) == (PcdItem.TokenSpaceGuidCName, PcdItem.TokenCName) and FieldName =="":\r
+ PcdItem.DefaultValue = NewValue\r
## Retrieve all PCD settings in platform\r
def _GetPcds(self):\r
if self._Pcds == None:\r
self._Pcds = sdict()\r
+ self.__ParsePcdFromCommandLine()\r
self._Pcds.update(self._GetPcd(MODEL_PCD_FIXED_AT_BUILD))\r
self._Pcds.update(self._GetPcd(MODEL_PCD_PATCHABLE_IN_MODULE))\r
self._Pcds.update(self._GetPcd(MODEL_PCD_FEATURE_FLAG))\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
+ self._Pcds = self.OverrideByFdfCommOverAll(self._Pcds)\r
+ self.RecoverCommandLinePcd()\r
return self._Pcds\r
\r
def _dumpPcdInfo(self,Pcds):\r
structure_pcd_data[(item[0],item[1])].append(item)\r
\r
return structure_pcd_data\r
+ def OverrideByFdfComm(self,StruPcds):\r
+ StructurePcdInCom = {(item[0],item[1],item[2] ):(item[3],item[4]) for item in GlobalData.BuildOptionPcd if len(item) == 5 and (item[1],item[0]) in StruPcds } if GlobalData.BuildOptionPcd else {}\r
+ GlobalPcds = set([(item[0],item[1]) for item in StructurePcdInCom.keys()])\r
+ for Pcd in StruPcds.values():\r
+ if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) not in GlobalPcds:\r
+ continue\r
+ FieldValues = {item[2]:StructurePcdInCom[item] for item in StructurePcdInCom if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) == (item[0],item[1]) and item[2]}\r
+ for sku in Pcd.SkuOverrideValues:\r
+ for defaultstore in Pcd.SkuOverrideValues[sku]:\r
+ for field in FieldValues:\r
+ if field not in Pcd.SkuOverrideValues[sku][defaultstore]:\r
+ Pcd.SkuOverrideValues[sku][defaultstore][field] = ["","",""]\r
+ Pcd.SkuOverrideValues[sku][defaultstore][field][0] = FieldValues[field][0]\r
+ Pcd.SkuOverrideValues[sku][defaultstore][field][1] = FieldValues[field][1][0]\r
+ Pcd.SkuOverrideValues[sku][defaultstore][field][2] = FieldValues[field][1][1]\r
+ return StruPcds\r
+ def OverrideByFdfCommOverAll(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
+ 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
+ else:\r
+ NoFiledValues = {(item[0],item[1]):[item[2]] for item in GlobalData.BuildOptionPcd}\r
+ for Guid,Name in NoFiledValues:\r
+ if (Name,Guid) in AllPcds:\r
+ Pcd = AllPcds.get((Name,Guid))\r
+ Pcd.DefaultValue = 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
+ else:\r
+ SkuInfo.HiiDefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]\r
+ for defaultstore in SkuInfo.DefaultStoreDict:\r
+ SkuInfo.DefaultStoreDict[defaultstore] = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]\r
+ else:\r
+ PcdInDec = self.DecPcds.get((Name,Guid))\r
+ if PcdInDec:\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.Pcds[Name, Guid] = copy.deepcopy(PcdInDec)\r
+ self.Pcds[Name, Guid].DefaultValue = NoFiledValues[( Guid,Name)][0]\r
+ return AllPcds\r
def UpdateStructuredPcds(self, TypeList, AllPcds):\r
\r
DynamicPcdType = [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT],\r
continue\r
\r
if SkuName in SkuIds and "." in TokenSpaceGuid:\r
- S_PcdSet.append(( TokenSpaceGuid.split(".")[0],TokenSpaceGuid.split(".")[1], PcdCName,SkuName, default_store,Dummy5, AnalyzePcdExpression(Setting)[0]))\r
+ S_PcdSet.append([ TokenSpaceGuid.split(".")[0],TokenSpaceGuid.split(".")[1], PcdCName,SkuName, default_store,Dummy5, AnalyzePcdExpression(Setting)[0]])\r
\r
# handle pcd value override\r
StrPcdSet = self.GetStructurePcdInfo(S_PcdSet)\r
for defaultstoreid in DefaultStores:\r
if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]:\r
stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorename])\r
-\r
+ S_pcd_set = self.OverrideByFdfComm(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
FieldName = "." + FieldName\r
IsArray = self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])\r
if IsArray:\r
- Value, ValueSize = ParseFieldValue (FieldList[FieldName.strip(".")][0])\r
+ try:\r
+ Value = ValueExpressionEx(FieldList[FieldName.strip(".")][0], "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('.'))), FieldList[FieldName.strip(".")][1], FieldList[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("."), FieldList[FieldName.strip(".")][1], FieldList[FieldName.strip(".")][2], FieldList[FieldName.strip(".")][0]);\r
else:\r
NewFieldName = ''\r
FieldName = "." + FieldName\r
IsArray = self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])\r
if IsArray:\r
- Value, ValueSize = ParseFieldValue (FieldList[FieldName.strip(".")][0])\r
+ try:\r
+ Value = ValueExpressionEx(FieldList[FieldName.strip(".")][0], "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('.'))), FieldList[FieldName.strip(".")][1], FieldList[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("."), FieldList[FieldName.strip(".")][1], FieldList[FieldName.strip(".")][2], FieldList[FieldName.strip(".")][0]);\r
else:\r
NewFieldName = ''\r
continue\r
for FieldName in FieldList:\r
IsArray = self.IsFieldValueAnArray(FieldList[FieldName][0])\r
+ if IsArray:\r
+ try:\r
+ FieldList[FieldName][0] = ValueExpressionEx(FieldList[FieldName][0], "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
+\r
try:\r
Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
except Exception:\r
continue\r
if Pcd.DefaultFromDSC and FieldList == Pcd.DefaultFromDSC:\r
IsArray = self.IsFieldValueAnArray(FieldList)\r
+ if IsArray:\r
+ try:\r
+ FieldList = ValueExpressionEx(FieldList, "VOID*")(True)\r
+ except BadExpression:\r
+ EdkLogger.error("Build", FORMAT_INVALID, "Invalid value format for %s.%s, from DSC: %s" %\r
+ (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldList))\r
+\r
Value, ValueSize = ParseFieldValue (FieldList)\r
if isinstance(Value, str):\r
CApp = CApp + ' Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DefaultFromDSC)\r
\r
for FieldName in FieldList:\r
IsArray = self.IsFieldValueAnArray(FieldList[FieldName][0])\r
+ if IsArray:\r
+ try:\r
+ FieldList[FieldName][0] = ValueExpressionEx(FieldList[FieldName][0], "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
+\r
try:\r
Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
except Exception:\r
Includes = {}\r
for PcdName in StructuredPcds:\r
Pcd = StructuredPcds[PcdName]\r
- IncludeFile = Pcd.StructuredPcdIncludeFile\r
- if IncludeFile not in Includes:\r
- Includes[IncludeFile] = True\r
- CApp = CApp + '#include <%s>\n' % (IncludeFile)\r
+ for IncludeFile in Pcd.StructuredPcdIncludeFile:\r
+ if IncludeFile not in Includes:\r
+ Includes[IncludeFile] = True\r
+ CApp = CApp + '#include <%s>\n' % (IncludeFile)\r
CApp = CApp + '\n'\r
\r
for PcdName in StructuredPcds:\r
projects / mirror_edk2.git / blobdiff