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, 49 insertions, 55 deletions

diff --git a/gdb/rom68k-rom.c b/gdb/rom68k-rom.c
index 208d9aa..0adb87e 100644
--- a/gdb/rom68k-rom.c
+++ b/gdb/rom68k-rom.c
@@ -93,62 +93,55 @@ static struct target_ops rom68k_ops;
 
 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 */
-  "\r",				/* end-of-line terminator */
-  ".\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 +154,7 @@ rom68k_open (args, from_tty)
 void
 _initialize_rom68k ()
 {
+  init_rom_68k_cmds() ;
   init_monitor_ops (&rom68k_ops);
 
   rom68k_ops.to_shortname = "rom68k";