Re: [PATCH] Fix frame ID comparison problem on s390

[Ulrich Weigand <weigand@i1.informatik.uni-erlangen.de>]

Daniel Jacobowitz wrote:

> Rather than cheat in the backend - most other backends will probably
> have the same issue - I'd like to know what's actually using the code
> wildcard.

I have no idea -- maybe this is obsolete by now?

The following patch simply removes the wild card feature, and it works
for s390 without test suite regressions (and fixes the signull failure
as well).

I've tried to look at the other platforms, but they appear not to be
using the wild card feature either ...

OK?

Bye,
Ulrich


ChangeLog:

	* frame.c (frame_id_eq): Do not treat zero code addr as wild card.
	* frame.h (frame_id_build, frame_id_build_special): Update comment.

Index: gdb/frame.c
===================================================================
RCS file: /cvs/src/src/gdb/frame.c,v
retrieving revision 1.181
diff -c -p -r1.181 frame.c
*** gdb/frame.c	8 May 2004 19:03:04 -0000	1.181
--- gdb/frame.c	24 May 2004 13:14:02 -0000
*************** frame_id_eq (struct frame_id l, struct f
*** 306,314 ****
    else if (l.stack_addr != r.stack_addr)
      /* If .stack addresses are different, the frames are different.  */
      eq = 0;
-   else if (l.code_addr == 0 || r.code_addr == 0)
-     /* A zero code addr is a wild card, always succeed.  */
-     eq = 1;
    else if (l.code_addr != r.code_addr)
      /* If .code addresses are different, the frames are different.  */
      eq = 0;
--- 306,311 ----
Index: gdb/frame.h
===================================================================
RCS file: /cvs/src/src/gdb/frame.h,v
retrieving revision 1.133
diff -c -p -r1.133 frame.h
*** gdb/frame.h	7 May 2004 23:19:14 -0000	1.133
--- gdb/frame.h	24 May 2004 13:14:02 -0000
*************** extern const struct frame_id null_frame_
*** 135,152 ****
  
  /* Construct a frame ID.  The first parameter is the frame's constant
     stack address (typically the outer-bound), and the second the
!    frame's constant code address (typically the entry point) (or zero,
!    to indicate a wild card).  The special identifier address is
!    defaulted to zero.  */
  extern struct frame_id frame_id_build (CORE_ADDR stack_addr,
  				       CORE_ADDR code_addr);
  
  /* Construct a special frame ID.  The first parameter is the frame's constant
     stack address (typically the outer-bound), the second is the
!    frame's constant code address (typically the entry point) (or zero,
!    to indicate a wild card), and the third parameter is the frame's
!    special identifier address (or zero to indicate a wild card or 
!    unused default).  */
  extern struct frame_id frame_id_build_special (CORE_ADDR stack_addr,
  					       CORE_ADDR code_addr,
  					       CORE_ADDR special_addr);
--- 135,150 ----
  
  /* Construct a frame ID.  The first parameter is the frame's constant
     stack address (typically the outer-bound), and the second the
!    frame's constant code address (typically the entry point).
!    The special identifier address is defaulted to zero.  */
  extern struct frame_id frame_id_build (CORE_ADDR stack_addr,
  				       CORE_ADDR code_addr);
  
  /* Construct a special frame ID.  The first parameter is the frame's constant
     stack address (typically the outer-bound), the second is the
!    frame's constant code address (typically the entry point),
!    and the third parameter is the frame's special identifier address 
!    (or zero to indicate a wild card or unused default).  */
  extern struct frame_id frame_id_build_special (CORE_ADDR stack_addr,
  					       CORE_ADDR code_addr,
  					       CORE_ADDR special_addr);


-- 
  Dr. Ulrich Weigand
  weigand@informatik.uni-erlangen.de