X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Frtos%2Fzephyr.c;h=5f7795337191f982eba51abb16f691946c24c501;hb=0c6e0bb82bef9c93506e2f30fc20918691540e65;hp=ef5ff5879158ff40a775316383b1841f6bfb4a1f;hpb=08ee7bb982b16742f52cfdc6c649d82ffa2eb177;p=fw%2Fopenocd

diff --git a/src/rtos/zephyr.c b/src/rtos/zephyr.c
index ef5ff5879..5f7795337 100644
--- a/src/rtos/zephyr.c
+++ b/src/rtos/zephyr.c
@@ -1,11 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2017 by Intel Corporation
  *   Leandro Pereira <leandro.pereira@intel.com>
  *   Daniel Glöckner <dg@emlix.com>*
  *   Copyright (C) 2021 by Synopsys, Inc.
  *   Evgeniy Didin <didin@synopsys.com>
- *                                                                         *
- *   SPDX-License-Identifier: GPL-2.0-or-later                             *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -136,7 +136,7 @@ static const struct stack_register_offset arm_cpu_saved[] = {
 	{ ARMV7M_R13,  -2, 32 },
 	{ ARMV7M_R14,  20, 32 },
 	{ ARMV7M_PC,   24, 32 },
-	{ ARMV7M_xPSR, 28, 32 },
+	{ ARMV7M_XPSR, 28, 32 },
 };
 
 static struct stack_register_offset arc_cpu_saved[] = {
@@ -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);
@@ -340,6 +340,14 @@ static struct zephyr_params zephyr_params_list[] = {
 		.cpu_saved_fp_stacking = &arm_cpu_saved_fp_stacking,
 		.get_cpu_state = &zephyr_get_arm_state,
 	},
+	{
+		.target_name = "cortex_r4",
+		.pointer_width = 4,
+		.callee_saved_stacking = &arm_callee_saved_stacking,
+		.cpu_saved_nofp_stacking = &arm_cpu_saved_nofp_stacking,
+		.cpu_saved_fp_stacking = &arm_cpu_saved_fp_stacking,
+		.get_cpu_state = &zephyr_get_arm_state,
+	},
 	{
 		.target_name = "hla_target",
 		.pointer_width = 4,
@@ -367,15 +375,15 @@ static const struct symbol_table_elem zephyr_symbol_list[] = {
 		.optional = false
 	},
 	{
-		.symbol_name = "_kernel_openocd_offsets",
+		.symbol_name = "_kernel_thread_info_offsets",
 		.optional = false
 	},
 	{
-		.symbol_name = "_kernel_openocd_size_t_size",
+		.symbol_name = "_kernel_thread_info_size_t_size",
 		.optional = false
 	},
 	{
-		.symbol_name = "_kernel_openocd_num_offsets",
+		.symbol_name = "_kernel_thread_info_num_offsets",
 		.optional = true
 	},
 	{
@@ -385,7 +393,7 @@ static const struct symbol_table_elem zephyr_symbol_list[] = {
 
 static bool zephyr_detect_rtos(struct target *target)
 {
-	if (target->rtos->symbols == NULL) {
+	if (!target->rtos->symbols) {
 		LOG_INFO("Zephyr: no symbols while detecting RTOS");
 		return false;
 	}