# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# 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
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
#\r
# This file is used to collect the Variable checking information\r
import collections\r
import Common.DataType as DataType\r
\r
-var_info = collections.namedtuple("uefi_var", "pcdindex,pcdname,defaultstoragename,skuname,var_name, var_guid, var_offset,var_attribute,pcd_default_value, default_value, data_type")\r
+var_info = collections.namedtuple("uefi_var", "pcdindex,pcdname,defaultstoragename,skuname,var_name, var_guid, var_offset,var_attribute,pcd_default_value, default_value, data_type,PcdDscLine,StructurePcd")\r
NvStorageHeaderSize = 28\r
VariableHeaderSize = 32\r
\r
value_str += ",".join(default_var_bin_strip)\r
value_str += "}"\r
return value_str\r
+\r
def combine_variable(self):\r
indexedvarinfo = collections.OrderedDict()\r
for item in self.VarInfo:\r
indexedvarinfo[(item.skuname, item.defaultstoragename, item.var_name, item.var_guid)].append(item)\r
for key in indexedvarinfo:\r
sku_var_info_offset_list = indexedvarinfo[key]\r
- if len(sku_var_info_offset_list) == 1:\r
- continue\r
- newvalue = {}\r
- for item in sku_var_info_offset_list:\r
- data_type = item.data_type\r
- value_list = item.default_value.strip("{").strip("}").split(",")\r
- if data_type in DataType.TAB_PCD_NUMERIC_TYPES:\r
- data_flag = DataType.PACK_CODE_BY_SIZE[MAX_SIZE_TYPE[data_type]]\r
- data = value_list[0]\r
- value_list = []\r
- for data_byte in pack(data_flag, int(data, 16) if data.upper().startswith('0X') else int(data)):\r
- value_list.append(hex(unpack("B", data_byte)[0]))\r
- newvalue[int(item.var_offset, 16) if item.var_offset.upper().startswith("0X") else int(item.var_offset)] = value_list\r
- try:\r
- newvaluestr = "{" + ",".join(VariableMgr.assemble_variable(newvalue)) +"}"\r
- except:\r
- EdkLogger.error("build", AUTOGEN_ERROR, "Variable offset conflict in PCDs: %s \n" % (" and ".join(item.pcdname for item in sku_var_info_offset_list)))\r
+ sku_var_info_offset_list.sort(key=lambda x:x.PcdDscLine)\r
+ FirstOffset = int(sku_var_info_offset_list[0].var_offset, 16) if sku_var_info_offset_list[0].var_offset.upper().startswith("0X") else int(sku_var_info_offset_list[0].var_offset)\r
+ fisrtvalue_list = sku_var_info_offset_list[0].default_value.strip("{").strip("}").split(",")\r
+ firstdata_type = sku_var_info_offset_list[0].data_type\r
+ if firstdata_type in DataType.TAB_PCD_NUMERIC_TYPES:\r
+ fisrtdata_flag = DataType.PACK_CODE_BY_SIZE[MAX_SIZE_TYPE[firstdata_type]]\r
+ fisrtdata = fisrtvalue_list[0]\r
+ fisrtvalue_list = []\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
+ CurOffset = int(var_item.var_offset, 16) if var_item.var_offset.upper().startswith("0X") else int(var_item.var_offset)\r
+ CurvalueList = var_item.default_value.strip("{").strip("}").split(",")\r
+ Curdata_type = var_item.data_type\r
+ if Curdata_type in DataType.TAB_PCD_NUMERIC_TYPES:\r
+ data_flag = DataType.PACK_CODE_BY_SIZE[MAX_SIZE_TYPE[Curdata_type]]\r
+ data = CurvalueList[0]\r
+ CurvalueList = []\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
+ newvalue_list[CurOffset : CurOffset + len(CurvalueList)] = CurvalueList\r
+\r
+ newvaluestr = "{" + ",".join(newvalue_list) +"}"\r
n = sku_var_info_offset_list[0]\r
- indexedvarinfo[key] = [var_info(n.pcdindex, n.pcdname, n.defaultstoragename, n.skuname, n.var_name, n.var_guid, "0x00", n.var_attribute, newvaluestr, newvaluestr, DataType.TAB_VOID)]\r
- self.VarInfo = [item[0] for item in indexedvarinfo.values()]\r
-\r
- @staticmethod\r
- def assemble_variable(valuedict):\r
- ordered_valuedict_keys = sorted(valuedict.keys())\r
- var_value = []\r
- for current_valuedict_key in ordered_valuedict_keys:\r
- if current_valuedict_key < len(var_value):\r
- raise\r
- for _ in xrange(current_valuedict_key - len(var_value)):\r
- var_value.append('0x00')\r
- var_value += valuedict[current_valuedict_key]\r
- return var_value\r
+ indexedvarinfo[key] = [var_info(n.pcdindex, n.pcdname, n.defaultstoragename, n.skuname, n.var_name, n.var_guid, "0x00", n.var_attribute, newvaluestr, newvaluestr, DataType.TAB_VOID,n.PcdDscLine,n.StructurePcd)]\r
+ self.VarInfo = [item[0] for item in list(indexedvarinfo.values())]\r
\r
def process_variable_data(self):\r
\r
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
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
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
\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
@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
\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
Buffer += pack("=B", int(value_char, 16))\r
data_len += len(tail.split(","))\r
elif data_type == "BOOLEAN":\r
- Buffer += pack("=B", True) if var_value.upper() == "TRUE" else pack("=B", False)\r
+ Buffer += pack("=B", True) if var_value.upper() in ["TRUE","1"] else pack("=B", False)\r
data_len += 1\r
elif data_type == DataType.TAB_UINT8:\r
Buffer += pack("=B", GetIntegerValue(var_value))\r
\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
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
\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
projects / mirror_edk2.git / blobdiff