summaryrefslogtreecommitdiffstats
path: root/src/core/arm/unicorn
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-04-27 13:54:05 +0200
committerLioncash <mathew1800@gmail.com>2018-04-27 16:04:02 +0200
commit847549663090aeef89debc6213ef17b7f14e0b0e (patch)
tree899731d5c75a7b40a8aa72f5e115f86e10078745 /src/core/arm/unicorn
parentMerge pull request #380 from ogniK5377/service-impl (diff)
downloadyuzu-847549663090aeef89debc6213ef17b7f14e0b0e.tar
yuzu-847549663090aeef89debc6213ef17b7f14e0b0e.tar.gz
yuzu-847549663090aeef89debc6213ef17b7f14e0b0e.tar.bz2
yuzu-847549663090aeef89debc6213ef17b7f14e0b0e.tar.lz
yuzu-847549663090aeef89debc6213ef17b7f14e0b0e.tar.xz
yuzu-847549663090aeef89debc6213ef17b7f14e0b0e.tar.zst
yuzu-847549663090aeef89debc6213ef17b7f14e0b0e.zip
Diffstat (limited to 'src/core/arm/unicorn')
-rw-r--r--src/core/arm/unicorn/arm_unicorn.cpp4
1 files changed, 2 insertions, 2 deletions
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 {};
}