diff options
author | Mai <mathew1800@gmail.com> | 2022-07-08 05:49:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-08 05:49:54 +0200 |
commit | 313f047f974249c0fa004056ced3f18a8c61eae4 (patch) | |
tree | 56d70869ae85bd0dce17923259d25e96be3c98a9 /src/core/arm/dynarmic/arm_dynarmic_32.cpp | |
parent | Merge pull request #8502 from liamwhite/end-wait (diff) | |
parent | core/arm: better support for backtrace generation (diff) | |
download | yuzu-313f047f974249c0fa004056ced3f18a8c61eae4.tar yuzu-313f047f974249c0fa004056ced3f18a8c61eae4.tar.gz yuzu-313f047f974249c0fa004056ced3f18a8c61eae4.tar.bz2 yuzu-313f047f974249c0fa004056ced3f18a8c61eae4.tar.lz yuzu-313f047f974249c0fa004056ced3f18a8c61eae4.tar.xz yuzu-313f047f974249c0fa004056ced3f18a8c61eae4.tar.zst yuzu-313f047f974249c0fa004056ced3f18a8c61eae4.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 10cf72a45..1be5fe1c1 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -427,18 +427,38 @@ void ARM_Dynarmic_32::PageTableChanged(Common::PageTable& page_table, } std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_32::GetBacktrace(Core::System& system, - u64 sp, u64 lr) { - // No way to get accurate stack traces in A32 yet - return {}; + u64 fp, u64 lr, u64 pc) { + std::vector<BacktraceEntry> out; + auto& memory = system.Memory(); + + out.push_back({"", 0, pc, 0, ""}); + + // fp (= r11) points to the last frame record. + // Frame records are two words long: + // fp+0 : pointer to previous frame record + // fp+4 : value of lr for frame + while (true) { + out.push_back({"", 0, lr, 0, ""}); + if (!fp || (fp % 4 != 0) || !memory.IsValidVirtualAddressRange(fp, 8)) { + break; + } + lr = memory.Read32(fp + 4); + fp = memory.Read32(fp); + } + + SymbolicateBacktrace(system, out); + + return out; } std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_32::GetBacktraceFromContext( System& system, const ThreadContext32& ctx) { - return GetBacktrace(system, ctx.cpu_registers[13], ctx.cpu_registers[14]); + const auto& reg = ctx.cpu_registers; + return GetBacktrace(system, reg[11], reg[14], reg[15]); } std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_32::GetBacktrace() const { - return GetBacktrace(system, GetReg(13), GetReg(14)); + return GetBacktrace(system, GetReg(11), GetReg(14), GetReg(15)); } } // namespace Core |