Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/libdwarf resolve conflicts, bump
details: https://anonhg.NetBSD.org/src/rev/ba3c3eb53c68
branches: trunk
changeset: 784088:ba3c3eb53c68
user: christos <christos%NetBSD.org@localhost>
date: Thu Jan 17 22:06:58 2013 +0000
description:
resolve conflicts, bump
diffstat:
external/bsd/libdwarf/dist/_libdwarf.h | 35 ++++++++++++++++++++++++++++-
external/bsd/libdwarf/dist/dwarf_abbrev.c | 4 +-
external/bsd/libdwarf/dist/dwarf_attr.c | 4 +-
external/bsd/libdwarf/dist/dwarf_attrval.c | 5 ++-
external/bsd/libdwarf/dist/dwarf_cu.c | 4 +-
external/bsd/libdwarf/dist/dwarf_dealloc.c | 4 +-
external/bsd/libdwarf/dist/dwarf_die.c | 4 +-
external/bsd/libdwarf/dist/dwarf_dump.c | 7 ++++-
external/bsd/libdwarf/dist/dwarf_errmsg.c | 6 ++--
external/bsd/libdwarf/dist/dwarf_errno.c | 4 +-
external/bsd/libdwarf/dist/dwarf_finish.c | 4 +-
external/bsd/libdwarf/dist/dwarf_form.c | 4 +-
external/bsd/libdwarf/dist/dwarf_init.c | 14 +++++++++--
external/bsd/libdwarf/dist/dwarf_loc.c | 4 +-
external/bsd/libdwarf/lib/shlib_version | 4 +-
15 files changed, 75 insertions(+), 32 deletions(-)
diffs (truncated from 374 to 300 lines):
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/_libdwarf.h
--- a/external/bsd/libdwarf/dist/_libdwarf.h Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/_libdwarf.h Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: _libdwarf.h,v 1.2 2009/12/23 00:11:30 darran Exp $ */
+/* $NetBSD: _libdwarf.h,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/_libdwarf.h,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/_libdwarf.h,v 1.3 2012/11/17 01:49:48 svnexp Exp $
*/
#ifndef __LIBDWARF_H_
@@ -165,6 +165,37 @@
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_ */
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_abbrev.c
--- a/external/bsd/libdwarf/dist/dwarf_abbrev.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_abbrev.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_abbrev.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_abbrev.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_abbrev.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_abbrev.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_attr.c
--- a/external/bsd/libdwarf/dist/dwarf_attr.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_attr.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_attr.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_attr.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_attr.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_attr.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_attrval.c
--- a/external/bsd/libdwarf/dist/dwarf_attrval.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_attrval.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_attrval.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_attrval.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_attrval.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_attrval.c,v 1.3 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
@@ -107,6 +107,7 @@
} else {
switch (av->av_form) {
case DW_FORM_flag:
+ case DW_FORM_flag_present:
*valp = (Dwarf_Bool) av->u[0].u64;
break;
default:
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_cu.c
--- a/external/bsd/libdwarf/dist/dwarf_cu.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_cu.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_cu.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_cu.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_cu.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_cu.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_dealloc.c
--- a/external/bsd/libdwarf/dist/dwarf_dealloc.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_dealloc.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_dealloc.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_dealloc.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_dealloc.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_dealloc.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_die.c
--- a/external/bsd/libdwarf/dist/dwarf_die.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_die.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_die.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_die.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_die.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_die.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_dump.c
--- a/external/bsd/libdwarf/dist/dwarf_dump.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_dump.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_dump.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_dump.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_dump.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_dump.c,v 1.3 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
@@ -246,6 +246,8 @@
return "DW_FORM_data8";
case DW_FORM_flag:
return "DW_FORM_flag";
+ case DW_FORM_flag_present:
+ return "DW_FORM_flag_present";
case DW_FORM_indirect:
return "DW_FORM_indirect";
case DW_FORM_ref1:
@@ -654,6 +656,7 @@
case DW_FORM_data4:
case DW_FORM_data8:
case DW_FORM_flag:
+ case DW_FORM_flag_present:
printf("%llu", (unsigned long long) av->u[0].u64);
break;
case DW_FORM_ref1:
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_errmsg.c
--- a/external/bsd/libdwarf/dist/dwarf_errmsg.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_errmsg.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_errmsg.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_errmsg.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_errmsg.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_errmsg.c,v 1.3 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
@@ -35,7 +35,7 @@
#include <stdio.h>
#include "_libdwarf.h"
-const char *_libdwarf_errors[] = {
+static const char *_libdwarf_errors[] = {
#define DEFINE_ERROR(N,S) [DWARF_E_##N] = S
DEFINE_ERROR(NONE, "No Error"),
DEFINE_ERROR(ERROR, "An error"),
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_errno.c
--- a/external/bsd/libdwarf/dist/dwarf_errno.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_errno.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_errno.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_errno.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_errno.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_errno.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_finish.c
--- a/external/bsd/libdwarf/dist/dwarf_finish.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_finish.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_finish.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_finish.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_finish.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_finish.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_form.c
--- a/external/bsd/libdwarf/dist/dwarf_form.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_form.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_form.c,v 1.2 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_form.c,v 1.3 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdwarf/dwarf_form.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf_form.c,v 1.2 2012/11/17 01:49:48 svnexp Exp $
*/
#if HAVE_NBTOOL_CONFIG_H
diff -r 1581ead0930b -r ba3c3eb53c68 external/bsd/libdwarf/dist/dwarf_init.c
--- a/external/bsd/libdwarf/dist/dwarf_init.c Thu Jan 17 22:03:02 2013 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_init.c Thu Jan 17 22:06:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_init.c,v 1.3 2010/02/22 11:01:29 darran Exp $ */
+/* $NetBSD: dwarf_init.c,v 1.4 2013/01/17 22:06:58 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
Home |
Main Index |
Thread Index |
Old Index