target: Use target_addr_t for algorithm addresses.
[openocd.git] / src / target / target.c
index 4d2c6465ddc419b3bc224329f43b024b4f06992d..ed6f655eac68607285030188b894db34141a4979 100644 (file)
@@ -41,6 +41,7 @@
 #include "config.h"
 #endif
 
+#include <helper/align.h>
 #include <helper/time_support.h>
 #include <jtag/jtag.h>
 #include <flash/nor/core.h>
@@ -154,9 +155,10 @@ static struct target_type *target_types[] = {
 struct target *all_targets;
 static struct target_event_callback *target_event_callbacks;
 static struct target_timer_callback *target_timer_callbacks;
+static int64_t target_timer_next_event_value;
 static LIST_HEAD(target_reset_callback_list);
 static LIST_HEAD(target_trace_callback_list);
-static const int polling_interval = 100;
+static const int polling_interval = TARGET_DEFAULT_POLLING_INTERVAL;
 
 static const struct jim_nvp nvp_assert[] = {
        { .name = "assert", NVP_ASSERT },
@@ -188,7 +190,7 @@ static const char *target_strerror_safe(int err)
        const struct jim_nvp *n;
 
        n = jim_nvp_value2name_simple(nvp_error_target, err);
-       if (n->name == NULL)
+       if (!n->name)
                return "unknown";
        else
                return n->name;
@@ -484,7 +486,7 @@ struct target *get_target(const char *id)
 
        /* try as tcltarget name */
        for (target = all_targets; target; target = target->next) {
-               if (target_name(target) == NULL)
+               if (!target_name(target))
                        continue;
                if (strcmp(id, target_name(target)) == 0)
                        return target;
@@ -526,7 +528,7 @@ struct target *get_current_target(struct command_context *cmd_ctx)
 {
        struct target *target = get_current_target_or_null(cmd_ctx);
 
-       if (target == NULL) {
+       if (!target) {
                LOG_ERROR("BUG: current_target out of bounds");
                exit(-1);
        }
@@ -663,7 +665,7 @@ static int target_process_reset(struct command_invocation *cmd, enum target_rese
        int retval;
        struct jim_nvp *n;
        n = jim_nvp_value2name_simple(nvp_reset_modes, reset_mode);
-       if (n->name == NULL) {
+       if (!n->name) {
                LOG_ERROR("invalid reset mode");
                return ERROR_FAIL;
        }
@@ -715,6 +717,15 @@ static int no_mmu(struct target *target, int *enabled)
        return ERROR_OK;
 }
 
+/**
+ * Reset the @c examined flag for the given target.
+ * Pure paranoia -- targets are zeroed on allocation.
+ */
+static inline void target_reset_examined(struct target *target)
+{
+       target->examined = false;
+}
+
 static int default_examine(struct target *target)
 {
        target_set_examined(target);
@@ -735,10 +746,12 @@ int target_examine_one(struct target *target)
 
        int retval = target->type->examine(target);
        if (retval != ERROR_OK) {
+               target_reset_examined(target);
                target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_FAIL);
                return retval;
        }
 
+       target_set_examined(target);
        target_call_event_callbacks(target, TARGET_EVENT_EXAMINE_END);
 
        return ERROR_OK;
@@ -826,7 +839,7 @@ static int target_soft_reset_halt(struct target *target)
 int target_run_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_param,
-               uint32_t entry_point, uint32_t exit_point,
+               target_addr_t entry_point, target_addr_t exit_point,
                int timeout_ms, void *arch_info)
 {
        int retval = ERROR_FAIL;
@@ -867,7 +880,7 @@ done:
 int target_start_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
-               uint32_t entry_point, uint32_t exit_point,
+               target_addr_t entry_point, target_addr_t exit_point,
                void *arch_info)
 {
        int retval = ERROR_FAIL;
@@ -911,7 +924,7 @@ done:
 int target_wait_algorithm(struct target *target,
                int num_mem_params, struct mem_param *mem_params,
                int num_reg_params, struct reg_param *reg_params,
-               uint32_t exit_point, int timeout_ms,
+               target_addr_t exit_point, int timeout_ms,
                void *arch_info)
 {
        int retval = ERROR_FAIL;
@@ -1003,7 +1016,7 @@ int target_run_flash_async_algorithm(struct target *target,
        uint32_t rp = fifo_start_addr;
 
        /* validate block_size is 2^n */
-       assert(!block_size || !(block_size & (block_size - 1)));
+       assert(IS_PWR_OF_2(block_size));
 
        retval = target_write_u32(target, wp_addr, wp);
        if (retval != ERROR_OK)
@@ -1041,7 +1054,7 @@ int target_run_flash_async_algorithm(struct target *target,
                        break;
                }
 
-               if (((rp - fifo_start_addr) & (block_size - 1)) || rp < fifo_start_addr || rp >= fifo_end_addr) {
+               if (!IS_ALIGNED(rp - fifo_start_addr, block_size) || rp < fifo_start_addr || rp >= fifo_end_addr) {
                        LOG_ERROR("corrupted fifo read pointer 0x%" PRIx32, rp);
                        break;
                }
@@ -1156,7 +1169,7 @@ int target_run_read_async_algorithm(struct target *target,
        uint32_t rp = fifo_start_addr;
 
        /* validate block_size is 2^n */
-       assert(!block_size || !(block_size & (block_size - 1)));
+       assert(IS_PWR_OF_2(block_size));
 
        retval = target_write_u32(target, wp_addr, wp);
        if (retval != ERROR_OK)
@@ -1193,7 +1206,7 @@ int target_run_read_async_algorithm(struct target *target,
                        break;
                }
 
-               if (((wp - fifo_start_addr) & (block_size - 1)) || wp < fifo_start_addr || wp >= fifo_end_addr) {
+               if (!IS_ALIGNED(wp - fifo_start_addr, block_size) || wp < fifo_start_addr || wp >= fifo_end_addr) {
                        LOG_ERROR("corrupted fifo write pointer 0x%" PRIx32, wp);
                        break;
                }
@@ -1397,7 +1410,7 @@ int target_hit_watchpoint(struct target *target,
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (target->type->hit_watchpoint == NULL) {
+       if (!target->type->hit_watchpoint) {
                /* For backward compatible, if hit_watchpoint is not implemented,
                 * return ERROR_FAIL such that gdb_server will not take the nonsense
                 * information. */
@@ -1409,7 +1422,7 @@ int target_hit_watchpoint(struct target *target,
 
 const char *target_get_gdb_arch(struct target *target)
 {
-       if (target->type->get_gdb_arch == NULL)
+       if (!target->type->get_gdb_arch)
                return NULL;
        return target->type->get_gdb_arch(target);
 }
@@ -1520,15 +1533,6 @@ static int target_profiling(struct target *target, uint32_t *samples,
                        num_samples, seconds);
 }
 
-/**
- * Reset the @c examined flag for the given target.
- * Pure paranoia -- targets are zeroed on allocation.
- */
-static void target_reset_examined(struct target *target)
-{
-       target->examined = false;
-}
-
 static int handle_target(void *priv);
 
 static int target_init_one(struct command_context *cmd_ctx,
@@ -1537,13 +1541,13 @@ static int target_init_one(struct command_context *cmd_ctx,
        target_reset_examined(target);
 
        struct target_type *type = target->type;
-       if (type->examine == NULL)
+       if (!type->examine)
                type->examine = default_examine;
 
-       if (type->check_reset == NULL)
+       if (!type->check_reset)
                type->check_reset = default_check_reset;
 
-       assert(type->init_target != NULL);
+       assert(type->init_target);
 
        int retval = type->init_target(cmd_ctx, target);
        if (retval != ERROR_OK) {
@@ -1555,7 +1559,7 @@ static int target_init_one(struct command_context *cmd_ctx,
         * implement it in stages, but warn if we need to do so.
         */
        if (type->mmu) {
-               if (type->virt2phys == NULL) {
+               if (!type->virt2phys) {
                        LOG_ERROR("type '%s' is missing virt2phys", type->name);
                        type->virt2phys = identity_virt2phys;
                }
@@ -1573,19 +1577,19 @@ static int target_init_one(struct command_context *cmd_ctx,
                type->virt2phys = identity_virt2phys;
        }
 
-       if (target->type->read_buffer == NULL)
+       if (!target->type->read_buffer)
                target->type->read_buffer = target_read_buffer_default;
 
-       if (target->type->write_buffer == NULL)
+       if (!target->type->write_buffer)
                target->type->write_buffer = target_write_buffer_default;
 
-       if (target->type->get_gdb_fileio_info == NULL)
+       if (!target->type->get_gdb_fileio_info)
                target->type->get_gdb_fileio_info = target_get_gdb_fileio_info_default;
 
-       if (target->type->gdb_fileio_end == NULL)
+       if (!target->type->gdb_fileio_end)
                target->type->gdb_fileio_end = target_gdb_fileio_end_default;
 
-       if (target->type->profiling == NULL)
+       if (!target->type->profiling)
                target->type->profiling = target_profiling_default;
 
        return ERROR_OK;
@@ -1652,7 +1656,7 @@ int target_register_event_callback(int (*callback)(struct target *target,
 {
        struct target_event_callback **callbacks_p = &target_event_callbacks;
 
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (*callbacks_p) {
@@ -1674,11 +1678,11 @@ int target_register_reset_callback(int (*callback)(struct target *target,
 {
        struct target_reset_callback *entry;
 
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        entry = malloc(sizeof(struct target_reset_callback));
-       if (entry == NULL) {
+       if (!entry) {
                LOG_ERROR("error allocating buffer for reset callback entry");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -1696,11 +1700,11 @@ int target_register_trace_callback(int (*callback)(struct target *target,
 {
        struct target_trace_callback *entry;
 
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        entry = malloc(sizeof(struct target_trace_callback));
-       if (entry == NULL) {
+       if (!entry) {
                LOG_ERROR("error allocating buffer for trace callback entry");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -1718,7 +1722,7 @@ int target_register_timer_callback(int (*callback)(void *priv),
 {
        struct target_timer_callback **callbacks_p = &target_timer_callbacks;
 
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (*callbacks_p) {
@@ -1733,8 +1737,8 @@ int target_register_timer_callback(int (*callback)(void *priv),
        (*callbacks_p)->time_ms = time_ms;
        (*callbacks_p)->removed = false;
 
-       gettimeofday(&(*callbacks_p)->when, NULL);
-       timeval_add_time(&(*callbacks_p)->when, 0, time_ms * 1000);
+       (*callbacks_p)->when = timeval_ms() + time_ms;
+       target_timer_next_event_value = MIN(target_timer_next_event_value, (*callbacks_p)->when);
 
        (*callbacks_p)->priv = priv;
        (*callbacks_p)->next = NULL;
@@ -1748,7 +1752,7 @@ int target_unregister_event_callback(int (*callback)(struct target *target,
        struct target_event_callback **p = &target_event_callbacks;
        struct target_event_callback *c = target_event_callbacks;
 
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        while (c) {
@@ -1770,7 +1774,7 @@ int target_unregister_reset_callback(int (*callback)(struct target *target,
 {
        struct target_reset_callback *entry;
 
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        list_for_each_entry(entry, &target_reset_callback_list, list) {
@@ -1789,7 +1793,7 @@ int target_unregister_trace_callback(int (*callback)(struct target *target,
 {
        struct target_trace_callback *entry;
 
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        list_for_each_entry(entry, &target_trace_callback_list, list) {
@@ -1805,7 +1809,7 @@ int target_unregister_trace_callback(int (*callback)(struct target *target,
 
 int target_unregister_timer_callback(int (*callback)(void *priv), void *priv)
 {
-       if (callback == NULL)
+       if (!callback)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        for (struct target_timer_callback *c = target_timer_callbacks;
@@ -1868,15 +1872,14 @@ int target_call_trace_callbacks(struct target *target, size_t len, uint8_t *data
 }
 
 static int target_timer_callback_periodic_restart(
-               struct target_timer_callback *cb, struct timeval *now)
+               struct target_timer_callback *cb, int64_t *now)
 {
-       cb->when = *now;
-       timeval_add_time(&cb->when, 0, cb->time_ms * 1000L);
+       cb->when = *now + cb->time_ms;
        return ERROR_OK;
 }
 
 static int target_call_timer_callback(struct target_timer_callback *cb,
-               struct timeval *now)
+               int64_t *now)
 {
        cb->callback(cb->priv);
 
@@ -1898,8 +1901,12 @@ static int target_call_timer_callbacks_check_time(int checktime)
 
        keep_alive();
 
-       struct timeval now;
-       gettimeofday(&now, NULL);
+       int64_t now = timeval_ms();
+
+       /* Initialize to a default value that's a ways into the future.
+        * The loop below will make it closer to now if there are
+        * callbacks that want to be called sooner. */
+       target_timer_next_event_value = now + 1000;
 
        /* Store an address of the place containing a pointer to the
         * next item; initially, that's a standalone "root of the
@@ -1915,11 +1922,14 @@ static int target_call_timer_callbacks_check_time(int checktime)
 
                bool call_it = (*callback)->callback &&
                        ((!checktime && (*callback)->type == TARGET_TIMER_TYPE_PERIODIC) ||
-                        timeval_compare(&now, &(*callback)->when) >= 0);
+                        now >= (*callback)->when);
 
                if (call_it)
                        target_call_timer_callback(*callback, &now);
 
+               if (!(*callback)->removed && (*callback)->when < target_timer_next_event_value)
+                       target_timer_next_event_value = (*callback)->when;
+
                callback = &(*callback)->next;
        }
 
@@ -1927,17 +1937,22 @@ static int target_call_timer_callbacks_check_time(int checktime)
        return ERROR_OK;
 }
 
-int target_call_timer_callbacks(void)
+int target_call_timer_callbacks()
 {
        return target_call_timer_callbacks_check_time(1);
 }
 
 /* invoke periodic callbacks immediately */
-int target_call_timer_callbacks_now(void)
+int target_call_timer_callbacks_now()
 {
        return target_call_timer_callbacks_check_time(0);
 }
 
+int64_t target_timer_next_event(void)
+{
+       return target_timer_next_event_value;
+}
+
 /* Prints the working area layout for debug purposes */
 static void print_wa_layout(struct target *target)
 {
@@ -1961,7 +1976,7 @@ static void target_split_working_area(struct working_area *area, uint32_t size)
        if (size < area->size) {
                struct working_area *new_wa = malloc(sizeof(*new_wa));
 
-               if (new_wa == NULL)
+               if (!new_wa)
                        return;
 
                new_wa->next = area->next;
@@ -2013,7 +2028,7 @@ static void target_merge_working_areas(struct target *target)
 int target_alloc_working_area_try(struct target *target, uint32_t size, struct working_area **area)
 {
        /* Reevaluate working area address based on MMU state*/
-       if (target->working_areas == NULL) {
+       if (!target->working_areas) {
                int retval;
                int enabled;
 
@@ -2072,7 +2087,7 @@ int target_alloc_working_area_try(struct target *target, uint32_t size, struct w
                c = c->next;
        }
 
-       if (c == NULL)
+       if (!c)
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 
        /* Split the working area into the requested size */
@@ -2082,9 +2097,9 @@ int target_alloc_working_area_try(struct target *target, uint32_t size, struct w
                          size, c->address);
 
        if (target->backup_working_area) {
-               if (c->backup == NULL) {
+               if (!c->backup) {
                        c->backup = malloc(c->size);
-                       if (c->backup == NULL)
+                       if (!c->backup)
                                return ERROR_FAIL;
                }
 
@@ -2120,7 +2135,7 @@ static int target_restore_working_area(struct target *target, struct working_are
 {
        int retval = ERROR_OK;
 
-       if (target->backup_working_area && area->backup != NULL) {
+       if (target->backup_working_area && area->backup) {
                retval = target_write_memory(target, area->address, 4, area->size / 4, area->backup);
                if (retval != ERROR_OK)
                        LOG_ERROR("failed to restore %" PRIu32 " bytes of working area at address " TARGET_ADDR_FMT,
@@ -2215,7 +2230,7 @@ uint32_t target_get_working_area_avail(struct target *target)
        struct working_area *c = target->working_areas;
        uint32_t max_size = 0;
 
-       if (c == NULL)
+       if (!c)
                return target->working_area_size;
 
        while (c) {
@@ -2250,7 +2265,7 @@ static void target_destroy(struct target *target)
        /* release the targets SMP list */
        if (target->smp) {
                struct target_list *head = target->head;
-               while (head != NULL) {
+               while (head) {
                        struct target_list *pos = head->next;
                        head->target->smp = 0;
                        free(head);
@@ -2301,7 +2316,7 @@ void target_quit(void)
 int target_arch_state(struct target *target)
 {
        int retval;
-       if (target == NULL) {
+       if (!target) {
                LOG_WARNING("No target has been configured");
                return ERROR_OK;
        }
@@ -2520,7 +2535,7 @@ int target_checksum_memory(struct target *target, target_addr_t address, uint32_
        retval = target->type->checksum_memory(target, address, size, &checksum);
        if (retval != ERROR_OK) {
                buffer = malloc(size);
-               if (buffer == NULL) {
+               if (!buffer) {
                        LOG_ERROR("error allocating buffer for section (%" PRIu32 " bytes)", size);
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
@@ -2555,7 +2570,7 @@ int target_blank_check_memory(struct target *target,
                return ERROR_FAIL;
        }
 
-       if (target->type->blank_check_memory == NULL)
+       if (!target->type->blank_check_memory)
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 
        return target->type->blank_check_memory(target, blocks, num_blocks, erased_value);
@@ -2820,7 +2835,7 @@ int target_write_phys_u8(struct target *target, target_addr_t address, uint8_t v
 static int find_target(struct command_invocation *cmd, const char *name)
 {
        struct target *target = get_target(name);
-       if (target == NULL) {
+       if (!target) {
                command_print(cmd, "Target: %s is unknown, try one of:\n", name);
                return ERROR_FAIL;
        }
@@ -3042,7 +3057,7 @@ static int handle_target(void *priv)
                                /* Target examination could have failed due to unstable connection,
                                 * but we set the examined flag anyway to repoll it later */
                                if (retval != ERROR_OK) {
-                                       target->examined = true;
+                                       target_set_examined(target);
                                        LOG_USER("Examination failed, GDB will be halted. Polling again in %dms",
                                                 target->backoff.times * polling_interval);
                                        return retval;
@@ -3136,7 +3151,7 @@ COMMAND_HANDLER(handle_reg_command)
                        goto not_found;
        }
 
-       assert(reg != NULL); /* give clang a hint that we *know* reg is != NULL here */
+       assert(reg); /* give clang a hint that we *know* reg is != NULL here */
 
        if (!reg->exist)
                goto not_found;
@@ -3163,7 +3178,7 @@ COMMAND_HANDLER(handle_reg_command)
        /* set register value */
        if (CMD_ARGC == 2) {
                uint8_t *buf = malloc(DIV_ROUND_UP(reg->size, 8));
-               if (buf == NULL)
+               if (!buf)
                        return ERROR_FAIL;
                str_to_buf(CMD_ARGV[1], strlen(CMD_ARGV[1]), buf, reg->size, 0);
 
@@ -3316,7 +3331,7 @@ COMMAND_HANDLER(handle_reset_command)
        if (CMD_ARGC == 1) {
                const struct jim_nvp *n;
                n = jim_nvp_name2value_simple(nvp_reset_modes, CMD_ARGV[0]);
-               if ((n->name == NULL) || (n->value == RESET_UNKNOWN))
+               if ((!n->name) || (n->value == RESET_UNKNOWN))
                        return ERROR_COMMAND_SYNTAX_ERROR;
                reset_mode = n->value;
        }
@@ -3475,7 +3490,7 @@ COMMAND_HANDLER(handle_md_command)
                COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], count);
 
        uint8_t *buffer = calloc(count, size);
-       if (buffer == NULL) {
+       if (!buffer) {
                LOG_ERROR("Failed to allocate md read buffer");
                return ERROR_FAIL;
        }
@@ -3506,7 +3521,7 @@ static int target_fill_mem(struct target *target,
         * to fill large memory areas with any sane speed */
        const unsigned chunk_size = 16384;
        uint8_t *target_buf = malloc(chunk_size * data_size);
-       if (target_buf == NULL) {
+       if (!target_buf) {
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
        }
@@ -3654,7 +3669,7 @@ COMMAND_HANDLER(handle_load_image_command)
        retval = ERROR_OK;
        for (unsigned int i = 0; i < image.num_sections; i++) {
                buffer = malloc(image.sections[i].size);
-               if (buffer == NULL) {
+               if (!buffer) {
                        command_print(CMD,
                                                  "error allocating buffer for section (%d bytes)",
                                                  (int)(image.sections[i].size));
@@ -3825,7 +3840,7 @@ static COMMAND_HELPER(handle_verify_image_command_internal, enum verify_mode ver
        retval = ERROR_OK;
        for (unsigned int i = 0; i < image.num_sections; i++) {
                buffer = malloc(image.sections[i].size);
-               if (buffer == NULL) {
+               if (!buffer) {
                        command_print(CMD,
                                        "error allocating buffer for section (%" PRIu32 " bytes)",
                                        image.sections[i].size);
@@ -3976,7 +3991,7 @@ static int handle_bp_command_set(struct command_invocation *cmd,
                        command_print(cmd, "breakpoint set at " TARGET_ADDR_FMT "", addr);
 
        } else if (addr == 0) {
-               if (target->type->add_context_breakpoint == NULL) {
+               if (!target->type->add_context_breakpoint) {
                        LOG_ERROR("Context breakpoint not available");
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
@@ -3986,7 +4001,7 @@ static int handle_bp_command_set(struct command_invocation *cmd,
                        command_print(cmd, "Context breakpoint set at 0x%8.8" PRIx32 "", asid);
 
        } else {
-               if (target->type->add_hybrid_breakpoint == NULL) {
+               if (!target->type->add_hybrid_breakpoint) {
                        LOG_ERROR("Hybrid breakpoint not available");
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
@@ -4194,7 +4209,7 @@ static void write_gmon(uint32_t *samples, uint32_t sample_num, const char *filen
 {
        uint32_t i;
        FILE *f = fopen(filename, "w");
-       if (f == NULL)
+       if (!f)
                return;
        write_string(f, "gmon");
        write_long(f, 0x00000001, target); /* Version */
@@ -4236,7 +4251,7 @@ static void write_gmon(uint32_t *samples, uint32_t sample_num, const char *filen
        if (num_buckets > max_buckets)
                num_buckets = max_buckets;
        int *buckets = malloc(sizeof(int) * num_buckets);
-       if (buckets == NULL) {
+       if (!buckets) {
                fclose(f);
                return;
        }
@@ -4268,7 +4283,7 @@ static void write_gmon(uint32_t *samples, uint32_t sample_num, const char *filen
        /*append binary memory gmon.out profile_hist_data (profile_hist_data + profile_hist_hdr.hist_size) */
 
        char *data = malloc(2 * num_buckets);
-       if (data != NULL) {
+       if (data) {
                for (i = 0; i < num_buckets; i++) {
                        int val;
                        val = buckets[i];
@@ -4304,7 +4319,7 @@ COMMAND_HANDLER(handle_profile_command)
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], offset);
 
        uint32_t *samples = malloc(sizeof(uint32_t) * MAX_PROFILE_SAMPLE_NUM);
-       if (samples == NULL) {
+       if (!samples) {
                LOG_ERROR("No memory to store samples.");
                return ERROR_FAIL;
        }
@@ -4406,10 +4421,10 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        struct target *target;
 
        context = current_command_context(interp);
-       assert(context != NULL);
+       assert(context);
 
        target = get_current_target(context);
-       if (target == NULL) {
+       if (!target) {
                LOG_ERROR("mem2array: no current target");
                return JIM_ERR;
        }
@@ -4517,7 +4532,7 @@ static int target_mem2array(Jim_Interp *interp, struct target *target, int argc,
 
        const size_t buffersize = 4096;
        uint8_t *buffer = malloc(buffersize);
-       if (buffer == NULL)
+       if (!buffer)
                return JIM_ERR;
 
        /* assume ok */
@@ -4589,7 +4604,7 @@ static int get_u64_array_element(Jim_Interp *interp, const char *varname, size_t
        Jim_Obj *obj_val = Jim_GetVariable(interp, obj_name, JIM_ERRMSG);
        Jim_DecrRefCount(interp, obj_name);
        free(namebuf);
-       if (obj_val == NULL)
+       if (!obj_val)
                return JIM_ERR;
 
        jim_wide wide_val;
@@ -4604,10 +4619,10 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        struct target *target;
 
        context = current_command_context(interp);
-       assert(context != NULL);
+       assert(context);
 
        target = get_current_target(context);
-       if (target == NULL) {
+       if (!target) {
                LOG_ERROR("array2mem: no current target");
                return JIM_ERR;
        }
@@ -4720,7 +4735,7 @@ static int target_array2mem(Jim_Interp *interp, struct target *target,
 
        const size_t buffersize = 4096;
        uint8_t *buffer = malloc(buffersize);
-       if (buffer == NULL)
+       if (!buffer)
                return JIM_ERR;
 
        /* index counter */
@@ -4791,7 +4806,7 @@ void target_handle_event(struct target *target, enum target_event e)
        struct target_event_action *teap;
        int retval;
 
-       for (teap = target->event_action; teap != NULL; teap = teap->next) {
+       for (teap = target->event_action; teap; teap = teap->next) {
                if (teap->event == e) {
                        LOG_DEBUG("target(%d): %s (%s) event: %d (%s) action: %s",
                                           target->target_number,
@@ -4839,7 +4854,7 @@ bool target_has_event_action(struct target *target, enum target_event event)
 {
        struct target_event_action *teap;
 
-       for (teap = target->event_action; teap != NULL; teap = teap->next) {
+       for (teap = target->event_action; teap; teap = teap->next) {
                if (teap->event == event)
                        return true;
        }
@@ -4970,11 +4985,11 @@ no_params:
                                if (goi->isconfigure) {
                                        /* START_DEPRECATED_TPIU */
                                        if (n->value == TARGET_EVENT_TRACE_CONFIG)
-                                               LOG_INFO("DEPRECATED target event %s", n->name);
+                                               LOG_INFO("DEPRECATED target event %s; use TPIU events {pre,post}-{enable,disable}", n->name);
                                        /* END_DEPRECATED_TPIU */
 
                                        bool replace = true;
-                                       if (teap == NULL) {
+                                       if (!teap) {
                                                /* create new */
                                                teap = calloc(1, sizeof(*teap));
                                                replace = false;
@@ -5005,7 +5020,7 @@ no_params:
                                        Jim_SetEmptyResult(goi->interp);
                                } else {
                                        /* get */
-                                       if (teap == NULL)
+                                       if (!teap)
                                                Jim_SetEmptyResult(goi->interp);
                                        else
                                                Jim_SetResult(goi->interp, Jim_DuplicateObj(goi->interp, teap->body));
@@ -5091,7 +5106,7 @@ no_params:
                                        goto no_params;
                        }
                        n = jim_nvp_value2name_simple(nvp_target_endian, target->endianness);
-                       if (n->name == NULL) {
+                       if (!n->name) {
                                target->endianness = TARGET_LITTLE_ENDIAN;
                                n = jim_nvp_value2name_simple(nvp_target_endian, target->endianness);
                        }
@@ -5129,7 +5144,7 @@ no_params:
                                if (e != JIM_OK)
                                        return e;
                                tap = jtag_tap_by_jim_obj(goi->interp, o_t);
-                               if (tap == NULL)
+                               if (!tap)
                                        return JIM_ERR;
                                target->tap = tap;
                                target->tap_configured = true;
@@ -5295,8 +5310,13 @@ static int jim_target_examine(Jim_Interp *interp, int argc, Jim_Obj *const *argv
        }
 
        int e = target->type->examine(target);
-       if (e != ERROR_OK)
+       if (e != ERROR_OK) {
+               target_reset_examined(target);
                return JIM_ERR;
+       }
+
+       target_set_examined(target);
+
        return JIM_OK;
 }
 
@@ -5692,7 +5712,7 @@ static int target_create(struct jim_getopt_info *goi)
        struct command_context *cmd_ctx;
 
        cmd_ctx = current_command_context(goi->interp);
-       assert(cmd_ctx != NULL);
+       assert(cmd_ctx);
 
        if (goi->argc < 3) {
                Jim_WrongNumArgs(goi->interp, 1, goi->argv, "?name? ?type? ..options...");
@@ -5702,7 +5722,7 @@ static int target_create(struct jim_getopt_info *goi)
        /* COMMAND */
        jim_getopt_obj(goi, &new_cmd);
        /* does this command exist? */
-       cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
+       cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_NONE);
        if (cmd) {
                cp = Jim_GetString(new_cmd, NULL);
                Jim_SetResultFormatted(goi->interp, "Command/target: %s Exists", cp);
@@ -5724,12 +5744,12 @@ static int target_create(struct jim_getopt_info *goi)
        }
        /* now does target type exist */
        for (x = 0 ; target_types[x] ; x++) {
-               if (0 == strcmp(cp, target_types[x]->name)) {
+               if (strcmp(cp, target_types[x]->name) == 0) {
                        /* found */
                        break;
                }
        }
-       if (target_types[x] == NULL) {
+       if (!target_types[x]) {
                Jim_SetResultFormatted(goi->interp, "Unknown target type %s, try one of ", cp);
                for (x = 0 ; target_types[x] ; x++) {
                        if (target_types[x + 1]) {
@@ -5824,7 +5844,7 @@ static int target_create(struct jim_getopt_info *goi)
                        }
                }
                /* tap must be set after target was configured */
-               if (target->tap == NULL)
+               if (!target->tap)
                        e = JIM_ERR;
        }
 
@@ -5922,7 +5942,7 @@ static int jim_target_current(Jim_Interp *interp, int argc, Jim_Obj *const *argv
                return JIM_ERR;
        }
        struct command_context *cmd_ctx = current_command_context(interp);
-       assert(cmd_ctx != NULL);
+       assert(cmd_ctx);
 
        struct target *target = get_current_target_or_null(cmd_ctx);
        if (target)
@@ -5937,7 +5957,7 @@ static int jim_target_types(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                return JIM_ERR;
        }
        Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
-       for (unsigned x = 0; NULL != target_types[x]; x++) {
+       for (unsigned x = 0; target_types[x]; x++) {
                Jim_ListAppendElement(interp, Jim_GetResult(interp),
                        Jim_NewStringObj(interp, target_types[x]->name, -1));
        }
@@ -5965,10 +5985,10 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        int i;
        const char *targetname;
        int retval, len;
-       struct target *target = (struct target *) NULL;
+       struct target *target = NULL;
        struct target_list *head, *curr, *new;
-       curr = (struct target_list *) NULL;
-       head = (struct target_list *) NULL;
+       curr = NULL;
+       head = NULL;
 
        retval = 0;
        LOG_DEBUG("%d", argc);
@@ -5985,8 +6005,8 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                if (target) {
                        new = malloc(sizeof(struct target_list));
                        new->target = target;
-                       new->next = (struct target_list *)NULL;
-                       if (head == (struct target_list *)NULL) {
+                       new->next = NULL;
+                       if (!head) {
                                head = new;
                                curr = head;
                        } else {
@@ -5998,7 +6018,7 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        /*  now parse the list of cpu and put the target in smp mode*/
        curr = head;
 
-       while (curr != (struct target_list *)NULL) {
+       while (curr) {
                target = curr->target;
                target->smp = 1;
                target->head = head;
@@ -6081,7 +6101,7 @@ static struct fast_load *fastload;
 
 static void free_fastload(void)
 {
-       if (fastload != NULL) {
+       if (fastload) {
                for (int i = 0; i < fastload_num; i++)
                        free(fastload[i].data);
                free(fastload);
@@ -6115,7 +6135,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
        retval = ERROR_OK;
        fastload_num = image.num_sections;
        fastload = malloc(sizeof(struct fast_load)*image.num_sections);
-       if (fastload == NULL) {
+       if (!fastload) {
                command_print(CMD, "out of memory");
                image_close(&image);
                return ERROR_FAIL;
@@ -6123,7 +6143,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
        memset(fastload, 0, sizeof(struct fast_load)*image.num_sections);
        for (unsigned int i = 0; i < image.num_sections; i++) {
                buffer = malloc(image.sections[i].size);
-               if (buffer == NULL) {
+               if (!buffer) {
                        command_print(CMD, "error allocating buffer for section (%d bytes)",
                                                  (int)(image.sections[i].size));
                        retval = ERROR_FAIL;
@@ -6154,7 +6174,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
 
                        fastload[i].address = image.sections[i].base_address + offset;
                        fastload[i].data = malloc(length);
-                       if (fastload[i].data == NULL) {
+                       if (!fastload[i].data) {
                                free(buffer);
                                command_print(CMD, "error allocating buffer for section (%" PRIu32 " bytes)",
                                                          length);
@@ -6195,7 +6215,7 @@ COMMAND_HANDLER(handle_fast_load_command)
 {
        if (CMD_ARGC > 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       if (fastload == NULL) {
+       if (!fastload) {
                LOG_ERROR("No image in memory");
                return ERROR_FAIL;
        }
@@ -6281,7 +6301,7 @@ COMMAND_HANDLER(handle_ps_command)
 
 static void binprint(struct command_invocation *cmd, const char *text, const uint8_t *buf, int size)
 {
-       if (text != NULL)
+       if (text)
                command_print_sameline(cmd, "%s", text);
        for (int i = 0; i < size; i++)
                command_print_sameline(cmd, " %02x", buf[i]);
@@ -6381,7 +6401,7 @@ next:
 out:
        free(test_pattern);
 
-       if (wa != NULL)
+       if (wa)
                target_free_working_area(target, wa);
 
        /* Test writes */
@@ -6466,7 +6486,7 @@ nextw:
 
        free(test_pattern);
 
-       if (wa != NULL)
+       if (wa)
                target_free_working_area(target, wa);
        return retval;
 }

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)