diff options
| author | Mai <mathew1800@gmail.com> | 2022-07-07 23:49:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 23:49:54 -0400 |
| commit | 313f047f974249c0fa004056ced3f18a8c61eae4 (patch) | |
| tree | 56d70869ae85bd0dce17923259d25e96be3c98a9 /src/core/arm/arm_interface.cpp | |
| parent | 7e75593c20bd0ad3cbb4915ee18bc7a3392f5651 (diff) | |
| parent | 8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8 (diff) | |
Merge pull request #8501 from liamwhite/backtrace-again
core/arm: better support for backtrace generation
Diffstat (limited to 'src/core/arm/arm_interface.cpp')
| -rw-r--r-- | src/core/arm/arm_interface.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index 0efc3732fd..cef79b245a 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -1,6 +1,10 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#ifndef _MSC_VER +#include <cxxabi.h> +#endif + #include <map> #include <optional> #include "common/bit_field.h" @@ -68,8 +72,19 @@ void ARM_Interface::SymbolicateBacktrace(Core::System& system, std::vector<Backt if (symbol_set != symbols.end()) { const auto symbol = Symbols::GetSymbolName(symbol_set->second, entry.offset); if (symbol.has_value()) { +#ifdef _MSC_VER // TODO(DarkLordZach): Add demangling of symbol names. entry.name = *symbol; +#else + int status{-1}; + char* demangled{abi::__cxa_demangle(symbol->c_str(), nullptr, nullptr, &status)}; + if (status == 0 && demangled != nullptr) { + entry.name = demangled; + std::free(demangled); + } else { + entry.name = *symbol; + } +#endif } } } |