From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 33BBE21A16E35 for ; Wed, 10 May 2017 23:19:15 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 10 May 2017 23:19:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,322,1491289200"; d="scan'208";a="85437864" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga002.jf.intel.com with ESMTP; 10 May 2017 23:19:14 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 10 May 2017 23:19:13 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 10 May 2017 23:19:13 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.246]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.117]) with mapi id 14.03.0319.002; Thu, 11 May 2017 14:19:11 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Correct VOID* PatchPcd Size in Library Autogen Thread-Index: AQHSyYxOAdf1/0RyL0aG+kpGkntA6aHuqeFQ Date: Thu, 11 May 2017 06:19:11 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D72CD98@shsmsx102.ccr.corp.intel.com> References: <1494420750-71068-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1494420750-71068-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Correct VOID* PatchPcd Size in Library Autogen X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 May 2017 06:19:15 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Zhu, Yonghong > Sent: Wednesday, May 10, 2017 8:53 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming > Subject: [Patch] BaseTools: Correct VOID* PatchPcd Size in Library Autoge= n >=20 > This patch correct the VOID* PatchPcd Size info generated in the > Library's autogen file. Update it to use the MaxDatumSize. >=20 > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu > --- > BaseTools/Source/Python/AutoGen/GenC.py | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/P= ython/AutoGen/GenC.py > index 0fb6b9f..542edb3 100644 > --- a/BaseTools/Source/Python/AutoGen/GenC.py > +++ b/BaseTools/Source/Python/AutoGen/GenC.py > @@ -1201,19 +1201,20 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH= , Pcd): > DatumType =3D ['UINT8', 'UINT16'][Pcd.DefaultValue[0] =3D=3D= 'L'] > AutoGenH.Append('extern %s _gPcd_BinaryPatch_%s%s;\n' %(Datu= mType, TokenCName, Array)) > else: > AutoGenH.Append('extern volatile %s %s%s;\n' % (DatumType,= PcdVariableName, Array)) > AutoGenH.Append('#define %s %s_gPcd_BinaryPatch_%s\n' %(GetMode= Name, Type, TokenCName)) > + PcdDataSize =3D GetPcdSize(Pcd) > if Pcd.DatumType =3D=3D 'VOID*': > AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPatchP= cdSetPtrAndSize((VOID *)_gPcd_BinaryPatch_%s, > &_gPcd_BinaryPatch_Size_%s, (UINTN)_PCD_PATCHABLE_%s_SIZE, (SizeOfBuffer)= , (Buffer))\n' % (SetModeName, TokenCName, > TokenCName, TokenCName)) > AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPatchP= cdSetPtrAndSizeS((VOID *)_gPcd_BinaryPatch_%s, > &_gPcd_BinaryPatch_Size_%s, (UINTN)_PCD_PATCHABLE_%s_SIZE, (SizeOfBuffer)= , (Buffer))\n' % (SetModeStatusName, TokenCName, > TokenCName, TokenCName)) > + AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, = Pcd.MaxDatumSize)) > else: > AutoGenH.Append('#define %s(Value) (%s =3D (Value))\n' % (S= etModeName, PcdVariableName)) > AutoGenH.Append('#define %s(Value) ((%s =3D (Value)), RETUR= N_SUCCESS)\n' % (SetModeStatusName, > PcdVariableName)) > - > - PcdDataSize =3D GetPcdSize(Pcd) > - AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, PcdD= ataSize)) > + AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, = PcdDataSize)) > + > AutoGenH.Append('#define %s %s\n' % (GetModeSizeName,PatchPcdSiz= eVariableName)) > AutoGenH.Append('extern UINTN %s; \n' % PatchPcdSizeVariableName= ) >=20 > if PcdItemType =3D=3D TAB_PCDS_FIXED_AT_BUILD or PcdItemType =3D=3D = TAB_PCDS_FEATURE_FLAG: > key =3D ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName)) > -- > 2.6.1.windows.1