actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct handling of demangling.

Browse Source
This commit is contained in:
Steve Checkoway
2003-09-18 10:17:32 +00:00
parent a84febc9e1
commit 0ede96ac63
2 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Darwin/arch_setup.h
+1 -1
View File
@@ -1,5 +1,4 @@
#define DARWIN 1 #define DARWIN 1
#define HAVE_DECL_SIGPWR 0
#define NEED_POWF #define NEED_POWF
#define NEED_SQRTF #define NEED_SQRTF
#define NEED_SINF #define NEED_SINF
@@ -9,3 +8,4 @@
#define BACKTRACE_LOOKUP_METHOD_ATOS #define BACKTRACE_LOOKUP_METHOD_ATOS
#define BACKTRACE_METHOD_POWERPC_DARWIN #define BACKTRACE_METHOD_POWERPC_DARWIN
#define HAVE_VERSION_INFO #define HAVE_VERSION_INFO
#define HAVE_CXA_DEMANGLE
stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+34 -31
View File
@@ -54,6 +54,40 @@ void BacktraceNames::Demangle()
Symbol = f; Symbol = f;
free(f); free(f);
} }
#elif defined(HAVE_CXA_DEMANGLE)
#include <cxxabi.h>
void BacktraceNames::Demangle()
{
/* demangle the name using __cxa_demangle() if needed */
if (Symbol.substr(0, 2) == "_Z")
{
int status = 0;
const char *name = abi::__cxa_demangle(Symbol, 0, 0, &status);
if (name)
Symbol = name;
else
{
switch (status)
{
case 0:
fprintf(stderr, "Something went wrong, it returned success, but failed.\n");
break;
case -1:
fprintf(stderr, "Memory allocation failure.\n");
break;
case -2:
fprintf(stderr, "Invalid mangled name: %s.\n", Symbol.c_str());
break;
case -3:
fprintf(stderr, "Invalid arguments.\n");
break;
default:
fprintf(stderr, "No idea what happened here.");
}
}
}
}
#else #else
void BacktraceNames::Demangle() { } void BacktraceNames::Demangle() { }
#endif #endif
@@ -150,8 +184,6 @@ void BacktraceNames::FromString( CString s )
} }
} }
#elif defined(BACKTRACE_LOOKUP_METHOD_ATOS) #elif defined(BACKTRACE_LOOKUP_METHOD_ATOS)
#include <cxxabi.h>
void BacktraceNames::FromAddr( void *p ) void BacktraceNames::FromAddr( void *p )
{ {
int fds[2]; int fds[2];
@@ -245,35 +277,6 @@ void BacktraceNames::FromAddr( void *p )
if (Symbol[0] == '_') if (Symbol[0] == '_')
Symbol = Symbol.substr(1); Symbol = Symbol.substr(1);
/* demangle the name using __cxa_demangle() if needed */
if (Symbol.substr(0, 2) == "_Z")
{
const char *name;
int status = 0;
name = abi::__cxa_demangle(Symbol, 0, 0, &status);
if (name)
Symbol = name;
else
{
switch (status)
{
case 0:
fprintf(stderr, "Something went wrong, it returned success, but failed.\n");
break;
case -1:
fprintf(stderr, "Memory allocation failure.\n");
break;
case -2:
fprintf(stderr, "Invalid mangled name: %s.\n", Symbol.c_str());
break;
case -3:
fprintf(stderr, "Invalid arguments.\n");
break;
default:
fprintf(stderr, "No idea what happened here.");
}
}
}
/* eg, the full line: /* eg, the full line:
* __Z1Ci (in a.out) (asmtest.cc:33) * __Z1Ci (in a.out) (asmtest.cc:33)
* _main (in a.out) (asmtest.cc:52) * _main (in a.out) (asmtest.cc:52)