Fix DEBUG print formats so that pointers and 64-bit integer values
display correctly for both 32-bit and 64-bit builds.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Scott Duplichan <scott@notabs.org>
Reviewed-by: Prince Agyeman <prince.agyeman@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17153
6f19259b-4bc3-4df7-8a09-
765794883524
if (EFI_ERROR (Status)) {\r
DEBUG ((\r
EFI_D_ERROR,\r
if (EFI_ERROR (Status)) {\r
DEBUG ((\r
EFI_D_ERROR,\r
- "Failed to add memory space :0x%x 0x%x\n",\r
+ "Failed to add memory space :0x%lx 0x%lx\n",\r
BaseAddress,\r
Length\r
));\r
BaseAddress,\r
Length\r
));\r
//\r
IoOr16 (mPmCtrlReg, BIT0);\r
\r
//\r
IoOr16 (mPmCtrlReg, BIT0);\r
\r
- DEBUG ((EFI_D_ERROR, "Enable SCI bit at 0x%x before boot\n", mPmCtrlReg)); \r
+ DEBUG ((EFI_D_ERROR, "Enable SCI bit at 0x%lx before boot\n", (UINT64)mPmCtrlReg)); \r
// Install Acpi Table\r
//\r
if (pSystemTableInfo->AcpiTableBase != 0 && pSystemTableInfo->AcpiTableSize != 0) { \r
// Install Acpi Table\r
//\r
if (pSystemTableInfo->AcpiTableBase != 0 && pSystemTableInfo->AcpiTableSize != 0) { \r
- DEBUG ((EFI_D_ERROR, "Install Acpi Table at 0x%x, length 0x%x\n", (UINTN)pSystemTableInfo->AcpiTableBase, pSystemTableInfo->AcpiTableSize)); \r
+ DEBUG ((EFI_D_ERROR, "Install Acpi Table at 0x%lx, length 0x%x\n", pSystemTableInfo->AcpiTableBase, pSystemTableInfo->AcpiTableSize)); \r
Status = gBS->InstallConfigurationTable (&gEfiAcpiTableGuid, (VOID *)(UINTN)pSystemTableInfo->AcpiTableBase);\r
ASSERT_EFI_ERROR (Status);\r
}\r
Status = gBS->InstallConfigurationTable (&gEfiAcpiTableGuid, (VOID *)(UINTN)pSystemTableInfo->AcpiTableBase);\r
ASSERT_EFI_ERROR (Status);\r
}\r
// Install Smbios Table\r
//\r
if (pSystemTableInfo->SmbiosTableBase != 0 && pSystemTableInfo->SmbiosTableSize != 0) { \r
// Install Smbios Table\r
//\r
if (pSystemTableInfo->SmbiosTableBase != 0 && pSystemTableInfo->SmbiosTableSize != 0) { \r
- DEBUG ((EFI_D_ERROR, "Install Smbios Table at 0x%x, length 0x%x\n", (UINTN)pSystemTableInfo->SmbiosTableBase, pSystemTableInfo->SmbiosTableSize)); \r
+ DEBUG ((EFI_D_ERROR, "Install Smbios Table at 0x%lx, length 0x%x\n", pSystemTableInfo->SmbiosTableBase, pSystemTableInfo->SmbiosTableSize)); \r
Status = gBS->InstallConfigurationTable (&gEfiSmbiosTableGuid, (VOID *)(UINTN)pSystemTableInfo->SmbiosTableBase);\r
ASSERT_EFI_ERROR (Status);\r
}\r
Status = gBS->InstallConfigurationTable (&gEfiSmbiosTableGuid, (VOID *)(UINTN)pSystemTableInfo->SmbiosTableBase);\r
ASSERT_EFI_ERROR (Status);\r
}\r
pAcpiBoardInfo = (ACPI_BOARD_INFO *)GET_GUID_HOB_DATA (GuidHob); \r
\r
mPmCtrlReg = (UINTN)pAcpiBoardInfo->PmCtrlRegBase;\r
pAcpiBoardInfo = (ACPI_BOARD_INFO *)GET_GUID_HOB_DATA (GuidHob); \r
\r
mPmCtrlReg = (UINTN)pAcpiBoardInfo->PmCtrlRegBase;\r
- DEBUG ((EFI_D_ERROR, "PmCtrlReg at 0x%x\n", mPmCtrlReg)); \r
+ DEBUG ((EFI_D_ERROR, "PmCtrlReg at 0x%lx\n", (UINT64)mPmCtrlReg)); \r
\r
//\r
// Register callback on the ready to boot event \r
\r
//\r
// Register callback on the ready to boot event \r
if (IsFvHeaderValid ((EFI_FIRMWARE_VOLUME_HEADER* )TempPtr)) {\r
if (TempPtr != (UINT8* )(UINTN) PcdGet32 (PcdPayloadFdMemBase)) {\r
// Skip the PEI FV\r
if (IsFvHeaderValid ((EFI_FIRMWARE_VOLUME_HEADER* )TempPtr)) {\r
if (TempPtr != (UINT8* )(UINTN) PcdGet32 (PcdPayloadFdMemBase)) {\r
// Skip the PEI FV\r
- DEBUG((EFI_D_ERROR, "Found one valid fv : 0x%x.\n", TempPtr, ((EFI_FIRMWARE_VOLUME_HEADER* )TempPtr)->FvLength)); \r
+ DEBUG((EFI_D_ERROR, "Found one valid fv : 0x%lx.\n", TempPtr, ((EFI_FIRMWARE_VOLUME_HEADER* )TempPtr)->FvLength)); \r
\r
PeiServicesInstallFvInfoPpi (\r
NULL,\r
\r
PeiServicesInstallFvInfoPpi (\r
NULL,\r
if (EFI_ERROR(Status)) \r
return Status;\r
\r
if (EFI_ERROR(Status)) \r
return Status;\r
\r
- DEBUG((EFI_D_ERROR, "LowMemorySize: 0x%x.\n", LowMemorySize));\r
- DEBUG((EFI_D_ERROR, "HighMemorySize: 0x%x.\n", HighMemorySize));\r
+ DEBUG((EFI_D_ERROR, "LowMemorySize: 0x%lx.\n", LowMemorySize));\r
+ DEBUG((EFI_D_ERROR, "HighMemorySize: 0x%lx.\n", HighMemorySize));\r
\r
ASSERT (LowMemorySize > 0);\r
\r
\r
ASSERT (LowMemorySize > 0);\r
\r
//\r
PeiMemBase = (LowMemorySize - PeiMemSize) & (~(BASE_64KB - 1));\r
\r
//\r
PeiMemBase = (LowMemorySize - PeiMemSize) & (~(BASE_64KB - 1));\r
\r
- DEBUG((EFI_D_ERROR, "PeiMemBase: 0x%x.\n", PeiMemBase));\r
- DEBUG((EFI_D_ERROR, "PeiMemSize: 0x%x.\n", PeiMemSize)); \r
+ DEBUG((EFI_D_ERROR, "PeiMemBase: 0x%lx.\n", PeiMemBase));\r
+ DEBUG((EFI_D_ERROR, "PeiMemSize: 0x%lx.\n", PeiMemSize)); \r
\r
Status = PeiServicesInstallPeiMemory (\r
PeiMemBase, \r
\r
Status = PeiServicesInstallPeiMemory (\r
PeiMemBase, \r
pCbHeader = NULL;\r
if ((CbParseGetCbHeader (1, &pCbHeader) == RETURN_SUCCESS) \r
&& ((UINTN)pCbHeader > BASE_4KB)) {\r
pCbHeader = NULL;\r
if ((CbParseGetCbHeader (1, &pCbHeader) == RETURN_SUCCESS) \r
&& ((UINTN)pCbHeader > BASE_4KB)) {\r
- DEBUG((EFI_D_ERROR, "Actual Coreboot header: 0x%x.\n", (UINTN)pCbHeader)); \r
+ DEBUG((EFI_D_ERROR, "Actual Coreboot header: %p.\n", pCbHeader)); \r
PcdSet32 (PcdCbHeaderPointer, (UINT32)(UINTN)pCbHeader);\r
}\r
\r
PcdSet32 (PcdCbHeaderPointer, (UINT32)(UINTN)pCbHeader);\r
}\r
\r
pSystemTableInfo->AcpiTableSize = AcpiTableSize; \r
pSystemTableInfo->SmbiosTableBase = (UINT64) (UINTN)pSmbiosTable;\r
pSystemTableInfo->SmbiosTableSize = SmbiosTableSize;\r
pSystemTableInfo->AcpiTableSize = AcpiTableSize; \r
pSystemTableInfo->SmbiosTableBase = (UINT64) (UINTN)pSmbiosTable;\r
pSystemTableInfo->SmbiosTableSize = SmbiosTableSize;\r
- DEBUG ((EFI_D_ERROR, "Detected Acpi Table at 0x%x, length 0x%x\n", (UINTN)pSystemTableInfo->AcpiTableBase, pSystemTableInfo->AcpiTableSize)); \r
- DEBUG ((EFI_D_ERROR, "Detected Smbios Table at 0x%x, length 0x%x\n", (UINTN)pSystemTableInfo->SmbiosTableBase, pSystemTableInfo->SmbiosTableSize)); \r
+ DEBUG ((EFI_D_ERROR, "Detected Acpi Table at 0x%lx, length 0x%x\n", pSystemTableInfo->AcpiTableBase, pSystemTableInfo->AcpiTableSize)); \r
+ DEBUG ((EFI_D_ERROR, "Detected Smbios Table at 0x%lx, length 0x%x\n", pSystemTableInfo->SmbiosTableBase, pSystemTableInfo->SmbiosTableSize)); \r
DEBUG ((EFI_D_ERROR, "Create system table info guid hob\n"));\r
\r
//\r
DEBUG ((EFI_D_ERROR, "Create system table info guid hob\n"));\r
\r
//\r
if (pMemTableSize)\r
*pMemTableSize = root->entries[Idx].size;\r
\r
if (pMemTableSize)\r
*pMemTableSize = root->entries[Idx].size;\r
\r
- DEBUG ((EFI_D_ERROR, "Find CbMemTable Id 0x%x, base 0x%x, size 0x%x\n", TableId, *pMemTable, *pMemTableSize));\r
+ DEBUG ((EFI_D_ERROR, "Find CbMemTable Id 0x%x, base %p, size 0x%x\n", TableId, *pMemTable, *pMemTableSize));\r
return RETURN_SUCCESS;\r
}\r
}\r
return RETURN_SUCCESS;\r
}\r
}\r
- DEBUG ((EFI_D_ERROR, "Low memory 0x%x, High Memory 0x%x\n", *pLowMemorySize, *pHighMemorySize));\r
+ DEBUG ((EFI_D_ERROR, "Low memory 0x%lx, High Memory 0x%lx\n", *pLowMemorySize, *pHighMemorySize));\r
\r
return RETURN_SUCCESS; \r
}\r
\r
return RETURN_SUCCESS; \r
}\r
if (!Rsdp)\r
return RETURN_NOT_FOUND;\r
\r
if (!Rsdp)\r
return RETURN_NOT_FOUND;\r
\r
- DEBUG ((EFI_D_ERROR, "Find Rsdp at 0x%x\n", Rsdp));\r
- DEBUG ((EFI_D_ERROR, "Find Rsdt 0x%x, Xsdt 0x%x\n", Rsdp->RsdtAddress, Rsdp->XsdtAddress));\r
+ DEBUG ((EFI_D_ERROR, "Find Rsdp at %p\n", Rsdp));\r
+ DEBUG ((EFI_D_ERROR, "Find Rsdt 0x%x, Xsdt 0x%lx\n", Rsdp->RsdtAddress, Rsdp->XsdtAddress));\r
\r
//\r
// Search Rsdt First\r
\r
//\r
// Search Rsdt First\r
\r
if (pResetReg) \r
*pResetReg = (UINTN)Fadt->ResetReg.Address; \r
\r
if (pResetReg) \r
*pResetReg = (UINTN)Fadt->ResetReg.Address; \r
- DEBUG ((EFI_D_ERROR, "Reset Reg 0x%x\n", Fadt->ResetReg.Address));\r
+ DEBUG ((EFI_D_ERROR, "Reset Reg 0x%lx\n", Fadt->ResetReg.Address));\r
\r
if (pResetValue) \r
*pResetValue = Fadt->ResetValue;\r
\r
if (pResetValue) \r
*pResetValue = Fadt->ResetValue;\r
\r
if (pResetReg) \r
*pResetReg = (UINTN)Fadt->ResetReg.Address; \r
\r
if (pResetReg) \r
*pResetReg = (UINTN)Fadt->ResetReg.Address; \r
- DEBUG ((EFI_D_ERROR, "Reset Reg 0x%x\n", Fadt->ResetReg.Address));\r
+ DEBUG ((EFI_D_ERROR, "Reset Reg 0x%lx\n", Fadt->ResetReg.Address));\r
\r
if (pResetValue) \r
*pResetValue = Fadt->ResetValue;\r
\r
if (pResetValue) \r
*pResetValue = Fadt->ResetValue;\r
return RETURN_NOT_FOUND;\r
\r
DEBUG ((EFI_D_ERROR, "Found coreboot video frame buffer information\n"));\r
return RETURN_NOT_FOUND;\r
\r
DEBUG ((EFI_D_ERROR, "Found coreboot video frame buffer information\n"));\r
- DEBUG ((EFI_D_ERROR, "physical_address: 0x%x\n", CbFbRec->physical_address));\r
+ DEBUG ((EFI_D_ERROR, "physical_address: 0x%lx\n", CbFbRec->physical_address));\r
DEBUG ((EFI_D_ERROR, "x_resolution: 0x%x\n", CbFbRec->x_resolution));\r
DEBUG ((EFI_D_ERROR, "y_resolution: 0x%x\n", CbFbRec->y_resolution));\r
DEBUG ((EFI_D_ERROR, "bits_per_pixel: 0x%x\n", CbFbRec->bits_per_pixel));\r
DEBUG ((EFI_D_ERROR, "x_resolution: 0x%x\n", CbFbRec->x_resolution));\r
DEBUG ((EFI_D_ERROR, "y_resolution: 0x%x\n", CbFbRec->y_resolution));\r
DEBUG ((EFI_D_ERROR, "bits_per_pixel: 0x%x\n", CbFbRec->bits_per_pixel));\r