From 0ca4dff62c61570828ec563d6200ca47b3d02569 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 20 Apr 2022 20:17:48 -0400 Subject: core/arm: separate backtrace collection --- src/core/arm/arm_interface.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/core/arm/arm_interface.h') diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index dce2f4195..bcec4b3b8 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -100,6 +100,12 @@ public: */ virtual u64 GetPC() const = 0; + /** + * Get the current Stack Pointer + * @return Returns current SP + */ + virtual u64 GetSP() const = 0; + /** * Get an ARM register * @param index Register index @@ -182,17 +188,13 @@ public: std::string name; }; + static std::vector GetBacktraceFromContext(System& system, + const ThreadContext32& ctx); static std::vector GetBacktraceFromContext(System& system, const ThreadContext64& ctx); - std::vector GetBacktrace() const; + virtual std::vector GetBacktrace() const = 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() const; protected: @@ -200,6 +202,8 @@ protected: System& system; CPUInterrupts& interrupt_handlers; bool uses_wall_clock; + + static void SymbolicateBacktrace(Core::System& system, std::vector& out); }; } // namespace Core -- cgit v1.2.3