X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fregister.c;h=4ddda6e6b3c420978d7c58e5692e8d2e1b1fa9ff;hb=081954136681b26ad30db9b4cc40cb360f47602c;hp=392455d013883c8b7d0dcdd1b802e7286c39bcd2;hpb=71cde5e359f273585880ea8986709b950ba85b08;p=fw%2Fopenocd

diff --git a/src/target/register.c b/src/target/register.c
index 392455d01..4ddda6e6b 100644
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -16,17 +16,15 @@
  *   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 "types.h"
 #include "register.h"
-#include "log.h"
+#include <helper/log.h>
 
 /**
  * @file
@@ -38,16 +36,39 @@
  * may be separate registers associated with debug or trace modules.
  */
 
-struct reg* register_get_by_name(struct reg_cache *first,
+struct reg *register_get_by_number(struct reg_cache *first,
+		uint32_t reg_num, bool search_all)
+{
+	unsigned i;
+	struct reg_cache *cache = first;
+
+	while (cache) {
+		for (i = 0; i < cache->num_regs; i++) {
+			if (cache->reg_list[i].exist == false)
+				continue;
+			if (cache->reg_list[i].number == reg_num)
+				return &(cache->reg_list[i]);
+		}
+
+		if (search_all)
+			cache = cache->next;
+		else
+			break;
+	}
+
+	return NULL;
+}
+
+struct reg *register_get_by_name(struct reg_cache *first,
 		const char *name, bool search_all)
 {
 	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]);
 		}
@@ -61,7 +82,7 @@ struct reg* 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;
 
@@ -74,14 +95,24 @@ struct reg_cache** register_get_last_cache_p(struct reg_cache **first)
 	return cache_p;
 }
 
+void register_unlink_cache(struct reg_cache **cache_p, const struct reg_cache *cache)
+{
+	while (*cache_p && *cache_p != cache)
+		cache_p = &((*cache_p)->next);
+	if (*cache_p)
+		*cache_p = cache->next;
+}
+
 /** Marks the contents of the register cache as invalid (and clean). */
 void register_cache_invalidate(struct reg_cache *cache)
 {
 	struct reg *reg = cache->reg_list;
 
 	for (unsigned n = cache->num_regs; n != 0; n--, reg++) {
-		reg->valid = 0;
-		reg->dirty = 0;
+		if (reg->exist == false)
+			continue;
+		reg->valid = false;
+		reg->dirty = false;
 	}
 }
 
@@ -92,8 +123,8 @@ static int register_get_dummy_core_reg(struct reg *reg)
 
 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;
 }