From 852081fc68a3b8fe372cda5fb009058d8a077ab9 Mon Sep 17 00:00:00 2001
From: jchen20 <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 10 Feb 2010 06:10:53 +0000
Subject: revise the debug message to add 0x in front of the HEX number for
 consistency replace FixedPcdGetXX with PcdGetXX to access
 PcdLoadModuleAtFixAddressEnable

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9964 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Core/Dxe/DxeMain.inf       | 6 ++----
 MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 2 +-
 MdeModulePkg/Core/Dxe/Gcd/Gcd.c         | 2 +-
 MdeModulePkg/Core/Dxe/Image/Image.c     | 6 +++---
 MdeModulePkg/Core/Dxe/Mem/Page.c        | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'MdeModulePkg/Core/Dxe')

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 3a32e1ff31..5da6f148d9 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -140,9 +140,7 @@
 [FeaturePcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport	   ## CONSUMES
 
-[FixedPcd.common]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable           ## CONSUMES
-
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber    ## SOMETIMES_CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber     ## SOMETIMES_CONSUMES
\ No newline at end of file
+  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber     ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable            ## CONSUMES
\ No newline at end of file
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 8c7bdc7074..cd2368e570 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -295,7 +295,7 @@ DxeMain (
   // 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. 
   //
-  if (FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
+  if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
     Status = CoreInstallConfigurationTable (&gLoadFixedAddressConfigurationTableGuid, &gLoadModuleAtFixAddressConfigurationTable);
     ASSERT_EFI_ERROR (Status);
   }
diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
index 2a026c0724..6ac093162e 100644
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
+++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
@@ -1797,7 +1797,7 @@ CoreInitializeMemoryServices (
   //
   PhitHob = Hob.HandoffInformationTable;
   
-  if (FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
+  if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
   	ReservedCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);
   	ReservedCodePageNumber += PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);
    
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 7752fab70d..ae4daebd9e 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -355,7 +355,7 @@ GetPeCoffImageFixLoadingAssignedAddress(
          // hold the spcified address. If the feature is configured as load module at fixed offset, ImageAddress hold an offset
          // relative to top address
          //
-         if ((INT64)FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) < 0) {
+         if ((INT64)PcdGet64(PcdLoadModuleAtFixAddressEnable) < 0) {
          	 ImageContext->ImageAddress = gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress + (INT64)ImageContext->ImageAddress;
          }
          //
@@ -367,7 +367,7 @@ GetPeCoffImageFixLoadingAssignedAddress(
      }
      SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);
    }
-   DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED INFO: Loading module at fixed address %x. Status = %r \n", ImageContext->ImageAddress, Status));
+   DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED INFO: Loading module at fixed address 0x%11p. Status = %r \n", (VOID *)(UINTN)(ImageContext->ImageAddress), Status));
    return Status;
 }
 /**
@@ -479,7 +479,7 @@ CoreLoadPeImage (
     // If Loading Module At Fixed Address feature is enabled, the module should be loaded to
     // a specified address.
     //
-    if (FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 ) {
+    if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 ) {
       Status = GetPeCoffImageFixLoadingAssignedAddress (&(Image->ImageContext));
 
       if (EFI_ERROR (Status))  {
diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 2a99507c58..f351a121f3 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -533,7 +533,7 @@ CoreAddMemoryDescriptor (
   //
   // If Loading Module At Fixed Address feature is enabled. try to allocate memory with Runtime code & Boot time code type
   //
-  if (FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
+  if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
     CoreLoadingFixedAddressHook();
   }
   
-- 
cgit v1.2.3