target/cortex_m: do not leak memory on reexamination

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

diff --git a/src/target/register.c b/src/target/register.c
index 355c860121372c45c6cd6a3d9420fd90d0d606c8..1c1717c8ff3b39342c12f5ba3e1f7f82546371eb 100644 (file)
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -18,13 +18,13 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <helper/types.h>
 #include "register.h"
 #include <helper/log.h>
 
@@ -38,16 +38,14 @@
  * 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_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 (strcmp(cache->reg_list[i].name, name) == 0)
                                return &(cache->reg_list[i]);
                }
@@ -61,7 +59,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,6 +72,14 @@ 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)
 {