From 266eb0d31872bc487876e809ba75718e47b0bcc8 Mon Sep 17 00:00:00 2001 From: EmulationEnjoyer Date: Tue, 12 Nov 2024 21:38:09 +0000 Subject: [PATCH] arm: Skip duplicate consecutive addresses in backtrace output ref: https://git.citron-emu.org/Citron/Citron/commit/aa56430f2a3179068f77b865d4fd0179aa5cc4c4 --- src/core/arm/arm_interface.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index 5dc7e5d59d..34acec9ebf 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -14,13 +14,22 @@ void ArmInterface::LogBacktrace(Kernel::KProcess* process) const { this->GetContext(ctx); LOG_ERROR(Core_ARM, "Backtrace, sp={:016X}, pc={:016X}", ctx.sp, ctx.pc); - LOG_ERROR(Core_ARM, "{:20}{:20}{:20}{:20}{}", "Module Name", "Address", "Original Address", - "Offset", "Symbol"); + LOG_ERROR(Core_ARM, "{:20}{:20}{:20}{:20}{}", "Module Name", "Address", "Original Address", "Offset", "Symbol"); LOG_ERROR(Core_ARM, ""); + const auto backtrace = GetBacktraceFromContext(process, ctx); + u64 last_address = 0; + for (const auto& entry : backtrace) { + + // Skip duplicate consecutive addresses + if (entry.address == last_address) + continue; + LOG_ERROR(Core_ARM, "{:20}{:016X} {:016X} {:016X} {}", entry.module, entry.address, entry.original_address, entry.offset, entry.name); + + last_address = entry.address; } }