X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fregister.c;h=638747560cb08f9c66762477c84ef0fa2220db6d;hb=4bb1d8b45ecd768b972efb1e3e9cf6e55336f8fd;hp=182ff9a22ef7fe315fc963ddac46cee39477ab83;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f;p=fw%2Fopenocd

diff --git a/src/target/register.c b/src/target/register.c
index 182ff9a22..638747560 100644
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -13,92 +16,123 @@
  *   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 <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "register.h"
+#include <helper/log.h>
 
-#include "log.h"
-#include "command.h"
+/**
+ * @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.
+ */
 
-#include <string.h>
-#include <stdlib.h>
+struct reg *register_get_by_number(struct reg_cache *first,
+		uint32_t reg_num, bool search_all)
+{
+	struct reg_cache *cache = first;
 
-reg_arch_type_t *reg_arch_types = NULL;
+	while (cache) {
+		for (unsigned int i = 0; i < cache->num_regs; i++) {
+			if (!cache->reg_list[i].exist)
+				continue;
+			if (cache->reg_list[i].number == reg_num)
+				return &(cache->reg_list[i]);
+		}
+
+		if (!search_all)
+			break;
+
+		cache = cache->next;
+	}
 
-reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all)
+	return NULL;
+}
+
+struct reg *register_get_by_name(struct reg_cache *first,
+		const char *name, bool search_all)
 {
-	int i;
-	reg_cache_t *cache = first;
-	
-	while (cache)
-	{
-		for (i = 0; i < cache->num_regs; i++)
-		{
+	struct reg_cache *cache = first;
+
+	while (cache) {
+		for (unsigned int i = 0; i < cache->num_regs; i++) {
+			if (!cache->reg_list[i].exist)
+				continue;
 			if (strcmp(cache->reg_list[i].name, name) == 0)
 				return &(cache->reg_list[i]);
 		}
-		
-		if (search_all)
-			cache = cache->next;
-		else
+
+		if (!search_all)
 			break;
+
+		cache = cache->next;
 	}
-	
+
 	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)
 			cache_p = &((*cache_p)->next);
 	else
 		return first;
-	
+
 	return cache_p;
 }
 
-int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, u32 value))
+void register_unlink_cache(struct reg_cache **cache_p, const struct reg_cache *cache)
 {
-	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;
+	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;
-	
-	while (arch_type)
-	{
-		if (arch_type->id == id)
-			return arch_type;
-		arch_type = arch_type->next;
+	struct reg *reg = cache->reg_list;
+
+	for (unsigned int n = cache->num_regs; n != 0; n--, reg++) {
+		if (!reg->exist)
+			continue;
+		reg->valid = false;
+		reg->dirty = false;
 	}
-	
-	return NULL;
+}
+
+static int register_get_dummy_core_reg(struct reg *reg)
+{
+	return ERROR_OK;
+}
+
+static int register_set_dummy_core_reg(struct reg *reg, uint8_t *buf)
+{
+	reg->dirty = true;
+	reg->valid = true;
+
+	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)
+{
+	reg->type = &dummy_type;
 }