Properly print PA & VA addresses

xtldr/arch/amd64/memory.c

@@ -102,8 +102,8 @@ BlBuildPageMap(IN PXTBL_PAGE_MAPPING PageMap)
         if(Mapping->VirtualAddress)
         {
             /* Dump memory mapping */
-            BlDebugPrint(L"   Type=%02lu, PhysicalBase=0x%016lX, VirtualBase=0x%016lX, Pages=%lu\n", Mapping->MemoryType,
+            BlDebugPrint(L"   Type=%02lu, PhysicalBase=%.16p, VirtualBase=%.16p, Pages=%lu\n",
-                         Mapping->PhysicalAddress, Mapping->VirtualAddress, Mapping->NumberOfPages);
+                         Mapping->MemoryType, Mapping->PhysicalAddress, Mapping->VirtualAddress, Mapping->NumberOfPages);
 
             /* Map memory */
             Status = BlMapPage(PageMap, (UINT_PTR)Mapping->VirtualAddress,

xtldr/arch/i686/memory.c

@@ -125,8 +125,8 @@ BlBuildPageMap(IN PXTBL_PAGE_MAPPING PageMap)
         if(Mapping->VirtualAddress)
         {
             /* Dump memory mapping */
-            BlDebugPrint(L"   Type=%02lu, PhysicalBase=0x%016lX, VirtualBase=0x%016lX, Pages=%lu\n", Mapping->MemoryType,
+            BlDebugPrint(L"   Type=%02lu, PhysicalBase=%.8p, VirtualBase=%.8p, Pages=%lu\n",
-                         Mapping->PhysicalAddress, Mapping->VirtualAddress, Mapping->NumberOfPages);
+                         Mapping->MemoryType, Mapping->PhysicalAddress, Mapping->VirtualAddress, Mapping->NumberOfPages);
 
             /* Map memory */
             Status = BlMapPage(PageMap, (UINT_PTR)Mapping->VirtualAddress,

xtldr/modules/xtos_o/xtos.c

@@ -581,7 +581,7 @@ XtpLoadModule(IN PEFI_FILE_HANDLE SystemDir,
     }
 
     /* Print debug message */
-    XtLdrProtocol->Debug.Print(L"Loaded %S at PA: 0x%lX, VA: 0x%lX\n", FileName,
+    XtLdrProtocol->Debug.Print(L"Loaded %S at PA: %p, VA: %p\n", FileName,
                                (*ImageContext)->PhysicalAddress, (*ImageContext)->VirtualAddress);
 
     /* Return success */