Author: obrien
Date: Sat May 7 01:05:31 2011
New Revision: 221569
URL: http://svn.freebsd.org/changeset/base/221569
Log:
Add the ability to search for all the inlined instances of a given function.
Reviewed by: jb
Obtained from: Juniper Networks
Added:
head/lib/libdwarf/dwarf_func.c (contents, props changed)
Modified:
head/lib/libdwarf/Makefile
head/lib/libdwarf/_libdwarf.h
head/lib/libdwarf/dwarf_init.c
head/lib/libdwarf/libdwarf.h
head/lib/libelf/Makefile
head/lib/libelf/libelf_data.c
head/sys/sys/elf_common.h
Modified: head/lib/libdwarf/Makefile
==============================================================================
--- head/lib/libdwarf/Makefile Sat May 7 00:25:12 2011 (r221568)
+++ head/lib/libdwarf/Makefile Sat May 7 01:05:31 2011 (r221569)
@@ -14,6 +14,7 @@ SRCS= \
dwarf_errno.c \
dwarf_finish.c \
dwarf_form.c \
+ dwarf_func.c \
dwarf_init.c \
dwarf_loc.c
Modified: head/lib/libdwarf/_libdwarf.h
==============================================================================
--- head/lib/libdwarf/_libdwarf.h Sat May 7 00:25:12 2011
(r221568)
+++ head/lib/libdwarf/_libdwarf.h Sat May 7 01:05:31 2011
(r221569)
@@ -163,6 +163,37 @@ struct _Dwarf_Debug {
dbg_cu; /* List of compilation units. */
Dwarf_CU dbg_cu_current;
/* Ptr to the current compilation unit.
*/
+
+ STAILQ_HEAD(, _Dwarf_Func) dbg_func; /* List of functions */
+};
+
+struct _Dwarf_Func {
+ Dwarf_Die func_die;
+ const char *func_name;
+ Dwarf_Addr func_low_pc;
+ Dwarf_Addr func_high_pc;
+ int func_is_inlined;
+ /* inlined instance */
+ STAILQ_HEAD(, _Dwarf_Inlined_Func) func_inlined_instances;
+ STAILQ_ENTRY(_Dwarf_Func) func_next;
};
+struct _Dwarf_Inlined_Func {
+ struct _Dwarf_Func *ifunc_origin;
+ Dwarf_Die ifunc_abstract;
+ Dwarf_Die ifunc_concrete;
+ Dwarf_Addr ifunc_low_pc;
+ Dwarf_Addr ifunc_high_pc;
+ STAILQ_ENTRY(_Dwarf_Inlined_Func) ifunc_next;
+};
+
+void dwarf_build_function_table(Dwarf_Debug dbg);
+
+#ifdef DWARF_DEBUG
+#include <assert.h>
+#define DWARF_ASSERT(x) assert(x)
+#else
+#define DWARF_ASSERT(x)
+#endif
+
#endif /* !__LIBDWARF_H_ */
Added: head/lib/libdwarf/dwarf_func.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libdwarf/dwarf_func.c Sat May 7 01:05:31 2011
(r221569)
@@ -0,0 +1,227 @@
+/*-
+ * Copyright (c) 2008-2009, 2011, Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * JNPR: dwarf_func.c 336441 2009-10-17 09:19:54Z deo
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stdlib.h>
+#include <string.h>
+#include <libdwarf.h>
+#include <_libdwarf.h>
+
+static void
+dwarf_add_function(Dwarf_Debug dbg, Dwarf_Func func)
+{
+
+ STAILQ_INSERT_TAIL(&dbg->dbg_func, func, func_next);
+}
+
+int
+dwarf_function_get_addr_range(Dwarf_Func f, Dwarf_Addr *low_pc,
+ Dwarf_Addr *high_pc)
+{
+
+ *low_pc = f->func_low_pc;
+ *high_pc = f->func_high_pc;
+ return 0;
+}
+
+int
+dwarf_inlined_function_get_addr_range(Dwarf_Inlined_Func f, Dwarf_Addr *low_pc,
+ Dwarf_Addr *high_pc)
+{
+
+ *low_pc = f->ifunc_low_pc;
+ *high_pc = f->ifunc_high_pc;
+ return 0;
+}
+
+int
+dwarf_function_is_inlined(Dwarf_Func f)
+{
+
+ if (f->func_is_inlined == DW_INL_inlined ||
+ f->func_is_inlined == DW_INL_declared_inlined)
+ return 1;
+ else
+ return 0;
+}
+
+Dwarf_Func
+dwarf_find_function_by_name(Dwarf_Debug dbg, const char *name)
+{
+ /* XXX: replace with a fast version */
+
+ Dwarf_Func func;
+ STAILQ_FOREACH(func, &dbg->dbg_func, func_next) {
+ if (strcmp(name, func->func_name) == 0)
+ return func;
+ }
+ return NULL;
+}
+
+Dwarf_Func
+dwarf_find_function_by_offset(Dwarf_Debug dbg, Dwarf_Off off)
+{
+
+ Dwarf_Func func;
+ Dwarf_Die die;
+ /* printf("look for %llx\n", off); */
+ STAILQ_FOREACH(func, &dbg->dbg_func, func_next) {
+ die = func->func_die;
+ if ((off_t)die->die_offset == off) {
+ return func;
+ }
+ }
+ return NULL;
+}
+
+void
+dwarf_build_function_table(Dwarf_Debug dbg)
+{
+ Dwarf_CU cu;
+ Dwarf_AttrValue av;
+ Dwarf_Die die, origin_die;
+ Dwarf_Func func, origin_func;
+ Dwarf_Inlined_Func ifunc;
+ unsigned long long offset;
+ const char *name;
+ Dwarf_Error error;
+
+ /*
+ * find out all the functions
+ */
+ STAILQ_FOREACH(cu, &dbg->dbg_cu, cu_next) {
+ STAILQ_FOREACH(die, &cu->cu_die, die_next) {
+ if (die->die_a->a_tag == DW_TAG_subprogram) {
+ /*
+ * Some function has multiple entries, i.e.
+ * if a function is inlined, it has many
+ * abstract/concrete instances, the abstract
+ * instances are with DW_TAG_subprogram.
+ */
+ dwarf_attrval_string(die, DW_AT_name, &name,
+ &error);
+ func = dwarf_find_function_by_name(dbg, name);
+ if (func == NULL) {
+ func = malloc(
+ sizeof(struct _Dwarf_Func));
+ DWARF_ASSERT(func);
+
+ func->func_die = die;
+ func->func_name = name;
+ STAILQ_INIT(
+ &func->func_inlined_instances);
+
+ dwarf_add_function(dbg, func);
+ STAILQ_FOREACH(av, &die->die_attrval,
+ av_next) {
+ switch (av->av_attrib) {
+ case DW_AT_low_pc:
+ func->func_low_pc =
+ av->u[0].u64;
+ break;
+ case DW_AT_high_pc:
+ func->func_high_pc =
+ av->u[0].u64;
+ break;
+ case DW_AT_inline:
+ func->func_is_inlined =
+ av->u[0].u64;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*
+ * Now check the concrete inlined instances.
+ */
+ STAILQ_FOREACH(cu, &dbg->dbg_cu, cu_next) {
+ STAILQ_FOREACH(die, &cu->cu_die, die_next) {
+ if (die->die_a->a_tag == DW_TAG_inlined_subroutine) {
+ ifunc = malloc(
+ sizeof(struct _Dwarf_Inlined_Func));
+ DWARF_ASSERT(ifunc);
+ STAILQ_FOREACH(av, &die->die_attrval, av_next) {
+ switch (av->av_attrib) {
+ case DW_AT_abstract_origin:
+ offset = av->u[0].u64 +
+ die->die_cu->cu_offset;
+ origin_die = dwarf_die_find(
+ die, offset);
+ DWARF_ASSERT(origin_die != 0);
+
+ /*
+ * the abstract origin must
+ * have been merged with
+ * another die
+ */
+ dwarf_attrval_string(
+ origin_die, DW_AT_name,
+ &name, &error);
+ origin_func =
+ dwarf_find_function_by_name
+ (dbg, name);
+ DWARF_ASSERT(origin_func != 0);
+
+ STAILQ_INSERT_TAIL(
+ &origin_func->
+ func_inlined_instances,
+ ifunc, ifunc_next);
+
+ break;
+ case DW_AT_low_pc:
+ ifunc->ifunc_low_pc =
+ av->u[0].u64;
+ break;
+ case DW_AT_high_pc:
+ ifunc->ifunc_high_pc =
+ av->u[0].u64;
+ break;
+ }
+ }
+ }
+ }
+ }
+}
+
+void
+dwarf_function_iterate_inlined_instance(Dwarf_Func func,
+ Dwarf_Inlined_Callback f, void *data)
+{
+ Dwarf_Inlined_Func ifunc;
+
+ if (!dwarf_function_is_inlined(func))
+ return;
+ STAILQ_FOREACH(ifunc, &func->func_inlined_instances, ifunc_next) {
+ f(ifunc, data);
+ }
+}
Modified: head/lib/libdwarf/dwarf_init.c
==============================================================================
--- head/lib/libdwarf/dwarf_init.c Sat May 7 00:25:12 2011
(r221568)
+++ head/lib/libdwarf/dwarf_init.c Sat May 7 01:05:31 2011
(r221569)
@@ -578,6 +578,9 @@ dwarf_init_info(Dwarf_Debug dbg, Dwarf_E
offset = next_offset;
}
+ /* Build the function table. */
+ dwarf_build_function_table(dbg);
+
return ret;
}
@@ -686,6 +689,7 @@ dwarf_elf_init(Elf *elf, int mode, Dwarf
dbg->dbg_mode = mode;
STAILQ_INIT(&dbg->dbg_cu);
+ STAILQ_INIT(&dbg->dbg_func);
*ret_dbg = dbg;
Modified: head/lib/libdwarf/libdwarf.h
==============================================================================
--- head/lib/libdwarf/libdwarf.h Sat May 7 00:25:12 2011
(r221568)
+++ head/lib/libdwarf/libdwarf.h Sat May 7 01:05:31 2011
(r221569)
@@ -51,6 +51,7 @@ typedef struct _Dwarf_Debug *Dwarf_Debug
typedef struct _Dwarf_Die *Dwarf_Die;
typedef struct _Dwarf_Fde *Dwarf_Fde;
typedef struct _Dwarf_Func *Dwarf_Func;
+typedef struct _Dwarf_Inlined_Func *Dwarf_Inlined_Func;
typedef struct _Dwarf_Global *Dwarf_Global;
typedef struct _Dwarf_Line *Dwarf_Line;
typedef struct _Dwarf_Type *Dwarf_Type;
@@ -71,6 +72,9 @@ typedef struct {
Dwarf_Loc *ld_s;
} Dwarf_Locdesc;
+/* receiver function for dwarf_function_iterate_inlined_instance() API */
+typedef void (*Dwarf_Inlined_Callback)(Dwarf_Inlined_Func, void *);
+
/*
* Error numbers which are specific to this implementation.
*/
@@ -157,6 +161,16 @@ void dwarf_dump_strtab(Dwarf_Debug);
void dwarf_dump_symtab(Dwarf_Debug);
void dwarf_dump_raw(Dwarf_Debug);
void dwarf_dump_tree(Dwarf_Debug);
+Dwarf_Func dwarf_find_function_by_offset(Dwarf_Debug dbg, Dwarf_Off off);
+Dwarf_Func dwarf_find_function_by_name(Dwarf_Debug dbg, const char *name);
+int dwarf_function_get_addr_range(Dwarf_Func f,
+ Dwarf_Addr *low_pc, Dwarf_Addr *high_pc);
+int dwarf_function_is_inlined(Dwarf_Func f);
+void dwarf_function_iterate_inlined_instance(Dwarf_Func func,
+ Dwarf_Inlined_Callback f, void *data);
+int dwarf_inlined_function_get_addr_range(Dwarf_Inlined_Func f,
+ Dwarf_Addr *low_pc, Dwarf_Addr *high_pc);
+
__END_DECLS
#endif /* !_LIBDWARF_H_ */
Modified: head/lib/libelf/Makefile
==============================================================================
--- head/lib/libelf/Makefile Sat May 7 00:25:12 2011 (r221568)
+++ head/lib/libelf/Makefile Sat May 7 01:05:31 2011 (r221569)
@@ -57,7 +57,7 @@ INCS= libelf.h gelf.h
GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c
CLEANFILES= ${GENSRCS}
-CFLAGS+= -I. -I${.CURDIR}
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys
SHLIB_MAJOR= 1
Modified: head/lib/libelf/libelf_data.c
==============================================================================
--- head/lib/libelf/libelf_data.c Sat May 7 00:25:12 2011
(r221568)
+++ head/lib/libelf/libelf_data.c Sat May 7 01:05:31 2011
(r221569)
@@ -84,6 +84,8 @@ _libelf_xlate_shtype(uint32_t sht)
case SHT_SUNW_dof:
return (ELF_T_BYTE);
#endif
+ case SHT_MIPS_DWARF:
+ /* FALLTHROUGH */
case SHT_AMD64_UNWIND: /* == SHT_IA_64_UNWIND */
return (ELF_T_BYTE);
default:
Modified: head/sys/sys/elf_common.h
==============================================================================
--- head/sys/sys/elf_common.h Sat May 7 00:25:12 2011 (r221568)
+++ head/sys/sys/elf_common.h Sat May 7 01:05:31 2011 (r221569)
@@ -1,4 +1,5 @@
/*-
+ * Copyright (c) 2000, 2001, 2008, 2011, David E. O'Brien
* Copyright (c) 1998 John D. Polstra.
* All rights reserved.
*
@@ -295,6 +296,7 @@ typedef struct {
#define SHT_HIOS 0x6fffffff /* Last of OS specific
semantics */
#define SHT_LOPROC 0x70000000 /* reserved range for
processor */
#define SHT_AMD64_UNWIND 0x70000001 /* unwind information */
+#define SHT_MIPS_DWARF 0x7000001e /* MIPS gcc uses
MIPS_DWARF */
#define SHT_HIPROC 0x7fffffff /* specific section
header types */
#define SHT_LOUSER 0x80000000 /* reserved range for
application */
#define SHT_HIUSER 0xffffffff /* specific indexes */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
