[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1427-g5e61d59c9

[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  5e61d59c9065bb4347c8e85767c39ea7263010f2 (commit)
      from  4fc61a2f9d60e49b8134ab7e0929cfb2b3a4f771 (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 5e61d59c9065bb4347c8e85767c39ea7263010f2
Author: Sylvain Chouleur <sch...@gr...>
Date:   Mon Oct 12 17:24:05 2020 +0200

    cortex_m: support control.FPCA
    
    Bit 2 of control register is used if the processor includes the FP
    extension
    
    Change-Id: Ie21bc9de8cae5bad9d841e1908eff3aa0bb29d4b
    Signed-off-by: Sylvain Chouleur <sch...@gr...>
    Reviewed-on: http://openocd.zylin.com/5853
    Reviewed-by: Sylvain Chouleur <syl...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins
    Reviewed-by: Andreas Fritiofson <and...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index ea6ee6117..5e0694d8a 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -111,7 +111,7 @@ static const struct {
 	{ ARMV7M_PRIMASK, "primask", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
 	{ ARMV7M_BASEPRI, "basepri", 8, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
 	{ ARMV7M_FAULTMASK, "faultmask", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
-	{ ARMV7M_CONTROL, "control", 2, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
+	{ ARMV7M_CONTROL, "control", 3, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
 
 	{ ARMV7M_D0, "d0", 64, REG_TYPE_IEEE_DOUBLE, "float", "org.gnu.gdb.arm.vfp" },
 	{ ARMV7M_D1, "d1", 64, REG_TYPE_IEEE_DOUBLE, "float", "org.gnu.gdb.arm.vfp" },
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 55664a79a..abc377f0d 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -541,7 +541,7 @@ static int cortex_m_debug_entry(struct target *target)
 		arm->map = armv7m_msp_reg_map;
 	} else {
 		unsigned control = buf_get_u32(arm->core_cache
-				->reg_list[ARMV7M_CONTROL].value, 0, 2);
+				->reg_list[ARMV7M_CONTROL].value, 0, 3);
 
 		/* is this thread privileged? */
 		arm->core_mode = control & 1
@@ -1678,7 +1678,7 @@ static int cortex_m_load_core_reg_u32(struct target *target,
 					break;
 
 				case ARMV7M_CONTROL:
-					*value = buf_get_u32((uint8_t *)value, 24, 2);
+					*value = buf_get_u32((uint8_t *)value, 24, 3);
 					break;
 			}
 
@@ -1764,7 +1764,7 @@ static int cortex_m_store_core_reg_u32(struct target *target,
 					break;
 
 				case ARMV7M_CONTROL:
-					buf_set_u32((uint8_t *)&reg, 24, 2, value);
+					buf_set_u32((uint8_t *)&reg, 24, 3, value);
 					break;
 			}
 
diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index f0dc57276..c02cbb643 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -123,7 +123,7 @@ static int adapter_load_core_reg_u32(struct target *target,
 			break;
 
 		case ARMV7M_CONTROL:
-			*value = buf_get_u32((uint8_t *) value, 24, 2);
+			*value = buf_get_u32((uint8_t *) value, 24, 3);
 			break;
 		}
 
@@ -215,7 +215,7 @@ static int adapter_store_core_reg_u32(struct target *target,
 			break;
 
 		case ARMV7M_CONTROL:
-			buf_set_u32((uint8_t *) &reg, 24, 2, value);
+			buf_set_u32((uint8_t *) &reg, 24, 3, value);
 			break;
 		}
 
@@ -433,7 +433,7 @@ static int adapter_debug_entry(struct target *target)
 		arm->map = armv7m_msp_reg_map;
 	} else {
 		unsigned control = buf_get_u32(arm->core_cache
-				->reg_list[ARMV7M_CONTROL].value, 0, 2);
+				->reg_list[ARMV7M_CONTROL].value, 0, 3);
 
 		/* is this thread privileged? */
 		arm->core_mode = control & 1

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

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


hooks/post-receive
-- 
Main OpenOCD repository