This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Bug 20936 - provide sparc and sparcv9 target description XML files


On 17-01-09 22:18:22, Ivo Raisr wrote:

> ChangeLog entry:
> 2017-01-09  Ivo Raisr  <ivo.raisr@oracle.com>
> 
> 	Split real and pseudo registers.
> 	* sparc-tdep.h: Separate real and pseudo registers.

We describe the changes in the ChangeLog, so the change can be described
like this:

	* sparc-tdep.h (SPARC_CORE_REGISTERS): New macro.
	(sparc32_pseudo_regnum): New enum.

> 	* sparc64-tdep.h: Separate real and pseudo registers.

	* sparc64-tdep.h (sparc64_pseudo_regnum): New enum.

> 	* sparc-tdep.c (sparc32_pseudo_register_name): New function returning
> 	pseudo register names on sparc 32-bit.

	"New function" should be enough to describe the change.

> 	(sparc32_register_name): Use sparc32_pseudo_register_name().
> 	(sparc32_pseudo_register_type): New function returning pseudo register
> 	types on sparc 32-bit.
> 	(sparc32_register_type): Use sparc32_pseudo_register_type().
> 	(sparc32_pseudo_register_read, sparc32_pseudo_register_write): Pseudo
> 	registers may have different numbers.
> 	* sparc64-tdep.c (sparc64_pseudo_register_name): New function returning
> 	pseudo register names on sparc 64-bit.
> 	(sparc64_register_name): Use sparc64_pseudo_register_name().
> 	(sparc64_pseudo_register_type): New function returning pseudo register
> 	types on sparc 64-bit.
> 	(sparc64_register_type): Use sparc64_pseudo_register_type().
> 	(sparc64_pseudo_register_read, sparc64_pseudo_register_write): Pseudo
> 	registers may have different numbers.
> 	(sparc64_store_floating_fields, sparc64_extract_floating_fields,
> 	sparc64_store_arguments): Pseudo registers may have different numbers;
> 	deal with it.

> --- a/gdb/sparc-tdep.c	2016-02-09 19:19:39.000000000 +0000
> +++ gdb-7.11/gdb/sparc-tdep.c	2017-01-09 13:11:30.421265402 +0000
> @@ -295,20 +295,23 @@ sparc_structure_or_union_p (const struct
>  }
>  
>  /* Register information.  */
> +#define SPARC32_FPU_REGISTERS                             \
> +  "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",         \
> +  "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",   \
> +  "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \
> +  "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31"
> +#define SPARC32_CP0_REGISTERS \
> +  "y", "psr", "wim", "tbr", "pc", "npc", "fsr", "csr"
> +
> +static const char *sparc_core_register_names[] = { SPARC_CORE_REGISTERS };
> +static const char *sparc32_fpu_register_names[] = { SPARC32_FPU_REGISTERS };
> +static const char *sparc32_cp0_register_names[] = { SPARC32_CP0_REGISTERS };

They are not used in this patch at all.  Should be moved to patch #2.

>  
>  static const char *sparc32_register_names[] =
>  {
> -  "g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7",
> -  "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7",
> -  "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7",
> -  "i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7",
> -
> -  "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
> -  "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
> -  "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",
> -  "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31",
> -
> -  "y", "psr", "wim", "tbr", "pc", "npc", "fsr", "csr"
> +  SPARC_CORE_REGISTERS,
> +  SPARC32_FPU_REGISTERS,
> +  SPARC32_CP0_REGISTERS
>  };
>  
>  /* Total number of registers.  */
> @@ -327,17 +330,26 @@ static const char *sparc32_pseudo_regist
>  #define SPARC32_NUM_PSEUDO_REGS ARRAY_SIZE (sparc32_pseudo_register_names)
>  
>  /* Return the name of register REGNUM.  */
> +static const char *
> +sparc32_pseudo_register_name (struct gdbarch *gdbarch, int regnum)

Don't insert the new function between sparc32_register_name and its
comments.  We also need comments to sparc32_pseudo_register_name.

/* Return the name of pseudo register REGNUM.  */

static const char *
sparc32_pseudo_register_name (struct gdbarch *gdbarch, int regnum)
....

/* Return the name of register REGNUM.  */

static const char *
sparc32_register_name (struct gdbarch *gdbarch, int regnum)

