* array-rom.c: Remove, no longer used.

	* remote-hms.c (hms_open): Make static.

	* mpw-config.in (MacSerial.h): Copy from version in {CIncludes},
	not {MPW}Interfaces:CIncludes.
	* ser-mac.c (mac_baud_rate_table): Fix value for 38400 baud.

5 files changed, 19 insertions, 133 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cc6c2c4..7367bdf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+Thu Jun 15 14:54:58 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* array-rom.c: Remove, no longer used.
+
+	* remote-hms.c (hms_open): Make static.
+
+	* mpw-config.in (MacSerial.h): Copy from version in {CIncludes},
+	not {MPW}Interfaces:CIncludes.
+	* ser-mac.c (mac_baud_rate_table): Fix value for 38400 baud.
+
+Wed Jun 14 14:27:07 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* ch-exp.y:  Remove lots of unsupported productions and names.
+	Add support for IF-expressions, ORIF, ANDIF, NUM, and ADDR.
+
 Tue Jun 13 21:40:11 1995  Per Bothner  <bothner@kalessin.cygnus.com>
 
 	* parser-defs.h (enum precedence):  Added PREC_BUILTIN_FUNCTION.
diff --git a/gdb/array-rom.c b/gdb/array-rom.c
deleted file mode 100644
index 9f59bd7..0000000
--- a/gdb/array-rom.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Remote target code for the Array Tech LSI33k based RAID disk controller board.
-
-   Copyright 1988, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
-
-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 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.  */
-
-#include "defs.h"
-#include "gdbcore.h"
-#include "target.h"
-#include "monitor.h"
-#include "serial.h"
-
-extern int baud_rate;
-
-void array_open();
-
-/*
- * this array of registers need to match the indexes used by GDB. The
- * whole reason this exists is cause the various ROM monitors use
- * different strings than GDB does, and doesn't support all the
- * registers either. So, typing "info reg sp" becomes a "r30".
- */
-static char *array_regnames[] = REGISTER_NAMES;
-extern char *tmp_mips_processor_type;
-extern int mips_set_processor_type();
-
-/*
- * 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.
- */
-
-static struct target_ops array_ops;
-
-static char *array_loadtypes[] = {"none", "srec", "default", NULL};
-static char *array_loadprotos[] = {"none", NULL};
-
-static struct monitor_ops array_cmds =
-{
-  0,					/* 1 for ASCII, 0 for binary */
-  "$?#b8+\n",				/* monitor init string */
-  "go %x\n",				/* execute or usually GO command */
-  "c\n",				/* continue command */
-  "s\n",				/* single step */
-  "brk 0x%x\n",				/* set a breakpoint */
-  "unbrk %x\n",				/* clear a breakpoint */
-  0,					/* 0 for number, 1 for address */
-  {
-    "M%8x,%4x:%8x",			/* set memory */
-    "",				        /* delimiter */
-    "",					/* the result */
-  },
-  {
-    "m%8x,%4x",				/* get memory */
-    "",				        /* delimiter */
-    "",					/* the result */
-  },
-  {
-    "G%8x",			        /* set registers */
-    "",				        /* delimiter between registers */
-    "",					/* the result */
-  },
-  {
-    "g",				/* get registers */
-    "",				        /* delimiter between registers */
-    "",					/* the result */
-  },
-  "sload -a tty(0)\r\n",		/* download command */
-  ">> ",				/* monitor command prompt */
-  "",					/* end-of-command delimitor */
-  "",					/* optional command terminator */
-  &array_ops,				/* target operations */
-  array_loadtypes,		/* loadtypes */
-  array_loadprotos,		/* loadprotos */
-  "4800",				/* supported baud rates */
-  SERIAL_2_STOPBITS,		/* number of stop bits */
-  array_regnames			/* registers names */
-};
-
-/*
- * array_open -- open the Array Tech LSI33k based RAID disk controller.
- */
-void
-array_open(args, from_tty)
-     char *args;
-     int from_tty;
-{
-  tmp_mips_processor_type = "lsi33k";	/* change the default from r3051 */
-  mips_set_processor_type_command ("lsi33k", 0);
-
-  baud_rate = 4800;			/* this is the only supported baud rate */
-  monitor_open (args, &array_cmds, from_tty);
-}
-
-/*
- * _initialize_array -- do any special init stuff for the target.
- */
-void
-_initialize_array ()
-{
-  init_monitor_ops (&array_ops);
-
-  array_ops.to_shortname = "array";
-  array_ops.to_longname = "Debug using the standard GDB remote protocol for the Array Tech target.";
-  array_ops.to_doc = "Debug using the standard GDB remote protocol for the Array Tech target.\n\
-Specify the serial device it is connected to (e.g. /dev/ttya).";
-  array_ops.to_open = array_open;
-
-  add_target (&array_ops);
-}
-
-
-
-
diff --git a/gdb/mpw-config.in b/gdb/mpw-config.in
index eb1badc..89f99f5 100644
--- a/gdb/mpw-config.in
+++ b/gdb/mpw-config.in
@@ -9,7 +9,7 @@ Set xdepfiles   '"{o}"mac-xdep.c.o'
 # Make a copy of this file and give it a different name, so it
 # won't be confused with GDB's serial.h.
 
-Duplicate -y "{MPW}"Interfaces:CIncludes:Serial.h MacSerial.h
+Duplicate -y "{CIncludes}"Serial.h MacSerial.h
 
 Echo "/* dummy */" >termio.h
 
diff --git a/gdb/remote-hms.c b/gdb/remote-hms.c
index 216e35e..5ec9fef 100644
--- a/gdb/remote-hms.c
+++ b/gdb/remote-hms.c
@@ -139,7 +139,7 @@ static struct monitor_ops hms_cmds =
   MONITOR_OPS_MAGIC		/* magic */
 };
 
-void
+static void
 hms_open (args, from_tty)
      char *args;
      int from_tty;
@@ -147,8 +147,8 @@ hms_open (args, from_tty)
   monitor_open (args, &hms_cmds, from_tty);
 }
 
-
 int write_dos_tick_delay;
+
 void
 _initialize_remote_hms ()
 {
@@ -165,7 +165,6 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
 }
 
 
-
 #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 */
diff --git a/gdb/ser-mac.c b/gdb/ser-mac.c
index 250375a..28f8591 100644
--- a/gdb/ser-mac.c
+++ b/gdb/ser-mac.c
@@ -248,7 +248,7 @@ static struct {
   int bits;
 } mac_baud_rate_table[] = {
   { 57600, baud57600 },
-  { 38400, 2 /* ??? */ },
+  { 38400, 1 },
   { 19200, baud19200 },
   { 9600, baud9600 },
   { 7200, baud7200 },