diff options
author | Liam <byteslice@airmail.cc> | 2022-06-25 18:54:24 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2022-06-25 18:54:24 +0200 |
commit | 8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8 (patch) | |
tree | 9e2be93615a1af7d43c7080e4073ff3032393d34 /src/core/arm/arm_interface.cpp | |
parent | Merge pull request #8491 from Morph1984/extra-assert (diff) | |
download | yuzu-8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8.tar yuzu-8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8.tar.gz yuzu-8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8.tar.bz2 yuzu-8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8.tar.lz yuzu-8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8.tar.xz yuzu-8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8.tar.zst yuzu-8f8c0b69dc4d56a0bc29bf8a0e59921334a808a8.zip |
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 6425e131f..6c9c9d96d 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 } } } |