1. Refine debug agent library.

2. DxeCore and DxeIpl consume debug agent library. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10119 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 12 insertions, 5 deletions

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index da56c88fd7..5c17b02d53 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -81,6 +81,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/ReportStatusCodeLib.h>

 #include <Library/TimerLib.h>

 #include <Library/DxeServicesLib.h>

+#include <Library/DebugAgentLib.h>

 

 

 //

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 6d5f6f5071..2f50ed0223 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -89,6 +89,7 @@
   ReportStatusCodeLib

   TimerLib

   DxeServicesLib

+  DebugAgentLib

 

 [Guids]

   gEfiEventMemoryMapChangeGuid                  ## CONSUMES ## Event

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 77c4227c30..2f72670c2a 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -215,8 +215,8 @@ EFI_DECOMPRESS_PROTOCOL  gEfiDecompress = {
 };

 

 //

-// For Loading modules at fixed address feature, the configuration table is to cache the top address below which to load 

-// Runtime code&boot time code 

+// For Loading modules at fixed address feature, the configuration table is to cache the top address below which to load

+// Runtime code&boot time code

 //

 GLOBAL_REMOVE_IF_UNREFERENCED EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE    gLoadModuleAtFixAddressConfigurationTable = {0, 0};

 

@@ -242,6 +242,11 @@ DxeMain (
   UINT64                             MemoryLength;

 

   //

+  // Initialize Debug Agent to support source level debug in DXE phase

+  //

+  InitializeDebugAgent (DEBUG_AGENT_INIT_DXE, HobStart);

+

+  //

   // Initialize Memory Services

   //

   CoreInitializeMemoryServices (&HobStart, &MemoryBaseAddress, &MemoryLength);

@@ -294,11 +299,11 @@ DxeMain (
   //

   Status = CoreInstallConfigurationTable (&gEfiMemoryTypeInformationGuid, &gMemoryTypeInformation);

   ASSERT_EFI_ERROR (Status);

-  

+

   //

-  // If Loading modules At fixed address feature is enabled, install Load moduels at fixed address 

+  // If Loading modules At fixed address feature is enabled, install Load moduels at fixed address

   // Configuration Table so that user could easily to retrieve the top address to load Dxe and PEI

-  // Code and Tseg base to load SMM driver. 

+  // Code and Tseg base to load SMM driver.

   //

   if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {

     Status = CoreInstallConfigurationTable (&gLoadFixedAddressConfigurationTableGuid, &gLoadModuleAtFixAddressConfigurationTable);