X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Frtos%2FChibiOS.c;h=8839acc9a61f44c3938bcbfb769c00dc93184594;hp=85da6f8114a460439c153d826ec8ad65e518ffc4;hb=5fbf4d4cc3f67ec8b2fb3d8a789117583a84e1a1;hpb=e6907e6d7e4cfc108d03d05dc2686f989ba7213d diff --git a/src/rtos/ChibiOS.c b/src/rtos/ChibiOS.c index 85da6f8114..8839acc9a6 100644 --- a/src/rtos/ChibiOS.c +++ b/src/rtos/ChibiOS.c @@ -16,9 +16,7 @@ * GNU General Public License for more details. * * * * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -36,7 +34,6 @@ #include "helper/types.h" #include "rtos_chibios_stackings.h" - /** * @brief ChibiOS/RT memory signature record. * @@ -72,10 +69,9 @@ struct ChibiOS_chdebug { /** * @brief ChibiOS thread states. */ -const char *ChibiOS_thread_states[] = { - "READY", "CURRENT", "SUSPENDED", "WTSEM", "WTMTX", "WTCOND", "SLEEPING", - "WTEXIT", "WTOREVT", "WTANDEVT", "SNDMSGQ", "SNDMSG", "WTMSG", "WTQUEUE", - "FINAL" +static const char * const ChibiOS_thread_states[] = { "READY", "CURRENT", +"WTSTART", "SUSPENDED", "QUEUED", "WTSEM", "WTMTX", "WTCOND", "SLEEPING", +"WTEXIT", "WTOREVT", "WTANDEVT", "SNDMSGQ", "SNDMSG", "WTMSG", "FINAL" }; #define CHIBIOS_NUM_STATES (sizeof(ChibiOS_thread_states)/sizeof(char *)) @@ -92,7 +88,7 @@ struct ChibiOS_params { const struct rtos_register_stacking *stacking_info; }; -struct ChibiOS_params ChibiOS_params_list[] = { +static struct ChibiOS_params ChibiOS_params_list[] = { { "cortex_m", /* target_name */ 0, @@ -106,10 +102,11 @@ struct ChibiOS_params ChibiOS_params_list[] = { }; #define CHIBIOS_NUM_PARAMS ((int)(sizeof(ChibiOS_params_list)/sizeof(struct ChibiOS_params))) -static int ChibiOS_detect_rtos(struct target *target); +static bool ChibiOS_detect_rtos(struct target *target); static int ChibiOS_create(struct target *target); static int ChibiOS_update_threads(struct rtos *rtos); -static int ChibiOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list); +static int ChibiOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, + struct rtos_reg **reg_list, int *num_regs); static int ChibiOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]); struct rtos_type ChibiOS_rtos = { @@ -122,19 +119,28 @@ struct rtos_type ChibiOS_rtos = { .get_symbol_list_to_lookup = ChibiOS_get_symbol_list_to_lookup, }; + +/* In ChibiOS/RT 3.0 the rlist structure has become part of a system + * data structure ch. We declare both symbols as optional and later + * use whatever is available. + */ + enum ChibiOS_symbol_values { ChibiOS_VAL_rlist = 0, - ChibiOS_VAL_ch_debug = 1, - ChibiOS_VAL_chSysInit = 2 + ChibiOS_VAL_ch = 1, + ChibiOS_VAL_ch_debug = 2 }; -static char *ChibiOS_symbol_list[] = { - "rlist", /* Thread ready list*/ - "ch_debug", /* Memory Signatur containing offsets of fields in rlist*/ - "chSysInit", /* Necessary part of API, used for ChibiOS detection*/ - NULL +static symbol_table_elem_t ChibiOS_symbol_list[] = { + { "rlist", 0, true}, /* Thread ready list */ + { "ch", 0, true}, /* System data structure */ + { "ch_debug", 0, false}, /* Memory Signature containing offsets of fields in rlist */ + { NULL, 0, false} }; +/* Offset of the rlist structure within the system data structure (ch) */ +#define CH_RLIST_OFFSET 0x00 + static int ChibiOS_update_memory_signature(struct rtos *rtos) { int retval; @@ -216,7 +222,7 @@ static int ChibiOS_update_stacking(struct rtos *rtos) /* Sometimes the stacking can not be determined only by looking at the * target name but only a runtime. * - * For example, this is the case for cortex-m4 targets and ChibiOS which + * For example, this is the case for Cortex-M4 targets and ChibiOS which * only stack the FPU registers if it is enabled during ChibiOS build. * * Terminating which stacking is used is target depending. @@ -238,10 +244,10 @@ static int ChibiOS_update_stacking(struct rtos *rtos) struct ChibiOS_params *param; param = (struct ChibiOS_params *) rtos->rtos_specific_params; - /* Check for armv7m with *enabled* FPU, i.e. a Cortex M4 */ + /* Check for armv7m with *enabled* FPU, i.e. a Cortex-M4 */ struct armv7m_common *armv7m_target = target_to_armv7m(rtos->target); if (is_armv7m(armv7m_target)) { - if (armv7m_target->fp_feature == FPv4_SP) { + if (armv7m_target->fp_feature != FP_NONE) { /* Found ARM v7m target which includes a FPU */ uint32_t cpacr; @@ -254,11 +260,9 @@ static int ChibiOS_update_stacking(struct rtos *rtos) /* Check if CP10 and CP11 are set to full access. * In ChibiOS this is done in ResetHandler() in crt0.c */ if (cpacr & 0x00F00000) { - /* Found target with enabled FPU */ - /* FIXME: Need to figure out how to specify the FPU registers */ - LOG_ERROR("ChibiOS ARM v7m targets with enabled FPU " - " are NOT supported"); - return -1; + LOG_DEBUG("Enabled FPU detected."); + param->stacking_info = &rtos_chibios_arm_v7m_stacking_w_fpu; + return 0; } } @@ -301,7 +305,9 @@ static int ChibiOS_update_threads(struct rtos *rtos) /* ChibiOS does not save the current thread count. We have to first * parse the double linked thread list to check for errors and the number of * threads. */ - const uint32_t rlist = rtos->symbols[ChibiOS_VAL_rlist].address; + const uint32_t rlist = rtos->symbols[ChibiOS_VAL_rlist].address ? + rtos->symbols[ChibiOS_VAL_rlist].address : + rtos->symbols[ChibiOS_VAL_ch].address + CH_RLIST_OFFSET /* ChibiOS3 */; const struct ChibiOS_chdebug *signature = param->signature; uint32_t current; uint32_t previous; @@ -351,7 +357,6 @@ static int ChibiOS_update_threads(struct rtos *rtos) sizeof(struct thread_detail)); rtos->thread_details->threadid = 1; rtos->thread_details->exists = true; - rtos->thread_details->display_str = NULL; rtos->thread_details->extra_info_str = malloc( sizeof(tmp_thread_extra_info)); @@ -435,14 +440,13 @@ static int ChibiOS_update_threads(struct rtos *rtos) if (threadState < CHIBIOS_NUM_STATES) state_desc = ChibiOS_thread_states[threadState]; else - state_desc = "Unknown state"; + state_desc = "Unknown"; curr_thrd_details->extra_info_str = malloc(strlen( - state_desc)+1); - strcpy(curr_thrd_details->extra_info_str, state_desc); + state_desc)+8); + sprintf(curr_thrd_details->extra_info_str, "State: %s", state_desc); curr_thrd_details->exists = true; - curr_thrd_details->display_str = NULL; curr_thrd_details++; } @@ -461,13 +465,13 @@ static int ChibiOS_update_threads(struct rtos *rtos) return 0; } -static int ChibiOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list) +static int ChibiOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, + struct rtos_reg **reg_list, int *num_regs) { int retval; const struct ChibiOS_params *param; uint32_t stack_ptr = 0; - *hex_reg_list = NULL; if ((rtos == NULL) || (thread_id == 0) || (rtos->rtos_specific_params == NULL)) return -1; @@ -492,38 +496,37 @@ static int ChibiOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, cha return retval; } - return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, hex_reg_list); + return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, reg_list, num_regs); } static int ChibiOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]) { - unsigned int i; - *symbol_list = malloc( - sizeof(symbol_table_elem_t) * ARRAY_SIZE(ChibiOS_symbol_list)); + *symbol_list = malloc(sizeof(ChibiOS_symbol_list)); - for (i = 0; i < ARRAY_SIZE(ChibiOS_symbol_list); i++) - (*symbol_list)[i].symbol_name = ChibiOS_symbol_list[i]; + if (*symbol_list == NULL) + return ERROR_FAIL; + memcpy(*symbol_list, ChibiOS_symbol_list, sizeof(ChibiOS_symbol_list)); return 0; } -static int ChibiOS_detect_rtos(struct target *target) +static bool ChibiOS_detect_rtos(struct target *target) { if ((target->rtos->symbols != NULL) && - (target->rtos->symbols[ChibiOS_VAL_rlist].address != 0) && - (target->rtos->symbols[ChibiOS_VAL_chSysInit].address != 0)) { + ((target->rtos->symbols[ChibiOS_VAL_rlist].address != 0) || + (target->rtos->symbols[ChibiOS_VAL_ch].address != 0))) { if (target->rtos->symbols[ChibiOS_VAL_ch_debug].address == 0) { - LOG_INFO("It looks like the target is running ChibiOS without " - "ch_debug."); - return 0; + LOG_INFO("It looks like the target may be running ChibiOS " + "without ch_debug."); + return false; } /* looks like ChibiOS with memory map enabled.*/ - return 1; + return true; } - return 0; + return false; } static int ChibiOS_create(struct target *target) @@ -539,6 +542,6 @@ static int ChibiOS_create(struct target *target) return -1; } - target->rtos->rtos_specific_params = &ChibiOS_params_list[i]; + target->rtos->rtos_specific_params = (void *) &ChibiOS_params_list[i]; return 0; }