From e8a6c6ace9d2cc7fa94f8adb81aba5181f77442c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:50:56 -0700 Subject: [PATCH] convert to_flash_erase 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_flash_erase): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. --- gdb/ChangeLog | 7 +++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 17 ++++------------- gdb/target.h | 3 ++- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c9b2017..f15d678 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,6 +1,13 @@ 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. + * target.c (target_flash_erase): Unconditionally delegate. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_NORETURN. + +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. * target.c (target_get_section_table): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 03e0030..c5fe013 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -723,6 +723,19 @@ tdefault_xfer_partial (struct target_ops *self, enum target_object arg1, const return TARGET_XFER_E_IO; } +static void +delegate_flash_erase (struct target_ops *self, ULONGEST arg1, LONGEST arg2) +{ + self = self->beneath; + self->to_flash_erase (self, arg1, arg2); +} + +static void +tdefault_flash_erase (struct target_ops *self, ULONGEST arg1, LONGEST arg2) +{ + tcomplain (); +} + static ptid_t delegate_get_ada_task_ptid (struct target_ops *self, long arg1, long arg2) { @@ -1350,6 +1363,8 @@ install_delegators (struct target_ops *ops) ops->to_goto_bookmark = delegate_goto_bookmark; if (ops->to_xfer_partial == NULL) ops->to_xfer_partial = delegate_xfer_partial; + if (ops->to_flash_erase == NULL) + ops->to_flash_erase = delegate_flash_erase; if (ops->to_get_ada_task_ptid == NULL) ops->to_get_ada_task_ptid = delegate_get_ada_task_ptid; if (ops->to_can_execute_reverse == NULL) @@ -1498,6 +1513,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_get_bookmark = tdefault_get_bookmark; ops->to_goto_bookmark = tdefault_goto_bookmark; ops->to_xfer_partial = tdefault_xfer_partial; + ops->to_flash_erase = tdefault_flash_erase; ops->to_get_ada_task_ptid = default_get_ada_task_ptid; ops->to_can_execute_reverse = tdefault_can_execute_reverse; ops->to_execution_direction = default_execution_direction; diff --git a/gdb/target.c b/gdb/target.c index a639861..b208443 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1757,19 +1757,10 @@ target_memory_map (void) void target_flash_erase (ULONGEST address, LONGEST length) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_flash_erase != NULL) - { - if (targetdebug) - fprintf_unfiltered (gdb_stdlog, "target_flash_erase (%s, %s)\n", - hex_string (address), phex (length, 0)); - t->to_flash_erase (t, address, length); - return; - } - - tcomplain (); + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "target_flash_erase (%s, %s)\n", + hex_string (address), phex (length, 0)); + current_target.to_flash_erase (¤t_target, address, length); } void diff --git a/gdb/target.h b/gdb/target.h index 38046eb..17e3ed2 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -676,7 +676,8 @@ struct target_ops Precondition: both ADDRESS and ADDRESS+LENGTH should be aligned on flash block boundaries, as reported by 'to_memory_map'. */ void (*to_flash_erase) (struct target_ops *, - ULONGEST address, LONGEST length); + ULONGEST address, LONGEST length) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Finishes a flash memory write sequence. After this operation all flash memory should be available for writing and the result -- 2.7.4