Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/FreeBSD]: src/external/bsd/libdwarf/dist sync with FreeBSD



details:   https://anonhg.NetBSD.org/src/rev/6159eb7dbf59
branches:  FreeBSD
changeset: 319384:6159eb7dbf59
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 17 22:03:02 2013 +0000

description:
sync with FreeBSD

diffstat:

 external/bsd/libdwarf/dist/Makefile        |   11 +-
 external/bsd/libdwarf/dist/_libdwarf.h     |   35 ++++-
 external/bsd/libdwarf/dist/dwarf.h         |    5 +-
 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_func.c    |  230 +++++++++++++++++++++++++++++
 external/bsd/libdwarf/dist/dwarf_init.c    |   14 +-
 external/bsd/libdwarf/dist/dwarf_loc.c     |    4 +-
 external/bsd/libdwarf/dist/libdwarf.h      |   18 ++-
 18 files changed, 327 insertions(+), 40 deletions(-)

diffs (truncated from 704 to 300 lines):

diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/Makefile
--- a/external/bsd/libdwarf/dist/Makefile       Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/Makefile       Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libdwarf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
+# $FreeBSD: src/lib/libdwarf/Makefile,v 1.7 2012/11/17 01:49:48 svnexp Exp $
 
 LIB=   dwarf
 
@@ -14,17 +14,16 @@
        dwarf_errno.c           \
        dwarf_finish.c          \
        dwarf_form.c            \
+       dwarf_func.c            \
        dwarf_init.c            \
        dwarf_loc.c
 
 INCS=  dwarf.h libdwarf.h
 
-CFLAGS+=       -I. -I${.CURDIR}
-
-SHLIB_MAJOR=   2
+CFLAGS+=       -I${.CURDIR}
 
-WARNS?=        6
+SHLIB_MAJOR=   3
 
-WITHOUT_MAN=   yes
+WITHOUT_MAN=
 
 .include <bsd.lib.mk>
diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/_libdwarf.h
--- a/external/bsd/libdwarf/dist/_libdwarf.h    Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/_libdwarf.h    Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: _libdwarf.h,v 1.1.1.1 2009/12/23 00:03:27 darran Exp $ */
+/*     $NetBSD: _libdwarf.h,v 1.1.1.2 2013/01/17 22:03:02 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 ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf.h
--- a/external/bsd/libdwarf/dist/dwarf.h        Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf.h        Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf.h,v 1.1.1.1 2009/12/23 00:03:27 darran Exp $     */
+/*     $NetBSD: dwarf.h,v 1.1.1.2 2013/01/17 22:03:02 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.h,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: src/lib/libdwarf/dwarf.h,v 1.3 2012/11/17 01:49:48 svnexp Exp $
  */
 
 #ifndef        _DWARF_H_
@@ -186,6 +186,7 @@
 #define DW_FORM_ref8                   0x14
 #define DW_FORM_ref_udata              0x15
 #define DW_FORM_indirect               0x16
+#define DW_FORM_flag_present           0x19
 
 #define DW_OP_addr                     0x03
 #define DW_OP_deref                    0x06
diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_abbrev.c
--- a/external/bsd/libdwarf/dist/dwarf_abbrev.c Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_abbrev.c Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_abbrev.c,v 1.1.1.1 2009/12/23 00:03:25 darran Exp $      */
+/*     $NetBSD: dwarf_abbrev.c,v 1.1.1.2 2013/01/17 22:03:02 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 $
  */
 
 #include <stdlib.h>
diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_attr.c
--- a/external/bsd/libdwarf/dist/dwarf_attr.c   Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_attr.c   Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_attr.c,v 1.1.1.1 2009/12/23 00:03:25 darran Exp $        */
+/*     $NetBSD: dwarf_attr.c,v 1.1.1.2 2013/01/17 22:03:02 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 $
  */
 
 #include <stdlib.h>
diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_attrval.c
--- a/external/bsd/libdwarf/dist/dwarf_attrval.c        Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_attrval.c        Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_attrval.c,v 1.1.1.1 2009/12/23 00:03:25 darran Exp $     */
+/*     $NetBSD: dwarf_attrval.c,v 1.1.1.2 2013/01/17 22:03:02 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 $
  */
 
 #include <stdlib.h>
@@ -103,6 +103,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 ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_cu.c
--- a/external/bsd/libdwarf/dist/dwarf_cu.c     Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_cu.c     Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_cu.c,v 1.1.1.1 2009/12/23 00:03:25 darran Exp $  */
+/*     $NetBSD: dwarf_cu.c,v 1.1.1.2 2013/01/17 22:03:02 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 $
  */
 
 #include "_libdwarf.h"
diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_dealloc.c
--- a/external/bsd/libdwarf/dist/dwarf_dealloc.c        Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_dealloc.c        Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_dealloc.c,v 1.1.1.1 2009/12/23 00:03:25 darran Exp $     */
+/*     $NetBSD: dwarf_dealloc.c,v 1.1.1.2 2013/01/17 22:03:02 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 $
  */
 
 #include "_libdwarf.h"
diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_die.c
--- a/external/bsd/libdwarf/dist/dwarf_die.c    Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_die.c    Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_die.c,v 1.1.1.1 2009/12/23 00:03:25 darran Exp $ */
+/*     $NetBSD: dwarf_die.c,v 1.1.1.2 2013/01/17 22:03:02 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 $
  */
 
 #include <stdlib.h>
diff -r ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_dump.c
--- a/external/bsd/libdwarf/dist/dwarf_dump.c   Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_dump.c   Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_dump.c,v 1.1.1.1 2009/12/23 00:03:24 darran Exp $        */
+/*     $NetBSD: dwarf_dump.c,v 1.1.1.2 2013/01/17 22:03:02 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 $
  */
 
 #include <stdlib.h>
@@ -242,6 +242,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:
@@ -650,6 +652,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 ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_errmsg.c
--- a/external/bsd/libdwarf/dist/dwarf_errmsg.c Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_errmsg.c Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_errmsg.c,v 1.1.1.1 2009/12/23 00:03:23 darran Exp $      */
+/*     $NetBSD: dwarf_errmsg.c,v 1.1.1.2 2013/01/17 22:03:02 christos Exp $    */
 
 /*-
  * Copyright (c) 2007 John Birrell (jb%freebsd.org@localhost)
@@ -25,13 +25,13 @@
  * 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 $
  */
 
 #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 ec5720470ff7 -r 6159eb7dbf59 external/bsd/libdwarf/dist/dwarf_errno.c
--- a/external/bsd/libdwarf/dist/dwarf_errno.c  Sat Feb 27 22:29:20 2010 +0000
+++ b/external/bsd/libdwarf/dist/dwarf_errno.c  Thu Jan 17 22:03:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwarf_errno.c,v 1.1.1.1 2009/12/23 00:03:23 darran Exp $       */
+/*     $NetBSD: dwarf_errno.c,v 1.1.1.2 2013/01/17 22:03:02 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



Home | Main Index | Thread Index | Old Index