Re: [edk2-devel] [PATCH 1/1] BaseTool/Ecc: Fix incorrect parsing of variable initialisation

["PierreGondois" <pierre.gondois@arm.com>]

Tested-by: Pierre Gondois <pierre.gondois@arm.com>

On 4/15/24 20:59, levi.yun wrote:
> If a global variable is initialised using a macro with multiple
> arguments, ECC incorrectly parses the statement and reports the
> macro arguments as variable declarations.
> 
> Example: In the following statement:
>    STATIC INT WrongVariable = MACRO_VERSION(1, 0), NextVariable;
> The logic in the ECC function GetIdentifierList() interprets the
> above statement as declaration of three variables:
>      1. 'WrongVariable = MACRO_VERSION(1,'
>      2. '0)'
>      3. 'NextVariable'
> Following which NamingConventionCheckVariableName() reports an
> error for "0)" stating an incorrect variable declaration as
> below:
> "ERROR - *The variable name [0)] does not follow the rules"
> 
> This patch fixes the parsing logic so that scenarios with macro
> initialisations are handled correctly.
> 
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Pierre Gondois <pierre.gondois@arm.com>
> Signed-off-by: levi.yun <yeoreum.yun@arm.com>
> ---
> 
> The changes can be seen at https://github.com/LeviYeoReum/edk2/tree/levi/3057_fix_false_on_ecc_v2
> 
>   BaseTools/Source/Python/Ecc/c.py | 23 ++++++++++++++++++--
>   1 file changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py
> index 61ad084fcc5b85b5a2194afd8bb1a4b4b65fdaee..71dc0fcf884ee3d45a527f20844b697958df366c 100644
> --- a/BaseTools/Source/Python/Ecc/c.py
> +++ b/BaseTools/Source/Python/Ecc/c.py
> @@ -182,8 +182,27 @@ def GetIdentifierList():
>               continue
>   
>           if var.Declarator.find('{') == -1:
> -            for decl in var.Declarator.split(','):
> -                DeclList = decl.split('=')
> +            DeclText = var.Declarator
> +            while (len(DeclText) > 0):
> +                AllocatorPos = DeclText.find('=')
> +                SplitPos = DeclText.find(',')
> +
> +                if (SplitPos == -1):
> +                    SplitPos = len(DeclText)
> +                elif (SplitPos > AllocatorPos):
> +                    NextAllcatorPos = DeclText.find('=', AllocatorPos + 1)
> +                    if (NextAllcatorPos == -1):
> +                        NextAllcatorPos = len(DeclText)
> +                    ParPos = DeclText.rfind(')', SplitPos, NextAllcatorPos)
> +                    if (ParPos != -1):
> +                        SplitPos = DeclText.find(',', ParPos)
> +                        if (SplitPos == -1):
> +                            SplitPos = ParPos + 1
> +
> +                SubDeclText = DeclText[:SplitPos]
> +                DeclText = DeclText[SplitPos + 1:]
> +
> +                DeclList = SubDeclText.split('=')
>                   Name = DeclList[0].strip()
>                   if ArrayPattern.match(Name):
>                       LSBPos = var.Declarator.find('[')
> --
> Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117855): https://edk2.groups.io/g/devel/message/117855
Mute This Topic: https://groups.io/mt/105542888/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-