BaseTools: Update GenFw tool to support -e -z option together

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1727
-e -z option is to generate EFI image with zero debug entry.
It can be used to check the EFI image in DEBUG build.
This fix also supports the case -t -z option together for TE image.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Feng Bob C <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
index 973bae5fe4dbec9c13d36f95e506a9138c8451a1..c99782b78eca89ccffeb94347f56b2cfb517667c 100644 (file)
--- a/BaseTools/Source/C/GenFw/GenFw.c
+++ b/BaseTools/Source/C/GenFw/GenFw.c
@@ -1111,6 +1111,7 @@ Returns:
   time_t                           InputFileTime;\r
   time_t                           OutputFileTime;\r
   struct stat                      Stat_Buf;\r
+  BOOLEAN                          ZeroDebugFlag;\r
 \r
   SetUtilityName (UTILITY_NAME);\r
 \r
@@ -1158,6 +1159,7 @@ Returns:
   NegativeAddr           = FALSE;\r
   InputFileTime          = 0;\r
   OutputFileTime         = 0;\r
+  ZeroDebugFlag          = FALSE;\r
 \r
   if (argc == 1) {\r
     Error (NULL, 0, 1001, "Missing options", "No input options.");\r
@@ -1197,6 +1199,9 @@ Returns:
         goto Finish;\r
       }\r
       ModuleType = argv[1];\r
+      if (mOutImageType == FW_ZERO_DEBUG_IMAGE) {\r
+        ZeroDebugFlag = TRUE;\r
+      }\r
       if (mOutImageType != FW_TE_IMAGE) {\r
         mOutImageType = FW_EFI_IMAGE;\r
       }\r
@@ -1220,6 +1225,9 @@ Returns:
     }\r
 \r
     if ((stricmp (argv[0], "-t") == 0) || (stricmp (argv[0], "--terse") == 0)) {\r
+      if (mOutImageType == FW_ZERO_DEBUG_IMAGE) {\r
+        ZeroDebugFlag = TRUE;\r
+      }\r
       mOutImageType = FW_TE_IMAGE;\r
       argc --;\r
       argv ++;\r
@@ -1241,7 +1249,12 @@ Returns:
     }\r
 \r
     if ((stricmp (argv[0], "-z") == 0) || (stricmp (argv[0], "--zero") == 0)) {\r
-      mOutImageType = FW_ZERO_DEBUG_IMAGE;\r
+      if (mOutImageType == FW_DUMMY_IMAGE) {\r
+        mOutImageType = FW_ZERO_DEBUG_IMAGE;\r
+      }\r
+      if (mOutImageType == FW_TE_IMAGE || mOutImageType == FW_EFI_IMAGE) {\r
+        ZeroDebugFlag = TRUE;\r
+      }\r
       argc --;\r
       argv ++;\r
       continue;\r
@@ -2588,7 +2601,7 @@ Returns:
   //\r
   // Zero Time/Data field\r
   //\r
-  ZeroDebugData (FileBuffer, FALSE);\r
+  ZeroDebugData (FileBuffer, ZeroDebugFlag);\r
 \r
   if (mOutImageType == FW_TE_IMAGE) {\r
     if ((PeHdr->Pe32.FileHeader.NumberOfSections &~0xFF) || (Type &~0xFF)) {\r