target: simplify register get/set ops

[openocd.git] / src / target / register.c

diff --git a/src/target/register.c b/src/target/register.c
index 1c1dac825e90ee98ed6b8be29d77c8c5596143d5..d9ef53e31f0e43a2929bf8fd6aa22bffb57b51dd 100644 (file)
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,16 +24,16 @@
 #include "config.h"
 #endif
 
+#include "types.h"
 #include "register.h"
 #include "log.h"
 
 
-reg_arch_type_t *reg_arch_types = NULL;
-
-reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all)
+struct reg* register_get_by_name(struct reg_cache *first,
+               const char *name, bool search_all)
 {
        int i;
-       reg_cache_t *cache = first;
+       struct reg_cache *cache = first;
 
        while (cache)
        {
@@ -52,9 +52,9 @@ reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all)
        return NULL;
 }
 
-reg_cache_t** register_get_last_cache_p(reg_cache_t **first)
+struct reg_cache** register_get_last_cache_p(struct reg_cache **first)
 {
-       reg_cache_t **cache_p = first;
+       struct reg_cache **cache_p = first;
 
        if (*cache_p)
                while (*cache_p)
@@ -65,50 +65,12 @@ reg_cache_t** register_get_last_cache_p(reg_cache_t **first)
        return cache_p;
 }
 
-int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, uint8_t *buf))
-{
-       reg_arch_type_t** arch_type_p = &reg_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(reg_arch_type_t));
-       (*arch_type_p)->id = id + 1;
-       (*arch_type_p)->set = set;
-       (*arch_type_p)->get = get;
-       (*arch_type_p)->next = NULL;
-
-       return id + 1;
-}
-
-reg_arch_type_t* register_get_arch_type(int id)
-{
-       reg_arch_type_t *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(reg_t *reg)
+static int register_get_dummy_core_reg(struct reg *reg)
 {
        return ERROR_OK;
 }
 
-static int register_set_dummy_core_reg(reg_t *reg, uint8_t *buf)
+static int register_set_dummy_core_reg(struct reg *reg, uint8_t *buf)
 {
        reg->dirty = 1;
        reg->valid = 1;
@@ -116,11 +78,12 @@ static int register_set_dummy_core_reg(reg_t *reg, uint8_t *buf)
        return ERROR_OK;
 }
 
-void register_init_dummy(reg_t *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);
+static const struct reg_arch_type dummy_type = {
+       .get = register_get_dummy_core_reg,
+       .set = register_set_dummy_core_reg,
+};
 
-       reg->arch_type = dummy_arch_type;
+void register_init_dummy(struct reg *reg)
+{
+       reg->type = &dummy_type;
 }