[PATCH 1/1] BaseTools: Fix StructurePcd offset error.

[PATCH 1/1] BaseTools: Fix StructurePcd offset error.

[Yuwei Chen]

Currently when parse VFR files to get the struct info,
BOOLEAN type struct is ignored, which caused offset errors.
This patch fixed these bugs.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
---
 BaseTools/Scripts/ConvertFceToStructurePcd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scripts/ConvertFceToStructurePcd.py
index 2baabf2dd521..9e7fe58768b1 100644
--- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
+++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
@@ -142,7 +142,7 @@ class parser_lst(object):
                       line.append(struct)
                       unparse.append(line)
                   else:
-                    if uint not in ['UINT8', 'UINT16', 'UINT32', 'UINT64']:
+                    if uint not in ['UINT8', 'UINT16', 'UINT32', 'UINT64', 'BOOLEAN']:
                       line = [offset, t_name, 0, uint]
                       line.append(struct)
                       unparse.append(line)
@@ -569,7 +569,7 @@ class mainprocess(object):
     for i in List:
       for j in i:
         tmp = j.split("|")
-        if (('L"' in j) and ("[" in j)) or (tmp[1].strip() == '{0x0, 0x0}'):
+        if (('L"' in j) and ("[" in j)) or (tmp[1].split("#")[0].strip() == '{0x0, 0x0}'):
           tmp[0] = tmp[0][:tmp[0].index('[')]
           List[List.index(i)][i.index(j)] = "|".join(tmp)
         else:
-- 
2.27.0.windows.1

回复: [PATCH 1/1] BaseTools: Fix StructurePcd offset error.

[gaoliming]

Yuwei: 

> -----邮件原件-----
> 发件人: Yuwei Chen <yuwei.chen@intel.com>
> 发送时间: 2021年10月27日 18:00
> 收件人: devel@edk2.groups.io
> 抄送: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>
> 主题: [PATCH 1/1] BaseTools: Fix StructurePcd offset error.
> 
> Currently when parse VFR files to get the struct info,
> BOOLEAN type struct is ignored, which caused offset errors.
> This patch fixed these bugs.
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
> ---
>  BaseTools/Scripts/ConvertFceToStructurePcd.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py
> b/BaseTools/Scripts/ConvertFceToStructurePcd.py
> index 2baabf2dd521..9e7fe58768b1 100644
> --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
> +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
> @@ -142,7 +142,7 @@ class parser_lst(object):
>                        line.append(struct)
>                        unparse.append(line)
>                    else:
> -                    if uint not in ['UINT8', 'UINT16', 'UINT32',
> 'UINT64']:
> +                    if uint not in ['UINT8', 'UINT16', 'UINT32',
'UINT64',
> 'BOOLEAN']:
>                        line = [offset, t_name, 0, uint]
>                        line.append(struct)
>                        unparse.append(line)
> @@ -569,7 +569,7 @@ class mainprocess(object):
>      for i in List:
>        for j in i:
>          tmp = j.split("|")
> -        if (('L"' in j) and ("[" in j)) or (tmp[1].strip() == '{0x0,
0x0}'):
> +        if (('L"' in j) and ("[" in j)) or (tmp[1].split("#")[0].strip()
== '{0x0,
> 0x0}'):

Why split '#'?

Thanks
Liming
>            tmp[0] = tmp[0][:tmp[0].index('[')]
>            List[List.index(i)][i.index(j)] = "|".join(tmp)
>          else:
> --
> 2.27.0.windows.1

Re: [PATCH 1/1] BaseTools: Fix StructurePcd offset error.

[Yuwei Chen]

Hi Liming,

