From eb626875b5fce4e5d297da897379a0f0427fab1d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 12 Jul 2013 13:00:34 -0600 Subject: [PATCH 05/11] add target method delegation MUST UPDATE This patch replaces some code in the record targets with target method delegation. record-full.c stores pointers to many target methods when the record target is pushed. Then it later delegates some calls via these. This is wrong because it violates the target stack contract. In particular it is ok to unpush a target at any stratum, but record-full does not keep track of this, so it could potentially call into an unpushed target. To fix the problem, this patch introduces a handful of target_delegate_* functions, which forward calls further down the target stack. 2013-10-30 Tom Tromey * record-full.c (record_full_beneath_to_resume_ops) (record_full_beneath_to_resume, record_full_beneath_to_wait_ops) (record_full_beneath_to_wait) (record_full_beneath_to_store_registers_ops) (record_full_beneath_to_store_registers) (record_full_beneath_to_xfer_partial_ops) (record_full_beneath_to_xfer_partial) (record_full_beneath_to_insert_breakpoint) (record_full_beneath_to_remove_breakpoint) (record_full_beneath_to_stopped_by_watchpoint) (record_full_beneath_to_stopped_data_address) (record_full_beneath_to_async, tmp_to_resume_ops, tmp_to_resume) (tmp_to_wait_ops, tmp_to_wait, tmp_to_store_registers_ops) (tmp_to_store_registers, tmp_to_xfer_partial_ops) (tmp_to_xfer_partial, tmp_to_insert_breakpoint) (tmp_to_remove_breakpoint, tmp_to_stopped_by_watchpoint) (tmp_to_stopped_data_address, tmp_to_async): Remove. (record_full_open_1, record_full_open): Update. Use RECORD_IS_USED. (record_full_resume, record_full_wait_1) (record_full_stopped_by_watchpoint, record_full_stopped_data_address) (record_full_store_registers, record_full_xfer_partial) (record_full_insert_breakpoint, record_full_remove_breakpoint) (record_full_async, record_full_can_async_p, record_full_is_async_p) (record_full_core_xfer_partial): Use target delegation. * target.c (update_current_target): Use target_delegate_xfer_partial. (target_delegate_xfer_partial): Now public. Renamed from... (current_xfer_partial): ...this. Remove. (target_delegate_async, target_delegate_is_async_p) (target_delegate_can_async_p, target_delegate_insert_breakpoint) (target_delegate_remove_breakpoint, target_delegate_wait) (target_delegate_resume, target_delegate_store_registers) (target_delegate_stopped_by_watchpoint) (target_delegate_stopped_data_address) (assert_delegation_failed): New functions. * target.h (target_delegate_async, target_delegate_is_async_p) (target_delegate_can_async_p, target_delegate_insert_breakpoint) (target_delegate_remove_breakpoint, target_delegate_wait) (target_delegate_resume, target_delegate_store_registers) (target_delegate_stopped_by_watchpoint) (target_delegate_stopped_data_address) (target_delegate_xfer_partial): Declare. --- gdb/ChangeLog | 44 +++++++++ gdb/make-target-delegates | 174 +++++++++++++++++++++++++++++++++ gdb/record-full.c | 239 ++++------------------------------------------ gdb/target-delegates.c | 108 +++++++++++++++++++++ gdb/target.c | 196 ++++++++++++++++++------------------- gdb/target.h | 5 +- 6 files changed, 444 insertions(+), 322 deletions(-) create mode 100755 gdb/make-target-delegates create mode 100644 gdb/target-delegates.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 001cce3..f87d015 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,49 @@ 2013-10-30 Tom Tromey + * record-full.c (record_full_beneath_to_resume_ops) + (record_full_beneath_to_resume, record_full_beneath_to_wait_ops) + (record_full_beneath_to_wait) + (record_full_beneath_to_store_registers_ops) + (record_full_beneath_to_store_registers) + (record_full_beneath_to_xfer_partial_ops) + (record_full_beneath_to_xfer_partial) + (record_full_beneath_to_insert_breakpoint) + (record_full_beneath_to_remove_breakpoint) + (record_full_beneath_to_stopped_by_watchpoint) + (record_full_beneath_to_stopped_data_address) + (record_full_beneath_to_async, tmp_to_resume_ops, tmp_to_resume) + (tmp_to_wait_ops, tmp_to_wait, tmp_to_store_registers_ops) + (tmp_to_store_registers, tmp_to_xfer_partial_ops) + (tmp_to_xfer_partial, tmp_to_insert_breakpoint) + (tmp_to_remove_breakpoint, tmp_to_stopped_by_watchpoint) + (tmp_to_stopped_data_address, tmp_to_async): Remove. + (record_full_open_1, record_full_open): Update. Use RECORD_IS_USED. + (record_full_resume, record_full_wait_1) + (record_full_stopped_by_watchpoint, record_full_stopped_data_address) + (record_full_store_registers, record_full_xfer_partial) + (record_full_insert_breakpoint, record_full_remove_breakpoint) + (record_full_async, record_full_can_async_p, record_full_is_async_p) + (record_full_core_xfer_partial): Use target delegation. + * target.c (update_current_target): Use target_delegate_xfer_partial. + (target_delegate_xfer_partial): Now public. Renamed from... + (current_xfer_partial): ...this. Remove. + (target_delegate_async, target_delegate_is_async_p) + (target_delegate_can_async_p, target_delegate_insert_breakpoint) + (target_delegate_remove_breakpoint, target_delegate_wait) + (target_delegate_resume, target_delegate_store_registers) + (target_delegate_stopped_by_watchpoint) + (target_delegate_stopped_data_address) + (assert_delegation_failed): New functions. + * target.h (target_delegate_async, target_delegate_is_async_p) + (target_delegate_can_async_p, target_delegate_insert_breakpoint) + (target_delegate_remove_breakpoint, target_delegate_wait) + (target_delegate_resume, target_delegate_store_registers) + (target_delegate_stopped_by_watchpoint) + (target_delegate_stopped_data_address) + (target_delegate_xfer_partial): Declare. + +2013-10-30 Tom Tromey + * record.c (find_record_target): Use find_target_at. * record.h (RECORD_IS_REPLAY): Use find_target_at. * target.c (find_target_at): New function. diff --git a/gdb/make-target-delegates b/gdb/make-target-delegates new file mode 100755 index 0000000..720ca13 --- /dev/null +++ b/gdb/make-target-delegates @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +# For the time being we only allow certain methods. +%OK = ( + 'to_resume' => 1, + 'to_wait' => 1, + 'to_store_registers' => 1, + 'to_insert_breakpoint' => 1, + 'to_remove_breakpoint' => 1, + 'to_can_async_p' => 1, + 'to_is_async_p' => 1, + 'to_async' => 1, + 'to_stopped_by_watchpoint' => 1, + 'to_stopped_data_address' => 1, + 'to_xfer_partial' => 1 +); + +# The line we search for in target.h that marks where we should start +# looking for methods. +$TRIGGER = qr,^struct target_ops$,; +# The end of the methods part. +$ENDER = qr,^\s*};$,; + +$SYMBOL = qr,[a-zA-Z0-9_]+,; +$NAME_PART = qr,\(\*(?${SYMBOL}+)\)\s,; +$ARGS_PART = qr,(?\(.*)$,; +$INTRO_PART = qr,^\s*,; + +$SIMPLE_RETURN_PART = qr,[^\(]+,; +$VEC_RETURN_PART = qr,VEC\s*\([^\)]+\)[^\(]*,; + +$METHOD = ($INTRO_PART . "(?" . $SIMPLE_RETURN_PART + . "|" . $VEC_RETURN_PART . ")" + . $NAME_PART . $ARGS_PART); + +sub trim($) { + my ($result) = @_; + $result =~ s,^\s*(\S*)\s*$,\1,; + return $result; +} + +# Read from the input files until we find the trigger line. +# Die if not found. +sub find_trigger() { + while (<>) { + chomp; + return if m/$TRIGGER/; + } + + die "could not find trigger line\n"; +} + +# Parse arguments into a list. +sub parse_argtypes($) { + my ($typestr) = @_; + + $typestr =~ s/^\((.*)\);$/\1/; + + my (@typelist) = split (/,\s*/, $typestr); + my (@result, $iter, $onetype); + + foreach $iter (@typelist) { + if ($iter =~ m/^(enum\s+${SYMBOL}\s*)(${SYMBOL})?$/) { + $onetype = $1; + } elsif ($iter =~ m/^(.*(enum\s+)?${SYMBOL}.*(\s|\*))${SYMBOL}+$/) { + $onetype = $1; + } elsif ($iter eq 'void') { + next; + } else { + $onetype = $iter; + } + push @result, trim ($onetype); + } + + return @result; +} + +sub dname($) { + my ($name) = @_; + $name =~ s/to_/delegate_/; + return $name; +} + +# Write out a delegation function. +sub write_delegator($$@) { + my ($name, $return_type, @argtypes) = @_; + + print "static " . $return_type . "\n"; + print dname ($name) . ' ('; + + my $iter; + my @argdecls; + my @actuals; + my $i = 0; + foreach $iter (@argtypes) { + my $val = $iter; + + if ($iter !~ m,\*$,) { + $val .= ' '; + } + + my $vname; + if ($i == 0) { + # Just a random nicety. + $vname = 'self'; + } else { + $vname .= "arg$i"; + } + $val .= $vname; + + push @argdecls, $val; + push @actuals, $vname; + ++$i; + } + + print join (', ', @argdecls) . ")\n"; + print "{\n"; + print " self = self->beneath;\n"; + print " "; + if ($return_type ne 'void') { + print "return "; + } + print "self->" . $name . " ("; + print join (', ', @actuals); + print ");\n"; + print "}\n\n"; +} + +print "/* THIS FILE IS GENERATED -*- buffer-read-only: t -*- */\n"; +print "/* vi:set ro: */\n\n"; +print "/* To regenerate this file, run:*/\n"; +print "/* make-target-delegates target.h > target-delegates.c */\n"; + +find_trigger(); + +@delegators = (); +$current_args = ''; +while (<>) { + chomp; + last if m/$ENDER/; + + if ($current_args ne '') { + s/^\s*//; + $current_args .= $_; + } elsif (m/$METHOD/) { + $name = $+{name}; + $current_args = $+{args}; + $return_type = trim ($+{return_type}); + } + + if ($current_args =~ /\);\s*$/) { + if (defined $OK{$name}) { + @argtypes = parse_argtypes ($current_args); + + # The first argument must be "this" to be delegatable. + if ($argtypes[0] =~ /\s*struct\s+target_ops\s*\*\s*/) { + write_delegator ($name, $return_type, @argtypes); + + push @delegators, $name; + } + } + + $current_args = ''; + } +} + +# Now the delegation code. +print "static void\ninstall_delegators (struct target_ops *ops)\n{\n"; + +for $iter (@delegators) { + print " if (ops->" . $iter . " == NULL)\n"; + print " ops->" . $iter . " = " . dname ($iter) . ";\n"; +} +print "}\n"; diff --git a/gdb/record-full.c b/gdb/record-full.c index f4d760a..1d66c6e 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -215,43 +215,6 @@ static struct cmd_list_element *show_record_full_cmdlist; /* Command list for "record full". */ static struct cmd_list_element *record_full_cmdlist; -/* The beneath function pointers. */ -static struct target_ops *record_full_beneath_to_resume_ops; -static void (*record_full_beneath_to_resume) (struct target_ops *, ptid_t, int, - enum gdb_signal); -static struct target_ops *record_full_beneath_to_wait_ops; -static ptid_t (*record_full_beneath_to_wait) (struct target_ops *, ptid_t, - struct target_waitstatus *, - int); -static struct target_ops *record_full_beneath_to_store_registers_ops; -static void (*record_full_beneath_to_store_registers) (struct target_ops *, - struct regcache *, - int regno); -static struct target_ops *record_full_beneath_to_xfer_partial_ops; -static LONGEST - (*record_full_beneath_to_xfer_partial) (struct target_ops *ops, - enum target_object object, - const char *annex, - gdb_byte *readbuf, - const gdb_byte *writebuf, - ULONGEST offset, - LONGEST len); -static int - (*record_full_beneath_to_insert_breakpoint) (struct target_ops *, - struct gdbarch *, - struct bp_target_info *); -static int - (*record_full_beneath_to_remove_breakpoint) (struct target_ops *, - struct gdbarch *, - struct bp_target_info *); -static int (*record_full_beneath_to_stopped_by_watchpoint) (struct target_ops *); -static int (*record_full_beneath_to_stopped_data_address) (struct target_ops *, - CORE_ADDR *); -static void - (*record_full_beneath_to_async) (struct target_ops *, - void (*) (enum inferior_event_type, void *), - void *); - static void record_full_goto_insn (struct record_full_entry *entry, enum exec_direction_kind dir); static void record_full_save (const char *recfilename); @@ -798,36 +761,6 @@ record_full_exec_insn (struct regcache *regcache, } } -static struct target_ops *tmp_to_resume_ops; -static void (*tmp_to_resume) (struct target_ops *, ptid_t, int, - enum gdb_signal); -static struct target_ops *tmp_to_wait_ops; -static ptid_t (*tmp_to_wait) (struct target_ops *, ptid_t, - struct target_waitstatus *, - int); -static struct target_ops *tmp_to_store_registers_ops; -static void (*tmp_to_store_registers) (struct target_ops *, - struct regcache *, - int regno); -static struct target_ops *tmp_to_xfer_partial_ops; -static LONGEST (*tmp_to_xfer_partial) (struct target_ops *ops, - enum target_object object, - const char *annex, - gdb_byte *readbuf, - const gdb_byte *writebuf, - ULONGEST offset, - LONGEST len); -static int (*tmp_to_insert_breakpoint) (struct target_ops *, - struct gdbarch *, - struct bp_target_info *); -static int (*tmp_to_remove_breakpoint) (struct target_ops *ops, - struct gdbarch *, - struct bp_target_info *); -static int (*tmp_to_stopped_by_watchpoint) (struct target_ops *); -static int (*tmp_to_stopped_data_address) (struct target_ops *, CORE_ADDR *); -static void (*tmp_to_async) (struct target_ops *, - void (*) (enum inferior_event_type, void *), void *); - static void record_full_restore (void); /* Asynchronous signal handle registered as event loop source for when @@ -890,26 +823,6 @@ record_full_open_1 (char *name, int from_tty) error (_("Process record: the current architecture doesn't support " "record function.")); - if (!tmp_to_resume) - error (_("Could not find 'to_resume' method on the target stack.")); - if (!tmp_to_wait) - error (_("Could not find 'to_wait' method on the target stack.")); - if (!tmp_to_store_registers) - error (_("Could not find 'to_store_registers' " - "method on the target stack.")); - if (!tmp_to_insert_breakpoint) - error (_("Could not find 'to_insert_breakpoint' " - "method on the target stack.")); - if (!tmp_to_remove_breakpoint) - error (_("Could not find 'to_remove_breakpoint' " - "method on the target stack.")); - if (!tmp_to_stopped_by_watchpoint) - error (_("Could not find 'to_stopped_by_watchpoint' " - "method on the target stack.")); - if (!tmp_to_stopped_data_address) - error (_("Could not find 'to_stopped_data_address' " - "method on the target stack.")); - push_target (&record_full_ops); } @@ -926,83 +839,16 @@ record_full_open (char *name, int from_tty) fprintf_unfiltered (gdb_stdlog, "Process record: record_full_open\n"); /* Check if record target is already running. */ - if (current_target.to_stratum == record_stratum) + if (RECORD_IS_USED) error (_("Process record target already running. Use \"record stop\" to " "stop record target first.")); - /* Reset the tmp beneath pointers. */ - tmp_to_resume_ops = NULL; - tmp_to_resume = NULL; - tmp_to_wait_ops = NULL; - tmp_to_wait = NULL; - tmp_to_store_registers_ops = NULL; - tmp_to_store_registers = NULL; - tmp_to_xfer_partial_ops = NULL; - tmp_to_xfer_partial = NULL; - tmp_to_insert_breakpoint = NULL; - tmp_to_remove_breakpoint = NULL; - tmp_to_stopped_by_watchpoint = NULL; - tmp_to_stopped_data_address = NULL; - tmp_to_async = NULL; - - /* Set the beneath function pointers. */ - for (t = current_target.beneath; t != NULL; t = t->beneath) - { - if (!tmp_to_resume) - { - tmp_to_resume = t->to_resume; - tmp_to_resume_ops = t; - } - if (!tmp_to_wait) - { - tmp_to_wait = t->to_wait; - tmp_to_wait_ops = t; - } - if (!tmp_to_store_registers) - { - tmp_to_store_registers = t->to_store_registers; - tmp_to_store_registers_ops = t; - } - if (!tmp_to_xfer_partial) - { - tmp_to_xfer_partial = t->to_xfer_partial; - tmp_to_xfer_partial_ops = t; - } - if (!tmp_to_insert_breakpoint) - tmp_to_insert_breakpoint = t->to_insert_breakpoint; - if (!tmp_to_remove_breakpoint) - tmp_to_remove_breakpoint = t->to_remove_breakpoint; - if (!tmp_to_stopped_by_watchpoint) - tmp_to_stopped_by_watchpoint = t->to_stopped_by_watchpoint; - if (!tmp_to_stopped_data_address) - tmp_to_stopped_data_address = t->to_stopped_data_address; - if (!tmp_to_async) - tmp_to_async = t->to_async; - } - if (!tmp_to_xfer_partial) - error (_("Could not find 'to_xfer_partial' method on the target stack.")); - /* Reset */ record_full_insn_num = 0; record_full_insn_count = 0; record_full_list = &record_full_first; record_full_list->next = NULL; - /* Set the tmp beneath pointers to beneath pointers. */ - record_full_beneath_to_resume_ops = tmp_to_resume_ops; - record_full_beneath_to_resume = tmp_to_resume; - record_full_beneath_to_wait_ops = tmp_to_wait_ops; - record_full_beneath_to_wait = tmp_to_wait; - record_full_beneath_to_store_registers_ops = tmp_to_store_registers_ops; - record_full_beneath_to_store_registers = tmp_to_store_registers; - record_full_beneath_to_xfer_partial_ops = tmp_to_xfer_partial_ops; - record_full_beneath_to_xfer_partial = tmp_to_xfer_partial; - record_full_beneath_to_insert_breakpoint = tmp_to_insert_breakpoint; - record_full_beneath_to_remove_breakpoint = tmp_to_remove_breakpoint; - record_full_beneath_to_stopped_by_watchpoint = tmp_to_stopped_by_watchpoint; - record_full_beneath_to_stopped_data_address = tmp_to_stopped_data_address; - record_full_beneath_to_async = tmp_to_async; - if (core_bfd) record_full_core_open_1 (name, from_tty); else @@ -1126,8 +972,7 @@ record_full_resume (struct target_ops *ops, ptid_t ptid, int step, /* Make sure the target beneath reports all signals. */ target_pass_signals (0, NULL); - record_full_beneath_to_resume (record_full_beneath_to_resume_ops, - ptid, step, signal); + ops->beneath->to_resume (ops->beneath, ptid, step, signal); } /* We are about to start executing the inferior (or simulate it), @@ -1217,8 +1062,7 @@ record_full_wait_1 (struct target_ops *ops, if (record_full_resume_step) { /* This is a single step. */ - return record_full_beneath_to_wait (record_full_beneath_to_wait_ops, - ptid, status, options); + return ops->beneath->to_wait (ops->beneath, ptid, status, options); } else { @@ -1229,8 +1073,7 @@ record_full_wait_1 (struct target_ops *ops, while (1) { - ret = record_full_beneath_to_wait - (record_full_beneath_to_wait_ops, ptid, status, options); + ret = ops->beneath->to_wait (ops->beneath, ptid, status, options); if (status->kind == TARGET_WAITKIND_IGNORE) { if (record_debug) @@ -1314,9 +1157,8 @@ record_full_wait_1 (struct target_ops *ops, "Process record: record_full_wait " "issuing one more step in the " "target beneath\n"); - record_full_beneath_to_resume - (record_full_beneath_to_resume_ops, ptid, step, - GDB_SIGNAL_0); + ops->beneath->to_resume (ops->beneath, ptid, step, + GDB_SIGNAL_0); continue; } } @@ -1520,11 +1362,7 @@ record_full_stopped_by_watchpoint (struct target_ops *ops) if (RECORD_FULL_IS_REPLAY) return record_full_hw_watchpoint; else - { - struct target_ops *beneath = find_target_beneath (ops); - - return record_full_beneath_to_stopped_by_watchpoint (beneath); - } + return ops->beneath->to_stopped_by_watchpoint (ops->beneath); } static int @@ -1533,7 +1371,7 @@ record_full_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p) if (RECORD_FULL_IS_REPLAY) return 0; else - return record_full_beneath_to_stopped_data_address (ops, addr_p); + return ops->beneath->to_stopped_data_address (ops->beneath, addr_p); } /* Record registers change (by user or by GDB) to list as an instruction. */ @@ -1636,8 +1474,7 @@ record_full_store_registers (struct target_ops *ops, record_full_registers_change (regcache, regno); } - record_full_beneath_to_store_registers - (record_full_beneath_to_store_registers_ops, regcache, regno); + ops->beneath->to_store_registers (ops->beneath, regcache, regno); } /* "to_xfer_partial" method. Behavior is conditional on @@ -1702,9 +1539,9 @@ record_full_xfer_partial (struct target_ops *ops, enum target_object object, record_full_insn_num++; } - return record_full_beneath_to_xfer_partial - (record_full_beneath_to_xfer_partial_ops, object, annex, - readbuf, writebuf, offset, len); + return ops->beneath->to_xfer_partial (ops->beneath, object, annex, + readbuf, writebuf, offset, + len); } /* This structure represents a breakpoint inserted while the record @@ -1785,8 +1622,7 @@ record_full_insert_breakpoint (struct target_ops *ops, int ret; old_cleanups = record_full_gdb_operation_disable_set (); - ret = record_full_beneath_to_insert_breakpoint (find_target_beneath (ops), - gdbarch, bp_tgt); + ret = ops->beneath->to_insert_breakpoint (ops->beneath, gdbarch, bp_tgt); do_cleanups (old_cleanups); if (ret != 0) @@ -1827,8 +1663,8 @@ record_full_remove_breakpoint (struct target_ops *ops, int ret; old_cleanups = record_full_gdb_operation_disable_set (); - ret = record_full_beneath_to_remove_breakpoint (find_target_beneath (ops), - gdbarch, bp_tgt); + ret = ops->beneath->to_remove_breakpoint (ops->beneath, gdbarch, + bp_tgt); do_cleanups (old_cleanups); if (ret != 0) @@ -1902,32 +1738,6 @@ record_full_goto_bookmark (gdb_byte *raw_bookmark, int from_tty) return; } -static void -record_full_async (struct target_ops *ops, - void (*callback) (enum inferior_event_type event_type, - void *context), void *context) -{ - /* If we're on top of a line target (e.g., linux-nat, remote), then - set it to async mode as well. Will be NULL if we're sitting on - top of the core target, for "record restore". */ - if (record_full_beneath_to_async != NULL) - record_full_beneath_to_async (find_target_beneath (ops), callback, context); -} - -static int -record_full_can_async_p (struct target_ops *ops) -{ - /* We only enable async when the user specifically asks for it. */ - return target_async_permitted; -} - -static int -record_full_is_async_p (struct target_ops *ops) -{ - /* We only enable async when the user specifically asks for it. */ - return target_async_permitted; -} - static enum exec_direction_kind record_full_execution_direction (void) { @@ -2092,9 +1902,6 @@ init_record_full_ops (void) /* Add bookmark target methods. */ record_full_ops.to_get_bookmark = record_full_get_bookmark; record_full_ops.to_goto_bookmark = record_full_goto_bookmark; - record_full_ops.to_async = record_full_async; - record_full_ops.to_can_async_p = record_full_can_async_p; - record_full_ops.to_is_async_p = record_full_is_async_p; record_full_ops.to_execution_direction = record_full_execution_direction; record_full_ops.to_info_record = record_full_info; record_full_ops.to_save_record = record_full_save; @@ -2251,10 +2058,10 @@ record_full_core_xfer_partial (struct target_ops *ops, else { if (!entry) - return record_full_beneath_to_xfer_partial - (record_full_beneath_to_xfer_partial_ops, - object, annex, readbuf, writebuf, - offset, len); + return ops->beneath->to_xfer_partial (ops->beneath, + object, annex, + readbuf, writebuf, + offset, len); memcpy (readbuf, entry->buf + sec_offset, (size_t) len); @@ -2270,9 +2077,8 @@ record_full_core_xfer_partial (struct target_ops *ops, error (_("You can't do that without a process to debug.")); } - return record_full_beneath_to_xfer_partial - (record_full_beneath_to_xfer_partial_ops, object, annex, - readbuf, writebuf, offset, len); + return ops->beneath->to_xfer_partial (ops->beneath, object, annex, + readbuf, writebuf, offset, len); } /* "to_insert_breakpoint" method for prec over corefile. */ @@ -2334,9 +2140,6 @@ init_record_full_core_ops (void) /* Add bookmark target methods. */ record_full_core_ops.to_get_bookmark = record_full_get_bookmark; record_full_core_ops.to_goto_bookmark = record_full_goto_bookmark; - record_full_core_ops.to_async = record_full_async; - record_full_core_ops.to_can_async_p = record_full_can_async_p; - record_full_core_ops.to_is_async_p = record_full_is_async_p; record_full_core_ops.to_execution_direction = record_full_execution_direction; record_full_core_ops.to_info_record = record_full_info; diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c new file mode 100644 index 0000000..60a28ca --- /dev/null +++ b/gdb/target-delegates.c @@ -0,0 +1,108 @@ +/* THIS FILE IS GENERATED -*- buffer-read-only: t -*- */ +/* vi:set ro: */ + +/* To regenerate this file, run:*/ +/* make-target-delegates target.h > target-delegates.c */ +static void +delegate_resume (struct target_ops *self, ptid_t arg1, int arg2, enum gdb_signal arg3) +{ + self = self->beneath; + self->to_resume (self, arg1, arg2, arg3); +} + +static ptid_t +delegate_wait (struct target_ops *self, ptid_t arg1, struct target_waitstatus *arg2, int arg3) +{ + self = self->beneath; + return self->to_wait (self, arg1, arg2, arg3); +} + +static void +delegate_store_registers (struct target_ops *self, struct regcache *arg1, int arg2) +{ + self = self->beneath; + self->to_store_registers (self, arg1, arg2); +} + +static int +delegate_insert_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2) +{ + self = self->beneath; + return self->to_insert_breakpoint (self, arg1, arg2); +} + +static int +delegate_remove_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2) +{ + self = self->beneath; + return self->to_remove_breakpoint (self, arg1, arg2); +} + +static int +delegate_stopped_by_watchpoint (struct target_ops *self) +{ + self = self->beneath; + return self->to_stopped_by_watchpoint (self); +} + +static int +delegate_stopped_data_address (struct target_ops *self, CORE_ADDR *arg1) +{ + self = self->beneath; + return self->to_stopped_data_address (self, arg1); +} + +static int +delegate_can_async_p (struct target_ops *self) +{ + self = self->beneath; + return self->to_can_async_p (self); +} + +static int +delegate_is_async_p (struct target_ops *self) +{ + self = self->beneath; + return self->to_is_async_p (self); +} + +static void +delegate_async (struct target_ops *self, async_callback_ftype *arg1, void *arg2) +{ + self = self->beneath; + self->to_async (self, arg1, arg2); +} + +static LONGEST +delegate_xfer_partial (struct target_ops *self, enum target_object arg1, const char *arg2, gdb_byte *arg3, const gdb_byte *arg4, ULONGEST arg5, LONGEST arg6) +{ + self = self->beneath; + return self->to_xfer_partial (self, arg1, arg2, arg3, arg4, arg5, arg6); +} + +static void +install_delegators (struct target_ops *ops) +{ + if (ops->to_resume == NULL) + ops->to_resume = delegate_resume; + if (ops->to_wait == NULL) + ops->to_wait = delegate_wait; + if (ops->to_store_registers == NULL) + ops->to_store_registers = delegate_store_registers; + if (ops->to_insert_breakpoint == NULL) + ops->to_insert_breakpoint = delegate_insert_breakpoint; + if (ops->to_remove_breakpoint == NULL) + ops->to_remove_breakpoint = delegate_remove_breakpoint; + if (ops->to_stopped_by_watchpoint == NULL) + ops->to_stopped_by_watchpoint = delegate_stopped_by_watchpoint; + if (ops->to_stopped_data_address == NULL) + ops->to_stopped_data_address = delegate_stopped_data_address; + if (ops->to_can_async_p == NULL) + ops->to_can_async_p = delegate_can_async_p; + if (ops->to_is_async_p == NULL) + ops->to_is_async_p = delegate_is_async_p; + if (ops->to_async == NULL) + ops->to_async = delegate_async; + if (ops->to_xfer_partial == NULL) + ops->to_xfer_partial = delegate_xfer_partial; +} diff --git a/gdb/target.c b/gdb/target.c index d2a40ee..e765700 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -45,6 +45,8 @@ #include "gdb/fileio.h" #include "agent.h" +#include "target-delegates.c" + static void target_info (char *, int); static void default_terminal_info (const char *, int); @@ -76,12 +78,6 @@ static LONGEST default_xfer_partial (struct target_ops *ops, const gdb_byte *writebuf, ULONGEST offset, LONGEST len); -static LONGEST current_xfer_partial (struct target_ops *ops, - enum target_object object, - const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, - ULONGEST offset, LONGEST len); - static struct gdbarch *default_thread_architecture (struct target_ops *ops, ptid_t ptid); @@ -352,6 +348,8 @@ complete_target_initialization (struct target_ops *t) if (t->to_has_execution == NULL) t->to_has_execution = (int (*) (struct target_ops *, ptid_t)) return_zero; + + install_delegators (t); } /* Add possible target architecture T to the list and add a new @@ -559,6 +557,9 @@ update_current_target (void) /* First, reset current's contents. */ memset (¤t_target, 0, sizeof (current_target)); + /* The newest approach is to auto-delegate some methods. */ + install_delegators (¤t_target); + #define INHERIT(FIELD, TARGET) \ if (!current_target.FIELD) \ current_target.FIELD = (TARGET)->FIELD @@ -582,8 +583,8 @@ update_current_target (void) INHERIT (to_prepare_to_store, t); INHERIT (deprecated_xfer_memory, t); INHERIT (to_files_info, t); - INHERIT (to_insert_breakpoint, t); - INHERIT (to_remove_breakpoint, t); + /* Do not inherit to_insert_breakpoint. */ + /* Do not inherit to_remove_breakpoint. */ INHERIT (to_can_use_hw_breakpoint, t); INHERIT (to_insert_hw_breakpoint, t); INHERIT (to_remove_hw_breakpoint, t); @@ -592,10 +593,10 @@ update_current_target (void) INHERIT (to_remove_watchpoint, t); /* Do not inherit to_insert_mask_watchpoint. */ /* Do not inherit to_remove_mask_watchpoint. */ - INHERIT (to_stopped_data_address, t); + /* Do not inherit to_stopped_data_address. */ INHERIT (to_have_steppable_watchpoint, t); INHERIT (to_have_continuable_watchpoint, t); - INHERIT (to_stopped_by_watchpoint, t); + /* Do not inherit to_stopped_by_watchpoint. */ INHERIT (to_watchpoint_addr_within_range, t); INHERIT (to_region_ok_for_hw_watchpoint, t); INHERIT (to_can_accel_watchpoint_condition, t); @@ -640,9 +641,9 @@ update_current_target (void) /* Do not inherit to_has_registers. */ /* Do not inherit to_has_execution. */ INHERIT (to_has_thread_control, t); - INHERIT (to_can_async_p, t); - INHERIT (to_is_async_p, t); - INHERIT (to_async, t); + /* Do not inherit to_can_async_p. */ + /* Do not inherit to_is_async_p. */ + /* Do not inherit to_async. */ INHERIT (to_find_memory_regions, t); INHERIT (to_make_corefile_notes, t); INHERIT (to_get_bookmark, t); @@ -742,12 +743,6 @@ update_current_target (void) de_fault (to_remove_watchpoint, (int (*) (CORE_ADDR, int, int, struct expression *)) return_minus_one); - de_fault (to_stopped_by_watchpoint, - (int (*) (struct target_ops *)) - return_zero); - de_fault (to_stopped_data_address, - (int (*) (struct target_ops *, CORE_ADDR *)) - return_zero); de_fault (to_watchpoint_addr_within_range, default_watchpoint_addr_within_range); de_fault (to_region_ok_for_hw_watchpoint, @@ -813,18 +808,12 @@ update_current_target (void) de_fault (to_stop, (void (*) (ptid_t)) target_ignore); - current_target.to_xfer_partial = current_xfer_partial; de_fault (to_rcmd, (void (*) (char *, struct ui_file *)) tcomplain); de_fault (to_pid_to_exec_file, (char *(*) (int)) return_zero); - de_fault (to_async, - (void (*) (struct target_ops *, - void (*) (enum inferior_event_type, void*), - void*)) - tcomplain); de_fault (to_thread_architecture, default_thread_architecture); current_target.to_read_description = NULL; @@ -1996,27 +1985,12 @@ default_xfer_partial (struct target_ops *ops, enum target_object object, else return -1; } - else if (ops->beneath != NULL) - return ops->beneath->to_xfer_partial (ops->beneath, object, annex, - readbuf, writebuf, offset, len); - else - return -1; -} - -/* The xfer_partial handler for the topmost target. Unlike the default, - it does not need to handle memory specially; it just passes all - requests down the stack. */ - -static LONGEST -current_xfer_partial (struct target_ops *ops, enum target_object object, - const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, ULONGEST offset, LONGEST len) -{ - if (ops->beneath != NULL) - return ops->beneath->to_xfer_partial (ops->beneath, object, annex, - readbuf, writebuf, offset, len); else - return -1; + { + gdb_assert (ops->beneath != NULL); + return ops->beneath->to_xfer_partial (ops->beneath, object, annex, + readbuf, writebuf, offset, len); + } } /* Target vector read/write partial wrapper functions. */ @@ -2665,34 +2639,26 @@ ptid_t target_wait (ptid_t ptid, struct target_waitstatus *status, int options) { struct target_ops *t; + ptid_t retval = (current_target.to_wait) (¤t_target, ptid, + status, options); - for (t = current_target.beneath; t != NULL; t = t->beneath) + if (targetdebug) { - if (t->to_wait != NULL) - { - ptid_t retval = (*t->to_wait) (t, ptid, status, options); - - if (targetdebug) - { - char *status_string; - char *options_string; - - status_string = target_waitstatus_to_string (status); - options_string = target_options_to_string (options); - fprintf_unfiltered (gdb_stdlog, - "target_wait (%d, status, options={%s})" - " = %d, %s\n", - ptid_get_pid (ptid), options_string, - ptid_get_pid (retval), status_string); - xfree (status_string); - xfree (options_string); - } + char *status_string; + char *options_string; - return retval; - } + status_string = target_waitstatus_to_string (status); + options_string = target_options_to_string (options); + fprintf_unfiltered (gdb_stdlog, + "target_wait (%d, status, options={%s})" + " = %d, %s\n", + ptid_get_pid (ptid), options_string, + ptid_get_pid (retval), status_string); + xfree (status_string); + xfree (options_string); } - noprocess (); + return retval; } char * @@ -2730,26 +2696,17 @@ target_resume (ptid_t ptid, int step, enum gdb_signal signal) target_dcache_invalidate (); - for (t = current_target.beneath; t != NULL; t = t->beneath) - { - if (t->to_resume != NULL) - { - t->to_resume (t, ptid, step, signal); - if (targetdebug) - fprintf_unfiltered (gdb_stdlog, "target_resume (%d, %s, %s)\n", - ptid_get_pid (ptid), - step ? "step" : "continue", - gdb_signal_to_name (signal)); - - registers_changed_ptid (ptid); - set_executing (ptid, 1); - set_running (ptid, 1); - clear_inline_frame_state (ptid); - return; - } - } + current_target.to_resume (¤t_target, ptid, step, signal); + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "target_resume (%d, %s, %s)\n", + ptid_get_pid (ptid), + step ? "step" : "continue", + gdb_signal_to_name (signal)); - noprocess (); + registers_changed_ptid (ptid); + set_executing (ptid, 1); + set_running (ptid, 1); + clear_inline_frame_state (ptid); } void @@ -3146,7 +3103,7 @@ find_default_can_async_p (struct target_ops *ignore) configured with a native debugger, and target remote isn't connected yet. */ t = find_default_run_target (NULL); - if (t && t->to_can_async_p) + if (t) return (t->to_can_async_p) (t); return 0; } @@ -3161,7 +3118,7 @@ find_default_is_async_p (struct target_ops *ignore) configured with a native debugger, and target remote isn't connected yet. */ t = find_default_run_target (NULL); - if (t && t->to_is_async_p) + if (t) return (t->to_is_async_p) (t); return 0; } @@ -3716,6 +3673,46 @@ dummy_pid_to_str (struct target_ops *ops, ptid_t ptid) return normal_pid_to_str (ptid); } +static void +dummy_resume (struct target_ops *self, ptid_t ptid, int step, + enum gdb_signal signal) +{ + noprocess (); +} + +static ptid_t +dummy_wait (struct target_ops *self, ptid_t ptid, + struct target_waitstatus *status, int options) +{ + noprocess (); +} + +static void +dummy_store_registers (struct target_ops *self, + struct regcache *regcache, + int regno) +{ + noprocess (); +} + +static LONGEST +dummy_xfer_partial (struct target_ops *ops, + enum target_object object, + const char *annex, gdb_byte *readbuf, + const gdb_byte *writebuf, + ULONGEST offset, LONGEST len) +{ + return -1; +} + +static void +dummy_async (struct target_ops *self, + void (*callback) (enum inferior_event_type, void *), + void *datum) +{ + tcomplain (); +} + /* Error-catcher for target_find_memory_regions. */ static int dummy_find_memory_regions (find_memory_region_ftype ignore1, void *ignore2) @@ -3760,8 +3757,11 @@ init_dummy_target (void) dummy_target.to_detach = (void (*)(struct target_ops *, const char *, int))target_ignore; dummy_target.to_create_inferior = find_default_create_inferior; + dummy_target.to_resume = dummy_resume; + dummy_target.to_wait = dummy_wait; dummy_target.to_can_async_p = find_default_can_async_p; dummy_target.to_is_async_p = find_default_is_async_p; + dummy_target.to_async = dummy_async; dummy_target.to_supports_non_stop = find_default_supports_non_stop; dummy_target.to_supports_disable_randomization = find_default_supports_disable_randomization; @@ -3771,13 +3771,14 @@ init_dummy_target (void) dummy_target.to_make_corefile_notes = dummy_make_corefile_notes; dummy_target.to_get_bookmark = dummy_get_bookmark; dummy_target.to_goto_bookmark = dummy_goto_bookmark; - dummy_target.to_xfer_partial = default_xfer_partial; + dummy_target.to_xfer_partial = dummy_xfer_partial; dummy_target.to_has_all_memory = (int (*) (struct target_ops *)) return_zero; dummy_target.to_has_memory = (int (*) (struct target_ops *)) return_zero; dummy_target.to_has_stack = (int (*) (struct target_ops *)) return_zero; dummy_target.to_has_registers = (int (*) (struct target_ops *)) return_zero; dummy_target.to_has_execution = (int (*) (struct target_ops *, ptid_t)) return_zero; + dummy_target.to_store_registers = dummy_store_registers; dummy_target.to_stopped_by_watchpoint = (int (*) (struct target_ops *)) return_zero; dummy_target.to_stopped_data_address = @@ -3999,20 +4000,11 @@ target_store_registers (struct regcache *regcache, int regno) if (!may_write_registers) error (_("Writing to registers is not allowed (regno %d)"), regno); - for (t = current_target.beneath; t != NULL; t = t->beneath) + current_target.to_store_registers (¤t_target, regcache, regno); + if (targetdebug) { - if (t->to_store_registers != NULL) - { - t->to_store_registers (t, regcache, regno); - if (targetdebug) - { - debug_print_register ("target_store_registers", regcache, regno); - } - return; - } + debug_print_register ("target_store_registers", regcache, regno); } - - noprocess (); } int diff --git a/gdb/target.h b/gdb/target.h index b219cff..804e8e4 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -341,6 +341,8 @@ extern ULONGEST get_target_memory_unsigned (struct target_ops *ops, struct thread_info; /* fwd decl for parameter list below: */ +typedef void async_callback_ftype (enum inferior_event_type, void *); + struct target_ops { struct target_ops *beneath; /* To the target under this one. */ @@ -484,8 +486,7 @@ struct target_ops /* ASYNC target controls */ int (*to_can_async_p) (struct target_ops *); int (*to_is_async_p) (struct target_ops *); - void (*to_async) (struct target_ops *, - void (*) (enum inferior_event_type, void *), void *); + void (*to_async) (struct target_ops *, async_callback_ftype *, void *); int (*to_supports_non_stop) (void); /* find_memory_regions support method for gcore */ int (*to_find_memory_regions) (find_memory_region_ftype func, void *data); -- 1.8.1.4