espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 13:56:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate require_running macros and move them up

Browse Source 
I find it very confusing to define the require_running in the middle of
the file, and re-define it to something else later in the middle of the
same file.  I think it would be better if those macros had different
names so that we know exactly what they do.

gdb/gdbserver/ChangeLog:

	* server.c (require_running): Rename to ...
	(require_running_or_return): ... this ...
	(require_running_or_break): ... and this.
	(handle_query, process_serial_event): Adjust.
This commit is contained in:
Simon Marchi
2017-09-15 17:59:36 +02:00
parent ef87240fd9
commit f8a4e11920
2 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,10 @@
2017-09-15 Simon Marchi <simon.marchi@ericsson.com>
* server.c (require_running): Rename to ...
(require_running_or_return): ... this ...
(require_running_or_break): ... and this.
(handle_query, process_serial_event): Adjust.
2017-09-15 Simon Marchi <simon.marchi@ericsson.com> 2017-09-15 Simon Marchi <simon.marchi@ericsson.com>
* linux-low.c (linux_set_resume_request): Remove unused * linux-low.c (linux_set_resume_request): Remove unused

70
gdb/gdbserver/server.c
View File

@ -42,6 +42,20 @@
#include "common/selftest.h" #include "common/selftest.h"
#define require_running_or_return(BUF) \
if (!target_running ()) \
{ \
write_enn (BUF); \
return; \
}
#define require_running_or_break(BUF) \
if (!target_running ()) \
{ \
write_enn (BUF); \
break; \
}
/* The environment to pass to the inferior when creating it. */ /* The environment to pass to the inferior when creating it. */
static gdb_environ our_environ; static gdb_environ our_environ;
@ -1143,13 +1157,6 @@ handle_search_memory (char *own_buf, int packet_len)
free (pattern); free (pattern);
} }
#define require_running(BUF) \
if (!target_running ()) \
{ \
write_enn (BUF); \
return; \
}
/* Parse options to --debug-format= and "monitor set debug-format". /* Parse options to --debug-format= and "monitor set debug-format".
ARG is the text after "--debug-format=" or "monitor set debug-format". ARG is the text after "--debug-format=" or "monitor set debug-format".
IS_MONITOR is non-zero if we're invoked via "monitor set debug-format". IS_MONITOR is non-zero if we're invoked via "monitor set debug-format".
@ -2071,7 +2078,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
if (strcmp ("qC", own_buf) == 0 && !disable_packet_qC) if (strcmp ("qC", own_buf) == 0 && !disable_packet_qC)
{ {
ptid_t gdb_id; ptid_t gdb_id;
require_running (own_buf); require_running_or_return (own_buf);
if (!ptid_equal (general_thread, null_ptid) if (!ptid_equal (general_thread, null_ptid)
&& !ptid_equal (general_thread, minus_one_ptid)) && !ptid_equal (general_thread, minus_one_ptid))
@ -2142,7 +2149,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
{ {
ptid_t gdb_id; ptid_t gdb_id;
require_running (own_buf); require_running_or_return (own_buf);
thread_ptr = get_first_inferior (&all_threads); thread_ptr = get_first_inferior (&all_threads);
*own_buf++ = 'm'; *own_buf++ = 'm';
@ -2156,7 +2163,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
{ {
ptid_t gdb_id; ptid_t gdb_id;
require_running (own_buf); require_running_or_return (own_buf);
if (thread_ptr != NULL) if (thread_ptr != NULL)
{ {
*own_buf++ = 'm'; *own_buf++ = 'm';
@ -2178,7 +2185,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
{ {
CORE_ADDR text, data; CORE_ADDR text, data;
require_running (own_buf); require_running_or_return (own_buf);
if (the_target->read_offsets (&text, &data)) if (the_target->read_offsets (&text, &data))
sprintf (own_buf, "Text=%lX;Data=%lX;Bss=%lX", sprintf (own_buf, "Text=%lX;Data=%lX;Bss=%lX",
(long)text, (long)data, (long)data); (long)text, (long)data, (long)data);
@ -2415,7 +2422,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
int i, err; int i, err;
ptid_t ptid = null_ptid; ptid_t ptid = null_ptid;
require_running (own_buf); require_running_or_return (own_buf);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@ -2528,7 +2535,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
if (startswith (own_buf, "qSearch:memory:")) if (startswith (own_buf, "qSearch:memory:"))
{ {
require_running (own_buf); require_running_or_return (own_buf);
handle_search_memory (own_buf, packet_len); handle_search_memory (own_buf, packet_len);
return; return;
} }
@ -2546,7 +2553,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
} }
else else
{ {
require_running (own_buf); require_running_or_return (own_buf);
process = current_process (); process = current_process ();
} }
@ -2568,7 +2575,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
int len; int len;
unsigned long long crc; unsigned long long crc;
require_running (own_buf); require_running_or_return (own_buf);
comma = unpack_varlen_hex (own_buf + 5, &base); comma = unpack_varlen_hex (own_buf + 5, &base);
if (*comma++ != ',') if (*comma++ != ',')
{ {
@ -3441,15 +3448,6 @@ gdbserver_show_disableable (FILE *stream)
" threads \tAll of the above\n"); " threads \tAll of the above\n");
} }
#undef require_running
#define require_running(BUF) \
if (!target_running ()) \
{ \
write_enn (BUF); \
break; \
}
static void static void
kill_inferior_callback (struct inferior_list_entry *entry) kill_inferior_callback (struct inferior_list_entry *entry)
{ {
@ -4039,7 +4037,7 @@ process_serial_event (void)
handle_general_set (own_buf); handle_general_set (own_buf);
break; break;
case 'D': case 'D':
require_running (own_buf); require_running_or_break (own_buf);
if (multi_process) if (multi_process)
{ {
@ -4138,7 +4136,7 @@ process_serial_event (void)
ptid_t gdb_id, thread_id; ptid_t gdb_id, thread_id;
int pid; int pid;
require_running (own_buf); require_running_or_break (own_buf);
gdb_id = read_ptid (&own_buf[2], NULL); gdb_id = read_ptid (&own_buf[2], NULL);
@ -4203,7 +4201,7 @@ process_serial_event (void)
} }
break; break;
case 'g': case 'g':
require_running (own_buf); require_running_or_break (own_buf);
if (current_traceframe >= 0) if (current_traceframe >= 0)
{ {
struct regcache *regcache struct regcache *regcache
@ -4230,7 +4228,7 @@ process_serial_event (void)
} }
break; break;
case 'G': case 'G':
require_running (own_buf); require_running_or_break (own_buf);
if (current_traceframe >= 0) if (current_traceframe >= 0)
write_enn (own_buf); write_enn (own_buf);
else else
@ -4248,7 +4246,7 @@ process_serial_event (void)
} }
break; break;
case 'm': case 'm':
require_running (own_buf); require_running_or_break (own_buf);
decode_m_packet (&own_buf[1], &mem_addr, &len); decode_m_packet (&own_buf[1], &mem_addr, &len);
res = gdb_read_memory (mem_addr, mem_buf, len); res = gdb_read_memory (mem_addr, mem_buf, len);
if (res < 0) if (res < 0)
@ -4257,7 +4255,7 @@ process_serial_event (void)
bin2hex (mem_buf, own_buf, res); bin2hex (mem_buf, own_buf, res);
break; break;
case 'M': case 'M':
require_running (own_buf); require_running_or_break (own_buf);
decode_M_packet (&own_buf[1], &mem_addr, &len, &mem_buf); decode_M_packet (&own_buf[1], &mem_addr, &len, &mem_buf);
if (gdb_write_memory (mem_addr, mem_buf, len) == 0) if (gdb_write_memory (mem_addr, mem_buf, len) == 0)
write_ok (own_buf); write_ok (own_buf);
@ -4265,7 +4263,7 @@ process_serial_event (void)
write_enn (own_buf); write_enn (own_buf);
break; break;
case 'X': case 'X':
require_running (own_buf); require_running_or_break (own_buf);
if (decode_X_packet (&own_buf[1], packet_len - 1, if (decode_X_packet (&own_buf[1], packet_len - 1,
&mem_addr, &len, &mem_buf) < 0 &mem_addr, &len, &mem_buf) < 0
|| gdb_write_memory (mem_addr, mem_buf, len) != 0) || gdb_write_memory (mem_addr, mem_buf, len) != 0)
@ -4274,7 +4272,7 @@ process_serial_event (void)
write_ok (own_buf); write_ok (own_buf);
break; break;
case 'C': case 'C':
require_running (own_buf); require_running_or_break (own_buf);
hex2bin (own_buf + 1, &sig, 1); hex2bin (own_buf + 1, &sig, 1);
if (gdb_signal_to_host_p ((enum gdb_signal) sig)) if (gdb_signal_to_host_p ((enum gdb_signal) sig))
signal = gdb_signal_to_host ((enum gdb_signal) sig); signal = gdb_signal_to_host ((enum gdb_signal) sig);
@ -4283,7 +4281,7 @@ process_serial_event (void)
myresume (own_buf, 0, signal); myresume (own_buf, 0, signal);
break; break;
case 'S': case 'S':
require_running (own_buf); require_running_or_break (own_buf);
hex2bin (own_buf + 1, &sig, 1); hex2bin (own_buf + 1, &sig, 1);
if (gdb_signal_to_host_p ((enum gdb_signal) sig)) if (gdb_signal_to_host_p ((enum gdb_signal) sig))
signal = gdb_signal_to_host ((enum gdb_signal) sig); signal = gdb_signal_to_host ((enum gdb_signal) sig);
@ -4292,12 +4290,12 @@ process_serial_event (void)
myresume (own_buf, 1, signal); myresume (own_buf, 1, signal);
break; break;
case 'c': case 'c':
require_running (own_buf); require_running_or_break (own_buf);
signal = 0; signal = 0;
myresume (own_buf, 0, signal); myresume (own_buf, 0, signal);
break; break;
case 's': case 's':
require_running (own_buf); require_running_or_break (own_buf);
signal = 0; signal = 0;
myresume (own_buf, 1, signal); myresume (own_buf, 1, signal);
break; break;
@ -4371,7 +4369,7 @@ process_serial_event (void)
{ {
ptid_t gdb_id, thread_id; ptid_t gdb_id, thread_id;
require_running (own_buf); require_running_or_break (own_buf);
gdb_id = read_ptid (&own_buf[1], NULL); gdb_id = read_ptid (&own_buf[1], NULL);
thread_id = gdb_id_to_thread_id (gdb_id); thread_id = gdb_id_to_thread_id (gdb_id);