From d772d2abcc163142fc38655896c4704b06dae0b6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 1 May 2019 15:50:33 -0600 Subject: [PATCH] Convert stabsread.c to type-safe registry API This changes stabsread.c to use the type-safe registry API. gdb/ChangeLog 2019-05-08 Tom Tromey * stabsread.c (rs6000_builtin_type_data): Change type. (rs6000_builtin_type, _initialize_stabsread): Update. --- gdb/ChangeLog | 5 +++++ gdb/stabsread.c | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ba67e17c1a3..0d4b3aeec3f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-05-08 Tom Tromey + + * stabsread.c (rs6000_builtin_type_data): Change type. + (rs6000_builtin_type, _initialize_stabsread): Update. + 2019-05-08 Tom Tromey * mips-tdep.c (mips_pdr_data): Remove. diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 3f340dbf20d..27414a9812a 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -2075,13 +2075,14 @@ again: /* RS/6000 xlc/dbx combination uses a set of builtin types, starting from -1. Return the proper type node for a given builtin type number. */ -static const struct objfile_data *rs6000_builtin_type_data; +static const struct objfile_key> + rs6000_builtin_type_data; static struct type * rs6000_builtin_type (int typenum, struct objfile *objfile) { - struct type **negative_types - = (struct type **) objfile_data (objfile, rs6000_builtin_type_data); + struct type **negative_types = rs6000_builtin_type_data.get (objfile); /* We recognize types numbered from -NUMBER_RECOGNIZED to -1. */ #define NUMBER_RECOGNIZED 34 @@ -2098,7 +2099,7 @@ rs6000_builtin_type (int typenum, struct objfile *objfile) /* This includes an empty slot for type number -0. */ negative_types = OBSTACK_CALLOC (&objfile->objfile_obstack, NUMBER_RECOGNIZED + 1, struct type *); - set_objfile_data (objfile, rs6000_builtin_type_data, negative_types); + rs6000_builtin_type_data.set (objfile, negative_types); } if (negative_types[-typenum] != NULL) @@ -4800,8 +4801,6 @@ hashname (const char *name) void _initialize_stabsread (void) { - rs6000_builtin_type_data = register_objfile_data (); - undef_types_allocated = 20; undef_types_length = 0; undef_types = XNEWVEC (struct type *, undef_types_allocated); -- 2.30.2