X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2From68k-rom.c;h=8b938b5139c9bc67f29ad0673aed890bca020f8d;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=399b747ad3af9ca88b12ad623802fd589745f7f8;hpb=f8f3659f3eb5d715c5e1d9ce10614e83482d986b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/rom68k-rom.c b/gdb/rom68k-rom.c
index 399b747ad3..8b938b5139 100644
--- a/gdb/rom68k-rom.c
+++ b/gdb/rom68k-rom.c
@@ -1,21 +1,22 @@
 /* Remote target glue for the ROM68K ROM monitor.
    Copyright 1988, 1991, 1992, 1993, 1994, 1995 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., 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 "gdbcore.h"
@@ -80,10 +81,11 @@ rom68k_supply_register (regname, regnamelen, val, vallen)
    than does GDB, and don't necessarily support all the registers
    either. So, typing "info reg sp" becomes a "r30".  */
 
-static char *rom68k_regnames[NUM_REGS] = {
+static char *rom68k_regnames[NUM_REGS] =
+{
   "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
   "A0", "A1", "A2", "A3", "A4", "A5", "A6", "ISP",
-  "SR", "PC" };
+  "SR", "PC"};
 
 /* Define the monitor command strings. Since these are passed directly
    through to a printf style function, we may include formatting
@@ -91,64 +93,60 @@ static char *rom68k_regnames[NUM_REGS] = {
 
 static struct target_ops rom68k_ops;
 
-static char *rom68k_inits[] = {".\r\r", NULL}; /* Exits pm/pr & download cmds */
+static char *rom68k_inits[] =
+{".\r\r", NULL};		/* Exits pm/pr & download cmds */
+
+static struct monitor_ops rom68k_cmds;
 
