BaseTools: Various typo

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenPcdDb.py

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index 68f92ef0637327d6d47515853d573a9a15a199a9..b3f4ccf4f4c2e43f54877ea84a936f860f3dcf8f 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -10,6 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
+from __future__ import absolute_import\r
 from io import BytesIO\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r
@@ -21,6 +22,9 @@ from Common.VariableAttributes import VariableAttributes
 import copy\r
 from struct import unpack\r
 from Common.DataType import *\r
+from Common import GlobalData\r
+from Common import EdkLogger\r
+import Common.LongFilePathOs as os\r
 \r
 DATABASE_VERSION = 7\r
 \r
@@ -338,7 +342,7 @@ class DbComItemList (DbItemList):
         Offset = 0\r
         if self.ItemSize == 0:\r
             #\r
-            # Variable length, need to calculte one by one\r
+            # Variable length, need to calculate one by one\r
             # The only variable table is stringtable, it is not Composite item, should not reach here\r
             #\r
             assert(False)\r
@@ -627,7 +631,7 @@ def BuildExDataBase(Dict):
     Dict['STRING_TABLE_DB_VALUE'] = [StringArrayToList(x) for x in Dict['STRING_TABLE_VALUE']]\r
 \r
     StringTableValue = Dict['STRING_TABLE_DB_VALUE']\r
-    # when calcute the offset, should use StringTableLen instead of StringTableValue, as string maxium len may be different with actual len\r
+    # when calcute the offset, should use StringTableLen instead of StringTableValue, as string maximum len may be different with actual len\r
     StringTableLen = Dict['STRING_TABLE_LENGTH']\r
     DbStringTableLen = DbStringItemList(0, RawDataList = StringTableValue, LenList = StringTableLen)\r
 \r
@@ -849,8 +853,9 @@ def BuildExDataBase(Dict):
     Index = 0\r
     for Item in DbItemTotal:\r
         Index +=1\r
-        b = bytes(Item.PackData())\r
-        Buffer += b\r
+        packdata = Item.PackData()\r
+        for i in range(len(packdata)):\r
+            Buffer += packdata[i:i + 1]\r
         if Index == InitTableNum:\r
             if len(Buffer) % 8:\r
                 for num in range(8 - len(Buffer) % 8):\r
@@ -917,9 +922,9 @@ def CreatePcdDataBase(PcdDBData):
     totallenbuff = pack("=L", totallen)\r
     newbuffer = databasebuff[:32]\r
     for i in range(4):\r
-        newbuffer += bytes([totallenbuff[i]])\r
+        newbuffer += totallenbuff[i:i+1]\r
     for i in range(36, totallen):\r
-        newbuffer += bytes([databasebuff[i]])\r
+        newbuffer += databasebuff[i:i+1]\r
 \r
     return newbuffer\r
 \r
@@ -961,8 +966,8 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform, Phase):
         for skuname, skuid in DynamicPcdSet_Sku:\r
             AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckTab = CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdSet_Sku[(skuname, skuid)], Phase)\r
             final_data = ()\r
-            for item in PcdDbBuffer:\r
-                final_data += unpack("B", bytes([item]))\r
+            for item in range(len(PcdDbBuffer)):\r
+                final_data += unpack("B", PcdDbBuffer[item:item+1])\r
             PcdDBData[(skuname, skuid)] = (PcdDbBuffer, final_data)\r
             PcdDriverAutoGenData[(skuname, skuid)] = (AdditionalAutoGenH, AdditionalAutoGenC)\r
             VarCheckTableData[(skuname, skuid)] = VarCheckTab\r
@@ -974,8 +979,8 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform, Phase):
     else:\r
         AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckTab = CreatePcdDatabasePhaseSpecificAutoGen (Platform, {}, Phase)\r
         final_data = ()\r
-        for item in PcdDbBuffer:\r
-            final_data += unpack("B", bytes([item]))\r
+        for item in range(len(PcdDbBuffer)):\r
+            final_data += unpack("B", PcdDbBuffer[item:item + 1])\r
         PcdDBData[(TAB_DEFAULT, "0")] = (PcdDbBuffer, final_data)\r
 \r
     return AdditionalAutoGenH, AdditionalAutoGenC, CreatePcdDataBase(PcdDBData)\r
@@ -1006,7 +1011,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
         'SKUID_TABLE_EMPTY'             : 'TRUE',\r
         'DATABASE_EMPTY'                : 'TRUE',\r
         'EXMAP_TABLE_EMPTY'             : 'TRUE',\r
-        'PCD_DATABASE_UNINIT_EMPTY'     : '  UINT8  dummy; /* PCD_DATABASE_UNINIT is emptry */',\r
+        'PCD_DATABASE_UNINIT_EMPTY'     : '  UINT8  dummy; /* PCD_DATABASE_UNINIT is empty */',\r
         'SYSTEM_SKU_ID'                 : '  SKU_ID             SystemSkuId;',\r
         'SYSTEM_SKU_ID_VALUE'           : '0U'\r
     }\r
@@ -1348,7 +1353,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
 \r
                 DbValueList.append(Sku.DefaultValue)\r
 \r
-        Pcd.TokenTypeList = sorted(set(Pcd.TokenTypeList))\r
+        Pcd.TokenTypeList = list(set(Pcd.TokenTypeList))\r
         if Pcd.DatumType == TAB_VOID:\r
             Dict['SIZE_TABLE_CNAME'].append(CName)\r
             Dict['SIZE_TABLE_GUID'].append(TokenSpaceGuid)\r
@@ -1449,7 +1454,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             Dict['PCD_CNAME_LENGTH'][GeneratedTokenNumber] = len(CNameBinArray.split(","))\r
 \r
 \r
-        Pcd.TokenTypeList = sorted(set(Pcd.TokenTypeList))\r
+        Pcd.TokenTypeList = list(set(Pcd.TokenTypeList))\r
 \r
         # search the Offset and Table, used by LocalTokenNumberTableOffset\r
         if 'PCD_TYPE_HII' in Pcd.TokenTypeList:\r