check the usage of %d,%x,%ld,%lx and so on in debug print statement.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7080 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
index ca3e2524db2ea0f79c1b88c17188d27fe98a02f7..7177c33aa7dd23a687441b32ee453ea246d6224e 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
@@ -87,7 +87,7 @@ EhcDumpQtd (
     DEBUG ((EFI_D_INFO, Msg));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Queue TD @ 0x%x, data length %d\n", Qtd, Qtd->DataLen));\r
+  DEBUG ((EFI_D_INFO, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen));\r
 \r
   QtdHw = &Qtd->QtdHw;\r
 \r
@@ -114,7 +114,7 @@ EhcDumpQtd (
   DEBUG ((EFI_D_INFO, "Data Toggle  : %d\n", QtdHw->DataToggle));\r
 \r
   for (Index = 0; Index < 5; Index++) {\r
-    DEBUG ((EFI_D_INFO, "Page[%d]      : 0x%x\n", Index, QtdHw->Page[Index]));\r
+    DEBUG ((EFI_D_INFO, "Page[%d]      : 0x%x\n", (UINT32)Index, QtdHw->Page[Index]));\r
   }\r
 }\r
 \r
@@ -145,8 +145,8 @@ EhcDumpQh (
     DEBUG ((EFI_D_INFO, Msg));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %d, next qh %x\n",\r
-                                Qh, Qh->Interval, Qh->NextQh));\r
+  DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %ld, next qh %p\n",\r
+                                Qh, (UINT64)Qh->Interval, Qh->NextQh));\r
 \r
   QhHw = &Qh->QhHw;\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 522f2d063325ede065fcc19f76293061d4353240..89ec339dd0aa25095a9fa56118a2612fd2936ea3 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -659,7 +659,7 @@ EhcExecTransfer (
   }\r
 \r
   if (!Finished) {\r
-    DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", TimeOut));\r
+    DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", (UINT32)TimeOut));\r
     EhcDumpQh (Urb->Qh, NULL, FALSE);\r
 \r
     Status = EFI_TIMEOUT;\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index c20e94419671b9cf57aa4e4a8be09bfbe5b03abf..deb21dd837337ebe5277220ea895e6b8297f8ead 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -318,7 +318,7 @@ Uhci2GetCapability (
 \r
   Uhc->RootPorts = *PortNumber;\r
 \r
-  DEBUG ((EFI_D_INFO, "Uhci2GetCapability: %d ports\n", Uhc->RootPorts));\r
+  DEBUG ((EFI_D_INFO, "Uhci2GetCapability: %d ports\n", (UINT32)Uhc->RootPorts));\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
index 7c3bfe91ae108ec872b86345860cb47ba6478679..2b53c262a364bdcec737eb1194de0a16762b999d 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
@@ -26,9 +26,9 @@ UhciDumpQh (
   IN UHCI_QH_SW    *QhSw\r
   )\r
 {\r
-  DEBUG ((EFI_D_INFO, "&QhSw @ 0x%x\n", QhSw));\r
-  DEBUG ((EFI_D_INFO, "QhSw.NextQh    - 0x%x\n", QhSw->NextQh));\r
-  DEBUG ((EFI_D_INFO, "QhSw.TDs       - 0x%x\n", QhSw->TDs));\r
+  DEBUG ((EFI_D_INFO, "&QhSw @ 0x%p\n", QhSw));\r
+  DEBUG ((EFI_D_INFO, "QhSw.NextQh    - 0x%p\n", QhSw->NextQh));\r
+  DEBUG ((EFI_D_INFO, "QhSw.TDs       - 0x%p\n", QhSw->TDs));\r
   DEBUG ((EFI_D_INFO, "QhSw.QhHw:\n"));\r
   DEBUG ((EFI_D_INFO, " Horizon  Link - %x\n", QhSw->QhHw.HorizonLink));\r
   DEBUG ((EFI_D_INFO, " Vertical Link - %x\n\n", QhSw->QhHw.VerticalLink));\r
@@ -51,10 +51,10 @@ UhciDumpTds (
   CurTdSw = TdSw;\r
 \r
   while (CurTdSw != NULL) {\r
-    DEBUG ((EFI_D_INFO, "TdSw @ 0x%x\n",           CurTdSw));\r
-    DEBUG ((EFI_D_INFO, "TdSw.NextTd   - 0x%x\n",  CurTdSw->NextTd));\r
+    DEBUG ((EFI_D_INFO, "TdSw @ 0x%p\n",           CurTdSw));\r
+    DEBUG ((EFI_D_INFO, "TdSw.NextTd   - 0x%p\n",  CurTdSw->NextTd));\r
     DEBUG ((EFI_D_INFO, "TdSw.DataLen  - %d\n",    CurTdSw->DataLen));\r
-    DEBUG ((EFI_D_INFO, "TdSw.Data     - 0x%x\n",  CurTdSw->Data));\r
+    DEBUG ((EFI_D_INFO, "TdSw.Data     - 0x%p\n",  CurTdSw->Data));\r
     DEBUG ((EFI_D_INFO, "TdHw:\n"));\r
     DEBUG ((EFI_D_INFO, " NextLink     - 0x%x\n",  CurTdSw->TdHw.NextLink));\r
     DEBUG ((EFI_D_INFO, " ActualLen    - %d\n",    CurTdSw->TdHw.ActualLen));\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
index 7173d721239704f24d15b484d62deb6c4a7dcc86..0ab2af4c4c2db8f90b4f6acebacc6944cb94a0fc 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
@@ -577,7 +577,7 @@ UhciExecuteTransfer (
   }\r
 \r
   if (!Finished) {\r
-    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution not finished for %dms\n", TimeOut));\r
+    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution not finished for %dms\n", (UINT32)TimeOut));\r
     UhciDumpQh (Qh);\r
     UhciDumpTds (Td);\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
index 269dcbf81bc9aa8ce2a91b18eb0f802d06b916d2..0e9ea1e4d329a1f0c8010c7cb4f80e755a8a467f 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
@@ -251,7 +251,7 @@ UsbParseInterfaceDesc (
   NumEp  = Setting->Desc.NumEndpoints;\r
 \r
   DEBUG (( EFI_D_INFO, "UsbParseInterfaceDesc: interface %d(setting %d) has %d endpoints\n",\r
-              Setting->Desc.InterfaceNumber, Setting->Desc.AlternateSetting, NumEp));\r
+              Setting->Desc.InterfaceNumber, Setting->Desc.AlternateSetting, (UINT32)NumEp));\r
 \r
   if (NumEp == 0) {\r
     goto ON_EXIT;\r
@@ -270,7 +270,7 @@ UsbParseInterfaceDesc (
     Ep = UsbCreateDesc (DescBuf + Offset, Len - Offset, USB_DESC_TYPE_ENDPOINT, &Used);\r
 \r
     if (Ep == NULL) {\r
-      DEBUG (( EFI_D_ERROR, "UsbParseInterfaceDesc: failed to create endpoint(index %d)\n", Index));\r
+      DEBUG (( EFI_D_ERROR, "UsbParseInterfaceDesc: failed to create endpoint(index %d)\n", (UINT32)Index));\r
       goto ON_ERROR;\r
     }\r
 \r
@@ -330,7 +330,7 @@ UsbParseConfigDesc (
   }\r
 \r
   DEBUG (( EFI_D_INFO, "UsbParseConfigDesc: config %d has %d interfaces\n",\r
-                Config->Desc.ConfigurationValue, NumIf));\r
+                Config->Desc.ConfigurationValue, (UINT32)NumIf));\r
 \r
   for (Index = 0; Index < NumIf; Index++) {\r
     Interface = AllocateZeroPool (sizeof (USB_INTERFACE_DESC));\r
@@ -721,7 +721,7 @@ UsbGetOneConfig (
 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG (( EFI_D_ERROR, "UsbGetOneConfig: failed to get descript length(%d) %r\n",\r
-                Status, Desc.TotalLength));\r
+                Desc.TotalLength, Status));\r
 \r
     return NULL;\r
   }\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index 3a2b8bc017ba92ba650633ca07ed62c7b029a843..0b96394f2a1dd38ee50d805f4c6452b7501dcef6 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -280,14 +280,14 @@ UsbConnectDriver (
     //\r
     if (UsbBusIsWantedUsbIO (UsbIf->Device->Bus, UsbIf)) {\r
       OldTpl            = UsbGetCurrentTpl ();\r
-      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", OldTpl));\r
+      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", (UINT32)OldTpl));\r
 \r
       gBS->RestoreTPL (TPL_CALLBACK);\r
 \r
       Status            = gBS->ConnectController (UsbIf->Handle, NULL, NULL, TRUE);\r
       UsbIf->IsManaged  = (BOOLEAN)!EFI_ERROR (Status);\r
 \r
-      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", UsbGetCurrentTpl()));\r
+      DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", (UINT32)UsbGetCurrentTpl()));\r
       ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);\r
 \r
       gBS->RaiseTPL (OldTpl);\r
@@ -472,14 +472,14 @@ UsbDisconnectDriver (
     // or disconnect at CALLBACK.\r
     //\r
     OldTpl           = UsbGetCurrentTpl ();\r
-    DEBUG ((EFI_D_INFO, "UsbDisconnectDriver: old TPL is %d\n", OldTpl));\r
+    DEBUG ((EFI_D_INFO, "UsbDisconnectDriver: old TPL is %d\n", (UINT32)OldTpl));\r
 \r
     gBS->RestoreTPL (TPL_CALLBACK);\r
 \r
     gBS->DisconnectController (UsbIf->Handle, NULL, NULL);\r
     UsbIf->IsManaged = FALSE;\r
 \r
-    DEBUG (( EFI_D_INFO, "UsbDisconnectDriver: TPL after disconnect is %d\n", UsbGetCurrentTpl()));\r
+    DEBUG (( EFI_D_INFO, "UsbDisconnectDriver: TPL after disconnect is %d\n", (UINT32)UsbGetCurrentTpl()));\r
     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);\r
 \r
     gBS->RaiseTPL (OldTpl);\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index 24653f06257b77f594c600e07b240ab4622849c3..eb41de5ecfe53ac5f995de5879881243033f2781 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -1330,10 +1330,10 @@ UsbBusRecursivelyConnectWantedUsbIo (
         //\r
         // Recursively connect the wanted Usb Io handle\r
         //\r
-        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", UsbGetCurrentTpl ()));\r
+        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL before connect is %d\n", (UINT32)UsbGetCurrentTpl ()));\r
         Status            = gBS->ConnectController (UsbIf->Handle, NULL, NULL, TRUE);\r
         UsbIf->IsManaged  = (BOOLEAN)!EFI_ERROR (Status);\r
-        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", UsbGetCurrentTpl()));\r
+        DEBUG ((EFI_D_INFO, "UsbConnectDriver: TPL after connect is %d\n", (UINT32)UsbGetCurrentTpl()));\r
       }\r
     }\r
   }\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 2e6be9c418e3fd962590cd36d2a63992e3909903..589087accd9ed73141f1c54c4741ba4fa05f3740 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -690,7 +690,7 @@ ON_ERROR:
       (Media->LastBlock != OldMedia.LastBlock)) {\r
 \r
     OldTpl = UsbGetCurrentTpl ();\r
-    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL before reinstall BlockIoProtocol is %d\n", OldTpl));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL before reinstall BlockIoProtocol is %d\n", (UINT32)OldTpl));\r
 \r
     gBS->RestoreTPL (TPL_CALLBACK);\r
 \r
@@ -701,7 +701,7 @@ ON_ERROR:
            &UsbMass->BlockIo\r
            );\r
 \r
