diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/python/py-framefilter.c | 8 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-framefilter-mi.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-framefilter.py | 5 |
5 files changed, 23 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 970dffb..861f01b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-01-23 Tom Tromey <tromey@redhat.com> + + PR python/16491: + * python/py-framefilter.c (apply_frame_filter): Call + ensure_python_env after computing gdbarch. + 2014-01-23 Yao Qi <yao@codesourcery.com> * target.c (raw_memory_xfer_partial): Change argument type diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 76ce4e5..c6a29ef 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -1477,18 +1477,18 @@ apply_frame_filter (struct frame_info *frame, int flags, if (!gdb_python_initialized) return PY_BT_NO_FILTERS; - cleanups = ensure_python_env (gdbarch, current_language); - TRY_CATCH (except, RETURN_MASK_ALL) { gdbarch = get_frame_arch (frame); } if (except.reason < 0) { - gdbpy_convert_exception (except); - goto error; + /* Let gdb try to print the stack trace. */ + return PY_BT_NO_FILTERS; } + cleanups = ensure_python_env (gdbarch, current_language); + iterable = bootstrap_python_frame_filters (frame, frame_low, frame_high); if (iterable == NULL) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1cbbfa0..4e11cd1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-01-23 Tom Tromey <tromey@redhat.com> + + PR python/16491: + * gdb.python/py-framefilter.py (Reverse_Function.function): Read a + string from an inferior frame. + * gdb.python/py-framefilter-mi.exp: Update. + 2014-01-22 Doug Evans <dje@google.com> * gdb.server/server-mon.exp: Add tests for "set debug-format". diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.exp b/gdb/testsuite/gdb.python/py-framefilter-mi.exp index 58c8d35..0c5f5d4 100644 --- a/gdb/testsuite/gdb.python/py-framefilter-mi.exp +++ b/gdb/testsuite/gdb.python/py-framefilter-mi.exp @@ -66,10 +66,10 @@ mi_continue_to_line [gdb_get_line_number {Backtrace end breakpoint} ${srcfile}] "step to breakpoint" mi_gdb_test "-stack-list-frames" \ - "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"22\",addr=\"$hex\",func=\"1cnuf\".*,children=\\\[frame={level=\"23\",addr=\"$hex\",func=\"func2\".*}\\\]},frame={level=\"24\",addr=\"$hex\",func=\"3cnuf\".*},frame={level=\"27\",addr=\"$hex\",func=\"niam\".*}\\\].*" \ + "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne.*\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"22\",addr=\"$hex\",func=\"1cnuf\".*,children=\\\[frame={level=\"23\",addr=\"$hex\",func=\"func2\".*}\\\]},frame={level=\"24\",addr=\"$hex\",func=\"3cnuf\".*},frame={level=\"27\",addr=\"$hex\",func=\"niam\".*}\\\].*" \ "filtered stack listing" mi_gdb_test "-stack-list-frames 0 3" \ - "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*}\\\]" \ + "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne.*\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*}\\\]" \ "filtered stack list 0 3" mi_gdb_test "-stack-list-frames 22 24" \ "\\^done,stack=\\\[frame={level=\"22\",addr=\"$hex\",func=\"1cnuf\".*,children=\\\[frame={level=\"23\",addr=\"$hex\",func=\"func2\".*}\\\]},frame={level=\"24\",addr=\"$hex\",func=\"3cnuf\".*}\\\]" \ diff --git a/gdb/testsuite/gdb.python/py-framefilter.py b/gdb/testsuite/gdb.python/py-framefilter.py index 1cf8c22..25b3368 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.py +++ b/gdb/testsuite/gdb.python/py-framefilter.py @@ -30,8 +30,11 @@ class Reverse_Function (FrameDecorator): fname = str (self.fobj.function()) if (fname == None or fname == ""): return None + if fname == 'end_func': + extra = self.fobj.inferior_frame().read_var('str').string() else: - fname = fname[::-1] + extra = '' + fname = fname[::-1] + extra return fname class Dummy (FrameDecorator): |