[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[805] vendor/fuse-emulator/current
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[805] vendor/fuse-emulator/current
|
From: <fr...@us...> - 2016-06-06 13:23:21
|
Revision: 805
http://sourceforge.net/p/fuse-for-macosx/code/805
Author: fredm
Date: 2016-06-06 13:23:18 +0000 (Mon, 06 Jun 2016)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/svg.c
vendor/fuse-emulator/current/fuse/svg.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-06-06 13:23:18 UTC (rev 805)
@@ -42,7 +42,7 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
- the 'movie' code and the ALSO and ao sound drivers.
+ the 'movie' code and the ALSA and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
+$Id: AUTHORS 5569 2016-06-01 11:12:38Z fredm $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,4 +1,4 @@
-2016-??-?? Philip Kendall <phi...@sh...>
+2016-06-06 Philip Kendall <phi...@sh...>
* Fuse 1.2.0 released.
@@ -12,46 +12,51 @@
* Allow continuing RZX recordings if there is a final snapshot in the
RZX (Sergio Baldoví).
* Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Use SZX format for the initial snapshot in RZX files (Sergio
+ Baldoví).
* Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
- * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
- traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
* Migrate disk "index event" handling to the FDD layer and have the
FDC layer use it for their STATUS registers (Gergely Szasz).
- * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
- * Leave most registers unchanged on a soft reset (Stuart Brady).
- * Emulate interrupt and NMI timings more precisely (Stuart Brady).
- * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
- * Switch to 2KB page size (Stuart Brady).
* Implement WD2797 emulation (Gergely Szasz).
- * Skip tape traps if VERIFY is requested (UB880D).
- * Fix inaccurate output when AY envelopes are used (Matthew Westcott
- and Fredrick Meunier)
- * Fix some peripherals activation when loading snapshots (Sergio
- Baldoví).
- * Fix loading sound with some custom loaders (Fredrick Meunier).
* Centralise the "Disk icon" update code to the FDD layer (Gergely
Szasz).
- * Check if data blocks are headers for handling PZX files (Fredrick
- Meunier).
- * Correct display of pulses in PZX pulse block for tape browser
- (Fredrick Meunier).
* Fix disk image corruption after saving UDI files (Sergio Baldoví).
* Check ready status after loading a disk into floppy disk drive
(thanks, John Elliott) (Sergio Baldoví).
* Fix overlapped SEEK commands (Sergio Baldoví).
* Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
(Sergio Baldoví).
+ * Fix writing .td0 format disk files (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier).
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
* Machine specific improvements:
- * The Timex SCLD is contended in all of the home, Dock and Exrom banks
- in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
- Meunier).
+ * The address range 0x4000 - 0x7FFF is contended on the TS2068 in the
+ home, Dock and Exrom banks (thanks, Richard Atkinson). It is assumed
+ that this is the same for other Timex models (Fredrick Meunier).
* Clear all Opus RAM on hard reset (Stuart Brady).
* Ensure the ZX Printer does not require a hard reset to enable
(thanks, RMartins) (Fredrick Meunier).
* Fix timing of events when emulating Scorpion (Stuart Brady).
* Ensure we have successfully selected a Pentagon or a Timex machine
before inserting their media (Fredrick Meunier).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (thanks, windale) (Sergio Baldoví).
* Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
(Sergio Baldoví).
* Don't enable the Beta 128 interface when loading a snapshot on a
@@ -61,10 +66,7 @@
Meunier).
* Spectranet: fix segfault in error handling when setting SO_REUSEADDR
(Stuart Brady).
- * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
- timing compatibility (part of feature request #90) (thanks, windale)
- (Sergio Baldoví).
- * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
* Debugger improvements:
* Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
@@ -75,7 +77,6 @@
Baldoví).
* Timex EXROM and Dock text was truncated in the debugger UI (thanks,
Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
- * Don't trap on breakpoints whilst halted (Stuart Brady).
* Win32: relocate halted flag and set monospaced font (Sergio
Baldoví).
* Fix memory issues when removing a matched breakpoint (Tom Seddon).
@@ -85,6 +86,11 @@
* Fix documentation of address syntax used in debugger section
(Sergio Baldoví).
* Allow debugger to dereference memory locations (Philip Kendall).
+ * Allow strings with escaped spaces in the debugger (Sergio Baldoví).
+ * Make wildcard event breakpoints work (thanks, Sergio Baldoví)
+ (Philip Kendall).
+ * Protect divide expression from a divide by zero exception (Fredrick
+ Meunier).
* Miscellaneous improvements:
* Remove warnings in aosound (Rene Ladan).
@@ -107,7 +113,7 @@
* Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
* Fix desktop integration rules to cope with VPATH builds (Sergio
Baldoví).
- * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Modernise autoconf support (Sergio Baldoví).
* Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
(Sergio Baldoví).
* Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
@@ -121,7 +127,8 @@
* Don't show an error when rewinding an empty tape (Sergio Baldoví).
* GTK UI: clear out row mark in tape browser when selecting another
block (Sergio Baldoví).
- * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart Brady and Sergio
+ Baldoví).
* Split Select ROMs menu into Machines and Peripherals (Gergely
Szasz).
* Only try to load the fallback ROM if it is different to the standard
@@ -159,11 +166,11 @@
(Fredrick Meunier).
* GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
Crisis) (Sergio Baldoví).
- * Don't show hidden files/directories in the file selector on Widget
+ * Don't show hidden files/directories in the file selector on Widget
UIs (Sergio Baldoví).
- * Remember filename when saving a recently formatted disk (Sergio
+ * Remember filename when saving a recently formatted disk (Sergio
Baldoví).
- * GTK UI: Change the resizing method for GTK+ UI for better
+ * GTK UI: Change the resizing method for GTK+ UI for better
compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
Baldoví).
@@ -1288,4 +1295,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
+$Id: ChangeLog 5594 2016-06-06 10:46:46Z fredm $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5537 2016-05-29 06:17:00Z sbaldovi $
## 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
@@ -131,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_create_stdint_h.m4 \
m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/README 2016-06-06 13:23:18 UTC (rev 805)
@@ -24,9 +24,11 @@
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
-* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+* Emulation of the Currah µSource, DivIDE, Fuller audio box, Interface 1,
+ Kempston mouse, SpecDrum, Spectrum +3e, ZXATASP and ZXCF interfaces.
+* Emulation of the Beta 128, +D, Didaktik 80/40, DISCiPLE and Opus Discovery
interfaces.
+* Emulation of the Spectranet and SpeccyBoot interfaces.
Help! <xyz> doesn't work
------------------------
@@ -106,6 +108,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-24th May, 2013
+6th June, 2016
-$Id: README 5403 2016-04-25 13:10:53Z fredm $
+$Id: README 5594 2016-06-06 10:46:46Z fredm $
Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 5500 2016-05-21 05:38:43Z fredm $
+dnl $Id: configure.ac 5594 2016-06-06 10:46:46Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
dnl Package info
-m4_define([fuse_copyright], ["(c) 1999-2013 Philip Kendall and others"])
+m4_define([fuse_copyright], ["(c) 1999-2016 Philip Kendall and others"])
m4_define([fuse_url], [http://fuse-emulator.sourceforge.net/])
m4_define([fuse_bugreport], [http://sourceforge.net/p/fuse-emulator/bugs/])
Modified: vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
===================================================================
--- vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,6 +1,5 @@
-#!/bin/bash
+# fuse: bash completion for fuse-emulator
-# fuse: bash completion for fuse-emulator
# Copyright (c) 2015 Sergio Baldoví
# This program is free software; you can redistribute it and/or modify
@@ -51,7 +50,7 @@
case $prev in
--betadisk|--discipledisk|--didaktik80disk|--opusdisk| \
--plus3disk|--plusddisk)
- _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI)'
+ _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI)'
return 0
;;
--disk-try-merge)
@@ -222,7 +221,6 @@
--no-movie-stop-after-rzx --no-opus --no-pal-tv2x
--no-plus3-detect-speedlock --no-plusd --no-printer
--no-raw-s-net --no-rs232-handshake
- --no-rs232-rx --no-rs232-tx
--no-rzx-autosaves --no-simpleide --no-slt --no-sound
--no-sound-force-8bit --no-speccyboot --no-specdrum
--no-spectranet --no-spectranet-disable --no-statusbar
@@ -258,7 +256,7 @@
--zxatasp-write-protect --zxcf --zxcf-cffile --zxcf-upload
--zxprinter' -- "$cur" ) )
else
- _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
+ _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
fi
} &&
complete -F _fuse -o filenames fuse
Modified: vendor/fuse-emulator/current/fuse/debugger/commandl.l
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2013 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandl.l 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandl.l 5539 2016-05-29 10:49:51Z fredm $
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
@@ -47,7 +47,7 @@
%}
-ID [a-z][a-z0-9]+
+ID [a-z]([a-z0-9]|\\[ ])+
%option caseless
@@ -124,8 +124,8 @@
"+" { return '+'; }
"-" { return '-'; }
-"*" { yylval.token = '*'; return TIMES_DIVIDE; }
-"/" { yylval.token = '/'; return TIMES_DIVIDE; }
+"*" { return '*'; }
+"/" { return '/'; }
"&" { return '&'; }
"^" { return '^'; }
@@ -146,7 +146,20 @@
if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
return NUMBER; }
-{ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext ); return STRING; }
+{ID} { char *dest, *source;
+ yylval.string = mempool_malloc( debugger_memory_pool, strlen( yytext ) + 1 );
+ /* remove escape characters */
+ dest = yylval.string;
+ source = yytext;
+ while( *source ) {
+ if( *source != '\\' ) {
+ *dest++ = *source;
+ }
+ source++;
+ }
+ *dest = '\0';
+ return STRING; }
+
${ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext + 1 ); return VARIABLE; }
\n { return '\n'; }
Modified: vendor/fuse-emulator/current/fuse/debugger/commandy.y
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2015 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandy.y 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandy.y 5539 2016-05-29 10:49:51Z fredm $
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
@@ -72,7 +72,6 @@
%token <token> COMPARISON /* < > <= >= */
%token <token> EQUALITY /* == != */
%token <token> NEGATE /* ! ~ */
-%token <token> TIMES_DIVIDE /* * / */
%token BASE
%token BREAK
@@ -138,7 +137,7 @@
%left EQUALITY
%left COMPARISON
%left '+' '-'
-%left TIMES_DIVIDE
+%left '*' '/'
%right NEGATE /* Unary minus, unary plus, !, ~ */
/* High precedence */
@@ -169,6 +168,10 @@
debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
$3, $5, 0, $1, $6 );
}
+ | breakpointlife EVENT STRING ':' '*' optionalcondition {
+ debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
+ $3, "*", 0, $1, $6 );
+ }
| CLEAR numberorpc { debugger_breakpoint_clear( $2 ); }
| COMMANDS number '\n' debuggercommands DEBUGGER_END { debugger_breakpoint_set_commands( $2, $4 ); }
| CONDITION NUMBER expressionornull {
@@ -268,10 +271,14 @@
$$ = debugger_expression_new_binaryop( '-', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
- | expression TIMES_DIVIDE expression {
- $$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
+ | expression '*' expression {
+ $$ = debugger_expression_new_binaryop( '*', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
+ | expression '/' expression {
+ $$ = debugger_expression_new_binaryop( '/', $1, $3, debugger_memory_pool );
+ if( !$$ ) YYABORT;
+ }
| expression EQUALITY expression {
$$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
Modified: vendor/fuse-emulator/current/fuse/debugger/event.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/event.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/event.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -65,6 +65,7 @@
{
if( strcasecmp( type, event->type ) ) return 0;
if( strcmp( detail, "*" ) == 0 ) return 1;
+ if( strcmp( event->detail, "*" ) == 0 ) return 1;
return strcasecmp( detail, event->detail ) == 0;
}
Modified: vendor/fuse-emulator/current/fuse/debugger/expression.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/expression.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/expression.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -367,8 +367,14 @@
case '*': return debugger_expression_evaluate( binary->op1 ) *
debugger_expression_evaluate( binary->op2 );
- case '/': return debugger_expression_evaluate( binary->op1 ) /
- debugger_expression_evaluate( binary->op2 );
+ case '/': {
+ libspectrum_dword op2 = debugger_expression_evaluate( binary->op2 );
+ if( op2 == 0 ) {
+ ui_error( UI_ERROR_ERROR, "divide by 0" );
+ return 0;
+ }
+ return debugger_expression_evaluate( binary->op1 ) / op2;
+ }
case DEBUGGER_TOKEN_EQUAL_TO:
return debugger_expression_evaluate( binary->op1 ) ==
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -617,13 +617,11 @@
start_files->disk_beta = filename; break;
case LIBSPECTRUM_CLASS_DISK_GENERIC:
- if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PLUS2A )
+ if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_DISK )
start_files->disk_plus3 = filename;
- else if( machine_current->machine == LIBSPECTRUM_MACHINE_PENT ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT512 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT1024 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_SCORP )
+ else if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_TRDOS_DISK )
start_files->disk_beta = filename;
else {
if( periph_is_active( PERIPH_TYPE_BETA128 ) )
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -5097,7 +5097,7 @@
20160503 peripherals/usource.c: add support for Currah uSource snapshots (patch
#363) (Fred and Sergio).
20160503 z80/z80c: complete revert accurate emulation of the HALT instruction
- in [r5160] as it causes [bugs:#316] and there is no current resolution
+ in [r5160] as it causes [bugs:#329] and there is no current resolution
(Fred).
20160508 peripherals/disk/beta.c: don't enable the Beta128 interface when
loading a snapshot on a machine with Beta built-in (fixes bug #342)
@@ -5163,3 +5163,56 @@
format (Sergio).
20160523 compat.h,settings.pl: use Windows line endings for plain text settings
(Sergio).
+20160524 rzx.c: use SZX format for the initial snapshot in RZX files (more from
+ bug #304) (Sergio).
+20160526 debugger/commandl.l,man/fuse.1: allow strings with escaped spaces in
+ the debugger (bug #337) (Sergio).
+20160528 ChangeLog: add even more recent changes (Fred).
+20160529 Makefile.am,lib/Makefile.am,z80/Makefile.am: distribute
+ m4/ax_create_stdint_h.m4,lib/tests/success.d80.bz2 and z80/tests/README
+ (Sergio).
+20160529 debugger/{commandl.l,commandy.y,event.c}: make wildcard events work
+ (fixes bug #349) (thanks, Sergio) (Phil).
+20160529 ChangeLog: add even more recent changes (Fred).
+20160529 README,man/fuse.1: update release dates (Fred).
+20160529 configure.ac: mark release as 1.2.0-pre1 (Fred).
+20160530 configure.ac: update more copyright dates (Sergio).
+20160530 z80/z80_ops.c: revert don't trap on breakpoints whilst halted in
+ [r5171] as it contributes to [bugs:#329] and there is no current
+ resolution (thanks, Guesser) (Fred).
+20160530 ChangeLog: remove reference to trap on breakpoints (Fred).
+20160530 ChangeLog: try to gather changes to related areas (Fred).
+20160531 svg.[hc],menu.c: tidy up svg_capture_mode (Fred).
+20160531 ui/ui.h: remove prototypes for obsolete functions (Fred).
+20160531 rzx.c: remove local arguments shadowing globals (Fred).
+20160531 z80/z80.c: remove local argument shadowing global (Fred).
+20160531 svg.c: don't declare svg_capture_mode when we don't have libxml2
+ (Fred).
+20160601 ChangeLog: fix typos (Fred).
+20160601 man/fuse.1: fix typo (Fred).
+20160601 menu.c,rzx.c: always report an error if we fail to continue a RZX
+ (Fred).
+20160601 fuse.c: use capabilities to decide whether a machine with a suitable
+ disk interface is currently running (Fred).
+20160601 AUTHORS: fix typo (Fred).
+20160602 ChangeLog: add Richard's full name, and tweak description as per
+ his advice (Phil).
+20160603 ChangeLog: fix spacing (Sergio).
+20160604 data/shell-completion/bash/fuse: add TRD file extension to bash
+ completion and remove wrong options (Sergio).
+20160604 data/shell-completion/bash/fuse: remove shebang in bash completion. The
+ script is meant to be sourced, not executed (Sergio).
+20160604 README: update list of supported interfaces (Sergio).
+20160604 debugger/expression.c: avoid doing divide by zero in debugger
+ expressions (fixes bug #350) (Fred).
+20160604 tape.c: fix use of tape traps if VERIFY is requested (thanks, Alberto
+ Garcia) (more from patch #337) (Fred).
+20160606 ui/{fb,gtk,sdl,svga,widget,wii,win32,xlib}/Makefile.am,z80/Makefile.am:
+ fix VPATH builds without dependency tracking (patch #368) (Alberto
+ Garcia).
+20160606 ChangeLog: add more recent changes (Sergio).
+20160606 ChangeLog: elaborate a bit more on the changes to contended memory for
+ Timex models (Fuse has changed all of them to follow the TS2068)
+ (Fred).
+20160606 ChangeLog,README,configure.ac,man/fuse.1: update release dates and mark
+ this release as 1.2.0 (Fred).
Modified: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 1999-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5537 2016-05-29 06:17:00Z sbaldovi $
## 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
@@ -82,6 +82,7 @@
lib_tests = \
lib/tests/fatware-success.hdf.bz2 \
lib/tests/idedos-success.hdf.bz2 \
+ lib/tests/success.d80.bz2 \
lib/tests/success.mdr \
lib/tests/success.mgt.bz2 \
lib/tests/success.opd \
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2016-06-06 13:23:18 UTC (rev 805)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "24th May, 2013" "Version 1.2.0" "Emulators"
+.TH fuse 1 "6th June, 2016" "Version 1.2.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -4537,10 +4537,10 @@
.RI ` ROM '
sources (e.g. offset 0x1234 in ROM\ 1 is specified as
.RI ` ROM:1:0x1234 "')."
-Another available sources are:
+Other available sources are:
.RI ` Betadisk "',"
-.RI ` "Didaktik RAM" "',"
-.RI ` "Didaktik ROM" "',"
+.RI ` "Didaktik 80 RAM" "',"
+.RI ` "Didaktik 80 ROM" "',"
.RI ` "DISCiPLE RAM" "',"
.RI ` "DISCiPLE ROM" "',"
.RI ` "DivIDE EPROM" "',"
@@ -4554,9 +4554,12 @@
.RI ` Spectranet "',"
.RI ` "Timex Dock" "',"
.RI ` "Timex EXROM" "',"
+.RI ` uSource "',"
.RI ` ZXATASP '
and
.RI ` ZXCF "'."
+Please, note that spaces in memory sources should be escaped, e.g.,
+`break Didaktik\\\ 80\\\ ROM:0:0x1234'.
The 48K machines are treated as having a permanent
mapping of page\ 5 at 0x4000, page\ 2 at 0x8000 and page\ 0 at 0xC000;
the 16K\ Spectrum is treated as having page\ 5 at 0x4000 and no page at
Modified: vendor/fuse-emulator/current/fuse/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/menu.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -771,8 +771,7 @@
if( !filename ) { fuse_emulation_unpause(); return; }
ui_menu_activate( UI_MENU_ITEM_FILE_SVG_CAPTURE, 1 );
- svg_capture_mode = SVG_CAPTURE_LINES;
- svg_startcapture( filename );
+ svg_startcapture( filename, SVG_CAPTURE_LINES );
fuse_emulation_unpause();
}
@@ -791,8 +790,7 @@
if( !filename ) { fuse_emulation_unpause(); return; }
ui_menu_activate( UI_MENU_ITEM_FILE_SVG_CAPTURE, 1 );
- svg_capture_mode = SVG_CAPTURE_DOTS;
- svg_startcapture( filename );
+ svg_startcapture( filename, SVG_CAPTURE_DOTS );
fuse_emulation_unpause();
}
@@ -920,6 +918,7 @@
MENU_CALLBACK( menu_file_recording_continuerecording )
{
char *rzx_filename;
+ int error;
if( rzx_playback || rzx_recording ) return;
@@ -928,8 +927,12 @@
rzx_filename = ui_get_open_filename( "Fuse - Continue Recording" );
if( !rzx_filename ) { fuse_emulation_unpause(); return; }
- rzx_continue_recording( rzx_filename );
+ error = rzx_continue_recording( rzx_filename );
+ if( error != LIBSPECTRUM_ERROR_NONE ) {
+ ui_error( UI_ERROR_WARNING, "RZX file cannot be continued" );
+ }
+
libspectrum_free( rzx_filename );
fuse_emulation_unpause();
Modified: vendor/fuse-emulator/current/fuse/rzx.c
===================================================================
--- vendor/fuse-emulator/current/fuse/rzx.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/rzx.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -109,8 +109,8 @@
int end_event;
-static int start_playback( libspectrum_rzx *rzx );
-static void start_recording( libspectrum_rzx *rzx, int competition_mode );
+static int start_playback( libspectrum_rzx *from_rzx );
+static void start_recording( libspectrum_rzx *to_rzx, int competition_mode );
static int recording_frame( void );
static int playback_frame( void );
static int counter_reset( void );
@@ -133,7 +133,7 @@
}
static int
-rzx_add_snap( libspectrum_rzx *rzx, int automatic )
+rzx_add_snap( libspectrum_rzx *to_rzx, int automatic )
{
int error;
libspectrum_snap *snap = libspectrum_snap_alloc();
@@ -144,7 +144,7 @@
return error;
}
- error = libspectrum_rzx_add_snap( rzx, snap, automatic );
+ error = libspectrum_rzx_add_snap( to_rzx, snap, automatic );
if( error ) {
libspectrum_snap_free( snap );
return error;
@@ -208,7 +208,7 @@
length = 0;
buffer = NULL;
libspec_error = libspectrum_rzx_write(
- &buffer, &length, rzx, LIBSPECTRUM_ID_UNKNOWN, fuse_creator,
+ &buffer, &length, rzx, LIBSPECTRUM_ID_SNAPSHOT_SZX, fuse_creator,
settings_current.rzx_compression, rzx_competition_mode ? &rzx_key : NULL
);
if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
@@ -335,12 +335,12 @@
}
static int
-start_playback( libspectrum_rzx *rzx )
+start_playback( libspectrum_rzx *from_rzx )
{
int error;
libspectrum_snap *snap;
- error = libspectrum_rzx_start_playback( rzx, 0, &snap );
+ error = libspectrum_rzx_start_playback( from_rzx, 0, &snap );
if( error ) return error;
if( snap ) {
@@ -354,8 +354,8 @@
/* Add a sentinel event to prevent tstates overrun (bug #1057471) */
event_add( RZX_SENTINEL_TIME, sentinel_event );
- tstates = libspectrum_rzx_tstates( rzx );
- rzx_instruction_count = libspectrum_rzx_instructions( rzx );
+ tstates = libspectrum_rzx_tstates( from_rzx );
+ rzx_instruction_count = libspectrum_rzx_instructions( from_rzx );
rzx_playback = 1;
counter_reset();
@@ -408,9 +408,9 @@
}
static void
-start_recording( libspectrum_rzx *rzx, int competition_mode )
+start_recording( libspectrum_rzx *to_rzx, int competition_mode )
{
- libspectrum_rzx_start_input( rzx, tstates );
+ libspectrum_rzx_start_input( to_rzx, tstates );
counter_reset();
rzx_in_count = 0;
@@ -471,7 +471,6 @@
error = snapshot_copy_from( snap );
if( error ) return error;
} else {
- ui_error( UI_ERROR_WARNING, "RZX file cannot be continued" );
libspectrum_free( rzx_filename );
libspectrum_rzx_free( rzx );
return 1;
@@ -515,7 +514,7 @@
length = 0;
buffer = NULL;
libspec_error = libspectrum_rzx_write(
- &buffer, &length, rzx, LIBSPECTRUM_ID_UNKNOWN, fuse_creator,
+ &buffer, &length, rzx, LIBSPECTRUM_ID_SNAPSHOT_SZX, fuse_creator,
settings_current.rzx_compression, rzx_competition_mode ? &rzx_key : NULL
);
if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
@@ -751,13 +750,13 @@
}
static GSList*
-get_rollback_list( libspectrum_rzx *rzx )
+get_rollback_list( libspectrum_rzx *from_rzx )
{
libspectrum_rzx_iterator it;
GSList *rollback_points;
size_t frames;
- it = libspectrum_rzx_iterator_begin( rzx );
+ it = libspectrum_rzx_iterator_begin( from_rzx );
rollback_points = NULL;
frames = 0;
Modified: vendor/fuse-emulator/current/fuse/svg.c
===================================================================
--- vendor/fuse-emulator/current/fuse/svg.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/svg.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -3,7 +3,7 @@
Copyright (c) 2014 Stefano Bodrato
Portions taken from svgwrite.c, (c) J.J. Green 2005
- $Id: svg.c 5385 2016-04-24 11:52:46Z fredm $
+ $Id: svg.c 5563 2016-05-31 12:59:48Z fredm $
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
@@ -50,11 +50,10 @@
#define BUFSZ 128
int svg_capture_active = 0;
-int svg_capture_mode = SVG_CAPTURE_LINES;
-
#ifdef HAVE_LIB_XML2
+static svg_capture_type svg_capture_mode = SVG_CAPTURE_LINES;
static char *svg_fname;
static char *svg_fnameroot;
@@ -315,11 +314,14 @@
+/* some init, open file (name)*/
void
-svg_startcapture( const char *name ) /* some init, open file (name)*/
+svg_startcapture( const char *name, svg_capture_type mode )
{
if( !svg_capture_active ) {
+ svg_capture_mode = mode;
+
if( name == NULL || *name == '\0' )
name = "fuse";
@@ -638,7 +640,7 @@
if( ( machine_current->machine == LIBSPECTRUM_MACHINE_TS2068 ) ||
( machine_current->machine == LIBSPECTRUM_MACHINE_TC2068 ) ) {
- if( ( svg_capture_mode == SVG_CAPTURE_DOTS) && ( z80.pc.w == 0x263e ) )
+ if( ( svg_capture_mode == SVG_CAPTURE_DOTS ) && ( z80.pc.w == 0x263e ) )
svg_capture_draw();
if( ( svg_capture_mode == SVG_CAPTURE_LINES ) &&
Modified: vendor/fuse-emulator/current/fuse/svg.h
===================================================================
--- vendor/fuse-emulator/current/fuse/svg.h 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/svg.h 2016-06-06 13:23:18 UTC (rev 805)
@@ -3,7 +3,7 @@
Copyright (c) 2014 Stefano Bodrato
Portions taken from svgwrite.c, (c) J.J. Green 2005
- $Id: svg.h 5314 2015-08-23 22:27:39Z sbaldovi $
+ $Id: svg.h 5559 2016-05-31 11:14:00Z fredm $
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
@@ -30,16 +30,15 @@
extern int svg_capture_active; /* SVG capture enabled? */
-extern void svg_startcapture( const char *name );
+typedef enum svg_capture_type {
+ SVG_CAPTURE_DOTS,
+ SVG_CAPTURE_LINES,
+} svg_capture_type;
-extern void svg_stopcapture( void );
+void svg_startcapture( const char *name, svg_capture_type mode );
+void svg_stopcapture( void );
void svg_capture( void );
void svg_capture_end( void );
-#define SVG_CAPTURE_DOTS 1
-#define SVG_CAPTURE_LINES 2
-
-extern int svg_capture_mode; /* SVG capture enabled? */
-
#endif /* #ifndef FUSE_SVG_H */
Modified: vendor/fuse-emulator/current/fuse/tape.c
===================================================================
--- vendor/fuse-emulator/current/fuse/tape.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/tape.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -364,12 +364,6 @@
return -1;
}
- /* Verify? For now don't run the traps in that situation */
- if( !(F_ & FLAG_C) ) {
- tape_play( 1 );
- return -1;
- }
-
/* We don't properly handle the case of partial loading, so don't run
the traps in that situation */
if( libspectrum_tape_block_data_length( block ) != DE + 2 ) {
@@ -413,7 +407,7 @@
trap_load_block( libspectrum_tape_block *block )
{
libspectrum_byte parity, *data;
- int i = 0, length, read;
+ int i = 0, length, read, verify;
/* On exit:
* A = calculated parity byte if parity checked, else 0 (CHECKME)
@@ -447,6 +441,7 @@
return 0;
}
+ verify = !(F_ & FLAG_C);
i = A_; /* i = A' (flag byte) */
AF_ = 0x0145;
A = 0;
@@ -462,20 +457,20 @@
L = data[read - 1];
/* Loading or verifying determined by the carry flag of F' */
- if( F_ & FLAG_C ) {
+ if( verify ) { /* verifying */
for( i = 0; i < read; i++ ) {
parity ^= data[i];
- writebyte_internal( IX+i, data[i] );
- }
- } else { /* verifying */
- for( i = 0; i < read; i++ ) {
- parity ^= data[i];
if( data[i] != readbyte_internal(IX+i) ) {
/* Verification failure */
L = data[i];
goto error_ret;
}
}
+ } else {
+ for( i = 0; i < read; i++ ) {
+ parity ^= data[i];
+ writebyte_internal( IX+i, data[i] );
+ }
}
/* At this point, i == number of bytes actually read or verified */
Modified: vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -47,4 +47,5 @@
ui_fb_built = ui/fb/keysyms.c
ui/fb/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/fb
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl fb $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -77,16 +77,21 @@
ui/gtk/options-header.pl
ui/gtk/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl gtk $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/gtk/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl gtk c > $@.tmp && mv $@.tmp $@
ui/gtk/menu_data.ui: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl gtk ui > $@.tmp && mv $@.tmp $@
ui/gtk/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/gtk/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/gtk/options.pl - > $@.tmp && mv $@.tmp $@
ui/gtk/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/gtk/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/gtk/options-header.pl - > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -46,4 +46,5 @@
ui_sdl_built = ui/sdl/keysyms.c
ui/sdl/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/sdl
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl sdl $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -45,4 +45,5 @@
ui_svga_built = ui/svga/keysyms.c
ui/svga/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/svga
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl svga $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/ui.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/ui.h 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/ui.h 2016-06-06 13:23:18 UTC (rev 805)
@@ -121,12 +121,6 @@
/* Write the current tape out */
int ui_tape_write( void );
-/* Write a +3, Beta or +D disk out */
-int ui_plus3_disk_write( specplus3_drive_number which, int saveas );
-int ui_beta_disk_write( beta_drive_number which, int saveas );
-int ui_opus_disk_write( opus_drive_number which, int saveas );
-int ui_plusd_disk_write( plusd_drive_number which, int saveas );
-int ui_disciple_disk_write( disciple_drive_number which, int saveas );
int ui_mdr_write( int which, int saveas );
/* Get a rollback point from the given list */
Modified: vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001,2002 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -68,13 +68,17 @@
ui/widget/options-header.pl
ui/widget/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.dat $(srcdir)/menu_data.pl config.h
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl widget > $@.tmp && mv $@.tmp $@
ui/widget/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/widget/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/widget/options.pl - > $@.tmp && mv $@.tmp $@
ui/widget/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/widget/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/widget/options-header.pl - > $@.tmp && mv $@.tmp $@
ui/widget/fuse.font: $(srcdir)/ui/widget/mkfusefont.pl $(srcdir)/ui/widget/fuse.font.sbf
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/ui/widget/mkfusefont.pl $(srcdir)/ui/widget/fuse.font.sbf > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2009 Philip Kendall, Bjoern Giesler
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -48,4 +48,5 @@
ui_wii_built = ui/wii/keysyms.c
ui/wii/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/wii
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl wii $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2008 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -118,22 +118,29 @@
$(ui_win32_rc_files)
ui/win32/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl win32 $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 c > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.h: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 h > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.rc: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 rc > $@.tmp && mv $@.tmp $@
ui/win32/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options.pl - > $@.tmp && mv $@.tmp $@
ui/win32/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options-header.pl - > $@.tmp && mv $@.tmp $@
ui/win32/options.rc: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options-resource.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options-resource.pl - > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -55,7 +55,9 @@
ui/xlib/xstatusbar.pl
ui/xlib/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/xlib
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl x $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/xlib/xpixmaps.c: ui/xlib/xstatusbar.pl $(srcdir)/ui/gtk/pixmaps.c
+ @$(MKDIR_P) ui/xlib
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/ui/xlib/xstatusbar.pl $(srcdir)/ui/gtk/pixmaps.c > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/z80/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2003 Philip Kendall
## Copyright (c) 2015-2016 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## 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
@@ -34,18 +34,23 @@
z80/z80_ed.c
z80/opcodes_base.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_base.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_base.dat > $@.tmp && mv $@.tmp $@
z80/z80_cb.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_cb.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_cb.dat > $@.tmp && mv $@.tmp $@
z80/z80_ddfd.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat > $@.tmp && mv $@.tmp $@
z80/z80_ddfdcb.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfdcb.dat > $@.tmp && mv $@.tmp $@
z80/z80_ed.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ed.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ed.dat > $@.tmp && mv $@.tmp $@
noinst_HEADERS += \
@@ -54,8 +59,9 @@
z80/z80_macros.h
EXTRA_DIST += \
+ z80/tests/README \
+ z80/tests/tests.expected \
z80/tests/tests.in \
- z80/tests/tests.expected \
z80/opcodes_base.c \
z80/opcodes_base.dat \
z80/opcodes_cb.dat \
Modified: vendor/fuse-emulator/current/fuse/z80/z80.c
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/z80.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -84,7 +84,8 @@
};
static void
-z80_interrupt_event_fn( libspectrum_dword tstates, int type, void *user_data )
+z80_interrupt_event_fn( libspectrum_dword event_tstates, int type,
+ void *user_data )
{
/* Retriggered interrupt; firstly, ignore if we're doing RZX playback
as all interrupts are generated by the RZX code */
Modified: vendor/fuse-emulator/current/fuse/z80/z80_ops.c
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80_ops.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/z80_ops.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -161,7 +161,7 @@
/* Check if the debugger should become active at this point */
CHECK( debugger, debugger_mode != DEBUGGER_MODE_INACTIVE )
- if( !z80.halted && debugger_check( DEBUGGER_BREAKPOINT_TYPE_EXECUTE, PC ) )
+ if( debugger_check( DEBUGGER_BREAKPOINT_TYPE_EXECUTE, PC ) )
debugger_trap();
END_CHECK
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,4 +1,4 @@
-2016-??-?? Philip Kendall <phi...@sh...>
+2016-06-06 Philip Kendall <phi...@sh...>
* libspectrum 1.2.0 released.
@@ -34,7 +34,7 @@
* 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 inital_level of PZX data blocks to have the default
+ * Allow for the initial_level of PZX data blocks to have the default
value (Fredrick Meunier).
2013-05-24 Philip Kendall <phi...@sh...>
@@ -379,5 +379,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 5413 2016-04-27 11:50:17Z fredm $
+$Id: ChangeLog 5592 2016-06-06 10:37:02Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/README 2016-06-06 13:23:18 UTC (rev 805)
@@ -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: README 5428 2016-04-30 07:03:25Z sbaldovi $
+$Id: README 5592 2016-06-06 10:37:02Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2013 Philip Kendall
-dnl $Id: configure.ac 5422 2016-04-29 12:54:59Z fredm $
+dnl $Id: configure.ac 5592 2016-06-06 10:37:02Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2016-06-06 13:23:18 UTC (rev 805)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "24th May, 2013" "Version 1.2.0" "Emulators"
+.TH libspectrum 3 "6th June, 2016" "Version 1.2.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2016-06-06 13:23:18 UTC (rev 805)
@@ -10,8 +10,8 @@
* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
.pzx, Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
-* Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0,
- .trd and .udi (identification only).
+* Disk images: .dsk (both plain and extended), .d40, .d80, .fdi, .img, .mgt,
+ .opd, .sad, .scl, .td0, .trd and .udi (identification only).
* Timex cartridges: .dck (read only).
* IDE hard disk images: .hdf (read/write).
* Microdrive cartridge images: .mdr (read/write).
@@ -1867,4 +1867,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 5486 2016-05-14 12:39:37Z fredm $
+$Id: libspectrum.txt 5552 2016-05-29 22:08:09Z sbaldovi $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1067,3 +1067,8 @@
(patch #364) (Fred).
20160521 szx.c: reset uncompressed size when loading Op...
[truncated message content] |
