Re: [edk2] [PATCH v1 2/4] BaseTools: replace 'UINT8', 'UINT16', 'UINT32', 'UINT64', 'VOID*' with shared constants.
Hi Jaben,
In GenFdsGlobalVariable.py file, it should use DataType.TAB_VOID because
current the import statement in this file is " import Common.DataType as
DataType".
Best Regards,
Zhu Yonghong
-Original Message-
From: Carsey, Jaben
Sent: Thursday, April 12, 2018 7:08 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming ; Zhu, Yonghong
Subject: [PATCH v1 2/4] BaseTools: replace
'UINT8','UINT16','UINT32','UINT64','VOID*' with shared constants.
Cc: Liming Gao
Cc: Yonghong Zhu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey
---
BaseTools/Source/Python/AutoGen/AutoGen.py | 26 +++---
BaseTools/Source/Python/AutoGen/GenC.py | 94
++--
BaseTools/Source/Python/AutoGen/GenPcdDb.py | 23 ++---
BaseTools/Source/Python/AutoGen/GenVar.py | 29 +++---
BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py | 9 +-
BaseTools/Source/Python/Common/DataType.py | 6 +-
BaseTools/Source/Python/Common/Expression.py| 61
++---
BaseTools/Source/Python/Common/Misc.py | 12 +--
BaseTools/Source/Python/Common/RangeExpression.py | 9 +-
BaseTools/Source/Python/Common/VpdInfoFile.py | 7 +-
BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py | 2 +-
BaseTools/Source/Python/GenFds/FdfParser.py | 15 ++--
BaseTools/Source/Python/GenFds/FfsInfStatement.py | 7 +-
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 +-
BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py | 21 ++---
BaseTools/Source/Python/Workspace/DscBuildData.py | 48 +-
BaseTools/Source/Python/build/BuildReport.py| 4 +-
17 files changed, 191 insertions(+), 186 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
b/BaseTools/Source/Python/AutoGen/AutoGen.py
index dbc9f893c2f1..8f663b8318f9 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1401,7 +1401,7 @@ class PlatformAutoGen(AutoGen):
for PcdFromModule in M.ModulePcdList + M.LibraryPcdList:
# make sure that the "VOID*" kind of datum has MaxDatumSize set
-if PcdFromModule.DatumType == "VOID*" and
PcdFromModule.MaxDatumSize in [None, '']:
+if PcdFromModule.DatumType == TAB_VOID and
PcdFromModule.MaxDatumSize in [None, '']:
NoDatumTypePcdList.add("%s.%s [%s]" %
(PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, F))
# Check the PCD from Binary INF or Source INF
@@ -1483,7 +1483,7 @@ class PlatformAutoGen(AutoGen):
ExtraData="\n\tExisted %s PCD %s
in:\n\t\t%s\n"
% (PcdFromModule.Type,
PcdFromModule.TokenCName, InfName))
# make sure that the "VOID*" kind of datum has
MaxDatumSize set
-if PcdFromModule.DatumType == "VOID*" and
PcdFromModule.MaxDatumSize in [None, '']:
+if PcdFromModule.DatumType == TAB_VOID and
PcdFromModule.MaxDatumSize in [None, '']:
NoDatumTypePcdList.add("%s.%s [%s]" %
(PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, InfName))
if M.ModuleType in ["PEIM", "PEI_CORE"]:
PcdFromModule.Phase = "PEI"
@@ -1548,7 +1548,7 @@ class PlatformAutoGen(AutoGen):
for item in self._PlatformPcds:
if self._PlatformPcds[item].DatumType and
self._PlatformPcds[item].DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32,
TAB_UINT64, TAB_VOID, "BOOLEAN"]:
-self._PlatformPcds[item].DatumType = "VOID*"
+self._PlatformPcds[item].DatumType = TAB_VOID
if (self.Workspace.ArchList[-1] == self.Arch):
for Pcd in self._DynamicPcdList:
@@ -1557,7 +1557,7 @@ class PlatformAutoGen(AutoGen):
Sku.VpdOffset = Sku.VpdOffset.strip()
if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32,
TAB_UINT64, TAB_VOID, "BOOLEAN"]:
-Pcd.DatumType = "VOID*"
+Pcd.DatumType = TAB_VOID
# if found PCD which datum value is unicode string the
insert to left size of UnicodeIndex
# if found HII type PCD then insert to right of
UnicodeIndex
@@ -1709,7 +1709,7 @@ class PlatformAutoGen(AutoGen):
SkuValueMap[PcdValue].append(Sku)
if not NeedProcessVpdMapFile and Sku.VpdOffset
== "*":
NeedProcessVpdMapFile = True
-if DscPcdEntry.DatumType == 'VOID*' and
PcdValue.startswith("L"):
+if DscPcdEntry.D
[edk2] [PATCH v1 2/4] BaseTools: replace 'UINT8', 'UINT16', 'UINT32', 'UINT64', 'VOID*' with shared constants.
Cc: Liming Gao
Cc: Yonghong Zhu
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey
---
BaseTools/Source/Python/AutoGen/AutoGen.py | 26 +++---
BaseTools/Source/Python/AutoGen/GenC.py | 94
++--
BaseTools/Source/Python/AutoGen/GenPcdDb.py | 23 ++---
BaseTools/Source/Python/AutoGen/GenVar.py | 29 +++---
BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py | 9 +-
BaseTools/Source/Python/Common/DataType.py | 6 +-
BaseTools/Source/Python/Common/Expression.py| 61
++---
BaseTools/Source/Python/Common/Misc.py | 12 +--
BaseTools/Source/Python/Common/RangeExpression.py | 9 +-
BaseTools/Source/Python/Common/VpdInfoFile.py | 7 +-
BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py | 2 +-
BaseTools/Source/Python/GenFds/FdfParser.py | 15 ++--
BaseTools/Source/Python/GenFds/FfsInfStatement.py | 7 +-
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 +-
BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py | 21 ++---
BaseTools/Source/Python/Workspace/DscBuildData.py | 48 +-
BaseTools/Source/Python/build/BuildReport.py| 4 +-
17 files changed, 191 insertions(+), 186 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
b/BaseTools/Source/Python/AutoGen/AutoGen.py
index dbc9f893c2f1..8f663b8318f9 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1401,7 +1401,7 @@ class PlatformAutoGen(AutoGen):
for PcdFromModule in M.ModulePcdList + M.LibraryPcdList:
# make sure that the "VOID*" kind of datum has MaxDatumSize set
-if PcdFromModule.DatumType == "VOID*" and
PcdFromModule.MaxDatumSize in [None, '']:
+if PcdFromModule.DatumType == TAB_VOID and
PcdFromModule.MaxDatumSize in [None, '']:
NoDatumTypePcdList.add("%s.%s [%s]" %
(PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, F))
# Check the PCD from Binary INF or Source INF
@@ -1483,7 +1483,7 @@ class PlatformAutoGen(AutoGen):
ExtraData="\n\tExisted %s PCD %s
in:\n\t\t%s\n"
% (PcdFromModule.Type,
PcdFromModule.TokenCName, InfName))
# make sure that the "VOID*" kind of datum has
MaxDatumSize set
-if PcdFromModule.DatumType == "VOID*" and
PcdFromModule.MaxDatumSize in [None, '']:
+if PcdFromModule.DatumType == TAB_VOID and
PcdFromModule.MaxDatumSize in [None, '']:
NoDatumTypePcdList.add("%s.%s [%s]" %
(PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, InfName))
if M.ModuleType in ["PEIM", "PEI_CORE"]:
PcdFromModule.Phase = "PEI"
@@ -1548,7 +1548,7 @@ class PlatformAutoGen(AutoGen):
for item in self._PlatformPcds:
if self._PlatformPcds[item].DatumType and
self._PlatformPcds[item].DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32,
TAB_UINT64, TAB_VOID, "BOOLEAN"]:
-self._PlatformPcds[item].DatumType = "VOID*"
+self._PlatformPcds[item].DatumType = TAB_VOID
if (self.Workspace.ArchList[-1] == self.Arch):
for Pcd in self._DynamicPcdList:
@@ -1557,7 +1557,7 @@ class PlatformAutoGen(AutoGen):
Sku.VpdOffset = Sku.VpdOffset.strip()
if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32,
TAB_UINT64, TAB_VOID, "BOOLEAN"]:
-Pcd.DatumType = "VOID*"
+Pcd.DatumType = TAB_VOID
# if found PCD which datum value is unicode string the
insert to left size of UnicodeIndex
# if found HII type PCD then insert to right of
UnicodeIndex
@@ -1709,7 +1709,7 @@ class PlatformAutoGen(AutoGen):
SkuValueMap[PcdValue].append(Sku)
if not NeedProcessVpdMapFile and Sku.VpdOffset
== "*":
NeedProcessVpdMapFile = True
-if DscPcdEntry.DatumType == 'VOID*' and
PcdValue.startswith("L"):
+if DscPcdEntry.DatumType == TAB_VOID and
PcdValue.startswith("L"):
UnicodePcdArray.add(DscPcdEntry)
elif len(Sku.VariableName) > 0:
HiiPcdArray.add(DscPcdEntry)
@@ -1756,10 +1756,10 @@ class PlatformAutoGen(AutoGen):
Sku.VpdOffset = Sku.VpdOffset.strip()
if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32,
TAB_UINT64, TAB_VOID, "BOOL
