Merge tag 'fuse-1.5.6'

Tag Fuse 1.5.6

Author: fmeunier

ChangeLog

@@ -1,3 +1,27 @@
+2018-08-06  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
+
+        * Fuse 1.5.6 released.
+
+        * Emulation core improvements:
+          * Z80 flags register is now correct after SCF and CCF (Sergio
+            Baldoví).
+
+        * Miscellaneous improvements:
+          * Factor out common paths code between Linux and generic UNIX (Alberto
+            Garcia and Fredrick Meunier).
+          * More improvements disabling phantom typist after finishing loading
+            TAP or standard ROM TZX files (thanks, Alberto Garcia) (Fredrick
+            Meunier).
+          * Saving and loading binary data no longer increments tstate count
+            or triggers breakpoints (thanks, Sergio Baldoví) (Philip Kendall).
+          * "Variant" Alkatraz loaders (e.g. Gauntlet 3 and Shadow Dancer),
+            "Variant" Search Loader programs (e.g. Lotus Esprit Turbo
+            Challenge and Space Crusade) and Dinaload loaders (e.g. Astro Marine
+            Corps) are now accelerated (Philip Kendall).
+          * Stop RZX playback/recording on machine reset/change (Sergio
+            Baldoví).
+          * Various minor bugfixes.
+
 2018-07-01  Philip Kendall  <philip-fuse@shadowmagic.org.uk>
 
         * Fuse 1.5.5 released.

README

