From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 796 invoked by alias); 16 Jul 2004 22:22:14 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 787 invoked from network); 16 Jul 2004 22:22:13 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 16 Jul 2004 22:22:13 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i6GMMDe1016381 for ; Fri, 16 Jul 2004 18:22:13 -0400 Received: from zenia.home.redhat.com (porkchop.devel.redhat.com [172.16.58.2]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i6GMMBa13533; Fri, 16 Jul 2004 18:22:11 -0400 To: gdb-patches@sources.redhat.com Subject: RFA: Remove 'power' variable from rs6000_gdbarch_init From: Jim Blandy Date: Fri, 16 Jul 2004 22:22:00 -0000 Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2004-07/txt/msg00208.txt.bz2 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 * 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);