From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EAF7322690ACC for ; Wed, 18 Apr 2018 07:23:21 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Apr 2018 07:23:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,465,1517904000"; d="scan'208";a="47943088" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga001.fm.intel.com with ESMTP; 18 Apr 2018 07:23:21 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 18 Apr 2018 07:23:21 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 18 Apr 2018 07:23:20 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.210]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.6]) with mapi id 14.03.0319.002; Wed, 18 Apr 2018 22:23:18 +0800 From: "Zhu, Yonghong" To: "Carsey, Jaben" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [PATCH v1 1/1] BaseTools: Eot - Remove FvImage file Thread-Index: AQHT1ashpn66D9BtkEChUxd4v5qq16QGljog Date: Wed, 18 Apr 2018 14:23:16 +0000 Message-ID: References: <74bcc87c5ebb154ccd916acd8dc051231e6ec991.1523900868.git.jaben.carsey@intel.com> In-Reply-To: <74bcc87c5ebb154ccd916acd8dc051231e6ec991.1523900868.git.jaben.carsey@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v1 1/1] BaseTools: Eot - Remove FvImage file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2018 14:23:22 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yonghong Zhu =20 Best Regards, Zhu Yonghong -----Original Message----- From: Carsey, Jaben=20 Sent: Tuesday, April 17, 2018 1:48 AM To: edk2-devel@lists.01.org Cc: Gao, Liming ; Zhu, Yonghong Subject: [PATCH v1 1/1] BaseTools: Eot - Remove FvImage file move the single used class from FvImage to Eot delete the FvImage file remove FvImage from makefile Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/Eot/Eot.py | 26 +- BaseTools/Source/Python/Eot/FvImage.py | 1434 -------------------- BaseTools/Source/Python/Makefile | 1 - 3 files changed, 24 insertions(+), 1437 deletions(-) diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/E= ot/Eot.py index 96c339613476..de32e99bb937 100644 --- a/BaseTools/Source/Python/Eot/Eot.py +++ b/BaseTools/Source/Python/Eot/Eot.py @@ -1,7 +1,7 @@ ## @file # This file is used to be the main entrance of EOT tool # -# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BS= D License # which accompanies this distribution. The full text of the license may b= e found at @@ -24,13 +24,35 @@ from Common.Misc import GuidStructureStringToGuidString from InfParserLite import * import c import Database -from FvImage import * from array import array from Report import Report from Common.BuildVersion import gBUILD_VERSION from Parser import ConvertGuid from Common.LongFilePathSupport import OpenLongFilePath as open =20 +## MultipleFv() class +# +# A class for Multiple FV +# +class MultipleFv(FirmwareVolume): + def __init__(self, FvList): + FirmwareVolume.__init__(self) + self.BasicInfo =3D [] + for FvPath in FvList: + FvName =3D os.path.splitext(os.path.split(FvPath)[1])[0] + Fd =3D open(FvPath, 'rb') + Buf =3D array('B') + try: + Buf.fromfile(Fd, os.path.getsize(FvPath)) + except EOFError: + pass + + Fv =3D FirmwareVolume(FvName) + Fv.frombuffer(Buf, 0, len(Buf)) + + self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size]) + self.FfsDict.append(Fv.FfsDict) + =20 ## Class Eot # # This class is used to define Eot main entrance diff --git a/BaseTools/Source/Python/Eot/FvImage.py b/BaseTools/Source/Pyth= on/Eot/FvImage.py deleted file mode 100644 index 472ae400506d..000000000000 --- a/BaseTools/Source/Python/Eot/FvImage.py +++ /dev/null @@ -1,1434 +0,0 @@ -## @file -# Parse FV image -# -# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.
-# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BS= D License -# which accompanies this distribution. The full text of the license may b= e found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -# - -## Import Modules -# -import Common.LongFilePathOs as os -import re -import sys -import uuid -import struct -import codecs -import copy - -from UserDict import IterableUserDict -from cStringIO import StringIO -from array import array -from Common.LongFilePathSupport import OpenLongFilePath as open -from CommonDataClass import * -from Common.Misc import sdict, GuidStructureStringToGuidString - -import Common.EdkLogger as EdkLogger - -import EotGlobalData - -# Global definiton -gFfsPrintTitle =3D "%-36s %-21s %8s %8s %8s %-4s %-36s" % ("GUID", "TYP= E", "OFFSET", "SIZE", "FREE", "ALIGN", "NAME") -gFfsPrintFormat =3D "%36s %-21s %8X %8X %8X %4s %-36s" -gGuidStringFormat =3D "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X" -gPeiAprioriFileNameGuid =3D '1b45cc0a-156a-428a-af62-49864da0e6e6' -gAprioriGuid =3D 'fc510ee7-ffdc-11d4-bd41-0080c73c8881' -gIndention =3D -4 - -## Image() class -# -# A class for Image -# -class Image(array): - _HEADER_ =3D struct.Struct("") - _HEADER_SIZE_ =3D _HEADER_.size - - def __new__(cls, *args, **kwargs): - return array.__new__(cls, 'B') - - def __init__(m, ID=3DNone): - if ID is None: - m._ID_ =3D str(uuid.uuid1()).upper() - else: - m._ID_ =3D ID - m._BUF_ =3D None - m._LEN_ =3D None - m._OFF_ =3D None - - m._SubImages =3D sdict() # {offset: Image()} - - array.__init__(m, 'B') - - def __repr__(m): - return m._ID_ - - def __len__(m): - Len =3D array.__len__(m) - for Offset in m._SubImages: - Len +=3D len(m._SubImages[Offset]) - return Len - - def _Unpack(m): - m.extend(m._BUF_[m._OFF_ : m._OFF_ + m._LEN_]) - return len(m) - - def _Pack(m, PadByte=3D0xFF): - raise NotImplementedError - - def frombuffer(m, Buffer, Offset=3D0, Size=3DNone): - m._BUF_ =3D Buffer - m._OFF_ =3D Offset - # we may need the Size information in advance if it's given - m._LEN_ =3D Size - m._LEN_ =3D m._Unpack() - - def empty(m): - del m[0:] - - def GetField(m, FieldStruct, Offset=3D0): - return FieldStruct.unpack_from(m, Offset) - - def SetField(m, FieldStruct, Offset, *args): - # check if there's enough space - Size =3D FieldStruct.size - if Size > len(m): - m.extend([0] * (Size - len(m))) - FieldStruct.pack_into(m, Offset, *args) - - def _SetData(m, Data): - if len(m) < m._HEADER_SIZE_: - m.extend([0] * (m._HEADER_SIZE_ - len(m))) - else: - del m[m._HEADER_SIZE_:] - m.extend(Data) - - def _GetData(m): - if len(m) > m._HEADER_SIZE_: - return m[m._HEADER_SIZE_:] - return None - - Data =3D property(_GetData, _SetData) - -## FirmwareVolume() class -# -# A class for Firmware Volume -# -class FirmwareVolume(Image): - # Read FvLength, Attributes, HeaderLength, Checksum - _HEADER_ =3D struct.Struct("16x 1I2H8B 1Q 4x 1I 1H 1H") - _HEADER_SIZE_ =3D _HEADER_.size - - _FfsGuid =3D "8C8CE578-8A3D-4F1C-9935-896185C32DD3" - - _GUID_ =3D struct.Struct("16x 1I2H8B") - _LENGTH_ =3D struct.Struct("16x 16x 1Q") - _SIG_ =3D struct.Struct("16x 16x 8x 1I") - _ATTR_ =3D struct.Struct("16x 16x 8x 4x 1I") - _HLEN_ =3D struct.Struct("16x 16x 8x 4x 4x 1H") - _CHECKSUM_ =3D struct.Struct("16x 16x 8x 4x 4x 2x 1H") - - def __init__(self, Name=3D''): - Image.__init__(self) - self.Name =3D Name - self.FfsDict =3D sdict() - self.OrderedFfsDict =3D sdict() - self.UnDispatchedFfsDict =3D sdict() - self.ProtocolList =3D sdict() - - def CheckArchProtocol(self): - for Item in EotGlobalData.gArchProtocolGuids: - if Item.lower() not in EotGlobalData.gProtocolList: - - return False - - return True - - def ParseDepex(self, Depex, Type): - List =3D None - if Type =3D=3D 'Ppi': - List =3D EotGlobalData.gPpiList - if Type =3D=3D 'Protocol': - List =3D EotGlobalData.gProtocolList - DepexStack =3D [] - DepexList =3D [] - DepexString =3D '' - FileDepex =3D None - CouldBeLoaded =3D True - for Index in range(0, len(Depex.Expression)): - Item =3D Depex.Expression[Index] - if Item =3D=3D 0x00: - Index =3D Index + 1 - Guid =3D gGuidStringFormat % Depex.Expression[Index] - if Guid in self.OrderedFfsDict and Depex.Expression[Index = + 1] =3D=3D 0x08: - return (True, 'BEFORE %s' % Guid, [Guid, 'BEFORE']) - elif Item =3D=3D 0x01: - Index =3D Index + 1 - Guid =3D gGuidStringFormat % Depex.Expression[Index] - if Guid in self.OrderedFfsDict and Depex.Expression[Index = + 1] =3D=3D 0x08: - return (True, 'AFTER %s' % Guid, [Guid, 'AFTER']) - elif Item =3D=3D 0x02: - Index =3D Index + 1 - Guid =3D gGuidStringFormat % Depex.Expression[Index] - if Guid.lower() in List: - DepexStack.append(True) - DepexList.append(Guid) - else: - DepexStack.append(False) - DepexList.append(Guid) - continue - elif Item =3D=3D 0x03 or Item =3D=3D 0x04: - DepexStack.append(eval(str(DepexStack.pop()) + ' ' + Depex= ._OPCODE_STRING_[Item].lower() + ' ' + str(DepexStack.pop()))) - DepexList.append(str(DepexList.pop()) + ' ' + Depex._OPCOD= E_STRING_[Item].upper() + ' ' + str(DepexList.pop())) - elif Item =3D=3D 0x05: - DepexStack.append(eval(Depex._OPCODE_STRING_[Item].lower()= + ' ' + str(DepexStack.pop()))) - DepexList.append(Depex._OPCODE_STRING_[Item].lower() + ' '= + str(DepexList.pop())) - elif Item =3D=3D 0x06: - DepexStack.append(True) - DepexList.append('TRUE') - DepexString =3D DepexString + 'TRUE' + ' ' - elif Item =3D=3D 0x07: - DepexStack.append(False) - DepexList.append('False') - DepexString =3D DepexString + 'FALSE' + ' ' - elif Item =3D=3D 0x08: - if Index !=3D len(Depex.Expression) - 1: - CouldBeLoaded =3D False - else: - CouldBeLoaded =3D DepexStack.pop() - else: - CouldBeLoaded =3D False - if DepexList !=3D []: - DepexString =3D DepexList[0].strip() - return (CouldBeLoaded, DepexString, FileDepex) - - def Dispatch(self, Db =3D None): - if Db is None: - return False - self.UnDispatchedFfsDict =3D copy.copy(self.FfsDict) - # Find PeiCore, DexCore, PeiPriori, DxePriori first - FfsSecCoreGuid =3D None - FfsPeiCoreGuid =3D None - FfsDxeCoreGuid =3D None - FfsPeiPrioriGuid =3D None - FfsDxePrioriGuid =3D None - for FfsID in self.UnDispatchedFfsDict: - Ffs =3D self.UnDispatchedFfsDict[FfsID] - if Ffs.Type =3D=3D 0x03: - FfsSecCoreGuid =3D FfsID - continue - if Ffs.Type =3D=3D 0x04: - FfsPeiCoreGuid =3D FfsID - continue - if Ffs.Type =3D=3D 0x05: - FfsDxeCoreGuid =3D FfsID - continue - if Ffs.Guid.lower() =3D=3D gPeiAprioriFileNameGuid: - FfsPeiPrioriGuid =3D FfsID - continue - if Ffs.Guid.lower() =3D=3D gAprioriGuid: - FfsDxePrioriGuid =3D FfsID - continue - - # Parse SEC_CORE first - if FfsSecCoreGuid is not None: - self.OrderedFfsDict[FfsSecCoreGuid] =3D self.UnDispatchedFfsDi= ct.pop(FfsSecCoreGuid) - self.LoadPpi(Db, FfsSecCoreGuid) - - # Parse PEI first - if FfsPeiCoreGuid is not None: - self.OrderedFfsDict[FfsPeiCoreGuid] =3D self.UnDispatchedFfsDi= ct.pop(FfsPeiCoreGuid) - self.LoadPpi(Db, FfsPeiCoreGuid) - if FfsPeiPrioriGuid is not None: - # Load PEIM described in priori file - FfsPeiPriori =3D self.UnDispatchedFfsDict.pop(FfsPeiPriori= Guid) - if len(FfsPeiPriori.Sections) =3D=3D 1: - Section =3D FfsPeiPriori.Sections.popitem()[1] - if Section.Type =3D=3D 0x19: - GuidStruct =3D struct.Struct('1I2H8B') - Start =3D 4 - while len(Section) > Start: - Guid =3D GuidStruct.unpack_from(Section[Start = : Start + 16]) - GuidString =3D gGuidStringFormat % Guid - Start =3D Start + 16 - if GuidString in self.UnDispatchedFfsDict: - self.OrderedFfsDict[GuidString] =3D self.U= nDispatchedFfsDict.pop(GuidString) - self.LoadPpi(Db, GuidString) - - self.DisPatchPei(Db) - - # Parse DXE then - if FfsDxeCoreGuid is not None: - self.OrderedFfsDict[FfsDxeCoreGuid] =3D self.UnDispatchedFfsDi= ct.pop(FfsDxeCoreGuid) - self.LoadProtocol(Db, FfsDxeCoreGuid) - if FfsDxePrioriGuid is not None: - # Load PEIM described in priori file - FfsDxePriori =3D self.UnDispatchedFfsDict.pop(FfsDxePriori= Guid) - if len(FfsDxePriori.Sections) =3D=3D 1: - Section =3D FfsDxePriori.Sections.popitem()[1] - if Section.Type =3D=3D 0x19: - GuidStruct =3D struct.Struct('1I2H8B') - Start =3D 4 - while len(Section) > Start: - Guid =3D GuidStruct.unpack_from(Section[Start = : Start + 16]) - GuidString =3D gGuidStringFormat % Guid - Start =3D Start + 16 - if GuidString in self.UnDispatchedFfsDict: - self.OrderedFfsDict[GuidString] =3D self.U= nDispatchedFfsDict.pop(GuidString) - self.LoadProtocol(Db, GuidString) - - self.DisPatchDxe(Db) - - def LoadProtocol(self, Db, ModuleGuid): - SqlCommand =3D """select GuidValue from Report - where SourceFileFullPath in - (select Value1 from Inf where BelongsToFile =3D - (select BelongsToFile from Inf - where Value1 =3D 'FILE_GUID' and Value2 like '%s' = and Model =3D %s) - and Model =3D %s) - and ItemType =3D 'Protocol' and ItemMode =3D 'Prod= uced'""" \ - % (ModuleGuid, 5001, 3007) - RecordSet =3D Db.TblReport.Exec(SqlCommand) - for Record in RecordSet: - SqlCommand =3D """select Value2 from Inf where BelongsToFile = =3D - (select DISTINCT BelongsToFile from Inf - where Value1 =3D - (select SourceFileFullPath from Report - where GuidValue like '%s' and ItemMode =3D 'Ca= llback')) - and Value1 =3D 'FILE_GUID'""" % Record[0] - CallBackSet =3D Db.TblReport.Exec(SqlCommand) - if CallBackSet !=3D []: - EotGlobalData.gProtocolList[Record[0].lower()] =3D ModuleG= uid - else: - EotGlobalData.gProtocolList[Record[0].lower()] =3D ModuleG= uid - - def LoadPpi(self, Db, ModuleGuid): - SqlCommand =3D """select GuidValue from Report - where SourceFileFullPath in - (select Value1 from Inf where BelongsToFile =3D - (select BelongsToFile from Inf - where Value1 =3D 'FILE_GUID' and Value2 like '%s' = and Model =3D %s) - and Model =3D %s) - and ItemType =3D 'Ppi' and ItemMode =3D 'Produced'= """ \ - % (ModuleGuid, 5001, 3007) - RecordSet =3D Db.TblReport.Exec(SqlCommand) - for Record in RecordSet: - EotGlobalData.gPpiList[Record[0].lower()] =3D ModuleGuid - - def DisPatchDxe(self, Db): - IsInstalled =3D False - ScheduleList =3D sdict() - for FfsID in self.UnDispatchedFfsDict: - CouldBeLoaded =3D False - DepexString =3D '' - FileDepex =3D None - Ffs =3D self.UnDispatchedFfsDict[FfsID] - if Ffs.Type =3D=3D 0x07: - # Get Depex - IsFoundDepex =3D False - for Section in Ffs.Sections.values(): - # Find Depex - if Section.Type =3D=3D 0x13: - IsFoundDepex =3D True - CouldBeLoaded, DepexString, FileDepex =3D self.Par= seDepex(Section._SubImages[4], 'Protocol') - break - if Section.Type =3D=3D 0x01: - CompressSections =3D Section._SubImages[4] - for CompressSection in CompressSections.Sections: - if CompressSection.Type =3D=3D 0x13: - IsFoundDepex =3D True - CouldBeLoaded, DepexString, FileDepex =3D = self.ParseDepex(CompressSection._SubImages[4], 'Protocol') - break - if CompressSection.Type =3D=3D 0x02: - NewSections =3D CompressSection._SubImages= [4] - for NewSection in NewSections.Sections: - if NewSection.Type =3D=3D 0x13: - IsFoundDepex =3D True - CouldBeLoaded, DepexString, FileDe= pex =3D self.ParseDepex(NewSection._SubImages[4], 'Protocol') - break - - # Not find Depex - if not IsFoundDepex: - CouldBeLoaded =3D self.CheckArchProtocol() - DepexString =3D '' - FileDepex =3D None - - # Append New Ffs - if CouldBeLoaded: - IsInstalled =3D True - NewFfs =3D self.UnDispatchedFfsDict.pop(FfsID) - NewFfs.Depex =3D DepexString - if FileDepex is not None: - ScheduleList.insert.insert(FileDepex[1], FfsID, Ne= wFfs, FileDepex[0]) - else: - ScheduleList[FfsID] =3D NewFfs - else: - self.UnDispatchedFfsDict[FfsID].Depex =3D DepexString - - for FfsID in ScheduleList: - NewFfs =3D ScheduleList.pop(FfsID) - FfsName =3D 'UnKnown' - self.OrderedFfsDict[FfsID] =3D NewFfs - self.LoadProtocol(Db, FfsID) - - SqlCommand =3D """select Value2 from Inf - where BelongsToFile =3D (select BelongsToFile = from Inf where Value1 =3D 'FILE_GUID' and lower(Value2) =3D lower('%s') and= Model =3D %s) - and Model =3D %s and Value1=3D'BASE_NAME'""" %= (FfsID, 5001, 5001) - RecordSet =3D Db.TblReport.Exec(SqlCommand) - if RecordSet !=3D []: - FfsName =3D RecordSet[0][0] - - if IsInstalled: - self.DisPatchDxe(Db) - - def DisPatchPei(self, Db): - IsInstalled =3D False - for FfsID in self.UnDispatchedFfsDict: - CouldBeLoaded =3D True - DepexString =3D '' - FileDepex =3D None - Ffs =3D self.UnDispatchedFfsDict[FfsID] - if Ffs.Type =3D=3D 0x06 or Ffs.Type =3D=3D 0x08: - # Get Depex - for Section in Ffs.Sections.values(): - if Section.Type =3D=3D 0x1B: - CouldBeLoaded, DepexString, FileDepex =3D self.Par= seDepex(Section._SubImages[4], 'Ppi') - break - - if Section.Type =3D=3D 0x01: - CompressSections =3D Section._SubImages[4] - for CompressSection in CompressSections.Sections: - if CompressSection.Type =3D=3D 0x1B: - CouldBeLoaded, DepexString, FileDepex =3D = self.ParseDepex(CompressSection._SubImages[4], 'Ppi') - break - if CompressSection.Type =3D=3D 0x02: - NewSections =3D CompressSection._SubImages= [4] - for NewSection in NewSections.Sections: - if NewSection.Type =3D=3D 0x1B: - CouldBeLoaded, DepexString, FileDe= pex =3D self.ParseDepex(NewSection._SubImages[4], 'Ppi') - break - - # Append New Ffs - if CouldBeLoaded: - IsInstalled =3D True - NewFfs =3D self.UnDispatchedFfsDict.pop(FfsID) - NewFfs.Depex =3D DepexString - self.OrderedFfsDict[FfsID] =3D NewFfs - self.LoadPpi(Db, FfsID) - else: - self.UnDispatchedFfsDict[FfsID].Depex =3D DepexString - - if IsInstalled: - self.DisPatchPei(Db) - - - def __str__(self): - global gIndention - gIndention +=3D 4 - FvInfo =3D '\n' + ' ' * gIndention - FvInfo +=3D "[FV:%s] file_system=3D%s size=3D%x checksum=3D%s\n" = % (self.Name, self.FileSystemGuid, self.Size, self.Checksum) - FfsInfo =3D "\n".join([str(self.FfsDict[FfsId]) for FfsId in self.= FfsDict]) - gIndention -=3D 4 - return FvInfo + FfsInfo - - def _Unpack(self): - Size =3D self._LENGTH_.unpack_from(self._BUF_, self._OFF_)[0] - self.empty() - self.extend(self._BUF_[self._OFF_:self._OFF_+Size]) - - # traverse the FFS - EndOfFv =3D Size - FfsStartAddress =3D self.HeaderSize - LastFfsObj =3D None - while FfsStartAddress < EndOfFv: - FfsObj =3D Ffs() - FfsObj.frombuffer(self, FfsStartAddress) - FfsId =3D repr(FfsObj) - if ((self.Attributes & 0x00000800) !=3D 0 and len(FfsObj) =3D= =3D 0xFFFFFF) \ - or ((self.Attributes & 0x00000800) =3D=3D 0 and len(FfsObj= ) =3D=3D 0): - if LastFfsObj is not None: - LastFfsObj.FreeSpace =3D EndOfFv - LastFfsObj._OFF_ - = len(LastFfsObj) - else: - if FfsId in self.FfsDict: - EdkLogger.error("FV", 0, "Duplicate GUID in FFS", - ExtraData=3D"\t%s @ %s\n\t%s @ %s" \ - % (FfsObj.Guid, FfsObj.Offset, - self.FfsDict[FfsId].Guid, self.FfsD= ict[FfsId].Offset)) - self.FfsDict[FfsId] =3D FfsObj - if LastFfsObj is not None: - LastFfsObj.FreeSpace =3D FfsStartAddress - LastFfsObj.= _OFF_ - len(LastFfsObj) - - FfsStartAddress +=3D len(FfsObj) - # - # align to next 8-byte aligned address: A =3D (A + 8 - 1) & (~= (8 - 1)) - # The next FFS must be at the latest next 8-byte aligned addre= ss - # - FfsStartAddress =3D (FfsStartAddress + 7) & (~7) - LastFfsObj =3D FfsObj - - def _GetAttributes(self): - return self.GetField(self._ATTR_, 0)[0] - - def _GetSize(self): - return self.GetField(self._LENGTH_, 0)[0] - - def _GetChecksum(self): - return self.GetField(self._CHECKSUM_, 0)[0] - - def _GetHeaderLength(self): - return self.GetField(self._HLEN_, 0)[0] - - def _GetFileSystemGuid(self): - return gGuidStringFormat % self.GetField(self._GUID_, 0) - - Attributes =3D property(_GetAttributes) - Size =3D property(_GetSize) - Checksum =3D property(_GetChecksum) - HeaderSize =3D property(_GetHeaderLength) - FileSystemGuid =3D property(_GetFileSystemGuid) - -## CompressedImage() class -# -# A class for Compressed Image -# -class CompressedImage(Image): - # UncompressedLength =3D 4-byte - # CompressionType =3D 1-byte - _HEADER_ =3D struct.Struct("1I 1B") - _HEADER_SIZE_ =3D _HEADER_.size - - _ORIG_SIZE_ =3D struct.Struct("1I") - _CMPRS_TYPE_ =3D struct.Struct("4x 1B") - - def __init__(m, CompressedData=3DNone, CompressionType=3DNone, Uncompr= essedLength=3DNone): - Image.__init__(m) - if UncompressedLength is not None: - m.UncompressedLength =3D UncompressedLength - if CompressionType is not None: - m.CompressionType =3D CompressionType - if CompressedData is not None: - m.Data =3D CompressedData - - def __str__(m): - global gIndention - S =3D "algorithm=3D%s uncompressed=3D%x" % (m.CompressionType, m.U= ncompressedLength) - for Sec in m.Sections: - S +=3D '\n' + str(Sec) - - return S - - def _SetOriginalSize(m, Size): - m.SetField(m._ORIG_SIZE_, 0, Size) - - def _GetOriginalSize(m): - return m.GetField(m._ORIG_SIZE_)[0] - - def _SetCompressionType(m, Type): - m.SetField(m._CMPRS_TYPE_, 0, Type) - - def _GetCompressionType(m): - return m.GetField(m._CMPRS_TYPE_)[0] - - def _GetSections(m): - try: - import EfiCompressor - TmpData =3D EfiCompressor.FrameworkDecompress( - m[m._HEADER_SIZE_:], - len(m) - m._HEADER_SIZE_ - ) - DecData =3D array('B') - DecData.fromstring(TmpData) - except: - import EfiCompressor - TmpData =3D EfiCompressor.UefiDecompress( - m[m._HEADER_SIZE_:], - len(m) - m._HEADER_SIZE_ - ) - DecData =3D array('B') - DecData.fromstring(TmpData) - - SectionList =3D [] - Offset =3D 0 - while Offset < len(DecData): - Sec =3D Section() - try: - Sec.frombuffer(DecData, Offset) - Offset +=3D Sec.Size - # the section is aligned to 4-byte boundary - except: - break - SectionList.append(Sec) - return SectionList - - UncompressedLength =3D property(_GetOriginalSize, _SetOriginalSize) - CompressionType =3D property(_GetCompressionType, _SetCompressionType) - Sections =3D property(_GetSections) - -## GuidDefinedImage() class -# -# A class for GUID Defined Image -# -class GuidDefinedImage(Image): - _HEADER_ =3D struct.Struct("1I2H8B 1H 1H") - _HEADER_SIZE_ =3D _HEADER_.size - - _GUID_ =3D struct.Struct("1I2H8B") - _DATA_OFFSET_ =3D struct.Struct("16x 1H") - _ATTR_ =3D struct.Struct("18x 1H") - - CRC32_GUID =3D "FC1BCDB0-7D31-49AA-936A-A4600D9DD083" - TIANO_COMPRESS_GUID =3D 'A31280AD-481E-41B6-95E8-127F4C984779' - LZMA_COMPRESS_GUID =3D 'EE4E5898-3914-4259-9D6E-DC7BD79403CF' - - def __init__(m, SectionDefinitionGuid=3DNone, DataOffset=3DNone, Attri= butes=3DNone, Data=3DNone): - Image.__init__(m) - if SectionDefinitionGuid is not None: - m.SectionDefinitionGuid =3D SectionDefinitionGuid - if DataOffset is not None: - m.DataOffset =3D DataOffset - if Attributes is not None: - m.Attributes =3D Attributes - if Data is not None: - m.Data =3D Data - - def __str__(m): - S =3D "guid=3D%s" % (gGuidStringFormat % m.SectionDefinitionGuid) - for Sec in m.Sections: - S +=3D "\n" + str(Sec) - return S - - def _Unpack(m): - # keep header in this Image object - m.empty() - m.extend(m._BUF_[m._OFF_ : m._OFF_ + m._LEN_]) - return len(m) - - def _SetAttribute(m, Attribute): - m.SetField(m._ATTR_, 0, Attribute) - - def _GetAttribute(m): - return m.GetField(m._ATTR_)[0] - - def _SetGuid(m, Guid): - m.SetField(m._GUID_, 0, Guid) - - def _GetGuid(m): - return m.GetField(m._GUID_) - - def _SetDataOffset(m, Offset): - m.SetField(m._DATA_OFFSET_, 0, Offset) - - def _GetDataOffset(m): - return m.GetField(m._DATA_OFFSET_)[0] - - def _GetSections(m): - SectionList =3D [] - Guid =3D gGuidStringFormat % m.SectionDefinitionGuid - if Guid =3D=3D m.CRC32_GUID: - # skip the CRC32 value, we don't do CRC32 verification here - Offset =3D m.DataOffset - 4 - while Offset < len(m): - Sec =3D Section() - try: - Sec.frombuffer(m, Offset) - Offset +=3D Sec.Size - # the section is aligned to 4-byte boundary - Offset =3D (Offset + 3) & (~3) - except: - break - SectionList.append(Sec) - elif Guid =3D=3D m.TIANO_COMPRESS_GUID: - try: - import EfiCompressor - # skip the header - Offset =3D m.DataOffset - 4 - TmpData =3D EfiCompressor.FrameworkDecompress(m[Offset:], = len(m)-Offset) - DecData =3D array('B') - DecData.fromstring(TmpData) - Offset =3D 0 - while Offset < len(DecData): - Sec =3D Section() - try: - Sec.frombuffer(DecData, Offset) - Offset +=3D Sec.Size - # the section is aligned to 4-byte boundary - Offset =3D (Offset + 3) & (~3) - except: - break - SectionList.append(Sec) - except: - pass - elif Guid =3D=3D m.LZMA_COMPRESS_GUID: - try: - import LzmaCompressor - # skip the header - Offset =3D m.DataOffset - 4 - TmpData =3D LzmaCompressor.LzmaDecompress(m[Offset:], len(= m)-Offset) - DecData =3D array('B') - DecData.fromstring(TmpData) - Offset =3D 0 - while Offset < len(DecData): - Sec =3D Section() - try: - Sec.frombuffer(DecData, Offset) - Offset +=3D Sec.Size - # the section is aligned to 4-byte boundary - Offset =3D (Offset + 3) & (~3) - except: - break - SectionList.append(Sec) - except: - pass - - return SectionList - - Attributes =3D property(_GetAttribute, _SetAttribute) - SectionDefinitionGuid =3D property(_GetGuid, _SetGuid) - DataOffset =3D property(_GetDataOffset, _SetDataOffset) - Sections =3D property(_GetSections) - -## Depex() class -# -# A class for Depex -# -class Depex(Image): - _HEADER_ =3D struct.Struct("") - _HEADER_SIZE_ =3D 0 - - _GUID_ =3D struct.Struct("1I2H8B") - _OPCODE_ =3D struct.Struct("1B") - - _OPCODE_STRING_ =3D { - 0x00 : "BEFORE", - 0x01 : "AFTER", - 0x02 : "PUSH", - 0x03 : "AND", - 0x04 : "OR", - 0x05 : "NOT", - 0x06 : "TRUE", - 0x07 : "FALSE", - 0x08 : "END", - 0x09 : "SOR" - } - - _NEXT_ =3D { - -1 : _OPCODE_, # first one in depex must be an opcdoe - 0x00 : _GUID_, #"BEFORE", - 0x01 : _GUID_, #"AFTER", - 0x02 : _GUID_, #"PUSH", - 0x03 : _OPCODE_, #"AND", - 0x04 : _OPCODE_, #"OR", - 0x05 : _OPCODE_, #"NOT", - 0x06 : _OPCODE_, #"TRUE", - 0x07 : _OPCODE_, #"FALSE", - 0x08 : None, #"END", - 0x09 : _OPCODE_, #"SOR" - } - - def __init__(m): - Image.__init__(m) - m._ExprList =3D [] - - def __str__(m): - global gIndention - gIndention +=3D 4 - Indention =3D ' ' * gIndention - S =3D '\n' - for T in m.Expression: - if T in m._OPCODE_STRING_: - S +=3D Indention + m._OPCODE_STRING_[T] - if T not in [0x00, 0x01, 0x02]: - S +=3D '\n' - else: - S +=3D ' ' + gGuidStringFormat % T + '\n' - gIndention -=3D 4 - return S - - def _Unpack(m): - # keep header in this Image object - m.empty() - m.extend(m._BUF_[m._OFF_ : m._OFF_ + m._LEN_]) - return len(m) - - def _GetExpression(m): - if m._ExprList =3D=3D []: - Offset =3D 0 - CurrentData =3D m._OPCODE_ - while Offset < len(m): - Token =3D CurrentData.unpack_from(m, Offset) - Offset +=3D CurrentData.size - if len(Token) =3D=3D 1: - Token =3D Token[0] - if Token in m._NEXT_: - CurrentData =3D m._NEXT_[Token] - else: - CurrentData =3D m._GUID_ - else: - CurrentData =3D m._OPCODE_ - m._ExprList.append(Token) - if CurrentData is None: - break - return m._ExprList - - Expression =3D property(_GetExpression) - -## Ui() class -# -# A class for Ui -# -class Ui(Image): - _HEADER_ =3D struct.Struct("") - _HEADER_SIZE_ =3D 0 - - def __init__(m): - Image.__init__(m) - - def __str__(m): - return m.String - - def _Unpack(m): - # keep header in this Image object - m.empty() - m.extend(m._BUF_[m._OFF_ : m._OFF_ + m._LEN_]) - return len(m) - - def _GetUiString(m): - return codecs.utf_16_decode(m[0:-2].tostring())[0] - - String =3D property(_GetUiString) - -## Section() class -# -# A class for Section -# -class Section(Image): - _TypeName =3D { - 0x00 : "", - 0x01 : "COMPRESSION", - 0x02 : "GUID_DEFINED", - 0x10 : "PE32", - 0x11 : "PIC", - 0x12 : "TE", - 0x13 : "DXE_DEPEX", - 0x14 : "VERSION", - 0x15 : "USER_INTERFACE", - 0x16 : "COMPATIBILITY16", - 0x17 : "FIRMWARE_VOLUME_IMAGE", - 0x18 : "FREEFORM_SUBTYPE_GUID", - 0x19 : "RAW", - 0x1B : "PEI_DEPEX" - } - - _SectionSubImages =3D { - 0x01 : CompressedImage, - 0x02 : GuidDefinedImage, - 0x17 : FirmwareVolume, - 0x13 : Depex, - 0x1B : Depex, - 0x15 : Ui - } - - # Size =3D 3-byte - # Type =3D 1-byte - _HEADER_ =3D struct.Struct("3B 1B") - _HEADER_SIZE_ =3D _HEADER_.size - - # SubTypeGuid - # _FREE_FORM_SUBTYPE_GUID_HEADER_ =3D struct.Struct("1I2H8B") - - _SIZE_ =3D struct.Struct("3B") - _TYPE_ =3D struct.Struct("3x 1B") - - def __init__(m, Type=3DNone, Size=3DNone): - Image.__init__(m) - m._Alignment =3D 1 - if Type is not None: - m.Type =3D Type - if Size is not None: - m.Size =3D Size - - def __str__(m): - global gIndention - gIndention +=3D 4 - SectionInfo =3D ' ' * gIndention - if m.Type in m._TypeName: - SectionInfo +=3D "[SECTION:%s] offset=3D%x size=3D%x" % (m._Ty= peName[m.Type], m._OFF_, m.Size) - else: - SectionInfo +=3D "[SECTION:%x] offset=3D%x size=3D%x = " % (m.Type, m._OFF_, m.Size) - for Offset in m._SubImages: - SectionInfo +=3D ", " + str(m._SubImages[Offset]) - gIndention -=3D 4 - return SectionInfo - - def _Unpack(m): - m.empty() - Type, =3D m._TYPE_.unpack_from(m._BUF_, m._OFF_) - Size1, Size2, Size3 =3D m._SIZE_.unpack_from(m._BUF_, m._OFF_) - Size =3D Size1 + (Size2 << 8) + (Size3 << 16) - - if Type not in m._SectionSubImages: - # no need to extract sub-image, keep all in this Image object - m.extend(m._BUF_[m._OFF_ : m._OFF_ + Size]) - else: - # keep header in this Image object - m.extend(m._BUF_[m._OFF_ : m._OFF_ + m._HEADER_SIZE_]) - # - # use new Image object to represent payload, which may be anot= her kind - # of image such as PE32 - # - PayloadOffset =3D m._HEADER_SIZE_ - PayloadLen =3D m.Size - m._HEADER_SIZE_ - Payload =3D m._SectionSubImages[m.Type]() - Payload.frombuffer(m._BUF_, m._OFF_ + m._HEADER_SIZE_, Payload= Len) - m._SubImages[PayloadOffset] =3D Payload - - return Size - - def _SetSize(m, Size): - Size1 =3D Size & 0xFF - Size2 =3D (Size & 0xFF00) >> 8 - Size3 =3D (Size & 0xFF0000) >> 16 - m.SetField(m._SIZE_, 0, Size1, Size2, Size3) - - def _GetSize(m): - Size1, Size2, Size3 =3D m.GetField(m._SIZE_) - return Size1 + (Size2 << 8) + (Size3 << 16) - - def _SetType(m, Type): - m.SetField(m._TYPE_, 0, Type) - - def _GetType(m): - return m.GetField(m._TYPE_)[0] - - def _GetAlignment(m): - return m._Alignment - - def _SetAlignment(m, Alignment): - m._Alignment =3D Alignment - AlignmentMask =3D Alignment - 1 - # section alignment is actually for payload, so we need to add hea= der size - PayloadOffset =3D m._OFF_ + m._HEADER_SIZE_ - if (PayloadOffset & (~AlignmentMask)) =3D=3D 0: - return - NewOffset =3D (PayloadOffset + AlignmentMask) & (~AlignmentMask) - while (NewOffset - PayloadOffset) < m._HEADER_SIZE_: - NewOffset +=3D m._Alignment - - def tofile(m, f): - m.Size =3D len(m) - Image.tofile(m, f) - for Offset in m._SubImages: - m._SubImages[Offset].tofile(f) - - Type =3D property(_GetType, _SetType) - Size =3D property(_GetSize, _SetSize) - Alignment =3D property(_GetAlignment, _SetAlignment) - # SubTypeGuid =3D property(_GetGuid, _SetGuid) - -## PadSection() class -# -# A class for Pad Section -# -class PadSection(Section): - def __init__(m, Size): - Section.__init__(m) - m.Type =3D 0x19 - m.Size =3D Size - m.Data =3D [0] * (Size - m._HEADER_SIZE_) - -## Ffs() class -# -# A class for Ffs Section -# -class Ffs(Image): - _FfsFormat =3D "24B%(payload_size)sB" - # skip IntegrityCheck - _HEADER_ =3D struct.Struct("1I2H8B 2x 1B 1B 3B 1B") - _HEADER_SIZE_ =3D _HEADER_.size - - _NAME_ =3D struct.Struct("1I2H8B") - _INT_CHECK_ =3D struct.Struct("16x 1H") - _TYPE_ =3D struct.Struct("18x 1B") - _ATTR_ =3D struct.Struct("19x 1B") - _SIZE_ =3D struct.Struct("20x 3B") - _STATE_ =3D struct.Struct("23x 1B") - - VTF_GUID =3D "1BA0062E-C779-4582-8566-336AE8F78F09" - - FFS_ATTRIB_FIXED =3D 0x04 - FFS_ATTRIB_DATA_ALIGNMENT =3D 0x38 - FFS_ATTRIB_CHECKSUM =3D 0x40 - - _TypeName =3D { - 0x00 : "", - 0x01 : "RAW", - 0x02 : "FREEFORM", - 0x03 : "SECURITY_CORE", - 0x04 : "PEI_CORE", - 0x05 : "DXE_CORE", - 0x06 : "PEIM", - 0x07 : "DRIVER", - 0x08 : "COMBINED_PEIM_DRIVER", - 0x09 : "APPLICATION", - 0x0A : "SMM", - 0x0B : "FIRMWARE_VOLUME_IMAGE", - 0x0C : "COMBINED_SMM_DXE", - 0x0D : "SMM_CORE", - 0x0E : "MM_STANDALONE", - 0x0F : "MM_CORE_STANDALONE", - 0xc0 : "OEM_MIN", - 0xdf : "OEM_MAX", - 0xe0 : "DEBUG_MIN", - 0xef : "DEBUG_MAX", - 0xf0 : "FFS_MIN", - 0xff : "FFS_MAX", - 0xf0 : "FFS_PAD", - } - - def __init__(self): - Image.__init__(self) - self.FreeSpace =3D 0 - - self.Sections =3D sdict() - self.Depex =3D '' - - self.__ID__ =3D None - - def __str__(self): - global gIndention - gIndention +=3D 4 - Indention =3D ' ' * gIndention - FfsInfo =3D Indention - FfsInfo +=3D "[FFS:%s] offset=3D%x size=3D%x guid=3D%s free_space= =3D%x alignment=3D%s\n" % \ - (Ffs._TypeName[self.Type], self._OFF_, self.Size, self= .Guid, self.FreeSpace, self.Alignment) - SectionInfo =3D '\n'.join([str(self.Sections[Offset]) for Offset i= n self.Sections]) - gIndention -=3D 4 - return FfsInfo + SectionInfo + "\n" - - def __len__(self): - return self.Size - - def __repr__(self): - return self.__ID__ - - def _Unpack(self): - Size1, Size2, Size3 =3D self._SIZE_.unpack_from(self._BUF_, self._= OFF_) - Size =3D Size1 + (Size2 << 8) + (Size3 << 16) - self.empty() - self.extend(self._BUF_[self._OFF_ : self._OFF_ + Size]) - - # Pad FFS may use the same GUID. We need to avoid it. - if self.Type =3D=3D 0xf0: - self.__ID__ =3D str(uuid.uuid1()).upper() - else: - self.__ID__ =3D self.Guid - - # Traverse the SECTION. RAW and PAD do not have sections - if self.Type not in [0xf0, 0x01] and Size > 0 and Size < 0xFFFFFF: - EndOfFfs =3D Size - SectionStartAddress =3D self._HEADER_SIZE_ - while SectionStartAddress < EndOfFfs: - SectionObj =3D Section() - SectionObj.frombuffer(self, SectionStartAddress) - #f =3D open(repr(SectionObj), 'wb') - #SectionObj.Size =3D 0 - #SectionObj.tofile(f) - #f.close() - self.Sections[SectionStartAddress] =3D SectionObj - SectionStartAddress +=3D len(SectionObj) - SectionStartAddress =3D (SectionStartAddress + 3) & (~3) - - def Pack(self): - pass - - def SetFreeSpace(self, Size): - self.FreeSpace =3D Size - - def _GetGuid(self): - return gGuidStringFormat % self.Name - - def _SetName(self, Value): - # Guid1, Guid2, Guid3, Guid4, Guid5, Guid6, Guid7, Guid8, Guid9, G= uid10, Guid11 - self.SetField(self._NAME_, 0, Value) - - def _GetName(self): - # Guid1, Guid2, Guid3, Guid4, Guid5, Guid6, Guid7, Guid8, Guid9, G= uid10, Guid11 - return self.GetField(self._NAME_) - - def _SetSize(m, Size): - Size1 =3D Size & 0xFF - Size2 =3D (Size & 0xFF00) >> 8 - Size3 =3D (Size & 0xFF0000) >> 16 - m.SetField(m._SIZE_, 0, Size1, Size2, Size3) - - def _GetSize(m): - Size1, Size2, Size3 =3D m.GetField(m._SIZE_) - return Size1 + (Size2 << 8) + (Size3 << 16) - - def _SetType(m, Type): - m.SetField(m._TYPE_, 0, Type) - - def _GetType(m): - return m.GetField(m._TYPE_)[0] - - def _SetAttributes(self, Value): - self.SetField(m._ATTR_, 0, Value) - - def _GetAttributes(self): - return self.GetField(self._ATTR_)[0] - - def _GetFixed(self): - if (self.Attributes & self.FFS_ATTRIB_FIXED) !=3D 0: - return True - return False - - def _GetCheckSum(self): - if (self.Attributes & self.FFS_ATTRIB_CHECKSUM) !=3D 0: - return True - return False - - def _GetAlignment(self): - return (self.Attributes & self.FFS_ATTRIB_DATA_ALIGNMENT) >> 3 - - def _SetState(self, Value): - self.SetField(m._STATE_, 0, Value) - - def _GetState(self): - return self.GetField(m._STATE_)[0] - - Name =3D property(_GetName, _SetName) - Guid =3D property(_GetGuid) - Type =3D property(_GetType, _SetType) - Size =3D property(_GetSize, _SetSize) - Attributes =3D property(_GetAttributes, _SetAttributes) - Fixed =3D property(_GetFixed) - Checksum =3D property(_GetCheckSum) - Alignment =3D property(_GetAlignment) - State =3D property(_GetState, _SetState) - -## PeImage() class -# -# A class for PE Image -# -class PeImage: - # - # just extract e_lfanew - # - _DosHeaderFormat =3D "60x 1I" - # - # Machine - # NumberOfSections - # SizeOfOptionalHeader - # - _FileHeaderFormat =3D "4x 1H 1H 4x 4x 4x 1H 2x" - # - # Magic - # SizeOfImage - # SizeOfHeaders - # CheckSum - # NumberOfRvaAndSizes - # - _OptionalHeader32Format =3D "1H 54x 1I 1I 1I 24x 1I" - _OptionalHeader64Format =3D "" - def __init__(self, Buf, Offset, Size): - self.Offset =3D Offset - self.Size =3D Size - self.Machine =3D 0x014c # IA32 - self.NumberOfSections =3D 0 - self.SizeOfImage =3D 0 - self.SizeOfOptionalHeader =3D 0 - self.Checksum =3D 0 - self._PeImageBuf =3D Buf - self._SectionList =3D [] - - self._DosHeader =3D struct.Struct(PeImage._DosHeaderFormat) - self._FileHeader =3D struct.Struct(PeImage._FileHeaderFormat) - self._OptionalHeader32 =3D struct.Struct(PeImage._OptionalHeader32= Format) - - self.Buffer =3D None - - self._Unpack() - - def __str__(self): - pass - - def __len__(self): - return self.Size - - def _Unpack(self): - # from DOS header, get the offset of PE header - FileHeaderOffset, =3D self._DosHeader.unpack_from(self._PeImageBuf= , self.Offset) - if FileHeaderOffset < struct.calcsize(self._DosHeaderFormat): - EdkLogger.error("PE+", 0, "Invalid offset of IMAGE_FILE_HEADER= : %s" % FileHeaderOffset) - - # from FILE header, get the optional header size - self.Machine, self.NumberOfSections, self.SizeOfOptionalHeader =3D= \ - self._FileHeader.unpack_from(self._PeImageBuf, self.Offset + F= ileHeaderOffset) - - print "Machine=3D%x NumberOfSections=3D%x SizeOfOptionalHeader=3D%= x" % (self.Machine, self.NumberOfSections, self.SizeOfOptionalHeader) - # optional header follows the FILE header - OptionalHeaderOffset =3D FileHeaderOffset + struct.calcsize(self._= FileHeaderFormat) - Magic, self.SizeOfImage, SizeOfHeaders, self.Checksum, NumberOfRva= AndSizes =3D \ - self._OptionalHeader32.unpack_from(self._PeImageBuf, self.Offs= et + OptionalHeaderOffset) - print "Magic=3D%x SizeOfImage=3D%x SizeOfHeaders=3D%x, Checksum=3D= %x, NumberOfRvaAndSizes=3D%x" % (Magic, self.SizeOfImage, SizeOfHeaders, se= lf.Checksum, NumberOfRvaAndSizes) - - PeImageSectionTableOffset =3D OptionalHeaderOffset + self.SizeOfOp= tionalHeader - PeSections =3D PeSectionTable(self._PeImageBuf, self.Offset + PeIm= ageSectionTableOffset, self.NumberOfSections) - - print "%x" % PeSections.GetFileAddress(0x3920) - -## PeSectionTable() class -# -# A class for PE Section Table -# -class PeSectionTable: - def __init__(self, Buf, Offset, NumberOfSections): - self._SectionList =3D [] - - SectionHeaderOffset =3D Offset - for TableIndex in range(0, NumberOfSections): - SectionHeader =3D PeSectionHeader(Buf, SectionHeaderOffset) - self._SectionList.append(SectionHeader) - SectionHeaderOffset +=3D len(SectionHeader) - print SectionHeader - - def GetFileAddress(self, Rva): - for PeSection in self._SectionList: - if Rva in PeSection: - return PeSection[Rva] - -## PeSectionHeader() class -# -# A class for PE Section Header -# -class PeSectionHeader: - # - # VirtualAddress - # SizeOfRawData - # PointerToRawData - # - _HeaderFormat =3D "12x 1I 1I 1I 16x" - _HeaderLength =3D struct.calcsize(_HeaderFormat) - - def __init__(self, Buf, Offset): - self.VirtualAddressStart, self.SizeOfRawData, self.PointerToRawDat= a =3D \ - struct.unpack_from(self._HeaderFormat, Buf, Offset) - self.VirtualAddressEnd =3D self.VirtualAddressStart + self.SizeOfR= awData - 1 - - def __str__(self): - return "VirtualAddress=3D%x, SizeOfRawData=3D%x, PointerToRawData= =3D%x" % (self.VirtualAddressStart, self.SizeOfRawData, self.PointerToRawDa= ta) - - def __len__(self): - return self._HeaderLength - - def __contains__(self, Rva): - return Rva >=3D self.VirtualAddressStart and Rva <=3D self.Virtual= AddressEnd - - def __getitem__(self, Rva): - return Rva - self.VirtualAddressStart + self.PointerToRawData - -## LinkMap() class -# -# A class for Link Map -# -class LinkMap: - _StartFlag =3D { - "MSFT" : re.compile("Address +Publics by Value +Rva\+Base +Lib:= Object"), - "GCC" : re.compile("^\.(text|bss|data|edata)"), - } - - _MappingFormat =3D { - "MSFT" : re.compile("([0-9a-f]+):([0-9a-f]+)\s+_+([0-9A-Za-z]+)= \s+([0-9a-f]+)\s+"), - "GCC" : re.compile("^(\.\w)?\s+(0x[0-9a-f]+)\s+_+([0-9A-Za-z]+= )"), - } - - def __init__(self, MapFile, MapType=3D"MSFT"): - self.File =3D MapFile - self.MapType =3D MapType - self._Globals =3D {} # global:RVA - - self._Parse() - - def _Parse(self): - MapFile =3D open(self.File, 'r') - MappingTitle =3D self._StartFlag[self.MapType] - MappingFormat =3D self._MappingFormat[self.MapType] - MappingStart =3D False - try: - for Line in MapFile: - Line =3D Line.strip() - if not MappingStart: - if MappingTitle.match(Line) is not None: - MappingStart =3D True - continue - ResultList =3D MappingFormat.findall(Line) - if len(ResultList) =3D=3D 0 or len(ResultList[0]) !=3D 4: - continue - self._Globals[ResultList[2]] =3D int(ResultList[3], 16) - EdkLogger.verbose(ResultList[0]) - finally: - MapFile.close() - - def __contains__(self, Var): - return Var in self._Globals - - def __getitem__(self, Var): - if Var not in self._Globals: - return None - return self._Globals[Var] - -## MultipleFv() class -# -# A class for Multiple FV -# -class MultipleFv(FirmwareVolume): - def __init__(self, FvList): - FirmwareVolume.__init__(self) - self.BasicInfo =3D [] - for FvPath in FvList: - FvName =3D os.path.splitext(os.path.split(FvPath)[1])[0] - Fd =3D open(FvPath, 'rb') - Buf =3D array('B') - try: - Buf.fromfile(Fd, os.path.getsize(FvPath)) - except EOFError: - pass - - Fv =3D FirmwareVolume(FvName) - Fv.frombuffer(Buf, 0, len(Buf)) - - self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size]) - self.FfsDict.append(Fv.FfsDict) - -# Version and Copyright -__version_number__ =3D "0.01" -__version__ =3D "%prog Version " + __version_number__ -__copyright__ =3D "Copyright (c) 2008, Intel Corporation. All rights reser= ved." - -## Parse command line options -# -# Using standard Python module optparse to parse command line option of th= is tool. -# -# @retval Options A optparse.Values object containing the parsed options -# @retval InputFile Path of file to be trimmed -# -def GetOptions(): - OptionList =3D [ - make_option("-a", "--arch", dest=3D"Arch", - help=3D"The input file is preprocessed source co= de, including C or assembly code"), - make_option("-p", "--platform", dest=3D"ActivePlatform", - help=3D"The input file is preprocessed VFR file"= ), - make_option("-m", "--module", dest=3D"ActiveModule", - help=3D"Convert standard hex format (0xabcd) to = MASM format (abcdh)"), - make_option("-f", "--FDF-file", dest=3D"FdfFile", - help=3D"Convert standard hex format (0xabcd) to = MASM format (abcdh)"), - make_option("-o", "--output", dest=3D"OutputDirectory", - help=3D"File to store the trimmed content"), - make_option("-t", "--toolchain-tag", dest=3D"ToolChain", - help=3D""), - make_option("-k", "--msft", dest=3D"MakefileType", action=3D"store= _const", const=3D"nmake", - help=3D""), - make_option("-g", "--gcc", dest=3D"MakefileType", action=3D"store_= const", const=3D"gmake", - help=3D""), - make_option("-v", "--verbose", dest=3D"LogLevel", action=3D"store_= const", const=3DEdkLogger.VERBOSE, - help=3D"Run verbosely"), - make_option("-d", "--debug", dest=3D"LogLevel", type=3D"int", - help=3D"Run with debug information"), - make_option("-q", "--quiet", dest=3D"LogLevel", action=3D"store_co= nst", const=3DEdkLogger.QUIET, - help=3D"Run quietly"), - make_option("-?", action=3D"help", help=3D"show this help message = and exit"), - ] - - # use clearer usage to override default usage message - UsageString =3D "%prog [-a ARCH] [-p PLATFORM] [-m MODULE] [-t TOOLCHA= IN_TAG] [-k] [-g] [-v|-d |-q] [-o ] [GenC|Ge= nMake]" - - Parser =3D OptionParser(description=3D__copyright__, version=3D__versi= on__, option_list=3DOptionList, usage=3DUsageString) - Parser.set_defaults(Arch=3D[]) - Parser.set_defaults(ActivePlatform=3DNone) - Parser.set_defaults(ActiveModule=3DNone) - Parser.set_defaults(OutputDirectory=3D"build") - Parser.set_defaults(FdfFile=3DNone) - Parser.set_defaults(ToolChain=3D"MYTOOLS") - if sys.platform =3D=3D "win32": - Parser.set_defaults(MakefileType=3D"nmake") - else: - Parser.set_defaults(MakefileType=3D"gmake") - Parser.set_defaults(LogLevel=3DEdkLogger.INFO) - - Options, Args =3D Parser.parse_args() - - # error check - if len(Args) =3D=3D 0: - Options.Target =3D "genmake" - sys.argv.append("genmake") - elif len(Args) =3D=3D 1: - Options.Target =3D Args[0].lower() - if Options.Target not in ["genc", "genmake"]: - EdkLogger.error("AutoGen", OPTION_NOT_SUPPORTED, "Not supporte= d target", - ExtraData=3D"%s\n\n%s" % (Options.Target, Pars= er.get_usage())) - else: - EdkLogger.error("AutoGen", OPTION_NOT_SUPPORTED, "Too many targets= ", - ExtraData=3DParser.get_usage()) - - return Options - -## Entrance method -# -# This method mainly dispatch specific methods per the command line option= s. -# If no error found, return zero value so the caller of this tool can know -# if it's executed successfully or not. -# -# @retval 0 Tool was successful -# @retval 1 Tool failed -# -def Main(): - from build import build - try: - Option =3D GetOptions() - build.main() - except Exception, e: - print e - return 1 - - return 0 - -# This acts like the main() function for the script, unless it is 'import'= ed into another script. -if __name__ =3D=3D '__main__': - EdkLogger.Initialize() - # sys.exit(Main()) - - if len(sys.argv) > 1: - FilePath =3D sys.argv[1] - if FilePath.lower().endswith(".fv"): - fd =3D open(FilePath, 'rb') - buf =3D array('B') - try: - buf.fromfile(fd, os.path.getsize(FilePath)) - except EOFError: - pass - - fv =3D FirmwareVolume("FVRECOVERY") - fv.frombuffer(buf, 0, len(buf)) - #fv.Dispatch(None) - print fv - elif FilePath.endswith(".efi"): - fd =3D open(FilePath, 'rb') - buf =3D array('B') - Size =3D os.path.getsize(FilePath) - - try: - buf.fromfile(fd, Size) - except EOFError: - pass - - PeSection =3D Section(Type=3D0x10) - PeSection.Data =3D buf - sf, ext =3D os.path.splitext(os.path.basename(FilePath)) - sf +=3D ".sec" - PeSection.tofile(open(sf, 'wb')) - elif FilePath.endswith(".map"): - mf =3D LinkMap(FilePath) diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Mak= efile index c1c58dc0a423..733f94d817c1 100644 --- a/BaseTools/Source/Python/Makefile +++ b/BaseTools/Source/Python/Makefile @@ -112,7 +112,6 @@ CMD_BUILD=3D$(BASE_TOOLS_PATH)\Source\Python\build\Buil= dReport.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\EotGlobalData.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\EotToolError.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\FileProfile.py \ - $(BASE_TOOLS_PATH)\Source\Python\Eot\FvImage.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\InfParserLite.py \ $(BASE_TOOLS_PATH)\Source\Python\Eot\LzmaCompressor.pyd \ $(BASE_TOOLS_PATH)\Source\Python\Eot\Parser.py \ --=20 2.16.2.windows.1