[RFA] clean-up of sym_read mainline flag (1/2)

[RFA] clean-up of sym_read mainline flag (1/2)

[Tristan Gingold]

Hi,

this is preliminary work to make dsym files working better on Darwin.

The mainline flag from sym_read routines was passed as argument to functions
that doesn't use it.  To clean-up a little bit and to make the code more
readable, this patch removes this unused parameter.

No regression on linux x86-64.

Tristan.

2009-11-26  Tristan Gingold  <gingold@adacore.com>

	* dwarf2read.c (dwarf2_build_psymtabs_easy): Remove mainline parameter.
	(dwarf2_build_psymtabs_hard): Ditto.
	(dwarf2_build_psymtabs): Ajust calls.
	* stabsread.h (elfstab_build_psymtabs): Remove mainline parameter on
	the prototype.
	(coffstab_build_psymtabs): Ditto.
	(stabsect_build_psymtabs): Ditto.
	* dbxread.c (coffstab_build_psymtabs): Remove mainline parameter on
	the definition.
	(elfstab_build_psymtabs): Ditto.
	(stabsect_build_psymtabs): Ditto.
	* coffread.c (coff_symfile_read): Adjust call.
	* elfread.c (elf_symfile_read): Ditto.
	* somread.c (som_symfile_read): Ditto.
---
diff --git a/gdb/coffread.c b/gdb/coffread.c
index 98c563a..d66312b 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -634,7 +634,6 @@ coff_symfile_read (struct objfile *objfile, int mainline)
       stabstrsize = bfd_section_size (abfd, info->stabstrsect);
 
       coffstab_build_psymtabs (objfile,
-			       mainline,
 			       info->textaddr, info->textsize,
 			       info->stabsects,
 			       info->stabstrsect->filepos, stabstrsize);
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 6d4c893..aad25b7 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -3332,7 +3332,7 @@ no enclosing block"));
    adjusted for coff details. */
 
 void
