diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/ctfread.c | 38 |
2 files changed, 24 insertions, 19 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1208b4a..3eaaddd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-11-20 Nick Alcock <nick.alcock@oracle.com> + + * ctfread.c: Change uses of ctf_file_t to ctf_dict_t. + (ctf_fp_info::~ctf_fp_info): Call ctf_dict_close, not ctf_file_close. + 2020-11-20 Pedro Alves <pedro@palves.net> * language.c (language_arch_info::lookup_primitive_type): Use diff --git a/gdb/ctfread.c b/gdb/ctfread.c index 52eef80..dd401ef 100644 --- a/gdb/ctfread.c +++ b/gdb/ctfread.c @@ -91,29 +91,29 @@ static const struct objfile_key<htab, htab_deleter> ctf_tid_key; struct ctf_fp_info { - explicit ctf_fp_info (ctf_file_t *cfp) : fp (cfp) {} + explicit ctf_fp_info (ctf_dict_t *cfp) : fp (cfp) {} ~ctf_fp_info (); - ctf_file_t *fp; + ctf_dict_t *fp; }; -/* Cleanup function for the ctf_file_key data. */ +/* Cleanup function for the ctf_dict_key data. */ ctf_fp_info::~ctf_fp_info () { if (!fp) return; ctf_archive_t *arc = ctf_get_arc (fp); - ctf_file_close (fp); + ctf_dict_close (fp); ctf_close (arc); } -static const objfile_key<ctf_fp_info> ctf_file_key; +static const objfile_key<ctf_fp_info> ctf_dict_key; /* A CTF context consists of a file pointer and an objfile pointer. */ struct ctf_context { - ctf_file_t *fp; + ctf_dict_t *fp; struct objfile *of; partial_symtab *pst; struct buildsym_compunit *builder; @@ -272,7 +272,7 @@ get_tid_type (struct objfile *of, ctf_id_t tid) /* Return the size of storage in bits for INTEGER, FLOAT, or ENUM. */ static int -get_bitsize (ctf_file_t *fp, ctf_id_t tid, uint32_t kind) +get_bitsize (ctf_dict_t *fp, ctf_id_t tid, uint32_t kind) { ctf_encoding_t cet; @@ -434,7 +434,7 @@ static struct symbol * new_symbol (struct ctf_context *ccp, struct type *type, ctf_id_t tid) { struct objfile *objfile = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct symbol *sym = NULL; gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (fp, tid)); @@ -497,7 +497,7 @@ static struct type * read_base_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; ctf_encoding_t cet; struct type *type = NULL; char *name; @@ -592,7 +592,7 @@ static struct type * read_structure_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *type; uint32_t kind; @@ -650,7 +650,7 @@ static struct type * read_func_kind_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *type, *rettype; ctf_funcinfo_t cfi; @@ -676,7 +676,7 @@ static struct type * read_enum_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *type, *target_type; ctf_funcinfo_t fi; @@ -751,7 +751,7 @@ static struct type * read_array_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *objfile = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *element_type, *range_type, *idx_type; struct type *type; ctf_arinfo_t ar; @@ -816,7 +816,7 @@ static struct type * read_volatile_type (struct ctf_context *ccp, ctf_id_t tid, ctf_id_t btid) { struct objfile *objfile = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *base_type, *cv_type; base_type = get_tid_type (objfile, btid); @@ -913,7 +913,7 @@ read_pointer_type (struct ctf_context *ccp, ctf_id_t tid, ctf_id_t btid) static struct type * read_type_record (struct ctf_context *ccp, ctf_id_t tid) { - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; uint32_t kind; struct type *type = NULL; ctf_id_t btid; @@ -1310,7 +1310,7 @@ ctf_psymtab::read_symtab (struct objfile *objfile) static ctf_psymtab * create_partial_symtab (const char *name, - ctf_file_t *cfp, + ctf_dict_t *cfp, struct objfile *objfile) { ctf_psymtab *pst; @@ -1406,7 +1406,7 @@ ctf_psymtab_var_cb (const char *name, ctf_id_t id, void *arg) debugging information is available. */ static void -scan_partial_symbols (ctf_file_t *cfp, struct objfile *of) +scan_partial_symbols (ctf_dict_t *cfp, struct objfile *of) { bfd *abfd = of->obfd; const char *name = bfd_get_filename (abfd); @@ -1482,11 +1482,11 @@ elfctf_build_psymtabs (struct objfile *of) error (_("ctf_bfdopen failed on %s - %s"), bfd_get_filename (abfd), ctf_errmsg (err)); - ctf_file_t *fp = ctf_arc_open_by_name (arc, NULL, &err); + ctf_dict_t *fp = ctf_arc_open_by_name (arc, NULL, &err); if (fp == NULL) error (_("ctf_arc_open_by_name failed on %s - %s"), bfd_get_filename (abfd), ctf_errmsg (err)); - ctf_file_key.emplace (of, fp); + ctf_dict_key.emplace (of, fp); scan_partial_symbols (fp, of); } |