From: Andrew Cagney <cagney@redhat.com>
Date: Sat, 22 Nov 2003 22:32:28 +0000 (+0000)
Subject: 2003-11-22  Andrew Cagney  <cagney@redhat.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10a08821d34f7753264017ec0f0ba518e22c1946;p=binutils-gdb.git

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 1af1a88e723..18959be1b92 100644
--- 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 0280dfd573e..e8612c075cc 100644
--- 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 056172066ae..88a9a5c591b 100644
--- 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 3ba9e2894f5..e9c2bd5afea 100644
--- 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)));