sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revise the debug message to add 0x in front of the HEX number for consistency

Browse Source 
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
This commit is contained in:
jchen20
2010-02-10 06:10:53 +00:00
parent d7c0e60c44
commit 852081fc68
8 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Core/Dxe/DxeMain.inf
View File

@@ -140,9 +140,7 @@
[FeaturePcd.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES
[FixedPcd.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable ## CONSUMES
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable ## CONSUMES

2
MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
View File

@@ -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);
}

2
MdeModulePkg/Core/Dxe/Gcd/Gcd.c
View File

@@ -1797,7 +1797,7 @@ CoreInitializeMemoryServices (
//
PhitHob = Hob.HandoffInformationTable;
if (FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
ReservedCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);
ReservedCodePageNumber += PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);

6
MdeModulePkg/Core/Dxe/Image/Image.c
View File

@@ -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)) {

2
MdeModulePkg/Core/Dxe/Mem/Page.c
View File

@@ -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();
}