Mon Apr 27 13:46:40 1998 John Metzler <jmetzler@cygnus.com>

	* rom68k-rom.c (_initialize_rom68k init_rom68k_cmds):
	* abug-rom.c (_initialize_abug_rom init_abug-cmds):
	* cpu32bug-rom.c (_initialize_cpu32bug_rom init_cpu32bug_cmds):
	* mon960-rom.c (initialize_mon960 init_mon960_cmds):
	* op50-rom.c (initialize_op50n  init_op50n_cmds) :
	* ppcbug-rom.c (_initialize_ppcbug_rom init_ppc_cmds) :
	* sh3-rom.c (_initialize_sh3_rom init_sh3_cmds) :
	* sparclet-rom.c (_initialize_sparcletinit_sparclet_cmds ) :
	* remote-est.c ( _initialize_est  init_est_cmds) :
	* remote-hms.c (  _initialize_remote_hms  init_hms_cmds) :
	  Convert all static initializations of monitor ops structures to
 	executable initializations in oreer tat additions to the data structure
	definition can me made without repeating this editing exercise

1 files changed, 48 insertions, 54 deletions

diff --git a/gdb/cpu32bug-rom.c b/gdb/cpu32bug-rom.c
index 58052c8..29a1fc2 100644
--- a/gdb/cpu32bug-rom.c
+++ b/gdb/cpu32bug-rom.c
@@ -92,61 +92,54 @@ static struct target_ops cpu32bug_ops;
 
 static char *cpu32bug_inits[] = {"\r", NULL};
 
