diff --git a/Utilities/stack_trace.cpp b/Utilities/stack_trace.cpp index 5ea4021242..17df59ffc2 100644 --- a/Utilities/stack_trace.cpp +++ b/Utilities/stack_trace.cpp @@ -30,7 +30,7 @@ namespace utils return out.data(); } - std::vector backtrace(int max_depth) + std::vector get_backtrace(int max_depth) { std::vector result = {}; @@ -70,7 +70,7 @@ namespace utils return result; } - std::vector backtrace_symbols(const std::vector& stack) + std::vector get_backtrace_symbols(const std::vector& stack) { std::vector result = {}; std::vector symbol_buf(sizeof(SYMBOL_INFO) + sizeof(TCHAR) * 256); @@ -117,7 +117,7 @@ namespace utils return result; } #else - std::vector backtrace(int max_depth) + std::vector get_backtrace(int max_depth) { std::vector result(max_depth); int depth = backtrace(result.data(), max_depth); @@ -126,7 +126,7 @@ namespace utils return result; } - std::vector backtrace_symbols(const std::vector& stack) + std::vector get_backtrace_symbols(const std::vector& stack) { std::vector result; result.reserve(stack.size()); diff --git a/Utilities/stack_trace.h b/Utilities/stack_trace.h index 3072ea3a88..b1077bcd42 100644 --- a/Utilities/stack_trace.h +++ b/Utilities/stack_trace.h @@ -4,13 +4,13 @@ namespace utils { - std::vector backtrace(int max_depth = 255); - std::vector backtrace_symbols(const std::vector& stack); + std::vector get_backtrace(int max_depth = 255); + std::vector get_backtrace_symbols(const std::vector& stack); FORCE_INLINE void print_trace(logs::channel& logger, int max_depth = 255) { - const auto trace = backtrace(max_depth); - const auto lines = backtrace_symbols(trace); + const auto trace = get_backtrace(max_depth); + const auto lines = get_backtrace_symbols(trace); for (const auto& line : lines) { diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 920caaa832..e65e50c167 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -59,6 +59,7 @@ target_sources(rpcs3_emu PRIVATE ../../Utilities/rXml.cpp ../../Utilities/sema.cpp ../../Utilities/simple_ringbuf.cpp + ../../Utilities/stack_trace.cpp ../../Utilities/StrFmt.cpp ../../Utilities/Thread.cpp ../../Utilities/version.cpp