Re: [PATCH 2/5] Change linetables to be objfile-independent

[Simon Marchi <simark@simark.ca>]

> diff --git a/gdb/objfiles.c b/gdb/objfiles.c
> index 8e7be8e2e25..2c8f5d14444 100644
> --- a/gdb/objfiles.c
> +++ b/gdb/objfiles.c
> @@ -616,22 +616,6 @@ objfile_relocate1 (struct objfile *objfile,
>  
>    /* OK, get all the symtabs.  */
>    {
> -    for (compunit_symtab *cust : objfile->compunits ())
> -      {
> -	for (symtab *s : cust->filetabs ())
> -	  {
> -	    struct linetable *l;
> -
> -	    /* First the line table.  */
> -	    l = s->linetable ();
> -	    if (l)
> -	      {
> -		for (int i = 0; i < l->nitems; ++i)
> -		  l->item[i].pc += delta[SECT_OFF_TEXT (objfile)];
> -	      }
> -	  }
> -      }
> -
It's nice to see the objfile_relocate1 function shrinking, it's like a
progress meter of your project :).

> diff --git a/gdb/symmisc.c b/gdb/symmisc.c
> index 6ff06ccaa93..d1458784e5c 100644
> --- a/gdb/symmisc.c
> +++ b/gdb/symmisc.c
> @@ -263,7 +263,7 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
>        for (int i = 0; i < len; i++)
>  	{
>  	  gdb_printf (outfile, " line %d at ", l->item[i].line);
> -	  gdb_puts (paddress (gdbarch, l->item[i].pc), outfile);
> +	  gdb_puts (paddress (gdbarch, l->item[i].raw_pc ()), outfile);

Here, do we want to see the raw of the relocated PC?  Maybe both, if
different?  The one you want depends if you are trying to match this
information against addresses from the ELF file (unrelocated) or against
addresses from the inferior (relocated).

> diff --git a/gdb/symtab.h b/gdb/symtab.h
> index 69f0eaa0f88..84d12617f31 100644
> --- a/gdb/symtab.h
> +++ b/gdb/symtab.h
> @@ -1547,18 +1547,29 @@ struct rust_vtable_symbol : public symbol
>  
>  struct linetable_entry
>  {
> +  /* Set the (unrelocated) PC for this entry.  */
> +  void set_pc (CORE_ADDR pc)
> +  { m_pc = pc; }

For symmetry with the getter, should this one be named "set_raw_pc"?

Simon