summaryrefslogtreecommitdiff
path: root/src/core/arm
diff options
context:
space:
mode:
authorGravatar bunnei2018-05-02 15:24:41 -0400
committerGravatar GitHub2018-05-02 15:24:41 -0400
commit1147db9dd1026672b96ca9d548239cace85ce952 (patch)
treeedfd9282300ba280bf51ba8a99f8a727122a31c0 /src/core/arm
parentMerge pull request #430 from lioncash/vec (diff)
parentgeneral: Make formatting of logged hex values more straightforward (diff)
downloadyuzu-1147db9dd1026672b96ca9d548239cace85ce952.tar.gz
yuzu-1147db9dd1026672b96ca9d548239cace85ce952.tar.xz
yuzu-1147db9dd1026672b96ca9d548239cace85ce952.zip
Merge pull request #431 from lioncash/fmt
general: Make formatting of logged hex values more straightforward
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp2
-rw-r--r--src/core/arm/unicorn/arm_unicorn.cpp2
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:
55 } 55 }
56 56
57 void InterpreterFallback(u64 pc, size_t num_instructions) override { 57 void InterpreterFallback(u64 pc, size_t num_instructions) override {
58 NGLOG_INFO(Core_ARM, "Unicorn fallback @ {:#X} for {} instructions (instr = {:08X})", pc, 58 NGLOG_INFO(Core_ARM, "Unicorn fallback @ 0x{:X} for {} instructions (instr = {:08X})", pc,
59 num_instructions, MemoryReadCode(pc)); 59 num_instructions, MemoryReadCode(pc));
60 60
61 ARM_Interface::ThreadContext ctx; 61 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
53 void* user_data) { 53 void* user_data) {
54 ARM_Interface::ThreadContext ctx{}; 54 ARM_Interface::ThreadContext ctx{};
55 Core::CPU().SaveContext(ctx); 55 Core::CPU().SaveContext(ctx);
56 ASSERT_MSG(false, "Attempted to read from unmapped memory: {:#X}, pc={:#X}, lr={:#X}", addr, 56 ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x{:X}, pc=0x{:X}, lr=0x{:X}", addr,
57 ctx.pc, ctx.cpu_registers[30]); 57 ctx.pc, ctx.cpu_registers[30]);
58 return {}; 58 return {};
59} 59}