zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtos: allow symbols to be optional for a particular RTOS 

Default to non-optional.

Change-Id: Ifc9ddb1ab701a19c3760f95da47da6f7d412ff2e
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2355
Tested-by: jenkins
Reviewed-by: Christian Gudrian <christian.gudrian@gmx.de>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
__archive__
Paul Fertser 2014-10-25 11:20:10 +04:00 committed by Spencer Oliver
parent 08607aefc0
commit 6d562283b5
8 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rtos/ChibiOS.c
View File

@ -497,8 +497,8 @@ static int ChibiOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, cha
static int ChibiOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]) static int ChibiOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
{ {
unsigned int i; unsigned int i;
*symbol_list = malloc( *symbol_list = calloc(
sizeof(symbol_table_elem_t) * ARRAY_SIZE(ChibiOS_symbol_list)); ARRAY_SIZE(ChibiOS_symbol_list), sizeof(symbol_table_elem_t));
for (i = 0; i < ARRAY_SIZE(ChibiOS_symbol_list); i++) for (i = 0; i < ARRAY_SIZE(ChibiOS_symbol_list); i++)
(*symbol_list)[i].symbol_name = ChibiOS_symbol_list[i]; (*symbol_list)[i].symbol_name = ChibiOS_symbol_list[i];

4
src/rtos/FreeRTOS.c
View File

@ -390,8 +390,8 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch
static int FreeRTOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]) static int FreeRTOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
{ {
unsigned int i; unsigned int i;
*symbol_list = malloc( *symbol_list = calloc(
sizeof(symbol_table_elem_t) * ARRAY_SIZE(FreeRTOS_symbol_list)); ARRAY_SIZE(FreeRTOS_symbol_list), sizeof(symbol_table_elem_t));
for (i = 0; i < ARRAY_SIZE(FreeRTOS_symbol_list); i++) for (i = 0; i < ARRAY_SIZE(FreeRTOS_symbol_list); i++)
(*symbol_list)[i].symbol_name = FreeRTOS_symbol_list[i]; (*symbol_list)[i].symbol_name = FreeRTOS_symbol_list[i];

4
src/rtos/ThreadX.c
View File

@ -330,8 +330,8 @@ static int ThreadX_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, cha
static int ThreadX_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]) static int ThreadX_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
{ {
unsigned int i; unsigned int i;
*symbol_list = malloc( *symbol_list = calloc(
sizeof(symbol_table_elem_t) * ARRAY_SIZE(ThreadX_symbol_list)); ARRAY_SIZE(ThreadX_symbol_list), sizeof(symbol_table_elem_t));
for (i = 0; i < ARRAY_SIZE(ThreadX_symbol_list); i++) for (i = 0; i < ARRAY_SIZE(ThreadX_symbol_list); i++)
(*symbol_list)[i].symbol_name = ThreadX_symbol_list[i]; (*symbol_list)[i].symbol_name = ThreadX_symbol_list[i];

4
src/rtos/eCos.c
View File

@ -359,8 +359,8 @@ static int eCos_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char *
static int eCos_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]) static int eCos_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
{ {
unsigned int i; unsigned int i;
*symbol_list = malloc( *symbol_list = calloc(
sizeof(symbol_table_elem_t) * ARRAY_SIZE(eCos_symbol_list)); ARRAY_SIZE(eCos_symbol_list), sizeof(symbol_table_elem_t));
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];

2
src/rtos/embKernel.c
View File

@ -335,7 +335,7 @@ static int embKernel_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, c
static int embKernel_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]) static int embKernel_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
{ {
unsigned int i; unsigned int i;
*symbol_list = malloc(sizeof(symbol_table_elem_t) * ARRAY_SIZE(embKernel_symbol_list)); *symbol_list = calloc(ARRAY_SIZE(embKernel_symbol_list), sizeof(symbol_table_elem_t));
for (i = 0; i < ARRAY_SIZE(embKernel_symbol_list); i++) for (i = 0; i < ARRAY_SIZE(embKernel_symbol_list); i++)
(*symbol_list)[i].symbol_name = embKernel_symbol_list[i]; (*symbol_list)[i].symbol_name = embKernel_symbol_list[i];

2
src/rtos/linux.c
View File

@ -329,7 +329,7 @@ static int linux_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
{ {
unsigned int i; unsigned int i;
*symbol_list = (symbol_table_elem_t *) *symbol_list = (symbol_table_elem_t *)
malloc(sizeof(symbol_table_elem_t) * ARRAY_SIZE(linux_symbol_list)); calloc(ARRAY_SIZE(linux_symbol_list), sizeof(symbol_table_elem_t));
for (i = 0; i < ARRAY_SIZE(linux_symbol_list); i++) for (i = 0; i < ARRAY_SIZE(linux_symbol_list); i++)
(*symbol_list)[i].symbol_name = linux_symbol_list[i]; (*symbol_list)[i].symbol_name = linux_symbol_list[i];

31
src/rtos/rtos.c
View File

@ -147,7 +147,7 @@ int gdb_thread_packet(struct connection *connection, char const *packet, int pac
return target->rtos->gdb_thread_packet(connection, packet, packet_size); return target->rtos->gdb_thread_packet(connection, packet, packet_size);
} }
static const char *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr) static symbol_table_elem_t *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr)
{ {
symbol_table_elem_t *s; symbol_table_elem_t *s;
@ -155,18 +155,29 @@ static const char *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_a
os->type->get_symbol_list_to_lookup(&os->symbols); os->type->get_symbol_list_to_lookup(&os->symbols);
if (!cur_symbol[0]) if (!cur_symbol[0])
return os->symbols[0].symbol_name; return &os->symbols[0];
for (s = os->symbols; s->symbol_name; s++) for (s = os->symbols; s->symbol_name; s++)
if (!strcmp(s->symbol_name, cur_symbol)) { if (!strcmp(s->symbol_name, cur_symbol)) {
s->address = cur_addr; s->address = cur_addr;
s++; s++;
return s->symbol_name; return s;
} }
return NULL; return NULL;
} }
/* searches for 'symbol' in the lookup table for 'os' and returns TRUE,
* if 'symbol' is not declared optional */
static bool is_symbol_mandatory(const struct rtos *os, const char *symbol)
{
for (symbol_table_elem_t *s = os->symbols; s->symbol_name; ++s) {
if (!strcmp(s->symbol_name, symbol))
return !s->optional;
}
return false;
}
/* rtos_qsymbol() processes and replies to all qSymbol packets from GDB. /* rtos_qsymbol() processes and replies to all qSymbol packets from GDB.
* *
* GDB sends a qSymbol:: packet (empty address, empty name) to notify * GDB sends a qSymbol:: packet (empty address, empty name) to notify
@ -192,7 +203,7 @@ int rtos_qsymbol(struct connection *connection, char const *packet, int packet_s
uint64_t addr = 0; uint64_t addr = 0;
size_t reply_len; size_t reply_len;
char reply[GDB_BUFFER_SIZE], cur_sym[GDB_BUFFER_SIZE / 2] = ""; char reply[GDB_BUFFER_SIZE], cur_sym[GDB_BUFFER_SIZE / 2] = "";
const char *next_sym; symbol_table_elem_t *next_sym = NULL;
struct target *target = get_target_from_connection(connection); struct target *target = get_target_from_connection(connection);
struct rtos *os = target->rtos; struct rtos *os = target->rtos;
@ -206,7 +217,9 @@ int rtos_qsymbol(struct connection *connection, char const *packet, int packet_s
cur_sym[len] = 0; cur_sym[len] = 0;
if ((strcmp(packet, "qSymbol::") != 0) && /* GDB is not offering symbol lookup for the first time */ if ((strcmp(packet, "qSymbol::") != 0) && /* GDB is not offering symbol lookup for the first time */
(!sscanf(packet, "qSymbol:%" SCNx64 ":", &addr))) { /* GDB did not found an address for a symbol */ (!sscanf(packet, "qSymbol:%" SCNx64 ":", &addr)) && /* GDB did not find an address for a symbol */
is_symbol_mandatory(os, cur_sym)) { /* the symbol is mandatory for this RTOS */
/* GDB could not find an address for the previous symbol */ /* GDB could not find an address for the previous symbol */
if (!target->rtos_auto_detect) { if (!target->rtos_auto_detect) {
LOG_WARNING("RTOS %s not detected. (GDB could not find symbol \'%s\')", os->type->name, cur_sym); LOG_WARNING("RTOS %s not detected. (GDB could not find symbol \'%s\')", os->type->name, cur_sym);
@ -224,7 +237,7 @@ int rtos_qsymbol(struct connection *connection, char const *packet, int packet_s
} }
next_sym = next_symbol(os, cur_sym, addr); next_sym = next_symbol(os, cur_sym, addr);
if (!next_sym) { if (!next_sym->symbol_name) {
/* No more symbols need looking up */ /* No more symbols need looking up */
if (!target->rtos_auto_detect) { if (!target->rtos_auto_detect) {
@ -242,13 +255,13 @@ int rtos_qsymbol(struct connection *connection, char const *packet, int packet_s
} }
} }
if (8 + (strlen(next_sym) * 2) + 1 > sizeof(reply)) { if (8 + (strlen(next_sym->symbol_name) * 2) + 1 > sizeof(reply)) {
LOG_ERROR("ERROR: RTOS symbol '%s' name is too long for GDB!", next_sym); LOG_ERROR("ERROR: RTOS symbol '%s' name is too long for GDB!", next_sym->symbol_name);
goto done; goto done;
} }
reply_len = snprintf(reply, sizeof(reply), "qSymbol:"); reply_len = snprintf(reply, sizeof(reply), "qSymbol:");
reply_len += hexify(reply + reply_len, next_sym, 0, sizeof(reply) - reply_len); reply_len += hexify(reply + reply_len, next_sym->symbol_name, 0, sizeof(reply) - reply_len);
done: done:
gdb_put_packet(connection, reply, reply_len); gdb_put_packet(connection, reply, reply_len);

2
src/rtos/rtos.h
View File

@ -35,7 +35,7 @@ struct reg;
typedef struct symbol_table_elem_struct { typedef struct symbol_table_elem_struct {
const char *symbol_name; const char *symbol_name;
symbol_address_t address; symbol_address_t address;
bool optional;
} symbol_table_elem_t; } symbol_table_elem_t;
struct thread_detail { struct thread_detail {