2004-04-20  Jim Blandy  <jimb@redhat.com>

	* ppc-linux-nat.c (fetch_ppc_registers, store_ppc_registers):
	Don't assume that the gprs, fprs, and UISA sprs are
	contiguous, start at register number zero, and end with fpscr.
	Instead, use the numbers from the tdep structure.

*** gdb/ppc-linux-nat.c	2004-05-04 13:32:34.000000000 -0500
--- gdb/ppc-linux-nat.c	2004-05-04 15:46:55.000000000 -0500
***************
*** 314,323 ****
    int i;
    struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
  
!   for (i = 0; i <= tdep->ppc_fpscr_regnum; i++)
!     fetch_register (tid, i);
    if (tdep->ppc_mq_regnum != -1)
      fetch_register (tid, tdep->ppc_mq_regnum);
    if (have_ptrace_getvrregs)
      if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
        fetch_altivec_registers (tid);
--- 314,339 ----
    int i;
    struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
  
!   for (i = 0; i < ppc_num_gprs; i++)
!     fetch_register (tid, tdep->ppc_gp0_regnum + i);
!   if (tdep->ppc_fp0_regnum >= 0)
!     for (i = 0; i < ppc_num_fprs; i++)
!       fetch_register (tid, tdep->ppc_fp0_regnum + i);
!   fetch_register (tid, PC_REGNUM);
!   if (tdep->ppc_ps_regnum != -1)
!     fetch_register (tid, tdep->ppc_ps_regnum);
!   if (tdep->ppc_cr_regnum != -1)
!     fetch_register (tid, tdep->ppc_cr_regnum);
!   if (tdep->ppc_lr_regnum != -1)
!     fetch_register (tid, tdep->ppc_lr_regnum);
!   if (tdep->ppc_ctr_regnum != -1)
!     fetch_register (tid, tdep->ppc_ctr_regnum);
!   if (tdep->ppc_xer_regnum != -1)
!     fetch_register (tid, tdep->ppc_xer_regnum);
    if (tdep->ppc_mq_regnum != -1)
      fetch_register (tid, tdep->ppc_mq_regnum);
+   if (tdep->ppc_fpscr_regnum != -1)
+     fetch_register (tid, tdep->ppc_fpscr_regnum);
    if (have_ptrace_getvrregs)
      if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
        fetch_altivec_registers (tid);
***************
*** 485,494 ****
    int i;
    struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
    
!   for (i = 0; i <= tdep->ppc_fpscr_regnum; i++)
!     store_register (tid, i);
    if (tdep->ppc_mq_regnum != -1)
      store_register (tid, tdep->ppc_mq_regnum);
    if (have_ptrace_getvrregs)
      if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
        store_altivec_registers (tid);
--- 501,526 ----
    int i;
    struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
    
!   for (i = 0; i < ppc_num_gprs; i++)
!     store_register (tid, tdep->ppc_gp0_regnum + i);
!   if (tdep->ppc_fp0_regnum >= 0)
!     for (i = 0; i < ppc_num_fprs; i++)
!       store_register (tid, tdep->ppc_fp0_regnum + i);
!   store_register (tid, PC_REGNUM);
!   if (tdep->ppc_ps_regnum != -1)
!     store_register (tid, tdep->ppc_ps_regnum);
!   if (tdep->ppc_cr_regnum != -1)
!     store_register (tid, tdep->ppc_cr_regnum);
!   if (tdep->ppc_lr_regnum != -1)
!     store_register (tid, tdep->ppc_lr_regnum);
!   if (tdep->ppc_ctr_regnum != -1)
!     store_register (tid, tdep->ppc_ctr_regnum);
!   if (tdep->ppc_xer_regnum != -1)
!     store_register (tid, tdep->ppc_xer_regnum);
    if (tdep->ppc_mq_regnum != -1)
      store_register (tid, tdep->ppc_mq_regnum);
+   if (tdep->ppc_fpscr_regnum != -1)
+     store_register (tid, tdep->ppc_fpscr_regnum);
    if (have_ptrace_getvrregs)
      if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
        store_altivec_registers (tid);