This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[patch] Delete sigtramp_saved_pc()
- From: Andrew Cagney <ac131313 at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Fri, 15 Nov 2002 18:26:28 -0500
- Subject: [patch] Delete sigtramp_saved_pc()
Hello,
This deletes the last remenant of the generic sigtramp_saved_pc().
Instead the vax and ns32k (which were using that function) get their own
local versions.
I suspect there is an oportunity to create a bsd_sigtramp_saved_pc() but
that is left to someone else.
committed,
Andrew
2002-11-15 Andrew Cagney <cagney@redhat.com>
* frame.h (sigtramp_saved_pc): Delete declaration.
* blockframe.c (sigtramp_saved_pc): Delete function.
* ns32k-tdep.c (ns32k_sigtramp_saved_pc): New function.
(ns32k_frame_saved_pc): Call ns32k_sigtramp_saved_pc.
* vax-tdep.c (vax_sigtramp_saved_pc): New function.
(vax_frame_saved_pc): Call vax_sigtramp_saved_pc.
Index: blockframe.c
===================================================================
RCS file: /cvs/src/src/gdb/blockframe.c,v
retrieving revision 1.49
diff -u -r1.49 blockframe.c
--- blockframe.c 15 Nov 2002 22:16:25 -0000 1.49
+++ blockframe.c 15 Nov 2002 23:22:46 -0000
@@ -660,35 +660,6 @@
}
}
-#ifdef SIGCONTEXT_PC_OFFSET
-/* Get saved user PC for sigtramp from sigcontext for BSD style sigtramp. */
-
-CORE_ADDR
-sigtramp_saved_pc (struct frame_info *frame)
-{
- CORE_ADDR sigcontext_addr;
- char *buf;
- int ptrbytes = TYPE_LENGTH (builtin_type_void_func_ptr);
- int sigcontext_offs = (2 * TARGET_INT_BIT) / TARGET_CHAR_BIT;
-
- buf = alloca (ptrbytes);
- /* Get sigcontext address, it is the third parameter on the stack. */
- if (frame->next)
- sigcontext_addr = read_memory_typed_address
- (FRAME_ARGS_ADDRESS (frame->next) + FRAME_ARGS_SKIP + sigcontext_offs,
- builtin_type_void_data_ptr);
- else
- 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
- layout has changed or the stack is corrupt. */
- target_read_memory (sigcontext_addr + SIGCONTEXT_PC_OFFSET, buf, ptrbytes);
- return extract_typed_address (buf, builtin_type_void_func_ptr);
-}
-#endif /* SIGCONTEXT_PC_OFFSET */
-
-
/* Are we in a call dummy? The code below which allows DECR_PC_AFTER_BREAK
below is for infrun.c, which may give the macro a pc without that
subtracted out. */
Index: frame.h
===================================================================
RCS file: /cvs/src/src/gdb/frame.h,v
retrieving revision 1.32
diff -u -r1.32 frame.h
--- frame.h 15 Nov 2002 22:16:25 -0000 1.32
+++ frame.h 15 Nov 2002 23:22:46 -0000
@@ -392,8 +392,6 @@
extern struct frame_info *find_frame_addr_in_frame_chain (CORE_ADDR);
-extern CORE_ADDR sigtramp_saved_pc (struct frame_info *);
-
/* NOTE: cagney/2002-09-13: There is no need for this function.
Instead either of frame_unwind_signed_register() or
frame_unwind_unsigned_register() can be used. */
Index: ns32k-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/ns32k-tdep.c,v
retrieving revision 1.19
diff -u -r1.19 ns32k-tdep.c
--- ns32k-tdep.c 14 Nov 2002 00:25:03 -0000 1.19
+++ ns32k-tdep.c 15 Nov 2002 23:22:46 -0000
@@ -314,11 +314,36 @@
return (read_memory_integer (frame->frame, 4));
}
+
+static CORE_ADDR
+ns32k_sigtramp_saved_pc (struct frame_info *frame)
+{
+ CORE_ADDR sigcontext_addr;
+ char *buf;
+ int ptrbytes = TYPE_LENGTH (builtin_type_void_func_ptr);
+ int sigcontext_offs = (2 * TARGET_INT_BIT) / TARGET_CHAR_BIT;
+
+ buf = alloca (ptrbytes);
+ /* Get sigcontext address, it is the third parameter on the stack. */
+ if (frame->next)
+ sigcontext_addr = read_memory_typed_address
+ (FRAME_ARGS_ADDRESS (frame->next) + FRAME_ARGS_SKIP + sigcontext_offs,
+ builtin_type_void_data_ptr);
+ else
+ 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
+ layout has changed or the stack is corrupt. */
+ target_read_memory (sigcontext_addr + SIGCONTEXT_PC_OFFSET, buf, ptrbytes);
+ return extract_typed_address (buf, builtin_type_void_func_ptr);
+}
+
static CORE_ADDR
ns32k_frame_saved_pc (struct frame_info *frame)
{
if (frame->signal_handler_caller)
- return (sigtramp_saved_pc (frame)); /* XXXJRT */
+ return (ns32k_sigtramp_saved_pc (frame)); /* XXXJRT */
return (read_memory_integer (frame->frame + 4, 4));
}
Index: vax-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/vax-tdep.c,v
retrieving revision 1.20
diff -u -r1.20 vax-tdep.c
--- vax-tdep.c 14 Nov 2002 00:25:03 -0000 1.20
+++ vax-tdep.c 15 Nov 2002 23:22:47 -0000
@@ -157,11 +157,37 @@
frame->saved_regs[PS_REGNUM] = frame->frame + 4;
}
+/* Get saved user PC for sigtramp from sigcontext for BSD style sigtramp. */
+
+static CORE_ADDR
+vax_sigtramp_saved_pc (struct frame_info *frame)
+{
+ CORE_ADDR sigcontext_addr;
+ char *buf;
+ int ptrbytes = TYPE_LENGTH (builtin_type_void_func_ptr);
+ int sigcontext_offs = (2 * TARGET_INT_BIT) / TARGET_CHAR_BIT;
+
+ buf = alloca (ptrbytes);
+ /* Get sigcontext address, it is the third parameter on the stack. */
+ if (frame->next)
+ sigcontext_addr = read_memory_typed_address
+ (FRAME_ARGS_ADDRESS (frame->next) + FRAME_ARGS_SKIP + sigcontext_offs,
+ builtin_type_void_data_ptr);
+ else
+ 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
+ layout has changed or the stack is corrupt. */
+ target_read_memory (sigcontext_addr + SIGCONTEXT_PC_OFFSET, buf, ptrbytes);
+ return extract_typed_address (buf, builtin_type_void_func_ptr);
+}
+
static CORE_ADDR
vax_frame_saved_pc (struct frame_info *frame)
{
if (frame->signal_handler_caller)
- return (sigtramp_saved_pc (frame)); /* XXXJRT */
+ return (vax_sigtramp_saved_pc (frame)); /* XXXJRT */
return (read_memory_integer (frame->frame + 16, 4));
}