[RFC]: Info tracepoint, allow for 64 bit addresses

Michael Snyder msnyder@cygnus.com
Thu Mar 15 15:27:00 GMT 2001


This change parallels yesterdays change to breakpoint.c.
This one required a few testsuite tweaks.  If I don't hear
objections, I will check both in on Monday.
2001-03-14  Michael Snyder  <msnyder@redhat.com>

	* tracepoint.c (tracepoints_info): Handle 64-bit addresses.
	* testsuite/gdb.trace/deltrace.exp: Allow for 64-bit addresses.
	* testsuite/gdb.trace/infotrace.exp: Ditto.
	* testsuite/gdb.trace/passcount.exp: Ditto.
	* testsuite/gdb.trace/while-stepping.exp: Ditto.

Index: tracepoint.c
===================================================================
RCS file: /cvs/src/src/gdb/tracepoint.c,v
retrieving revision 1.18
diff -c -3 -p -r1.18 tracepoint.c
*** tracepoint.c	2001/03/06 08:21:17	1.18
--- tracepoint.c	2001/03/15 23:24:06
*************** tracepoints_info (char *tpnum_exp, int f
*** 479,497 ****
  	{
  	  printf_filtered ("Num Enb ");
  	  if (addressprint)
! 	    printf_filtered ("Address    ");
  	  printf_filtered ("PassC StepC What\n");
  	}
        strcpy (wrap_indent, "                           ");
        if (addressprint)
! 	strcat (wrap_indent, "           ");
  
        printf_filtered ("%-3d %-3s ", t->number,
  		       t->enabled == enabled ? "y" : "n");
        if (addressprint)
! 	printf_filtered ("%s ",
! 			 local_hex_string_custom ((unsigned long) t->address,
! 						  "08l"));
        printf_filtered ("%-5d %-5ld ", t->pass_count, t->step_count);
  
        if (t->source_file)
--- 479,514 ----
  	{
  	  printf_filtered ("Num Enb ");
  	  if (addressprint)
! 	    {
! 	      if (TARGET_ADDR_BIT <= 32)
! 		printf_filtered ("Address    ");
! 	      else
! 		printf_filtered ("Address            ");
! 	    }
  	  printf_filtered ("PassC StepC What\n");
  	}
        strcpy (wrap_indent, "                           ");
        if (addressprint)
! 	{
! 	  if (TARGET_ADDR_BIT <= 32)
! 	    strcat (wrap_indent, "           ");
! 	  else
! 	    strcat (wrap_indent, "                   ");
! 	}
  
        printf_filtered ("%-3d %-3s ", t->number,
  		       t->enabled == enabled ? "y" : "n");
        if (addressprint)
! 	{
! 	  char *tmp;
! 
! 	  if (TARGET_ADDR_BIT <= 32)
! 	    tmp = longest_local_hex_string_custom (t->address, "08l");
! 	  else
! 	    tmp = longest_local_hex_string_custom (t->address, "016l");
! 
! 	  printf_filtered ("%s ", tmp);
! 	}
        printf_filtered ("%-5d %-5ld ", t->pass_count, t->step_count);
  
        if (t->source_file)
*************** encode_actions (struct tracepoint *t, ch
*** 1543,1549 ****
  		  struct cleanup *old_chain1 = NULL;
  		  struct agent_reqs areqs;
  
! 		  exp = parse_exp_1 (&action_exp, block_for_pc (t->address), 1);
  		  old_chain = make_cleanup (free_current_contents, &exp);
  
  		  switch (exp->elts[0].opcode)
--- 1560,1567 ----
  		  struct cleanup *old_chain1 = NULL;
  		  struct agent_reqs areqs;
  
! 		  exp = parse_exp_1 (&action_exp, 
! 				     block_for_pc (t->address), 1);
  		  old_chain = make_cleanup (free_current_contents, &exp);
  
  		  switch (exp->elts[0].opcode)
Index: testsuite/gdb.trace/deltrace.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/deltrace.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 deltrace.exp
*** deltrace.exp	2001/03/06 08:22:00	1.2
--- deltrace.exp	2001/03/15 23:24:06
*************** gdb_test "trace gdb_asm_test" "Tracepoin
*** 70,76 ****
  gdb_test "trace $testline1"   "Tracepoint \[0-9\]+ at .*" "set tracepoint 3"
  
  gdb_test "info tracepoints" \
!     "Num Enb Address    PassC StepC What.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_recursion_test.*" \
  			"3.1a: set three tracepoints"
  
  send_gdb "delete tracepoints\n"
--- 70,76 ----
  gdb_test "trace $testline1"   "Tracepoint \[0-9\]+ at .*" "set tracepoint 3"
  
  gdb_test "info tracepoints" \
!     "Num Enb Address\[ \]+PassC StepC What.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_recursion_test.*" \
  			"3.1a: set three tracepoints"
  
  send_gdb "delete tracepoints\n"
*************** if { $trcpt1 <= 0 || $trcpt2 <= 0 || $tr
*** 101,107 ****
  }
  
  gdb_test "info tracepoints" \
!     "Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in.*gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in.*gdb_recursion_test.*" \
  			"3.2a: set three tracepoints"
  
  #gdb_test "delete tracepoint $trcpt1" "" ""
--- 101,107 ----
  }
  
  gdb_test "info tracepoints" \
!     "Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in.*gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in.*gdb_recursion_test.*" \
  			"3.2a: set three tracepoints"
  
  #gdb_test "delete tracepoint $trcpt1" "" ""
*************** if { $trcpt1 <= 0 || $trcpt2 <= 0 || $tr
*** 215,221 ****
  }
  
  gdb_test "info tracepoints" \
!     "Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_recursion_test.*" \
  			"3.3a: set three tracepoints"
  
  #gdb_test "delete tracepoint $trcpt1 $trcpt2 $trcpt3" "" ""
--- 215,221 ----
  }
  
  gdb_test "info tracepoints" \
