From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web12.39666.1636339091902250301 for ; Sun, 07 Nov 2021 18:38:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=qb0aGhki; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: bob.c.feng@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10161"; a="230869101" X-IronPort-AV: E=Sophos;i="5.87,217,1631602800"; d="scan'208";a="230869101" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2021 18:38:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,217,1631602800"; d="scan'208";a="601253583" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga004.jf.intel.com with ESMTP; 07 Nov 2021 18:38:11 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Sun, 7 Nov 2021 18:38:10 -0800 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Sun, 7 Nov 2021 18:38:10 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Sun, 7 Nov 2021 18:38:10 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.104) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Sun, 7 Nov 2021 18:38:10 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V+x1EmAQCKo4EH7GOHCTRdDWx5yN5IEMLzqgI6R0Y8dqK/XH+elqm6JjmBdiTWV/zBUCldpPXZhs75nKXfiNGHlRR+ZvlJPFXbq9SEZCkxEeG7z55TQSojzzaINDF1rgLbNFnVNHSUszuSEGHndZqKT6aW34nguODOwcqLJs7XwP9P7N6/RDfbNoz8WM/6kADWkOPWBsjt7FjMgDWQv0wXjlmzswcBBixOgpnmM+NurFM3skIF5JNyA1Q6sOl+3AGf+NpAmPQGU82GBazzQXNHbi9LBX5cgDGLhPMRJJiyRqrfy/VHNsh9WDmKmFmYS3XheMCyyMHSpvbxTRSNFoPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FqgOD+IkR4t2cWnejzhYCxLG2il/pCM+igmRRpLDWCo=; b=USbSxQNYQjuZ/eJwF9/uCDUwUpbGt7ud3f2W2RjG0m/88bPD/3OdhGfONGdwTId/fKpXJ5ZGxDKwGGX9H0E/WRl5PCUK479dCYoFIVp/fXX/YXi47ICztizq7HtjisHRG7I7+ZuEIrrIbKI2C5k/cPXdXBOyWw0oJ1RgRNDDyJxP2HfO6VKuOH7d5k2UxtbK0xVqKpO/BSALqFMsls/dpI2FOxmeW2kP1uk0ob4ORyt+E0Qs156KdCyCCh+pCfUgAFeP6OjQpt6UaULBUrSMS5TnfTD5/Qn9ixds/62oJjholx1fCIt6a314XM0XPOGYTitc1GvptIIN5nwtnYy+aQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FqgOD+IkR4t2cWnejzhYCxLG2il/pCM+igmRRpLDWCo=; b=qb0aGhkiB/zHEkn6EXEklpuyobZBTYFxvNG1qLxkrG3zYgUTR+iu886F6uHfPbPXA4nH0oD7Dhpwr+W4j27inqk2lx500ntnm3X83RulQ2TXHxtw7evwMiKxco+GNe4GHFdcc8cQ8J882zdZdMCeye+hsRAh3vpWWC9XJY9SBIc= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB3419.namprd11.prod.outlook.com (2603:10b6:5:6f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Mon, 8 Nov 2021 02:38:09 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::85d4:9d42:234a:6b4b]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::85d4:9d42:234a:6b4b%6]) with mapi id 15.20.4669.016; Mon, 8 Nov 2021 02:38:09 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Chen, Christine" CC: Liming Gao Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: Fix StructurePcd offset error. Thread-Topic: [edk2-devel] [PATCH 1/1] BaseTools: Fix StructurePcd offset error. Thread-Index: AQHXyxl5Tybe2CcF70ePJBjHOqiEMqv4/Q6g Date: Mon, 8 Nov 2021 02:38:08 +0000 Message-ID: References: <20211027100003.167-1-yuwei.chen@intel.com> In-Reply-To: <20211027100003.167-1-yuwei.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6ae21cef-57a3-4785-c935-08d9a260cd0f x-ms-traffictypediagnostic: DM6PR11MB3419: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2887; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7YWWaazL6XtPpb8sVaCsO6PfktsWfAoXJA63jNTpU0klCwJDG6VFnx2nI3+J8NkA3dHdjwZFGt4r4YOTmFVXvgdhJruVYpFfjYvrFnonzbnI8s9mw18m3A2Sw6eq9BCqUyCs3utXeixWQBE+BA4LaItE+VVXaoQExnkuXgoTTQOQjtAt2m2sCX2Q5RQjhEhre3OL7N/yPtbAdO6HQDaDy2KvMOB0P4GNqdSv00KLpliSGNurrZT+XUhzHU2kaGxqwOWzKJPqBuWJhDTfUFbgHHdC3M6Tdd35/In2NUju0QZBuE4X5IRfQzkwoqVe1Cinn99Po6jM7bNiG1arD5xgUGCj4cw2O5vlALakscUcVxf2rEhAo/GoNWJFRbKRTD4Q4GiuUahAXEhItvFxLZ/37OcnZDKtToRS619LIXAVyKQuOwYocv1DzxdxKMt0vTHsL8X8e66DXdEA7BjpnZ8b5Uoh/nhex82C5hJfO2NeiaIhpNUOnJEIFbS56VQI2DtyONdq0SzXagaRSjEyHnjBcjN6KAesPK/Ep7ey3f70bK7GxDJCQvxJKeIwoKUdPtIR+GGISQrxaTl7kA/yNykNHP6Npa7i+01rsv2hSN6dwaBnbEV8FBCR4oL8wlluXx5SWsSoFCjpoT/I9YHSu6betaTyHquhD7Uw15oMN7/OyTqPatfGHJhT2/tiRVSfIw5fELS5X8xGRwq5L+mKkA/paYTL2Rps/OMKJwqIb3RuQU43X5cNUuzvQZCMcn1BlPHM1pH0v4JVb6eKCIcjEvEooOuRxXqqLc8l2VRV9qT6SEVYcfbio5zIT1RXdJsK3GXswXxS3/QfbxDHln0mXb0Q7g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66556008)(66946007)(6506007)(76116006)(64756008)(186003)(66446008)(71200400001)(508600001)(9686003)(66476007)(966005)(38100700002)(6636002)(53546011)(38070700005)(52536014)(122000001)(83380400001)(86362001)(7696005)(316002)(55016002)(26005)(2906002)(33656002)(8936002)(8676002)(82960400001)(4326008)(110136005)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?sUYCGDyBBnX7wDsGNsjnGO/zKnOXOWPEYzUAmC1KbbMfTm+vhdFWrVLpQGHF?= =?us-ascii?Q?olllJnbcN2ShR22XzTz7Ophb2OOnbx7XQ5CJ0o+Xc9ACLgeJ6K8NqI2DRzwc?= =?us-ascii?Q?NL6TE1Ae3r+qJJXFedcU7uXWqmVXRcOLUJM7BiacCInejRvsnaWKjZivFtSA?= =?us-ascii?Q?53jisRMXh1eVSjf2zUG5IK+a42jJ3EOBnWlWu4C8KCXgkjP6JeL8uRK0wVgA?= =?us-ascii?Q?xwjf0VIQMiie8C8VkXdevAoevhLAdf67lrGGf2/sUNwYbLg5tP6kerP/YZYm?= =?us-ascii?Q?12FASLvBa2pL4skMOnTMldb4Kbqqc+fYvJkQ4j15VECOljtu4RDa2J480oaP?= =?us-ascii?Q?6TrShU4DOBPnwQ57pgTy50Ba0Ds9mDYErkELHzhQaJPgqIZBuPS8c2WpoRs9?= =?us-ascii?Q?zoCqNf2yI6DBFEDblCDo95R/UljBEtVu/naQdERtVNzmpabEx3PdnYeB0ncb?= =?us-ascii?Q?1eDHYqA1/XJmkgLqf6nWZM1qU1JN3zTQFID8Y0bc/iS3VuJcM4k6kO44zHEP?= =?us-ascii?Q?3Cq6srM3smjxEX1s3C5+H9zOHia42qePD9iIo5VD1M5q4WVFSM+oL/aLt4+I?= =?us-ascii?Q?qoaOrBrvY0MhECcctmZ5TAzLBNjXexdujiSbCvkk3j8jNqG8xVRJyVKPctyc?= =?us-ascii?Q?YAelrtb3Hjdd2rDWERFiW6PxjHFjpakq7H+fQ2dJri9beyQ2/bxC2cPDv8Qi?= =?us-ascii?Q?Qgxz006I8b0KLHZssovnP2iwKPe8P/X4BwDFeVr67BeMfw5NE7uYSILPK/Id?= =?us-ascii?Q?Wk5dGgnBUQ5nrfEEhEkwfem0yN1koa6OkACdQCkE8xwFVkokZ6SfzqZoT4/H?= =?us-ascii?Q?1vVzj63XKu0Pv/fgqkciRvaMudUHhmYBqBFmG+iJrj4NzpDYCyo/tROedVSn?= =?us-ascii?Q?ekD8wOO9KpsWX45fkoI5W4A8KeIoc9W9zySwu3XQQKMt9cQF3Hdq7GpmI1HL?= =?us-ascii?Q?oaoxllFYi53xcjW7Lq9rY6Zo0uBXu/Miof0kpTaqFJemlnJ/G8sIcnDKvyu/?= =?us-ascii?Q?3r6g9AM/2BsLXeKtO1UFH2ZSQo8GO8RFQLIbbhJjjFIKMeE9Z6RxSsgjxItU?= =?us-ascii?Q?nPLuQ+OsaFg6VhIc7+cm0nnR+Xsb/7mwqill7f98Z/gbIUBROB/p2sESZqPa?= =?us-ascii?Q?JOMteiM3avy7fr3NR485u/KUXVM0s4fVhwmctMOwyJ6ux/iAku94xC5m4aOe?= =?us-ascii?Q?o7PBKMYTmDdJ9mYomieW9jF9f6FyfEEO0KSUs0YzHraHCp0UWb6nE/epmUBx?= =?us-ascii?Q?Fmrub/kt4emyfm6zLQte7S20qvYtYm1WqDyi+jQgSPBbCrOgml2J0a6Hwms4?= =?us-ascii?Q?ebli2DZhEexwm3s7C4klBAa1UNl2iQ8Brr9PMgy0HxJyawT+xvWUEYsxKI/K?= =?us-ascii?Q?mZ6cHZuu/MsBhcqfBOfb2Zdxeqm0oDa1UQWtcBFAtcZYIWZPwUPeWH/vlsX+?= =?us-ascii?Q?/TD32MPBa2qAP2w+ozW5ZC0yIcEGC2b5LAQ9a86To3iAvDJ27C3oRepqdtw2?= =?us-ascii?Q?0rZeJNzWXsvIom6XF5bP8xfEOpPqsKte55aJKsihagu5fL3vqA6jYibMD/A9?= =?us-ascii?Q?JKCuDuNYbEo4pg7T8uord1ApGfQsbcXJqKQsfGiZFDo1ZjTgPFUFlEqBS+ja?= =?us-ascii?Q?bA=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ae21cef-57a3-4785-c935-08d9a260cd0f X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Nov 2021 02:38:08.9480 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: szumnxM6Wyu2h2gSCMpogJSedy6ZtjFe/IL3xyf1pZjrki+tExqciHqFNq5KaHa4KRoESTYE5zjgeeXnQn/h4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3419 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: 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 ; Liming Gao 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 Cc: Liming Gao Signed-off-by: Yuwei Chen --- BaseTools/Scripts/ConvertFceToStructurePcd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scri= pts/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 =3D [offset, t_name, 0, uint] line.append(struct) unparse.append(line) @@ -569,7 +569,7 @@ class mainp= rocess(object): for i in List: for j in i: tmp =3D j.split("|") - if (('L"' in j) and ("[" in j)) or (tmp[1].strip() =3D=3D '{0x0, 0= x0}'): + if (('L"' in j) and ("[" in j)) or (tmp[1].split("#")[0].strip() = =3D=3D '{0x0, 0x0}'): tmp[0] =3D tmp[0][:tmp[0].index('[')] List[List.index(i)][i.index(j)] =3D "|".join(tmp) else: -- 2.27.0.windows.1