summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 04:10:51 +0100
committerDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 04:10:51 +0100
commit08d5663cb8989f6e57cc28e02c572367685d69fd (patch)
treeea69bc539f01e2a2b7b99168b4fcb2834027f5ec /src
parentMoved backtrace to ArmInterface (diff)
downloadyuzu-08d5663cb8989f6e57cc28e02c572367685d69fd.tar
yuzu-08d5663cb8989f6e57cc28e02c572367685d69fd.tar.gz
yuzu-08d5663cb8989f6e57cc28e02c572367685d69fd.tar.bz2
yuzu-08d5663cb8989f6e57cc28e02c572367685d69fd.tar.lz
yuzu-08d5663cb8989f6e57cc28e02c572367685d69fd.tar.xz
yuzu-08d5663cb8989f6e57cc28e02c572367685d69fd.tar.zst
yuzu-08d5663cb8989f6e57cc28e02c572367685d69fd.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/arm_interface.h18
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp16
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.h2
-rw-r--r--src/core/arm/unicorn/arm_unicorn.cpp16
-rw-r--r--src/core/arm/unicorn/arm_unicorn.h1
-rw-r--r--src/core/hle/kernel/svc.cpp5
-rw-r--r--src/core/hle/kernel/thread.cpp4
-rw-r--r--src/core/hle/kernel/thread.h5
8 files changed, 20 insertions, 47 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index 26fe68a2e..b0472d55d 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -6,6 +6,8 @@
#include <array>
#include "common/common_types.h"
+#include "common/logging/log.h"
+#include "core/memory.h"
namespace Kernel {
enum class VMAPermission : u8;
@@ -142,7 +144,21 @@ public:
/// Prepare core for thread reschedule (if needed to correctly handle state)
virtual void PrepareReschedule() = 0;
- virtual void LogBacktrace() = 0;
+ void 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/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 47dadba91..4d2491870 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -278,22 +278,6 @@ 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 791653233..512bf8ce9 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.h
+++ b/src/core/arm/dynarmic/arm_dynarmic.h
@@ -53,8 +53,6 @@ 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 c9495124e..c455c81fb 100644
--- a/src/core/arm/unicorn/arm_unicorn.cpp
+++ b/src/core/arm/unicorn/arm_unicorn.cpp
@@ -267,22 +267,6 @@ 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 41da6a73c..75761950b 100644
--- a/src/core/arm/unicorn/arm_unicorn.h
+++ b/src/core/arm/unicorn/arm_unicorn.h
@@ -40,7 +40,6 @@ 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/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;
}