MdeModulePkg: Change use of EFI_D_* to DEBUG_*
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739 Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines. Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael Kubacki <michael.kubacki@microsoft.com> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
committed by
mergify[bot]
parent
917e98f3e5
commit
87000d7708
@@ -769,7 +769,7 @@ FvIsBeingProcessed (
|
||||
for (Link = mFvHandleList.ForwardLink; Link != &mFvHandleList; Link = Link->ForwardLink) {
|
||||
KnownHandle = CR(Link, KNOWN_HANDLE, Link, KNOWN_HANDLE_SIGNATURE);
|
||||
if (CompareGuid (&FvNameGuid, &KnownHandle->FvNameGuid)) {
|
||||
DEBUG ((EFI_D_ERROR, "FvImage on FvHandle %p and %p has the same FvNameGuid %g.\n", FvHandle, KnownHandle->Handle, &FvNameGuid));
|
||||
DEBUG ((DEBUG_ERROR, "FvImage on FvHandle %p and %p has the same FvNameGuid %g.\n", FvHandle, KnownHandle->Handle, &FvNameGuid));
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
@@ -60,7 +60,7 @@ CoreRaiseTpl (
|
||||
|
||||
OldTpl = gEfiCurrentTpl;
|
||||
if (OldTpl > NewTpl) {
|
||||
DEBUG ((EFI_D_ERROR, "FATAL ERROR - RaiseTpl with OldTpl(0x%x) > NewTpl(0x%x)\n", OldTpl, NewTpl));
|
||||
DEBUG ((DEBUG_ERROR, "FATAL ERROR - RaiseTpl with OldTpl(0x%x) > NewTpl(0x%x)\n", OldTpl, NewTpl));
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
ASSERT (VALID_TPL (NewTpl));
|
||||
@@ -101,7 +101,7 @@ CoreRestoreTpl (
|
||||
|
||||
OldTpl = gEfiCurrentTpl;
|
||||
if (NewTpl > OldTpl) {
|
||||
DEBUG ((EFI_D_ERROR, "FATAL ERROR - RestoreTpl with NewTpl(0x%x) > OldTpl(0x%x)\n", NewTpl, OldTpl));
|
||||
DEBUG ((DEBUG_ERROR, "FATAL ERROR - RestoreTpl with NewTpl(0x%x) > OldTpl(0x%x)\n", NewTpl, OldTpl));
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
ASSERT (VALID_TPL (NewTpl));
|
||||
|
@@ -463,7 +463,7 @@ FvCheck (
|
||||
(FileState == EFI_FILE_HEADER_CONSTRUCTION)) {
|
||||
if (IS_FFS_FILE2 (FfsHeader)) {
|
||||
if (!FvDevice->IsFfs3Fv) {
|
||||
DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsHeader->Name));
|
||||
DEBUG ((DEBUG_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsHeader->Name));
|
||||
}
|
||||
FfsHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsHeader + sizeof (EFI_FFS_FILE_HEADER2));
|
||||
} else {
|
||||
@@ -508,7 +508,7 @@ FvCheck (
|
||||
if (IS_FFS_FILE2 (CacheFfsHeader)) {
|
||||
ASSERT (FFS_FILE2_SIZE (CacheFfsHeader) > 0x00FFFFFF);
|
||||
if (!FvDevice->IsFfs3Fv) {
|
||||
DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &CacheFfsHeader->Name));
|
||||
DEBUG ((DEBUG_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &CacheFfsHeader->Name));
|
||||
FfsHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsHeader + FFS_FILE2_SIZE (CacheFfsHeader));
|
||||
//
|
||||
// Adjust pointer to the next 8-byte aligned boundary.
|
||||
@@ -725,5 +725,3 @@ FwVolDriverInit (
|
||||
);
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -2384,8 +2384,8 @@ CoreInitializeMemoryServices (
|
||||
}
|
||||
}
|
||||
|
||||
DEBUG ((EFI_D_INFO, "CoreInitializeMemoryServices:\n"));
|
||||
DEBUG ((EFI_D_INFO, " BaseAddress - 0x%lx Length - 0x%lx MinimalMemorySizeNeeded - 0x%lx\n", BaseAddress, Length, MinimalMemorySizeNeeded));
|
||||
DEBUG ((DEBUG_INFO, "CoreInitializeMemoryServices:\n"));
|
||||
DEBUG ((DEBUG_INFO, " BaseAddress - 0x%lx Length - 0x%lx MinimalMemorySizeNeeded - 0x%lx\n", BaseAddress, Length, MinimalMemorySizeNeeded));
|
||||
|
||||
//
|
||||
// If no memory regions are found that are big enough to initialize the DXE core, then ASSERT().
|
||||
|
@@ -485,7 +485,7 @@ GetPeCoffImageFixLoadingAssignedAddress(
|
||||
}
|
||||
SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);
|
||||
}
|
||||
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));
|
||||
DEBUG ((DEBUG_INFO|DEBUG_LOAD, "LOADING MODULE FIXED INFO: Loading module at fixed address 0x%11p. Status = %r \n", (VOID *)(UINTN)(ImageContext->ImageAddress), Status));
|
||||
return Status;
|
||||
}
|
||||
|
||||
@@ -648,7 +648,7 @@ CoreLoadPeImage (
|
||||
//
|
||||
// If the code memory is not ready, invoke CoreAllocatePage with AllocateAnyPages to load the driver.
|
||||
//
|
||||
DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED ERROR: Loading module at fixed address failed since specified memory is not available.\n"));
|
||||
DEBUG ((DEBUG_INFO|DEBUG_LOAD, "LOADING MODULE FIXED ERROR: Loading module at fixed address failed since specified memory is not available.\n"));
|
||||
|
||||
Status = CoreAllocatePages (
|
||||
AllocateAnyPages,
|
||||
@@ -1587,8 +1587,8 @@ CoreStartImage (
|
||||
// Do not ASSERT here, because image might be loaded via EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED
|
||||
// But it can not be started.
|
||||
//
|
||||
DEBUG ((EFI_D_ERROR, "Image type %s can't be started ", GetMachineTypeName(Image->Machine)));
|
||||
DEBUG ((EFI_D_ERROR, "on %s UEFI system.\n", GetMachineTypeName(mDxeCoreImageMachineType)));
|
||||
DEBUG ((DEBUG_ERROR, "Image type %s can't be started ", GetMachineTypeName(Image->Machine)));
|
||||
DEBUG ((DEBUG_ERROR, "on %s UEFI system.\n", GetMachineTypeName(mDxeCoreImageMachineType)));
|
||||
return EFI_UNSUPPORTED;
|
||||
}
|
||||
|
||||
|
@@ -611,7 +611,7 @@ MemoryProfileInit (
|
||||
|
||||
RegisterDxeCore (HobStart, &mMemoryProfileContext);
|
||||
|
||||
DEBUG ((EFI_D_INFO, "MemoryProfileInit MemoryProfileContext - 0x%x\n", &mMemoryProfileContext));
|
||||
DEBUG ((DEBUG_INFO, "MemoryProfileInit MemoryProfileContext - 0x%x\n", &mMemoryProfileContext));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -66,7 +66,7 @@ CoreInitializeDebugImageInfoTable (
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if (PcdGet64 (PcdMaxEfiSystemTablePointerAddress) != 0) {
|
||||
DEBUG ((EFI_D_INFO, "Allocate memory for EFI_SYSTEM_TABLE_POINTER below PcdMaxEfiSystemTablePointerAddress failed. \
|
||||
DEBUG ((DEBUG_INFO, "Allocate memory for EFI_SYSTEM_TABLE_POINTER below PcdMaxEfiSystemTablePointerAddress failed. \
|
||||
Retry to allocate memroy as close to the top of memory as feasible.\n"));
|
||||
}
|
||||
//
|
||||
@@ -278,5 +278,3 @@ CoreRemoveDebugImageInfoEntry (
|
||||
}
|
||||
mDebugInfoTableHeader.UpdateStatus &= ~EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -120,7 +120,7 @@ InstallMemoryAttributesTable (
|
||||
|
||||
if (!mMemoryAttributesTableEnable) {
|
||||
DEBUG ((DEBUG_VERBOSE, "Cannot install Memory Attributes Table "));
|
||||
DEBUG ((EFI_D_VERBOSE, "because Runtime Driver Section Alignment is not %dK.\n", RUNTIME_PAGE_ALLOCATION_GRANULARITY >> 10));
|
||||
DEBUG ((DEBUG_VERBOSE, "because Runtime Driver Section Alignment is not %dK.\n", RUNTIME_PAGE_ALLOCATION_GRANULARITY >> 10));
|
||||
return ;
|
||||
}
|
||||
|
||||
@@ -182,10 +182,10 @@ InstallMemoryAttributesTable (
|
||||
MemoryAttributesTable->NumberOfEntries = RuntimeEntryCount;
|
||||
MemoryAttributesTable->DescriptorSize = (UINT32)DescriptorSize;
|
||||
MemoryAttributesTable->Reserved = 0;
|
||||
DEBUG ((EFI_D_VERBOSE, "MemoryAttributesTable:\n"));
|
||||
DEBUG ((EFI_D_VERBOSE, " Version - 0x%08x\n", MemoryAttributesTable->Version));
|
||||
DEBUG ((EFI_D_VERBOSE, " NumberOfEntries - 0x%08x\n", MemoryAttributesTable->NumberOfEntries));
|
||||
DEBUG ((EFI_D_VERBOSE, " DescriptorSize - 0x%08x\n", MemoryAttributesTable->DescriptorSize));
|
||||
DEBUG ((DEBUG_VERBOSE, "MemoryAttributesTable:\n"));
|
||||
DEBUG ((DEBUG_VERBOSE, " Version - 0x%08x\n", MemoryAttributesTable->Version));
|
||||
DEBUG ((DEBUG_VERBOSE, " NumberOfEntries - 0x%08x\n", MemoryAttributesTable->NumberOfEntries));
|
||||
DEBUG ((DEBUG_VERBOSE, " DescriptorSize - 0x%08x\n", MemoryAttributesTable->DescriptorSize));
|
||||
MemoryAttributesEntry = (EFI_MEMORY_DESCRIPTOR *)(MemoryAttributesTable + 1);
|
||||
MemoryMap = MemoryMapStart;
|
||||
for (Index = 0; Index < MemoryMapSize/DescriptorSize; Index++) {
|
||||
@@ -194,12 +194,12 @@ InstallMemoryAttributesTable (
|
||||
case EfiRuntimeServicesData:
|
||||
CopyMem (MemoryAttributesEntry, MemoryMap, DescriptorSize);
|
||||
MemoryAttributesEntry->Attribute &= (EFI_MEMORY_RO|EFI_MEMORY_XP|EFI_MEMORY_RUNTIME);
|
||||
DEBUG ((EFI_D_VERBOSE, "Entry (0x%x)\n", MemoryAttributesEntry));
|
||||
DEBUG ((EFI_D_VERBOSE, " Type - 0x%x\n", MemoryAttributesEntry->Type));
|
||||
DEBUG ((EFI_D_VERBOSE, " PhysicalStart - 0x%016lx\n", MemoryAttributesEntry->PhysicalStart));
|
||||
DEBUG ((EFI_D_VERBOSE, " VirtualStart - 0x%016lx\n", MemoryAttributesEntry->VirtualStart));
|
||||
DEBUG ((EFI_D_VERBOSE, " NumberOfPages - 0x%016lx\n", MemoryAttributesEntry->NumberOfPages));
|
||||
DEBUG ((EFI_D_VERBOSE, " Attribute - 0x%016lx\n", MemoryAttributesEntry->Attribute));
|
||||
DEBUG ((DEBUG_VERBOSE, "Entry (0x%x)\n", MemoryAttributesEntry));
|
||||
DEBUG ((DEBUG_VERBOSE, " Type - 0x%x\n", MemoryAttributesEntry->Type));
|
||||
DEBUG ((DEBUG_VERBOSE, " PhysicalStart - 0x%016lx\n", MemoryAttributesEntry->PhysicalStart));
|
||||
DEBUG ((DEBUG_VERBOSE, " VirtualStart - 0x%016lx\n", MemoryAttributesEntry->VirtualStart));
|
||||
DEBUG ((DEBUG_VERBOSE, " NumberOfPages - 0x%016lx\n", MemoryAttributesEntry->NumberOfPages));
|
||||
DEBUG ((DEBUG_VERBOSE, " Attribute - 0x%016lx\n", MemoryAttributesEntry->Attribute));
|
||||
MemoryAttributesEntry = NEXT_MEMORY_DESCRIPTOR(MemoryAttributesEntry, DescriptorSize);
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user