RFA: Remove 'power' variable from rs6000_gdbarch_init

RFA: Remove 'power' variable from rs6000_gdbarch_init

[Jim Blandy]

This patch has been tested with no regressions on i686-pc-linux-gnu x
powerpc-eabispe, and on an AIX 5.1. rs6000 (generating rs6000:6000
executables).  (Thanks to Joel B. for help with testing.)

2004-07-15  Jim Blandy  <jimb@redhat.com>

	* rs6000-tdep.c (rs6000_gdbarch_init): Delete variable 'power';
	replace references with expression used to initialize variable.

Index: gdb/rs6000-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v
retrieving revision 1.219
diff -c -p -r1.219 rs6000-tdep.c
*** gdb/rs6000-tdep.c	15 Jul 2004 08:02:36 -0000	1.219
--- gdb/rs6000-tdep.c	15 Jul 2004 09:00:15 -0000
*************** rs6000_gdbarch_init (struct gdbarch_info
*** 2741,2747 ****
  {
    struct gdbarch *gdbarch;
    struct gdbarch_tdep *tdep;
!   int wordsize, from_xcoff_exec, from_elf_exec, power, i, off;
    struct reg *regs;
    const struct variant *v;
    enum bfd_architecture arch;
--- 2741,2747 ----
  {
    struct gdbarch *gdbarch;
    struct gdbarch_tdep *tdep;
!   int wordsize, from_xcoff_exec, from_elf_exec, i, off;
    struct reg *regs;
    const struct variant *v;
    enum bfd_architecture arch;
*************** rs6000_gdbarch_init (struct gdbarch_info
*** 2840,2846 ****
      }
  
    gdbarch = gdbarch_alloc (&info, tdep);
-   power = arch == bfd_arch_rs6000;
  
    /* Initialize the number of real and pseudo registers in each variant.  */
    init_variants ();
--- 2840,2845 ----
*************** rs6000_gdbarch_init (struct gdbarch_info
*** 2862,2873 ****
    tdep->ppc_xer_regnum = 69;
    if (v->mach == bfd_mach_ppc_601)
      tdep->ppc_mq_regnum = 124;
!   else if (power)
      tdep->ppc_mq_regnum = 70;
    else
      tdep->ppc_mq_regnum = -1;
    tdep->ppc_fp0_regnum = 32;
!   tdep->ppc_fpscr_regnum = power ? 71 : 70;
    tdep->ppc_sr0_regnum = 71;
    tdep->ppc_vr0_regnum = -1;
    tdep->ppc_vrsave_regnum = -1;
--- 2861,2872 ----
    tdep->ppc_xer_regnum = 69;
    if (v->mach == bfd_mach_ppc_601)
      tdep->ppc_mq_regnum = 124;
!   else if (arch == bfd_arch_rs6000)
      tdep->ppc_mq_regnum = 70;
    else
      tdep->ppc_mq_regnum = -1;
    tdep->ppc_fp0_regnum = 32;
!   tdep->ppc_fpscr_regnum = (arch == bfd_arch_rs6000) ? 71 : 70;
    tdep->ppc_sr0_regnum = 71;
    tdep->ppc_vr0_regnum = -1;
    tdep->ppc_vrsave_regnum = -1;
*************** rs6000_gdbarch_init (struct gdbarch_info
*** 2952,2958 ****
    gdb_assert (strcmp (tdep->regs[tdep->ppc_gp0_regnum].name, "r0") == 0);
  
    /* Select instruction printer.  */
!   if (arch == power)
      set_gdbarch_print_insn (gdbarch, print_insn_rs6000);
    else
      set_gdbarch_print_insn (gdbarch, gdb_print_insn_powerpc);
--- 2951,2957 ----
    gdb_assert (strcmp (tdep->regs[tdep->ppc_gp0_regnum].name, "r0") == 0);
  
    /* Select instruction printer.  */
!   if (arch == bfd_arch_rs6000)
      set_gdbarch_print_insn (gdbarch, print_insn_rs6000);
    else
      set_gdbarch_print_insn (gdbarch, gdb_print_insn_powerpc);

Re: RFA: Remove 'power' variable from rs6000_gdbarch_init

[Kevin Buettner]

On 16 Jul 2004 17:16:53 -0500
Jim Blandy <jimb@redhat.com> wrote:

> This patch has been tested with no regressions on i686-pc-linux-gnu x
> powerpc-eabispe, and on an AIX 5.1. rs6000 (generating rs6000:6000
> executables).  (Thanks to Joel B. for help with testing.)
> 
> 2004-07-15  Jim Blandy  <jimb@redhat.com>
> 
> 	* rs6000-tdep.c (rs6000_gdbarch_init): Delete variable 'power';
> 	replace references with expression used to initialize variable.

Okay.

Kevin

Re: RFA: Remove 'power' variable from rs6000_gdbarch_init

[Jim Blandy]

Kevin Buettner <kevinb@redhat.com> writes:

> On 16 Jul 2004 17:16:53 -0500
> Jim Blandy <jimb@redhat.com> wrote:
> 
> > This patch has been tested with no regressions on i686-pc-linux-gnu x
> > powerpc-eabispe, and on an AIX 5.1. rs6000 (generating rs6000:6000
> > executables).  (Thanks to Joel B. for help with testing.)
> > 
> > 2004-07-15  Jim Blandy  <jimb@redhat.com>
> > 
> > 	* rs6000-tdep.c (rs6000_gdbarch_init): Delete variable 'power';
> > 	replace references with expression used to initialize variable.
> 
> Okay.

Committed, thanks.