* Makefile.in (SUBDIRS): Add mswin so that make cleanup cleans up

	that directory.
	* defs.h utils.c (error warning):  Make message be const.
	* main.c (fputs_unfiltered):  Only send gdb_stdout and gdb_stderr
	to hook.  Otherwise send it to fputs.
	* monitor.c monitor.h (monitor_get_dev_name):  New function.  Does
	the obvious.
	* remote-e7000.c:  Remove debugify stuff.  Change printf, fprintf
	to _filtered forms to make output appear in GUIs.  Replace all
	uses of SERIAL_READCHAR with readchar, which has better error
	checking.
	* (e7000_parse_device):  Add prototype.
	* (readchar):  Improve doc.  Handle random serial errors.
	* (expect):  Disable notice_quit code.  It's busted.  Remove
	serial error handling (it's now handled in readchar).  Remove
	remote_debug echoing.  That's handled in readchar as well.
	* (e7000_parse_device):  Remove serial_flag arg.  It's not
	necessary.
	* (e7000_open):  Split into two pieces.  Second part is
	e7000_start_remote, and is error protected.  Now, when we connect
	to the target, we setup the initial frame and registers so that
	the user gets an immediate indication of where the target is.
	* (gch):  Remove debug output.  That's handled by readchar.
	* (e7000_read_inferior_memory):  Handle errors better.
	* (_initialize_remote_e7000):  Get rid of `<xxx>' things from
	command names.  They show up when doing completion and confuse
	things horribly.
	* ser-e7kpc.c:  Remove the last seven months of brain damage.  Get
	rid of the DLL's since we can access the device directly from Win32s
	and Win95.  Get rid of debugify crud.
	* serial.c:  Remove debugify cruft.
	* (serial_logchar serial_log_command serial_write serial_readchar
	serial_send_break serial_close):  Merge common functionality into
	serial_logchar.  Clean up rest of routines.
	* sparclet-rom.c:  Disembowel.  Leave only download routine.
	Download routine now switches to remote target automatically.
	* top.c (disconnect):  Only define if SIGHUP is defined.  Cleans
	up MSVC/Win32 problem.
	* utils.c (gdb_flush):  Don't call hook unless it's for gdb_stdout
	or gdb_stderr.
	* config/sh/tm-sh.h:  Define TARGET_SH for WinGDB.
	* config/sparc/tm-sparclet.h:  Remove override for prompt.

1 files changed, 83 insertions, 252 deletions

diff --git a/gdb/ser-e7kpc.c b/gdb/ser-e7kpc.c
index 4982b8c..b0976df 100644
--- a/gdb/ser-e7kpc.c
+++ b/gdb/ser-e7kpc.c
@@ -16,35 +16,25 @@
 
    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.  */
-
-/*#define DEBUGIFY*/
-#include "debugify.h"
-
-#define RMT_DBG(x) if (remote_debug) printf_unfiltered x
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#if defined __GO32__ || defined _WIN32
+#include "defs.h"
+#include "serial.h"
+#include "gdb_string.h"
 
-#if defined(__GO32__) || defined(_WIN32)
-#if defined(_WIN32)
-/* we define the 32-bit calls which thunk to 16-bit dll calls 
- */
-#include "win-e7kpc.h"
-#include "target.h"
+/* MSVC uses strnicmp instead of strncasecmp */
 #ifdef _MSC_VER
-/* msvc uses strnicmp instead of strncasecmp */
 #define strncasecmp strnicmp
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #define W32SUT_32
-#include "windefs.h"
-#include "w32sut.h"
+#include <w32sut.h>
 #endif
-#include "gdbwin.h"
 
-#else
+#ifdef __GO32__
 #include <sys/dos.h>
-#include "defs.h"
-#endif /* _WIN32 */
-#include "serial.h"
-
+#endif
 
 static int e7000pc_open PARAMS ((serial_t scb, const char *name));
 static void e7000pc_raw PARAMS ((serial_t scb));
@@ -99,107 +89,24 @@ static unsigned long pon;
 static unsigned long irqtop;
 static unsigned long board_at;
 
-#ifdef _WIN32
-/* These routines are normally part of the go32 dos extender.
- * We redefine them here to be calls into their Windoze equivs. */
-static void dosmemget(int offset, int length, void *buffer);
-static void dosmemput(const void *buffer, int length, int offset);
-
-/* dll entry points for w32se7kpc.dll; call kernel32 to thunk for us */
-typedef BOOL (APIENTRY * PUTREGISTER) (
-	HANDLE hModule,
-        LPCSTR lpsz16BitDLL,
-	LPCSTR lpszInitName,
-	LPCSTR lpszProcName,
-	UT32PROC * ppfn32Thunk,
-	FARPROC pfnUT32Callback,
-	LPVOID lpBuff
-	);
-
-/* dll entry points for w95e7kpc.dll and w31e7kpc.dll */
-HANDLE hWine7kpc = 0;
-
-typedef int (APIENTRY * PWIN_LOAD_E7KPC) (void);
-typedef void (APIENTRY * PWIN_UNLOAD_E7KPC) (void);
-typedef void (APIENTRY * PWIN_MEM_GET) (unsigned char *buf, int len, int offset);
-typedef void (APIENTRY * PWIN_MEM_PUT) (unsigned char *buf, int len, int offset);
-typedef void (APIENTRY * PWIN_REMOTE_DEBUG) (int val);
-
-PWIN_LOAD_E7KPC pwin_load_e7kpc=NULL;
-PWIN_UNLOAD_E7KPC pwin_unload_e7kpc=NULL;
-PWIN_MEM_GET pwin_mem_get=NULL;
-PWIN_MEM_PUT pwin_mem_put=NULL;
-PWIN_REMOTE_DEBUG pwin_remote_debug=NULL;
-
-static int last_remote_debug = 0;
-static int wine7kpc_loaded = 0;
-static void win_unload_e7kpc (void);
-
-static int win_load_e7kpc (void)
-{
-    if (pwin_load_e7kpc && !wine7kpc_loaded)
-    {
-      wine7kpc_loaded = pwin_load_e7kpc();
-      if (wine7kpc_loaded)
-	  make_final_cleanup(win_unload_e7kpc, 0);
-    }
-    return wine7kpc_loaded;
-}
-
-static void win_unload_e7kpc (void)
-{
-    DBG(("win_unload_e7kpc\n"));
-    if (pwin_unload_e7kpc && wine7kpc_loaded)
-      pwin_unload_e7kpc();
-    wine7kpc_loaded = 0;
-}
-
-static void win_mem_get (unsigned char *buf, int offset, int len)
-{
-    DBG(("win_mem_get(&buf=<x%x> offset=<x%x> len=<%d>)\n", buf, offset, len));
-    if (remote_debug!=last_remote_debug && pwin_remote_debug)
-    {
-	pwin_remote_debug(remote_debug);
-        last_remote_debug=remote_debug;
-    }
-    if (pwin_mem_get) 
-    {
-        pwin_mem_get (buf, offset, len);
-    }
-}
-
-static void win_mem_put (unsigned char *buf, int offset, int len)
-{
-    DBG(("win_mem_put(buf=<%s> offset=<x%x> len=<%d>)\n", buf, offset, len));
-    if (remote_debug!=last_remote_debug && pwin_remote_debug)
-    {
-	pwin_remote_debug(remote_debug);
-        last_remote_debug=remote_debug;
-    }
-    if (pwin_mem_put)
-      pwin_mem_put (buf, offset, len);
-}
-
-static void dosmemget(int offset, int length, void *buffer)
-{
-    win_mem_get(buffer, offset, length);
-}
-
-static void dosmemput(const void *buffer, int length, int offset)
-{
-    win_mem_put((unsigned char*)buffer, offset, length);
-}
-
-#endif /* _WIN32 */
+#ifdef __GO32__
 
 #define SET_BYTE(x,y)   { char _buf = y;dosmemput(&_buf,1, x);}
 #define SET_WORD(x,y)   { short _buf = y;dosmemput(&_buf,2, x);}
 #define GET_BYTE(x)     ( dosmemget(x,1,&bb), bb)
 #define GET_WORD(x)     ( dosmemget(x,2,&sb), sb)
-
 static unsigned char bb;
 static unsigned short sb;
 
+#else /* win32 */
+
+#define SET_BYTE(x,y)   *(volatile unsigned char *)(x) = (y)
+#define SET_WORD(x,y)   *(volatile unsigned short *)(x) = (y)
+#define GET_BYTE(x)     (*(volatile unsigned char *)(x))
+#define GET_WORD(x)     (*(volatile unsigned short *)(x))
+#define dosmemget(FROM, LEN, TO) memcpy ((void *)(TO), (void *)(FROM), (LEN))
+#define dosmemput(FROM, LEN, TO) memcpy ((void *)(TO), (void *)(FROM), (LEN))
+#endif
 
 static struct sw 
 {
@@ -212,19 +119,51 @@ static struct sw
   {0x17, 0xdc000},
   0};
 
+#ifndef __GO32__
+/* Get the base of the data segment.  This is needed to calculate the offset
+   between data segment addresses and the base of linear memory, which is where
+   device registers reside.  Note that this is really only necessary for
+   Win32s, since Win95 and NT keep the data segment at linear 0.  */
+
+static unsigned long
+get_ds_base (void)
+{
+  unsigned short dsval;
+  LDT_ENTRY ldt;
+  unsigned long dsbase;
+
+  __asm
+    {
+      mov dsval,ds
+    }
+
+  dsbase = 0;
+
+  GetThreadSelectorEntry (GetCurrentThread(), dsval, &ldt);
+
+  dsbase = ldt.HighWord.Bits.BaseHi << 24 | ldt.HighWord.Bits.BaseMid << 16
+	     | ldt.BaseLow;
+
+  return dsbase;
+}
+#else /* !__GO32__ */
+#define get_ds_base() 0
+#endif /* __GO32__ */ 
+
 static int
 e7000pc_init ()
 {
-  /* Look around in memory for the board's signature */
-
   int try;
+  unsigned long dsbase;
   
-  DBG(("e7000pc_init()\n"));
-  for (try = 0; sigs[try].sw; try++)
+  dsbase = get_ds_base ();
 
+  /* Look around in memory for the board's signature */
+
+  for (try = 0; sigs[try].sw; try++)
     {
       int val;
-      board_at = sigs[try].addr;
+      board_at = sigs[try].addr - dsbase;
       fa = board_at + OFF_FA;
       fb = board_at + OFF_FB;
       cpd = board_at + OFF_CPD;
@@ -233,32 +172,27 @@ e7000pc_init ()
       pon = board_at + OFF_PON;	      
       irqtop = board_at + OFF_IRQTOP;
       irqtod = board_at + OFF_IRQTOD;
-
-      RMT_DBG(("e7000pc_init: looking for board's signature, try=%d\n", try));
-
+      
       val = GET_WORD (ready);
 
       if (val == (0xaaa0  | sigs[try].sw))
 	{
-	  if (GET_BYTE (pon) & 0xf)
+	  if (GET_WORD (pon) & 0xf)
 	    {
-	      SET_BYTE(fa, 0);
-	      SET_BYTE (fb, 0);
+	      SET_WORD (fa, 0);
+	      SET_WORD (fb, 0);
 
-	      SET_BYTE (irqtop, 1); /* Disable interrupts from e7000 */
+	      SET_WORD (irqtop, 1); /* Disable interrupts from e7000 */
 	      SET_WORD (ready, 1);
-              DBG(("Yippie!  Connected :-)\n"));
 	      printf_filtered ("\nConnected to the E7000PC at address 0x%x\n", 
 			       sigs[try].addr);
 	      return 1;	      
 	    }
-          DBG(("Bummer!  e7000pc not on :-(\n"));
 	  error ("The E7000 PC board is working, but the E7000 is turned off.\n");
 	  return 0;
 	}
     }
 
-  DBG(("Bummer!  Can't connect :-(\n"));
   error ("GDB cannot connect to the E7000 PC board, check that it is installed\n\
 and that the switch settings are correct.  Some other DOS programs can \n\
 stop the board from working.  Try starting from a very minimal boot, \n\
@@ -271,32 +205,29 @@ its I/O space, remove other unneeded cards, etc etc\n");
 static int pbuf_size;
 static int pbuf_index;
 
-static 
-int 
-e7000_get ()
+/* Return next byte from cdp.  If no more, then return -1.  */
+
+static int 
+e7000_get (void)
 {
   static char pbuf[1000];
   char tmp[1000];
   int x;
-  DBG(("e7000_get()\n"));
+
   if (pbuf_index < pbuf_size) 
     {
       x = pbuf[pbuf_index++];
     }
-  else if ((GET_BYTE (fb)  & 1))
+  else if ((GET_WORD (fb) & 1))
     {
       int i;
-      pbuf_size = GET_WORD(cdp + 2);
+      pbuf_size = GET_WORD (cdp + 2);
 
       dosmemget (cdp + 8, pbuf_size + 1, tmp);
 
       /* Tell the E7000 we've eaten */
-      SET_BYTE(fb,0);	
+      SET_WORD (fb, 0);	
       /* Swap it around */
-/* FIXME!  We get in an infinite loop inside e7000_open...
- * This is called from dosasync_readchar
- * called from remote-e7000.c trying to sync up.
- */
       for (i = 0; i < pbuf_size; i++) 
 	{
 	  pbuf[i] = tmp[i^1];
@@ -311,6 +242,9 @@ e7000_get ()
   return x;
 }
 
+/* Works just like read(), except that it takes a TIMEOUT in seconds.  Note
+   that TIMEOUT == 0 is a poll, and TIMEOUT == -1 means wait forever. */
+
 static int
 dosasync_read (fd, buf, len, timeout)
      int fd;
@@ -323,7 +257,6 @@ dosasync_read (fd, buf, len, timeout)
   long then;
   int i = 0;
 
-  DBG(("dosasync_read(fd=x%x,buf,len=x%x,timeout=x%x)\n",fd,len,timeout));
   /* Then look for some more if we're still hungry */
   time (&now);
   then = now + timeout;
@@ -332,7 +265,7 @@ dosasync_read (fd, buf, len, timeout)
       int ch = e7000_get();
       
       /* While there's room in the buffer, and we've already
-       * read the stuff in, suck it over */
+	 read the stuff in, suck it over */
       if (ch != -1) 
 	{
 	  buf[i++] = ch;
@@ -347,14 +280,10 @@ dosasync_read (fd, buf, len, timeout)
 
       time (&now);
 
-      if (timeout == 0 || (now >= then && timeout > 0))
+      if (timeout == 0)
+	return i;
+      if (now >= then && timeout > 0)
 	{
-/* We timeout here but return i anyway...  
- * were we supposed to send a TIMEOUT ?
- * While syncing, len = 1 and timeout=1..
- * so always take this path and return 1 char. 
- */
-	  DBG(("timeout; read x%x chars\n", i));
 	  return i;
 	}
     }
@@ -370,8 +299,6 @@ dosasync_write (fd, buf, len)
 {
   int i;
   char dummy[1000];  
-
-  DBG(("dosasync_write(fd=x%x,buf=x%x,len=x%x)\n",fd,buf,len));
   
   /* Construct copy locally */
   ((short *)dummy)[0] = CMD_CI;
@@ -384,119 +311,33 @@ dosasync_write (fd, buf, len)
     }
 
   /* Wait for the card to get ready */
-  while ((GET_BYTE(fa) & 1) != 0)
-    ;
+  while (GET_WORD (fa) & 1) ;
 
   /* Blast onto the ISA card */
   dosmemput (dummy, 8 + len + 1,  cpd);
 
-  SET_BYTE(fa, 1);
-  SET_BYTE(irqtod, 1); /* Interrupt the E7000 */
+  SET_WORD (fa, 1);
+  SET_WORD (irqtod, 1); /* Interrupt the E7000 */
 
   return len;
 }
 
-
-#ifdef _WIN32
-static int 
-load_wine7kpc(void)
-{
-  char dll[64];
-
-  DBG(("load_wine7kpc()\n"));
-  if (win_host()==winnt)
-    {
-        printf_filtered( "e7000pc not supported on this host.\n" );
-        return 0;
-    }
-  if (win_host()==win32s)
-      strcpy(dll, "w31e7kpc.Dll");
-  else if (win_host()==win95)
-      strcpy(dll, "w95e7kpc.Dll");
-  else return 0;
-
-  /* load dll for windows support of e7000pc */
-  DBG(("LoadLibrary(%s)\n",dll));
-  hWine7kpc = LoadLibrary (dll);
-  if (!hWine7kpc)
-    {
-        DBG(("LoadLibrary(%s) failed\n",dll));
-        printf_filtered( "Error: unable to load %s.\n",dll);
-        return 0;
-    }
-  pwin_load_e7kpc = (PWIN_LOAD_E7KPC) GetProcAddress (hWine7kpc, "win_load_e7kpc");
-  if (!pwin_load_e7kpc)
-    {
-        DBG(("!pwin_load_e7kpc\n"));
-        printf_filtered( "Error: unable to resolve win_load_e7kpc.\n" );
-        return 0;
-    }
-  pwin_unload_e7kpc = (PWIN_UNLOAD_E7KPC) GetProcAddress (hWine7kpc, "win_unload_e7kpc");
-  if (!pwin_unload_e7kpc)
-    {
-        DBG(("!pwin_unload_e7kpc\n"));
-        printf_filtered( "Error: unable to resolve win_unload_e7kpc.\n" );
-        return 0;
-    }
-  pwin_mem_get = (PWIN_MEM_GET) GetProcAddress (hWine7kpc, "win_mem_get");
-  if (!pwin_mem_get)
-    {
-        DBG(("!pwin_mem_get\n"));
-        printf_filtered( "Error: unable to resolve win_mem_get.\n" );
-        return 0;
-    }
-  pwin_mem_put= (PWIN_MEM_PUT) GetProcAddress (hWine7kpc, "win_mem_put");
-  if (!pwin_mem_put)
-    {
-        DBG(("!pwin_mem_put\n"));
-        printf_filtered( "Error: unable to resolve win_mem_put.\n" );
-        return 0;
-    }
-  pwin_remote_debug= (PWIN_REMOTE_DEBUG) GetProcAddress (hWine7kpc, "win_remote_debug");
-  if (!pwin_remote_debug)
-    {
-        DBG(("!pwin_remote_debug\n"));
-        printf_filtered( "Error: unable to resolve win_remote_debug.\n" );
-        return 0;
-    }
-  DBG(("load_wine7kpc Done! :-)\n"));
-  return 1;
-}
-#endif /* _WIN32 */
-
 static int
 e7000pc_open (scb, name)
      serial_t scb;
      const char *name;
 {
-  DBG(("e7000pc_open\n"));
   if (strncasecmp (name, "pc", 2) != 0)
     {
       errno = ENOENT;
       return -1;
     }
-#ifdef _WIN32
-  if (!load_wine7kpc()) /* load windows dll for e7kpc support */
-    {
-        DBG(("Error! load_wine7kpc failed\n"));
-        printf_filtered("Failed to initialize dll for e7000pc support.\n" );
-        return -1;
-    }
-  if (win_load_e7kpc () != 0)
-    {
-      errno = ENOENT;
-      return -1;
-    }
-#endif /* _WIN32 */
+
   scb->fd = e7000pc_init ();
 
   if (!scb->fd)
-  {
-    DBG(("Error! !scb->fd\n"));
     return -1;
-  }
 
-  DBG(("e7000pc_open done! :-)\n"));
   return 0;
 }
 
@@ -521,12 +362,8 @@ e7000pc_readchar (scb, timeout)
 {
   char buf;
 
- DBG(("e7000pc_readchar\n"));
  top:
 
-  /* FIXME!  How does dosasync_read ever return 0?
-   * it always goes thru the loop once, so i>0
-   */
   if (dosasync_read (scb->fd, &buf, 1, timeout))
     {
       if (buf == 0) goto top;
@@ -548,7 +385,6 @@ e7000pc_get_tty_state (scb)
      serial_t scb;
 {
   struct e7000pc_ttystate *state;
-  DBG(("e7000pc_get_tty_state\n"));
 
   state = (struct e7000pc_ttystate *) xmalloc (sizeof *state);
 
@@ -595,7 +431,6 @@ e7000pc_write (scb, str, len)
      const char *str;
      int len;
 {
-  DBG(("e7000pc_write(scb,str=%s,len=x%x)\n",str,len));
   dosasync_write (scb->fd, str, len);
 
   return 0;
@@ -605,10 +440,6 @@ static void
 e7000pc_close (scb)
      serial_t scb;
 {
-  DBG(("e7000pc_close\n"));
-#ifdef _WIN32
-  win_unload_e7kpc ();
-#endif
 }
 
 static struct serial_ops e7000pc_ops =
@@ -642,4 +473,4 @@ _initialize_ser_e7000pc ()
 {
 
 }
-#endif /* defined(__GO32__) || defined(_WIN32) */
+#endif