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>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 79dc83efc3d5670d9dc278bc06d488402d359a56..e76f09c367c19a102d06a6ee94d4061a4e33fcc3 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -909,8 +909,9 @@ class ValueExpressionEx(ValueExpression):
                         LabelOffset = 0\r
                         for Index, Item in enumerate(PcdValueList):\r
                             # compute byte offset of every LABEL\r
                         LabelOffset = 0\r
                         for Index, Item in enumerate(PcdValueList):\r
                             # compute byte offset of every LABEL\r

-                            Item = Item.strip()\r

                             LabelList = ReLabel.findall(Item)\r
                             LabelList = ReLabel.findall(Item)\r

+                            Item = ReLabel.sub('', Item)\r
+                            Item = Item.strip()\r

                             if LabelList:\r
                                 for Label in LabelList:\r
                                     if not IsValidCString(Label):\r
                             if LabelList:\r
                                 for Label in LabelList:\r
                                     if not IsValidCString(Label):\r