BaseTools: Replace StandardError with Expression

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / Region.py

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 7548a4f014b1397be4bb6cfbb3b7b287119d06fc..9d632b6321e2daef8d546f04293d0393c36509ce 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process FD Region generation\r
 #\r
-#  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -26,6 +26,7 @@ from Common import EdkLogger
 from Common.BuildToolError import *\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
+from Common.DataType import BINARY_FILE_TYPE_FV\r
 \r
 ## generate Region\r
 #\r
@@ -56,7 +57,7 @@ class Region(RegionClassObject):
                 PadByte = pack('B', 0xFF)\r
             else:\r
                 PadByte = pack('B', 0)\r
-            PadData = string.join(PadByte for i in xrange(0, Size))\r
+            PadData = ''.join(PadByte for i in xrange(0, Size))\r
             Buffer.write(PadData)\r
 \r
     ## AddToBuffer()\r
@@ -74,13 +75,16 @@ class Region(RegionClassObject):
     #   @retval string      Generated FV file path\r
     #\r
 \r
-    def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}):\r
+    def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}, Flag=False):\r
         Size = self.Size\r
-        GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
-        GenFdsGlobalVariable.InfLogger("   Region Size = 0x%X" % Size)\r
+        if not Flag:\r
+            GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
+            GenFdsGlobalVariable.InfLogger("   Region Size = 0x%X" % Size)\r
         GenFdsGlobalVariable.SharpCounter = 0\r
+        if Flag and (self.RegionType != BINARY_FILE_TYPE_FV):\r
+            return\r
 \r
-        if self.RegionType == 'FV':\r
+        if self.RegionType == BINARY_FILE_TYPE_FV:\r
             #\r
             # Get Fv from FvDict\r
             #\r
@@ -91,26 +95,29 @@ class Region(RegionClassObject):
                 FileName = None\r
                 if RegionData.endswith(".fv"):\r
                     RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
-                    GenFdsGlobalVariable.InfLogger('   Region FV File Name = .fv : %s' % RegionData)\r
+                    if not Flag:\r
+                        GenFdsGlobalVariable.InfLogger('   Region FV File Name = .fv : %s' % RegionData)\r
                     if RegionData[1] != ':' :\r
                         RegionData = mws.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
                     if not os.path.exists(RegionData):\r
                         EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=RegionData)\r
 \r
                     FileName = RegionData\r
-                elif RegionData.upper() + 'fv' in ImageBinDict.keys():\r
-                    GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
+                elif RegionData.upper() + 'fv' in ImageBinDict:\r
+                    if not Flag:\r
+                        GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
                     FileName = ImageBinDict[RegionData.upper() + 'fv']\r
                 else:\r
                     #\r
                     # Generate FvImage.\r
                     #\r
                     FvObj = None\r
-                    if RegionData.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict.keys():\r
-                        FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(RegionData.upper())\r
+                    if RegionData.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict:\r
+                        FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict[RegionData.upper()]\r
 \r
-                    if FvObj != None :\r
-                        GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
+                    if FvObj is not None :\r
+                        if not Flag:\r
+                            GenFdsGlobalVariable.InfLogger('   Region Name = FV')\r
                         #\r
                         # Call GenFv tool\r
                         #\r
@@ -124,7 +131,10 @@ class Region(RegionClassObject):
                         FvBaseAddress = '0x%X' % self.FvAddress\r
                         BlockSize = None\r
                         BlockNum = None\r
-                        FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict)\r
+                        FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict, Flag=Flag)\r
+                        if Flag:\r
+                            continue\r
+\r
                         if FvBuffer.len > Size:\r
                             FvBuffer.close()\r
                             EdkLogger.error("GenFds", GENFDS_ERROR,\r
@@ -142,20 +152,22 @@ class Region(RegionClassObject):
                 #\r
                 # Add the exist Fv image into FD buffer\r
                 #\r
-                if FileName != None:\r
-                    FileLength = os.stat(FileName)[ST_SIZE]\r
-                    if FileLength > Size:\r
-                        EdkLogger.error("GenFds", GENFDS_ERROR,\r
-                                        "Size of FV File (%s) is larger than Region Size 0x%X specified." \\r
-                                        % (RegionData, Size))\r
-                    BinFile = open(FileName, 'r+b')\r
-                    Buffer.write(BinFile.read())\r
-                    BinFile.close()\r
-                    Size = Size - FileLength\r
+                if not Flag:\r
+                    if FileName is not None:\r
+                        FileLength = os.stat(FileName)[ST_SIZE]\r
+                        if FileLength > Size:\r
+                            EdkLogger.error("GenFds", GENFDS_ERROR,\r
+                                            "Size of FV File (%s) is larger than Region Size 0x%X specified." \\r
+                                            % (RegionData, Size))\r
+                        BinFile = open(FileName, 'rb')\r
+                        Buffer.write(BinFile.read())\r
+                        BinFile.close()\r
+                        Size = Size - FileLength\r
             #\r
             # Pad the left buffer\r
             #\r
-            self.PadBuffer(Buffer, ErasePolarity, Size)\r
+            if not Flag:\r
+                self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
         if self.RegionType == 'CAPSULE':\r
             #\r
@@ -171,7 +183,7 @@ class Region(RegionClassObject):
                         EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=RegionData)\r
 \r
                     FileName = RegionData\r
-                elif RegionData.upper() + 'cap' in ImageBinDict.keys():\r
+                elif RegionData.upper() + 'cap' in ImageBinDict:\r
                     GenFdsGlobalVariable.InfLogger('   Region Name = CAPSULE')\r
                     FileName = ImageBinDict[RegionData.upper() + 'cap']\r
                 else:\r
@@ -179,10 +191,10 @@ class Region(RegionClassObject):
                     # Generate Capsule image and Put it into FD buffer\r
                     #\r
                     CapsuleObj = None\r
-                    if RegionData.upper() in GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict.keys():\r
+                    if RegionData.upper() in GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict:\r
                         CapsuleObj = GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict[RegionData.upper()]\r
 \r
-                    if CapsuleObj != None :\r
+                    if CapsuleObj is not None :\r
                         CapsuleObj.CapsuleName = RegionData.upper()\r
                         GenFdsGlobalVariable.InfLogger('   Region Name = CAPSULE')\r
                         #\r
@@ -201,7 +213,7 @@ class Region(RegionClassObject):
                     EdkLogger.error("GenFds", GENFDS_ERROR,\r
                                     "Size 0x%X of Capsule File (%s) is larger than Region Size 0x%X specified." \\r
                                     % (FileLength, RegionData, Size))\r
-                BinFile = open(FileName, 'r+b')\r
+                BinFile = open(FileName, 'rb')\r
                 Buffer.write(BinFile.read())\r
                 BinFile.close()\r
                 Size = Size - FileLength\r
@@ -259,7 +271,7 @@ class Region(RegionClassObject):
             #\r
             self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
-        if self.RegionType == None:\r
+        if self.RegionType is None:\r
             GenFdsGlobalVariable.InfLogger('   Region Name = None')\r
             self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
@@ -322,7 +334,7 @@ class Region(RegionClassObject):
             # first check whether FvObj.BlockSizeList items have only "BlockSize" or "NumBlocks",\r
             # if so, use ExpectedList\r
             for Item in FvObj.BlockSizeList:\r
-                if Item[0] == None or Item[1] == None:\r
+                if Item[0] is None or Item[1] is None:\r
                     FvObj.BlockSizeList = ExpectedList\r
                     break\r
             # make sure region size is no smaller than the summed block size in FV\r