MdeModulePkg/Gcd: Suppress incorrect compiler/analyzer warnings

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / DxeMain / DxeMain.c

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 21cd61ad2e147db5da58b2fddd8f85a4ed5ac56d..07c740346242fb229b077575766402fb3667da8f 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -1,7 +1,7 @@
 /** @file\r
   DXE Core Main Entry Point\r
 \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 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
@@ -258,7 +258,7 @@ DxeMain (
   if (GuidHob != NULL) {\r
     VectorInfoList = (EFI_VECTOR_HANDOFF_INFO *) (GET_GUID_HOB_DATA(GuidHob));\r
   }\r
-  Status = InitializeCpuExceptionHandlers (VectorInfoList);\r
+  Status = InitializeCpuExceptionHandlersEx (VectorInfoList, NULL);\r
   ASSERT_EFI_ERROR (Status);\r
   \r
   //\r
@@ -380,10 +380,43 @@ DxeMain (
       }\r
     }\r
     for (Hob.Raw = HobStart; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
-      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV2) {\r
-        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "FV2 Hob           0x%0lx - 0x%0lx\n", Hob.FirmwareVolume2->BaseAddress, Hob.FirmwareVolume2->BaseAddress + Hob.FirmwareVolume2->Length - 1));\r
-      } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV) {\r
-        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "FV Hob            0x%0lx - 0x%0lx\n", Hob.FirmwareVolume->BaseAddress, Hob.FirmwareVolume->BaseAddress + Hob.FirmwareVolume->Length - 1));\r
+      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV) {\r
+        DEBUG ((\r
+          DEBUG_INFO | DEBUG_LOAD,\r
+          "FV Hob            0x%0lx - 0x%0lx\n",\r
+          Hob.FirmwareVolume->BaseAddress,\r
+          Hob.FirmwareVolume->BaseAddress + Hob.FirmwareVolume->Length - 1\r
+          ));\r
+      } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV2) {\r
+        DEBUG ((\r
+          DEBUG_INFO | DEBUG_LOAD,\r
+          "FV2 Hob           0x%0lx - 0x%0lx\n",\r
+          Hob.FirmwareVolume2->BaseAddress,\r
+          Hob.FirmwareVolume2->BaseAddress + Hob.FirmwareVolume2->Length - 1\r
+          ));\r
+        DEBUG ((\r
+          DEBUG_INFO | DEBUG_LOAD,\r
+          "                  %g - %g\n",\r
+          &Hob.FirmwareVolume2->FvName,\r
+          &Hob.FirmwareVolume2->FileName\r
+          ));\r
+      } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV3) {\r
+        DEBUG ((\r
+          DEBUG_INFO | DEBUG_LOAD,\r
+          "FV3 Hob           0x%0lx - 0x%0lx - 0x%x - 0x%x\n",\r
+          Hob.FirmwareVolume3->BaseAddress,\r
+          Hob.FirmwareVolume3->BaseAddress + Hob.FirmwareVolume3->Length - 1,\r
+          Hob.FirmwareVolume3->AuthenticationStatus,\r
+          Hob.FirmwareVolume3->ExtractedFv\r
+          ));\r
+        if (Hob.FirmwareVolume3->ExtractedFv) {\r
+          DEBUG ((\r
+            DEBUG_INFO | DEBUG_LOAD,\r
+            "                  %g - %g\n",\r
+            &Hob.FirmwareVolume3->FvName,\r
+            &Hob.FirmwareVolume3->FileName\r
+            ));\r
+        }\r
       }\r
     }\r
   DEBUG_CODE_END ();\r
@@ -398,6 +431,7 @@ DxeMain (
 \r
   CoreInitializePropertiesTable ();\r
   CoreInitializeMemoryAttributesTable ();\r
+  CoreInitializeMemoryProtection ();\r
 \r
   //\r
   // Get persisted vector hand-off info from GUIDeed HOB again due to HobStart may be updated,\r
@@ -771,6 +805,8 @@ CoreExitBootServices (
     (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)\r
     );\r
 \r
+  MemoryProtectionExitBootServicesCallback();\r
+\r
   //\r
   // Disable interrupt of Debug timer.\r
   //\r