diff options
| author | bunnei <bunneidev@gmail.com> | 2018-12-31 11:11:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:11:00 -0500 |
| commit | f96bb2520b9a20a2b40088a3f1be99a6e6e719b9 (patch) | |
| tree | 4e3133eec6e5045321b83f0cc8f89d8e0255a096 /src | |
| parent | 09ffa0cb21fa5421934bfa3f69ba9226a345e193 (diff) | |
| parent | 039e58a984e2c95ffae2160b81b4c08740bb2dd2 (diff) | |
Merge pull request #1966 from lioncash/backtrace
arm_interface: Minor cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/arm_interface.cpp | 13 | ||||
| -rw-r--r-- | src/core/arm/arm_interface.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index bcc812da48..2223cbeed2 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -2,19 +2,20 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "arm_interface.h" #include "common/common_types.h" #include "common/logging/log.h" +#include "core/arm/arm_interface.h" #include "core/memory.h" namespace Core { -void ARM_Interface::LogBacktrace() { +void ARM_Interface::LogBacktrace() const { VAddr fp = GetReg(29); VAddr lr = GetReg(30); - VAddr sp = GetReg(13); - VAddr pc = GetPC(); + const VAddr sp = GetReg(13); + const VAddr pc = GetPC(); + LOG_ERROR(Core_ARM, "Backtrace, sp={:016X}, pc={:016X}", sp, pc); - for (;;) { + while (true) { LOG_ERROR(Core_ARM, "{:016X}", lr); if (!fp) { break; @@ -23,4 +24,4 @@ void ARM_Interface::LogBacktrace() { fp = Memory::Read64(fp); } } -}; // namespace Core +} // namespace Core diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 91d2b0f81c..4dfd41b43a 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -148,7 +148,7 @@ public: /// Frame records are two words long: /// fp+0 : pointer to previous frame record /// fp+8 : value of lr for frame - void LogBacktrace(); + void LogBacktrace() const; }; } // namespace Core |