From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.92.41.79]) by mx.groups.io with SMTP id smtpd.web12.350.1602886655688836177 for ; Fri, 16 Oct 2020 15:17:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=CdJzf+Gd; spf=pass (domain: outlook.com, ip: 40.92.41.79, mailfrom: spbrogan@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kdi3UGaCTbTU4Q4sajCL8GjXQqkb4rBxXWgBHeRwJvhluWDfbL9mVsxa8RWxBMw2kNYYefnUTSXv4zDr7Edwn8taSa+lf9sklojsHY6ZnSMyTF85lBHsBL7FFDDXLY4yEnePHOQQN5DT9d7mLmQEyaT18j+cMbvkV3UyRId2pUGJUg479qa5/3+rjW2eHTWHo8PKd95o5o2HxfaBjjHtidbVzH2KfIC02V42bRTOTWUef2BYOSfQfgMEPSQHpEVceKJIyKQACCg8ntyjUJKML6P6ZKdji8a+u5cd3tsihj1bU2Yrp14VobteoBUb0L4o7oA2SSRZb0C6x9OERj/X1Q== 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-SenderADCheck; bh=7P1So6VnJiCYx0B1Mor3B5fawSbBrSglVmEttvFQ2q8=; b=WUWge46C9uy0HWBf7cvsL7n4aNtdP/Nzv7esDLOvJGDWC3zJI1+BRIaJkhkER9ydOVNhQJdNht99f+BzL9Ms6dioiXvqfoAQ2RgkxaUsnYSYeoQpEfurman2+mJJJAm4g+9/oNx3F0wfWs9GKHJxxabprpQOOfeLZMcKoKj5hmGfv7iS/OVdf0NJsjGByAnmuFt8Sn0vvIpcBJc7bW4VLIEoYRWawHkjs8YNHZYxMjfuTo6HaM8tyowzkON7Iyu0IMdL4g9tnuEnFkzmED9Qv4jwb4AJz3kTBlF2pwpPoWLrm0pXCownl+EcI0dyiI2CT+EnmtoiAIFm0sIRq5exzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7P1So6VnJiCYx0B1Mor3B5fawSbBrSglVmEttvFQ2q8=; b=CdJzf+GdhMXvynZcBTFQ1d94ig1obgbaOHiaIxJ87sI7DDkK90o83UNSxspxE2fSv2KUkifpaK0swM9azr297nT7aj2XwCFGqZb9jHnN/FJZNLg7yYfYzLPrwe989HY9PN4wXz5WvTJd3cPfLami3BdhwfiyYIxYX54ypYhzWoLvDipvJYVEzpkq1D2Ld0MeVYEm2Kd5VcHd+QBd6e5zn4yk+MzNWqA4jQ+OcveNUueJmcnBxlGqK9ARRborcvYIkuvG/hI/PYzMdpwt515SlzwYl0mGmYv5XZfL2Fwul4/SO3L6W2Ki8x5WY2thwuWApSi+BYXXsToZYE0NqbEfwQ== Received: from MW2NAM10FT041.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e87::4c) by MW2NAM10HT006.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e87::484) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23; Fri, 16 Oct 2020 22:17:34 +0000 Received: from BN8PR07MB6962.namprd07.prod.outlook.com (2a01:111:e400:7e87::4c) by MW2NAM10FT041.mail.protection.outlook.com (2a01:111:e400:7e87::399) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Fri, 16 Oct 2020 22:17:34 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B6AC76073CE075FCAE4634D0CE945510954870264A1FA6F2A19FBC4011D70A8A;UpperCasedChecksum:4CB6D9F8D38B7C396BA6A39D0C9EC9A821FF51E7DDB67B8F51C0638CA3C8D0DF;SizeAsReceived:8832;Count:48 Received: from BN8PR07MB6962.namprd07.prod.outlook.com ([fe80::b1be:f3e4:f6e:66c3]) by BN8PR07MB6962.namprd07.prod.outlook.com ([fe80::b1be:f3e4:f6e:66c3%5]) with mapi id 15.20.3477.025; Fri, 16 Oct 2020 22:17:34 +0000 Subject: Re: [edk2-devel] [Patch] BaseTools: Fix PcdValueInit tool build issue with VS compiler x64 To: devel@edk2.groups.io, bob.c.feng@intel.com Cc: Liming Gao , Yuwei Chen , Michael D Kinney , Sean Brogan References: <20201015112037.26556-1-bob.c.feng@intel.com> From: "Sean" Message-ID: Date: Fri, 16 Oct 2020 15:17:23 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 In-Reply-To: <20201015112037.26556-1-bob.c.feng@intel.com> X-TMN: [BBP/O+WriLCxUYvW/QbjJudG0xlcONxk] X-ClientProxiedBy: MWHPR1201CA0002.namprd12.prod.outlook.com (2603:10b6:301:4a::12) To BN8PR07MB6962.namprd07.prod.outlook.com (2603:10b6:408:d6::11) Return-Path: spbrogan@outlook.com X-Microsoft-Original-Message-ID: <0c2e9bdc-e819-f278-e4a6-889ecce890a1@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.2.78] (50.47.113.221) by MWHPR1201CA0002.namprd12.prod.outlook.com (2603:10b6:301:4a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Fri, 16 Oct 2020 22:17:32 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b12a6f5a-5c08-4e01-0a21-08d8722147bc X-MS-TrafficTypeDiagnostic: MW2NAM10HT006: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i/NSkTNRVtoMDQPm8OLfjnbaAEnn1lJUjgL4ekDaMc1HDG70ywDsoLxaUdexrlVEGO9iDoJf5Z+JYMr+XejGPay9MMev4veYPYa0JFVyVxC0OucMHWog0LbtbqkwruWvn8QD/4xC3aPSR9phG2L/zf3pbwqt1IGT71RjiI3qZgPsfS8+jQnabk1WNdcQ15x2Y46LRWC3YORj/ZZxuos17B0pBEPpolbX7TipRtuWoFbjArgaFpf9vZ+/1KekmeR8 X-MS-Exchange-AntiSpam-MessageData: CosSTIcs0L4voKZ1BbVO7w5Vcnk9+6M1xMU/7Tu0Y+TSOzjDITxFgX9FPzdJF8UzSVwD3t7uAtd9DHiw1Pg/cYLG8SUxTHN7DSxUW2GBR0x3J1Tgdi27JdVWDZNbyjGeya3WJbGFCANfMrSZUU9TNQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b12a6f5a-5c08-4e01-0a21-08d8722147bc X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2020 22:17:33.9990 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: MW2NAM10FT041.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2NAM10HT006 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Reviewed-by: Sean Brogan On 10/15/2020 4:20 AM, Bob Feng wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3001 > > When the 64-bit version of VS compiler is used, the generated > PcdValueInit tool will be failed to compile. > > This patch is going to fix that issue. > > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > Cc: Michael D Kinney > Cc: Sean Brogan > > --- > BaseTools/Source/C/Common/PcdValueCommon.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/BaseTools/Source/C/Common/PcdValueCommon.h b/BaseTools/Source/C/Common/PcdValueCommon.h > index cfd3bb76e1..1652bd5430 100644 > --- a/BaseTools/Source/C/Common/PcdValueCommon.h > +++ b/BaseTools/Source/C/Common/PcdValueCommon.h > @@ -12,11 +12,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include > #include > > #define __FIELD_SIZE(TYPE, Field) (sizeof((TYPE *)0)->Field) > #define __ARRAY_ELEMENT_SIZE(TYPE, Field) (sizeof((TYPE *)0)->Field[0]) > -#define __OFFSET_OF(TYPE, Field) ((UINT32) &(((TYPE *)0)->Field)) > +#define __OFFSET_OF(TYPE, Field) ((UINT32)(size_t) &(((TYPE *)0)->Field)) > #define __FLEXIBLE_SIZE(Size, TYPE, Field, MaxIndex) if (__FIELD_SIZE(TYPE, Field) == 0) Size = MAX((__OFFSET_OF(TYPE, Field) + __ARRAY_ELEMENT_SIZE(TYPE, Field) * (MaxIndex)), Size) > #define __ARRAY_SIZE(Array) (sizeof(Array)/sizeof(Array[0])) > > #if defined(_MSC_EXTENSIONS) > #define __STATIC_ASSERT static_assert >