interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb: fix multi core gdb issue 

gdb_memory_map() correctly calculates the target specific number of flash banks, but then uses the total number (all targets) instead of the target specific number to construct its GDB response, causing a crash.

Change-Id: I3f8639b3e90303a59753ebe140ce4fff96fd5db0
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/199
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Philip Nye 2011-11-14 19:44:32 +00:00 committed by Andreas Fritiofson
parent 6eb18b307a
commit 950f240519
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/gdb_server.c
View File

@ -1741,7 +1741,7 @@ static int gdb_memory_map(struct connection *connection,
qsort(banks, target_flash_banks, sizeof(struct flash_bank *), qsort(banks, target_flash_banks, sizeof(struct flash_bank *),
compare_bank); compare_bank);
for (i = 0; i < flash_get_bank_count(); i++) { for (i = 0; i < target_flash_banks; i++) {
int j; int j;
unsigned sector_size = 0; unsigned sector_size = 0;
uint32_t start; uint32_t start;
@ -2451,7 +2451,7 @@ static int gdb_target_start(struct target *target, const char *port)
{ {
curr = head->target; curr = head->target;
if (curr != target) curr->gdb_service = gdb_service; if (curr != target) curr->gdb_service = gdb_service;
head = head->next; head = head->next;
} }
} }
return ret; return ret;
@ -2462,7 +2462,7 @@ static int gdb_target_add_one(struct target *target)
/* one gdb instance per smp list */ /* one gdb instance per smp list */
if ((target->smp) && (target->gdb_service)) return ERROR_OK; if ((target->smp) && (target->gdb_service)) return ERROR_OK;
int retval = gdb_target_start(target, gdb_port_next); int retval = gdb_target_start(target, gdb_port_next);
if (retval == ERROR_OK) if (retval == ERROR_OK)
{ {
long portnumber; long portnumber;
/* If we can parse the port number /* If we can parse the port number