diff options
Diffstat (limited to 'contrib/gdb/gdb/gdbserver/server.c')
| -rw-r--r-- | contrib/gdb/gdb/gdbserver/server.c | 160 |
1 files changed, 114 insertions, 46 deletions
diff --git a/contrib/gdb/gdb/gdbserver/server.c b/contrib/gdb/gdb/gdbserver/server.c index cdec0f8..adaabac 100644 --- a/contrib/gdb/gdb/gdbserver/server.c +++ b/contrib/gdb/gdb/gdbserver/server.c @@ -1,21 +1,23 @@ /* Main code for remote server for GDB. - Copyright (C) 1989, 1993 Free Software Foundation, Inc. + Copyright 1989, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2002 + Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "server.h" @@ -28,9 +30,7 @@ jmp_buf toplevel; int inferior_pid; static unsigned char -start_inferior (argv, statusptr) - char *argv[]; - char *statusptr; +start_inferior (char *argv[], char *statusptr) { inferior_pid = create_inferior (argv[0], argv); fprintf (stderr, "Process %s created; pid = %d\n", argv[0], inferior_pid); @@ -39,39 +39,89 @@ start_inferior (argv, statusptr) return mywait (statusptr); } +static int +attach_inferior (int pid, char *statusptr, unsigned char *sigptr) +{ + /* myattach should return -1 if attaching is unsupported, + 0 if it succeeded, and call error() otherwise. */ + if (myattach (pid) != 0) + return -1; + + inferior_pid = pid; + + *sigptr = mywait (statusptr); + + return 0; +} + extern int remote_debug; int -main (argc, argv) - int argc; - char *argv[]; +main (int argc, char *argv[]) { - char ch, status, own_buf[2000], mem_buf[2000]; + char ch, status, *own_buf, mem_buf[2000]; int i = 0; unsigned char signal; unsigned int len; CORE_ADDR mem_addr; + int bad_attach = 0; + int pid = 0; + int attached = 0; + char *arg_end; - if (setjmp(toplevel)) + if (setjmp (toplevel)) { - fprintf(stderr, "Exiting\n"); - exit(1); + fprintf (stderr, "Exiting\n"); + exit (1); } - if (argc < 3) - error("Usage: gdbserver tty prog [args ...]"); + if (argc >= 3 && strcmp (argv[2], "--attach") == 0) + { + if (argc == 4 + && argv[3] != '\0' + && (pid = strtoul (argv[3], &arg_end, 10)) != 0 + && *arg_end == '\0') + { + ; + } + else + bad_attach = 1; + } + + if (argc < 3 || bad_attach) + error ("Usage:\tgdbserver tty prog [args ...]\n" + "\tgdbserver tty --attach pid"); - /* Wait till we are at first instruction in program. */ - signal = start_inferior (&argv[2], &status); + initialize_low (); + + own_buf = malloc (PBUFSIZ); + + if (pid == 0) + { + /* Wait till we are at first instruction in program. */ + signal = start_inferior (&argv[2], &status); - /* We are now stopped at the first instruction of the target process */ + /* We are now stopped at the first instruction of the target process */ + } + else + { + switch (attach_inferior (pid, &status, &signal)) + { + case -1: + error ("Attaching not supported on this target"); + break; + default: + attached = 1; + break; + } + } while (1) { remote_open (argv[1]); -restart: - setjmp(toplevel); + restart: + setjmp (toplevel); while (getpkt (own_buf) > 0) { unsigned char sig; @@ -83,8 +133,18 @@ restart: remote_debug = !remote_debug; break; case '!': - extended_protocol = 1; - prepare_resume_reply (own_buf, status, signal); + if (attached == 0) + { + extended_protocol = 1; + prepare_resume_reply (own_buf, status, signal); + } + else + { + /* We can not use the extended protocol if we are + attached, because we can not restart the running + program. So return unrecognized. */ + own_buf[0] = '\0'; + } break; case '?': prepare_resume_reply (own_buf, status, signal); @@ -109,10 +169,10 @@ restart: } break; case 'g': - convert_int_to_ascii (registers, own_buf, REGISTER_BYTES); + registers_to_string (own_buf); break; case 'G': - convert_ascii_to_int (&own_buf[1], registers, REGISTER_BYTES); + registers_from_string (&own_buf[1]); store_inferior_registers (-1); write_ok (own_buf); break; @@ -130,13 +190,21 @@ restart: break; case 'C': convert_ascii_to_int (own_buf + 1, &sig, 1); - myresume (0, sig); + if (target_signal_to_host_p (sig)) + signal = target_signal_to_host (sig); + else + signal = 0; + myresume (0, signal); signal = mywait (&status); prepare_resume_reply (own_buf, status, signal); break; case 'S': convert_ascii_to_int (own_buf + 1, &sig, 1); - myresume (1, sig); + if (target_signal_to_host_p (sig)) + signal = target_signal_to_host (sig); + else + signal = 0; + myresume (1, signal); signal = mywait (&status); prepare_resume_reply (own_buf, status, signal); break; @@ -154,7 +222,7 @@ restart: fprintf (stderr, "Killing inferior\n"); kill_inferior (); /* When using the extended protocol, we start up a new - debugging session. The traditional protocol will + debugging session. The traditional protocol will exit instead. */ if (extended_protocol) { @@ -179,7 +247,7 @@ restart: break; case 'R': /* Restarting the inferior is only supported in the - extended protocol. */ + extended protocol. */ if (extended_protocol) { kill_inferior (); @@ -201,8 +269,8 @@ restart: } default: /* It is a request we don't understand. Respond with an - empty packet so that gdb knows that we don't support this - request. */ + empty packet so that gdb knows that we don't support this + request. */ own_buf[0] = '\0'; break; } @@ -238,11 +306,11 @@ restart: /* We come here when getpkt fails. - For the extended remote protocol we exit (and this is the only - way we gracefully exit!). + For the extended remote protocol we exit (and this is the only + way we gracefully exit!). - For the traditional remote protocol close the connection, - and re-open it at the top of the loop. */ + For the traditional remote protocol close the connection, + and re-open it at the top of the loop. */ if (extended_protocol) { remote_close (); @@ -250,8 +318,8 @@ restart: } else { - fprintf (stderr, "Remote side has terminated connection. GDBserver will reopen the connection.\n"); - + fprintf (stderr, "Remote side has terminated connection. " + "GDBserver will reopen the connection.\n"); remote_close (); } } |
