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/arm/unicorn/arm_unicorn.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/arm/unicorn') diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index b0cdc2403..4b121edb3 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -30,7 +30,7 @@ LoadDll LoadDll::g_load_dll; #define CHECKED(expr) \ do { \ if (auto _cerr = (expr)) { \ - ASSERT_MSG(false, "Call " #expr " failed with error: %u (%s)\n", _cerr, \ + ASSERT_MSG(false, "Call " #expr " failed with error: {} ({})\n", _cerr, \ uc_strerror(_cerr)); \ } \ } while (0) @@ -53,7 +53,7 @@ static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int si void* user_data) { ARM_Interface::ThreadContext ctx{}; Core::CPU().SaveContext(ctx); - ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x%lx, pc=0x%lx, lr=0x%lx", addr, + ASSERT_MSG(false, "Attempted to read from unmapped memory: {:#X}, pc={:#X}, lr={:#X}", addr, ctx.pc, ctx.cpu_registers[30]); return {}; } -- cgit v1.2.3