!     "Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_recursion_test.*" \
  			"3.3a: set three tracepoints"
  
  #gdb_test "delete tracepoint $trcpt1 $trcpt2 $trcpt3" "" ""
Index: testsuite/gdb.trace/infotrace.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/infotrace.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 infotrace.exp
*** infotrace.exp	2001/03/06 08:22:00	1.2
--- infotrace.exp	2001/03/15 23:24:06
*************** if { $c_test_num <= 0 || $asm_test_num <
*** 64,70 ****
  
  # 2.1 info tracepoints (all)
  gdb_test "info tracepoints" \
!     "Num Enb Address    PassC StepC What.*$c_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*$asm_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*" \
      "2.1: info tracepoints (all)"
  
  # 2.2 info tracepoint (specific)
--- 64,70 ----
  
  # 2.1 info tracepoints (all)
  gdb_test "info tracepoints" \
!     "Num Enb Address\[ \]+PassC StepC What.*$c_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*$asm_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*" \
      "2.1: info tracepoints (all)"
  
  # 2.2 info tracepoint (specific)
Index: testsuite/gdb.trace/passcount.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/passcount.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 passcount.exp
*** passcount.exp	2001/03/06 08:22:00	1.2
--- passcount.exp	2001/03/15 23:24:06
*************** if { $trcpt1 <= 0 || $trcpt2 <= 0 || $tr
*** 75,81 ****
  # 4.1 passcount of specified tracepoint
  
  gdb_test "info tracepoints" \
!     "Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
  			"4.1a: set three tracepoints, passcounts all zero"
  
  gdb_test "passcount 2 $trcpt1" \
--- 75,81 ----
  # 4.1 passcount of specified tracepoint
  
  gdb_test "info tracepoints" \
!     "Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
  			"4.1a: set three tracepoints, passcounts all zero"
  
  gdb_test "passcount 2 $trcpt1" \
*************** gdb_test "passcount 2 $trcpt1" \
*** 83,89 ****
  	"4.1b: set 1st tracepoint's passcount to two"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
  	"4.1c: verify 1st tracepoint's passcount set to two"
  
  gdb_test "passcount 4 $trcpt2" \
--- 83,89 ----
  	"4.1b: set 1st tracepoint's passcount to two"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
  	"4.1c: verify 1st tracepoint's passcount set to two"
  
  gdb_test "passcount 4 $trcpt2" \
*************** gdb_test "passcount 4 $trcpt2" \
*** 91,97 ****
  	"4.1d: set 2nd tracepoint's passcount to four"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
  	"4.1c: verify 2nd tracepoint's passcount set to four"
  
  # 4.2 passcount of last (default) tracepoint
--- 91,97 ----
  	"4.1d: set 2nd tracepoint's passcount to four"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
  	"4.1c: verify 2nd tracepoint's passcount set to four"
  
  # 4.2 passcount of last (default) tracepoint
*************** gdb_test "passcount 6" \
*** 101,107 ****
  	"4.2b: set last (default) tp's passcount to six"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+6\[\t \]+.*in gdb_recursion_test.*" \
  	"4.2b: verify last (default) tp's passcount set to six"
  
  # 4.3 run until stopped explicitly by user
--- 101,107 ----
  	"4.2b: set last (default) tp's passcount to six"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+6\[\t \]+.*in gdb_recursion_test.*" \
  	"4.2b: verify last (default) tp's passcount set to six"
  
  # 4.3 run until stopped explicitly by user
*************** gdb_test "passcount 7" \
*** 114,120 ****
  	"4.4a: reset last (default) tp's passcount to seven"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+7\[\t \]+.*in gdb_recursion_test.*" \
  	"4.4a: verify reset last (default) tp's passcount to seven"
  
  gdb_test "passcount 5 $trcpt2" \
--- 114,120 ----
  	"4.4a: reset last (default) tp's passcount to seven"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+7\[\t \]+.*in gdb_recursion_test.*" \
  	"4.4a: verify reset last (default) tp's passcount to seven"
  
  gdb_test "passcount 5 $trcpt2" \
*************** gdb_test "passcount 5 $trcpt2" \
*** 122,128 ****
  	"4.4b: reset second tracepoint's passcount to five"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+5\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+7\[\t \]+.*in gdb_recursion_test.*" \
  	"4.4c: verify reset second tracepoint's passcount to five"
  
  # 4.20 <FIXME test number> passcount for "all"
--- 122,128 ----
  	"4.4b: reset second tracepoint's passcount to five"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+5\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+7\[\t \]+.*in gdb_recursion_test.*" \
  	"4.4c: verify reset second tracepoint's passcount to five"
  
  # 4.20 <FIXME test number> passcount for "all"
*************** gdb_test "passcount 3 all" \
*** 132,138 ****
  	"4.20a: set all three passcounts to three"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*in gdb_recursion_test.*" \
  	"4.20a: set all three passcounts to three"
  
  gdb_test "passcount 4 all" \
--- 132,138 ----
  	"4.20a: set all three passcounts to three"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*in gdb_recursion_test.*" \
  	"4.20a: set all three passcounts to three"
  
  gdb_test "passcount 4 all" \
*************** gdb_test "passcount 4 all" \
*** 140,146 ****
  	"4.20a: reset all three passcounts to four"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
  	"4.20b: reset all three passcounts to four"
  
  # 4.5 Verify trace stops on first "satisfied" passcount
--- 140,146 ----
  	"4.20a: reset all three passcounts to four"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
  	"4.20b: reset all three passcounts to four"
  
  # 4.5 Verify trace stops on first "satisfied" passcount
*************** gdb_test "passcount 0 $trcpt1" \
*** 153,159 ****
  	"4.6: set passcount to zero"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
  	"4.6: set passcount to zero"
  
  # 4.7 (test a very large passcount)
--- 153,159 ----
  	"4.6: set passcount to zero"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
  	"4.6: set passcount to zero"
  
  # 4.7 (test a very large passcount)
*************** gdb_test "passcount 32767 $trcpt1" \
*** 163,169 ****
  	"4.7: set passcount to large number (32767)"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+32767\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
  	"4.7: set passcount to large number (32767)"
  
  # 4.8 set passcount for invalid tracepoint
--- 163,169 ----
  	"4.7: set passcount to large number (32767)"
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+32767\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
  	"4.7: set passcount to large number (32767)"
  
  # 4.8 set passcount for invalid tracepoint
Index: testsuite/gdb.trace/while-stepping.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/while-stepping.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 while-stepping.exp
*** while-stepping.exp	2001/03/06 08:22:00	1.2
--- while-stepping.exp	2001/03/15 23:24:06
*************** if { $trcpt1 <= 0 } then {
*** 64,70 ****
  # 5.12 basic while-stepping command (collect regs)
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address    PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+0\[\t \]+.*in gdb_c_test.*" \
  	"5.12: set a tracepoint, stepcount is zero"
  
  set stepcount 12
--- 64,70 ----
  # 5.12 basic while-stepping command (collect regs)
  
  gdb_test "info tracepoints" \
! 	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+0\[\t \]+.*in gdb_c_test.*" \
  	"5.12: set a tracepoint, stepcount is zero"
  
  set stepcount 12
*************** gdb_trace_setactions "5.12: set stepcoun
*** 76,86 ****
  	"end" ""
  
  gdb_test "info tracepoints" \
!     "Num Enb Address    PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+$stepcount\[\t \]+.*in gdb_c_test.*" \
  	"5.12: confirm stepcount set to $stepcount"
  
  gdb_test "info tracepoints" \
!     "Num Enb Address    PassC StepC What.*
  .*while-stepping $stepcount.*" \
  	"5.12: info trace shows \"while-stepping\""
  
--- 76,86 ----
  	"end" ""
  
  gdb_test "info tracepoints" \
!     "Num Enb Address\[ \]+PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+$stepcount\[\t \]+.*in gdb_c_test.*" \
  	"5.12: confirm stepcount set to $stepcount"
  
  gdb_test "info tracepoints" \
!     "Num Enb Address\[ \]+PassC StepC What.*
  .*while-stepping $stepcount.*" \
  	"5.12: info trace shows \"while-stepping\""
  


More information about the Gdb-patches mailing list