As the comments have been added to each StructurePcd (https://edk2.groups.io/g/devel/message/68378?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Arecentpostdate%2Fsticky%2C%2CStructurePcd%2C20%2C2%2C20%2C78773894), the tmp[1] will have not only the "{0x0,0x0}" value but also the "# comments". If not split with "#", it will generate error format for value "{0x0, 0x0}" StructurePcd.

Thanks,
Christine (Yuwei)

> -----Original Message-----
> From: gaoliming <gaoliming@byosoft.com.cn>
> Sent: Friday, October 29, 2021 10:02 AM
> To: Chen, Christine <yuwei.chen@intel.com>; devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>
> Subject: 回复: [PATCH 1/1] BaseTools: Fix StructurePcd offset error.
> 
> Yuwei:
> 
> > -----邮件原件-----
> > 发件人: Yuwei Chen <yuwei.chen@intel.com>
> > 发送时间: 2021年10月27日 18:00
> > 收件人: devel@edk2.groups.io
> > 抄送: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> > <gaoliming@byosoft.com.cn>
> > 主题: [PATCH 1/1] BaseTools: Fix StructurePcd offset error.
> >
> > Currently when parse VFR files to get the struct info, BOOLEAN type
> > struct is ignored, which caused offset errors.
> > This patch fixed these bugs.
> >
> > Cc: Bob Feng <bob.c.feng@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
> > ---
> >  BaseTools/Scripts/ConvertFceToStructurePcd.py | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > b/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > index 2baabf2dd521..9e7fe58768b1 100644
> > --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > @@ -142,7 +142,7 @@ class parser_lst(object):
> >                        line.append(struct)
> >                        unparse.append(line)
> >                    else:
> > -                    if uint not in ['UINT8', 'UINT16', 'UINT32',
> > 'UINT64']:
> > +                    if uint not in ['UINT8', 'UINT16', 'UINT32',
> 'UINT64',
> > 'BOOLEAN']:
> >                        line = [offset, t_name, 0, uint]
> >                        line.append(struct)
> >                        unparse.append(line) @@ -569,7 +569,7 @@ class
> > mainprocess(object):
> >      for i in List:
> >        for j in i:
> >          tmp = j.split("|")
> > -        if (('L"' in j) and ("[" in j)) or (tmp[1].strip() == '{0x0,
> 0x0}'):
> > +        if (('L"' in j) and ("[" in j)) or
> > + (tmp[1].split("#")[0].strip()
> == '{0x0,
> > 0x0}'):
> 
> Why split '#'?
> 
> Thanks
> Liming
> >            tmp[0] = tmp[0][:tmp[0].index('[')]
> >            List[List.index(i)][i.index(j)] = "|".join(tmp)
> >          else:
> > --
> > 2.27.0.windows.1
> 
> 

回复: [edk2-devel] [PATCH 1/1] BaseTools: Fix StructurePcd offset error.

[gaoliming]

Yuwei:
  Thanks for your information. I have no other comment for this change. Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Yuwei Chen
> 发送时间: 2021年10月29日 13:35
> 收件人: gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
> 抄送: Feng, Bob C <bob.c.feng@intel.com>
> 主题: Re: [edk2-devel] [PATCH 1/1] BaseTools: Fix StructurePcd offset error.
> 
> Hi Liming,
> 
> As the comments have been added to each StructurePcd
> (https://edk2.groups.io/g/devel/message/68378?p=%2C%2C%2C20%2C0%2
> C0%2C0%3A%3Arecentpostdate%2Fsticky%2C%2CStructurePcd%2C20%2C2
> %2C20%2C78773894), the tmp[1] will have not only the "{0x0,0x0}" value but
> also the "# comments". If not split with "#", it will generate error format for
> value "{0x0, 0x0}" StructurePcd.
> 
> Thanks,
> Christine (Yuwei)
> 
> > -----Original Message-----
> > From: gaoliming <gaoliming@byosoft.com.cn>
> > Sent: Friday, October 29, 2021 10:02 AM
> > To: Chen, Christine <yuwei.chen@intel.com>; devel@edk2.groups.io
> > Cc: Feng, Bob C <bob.c.feng@intel.com>
> > Subject: 回复: [PATCH 1/1] BaseTools: Fix StructurePcd offset error.
> >
> > Yuwei:
> >
> > > -----邮件原件-----
> > > 发件人: Yuwei Chen <yuwei.chen@intel.com>
> > > 发送时间: 2021年10月27日 18:00
> > > 收件人: devel@edk2.groups.io
> > > 抄送: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> > > <gaoliming@byosoft.com.cn>
> > > 主题: [PATCH 1/1] BaseTools: Fix StructurePcd offset error.
> > >
> > > Currently when parse VFR files to get the struct info, BOOLEAN type
> > > struct is ignored, which caused offset errors.
> > > This patch fixed these bugs.
> > >
> > > Cc: Bob Feng <bob.c.feng@intel.com>
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
> > > ---
> > >  BaseTools/Scripts/ConvertFceToStructurePcd.py | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > > b/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > > index 2baabf2dd521..9e7fe58768b1 100644
> > > --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > > +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
> > > @@ -142,7 +142,7 @@ class parser_lst(object):
> > >                        line.append(struct)
> > >                        unparse.append(line)
> > >                    else:
> > > -                    if uint not in ['UINT8', 'UINT16', 'UINT32',
> > > 'UINT64']:
> > > +                    if uint not in ['UINT8', 'UINT16', 'UINT32',
> > 'UINT64',
> > > 'BOOLEAN']:
> > >                        line = [offset, t_name, 0, uint]
> > >                        line.append(struct)
> > >                        unparse.append(line) @@ -569,7 +569,7
> @@ class
> > > mainprocess(object):
> > >      for i in List:
> > >        for j in i:
> > >          tmp = j.split("|")
> > > -        if (('L"' in j) and ("[" in j)) or (tmp[1].strip() == '{0x0,
> > 0x0}'):
> > > +        if (('L"' in j) and ("[" in j)) or
> > > + (tmp[1].split("#")[0].strip()
> > == '{0x0,
> > > 0x0}'):
> >
> > Why split '#'?
> >
> > Thanks
> > Liming
> > >            tmp[0] = tmp[0][:tmp[0].index('[')]
> > >            List[List.index(i)][i.index(j)] = "|".join(tmp)
> > >          else:
> > > --
> > > 2.27.0.windows.1
> >
> >
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH 1/1] BaseTools: Fix StructurePcd offset error.

