This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 5/9] gdb: Fix bug with dbx style func command.
- From: Andrew Burgess <andrew dot burgess at embecosm dot com>
- To: gdb-patches at sourceware dot org
- Cc: Andrew Burgess <andrew dot burgess at embecosm dot com>
- Date: Fri, 11 Sep 2015 19:49:39 +0100
- Subject: [PATCH 5/9] gdb: Fix bug with dbx style func command.
- Authentication-results: sourceware.org; auth=none
- References: <cover dot 1441996064 dot git dot andrew dot burgess at embecosm dot com>
- References: <cover dot 1441996064 dot git dot andrew dot burgess at embecosm dot com>
The func command, available when starting gdb in dbx mode, is supposed
to take a function name and locate the frame for that function in the
stack. This has been broken for a while due to an invalid check of the
arguments within the worker function. Fixed in this commit.
gdb/ChangeLog:
* stack.c (func_command): Return early when there is no ARG
string.
gdb/testsuite/ChangeLog:
* gdb.base/dbx.exp (test_func): Remove xfails, update expected
results.
---
gdb/ChangeLog | 5 +++++
gdb/stack.c | 2 +-
gdb/testsuite/ChangeLog | 5 +++++
gdb/testsuite/gdb.base/dbx.exp | 6 +-----
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 50aa7f0..7c4b567 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2015-09-11 Andrew Burgess <andrew.burgess@embecosm.com>
+ * stack.c (func_command): Return early when there is no ARG
+ string.
+
+2015-09-11 Andrew Burgess <andrew.burgess@embecosm.com>
+
* stack.c: Include safe-ctype.h not ctype.h.
(parse_frame_specification): Use ISSPACE not isspace.
(backtrace_command): Use TOLOWER not tolower.
diff --git a/gdb/stack.c b/gdb/stack.c
index 2fe176f..1049995 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -2527,7 +2527,7 @@ func_command (char *arg, int from_tty)
struct function_bounds *func_bounds = NULL;
struct cleanup *cleanups;
- if (arg != NULL)
+ if (arg == NULL)
return;
frame = parse_frame_specification ("0");
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ee0ad76..272d3fc 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2015-09-11 Andrew Burgess <andrew.burgess@embecosm.com>
+ * gdb.base/dbx.exp (test_func): Remove xfails, update expected
+ results.
+
+2015-09-11 Andrew Burgess <andrew.burgess@embecosm.com>
+
* gdb.base/create-frame.exp: Add test for 'info frame' with
specific address.
diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp
index 19dba62..75cb0fd 100644
--- a/gdb/testsuite/gdb.base/dbx.exp
+++ b/gdb/testsuite/gdb.base/dbx.exp
@@ -293,15 +293,11 @@ proc test_func { } {
global srcfile2
gdb_test "cont" ".*" "cont 1"
gdb_test "step" ".*"
- # This always fails, but it's not clear why. -sts 1999-08-17
- setup_xfail "*-*-*"
gdb_test "func sum" "'sum' not within current stack frame\."
set stop_line [gdb_get_line_number "stop-in-sum" $srcfile2]
gdb_test "stop in sum" "Breakpoint.*at.*: file.*sum\.c, line $stop_line\."
gdb_test "cont" ".*" "cont 2"
- # This always fails, but it's not clear why. -sts 1999-08-17
- setup_xfail "*-*-*"
- gdb_test "func print_average" ".*in print_average.*\\(list=.*, low=0, high=6\\).*at.*average\.c:${decimal}\r\n\${decimal}\[ \t\]+total = sum\\(list, low, high\\);"
+ gdb_test "func print_average" ".*in print_average.*\\(list=.*, low=0, high=6\\).*at.*average\.c:${decimal}\r\n${decimal}\[ \t\]+total = sum\\(list, low, high\\);"
}
# Start with a fresh gdb.
--
2.5.1