From 8e260fc026e568894546d065e63ecec2c346f6a4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 22 Aug 2012 15:17:21 +0000 Subject: * auto-load.c (_initialize_auto_load): Update. * solib-svr4.c (_initialize_svr4_solib): Update * solib-dsbt.c (_initialize_dsbt_solib): Update. * solib-darwin.c (_initialize_darwin_solib): Update. * registry.h: New file. * python/py-progspace.c (gdbpy_initialize_pspace): Update. * python/py-inferior.c (gdbpy_initialize_inferior): Update. * progspace.h: Include registry.h. Use DECLARE_REGISTRY. (register_program_space_data_with_cleanup) (register_program_space_data, program_space_alloc_data) (clear_program_space_data, set_program_space_data) (program_space_data): Don't declare. * progspace.c: Use DEFINE_REGISTRY. (struct program_space_data, struct program_space_data_registration, struct program_space_data_registry, program_space_data_registry) (register_program_space_data_with_cleanup) (register_program_space_data, program_space_alloc_data) (program_space_free_data, clear_program_space_data) (set_program_space_data, program_space_data): Remove. * objfiles.h: Include registry.h. Use DECLARE_REGISTRY. (struct objfile) : Replace with REGISTRY_FIELDS. (register_objfile_data_with_cleanup, register_objfile_data) (clear_objfile_data, set_objfile_data, objfile_data): Don't declare. * objfiles.c: Use DEFINE_REGISTRY. (struct objfile_data, struct objfile_data_registration, struct objfile_data_registry, objfile_data_registry) (register_objfile_data_with_cleanup, register_objfile_data) (objfile_alloc_data, objfile_free_data, clear_objfile_data) (set_objfile_data, objfile_data): Remove. (_initialize_objfiles): Update. * jit.c (_initialize_jit): Update. * inflow.c (_initialize_inflow): Update. * inferior.h: Include registry.h. Use DECLARE_REGISTRY. (struct inferior) : Replace with REGISTRY_FIELDS. (register_inferior_data_with_cleanup, register_inferior_data) (clear_inferior_data, set_inferior_data, inferior_data): Don't declare. * inferior.c: Use DEFINE_REGISTRY. (struct inferior_data, struct inferior_data_registration, struct inferior_data_registry, inferior_data_registry) (register_inferior_data_with_cleanup, register_inferior_data) (inferior_alloc_data, inferior_free_data clear_inferior_data) (set_inferior_data, inferior_data): Remove. * auxv.c (_initialize_auxv): Update. * ada-lang.c (_initialize_ada_language): Update. * breakpoint.c (_initialize_breakpoint): Update. * i386-nat.c (i386_use_watchpoints): Update. --- gdb/progspace.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gdb/progspace.h') diff --git a/gdb/progspace.h b/gdb/progspace.h index 3db3938..9348c3f 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -24,6 +24,7 @@ #include "target.h" #include "vec.h" #include "gdb_vecs.h" +#include "registry.h" struct target_ops; struct bfd; @@ -201,8 +202,7 @@ struct program_space VEC (char_ptr) *deleted_solibs; /* Per pspace data-pointers required by other GDB modules. */ - void **data; - unsigned num_data; + REGISTRY_FIELDS; }; /* The object file that the main symbol table was loaded from (e.g. the @@ -298,14 +298,6 @@ extern void clear_program_space_solib_cache (struct program_space *); /* Keep a registry of per-pspace data-pointers required by other GDB modules. */ -extern const struct program_space_data *register_program_space_data (void); -extern const struct program_space_data *register_program_space_data_with_cleanup - (void (*cleanup) (struct program_space *, void *)); -extern void clear_program_space_data (struct program_space *pspace); -extern void set_program_space_data (struct program_space *pspace, - const struct program_space_data *data, - void *value); -extern void *program_space_data (struct program_space *pspace, - const struct program_space_data *data); +DECLARE_REGISTRY (program_space); #endif -- cgit v1.1