X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FDxeMain.inf;h=d4b3912b5e6ebf1dd82211abb7b56426a7208446;hb=57df17fe26cd;hp=6bdab9058db4e8e94f401c0f8389783cc6fdc307;hpb=6c85d1621713403f20e5c013fa8db161a1c8c4f3;p=mirror_edk2.git

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 6bdab9058d..d4b3912b5e 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -1,21 +1,17 @@
 ## @file
-#  This is core module in DXE phase. It provides an implementation of DXE Core that is
-#  compliant with DXE CIS.  
-#  
-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be 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 IMPLIED.
-#  
+#  This is core module in DXE phase.
+#
+#  It provides an implementation of DXE Core that is compliant with DXE CIS.
+#
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
 ##
 
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DxeCore
+  MODULE_UNI_FILE                = DxeCore.uni
   FILE_GUID                      = D6A2CB7F-6A18-4e2f-B43B-9920A733700A
   MODULE_TYPE                    = DXE_CORE
   VERSION_STRING                 = 1.0
@@ -26,7 +22,7 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
+#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)
 #
 
 [Sources]
@@ -38,6 +34,9 @@
   Misc/Stall.c
   Misc/SetWatchdogTimer.c
   Misc/InstallConfigurationTable.c
+  Misc/PropertiesTable.c
+  Misc/MemoryAttributesTable.c
+  Misc/MemoryProtection.c
   Library/Library.c
   Hand/DriverSupport.c
   Hand/Notify.c
@@ -50,6 +49,9 @@
   Mem/Page.c
   Mem/MemData.c
   Mem/Imem.h
+  Mem/MemoryProfileRecord.c
+  Mem/HeapGuard.c
+  Mem/HeapGuard.h
   FwVolBlock/FwVolBlock.c
   FwVolBlock/FwVolBlock.h
   FwVol/FwVolWrite.c
@@ -89,66 +91,119 @@
   UefiBootServicesTableLib
   DevicePathLib
   ReportStatusCodeLib
-  TimerLib
   DxeServicesLib
   DebugAgentLib
+  CpuExceptionHandlerLib
+  PcdLib
 
 [Guids]
-  gEfiEventMemoryMapChangeGuid                  ## CONSUMES ## Event
-  gEfiEventVirtualAddressChangeGuid             ## SOMETIMES_CONSUMES ## Event
-  gEfiEventExitBootServicesGuid                 ## SOMETIMES_CONSUMES ## Event
-  gEfiHobMemoryAllocModuleGuid                  ## CONSUMES ## Hob
-  gEfiFileInfoGuid                              ## CONSUMES ## File
-  gEfiFirmwareFileSystem2Guid                   ## CONSUMES ## GUID
-  gEfiFirmwareFileSystem3Guid                   ## CONSUMES ## GUID
-  gAprioriGuid                                  ## CONSUMES ## GUID
-  gEfiDebugImageInfoTableGuid                   ## CONSUMES ## GUID
-  gEfiHobListGuid                               ## CONSUMES ## GUID
-  gEfiDxeServicesTableGuid                      ## CONSUMES ## GUID
-  gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID
-  gEfiEventDxeDispatchGuid                      ## CONSUMES ## GUID
-  gLoadFixedAddressConfigurationTableGuid       ## SOMETIMES_CONSUMES
-  gIdleLoopEventGuid                            ## CONSUMES ## GUID
+  gEfiEventMemoryMapChangeGuid                  ## PRODUCES             ## Event
+  gEfiEventVirtualAddressChangeGuid             ## CONSUMES             ## Event
+  ## CONSUMES   ## Event
+  ## PRODUCES   ## Event
+  gEfiEventExitBootServicesGuid
+  gEfiHobMemoryAllocModuleGuid                  ## SOMETIMES_CONSUMES   ## HOB
+  gEfiFirmwareFileSystem2Guid                   ## CONSUMES             ## GUID # Used to compare with FV's file system guid and get the FV's file system format
+  gEfiFirmwareFileSystem3Guid                   ## CONSUMES             ## GUID # Used to compare with FV's file system guid and get the FV's file system format
+  gAprioriGuid                                  ## SOMETIMES_CONSUMES   ## File
+  gEfiDebugImageInfoTableGuid                   ## PRODUCES             ## SystemTable
+  gEfiHobListGuid                               ## PRODUCES             ## SystemTable
+  gEfiDxeServicesTableGuid                      ## PRODUCES             ## SystemTable
+  ## PRODUCES               ## SystemTable
+  ## SOMETIMES_CONSUMES     ## HOB
+  gEfiMemoryTypeInformationGuid
+  gEfiEventDxeDispatchGuid                      ## PRODUCES             ## Event
+  gLoadFixedAddressConfigurationTableGuid       ## SOMETIMES_PRODUCES   ## SystemTable
+  ## PRODUCES   ## Event
+  ## CONSUMES   ## Event
+  gIdleLoopEventGuid
+  gEventExitBootServicesFailedGuid              ## SOMETIMES_PRODUCES   ## Event
+  gEfiVectorHandoffTableGuid                    ## SOMETIMES_PRODUCES   ## SystemTable
+  gEdkiiMemoryProfileGuid                       ## SOMETIMES_PRODUCES   ## GUID # Install protocol
+  gEfiPropertiesTableGuid                       ## SOMETIMES_PRODUCES   ## SystemTable
+  gEfiMemoryAttributesTableGuid                 ## SOMETIMES_PRODUCES   ## SystemTable
+  gEfiEndOfDxeEventGroupGuid                    ## SOMETIMES_CONSUMES   ## Event
+  gEfiHobMemoryAllocStackGuid                   ## SOMETIMES_CONSUMES   ## SystemTable
+
+[Ppis]
+  gEfiVectorHandoffInfoPpiGuid                  ## UNDEFINED # HOB
 
 [Protocols]