-static struct monitor_ops cpu32bug_cmds =
+static struct monitor_ops cpu32bug_cmds ;
+static void init_cpu32bug_cmds(void)
 {
-  MO_CLR_BREAK_USES_ADDR,
-  cpu32bug_inits,		/* Init strings */
-  "g\r",			/* continue command */
-  "t\r",			/* single step */
-  NULL,				/* interrupt command */
-  "br %x\r",			/* set a breakpoint */
-  "nobr %x\r",			/* clear a breakpoint */
-  "nobr\r",			/* clear all breakpoints */
-  "bf %x:%x %x;b\r",		/* fill (start count val) */
-  {
-    "ms %x %02x\r",		/* setmem.cmdb (addr, value) */
-    "ms %x %04x\r",		/* setmem.cmdw (addr, value) */
-    "ms %x %08x\r",		/* setmem.cmdl (addr, value) */
-    NULL,			/* setmem.cmdll (addr, value) */
-    NULL,			/* setreg.resp_delim */
-    NULL,			/* setreg.term */
-    NULL,			/* setreg.term_cmd */
-  },
-  {
-    "md %x:%x;b\r",		/* getmem.cmdb (addr, len) */
-    "md %x:%x;b\r",		/* getmem.cmdw (addr, len) */
-    "md %x:%x;b\r",		/* getmem.cmdl (addr, len) */
-    NULL,			/* getmem.cmdll (addr, len) */
-    " ",			/* getmem.resp_delim */
-    NULL,			/* getmem.term */
-    NULL,			/* getmem.term_cmd */
-  },
-  {
-    "rs %s %x\r",		/* setreg.cmd (name, value) */
-    NULL,			/* setreg.resp_delim */
-    NULL,			/* setreg.term */
-    NULL			/* setreg.term_cmd */
-  },
-  {
-    "rs %s\r",			/* getreg.cmd (name) */
-    "=",			/* getreg.resp_delim */
-    NULL,			/* getreg.term */
-    NULL			/* getreg.term_cmd */
-  },
-  "rd\r",			/* dump_registers */
-  "\\(\\w+\\) +=\\([0-9a-fA-F]+\\b\\)", /* register_pattern */
-  cpu32bug_supply_register,	/* supply_register */
-  NULL,				/* load_routine (defaults to SRECs) */
-  "lo\r",			/* download command */
-  "\n",				/* load response */
-  "CPU32Bug>",			/* monitor command prompt */
-  "\r",				/* end-of-line terminator */
-  NULL,				/* optional command terminator */
-  &cpu32bug_ops,		/* target operations */
-  SERIAL_1_STOPBITS,		/* number of stop bits */
-  cpu32bug_regnames,		/* registers names */
-  MONITOR_OPS_MAGIC		/* magic */
-  };
+  cpu32bug_cmds.flags =   MO_CLR_BREAK_USES_ADDR;
+  cpu32bug_cmds.init =   cpu32bug_inits;		/* Init strings */
+  cpu32bug_cmds.cont =   "g\r";			/* continue command */
+  cpu32bug_cmds.step =   "t\r";			/* single step */
+  cpu32bug_cmds.stop =   NULL;				/* interrupt command */
+  cpu32bug_cmds.set_break =   "br %x\r";			/* set a breakpoint */
+  cpu32bug_cmds.clr_break =   "nobr %x\r";			/* clear a breakpoint */
+  cpu32bug_cmds.clr_all_break =   "nobr\r";			/* clear all breakpoints */
+  cpu32bug_cmds.fill =   "bf %x:%x %x;b\r";		/* fill (start count val) */
+  cpu32bug_cmds.setmem.cmdb =     "ms %x %02x\r";		/* setmem.cmdb (addr, value) */
+  cpu32bug_cmds.setmem.cmdw =     "ms %x %04x\r";		/* setmem.cmdw (addr, value) */
+  cpu32bug_cmds.setmem.cmdl =     "ms %x %08x\r";		/* setmem.cmdl (addr, value) */
+  cpu32bug_cmds.setmem.cmdll =     NULL;			/* setmem.cmdll (addr, value) */
+  cpu32bug_cmds.setmem.resp_delim =     NULL;			/* setreg.resp_delim */
+  cpu32bug_cmds.setmem.term =     NULL;			/* setreg.term */
+  cpu32bug_cmds.setmem.term_cmd =     NULL;			/* setreg.term_cmd */
+  cpu32bug_cmds.getmem.cmdb =     "md %x:%x;b\r";		/* getmem.cmdb (addr, len) */
+  cpu32bug_cmds.getmem.cmdw =     "md %x:%x;b\r";		/* getmem.cmdw (addr, len) */
+  cpu32bug_cmds.getmem.cmdl =     "md %x:%x;b\r";		/* getmem.cmdl (addr, len) */
+  cpu32bug_cmds.getmem.cmdll =     NULL;			/* getmem.cmdll (addr, len) */
+  cpu32bug_cmds.getmem.resp_delim =     " ";			/* getmem.resp_delim */
+  cpu32bug_cmds.getmem.term =     NULL;			/* getmem.term */
+  cpu32bug_cmds.getmem.term_cmd =     NULL;			/* getmem.term_cmd */
+  cpu32bug_cmds.setreg.cmd =     "rs %s %x\r";		/* setreg.cmd (name, value) */
+  cpu32bug_cmds.setreg.resp_delim =     NULL;			/* setreg.resp_delim */
+  cpu32bug_cmds.setreg.term =     NULL;			/* setreg.term */
+  cpu32bug_cmds.setreg.term_cmd =     NULL;			/* setreg.term_cmd */
+  cpu32bug_cmds.getreg.cmd =     "rs %s\r";			/* getreg.cmd (name) */
+  cpu32bug_cmds.getreg.resp_delim =     "=";			/* getreg.resp_delim */
+  cpu32bug_cmds.getreg.term =     NULL;			/* getreg.term */
+  cpu32bug_cmds.getreg.term_cmd =     NULL ;			/* getreg.term_cmd */
+  cpu32bug_cmds.dump_registers =   "rd\r";			/* dump_registers */
+  cpu32bug_cmds.register_pattern =   "\\(\\w+\\) +=\\([0-9a-fA-F]+\\b\\)"; /* register_pattern */
+  cpu32bug_cmds.supply_register =   cpu32bug_supply_register;	/* supply_register */
+  cpu32bug_cmds.load_routine =   NULL;				/* load_routine (defaults to SRECs) */
+  cpu32bug_cmds.load =   "lo\r";			/* download command */
+  cpu32bug_cmds.loadresp =   "\n";				/* load response */
+  cpu32bug_cmds.prompt =   "CPU32Bug>";			/* monitor command prompt */
+  cpu32bug_cmds.line_term =   "\r";				/* end-of-line terminator */
+  cpu32bug_cmds.cmd_end =   NULL;				/* optional command terminator */
+  cpu32bug_cmds.target =   &cpu32bug_ops;		/* target operations */
+  cpu32bug_cmds.stopbits =   SERIAL_1_STOPBITS;		/* number of stop bits */
+  cpu32bug_cmds.regnames =   cpu32bug_regnames;		/* registers names */
+  cpu32bug_cmds.magic =   MONITOR_OPS_MAGIC;		/* magic */
+}; /* init_cpu32bug_cmds */
 
 static void
 cpu32bug_open(args, from_tty)
@@ -159,6 +152,7 @@ cpu32bug_open(args, from_tty)
 void
 _initialize_cpu32bug_rom ()
 {
+  init_cpu32bug_cmds() ;
   init_monitor_ops (&cpu32bug_ops);
 
   cpu32bug_ops.to_shortname = "cpu32bug";