From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21757 invoked by alias); 14 Mar 2004 21:11:36 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 21750 invoked from network); 14 Mar 2004 21:11:35 -0000 Received: from unknown (HELO nevyn.them.org) (66.93.172.17) by sources.redhat.com with SMTP; 14 Mar 2004 21:11:35 -0000 Received: from drow by nevyn.them.org with local (Exim 4.30 #1 (Debian)) id 1B2ctS-0003us-1E for ; Sun, 14 Mar 2004 16:11:34 -0500 Date: Fri, 19 Mar 2004 00:09:00 -0000 From: Daniel Jacobowitz To: gdb-patches@sources.redhat.com Subject: [intercu] Cosmetic matching for multiple-processing patch Message-ID: <20040314211133.GB21027@nevyn.them.org> Mail-Followup-To: gdb-patches@sources.redhat.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.1i X-SW-Source: 2004-03/txt/msg00307.txt.bz2 Message-ID: <20040319000900.YYr6dpV6NpX7jKj1wGkMUEj9EY58mNx2yN3mb5qgl8A@z> This patch brings the intercu branch up-to-date with the edited function names and comments, to simplify my next merge. Committed to the intercu branch. -- Daniel Jacobowitz MontaVista Software Debian GNU/Linux Developer 2004-03-14 Daniel Jacobowitz * dwarf2read.c (read_structure_type): Renamed from read_structure_scope. (process_enumeration_scope): Renamed from read_enumeration_scope. (add_partial_structure, process_die, new_symbol) (read_type_die): Update calls and comments. Index: gdb/dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v retrieving revision 1.135.2.34 diff -u -p -r1.135.2.34 dwarf2read.c --- gdb/dwarf2read.c 25 Feb 2004 03:45:12 -0000 1.135.2.34 +++ gdb/dwarf2read.c 14 Mar 2004 20:43:59 -0000 @@ -855,7 +855,7 @@ static void dwarf2_add_member_fn (struct static void dwarf2_attach_fn_fields_to_type (struct field_info *, struct type *, struct dwarf2_cu *); -static void read_structure_scope (struct die_info *, struct dwarf2_cu *); +static void read_structure_type (struct die_info *, struct dwarf2_cu *); static void process_structure_scope (struct die_info *, struct dwarf2_cu *); @@ -868,7 +868,7 @@ static const char *namespace_name (struc static void read_enumeration_type (struct die_info *, struct dwarf2_cu *); -static void read_enumeration_scope (struct die_info *, struct dwarf2_cu *); +static void process_enumeration_scope (struct die_info *, struct dwarf2_cu *); static struct type *dwarf_base_type (int, int, struct dwarf2_cu *); @@ -2043,7 +2043,7 @@ add_partial_structure (struct partial_di what template types look like, because the demangler frequently doesn't give the same name as the debug info. We could fix this by only using the demangled name to get the - prefix (but see comment in read_structure_scope). */ + prefix (but see comment in read_structure_type). */ struct partial_die_info *child_pdi = struct_pdi->die_child; @@ -2595,17 +2595,17 @@ process_die (struct die_info *die, struc case DW_TAG_class_type: case DW_TAG_structure_type: case DW_TAG_union_type: - read_structure_scope (die, cu); + read_structure_type (die, cu); process_structure_scope (die, cu); break; case DW_TAG_enumeration_type: read_enumeration_type (die, cu); - read_enumeration_scope (die, cu); + process_enumeration_scope (die, cu); break; - /* FIXME: These initialize die->type, but do not create a symbol - or process any children. Therefore it doesn't do anything that - won't be done on-demand by read_type_die. */ + /* FIXME drow/2004-03-14: These initialize die->type, but do not create + a symbol or process any children. Therefore it doesn't do anything + that won't be done on-demand by read_type_die. */ case DW_TAG_subroutine_type: read_subroutine_type (die, cu); break; @@ -3641,7 +3641,7 @@ dwarf2_attach_fn_fields_to_type (struct suppresses creating a symbol table entry itself). */ static void -read_structure_scope (struct die_info *die, struct dwarf2_cu *cu) +read_structure_type (struct die_info *die, struct dwarf2_cu *cu) { struct objfile *objfile = cu->objfile; struct type *type; @@ -3963,7 +3963,7 @@ read_enumeration_type (struct die_info * NOTE: We reverse the order of the element list. */ static void -read_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu) +process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu) { struct objfile *objfile = cu->objfile; struct die_info *child_die; @@ -6706,7 +6706,7 @@ new_symbol (struct die_info *die, struct /* Make sure that the symbol includes appropriate enclosing classes/namespaces in its name. These are calculated in - read_structure_scope, and the correct name is saved in + read_structure_type, and the correct name is saved in the type. */ if (cu->language == language_cplus) @@ -7048,7 +7048,7 @@ read_type_die (struct die_info *die, str case DW_TAG_class_type: case DW_TAG_structure_type: case DW_TAG_union_type: - read_structure_scope (die, cu); + read_structure_type (die, cu); break; case DW_TAG_enumeration_type: read_enumeration_type (die, cu);