-  gEfiStatusCodeRuntimeProtocolGuid             ## SOMETIMES_CONSUMES
-  gEfiCapsuleArchProtocolGuid                   ## CONSUMES
-  gEfiDecompressProtocolGuid                    ## CONSUMES
-  gEfiLoadPeImageProtocolGuid                   ## SOMETIMES_PRODUCES (Produces when PcdFrameworkCompatibilitySupport is set)
-  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES
-  gEfiLoadFileProtocolGuid                      ## CONSUMES
-  gEfiLoadFile2ProtocolGuid                     ## CONSUMES
-  gEfiResetArchProtocolGuid                     ## CONSUMES
-  gEfiRealTimeClockArchProtocolGuid             ## CONSUMES
-  gEfiRuntimeArchProtocolGuid                   ## CONSUMES
-  gEfiWatchdogTimerArchProtocolGuid             ## CONSUMES
-  gEfiSecurityArchProtocolGuid                  ## CONSUMES
-  gEfiVariableArchProtocolGuid                  ## CONSUMES
-  gEfiBdsArchProtocolGuid                       ## CONSUMES
-  gEfiVariableWriteArchProtocolGuid             ## CONSUMES
-  gEfiMonotonicCounterArchProtocolGuid          ## CONSUMES
-  gEfiMetronomeArchProtocolGuid                 ## CONSUMES
-  gEfiTimerArchProtocolGuid                     ## CONSUMES
-  gEfiBusSpecificDriverOverrideProtocolGuid     ## CONSUMES
-  gEfiDriverFamilyOverrideProtocolGuid          ## CONSUMES
-  gEfiPlatformDriverOverrideProtocolGuid        ## CONSUMES
+  ## PRODUCES
+  ## SOMETIMES_CONSUMES
+  gEfiDecompressProtocolGuid
+  gEfiLoadPeImageProtocolGuid                   ## SOMETIMES_PRODUCES   # Produces when PcdFrameworkCompatibilitySupport is set
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES
+  gEfiLoadFileProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiLoadFile2ProtocolGuid                     ## SOMETIMES_CONSUMES
+  gEfiBusSpecificDriverOverrideProtocolGuid     ## SOMETIMES_CONSUMES
+  gEfiDriverFamilyOverrideProtocolGuid          ## SOMETIMES_CONSUMES
+  gEfiPlatformDriverOverrideProtocolGuid        ## SOMETIMES_CONSUMES
   gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMES
-  gEfiFirmwareVolumeBlockProtocolGuid           ## PRODUCES
-  gEfiFirmwareVolume2ProtocolGuid               ## PRODUCES
-  gEfiCpuArchProtocolGuid                       ## CONSUMES
-  gEfiDevicePathProtocolGuid                    ## CONSUMES
+  ## PRODUCES
+  ## CONSUMES
+  ## NOTIFY
+  gEfiFirmwareVolumeBlockProtocolGuid
+  ## PRODUCES
+  ## CONSUMES
+  ## NOTIFY
+  gEfiFirmwareVolume2ProtocolGuid
+  ## PRODUCES
+  ## CONSUMES
+  gEfiDevicePathProtocolGuid
   gEfiLoadedImageProtocolGuid                   ## PRODUCES
+  gEfiLoadedImageDevicePathProtocolGuid         ## PRODUCES
   gEfiHiiPackageListProtocolGuid                ## SOMETIMES_PRODUCES
   gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES
-  gEfiLoadedImageDevicePathProtocolGuid         ## PRODUCES
   gEfiSmmBase2ProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEdkiiPeCoffImageEmulatorProtocolGuid         ## SOMETIMES_CONSUMES
+
+  # Arch Protocols
+  gEfiBdsArchProtocolGuid                       ## CONSUMES
+  gEfiCpuArchProtocolGuid                       ## CONSUMES
+  gEfiMetronomeArchProtocolGuid                 ## CONSUMES
+  gEfiMonotonicCounterArchProtocolGuid          ## CONSUMES
+  gEfiRealTimeClockArchProtocolGuid             ## CONSUMES
+  gEfiResetArchProtocolGuid                     ## CONSUMES
+  gEfiRuntimeArchProtocolGuid                   ## CONSUMES
+  gEfiSecurityArchProtocolGuid                  ## CONSUMES
+  gEfiSecurity2ArchProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiTimerArchProtocolGuid                     ## CONSUMES
+  gEfiVariableWriteArchProtocolGuid             ## CONSUMES
+  gEfiVariableArchProtocolGuid                  ## CONSUMES
+  gEfiCapsuleArchProtocolGuid                   ## CONSUMES
+  gEfiWatchdogTimerArchProtocolGuid             ## CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport	   ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport     ## CONSUMES
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber    ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber     ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable            ## CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress         ## CONSUMES
-  
\ No newline at end of file
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfileMemoryType                 ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfilePropertyMask               ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfileDriverPath                 ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable                   ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy                   ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy             ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask        ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPageType                       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPoolType                       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask                   ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard                           ## CONSUMES
+
+# [Hob]
+# RESOURCE_DESCRIPTOR   ## CONSUMES
+# MEMORY_ALLOCATION     ## CONSUMES
+# FIRMWARE_VOLUME       ## CONSUMES
+# UNDEFINED             ## CONSUMES # CPU
+#
+# [Event]
+# EVENT_TYPE_RELATIVE_TIMER ## PRODUCES  # DxeCore signals timer event.
+# EVENT_TYPE_PERIODIC_TIMER ## PRODUCES  # DxeCore signals timer event.
+#
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  DxeCoreExtra.uni