[COMMIT] Some amd64-linux-tdep.c tweaks

[COMMIT] Some amd64-linux-tdep.c tweaks

[Mark Kettenis]

Committed,

Mark


Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* amd64-linux-tdep.c: Update copyright year.
	(amd64_linux_sigtramp_start): Change argument to `struct
	frame_info *'.  Use safe_frame_unwind_memory instead of
	deprecated_read_memory_nobpt.
	(amd64_linux_sigtramp_p): Adjust call to
	amd64_linux_sigtramp_start.

Index: amd64-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64-linux-tdep.c,v
retrieving revision 1.7
diff -u -p -r1.7 amd64-linux-tdep.c
--- amd64-linux-tdep.c 22 Aug 2004 16:27:30 -0000 1.7
+++ amd64-linux-tdep.c 16 Feb 2005 02:15:20 -0000
@@ -1,6 +1,6 @@
 /* Target-dependent code for GNU/Linux x86-64.
 
-   Copyright 2001, 2003, 2004 Free Software Foundation, Inc.
+   Copyright 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
    Contributed by Jiri Smid, SuSE Labs.
 
    This file is part of GDB.
@@ -98,7 +98,7 @@ amd64_linux_sigtramp_start (struct frame
      PC is not at the start of the instruction sequence, there will be
      a few trailing readable bytes on the stack.  */
 
-  if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN))
+  if (!safe_frame_unwind_memory (next_frame, pc, buf, sizeof buf))
     return 0;
 
   if (buf[0] != LINUX_SIGTRAMP_INSN0)
@@ -107,8 +107,7 @@ amd64_linux_sigtramp_start (struct frame
 	return 0;
 
       pc -= LINUX_SIGTRAMP_OFFSET1;
-
-      if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN))
+      if (!safe_frame_unwind_memory (next_frame, pc, buf, sizeof buf))
 	return 0;
     }
 

Re: [COMMIT] Some amd64-linux-tdep.c tweaks

[Daniel Jacobowitz]

On Tue, Feb 15, 2005 at 09:17:35PM -0500, Mark Kettenis wrote:
> Committed,
> 
> Mark
> 

Hi Mark,

Your patch and changelog don't match.  Which one's right?

> 
> Index: ChangeLog
> from  Mark Kettenis  <kettenis@gnu.org>
> 
> 	* amd64-linux-tdep.c: Update copyright year.
> 	(amd64_linux_sigtramp_start): Change argument to `struct
> 	frame_info *'.  Use safe_frame_unwind_memory instead of
> 	deprecated_read_memory_nobpt.
> 	(amd64_linux_sigtramp_p): Adjust call to
> 	amd64_linux_sigtramp_start.
> 
> Index: amd64-linux-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/amd64-linux-tdep.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 amd64-linux-tdep.c
> --- amd64-linux-tdep.c 22 Aug 2004 16:27:30 -0000 1.7
> +++ amd64-linux-tdep.c 16 Feb 2005 02:15:20 -0000
> @@ -1,6 +1,6 @@
>  /* Target-dependent code for GNU/Linux x86-64.
>  
> -   Copyright 2001, 2003, 2004 Free Software Foundation, Inc.
> +   Copyright 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
>     Contributed by Jiri Smid, SuSE Labs.
>  
>     This file is part of GDB.
> @@ -98,7 +98,7 @@ amd64_linux_sigtramp_start (struct frame
>       PC is not at the start of the instruction sequence, there will be
>       a few trailing readable bytes on the stack.  */
>  
> -  if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN))
> +  if (!safe_frame_unwind_memory (next_frame, pc, buf, sizeof buf))
>      return 0;
>  
>    if (buf[0] != LINUX_SIGTRAMP_INSN0)
> @@ -107,8 +107,7 @@ amd64_linux_sigtramp_start (struct frame
>  	return 0;
>  
>        pc -= LINUX_SIGTRAMP_OFFSET1;
> -
> -      if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN))
> +      if (!safe_frame_unwind_memory (next_frame, pc, buf, sizeof buf))
>  	return 0;
>      }
>  
> 

-- 
Daniel Jacobowitz
CodeSourcery, LLC