target/register: Minor code cleanup

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

diff --git a/src/target/register.c b/src/target/register.c
index 42b3b8b64e2fa7e2dcba049f025ba8e8907b0731..638747560cb08f9c66762477c84ef0fa2220db6d 100644 (file)
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -16,9 +16,7 @@
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -38,22 +36,45 @@
  * may be separate registers associated with debug or trace modules.
  */
 
+struct reg *register_get_by_number(struct reg_cache *first,
+               uint32_t reg_num, bool search_all)
+{
+       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 (cache->reg_list[i].number == reg_num)
+                               return &(cache->reg_list[i]);
+               }
+
+               if (!search_all)
+                       break;
+
+               cache = cache->next;
+       }
+
+       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++) {
+               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;
@@ -72,14 +93,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;
+       for (unsigned int n = cache->num_regs; n != 0; n--, reg++) {
+               if (!reg->exist)
+                       continue;
+               reg->valid = false;
+               reg->dirty = false;
        }
 }
 
@@ -90,8 +121,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;
 }