insight/160: Store Breakpoints does not work correctly

[craig@triscend.com]

>Number:         160
>Category:       insight
>Synopsis:       Store Breakpoints does not work correctly
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    unassigned
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu May 23 14:53:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     craig@triscend.com
>Release:        unknown-1.0
>Organization:
>Environment:
Windows 2K/Cygwin, arm-elf-gdb
>Description:
The store breakpoints function does not save the breakpoints correctly. It seems that the call to gdb_get_breakpoint_info returns one more parameter than is expected in the bp_store function.
>How-To-Repeat:
Start GDB and set several breakpoints. Use the store breakpoint function to save them to a file. Clear all of the breakpoints you set, then use the restore breakpoint function. The breakpioints are not set in the correct places.
>Fix:
The attached file handles the extra parameter returned from gdb_get_breakpoint_info called from bp_store, patch also includes fix for bug report 144.
>Release-Note:
>Audit-Trail:
>Unformatted:
----gnatsweb-attachment----
Content-Type: text/plain; name="bpwin.itb.pat"
Content-Disposition: inline; filename="bpwin.itb.pat"

Index: bpwin.itb
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/library/bpwin.itb,v
retrieving revision 1.13
diff -c -p -r1.13 bpwin.itb
*** bpwin.itb	14 Mar 2002 17:12:10 -0000	1.13
--- bpwin.itb	23 May 2002 21:34:53 -0000
*************** body BpWin::build_win {} {
*** 74,79 ****
--- 74,81 ----
    } 
    label $twin.thread0 -text "Thread" -relief raised -bd 2 -anchor center \
      -font global/fixed
+   label $twin.enabled0 -text "Enabled" -relief raised -bd 2 -anchor center \
+     -font global/fixed
    label $twin.addr0 -text "Address" -relief raised -bd 2 -anchor center \
      -font global/fixed
    label $twin.file0 -text "File" -relief raised -bd 2 -anchor center \
*************** body BpWin::build_win {} {
*** 86,101 ****
    if {$tracepoints} {
      label $twin.pass0 -text "PassCount" -relief raised -borderwidth 2 \
        -anchor center -font global/fixed
!     grid x $twin.num0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 $twin.pass0 \
        -sticky new
    } else {
      if {$show_threads} {
!       grid x $twin.thread0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
        # Let the File and Function columns expand; no others.
        grid columnconfigure $twin 3 -weight 1
        grid columnconfigure $twin 5 -weight 1
      } else {
!       grid x $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
        # Let the File and Function columns expand; no others.
        grid columnconfigure $twin 2 -weight 1
        grid columnconfigure $twin 4 -weight 1
--- 88,103 ----
    if {$tracepoints} {
      label $twin.pass0 -text "PassCount" -relief raised -borderwidth 2 \
        -anchor center -font global/fixed
!     grid $twin.enabled0 $twin.num0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 $twin.pass0 \
        -sticky new
    } else {
      if {$show_threads} {
!       grid $twin.enabled0 $twin.thread0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
        # Let the File and Function columns expand; no others.
        grid columnconfigure $twin 3 -weight 1
        grid columnconfigure $twin 5 -weight 1
      } else {
!       grid $twin.enabled0 $twin.addr0 $twin.file0 $twin.line0 $twin.func0 -sticky new
        # Let the File and Function columns expand; no others.
        grid columnconfigure $twin 2 -weight 1
        grid columnconfigure $twin 4 -weight 1
*************** body BpWin::bp_store {} {
*** 314,320 ****
    foreach breakpoint [gdb_get_breakpoint_list] {
      # This is an lassign
      foreach {file function line_no address type \
! 	       enable_p disp ignore cmds thread hit_count user_spec} \
        [gdb_get_breakpoint_info $breakpoint] {
  	break
        }
--- 316,322 ----
    foreach breakpoint [gdb_get_breakpoint_list] {
      # This is an lassign
      foreach {file function line_no address type \
! 	       enable_p disp ignore cmds cond thread hit_count user_spec} \
        [gdb_get_breakpoint_info $breakpoint] {
  	break
        }