[Bob Feng]

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yuwei Chen
Sent: Wednesday, October 27, 2021 6:00 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
Subject: [edk2-devel] [PATCH 1/1] BaseTools: Fix StructurePcd offset error.

Currently when parse VFR files to get the struct info, BOOLEAN type struct is ignored, which caused offset errors.
This patch fixed these bugs.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
---
 BaseTools/Scripts/ConvertFceToStructurePcd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scripts/ConvertFceToStructurePcd.py
index 2baabf2dd521..9e7fe58768b1 100644
--- a/BaseTools/Scripts/ConvertFceToStructurePcd.py
+++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py
@@ -142,7 +142,7 @@ class parser_lst(object):
                       line.append(struct)
                       unparse.append(line)
                   else:
-                    if uint not in ['UINT8', 'UINT16', 'UINT32', 'UINT64']:
+                    if uint not in ['UINT8', 'UINT16', 'UINT32', 'UINT64', 'BOOLEAN']:
                       line = [offset, t_name, 0, uint]
                       line.append(struct)
                       unparse.append(line) @@ -569,7 +569,7 @@ class mainprocess(object):
     for i in List:
       for j in i:
         tmp = j.split("|")
-        if (('L"' in j) and ("[" in j)) or (tmp[1].strip() == '{0x0, 0x0}'):
+        if (('L"' in j) and ("[" in j)) or (tmp[1].split("#")[0].strip() == '{0x0, 0x0}'):
           tmp[0] = tmp[0][:tmp[0].index('[')]
           List[List.index(i)][i.index(j)] = "|".join(tmp)
         else:
--
2.27.0.windows.1