rtos: Create a new helper function find_symbol(...)

This will be utilized for an upcoming refactorization to support -flto
compiled programs.

Signed-off-by: Tim Nordell <tnordell@airgain.com>
Change-Id: Id523c0b3ac2dad8b248ea0d2cac7b4dd2f83d293
Reviewed-on: https://review.openocd.org/c/openocd/+/7177
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Tim Nordell 2022-09-07 11:35:33 -05:00 committed by Antonio Borneo
parent 4279b23fca
commit 9f5a74c228
1 changed files with 18 additions and 13 deletions
src/rtos

View File

@ -170,35 +170,40 @@ 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 struct symbol_table_elem *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr) static struct symbol_table_elem *find_symbol(const struct rtos *os, const char *symbol)
{ {
struct symbol_table_elem *s; struct symbol_table_elem *s;
for (s = os->symbols; s->symbol_name; s++)
if (!strcmp(s->symbol_name, symbol))
return s;
return NULL;
}
static struct symbol_table_elem *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr)
{
if (!os->symbols) if (!os->symbols)
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]; return &os->symbols[0];
for (s = os->symbols; s->symbol_name; s++) struct symbol_table_elem *s = find_symbol(os, cur_symbol);
if (!strcmp(s->symbol_name, cur_symbol)) { if (!s)
return NULL;
s->address = cur_addr; s->address = cur_addr;
s++; s++;
return s; return s;
} }
return NULL;
}
/* searches for 'symbol' in the lookup table for 'os' and returns TRUE, /* searches for 'symbol' in the lookup table for 'os' and returns TRUE,
* if 'symbol' is not declared optional */ * if 'symbol' is not declared optional */
static bool is_symbol_mandatory(const struct rtos *os, const char *symbol) static bool is_symbol_mandatory(const struct rtos *os, const char *symbol)
{ {
for (struct symbol_table_elem *s = os->symbols; s->symbol_name; ++s) { struct symbol_table_elem *s = find_symbol(os, symbol);
if (!strcmp(s->symbol_name, symbol)) return s && !s->optional;
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.