From 08d5663cb8989f6e57cc28e02c572367685d69fd Mon Sep 17 00:00:00 2001
From: David Marcec <dmarcecguzman@gmail.com>
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<std::size_t>(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<Thread> 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