diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-27 17:09:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 17:09:56 +0200 |
| commit | acede1f1d3309e629b1ddc55ad22f920fe50f681 (patch) | |
| tree | 899731d5c75a7b40a8aa72f5e115f86e10078745 /src/core/arm/unicorn | |
| parent | Merge pull request #380 from ogniK5377/service-impl (diff) | |
| parent | general: Convert assertion macros over to be fmt-compatible (diff) | |
| download | yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.gz yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.bz2 yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.lz yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.xz yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.zst yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.zip | |
Diffstat (limited to 'src/core/arm/unicorn')
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 4 |
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 {}; } |