From patchwork Mon Aug 27 00:21:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 29060 Received: (qmail 25086 invoked by alias); 27 Aug 2018 00:21:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 25076 invoked by uid 89); 27 Aug 2018 00:21:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=gathered, mapped, events, gcore X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 27 Aug 2018 00:21:21 +0000 Received: from smtp.ebox.ca (smtp.electronicbox.net [96.127.255.82]) by barracuda.ebox.ca with ESMTP id zsdra8iD5AKbKJyC (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 26 Aug 2018 20:21:06 -0400 (EDT) Received: from simark.lan (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id 68725441B21; Sun, 26 Aug 2018 20:21:06 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [pushed] Fix indentation in solist.h Date: Sun, 26 Aug 2018 20:21:04 -0400 Message-Id: <20180827002104.15157-1-simon.marchi@polymtl.ca> X-IsSubscribed: yes gdb/ChangeLog: * solist.h (struct solist, struct target_so_ops): Fix indentation. --- gdb/ChangeLog | 5 + gdb/solist.h | 270 +++++++++++++++++++++++++------------------------- 2 files changed, 140 insertions(+), 135 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a9819ab8cdfa..99eb36a64d7b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-08-26 Simon Marchi + + * solist.h (struct solist, struct target_so_ops): Fix + indentation. + 2018-08-26 Simon Marchi * ada-tasks.c (ada_task_info_s): Remove typedef. diff --git a/gdb/solist.h b/gdb/solist.h index 6875d1be1236..7262bc281abf 100644 --- a/gdb/solist.h +++ b/gdb/solist.h @@ -36,143 +36,143 @@ struct lm_info_base }; struct so_list - { - /* The following fields of the structure come directly from the - dynamic linker's tables in the inferior, and are initialized by - current_sos. */ - - struct so_list *next; /* next structure in linked list */ - - /* A pointer to target specific link map information. Often this - will be a copy of struct link_map from the user process, but - it need not be; it can be any collection of data needed to - traverse the dynamic linker's data structures. */ - lm_info_base *lm_info; - - /* Shared object file name, exactly as it appears in the - inferior's link map. This may be a relative path, or something - which needs to be looked up in LD_LIBRARY_PATH, etc. We use it - to tell which entries in the inferior's dynamic linker's link - map we've already loaded. */ - char so_original_name[SO_NAME_MAX_PATH_SIZE]; - - /* Shared object file name, expanded to something GDB can open. */ - char so_name[SO_NAME_MAX_PATH_SIZE]; - - /* Program space this shared library belongs to. */ - struct program_space *pspace; - - /* The following fields of the structure are built from - information gathered from the shared object file itself, and - are set when we actually add it to our symbol tables. - - current_sos must initialize these fields to 0. */ - - bfd *abfd; - char symbols_loaded; /* flag: symbols read in yet? */ - - /* objfile with symbols for a loaded library. Target memory is read from - ABFD. OBJFILE may be NULL either before symbols have been loaded, if - the file cannot be found or after the command "nosharedlibrary". */ - struct objfile *objfile; - - struct target_section *sections; - struct target_section *sections_end; - - /* Record the range of addresses belonging to this shared library. - There may not be just one (e.g. if two segments are relocated - differently). This is used for "info sharedlibrary" and - the MI command "-file-list-shared-libraries". The latter has a format - that supports outputting multiple segments once the related code - supports them. */ - CORE_ADDR addr_low, addr_high; - }; +{ + /* The following fields of the structure come directly from the + dynamic linker's tables in the inferior, and are initialized by + current_sos. */ + + struct so_list *next; /* next structure in linked list */ + + /* A pointer to target specific link map information. Often this + will be a copy of struct link_map from the user process, but + it need not be; it can be any collection of data needed to + traverse the dynamic linker's data structures. */ + lm_info_base *lm_info; + + /* Shared object file name, exactly as it appears in the + inferior's link map. This may be a relative path, or something + which needs to be looked up in LD_LIBRARY_PATH, etc. We use it + to tell which entries in the inferior's dynamic linker's link + map we've already loaded. */ + char so_original_name[SO_NAME_MAX_PATH_SIZE]; + + /* Shared object file name, expanded to something GDB can open. */ + char so_name[SO_NAME_MAX_PATH_SIZE]; + + /* Program space this shared library belongs to. */ + struct program_space *pspace; + + /* The following fields of the structure are built from + information gathered from the shared object file itself, and + are set when we actually add it to our symbol tables. + + current_sos must initialize these fields to 0. */ + + bfd *abfd; + char symbols_loaded; /* flag: symbols read in yet? */ + + /* objfile with symbols for a loaded library. Target memory is read from + ABFD. OBJFILE may be NULL either before symbols have been loaded, if + the file cannot be found or after the command "nosharedlibrary". */ + struct objfile *objfile; + + struct target_section *sections; + struct target_section *sections_end; + + /* Record the range of addresses belonging to this shared library. + There may not be just one (e.g. if two segments are relocated + differently). This is used for "info sharedlibrary" and + the MI command "-file-list-shared-libraries". The latter has a format + that supports outputting multiple segments once the related code + supports them. */ + CORE_ADDR addr_low, addr_high; +}; struct target_so_ops - { - /* Adjust the section binding addresses by the base address at - which the object was actually mapped. */ - void (*relocate_section_addresses) (struct so_list *so, - struct target_section *); - - /* Free the link map info and any other private data structures - associated with a so_list entry. */ - void (*free_so) (struct so_list *so); - - /* Reset private data structures associated with SO. - This is called when SO is about to be reloaded. - It is also called before free_so when SO is about to be freed. */ - void (*clear_so) (struct so_list *so); - - /* Reset or free private data structures not associated with - so_list entries. */ - void (*clear_solib) (void); - - /* Target dependent code to run after child process fork. */ - void (*solib_create_inferior_hook) (int from_tty); - - /* Construct a list of the currently loaded shared objects. This - list does not include an entry for the main executable file. - - Note that we only gather information directly available from the - inferior --- we don't examine any of the shared library files - themselves. The declaration of `struct so_list' says which fields - we provide values for. */ - struct so_list *(*current_sos) (void); - - /* Find, open, and read the symbols for the main executable. If - FROM_TTY is non-zero, allow messages to be printed. */ - int (*open_symbol_file_object) (int from_ttyp); - - /* Determine if PC lies in the dynamic symbol resolution code of - the run time loader. */ - int (*in_dynsym_resolve_code) (CORE_ADDR pc); - - /* Find and open shared library binary file. */ - gdb_bfd_ref_ptr (*bfd_open) (const char *pathname); - - /* Optional extra hook for finding and opening a solib. - If TEMP_PATHNAME is non-NULL: If the file is successfully opened a - pointer to a malloc'd and realpath'd copy of SONAME is stored there, - otherwise NULL is stored there. */ - int (*find_and_open_solib) (const char *soname, - unsigned o_flags, - gdb::unique_xmalloc_ptr *temp_pathname); - - /* Hook for looking up global symbols in a library-specific way. */ - struct block_symbol (*lookup_lib_global_symbol) - (struct objfile *objfile, - const char *name, - const domain_enum domain); - - /* Given two so_list objects, one from the GDB thread list - and another from the list returned by current_sos, return 1 - if they represent the same library. - Falls back to using strcmp on so_original_name field when set - to NULL. */ - int (*same) (struct so_list *gdb, struct so_list *inferior); - - /* Return whether a region of memory must be kept in a core file - for shared libraries loaded before "gcore" is used to be - handled correctly when the core file is loaded. This only - applies when the section would otherwise not be kept in the - core file (in particular, for readonly sections). */ - int (*keep_data_in_core) (CORE_ADDR vaddr, - unsigned long size); - - /* Enable or disable optional solib event breakpoints as - appropriate. This should be called whenever - stop_on_solib_events is changed. This pointer can be - NULL, in which case no enabling or disabling is necessary - for this target. */ - void (*update_breakpoints) (void); - - /* Target-specific processing of solib events that will be - performed before solib_add is called. This pointer can be - NULL, in which case no specific preprocessing is necessary - for this target. */ - void (*handle_event) (void); - }; +{ + /* Adjust the section binding addresses by the base address at + which the object was actually mapped. */ + void (*relocate_section_addresses) (struct so_list *so, + struct target_section *); + + /* Free the link map info and any other private data structures + associated with a so_list entry. */ + void (*free_so) (struct so_list *so); + + /* Reset private data structures associated with SO. + This is called when SO is about to be reloaded. + It is also called before free_so when SO is about to be freed. */ + void (*clear_so) (struct so_list *so); + + /* Reset or free private data structures not associated with + so_list entries. */ + void (*clear_solib) (void); + + /* Target dependent code to run after child process fork. */ + void (*solib_create_inferior_hook) (int from_tty); + + /* Construct a list of the currently loaded shared objects. This + list does not include an entry for the main executable file. + + Note that we only gather information directly available from the + inferior --- we don't examine any of the shared library files + themselves. The declaration of `struct so_list' says which fields + we provide values for. */ + struct so_list *(*current_sos) (void); + + /* Find, open, and read the symbols for the main executable. If + FROM_TTY is non-zero, allow messages to be printed. */ + int (*open_symbol_file_object) (int from_ttyp); + + /* Determine if PC lies in the dynamic symbol resolution code of + the run time loader. */ + int (*in_dynsym_resolve_code) (CORE_ADDR pc); + + /* Find and open shared library binary file. */ + gdb_bfd_ref_ptr (*bfd_open) (const char *pathname); + + /* Optional extra hook for finding and opening a solib. + If TEMP_PATHNAME is non-NULL: If the file is successfully opened a + pointer to a malloc'd and realpath'd copy of SONAME is stored there, + otherwise NULL is stored there. */ + int (*find_and_open_solib) (const char *soname, + unsigned o_flags, + gdb::unique_xmalloc_ptr *temp_pathname); + + /* Hook for looking up global symbols in a library-specific way. */ + struct block_symbol (*lookup_lib_global_symbol) + (struct objfile *objfile, + const char *name, + const domain_enum domain); + + /* Given two so_list objects, one from the GDB thread list + and another from the list returned by current_sos, return 1 + if they represent the same library. + Falls back to using strcmp on so_original_name field when set + to NULL. */ + int (*same) (struct so_list *gdb, struct so_list *inferior); + + /* Return whether a region of memory must be kept in a core file + for shared libraries loaded before "gcore" is used to be + handled correctly when the core file is loaded. This only + applies when the section would otherwise not be kept in the + core file (in particular, for readonly sections). */ + int (*keep_data_in_core) (CORE_ADDR vaddr, + unsigned long size); + + /* Enable or disable optional solib event breakpoints as + appropriate. This should be called whenever + stop_on_solib_events is changed. This pointer can be + NULL, in which case no enabling or disabling is necessary + for this target. */ + void (*update_breakpoints) (void); + + /* Target-specific processing of solib events that will be + performed before solib_add is called. This pointer can be + NULL, in which case no specific preprocessing is necessary + for this target. */ + void (*handle_event) (void); +}; /* Free the memory associated with a (so_list *). */ void free_so (struct so_list *so);