Dear Maintainers, This patch fixes an ECC tool issue that is preventing the Arm CCA patch series from passing the edk2-CI tests, see https://dev.azure.com/tianocore/edk2-ci/_build/results?buildId=122726&view=logs&j=ec42d809-3c3b-54a9-276c-e54a8b9aaee9&t=bd91c6c3-6d75-5ede-7b63-5767cf827334&l=74
Regards, Sami Mujawar On 16/04/2024, 00:30, "devel@edk2.groups.io <mailto:devel@edk2.groups.io> on behalf of levi.yun via groups.io" <devel@edk2.groups.io <mailto:devel@edk2.groups.io> on behalf of yeoreum.yun=arm....@groups.io <mailto:arm....@groups.io>> 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 <rebe...@bsdio.com <mailto:rebe...@bsdio.com>> Cc: Liming Gao <gaolim...@byosoft.com.cn <mailto:gaolim...@byosoft.com.cn>> Cc: Bob Feng <bob.c.f...@intel.com <mailto:bob.c.f...@intel.com>> Cc: Yuwei Chen <yuwei.c...@intel.com <mailto:yuwei.c...@intel.com>> Cc: Sami Mujawar <sami.muja...@arm.com <mailto:sami.muja...@arm.com>> Cc: Pierre Gondois <pierre.gond...@arm.com <mailto:pierre.gond...@arm.com>> Signed-off-by: levi.yun <yeoreum....@arm.com <mailto:yeoreum....@arm.com>> --- The changes can be seen at https://github.com/LeviYeoReum/edk2/tree/levi/3057_fix_false_on_ecc_v2 <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 (#117802): https://edk2.groups.io/g/devel/message/117802 <https://edk2.groups.io/g/devel/message/117802> Mute This Topic: https://groups.io/mt/105542888/1779659 <https://groups.io/mt/105542888/1779659> Group Owner: devel+ow...@edk2.groups.io <mailto:devel+ow...@edk2.groups.io> Unsubscribe: https://edk2.groups.io/g/devel/unsub <https://edk2.groups.io/g/devel/unsub> [sami.muja...@arm.com <mailto:sami.muja...@arm.com>] -=-=-=-=-=-= -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117842): https://edk2.groups.io/g/devel/message/117842 Mute This Topic: https://groups.io/mt/105542888/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
