This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] Bug 20936 - provide sparc and sparcv9 target description XML files
On 17-01-11 14:14:10, Ivo Raisr wrote:
Patch is good to me, some nits below. Fix these nits, and then you
can push it in!
> ChangeLog entry:
> 2017-01-11 Ivo Raisr <ivo.raisr@oracle.com>
>
> Split real and pseudo registers.
> * sparc-tdep.h (SPARC_CORE_REGISTERS): New macro.
> (sparc32_pseudo_regnum): New enum.
> * sparc64-tdep.h (sparc64_pseudo_regnum): New enum.
> * sparc-tdep.c (SPARC32_FPU_REGISTERS): New macro.
> (SPARC32_CP0_REGISTERS): New macro.
> (sparc32_pseudo_register_name): New function.
> (sparc32_register_name): Use sparc32_pseudo_register_name().
(sparc32_register_name): Use sparc32_pseudo_register_name.
> (sparc32_pseudo_register_type): New function.
> (sparc32_register_type): Use sparc32_pseudo_register_type().
Likewise.
> (sparc32_pseudo_register_read, sparc32_pseudo_register_write): Pseudo
> registers may have different numbers.
(sparc32_pseudo_register_read, sparc32_pseudo_register_write): Handle
pseudo register numbers.
> * sparc64-tdep.c SPARC64_FPU_REGISTERS): New macro.
> (SPARC64_CP0_REGISTERS): New macro.
> (sparc64_pseudo_register_name): New function.
> (sparc64_register_name): Use sparc64_pseudo_register_name().
> (sparc64_pseudo_register_type): New function.
> (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.h 2016-02-09 19:19:39.000000000 +0000
> +++ gdb-7.11/gdb/sparc-tdep.h 2017-01-09 13:26:11.749929515 +0000
> @@ -20,6 +20,12 @@
> #ifndef SPARC_TDEP_H
> #define SPARC_TDEP_H 1
>
> +#define SPARC_CORE_REGISTERS \
> + "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"
> +
> struct frame_info;
> struct gdbarch;
> struct regcache;
> @@ -85,7 +91,7 @@ struct gdbarch_tdep
>
> enum sparc_regnum
> {
> - SPARC_G0_REGNUM, /* %g0 */
> + SPARC_G0_REGNUM = 0, /* %g0 */
> SPARC_G1_REGNUM,
> SPARC_G2_REGNUM,
> SPARC_G3_REGNUM,
> @@ -140,9 +146,12 @@ enum sparc32_regnum
> SPARC32_NPC_REGNUM, /* %npc */
> SPARC32_FSR_REGNUM, /* %fsr */
> SPARC32_CSR_REGNUM, /* %csr */
> +};
>
> - /* Pseudo registers. */
> - SPARC32_D0_REGNUM, /* %d0 */
> +/* Pseudo registers. */
> +enum sparc32_pseudo_regnum
> +{
> + SPARC32_D0_REGNUM = 0, /* %d0 */
> SPARC32_D30_REGNUM /* %d30 */
> = SPARC32_D0_REGNUM + 15
> };
> --- a/gdb/sparc-tdep.c 2016-02-09 19:19:39.000000000 +0000
> +++ gdb-7.11/gdb/sparc-tdep.c 2017-01-11 04:23:28.543904210 +0000
> @@ -295,20 +295,19 @@ 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 *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. */
> @@ -326,18 +325,28 @@ static const char *sparc32_pseudo_regist
> /* Total number of pseudo registers. */
> #define SPARC32_NUM_PSEUDO_REGS ARRAY_SIZE (sparc32_pseudo_register_names)
>
> -/* Return the name of register REGNUM. */
> +/* Return the name of pseudo register REGNUM. */
Add a blank line between function and its comment.
> +static const char *
> +sparc32_pseudo_register_name (struct gdbarch *gdbarch, int regnum)
> +{
> + regnum -= gdbarch_num_regs (gdbarch);
> +
> + if (regnum < SPARC32_NUM_PSEUDO_REGS)
> + return sparc32_pseudo_register_names[regnum];
>
> + internal_error (__FILE__, __LINE__,
> + _("sparc32_pseudo_register_name: bad register number %d"),
> + regnum);
> +}
> +
> +/* Return the name of register REGNUM. */
Likewise.
> static const char *
> sparc32_register_name (struct gdbarch *gdbarch, int regnum)
> {
> - if (regnum >= 0 && regnum < SPARC32_NUM_REGS)
> + if (regnum >= 0 && regnum < gdbarch_num_regs (gdbarch))
> return sparc32_register_names[regnum];
>
> - if (regnum < SPARC32_NUM_REGS + SPARC32_NUM_PSEUDO_REGS)
> - return sparc32_pseudo_register_names[regnum - SPARC32_NUM_REGS];
> -
> - return NULL;
> + return sparc32_pseudo_register_name (gdbarch, regnum);
> }
>
> /* Construct types for ISA-specific registers. */
> @@ -398,17 +407,28 @@ sparc_fsr_type (struct gdbarch *gdbarch)
> }
>
> /* Return the GDB type object for the "standard" data type of data in
> - register REGNUM. */
> + pseudo register REGNUM. */
Likewise.
> +static struct type *
> +sparc32_pseudo_register_type (struct gdbarch *gdbarch, int regnum)
> +{
> + regnum -= gdbarch_num_regs (gdbarch);
> +
> + if (regnum >= SPARC32_D0_REGNUM && regnum <= SPARC32_D30_REGNUM)
> + return builtin_type (gdbarch)->builtin_double;
> +
> + internal_error (__FILE__, __LINE__,
> + _("sparc32_pseudo_register_type: bad register number %d"),
> + regnum);
> +}
>
> +/* Return the GDB type object for the "standard" data type of data in
> + register REGNUM. */
Likewise.
> static struct type *
> sparc32_register_type (struct gdbarch *gdbarch, int regnum)
> {
> if (regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM)
> return builtin_type (gdbarch)->builtin_float;
>
> - if (regnum >= SPARC32_D0_REGNUM && regnum <= SPARC32_D30_REGNUM)
> - return builtin_type (gdbarch)->builtin_double;
> -
> if (regnum == SPARC_SP_REGNUM || regnum == SPARC_FP_REGNUM)
> return builtin_type (gdbarch)->builtin_data_ptr;
>
--
Yao (齐尧)