This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[patch/mi] Output full breakpoint table headings
- To: gdb-patches at sources dot redhat dot com
- Subject: [patch/mi] Output full breakpoint table headings
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Wed, 27 Jun 2001 13:24:24 -0400
Hello,
I've committed the attached. For mi!=0 it always outputs a full
breakpoint table header and the breakpoint table body as a list.
One note on on my coding style:
o I've tried to always test mi_version == 0
rather than alternate between that and
tests like mi_version>0. (make searching easier)
o I've tried to do things so that the removal
of the mi0 code is a no-brainer. (reduce need
to re-indent)
enjoy,
Andrew
2001-06-27 Andrew Cagney <ac131313@redhat.com>
* mi-out.c (mi_table_begin): Include nr_cols and nr_rows in mi1
table output.
* mi-out.c (mi_table_begin): Only suppress output when mi0. Change
the header to a list.
(mi_table_body): For mi1, close the header list and open a table
body list.
(mi_table_end): For mi1, close the body list.
(mi_table_header): For mi1, output a tuple containing all the
header information.
(mi_open, mi_close): Reverse logic of mi_version test.
* gdbmi.texinfo (GDB/MI Breakpoint Table Commands): Update.
Index: testsuite/ChangeLog
2001-06-27 Andrew Cagney <ac131313@redhat.com>
* lib/mi-support.exp (mi_delete_breakpoints): Accept mi1 format
empty breakpoint tables.
Index: testsuite/gdb.mi/ChangeLog
2001-06-27 Andrew Cagney <ac131313@redhat.com>
* mi-disassemble.exp: Update to accept mi1 breakpoint tables.
* mi-basics.exp: Ditto.
* mi-simplerun.exp: Ditto.
* mi-watch.exp: Ditto. Add check for full header.
* mi-break.exp: Ditto. Add check for full header.
Index: mi/gdbmi.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/mi/gdbmi.texinfo,v
retrieving revision 1.22
diff -p -r1.22 gdbmi.texinfo
*** gdbmi.texinfo 2001/06/26 19:11:48 1.22
--- gdbmi.texinfo 2001/06/27 17:12:08
*************** The corresponding @value{GDBN} command i
*** 588,597 ****
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x000100d0",func="main",file="hello.c",line="5",times="0",
! ignore="3"@}@}
(@value{GDBP})
@end smallexample
--- 588,603 ----
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="1",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x000100d0",func="main",file="hello.c",line="5",times="0",
! ignore="3"@}]@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} command i
*** 630,639 ****
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x000100d0",func="main",file="hello.c",line="5",cond="1",
! times="0",ignore="3"@}@}
(@value{GDBP})
@end smallexample
--- 636,651 ----
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="1",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x000100d0",func="main",file="hello.c",line="5",cond="1",
! times="0",ignore="3"@}]@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} command i
*** 661,667 ****
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{@}
(@value{GDBP})
@end example
--- 673,686 ----
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="0",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[]@}
(@value{GDBP})
@end example
*************** The corresponding @value{GDBN} command i
*** 689,697 ****
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="2",type="breakpoint",disp="keep",enabled="n",
! addr="0x000100d0",func="main",file="hello.c",line="5",times="0"@}@}
(@value{GDBP})
@end smallexample
--- 708,722 ----
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="1",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="2",type="breakpoint",disp="keep",enabled="n",
! addr="0x000100d0",func="main",file="hello.c",line="5",times="0"@}]@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} command i
*** 718,726 ****
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="2",type="breakpoint",disp="keep",enabled="y",
! addr="0x000100d0",func="main",file="hello.c",line="5",times="0"@}@}
(@value{GDBP})
@end smallexample
--- 743,757 ----
^done
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="1",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="2",type="breakpoint",disp="keep",enabled="y",
! addr="0x000100d0",func="main",file="hello.c",line="5",times="0"@}]@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} commands
*** 818,828 ****
^done,bkpt=@{number="2",addr="0x00010774",file="recursive2.c",line="11"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x0001072c", func="main",file="recursive2.c",line="4",times="0"@},
bkpt=@{number="2",type="breakpoint",disp="del",enabled="y",
! addr="0x00010774",func="foo",file="recursive2.c",line="11",times="0"@}@}
(@value{GDBP})
-break-insert -r foo.*
~int foo(int, int);
--- 849,865 ----
^done,bkpt=@{number="2",addr="0x00010774",file="recursive2.c",line="11"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="2",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x0001072c", func="main",file="recursive2.c",line="4",times="0"@},
bkpt=@{number="2",type="breakpoint",disp="del",enabled="y",
! addr="0x00010774",func="foo",file="recursive2.c",line="11",times="0"@}]@}
(@value{GDBP})
-break-insert -r foo.*
~int foo(int, int);
*************** number of times the breakpoint has been
*** 861,867 ****
@end table
If there are no breakpoints or watchpoints, the @code{BreakpointTable}
! field is an empty list.
@subsubheading @value{GDBN} Command
--- 898,904 ----
@end table
If there are no breakpoints or watchpoints, the @code{BreakpointTable}
! @code{body} field is an empty list.
@subsubheading @value{GDBN} Command
*************** The corresponding @value{GDBN} command i
*** 872,882 ****
@smallexample
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x000100d0",func="main",file="hello.c",line="5",times="0"@},
bkpt=@{number="2",type="breakpoint",disp="keep",enabled="y",
! addr="0x00010114",func="foo",file="hello.c",line="13",times="0"@}@}
(@value{GDBP})
@end smallexample
--- 909,925 ----
@smallexample
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="2",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x000100d0",func="main",file="hello.c",line="5",times="0"@},
bkpt=@{number="2",type="breakpoint",disp="keep",enabled="y",
! addr="0x00010114",func="foo",file="hello.c",line="13",times="0"@}]@}
(@value{GDBP})
@end smallexample
*************** Here's an example of the result when the
*** 885,891 ****
@smallexample
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{@}
(@value{GDBP})
@end smallexample
--- 928,941 ----
@smallexample
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="0",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[]@}
(@value{GDBP})
@end smallexample
*************** deleted.
*** 967,978 ****
^done,wpt=@{number="2",exp="C"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x00010734",func="callee4",
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8",times="1"@},
bkpt=@{number="2",type="watchpoint",disp="keep",
! enabled="y",addr="",what="C",times="0"@}@}
(@value{GDBP})
-exec-continue
^running
--- 1017,1034 ----
^done,wpt=@{number="2",exp="C"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="2",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x00010734",func="callee4",
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8",times="1"@},
bkpt=@{number="2",type="watchpoint",disp="keep",
! enabled="y",addr="",what="C",times="0"@}]@}
(@value{GDBP})
-exec-continue
^running
*************** frame=@{func="callee4",args=[],
*** 982,993 ****
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="13"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x00010734",func="callee4",
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8",times="1"@},
bkpt=@{number="2",type="watchpoint",disp="keep",
! enabled="y",addr="",what="C",times="-5"@}@}
(@value{GDBP})
-exec-continue
^running
--- 1038,1055 ----
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="13"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="2",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x00010734",func="callee4",
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8",times="1"@},
bkpt=@{number="2",type="watchpoint",disp="keep",
! enabled="y",addr="",what="C",times="-5"@}]@}
(@value{GDBP})
-exec-continue
^running
*************** value="0x11940 \"A string argument.\""@}
*** 997,1006 ****
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{hdr=@{"Num","Type","Disp","Enb","Address","What"@},
! bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x00010734",func="callee4",
! file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8",times="1"@}@}
(@value{GDBP})
@end smallexample
--- 1059,1074 ----
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
-break-list
! ^done,BreakpointTable=@{nr_rows="1",nr_cols="6",
! hdr=[@{width="3",alignment="-1",col_name="number",colhdr="Num"@},
! @{width="14",alignment="-1",col_name="type",colhdr="Type"@},
! @{width="4",alignment="-1",col_name="disp",colhdr="Disp"@},
! @{width="3",alignment="-1",col_name="enabled",colhdr="Enb"@},
! @{width="10",alignment="-1",col_name="addr",colhdr="Address"@},
! @{width="40",alignment="2",col_name="what",colhdr="What"@}],
! body=[bkpt=@{number="1",type="breakpoint",disp="keep",enabled="y",
addr="0x00010734",func="callee4",
! file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8",times="1"@}]@}
(@value{GDBP})
@end smallexample
Index: mi/mi-out.c
===================================================================
RCS file: /cvs/src/src/gdb/mi/mi-out.c,v
retrieving revision 1.18
diff -p -r1.18 mi-out.c
*** mi-out.c 2001/06/21 19:27:50 1.18
--- mi-out.c 2001/06/27 17:12:10
*************** static void out_field_fmt (struct ui_out
*** 105,122 ****
/* Mark beginning of a table */
void
! mi_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows,
const char *tblid)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_open (uiout, tblid, ui_out_type_tuple);
! if (nr_rows == 0)
{
! data->suppress_output = 1;
return;
}
! mi_open (uiout, "hdr", ui_out_type_tuple);
}
/* Mark beginning of a table body */
--- 105,130 ----
/* Mark beginning of a table */
void
! mi_table_begin (struct ui_out *uiout,
! int nr_cols,
int nr_rows,
const char *tblid)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_open (uiout, tblid, ui_out_type_tuple);
! if (data->mi_version == 0)
{
! if (nr_rows == 0)
! data->suppress_output = 1;
! else
! mi_open (uiout, "hdr", ui_out_type_list);
return;
}
! mi_field_int (uiout, -1/*fldno*/, -1/*width*/, -1/*alin*/,
! "nr_rows", nr_rows);
! mi_field_int (uiout, -1/*fldno*/, -1/*width*/, -1/*alin*/,
! "nr_cols", nr_cols);
! mi_open (uiout, "hdr", ui_out_type_list);
}
/* Mark beginning of a table body */
*************** void
*** 125,134 ****
mi_table_body (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
- /* close the table header line if there were any headers */
if (data->suppress_output)
return;
! mi_close (uiout, ui_out_type_tuple);
}
/* Mark end of a table */
--- 133,145 ----
mi_table_body (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
! /* close the table header line if there were any headers */
! mi_close (uiout, ui_out_type_list);
! if (data->mi_version == 0)
! return;
! mi_open (uiout, "body", ui_out_type_list);
}
/* Mark end of a table */
*************** mi_table_end (struct ui_out *uiout)
*** 138,143 ****
--- 149,160 ----
{
struct ui_out_data *data = ui_out_data (uiout);
data->suppress_output = 0;
+ if (data->mi_version == 0)
+ {
+ mi_close (uiout, ui_out_type_tuple);
+ return;
+ }
+ mi_close (uiout, ui_out_type_list); /* body */
mi_close (uiout, ui_out_type_tuple);
}
*************** mi_table_header (struct ui_out *uiout, i
*** 151,157 ****
struct ui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
! mi_field_string (uiout, 0, width, alignment, 0, colhdr);
}
/* Mark beginning of a list */
--- 168,184 ----
struct ui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
! if (data->mi_version == 0)
! {
! mi_field_string (uiout, 0, width, alignment, 0, colhdr);
! return;
! }
! mi_open (uiout, NULL, ui_out_type_tuple);
! mi_field_int (uiout, 0, 0, 0, "width", width);
! mi_field_int (uiout, 0, 0, 0, "alignment", alignment);
! mi_field_string (uiout, 0, 0, 0, "col_name", col_name);
! mi_field_string (uiout, 0, width, alignment, "colhdr", colhdr);
! mi_close (uiout, ui_out_type_tuple);
}
/* Mark beginning of a list */
*************** mi_open (struct ui_out *uiout,
*** 337,346 ****
fputc_unfiltered ('{', data->buffer);
break;
case ui_out_type_list:
! if (data->mi_version > 0)
! fputc_unfiltered ('[', data->buffer);
! else
fputc_unfiltered ('{', data->buffer);
break;
default:
internal_error (__FILE__, __LINE__, "bad switch");
--- 364,373 ----
fputc_unfiltered ('{', data->buffer);
break;
case ui_out_type_list:
! if (data->mi_version == 0)
fputc_unfiltered ('{', data->buffer);
+ else
+ fputc_unfiltered ('[', data->buffer);
break;
default:
internal_error (__FILE__, __LINE__, "bad switch");
*************** mi_close (struct ui_out *uiout,
*** 358,367 ****
fputc_unfiltered ('}', data->buffer);
break;
case ui_out_type_list:
! if (data->mi_version > 0)
! fputc_unfiltered (']', data->buffer);
! else
fputc_unfiltered ('}', data->buffer);
break;
default:
internal_error (__FILE__, __LINE__, "bad switch");
--- 385,394 ----
fputc_unfiltered ('}', data->buffer);
break;
case ui_out_type_list:
! if (data->mi_version == 0)
fputc_unfiltered ('}', data->buffer);
+ else
+ fputc_unfiltered (']', data->buffer);
break;
default:
internal_error (__FILE__, __LINE__, "bad switch");
Index: testsuite/gdb.mi/mi-basics.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-basics.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-basics.exp
*** mi-basics.exp 2001/06/23 21:47:09 1.5
--- mi-basics.exp 2001/06/27 17:12:43
*************** proc test_breakpoints_deletion {} {
*** 139,145 ****
"break-delete (all) operation"
mi_gdb_test "201-break-list" \
! ".*\\\^done,BreakpointTable=\\\{\\\}" \
"all breakpoints removed"
}
--- 139,145 ----
"break-delete (all) operation"
mi_gdb_test "201-break-list" \
! ".*\\\^done,BreakpointTable=\\\{.*,body=\\\[\\\]\\\}" \
"all breakpoints removed"
}
Index: testsuite/gdb.mi/mi-break.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-break.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-break.exp
*** mi-break.exp 2001/06/23 21:47:09 1.4
--- mi-break.exp 2001/06/27 17:12:43
*************** proc test_tbreak_creation_and_listing {}
*** 79,85 ****
"insert temp breakpoint at \"<fullfilename>\":6 (callee4)"
mi_gdb_test "666-break-list" \
! "666\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\}" \
"list of breakpoints"
mi_gdb_test "777-break-delete" \
--- 79,85 ----
"insert temp breakpoint at \"<fullfilename>\":6 (callee4)"
mi_gdb_test "666-break-list" \
! "666\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\}.*\\\]\}" \
"list of breakpoints"
mi_gdb_test "777-break-delete" \
*************** proc test_rbreak_creation_and_listing {}
*** 123,129 ****
setup_xfail "*-*-*"
mi_gdb_test "166-break-list" \
! "166\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\}" \
"list of breakpoints"
mi_gdb_test "177-break-delete" \
--- 123,129 ----
setup_xfail "*-*-*"
mi_gdb_test "166-break-list" \
! "1\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\\\]\}" \
"list of breakpoints"
mi_gdb_test "177-break-delete" \
Index: testsuite/gdb.mi/mi-disassemble.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-disassemble.exp,v
retrieving revision 1.8
diff -p -r1.8 mi-disassemble.exp
*** mi-disassemble.exp 2001/06/26 04:48:48 1.8
--- mi-disassemble.exp 2001/06/27 17:12:43
*************** proc test_breakpoints_creation_and_listi
*** 61,67 ****
"break-insert operation"
mi_gdb_test "204-break-list" \
! "204\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\}\}" \
"list of breakpoints"
}
--- 61,67 ----
"break-insert operation"
mi_gdb_test "204-break-list" \
! "204\\^done,BreakpointTable=\{.*,body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\}\\\]\}" \
"list of breakpoints"
}
Index: testsuite/gdb.mi/mi-simplerun.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-simplerun.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-simplerun.exp
*** mi-simplerun.exp 2001/06/26 04:48:48 1.5
--- mi-simplerun.exp 2001/06/27 17:12:43
*************** proc test_breakpoints_creation_and_listi
*** 78,84 ****
"insert breakpoint at \"<fullfilename>\":6 (callee4)"
mi_gdb_test "204-break-list" \
! "204\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\}" \
"list of breakpoints"
mi_gdb_test "205-break-disable 2 3 4" \
--- 78,84 ----
"insert breakpoint at \"<fullfilename>\":6 (callee4)"
mi_gdb_test "204-break-list" \
! "204\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\\\]\}" \
"list of breakpoints"
mi_gdb_test "205-break-disable 2 3 4" \
*************** proc test_breakpoints_creation_and_listi
*** 86,92 ****
"disabling of breakpoints"
mi_gdb_test "206-break-info 2" \
! "206\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"2\",.*,enabled=\"n\",.*\}\}" \
"list of breakpoints, 16 disabled"
}
--- 86,92 ----
"disabling of breakpoints"
mi_gdb_test "206-break-info 2" \
! "206\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"2\",.*,enabled=\"n\",.*\}\\\]\}" \
"list of breakpoints, 16 disabled"
}
Index: testsuite/gdb.mi/mi-watch.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-watch.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-watch.exp
*** mi-watch.exp 2001/06/26 04:48:48 1.6
--- mi-watch.exp 2001/06/27 17:12:44
*************** proc test_watchpoint_creation_and_listin
*** 62,68 ****
"break-watch operation"
mi_gdb_test "222-break-list" \
! "222\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"8\",times=\"1\"\},bkpt=\{number=\"2\",type=\".*watchpoint\",disp=\"keep\",enabled=\"y\",addr=\"\",what=\"C\",times=\"0\"\}\}" \
"list of watchpoints"
}
--- 62,68 ----
"break-watch operation"
mi_gdb_test "222-break-list" \
! "222\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"8\",times=\"1\"\},bkpt=\{number=\"2\",type=\".*watchpoint\",disp=\"keep\",enabled=\"y\",addr=\"\",what=\"C\",times=\"0\"\}\\\]\}" \
"list of watchpoints"
}
*************** proc test_awatch_creation_and_listing {}
*** 83,89 ****
"break-watch -a operation"
mi_gdb_test "444-break-list" \
! "444\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"3\",type=\"watchpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\}" \
"list of watchpoints awatch"
mi_gdb_test "777-break-delete 3" \
--- 83,89 ----
"break-watch -a operation"
mi_gdb_test "444-break-list" \
! "444\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"3\",type=\"watchpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\\\]\}" \
"list of watchpoints awatch"
mi_gdb_test "777-break-delete 3" \
*************** proc test_rwatch_creation_and_listing {}
*** 107,113 ****
"break-insert -r operation"
mi_gdb_test "300-break-list" \
! "300\\^done,BreakpointTable=\{hdr=\{.*\},bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\}" \
"list of breakpoints"
mi_gdb_test "177-break-delete 4" \
--- 107,113 ----
"break-insert -r operation"
mi_gdb_test "300-break-list" \
! "300\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\\\}\}" \
"list of breakpoints"
mi_gdb_test "177-break-delete 4" \
Index: testsuite/lib/mi-support.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/mi-support.exp,v
retrieving revision 1.7
diff -p -r1.7 mi-support.exp
*** mi-support.exp 2001/06/26 04:48:49 1.7
--- mi-support.exp 2001/06/27 17:12:45
*************** proc mi_delete_breakpoints {} {
*** 206,211 ****
--- 206,212 ----
send_gdb "103-break-list\n"
gdb_expect 30 {
-re "103-break-list\r\n103\\\^done,BreakpointTable=\{\}\r\n$mi_gdb_prompt$" {}
+ -re "103-break-list\r\n103\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[\\\]\}" {}
-re "103-break-list\r\n103\\\^doneNo breakpoints or watchpoints.\r\n\r\n$mi_gdb_prompt$" {warning "Unexpected console text received"}
-re "$mi_gdb_prompt$" { perror "Breakpoints not deleted" ; return }
-re "Delete all breakpoints.*or n.*$" {