Basetools/GenFds: refactor class FV

1) initialize UiFvName via __init__ parameter. No change to default behavior.
2) initialize 3 empty lists in __init__. Curently not guarenteed initialized.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 8b4d5e7fd863cc5e24602784fbc96f36fbb1c870..9e806de0d294a6dea3a3cfc61eb576b7876d766b 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -2090,8 +2090,7 @@ class FdfParser:
         if not self._IsToken(TAB_SECTION_END):\r
             raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
 \r
-        FvObj = FV()\r
-        FvObj.UiFvName = self.CurrentFvName\r
+        FvObj = FV(Name=self.CurrentFvName)\r
         self.Profile.FvDict[self.CurrentFvName] = FvObj\r
 \r
         Status = self._GetCreateFile(FvObj)\r
@@ -2102,9 +2101,6 @@ class FdfParser:
 \r
         self._GetAddressStatements(FvObj)\r
 \r
-        FvObj.FvExtEntryTypeValue = []\r
-        FvObj.FvExtEntryType = []\r
-        FvObj.FvExtEntryData = []\r
         while True:\r
             self._GetSetStatements(FvObj)\r
 \r

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 30525bd11fcc7dbac8e90f19917540bead300a7f..d89e7bfbdd6edf8b24eeaa294c2509270708d012 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -37,8 +37,8 @@ class FV (object):
     #\r
     #   @param  self        The object pointer\r
     #\r
-    def __init__(self):\r
-        self.UiFvName = None\r
+    def __init__(self, Name=None):\r
+        self.UiFvName = Name\r
         self.CreateFileName = None\r
         self.BlockSizeList = []\r
         self.DefineVarDict = {}\r
@@ -61,7 +61,9 @@ class FV (object):
         self.FvForceRebase = None\r
         self.FvRegionInFD = None\r
         self.UsedSizeEnable = False\r
-\r
+        self.FvExtEntryTypeValue = []\r
+        self.FvExtEntryType = []\r
+        self.FvExtEntryData = []\r
     ## AddToBuffer()\r
     #\r
     #   Generate Fv and add it to the Buffer\r
@@ -77,7 +79,6 @@ class FV (object):
     #   @retval string      Generated FV file path\r
     #\r
     def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False):\r
-\r
         if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFdsGlobalVariable.ImageBinDict:\r
             return GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + 'fv']\r
 \r