diff options
author | bunnei <bunneidev@gmail.com> | 2018-12-30 04:58:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-30 04:58:13 +0100 |
commit | 331c252509aa6c7712d983b388ba3533d3047df1 (patch) | |
tree | bdffbe558bab81adac706ed7ead2e6b91ed5a394 /src/core/arm | |
parent | Merge pull request #1964 from lioncash/time (diff) | |
parent | Moved log backtrace to arm_interface.cpp. Added printing of error code to fatal (diff) | |
download | yuzu-331c252509aa6c7712d983b388ba3533d3047df1.tar yuzu-331c252509aa6c7712d983b388ba3533d3047df1.tar.gz yuzu-331c252509aa6c7712d983b388ba3533d3047df1.tar.bz2 yuzu-331c252509aa6c7712d983b388ba3533d3047df1.tar.lz yuzu-331c252509aa6c7712d983b388ba3533d3047df1.tar.xz yuzu-331c252509aa6c7712d983b388ba3533d3047df1.tar.zst yuzu-331c252509aa6c7712d983b388ba3533d3047df1.zip |
Diffstat (limited to 'src/core/arm')
-rw-r--r-- | src/core/arm/arm_interface.cpp | 26 | ||||
-rw-r--r-- | src/core/arm/arm_interface.h | 8 | ||||
-rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp new file mode 100644 index 000000000..bcc812da4 --- /dev/null +++ b/src/core/arm/arm_interface.cpp @@ -0,0 +1,26 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "arm_interface.h" +#include "common/common_types.h" +#include "common/logging/log.h" +#include "core/memory.h" + +namespace Core { +void ARM_Interface::LogBacktrace() { + VAddr fp = GetReg(29); + VAddr lr = GetReg(30); + VAddr sp = GetReg(13); + VAddr pc = GetPC(); + LOG_ERROR(Core_ARM, "Backtrace, sp={:016X}, pc={:016X}", sp, pc); + for (;;) { + LOG_ERROR(Core_ARM, "{:016X}", lr); + if (!fp) { + break; + } + lr = Memory::Read64(fp + 8) - 4; + fp = Memory::Read64(fp); + } +} +}; // namespace Core diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 59da33f30..91d2b0f81 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -141,6 +141,14 @@ public: /// Prepare core for thread reschedule (if needed to correctly handle state) virtual void PrepareReschedule() = 0; + + /// fp (= r29) points to the last frame record. + /// Note that this is the frame record for the *previous* frame, not the current one. + /// Note we need to subtract 4 from our last read to get the proper address + /// Frame records are two words long: + /// fp+0 : pointer to previous frame record + /// fp+8 : value of lr for frame + void LogBacktrace(); }; } // namespace Core diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index ded4dd359..c455c81fb 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -10,6 +10,7 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hle/kernel/svc.h" +#include "core/memory.h" namespace Core { |