2011-02-24 Michael Snyder * value.c (value_from_history_ref): New function. * value.h (value_from_history_ref): Export. * cli/cli-utils.c (get_number_trailer): Use value_from_history_ref to parse value history references. 2011-02-24 Michael Snyder * gdb.base/break.exp: Add tests for delete breakpoints using convenience variables and value history references. Index: value.c =================================================================== RCS file: /cvs/src/src/gdb/value.c,v retrieving revision 1.138 diff -u -p -u -p -r1.138 value.c --- value.c 16 Feb 2011 11:55:59 -0000 1.138 +++ value.c 24 Feb 2011 19:00:20 -0000 @@ -41,7 +41,7 @@ #include "cli/cli-decode.h" #include "exceptions.h" #include "python/python.h" - +#include #include "tracepoint.h" /* Prototypes for exported functions. */ @@ -2992,6 +2992,30 @@ value_from_decfloat (struct type *type, } struct value * +value_from_history_ref (char *h, char **endp) +{ + int index; + + if (h[0] == '$') + { + if (isdigit (h[1]) || h[1] == '\0' || h[1] == ' ' || h[1] == '\t') + /* single-dollar history value */ + index = strtol (&h[1], endp, 10); + else if (h[1] == '$' + && (isdigit (h[2]) || h[2] == '\0' + || h[2] == ' ' || h[2] == '\t')) + /* double-dollar history value */ + index = -strtol (&h[2], endp, 10); + else + /* not a history value */ + return NULL; + + return access_value_history (index); + } + return NULL; +} + +struct value * coerce_ref (struct value *arg) { struct type *value_type_arg_tmp = check_typedef (value_type (arg)); Index: value.h =================================================================== RCS file: /cvs/src/src/gdb/value.h,v retrieving revision 1.176 diff -u -p -u -p -r1.176 value.h --- value.h 16 Feb 2011 10:13:53 -0000 1.176 +++ value.h 24 Feb 2011 19:00:20 -0000 @@ -471,6 +471,7 @@ extern struct value *value_from_pointer extern struct value *value_from_double (struct type *type, DOUBLEST num); extern struct value *value_from_decfloat (struct type *type, const gdb_byte *decbytes); +extern struct value *value_from_history_ref (char *, char **); extern struct value *value_at (struct type *type, CORE_ADDR addr); extern struct value *value_at_lazy (struct type *type, CORE_ADDR addr); Index: cli/cli-utils.c =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-utils.c,v retrieving revision 1.10 diff -u -p -u -p -r1.10 cli-utils.c --- cli/cli-utils.c 22 Feb 2011 18:45:05 -0000 1.10 +++ cli/cli-utils.c 24 Feb 2011 19:00:20 -0000 @@ -21,6 +21,7 @@ #include "cli/cli-utils.h" #include "gdb_string.h" #include "value.h" +#include "gdb_assert.h" #include @@ -41,24 +42,37 @@ get_number_trailer (char **pp, int trail if (*p == '$') { - /* Make a copy of the name, so we can null-terminate it - to pass to lookup_internalvar(). */ - char *varname; - char *start = ++p; - LONGEST val; - - while (isalnum (*p) || *p == '_') - p++; - varname = (char *) alloca (p - start + 1); - strncpy (varname, start, p - start); - varname[p - start] = '\0'; - if (get_internalvar_integer (lookup_internalvar (varname), &val)) - retval = (int) val; + if (isalpha (p[1]) || p[1] == '_') + { + /* Internal variable. Make a copy of the name, so we can + null-terminate it to pass to lookup_internalvar(). */ + char *varname; + char *start = ++p; + LONGEST val; + + while (isalnum (*p) || *p == '_') + p++; + varname = (char *) alloca (p - start + 1); + strncpy (varname, start, p - start); + varname[p - start] = '\0'; + if (get_internalvar_integer (lookup_internalvar (varname), &val)) + retval = (int) val; + else + { + printf_filtered (_("Convenience variable must " + "have integer value.\n")); + retval = 0; + } + } else { - printf_filtered (_("Convenience variable must " - "have integer value.\n")); - retval = 0; + /* Value history token. */ + struct value *val = value_from_history_ref (p, &p); + + gdb_assert (val); + if (TYPE_CODE (value_type (val)) != TYPE_CODE_INT) + error (_("History value must have integer type.")); + retval = value_as_long (val); } } else Index: testsuite/gdb.base/break.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/break.exp,v retrieving revision 1.46 diff -u -p -u -p -r1.46 break.exp --- testsuite/gdb.base/break.exp 24 Feb 2011 18:37:14 -0000 1.46 +++ testsuite/gdb.base/break.exp 24 Feb 2011 19:00:20 -0000 @@ -236,6 +236,124 @@ gdb_test_multiple "info break 3-5" "info } } +# +# Test disable/enable with arguments +# + +# Test with value history + +gdb_test "print 1" "" "" +gdb_test "print 2" "" "" +gdb_test "print 3" "" "" +gdb_test "print 4" "" "" +gdb_test "print 5" "" "" + +gdb_test_no_output "disable \$2 \$\$" "disable using history values" + +set see1 0 +set see2 0 +set see3 0 +set see4 0 +set see5 0 +set see6 0 + +gdb_test_multiple "info break" "check disable with history values" { + -re "1\[\t \]+breakpoint *keep y.* in main at .*:$main_line\[^\r\n\]*" { + set see1 1 + exp_continue + } + -re "2\[\t \]+breakpoint *keep n\[^\r\n\]* in marker2 at \[^\r\n\]*" { + set see2 1 + exp_continue + } + -re "3\[\t \]+breakpoint *keep y\[^\r\n\]*$bp_location7\[^\r\n\]*" { + set see3 1 + exp_continue + } + -re "4\[\t \]+breakpoint *keep y\[^\r\n\]*$bp_location1\[^\r\n\]*" { + set see4 1 + exp_continue + } + -re "5\[\t \]+breakpoint *keep n\[^\r\n\]*$bp_location1\[^\r\n\]*" { + set see5 1 + exp_continue + } + -re "6\[\t \]+breakpoint *keep y\[^\r\n\]*$bp_location2\[^\r\n\]*" { + set see6 1 + exp_continue + } + -re ".*$gdb_prompt $" { + if { $see1 && $see2 && $see3 && $see4 && $see5 && $see6 } then { + pass "check disable with history values" + } else { + fail "check disable with history values" + } + } +} + +gdb_test "enable" "" "" +gdb_test "set \$foo = 3" "" "" +gdb_test "set \$bar = 6" "" "" +gdb_test_no_output "disable \$foo \$bar" "disable with convenience values" + +set see1 0 +set see2 0 +set see3 0 +set see4 0 +set see5 0 +set see6 0 + +gdb_test_multiple "info break" "check disable with convenience values" { + -re "1\[\t \]+breakpoint *keep y.* in main at .*:$main_line\[^\r\n\]*" { + set see1 1 + exp_continue + } + -re "2\[\t \]+breakpoint *keep y\[^\r\n\]* in marker2 at \[^\r\n\]*" { + set see2 1 + exp_continue + } + -re "3\[\t \]+breakpoint *keep n\[^\r\n\]*$bp_location7\[^\r\n\]*" { + set see3 1 + exp_continue + } + -re "4\[\t \]+breakpoint *keep y\[^\r\n\]*$bp_location1\[^\r\n\]*" { + set see4 1 + exp_continue + } + -re "5\[\t \]+breakpoint *keep y\[^\r\n\]*$bp_location1\[^\r\n\]*" { + set see5 1 + exp_continue + } + -re "6\[\t \]+breakpoint *keep n\[^\r\n\]*$bp_location2\[^\r\n\]*" { + set see6 1 + exp_continue + } + -re ".*$gdb_prompt $" { + if { $see1 && $see2 && $see3 && $see4 && $see5 && $see6 } then { + pass "check disable with convenience values" + } else { + fail "check disable with convenience values" + } + } +} + +# test with bad values + +gdb_test "enable" "" "" +gdb_test "disable 10" "No breakpoint number 10." \ + "disable non-existent breakpoint 10" + +gdb_test "set \$baz 1.234" +gdb_test "disable \$baz" \ + "Convenience variable must have integer value.*" \ + "disable with non-integer convenience var" +gdb_test "disable \$grbx" \ + "Convenience variable must have integer value.*" \ + "disable with non-existent convenience var" +gdb_test "disable \$10" \ + "History has not yet reached .10." \ + "disable with non-existent history value" + # FIXME: The rest of this test doesn't work with anything that can't # handle arguments. # Huh? There doesn't *appear* to be anything that passes arguments