Menu
▾
▴
[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[5603] trunk/libspectrum
|
From: <fr...@us...> - 2016-06-07 11:04:01
|
Revision: 5603
http://sourceforge.net/p/fuse-emulator/code/5603
Author: fredm
Date: 2016-06-07 11:03:58 +0000 (Tue, 07 Jun 2016)
Log Message:
-----------
Merge libspectrum_1_2_0-branch back to trunk.
Modified Paths:
--------------
trunk/libspectrum/ChangeLog
trunk/libspectrum/Makefile.am
trunk/libspectrum/README
trunk/libspectrum/configure.ac
trunk/libspectrum/doc/libspectrum.3
trunk/libspectrum/doc/libspectrum.txt
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/snapshot.c
Property Changed:
----------------
trunk/libspectrum/
Index: trunk/libspectrum
===================================================================
--- trunk/libspectrum 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum 2016-06-07 11:03:58 UTC (rev 5603)
Property changes on: trunk/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -6,6 +6,7 ##
/branches/libspectrum_0_5_0-branch:3809-3879
/branches/libspectrum_1_0_0-branch:4185-4219
/branches/libspectrum_1_1_0-branch:4928-5385
+/branches/libspectrum_1_2_0-branch:5388-5602
/branches/ntsc-2009-04-11/libspectrum:4000-4147
/branches/opus-20090722/libspectrum:4046-4059
/branches/wii-20080828/libspectrum:3757-3946
\ No newline at end of property
Modified: trunk/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/ChangeLog 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/ChangeLog 2016-06-07 11:03:58 UTC (rev 5603)
@@ -1,3 +1,42 @@
+2016-06-06 Philip Kendall <phi...@sh...>
+
+ * libspectrum 1.2.0 released.
+
+ * Allow finalising RZX recordings (Sergio Baldoví).
+
+ * Support for Didaktik D80 disk class (Gergely Szasz).
+
+ * Use SZX format for interspersed snapshots in RZX recordings (Sergio
+ Baldoví).
+
+ * Add libspectrum_{new,new0,renew}(), libspectrum_{m,re}alloc_n()
+ memory macros (Stuart Brady).
+
+ * Rename libspectrum_calloc() to libspectrum_malloc0_n() (Stuart Brady).
+
+ * Various minor bug fixes/improvements:
+ * Modernise autoconf support (Sergio Baldoví).
+ * Fix snapshot insertion in RZX recordings (Sergio Baldoví).
+ * Ensure we have an edge at the end of a tape - fixes loading of Moon
+ Cresta (Fredrick Meunier).
+ * Avoid reliance on undefined pointer overflow in buffer length checks
+ (Stuart Brady).
+ * Add ARRAY_SIZE macro (Stuart Brady).
+ * Fix overallocation for uncompressed Z80 v2 data blocks (Stuart
+ Brady).
+ * Check for overflow in libspectrum_calloc() (Stuart Brady).
+ * Replace automatic fallback to GLib replacement with --with-fake-glib
+ flag (Stuart Brady).
+ * const and static cleanups (Stuart Brady).
+ * Fix compilation on systems without stdint.h (Stuart Brady).
+ * C89 compilation fixes (Adrien Destugues)
+ * Refactor frame timings (Stuart Brady).
+ * Add pkg.m4 for PKG_CHECK_MODULES in case the platform doesn't have
+ pkg-config installed (Sergio Baldoví).
+ * Enable silent rules for perl and windres commands (Sergio Baldoví).
+ * Allow for the initial_level of PZX data blocks to have the default
+ value (Fredrick Meunier).
+
2013-05-24 Philip Kendall <phi...@sh...>
* libspectrum 1.1.1 released.
Modified: trunk/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/Makefile.am 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/Makefile.am 2016-06-07 11:03:58 UTC (rev 5603)
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 9:0:1 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 10:0:2 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: trunk/libspectrum/README
===================================================================
--- trunk/libspectrum/README 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/README 2016-06-07 11:03:58 UTC (rev 5603)
@@ -1,4 +1,4 @@
-libspectrum 1.1.1
+libspectrum 1.2.0
=================
libspectrum is a library which is designed to make the input and
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-24th May, 2013
+6th June, 2016
$Id$
Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/configure.ac 2016-06-07 11:03:58 UTC (rev 5603)
@@ -22,12 +22,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([libspectrum_version], [1.1.1])
+m4_define([libspectrum_version], [1.2.0])
dnl Product full version
m4_define([libspectrum_major_version], [1])
-m4_define([libspectrum_minor_version], [1])
-m4_define([libspectrum_micro_version], [1])
+m4_define([libspectrum_minor_version], [2])
+m4_define([libspectrum_micro_version], [0])
m4_define([libspectrum_nano_version], [0])
m4_define([libspectrum_full_version],
[libspectrum_major_version.libspectrum_minor_version.libspectrum_micro_version.libspectrum_nano_version])
@@ -35,7 +35,7 @@
[libspectrum_major_version,libspectrum_minor_version,libspectrum_micro_version,libspectrum_nano_version])
dnl Package info
-m4_define([libspectrum_copyright], ["(c) 1999-2013 Philip Kendall and others"])
+m4_define([libspectrum_copyright], ["(c) 1999-2016 Philip Kendall and others"])
m4_define([libspectrum_url],
[http://fuse-emulator.sourceforge.net/libspectrum.php])
m4_define([libspectrum_bugreport],
Modified: trunk/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/doc/libspectrum.3 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/doc/libspectrum.3 2016-06-07 11:03:58 UTC (rev 5603)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "24th May, 2013" "Version 1.1.1" "Emulators"
+.TH libspectrum 3 "6th June, 2016" "Version 1.2.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/doc/libspectrum.txt 2016-06-07 11:03:58 UTC (rev 5603)
@@ -1,4 +1,4 @@
-libspectrum 1.1.1
+libspectrum 1.2.0
=================
libspectrum is a fairly simple library designed to make the handling
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/hacking/ChangeLog 2016-06-07 11:03:58 UTC (rev 5603)
@@ -1033,6 +1033,14 @@
20160424 ChangeLog,README,configure.ac,doc/libspectrum.{3,txt},
hacking/ChangeLog: merge libspectrum_1_1_0-branch changes onto trunk
(Fred).
+20160424 ChangeLog,Makefile.am,README,configure.ac,doc/libspectrum.txt:
+ bump version number for 1.2.0 release (Fred).
+20160425 snapshot.c: revert [r5161] store PC-1 for all snapshot formats whilst
+ in the halted state as the matching Fuse changes are reverted for now
+ (Fred).
+20160425 ChangeLog,README: first updates for a "1.2.0" release (Fred).
+20160426 Makefile.am: change version to 10:0:2 as the ABI is compatible with
+ libspectrum 1.1.1 (Sergio).
20160427 tape_block.c: fix bugs handling TZX generalised data blocks with empty
symbol tables (e.g. ZX81 tapes encoded as in the TZX 1.20
specification) (patch #359) (Andre Leiradella).
@@ -1045,6 +1053,8 @@
20160430 README,doc/libspectrum.3: list more disk formats (Sergio).
20160501 Makefile.am,memory.c: don't use g_mem_set_vtable on newer GLib and
distribute missing macro files (Sergio).
+20160501 doc/libspectrum.3: bump more version numbers for 1.2.0 release
+ (Sergio).
20160503 accessor.pl,doc/libspectrum.txt,sna.c,snap_accessors.txt,snapshot.c,
szx.c,z80.c: add skeleton of support for Currah uSource snapshots
(patch #363) (Fred and Sergio).
@@ -1057,4 +1067,8 @@
(patch #364) (Fred).
20160521 szx.c: reset uncompressed size when loading Opus and +D custom ROM
(from patch #366) (Sergio).
+20160529 README,doc/libspectrum.3: update release dates (Fred).
+20160529 configure.ac: mark this release as 1.2.0-pre1 (Fred).
20160530 doc/libspectrum.txt: list more disk formats (Sergio).
+20160606 ChangeLog,README,configure.ac,doc/libspectrum.3: update release dates
+ and mark this release as 1.2.0 (Fred).
Modified: trunk/libspectrum/snapshot.c
===================================================================
--- trunk/libspectrum/snapshot.c 2016-06-07 10:36:29 UTC (rev 5602)
+++ trunk/libspectrum/snapshot.c 2016-06-07 11:03:58 UTC (rev 5603)
@@ -409,13 +409,6 @@
return LIBSPECTRUM_ERROR_LOGIC;
}
- /* Sadly, virtually all emulators handle saving of PC incorrectly when
- * executing a HALT instruction, so it's easiest to deal with this just
- * once, so that it affects all snapshot formats. */
- if( libspectrum_snap_halted( snap ) ) {
- libspectrum_snap_set_pc( snap, libspectrum_snap_pc( snap ) + 1 );
- }
-
libspectrum_free( new_buffer );
return error;
}
@@ -428,7 +421,6 @@
{
libspectrum_class_t class;
libspectrum_error error;
- libspectrum_word orig_pc;
error = libspectrum_identify_class( &class, type );
if( error ) return error;
@@ -439,29 +431,17 @@
return LIBSPECTRUM_ERROR_INVALID;
}
- /* Sadly, virtually all emulators handle saving of PC incorrectly when
- * executing a HALT instruction, so it's easiest to deal with this just
- * once, so that it affects all snapshot formats. */
- orig_pc = libspectrum_snap_pc( snap );
- if( libspectrum_snap_halted( snap ) ) {
- libspectrum_snap_set_pc( snap, orig_pc - 1 );
- }
-
switch( type ) {
case LIBSPECTRUM_ID_SNAPSHOT_SNA:
- error = libspectrum_sna_write( buffer, length, out_flags, snap, in_flags );
- break;
+ return libspectrum_sna_write( buffer, length, out_flags, snap, in_flags );
case LIBSPECTRUM_ID_SNAPSHOT_SZX:
- error = libspectrum_szx_write( buffer, length, out_flags, snap, creator,
- in_flags );
- break;
+ return libspectrum_szx_write( buffer, length, out_flags, snap, creator,
+ in_flags );
case LIBSPECTRUM_ID_SNAPSHOT_Z80:
- error = libspectrum_z80_write2( buffer, length, out_flags, snap,
- in_flags );
- break;
+ return libspectrum_z80_write2( buffer, length, out_flags, snap, in_flags );
default:
libspectrum_print_error( LIBSPECTRUM_ERROR_UNKNOWN,
@@ -469,11 +449,6 @@
return LIBSPECTRUM_ERROR_UNKNOWN;
}
-
- /* Put back the correct value of PC, in case snap is needed again */
- libspectrum_snap_set_pc( snap, orig_pc );
-
- return error;
}
/* Given a 48K memory dump `data', place it into the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
