nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 12:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

use cxxabi for demangling on linux/windows

Browse source
This commit is contained in:
Michael Scire 2022-03-10 15:24:26 -08:00
parent 6c4960d5a9
commit 22f30e4e51
5 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/config/templates/stratosphere.mk
View file

@ -82,7 +82,7 @@ export LIBS := -lstratosphere -lnx
else ifeq ($(ATMOSPHERE_BOARD),generic_windows) else ifeq ($(ATMOSPHERE_BOARD),generic_windows)
export LIBS := -lstratosphere -lwinmm -lws2_32 -lbcrypt -lbfd -liberty -lintl -lz export LIBS := -lstratosphere -lwinmm -lws2_32 -lbcrypt -lbfd -liberty -lintl -lz
else ifeq ($(ATMOSPHERE_BOARD),generic_linux) else ifeq ($(ATMOSPHERE_BOARD),generic_linux)
export LIBS := -lstratosphere -pthread -lbfd -liberty -ldl export LIBS := -lstratosphere -pthread -lbfd
else ifeq ($(ATMOSPHERE_BOARD),generic_macos) else ifeq ($(ATMOSPHERE_BOARD),generic_macos)
export LIBS := -lstratosphere -pthread export LIBS := -lstratosphere -pthread
else else

4
libraries/libstratosphere/source/diag/diag_assertion_impl.cpp
View file

@ -14,6 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stratosphere.hpp> #include <stratosphere.hpp>
#include "impl/diag_get_all_backtrace.hpp"
#include "impl/diag_invoke_abort.hpp" #include "impl/diag_invoke_abort.hpp"
namespace ams::diag { namespace ams::diag {
@ -179,6 +180,9 @@ namespace ams::diag {
std::scoped_lock lk(g_abort_mutex); std::scoped_lock lk(g_abort_mutex);
/* Set the abort impl return address. */
impl::SetAbortImplReturnAddress(reinterpret_cast<uintptr_t>(__builtin_return_address(0)));
/* Create abort info. */ /* Create abort info. */
std::va_list cvl; std::va_list cvl;
va_copy(cvl, vl); va_copy(cvl, vl);

4
libraries/libstratosphere/source/diag/impl/diag_get_all_backtrace.cpp
View file

@ -23,6 +23,10 @@ namespace ams::diag::impl {
} }
void SetAbortImplReturnAddress(uintptr_t address) {
g_abort_impl_return_address = address;
}
size_t GetAllBacktrace(uintptr_t *out, size_t out_size, ::ams::diag::Backtrace &bt) { size_t GetAllBacktrace(uintptr_t *out, size_t out_size, ::ams::diag::Backtrace &bt) {
size_t count = 0; size_t count = 0;
do { do {

2
libraries/libstratosphere/source/diag/impl/diag_get_all_backtrace.hpp
View file

@ -18,7 +18,7 @@
namespace ams::diag::impl { namespace ams::diag::impl {
void SetAbortImplAddress(uintptr_t address); void SetAbortImplReturnAddress(uintptr_t address);
size_t GetAllBacktrace(uintptr_t *out, size_t out_size, ::ams::diag::Backtrace &bt); size_t GetAllBacktrace(uintptr_t *out, size_t out_size, ::ams::diag::Backtrace &bt);

8
libraries/libstratosphere/source/diag/impl/diag_symbol_impl.os.generic.cpp
View file

@ -35,8 +35,7 @@
extern "C" char __init_array_start; extern "C" char __init_array_start;
#endif #endif
#define HAVE_DECL_BASENAME 1 #include <cxxabi.h>
#include <libiberty/demangle.h>
namespace ams::diag::impl { namespace ams::diag::impl {
@ -219,7 +218,10 @@ namespace ams::diag::impl {
/* Print the symbol. */ /* Print the symbol. */
const char *name = bfd_asymbol_name(*symbol); const char *name = bfd_asymbol_name(*symbol);
if (auto *demangled = bfd_demangle(m_handle, name, DMGL_ANSI | DMGL_PARAMS); demangled != nullptr) {
int cpp_name_status = 0;
if (char *demangled = abi::__cxa_demangle(name, nullptr, 0, std::addressof(cpp_name_status)); cpp_name_status == 0) {
AMS_ASSERT(demangled != nullptr);
util::TSNPrintf(dst, dst_size, "%s", demangled); util::TSNPrintf(dst, dst_size, "%s", demangled);
std::free(demangled); std::free(demangled);
} else { } else {