@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.5.5
+The Free Unix Spectrum Emulator (Fuse) 1.5.6
 ============================================
 
 Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -111,4 +111,4 @@ Usenet newsgroup `comp.sys.sinclair' or the World of Spectrum forums
 <http://www.worldofspectrum.org/forums/>.
 
 Philip Kendall <philip-fuse@shadowmagic.org.uk>
-1st July, 2018
+6th August, 2018

compat/Makefile.am

@@ -46,7 +46,8 @@ fuse_SOURCES += \
                 compat/unix/dir.c \
                 compat/unix/file.c \
                 compat/unix/osname.c \
-                compat/linux/paths.c \
+                compat/linux/relative_paths.c \
+                compat/unix/paths.c \
                 compat/unix/timer.c
 
 if HAVE_SOCKETS
@@ -70,6 +71,7 @@ fuse_SOURCES += \
                 compat/unix/dir.c \
                 compat/unix/file.c \
                 compat/unix/osname.c \
+                compat/unix/relative_paths.c \
                 compat/unix/paths.c \
                 compat/unix/timer.c
 

compat/linux/paths.c

@@ -0,0 +1,43 @@
+/* relative_paths.c: Path-related compatibility routines
+   Copyright (c) 1999-2012 Philip Kendall
+
+   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.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   Author contact information:
+
+   E-mail: philip-fuse@shadowmagic.org.uk
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "fuse.h"
+#include "ui/ui.h"
+
+void
+get_relative_directory( char *buffer, size_t bufsize )
+{
+  ssize_t retval = readlink( "/proc/self/exe", buffer, bufsize - 1 );
+  if( retval < 0 ) {
+    ui_error( UI_ERROR_ERROR, "error getting current working directory: %s",
+              strerror( -errno ) );
+    fuse_abort();
+  }
+  buffer[ retval ] = '\0';
+}

compat/linux/relative_paths.c

@@ -23,18 +23,18 @@
 
 #include <config.h>
 
-#include <errno.h>
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
 #endif				/* #ifdef HAVE_LIBGEN_H */
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "compat.h"
 #include "fuse.h"
 #include "ui/ui.h"
 
+void get_relative_directory( char *buffer, size_t bufsize );
+
 const char*
 compat_get_temp_path( void )
 {
@@ -89,15 +89,7 @@ compat_get_next_path( path_context *ctx )
       strncpy( buffer, fuse_progname, PATH_MAX );
       buffer[ PATH_MAX - 1 ] = '\0';
     } else {
-      size_t len;
-      len = PATH_MAX - strlen( fuse_progname ) - strlen( FUSE_DIR_SEP_STR );
-      if( !getcwd( buffer, len ) ) {
-        ui_error( UI_ERROR_ERROR, "error getting current working directory: %s",
-	          strerror( errno ) );
-        return 0;
-      }
-      strcat( buffer, FUSE_DIR_SEP_STR );
-      strcat( buffer, fuse_progname );
+      get_relative_directory( buffer, PATH_MAX );
     }
 
     path2 = dirname( buffer );

compat/unix/paths.c

@@ -0,0 +1,44 @@
+/* relative_paths.c: Path-related compatibility routines
+   Copyright (c) 1999-2012 Philip Kendall
+
+   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.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   Author contact information:
+
+   E-mail: philip-fuse@shadowmagic.org.uk
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "fuse.h"
+#include "ui/ui.h"
+
+void
+get_relative_directory( char *buffer, size_t bufsize )
+{
+  size_t len = bufsize - strlen( fuse_progname ) - strlen( FUSE_DIR_SEP_STR );
+  if( !getcwd( buffer, len ) ) {
+    ui_error( UI_ERROR_ERROR, "error getting current working directory: %s",
+              strerror( -errno ) );
+    fuse_abort();
+  }
+  strcat( buffer, FUSE_DIR_SEP_STR );
+  strcat( buffer, fuse_progname );
+}

compat/unix/relative_paths.c

@@ -19,12 +19,12 @@ dnl
 dnl E-mail: philip-fuse@shadowmagic.org.uk
 
 dnl Package version
-m4_define([fuse_version], [1.5.5])
+m4_define([fuse_version], [1.5.6])
 
 dnl Product full version
 m4_define([fuse_major_version], [1])
 m4_define([fuse_minor_version], [5])
-m4_define([fuse_micro_version], [5])
+m4_define([fuse_micro_version], [6])
 m4_define([fuse_nano_version],  [0])
 m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
 m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])

configure.ac

@@ -117,6 +117,7 @@ acceleration_detector( libspectrum_word pc )
       break;
     case 1:
       switch( b ) {
+      case 0x20: state = 40; break;     /* JR NZ - variant Alkatraz */
       case 0xc8: state = 2; break;	/* RET Z */
       default: return ACCELERATION_MODE_NONE;
       }
@@ -131,6 +132,7 @@ acceleration_detector( libspectrum_word pc )
       switch( b ) {
       case 0x00:			/* Search Loader */
       case 0x7f:			/* ROM loader and variants */
+      case 0xff:                        /* Dinaload */
 	state = 4; break;		/* Data byte */
       default: return ACCELERATION_MODE_NONE;
       }
@@ -279,6 +281,7 @@ acceleration_detector( libspectrum_word pc )
       break;
     case 26:
       switch( b ) {
+      case 0x28: state = 12; break;     /* JR Z - Space Crusade */
       case 0xd8: state = 27; break;	/* RET C */
       default: return ACCELERATION_MODE_NONE;
       }
@@ -352,7 +355,24 @@ acceleration_detector( libspectrum_word pc )
       break;
     case 39:
       switch( b ) {
-      case 0xf1: return ACCELERATION_MODE_INCREASING; /* Data byte */
+      case 0xf1:                        /* Normal data byte */
+      case 0xf3:                        /* Variant data byte */
+        return ACCELERATION_MODE_INCREASING;
+      default: return ACCELERATION_MODE_NONE;
+      }
+      break;
+
+    /* "Variant" Alkatraz */
+
+    case 40:
+      switch( b ) {
+      case 0x01: state = 41; break;     /* Data byte of JR NZ */
+      default: return ACCELERATION_MODE_NONE;
+      }
+      break;
+    case 41:
+      switch( b ) {
+      case 0xc9: state = 31; break;     /* RET */
       default: return ACCELERATION_MODE_NONE;
       }
       break;

loader.c

@@ -42,6 +42,7 @@
 #include "movie.h"
 #include "peripherals/ula.h"
 #include "pokefinder/pokemem.h"
+#include "rzx.h"
 #include "settings.h"
 #include "snapshot.h"
 #include "sound.h"
@@ -136,6 +137,10 @@ machine_select( libspectrum_machine type )
   int i;
   int error;
 
+  /* Stop any ongoing RZX */
+  rzx_stop_recording();
+  rzx_stop_playback( 1 );
+
   /* We don't want to have to deal with screen size changes in the movie code
      and recording movies where we change machines seems pretty obscure */
   movie_stop();