From 4d2cbf271c259044eddb328af92a0da7ff5849d4 Mon Sep 17 00:00:00 2001 From: Daniel Lim Wee Soong Date: Sat, 9 Jun 2018 16:35:37 +0800 Subject: [PATCH] Fix wrongly replaced arguments --- src/core/file_sys/archive_selfncch.cpp | 5 +++-- src/core/memory.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/file_sys/archive_selfncch.cpp b/src/core/file_sys/archive_selfncch.cpp index 04755f6d6..5feb4e27a 100644 --- a/src/core/file_sys/archive_selfncch.cpp +++ b/src/core/file_sys/archive_selfncch.cpp @@ -241,11 +241,12 @@ void ArchiveFactory_SelfNCCH::Register(Loader::AppLoader& app_loader) { "Could not read program id when registering with SelfNCCH, this might be a 3dsx file"); } - NGLOG_DEBUG(Service_FS, "Registering program {} with the SelfNCCH archive factory", program_id); + NGLOG_DEBUG(Service_FS, "Registering program {:016X} with the SelfNCCH archive factory", + program_id); if (ncch_data.find(program_id) != ncch_data.end()) { NGLOG_WARNING(Service_FS, - "Registering program {} with SelfNCCH will override existing mapping", + "Registering program {:016X} with SelfNCCH will override existing mapping", program_id); } diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 599c513ce..de4eeb71f 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -38,7 +38,7 @@ PageTable* GetCurrentPageTable() { } static void MapPages(PageTable& page_table, u32 base, u32 size, u8* memory, PageType type) { - NGLOG_DEBUG(HW_Memory, "Mapping {} onto {:08X}-{:08X}", memory, base * PAGE_SIZE, + NGLOG_DEBUG(HW_Memory, "Mapping {} onto {:08X}-{:08X}", (void*)memory, base * PAGE_SIZE, (base + size) * PAGE_SIZE); RasterizerFlushVirtualRegion(base << PAGE_BITS, size * PAGE_SIZE,