/* Remote utility routines for the remote server for GDB.
Copyright 1986, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004
+ 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GDB.
#include <unistd.h>
#include <arpa/inet.h>
+#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
+/* A cache entry for a successfully looked-up symbol. */
+struct sym_cache
+{
+ const char *name;
+ CORE_ADDR addr;
+ struct sym_cache *next;
+};
+
+/* The symbol cache. */
+static struct sym_cache *symbol_cache;
+
int remote_debug = 0;
struct ui_file *gdb_stdlog;
char *port_str;
int port;
struct sockaddr_in sockaddr;
- int tmp;
+ socklen_t tmp;
int tmp_desc;
port_str = strchr (name, ':');
if (select (remote_desc + 1, &readset, 0, 0, &immediate) > 0)
{
int cc;
- char c;
+ char c = 0;
cc = read (remote_desc, &c, 1);
if (cc != 1 || c != '\003')
{
- fprintf (stderr, "input_interrupt, cc = %d c = %d\n", cc, c);
+ fprintf (stderr, "input_interrupt, count = %d c = %d ('%c')\n",
+ cc, c, c);
return;
}
}
}
+void
+block_async_io (void)
+{
+ sigset_t sigio_set;
+ sigemptyset (&sigio_set);
+ sigaddset (&sigio_set, SIGIO);
+ sigprocmask (SIG_BLOCK, &sigio_set, NULL);
+}
+
+void
+unblock_async_io (void)
+{
+ sigset_t sigio_set;
+ sigemptyset (&sigio_set);
+ sigaddset (&sigio_set, SIGIO);
+ sigprocmask (SIG_UNBLOCK, &sigio_set, NULL);
+}
+
+/* Asynchronous I/O support. SIGIO must be enabled when waiting, in order to
+ accept Control-C from the client, and must be disabled when talking to
+ the client. */
+
+/* Current state of asynchronous I/O. */
+static int async_io_enabled;
+
+/* Enable asynchronous I/O. */
void
enable_async_io (void)
{
+ if (async_io_enabled)
+ return;
+
signal (SIGIO, input_interrupt);
+ async_io_enabled = 1;
}
+/* Disable asynchronous I/O. */
void
disable_async_io (void)
{
+ if (!async_io_enabled)
+ return;
+
signal (SIGIO, SIG_IGN);
+ async_io_enabled = 0;
}
/* Returns next char from remote GDB. -1 if error. */
}
void
-convert_int_to_ascii (char *from, char *to, int n)
+convert_int_to_ascii (unsigned char *from, char *to, int n)
{
int nib;
- char ch;
+ int ch;
while (n--)
{
ch = *from++;
void
-convert_ascii_to_int (char *from, char *to, int n)
+convert_ascii_to_int (char *from, unsigned char *to, int n)
{
int nib1, nib2;
while (n--)
if (status == 'T')
{
const char **regp = gdbserver_expedite_regs;
+
+ if (the_target->stopped_by_watchpoint != NULL
+ && (*the_target->stopped_by_watchpoint) ())
+ {
+ CORE_ADDR addr;
+ int i;
+
+ strncpy (buf, "watch:", 6);
+ buf += 6;
+
+ addr = (*the_target->stopped_data_address) ();
+
+ /* Convert each byte of the address into two hexadecimal chars.
+ Note that we take sizeof (void *) instead of sizeof (addr);
+ this is to avoid sending a 64-bit address to a 32-bit GDB. */
+ for (i = sizeof (void *) * 2; i > 0; i--)
+ {
+ *buf++ = tohex ((addr >> (i - 1) * 4) & 0xf);
+ }
+ *buf++ = ';';
+ }
+
while (*regp)
{
buf = outreg (find_regno (*regp), buf);
/* FIXME right place to set this? */
thread_from_wait = ((struct inferior_list_entry *)current_inferior)->id;
if (debug_threads)
- fprintf (stderr, "Writing resume reply for %d\n\n", thread_from_wait);
- if (old_thread_from_wait != thread_from_wait)
+ fprintf (stderr, "Writing resume reply for %ld\n\n", thread_from_wait);
+ /* This if (1) ought to be unnecessary. But remote_wait in GDB
+ will claim this event belongs to inferior_ptid if we do not
+ specify a thread, and there's no way for gdbserver to know
+ what inferior_ptid is. */
+ if (1 || old_thread_from_wait != thread_from_wait)
{
general_thread = thread_from_wait;
- sprintf (buf, "thread:%x;", thread_from_wait);
+ sprintf (buf, "thread:%lx;", thread_from_wait);
buf += strlen (buf);
old_thread_from_wait = thread_from_wait;
}
void
decode_M_packet (char *from, CORE_ADDR *mem_addr_ptr, unsigned int *len_ptr,
- char *to)
+ unsigned char *to)
{
int i = 0;
char ch;
convert_ascii_to_int (&from[i++], to, *len_ptr);
}
+/* Ask GDB for the address of NAME, and return it in ADDRP if found.
+ Returns 1 if the symbol is found, 0 if it is not, -1 on error. */
+
int
look_up_one_symbol (const char *name, CORE_ADDR *addrp)
{
char own_buf[266], *p, *q;
int len;
+ struct sym_cache *sym;
+
+ /* Check the cache first. */
+ for (sym = symbol_cache; sym; sym = sym->next)
+ if (strcmp (name, sym->name) == 0)
+ {
+ *addrp = sym->addr;
+ return 1;
+ }
/* Send the request. */
strcpy (own_buf, "qSymbol:");
return 0;
decode_address (addrp, p, q - p);
+
+ /* Save the symbol in our cache. */
+ sym = malloc (sizeof (*sym));
+ sym->name = strdup (name);
+ sym->addr = *addrp;
+ sym->next = symbol_cache;
+ symbol_cache = sym;
+
return 1;
}
-
projects / deliverable / binutils-gdb.git / blobdiff