MdeModulePkg/CapsulePei: Update the debug code to print 64bit data

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1677

For some pointer and UINT64 data, the debug code print with '%x'.
Which would loss the upper 32bit data. So update '%x' to '%lx'
for these data. And change the pointer value from '%x' to '%p'.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
This commit is contained in:
Bret Barkelew 2019-04-11 18:14:47 +08:00 committed by Hao Wu
parent 85b0193276
commit 42d8be0eaa
1 changed files with 9 additions and 9 deletions

View File

@ -327,9 +327,9 @@ ValidateCapsuleIntegrity (
return NULL;
}
DEBUG ((DEBUG_INFO, "Ptr - 0x%x\n", Ptr));
DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%x\n", Ptr->Length));
DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%x\n", Ptr->Union.ContinuationPointer));
DEBUG ((DEBUG_INFO, "Ptr - 0x%p\n", Ptr));
DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length));
DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", Ptr->Union.ContinuationPointer));
while ((Ptr->Length != 0) || (Ptr->Union.ContinuationPointer != (EFI_PHYSICAL_ADDRESS) (UINTN) NULL)) {
//
// Make sure the descriptor is aligned at UINT64 in memory
@ -348,9 +348,9 @@ ValidateCapsuleIntegrity (
if (!ValidateCapsuleByMemoryResource (MemoryResource, (EFI_PHYSICAL_ADDRESS) (UINTN) Ptr, sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR))) {
return NULL;
}
DEBUG ((DEBUG_INFO, "Ptr(C) - 0x%x\n", Ptr));
DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%x\n", Ptr->Length));
DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%x\n", Ptr->Union.ContinuationPointer));
DEBUG ((DEBUG_INFO, "Ptr(C) - 0x%p\n", Ptr));
DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length));
DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", Ptr->Union.ContinuationPointer));
} else {
if (!ValidateCapsuleByMemoryResource (MemoryResource, Ptr->Union.DataBlock, Ptr->Length)) {
return NULL;
@ -403,9 +403,9 @@ ValidateCapsuleIntegrity (
if (!ValidateCapsuleByMemoryResource (MemoryResource, (EFI_PHYSICAL_ADDRESS) (UINTN) Ptr, sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR))) {
return NULL;
}
DEBUG ((DEBUG_INFO, "Ptr(B) - 0x%x\n", Ptr));
DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%x\n", Ptr->Length));
DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%x\n", Ptr->Union.ContinuationPointer));
DEBUG ((DEBUG_INFO, "Ptr(B) - 0x%p\n", Ptr));
DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length));
DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", Ptr->Union.ContinuationPointer));
}
}