-    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL after reinstall is %d\n", UsbGetCurrentTpl()));\r
+    DEBUG ((EFI_D_ERROR, "UsbBootDetectMedia: TPL after reinstall is %d\n", (UINT32)UsbGetCurrentTpl()));\r
     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);\r
 \r
     gBS->RaiseTPL (OldTpl);\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index f5bd0fc8374eb74dab159186014c37e05da8bf59..724246d9f1d9c79e7aaac57febbdc8a00e66af17 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
@@ -961,7 +961,7 @@ USBMassDriverBindingStop (
                     );\r
     if (EFI_ERROR (Status)) {\r
       AllChildrenStopped = FALSE;\r
-      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when opening blockio\n", Index));\r
+      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when opening blockio\n", (UINT32)Index));\r
       continue;\r
     }\r
 \r
@@ -988,7 +988,7 @@ USBMassDriverBindingStop (
       // Fail to uninstall blockio and devicepath protocol, so re-open usbio by child.\r
       //\r
       AllChildrenStopped = FALSE;\r
-      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when uninstalling blockio and devicepath\n", Index));\r
+      DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when uninstalling blockio and devicepath\n", (UINT32)Index));\r
       \r
       gBS->OpenProtocol (\r
              Controller,\r
@@ -1013,7 +1013,7 @@ USBMassDriverBindingStop (
     return EFI_DEVICE_ERROR;\r
   }\r
   \r
-  DEBUG ((EFI_D_INFO, "Success to stop all %d multi-lun children handles\n", NumberOfChildren));\r
+  DEBUG ((EFI_D_INFO, "Success to stop all %d multi-lun children handles\n", (UINT32)NumberOfChildren));\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 820e6cca0c2505f512a469c392c435507b3a4c3a..36893d9650ad38119ed7fa07aa66c619430503a0 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1202,7 +1202,7 @@ CoreStartImage (
   DEBUG_CODE_BEGIN ();\r
     if (Image->ExitDataSize != 0 || Image->ExitData != NULL) {\r
 \r
-      DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %p", Image->ExitDataSize, Image->ExitData));\r
+      DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %p", (UINT32)Image->ExitDataSize, Image->ExitData));\r
       if (Image->ExitData != NULL) {\r
         DEBUG ((DEBUG_LOAD, " (%hs)", Image->ExitData));\r
       }\r

diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index fa54e7f0e63f9b6e7b37e6a75bfe42d87feaf83b..1f9e659753af2ceec5ff7ecf0bfc6321154338a9 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -1363,7 +1363,7 @@ CoreAllocatePoolPages (
   // Convert it to boot services data\r
   //\r
   if (Start == 0) {\r
-    DEBUG ((DEBUG_ERROR | DEBUG_PAGE, "AllocatePoolPages: failed to allocate %d pages\n", NumberOfPages));\r
+    DEBUG ((DEBUG_ERROR | DEBUG_PAGE, "AllocatePoolPages: failed to allocate %d pages\n", (UINT32)NumberOfPages));\r
   } else {\r
     CoreConvertPages (Start, NumberOfPages, PoolType);\r
   }\r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 934533ec5424777e2588bc08a6282f5dd1c64f13..91f627dd4ecf2832d4f7ac7b406fc5e963340814 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -447,7 +447,7 @@ PeiDispatcher (
                      && (*StackPointer == INIT_CAR_VALUE);\r
                      StackPointer ++);\r
                      \r
-                DEBUG ((EFI_D_INFO, "Total Cache as RAM:    %d bytes.\n", SecCoreData->TemporaryRamSize));\r
+                DEBUG ((EFI_D_INFO, "Total Cache as RAM:    %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize));\r
                 DEBUG ((EFI_D_INFO, "  CAR stack ever used: %d bytes.\n",\r
                        (SecCoreData->StackSize - ((UINTN) StackPointer - (UINTN)SecCoreData->StackBase))\r
                       ));\r
@@ -497,7 +497,7 @@ PeiDispatcher (
               StackOffset            = (UINTN) NewPermenentMemoryBase - (UINTN) SecCoreData->StackBase;\r
               HeapOffset             = (INTN) ((UINTN) Private->PhysicalMemoryBegin + Private->StackSize - \\r
                                                (UINTN) SecCoreData->PeiTemporaryRamBase);\r
-              DEBUG ((EFI_D_INFO, "Heap Offset = 0x%X Stack Offset = 0x%X\n", HeapOffset, StackOffset));\r
+              DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (INT64)HeapOffset, (INT64)StackOffset));\r
               \r
               //\r
               // Caculate new HandOffTable and PrivateData address in permenet memory's stack\r
@@ -577,8 +577,8 @@ PeiDispatcher (
                                   HeapOffset\r
                                   );\r
 \r
-              DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%X Length=0x%X\n",\r
-                                  (UINTN)PrivateInMem->StackBase,\r
+              DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%lX Length=0x%lX\n",\r
+                                  PrivateInMem->StackBase,\r
                                   PrivateInMem->StackSize));\r
               BuildStackHob (PrivateInMem->StackBase, PrivateInMem->StackSize);\r
 \r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index f4d426cf53296086d599c23012bc83e82140b3fd..7cb2b8d264ad5eb57cd5d18a32f54e79e17ce4b4 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -357,7 +357,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
     //\r
     PrivateData->AllFv[PrivateData->AllFvCount++] = (EFI_PEI_FV_HANDLE)Fv->FvInfo;\r
     \r
-    DEBUG ((EFI_D_INFO, "The %dth FvImage start address is 0x%11p and size is 0x%08x\n", PrivateData->AllFvCount, (VOID *) Fv->FvInfo, Fv->FvInfoSize));\r
+    DEBUG ((EFI_D_INFO, "The %dth FvImage start address is 0x%11p and size is 0x%08x\n", (UINT32)PrivateData->AllFvCount, (VOID *) Fv->FvInfo, Fv->FvInfoSize));\r
     //\r
     // Preprocess all FV type files in this new FileSystem2 Fv image\r
     //\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c
index 1e1c89d5de9a62c150302e550f8e904da490e85d..e23a6759ebc59e18a043eb2bc79aee980db4b849 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c
@@ -107,10 +107,10 @@ CommonHandler (
       DEBUG ((EFI_D_INFO, "ERROR: Re-entered debugger!\n"\r
                                     "       ExceptionType == %X\n"\r
                                     "       Context       == %X\n"\r
-                                    "       Context.SystemContextIpf->CrIip  == %X\n"\r
-                                    "       Context.SystemContextIpf->CrIpsr == %X\n"\r
+                                    "       Context.SystemContextIpf->CrIip  == %LX\n"\r
+                                    "       Context.SystemContextIpf->CrIpsr == %LX\n"\r
                                     "       mInHandler     == %X\n",\r
-                                    ExceptionType, \r
+                                    (INT32)ExceptionType, \r
                                     Context, \r
                                     Context.SystemContextIpf->CrIip,\r
                                     Context.SystemContextIpf->CrIpsr,\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index cdace18f481a1aad3b960266b397cd27cc65765a..8cb78abfc1ab64132f5731a963621c5fcc11dba7 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -202,7 +202,7 @@ PartitionInstallGptChildHandles (
   LastBlock     = BlockIo->Media->LastBlock;\r
 \r
   DEBUG ((EFI_D_INFO, " BlockSize : %d \n", BlockSize));\r
-  DEBUG ((EFI_D_INFO, " LastBlock : %x \n", LastBlock));\r
+  DEBUG ((EFI_D_INFO, " LastBlock : %lx \n", LastBlock));\r
 \r
   GptValidStatus = EFI_NOT_FOUND;\r
 \r