From 847549663090aeef89debc6213ef17b7f14e0b0e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 27 Apr 2018 07:54:05 -0400 Subject: general: Convert assertion macros over to be fmt-compatible --- src/core/hle/kernel/object_address_table.cpp | 4 ++-- src/core/hle/kernel/svc.cpp | 2 +- src/core/hle/kernel/thread.cpp | 4 ++-- src/core/hle/kernel/vm_manager.cpp | 8 ++++---- src/core/hle/service/nvdrv/nvdrv.cpp | 4 ++-- src/core/hle/service/service.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/core/hle') diff --git a/src/core/hle/kernel/object_address_table.cpp b/src/core/hle/kernel/object_address_table.cpp index cd286f85d..b88a90f24 100644 --- a/src/core/hle/kernel/object_address_table.cpp +++ b/src/core/hle/kernel/object_address_table.cpp @@ -10,12 +10,12 @@ namespace Kernel { ObjectAddressTable g_object_address_table; void ObjectAddressTable::Insert(VAddr addr, SharedPtr obj) { - ASSERT_MSG(objects.find(addr) == objects.end(), "Object already exists with addr=0x%lx", addr); + ASSERT_MSG(objects.find(addr) == objects.end(), "Object already exists with addr={:#X}", addr); objects[addr] = obj; } void ObjectAddressTable::Close(VAddr addr) { - ASSERT_MSG(objects.find(addr) != objects.end(), "Object does not exist with addr=0x%lx", addr); + ASSERT_MSG(objects.find(addr) != objects.end(), "Object does not exist with addr={:#X}", addr); objects.erase(addr); } diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index cb19b1a69..4df38c977 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -539,7 +539,7 @@ static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, V processor_id); break; default: - ASSERT_MSG(false, "Unsupported thread processor ID: %d", processor_id); + ASSERT_MSG(false, "Unsupported thread processor ID: {}", processor_id); break; } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 4cd57ab25..63790ea00 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -175,11 +175,11 @@ void Thread::ResumeFromWait() { return; case THREADSTATUS_RUNNING: - DEBUG_ASSERT_MSG(false, "Thread with object id %u has already resumed.", GetObjectId()); + DEBUG_ASSERT_MSG(false, "Thread with object id {} has already resumed.", GetObjectId()); return; case THREADSTATUS_DEAD: // This should never happen, as threads must complete before being stopped. - DEBUG_ASSERT_MSG(false, "Thread with object id %u cannot be resumed because it's DEAD.", + DEBUG_ASSERT_MSG(false, "Thread with object id {} cannot be resumed because it's DEAD.", GetObjectId()); return; } diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index eb2e35eed..7a5231fb7 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -245,8 +245,8 @@ VMManager::VMAIter VMManager::StripIterConstness(const VMAHandle& iter) { } ResultVal VMManager::CarveVMA(VAddr base, u64 size) { - ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: 0x%16" PRIx64, size); - ASSERT_MSG((base & Memory::PAGE_MASK) == 0, "non-page aligned base: 0x%016" PRIx64, base); + ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: {:#018X}", size); + ASSERT_MSG((base & Memory::PAGE_MASK) == 0, "non-page aligned base: {:#018X}", base); VMAIter vma_handle = StripIterConstness(FindVMA(base)); if (vma_handle == vma_map.end()) { @@ -281,8 +281,8 @@ ResultVal VMManager::CarveVMA(VAddr base, u64 size) { } ResultVal VMManager::CarveVMARange(VAddr target, u64 size) { - ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: 0x%16" PRIx64, size); - ASSERT_MSG((target & Memory::PAGE_MASK) == 0, "non-page aligned base: 0x%016" PRIx64, target); + ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: {:#018X}", size); + ASSERT_MSG((target & Memory::PAGE_MASK) == 0, "non-page aligned base: {:#018X}", target); VAddr target_end = target + size; ASSERT(target_end >= target); diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 170420418..a6a4ab7d3 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -39,8 +39,8 @@ Module::Module() { } u32 Module::Open(std::string device_name) { - ASSERT_MSG(devices.find(device_name) != devices.end(), "Trying to open unknown device %s", - device_name.c_str()); + ASSERT_MSG(devices.find(device_name) != devices.end(), "Trying to open unknown device {}", + device_name); auto device = devices[device_name]; u32 fd = next_fd++; diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 34d691b90..94de21ae1 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -154,7 +154,7 @@ ResultCode ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& co break; } default: - UNIMPLEMENTED_MSG("command_type=%d", static_cast(context.GetCommandType())); + UNIMPLEMENTED_MSG("command_type={}", static_cast(context.GetCommandType())); } context.WriteToOutgoingCommandBuffer(*Kernel::GetCurrentThread()); -- cgit v1.2.3