Re: [PATCH] Proper _to_regnum for DWARF on Cygwin

[Brian Ford <ford@vss.fsi.com>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2092 bytes --]

Oops, missed the comment refering to the removed function.  Updated patch
attached.  ChangeLog unchanged from below.  Ok to apply?

On Mon, 19 Apr 2004, Brian Ford wrote:

> On Mon, 19 Apr 2004, Mark Kettenis wrote:
>
> > Hmm.  I very much agree with what Brian wrote in his follow-up
> > messages.  I think DJGPP is doing the right thing using the SVR4
> > scheme for DWARF2 while staying backwards compatible for stabs.  I'd
> > advise him to do the same for cygwin.
>
> Ok, do I need approval to revert my own patch ;-) ?
>
> 2004-04-19  Brian Ford  <ford@vss.fsi.com>
>
> 	Revert 2004-04-16 change.
> 	* i386-tdep.c (i386_gdbarch_init): Fix comment typos.
> 	(i386_coff_init_abi): Remove.
> 	* i386-tdep.h (i386_coff_init_abi): Remove.
> 	* i386-cygwin-tdep.c (i386_cygwin_init_abi): Remove call to above.
>
> > If i386_coff_init_abi will be gone, the comments aren't contradictiory
> > anymore.
>
> Not exactly, as Eli pointed out before, both of the following will be
> false for DJGPP and Cygwin/Mingw:
>
>      Currently, each GCC i386 target always uses the same register
>      numbering scheme across all its supported debugging formats
>      i.e. SDB (COFF), stabs and DWARF 2.  This is because
>      gcc/sdbout.c, gcc/dbxout.c and gcc/dwarf2out.c all use the
>      DBX_REGISTER_NUMBER macro which is defined by each target's
>      respective config header in a manner independent of the requested
>      output debugging format.
>
> > On Mon, 19 Apr 2004 at 08:50:59 +0200, Eli Zaretskii wrote:
> >
> >> On Sun, 18 Apr 2004 20:38:38 +0200 (CEST), Mark Kettenis wrote:
> >>
> >>>+     floating-point registers, and are implemented by the attays
> >> 							        ^^^^^^
> >> A typo.
> >
> > I though I'd fixed that one :-(.
>
> and another:
>
>      implemented in dbx64_register_map, and us used for AMD64; see
>                                             ^^
> both of which are fixed in the attached patch.  Ok to apply?

-- 
Brian Ford
Senior Realtime Software Engineer
VITAL - Visual Simulation Systems
FlightSafety International
Phone: 314-551-8460
Fax:   314-551-8444

[-- Attachment #2: Type: TEXT/PLAIN, Size: 3503 bytes --]

Index: i386-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.c,v
retrieving revision 1.187
diff -u -p -r1.187 i386-tdep.c
--- i386-tdep.c	18 Apr 2004 18:38:04 -0000	1.187
+++ i386-tdep.c	20 Apr 2004 16:18:37 -0000
@@ -1782,16 +1782,6 @@ i386_svr4_sigcontext_addr (struct frame_
 }
 \f
 
-/* Generic COFF.  */
-
-void
-i386_coff_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  /* We typically use DWARF-in-COFF with the dbx register numbering.  */
-  set_gdbarch_dwarf_reg_to_regnum (gdbarch, i386_dbx_reg_to_regnum);
-  set_gdbarch_dwarf2_reg_to_regnum (gdbarch, i386_dbx_reg_to_regnum);
-}
-
 /* Generic ELF.  */
 
 void
@@ -1995,12 +1985,12 @@ i386_gdbarch_init (struct gdbarch_info i
   /* NOTE: kettenis/20040418: GCC does have two possible register
      numbering schemes on the i386: dbx and SVR4.  These schemes
      differ in how they number %ebp, %esp, %eflags, and the
-     floating-point registers, and are implemented by the attays
+     floating-point registers, and are implemented by the arrays
      dbx_register_map[] and svr4_dbx_register_map in
      gcc/config/i386.c.  GCC also defines a third numbering scheme in
      gcc/config/i386.c, which it designates as the "default" register
      map used in 64bit mode.  This last register numbering scheme is
-     implemented in dbx64_register_map, and us used for AMD64; see
+     implemented in dbx64_register_map, and is used for AMD64; see
      amd64-tdep.c.
 
      Currently, each GCC i386 target always uses the same register
@@ -2019,8 +2009,8 @@ i386_gdbarch_init (struct gdbarch_info i
      native compiler (FreeBSD, NetBSD, OpenBSD, GNU/Linux) or for
      targets where the native toolchain uses a different numbering
      scheme for a particular debug format (stabs-in-ELF on Solaris)
-     the defaults below will have to be overridden, like the functions
-     i386_coff_init_abi() and i386_elf_init_abi() do.  */
+     the defaults below will have to be overridden, like
+     i386_elf_init_abi() does.  */
 
   /* Use the dbx register numbering scheme for stabs and COFF.  */
   set_gdbarch_stab_reg_to_regnum (gdbarch, i386_dbx_reg_to_regnum);
Index: i386-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.h,v
retrieving revision 1.39
diff -u -p -r1.39 i386-tdep.h
--- i386-tdep.h	16 Apr 2004 16:49:55 -0000	1.39
+++ i386-tdep.h	20 Apr 2004 16:18:37 -0000
@@ -210,9 +210,6 @@ extern const struct regset *
   i386_regset_from_core_section (struct gdbarch *gdbarch,
 				 const char *sect_name, size_t sect_size);
 
-/* Initialize a basic COFF architecture variant.  */
-extern void i386_coff_init_abi (struct gdbarch_info, struct gdbarch *);
-
 /* Initialize a basic ELF architecture variant.  */
 extern void i386_elf_init_abi (struct gdbarch_info, struct gdbarch *);
 
Index: i386-cygwin-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-cygwin-tdep.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-cygwin-tdep.c
--- i386-cygwin-tdep.c	16 Apr 2004 16:49:55 -0000	1.4
+++ i386-cygwin-tdep.c	20 Apr 2004 16:18:37 -0000
@@ -31,8 +31,6 @@ i386_cygwin_init_abi (struct gdbarch_inf
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
-  i386_coff_init_abi (info, gdbarch);
-
   tdep->struct_return = reg_struct_return;
 }