[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-416-ge48720541

[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  e4872054108a3a18dc651b45dea679696e14ee7f (commit)
      from  b5a24386e49ca643ab750543e3818172d37fbc54 (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 e4872054108a3a18dc651b45dea679696e14ee7f
Author: Tim Newsome <ti...@si...>
Date:   Tue Sep 21 11:43:21 2021 -0700

    uint64_t->target_addr_t for stack pointers.
    
    This might be incomplete. It's just a quick attempt to reduce some of
    the difference between riscv-openocd and mainline. Other stack pointers
    can be updated as I come across them.
    
    Change-Id: Id3311b8a1bb0667f309a26d36b67093bfeb8380a
    Signed-off-by: Tim Newsome <ti...@si...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6586
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index eaad5e50c..f401c3d30 100644
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -616,7 +616,7 @@ int rtos_generic_stack_read(struct target *target,
 		LOG_OUTPUT("\r\n");
 #endif
 
-	int64_t new_stack_ptr;
+	target_addr_t new_stack_ptr;
 	if (stacking->calculate_process_stack) {
 		new_stack_ptr = stacking->calculate_process_stack(target,
 				stack_data, stacking, stack_ptr);
diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h
index 81751fe0a..dc7a64f43 100644
--- a/src/rtos/rtos.h
+++ b/src/rtos/rtos.h
@@ -108,10 +108,10 @@ struct rtos_register_stacking {
 	 * just use stacking->stack_registers_size * stack_growth_direction
 	 * to calculate adjustment.
 	 */
-	int64_t (*calculate_process_stack)(struct target *target,
+	target_addr_t (*calculate_process_stack)(struct target *target,
 		const uint8_t *stack_data,
 		const struct rtos_register_stacking *stacking,
-		int64_t stack_ptr);
+		target_addr_t stack_ptr);
 	const struct stack_register_offset *register_offsets;
 };
 
diff --git a/src/rtos/rtos_riot_stackings.c b/src/rtos/rtos_riot_stackings.c
index 98e02edfc..abf08c8ff 100644
--- a/src/rtos/rtos_riot_stackings.c
+++ b/src/rtos/rtos_riot_stackings.c
@@ -27,9 +27,9 @@
 /* This works for the M0 and M34 stackings as xPSR is in a fixed
  * location
  */
-static int64_t rtos_riot_cortex_m_stack_align(struct target *target,
+static target_addr_t rtos_riot_cortex_m_stack_align(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr)
+	target_addr_t stack_ptr)
 {
 	const int XPSR_OFFSET = 0x40;
 	return rtos_cortex_m_stack_align(target, stack_data, stacking,
diff --git a/src/rtos/rtos_standard_stackings.c b/src/rtos/rtos_standard_stackings.c
index 90c642a00..c3eef5c06 100644
--- a/src/rtos/rtos_standard_stackings.c
+++ b/src/rtos/rtos_standard_stackings.c
@@ -152,29 +152,29 @@ static const struct stack_register_offset rtos_standard_nds32_n1068_stack_offset
 	{ 35, 0x10, 32 },		/* IFC_LP */
 };
 
-static int64_t rtos_generic_stack_align(struct target *target,
+static target_addr_t rtos_generic_stack_align(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr, int align)
+	target_addr_t stack_ptr, int align)
 {
-	int64_t new_stack_ptr;
-	int64_t aligned_stack_ptr;
+	target_addr_t new_stack_ptr;
+	target_addr_t aligned_stack_ptr;
 	new_stack_ptr = stack_ptr - stacking->stack_growth_direction *
 		stacking->stack_registers_size;
-	aligned_stack_ptr = new_stack_ptr & ~((int64_t)align - 1);
+	aligned_stack_ptr = new_stack_ptr & ~((target_addr_t)align - 1);
 	if (aligned_stack_ptr != new_stack_ptr &&
 		stacking->stack_growth_direction == -1) {
 		/* If we have a downward growing stack, the simple alignment code
 		 * above results in a wrong result (since it rounds down to nearest
 		 * alignment).  We want to round up so add an extra align.
 		 */
-		aligned_stack_ptr += (int64_t)align;
+		aligned_stack_ptr += (target_addr_t)align;
 	}
 	return aligned_stack_ptr;
 }
 
-int64_t rtos_generic_stack_align8(struct target *target,
+target_addr_t rtos_generic_stack_align8(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr)
+	target_addr_t stack_ptr)
 {
 	return rtos_generic_stack_align(target, stack_data,
 			stacking, stack_ptr, 8);
@@ -199,13 +199,13 @@ int64_t rtos_generic_stack_align8(struct target *target,
  * This is just a helper function for use in the calculate_process_stack
  * function for a given architecture/rtos.
  */
-int64_t rtos_cortex_m_stack_align(struct target *target,
+target_addr_t rtos_cortex_m_stack_align(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr, size_t xpsr_offset)
+	target_addr_t stack_ptr, size_t xpsr_offset)
 {
 	const uint32_t ALIGN_NEEDED = (1 << 9);
 	uint32_t xpsr;
-	int64_t new_stack_ptr;
+	target_addr_t new_stack_ptr;
 
 	new_stack_ptr = stack_ptr - stacking->stack_growth_direction *
 		stacking->stack_registers_size;
@@ -220,27 +220,27 @@ int64_t rtos_cortex_m_stack_align(struct target *target,
 	return new_stack_ptr;
 }
 
-static int64_t rtos_standard_cortex_m3_stack_align(struct target *target,
+static target_addr_t rtos_standard_cortex_m3_stack_align(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr)
+	target_addr_t stack_ptr)
 {
 	const int XPSR_OFFSET = 0x3c;
 	return rtos_cortex_m_stack_align(target, stack_data, stacking,
 		stack_ptr, XPSR_OFFSET);
 }
 
-static int64_t rtos_standard_cortex_m4f_stack_align(struct target *target,
+static target_addr_t rtos_standard_cortex_m4f_stack_align(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr)
+	target_addr_t stack_ptr)
 {
 	const int XPSR_OFFSET = 0x40;
 	return rtos_cortex_m_stack_align(target, stack_data, stacking,
 		stack_ptr, XPSR_OFFSET);
 }
 
-static int64_t rtos_standard_cortex_m4f_fpu_stack_align(struct target *target,
+static target_addr_t rtos_standard_cortex_m4f_fpu_stack_align(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr)
+	target_addr_t stack_ptr)
 {
 	const int XPSR_OFFSET = 0x80;
 	return rtos_cortex_m_stack_align(target, stack_data, stacking,
diff --git a/src/rtos/rtos_standard_stackings.h b/src/rtos/rtos_standard_stackings.h
index ad319d2a0..d18f1797c 100644
--- a/src/rtos/rtos_standard_stackings.h
+++ b/src/rtos/rtos_standard_stackings.h
@@ -30,11 +30,11 @@ extern const struct rtos_register_stacking rtos_standard_cortex_m4f_stacking;
 extern const struct rtos_register_stacking rtos_standard_cortex_m4f_fpu_stacking;
 extern const struct rtos_register_stacking rtos_standard_cortex_r4_stacking;
 extern const struct rtos_register_stacking rtos_standard_nds32_n1068_stacking;
-int64_t rtos_generic_stack_align8(struct target *target,
+target_addr_t rtos_generic_stack_align8(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr);
-int64_t rtos_cortex_m_stack_align(struct target *target,
+	target_addr_t stack_ptr);
+target_addr_t rtos_cortex_m_stack_align(struct target *target,
 	const uint8_t *stack_data, const struct rtos_register_stacking *stacking,
-	int64_t stack_ptr, size_t xpsr_offset);
+	target_addr_t stack_ptr, size_t xpsr_offset);
 
 #endif /* OPENOCD_RTOS_RTOS_STANDARD_STACKINGS_H */
diff --git a/src/rtos/zephyr.c b/src/rtos/zephyr.c
index a59673557..630511636 100644
--- a/src/rtos/zephyr.c
+++ b/src/rtos/zephyr.c
@@ -189,9 +189,9 @@ enum zephyr_symbol_values {
 	ZEPHYR_VAL_COUNT
 };
 
-static int64_t zephyr_cortex_m_stack_align(struct target *target,
+static target_addr_t zephyr_cortex_m_stack_align(struct target *target,
 		const uint8_t *stack_data,
-		const struct rtos_register_stacking *stacking, int64_t stack_ptr)
+		const struct rtos_register_stacking *stacking, target_addr_t stack_ptr)
 {
 	return rtos_cortex_m_stack_align(target, stack_data, stacking,
 			stack_ptr, ARM_XPSR_OFFSET);

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

Summary of changes:
 src/rtos/rtos.c                    |  2 +-
 src/rtos/rtos.h                    |  4 ++--
 src/rtos/rtos_riot_stackings.c     |  4 ++--
 src/rtos/rtos_standard_stackings.c | 34 +++++++++++++++++-----------------
 src/rtos/rtos_standard_stackings.h |  8 ++++----
 src/rtos/zephyr.c                  |  4 ++--
 6 files changed, 28 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository