[commit/mips] For elf_flags, use the previous arch

[commit/mips] For elf_flags, use the previous arch

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

Hello,

This fixes a subtle edge case.  Given the sequence:

	(gdb) file foo
	(gdb) set mipsfpu none
	(gdb) file foo

An extra, unnecessary arch was being created after the second "file foo".

committed,
Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 780 bytes --]

2004-01-07  Andrew Cagney  <cagney@redhat.com>

	* mips-tdep.c (mips_gdbarch_init): Set elf_flags to the previous
	architecture's elf flags (when available).

Index: mips-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mips-tdep.c,v
retrieving revision 1.267
diff -u -r1.267 mips-tdep.c
--- mips-tdep.c	8 Jan 2004 04:57:38 -0000	1.267
+++ mips-tdep.c	8 Jan 2004 05:02:23 -0000
@@ -5688,6 +5688,8 @@
   /* First of all, extract the elf_flags, if available.  */
   if (info.abfd && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour)
     elf_flags = elf_elfheader (info.abfd)->e_flags;
+  else if (arches != NULL)
+    elf_flags = gdbarch_tdep (arches->gdbarch)->elf_flags;
   else
     elf_flags = 0;
   if (gdbarch_debug)

Re: [commit/mips] For elf_flags, use the previous arch

[Daniel Jacobowitz]

On Thu, Jan 08, 2004 at 12:06:25AM -0500, Andrew Cagney wrote:
> Hello,
> 
> This fixes a subtle edge case.  Given the sequence:
> 
> 	(gdb) file foo
> 	(gdb) set mipsfpu none
> 	(gdb) file foo
> 
> An extra, unnecessary arch was being created after the second "file foo".

After the "file foo"?  I'm confused as to how this case can trigger,
since we ought to have info.abfd at that point, right?

> 2004-01-07  Andrew Cagney  <cagney@redhat.com>
> 
> 	* mips-tdep.c (mips_gdbarch_init): Set elf_flags to the previous
> 	architecture's elf flags (when available).
> 
> Index: mips-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/mips-tdep.c,v
> retrieving revision 1.267
> diff -u -r1.267 mips-tdep.c
> --- mips-tdep.c	8 Jan 2004 04:57:38 -0000	1.267
> +++ mips-tdep.c	8 Jan 2004 05:02:23 -0000
> @@ -5688,6 +5688,8 @@
>    /* First of all, extract the elf_flags, if available.  */
>    if (info.abfd && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour)
>      elf_flags = elf_elfheader (info.abfd)->e_flags;
> +  else if (arches != NULL)
> +    elf_flags = gdbarch_tdep (arches->gdbarch)->elf_flags;
>    else
>      elf_flags = 0;
>    if (gdbarch_debug)


-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

Re: [commit/mips] For elf_flags, use the previous arch

[Andrew Cagney]

> On Thu, Jan 08, 2004 at 12:06:25AM -0500, Andrew Cagney wrote:
> 
>> Hello,
>> 
>> This fixes a subtle edge case.  Given the sequence:
>> 
>> 	(gdb) file foo

this changes:
	elf_flags 0 -> 0x<something>
	fpu_type 0 -> 0

>> 	(gdb) set mipsfpu none

this was changing:
	elf_flags 0x<something> -> 0
	fpu_type 0 -> 2
but should have changed:
	elf_flags 0x<something> -> 0x<something>
	fpu_type 0 -> 2

>> 	(gdb) file foo

this was changing:
	elf_flags 0 -> 0x<something>
	fpu_type 2 -> 2
but should have changed:
	elf_flags 0x<something> -> 0x<something>
	fpu_type 2 -> 2
i.e., no change

>> 
>> An extra, unnecessary arch was being created after the second "file foo".
> 
> 
> After the "file foo"?  I'm confused as to how this case can trigger,
> since we ought to have info.abfd at that point, right?

Andrew

Re: [commit/mips] For elf_flags, use the previous arch

[Daniel Jacobowitz]

On Thu, Jan 08, 2004 at 12:55:20PM -0500, Andrew Cagney wrote:
> >On Thu, Jan 08, 2004 at 12:06:25AM -0500, Andrew Cagney wrote:
> >
> >>Hello,
> >>
> >>This fixes a subtle edge case.  Given the sequence:
> >>
> >>	(gdb) file foo
> 
> this changes:
> 	elf_flags 0 -> 0x<something>
> 	fpu_type 0 -> 0
> 
> >>	(gdb) set mipsfpu none
> 
> this was changing:
> 	elf_flags 0x<something> -> 0
> 	fpu_type 0 -> 2
> but should have changed:
> 	elf_flags 0x<something> -> 0x<something>
> 	fpu_type 0 -> 2
> 
> >>	(gdb) file foo
> 
> this was changing:
> 	elf_flags 0 -> 0x<something>
> 	fpu_type 2 -> 2
> but should have changed:
> 	elf_flags 0x<something> -> 0x<something>
> 	fpu_type 2 -> 2
> i.e., no change

Thanks, I gotcha now.  The unnecessary architecture happens after set
mpsfpu none.

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer