from Common.Misc import *\r
import collections\r
\r
-var_info = collections.namedtuple("uefi_var", "pcdindex,pcdname,defaultstoragename,skuname,var_name, var_guid, 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")\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
+ if (item.skuname,item.defaultstoragename, item.var_name,item.var_guid) not in indexedvarinfo:\r
+ indexedvarinfo[(item.skuname,item.defaultstoragename, item.var_name,item.var_guid) ] = []\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 ["BOOLEAN","UINT8","UINT16","UINT32","UINT64"]:\r
+ if data_type == ["BOOLEAN","UINT8"]:\r
+ data_flag = "=B"\r
+ elif data_type == "UINT16":\r
+ data_flag = "=H"\r
+ elif data_type == "UINT32":\r
+ data_flag = "=L"\r
+ elif data_type == "UINT64":\r
+ data_flag = "=Q"\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 += [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
+ newvaluestr = "{" + ",".join(reduce(lambda x,y: x+y, [newvalue[k] for k in sorted(newvalue.keys())] )) +"}"\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 , "VOID*")]\r
+ self.VarInfo = [item[0] for item in indexedvarinfo.values()]\r
def process_variable_data(self):\r
\r
var_data = dict()\r
return var_data\r
\r
def new_process_varinfo(self):\r
+ self.combine_variable()\r
\r
var_data = self.process_variable_data()\r
\r