2003-11-22 Andrew Cagney <cagney@redhat.com>

	* mips-tdep.c (SIGFRAME_REG_SIZE): Delete macro.
	(mips_find_saved_regs): Replace SIGFRAME_REG_SIZE with
	mips_regsize.
	(mips_dump_tdep): Do not print SIGFRAME_REG_SIZE.
	* config/mips/tm-irix6.h (SIGFRAME_REG_SIZE): Delete macro.
	* config/mips/tm-irix5.h: Update copyright.
	(SIGFRAME_REG_SIZE): Delete macro.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1af1a88e723ec9934fe5c58ac8616622aee4b707..18959be1b92faf1e9151c31f65987f769980a98a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 2003-11-22  Andrew Cagney  <cagney@redhat.com>
 
+       * mips-tdep.c (SIGFRAME_REG_SIZE): Delete macro.
+       (mips_find_saved_regs): Replace SIGFRAME_REG_SIZE with
+       mips_regsize.
+       (mips_dump_tdep): Do not print SIGFRAME_REG_SIZE.
+       * config/mips/tm-irix6.h (SIGFRAME_REG_SIZE): Delete macro.
+       * config/mips/tm-irix5.h: Update copyright.
+       (SIGFRAME_REG_SIZE): Delete macro.
+
        * hppa-tdep.c (hppa_value_returned_from_stack): Delete function.
        * config/pa/tm-hppa.h (hppa_value_returned_from_stack): Delete
        declaration.

diff --git a/gdb/config/mips/tm-irix5.h b/gdb/config/mips/tm-irix5.h
index 0280dfd573e2f633d437c351706f2b1bd1fccbca..e8612c075cce25a2bf73ab598abeb14bf75733c3 100644 (file)
--- a/gdb/config/mips/tm-irix5.h
+++ b/gdb/config/mips/tm-irix5.h
@@ -1,6 +1,7 @@
 /* Target machine description for SGI Iris under Irix 5, for GDB.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2000
-   Free Software Foundation, Inc.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2000, 2003 Free
+   Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -44,4 +45,3 @@
 #define SIGFRAME_REGSAVE_OFF   (SIGFRAME_BASE + 2 * 4 + 8 + 4)
 #undef SIGFRAME_FPREGSAVE_OFF
 #define SIGFRAME_FPREGSAVE_OFF (SIGFRAME_BASE + 2 * 4 + 8 + 32 * 8 + 4)
-#define SIGFRAME_REG_SIZE      8

diff --git a/gdb/config/mips/tm-irix6.h b/gdb/config/mips/tm-irix6.h
index 056172066aec090cc205f1e7f0b051601f902ca2..88a9a5c591b631a64eff3fa7f626d7ffedcff877 100644 (file)
--- a/gdb/config/mips/tm-irix6.h
+++ b/gdb/config/mips/tm-irix6.h
@@ -43,4 +43,3 @@
 #define SIGFRAME_REGSAVE_OFF   (SIGFRAME_BASE + 2 * 4 + 8 + 4)
 #undef SIGFRAME_FPREGSAVE_OFF
 #define SIGFRAME_FPREGSAVE_OFF (SIGFRAME_BASE + 2 * 4 + 8 + 32 * 8 + 4)
-#define SIGFRAME_REG_SIZE      8

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 3ba9e2894f523baccad00b11f944f6e2870d0b59..e9c2bd5afeaa70a342f4922d28d759c70f3dddbd 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -1514,24 +1514,20 @@ mips_find_saved_regs (struct frame_info *fci)
 #define SIGFRAME_REGSAVE_OFF   (SIGFRAME_BASE + 3 * mips_regsize (current_gdbarch))
 #define SIGFRAME_FPREGSAVE_OFF \
         (SIGFRAME_REGSAVE_OFF + MIPS_NUMREGS * mips_regsize (current_gdbarch) + 3 * mips_regsize (current_gdbarch))
-#endif
-#ifndef SIGFRAME_REG_SIZE
-  /* FIXME!  Is this correct?? */
-#define SIGFRAME_REG_SIZE      mips_regsize (current_gdbarch)
 #endif
   if ((get_frame_type (fci) == SIGTRAMP_FRAME))
     {
       for (ireg = 0; ireg < MIPS_NUMREGS; ireg++)
        {
          CORE_ADDR reg_position = (get_frame_base (fci) + SIGFRAME_REGSAVE_OFF
-                                   + ireg * SIGFRAME_REG_SIZE);
+                                   + ireg * mips_regsize (current_gdbarch));
          set_reg_offset (saved_regs, ireg, reg_position);
        }
       for (ireg = 0; ireg < MIPS_NUMREGS; ireg++)
        {
          CORE_ADDR reg_position = (get_frame_base (fci)
                                    + SIGFRAME_FPREGSAVE_OFF
-                                   + ireg * SIGFRAME_REG_SIZE);
+                                   + ireg * mips_regsize (current_gdbarch));
          set_reg_offset (saved_regs, mips_regnum (current_gdbarch)->fp0 + ireg, reg_position);
        }
 
@@ -6335,9 +6331,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                      "mips_dump_tdep: SIGFRAME_REGSAVE_OFF = %d\n",
                      SIGFRAME_REGSAVE_OFF);
-  fprintf_unfiltered (file,
-                     "mips_dump_tdep: SIGFRAME_REG_SIZE = %d\n",
-                     SIGFRAME_REG_SIZE);
   fprintf_unfiltered (file,
                      "mips_dump_tdep: SKIP_TRAMPOLINE_CODE # %s\n",
                      XSTRING (SKIP_TRAMPOLINE_CODE (PC)));