## @file\r
# parse FDF file\r
#\r
-# Copyright (c) 2007, Intel Corporation\r
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
#\r
-# All rights reserved. This program and the accompanying materials\r
+# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
# http://opensource.org/licenses/bsd-license.php\r
while Offset <= EndPos[1]:\r
self.Profile.FileLinesList[EndPos[0]][Offset] = Value\r
Offset += 1\r
- \r
+\r
+\r
+ def __GetMacroName(self):\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ MacroName = self.__Token\r
+ NotFlag = False\r
+ if MacroName.startswith('!'):\r
+ NotFlag = True\r
+ MacroName = MacroName[1:].strip()\r
+ \r
+ if not MacroName.startswith('$(') or not MacroName.endswith(')'):\r
+ raise Warning("Macro name expected(Please use '$(%(Token)s)' if '%(Token)s' is a macro.)" % {"Token" : MacroName},\r
+ self.FileName, self.CurrentLineNumber)\r
+ MacroName = MacroName[2:-1]\r
+ return MacroName, NotFlag\r
\r
## PreprocessFile() method\r
#\r
IfList.append([IfStartPos, None, None])\r
CondLabel = self.__Token\r
\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name At Line ", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\r
-\r
+ MacroName, NotFlag = self.__GetMacroName() \r
NotDefineFlag = False\r
if CondLabel == '!ifndef':\r
NotDefineFlag = True\r
self.__WipeOffArea.append((IfList[-1][0], ElseStartPos))\r
IfList[-1] = [ElseStartPos, True, IfList[-1][2]]\r
if self.__Token == '!elseif':\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name At Line ", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\r
-\r
+ MacroName, NotFlag = self.__GetMacroName() \r
if not self.__GetNextOp():\r
raise Warning("expected !endif At Line ", self.FileName, self.CurrentLineNumber)\r
\r
def __GetBlockStatements(self, Obj):\r
\r
if not self.__GetBlockStatement(Obj):\r
- raise Warning("expected block statement At Line ", self.FileName, self.CurrentLineNumber)\r
- \r
+ #set default block size is 1\r
+ Obj.BlockSizeList.append((1, Obj.Size, None))\r
+ return True\r
+\r
while self.__GetBlockStatement(Obj):\r
pass\r
+ \r
+ for Item in Obj.BlockSizeList:\r
+ if Item[0] == None or Item[1] == None:\r
+ raise Warning("expected block statement for Fd Section", self.FileName, self.CurrentLineNumber)\r
+\r
return True\r
\r
## __GetBlockStatement() method\r
if not self.__GetNextWord():\r
return True\r
\r
- if not self.__Token in ("SET", "FV", "FILE", "DATA"):\r
+ if not self.__Token in ("SET", "FV", "FILE", "DATA", "CAPSULE"):\r
self.__UndoToken()\r
RegionObj.PcdOffset = self.__GetNextPcdName()\r
self.Profile.PcdDict[RegionObj.PcdOffset] = RegionObj.Offset + long(Fd.BaseAddress, 0)\r
if not self.__GetNextWord():\r
return True\r
\r
- if self.__Token == "FV":\r
+ elif self.__Token == "FV":\r
self.__UndoToken()\r
self.__GetRegionFvType( RegionObj)\r
\r
+ elif self.__Token == "CAPSULE":\r
+ self.__UndoToken()\r
+ self.__GetRegionCapType( RegionObj)\r
+\r
elif self.__Token == "FILE":\r
self.__UndoToken()\r
self.__GetRegionFileType( RegionObj)\r
raise Warning("expected FV name At Line ", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionDataList.append(self.__Token)\r
- \r
+\r
+ ## __GetRegionCapType() method\r
+ #\r
+ # Get region capsule data for region\r
+ #\r
+ # @param self The object pointer\r
+ # @param RegionObj for whom region data is got\r
+ #\r
+ def __GetRegionCapType(self, RegionObj):\r
+\r
+ if not self.__IsKeyword("CAPSULE"):\r
+ raise Warning("expected Keyword 'CAPSULE' at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '=' at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected CAPSULE name at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ RegionObj.RegionType = "CAPSULE"\r
+ RegionObj.RegionDataList.append(self.__Token)\r
+\r
+ while self.__IsKeyword("CAPSULE"):\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '=' at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected CAPSULE name at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ RegionObj.RegionDataList.append(self.__Token)\r
+\r
## __GetRegionFileType() method\r
#\r
# Get region file data for region\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte At Line ", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long At Line ", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 18:\r
+ raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
\r
DataString = self.__Token\r
DataString += ","\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte At Line ", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long At Line ", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 18:\r
+ raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
\r
DataString = self.__Token\r
DataString += ","\r
\r
AlignValue = None\r
if self.__GetAlignment():\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
BuildNum = None\r
BuildNum = self.__Token\r
\r
if self.__IsKeyword( "VERSION"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(VerSectionObj)\r
\r
elif self.__IsKeyword( "UI"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(UiSectionObj)\r
\r
elif self.__IsKeyword( "FV_IMAGE"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextWord():\r
\r
Obj.SectionList.append(FvImageSectionObj) \r
\r
- elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP"):\r
+ elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP") or self.__IsKeyword("SMM_DEPEX_EXP"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
DepexSectionObj = CommonDataClass.FdfClass.DepexSectionClassObject()\r
DepexSectionObj.Alignment = AlignValue\r
DepexSectionObj.DepexType = self.__Token\r
if self.__Token not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
"UI", "VERSION", "PEI_DEPEX", "SUBTYPE_GUID", "SMM_DEPEX"):\r
raise Warning("Unknown section type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ if AlignValue == 'Auto'and (not self.__Token == 'PE32') and (not self.__Token == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
# DataSection\r
DataSectionObj = CommonDataClass.FdfClass.DataSectionClassObject()\r
DataSectionObj.Alignment = AlignValue\r
\r
AlignValue = None\r
if self.__GetAlignment():\r
+ if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
if not self.__GetCglSection(FfsFileObj, AlignValue):\r
\r
Arch = self.__SkippedChars.rstrip(".")\r
if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "COMMON"):\r
- raise Warning("Unknown Arch At line ", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber)\r
\r
ModuleType = self.__GetModuleType()\r
\r
"DXE_SMM_DRIVER", "DXE_RUNTIME_DRIVER", \\r
"UEFI_DRIVER", "UEFI_APPLICATION", "USER_DEFINED", "DEFAULT", "BASE", \\r
"SECURITY_CORE", "COMBINED_PEIM_DRIVER", "PIC_PEIM", "RELOCATABLE_PEIM", \\r
- "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION"):\r
+ "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE"):\r
raise Warning("Unknown Module type At line ", self.FileName, self.CurrentLineNumber)\r
return self.__Token\r
\r
raise Warning("expected FILE At Line ", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__GetNextWord():\r
- raise Warning("expected FV type At Line ", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected FFS type At Line ", self.FileName, self.CurrentLineNumber)\r
\r
Type = self.__Token.strip().upper()\r
if Type not in ("RAW", "FREEFORM", "SEC", "PEI_CORE", "PEIM",\\r
- "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE"):\r
+ "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE", "SMM", "SMM_CORE"):\r
raise Warning("Unknown FV type At line ", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken("="):\r
\r
AlignValue = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
CheckSum = True\r
\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
+ if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
if not self.__GetNextToken():\r
raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.Alignment = self.__Token\r
\r
- if self.__IsKeyword("FV"):\r
- FvImageSectionObj.FvFileType = self.__Token\r
- \r
- if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
- raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
- FvImageSectionObj.Alignment = self.__Token\r
- \r
if self.__IsToken('|'):\r
FvImageSectionObj.FvFileExtension = self.__GetFileExtension()\r
elif self.__GetNextToken():\r
EfiSectionObj.BuildNum = self.__Token\r
\r
if self.__GetAlignment():\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
EfiSectionObj.Alignment = self.__Token\r
\r
if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):\r
elif SectionType == "RAW":\r
if FileType not in ("BIN", "SEC_BIN", "RAW", "ASL", "ACPI"):\r
raise Warning("Incorrect section file type At Line ", self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "DXE_DEPEX":\r
- if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX"):\r
+ elif SectionType == "DXE_DEPEX" or SectionType == "SMM_DEPEX":\r
+ if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX", "SMM_DEPEX"):\r
raise Warning("Incorrect section file type At Line ", self.FileName, self.CurrentLineNumber)\r
elif SectionType == "UI":\r
if FileType not in ("UI", "SEC_UI"):\r
projects / mirror_edk2.git / blobdiff