diff options
| author | Philip Nye <philipnye@users.sf.net> | 2011-11-14 19:44:32 +0000 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2011-11-17 23:01:30 +0000 |
| commit | 950f2405197661974225a578630e44667639ccb6 (patch) | |
| tree | c3fdff239d52cb1735f7182b0e624283f4d722c3 /src | |
| parent | 6eb18b307a6c7cf01e21bd637beeab5211dafa53 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/gdb_server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 7c55e7cd..cbc2b401 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -1741,7 +1741,7 @@ static int gdb_memory_map(struct connection *connection, qsort(banks, target_flash_banks, sizeof(struct flash_bank *), compare_bank); - for (i = 0; i < flash_get_bank_count(); i++) { + for (i = 0; i < target_flash_banks; i++) { int j; unsigned sector_size = 0; uint32_t start; @@ -2451,7 +2451,7 @@ static int gdb_target_start(struct target *target, const char *port) { curr = head->target; if (curr != target) curr->gdb_service = gdb_service; - head = head->next; + head = head->next; } } return ret; @@ -2462,7 +2462,7 @@ static int gdb_target_add_one(struct target *target) /* one gdb instance per smp list */ if ((target->smp) && (target->gdb_service)) return ERROR_OK; int retval = gdb_target_start(target, gdb_port_next); - if (retval == ERROR_OK) + if (retval == ERROR_OK) { long portnumber; /* If we can parse the port number |