From 71493327121038696c887158cb34f94e2f225e0f Mon Sep 17 00:00:00 2001 From: David Marcec Date: Mon, 3 Dec 2018 19:12:09 +1100 Subject: Print backtrace on svcBreak When we get an svcBreak we get a backtrace now --- src/core/hle/kernel/svc.cpp | 2 ++ src/core/hle/kernel/thread.cpp | 17 +++++++++++++++++ src/core/hle/kernel/thread.h | 5 +++++ 3 files changed, 24 insertions(+) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 3339777c1..2273f0bcf 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -625,6 +625,8 @@ static void Break(u32 reason, u64 info1, u64 info2) { "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}", reason, info1, info2); handle_debug_buffer(info1, info2); + GetCurrentThread()->LogBacktrace(); + ASSERT(false); Core::CurrentProcess()->PrepareForTermination(); diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 4ffb76818..a044db6e7 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -388,6 +388,23 @@ bool Thread::InvokeWakeupCallback(ThreadWakeupReason reason, SharedPtr t return wakeup_callback(reason, std::move(thread), std::move(object), index); } +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); + } +} + //////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index d384d50db..469f8a56d 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -240,6 +240,11 @@ public: return status == ThreadStatus::WaitSynchAll; } + /** + * Logs the backtrace for the current thread + */ + void LogBacktrace(); + ThreadContext& GetContext() { return context; } -- cgit v1.2.3 From 5102c912569a29259ec26aa254d4598e81205a17 Mon Sep 17 00:00:00 2001 From: David Marcec Date: Mon, 3 Dec 2018 20:13:48 +1100 Subject: Moved backtrace to ArmInterface Added to both dynarmic and unicorn --- src/core/hle/kernel/thread.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index a044db6e7..a276812f0 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 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(); } //////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 08d5663cb8989f6e57cc28e02c572367685d69fd Mon Sep 17 00:00:00 2001 From: David Marcec Date: Wed, 19 Dec 2018 14:10:51 +1100 Subject: Moved backtrace to ArmInterface --- src/core/hle/kernel/svc.cpp | 5 +++-- src/core/hle/kernel/thread.cpp | 4 ---- src/core/hle/kernel/thread.h | 5 ----- 3 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 2273f0bcf..290670e78 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -625,8 +625,9 @@ static void Break(u32 reason, u64 info1, u64 info2) { "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}", reason, info1, info2); handle_debug_buffer(info1, info2); - GetCurrentThread()->LogBacktrace(); - + Core::System::GetInstance() + .ArmInterface(static_cast(GetCurrentThread()->GetProcessorID())) + .LogBacktrace(); ASSERT(false); Core::CurrentProcess()->PrepareForTermination(); diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index a276812f0..4ffb76818 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -388,10 +388,6 @@ bool Thread::InvokeWakeupCallback(ThreadWakeupReason reason, SharedPtr t return wakeup_callback(reason, std::move(thread), std::move(object), index); } -void Thread::LogBacktrace() { - Core::System::GetInstance().ArmInterface(processor_id).LogBacktrace(); -} - //////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 469f8a56d..d384d50db 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -240,11 +240,6 @@ public: return status == ThreadStatus::WaitSynchAll; } - /** - * Logs the backtrace for the current thread - */ - void LogBacktrace(); - ThreadContext& GetContext() { return context; } -- cgit v1.2.3