2004-02-15 Andrew Cagney <cagney@redhat.com>

	* config/mips/tm-nbsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
	* config/i386/tm-i386bsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
	* config/arm/tm-linux.h (SIGCONTEXT_PC_OFFSET): Delete macro.
	* config/vax/tm-vaxbsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
	* vax-tdep.c (vax_sigtramp_saved_pc): Inline only reference.
	* config/ns32k/tm-nbsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
	* ns32k-tdep.c (ns32k_sigtramp_saved_pc): Inline only reference.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 569ca2e99578a632129ab9fae54b3c6c7eab211a..7a5a2ade080b264bb347d5e2b814cde3959c4e35 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-15  Andrew Cagney  <cagney@redhat.com>
+
+       * config/mips/tm-nbsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
+       * config/i386/tm-i386bsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
+       * config/arm/tm-linux.h (SIGCONTEXT_PC_OFFSET): Delete macro.
+       * config/vax/tm-vaxbsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
+       * vax-tdep.c (vax_sigtramp_saved_pc): Inline only reference.
+       * config/ns32k/tm-nbsd.h (SIGCONTEXT_PC_OFFSET): Delete macro.
+       * ns32k-tdep.c (ns32k_sigtramp_saved_pc): Inline only reference.
+
 2004-02-15  Mark Kettenis  <kettenis@gnu.org>
 
        * dwarf2-frame.h (dwarf2_frame_set_init_reg): New prototype.

diff --git a/gdb/config/arm/tm-linux.h b/gdb/config/arm/tm-linux.h
index dd41540786bc4eaf20f18b36ec6cd5f75cf28c22..306f837c3b89a845673b45a52205128219087183 100644 (file)
--- a/gdb/config/arm/tm-linux.h
+++ b/gdb/config/arm/tm-linux.h
@@ -26,9 +26,6 @@
 
 #include "config/tm-linux.h"
 
-/* Offset to saved PC in sigcontext structure, from <asm/sigcontext.h> */
-#define SIGCONTEXT_PC_OFFSET   (sizeof(unsigned long) * 18)
-
 /* We've multi-arched this.  */
 #undef IN_SOLIB_CALL_TRAMPOLINE
 

diff --git a/gdb/config/i386/tm-i386bsd.h b/gdb/config/i386/tm-i386bsd.h
index e2b2229efa7a7d402ee916d95ee81ac66b0154df..fef009ec01d14d54eadb5eb5be1e47556feda485 100644 (file)
--- a/gdb/config/i386/tm-i386bsd.h
+++ b/gdb/config/i386/tm-i386bsd.h
@@ -37,9 +37,4 @@
 #define SIGTRAMP_START(pc)     0xfdbfdfc0
 #define SIGTRAMP_END(pc)       0xfdbfe000
 
-/* Saved Pc.  Get it from sigcontext if within sigtramp.  */
-
-/* Offset to saved PC in sigcontext, from <sys/signal.h>.  */
-#define SIGCONTEXT_PC_OFFSET 20
-
 #endif /* ifndef TM_I386BSD_H */

diff --git a/gdb/config/mips/tm-nbsd.h b/gdb/config/mips/tm-nbsd.h
index 143f3a43114ffb5486a686ea5ea128a96509ecb9..fb30761111c0d5a9043b97ed6f4674cdacf6de23 100644 (file)
--- a/gdb/config/mips/tm-nbsd.h
+++ b/gdb/config/mips/tm-nbsd.h
@@ -22,9 +22,6 @@
 #ifndef TM_NBSD_H
 #define TM_NBSD_H
 
-/* Saved Pc.  Get it from sigcontext if within sigtramp.  */
-#define SIGCONTEXT_PC_OFFSET 8
-
 #include "mips/tm-mips.h"
 #include "solib.h"
 

diff --git a/gdb/config/ns32k/tm-nbsd.h b/gdb/config/ns32k/tm-nbsd.h
index 88b4e2269425779da269e498169236a4f3954a3b..8e530d411ddfb276ffe84058265557b6855d0e1e 100644 (file)
--- a/gdb/config/ns32k/tm-nbsd.h
+++ b/gdb/config/ns32k/tm-nbsd.h
@@ -29,9 +29,4 @@
 
 #include "ns32k/tm-ns32k.h"
 
-/* Saved Pc.  Get it from sigcontext if within sigtramp.  */
-
-/* Offset to saved PC in sigcontext, from <machine/signal.h>.  */
-#define SIGCONTEXT_PC_OFFSET 20
-
 #endif /* TM_NBSD_H */

diff --git a/gdb/config/vax/tm-vaxbsd.h b/gdb/config/vax/tm-vaxbsd.h
index e24049a6ec6460a0a9adad8c77976db1e6ba2929..47c9f8cbbabd9662870de616c60dba7c6e8b203e 100644 (file)
--- a/gdb/config/vax/tm-vaxbsd.h
+++ b/gdb/config/vax/tm-vaxbsd.h
@@ -34,8 +34,4 @@
 #define SIGTRAMP_START(pc)     STACK_END_ADDR
 #define SIGTRAMP_END(pc)       0x80000000
 
-/* Offset to saved PC in sigcontext, from <sys/signal.h>.  */
-/* XXXJRT should go away */
-#define SIGCONTEXT_PC_OFFSET 12
-
 #endif /* TM_VAXBSD_H */

diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c
index dc143bbc36b7a5e247ded70d1bc36ab0f7ca6973..ecd3864d995bcf2d618e5b7782dcc1d25502a411 100644 (file)
--- a/gdb/ns32k-tdep.c
+++ b/gdb/ns32k-tdep.c
@@ -331,9 +331,10 @@ ns32k_sigtramp_saved_pc (struct frame_info *frame)
     sigcontext_addr = read_memory_typed_address
       (read_register (SP_REGNUM) + sigcontext_offs, builtin_type_void_data_ptr);
 
-  /* Don't cause a memory_error when accessing sigcontext in case the stack
+  /* Offset to saved PC in sigcontext, from <machine/signal.h>.  Don't
+     cause a memory_error when accessing sigcontext in case the stack
      layout has changed or the stack is corrupt.  */
-  target_read_memory (sigcontext_addr + SIGCONTEXT_PC_OFFSET, buf, ptrbytes);
+  target_read_memory (sigcontext_addr + 20, buf, ptrbytes);
   return extract_typed_address (buf, builtin_type_void_func_ptr);
 }
 

diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 169b53286887e2f9eeacf1e6301ffed0fa8d9b43..809330eba09c4a40f65039b58b9187345020d4cb 100644 (file)
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -141,9 +141,10 @@ vax_sigtramp_saved_pc (struct frame_info *frame)
     sigcontext_addr = read_memory_typed_address
       (read_register (SP_REGNUM) + sigcontext_offs, builtin_type_void_data_ptr);
 
-  /* Don't cause a memory_error when accessing sigcontext in case the stack
+  /* Offset to saved PC in sigcontext, from <sys/signal.h>.  Don't
+     cause a memory_error when accessing sigcontext in case the stack
      layout has changed or the stack is corrupt.  */
-  target_read_memory (sigcontext_addr + SIGCONTEXT_PC_OFFSET, buf, ptrbytes);
+  target_read_memory (sigcontext_addr + 12, buf, ptrbytes);
   return extract_typed_address (buf, builtin_type_void_func_ptr);
 }