summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Kelebek12023-01-14 05:12:41 +0000
committerGravatar Kelebek12023-01-14 05:12:41 +0000
commitce0b8d618da77fef0088067d19f5d36a13e74cbc (patch)
tree3f6cdc042723e3ea6c81076579379f21ac100dba /src
parentAdd stacktrace symbol demangling (diff)
downloadyuzu-ce0b8d618da77fef0088067d19f5d36a13e74cbc.tar.gz
yuzu-ce0b8d618da77fef0088067d19f5d36a13e74cbc.tar.xz
yuzu-ce0b8d618da77fef0088067d19f5d36a13e74cbc.zip
Move demangle impl to cpp
Diffstat (limited to 'src')
-rw-r--r--src/common/CMakeLists.txt1
-rw-r--r--src/common/demangle.cpp33
-rw-r--r--src/common/demangle.h25
3 files changed, 36 insertions, 23 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 57eec57b5..bd6ac6716 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -38,6 +38,7 @@ add_library(common STATIC
38 common_precompiled_headers.h 38 common_precompiled_headers.h
39 common_types.h 39 common_types.h
40 concepts.h 40 concepts.h
41 demangle.cpp
41 demangle.h 42 demangle.h
42 div_ceil.h 43 div_ceil.h
43 dynamic_library.cpp 44 dynamic_library.cpp
diff --git a/src/common/demangle.cpp b/src/common/demangle.cpp
new file mode 100644
index 000000000..17abdb85e
--- /dev/null
+++ b/src/common/demangle.cpp
@@ -0,0 +1,33 @@
1// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#include "common/demangle.h"
5
6namespace llvm {
7char* itaniumDemangle(const char* mangled_name, char* buf, size_t* n, int* status);
8}
9
10namespace Common {
11
12std::string DemangleSymbol(const std::string& mangled) {
13 auto is_itanium = [](const std::string& name) -> bool {
14 // A valid Itanium encoding requires 1-4 leading underscores, followed by 'Z'.
15 auto pos = name.find_first_not_of('_');
16 return pos > 0 && pos <= 4 && name[pos] == 'Z';
17 };
18
19 char* demangled = nullptr;
20 if (is_itanium(mangled)) {
21 demangled = llvm::itaniumDemangle(mangled.c_str(), nullptr, nullptr, nullptr);
22 }
23
24 if (!demangled) {
25 return mangled;
26 }
27
28 std::string ret = demangled;
29 std::free(demangled);
30 return ret;
31}
32
33} // namespace Common
diff --git a/src/common/demangle.h b/src/common/demangle.h
index 1c4143629..f072d22f3 100644
--- a/src/common/demangle.h
+++ b/src/common/demangle.h
@@ -5,29 +5,8 @@
5 5
6#include <string> 6#include <string>
7 7
8namespace llvm {
9char* itaniumDemangle(const char* mangled_name, char* buf, size_t* n, int* status);
10}
11
12namespace Common { 8namespace Common {
13std::string DemangleSymbol(const std::string& mangled) {
14 auto is_itanium = [](const std::string& name) -> bool {
15 // A valid Itanium encoding requires 1-4 leading underscores, followed by 'Z'.
16 auto pos = name.find_first_not_of('_');
17 return pos > 0 && pos <= 4 && name[pos] == 'Z';
18 };
19
20 char* demangled = nullptr;
21 if (is_itanium(mangled)) {
22 demangled = llvm::itaniumDemangle(mangled.c_str(), nullptr, nullptr, nullptr);
23 }
24 9
25 if (!demangled) { 10std::string DemangleSymbol(const std::string& mangled);
26 return mangled;
27 }
28 11
29 std::string ret = demangled; 12} // namespace Common
30 std::free(demangled);
31 return ret;
32}
33} // namespace Common \ No newline at end of file