convert to_prepare_to_store

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_store.
	* target.h (struct target_ops) <to_store>: Use
	TARGET_DEFAULT_NORETURN.
This commit is contained in:
Tom Tromey
2013-12-18 09:47:18 -07:00
parent bebd3233bf
commit 6c62816386
4 changed files with 27 additions and 5 deletions

View File

@ -1,3 +1,11 @@
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_store.
* target.h (struct target_ops) <to_store>: Use
TARGET_DEFAULT_NORETURN.
2014-02-19 Tom Tromey <tromey@redhat.com> 2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild. * target-delegates.c: Rebuild.

View File

@ -73,6 +73,19 @@ tdefault_store_registers (struct target_ops *self, struct regcache *arg1, int ar
noprocess (); noprocess ();
} }
static void
delegate_prepare_to_store (struct target_ops *self, struct regcache *arg1)
{
self = self->beneath;
self->to_prepare_to_store (self, arg1);
}
static void
tdefault_prepare_to_store (struct target_ops *self, struct regcache *arg1)
{
noprocess ();
}
static int static int
delegate_insert_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2) delegate_insert_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2)
{ {
@ -188,6 +201,8 @@ install_delegators (struct target_ops *ops)
ops->to_wait = delegate_wait; ops->to_wait = delegate_wait;
if (ops->to_store_registers == NULL) if (ops->to_store_registers == NULL)
ops->to_store_registers = delegate_store_registers; ops->to_store_registers = delegate_store_registers;
if (ops->to_prepare_to_store == NULL)
ops->to_prepare_to_store = delegate_prepare_to_store;
if (ops->to_insert_breakpoint == NULL) if (ops->to_insert_breakpoint == NULL)
ops->to_insert_breakpoint = delegate_insert_breakpoint; ops->to_insert_breakpoint = delegate_insert_breakpoint;
if (ops->to_remove_breakpoint == NULL) if (ops->to_remove_breakpoint == NULL)
@ -219,6 +234,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_resume = tdefault_resume; ops->to_resume = tdefault_resume;
ops->to_wait = tdefault_wait; ops->to_wait = tdefault_wait;
ops->to_store_registers = tdefault_store_registers; ops->to_store_registers = tdefault_store_registers;
ops->to_prepare_to_store = tdefault_prepare_to_store;
ops->to_insert_breakpoint = memory_insert_breakpoint; ops->to_insert_breakpoint = memory_insert_breakpoint;
ops->to_remove_breakpoint = memory_remove_breakpoint; ops->to_remove_breakpoint = memory_remove_breakpoint;
ops->to_stopped_by_watchpoint = tdefault_stopped_by_watchpoint; ops->to_stopped_by_watchpoint = tdefault_stopped_by_watchpoint;

View File

@ -599,7 +599,7 @@ update_current_target (void)
/* Do not inherit to_wait. */ /* Do not inherit to_wait. */
/* Do not inherit to_fetch_registers. */ /* Do not inherit to_fetch_registers. */
/* Do not inherit to_store_registers. */ /* Do not inherit to_store_registers. */
INHERIT (to_prepare_to_store, t); /* Do not inherit to_prepare_to_store. */
INHERIT (deprecated_xfer_memory, t); INHERIT (deprecated_xfer_memory, t);
INHERIT (to_files_info, t); INHERIT (to_files_info, t);
/* Do not inherit to_insert_breakpoint. */ /* Do not inherit to_insert_breakpoint. */
@ -730,9 +730,6 @@ update_current_target (void)
de_fault (to_close, de_fault (to_close,
(void (*) (struct target_ops *)) (void (*) (struct target_ops *))
target_ignore); target_ignore);
de_fault (to_prepare_to_store,
(void (*) (struct target_ops *, struct regcache *))
noprocess);
de_fault (deprecated_xfer_memory, de_fault (deprecated_xfer_memory,
(int (*) (CORE_ADDR, gdb_byte *, int, int, (int (*) (CORE_ADDR, gdb_byte *, int, int,
struct mem_attrib *, struct target_ops *)) struct mem_attrib *, struct target_ops *))

View File

@ -418,7 +418,8 @@ struct target_ops
void (*to_fetch_registers) (struct target_ops *, struct regcache *, int); void (*to_fetch_registers) (struct target_ops *, struct regcache *, int);
void (*to_store_registers) (struct target_ops *, struct regcache *, int) void (*to_store_registers) (struct target_ops *, struct regcache *, int)
TARGET_DEFAULT_NORETURN (noprocess ()); TARGET_DEFAULT_NORETURN (noprocess ());
void (*to_prepare_to_store) (struct target_ops *, struct regcache *); void (*to_prepare_to_store) (struct target_ops *, struct regcache *)
TARGET_DEFAULT_NORETURN (noprocess ());
/* Transfer LEN bytes of memory between GDB address MYADDR and /* Transfer LEN bytes of memory between GDB address MYADDR and
target address MEMADDR. If WRITE, transfer them to the target, else target address MEMADDR. If WRITE, transfer them to the target, else