d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for demangling C++ symbols. This requires linking libproc with

Browse Source 
libc++rt/libsupc++.

Discussed with:	theraven
This commit is contained in:
Rui Paulo 2012-09-06 03:19:48 +00:00
parent 3aa5b33a42
commit cd906041ea
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=240156
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libproc/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$
.include <bsd.own.mk>
LIB= proc
SRCS= proc_bkpt.c \
@ -13,6 +15,14 @@ INCS= libproc.h
CFLAGS+= -I${.CURDIR}
.if ${MK_LIBCPLUSPLUS} != "no"
LDADD+= -lcxxrt
DPADD+= ${LIBCXXRT}
.else
LDADD+= -lsupc++
DPADD+= ${LIBSTDCPLUSPLUS}
.endif
SHLIB_MAJOR= 2
WITHOUT_MAN=

14
lib/libproc/proc_sym.c
View File

@ -46,6 +46,8 @@
#include "_libproc.h"
extern char *__cxa_demangle(const char *, char *, size_t *, int *);
static void proc_rdl2prmap(rd_loadobj_t *, prmap_t *);
static void
@ -266,7 +268,11 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
if (addr >= rsym && addr <= (rsym + sym.st_size)) {
s = elf_strptr(e, dynsymstridx, sym.st_name);
if (s) {
strlcpy(name, s, namesz);
if (strlen(s) > 2 &&
s[0] == '_' && s[1] == 'Z')
__cxa_demangle(s, name, &namesz, NULL);
else
strlcpy(name, s, namesz);
memcpy(symcopy, &sym, sizeof(sym));
/*
* DTrace expects the st_value to contain
@ -302,7 +308,11 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
if (addr >= rsym && addr <= (rsym + sym.st_size)) {
s = elf_strptr(e, symtabstridx, sym.st_name);
if (s) {
strlcpy(name, s, namesz);
if (strlen(s) > 2 &&
s[0] == '_' && s[1] == 'Z')
__cxa_demangle(s, name, &namesz, NULL);
else
strlcpy(name, s, namesz);
memcpy(symcopy, &sym, sizeof(sym));
/*
* DTrace expects the st_value to contain