Fix build problems on Cygwin and FreeBSD

4 files changed, 41 insertions, 12 deletions

diff --git a/remote.c b/remote.c
index f568673..f7d0d7b 100644
--- a/remote.c
+++ b/remote.c
@@ -57,8 +57,7 @@ create_socket (int port)
     }
 
   // Forcefully attaching socket to the port
-  if (setsockopt (server_fd, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT,
-		  &opt, sizeof (opt)))
+  if (setsockopt (server_fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof (opt)))
     {
       perror ("setsockopt");
       return 0;
@@ -404,6 +403,11 @@ gdb_remote (int port)
   sis_gdb_break = 1;
   detach = 0;
   signal (SIGIO, int_handler);
+#ifdef __CYGWIN__
+  printf ("Warning: gdb cannot interrupt a running simulator under CYGWIN\n");
+  printf
+    ("         As a workaround, use Ctrl-C in the simulator window instead\n\n");
+#endif
   printf ("gdb: listening on port %d ", port);
   while (cont)
     {
@@ -454,11 +458,18 @@ gdb_remote (int port)
 	      if (sis_verbose)
 		printf ("tx: +\n");
 	      send (new_socket, &ack, 1, 0);
-	      strcpy (sendbuf, "$");
-	      cont = gdb_remote_exec (&buffer[res]);
-	      if (sis_verbose)
-		printf ("tx: %s\n", sendbuf);
-	      send (new_socket, sendbuf, strlen (sendbuf), 0);
+	      if (detach)
+		{
+		  cont = 0;
+		}
+	      else
+		{
+		  strcpy (sendbuf, "$");
+		  cont = gdb_remote_exec (&buffer[res]);
+		  if (sis_verbose)
+		    printf ("tx: %s\n", sendbuf);
+		  send (new_socket, sendbuf, strlen (sendbuf), 0);
+		}
 	    }
 	  else
 	    {
diff --git a/sis.info b/sis.info
index 8b4e941..9c9ff10 100644
--- a/sis.info
+++ b/sis.info
@@ -1,6 +1,6 @@
 This is sis.info, produced by makeinfo version 6.5 from sis.texi.
 
-This manual is for SIS (version 2.15, 21 May 2019).
+This manual is for SIS (version 2.15, 31 May 2019).
 
    Copyright (C) 2019 Free Software Foundation, Inc.
 
@@ -21,7 +21,7 @@ File: sis.info,  Node: Top,  Next: Introduction,  Up: (dir)
 SIS
 ***
 
-This manual is for SIS (version 2.15, 21 May 2019).
+This manual is for SIS (version 2.15, 31 May 2019).
 
 * Menu:
 
@@ -696,6 +696,14 @@ SIS uses the GNU autoconf system, and can simply be build using
 './configure' followed by 'make'.  To build a PDF version of the manual,
 do 'make sis.pdf'.
 
+   The following custom configure options are recognized:
+
+'-enable-l1cache'
+     Enable the emulation of a L1 cache in multi-processor systems.
+     Each core in an MP LEON3/RISC-V system will have a 4Kbyte
+     instruction cache and a 4 Kbyte data cache.  The cache only affects
+     instruction timing, and has no effect on instruction behaviour.
+
 
 File: sis.info,  Node: GNU Free Documentation License,  Next: Index,  Prev: Building SIS,  Up: Top
 
@@ -1209,7 +1217,7 @@ Node: Multi-processing20477
 Node: Interfacing to GDB20973
 Node: Code coverage21383
 Node: Building SIS22388
-Node: GNU Free Documentation License22686
-Node: Index47830
+Node: GNU Free Documentation License23037
+Node: Index48181
 
 End Tag Table
diff --git a/sis.texi b/sis.texi
index bbf6f4e..4392138 100644
--- a/sis.texi
+++ b/sis.texi
@@ -688,6 +688,16 @@ SIS uses the GNU autoconf system, and can simply be build using
 @code{./configure} followed by @code{make}. To build a PDF version of the
 manual, do @code{make sis.pdf}.
 
+The following custom configure options are recognized:
+
+@table @code
+@item -enable-l1cache
+Enable the emulation of a L1 cache in multi-processor systems. Each core in an
+MP LEON3/RISC-V system will have a 4Kbyte instruction cache and a 4 Kbyte data
+cache. The cache only affects instruction timing, and has no effect on instruction
+behaviour.
+@end table
+
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
diff --git a/version.texi b/version.texi
index 1a5a276..1005ceb 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 21 May 2019
+@set UPDATED 31 May 2019
 @set UPDATED-MONTH May 2019
 @set EDITION 2.15
 @set VERSION 2.15