aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog16
-rw-r--r--gdb/remote.c5
-rw-r--r--gdb/target.h17
3 files changed, 20 insertions, 18 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 326909f..3b199ac 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,21 @@
2014-02-23 Yao Qi <yao@codesourcery.com>
+ Revert two patches:
+
+ 2013-10-25 Yao Qi <yao@codesourcery.com>
+
+ * remote.c (remote_traceframe_info): Return early if
+ traceframe is not selected.
+
+ 2013-07-19 Yao Qi <yao@codesourcery.com>
+
+ * target.c (update_current_target): Change the default action
+ of 'to_traceframe_info' from tcomplain to return_zero.
+ * target.h (struct target_ops) <to_traceframe_info>: Add more
+ comments.
+
+2014-02-23 Yao Qi <yao@codesourcery.com>
+
* valops.c (read_value_memory): Rewrite it. Call
target_xfer_partial in a loop.
* exec.h (section_table_available_memory): Remove declaration.
diff --git a/gdb/remote.c b/gdb/remote.c
index dcf2e50..de9dad1 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11058,11 +11058,6 @@ remote_traceframe_info (struct target_ops *self)
{
char *text;
- /* If current traceframe is not selected, don't bother the remote
- stub. */
- if (get_traceframe_number () < 0)
- return NULL;
-
text = target_read_stralloc (&current_target,
TARGET_OBJECT_TRACEFRAME_INFO, NULL);
if (text != NULL)
diff --git a/gdb/target.h b/gdb/target.h
index 2cc3c13..6cc1337 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -974,20 +974,11 @@ struct target_ops
TARGET_DEFAULT_NORETURN (tcomplain ());
/* Return a traceframe info object describing the current
- traceframe's contents. If the target doesn't support
- traceframe info, return NULL. If the current traceframe is not
- selected (the current traceframe number is -1), the target can
- choose to return either NULL or an empty traceframe info. If
- NULL is returned, for example in remote target, GDB will read
- from the live inferior. If an empty traceframe info is
- returned, for example in tfile target, which means the
- traceframe info is available, but the requested memory is not
- available in it. GDB will try to see if the requested memory
- is available in the read-only sections. This method should not
- cache data; higher layers take care of caching, invalidating,
- and re-fetching when necessary. */
+ traceframe's contents. This method should not cache data;
+ higher layers take care of caching, invalidating, and
+ re-fetching when necessary. */
struct traceframe_info *(*to_traceframe_info) (struct target_ops *)
- TARGET_DEFAULT_RETURN (NULL);
+ TARGET_DEFAULT_RETURN (tcomplain ());
/* Ask the target to use or not to use agent according to USE. Return 1
successful, 0 otherwise. */