/* Remote debugging interface for Hitachi HMS Monitor Version 1.0
- Copyright 1992 Free Software Foundation, Inc.
+ Copyright 1995 Free Software Foundation, Inc.
Contributed by Cygnus Support. Written by Steve Chamberlain
(sac@cygnus.com).
-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., 675 Mass Ave, Cambridge, MA 02139, 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 "defs.h"
-#include "inferior.h"
-#include "wait.h"
-#include "value.h"
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <errno.h>
-#include "terminal.h"
-#include "target.h"
#include "gdbcore.h"
+#include "target.h"
+#include "monitor.h"
#include "serial.h"
-/* External data declarations */
-extern int stop_soon_quietly; /* for wait_for_inferior */
-
-/* Forward data declarations */
-extern struct target_ops hms_ops; /* Forward declaration */
-
-/* Forward function declarations */
-static void hms_fetch_registers ();
-static int hms_store_registers ();
-static void hms_close ();
-static int hms_clear_breakpoints ();
-
-extern struct target_ops hms_ops;
-
-static int quiet = 1;
-
-
-serial_t desc;
+static void hms_open PARAMS ((char *args, int from_tty));
-/***********************************************************************/
-/* Caching stuff stolen from remote-nindy.c */
-
-/* The data cache records all the data read from the remote machine
- since the last time it stopped.
+static void
+hms_supply_register (regname, regnamelen, val, vallen)
+ char *regname;
+ int regnamelen;
+ char *val;
+ int vallen;
+{
+ int regno;
- Each cache block holds LINE_SIZE bytes of data
- starting at a multiple-of-LINE_SIZE address. */
+ if (regnamelen != 2)
+ return;
+ if (regname[0] != 'P')
+ return;
+ /* We scan off all the registers in one go */
-#define LINE_SIZE_POWER 4
-#define LINE_SIZE (1<<LINE_SIZE_POWER) /* eg 1<<3 == 8 */
-#define LINE_SIZE_MASK ((LINE_SIZE-1)) /* eg 7*2+1= 111*/
-#define DCACHE_SIZE 64 /* Number of cache blocks */
-#define XFORM(x) ((x&LINE_SIZE_MASK)>>2)
-struct dcache_block
- {
- struct dcache_block *next, *last;
- unsigned int addr; /* Address for which data is recorded. */
- int data[LINE_SIZE / sizeof (int)];
- };
+ val = monitor_supply_register (PC_REGNUM, val);
+ /* Skip the ccr string */
+ while (*val != '=' && *val)
+ val++;
-struct dcache_block dcache_free, dcache_valid;
+ val = monitor_supply_register (CCR_REGNUM, val + 1);
-/* Free all the data cache blocks, thus discarding all cached data. */
-static
-void
-dcache_flush ()
-{
- register struct dcache_block *db;
+ /* Skip up to rest of regs */
+ while (*val != '=' && *val)
+ val++;
- while ((db = dcache_valid.next) != &dcache_valid)
+ for (regno = 0; regno < 7; regno++)
{
- remque (db);
- insque (db, &dcache_free);
+ val = monitor_supply_register (regno, val + 1);
}
}
/*
- * If addr is present in the dcache, return the address of the block
- * containing it.
+ * This array of registers needs to match the indexes used by GDB. The
+ * whole reason this exists is because the various ROM monitors use
+ * different names than GDB does, and don't support all the
+ * registers either. So, typing "info reg sp" becomes a "r30".
*/
-static
-struct dcache_block *
-dcache_hit (addr)
- unsigned int addr;
+
+static char *hms_regnames[NUM_REGS] =
{
- register struct dcache_block *db;
+ "R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7", "CCR", "PC"
+};
- if (addr & 3)
- abort ();
+/*
+ * Define the monitor command strings. Since these are passed directly
+ * through to a printf style function, we need can include formatting
+ * strings. We also need a CR or LF on the end.
+ */
- /* Search all cache blocks for one that is at this address. */
- db = dcache_valid.next;
- while (db != &dcache_valid)
- {
- if ((addr & ~LINE_SIZE_MASK) == db->addr)
- return db;
- db = db->next;
- }
- return NULL;
-}
+static struct target_ops hms_ops;
-/* Return the int data at address ADDR in dcache block DC. */
-static
-int
-dcache_value (db, addr)
- struct dcache_block *db;
- unsigned int addr;
+static char *hms_inits[] =
+{"\003", /* Resets the prompt, and clears repeated cmds */
+ NULL};
+
+static struct monitor_ops hms_cmds =
{
- if (addr & 3)
- abort ();
- return (db->data[XFORM (addr)]);
-}
+ MO_CLR_BREAK_USES_ADDR | MO_FILL_USES_ADDR | MO_GETMEM_NEEDS_RANGE,
+ hms_inits, /* Init strings */
+ "g\r", /* continue command */
+ "s\r", /* single step */
+ "\003", /* ^C interrupts the program */
+ "b %x\r", /* set a breakpoint */
+ "b - %x\r", /* clear a breakpoint */
+ "b -\r", /* clear all breakpoints */
+ "f %x %x %x\r", /* fill (start end val) */
+ {
+ "m.b %x=%x\r", /* setmem.cmdb (addr, value) */
+ "m.w %x=%x\r", /* setmem.cmdw (addr, value) */
+ NULL, /* setmem.cmdl (addr, value) */
+ NULL, /* setmem.cmdll (addr, value) */
+ NULL, /* setreg.resp_delim */
+ NULL, /* setreg.term */
+ NULL, /* setreg.term_cmd */
+ },
+ {
+ "m.b %x %x\r", /* getmem.cmdb (addr, addr) */
+ "m.w %x %x\r", /* getmem.cmdw (addr, addr) */
+ NULL, /* getmem.cmdl (addr, addr) */
+ NULL, /* getmem.cmdll (addr, addr) */
+ ": ", /* getmem.resp_delim */
+ ">", /* getmem.term */
+ "\003", /* getmem.term_cmd */
+ },
+ {
+ "r %s=%x\r", /* setreg.cmd (name, value) */
+ NULL, /* setreg.resp_delim */
+ NULL, /* setreg.term */
+ NULL /* setreg.term_cmd */
+ },
+ {
+ "r %s\r", /* getreg.cmd (name) */
+ " (", /* getreg.resp_delim */
+ ":", /* getreg.term */
+ "\003", /* getreg.term_cmd */
+ },
+ "r\r", /* dump_registers */
+ "\\(\\w+\\)=\\([0-9a-fA-F]+\\)", /* register_pattern */
+ hms_supply_register, /* supply_register */
+ NULL, /* load_routine (defaults to SRECs) */
+ "tl\r", /* download command */
+ NULL, /* load response */
+ ">", /* monitor command prompt */
+ "\r", /* end-of-command delimitor */
+ NULL, /* optional command terminator */
+ &hms_ops, /* target operations */
+ SERIAL_1_STOPBITS, /* number of stop bits */
+ hms_regnames, /* registers names */
+ MONITOR_OPS_MAGIC /* magic */
+};
-/* Get a free cache block, put or keep it on the valid list,
- and return its address. The caller should store into the block
- the address and data that it describes, then remque it from the
- free list and insert it into the valid list. This procedure
- prevents errors from creeping in if a ninMemGet is interrupted
- (which used to put garbage blocks in the valid list...). */
-static
-struct dcache_block *
-dcache_alloc ()
+static void
+hms_open (args, from_tty)
+ char *args;
+ int from_tty;
{
- register struct dcache_block *db;
+ monitor_open (args, &hms_cmds, from_tty);
+}
- if ((db = dcache_free.next) == &dcache_free)
- {
- /* If we can't get one from the free list, take last valid and put
- it on the free list. */
- db = dcache_valid.last;
- remque (db);
- insque (db, &dcache_free);
- }
+int write_dos_tick_delay;
- remque (db);
- insque (db, &dcache_valid);
- return (db);
+void
+_initialize_remote_hms ()
+{
+ init_monitor_ops (&hms_ops);
+
+ hms_ops.to_shortname = "hms";
+ hms_ops.to_longname = "Hitachi Microsystems H8/300 debug monitor";
+ hms_ops.to_doc = "Debug via the HMS monitor.\n\
+Specify the serial device it is connected to (e.g. /dev/ttya).";
+ hms_ops.to_open = hms_open;
+ /* By trial and error I've found that this delay doesn't break things */
+ write_dos_tick_delay = 1;
+ add_target (&hms_ops);
}
-/* Return the contents of the word at address ADDR in the remote machine,
- using the data cache. */
-static
-int
-dcache_fetch (addr)
- CORE_ADDR addr;
-{
- register struct dcache_block *db;
- db = dcache_hit (addr);
- if (db == 0)
- {
- db = dcache_alloc ();
- immediate_quit++;
- hms_read_inferior_memory (addr & ~LINE_SIZE_MASK, (unsigned char *) db->data, LINE_SIZE);
- immediate_quit--;
- db->addr = addr & ~LINE_SIZE_MASK;
- remque (db); /* Off the free list */
- insque (db, &dcache_valid); /* On the valid list */
- }
- return (dcache_value (db, addr));
-}
+#if 0
+/* This is kept here because we used to support the H8/500 in this module,
+ and I haven't done the H8/500 yet */
+#include "defs.h"
+#include "inferior.h"
+#include "wait.h"
+#include "value.h"
+#include "gdb_string.h"
+#include <ctype.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <errno.h>
+#include "terminal.h"
+#include "target.h"
+#include "gdbcore.h"
+#include "serial.h"
+#include "remote-utils.h"
+/* External data declarations */
+extern int stop_soon_quietly; /* for wait_for_inferior */
-/* Write the word at ADDR both in the data cache and in the remote machine. */
-static void
-dcache_poke (addr, data)
- CORE_ADDR addr;
- int data;
-{
- register struct dcache_block *db;
+/* Forward data declarations */
+extern struct target_ops hms_ops; /* Forward declaration */
- /* First make sure the word is IN the cache. DB is its cache block. */
- db = dcache_hit (addr);
- if (db == 0)
- {
- db = dcache_alloc ();
- immediate_quit++;
- hms_write_inferior_memory (addr & ~LINE_SIZE_MASK, (unsigned char *) db->data, LINE_SIZE);
- immediate_quit--;
- db->addr = addr & ~LINE_SIZE_MASK;
- remque (db); /* Off the free list */
- insque (db, &dcache_valid); /* On the valid list */
- }
+/* Forward function declarations */
+static void hms_fetch_registers ();
+static int hms_store_registers ();
+static void hms_close ();
+static int hms_clear_breakpoints ();
- /* Modify the word in the cache. */
- db->data[XFORM (addr)] = data;
+extern struct target_ops hms_ops;
+static void hms_drain ();
+static void add_commands ();
+static void remove_commands ();
- /* Send the changed word. */
- immediate_quit++;
- hms_write_inferior_memory (addr, (unsigned char *) &data, 4);
- immediate_quit--;
-}
+static int quiet = 1; /* FIXME - can be removed after Dec '94 */
-/* The cache itself. */
-struct dcache_block the_cache[DCACHE_SIZE];
-/* Initialize the data cache. */
-static void
-dcache_init ()
-{
- register i;
- register struct dcache_block *db;
-
- db = the_cache;
- dcache_free.next = dcache_free.last = &dcache_free;
- dcache_valid.next = dcache_valid.last = &dcache_valid;
- for (i = 0; i < DCACHE_SIZE; i++, db++)
- insque (db, &dcache_free);
-}
/***********************************************************************
* I/O stuff stolen from remote-eb.c
hms_open knows that we don't have a file open when the program
starts. */
-int is_open = 0;
+static int before = 0xdead;
+static int is_open = 0;
+static int after = 0xdead;
int
check_open ()
{
+ if (before != 0xdead
+ || after != 0xdead)
+ printf ("OUTCH! \n");
if (!is_open)
{
error ("remote device not open");
buf = SERIAL_READCHAR (desc, timeout);
if (buf == SERIAL_TIMEOUT)
- error ("Timeout reading from remote system.");
+ {
+ hms_write (".\r\n", 3);
+ error ("Timeout reading from remote system.");
+ }
+ if (buf == SERIAL_ERROR)
+ {
+ error ("Serial port error!");
+ }
- if (!quiet)
+ if (!quiet || remote_debug)
printf_unfiltered ("%c", buf);
return buf & 0x7f;
}
+static void
+flush ()
+{
+ while (1)
+ {
+ int b = SERIAL_READCHAR (desc, 0);
+ if (b == SERIAL_TIMEOUT)
+ return;
+ }
+}
+
static int
readchar_nofail ()
{
buf = SERIAL_READCHAR (desc, timeout);
if (buf == SERIAL_TIMEOUT)
buf = 0;
- if (!quiet)
+ if (!quiet || remote_debug)
printf_unfiltered ("%c", buf);
return buf & 0x7f;
char *string;
{
char *p = string;
-
+ char c;
immediate_quit = 1;
while (1)
{
- if (readchar () == *p)
+ c = readchar ();
+ if (c == *p)
{
p++;
if (*p == '\0')
}
}
else
- p = string;
+ {
+ p = string;
+ if (c == *p)
+ p++;
+ }
}
}
}
-/*
- * Download a file specified in 'args', to the hms.
- */
-static void
-hms_load (args, fromtty)
- char *args;
- int fromtty;
-{
- bfd *abfd;
- asection *s;
- int n;
- char buffer[1024];
-
- check_open ();
-
- dcache_flush ();
- inferior_pid = 0;
- abfd = bfd_openr (args, gnutarget);
- if (!abfd)
- {
- printf_filtered ("Unable to open file %s\n", args);
- return;
- }
-
- if (bfd_check_format (abfd, bfd_object) == 0)
- {
- printf_filtered ("File is not an object file\n");
- return;
- }
-
- s = abfd->sections;
- while (s != (asection *) NULL)
- {
- if (s->flags & SEC_LOAD)
- {
- int i;
-
-#define DELTA 1024
- char *buffer = xmalloc (DELTA);
-
- printf_filtered ("%s\t: 0x%4x .. 0x%4x ", s->name, s->vma, s->vma + s->_raw_size);
- for (i = 0; i < s->_raw_size; i += DELTA)
- {
- int delta = DELTA;
-
- if (delta > s->_raw_size - i)
- delta = s->_raw_size - i;
-
- bfd_get_section_contents (abfd, s, buffer, i, delta);
- hms_write_inferior_memory (s->vma + i, buffer, delta);
- printf_filtered ("*");
- gdb_flush (gdb_stdout);
- }
- printf_filtered ("\n");
- free (buffer);
- }
- s = s->next;
- }
- sprintf (buffer, "r PC=%x", abfd->start_address);
- hms_write_cr (buffer);
- expect_prompt ();
- /* Turn off all breakpoints */
- hms_write_cr ("b -");
- expect_prompt ();
-}
-
/* This is called not only when we first attach, but also when the
user types "run" after having attached. */
void
/* Put this port into NORMAL mode, send the 'normal' character */
hms_write ("\001", 1); /* Control A */
- hms_write ("\r", 1); /* Cr */
+ hms_write ("\r\n", 2); /* Cr */
while (1)
{
}
-static void
-hms_open (name, from_tty)
- char *name;
- int from_tty;
-{
- unsigned int prl;
- char *p;
-
- if (name == 0)
- {
- name = "";
- }
- if (is_open)
- hms_close (0);
- dev_name = strdup (name);
-
- if (!(desc = SERIAL_OPEN (dev_name)))
- perror_with_name ((char *) dev_name);
-
- SERIAL_RAW (desc);
- is_open = 1;
- push_target (&hms_ops);
- dcache_init ();
-
- /* Hello? Are you there? */
- SERIAL_WRITE (desc, "\r", 1);
- expect_prompt ();
-
- /* Clear any break points */
- hms_clear_breakpoints ();
-
- printf_filtered ("Connected to remote board running HMS monitor.\n");
-}
/* Close out all files and local state before this target loses control. */
int quitting;
{
/* Clear any break points */
+ remove_commands ();
hms_clear_breakpoints ();
sleep (1); /* Let any output make it all the way back */
if (is_open)
{
- SERIAL_WRITE (desc, "R\r", 2);
+ SERIAL_WRITE (desc, "R\r\n", 3);
SERIAL_CLOSE (desc);
}
is_open = 0;
}
-/* Terminate the open connection to the remote debugger.
- Use this when you want to detach and do something else
- with your gdb. */
-void
+/* Terminate the open connection to the remote debugger. Use this
+ when you want to detach and do something else with your gdb. */ void
hms_detach (args, from_tty)
char *args;
int from_tty;
hms_clear_breakpoints ();
}
- pop_target (); /* calls hms_close to do the real work */
+ pop_target (); /* calls hms_close to do the real work
+ */
if (from_tty)
- printf_filtered ("Ending remote %s debugging\n", target_shortname);
+ printf_filtered ("Ending remote %s debugging\n",
+ target_shortname);
}
/* Tell the remote machine to resume. */
void
hms_resume (pid, step, sig)
int pid, step;
- enum target_signal sig;
+ enum target_signal
+ sig;
{
- dcache_flush ();
-
if (step)
{
hms_write_cr ("s");
expect ("Step>");
/* Force the next hms_wait to return a trap. Not doing anything
- about I/O from the target means that the user has to type
- "continue" to see any. FIXME, this should be fixed. */
+ about I/O from the target means that the user has to type "continue"
+ to see any. FIXME, this should be fixed. */
need_artificial_trap = 1;
}
else
}
}
-/* Wait until the remote machine stops, then return,
- storing status in STATUS just as `wait' would. */
+/* Wait until the remote machine stops, then return, storing status in
+ STATUS just as `wait' would. */
int
hms_wait (pid, status)
int pid;
struct target_waitstatus *status;
{
- /* Strings to look for. '?' means match any single character.
- Note that with the algorithm we use, the initial character
- of the string cannot recur in the string, or we will not
- find some cases of the string in the input. */
+ /* Strings to look for. '?' means match any single character. Note
+ that with the algorithm we use, the initial character of the string
+ cannot recur in the string, or we will not find some cases of the
+ string in the input. */
static char bpt[] = "At breakpoint:";
- /* It would be tempting to look for "\n[__exit + 0x8]\n"
- but that requires loading symbols with "yc i" and even if
- we did do that we don't know that the file has symbols. */
+ /* It would be tempting to look for "\n[__exit + 0x8]\n" but that
+ requires loading symbols with "yc i" and even if we did do that we
+ don't know that the file has symbols. */
static char exitmsg[] = "HMS>";
char *bp = bpt;
char *ep = exitmsg;
- /* Large enough for either sizeof (bpt) or sizeof (exitmsg) chars. */
+ /* Large enough for either sizeof (bpt) or sizeof (exitmsg) chars.
+ */
char swallowed[50];
/* Current position in swallowed. */
int ch;
int ch_handled;
int old_timeout = timeout;
- int old_immediate_quit = immediate_quit;
+ int
+ old_immediate_quit = immediate_quit;
int swallowed_cr = 0;
status->kind = TARGET_WAITKIND_EXITED;
if (need_artificial_trap != 0)
{
- status->kind = TARGET_WAITKIND_STOPPED;
+ status->kind =
+ TARGET_WAITKIND_STOPPED;
status->value.sig = TARGET_SIGNAL_TRAP;
need_artificial_trap--;
return 0;
}
- timeout = -1; /* Don't time out -- user program is running. */
+ timeout = 5; /* Don't time out for a while - user program is running.
+ */
immediate_quit = 1; /* Helps ability to QUIT */
while (1)
{
{
bp = bpt;
}
- if (ch == *ep || *ep == '?')
+ if
+ (ch == *ep || *ep == '?')
{
ep++;
if (*ep == '\0')
if (!ch_handled)
*swallowed_p++ = ch;
- ch_handled = 1;
+ ch_handled =
+ 1;
}
else
{
/* Print out any characters which have been swallowed. */
for (p = swallowed; p < swallowed_p; ++p)
- putc_unfiltered (*p);
+ putchar_unfiltered (*p);
swallowed_p = swallowed;
if ((ch != '\r' && ch != '\n') || swallowed_cr > 10)
{
- putc_unfiltered (ch);
+ putchar_unfiltered (ch);
swallowed_cr = 10;
}
swallowed_cr++;
else
{
status->kind = TARGET_WAITKIND_EXITED;
- status->value.integer = TARGET_SIGNAL_STOP;
+ status->value.integer =
+ TARGET_SIGNAL_STOP;
}
timeout = old_timeout;
immediate_quit = old_immediate_quit;
- return 0;
+ return
+ 0;
}
-/* Return the name of register number REGNO
- in the form input and output by hms.
+/* Return the name of register number REGNO in the form input and
+ output by hms.
Returns a pointer to a static buffer containing the answer. */
static char *
get_reg_name (regno)
int regno;
{
- static char *rn[] = REGISTER_NAMES;
+ static char *rn[] =
+ REGISTER_NAMES;
return rn[regno];
}
/* Read the remote registers. */
+
static int
gethex (length, start, ok)
unsigned int length;
{
result += *start - 'a' + 10;
}
- else if (*start >= 'A' && *start <= 'F')
+ else if (*start >= 'A' &&
+ *start <= 'F')
{
result += *start - 'A' + 10;
}
- else if (*start >= '0' && *start <= '9')
+ else if
+ (*start >= '0' && *start <= '9')
{
result += *start - '0';
}
}
static int
timed_read (buf, n, timeout)
- char *buf;
+ char
+ *buf;
{
int i;
SERIAL_WRITE (desc, a, l);
- if (!quiet)
- for (i = 0; i < l; i++)
- {
- printf_unfiltered ("%c", a[i]);
- }
+ if (!quiet || remote_debug)
+ {
+ printf_unfiltered ("<");
+ for (i = 0; i < l; i++)
+ {
+ printf_unfiltered ("%c", a[i]);
+ }
+ printf_unfiltered (">");
+ }
}
hms_write_cr (s)
char *s;
{
hms_write (s, strlen (s));
- hms_write ("\r", 1);
+ hms_write ("\r\n", 2);
}
#ifdef GDB_TARGET_IS_H8500
/* H8/500 monitor reg dump looks like:
-HMS>r
-PC:8000 SR:070C .7NZ.. CP:00 DP:00 EP:00 TP:00 BR:00
-R0-R7: FF5A 0001 F4FE F500 0000 F528 F528 F4EE
-HMS>
+ HMS>r
+ PC:8000 SR:070C .7NZ.. CP:00 DP:00 EP:00 TP:00 BR:00
+ R0-R7: FF5A 0001 F4FE F500 0000 F528 F528 F4EE
+ HMS>
-*/
+ */
-supply_val(n, size, ptr, segptr)
-int n;
-int size;
-char *ptr;
-char *segptr;
+supply_val (n, size, ptr, segptr)
+ int n;
+ int size;
+ char *ptr;
+ char *segptr;
{
int ok;
char raw[4];
- switch (size)
+ switch (size)
{
case 2:
- raw[0] = gethex(2, ptr, &ok);
- raw[1] = gethex(2, ptr+2, &ok);
+ raw[0] = gethex (2, ptr, &ok);
+ raw[1] = gethex (2, ptr + 2, &ok);
supply_register (n, raw);
break;
case 1:
- raw[0] = gethex(2,ptr,&ok);
+ raw[0] = gethex (2, ptr, &ok);
supply_register (n, raw);
break;
case 4:
int v = gethex (4, ptr, &ok);
v |= gethex (2, segptr, &ok) << 16;
raw[0] = 0;
- raw[1] = (v>>16) & 0xff ;
- raw[2] = (v>>8) & 0xff ;
- raw[3] = (v>>0) & 0xff ;
+ raw[1] = (v >> 16) & 0xff;
+ raw[2] = (v >> 8) & 0xff;
+ raw[3] = (v >> 0) & 0xff;
supply_register (n, raw);
}
}
int s;
int gottok;
- REGISTER_TYPE reg[NUM_REGS];
- int foo[NUM_REGS];
+ LONGEST reg[NUM_REGS];
check_open ();
do
{
hms_write_cr ("r");
- expect("r");
- s = timed_read (linebuf+1, REGREPLY_SIZE, 1);
+ expect ("r");
+ s = timed_read (linebuf + 1, REGREPLY_SIZE, 1);
linebuf[REGREPLY_SIZE] = 0;
gottok = 0;
{
/*
- 012
- r**
- -------1---------2---------3---------4---------5-----
- 345678901234567890123456789012345678901234567890123456
- PC:8000 SR:070C .7NZ.. CP:00 DP:00 EP:00 TP:00 BR:00**
- ---6---------7---------8---------9--------10----
- 789012345678901234567890123456789012345678901234
- R0-R7: FF5A 0001 F4FE F500 0000 F528 F528 F4EE**
-
- 56789
- HMS>
- */
+ 012
+ r**
+ -------1---------2---------3---------4---------5-----
+ 345678901234567890123456789012345678901234567890123456
+ PC:8000 SR:070C .7NZ.. CP:00 DP:00 EP:00 TP:00 BR:00**
+ ---6---------7---------8---------9--------10----
+ 789012345678901234567890123456789012345678901234
+ R0-R7: FF5A 0001 F4FE F500 0000 F528 F528 F4EE**
+
+ 56789
+ HMS>
+ */
gottok = 1;
-
- supply_val(PC_REGNUM, 4, linebuf+6, linebuf+29);
- supply_val(CCR_REGNUM, 2, linebuf+14);
- supply_val(SEG_C_REGNUM, 1, linebuf+29);
- supply_val(SEG_D_REGNUM, 1, linebuf+35);
- supply_val(SEG_E_REGNUM, 1, linebuf+41);
- supply_val(SEG_T_REGNUM, 1, linebuf+47);
+ supply_val (PC_REGNUM, 4, linebuf + 6, linebuf + 29);
+
+ supply_val (CCR_REGNUM, 2, linebuf + 14);
+ supply_val (SEG_C_REGNUM, 1, linebuf + 29);
+ supply_val (SEG_D_REGNUM, 1, linebuf + 35);
+ supply_val (SEG_E_REGNUM, 1, linebuf + 41);
+ supply_val (SEG_T_REGNUM, 1, linebuf + 47);
for (i = 0; i < 8; i++)
{
- static int sr[8] = { 35,35,35,35,
- 41,41,47,47};
+ static int sr[8] =
+ {35, 35, 35, 35,
+ 41, 41, 47, 47};
char raw[4];
char *src = linebuf + 64 + 5 * i;
char *segsrc = linebuf + sr[i];
- supply_val(R0_REGNUM + i, 2, src);
- supply_val(PR0_REGNUM + i, 4, src, segsrc);
+ supply_val (R0_REGNUM + i, 2, src);
+ supply_val (PR0_REGNUM + i, 4, src, segsrc);
}
}
if (!gottok)
{
- hms_write_cr ("");
- expect("HMS>");
+ hms_write_cr ("");
+ expect ("HMS>");
}
}
while (!gottok);
int s;
int gottok;
- unsigned LONGEST reg[NUM_REGS];
- int foo[8];
+ ULONGEST reg[NUM_REGS];
check_open ();
do
{
-
hms_write_cr ("r");
- s = timed_read (linebuf, REGREPLY_SIZE, 1);
+
+ s = timed_read (linebuf, 1, 1);
+
+ while (linebuf[0] != 'r')
+ s = timed_read (linebuf, 1, 1);
+
+ s = timed_read (linebuf + 1, REGREPLY_SIZE - 1, 1);
linebuf[REGREPLY_SIZE] = 0;
gottok = 0;
linebuf[77] == 'S')
{
/*
- PC=XXXX CCR=XX:XXXXXXXX R0-R7= XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
- 5436789012345678901234567890123456789012345678901234567890123456789012
- 0 1 2 3 4 5 6
- */
+ PC=XXXX CCR=XX:XXXXXXXX R0-R7= XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
+ 5436789012345678901234567890123456789012345678901234567890123456789012
+ 0 1 2 3 4 5 6
+ */
gottok = 1;
reg[PC_REGNUM] = gethex (4, linebuf + 6, &gottok);
{
char *name = get_reg_name (regno);
char buffer[100];
- /* Regs starting pr<foo> don't really exist */
- if (!(name[0] == 'p' && name[1] == 'r') ) {
- sprintf (buffer, "r %s=%x", name, read_register (regno));
- hms_write_cr (buffer);
- expect_prompt ();
- }
+ /* Some regs dont really exist */
+ if (!(name[0] == 'p' && name[1] == 'r')
+ && !(name[0] == 'c' && name[1] == 'y')
+ && !(name[0] == 't' && name[1] == 'i')
+ && !(name[0] == 'i' && name[1] == 'n'))
+ {
+ sprintf (buffer, "r %s=%x", name, read_register (regno));
+ hms_write_cr (buffer);
+ expect_prompt ();
+ }
}
}
}
-/* Read a word from remote address ADDR and return it.
- * This goes through the data cache.
- */
-int
-hms_fetch_word (addr)
- CORE_ADDR addr;
-{
- return dcache_fetch (addr);
-}
-
-/* Write a word WORD into remote address ADDR.
- This goes through the data cache. */
-
-void
-hms_store_word (addr, word)
- CORE_ADDR addr;
- int word;
-{
- dcache_poke (addr, word);
-}
int
hms_xfer_inferior_memory (memaddr, myaddr, len, write, target)
int write;
struct target_ops *target; /* ignored */
{
- register int i;
-
- /* Round starting address down to longword boundary. */
- register CORE_ADDR addr;
-
- /* Round ending address up; get number of longwords that makes. */
- register int count;
-
- /* Allocate buffer of that many longwords. */
- register int *buffer;
-
- memaddr &= 0xffff;
- addr = memaddr & -sizeof (int);
- count = (((memaddr + len) - addr) + sizeof (int) - 1) / sizeof (int);
-
- buffer = (int *) alloca (count * sizeof (int));
-
- if (write)
- {
- /* Fill start and end extra bytes of buffer with existing memory data. */
-
- if (addr != memaddr || len < (int) sizeof (int))
- {
- /* Need part of initial word -- fetch it. */
- buffer[0] = hms_fetch_word (addr);
- }
-
- if (count > 1) /* FIXME, avoid if even boundary */
- {
- buffer[count - 1]
- = hms_fetch_word (addr + (count - 1) * sizeof (int));
- }
-
- /* Copy data to be written over corresponding part of buffer */
-
- memcpy ((char *) buffer + (memaddr & (sizeof (int) - 1)), myaddr, len);
-
- /* Write the entire buffer. */
-
- for (i = 0; i < count; i++, addr += sizeof (int))
- {
- errno = 0;
- hms_store_word (addr, buffer[i]);
- if (errno)
- {
-
- return 0;
- }
-
- }
- }
- else
- {
- /* Read all the longwords */
- for (i = 0; i < count; i++, addr += sizeof (int))
- {
- errno = 0;
- buffer[i] = hms_fetch_word (addr);
- if (errno)
- {
- return 0;
- }
- QUIT;
- }
-
- /* Copy appropriate bytes out of the buffer. */
- memcpy (myaddr, (char *) buffer + (memaddr & (sizeof (int) - 1)), len);
- }
return len;
}
bfd_vma addr;
int done;
int todo;
-
+ char buffer[100];
done = 0;
+ hms_write_cr (".");
+ expect_prompt ();
while (done < len)
{
- char buffer[20];
+ char *ptr = buffer;
int thisgo;
int idx;
if (thisgo > 20)
thisgo = 20;
- sprintf (buffer, "M.B %4x =", memaddr + done);
- hms_write (buffer, 10);
+ sprintf (ptr, "M.B %4x =", memaddr + done);
+ ptr += 10;
for (idx = 0; idx < thisgo; idx++)
{
- char buf[20];
-
- sprintf (buf, "%2x ", myaddr[idx + done]);
- hms_write (buf, 3);
+ sprintf (ptr, "%2x ", myaddr[idx + done]);
+ ptr += 3;
}
- hms_write_cr ("");
+ hms_write_cr (buffer);
expect_prompt ();
done += thisgo;
}
-
}
void
/* Copy LEN bytes of data from debugger memory at MYADDR
to inferior's memory at MEMADDR. Returns errno value.
- * sb/sh instructions don't work on unaligned addresses, when TU=1.
+ * sb/sh instructions don't work on unaligned addresses, when TU=1.
*/
/* Read LEN bytes from inferior memory at MEMADDR. Put the result
/* Align to nearest low 16 bits */
int i;
-#if 0
- CORE_ADDR start = memaddr & ~0xf;
- CORE_ADDR end = ((memaddr + len + 16) & ~0xf) - 1;
-
-#endif
CORE_ADDR start = memaddr;
CORE_ADDR end = memaddr + len - 1;
int ok = 1;
/*
- AAAA: XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX '................'
- 012345678901234567890123456789012345678901234567890123456789012345
- 0 1 2 3 4 5 6
- */
+ AAAA: XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX '................'
+ 012345678901234567890123456789012345678901234567890123456789012345
+ 0 1 2 3 4 5 6
+ */
char buffer[66];
if (memaddr & 0xf)
abort ();
sprintf (buffer, "m %4x %4x", start & 0xffff, end & 0xffff);
+
+ flush ();
hms_write_cr (buffer);
- /* drop the echo and newline*/
+ /* drop the echo and newline */
for (i = 0; i < 13; i++)
readchar ();
char byte[16];
buffer[0] = readchar ();
+ while (buffer[0] == '\r'
+ || buffer[0] == '\n')
+ buffer[0] = readchar ();
+
if (buffer[0] == 'M')
break;
- for (i = 1; i < 66; i++)
- buffer[i] = readchar ();
+
+ for (i = 1; i < 50; i++)
+ {
+ buffer[i] = readchar ();
+ }
+ /* sometimes we loose characters in the ascii representation of the
+ data. I don't know where. So just scan for the end of line */
+ i = readchar ();
+ while (i != '\n' && i != '\r')
+ i = readchar ();
/* Now parse the line */
byte[p] = gethex (2, buffer + idx, &ok);
byte[p + 1] = gethex (2, buffer + idx + 2, &ok);
idx += 5;
-
}
for (p = 0; p < 16; p++)
}
}
-#ifdef TARGET_IS_H8500
- expect ("ore>");
+#ifdef GDB_TARGET_IS_H8500
+ expect ("ore>");
#endif
-#ifdef TARGET_IS_H8300
+#ifdef GDB_TARGET_IS_H8300
expect ("emory>");
#endif
- hms_write_cr (" ");
+ hms_write_cr (".");
+
expect_prompt ();
return len;
}
-#if 0
-/* This routine is run as a hook, just before the main command loop is
- entered. If gdb is configured for the H8, but has not had its
- target specified yet, this will loop prompting the user to do so.
-*/
-
-hms_before_main_loop ()
-{
- char ttyname[100];
- char *p, *p2;
- extern GDB_FILE *instream;
-
- push_target (&hms_ops);
-}
-#endif
#define MAX_BREAKS 16
/* Clear all input so only command relative output is displayed */
hms_write_cr (args);
- hms_write ("\030", 1);
+/* hms_write ("\030", 1); */
expect_prompt ();
}
+static void
+hms_open (name, from_tty)
+ char *name;
+ int from_tty;
+{
+ unsigned int prl;
+ char *p;
+
+ if (name == 0)
+ {
+ name = "";
+ }
+ if (is_open)
+ hms_close (0);
+ dev_name = strdup (name);
+
+ if (!(desc = SERIAL_OPEN (dev_name)))
+ perror_with_name ((char *) dev_name);
+
+ SERIAL_RAW (desc);
+ is_open = 1;
+ push_target (&hms_ops);
+ dcache_ptr = dcache_init (hms_read_inferior_memory,
+ hms_write_inferior_memory);
+ remote_dcache = 1;
+ /* Hello? Are you there? */
+ SERIAL_WRITE (desc, "\r\n", 2);
+ expect_prompt ();
+
+ /* Clear any break points */
+ hms_clear_breakpoints ();
+
+ printf_filtered ("Connected to remote board running HMS monitor.\n");
+ add_commands ();
+/* hms_drain (); */
+}
+
/* Define the target subroutine names */
struct target_ops hms_ops =
hms_prepare_to_store,
hms_xfer_inferior_memory,
hms_files_info,
- hms_insert_breakpoint, hms_remove_breakpoint, /* Breakpoints */
+ hms_insert_breakpoint, hms_remove_breakpoint, /* Breakpoints */
0, 0, 0, 0, 0, /* Terminal handling */
hms_kill, /* FIXME, kill */
- hms_load,
+ generic_load,
0, /* lookup_symbol */
hms_create_inferior, /* create_inferior */
hms_mourn, /* mourn_inferior FIXME */
0, /* can_run */
0, /* notice_signals */
+ 0, /* to_thread_alive */
+ 0, /* to_stop */
process_stratum, 0, /* next */
1, 1, 1, 1, 1, /* all mem, mem, stack, regs, exec */
0, 0, /* Section pointers */
OPS_MAGIC, /* Always the last thing */
};
-hms_quiet ()
+hms_quiet () /* FIXME - this routine can be removed after Dec '94 */
{
quiet = !quiet;
if (quiet)
else
printf_filtered ("Snoop enabled\n");
+ printf_filtered ("`snoop' is obsolete, please use `set remotedebug'.\n");
}
hms_device (s)
/***********************************************************************/
+static void
+hms_drain (args, fromtty)
+ char *args;
+ int fromtty;
+{
+ int c;
+ while (1)
+ {
+ c = SERIAL_READCHAR (desc, 1);
+ if (c == SERIAL_TIMEOUT)
+ break;
+ if (c == SERIAL_ERROR)
+ break;
+ if (c > ' ' && c < 127)
+ printf ("%c", c & 0xff);
+ else
+ printf ("<%x>", c & 0xff);
+ }
+}
+
+static void
+add_commands ()
+{
+
+ add_com ("hms_drain", class_obscure, hms_drain,
+ "Drain pending hms text buffers.");
+}
+
+static void
+remove_commands ()
+{
+ extern struct cmd_list_element *cmdlist;
+ delete_cmd ("hms-drain", &cmdlist);
+}
+
+
void
_initialize_remote_hms ()
{
add_com ("hms <command>", class_obscure, hms_com,
"Send a command to the HMS monitor.");
+
+ /* FIXME - hms_quiet and `snoop' can be removed after Dec '94 */
add_com ("snoop", class_obscure, hms_quiet,
- "Show what commands are going to the monitor");
+ "Show what commands are going to the monitor (OBSOLETE - see 'set remotedebug')");
add_com ("device", class_obscure, hms_device,
"Set the terminal line for HMS communications");
dev_name = NULL;
}
+#endif
+
projects / deliverable / binutils-gdb.git / blobdiff