diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 59da33f306e5fb520588aecf37793d8032662b0e..26fe68a2e3cae7fc934ddfea85604d722aefc76b 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -141,6 +141,8 @@ public: /// Prepare core for thread reschedule (if needed to correctly handle state) virtual void PrepareReschedule() = 0; + + virtual void LogBacktrace() = 0; }; } // namespace Core diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 4d2491870c798340bf99113008a01c6930cbb68b..47dadba91aad625db6ca879fc37ea8e57671ac26 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -278,6 +278,22 @@ void ARM_Dynarmic::PageTableChanged() { current_page_table = Memory::GetCurrentPageTable(); } +void ARM_Dynarmic::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); + } +} + DynarmicExclusiveMonitor::DynarmicExclusiveMonitor(std::size_t core_count) : monitor(core_count) {} DynarmicExclusiveMonitor::~DynarmicExclusiveMonitor() = default; diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index 512bf8ce97f6285eb8549d1da417630fcc666cf1..791653233524622a2d2c79367d167d09b00bcff2 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -53,6 +53,8 @@ public: void ClearInstructionCache() override; void PageTableChanged() override; + void LogBacktrace() override; + private: std::unique_ptr<Dynarmic::A64::Jit> MakeJit() const; diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index ded4dd359c928619a71b6a6fc82f59a6bb7780d6..c9495124efdaeb16a86b82fcf3e407d4b58950ce 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 { @@ -266,6 +267,22 @@ void ARM_Unicorn::ClearExclusiveState() {} void ARM_Unicorn::ClearInstructionCache() {} +void ARM_Unicorn::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); + } +} + void ARM_Unicorn::RecordBreak(GDBStub::BreakpointAddress bkpt) { last_bkpt = bkpt; last_bkpt_hit = true; diff --git a/src/core/arm/unicorn/arm_unicorn.h b/src/core/arm/unicorn/arm_unicorn.h index 75761950b53845e67e14d56f1802d6b1bbaa98f1..41da6a73c12bacbdac2ffd3b9c5c7a1fa88f0633 100644 --- a/src/core/arm/unicorn/arm_unicorn.h +++ b/src/core/arm/unicorn/arm_unicorn.h @@ -40,6 +40,7 @@ public: void ClearInstructionCache() override; void PageTableChanged() override{}; void RecordBreak(GDBStub::BreakpointAddress bkpt); + void LogBacktrace() override; private: uc_engine* uc{}; diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index a044db6e711f1e938cca231e4f28e359769211ef..a276812f08d966ee4d8744120ec802c6f0003603 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -389,20 +389,7 @@ bool Thread::InvokeWakeupCallback(ThreadWakeupReason reason, SharedPtr<Thread> t } void Thread::LogBacktrace() { - auto& system = Core::System::GetInstance(); - VAddr fp = system.ArmInterface(processor_id).GetReg(29); - VAddr lr = system.ArmInterface(processor_id).GetReg(30); - VAddr sp = system.ArmInterface(processor_id).GetReg(13); - VAddr pc = system.ArmInterface(processor_id).GetPC(); - LOG_ERROR(Debug, "Backtrace, sp={:016X}, pc={:016X}", sp, pc); - for (std::size_t i = 0; i < 256; i++) { - LOG_ERROR(Debug, "{:016X}", lr - 4); - if (!fp) { - break; - } - lr = Memory::Read64(fp + 8); - fp = Memory::Read64(fp); - } + Core::System::GetInstance().ArmInterface(processor_id).LogBacktrace(); } ////////////////////////////////////////////////////////////////////////////////////////////////////