* remote-mon.c (general_open): Set dev_name. Minor tweaking to get

it working again.
	* config/m68k/tm-monitor.h: Remove floating point register names
	as there aren't any on any of the monitors that use this code.
This commit is contained in:
Rob Savoye 1993-10-15 03:41:58 +00:00
parent 81d460c775
commit 8c4731b588
2 changed files with 25 additions and 13 deletions

View file

@ -1,3 +1,10 @@
Thu Oct 14 21:35:55 1993 Rob Savoye (rob@darkstar.cygnus.com)
* remote-mon.c (general_open): Set dev_name. Minor tweaking to get
it working again.
* config/m68k/tm-monitor.h: Remove floating point register names
as there aren't any on any of the monitors that use this code.
Wed Oct 13 11:47:23 1993 Jim Kingdon (kingdon@lioth.cygnus.com) Wed Oct 13 11:47:23 1993 Jim Kingdon (kingdon@lioth.cygnus.com)
* inflow.c: Pass pointer to process group, not process group itself, * inflow.c: Pass pointer to process group, not process group itself,

View file

@ -1,4 +1,4 @@
/* Remote debugging interface for MONITOR boot monitor, for GDB. /* Remote debugging interface for boot monitors, for GDB.
Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc. Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
Contributed by Cygnus Support. Written by Rob Savoye for Cygnus. Contributed by Cygnus Support. Written by Rob Savoye for Cygnus.
@ -71,7 +71,9 @@ struct cmd_list_element *showlist;
static void monitor_close(); static void monitor_close();
static void monitor_fetch_register(); static void monitor_fetch_register();
static void monitor_store_register(); static void monitor_store_register();
static int kiodebug; /* flag set by "set remotedebug" */ #if 0
static int sr_get_debug(); /* flag set by "set remotedebug" */
#endif
static int hashmark; /* flag set by "set hash" */ static int hashmark; /* flag set by "set hash" */
#define LOG_FILE "monitor.log" #define LOG_FILE "monitor.log"
@ -117,7 +119,7 @@ readchar(timeout)
c = SERIAL_READCHAR(monitor_desc, timeout); c = SERIAL_READCHAR(monitor_desc, timeout);
if (kiodebug) if (sr_get_debug())
putchar(c & 0x7f); putchar(c & 0x7f);
#ifdef LOG_FILE #ifdef LOG_FILE
@ -150,7 +152,7 @@ expect(string, discard)
char *p = string; char *p = string;
int c; int c;
if (kiodebug) if (sr_get_debug())
printf ("Expecting \"%s\"\n", string); printf ("Expecting \"%s\"\n", string);
immediate_quit = 1; immediate_quit = 1;
@ -164,7 +166,7 @@ expect(string, discard)
if (*p == '\0') if (*p == '\0')
{ {
immediate_quit = 0; immediate_quit = 0;
if (kiodebug) if (sr_get_debug())
printf ("\nMatched\n"); printf ("\nMatched\n");
return; return;
} }
@ -330,8 +332,10 @@ general_open(args, name, from_tty)
target_preopen(from_tty); target_preopen(from_tty);
monitor_close(0); /* if (is_open) */
monitor_close(0);
strcpy(dev_name, args);
monitor_desc = SERIAL_OPEN(dev_name); monitor_desc = SERIAL_OPEN(dev_name);
if (monitor_desc == NULL) if (monitor_desc == NULL)
@ -587,7 +591,7 @@ monitor_store_register (regno)
monitor_store_registers (); monitor_store_registers ();
else else
{ {
if (kiodebug) if (sr_get_debug())
printf ("Setting register %s to 0x%x\n", get_reg_name (regno), read_register (regno)); printf ("Setting register %s to 0x%x\n", get_reg_name (regno), read_register (regno));
printf_monitor (SET_REG, get_reg_name (regno), printf_monitor (SET_REG, get_reg_name (regno),
@ -636,7 +640,7 @@ monitor_write_inferior_memory (memaddr, myaddr, len)
expect (sprintf (buf, MEM_PROMPT, memaddr + i), 1); expect (sprintf (buf, MEM_PROMPT, memaddr + i), 1);
expect (CMD_DELIM); expect (CMD_DELIM);
printf_monitor ("%x", myaddr[i]); printf_monitor ("%x", myaddr[i]);
if (kiodebug) if (sr_get_debug())
printf ("\nSet 0x%x to 0x%x\n", memaddr + i, myaddr[i]); printf ("\nSet 0x%x to 0x%x\n", memaddr + i, myaddr[i]);
if (CMD_END) if (CMD_END)
{ {
@ -696,7 +700,7 @@ monitor_read_inferior_memory(memaddr, myaddr, len)
len_this_pass -= startaddr % 16; len_this_pass -= startaddr % 16;
if (len_this_pass > (len - count)) if (len_this_pass > (len - count))
len_this_pass = (len - count); len_this_pass = (len - count);
if (kiodebug) if (sr_get_debug())
printf ("\nDisplay %d bytes at %x\n", len_this_pass, startaddr); printf ("\nDisplay %d bytes at %x\n", len_this_pass, startaddr);
for (i = 0; i < len_this_pass; i++) for (i = 0; i < len_this_pass; i++)
@ -704,7 +708,7 @@ monitor_read_inferior_memory(memaddr, myaddr, len)
printf_monitor (MEM_DIS_CMD, startaddr); printf_monitor (MEM_DIS_CMD, startaddr);
expect (sprintf(buf, MEM_PROMPT, startaddr), 1); expect (sprintf(buf, MEM_PROMPT, startaddr), 1);
get_hex_byte (&myaddr[count++]); get_hex_byte (&myaddr[count++]);
if (kiodebug) if (sr_get_debug())
printf ("\nRead a 0x%x from 0x%x\n", myaddr[count-1], startaddr); printf ("\nRead a 0x%x from 0x%x\n", myaddr[count-1], startaddr);
if (CMD_END) if (CMD_END)
{ {
@ -772,7 +776,7 @@ monitor_insert_breakpoint (addr, shadow)
if (breakaddr[i] == 0) if (breakaddr[i] == 0)
{ {
breakaddr[i] = addr; breakaddr[i] = addr;
if (kiodebug) if (sr_get_debug())
printf ("Breakpoint at %x\n", addr); printf ("Breakpoint at %x\n", addr);
monitor_read_inferior_memory(addr, shadow, memory_breakpoint_size); monitor_read_inferior_memory(addr, shadow, memory_breakpoint_size);
printf_monitor(SET_BREAK_CMD, addr); printf_monitor(SET_BREAK_CMD, addr);
@ -826,7 +830,7 @@ monitor_load (arg)
char buf[DOWNLOAD_LINE_SIZE]; char buf[DOWNLOAD_LINE_SIZE];
int i, bytes_read; int i, bytes_read;
if (kiodebug) if (sr_get_debug())
printf ("Loading %s to monitor\n", arg); printf ("Loading %s to monitor\n", arg);
download = fopen (arg, "r"); download = fopen (arg, "r");
@ -1174,13 +1178,14 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",
void void
_initialize_remote_monitors () _initialize_remote_monitors ()
{ {
add_show_from_set ( /*** add_show_from_set (
add_set_cmd ("remotedebug", no_class, var_boolean, add_set_cmd ("remotedebug", no_class, var_boolean,
(char *)&kiodebug, (char *)&kiodebug,
"Set debugging of I/O to a serial based Monitor.\n\ "Set debugging of I/O to a serial based Monitor.\n\
When enabled, debugging info is displayed.", When enabled, debugging info is displayed.",
&setlist), &setlist),
&showlist); &showlist);
***/
add_show_from_set ( add_show_from_set (
add_set_cmd ("hash", no_class, var_boolean, add_set_cmd ("hash", no_class, var_boolean,
(char *)&hashmark, (char *)&hashmark,