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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 79a4df9638ae2034df56832ea18e363f1bdb93e7..4356b148a4392935fa02b55b7283a703c4aa6995 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2003-11-25  Andrew Cagney  <cagney@redhat.com>
 
        * infrun.c: Don't include "exec.h".

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 1088cdaa4a64d9eb905f3e80b5de96339cf4e343..2c3e8c27090121babba96eef0b454faf3420dcdc 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -4696,12 +4696,12 @@ mips_eabi_extract_return_value (struct type *valtype,
   return_value_location (valtype, &hi, &lo);
 
   memcpy (valbuf + lo.buf_offset,
-         regbuf + DEPRECATED_REGISTER_BYTE (lo.reg) + lo.reg_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 (hi.reg) + hi.reg_offset,
+           regbuf + DEPRECATED_REGISTER_BYTE (NUM_REGS + hi.reg) + hi.reg_offset,
            hi.len);
 }
 
@@ -4715,12 +4715,12 @@ mips_o64_extract_return_value (struct type *valtype,
   return_value_location (valtype, &hi, &lo);
 
   memcpy (valbuf + lo.buf_offset,
-         regbuf + DEPRECATED_REGISTER_BYTE (lo.reg) + lo.reg_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 (hi.reg) + hi.reg_offset,
+           regbuf + DEPRECATED_REGISTER_BYTE (NUM_REGS + hi.reg) + hi.reg_offset,
            hi.len);
 }