Reviewed-by: Liming Gao <liming....@intel.com> > -----Original Message----- > From: Zhu, Yonghong > Sent: Wednesday, May 10, 2017 8:53 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming <liming....@intel.com> > Subject: [Patch] BaseTools: Correct VOID* PatchPcd Size in Library Autogen > > This patch correct the VOID* PatchPcd Size info generated in the > Library's autogen file. Update it to use the MaxDatumSize. > > Cc: Liming Gao <liming....@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu <yonghong....@intel.com> > --- > BaseTools/Source/Python/AutoGen/GenC.py | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/BaseTools/Source/Python/AutoGen/GenC.py > b/BaseTools/Source/Python/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 = ['UINT8', 'UINT16'][Pcd.DefaultValue[0] == 'L'] > AutoGenH.Append('extern %s _gPcd_BinaryPatch_%s%s;\n' > %(DatumType, TokenCName, Array)) > else: > AutoGenH.Append('extern volatile %s %s%s;\n' % (DatumType, > PcdVariableName, Array)) > AutoGenH.Append('#define %s %s_gPcd_BinaryPatch_%s\n' > %(GetModeName, Type, TokenCName)) > + PcdDataSize = GetPcdSize(Pcd) > if Pcd.DatumType == 'VOID*': > AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) > LibPatchPcdSetPtrAndSize((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) > LibPatchPcdSetPtrAndSizeS((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 = (Value))\n' % > (SetModeName, PcdVariableName)) > AutoGenH.Append('#define %s(Value) ((%s = (Value)), > RETURN_SUCCESS)\n' % (SetModeStatusName, > PcdVariableName)) > - > - PcdDataSize = GetPcdSize(Pcd) > - AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, > PcdDataSize)) > + AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, > PcdDataSize)) > + > AutoGenH.Append('#define %s %s\n' % > (GetModeSizeName,PatchPcdSizeVariableName)) > AutoGenH.Append('extern UINTN %s; \n' % PatchPcdSizeVariableName) > > if PcdItemType == TAB_PCDS_FIXED_AT_BUILD or PcdItemType == > TAB_PCDS_FEATURE_FLAG: > key = ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName)) > -- > 2.6.1.windows.1
_______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel