2003-11-25  Michael Snyder  <msnyder@redhat.com>

        * mips-tdep.c (mips_o64_extract_return_value): Correct for
	NUM_REGS (see changes 2003-06-21).
	(mips_eabi_extract_return_value): Ditto.

Index: mips-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mips-tdep.c,v
retrieving revision 1.261
diff -p -r1.261 mips-tdep.c
*** mips-tdep.c	23 Nov 2003 21:49:12 -0000	1.261
--- mips-tdep.c	25 Nov 2003 22:14:08 -0000
*************** mips_eabi_extract_return_value (struct t
*** 4696,4707 ****
    return_value_location (valtype, &hi, &lo);
  
    memcpy (valbuf + lo.buf_offset,
! 	  regbuf + DEPRECATED_REGISTER_BYTE (lo.reg) + lo.reg_offset,
  	  lo.len);
  
    if (hi.len > 0)
      memcpy (valbuf + hi.buf_offset,
! 	    regbuf + DEPRECATED_REGISTER_BYTE (hi.reg) + hi.reg_offset,
  	    hi.len);
  }
  
--- 4696,4707 ----
    return_value_location (valtype, &hi, &lo);
  
    memcpy (valbuf + lo.buf_offset,
! 	  regbuf + DEPRECATED_REGISTER_BYTE (NUM_REGS + lo.reg) + lo.reg_offset,
  	  lo.len);
  
    if (hi.len > 0)
      memcpy (valbuf + hi.buf_offset,
! 	    regbuf + DEPRECATED_REGISTER_BYTE (NUM_REGS + hi.reg) + hi.reg_offset,
  	    hi.len);
  }
  
*************** mips_o64_extract_return_value (struct ty
*** 4715,4726 ****
    return_value_location (valtype, &hi, &lo);
  
    memcpy (valbuf + lo.buf_offset,
! 	  regbuf + DEPRECATED_REGISTER_BYTE (lo.reg) + lo.reg_offset,
  	  lo.len);
  
    if (hi.len > 0)
      memcpy (valbuf + hi.buf_offset,
! 	    regbuf + DEPRECATED_REGISTER_BYTE (hi.reg) + hi.reg_offset,
  	    hi.len);
  }
  
--- 4715,4726 ----
    return_value_location (valtype, &hi, &lo);
  
    memcpy (valbuf + lo.buf_offset,
! 	  regbuf + DEPRECATED_REGISTER_BYTE (NUM_REGS + lo.reg) + lo.reg_offset,
  	  lo.len);
  
    if (hi.len > 0)
      memcpy (valbuf + hi.buf_offset,
! 	    regbuf + DEPRECATED_REGISTER_BYTE (NUM_REGS + hi.reg) + hi.reg_offset,
  	    hi.len);
  }