* [PATCH] BaseTools: Fix parse OFFSET_OF get wrong offset
@ 2018-03-09 8:46 Feng, YunhuaX
2018-03-09 9:11 ` Zhu, Yonghong
0 siblings, 1 reply; 2+ messages in thread
From: Feng, YunhuaX @ 2018-03-09 8:46 UTC (permalink / raw)
To: edk2-devel@lists.01.org; +Cc: Zhu, Yonghong, Gao, Liming
Fix parse OFFSET_OF get wrong offset
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
---
BaseTools/Source/Python/Common/Expression.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 5a0ade9e7e..47fa190eb8 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -888,12 +888,13 @@ class ValueExpressionEx(ValueExpression):
ReLabel = re.compile('LABEL\((\w+)\)')
ReOffset = re.compile('OFFSET_OF\((\w+)\)')
LabelOffset = 0
for Index, Item in enumerate(PcdValueList):
# compute byte offset of every LABEL
- Item = Item.strip()
LabelList = ReLabel.findall(Item)
+ Item = ReLabel.sub('', Item)
+ Item = Item.strip()
if LabelList:
for Label in LabelList:
if not IsValidCString(Label):
raise BadExpression('%s is not a valid c variable name' % Label)
if Label not in LabelDict.keys():
@@ -1001,12 +1002,14 @@ class ValueExpressionEx(ValueExpression):
if RealValue:
return PcdValue
if __name__ == '__main__':
- pass
- while True:
+ Value = "{UINT32(OFFSET_OF(Cert0)),UINT32(OFFSET_OF(Cert1)), UINT32(OFFSET_OF(Cert2)), UINT32(OFFSET_OF(Cert3)), UINT32(OFFSET_OF(Cert4)), UINT32(OFFSET_OF(Cert5)), UINT32(OFFSET_OF(Cert6)), UINT32(OFFSET_OF(Cert7)), UINT32(OFFSET_OF(Cert8)), LABEL(Cert0) UINT8(1),LABEL(Cert1) UINT16(2), LABEL(Cert2) UINT32(4), LABEL(Cert3) UINT64(8), LABEL(Cert4) 'ABC', LABEL(Cert5) \"ABC\", LABEL(Cert6) L'ABC', LABEL(Cert7) L\"ABC\", LABEL(Cert8) 0}"
+ Ret = ValueExpressionEx(Value, "VOID*")(True)
+ print Ret
+ while False:
input = raw_input('Input expr: ')
if input in 'qQ':
break
try:
print ValueExpression(input)(True)
--
2.12.2.windows.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] BaseTools: Fix parse OFFSET_OF get wrong offset
2018-03-09 8:46 [PATCH] BaseTools: Fix parse OFFSET_OF get wrong offset Feng, YunhuaX
@ 2018-03-09 9:11 ` Zhu, Yonghong
0 siblings, 0 replies; 2+ messages in thread
From: Zhu, Yonghong @ 2018-03-09 9:11 UTC (permalink / raw)
To: Feng, YunhuaX, edk2-devel@lists.01.org; +Cc: Gao, Liming, Zhu, Yonghong
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: Feng, YunhuaX
Sent: Friday, March 9, 2018 4:46 PM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH] BaseTools: Fix parse OFFSET_OF get wrong offset
Fix parse OFFSET_OF get wrong offset
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
---
BaseTools/Source/Python/Common/Expression.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 5a0ade9e7e..47fa190eb8 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -888,12 +888,13 @@ class ValueExpressionEx(ValueExpression):
ReLabel = re.compile('LABEL\((\w+)\)')
ReOffset = re.compile('OFFSET_OF\((\w+)\)')
LabelOffset = 0
for Index, Item in enumerate(PcdValueList):
# compute byte offset of every LABEL
- Item = Item.strip()
LabelList = ReLabel.findall(Item)
+ Item = ReLabel.sub('', Item)
+ Item = Item.strip()
if LabelList:
for Label in LabelList:
if not IsValidCString(Label):
raise BadExpression('%s is not a valid c variable name' % Label)
if Label not in LabelDict.keys():
@@ -1001,12 +1002,14 @@ class ValueExpressionEx(ValueExpression):
if RealValue:
return PcdValue
if __name__ == '__main__':
- pass
- while True:
+ Value = "{UINT32(OFFSET_OF(Cert0)),UINT32(OFFSET_OF(Cert1)), UINT32(OFFSET_OF(Cert2)), UINT32(OFFSET_OF(Cert3)), UINT32(OFFSET_OF(Cert4)), UINT32(OFFSET_OF(Cert5)), UINT32(OFFSET_OF(Cert6)), UINT32(OFFSET_OF(Cert7)), UINT32(OFFSET_OF(Cert8)), LABEL(Cert0) UINT8(1),LABEL(Cert1) UINT16(2), LABEL(Cert2) UINT32(4), LABEL(Cert3) UINT64(8), LABEL(Cert4) 'ABC', LABEL(Cert5) \"ABC\", LABEL(Cert6) L'ABC', LABEL(Cert7) L\"ABC\", LABEL(Cert8) 0}"
+ Ret = ValueExpressionEx(Value, "VOID*")(True)
+ print Ret
+ while False:
input = raw_input('Input expr: ')
if input in 'qQ':
break
try:
print ValueExpression(input)(True)
--
2.12.2.windows.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-09 9:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-09 8:46 [PATCH] BaseTools: Fix parse OFFSET_OF get wrong offset Feng, YunhuaX
2018-03-09 9:11 ` Zhu, Yonghong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox