10812 ctf tools shouldn't add blank labels
10813 ctf symbol mapping needs work
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

          --- old/usr/src/lib/libctf/common/libctf_impl.h
          +++ new/usr/src/lib/libctf/common/libctf_impl.h

   1    1  /*
   2    2   * This file and its contents are supplied under the terms of the

   3    3   * Common Development and Distribution License ("CDDL"), version 1.0.
   4    4   * You may only use this file in accordance with the terms of version
   5    5   * 1.0 of the CDDL.
   6    6   *
   7    7   * A full copy of the text of the CDDL should have accompanied this
   8    8   * source.  A copy of the CDDL is also available via the Internet at
   9    9   * http://www.illumos.org/license/CDDL.
  10   10   */
  11   11  
  12   12  /*
  13      - * Copyright 2015 Joyent, Inc.
       13 + * Copyright 2019 Joyent, Inc.
  14   14   */
  15   15  
  16   16  #ifndef _LIBCTF_IMPL_H
  17   17  #define _LIBCTF_IMPL_H
  18   18  
  19   19  /*
  20   20   * Portions of libctf implementations that are only suitable for CTF's userland
  21   21   * library, eg. converting and merging related routines.
  22   22   */
  23   23  

  24   24  #include <libelf.h>
  25   25  #include <libctf.h>
  26   26  #include <ctf_impl.h>
  27   27  
  28   28  #ifdef __cplusplus
  29   29  extern "C" {
  30   30  #endif
  31   31  
  32   32  typedef enum ctf_conv_status {
  33   33          CTF_CONV_SUCCESS        = 0,

  34   34          CTF_CONV_ERROR          = 1,
  35   35          CTF_CONV_NOTSUP         = 2
  36   36  } ctf_conv_status_t;
  37   37  
  38   38  typedef ctf_conv_status_t (*ctf_convert_f)(int, Elf *, uint_t, int *,
  39   39      ctf_file_t **, char *, size_t);
  40   40  extern ctf_conv_status_t ctf_dwarf_convert(int, Elf *, uint_t, int *,
  41   41      ctf_file_t **, char *, size_t);
  42   42  
  43   43  /*
       44 + * Symbol walking
       45 + */
       46 +typedef int (*ctf_symtab_f)(const Elf64_Sym *, ulong_t, const char *,
       47 +    const char *, boolean_t, void *);
       48 +extern int ctf_symtab_iter(ctf_file_t *, ctf_symtab_f, void *);
       49 +
       50 +/*
  44   51   * zlib compression routines
  45   52   */
  46   53  extern int ctf_compress(ctf_file_t *fp, void **, size_t *, size_t *);
  47   54  
  48   55  extern int ctf_diff_self(ctf_diff_t *, ctf_diff_type_f, void *);
  49   56  
  50   57  /*
  51   58   * Internal debugging aids
  52   59   */
  53      -extern void ctf_phase_dump(ctf_file_t *, const char *);
       60 +extern void ctf_phase_dump(ctf_file_t *, const char *, const char *);
       61 +extern void ctf_phase_bump(void);
  54   62  
  55   63  #ifdef __cplusplus
  56   64  }
  57   65  #endif
  58   66  
  59   67  #endif /* _LIBCTF_IMPL_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX