from Common.BuildToolError import *\r
from Common.DataType import *\r
from Common.Misc import *\r
-from Common.String import StringToArray\r
+from Common.StringUtils import StringToArray\r
from StrGather import *\r
from GenPcdDb import CreatePcdDatabaseCode\r
from IdfClassObject import *\r
% (RealTokenCName, RealTokenCName, RealTokenCName, RealTokenCName))\r
TokenCNameList.add(TokenCName)\r
\r
-def GetPcdSize(Pcd):\r
- if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES:\r
- Value = Pcd.DefaultValue\r
- if Value in [None, '']:\r
- return 1\r
- elif Value[0] == 'L':\r
- return (len(Value) - 2) * 2\r
- elif Value[0] == '{':\r
- return len(Value.split(','))\r
- else:\r
- return len(Value) - 1\r
- if Pcd.DatumType == TAB_UINT64:\r
- return 8\r
- if Pcd.DatumType == TAB_UINT32:\r
- return 4\r
- if Pcd.DatumType == TAB_UINT16:\r
- return 2\r
- if Pcd.DatumType == TAB_UINT8:\r
- return 1\r
- if Pcd.DatumType == 'BOOLEAN':\r
- return 1\r
- else:\r
- return Pcd.MaxDatumSize\r
-\r
-\r
## Create code for module PCDs\r
#\r
# @param Info The ModuleAutoGen object\r
if not Value.endswith('U'):\r
Value += 'U'\r
if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES:\r
- if Pcd.MaxDatumSize is None or Pcd.MaxDatumSize == '':\r
+ if not Pcd.MaxDatumSize:\r
EdkLogger.error("build", AUTOGEN_ERROR,\r
"Unknown [MaxDatumSize] of PCD [%s.%s]" % (Pcd.TokenSpaceGuidCName, TokenCName),\r
ExtraData="[%s]" % str(Info))\r
ArraySize = int(Pcd.MaxDatumSize, 0)\r
if Value[0] == '{':\r
Type = '(VOID *)'\r
+ ValueSize = len(Value.split(','))\r
else:\r
if Value[0] == 'L':\r
Unicode = True\r
Value = Value.lstrip('L') #.strip('"')\r
Value = eval(Value) # translate escape character\r
+ ValueSize = len(Value) + 1\r
NewValue = '{'\r
for Index in range(0,len(Value)):\r
if Unicode:\r
else:\r
NewValue = NewValue + str(ord(Value[Index]) % 0x100) + ', '\r
if Unicode:\r
- ArraySize = ArraySize / 2;\r
-\r
- if ArraySize < (len(Value) + 1):\r
- if Pcd.MaxSizeUserSet:\r
- EdkLogger.error("build", AUTOGEN_ERROR,\r
- "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, TokenCName),\r
- ExtraData="[%s]" % str(Info))\r
- else:\r
- ArraySize = GetPcdSize(Pcd)\r
- if Unicode:\r
- ArraySize = ArraySize / 2\r
+ ArraySize = ArraySize / 2\r
Value = NewValue + '0 }'\r
+ if ArraySize < ValueSize:\r
+ if Pcd.MaxSizeUserSet:\r
+ EdkLogger.error("build", AUTOGEN_ERROR,\r
+ "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, TokenCName),\r
+ ExtraData="[%s]" % str(Info))\r
+ else:\r
+ ArraySize = Pcd.GetPcdSize()\r
+ if Unicode:\r
+ ArraySize = ArraySize / 2\r
Array = '[%d]' % ArraySize\r
#\r
# skip casting for fixed at build since it breaks ARM assembly.\r
elif Pcd.Type != TAB_PCDS_FIXED_AT_BUILD and Pcd.DatumType in TAB_PCD_NUMERIC_TYPES_VOID:\r
Value = "((%s)%s)" % (Pcd.DatumType, Value)\r
\r
- if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES_VOID:\r
- # handle structure PCD\r
- if Pcd.MaxDatumSize is None or Pcd.MaxDatumSize == '':\r
- EdkLogger.error("build", AUTOGEN_ERROR,\r
- "Unknown [MaxDatumSize] of PCD [%s.%s]" % (Pcd.TokenSpaceGuidCName, TokenCName),\r
- ExtraData="[%s]" % str(Info))\r
-\r
- ArraySize = int(Pcd.MaxDatumSize, 0)\r
- Array = '[%d]' % ArraySize\r
-\r
if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE:\r
PcdValueName = '_PCD_PATCHABLE_VALUE_' + TokenCName\r
else:\r
AutoGenH.Append('extern %s UINT8 %s%s;\n' %(Const, PcdVariableName, Array))\r
AutoGenH.Append('#define %s %s%s\n' %(GetModeName, Type, PcdVariableName))\r
\r
- PcdDataSize = GetPcdSize(Pcd)\r
+ PcdDataSize = Pcd.GetPcdSize()\r
if Pcd.Type == TAB_PCDS_FIXED_AT_BUILD:\r
AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenName, PcdDataSize))\r
AutoGenH.Append('#define %s %s \n' % (GetModeSizeName,FixPcdSizeTokenName))\r
AutoGenH.Append('extern volatile %s %s %s%s;\n' % (Const, Pcd.DatumType, PcdVariableName, Array))\r
AutoGenH.Append('#define %s %s%s\n' % (GetModeName, Type, PcdVariableName))\r
\r
- PcdDataSize = GetPcdSize(Pcd)\r
+ PcdDataSize = Pcd.GetPcdSize()\r
AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, PcdDataSize))\r
\r
AutoGenH.Append('#define %s %s \n' % (GetModeSizeName,PatchPcdSizeVariableName))\r
AutoGenH.Append('extern UINTN %s; \n' % PatchPcdSizeVariableName)\r
AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED UINTN %s = %s;\n' % (PatchPcdSizeVariableName,PcdDataSize))\r
else:\r
- PcdDataSize = GetPcdSize(Pcd)\r
+ PcdDataSize = Pcd.GetPcdSize()\r
AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenName, PcdDataSize))\r
AutoGenH.Append('#define %s %s \n' % (GetModeSizeName,FixPcdSizeTokenName))\r
\r
else:\r
AutoGenH.Append('extern volatile %s %s%s;\n' % (DatumType, PcdVariableName, Array))\r
AutoGenH.Append('#define %s %s_gPcd_BinaryPatch_%s\n' %(GetModeName, Type, TokenCName))\r
- PcdDataSize = GetPcdSize(Pcd)\r
+ PcdDataSize = Pcd.GetPcdSize()\r
if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES:\r
AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPatchPcdSetPtrAndSize((VOID *)_gPcd_BinaryPatch_%s, &%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeName, TokenCName, PatchPcdSizeVariableName, PatchPcdMaxSizeVariable))\r
AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPatchPcdSetPtrAndSizeS((VOID *)_gPcd_BinaryPatch_%s, &%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeStatusName, TokenCName, PatchPcdSizeVariableName, PatchPcdMaxSizeVariable))\r
AutoGenH.Append('#define _PCD_VALUE_%s %s%s\n' %(TokenCName, Type, PcdVariableName))\r
else:\r
AutoGenH.Append('#define _PCD_VALUE_%s %s\n' %(TokenCName, Pcd.DefaultValue))\r
- PcdDataSize = GetPcdSize(Pcd)\r
+ PcdDataSize = Pcd.GetPcdSize()\r
if PcdItemType == TAB_PCDS_FIXED_AT_BUILD:\r
if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES:\r
if ConstFixedPcd:\r
#\r
def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH):\r
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
- GuidType = "GUID"\r
+ GuidType = TAB_GUID\r
else:\r
GuidType = "EFI_GUID"\r
\r
#\r
def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH):\r
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
- GuidType = "GUID"\r
+ GuidType = TAB_GUID\r
else:\r
GuidType = "EFI_GUID"\r
\r
#\r
def CreatePpiDefinitionCode(Info, AutoGenC, AutoGenH):\r
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
- GuidType = "GUID"\r
+ GuidType = TAB_GUID\r
else:\r
GuidType = "EFI_GUID"\r
\r
TokenSpaceList = []\r
for Pcd in Info.ModulePcdList:\r
if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET and Pcd.TokenSpaceGuidCName not in TokenSpaceList:\r
- TokenSpaceList += [Pcd.TokenSpaceGuidCName]\r
+ TokenSpaceList.append(Pcd.TokenSpaceGuidCName)\r
\r
SkuMgr = Info.Workspace.Platform.SkuIdMgr\r
AutoGenH.Append("\n// Definition of SkuId Array\n")\r
if TokenSpaceList:\r
AutoGenH.Append("\n// Definition of PCD Token Space GUIDs used in this module\n\n")\r
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
- GuidType = "GUID"\r
+ GuidType = TAB_GUID\r
else:\r
GuidType = "EFI_GUID" \r
for Item in TokenSpaceList:\r
AutoGenH.Append(gAutoGenHCppPrologueString)\r
if Info.AutoGenVersion >= 0x00010005:\r
# header files includes\r
- AutoGenH.Append("#include <%s>\n" % gBasicHeaderFile)\r
- if Info.ModuleType in gModuleTypeHeaderFile \\r
- and gModuleTypeHeaderFile[Info.ModuleType][0] != gBasicHeaderFile:\r
+ if Info.ModuleType in gModuleTypeHeaderFile:\r
AutoGenH.Append("#include <%s>\n" % gModuleTypeHeaderFile[Info.ModuleType][0])\r
#\r
# if either PcdLib in [LibraryClasses] sections or there exist Pcd section, add PcdLib.h \r
GuidMacros.append('#define %s %s' % (Guid, Info.Module.Guids[Guid]))\r
for Guid, Value in Info.Module.Protocols.items() + Info.Module.Ppis.items():\r
GuidMacros.append('#define %s %s' % (Guid, Value))\r
- # supports FixedAtBuild usage in VFR file\r
+ # supports FixedAtBuild and FeaturePcd usage in VFR file\r
if Info.VfrFileList and Info.ModulePcdList:\r
GuidMacros.append('#define %s %s' % ('FixedPcdGetBool(TokenName)', '_PCD_VALUE_##TokenName'))\r
GuidMacros.append('#define %s %s' % ('FixedPcdGet8(TokenName)', '_PCD_VALUE_##TokenName'))\r
GuidMacros.append('#define %s %s' % ('FixedPcdGet16(TokenName)', '_PCD_VALUE_##TokenName'))\r
GuidMacros.append('#define %s %s' % ('FixedPcdGet32(TokenName)', '_PCD_VALUE_##TokenName'))\r
GuidMacros.append('#define %s %s' % ('FixedPcdGet64(TokenName)', '_PCD_VALUE_##TokenName'))\r
+ GuidMacros.append('#define %s %s' % ('FeaturePcdGet(TokenName)', '_PCD_VALUE_##TokenName'))\r
for Pcd in Info.ModulePcdList:\r
- if Pcd.Type == TAB_PCDS_FIXED_AT_BUILD:\r
+ if Pcd.Type in [TAB_PCDS_FIXED_AT_BUILD, TAB_PCDS_FEATURE_FLAG]:\r
TokenCName = Pcd.TokenCName\r
Value = Pcd.DefaultValue\r
if Pcd.DatumType == 'BOOLEAN':\r
projects / mirror_edk2.git / blobdiff