X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fregister.c;h=5352d2f21d7786753c35b2cf1448a79a85cf4989;hp=2efcd5f8bb8f8e1a5a490e7c8a4ce34a8bce7d70;hb=92f51c50ae41732ba287ea8ee4a4cdeb54e313ee;hpb=74d09617b927ed7011098d5a65087dee1ef1e87a;ds=sidebyside
diff --git a/src/target/register.c b/src/target/register.c
index 2efcd5f8bb..5352d2f21d 100644
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -16,30 +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"
-
-
-reg_arch_type_t *reg_arch_types = NULL;
-
-reg_t* register_get_by_name(struct reg_cache *first,
+#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;
+ 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]);
}
@@ -53,7 +59,7 @@ reg_t* register_get_by_name(struct reg_cache *first,
return NULL;
}
-struct reg_cache** register_get_last_cache_p(struct reg_cache **first)
+struct reg_cache **register_get_last_cache_p(struct reg_cache **first)
{
struct reg_cache **cache_p = first;
@@ -66,62 +72,46 @@ struct reg_cache** register_get_last_cache_p(struct reg_cache **first)
return cache_p;
}
-int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, uint8_t *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 = false;
+ reg->dirty = false;
}
- 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;
+ reg->dirty = true;
+ reg->valid = true;
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;
}