[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-25-gbc0c9907d

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  bc0c9907d6ba9a39a953482a2bb2195504999427 (commit)
      from  5e57090203b36465c2f0560b92ca58cafb2c9e0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bc0c9907d6ba9a39a953482a2bb2195504999427
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Fri Feb 12 21:12:43 2021 +0100

    cortex_m: avoid reading and writing non-existent registers
    
    Change-Id: Iedc24352c8d3444372da06d00fcec9603540f950
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/6059
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index f14ce0d88..101094a97 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -166,10 +166,10 @@ int armv7m_restore_context(struct target *target)
 	 * packing of ARMV7M_PMSK_BPRI_FLTMSK_CTRL!
 	 * See also comments in the register table above */
 	for (i = cache->num_regs - 1; i >= 0; i--) {
-		if (cache->reg_list[i].dirty) {
-			armv7m->arm.write_core_reg(target, &cache->reg_list[i], i,
-						   ARM_MODE_ANY, cache->reg_list[i].value);
-		}
+		struct reg *r = &cache->reg_list[i];
+
+		if (r->exist && r->dirty)
+			armv7m->arm.write_core_reg(target, r, i, ARM_MODE_ANY, r->value);
 	}
 
 	return ERROR_OK;
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index b998b7ac7..2a973e1f6 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -521,7 +521,7 @@ static int cortex_m_debug_entry(struct target *target)
 
 	for (i = 0; i < num_regs; i++) {
 		r = &armv7m->arm.core_cache->reg_list[i];
-		if (!r->valid)
+		if (r->exist && !r->valid)
 			arm->read_core_reg(target, r, i, ARM_MODE_ANY);
 	}
 
diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index ca8b5874a..9ac344245 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -226,7 +226,7 @@ static int adapter_load_context(struct target *target)
 	for (int i = 0; i < num_regs; i++) {
 
 		struct reg *r = &armv7m->arm.core_cache->reg_list[i];
-		if (!r->valid)
+		if (r->exist && !r->valid)
 			armv7m->arm.read_core_reg(target, r, i, ARM_MODE_ANY);
 	}
 

-----------------------------------------------------------------------

Summary of changes:
 src/target/armv7m.c     | 8 ++++----
 src/target/cortex_m.c   | 2 +-
 src/target/hla_target.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository