sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Involve Dec default value to calculate Maxsize

Browse Source 
Involve Dec default value to calculate Maxsize for structure PCD

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Feng, Bob C
2018-09-03 09:05:53 +08:00
committed by Liming Gao
parent 71127ce883
commit cfed8a37ec
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
BaseTools/Source/Python/Workspace/BuildClassObject.py
View File

@ -68,6 +68,19 @@ class PcdClassObject(object):
self.PcdValueFromFdf = "" self.PcdValueFromFdf = ""
self.DefinitionPosition = ("","") self.DefinitionPosition = ("","")
@staticmethod
def GetPcdMaxSizeWorker(PcdString, MaxSize):
if PcdString.startswith("{") and PcdString.endswith("}"):
return max([len(PcdString.split(",")),MaxSize])
if PcdString.startswith("\"") or PcdString.startswith("\'"):
return max([len(PcdString)-2+1,MaxSize])
if PcdString.startswith("L\""):
return max([2*(len(PcdString)-3+1),MaxSize])
return max([len(PcdString),MaxSize])
## Get the maximum number of bytes ## Get the maximum number of bytes
def GetPcdMaxSize(self): def GetPcdMaxSize(self):
if self.DatumType in TAB_PCD_NUMERIC_TYPES: if self.DatumType in TAB_PCD_NUMERIC_TYPES:
@ -75,24 +88,11 @@ class PcdClassObject(object):
MaxSize = int(self.MaxDatumSize, 10) if self.MaxDatumSize else 0 MaxSize = int(self.MaxDatumSize, 10) if self.MaxDatumSize else 0
if self.PcdValueFromFdf: if self.PcdValueFromFdf:
if self.PcdValueFromFdf.startswith("{") and self.PcdValueFromFdf.endswith("}"): MaxSize = self.GetPcdMaxSizeWorker(self.PcdValueFromFdf,MaxSize)
MaxSize = max([len(self.PcdValueFromFdf.split(",")),MaxSize])
elif self.PcdValueFromFdf.startswith("\"") or self.PcdValueFromFdf.startswith("\'"):
MaxSize = max([len(self.PcdValueFromFdf)-2+1,MaxSize])
elif self.PcdValueFromFdf.startswith("L\""):
MaxSize = max([2*(len(self.PcdValueFromFdf)-3+1),MaxSize])
else:
MaxSize = max([len(self.PcdValueFromFdf),MaxSize])
if self.PcdValueFromComm: if self.PcdValueFromComm:
if self.PcdValueFromComm.startswith("{") and self.PcdValueFromComm.endswith("}"): MaxSize = self.GetPcdMaxSizeWorker(self.PcdValueFromComm,MaxSize)
return max([len(self.PcdValueFromComm.split(",")), MaxSize]) if hasattr(self, "DefaultValueFromDec"):
elif self.PcdValueFromComm.startswith("\"") or self.PcdValueFromComm.startswith("\'"): MaxSize = self.GetPcdMaxSizeWorker(self.DefaultValueFromDec,MaxSize)
return max([len(self.PcdValueFromComm)-2+1, MaxSize])
elif self.PcdValueFromComm.startswith("L\""):
return max([2*(len(self.PcdValueFromComm)-3+1), MaxSize])
else:
return max([len(self.PcdValueFromComm), MaxSize])
return MaxSize return MaxSize
## Get the number of bytes ## Get the number of bytes