[fmt] use {:#X} for format instead of 0x{:X}

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/audio_core/opus/decoder.cpp

@@ -148,7 +148,7 @@ Result OpusDecoder::DecodeInterleavedForMultiStream(u32* out_data_size, u64* out
     auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
     OpusPacketHeader header{ReverseHeader(*header_p)};
 
-    LOG_TRACE(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
+    LOG_TRACE(Service_Audio, "header size {:#X} input data size 0x{:X} in_data size 0x{:X}",
               header.size, input_data.size_bytes(), in_data.size_bytes());
 
     R_UNLESS(in_data.size_bytes() >= header.size &&

src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -88,7 +88,7 @@ public:
     void InterpreterFallback(u32 pc, std::size_t num_instructions) override {
         m_parent.LogBacktrace(m_process);
         LOG_ERROR(Core_ARM,
-                  "Unimplemented instruction @ 0x{:X} for {} instructions (instr = {:08X})", pc,
+                  "Unimplemented instruction @ {:#X} for {} instructions (instr = {:08X})", pc,
                   num_instructions, m_memory.Read32(pc));
     }
 

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -102,7 +102,7 @@ public:
     void InterpreterFallback(u64 pc, std::size_t num_instructions) override {
         m_parent.LogBacktrace(m_process);
         LOG_ERROR(Core_ARM,
-                  "Unimplemented instruction @ 0x{:X} for {} instructions (instr = {:08X})", pc,
+                  "Unimplemented instruction @ {:#X} for {} instructions (instr = {:08X})", pc,
                   num_instructions, m_memory.Read32(pc));
         ReturnException(pc, PrefetchAbort);
     }

src/core/file_sys/program_metadata.cpp

@@ -180,7 +180,7 @@ void ProgramMetadata::Print() const {
     LOG_DEBUG(Service_FS, "Magic:                  {:.4}", npdm_header.magic.data());
     LOG_DEBUG(Service_FS, "Main thread priority:   0x{:02X}", npdm_header.main_thread_priority);
     LOG_DEBUG(Service_FS, "Main thread core:       {}", npdm_header.main_thread_cpu);
-    LOG_DEBUG(Service_FS, "Main thread stack size: 0x{:X} bytes", npdm_header.main_stack_size);
+    LOG_DEBUG(Service_FS, "Main thread stack size: {:#X} bytes", npdm_header.main_stack_size);
     LOG_DEBUG(Service_FS, "Process category:       {}", npdm_header.process_category);
     LOG_DEBUG(Service_FS, "Flags:                  0x{:02X}", npdm_header.flags);
     LOG_DEBUG(Service_FS, " > 64-bit instructions: {}",

src/core/hle/kernel/svc/svc_address_arbiter.cpp

@@ -40,7 +40,7 @@ constexpr bool IsValidArbitrationType(Svc::ArbitrationType type) {
 // Wait for an address (via Address Arbiter)
 Result WaitForAddress(Core::System& system, u64 address, ArbitrationType arb_type, s32 value,
                       s64 timeout_ns) {
-    LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, arb_type=0x{:X}, value=0x{:X}, timeout_ns={}",
+    LOG_TRACE(Kernel_SVC, "called, address={:#X}, arb_type=0x{:X}, value=0x{:X}, timeout_ns={}",
               address, arb_type, value, timeout_ns);
 
     // Validate input.
@@ -71,7 +71,7 @@ Result WaitForAddress(Core::System& system, u64 address, ArbitrationType arb_typ
 // Signals to an address (via Address Arbiter)
 Result SignalToAddress(Core::System& system, u64 address, SignalType signal_type, s32 value,
                        s32 count) {
-    LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, signal_type=0x{:X}, value=0x{:X}, count=0x{:X}",
+    LOG_TRACE(Kernel_SVC, "called, address={:#X}, signal_type=0x{:X}, value=0x{:X}, count=0x{:X}",
               address, signal_type, value, count);
 
     // Validate input.

src/core/hle/kernel/svc/svc_code_memory.cpp

@@ -30,7 +30,7 @@ constexpr bool IsValidUnmapFromOwnerCodeMemoryPermission(MemoryPermission perm)
 } // namespace
 
 Result CreateCodeMemory(Core::System& system, Handle* out, u64 address, uint64_t size) {
-    LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, size=0x{:X}", address, size);
+    LOG_TRACE(Kernel_SVC, "called, address={:#X}, size=0x{:X}", address, size);
 
     // Get kernel instance.
     auto& kernel = system.Kernel();
@@ -70,8 +70,8 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle,
                          MemoryPermission perm) {
 
     LOG_TRACE(Kernel_SVC,
-              "called, code_memory_handle=0x{:X}, operation=0x{:X}, address=0x{:X}, size=0x{:X}, "
-              "permission=0x{:X}",
+              "called, code_memory_handle={:#X}, operation=0x{:X}, address=0x{:X}, size=0x{:X}, "
+              "permission={:#X}",
               code_memory_handle, operation, address, size, perm);
 
     // Validate the address / size.

src/core/hle/kernel/svc/svc_condition_variable.cpp

@@ -45,7 +45,7 @@ Result WaitProcessWideKeyAtomic(Core::System& system, u64 address, u64 cv_key, u
 
 /// Signal process wide key
 void SignalProcessWideKey(Core::System& system, u64 cv_key, s32 count) {
-    LOG_TRACE(Kernel_SVC, "called, cv_key=0x{:X}, count=0x{:08X}", cv_key, count);
+    LOG_TRACE(Kernel_SVC, "called, cv_key={:#X}, count=0x{:08X}", cv_key, count);
 
     // Signal the condition variable.
     return GetCurrentProcess(system.Kernel())

src/core/hle/kernel/svc/svc_info.cpp

@@ -15,7 +15,7 @@ namespace Kernel::Svc {
 /// Gets system/memory information for the current process
 Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle handle,
                u64 info_sub_id) {
-    LOG_TRACE(Kernel_SVC, "called info_id=0x{:X}, info_sub_id=0x{:X}, handle=0x{:08X}",
+    LOG_TRACE(Kernel_SVC, "called info_id={:#X}, info_sub_id=0x{:X}, handle=0x{:08X}",
               info_id_type, info_sub_id, handle);
 
     u32 info_id = static_cast<u32>(info_id_type);

src/core/hle/kernel/svc/svc_lock.cpp

@@ -10,7 +10,7 @@ namespace Kernel::Svc {
 
 /// Attempts to locks a mutex
 Result ArbitrateLock(Core::System& system, Handle thread_handle, u64 address, u32 tag) {
-    LOG_TRACE(Kernel_SVC, "called thread_handle=0x{:08X}, address=0x{:X}, tag=0x{:08X}",
+    LOG_TRACE(Kernel_SVC, "called thread_handle=0x{:08X}, address={:#X}, tag=0x{:08X}",
               thread_handle, address, tag);
 
     // Validate the input address.
@@ -22,7 +22,7 @@ Result ArbitrateLock(Core::System& system, Handle thread_handle, u64 address, u3
 
 /// Unlock a mutex
 Result ArbitrateUnlock(Core::System& system, u64 address) {
-    LOG_TRACE(Kernel_SVC, "called address=0x{:X}", address);
+    LOG_TRACE(Kernel_SVC, "called address={:#X}", address);
 
     // Validate the input address.
     R_UNLESS(!IsKernelAddress(address), ResultInvalidCurrentMemory);

src/core/hle/kernel/svc/svc_memory.cpp

@@ -77,7 +77,7 @@ Result MapUnmapMemorySanityChecks(const KProcessPageTable& manager, u64 dst_addr
 } // namespace
 
 Result SetMemoryPermission(Core::System& system, u64 address, u64 size, MemoryPermission perm) {
-    LOG_DEBUG(Kernel_SVC, "called, address=0x{:016X}, size=0x{:X}, perm=0x{:08X}", address, size,
+    LOG_DEBUG(Kernel_SVC, "called, address=0x{:016X}, size={:#X}, perm=0x{:08X}", address, size,
               perm);
 
     // Validate address / size.
@@ -99,7 +99,7 @@ Result SetMemoryPermission(Core::System& system, u64 address, u64 size, MemoryPe
 
 Result SetMemoryAttribute(Core::System& system, u64 address, u64 size, u32 mask, u32 attr) {
     LOG_DEBUG(Kernel_SVC,
-              "called, address=0x{:016X}, size=0x{:X}, mask=0x{:08X}, attribute=0x{:08X}", address,
+              "called, address=0x{:016X}, size={:#X}, mask=0x{:08X}, attribute=0x{:08X}", address,
               size, mask, attr);
 
     // Validate address / size.
@@ -130,7 +130,7 @@ Result SetMemoryAttribute(Core::System& system, u64 address, u64 size, u32 mask,
 
 /// Maps a memory range into a different range.
 Result MapMemory(Core::System& system, u64 dst_addr, u64 src_addr, u64 size) {
-    LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr,
+    LOG_TRACE(Kernel_SVC, "called, dst_addr={:#X}, src_addr=0x{:X}, size=0x{:X}", dst_addr,
               src_addr, size);
 
     auto& page_table{GetCurrentProcess(system.Kernel()).GetPageTable()};
@@ -145,7 +145,7 @@ Result MapMemory(Core::System& system, u64 dst_addr, u64 src_addr, u64 size) {
 
 /// Unmaps a region that was previously mapped with svcMapMemory
 Result UnmapMemory(Core::System& system, u64 dst_addr, u64 src_addr, u64 size) {
-    LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr,
+    LOG_TRACE(Kernel_SVC, "called, dst_addr={:#X}, src_addr=0x{:X}, size=0x{:X}", dst_addr,
               src_addr, size);
 
     auto& page_table{GetCurrentProcess(system.Kernel()).GetPageTable()};

src/core/hle/kernel/svc/svc_physical_memory.cpp

@@ -9,7 +9,7 @@ namespace Kernel::Svc {
 
 /// Set the process heap to a given Size. It can both extend and shrink the heap.
 Result SetHeapSize(Core::System& system, u64* out_address, u64 size) {
-    LOG_TRACE(Kernel_SVC, "called, heap_size=0x{:X}", size);
+    LOG_TRACE(Kernel_SVC, "called, heap_size={:#X}", size);
 
     // Validate size.
     R_UNLESS(Common::IsAligned(size, HeapSizeAlignment), ResultInvalidSize);
@@ -28,7 +28,7 @@ Result SetHeapSize(Core::System& system, u64* out_address, u64 size) {
 
 /// Maps memory at a desired address
 Result MapPhysicalMemory(Core::System& system, u64 addr, u64 size) {
-    LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size);
+    LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size={:#X}", addr, size);
 
     if (!Common::Is4KBAligned(addr)) {
         LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr);
@@ -36,7 +36,7 @@ Result MapPhysicalMemory(Core::System& system, u64 addr, u64 size) {
     }
 
     if (!Common::Is4KBAligned(size)) {
-        LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size);
+        LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, {:#X}", size);
         R_THROW(ResultInvalidSize);
     }
 
@@ -77,7 +77,7 @@ Result MapPhysicalMemory(Core::System& system, u64 addr, u64 size) {
 
 /// Unmaps memory previously mapped via MapPhysicalMemory
 Result UnmapPhysicalMemory(Core::System& system, u64 addr, u64 size) {
-    LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size);
+    LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size={:#X}", addr, size);
 
     if (!Common::Is4KBAligned(addr)) {
         LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr);
@@ -85,7 +85,7 @@ Result UnmapPhysicalMemory(Core::System& system, u64 addr, u64 size) {
     }
 
     if (!Common::Is4KBAligned(size)) {
-        LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size);
+        LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, {:#X}", size);
         R_THROW(ResultInvalidSize);
     }
 

src/core/hle/kernel/svc/svc_process.cpp

@@ -92,7 +92,7 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, u64 out_proc
 
 Result GetProcessInfo(Core::System& system, s64* out, Handle process_handle,
                       ProcessInfoType info_type) {
-    LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type=0x{:X}", process_handle, info_type);
+    LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type={:#X}", process_handle, info_type);
 
     const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();
     KScopedAutoObject process = handle_table.GetObject<KProcess>(process_handle);

src/core/hle/kernel/svc/svc_process_memory.cpp

@@ -29,7 +29,7 @@ constexpr bool IsValidProcessMemoryPermission(Svc::MemoryPermission perm) {
 Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, u64 address,
                                   u64 size, Svc::MemoryPermission perm) {
     LOG_TRACE(Kernel_SVC,
-              "called, process_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}",
+              "called, process_handle={:#X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}",
               process_handle, address, size, perm);
 
     // Validate the address/size.
@@ -59,7 +59,7 @@ Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, u
 Result MapProcessMemory(Core::System& system, u64 dst_address, Handle process_handle,
                         u64 src_address, u64 size) {
     LOG_TRACE(Kernel_SVC,
-              "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}",
+              "called, dst_address={:#X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}",
               dst_address, process_handle, src_address, size);
 
     // Validate the address/size.
@@ -100,7 +100,7 @@ Result MapProcessMemory(Core::System& system, u64 dst_address, Handle process_ha
 Result UnmapProcessMemory(Core::System& system, u64 dst_address, Handle process_handle,
                           u64 src_address, u64 size) {
     LOG_TRACE(Kernel_SVC,
-              "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}",
+              "called, dst_address={:#X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}",
               dst_address, process_handle, src_address, size);
 
     // Validate the address/size.

src/core/hle/kernel/svc/svc_shared_memory.cpp

@@ -29,7 +29,7 @@ constexpr bool IsValidSharedMemoryPermission(MemoryPermission perm) {
 Result MapSharedMemory(Core::System& system, Handle shmem_handle, u64 address, u64 size,
                        Svc::MemoryPermission map_perm) {
     LOG_TRACE(Kernel_SVC,
-              "called, shared_memory_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}",
+              "called, shared_memory_handle={:#X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}",
               shmem_handle, address, size, map_perm);
 
     // Validate the address/size.

src/core/hle/kernel/svc/svc_synchronization.cpp

@@ -105,7 +105,7 @@ Result WaitSynchronization(Core::System& system, int32_t* out_index, u64 user_ha
 
 /// Resumes a thread waiting on WaitSynchronization
 Result CancelSynchronization(Core::System& system, Handle handle) {
-    LOG_TRACE(Kernel_SVC, "called handle=0x{:X}", handle);
+    LOG_TRACE(Kernel_SVC, "called handle={:#X}", handle);
 
     // Get the thread from its handle.
     KScopedAutoObject thread =

src/core/hle/kernel/svc/svc_thread.cpp

@@ -136,7 +136,7 @@ void SleepThread(Core::System& system, s64 ns) {
 
 /// Gets the thread context
 Result GetThreadContext3(Core::System& system, u64 out_context, Handle thread_handle) {
-    LOG_DEBUG(Kernel_SVC, "called, out_context=0x{:08X}, thread_handle=0x{:X}", out_context,
+    LOG_DEBUG(Kernel_SVC, "called, out_context=0x{:08X}, thread_handle={:#X}", out_context,
               thread_handle);
 
     auto& kernel = system.Kernel();

src/core/hle/service/fatal/fatal.cpp

@@ -68,7 +68,7 @@ static void GenerateErrorReport(Core::System& system, Result error_code, const F
     std::string crash_report = fmt::format(
         "Yuzu {}-{} crash report\n"
         "Title ID:                        {:016x}\n"
-        "Result:                          0x{:X} ({:04}-{:04d})\n"
+        "Result:                          {:#X} ({:04}-{:04d})\n"
         "Set flags:                       0x{:16X}\n"
         "Program entry point:             0x{:16X}\n"
         "\n",
@@ -108,7 +108,7 @@ static void GenerateErrorReport(Core::System& system, Result error_code, const F
 
 static void ThrowFatalError(Core::System& system, Result error_code, FatalType fatal_type,
                             const FatalInfo& info) {
-    LOG_ERROR(Service_Fatal, "Threw fatal error type {} with error code 0x{:X}", fatal_type,
+    LOG_ERROR(Service_Fatal, "Threw fatal error type {} with error code {:#X}", fatal_type,
               error_code.raw);
 
     switch (fatal_type) {

src/core/hle/service/filesystem/fsp/fs_i_file.cpp

@@ -27,7 +27,7 @@ Result IFile::Read(
     FileSys::ReadOption option, Out<s64> out_size, s64 offset,
     const OutBuffer<BufferAttr_HipcMapAlias | BufferAttr_HipcMapTransferAllowsNonSecure> out_buffer,
     s64 size) {
-    LOG_DEBUG(Service_FS, "called, option={}, offset=0x{:X}, length={}", option.value, offset,
+    LOG_DEBUG(Service_FS, "called, option={}, offset={:#X}, length={}", option.value, offset,
               size);
 
     // Read the data from the Storage backend
@@ -38,7 +38,7 @@ Result IFile::Read(
 Result IFile::Write(
     const InBuffer<BufferAttr_HipcMapAlias | BufferAttr_HipcMapTransferAllowsNonSecure> buffer,
     FileSys::WriteOption option, s64 offset, s64 size) {
-    LOG_DEBUG(Service_FS, "called, option={}, offset=0x{:X}, length={}", option.value, offset,
+    LOG_DEBUG(Service_FS, "called, option={}, offset={:#X}, length={}", option.value, offset,
               size);
 
     R_RETURN(backend->Write(offset, buffer.data(), size, option));

src/core/hle/service/filesystem/fsp/fs_i_filesystem.cpp

@@ -38,7 +38,7 @@ IFileSystem::IFileSystem(Core::System& system_, FileSys::VirtualDir dir_, SizeGe
 
 Result IFileSystem::CreateFile(const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path,
                                s32 option, s64 size) {
-    LOG_DEBUG(Service_FS, "called. file={}, option=0x{:X}, size=0x{:08X}", path->str, option, size);
+    LOG_DEBUG(Service_FS, "called. file={}, option={:#X}, size=0x{:08X}", path->str, option, size);
 
     R_RETURN(backend->CreateFile(FileSys::Path(path->str), size));
 }

src/core/hle/service/filesystem/fsp/fs_i_storage.cpp

@@ -23,7 +23,7 @@ IStorage::IStorage(Core::System& system_, FileSys::VirtualFile backend_)
 Result IStorage::Read(
     OutBuffer<BufferAttr_HipcMapAlias | BufferAttr_HipcMapTransferAllowsNonSecure> out_bytes,
     s64 offset, s64 length) {
-    LOG_DEBUG(Service_FS, "called, offset=0x{:X}, length={}", offset, length);
+    LOG_DEBUG(Service_FS, "called, offset={:#X}, length={}", offset, length);
 
     R_UNLESS(length >= 0, FileSys::ResultInvalidSize);
     R_UNLESS(offset >= 0, FileSys::ResultInvalidOffset);

src/core/hle/service/hid/applet_resource.cpp

@@ -27,7 +27,7 @@ Result IAppletResource::GetSharedMemoryHandle(
     OutCopyHandle<Kernel::KSharedMemory> out_shared_memory_handle) {
     const auto result = resource_manager->GetSharedMemoryHandle(out_shared_memory_handle, aruid);
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, result=0x{:X}", aruid, result.raw);
+    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, result={:#X}", aruid, result.raw);
     R_RETURN(result);
 }
 

src/core/hle/service/hid/hid_server.cpp

@@ -200,7 +200,7 @@ Result IHidServer::CreateAppletResource(OutInterface<IAppletResource> out_applet
                                         ClientAppletResourceUserId aruid) {
     const auto result = GetResourceManager()->CreateAppletResource(aruid.pid);
 
-    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, result=0x{:X}", aruid.pid,
+    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, result={:#X}", aruid.pid,
               result.raw);
 
     *out_applet_resource = std::make_shared<IAppletResource>(system, resource_manager, aruid.pid);

src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp

@@ -93,7 +93,7 @@ void nvhost_as_gpu::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {}
 void nvhost_as_gpu::OnClose(DeviceFD fd) {}
 
 NvResult nvhost_as_gpu::AllocAsEx(IoctlAllocAsEx& params) {
-    LOG_DEBUG(Service_NVDRV, "called, big_page_size=0x{:X}", params.big_page_size);
+    LOG_DEBUG(Service_NVDRV, "called, big_page_size={:#X}", params.big_page_size);
 
     std::scoped_lock lock(mutex);
 
@@ -104,12 +104,12 @@ NvResult nvhost_as_gpu::AllocAsEx(IoctlAllocAsEx& params) {
 
     if (params.big_page_size) {
         if (!std::has_single_bit(params.big_page_size)) {
-            LOG_ERROR(Service_NVDRV, "Non power-of-2 big page size: 0x{:X}!", params.big_page_size);
+            LOG_ERROR(Service_NVDRV, "Non power-of-2 big page size: {:#X}!", params.big_page_size);
             return NvResult::BadValue;
         }
 
         if ((params.big_page_size & VM::SUPPORTED_BIG_PAGE_SIZES) == 0) {
-            LOG_ERROR(Service_NVDRV, "Unsupported big page size: 0x{:X}!", params.big_page_size);
+            LOG_ERROR(Service_NVDRV, "Unsupported big page size: {:#X}!", params.big_page_size);
             return NvResult::BadValue;
         }
 
@@ -267,7 +267,7 @@ NvResult nvhost_as_gpu::FreeSpace(IoctlFreeSpace& params) {
 }
 
 NvResult nvhost_as_gpu::Remap(std::span<IoctlRemapEntry> entries) {
-    LOG_DEBUG(Service_NVDRV, "called, num_entries=0x{:X}", entries.size());
+    LOG_DEBUG(Service_NVDRV, "called, num_entries={:#X}", entries.size());
 
     if (!vm.initialised) {
         return NvResult::BadValue;
@@ -315,7 +315,7 @@ NvResult nvhost_as_gpu::Remap(std::span<IoctlRemapEntry> entries) {
 NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {
     LOG_DEBUG(Service_NVDRV,
               "called, flags={:X}, nvmap_handle={:X}, buffer_offset={}, mapping_size={}"
-              ", offset=0x{:X}",
+              ", offset={:#X}",
               params.flags, params.handle, params.buffer_offset, params.mapping_size,
               params.offset);
 
@@ -332,7 +332,7 @@ NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {
 
             if (mapping->size < params.mapping_size) {
                 LOG_WARNING(Service_NVDRV,
-                            "Cannot remap a partially mapped GPU address space region: 0x{:X}",
+                            "Cannot remap a partially mapped GPU address space region: {:#X}",
                             params.offset);
                 return NvResult::BadValue;
             }
@@ -345,7 +345,7 @@ NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {
 
             return NvResult::Success;
         } catch (const std::out_of_range&) {
-            LOG_WARNING(Service_NVDRV, "Cannot remap an unmapped GPU address space region: 0x{:X}",
+            LOG_WARNING(Service_NVDRV, "Cannot remap an unmapped GPU address space region: {:#X}",
                         params.offset);
             return NvResult::BadValue;
         }
@@ -416,7 +416,7 @@ NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {
 
 NvResult nvhost_as_gpu::UnmapBuffer(IoctlUnmapBuffer& params) {
     if (map_buffer_offsets.find(params.offset) != map_buffer_offsets.end()) {
-        LOG_DEBUG(Service_NVDRV, "called, offset=0x{:X}", params.offset);
+        LOG_DEBUG(Service_NVDRV, "called, offset={:#X}", params.offset);
 
         std::scoped_lock lock(mutex);
 

src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp

@@ -205,7 +205,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics3(
 }
 
 NvResult nvhost_ctrl_gpu::GetTPCMasks1(IoctlGpuGetTpcMasksArgs& params) {
-    LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size=0x{:X}", params.mask_buffer_size);
+    LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size={:#X}", params.mask_buffer_size);
     if (params.mask_buffer_size != 0) {
         params.tcp_mask = 3;
     }
@@ -213,7 +213,7 @@ NvResult nvhost_ctrl_gpu::GetTPCMasks1(IoctlGpuGetTpcMasksArgs& params) {
 }
 
 NvResult nvhost_ctrl_gpu::GetTPCMasks3(IoctlGpuGetTpcMasksArgs& params, std::span<u32> tpc_mask) {
-    LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size=0x{:X}", params.mask_buffer_size);
+    LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size={:#X}", params.mask_buffer_size);
     if (params.mask_buffer_size != 0) {
         params.tcp_mask = 3;
     }
@@ -312,7 +312,7 @@ NvResult nvhost_ctrl_gpu::ZBCQueryTable(IoctlZbcQueryTable& params) {
 }
 
 NvResult nvhost_ctrl_gpu::FlushL2(IoctlFlushL2& params) {
-    LOG_DEBUG(Service_NVDRV, "called 0x{:X}", params.flush);
+    LOG_DEBUG(Service_NVDRV, "called {:#X}", params.flush);
     // if ((params.flush & 0x01) != 0) //l2 flush
     //     /* we dont emulate l2 */;
     // if ((params.flush & 0x04) != 0) //fb flush

src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp

@@ -360,20 +360,20 @@ NvResult nvhost_gpu::SubmitGPFIFOBase2(IoctlSubmitGpfifo& params,
 }
 
 NvResult nvhost_gpu::GetWaitbase(IoctlGetWaitbase& params) {
-    LOG_INFO(Service_NVDRV, "called, unknown=0x{:X}", params.unknown);
+    LOG_INFO(Service_NVDRV, "called, unknown={:#X}", params.unknown);
 
     params.value = 0; // Seems to be hard coded at 0
     return NvResult::Success;
 }
 
 NvResult nvhost_gpu::ChannelSetTimeout(IoctlChannelSetTimeout& params) {
-    LOG_INFO(Service_NVDRV, "called, timeout=0x{:X}", params.timeout);
+    LOG_INFO(Service_NVDRV, "called, timeout={:#X}", params.timeout);
 
     return NvResult::Success;
 }
 
 NvResult nvhost_gpu::ChannelSetTimeslice(IoctlSetTimeslice& params) {
-    LOG_INFO(Service_NVDRV, "called, timeslice=0x{:X}", params.timeslice);
+    LOG_INFO(Service_NVDRV, "called, timeslice={:#X}", params.timeslice);
 
     channel_timeslice = params.timeslice;
 

src/core/hle/service/nvdrv/devices/nvmap.cpp

@@ -89,7 +89,7 @@ NvResult nvmap::IocCreate(IocCreateParams& params) {
     }
     handle_description->orig_size = params.size; // Orig size is the unaligned size
     params.handle = handle_description->id;
-    LOG_DEBUG(Service_NVDRV, "handle: {}, size: 0x{:X}", handle_description->id, params.size);
+    LOG_DEBUG(Service_NVDRV, "handle: {}, size: {:#X}", handle_description->id, params.size);
 
     return NvResult::Success;
 }

src/core/hle/service/nvdrv/nvdrv_interface.cpp

@@ -209,7 +209,7 @@ void NVDRV::QueryEvent(HLERequestContext& ctx) {
 void NVDRV::SetAruid(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     pid = rp.Pop<u64>();
-    LOG_WARNING(Service_NVDRV, "(STUBBED) called, pid=0x{:X}", pid);
+    LOG_WARNING(Service_NVDRV, "(STUBBED) called, pid={:#X}", pid);
 
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(ResultSuccess);

src/core/hle/service/psc/time/steady_clock.cpp

@@ -87,7 +87,7 @@ Result SteadyClock::IsRtcResetDetected(Out<bool> out_is_detected) {
 
 Result SteadyClock::GetSetupResultValue(Out<Result> out_result) {
     SCOPE_EXIT {
-        LOG_DEBUG(Service_Time, "called. out_result=0x{:X}", out_result->raw);
+        LOG_DEBUG(Service_Time, "called. out_result={:#X}", out_result->raw);
     };
 
     R_UNLESS(m_can_write_uninitialized_clock || m_clock_core.IsInitialized(),

src/core/hle/service/service.cpp

@@ -27,7 +27,7 @@ namespace Service {
 
     std::string function_string = fmt::format("function '{}': port={}", name, port_name);
     for (int i = 1; i <= num_params; ++i) {
-        function_string += fmt::format(", cmd_buff[{}]=0x{:X}", i, cmd_buff[i]);
+        function_string += fmt::format(", cmd_buff[{}]={:#X}", i, cmd_buff[i]);
     }
     return function_string;
 }
@@ -66,10 +66,10 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(HLERequestContext& ctx,
     std::string function_name = info == nullptr ? "<unknown>" : info->name;
 
     fmt::memory_buffer buf;
-    fmt::format_to(std::back_inserter(buf), "function '{}({})': port='{}' cmd_buf={{[0]=0x{:X}",
+    fmt::format_to(std::back_inserter(buf), "function '{}({})': port='{}' cmd_buf={{[0]={:#X}",
                    ctx.GetCommand(), function_name, service_name, cmd_buf[0]);
     for (int i = 1; i <= 8; ++i) {
-        fmt::format_to(std::back_inserter(buf), ", [{}]=0x{:X}", i, cmd_buf[i]);
+        fmt::format_to(std::back_inserter(buf), ", [{}]={:#X}", i, cmd_buf[i]);
     }
     buf.push_back('}');
 

src/core/loader/kip.cpp

@@ -101,7 +101,7 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process,
     const VAddr base_address = GetInteger(process.GetEntryPoint());
     process.LoadModule(std::move(codeset), base_address);
 
-    LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", kip->GetName(), base_address);
+    LOG_DEBUG(Loader, "loaded module {} @ {:#X}", kip->GetName(), base_address);
 
     is_loaded = true;
     return {ResultStatus::Success,

src/core/loader/nso.cpp

@@ -223,7 +223,7 @@ AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::KProcess& process, Core::S
     }
 
     modules.insert_or_assign(base_address, file->GetName());
-    LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", file->GetName(), base_address);
+    LOG_DEBUG(Loader, "loaded module {} @ {:#X}", file->GetName(), base_address);
 
     is_loaded = true;
     return {ResultStatus::Success, LoadParameters{Kernel::KThread::DefaultThreadPriority,

src/video_core/cdma_pusher.cpp

@@ -90,7 +90,7 @@ void CDmaPusher::ProcessEntries(std::stop_token stop_token) {
                 break;
             }
             default:
-                LOG_ERROR(HW_GPU, "Bad command at index {} (bytes 0x{:X}), buffer size {}", i - 1,
+                LOG_ERROR(HW_GPU, "Bad command at index {} (bytes {:#X}), buffer size {}", i - 1,
                           (i - 1) * sizeof(u32), command_list.size());
                 UNIMPLEMENTED_MSG("ChSubmission mode {} is not implemented!",
                                   static_cast<u32>(mode));
@@ -103,7 +103,7 @@ void CDmaPusher::ProcessEntries(std::stop_token stop_token) {
 void CDmaPusher::ExecuteCommand(u32 method, u32 arg) {
     switch (current_class) {
     case ChClassId::Control:
-        LOG_TRACE(Service_NVDRV, "Class {} method 0x{:X} arg 0x{:X}",
+        LOG_TRACE(Service_NVDRV, "Class {} method {:#X} arg 0x{:X}",
                   static_cast<u32>(current_class), method, arg);
         host_processor->ProcessMethod(static_cast<Host1x::Control::Method>(method), arg);
         break;
@@ -121,7 +121,7 @@ void CDmaPusher::ExecuteCommand(u32 method, u32 arg) {
             break;
         }
         case ThiMethod::SetMethod1:
-            LOG_TRACE(Service_NVDRV, "Class {} method 0x{:X} arg 0x{:X}",
+            LOG_TRACE(Service_NVDRV, "Class {} method {:#X} arg 0x{:X}",
                       static_cast<u32>(current_class), static_cast<u32>(thi_regs.method_0), arg);
             ProcessMethod(thi_regs.method_0, arg);
             break;

src/video_core/host1x/codecs/decoder.cpp

@@ -44,7 +44,7 @@ void Decoder::Decode() {
 
         if (!frame.get()) {
             LOG_ERROR(HW_GPU,
-                      "Nvdec {} failed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id,
+                      "Nvdec {} failed to decode interlaced frame for top {:#X} bottom 0x{:X}", id,
                       luma_top, luma_bottom);
         }
 
@@ -59,7 +59,7 @@ void Decoder::Decode() {
         auto [luma_offset, chroma_offset] = GetProgressiveOffsets();
 
         if (!frame.get()) {
-            LOG_ERROR(HW_GPU, "Nvdec {} failed to decode progressive frame for luma 0x{:X}", id,
+            LOG_ERROR(HW_GPU, "Nvdec {} failed to decode progressive frame for luma {:#X}", id,
                       luma_offset);
         }
 

src/video_core/host1x/control.cpp

@@ -21,7 +21,7 @@ void Control::ProcessMethod(Method method, u32 argument) {
         Execute(argument);
         break;
     default:
-        UNIMPLEMENTED_MSG("Control method 0x{:X}", static_cast<u32>(method));
+        UNIMPLEMENTED_MSG("Control method {:#X}", static_cast<u32>(method));
         break;
     }
 }

src/video_core/host1x/vic.cpp

@@ -105,7 +105,7 @@ Vic::~Vic() {
 }
 
 void Vic::ProcessMethod(u32 method, u32 arg) {
-    LOG_TRACE(HW_GPU, "Vic {} method 0x{:X}", id, static_cast<u32>(method));
+    LOG_TRACE(HW_GPU, "Vic {} method {:#X}", id, static_cast<u32>(method));
     regs.reg_array[method] = arg;
 
     switch (static_cast<Method>(method * sizeof(u32))) {
@@ -142,7 +142,7 @@ void Vic::Execute() {
 
             auto frame = frame_queue.GetFrame(nvdec_id, luma_offset);
             if (!frame.get()) {
-                LOG_ERROR(HW_GPU, "Vic {} failed to get frame with offset 0x{:X}", id, luma_offset);
+                LOG_ERROR(HW_GPU, "Vic {} failed to get frame with offset {:#X}", id, luma_offset);
                 continue;
             }
 
@@ -999,9 +999,9 @@ void Vic::WriteY8__V8U8_N420(const OutputSurfaceConfig& output_surface_config) {
         LOG_TRACE(
             HW_GPU,
             "Writing Y8__V8U8_N420 swizzled frame\n"
-            "\tinput surface {}x{} stride {} size 0x{:X}\n"
-            "\toutput   luma {}x{} stride {} size 0x{:X} block height {} swizzled size 0x{:X}\n",
-            "\toutput chroma {}x{} stride {} size 0x{:X} block height {} swizzled size 0x{:X}",
+            "\tinput surface {}x{} stride {} size {:#X}\n"
+            "\toutput   luma {}x{} stride {} size {:#X} block height {} swizzled size 0x{:X}\n",
+            "\toutput chroma {}x{} stride {} size {:#X} block height {} swizzled size 0x{:X}",
             surface_width, surface_height, surface_stride * BytesPerPixel,
             surface_stride * surface_height * BytesPerPixel, out_luma_width, out_luma_height,
             out_luma_stride, out_luma_size, block_height, out_luma_swizzle_size, out_chroma_width,
@@ -1041,9 +1041,9 @@ void Vic::WriteY8__V8U8_N420(const OutputSurfaceConfig& output_surface_config) {
         LOG_TRACE(
             HW_GPU,
             "Writing Y8__V8U8_N420 swizzled frame\n"
-            "\tinput surface {}x{} stride {} size 0x{:X}\n"
-            "\toutput   luma {}x{} stride {} size 0x{:X} block height {} swizzled size 0x{:X}\n",
-            "\toutput chroma {}x{} stride {} size 0x{:X} block height {} swizzled size 0x{:X}",
+            "\tinput surface {}x{} stride {} size {:#X}\n"
+            "\toutput   luma {}x{} stride {} size {:#X} block height {} swizzled size 0x{:X}\n",
+            "\toutput chroma {}x{} stride {} size {:#X} block height {} swizzled size 0x{:X}",
             surface_width, surface_height, surface_stride * BytesPerPixel,
             surface_stride * surface_height * BytesPerPixel, out_luma_width, out_luma_height,
             out_luma_stride, out_luma_size, out_chroma_width, out_chroma_height, out_chroma_stride,
@@ -1212,8 +1212,8 @@ void Vic::WriteABGR(const OutputSurfaceConfig& output_surface_config) {
         LOG_TRACE(
             HW_GPU,
             "Writing ABGR swizzled frame\n"
-            "\tinput surface {}x{} stride {} size 0x{:X}\n"
-            "\toutput surface {}x{} stride {} size 0x{:X} block height {} swizzled size 0x{:X}",
+            "\tinput surface {}x{} stride {} size {:#X}\n"
+            "\toutput surface {}x{} stride {} size {:#X} block height {} swizzled size 0x{:X}",
             surface_width, surface_height, surface_stride * BytesPerPixel,
             surface_stride * surface_height * BytesPerPixel, out_luma_width, out_luma_height,
             out_luma_stride, out_luma_size, block_height, out_swizzle_size);
@@ -1237,8 +1237,8 @@ void Vic::WriteABGR(const OutputSurfaceConfig& output_surface_config) {
     case BLK_KIND::PITCH: {
         LOG_TRACE(HW_GPU,
                   "Writing ABGR pitch frame\n"
-                  "\tinput surface {}x{} stride {} size 0x{:X}"
-                  "\toutput surface {}x{} stride {} size 0x{:X}",
+                  "\tinput surface {}x{} stride {} size {:#X}"
+                  "\toutput surface {}x{} stride {} size {:#X}",
                   surface_width, surface_height, surface_stride,
                   surface_stride * surface_height * BytesPerPixel, out_luma_width, out_luma_height,
                   out_luma_stride, out_luma_size);

src/video_core/texture_cache/formatter.cpp

@@ -60,25 +60,25 @@ std::string Name(const ImageViewBase& image_view, GPUVAddr addr) {
     const std::string level = num_levels > 1 ? fmt::format(":{}", num_levels) : "";
     switch (image_view.type) {
     case ImageViewType::e1D:
-        return fmt::format("ImageView 1D 0x{:X} {}{}", addr, width, level);
+        return fmt::format("ImageView 1D {:#X} {}{}", addr, width, level);
     case ImageViewType::e2D:
-        return fmt::format("ImageView 2D 0x{:X} {}x{}{}", addr, width, height, level);
+        return fmt::format("ImageView 2D {:#X} {}x{}{}", addr, width, height, level);
     case ImageViewType::Cube:
-        return fmt::format("ImageView Cube 0x{:X} {}x{}{}", addr, width, height, level);
+        return fmt::format("ImageView Cube {:#X} {}x{}{}", addr, width, height, level);
     case ImageViewType::e3D:
-        return fmt::format("ImageView 3D 0x{:X} {}x{}x{}{}", addr, width, height, depth, level);
+        return fmt::format("ImageView 3D {:#X} {}x{}x{}{}", addr, width, height, depth, level);
     case ImageViewType::e1DArray:
-        return fmt::format("ImageView 1DArray 0x{:X} {}{}|{}", addr, width, level, num_layers);
+        return fmt::format("ImageView 1DArray {:#X} {}{}|{}", addr, width, level, num_layers);
     case ImageViewType::e2DArray:
-        return fmt::format("ImageView 2DArray 0x{:X} {}x{}{}|{}", addr, width, height, level,
+        return fmt::format("ImageView 2DArray {:#X} {}x{}{}|{}", addr, width, height, level,
                            num_layers);
     case ImageViewType::CubeArray:
-        return fmt::format("ImageView CubeArray 0x{:X} {}x{}{}|{}", addr, width, height, level,
+        return fmt::format("ImageView CubeArray {:#X} {}x{}{}|{}", addr, width, height, level,
                            num_layers);
     case ImageViewType::Rect:
-        return fmt::format("ImageView Rect 0x{:X} {}x{}{}", addr, width, height, level);
+        return fmt::format("ImageView Rect {:#X} {}x{}{}", addr, width, height, level);
     case ImageViewType::Buffer:
-        return fmt::format("BufferView 0x{:X} {}", addr, width);
+        return fmt::format("BufferView {:#X} {}", addr, width);
     }
     return "Invalid";
 }