From b2f4cfdebc3b7feb9572e83570d212f0ef31a78a Mon Sep 17 00:00:00 2001 From: Markus Metzger Date: Mon, 25 Mar 2013 15:44:43 +0100 Subject: [PATCH] record-btrace: add to_wait and to_resume target methods. Add simple to_wait and to_resume target methods that prevent stepping when the current replay position is not at the end of the execution log. 2014-01-16 Markus Metzger * record-btrace.c (record_btrace_resume): New. (record_btrace_wait): New. (init_record_btrace_ops): Initialize to_wait and to_resume. --- gdb/ChangeLog | 6 ++++++ gdb/record-btrace.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 29f00d851c..7ca7fb3216 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-01-16 Markus Metzger + + * record-btrace.c (record_btrace_resume): New. + (record_btrace_wait): New. + (init_record_btrace_ops): Initialize to_wait and to_resume. + 2014-01-16 Markus Metzger * record-btrace.c (record_btrace_xfer_partial) diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index a12dba18b7..1951dce4ee 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -1011,6 +1011,45 @@ static const struct frame_unwind record_btrace_frame_unwind = NULL, record_btrace_frame_sniffer }; + +/* The to_resume method of target record-btrace. */ + +static void +record_btrace_resume (struct target_ops *ops, ptid_t ptid, int step, + enum gdb_signal signal) +{ + /* As long as we're not replaying, just forward the request. */ + if (!record_btrace_is_replaying ()) + { + for (ops = ops->beneath; ops != NULL; ops = ops->beneath) + if (ops->to_resume != NULL) + return ops->to_resume (ops, ptid, step, signal); + + error (_("Cannot find target for stepping.")); + } + + error (_("You can't do this from here. Do 'record goto end', first.")); +} + +/* The to_wait method of target record-btrace. */ + +static ptid_t +record_btrace_wait (struct target_ops *ops, ptid_t ptid, + struct target_waitstatus *status, int options) +{ + /* As long as we're not replaying, just forward the request. */ + if (!record_btrace_is_replaying ()) + { + for (ops = ops->beneath; ops != NULL; ops = ops->beneath) + if (ops->to_wait != NULL) + return ops->to_wait (ops, ptid, status, options); + + error (_("Cannot find target for waiting.")); + } + + error (_("You can't do this from here. Do 'record goto end', first.")); +} + /* Initialize the record-btrace target ops. */ static void @@ -1045,6 +1084,8 @@ init_record_btrace_ops (void) ops->to_store_registers = record_btrace_store_registers; ops->to_prepare_to_store = record_btrace_prepare_to_store; ops->to_get_unwinder = &record_btrace_frame_unwind; + ops->to_resume = record_btrace_resume; + ops->to_wait = record_btrace_wait; ops->to_stratum = record_stratum; ops->to_magic = OPS_MAGIC; }