X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fregister.c;h=850641448b637a276ced58748f5e504871ac4168;hb=bda2d7371874569cd5232580a3602dd56083a304;hp=37915eb494c48879c5c79ed2cff58bd0cdb1d64d;hpb=0cba0d4df3fe120f08945703506f8405760325c9;p=openocd.git
diff --git a/src/target/register.c b/src/target/register.c
index 37915eb494..850641448b 100644
--- 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 *
@@ -16,33 +16,36 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "register.h"
-
-#include "log.h"
-#include "command.h"
-
-#include
-#include
-
-reg_arch_type_t *reg_arch_types = NULL;
-
-reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all)
+#include
+
+/**
+ * @file
+ * Holds utilities to work with register caches.
+ *
+ * OpenOCD uses machine registers internally, and exposes them by name
+ * to Tcl scripts. Sets of related registers are grouped into caches.
+ * For example, a CPU core will expose a set of registers, and there
+ * may be separate registers associated with debug or trace modules.
+ */
+
+struct reg *register_get_by_name(struct reg_cache *first,
+ const char *name, bool search_all)
{
- int i;
- reg_cache_t *cache = first;
+ unsigned i;
+ struct reg_cache *cache = first;
- while (cache)
- {
- for (i = 0; i < cache->num_regs; i++)
- {
+ while (cache) {
+ for (i = 0; i < cache->num_regs; i++) {
+ if (cache->reg_list[i].exist == false)
+ continue;
if (strcmp(cache->reg_list[i].name, name) == 0)
return &(cache->reg_list[i]);
}
@@ -56,9 +59,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)
@@ -69,50 +72,33 @@ 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, u8 *buf))
+void register_unlink_cache(struct reg_cache **cache_p, const struct reg_cache *cache)
{
- reg_arch_type_t** 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(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;
+ while (*cache_p && *cache_p != cache)
+ cache_p = &((*cache_p)->next);
+ if (*cache_p)
+ *cache_p = cache->next;
}
-reg_arch_type_t* register_get_arch_type(int id)
+/** Marks the contents of the register cache as invalid (and clean). */
+void register_cache_invalidate(struct reg_cache *cache)
{
- reg_arch_type_t *arch_type = reg_arch_types;
+ struct reg *reg = cache->reg_list;
- while (arch_type)
- {
- if (arch_type->id == id)
- return arch_type;
- arch_type = arch_type->next;
+ for (unsigned n = cache->num_regs; n != 0; n--, reg++) {
+ if (reg->exist == false)
+ continue;
+ reg->valid = 0;
+ reg->dirty = 0;
}
- 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, u8 *buf)
+static int register_set_dummy_core_reg(struct reg *reg, uint8_t *buf)
{
reg->dirty = 1;
reg->valid = 1;
@@ -120,11 +106,12 @@ static int register_set_dummy_core_reg(reg_t *reg, u8 *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;
}