diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-05-02 15:14:28 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-05-02 15:49:36 +0200 |
| commit | 7c9644646f595605036b9fe9e51c44716ee60fa3 (patch) | |
| tree | 20f8f60d78ed7db5c76629d452ed196d43dc3e78 /src/core/arm | |
| parent | Merge pull request #429 from Subv/ioctl_corruption (diff) | |
| download | yuzu-7c9644646f595605036b9fe9e51c44716ee60fa3.tar yuzu-7c9644646f595605036b9fe9e51c44716ee60fa3.tar.gz yuzu-7c9644646f595605036b9fe9e51c44716ee60fa3.tar.bz2 yuzu-7c9644646f595605036b9fe9e51c44716ee60fa3.tar.lz yuzu-7c9644646f595605036b9fe9e51c44716ee60fa3.tar.xz yuzu-7c9644646f595605036b9fe9e51c44716ee60fa3.tar.zst yuzu-7c9644646f595605036b9fe9e51c44716ee60fa3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 984ad853d..b5db47667 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -55,7 +55,7 @@ public: } void InterpreterFallback(u64 pc, size_t num_instructions) override { - NGLOG_INFO(Core_ARM, "Unicorn fallback @ {:#X} for {} instructions (instr = {:08X})", pc, + NGLOG_INFO(Core_ARM, "Unicorn fallback @ 0x{:X} for {} instructions (instr = {:08X})", pc, num_instructions, MemoryReadCode(pc)); ARM_Interface::ThreadContext ctx; diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 4b121edb3..574922130 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -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: {:#X}, pc={:#X}, lr={:#X}", addr, + ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x{:X}, pc=0x{:X}, lr=0x{:X}", addr, ctx.pc, ctx.cpu_registers[30]); return {}; } |