Re: [PATCH RFA] Create new file mips-tdep.h

[Andrew Cagney <ac131313 at redhat dot com>]

> I have some other changes under way in which I will need to know which
> mips ABI is in use.  I've moved struct gdbarch_tdep and the enums
> that it depends upon into a new header file.
>
> Okay?
>
> 	* Makefile.in (mips_tdep_h): Define.
> 	(mips-tdep.o): Remove osabi_h from dependency list.  Add mips_tdep_h
> 	to dependency list.
> 	* mips-tdep.h: New file.
> 	* mips-tdep.c (mips-tdep.h): Include.
> 	(osabi.h): Don't include (since it's included by mips-tdep.h).
> 	(enum mips_abi, enum_mips_fpu_type, struct gdbarch_tdep): Move
> 	definitions to mips-tdep.h.
Rather than publishing `struct gdbarch_tdep', can you instead just 
publish accessor methods for the parts you need?  Otherwize ok.

Andrew


> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/gdb/Makefile.in,v
> retrieving revision 1.267
> diff -u -p -r1.267 Makefile.in
> --- Makefile.in	1 Oct 2002 19:26:04 -0000	1.267
> +++ Makefile.in	4 Oct 2002 00:49:40 -0000
> @@ -684,6 +684,7 @@ macrotab_h = macrotab.h
>  main_h = main.h
>  memattr_h = memattr.h
>  minimon_h = minimon.h
> +mips_tdep_h = mips-tdep.h $(osabi_h)
>  mipsnbsd_tdep_h = mipsnbsd-tdep.h
>  monitor_h = monitor.h
>  nbsd_tdep_h = nbsd-tdep.h
> @@ -1902,7 +1903,7 @@ mips-nat.o: mips-nat.c $(defs_h) $(infer
>  mips-tdep.o: mips-tdep.c $(defs_h) $(gdb_string_h) $(frame_h) $(inferior_h) \
>  	$(symtab_h) $(value_h) $(gdbcmd_h) $(language_h) $(gdbcore_h) \
>  	$(symfile_h) $(objfiles_h) $(gdbtypes_h) $(target_h) $(arch_utils_h) \
> -	$(regcache_h) $(osabi_h) $(opcode_mips_h) $(elf_mips_h) $(elf_bfd_h) \
> +	$(regcache_h) $(mips_tdep_h) $(opcode_mips_h) $(elf_mips_h) $(elf_bfd_h) \
>  	$(symcat_h)
>  mipsm3-nat.o: mipsm3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
>  mipsnbsd-nat.o: mipsnbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
> Index: mips-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/mips-tdep.c,v
> retrieving revision 1.129
> diff -u -p -r1.129 mips-tdep.c
> --- mips-tdep.c	2 Oct 2002 01:28:55 -0000	1.129
> +++ mips-tdep.c	4 Oct 2002 00:49:42 -0000
> @@ -38,7 +38,7 @@
>  #include "target.h"
>  #include "arch-utils.h"
>  #include "regcache.h"
> -#include "osabi.h"
> +#include "mips-tdep.h"
>  
>  #include "opcode/mips.h"
>  #include "elf/mips.h"
> @@ -57,19 +57,6 @@ enum
>    MIPS_FPU_DOUBLE_REGSIZE = 8
>  };
>  
> -/* All the possible MIPS ABIs. */
> -
> -enum mips_abi
> -  {
> -    MIPS_ABI_UNKNOWN = 0,
> -    MIPS_ABI_N32,
> -    MIPS_ABI_O32,
> -    MIPS_ABI_N64,
> -    MIPS_ABI_O64,
> -    MIPS_ABI_EABI32,
> -    MIPS_ABI_EABI64,
> -    MIPS_ABI_LAST
> -  };
>  
>  static const char *mips_abi_string;
>  
> @@ -105,17 +92,6 @@ static const char *size_enums[] = {
>    0
>  };
>  
> -/* Some MIPS boards don't support floating point while others only
> -   support single-precision floating-point operations.  See also
> -   FP_REGISTER_DOUBLE. */
> -
> -enum mips_fpu_type
> -  {
> -    MIPS_FPU_DOUBLE,		/* Full double precision floating point.  */
> -    MIPS_FPU_SINGLE,		/* Single precision floating point (R4650).  */
> -    MIPS_FPU_NONE		/* No floating point.  */
> -  };
> -
>  #ifndef MIPS_DEFAULT_FPU_TYPE
>  #define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_DOUBLE
>  #endif
> @@ -124,26 +100,6 @@ static enum mips_fpu_type mips_fpu_type 
>  
>  static int mips_debug = 0;
>  
> -/* MIPS specific per-architecture information */
> -struct gdbarch_tdep
> -  {
> -    /* from the elf header */
> -    int elf_flags;
> -
> -    /* mips options */
> -    enum mips_abi mips_abi;
> -    enum mips_abi found_abi;
> -    enum mips_fpu_type mips_fpu_type;
> -    int mips_last_arg_regnum;
> -    int mips_last_fp_arg_regnum;
> -    int mips_default_saved_regsize;
> -    int mips_fp_register_double;
> -    int mips_default_stack_argsize;
> -    int gdb_target_is_mips64;
> -    int default_mask_address_p;
> -
> -    enum gdb_osabi osabi;
> -  };
>  
>  #define MIPS_EABI (gdbarch_tdep (current_gdbarch)->mips_abi == MIPS_ABI_EABI32 \
>  		   || gdbarch_tdep (current_gdbarch)->mips_abi == MIPS_ABI_EABI64)
> Index: mips-tdep.h
> ===================================================================
> RCS file: mips-tdep.h
> diff -N mips-tdep.h
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ mips-tdep.h	4 Oct 2002 00:49:42 -0000
> @@ -0,0 +1,72 @@
> +/* Target-dependent header for the MIPS architecture, for GDB, the GNU Debugger.
> +
> +   Copyright 2002 Free Software Foundation, Inc.
> +
> +   This file is part of GDB.
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 2 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program; if not, write to the Free Software
> +   Foundation, Inc., 59 Temple Place - Suite 330,
> +   Boston, MA 02111-1307, USA.  */
> +
> +#ifndef MIPS_TDEP_H
> +#define MIPS_TDEP_H
> +
> +#include "osabi.h"
> +
> +/* All the possible MIPS ABIs. */
> +enum mips_abi
> +  {
> +    MIPS_ABI_UNKNOWN = 0,
> +    MIPS_ABI_N32,
> +    MIPS_ABI_O32,
> +    MIPS_ABI_N64,
> +    MIPS_ABI_O64,
> +    MIPS_ABI_EABI32,
> +    MIPS_ABI_EABI64,
> +    MIPS_ABI_LAST
> +  };
> +
> +/* Some MIPS boards don't support floating point while others only
> +   support single-precision floating-point operations.  See also
> +   FP_REGISTER_DOUBLE. */
> +
> +enum mips_fpu_type
> +  {
> +    MIPS_FPU_DOUBLE,		/* Full double precision floating point.  */
> +    MIPS_FPU_SINGLE,		/* Single precision floating point (R4650).  */
> +    MIPS_FPU_NONE		/* No floating point.  */
> +  };
> +
> +/* MIPS specific per-architecture information */
> +struct gdbarch_tdep
> +  {
> +    /* from the elf header */
> +    int elf_flags;
> +
> +    /* mips options */
> +    enum mips_abi mips_abi;
> +    enum mips_abi found_abi;
> +    enum mips_fpu_type mips_fpu_type;
> +    int mips_last_arg_regnum;
> +    int mips_last_fp_arg_regnum;
> +    int mips_default_saved_regsize;
> +    int mips_fp_register_double;
> +    int mips_default_stack_argsize;
> +    int gdb_target_is_mips64;
> +    int default_mask_address_p;
> +
> +    enum gdb_osabi osabi;
> +  };
> +
> +#endif /* MIPS_TDEP_H */