-static struct monitor_ops rom68k_cmds =
+static void
+init_rom68k_cmds (void)
 {
-  0,				/* flags */
-  rom68k_inits,			/* monitor init string */
-  "go\r",			/* continue command */
-  "st\r",			/* single step */
-  NULL,				/* No way to interrupt program */
-  "db %x\r",			/* set a breakpoint */
-  "cb %x\r",			/* clear a breakpoint */
-  "cb *\r",			/* clear all breakpoints */
-  "fm %x %x %x\r",		/* fill (start len val) */
-  {
-    "pm %x %x\r",		/* setmem.cmdb (addr, value) */
-    "pm.w %x %x\r",		/* setmem.cmdw (addr, value) */
-    "pm.l %x %x\r",		/* setmem.cmdl (addr, value) */
-    NULL,			/* setmem.cmdll (addr, value) */
-    NULL,			/* setreg.resp_delim */
-    NULL,			/* setreg.term */
-    NULL,			/* setreg.term_cmd */
-  },
-  {
-    "dm %x %x\r",		/* getmem.cmdb (addr, len) */
-    "dm.w %x %x\r",		/* getmem.cmdw (addr, len) */
-    "dm.l %x %x\r",		/* getmem.cmdl (addr, len) */
-    NULL,			/* getmem.cmdll (addr, len) */
-    "  ",			/* getmem.resp_delim */
-    NULL,			/* getmem.term */
-    NULL,			/* getmem.term_cmd */
-  },
-  {
-    "pr %s %x\r",		/* setreg.cmd (name, value) */
-    NULL,			/* setreg.resp_delim */
-    NULL,			/* setreg.term */
-    NULL			/* setreg.term_cmd */
-  },
-  {
-    "pr %s\r",			/* getreg.cmd (name) */
-    ":  ",			/* getreg.resp_delim */
-    "= ",			/* getreg.term */
-    ".\r"			/* getreg.term_cmd */
-  },
-  "dr\r",			/* dump_registers */
-				/* register_pattern */
-  "\\(\\w+\\)=\\([0-9a-fA-F]+\\( +[0-9a-fA-F]+\\b\\)*\\)",
-  rom68k_supply_register,	/* supply_register */
-  NULL,				/* load_routine (defaults to SRECs) */
-  "dc\r",			/* download command */
-  "Waiting for S-records from host... ", /* Load response */
-  "ROM68K :->",			/* monitor command prompt */
-  "=",				/* end-of-command delimitor */
-  ".\r",			/* optional command terminator */
-  &rom68k_ops,			/* target operations */
-  SERIAL_1_STOPBITS,		/* number of stop bits */
-  rom68k_regnames,		/* registers names */
-  MONITOR_OPS_MAGIC		/* magic */
-};
+  rom68k_cmds.flags = 0;
+  rom68k_cmds.init = rom68k_inits;	/* monitor init string */
+  rom68k_cmds.cont = "go\r";
+  rom68k_cmds.step = "st\r";
+  rom68k_cmds.stop = NULL;
+  rom68k_cmds.set_break = "db %x\r";
+  rom68k_cmds.clr_break = "cb %x\r";
+  rom68k_cmds.clr_all_break = "cb *\r";
+  rom68k_cmds.fill = "fm %x %x %x\r";
+  rom68k_cmds.setmem.cmdb = "pm %x %x\r";
+  rom68k_cmds.setmem.cmdw = "pm.w %x %x\r";
+  rom68k_cmds.setmem.cmdl = "pm.l %x %x\r";
+  rom68k_cmds.setmem.cmdll = NULL;
+  rom68k_cmds.setmem.resp_delim = NULL;
+  rom68k_cmds.setmem.term = NULL;
+  rom68k_cmds.setmem.term_cmd = NULL;
+  rom68k_cmds.getmem.cmdb = "dm %x %x\r";
+  rom68k_cmds.getmem.cmdw = "dm.w %x %x\r";
+  rom68k_cmds.getmem.cmdl = "dm.l %x %x\r";
+  rom68k_cmds.getmem.cmdll = NULL;
+  rom68k_cmds.getmem.resp_delim = "  ";
+  rom68k_cmds.getmem.term = NULL;
+  rom68k_cmds.getmem.term_cmd = NULL;
+  rom68k_cmds.setreg.cmd = "pr %s %x\r";
+  rom68k_cmds.setreg.resp_delim = NULL;
+  rom68k_cmds.setreg.term = NULL;
+  rom68k_cmds.setreg.term_cmd = NULL;
+  rom68k_cmds.getreg.cmd = "pr %s\r";
+  rom68k_cmds.getreg.resp_delim = ":  ";
+  rom68k_cmds.getreg.term = "= ";
+  rom68k_cmds.getreg.term_cmd = ".\r";
+  rom68k_cmds.dump_registers = "dr\r";
+  rom68k_cmds.register_pattern =
+    "\\(\\w+\\)=\\([0-9a-fA-F]+\\( +[0-9a-fA-F]+\\b\\)*\\)";
+  rom68k_cmds.supply_register = rom68k_supply_register;
+  rom68k_cmds.load_routine = NULL;
+  rom68k_cmds.load = "dc\r";
+  rom68k_cmds.loadresp = "Waiting for S-records from host... ";
+  rom68k_cmds.prompt = "ROM68K :-> ";
+  rom68k_cmds.line_term = "\r";
+  rom68k_cmds.cmd_end = ".\r";
+  rom68k_cmds.target = &rom68k_ops;
+  rom68k_cmds.stopbits = SERIAL_1_STOPBITS;
+  rom68k_cmds.regnames = rom68k_regnames;
+  rom68k_cmds.magic = MONITOR_OPS_MAGIC;
+}				/* init_rom68k_cmds */
 
 static void
 rom68k_open (args, from_tty)
@@ -161,6 +159,7 @@ rom68k_open (args, from_tty)
 void
 _initialize_rom68k ()
 {
+  init_rom68k_cmds ();
   init_monitor_ops (&rom68k_ops);
 
   rom68k_ops.to_shortname = "rom68k";