>  /* Return the GDB type object for the "standard" data type of data in
>     register REGNUM.  */
> +static struct type *
> +sparc32_pseudo_register_type (struct gdbarch *gdbarch, int regnum)

Likewise, don't insert sparc32_pseudo_register_type between
sparc32_register_type and its type.

> --- a/gdb/sparc64-tdep.c	2016-02-09 19:19:39.000000000 +0000
> +++ gdb-7.11/gdb/sparc64-tdep.c	2017-01-09 13:11:51.858903807 +0000
> @@ -226,28 +226,29 @@ sparc64_fprs_type (struct gdbarch *gdbar
>  
>  
>  /* Register information.  */
> +#define SPARC64_FPU_REGISTERS                             \
> +  "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",         \
> +  "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",   \
> +  "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \
> +  "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \
> +  "f32", "f34", "f36", "f38", "f40", "f42", "f44", "f46", \
> +  "f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62"
> +#define SPARC64_CP0_REGISTERS                                             \
> +  "pc", "npc",                                                            \
> +  /* FIXME: Give "state" a name until we start using register groups.  */ \
> +  "state",                                                                \
> +  "fsr",                                                                  \
> +  "fprs",                                                                 \
> +  "y"
> +
> +static const char *sparc64_fpu_register_names[] = { SPARC64_FPU_REGISTERS };
> +static const char *sparc64_cp0_register_names[] = { SPARC64_CP0_REGISTERS };

They are not used, should be moved to patch #2.

> @@ -273,28 +274,57 @@ static const char *sparc64_pseudo_regist
>  #define SPARC64_NUM_PSEUDO_REGS ARRAY_SIZE (sparc64_pseudo_register_names)
>  
>  /* Return the name of register REGNUM.  */
> +static const char *
> +sparc64_pseudo_register_name (struct gdbarch *gdbarch, int regnum)

sparc64_pseudo_register_name is added between sparc64_register_name and
its comments.

> +{
> +  regnum -= gdbarch_num_regs (gdbarch);
> +
> +  if (regnum < SPARC64_NUM_PSEUDO_REGS)
> +    return sparc64_pseudo_register_names[regnum];
> +
> +  internal_error (__FILE__, __LINE__,
> +                  _("sparc64_pseudo_register_name: bad register number %d"),
> +                  regnum);
> +}
>  
>  static const char *
>  sparc64_register_name (struct gdbarch *gdbarch, int regnum)
>  {
> -  if (regnum >= 0 && regnum < SPARC64_NUM_REGS)
> +  if (regnum >= 0 && regnum < gdbarch_num_regs (gdbarch))
>      return sparc64_register_names[regnum];
>  
> -  if (regnum >= SPARC64_NUM_REGS
> -      && regnum < SPARC64_NUM_REGS + SPARC64_NUM_PSEUDO_REGS)
> -    return sparc64_pseudo_register_names[regnum - SPARC64_NUM_REGS];
> -
> -  return NULL;
> +  return sparc64_pseudo_register_name (gdbarch, regnum);
>  }
>  
>  /* Return the GDB type object for the "standard" data type of data in
>     register REGNUM.  */
> +static struct type *
> +sparc64_pseudo_register_type (struct gdbarch *gdbarch, int regnum)

Likewise.

> +{
> +  regnum -= gdbarch_num_regs (gdbarch);
> +
> +  if (regnum == SPARC64_CWP_REGNUM)
> +    return builtin_type (gdbarch)->builtin_int64;
> +  if (regnum == SPARC64_PSTATE_REGNUM)
> +    return sparc64_pstate_type (gdbarch);
> +  if (regnum == SPARC64_ASI_REGNUM)
> +    return builtin_type (gdbarch)->builtin_int64;
> +  if (regnum == SPARC64_CCR_REGNUM)
> +    return builtin_type (gdbarch)->builtin_int64;
> +  if (regnum >= SPARC64_D0_REGNUM && regnum <= SPARC64_D62_REGNUM)
> +    return builtin_type (gdbarch)->builtin_double;
> +  if (regnum >= SPARC64_Q0_REGNUM && regnum <= SPARC64_Q60_REGNUM)
> +    return builtin_type (gdbarch)->builtin_long_double;
> +
> +  internal_error (__FILE__, __LINE__,
> +                  _("sparc64_pseudo_register_type: bad register number %d"),
> +                  regnum);
> +}
>  

-- 
Yao (齐尧)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]