X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Frtos%2FeCos.c;h=8e982dacb465b66731a6e5554878c108e30e0d29;hb=58f987aa856a54ce34ecd402ede437a55d4181e9;hp=9ab88dec01e5da06b633040a9540808e5a16c73a;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee;p=fw%2Fopenocd diff --git a/src/rtos/eCos.c b/src/rtos/eCos.c index 9ab88dec0..8e982dacb 100644 --- a/src/rtos/eCos.c +++ b/src/rtos/eCos.c @@ -1,19 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + /*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * 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. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -29,18 +16,18 @@ #include "helper/types.h" #include "rtos_ecos_stackings.h" -static int eCos_detect_rtos(struct target *target); -static int eCos_create(struct target *target); -static int eCos_update_threads(struct rtos *rtos); -static int eCos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list); -static int eCos_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]); +static bool ecos_detect_rtos(struct target *target); +static int ecos_create(struct target *target); +static int ecos_update_threads(struct rtos *rtos); +static int ecos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, struct rtos_reg **reg_list, int *num_regs); +static int ecos_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]); -struct eCos_thread_state { +struct ecos_thread_state { int value; - char *desc; + const char *desc; }; -struct eCos_thread_state eCos_thread_states[] = { +static const struct ecos_thread_state ecos_thread_states[] = { { 0, "Ready" }, { 1, "Sleeping" }, { 2, "Countsleep" }, @@ -49,10 +36,10 @@ struct eCos_thread_state eCos_thread_states[] = { { 16, "Exited" } }; -#define ECOS_NUM_STATES (sizeof(eCos_thread_states)/sizeof(struct eCos_thread_state)) +#define ECOS_NUM_STATES ARRAY_SIZE(ecos_thread_states) -struct eCos_params { - char *target_name; +struct ecos_params { + const char *target_name; unsigned char pointer_width; unsigned char thread_stack_offset; unsigned char thread_name_offset; @@ -62,7 +49,7 @@ struct eCos_params { const struct rtos_register_stacking *stacking_info; }; -const struct eCos_params eCos_params_list[] = { +static const struct ecos_params ecos_params_list[] = { { "cortex_m", /* target_name */ 4, /* pointer_width; */ @@ -71,82 +58,62 @@ const struct eCos_params eCos_params_list[] = { 0x3c, /* thread_state_offset; */ 0xa0, /* thread_next_offset */ 0x4c, /* thread_uniqueid_offset */ - &rtos_eCos_Cortex_M3_stacking /* stacking_info */ + &rtos_ecos_cortex_m3_stacking /* stacking_info */ } }; -#define ECOS_NUM_PARAMS ((int)(sizeof(eCos_params_list)/sizeof(struct eCos_params))) - -enum eCos_symbol_values { - eCos_VAL_thread_list = 0, - eCos_VAL_current_thread_ptr = 1 +enum ecos_symbol_values { + ECOS_VAL_THREAD_LIST = 0, + ECOS_VAL_CURRENT_THREAD_PTR = 1 }; -static char *eCos_symbol_list[] = { +static const char * const ecos_symbol_list[] = { "Cyg_Thread::thread_list", "Cyg_Scheduler_Base::current_thread", NULL }; -const struct rtos_type eCos_rtos = { +const struct rtos_type ecos_rtos = { .name = "eCos", - .detect_rtos = eCos_detect_rtos, - .create = eCos_create, - .update_threads = eCos_update_threads, - .get_thread_reg_list = eCos_get_thread_reg_list, - .get_symbol_list_to_lookup = eCos_get_symbol_list_to_lookup, + .detect_rtos = ecos_detect_rtos, + .create = ecos_create, + .update_threads = ecos_update_threads, + .get_thread_reg_list = ecos_get_thread_reg_list, + .get_symbol_list_to_lookup = ecos_get_symbol_list_to_lookup, }; -static int eCos_update_threads(struct rtos *rtos) +static int ecos_update_threads(struct rtos *rtos) { int retval; int tasks_found = 0; int thread_list_size = 0; - const struct eCos_params *param; + const struct ecos_params *param; - if (rtos == NULL) + if (!rtos) return -1; - if (rtos->rtos_specific_params == NULL) + if (!rtos->rtos_specific_params) return -3; - param = (const struct eCos_params *) rtos->rtos_specific_params; + param = (const struct ecos_params *) rtos->rtos_specific_params; - if (rtos->symbols == NULL) { + if (!rtos->symbols) { LOG_ERROR("No symbols for eCos"); return -4; } - if (rtos->symbols[eCos_VAL_thread_list].address == 0) { + if (rtos->symbols[ECOS_VAL_THREAD_LIST].address == 0) { LOG_ERROR("Don't have the thread list head"); return -2; } /* wipe out previous thread details if any */ - if (rtos->thread_details != NULL) { - int j; - for (j = 0; j < rtos->thread_count; j++) { - if (rtos->thread_details[j].display_str != NULL) { - free(rtos->thread_details[j].display_str); - rtos->thread_details[j].display_str = NULL; - } - if (rtos->thread_details[j].thread_name_str != NULL) { - free(rtos->thread_details[j].thread_name_str); - rtos->thread_details[j].thread_name_str = NULL; - } - if (rtos->thread_details[j].extra_info_str != NULL) { - free(rtos->thread_details[j].extra_info_str); - rtos->thread_details[j].extra_info_str = NULL; - } - } - free(rtos->thread_details); - rtos->thread_details = NULL; - } + rtos_free_threadlist(rtos); /* determine the number of current threads */ - uint32_t thread_list_head = rtos->symbols[eCos_VAL_thread_list].address; + uint32_t thread_list_head = rtos->symbols[ECOS_VAL_THREAD_LIST].address; uint32_t thread_index; target_read_buffer(rtos->target, thread_list_head, @@ -166,7 +133,7 @@ static int eCos_update_threads(struct rtos *rtos) /* read the current thread id */ uint32_t current_thread_addr; retval = target_read_buffer(rtos->target, - rtos->symbols[eCos_VAL_current_thread_ptr].address, + rtos->symbols[ECOS_VAL_CURRENT_THREAD_PTR].address, 4, (uint8_t *)¤t_thread_addr); if (retval != ERROR_OK) @@ -188,13 +155,12 @@ static int eCos_update_threads(struct rtos *rtos) char tmp_str[] = "Current Execution"; thread_list_size++; tasks_found++; - rtos->thread_details = (struct thread_detail *) malloc( + rtos->thread_details = malloc( sizeof(struct thread_detail) * thread_list_size); rtos->thread_details->threadid = 1; rtos->thread_details->exists = true; - rtos->thread_details->display_str = NULL; rtos->thread_details->extra_info_str = NULL; - rtos->thread_details->thread_name_str = (char *) malloc(sizeof(tmp_str)); + rtos->thread_details->thread_name_str = malloc(sizeof(tmp_str)); strcpy(rtos->thread_details->thread_name_str, tmp_str); if (thread_list_size == 0) { @@ -203,7 +169,7 @@ static int eCos_update_threads(struct rtos *rtos) } } else { /* create space for new thread details */ - rtos->thread_details = (struct thread_detail *) malloc( + rtos->thread_details = malloc( sizeof(struct thread_detail) * thread_list_size); } @@ -255,7 +221,7 @@ static int eCos_update_threads(struct rtos *rtos) strcpy(tmp_str, "No Name"); rtos->thread_details[tasks_found].thread_name_str = - (char *)malloc(strlen(tmp_str)+1); + malloc(strlen(tmp_str)+1); strcpy(rtos->thread_details[tasks_found].thread_name_str, tmp_str); /* Read the thread status */ @@ -269,31 +235,29 @@ static int eCos_update_threads(struct rtos *rtos) return retval; } - for (i = 0; (i < ECOS_NUM_STATES) && (eCos_thread_states[i].value != thread_status); i++) { + for (i = 0; (i < ECOS_NUM_STATES) && (ecos_thread_states[i].value != thread_status); i++) { /* * empty */ } - char *state_desc; + const char *state_desc; if (i < ECOS_NUM_STATES) - state_desc = eCos_thread_states[i].desc; + state_desc = ecos_thread_states[i].desc; else state_desc = "Unknown state"; - rtos->thread_details[tasks_found].extra_info_str = (char *)malloc(strlen( - state_desc)+1); - strcpy(rtos->thread_details[tasks_found].extra_info_str, state_desc); + rtos->thread_details[tasks_found].extra_info_str = malloc(strlen( + state_desc)+8); + sprintf(rtos->thread_details[tasks_found].extra_info_str, "State: %s", state_desc); rtos->thread_details[tasks_found].exists = true; - rtos->thread_details[tasks_found].display_str = NULL; - tasks_found++; prev_thread_ptr = thread_index; /* Get the location of the next thread structure. */ - thread_index = rtos->symbols[eCos_VAL_thread_list].address; + thread_index = rtos->symbols[ECOS_VAL_THREAD_LIST].address; retval = target_read_buffer(rtos->target, prev_thread_ptr + param->thread_next_offset, param->pointer_width, @@ -308,27 +272,26 @@ static int eCos_update_threads(struct rtos *rtos) return 0; } -static int eCos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list) +static int ecos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, + struct rtos_reg **reg_list, int *num_regs) { int retval; - const struct eCos_params *param; - - *hex_reg_list = NULL; + const struct ecos_params *param; - if (rtos == NULL) + if (!rtos) return -1; if (thread_id == 0) return -2; - if (rtos->rtos_specific_params == NULL) + if (!rtos->rtos_specific_params) return -3; - param = (const struct eCos_params *) rtos->rtos_specific_params; + param = (const struct ecos_params *) rtos->rtos_specific_params; /* Find the thread with that thread id */ uint16_t id = 0; - uint32_t thread_list_head = rtos->symbols[eCos_VAL_thread_list].address; + uint32_t thread_list_head = rtos->symbols[ECOS_VAL_THREAD_LIST].address; uint32_t thread_index; target_read_buffer(rtos->target, thread_list_head, param->pointer_width, (uint8_t *)&thread_index); @@ -368,48 +331,45 @@ static int eCos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char * return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, - hex_reg_list); + reg_list, + num_regs); } return -1; } -static int eCos_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]) +static int ecos_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]) { unsigned int i; - *symbol_list = (symbol_table_elem_t *) malloc( - sizeof(symbol_table_elem_t) * ARRAY_SIZE(eCos_symbol_list)); + *symbol_list = calloc( + ARRAY_SIZE(ecos_symbol_list), sizeof(struct symbol_table_elem)); - for (i = 0; i < ARRAY_SIZE(eCos_symbol_list); i++) - (*symbol_list)[i].symbol_name = eCos_symbol_list[i]; + for (i = 0; i < ARRAY_SIZE(ecos_symbol_list); i++) + (*symbol_list)[i].symbol_name = ecos_symbol_list[i]; return 0; } -static int eCos_detect_rtos(struct target *target) +static bool ecos_detect_rtos(struct target *target) { - if ((target->rtos->symbols != NULL) && - (target->rtos->symbols[eCos_VAL_thread_list].address != 0)) { + if ((target->rtos->symbols) && + (target->rtos->symbols[ECOS_VAL_THREAD_LIST].address != 0)) { /* looks like eCos */ - return 1; + return true; } - return 0; + return false; } -static int eCos_create(struct target *target) +static int ecos_create(struct target *target) { - int i = 0; - while ((i < ECOS_NUM_PARAMS) && - (0 != strcmp(eCos_params_list[i].target_name, target->type->name))) { - i++; - } - if (i >= ECOS_NUM_PARAMS) { - LOG_ERROR("Could not find target in eCos compatibility list"); - return -1; - } + for (unsigned int i = 0; i < ARRAY_SIZE(ecos_params_list); i++) + if (strcmp(ecos_params_list[i].target_name, target->type->name) == 0) { + target->rtos->rtos_specific_params = (void *)&ecos_params_list[i]; + target->rtos->current_thread = 0; + target->rtos->thread_details = NULL; + return 0; + } - target->rtos->rtos_specific_params = (void *) &eCos_params_list[i]; - target->rtos->current_thread = 0; - target->rtos->thread_details = NULL; - return 0; + LOG_ERROR("Could not find target in eCos compatibility list"); + return -1; }