-coffstab_build_psymtabs (struct objfile *objfile, int mainline,
+coffstab_build_psymtabs (struct objfile *objfile,
 			 CORE_ADDR textaddr, unsigned int textsize,
 			 struct stab_section_list *stabsects,
 			 file_ptr stabstroffset, unsigned int stabstrsize)
@@ -3425,8 +3425,7 @@ coffstab_build_psymtabs (struct objfile *objfile, int mainline,
    adjusted for elf details. */
 
 void
-elfstab_build_psymtabs (struct objfile *objfile, int mainline,
-			asection *stabsect,
+elfstab_build_psymtabs (struct objfile *objfile, asection *stabsect,
 			file_ptr stabstroffset, unsigned int stabstrsize)
 {
   int val;
@@ -3509,7 +3508,7 @@ elfstab_build_psymtabs (struct objfile *objfile, int mainline,
    This routine is mostly copied from dbx_symfile_init and dbx_symfile_read. */
 
 void
-stabsect_build_psymtabs (struct objfile *objfile, int mainline, char *stab_name,
+stabsect_build_psymtabs (struct objfile *objfile, char *stab_name,
 			 char *stabstr_name, char *text_name)
 {
   int val;
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 906bbfc..0fa63a5 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -769,7 +769,7 @@ dwarf2_invalid_attrib_class_complaint (const char *arg1, const char *arg2)
 static void dwarf2_locate_sections (bfd *, asection *, void *);
 
 #if 0
-static void dwarf2_build_psymtabs_easy (struct objfile *, int);
+static void dwarf2_build_psymtabs_easy (struct objfile *);
 #endif
 
 static void dwarf2_create_include_psymtab (char *, struct partial_symtab *,
@@ -779,7 +779,7 @@ static void dwarf2_build_include_psymtabs (struct dwarf2_cu *,
                                            struct die_info *,
                                            struct partial_symtab *);
 
-static void dwarf2_build_psymtabs_hard (struct objfile *, int);
+static void dwarf2_build_psymtabs_hard (struct objfile *);
 
 static void scan_partial_symbols (struct partial_die_info *,
 				  CORE_ADDR *, CORE_ADDR *,
@@ -1474,14 +1474,14 @@ dwarf2_build_psymtabs (struct objfile *objfile, int mainline)
       /* Things are significantly easier if we have .debug_aranges and
          .debug_pubnames sections */
 
-      dwarf2_build_psymtabs_easy (objfile, mainline);
+      dwarf2_build_psymtabs_easy (objfile);
     }
   else
 #endif
     /* only test this case for now */
     {
       /* In this case we have to work a bit harder */
-      dwarf2_build_psymtabs_hard (objfile, mainline);
+      dwarf2_build_psymtabs_hard (objfile);
     }
 }
 
@@ -1490,7 +1490,7 @@ dwarf2_build_psymtabs (struct objfile *objfile, int mainline)
    .debug_pubnames and .debug_aranges sections.  */
 
 static void
-dwarf2_build_psymtabs_easy (struct objfile *objfile, int mainline)
+dwarf2_build_psymtabs_easy (struct objfile *objfile)
 {
   bfd *abfd = objfile->obfd;
   char *aranges_buffer, *pubnames_buffer;
@@ -2075,7 +2075,7 @@ build_type_psymtabs (struct objfile *objfile)
    .debug_info and .debug_abbrev sections.  */
 
 static void
-dwarf2_build_psymtabs_hard (struct objfile *objfile, int mainline)
+dwarf2_build_psymtabs_hard (struct objfile *objfile)
 {
   /* Instead of reading this into a big buffer, we should probably use
      mmap()  on architectures that support it. (FIXME) */
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 0885240..b9e1568 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -736,7 +736,6 @@ elf_symfile_read (struct objfile *objfile, int mainline)
       /* FIXME should probably warn about a stab section without a stabstr.  */
       if (str_sect)
 	elfstab_build_psymtabs (objfile,
-				mainline,
 				ei.stabsect,
 				str_sect->filepos,
 				bfd_section_size (abfd, str_sect));
diff --git a/gdb/somread.c b/gdb/somread.c
index 36a2b28..d519d2c 100644
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -340,7 +340,7 @@ som_symfile_read (struct objfile *objfile, int mainline)
 
   /* Now read information from the stabs debug sections.
      This is emitted by gcc.  */
-  stabsect_build_psymtabs (objfile, mainline,
+  stabsect_build_psymtabs (objfile,
 			   "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$");
 }
 
diff --git a/gdb/stabsread.h b/gdb/stabsread.h
index 83458d1..19cc863 100644
--- a/gdb/stabsread.h
+++ b/gdb/stabsread.h
@@ -175,21 +175,18 @@ extern void process_one_symbol (int, int, CORE_ADDR, char *,
 				struct section_offsets *, struct objfile *);
 
 extern void elfstab_build_psymtabs (struct objfile *objfile,
-				    int mainline,
 				    asection *stabsect,
 				    file_ptr stabstroffset,
 				    unsigned int stabstrsize);
 
 extern void coffstab_build_psymtabs
   (struct objfile *objfile,
-   int mainline,
    CORE_ADDR textaddr, unsigned int textsize,
    struct stab_section_list *stabs,
    file_ptr stabstroffset, unsigned int stabstrsize);
 
-extern void stabsect_build_psymtabs
-  (struct objfile *objfile,
-   int mainline, char *stab_name, char *stabstr_name, char *text_name);
+extern void stabsect_build_psymtabs (struct objfile *objfile, char *stab_name,
+				     char *stabstr_name, char *text_name);
 
 extern void elfstab_offset_sections (struct objfile *,
 				     struct partial_symtab *);
-- 
1.6.2

Re: [RFA] clean-up of sym_read mainline flag (1/2)

[Tom Tromey]

>>>>> "Tristan" == Tristan Gingold <gingold@adacore.com> writes:

Tristan> The mainline flag from sym_read routines was passed as argument
Tristan> to functions that doesn't use it.  To clean-up a little bit and
Tristan> to make the code more readable, this patch removes this unused
Tristan> parameter.

This is almost ok.

Tristan>  void
Tristan> -coffstab_build_psymtabs (struct objfile *objfile, int mainline,
Tristan> +coffstab_build_psymtabs (struct objfile *objfile,
Tristan>  			 CORE_ADDR textaddr, unsigned int textsize,

I spot-checked and noticed that this function (and some others in this
file) documents the 'mainline' parameter in its header comment.  These
comments must also be updated.

This is ok with that change.  Please be sure to check all the functions,
thanks.

Tom

Re: [RFA] clean-up of sym_read mainline flag (1/2)

[Tristan Gingold]

On Nov 30, 2009, at 9:19 PM, Tom Tromey wrote:

>>>>>> "Tristan" == Tristan Gingold <gingold@adacore.com> writes:
> 
> Tristan> The mainline flag from sym_read routines was passed as argument
> Tristan> to functions that doesn't use it.  To clean-up a little bit and
> Tristan> to make the code more readable, this patch removes this unused
> Tristan> parameter.
> 
> This is almost ok.
> 
> Tristan>  void
> Tristan> -coffstab_build_psymtabs (struct objfile *objfile, int mainline,
> Tristan> +coffstab_build_psymtabs (struct objfile *objfile,
> Tristan>  			 CORE_ADDR textaddr, unsigned int textsize,
> 
> I spot-checked and noticed that this function (and some others in this
> file) documents the 'mainline' parameter in its header comment.  These
> comments must also be updated.
> 
> This is ok with that change.  Please be sure to check all the functions,

I have updated the comments too, and I hope I checked all the functions.

Thanks,
Tristan.