diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/remote-vx.c | 13 | ||||
| -rw-r--r-- | gdb/remote.c | 116 |
3 files changed, 12 insertions, 127 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 839537d..44005fa 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2004-05-09 Andrew Cagney <cagney@redhat.com> + + * remote-vx.c (net_step): Delete step-range code. + * remote.c (remote_resume, init_all_packet_configs) + (set_remote_protocol_E_packet_cmd) + (show_remote_protocol_E_packet_cmd) + (remote_protocol_E, show_remote_cmd, _initialize_remote) + (remote_protocol_e, set_remote_protocol_e_packet_cmd) + (show_remote_protocol_e_packet_cmd): Ditto. + 2004-05-09 Mark Kettenis <kettenis@gnu.org> * hppa-tdep.h (enum hppa_regnum): Name enum, add HPPA_R1_REGNUM. diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c index fd51781..2622cce 100644 --- a/gdb/remote-vx.c +++ b/gdb/remote-vx.c @@ -747,17 +747,8 @@ net_step (void) SOURCE_STEP source_step; source_step.taskId = PIDGET (inferior_ptid); - - if (step_range_end) - { - source_step.startAddr = step_range_start; - source_step.endAddr = step_range_end; - } - else - { - source_step.startAddr = 0; - source_step.endAddr = 0; - } + source_step.startAddr = 0; + source_step.endAddr = 0; status = net_clnt_call (VX_SOURCE_STEP, xdr_SOURCE_STEP, &source_step, xdr_int, &step_status); diff --git a/gdb/remote.c b/gdb/remote.c index 384f011..e0c9cde 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -774,42 +774,6 @@ show_remote_protocol_qSymbol_packet_cmd (char *args, int from_tty, show_packet_config_cmd (&remote_protocol_qSymbol); } -/* Should we try the 'e' (step over range) request? */ -static struct packet_config remote_protocol_e; - -static void -set_remote_protocol_e_packet_cmd (char *args, int from_tty, - struct cmd_list_element *c) -{ - update_packet_config (&remote_protocol_e); -} - -static void -show_remote_protocol_e_packet_cmd (char *args, int from_tty, - struct cmd_list_element *c) -{ - show_packet_config_cmd (&remote_protocol_e); -} - - -/* Should we try the 'E' (step over range / w signal #) request? */ -static struct packet_config remote_protocol_E; - -static void -set_remote_protocol_E_packet_cmd (char *args, int from_tty, - struct cmd_list_element *c) -{ - update_packet_config (&remote_protocol_E); -} - -static void -show_remote_protocol_E_packet_cmd (char *args, int from_tty, - struct cmd_list_element *c) -{ - show_packet_config_cmd (&remote_protocol_E); -} - - /* Should we try the 'P' (set register) request? */ static struct packet_config remote_protocol_P; @@ -2077,8 +2041,6 @@ static void init_all_packet_configs (void) { int i; - update_packet_config (&remote_protocol_e); - update_packet_config (&remote_protocol_E); update_packet_config (&remote_protocol_P); update_packet_config (&remote_protocol_qSymbol); update_packet_config (&remote_protocol_vcont); @@ -2565,60 +2527,6 @@ remote_resume (ptid_t ptid, int step, enum target_signal siggnal) else set_thread (pid, 0); /* run this thread */ - /* The s/S/c/C packets do not return status. So if the target does - not support the S or C packets, the debug agent returns an empty - string which is detected in remote_wait(). This protocol defect - is fixed in the e/E packets. */ - - if (step && step_range_end) - { - /* If the target does not support the 'E' packet, we try the 'S' - packet. Ideally we would fall back to the 'e' packet if that - too is not supported. But that would require another copy of - the code to issue the 'e' packet (and fall back to 's' if not - supported) in remote_wait(). */ - - if (siggnal != TARGET_SIGNAL_0) - { - if (remote_protocol_E.support != PACKET_DISABLE) - { - p = buf; - *p++ = 'E'; - *p++ = tohex (((int) siggnal >> 4) & 0xf); - *p++ = tohex (((int) siggnal) & 0xf); - *p++ = ','; - p += hexnumstr (p, (ULONGEST) step_range_start); - *p++ = ','; - p += hexnumstr (p, (ULONGEST) step_range_end); - *p++ = 0; - - putpkt (buf); - getpkt (buf, (rs->remote_packet_size), 0); - - if (packet_ok (buf, &remote_protocol_E) == PACKET_OK) - return; - } - } - else - { - if (remote_protocol_e.support != PACKET_DISABLE) - { - p = buf; - *p++ = 'e'; - p += hexnumstr (p, (ULONGEST) step_range_start); - *p++ = ','; - p += hexnumstr (p, (ULONGEST) step_range_end); - *p++ = 0; - - putpkt (buf); - getpkt (buf, (rs->remote_packet_size), 0); - - if (packet_ok (buf, &remote_protocol_e) == PACKET_OK) - return; - } - } - } - if (siggnal != TARGET_SIGNAL_0) { buf[0] = step ? 'S' : 'C'; @@ -5422,8 +5330,6 @@ show_remote_cmd (char *args, int from_tty) /* FIXME: cagney/2002-06-15: This function should iterate over remote_show_cmdlist for a list of sub commands to show. */ show_remote_protocol_Z_packet_cmd (args, from_tty, NULL); - show_remote_protocol_e_packet_cmd (args, from_tty, NULL); - show_remote_protocol_E_packet_cmd (args, from_tty, NULL); show_remote_protocol_P_packet_cmd (args, from_tty, NULL); show_remote_protocol_qSymbol_packet_cmd (args, from_tty, NULL); show_remote_protocol_vcont_packet_cmd (args, from_tty, NULL); @@ -5608,28 +5514,6 @@ in a memory packet.\n", &remote_set_cmdlist, &remote_show_cmdlist, 0); - add_packet_config_cmd (&remote_protocol_e, - "e", "step-over-range", - set_remote_protocol_e_packet_cmd, - show_remote_protocol_e_packet_cmd, - &remote_set_cmdlist, &remote_show_cmdlist, - 0); - /* Disable by default. The ``e'' packet has nasty interactions with - the threading code - it relies on global state. */ - remote_protocol_e.detect = AUTO_BOOLEAN_FALSE; - update_packet_config (&remote_protocol_e); - - add_packet_config_cmd (&remote_protocol_E, - "E", "step-over-range-w-signal", - set_remote_protocol_E_packet_cmd, - show_remote_protocol_E_packet_cmd, - &remote_set_cmdlist, &remote_show_cmdlist, - 0); - /* Disable by default. The ``e'' packet has nasty interactions with - the threading code - it relies on global state. */ - remote_protocol_E.detect = AUTO_BOOLEAN_FALSE; - update_packet_config (&remote_protocol_E); - add_packet_config_cmd (&remote_protocol_P, "P", "set-register", set_remote_protocol_P_packet_cmd, |