interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtos/eCos: rename CamelCase symbols 

Convert CamelCase enum in uppercase and the other symbols in
lowercase.

Change-Id: I141c55bdfe6ef2a2da28d1da15a283a644ae7cb2
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6306
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2021-06-06 19:22:30 +02:00
parent a489058d7b
commit 920cacd74c
3 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/rtos/eCos.c
View File

@ -27,18 +27,18 @@
#include "helper/types.h" #include "helper/types.h"
#include "rtos_ecos_stackings.h" #include "rtos_ecos_stackings.h"
static bool eCos_detect_rtos(struct target *target); static bool ecos_detect_rtos(struct target *target);
static int eCos_create(struct target *target); static int ecos_create(struct target *target);
static int eCos_update_threads(struct rtos *rtos); 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_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[]); static int ecos_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]);
struct eCos_thread_state { struct ecos_thread_state {
int value; int value;
const char *desc; const char *desc;
}; };
static const struct eCos_thread_state eCos_thread_states[] = { static const struct ecos_thread_state ecos_thread_states[] = {
{ 0, "Ready" }, { 0, "Ready" },
{ 1, "Sleeping" }, { 1, "Sleeping" },
{ 2, "Countsleep" }, { 2, "Countsleep" },
@ -47,9 +47,9 @@ static const struct eCos_thread_state eCos_thread_states[] = {
{ 16, "Exited" } { 16, "Exited" }
}; };
#define ECOS_NUM_STATES ARRAY_SIZE(eCos_thread_states) #define ECOS_NUM_STATES ARRAY_SIZE(ecos_thread_states)
struct eCos_params { struct ecos_params {
const char *target_name; const char *target_name;
unsigned char pointer_width; unsigned char pointer_width;
unsigned char thread_stack_offset; unsigned char thread_stack_offset;
@ -60,7 +60,7 @@ struct eCos_params {
const struct rtos_register_stacking *stacking_info; const struct rtos_register_stacking *stacking_info;
}; };
static const struct eCos_params eCos_params_list[] = { static const struct ecos_params ecos_params_list[] = {
{ {
"cortex_m", /* target_name */ "cortex_m", /* target_name */
4, /* pointer_width; */ 4, /* pointer_width; */
@ -69,16 +69,16 @@ static const struct eCos_params eCos_params_list[] = {
0x3c, /* thread_state_offset; */ 0x3c, /* thread_state_offset; */
0xa0, /* thread_next_offset */ 0xa0, /* thread_next_offset */
0x4c, /* thread_uniqueid_offset */ 0x4c, /* thread_uniqueid_offset */
&rtos_eCos_Cortex_M3_stacking /* stacking_info */ &rtos_ecos_cortex_m3_stacking /* stacking_info */
} }
}; };
enum eCos_symbol_values { enum ecos_symbol_values {
eCos_VAL_thread_list = 0, ECOS_VAL_THREAD_LIST = 0,
eCos_VAL_current_thread_ptr = 1 ECOS_VAL_CURRENT_THREAD_PTR = 1
}; };
static const char * const eCos_symbol_list[] = { static const char * const ecos_symbol_list[] = {
"Cyg_Thread::thread_list", "Cyg_Thread::thread_list",
"Cyg_Scheduler_Base::current_thread", "Cyg_Scheduler_Base::current_thread",
NULL NULL
@ -87,20 +87,20 @@ static const char * const eCos_symbol_list[] = {
const struct rtos_type ecos_rtos = { const struct rtos_type ecos_rtos = {
.name = "eCos", .name = "eCos",
.detect_rtos = eCos_detect_rtos, .detect_rtos = ecos_detect_rtos,
.create = eCos_create, .create = ecos_create,
.update_threads = eCos_update_threads, .update_threads = ecos_update_threads,
.get_thread_reg_list = eCos_get_thread_reg_list, .get_thread_reg_list = ecos_get_thread_reg_list,
.get_symbol_list_to_lookup = eCos_get_symbol_list_to_lookup, .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 retval;
int tasks_found = 0; int tasks_found = 0;
int thread_list_size = 0; int thread_list_size = 0;
const struct eCos_params *param; const struct ecos_params *param;
if (rtos == NULL) if (rtos == NULL)
return -1; return -1;
@ -108,14 +108,14 @@ static int eCos_update_threads(struct rtos *rtos)
if (rtos->rtos_specific_params == NULL) if (rtos->rtos_specific_params == NULL)
return -3; 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 == NULL) {
LOG_ERROR("No symbols for eCos"); LOG_ERROR("No symbols for eCos");
return -4; 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"); LOG_ERROR("Don't have the thread list head");
return -2; return -2;
} }
@ -124,7 +124,7 @@ static int eCos_update_threads(struct rtos *rtos)
rtos_free_threadlist(rtos); rtos_free_threadlist(rtos);
/* determine the number of current threads */ /* 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; uint32_t thread_index;
target_read_buffer(rtos->target, target_read_buffer(rtos->target,
thread_list_head, thread_list_head,
@ -144,7 +144,7 @@ static int eCos_update_threads(struct rtos *rtos)
/* read the current thread id */ /* read the current thread id */
uint32_t current_thread_addr; uint32_t current_thread_addr;
retval = target_read_buffer(rtos->target, retval = target_read_buffer(rtos->target,
rtos->symbols[eCos_VAL_current_thread_ptr].address, rtos->symbols[ECOS_VAL_CURRENT_THREAD_PTR].address,
4, 4,
(uint8_t *)&current_thread_addr); (uint8_t *)&current_thread_addr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -246,7 +246,7 @@ static int eCos_update_threads(struct rtos *rtos)
return retval; 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 * empty
*/ */
@ -254,7 +254,7 @@ static int eCos_update_threads(struct rtos *rtos)
const char *state_desc; const char *state_desc;
if (i < ECOS_NUM_STATES) if (i < ECOS_NUM_STATES)
state_desc = eCos_thread_states[i].desc; state_desc = ecos_thread_states[i].desc;
else else
state_desc = "Unknown state"; state_desc = "Unknown state";
@ -268,7 +268,7 @@ static int eCos_update_threads(struct rtos *rtos)
prev_thread_ptr = thread_index; prev_thread_ptr = thread_index;
/* Get the location of the next thread structure. */ /* 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, retval = target_read_buffer(rtos->target,
prev_thread_ptr + param->thread_next_offset, prev_thread_ptr + param->thread_next_offset,
param->pointer_width, param->pointer_width,
@ -283,11 +283,11 @@ static int eCos_update_threads(struct rtos *rtos)
return 0; return 0;
} }
static int eCos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, static int ecos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
struct rtos_reg **reg_list, int *num_regs) struct rtos_reg **reg_list, int *num_regs)
{ {
int retval; int retval;
const struct eCos_params *param; const struct ecos_params *param;
if (rtos == NULL) if (rtos == NULL)
return -1; return -1;
@ -298,11 +298,11 @@ static int eCos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
if (rtos->rtos_specific_params == NULL) if (rtos->rtos_specific_params == NULL)
return -3; 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 */ /* Find the thread with that thread id */
uint16_t id = 0; 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; uint32_t thread_index;
target_read_buffer(rtos->target, thread_list_head, param->pointer_width, target_read_buffer(rtos->target, thread_list_head, param->pointer_width,
(uint8_t *)&thread_index); (uint8_t *)&thread_index);
@ -349,33 +349,33 @@ static int eCos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
return -1; return -1;
} }
static int eCos_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]) static int ecos_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[])
{ {
unsigned int i; unsigned int i;
*symbol_list = calloc( *symbol_list = calloc(
ARRAY_SIZE(eCos_symbol_list), sizeof(struct symbol_table_elem)); ARRAY_SIZE(ecos_symbol_list), sizeof(struct symbol_table_elem));
for (i = 0; i < ARRAY_SIZE(eCos_symbol_list); i++) for (i = 0; i < ARRAY_SIZE(ecos_symbol_list); i++)
(*symbol_list)[i].symbol_name = eCos_symbol_list[i]; (*symbol_list)[i].symbol_name = ecos_symbol_list[i];
return 0; return 0;
} }
static bool eCos_detect_rtos(struct target *target) static bool ecos_detect_rtos(struct target *target)
{ {
if ((target->rtos->symbols != NULL) && if ((target->rtos->symbols != NULL) &&
(target->rtos->symbols[eCos_VAL_thread_list].address != 0)) { (target->rtos->symbols[ECOS_VAL_THREAD_LIST].address != 0)) {
/* looks like eCos */ /* looks like eCos */
return true; return true;
} }
return false; return false;
} }
static int eCos_create(struct target *target) static int ecos_create(struct target *target)
{ {
for (unsigned int i = 0; i < ARRAY_SIZE(eCos_params_list); i++) for (unsigned int i = 0; i < ARRAY_SIZE(ecos_params_list); i++)
if (strcmp(eCos_params_list[i].target_name, target->type->name) == 0) { if (strcmp(ecos_params_list[i].target_name, target->type->name) == 0) {
target->rtos->rtos_specific_params = (void *)&eCos_params_list[i]; target->rtos->rtos_specific_params = (void *)&ecos_params_list[i];
target->rtos->current_thread = 0; target->rtos->current_thread = 0;
target->rtos->thread_details = NULL; target->rtos->thread_details = NULL;
return 0; return 0;

6
src/rtos/rtos_ecos_stackings.c
View File

@ -22,7 +22,7 @@
#include "rtos_standard_stackings.h" #include "rtos_standard_stackings.h"
#include "target/armv7m.h" #include "target/armv7m.h"
static const struct stack_register_offset rtos_eCos_Cortex_M3_stack_offsets[ARMV7M_NUM_CORE_REGS] = { static const struct stack_register_offset rtos_ecos_cortex_m3_stack_offsets[ARMV7M_NUM_CORE_REGS] = {
{ ARMV7M_R0, 0x0c, 32 }, /* r0 */ { ARMV7M_R0, 0x0c, 32 }, /* r0 */
{ ARMV7M_R1, 0x10, 32 }, /* r1 */ { ARMV7M_R1, 0x10, 32 }, /* r1 */
{ ARMV7M_R2, 0x14, 32 }, /* r2 */ { ARMV7M_R2, 0x14, 32 }, /* r2 */
@ -42,10 +42,10 @@ static const struct stack_register_offset rtos_eCos_Cortex_M3_stack_offsets[ARMV
{ ARMV7M_xPSR, -1, 32 }, /* xPSR */ { ARMV7M_xPSR, -1, 32 }, /* xPSR */
}; };
const struct rtos_register_stacking rtos_eCos_Cortex_M3_stacking = { const struct rtos_register_stacking rtos_ecos_cortex_m3_stacking = {
0x44, /* stack_registers_size */ 0x44, /* stack_registers_size */
-1, /* stack_growth_direction */ -1, /* stack_growth_direction */
ARMV7M_NUM_CORE_REGS, /* num_output_registers */ ARMV7M_NUM_CORE_REGS, /* num_output_registers */
rtos_generic_stack_align8, /* stack_alignment */ rtos_generic_stack_align8, /* stack_alignment */
rtos_eCos_Cortex_M3_stack_offsets /* register_offsets */ rtos_ecos_cortex_m3_stack_offsets /* register_offsets */
}; };

2
src/rtos/rtos_ecos_stackings.h
View File

@ -23,6 +23,6 @@
#include "rtos.h" #include "rtos.h"
extern const struct rtos_register_stacking rtos_eCos_Cortex_M3_stacking; extern const struct rtos_register_stacking rtos_ecos_cortex_m3_stacking;
#endif /* OPENOCD_RTOS_RTOS_ECOS_STACKINGS_H */ #endif /* OPENOCD_RTOS_RTOS_ECOS_STACKINGS_H */