diff options
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/gdbserver/remote-utils.c | 45 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 4 | ||||
| -rw-r--r-- | gdb/gdbserver/server.h | 4 |
4 files changed, 45 insertions, 18 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 6c6784f..afc4bfc 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,13 @@ +2016-03-30 Marcin Kościelnicki <koriakin@0x04.net> + + * remote-utils.c (look_up_one_symbol): Remove own_buf, handle 'v' + packets. + (relocate_instruction): Remove own_buf. + * server.c (own_buf): Make global. + (handle_v_requests): Make global. + * server.h (own_buf): New declaration. + (handle_v_requests): New prototype. + 2016-03-29 Marcin Kościelnicki <koriakin@0x04.net> PR 18377 diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index e751473..768d2e9 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -1462,7 +1462,7 @@ clear_symbol_cache (struct sym_cache **symcache_p) int look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb) { - char own_buf[266], *p, *q; + char *p, *q; int len; struct sym_cache *sym; struct process_info *proc; @@ -1497,23 +1497,37 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb) /* We ought to handle pretty much any packet at this point while we wait for the qSymbol "response". That requires re-entering the main loop. For now, this is an adequate approximation; allow - GDB to read from memory while it figures out the address of the - symbol. */ - while (own_buf[0] == 'm') + GDB to read from memory and handle 'v' packets (for vFile transfers) + while it figures out the address of the symbol. */ + while (1) { - CORE_ADDR mem_addr; - unsigned char *mem_buf; - unsigned int mem_len; + if (own_buf[0] == 'm') + { + CORE_ADDR mem_addr; + unsigned char *mem_buf; + unsigned int mem_len; - decode_m_packet (&own_buf[1], &mem_addr, &mem_len); - mem_buf = (unsigned char *) xmalloc (mem_len); - if (read_inferior_memory (mem_addr, mem_buf, mem_len) == 0) - bin2hex (mem_buf, own_buf, mem_len); + decode_m_packet (&own_buf[1], &mem_addr, &mem_len); + mem_buf = (unsigned char *) xmalloc (mem_len); + if (read_inferior_memory (mem_addr, mem_buf, mem_len) == 0) + bin2hex (mem_buf, own_buf, mem_len); + else + write_enn (own_buf); + free (mem_buf); + if (putpkt (own_buf) < 0) + return -1; + } + else if (own_buf[0] == 'v') + { + int new_len = -1; + handle_v_requests (own_buf, len, &new_len); + if (new_len != -1) + putpkt_binary (own_buf, new_len); + else + putpkt (own_buf); + } else - write_enn (own_buf); - free (mem_buf); - if (putpkt (own_buf) < 0) - return -1; + break; len = getpkt (own_buf); if (len < 0) return -1; @@ -1561,7 +1575,6 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb) int relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc) { - char own_buf[266]; int len; ULONGEST written = 0; diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index ef715e7..9c50929 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -119,7 +119,7 @@ int disable_packet_qfThreadInfo; static struct target_waitstatus last_status; static ptid_t last_ptid; -static char *own_buf; +char *own_buf; static unsigned char *mem_buf; /* A sub-class of 'struct notif_event' for stop, holding information @@ -2935,7 +2935,7 @@ handle_v_kill (char *own_buf) } /* Handle all of the extended 'v' packets. */ -static void +void handle_v_requests (char *own_buf, int packet_len, int *new_packet_len) { if (!disable_packet_vCont) diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 3d78fb3..51b2191 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -82,6 +82,8 @@ extern int disable_packet_Tthread; extern int disable_packet_qC; extern int disable_packet_qfThreadInfo; +extern char *own_buf; + extern int run_once; extern int multi_process; extern int report_fork_events; @@ -113,6 +115,8 @@ typedef int gdb_fildes_t; #include "event-loop.h" /* Functions from server.c. */ +extern void handle_v_requests (char *own_buf, int packet_len, + int *new_packet_len); extern int handle_serial_event (int err, gdb_client_data client_data); extern int handle_target_event (int err, gdb_client_data client_data); |