BaseTools: Handle the bytes and str difference

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

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index 98f88e249729c2efee4ce4cab11cdd5fe5c9bea4..453af66022dd78be9a91eb6f0c16f23771f7cd8b 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -73,8 +73,9 @@ class VariableMgr(object):
                 fisrtdata_flag = DataType.PACK_CODE_BY_SIZE[MAX_SIZE_TYPE[firstdata_type]]\r
                 fisrtdata = fisrtvalue_list[0]\r
                 fisrtvalue_list = []\r
-                for data_byte in pack(fisrtdata_flag, int(fisrtdata, 16) if fisrtdata.upper().startswith('0X') else int(fisrtdata)):\r
-                    fisrtvalue_list.append(hex(unpack("B", data_byte)[0]))\r
+                pack_data = pack(fisrtdata_flag, int(fisrtdata, 0))\r
+                for data_byte in range(len(pack_data)):\r
+                    fisrtvalue_list.append(hex(unpack("B", pack_data[data_byte:data_byte + 1])[0]))\r
             newvalue_list = ["0x00"] * FirstOffset + fisrtvalue_list\r
 \r
             for var_item in sku_var_info_offset_list[1:]:\r
@@ -85,8 +86,9 @@ class VariableMgr(object):
                     data_flag = DataType.PACK_CODE_BY_SIZE[MAX_SIZE_TYPE[Curdata_type]]\r
                     data = CurvalueList[0]\r
                     CurvalueList = []\r
-                    for data_byte in pack(data_flag, int(data, 16) if data.upper().startswith('0X') else int(data)):\r
-                        CurvalueList.append(hex(unpack("B", data_byte)[0]))\r
+                    pack_data = pack(data_flag, int(data, 0))\r
+                    for data_byte in range(len(pack_data)):\r
+                        CurvalueList.append(hex(unpack("B", pack_data[data_byte:data_byte + 1])[0]))\r
                 if CurOffset > len(newvalue_list):\r
                     newvalue_list = newvalue_list + ["0x00"] * (CurOffset - len(newvalue_list)) + CurvalueList\r
                 else:\r
@@ -123,8 +125,8 @@ class VariableMgr(object):
             default_data_buffer = VariableMgr.PACK_VARIABLES_DATA(default_sku_default.default_value, default_sku_default.data_type, tail)\r
 \r
             default_data_array = ()\r
-            for item in default_data_buffer:\r
-                default_data_array += unpack("B", item)\r
+            for item in range(len(default_data_buffer)):\r
+                default_data_array += unpack("B", default_data_buffer[item:item + 1])\r
 \r
             var_data[(DataType.TAB_DEFAULT, DataType.TAB_DEFAULT_STORES_DEFAULT)][index] = (default_data_buffer, sku_var_info[(DataType.TAB_DEFAULT, DataType.TAB_DEFAULT_STORES_DEFAULT)])\r
 \r
@@ -141,8 +143,8 @@ class VariableMgr(object):
                 others_data_buffer = VariableMgr.PACK_VARIABLES_DATA(other_sku_other.default_value, other_sku_other.data_type, tail)\r
 \r
                 others_data_array = ()\r
-                for item in others_data_buffer:\r
-                    others_data_array += unpack("B", item)\r
+                for item in range(len(others_data_buffer)):\r
+                    others_data_array += unpack("B", others_data_buffer[item:item + 1])\r
 \r
                 data_delta = VariableMgr.calculate_delta(default_data_array, others_data_array)\r
 \r
@@ -158,7 +160,7 @@ class VariableMgr(object):
             return []\r
 \r
         pcds_default_data = var_data.get((DataType.TAB_DEFAULT, DataType.TAB_DEFAULT_STORES_DEFAULT), {})\r
-        NvStoreDataBuffer = ""\r
+        NvStoreDataBuffer = bytearray()\r
         var_data_offset = collections.OrderedDict()\r
         offset = NvStorageHeaderSize\r
         for default_data, default_info in pcds_default_data.values():\r
@@ -185,7 +187,7 @@ class VariableMgr(object):
 \r
         nv_default_part = VariableMgr.AlignData(VariableMgr.PACK_DEFAULT_DATA(0, 0, VariableMgr.unpack_data(variable_storage_header_buffer+NvStoreDataBuffer)), 8)\r
 \r
-        data_delta_structure_buffer = ""\r
+        data_delta_structure_buffer = bytearray()\r
         for skuname, defaultstore in var_data:\r
             if (skuname, defaultstore) == (DataType.TAB_DEFAULT, DataType.TAB_DEFAULT_STORES_DEFAULT):\r
                 continue\r
@@ -216,8 +218,8 @@ class VariableMgr(object):
     @staticmethod\r
     def unpack_data(data):\r
         final_data = ()\r
-        for item in data:\r
-            final_data += unpack("B", item)\r
+        for item in range(len(data)):\r
+            final_data += unpack("B", data[item:item + 1])\r
         return final_data\r
 \r
     @staticmethod\r
@@ -285,7 +287,7 @@ class VariableMgr(object):
 \r
     @staticmethod\r
     def PACK_VARIABLES_DATA(var_value,data_type, tail = None):\r
-        Buffer = ""\r
+        Buffer = bytearray()\r
         data_len = 0\r
         if data_type == DataType.TAB_VOID:\r
             for value_char in var_value.strip("{").strip("}").split(","):\r
@@ -315,7 +317,7 @@ class VariableMgr(object):
 \r
     @staticmethod\r
     def PACK_DEFAULT_DATA(defaultstoragename, skuid, var_value):\r
-        Buffer = ""\r
+        Buffer = bytearray()\r
         Buffer += pack("=L", 4+8+8)\r
         Buffer += pack("=Q", int(skuid))\r
         Buffer += pack("=Q", int(defaultstoragename))\r
@@ -340,7 +342,7 @@ class VariableMgr(object):
     def PACK_DELTA_DATA(self, skuname, defaultstoragename, delta_list):\r
         skuid = self.GetSkuId(skuname)\r
         defaultstorageid = self.GetDefaultStoreId(defaultstoragename)\r
-        Buffer = ""\r
+        Buffer = bytearray()\r
         Buffer += pack("=L", 4+8+8)\r
         Buffer += pack("=Q", int(skuid))\r
         Buffer += pack("=Q", int(defaultstorageid))\r
@@ -363,7 +365,7 @@ class VariableMgr(object):
 \r
     @staticmethod\r
     def PACK_VARIABLE_NAME(var_name):\r
-        Buffer = ""\r
+        Buffer = bytearray()\r
         for name_char in var_name.strip("{").strip("}").split(","):\r
             Buffer += pack("=B", int(name_char, 16))\r
 \r