* 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., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "target/target_type.h"
#include "rtos.h"
#include "helper/log.h"
+#include "helper/types.h"
#include "rtos_ecos_stackings.h"
static int eCos_detect_rtos(struct target *target);
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" },
#define ECOS_NUM_STATES (sizeof(eCos_thread_states)/sizeof(struct eCos_thread_state))
struct eCos_params {
- char *target_name;
+ const char *target_name;
unsigned char pointer_width;
unsigned char thread_stack_offset;
unsigned char thread_name_offset;
const struct rtos_register_stacking *stacking_info;
};
-const struct eCos_params eCos_params_list[] = {
+static const struct eCos_params eCos_params_list[] = {
{
- "cortex_m3", /* target_name */
+ "cortex_m", /* target_name */
4, /* pointer_width; */
0x0c, /* thread_stack_offset; */
0x9c, /* thread_name_offset; */
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
};
-#define ECOS_NUM_SYMBOLS (sizeof(eCos_symbol_list)/sizeof(char *))
-
const struct rtos_type eCos_rtos = {
.name = "eCos",
param = (const struct eCos_params *) rtos->rtos_specific_params;
if (rtos->symbols == NULL) {
- LOG_OUTPUT("No symbols for eCos\r\n");
+ LOG_ERROR("No symbols for eCos");
return -4;
}
if (rtos->symbols[eCos_VAL_thread_list].address == 0) {
- LOG_OUTPUT("Don't have the thread list head\r\n");
+ 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;
2,
(uint8_t *)&rtos->current_thread);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Could not read eCos current thread from target\r\n");
+ LOG_ERROR("Could not read eCos current thread from target");
return retval;
}
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) {
}
} 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);
}
2,
(uint8_t *)&thread_id);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Could not read eCos thread id from target\r\n");
+ LOG_ERROR("Could not read eCos thread id from target");
return retval;
}
rtos->thread_details[tasks_found].threadid = thread_id;
param->pointer_width,
(uint8_t *)&name_ptr);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Could not read eCos thread name pointer from target\r\n");
+ LOG_ERROR("Could not read eCos thread name pointer from target");
return retval;
}
ECOS_THREAD_NAME_STR_SIZE,
(uint8_t *)&tmp_str);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Error reading thread name from eCos target\r\n");
+ LOG_ERROR("Error reading thread name from eCos target");
return retval;
}
tmp_str[ECOS_THREAD_NAME_STR_SIZE-1] = '\x00';
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 */
4,
(uint8_t *)&thread_status);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Error reading thread state from eCos target\r\n");
+ LOG_ERROR("Error reading thread state from eCos target");
return retval;
}
*/
}
- char *state_desc;
+ const char *state_desc;
if (i < ECOS_NUM_STATES)
state_desc = eCos_thread_states[i].desc;
else
state_desc = "Unknown state";
- rtos->thread_details[tasks_found].extra_info_str = (char *)malloc(strlen(
+ rtos->thread_details[tasks_found].extra_info_str = malloc(strlen(
state_desc)+1);
strcpy(rtos->thread_details[tasks_found].extra_info_str, state_desc);
param->pointer_width,
(uint8_t *) &thread_index);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Error reading next thread pointer in eCos thread list\r\n");
+ LOG_ERROR("Error reading next thread pointer in eCos thread list");
return retval;
}
} while (thread_index != first_thread);
2,
(uint8_t *)&id);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Error reading unique id from eCos thread\r\n");
+ LOG_ERROR("Error reading unique id from eCos thread");
return retval;
}
param->pointer_width,
(uint8_t *)&stack_ptr);
if (retval != ERROR_OK) {
- LOG_OUTPUT("Error reading stack frame from eCos thread\r\n");
+ LOG_ERROR("Error reading stack frame from eCos thread");
return retval;
}
static int eCos_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
{
unsigned int i;
- *symbol_list = (symbol_table_elem_t *) malloc(
- sizeof(symbol_table_elem_t) * ECOS_NUM_SYMBOLS);
+ *symbol_list = calloc(
+ ARRAY_SIZE(eCos_symbol_list), sizeof(symbol_table_elem_t));
- for (i = 0; i < ECOS_NUM_SYMBOLS; i++)
+ for (i = 0; i < ARRAY_SIZE(eCos_symbol_list); i++)
(*symbol_list)[i].symbol_name = eCos_symbol_list[i];
return 0;
i++;
}
if (i >= ECOS_NUM_PARAMS) {
- LOG_OUTPUT("Could not find target in eCos compatibility list\r\n");
+ LOG_ERROR("Could not find target in eCos compatibility list");
return -1;
}