From f4788652e45662d1e43933dc0620561bc4cddae0 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 17 Nov 2009 09:06:45 -0800 Subject: target: simplify register get/set ops No need to indirect from registered integers to pointers. Just stash the pointers directly in the register struct, and don't even bother registering. This is a small code shrink, speeds register access just a smidgeon, and gets rid of another rude exit() path. Signed-off-by: David Brownell --- src/target/register.c | 51 ++++++--------------------------------------------- 1 file changed, 6 insertions(+), 45 deletions(-) (limited to 'src/target/register.c') diff --git a/src/target/register.c b/src/target/register.c index bb046a1..d9ef53e 100644 --- a/src/target/register.c +++ b/src/target/register.c @@ -29,8 +29,6 @@ #include "log.h" -struct reg_arch_type *reg_arch_types = NULL; - struct reg* register_get_by_name(struct reg_cache *first, const char *name, bool search_all) { @@ -67,44 +65,6 @@ struct reg_cache** register_get_last_cache_p(struct reg_cache **first) return cache_p; } -int register_reg_arch_type(int (*get)(struct reg *reg), int (*set)(struct reg *reg, uint8_t *buf)) -{ - struct reg_arch_type** arch_type_p = ®_arch_types; - int id = 0; - - if (*arch_type_p) - { - while (*arch_type_p) - { - id = (*arch_type_p)->id; - arch_type_p = &((*arch_type_p)->next); - } - } - - (*arch_type_p) = malloc(sizeof(struct reg_arch_type)); - (*arch_type_p)->id = id + 1; - (*arch_type_p)->set = set; - (*arch_type_p)->get = get; - (*arch_type_p)->next = NULL; - - return id + 1; -} - -struct reg_arch_type* register_get_arch_type(int id) -{ - struct reg_arch_type *arch_type = reg_arch_types; - - while (arch_type) - { - if (arch_type->id == id) - return arch_type; - arch_type = arch_type->next; - } - LOG_ERROR("BUG: encountered unregistered arch type 0x%08x", id); - exit(-1); - return NULL; -} - static int register_get_dummy_core_reg(struct reg *reg) { return ERROR_OK; @@ -118,11 +78,12 @@ static int register_set_dummy_core_reg(struct reg *reg, uint8_t *buf) return ERROR_OK; } +static const struct reg_arch_type dummy_type = { + .get = register_get_dummy_core_reg, + .set = register_set_dummy_core_reg, +}; + void register_init_dummy(struct reg *reg) { - static int dummy_arch_type = -1; - if (dummy_arch_type == -1) - dummy_arch_type = register_reg_arch_type(register_get_dummy_core_reg, register_set_dummy_core_reg); - - reg->arch_type = dummy_arch_type; + reg->type = &dummy_type; } -- cgit v1.1