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

BaseTools/Expression: Use 2nd passes on PCD values

Browse Source 
Use 2 passes when evaluating PCD values to discover
all the LABEL() operators and compute the byte offset
of each LABEL().  The 2nd pass then has the information
to replace the OFFSET_OF() operator with the computed
byte offset.  The 2 passes allows OFFSET_OF() to be used
before a LABEL() is declared.

fixes:https://bugzilla.tianocore.org/show_bug.cgi?id=880
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
(cherry picked from commit 8bd72d7c05)
This commit is contained in:
Kinney, Michael D
2018-02-20 20:08:32 -08:00
committed by Yonghong Zhu
parent a46b556690
commit 6cc21aa625
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
BaseTools/Source/Python/Common/Expression.py
View File

@ -827,6 +827,30 @@ class ValueExpressionEx(ValueExpression):
LabelDict = {}
ReLabel = re.compile('LABEL\((\w+)\)')
ReOffset = re.compile('OFFSET_OF\((\w+)\)')
LabelOffset = 0
for Index, Item in enumerate(ListItem):
# compute byte offset of every LABEL
Item = Item.strip()
try:
LabelList = ReLabel.findall(Item)
for Label in LabelList:
if Label not in LabelDict.keys():
LabelDict[Label] = str(LabelOffset)
Item = ReLabel.sub('', Item)
except:
pass
if Item.startswith('UINT8'):
LabelOffset = LabelOffset + 1
elif Item.startswith('UINT16'):
LabelOffset = LabelOffset + 2
elif Item.startswith('UINT32'):
LabelOffset = LabelOffset + 4
elif Item.startswith('UINT64'):
LabelOffset = LabelOffset + 8
else:
ItemValue, ItemSize = ParseFieldValue(Item)
LabelOffset = LabelOffset + ItemSize
for Index, Item in enumerate(ListItem):
# for LABEL parse
Item = Item.strip()
@ -847,7 +871,7 @@ class ValueExpressionEx(ValueExpression):
Re = re.compile('OFFSET_OF\(%s\)'% Offset)
Item = Re.sub(LabelDict[Offset], Item)
else:
raise BadExpression('%s not defined before use' % Offset)
raise BadExpression('%s not defined' % Offset)
ValueType = ""
if Item.startswith('UINT8'):
ItemSize = 1