From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 3D09B21CAD9A7 for ; Sun, 2 Jul 2017 22:26:27 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jul 2017 22:28:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,301,1496127600"; d="scan'208";a="1167429312" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga001.fm.intel.com with ESMTP; 02 Jul 2017 22:28:03 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 2 Jul 2017 22:28:03 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 2 Jul 2017 22:28:02 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.116]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0319.002; Mon, 3 Jul 2017 13:28:01 +0800 From: "Zhu, Yonghong" To: "Gao, Liming" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Update GenFw to clear unused debug entry generated by VS tool chain Thread-Index: AQHS87xGiF7cDUYGzEuUXLRMjIHeUKJBkpyg Date: Mon, 3 Jul 2017 05:28:00 +0000 Message-ID: References: <1499059281-11744-1-git-send-email-liming.gao@intel.com> In-Reply-To: <1499059281-11744-1-git-send-email-liming.gao@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] BaseTools: Update GenFw to clear unused debug entry generated by VS tool chain X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2017 05:26:27 -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: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Limi= ng Gao Sent: Monday, July 03, 2017 1:21 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch] BaseTools: Update GenFw to clear unused debug entry= generated by VS tool chain https://bugzilla.tianocore.org/show_bug.cgi?id=3D600 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- BaseTools/Source/C/GenFw/GenFw.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/Ge= nFw.c index 22e4e72..6569460 100644 --- a/BaseTools/Source/C/GenFw/GenFw.c +++ b/BaseTools/Source/C/GenFw/GenFw.c @@ -2770,6 +2770,7 @@ Returns: { UINT32 Index; UINT32 DebugDirectoryEntryRva; + UINT32 DebugDirectoryEntrySize; UINT32 DebugDirectoryEntryFileOffset; UINT32 ExportDirectoryEntryRva; UINT32 ExportDirectoryEntryFileOffset; @@ -2781,12 +2782,14 @@ Returns: EFI_IMAGE_OPTIONAL_HEADER64 *Optional64Hdr; EFI_IMAGE_SECTION_HEADER *SectionHeader; EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *DebugEntry; + EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY *RsdsEntry; UINT32 *NewTimeStamp; =20 =20 // // Init variable. // DebugDirectoryEntryRva =3D 0; + DebugDirectoryEntrySize =3D 0; ExportDirectoryEntryRva =3D 0; ResourceDirectoryEntryRva =3D 0; DebugDirectoryEntryFileOffset =3D 0; @@ -2822,6 +2825,7 @@ Returns: if (Optional32Hdr->NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_DEB= UG && \ Optional32Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size= !=3D 0) { DebugDirectoryEntryRva =3D Optional32Hdr->DataDirectory[EFI_IMAGE_DI= RECTORY_ENTRY_DEBUG].VirtualAddress; + DebugDirectoryEntrySize =3D=20 + Optional32Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size; if (ZeroDebugFlag) { Optional32Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size= =3D 0; Optional32Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Virt= ualAddress =3D 0; @@ -2841,6 +2845,7 @@ Returns: if (Optional64Hdr->NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_DEB= UG && \ Optional64Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size= !=3D 0) { DebugDirectoryEntryRva =3D Optional64Hdr->DataDirectory[EFI_IMAGE_DI= RECTORY_ENTRY_DEBUG].VirtualAddress; + DebugDirectoryEntrySize =3D=20 + Optional64Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size; if (ZeroDebugFlag) { Optional64Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Size= =3D 0; Optional64Hdr->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG].Virt= ualAddress =3D 0; @@ -2886,11 +2891,23 @@ Returns: =20 if (DebugDirectoryEntryFileOffset !=3D 0) { DebugEntry =3D (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *) (FileBuffer + Debug= DirectoryEntryFileOffset); - DebugEntry->TimeDateStamp =3D 0; - mImageTimeStamp =3D 0; - if (ZeroDebugFlag) { - memset (FileBuffer + DebugEntry->FileOffset, 0, DebugEntry->SizeOfDa= ta); - memset (DebugEntry, 0, sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)); + Index =3D 0; + for (Index=3D0; Index < DebugDirectoryEntrySize / sizeof (EFI_IMAGE_DE= BUG_DIRECTORY_ENTRY); Index ++, DebugEntry ++) { + DebugEntry->TimeDateStamp =3D 0; + if (ZeroDebugFlag || DebugEntry->Type !=3D EFI_IMAGE_DEBUG_TYPE_CODE= VIEW) { + memset (FileBuffer + DebugEntry->FileOffset, 0, DebugEntry->SizeOf= Data); + memset (DebugEntry, 0, sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)); + } + if (DebugEntry->Type =3D=3D EFI_IMAGE_DEBUG_TYPE_CODEVIEW) { + RsdsEntry =3D (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY *) (FileBuffer = + DebugEntry->FileOffset); + if (RsdsEntry->Signature =3D=3D CODEVIEW_SIGNATURE_RSDS) { + RsdsEntry->Unknown =3D 0; + RsdsEntry->Unknown2 =3D 0; + RsdsEntry->Unknown3 =3D 0; + RsdsEntry->Unknown4 =3D 0; + RsdsEntry->Unknown5 =3D 0; + } + } } } =20 -- 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel