vice-emu-commit — Commit notifications for the source server

[Vice-emu-commit] SF.net SVN: vice-emu:[46108] trunk/vice

[<gp...@us...>]

Revision: 46108
          http://sourceforge.net/p/vice-emu/code/46108
Author:   gpz
Date:     2026-05-12 19:14:36 +0000 (Tue, 12 May 2026)
Log Message:
-----------
properly filter residfp directory from install targets, patch provided by leandro. this makes 'make dist' work again, and no files are installed that shouldn't be.

Modified Paths:
--------------
    trunk/vice/autogen.sh
    trunk/vice/src/lib/Makefile.am

Property Changed:
----------------
    trunk/vice/src/lib/libresidfp/
    trunk/vice/src/lib/libresidfp/tests/

Modified: trunk/vice/autogen.sh
===================================================================
--- trunk/vice/autogen.sh	2026-05-12 18:30:45 UTC (rev 46107)
+++ trunk/vice/autogen.sh	2026-05-12 19:14:36 UTC (rev 46108)
@@ -181,28 +181,8 @@
 }
 
 
-# FIXME: we also need to prevent it from installing header files and pkg info
-
-# src/residfp/sidversion.h
-# src/residfp/residfp.h src/residfp/residfp_defs.h
-# libresidfp.pc
-
-# patch the residfp makefile(s) - we don't want them to install anything
-# CAUTION: this must be written so multiple runs wont mess up the file(s)
-# NOTE: we cant revert the modified files after running this script - else it would
-# use the original file(s) when running "make install"
-patch_residfp() {
-    RESIDFP=./src/lib/libresidfp
-    sed -e "s/^lib_LTLIBRARIES/noinst_LTLIBRARIES/g" \
-        $RESIDFP/Makefile.am > $RESIDFP/Makefile.am.tmp
-    mv $RESIDFP/Makefile.am.tmp $RESIDFP/Makefile.am
-}
-
-
 # Script entry point
 
-patch_residfp
-
 autoconf_line=`autoconf --version`
 if test x"$autoconf_line" = "x"; then
     echo "No autoconf installed"

Modified: trunk/vice/src/lib/Makefile.am
===================================================================
--- trunk/vice/src/lib/Makefile.am	2026-05-12 18:30:45 UTC (rev 46107)
+++ trunk/vice/src/lib/Makefile.am	2026-05-12 19:14:36 UTC (rev 46108)
@@ -36,3 +36,5 @@
 libresidfp:
 	(cd libresidfp; $(MAKE))
 endif
+
+install installdirs: SUBDIRS := $(filter-out libresidfp, $(SUBDIRS))

Index: trunk/vice/src/lib/libresidfp
===================================================================
--- trunk/vice/src/lib/libresidfp	2026-05-12 18:30:45 UTC (rev 46107)
+++ trunk/vice/src/lib/libresidfp	2026-05-12 19:14:36 UTC (rev 46108)

Property changes on: trunk/vice/src/lib/libresidfp
___________________________________________________________________
Modified: svn:ignore
## -9,3 +9,5 ##
 Makefile
 autom4te.cache
 .automake.out
+configure
+Makefile.in
Index: trunk/vice/src/lib/libresidfp/tests
===================================================================
--- trunk/vice/src/lib/libresidfp/tests	2026-05-12 18:30:45 UTC (rev 46107)
+++ trunk/vice/src/lib/libresidfp/tests	2026-05-12 19:14:36 UTC (rev 46108)

Property changes on: trunk/vice/src/lib/libresidfp/tests
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,3 ##
 Makefile
 .deps
+Makefile.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46107] trunk/vice

[<gp...@us...>]

Revision: 46107
          http://sourceforge.net/p/vice-emu/code/46107
Author:   gpz
Date:     2026-05-12 18:30:45 +0000 (Tue, 12 May 2026)
Log Message:
-----------
remove and ignore accidently comitted generated files in the residfp directory. run autoheader only when AC_CONFIG_HEADERS is present in configure.ac. patch residfp makefile.am to not install the produced libraries. CAUTION: package config file and headers are still being installed

Modified Paths:
--------------
    trunk/vice/autogen.sh

Removed Paths:
-------------
    trunk/vice/src/lib/libresidfp/Makefile.in
    trunk/vice/src/lib/libresidfp/configure
    trunk/vice/src/lib/libresidfp/tests/Makefile.in

Property Changed:
----------------
    trunk/vice/src/lib/libresidfp/
    trunk/vice/src/lib/libresidfp/src/

Modified: trunk/vice/autogen.sh
===================================================================
--- trunk/vice/autogen.sh	2026-05-12 17:32:03 UTC (rev 46106)
+++ trunk/vice/autogen.sh	2026-05-12 18:30:45 UTC (rev 46107)
@@ -155,11 +155,15 @@
 
 do_autoheader() {
     if [ -e configure.in ]; then
+        # only run autoheader when AM_CONFIG_HEADER is defined
         if [ ! x"`sed -ne "s/.*AM_CONFIG_HEADER\((.*)\).*/\1/p" configure.in`" = x ]; then
             do_command autoheader
         fi
     else
-        do_command autoheader
+        # only run autoheader when AC_CONFIG_HEADERS is defined
+        if [ ! x"`sed -ne "s/.*AC_CONFIG_HEADERS\((.*)\).*/\1/p" configure.ac`" = x ]; then
+            do_command autoheader
+        fi
     fi
 }
 
@@ -168,7 +172,6 @@
 }
 
 buildfiles() {
-
     if [ -f configure.ac ] || [ -f configure.in ]; then
         do_aclocal
         do_autoconf
@@ -178,8 +181,28 @@
 }
 
 
+# FIXME: we also need to prevent it from installing header files and pkg info
+
+# src/residfp/sidversion.h
+# src/residfp/residfp.h src/residfp/residfp_defs.h
+# libresidfp.pc
+
+# patch the residfp makefile(s) - we don't want them to install anything
+# CAUTION: this must be written so multiple runs wont mess up the file(s)
+# NOTE: we cant revert the modified files after running this script - else it would
+# use the original file(s) when running "make install"
+patch_residfp() {
+    RESIDFP=./src/lib/libresidfp
+    sed -e "s/^lib_LTLIBRARIES/noinst_LTLIBRARIES/g" \
+        $RESIDFP/Makefile.am > $RESIDFP/Makefile.am.tmp
+    mv $RESIDFP/Makefile.am.tmp $RESIDFP/Makefile.am
+}
+
+
 # Script entry point
 
+patch_residfp
+
 autoconf_line=`autoconf --version`
 if test x"$autoconf_line" = "x"; then
     echo "No autoconf installed"
@@ -212,6 +235,7 @@
 
 buildfiles
 
+
 # Whatever this tried to do, its probably obsolete
 #
 #if [ x"$1" = x"--dist" ]; then

Index: trunk/vice/src/lib/libresidfp
===================================================================
--- trunk/vice/src/lib/libresidfp	2026-05-12 17:32:03 UTC (rev 46106)
+++ trunk/vice/src/lib/libresidfp	2026-05-12 18:30:45 UTC (rev 46107)

Property changes on: trunk/vice/src/lib/libresidfp
___________________________________________________________________
Modified: svn:ignore
## -8,3 +8,4 ##
 libtool
 Makefile
 autom4te.cache
+.automake.out
Deleted: trunk/vice/src/lib/libresidfp/Makefile.in
===================================================================
--- trunk/vice/src/lib/libresidfp/Makefile.in	2026-05-12 17:32:03 UTC (rev 46106)
+++ trunk/vice/src/lib/libresidfp/Makefile.in	2026-05-12 18:30:45 UTC (rev 46107)
@@ -1,1560 +0,0 @@
-# Makefile.in generated by automake 1.18.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2025 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@ENABLE_TEST_TRUE@noinst_PROGRAMS = src/resample/test$(EXEEXT)
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
-	$(top_srcdir)/m4/ax_append_flag.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/ax_require_defined.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/sid_x86_simd_supports.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(src_libresidfp_la_HEADERS) \
-	$(am__DIST_COMMON)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = Doxyfile libresidfp.pc src/siddefs-fp.h \
-	src/residfp/sidversion.h
-CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-  || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-       $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
-	"$(DESTDIR)$(src_libresidfp_ladir)" \
-	"$(DESTDIR)$(src_libresidfp_ladir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-src_libresidfp_la_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
-am_src_libresidfp_la_OBJECTS = src/libresidfp_la-Dac.lo \
-	src/libresidfp_la-EnvelopeGenerator.lo \
-	src/libresidfp_la-ExternalFilter.lo \
-	src/libresidfp_la-Filter.lo src/libresidfp_la-Filter6581.lo \
-	src/libresidfp_la-Filter8580.lo \
-	src/libresidfp_la-FilterModelConfig.lo \
-	src/libresidfp_la-FilterModelConfig6581.lo \
-	src/libresidfp_la-FilterModelConfig8580.lo \
-	src/libresidfp_la-Integrator6581.lo \
-	src/libresidfp_la-Integrator8580.lo src/libresidfp_la-OpAmp.lo \
-	src/libresidfp_la-SID.lo src/libresidfp_la-Spline.lo \
-	src/libresidfp_la-WaveformCalculator.lo \
-	src/libresidfp_la-WaveformGenerator.lo \
-	src/resample/libresidfp_la-SincResampler.lo \
-	src/libresidfp_la-version.lo \
-	src/residfp/libresidfp_la-residfp.lo
-src_libresidfp_la_OBJECTS = $(am_src_libresidfp_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-src_libresidfp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(src_libresidfp_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am__src_resample_test_SOURCES_DIST = src/resample/test.cpp \
-	src/resample/SincResampler.cpp
-@ENABLE_TEST_TRUE@am_src_resample_test_OBJECTS =  \
-@ENABLE_TEST_TRUE@	src/resample/test.$(OBJEXT) \
-@ENABLE_TEST_TRUE@	src/resample/SincResampler.$(OBJEXT)
-src_resample_test_OBJECTS = $(am_src_resample_test_OBJECTS)
-src_resample_test_LDADD = $(LDADD)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = src/$(DEPDIR)/libresidfp_la-Dac.Plo \
-	src/$(DEPDIR)/libresidfp_la-EnvelopeGenerator.Plo \
-	src/$(DEPDIR)/libresidfp_la-ExternalFilter.Plo \
-	src/$(DEPDIR)/libresidfp_la-Filter.Plo \
-	src/$(DEPDIR)/libresidfp_la-Filter6581.Plo \
-	src/$(DEPDIR)/libresidfp_la-Filter8580.Plo \
-	src/$(DEPDIR)/libresidfp_la-FilterModelConfig.Plo \
-	src/$(DEPDIR)/libresidfp_la-FilterModelConfig6581.Plo \
-	src/$(DEPDIR)/libresidfp_la-FilterModelConfig8580.Plo \
-	src/$(DEPDIR)/libresidfp_la-Integrator6581.Plo \
-	src/$(DEPDIR)/libresidfp_la-Integrator8580.Plo \
-	src/$(DEPDIR)/libresidfp_la-OpAmp.Plo \
-	src/$(DEPDIR)/libresidfp_la-SID.Plo \
-	src/$(DEPDIR)/libresidfp_la-Spline.Plo \
-	src/$(DEPDIR)/libresidfp_la-WaveformCalculator.Plo \
-	src/$(DEPDIR)/libresidfp_la-WaveformGenerator.Plo \
-	src/$(DEPDIR)/libresidfp_la-version.Plo \
-	src/resample/$(DEPDIR)/SincResampler.Po \
-	src/resample/$(DEPDIR)/libresidfp_la-SincResampler.Plo \
-	src/resample/$(DEPDIR)/test.Po \
-	src/residfp/$(DEPDIR)/libresidfp_la-residfp.Plo
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(src_libresidfp_la_SOURCES) $(src_resample_test_SOURCES)
-DIST_SOURCES = $(src_libresidfp_la_SOURCES) \
-	$(am__src_resample_test_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DATA = $(pkgconfig_DATA)
-HEADERS = $(nodist_src_libresidfp_la_HEADERS) \
-	$(src_libresidfp_la_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in \
-	$(srcdir)/libresidfp.pc.in $(top_srcdir)/build-aux/compile \
-	$(top_srcdir)/build-aux/config.guess \
-	$(top_srcdir)/build-aux/config.sub \
-	$(top_srcdir)/build-aux/depcomp \
-	$(top_srcdir)/build-aux/install-sh \
-	$(top_srcdir)/build-aux/ltmain.sh \
-	$(top_srcdir)/build-aux/missing \
-	$(top_srcdir)/src/residfp/sidversion.h.in \
-	$(top_srcdir)/src/siddefs-fp.h.in AUTHORS COPYING NEWS.md \
-	README.md build-aux/compile build-aux/config.guess \
-	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
-	build-aux/ltmain.sh build-aux/missing
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
-      ; rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = -9
-DIST_TARGETS = dist-gzip
-# Exists only to be overridden by the user if desired.
-AM_DISTCHECK_DVI_TARGET = dvi
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = \
-  find . \( -type f -a \! \
-            \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FILECMD = @FILECMD@
-GREP = @GREP@
-HAVE_BUILTIN_EXPECT = @HAVE_BUILTIN_EXPECT@
-HAVE_CXX11 = @HAVE_CXX11@
-HAVE_CXX14 = @HAVE_CXX14@
-HAVE_CXX17 = @HAVE_CXX17@
-HAVE_CXX20 = @HAVE_CXX20@
-HAVE_CXX23 = @HAVE_CXX23@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBRESIDFPVERSION = @LIBRESIDFPVERSION@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_LEVEL = @LIB_LEVEL@
-LIB_MAJOR = @LIB_MAJOR@
-LIB_MINOR = @LIB_MINOR@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-RESIDFP_BRANCH_HINTS = @RESIDFP_BRANCH_HINTS@
-RESIDFP_CXXFLAGS = @RESIDFP_CXXFLAGS@
-RESIDFP_INLINE = @RESIDFP_INLINE@
-RESIDFP_INLINING = @RESIDFP_INLINING@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
-am__tar = @am__tar@
-am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-debug_flags = @debug_flags@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign subdir-objects
-SUBDIRS = tests
-
-#AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tests
-@MINGW32_TRUE@W32_CPPFLAGS = -DWIN32_LEAN_AND_MEAN
-@MINGW32_TRUE@W32_LDFLAGS = -no-undefined
-AM_CPPFLAGS = \
--I $(top_builddir)/src \
--I $(top_srcdir)/src \
-${W32_CPPFLAGS} \
-@debug_flags@
-
-
-#=========================================================
-EXTRA_DIST = \
-docs/mainpage.dox
-
-
-#=========================================================
-# Libraries
-lib_LTLIBRARIES = \
-src/libresidfp.la
-
-
-#=========================================================
-# libresidfp
-src_libresidfp_la_SOURCES = \
-src/array.h \
-src/Dac.cpp \
-src/Dac.h \
-src/EnvelopeGenerator.cpp \
-src/EnvelopeGenerator.h \
-src/ExternalFilter.cpp \
-src/ExternalFilter.h \
-src/Filter.cpp \
-src/Filter.h \
-src/Filter6581.cpp \
-src/Filter6581.h \
-src/Filter8580.cpp \
-src/Filter8580.h \
-src/FilterModelConfig.cpp \
-src/FilterModelConfig.h \
-src/FilterModelConfig6581.cpp \
-src/FilterModelConfig6581.h \
-src/FilterModelConfig8580.cpp \
-src/FilterModelConfig8580.h \
-src/Integrator.h \
-src/Integrator6581.cpp \
-src/Integrator6581.h \
-src/Integrator8580.cpp \
-src/Integrator8580.h \
-src/OpAmp.cpp \
-src/OpAmp.h \
-src/SID.cpp \
-src/SID.h \
-src/Spline.cpp \
-src/Spline.h \
-src/Voice.h \
-src/WaveformCalculator.cpp \
-src/WaveformCalculator.h \
-src/WaveformGenerator.cpp \
-src/WaveformGenerator.h \
-src/resample/Limiter.h \
-src/resample/Resampler.h \
-src/resample/PassThrough.h \
-src/resample/ZeroOrderResampler.h \
-src/resample/SincResampler.cpp \
-src/resample/SincResampler.h \
-src/resample/TwoPassSincResampler.h \
-src/version.cc \
-src/residfp/residfp.cpp
-
-src_libresidfp_la_LDFLAGS = -version-info $(LIBRESIDFPVERSION) $(W32_LDFLAGS)
-src_libresidfp_ladir = $(includedir)/residfp
-src_libresidfp_la_HEADERS = \
-src/residfp/residfp.h \
-src/residfp/residfp_defs.h
-
-nodist_src_libresidfp_la_HEADERS = \
-src/residfp/sidversion.h
-
-src_libresidfp_la_CPPFLAGS = $(AM_CPPFLAGS) @RESIDFP_CXXFLAGS@
-@ENABLE_TEST_TRUE@src_resample_test_SOURCES = \
-@ENABLE_TEST_TRUE@src/resample/test.cpp \
-@ENABLE_TEST_TRUE@src/resample/SincResampler.cpp
-
-
-#=========================================================
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libresidfp.pc
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .cc .cpp .lo .o .obj
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-@HAVE_DOXYGEN_TRUE@Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
-@HAVE_DOXYGEN_TRUE@	cd $(top_builddir) && $(SHELL) ./config.status $@
-libresidfp.pc: $(top_builddir)/config.status $(srcdir)/libresidfp.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-src/siddefs-fp.h: $(top_builddir)/config.status $(top_srcdir)/src/siddefs-fp.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-src/residfp/sidversion.h: $(top_builddir)/config.status $(top_srcdir)/src/residfp/sidversion.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-clean-noinstPROGRAMS:
-	$(am__rm_f) $(noinst_PROGRAMS)
-	test -z "$(EXEEXT)" || $(am__rm_f) $(noinst_PROGRAMS:$(EXEEXT)=)
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-$(am__rm_f) $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	echo rm -f $${locs}; \
-	$(am__rm_f) $${locs}
-src/$(am__dirstamp):
-	@$(MKDIR_P) src
-	@: >>src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/$(DEPDIR)
-	@: >>src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-Dac.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-EnvelopeGenerator.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-ExternalFilter.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-Filter.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-Filter6581.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-Filter8580.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-FilterModelConfig.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-FilterModelConfig6581.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-FilterModelConfig8580.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-Integrator6581.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-Integrator8580.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-OpAmp.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-SID.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-Spline.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-WaveformCalculator.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-WaveformGenerator.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/resample/$(am__dirstamp):
-	@$(MKDIR_P) src/resample
-	@: >>src/resample/$(am__dirstamp)
-src/resample/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/resample/$(DEPDIR)
-	@: >>src/resample/$(DEPDIR)/$(am__dirstamp)
-src/resample/libresidfp_la-SincResampler.lo:  \
-	src/resample/$(am__dirstamp) \
-	src/resample/$(DEPDIR)/$(am__dirstamp)
-src/libresidfp_la-version.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/residfp/$(am__dirstamp):
-	@$(MKDIR_P) src/residfp
-	@: >>src/residfp/$(am__dirstamp)
-src/residfp/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/residfp/$(DEPDIR)
-	@: >>src/residfp/$(DEPDIR)/$(am__dirstamp)
-src/residfp/libresidfp_la-residfp.lo: src/residfp/$(am__dirstamp) \
-	src/residfp/$(DEPDIR)/$(am__dirstamp)
-
-src/libresidfp.la: $(src_libresidfp_la_OBJECTS) $(src_libresidfp_la_DEPENDENCIES) $(EXTRA_src_libresidfp_la_DEPENDENCIES) src/$(am__dirstamp)
-	$(AM_V_CXXLD)$(src_libresidfp_la_LINK) -rpath $(libdir) $(src_libresidfp_la_OBJECTS) $(src_libresidfp_la_LIBADD) $(LIBS)
-src/resample/test.$(OBJEXT): src/resample/$(am__dirstamp) \
-	src/resample/$(DEPDIR)/$(am__dirstamp)
-src/resample/SincResampler.$(OBJEXT): src/resample/$(am__dirstamp) \
-	src/resample/$(DEPDIR)/$(am__dirstamp)
-
-src/resample/test$(EXEEXT): $(src_resample_test_OBJECTS) $(src_resample_test_DEPENDENCIES) $(EXTRA_src_resample_test_DEPENDENCIES) src/resample/$(am__dirstamp)
-	@rm -f src/resample/test$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(src_resample_test_OBJECTS) $(src_resample_test_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f src/*.$(OBJEXT)
-	-rm -f src/*.lo
-	-rm -f src/resample/*.$(OBJEXT)
-	-rm -f src/resample/*.lo
-	-rm -f src/residfp/*.$(OBJEXT)
-	-rm -f src/residfp/*.lo
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-Dac.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-EnvelopeGenerator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-ExternalFilter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-Filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-Filter6581.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-Filter8580.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-FilterModelConfig.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-FilterModelConfig6581.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-FilterModelConfig8580.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-Integrator6581.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-Integrator8580.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-OpAmp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-SID.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-Spline.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-WaveformCalculator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-WaveformGenerator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libresidfp_la-version.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/resample/$(DEPDIR)/SincResampler.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/resample/$(DEPDIR)/libresidfp_la-SincResampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/resample/$(DEPDIR)/test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/residfp/$(DEPDIR)/libresidfp_la-residfp.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@: >>$@
-
-am--depfiles: $(am__depfiles_remade)
-
-.cc.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-src/libresidfp_la-Dac.lo: src/Dac.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-Dac.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-Dac.Tpo -c -o src/libresidfp_la-Dac.lo `test -f 'src/Dac.cpp' || echo '$(srcdir)/'`src/Dac.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-Dac.Tpo src/$(DEPDIR)/libresidfp_la-Dac.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Dac.cpp' object='src/libresidfp_la-Dac.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-Dac.lo `test -f 'src/Dac.cpp' || echo '$(srcdir)/'`src/Dac.cpp
-
-src/libresidfp_la-EnvelopeGenerator.lo: src/EnvelopeGenerator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-EnvelopeGenerator.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-EnvelopeGenerator.Tpo -c -o src/libresidfp_la-EnvelopeGenerator.lo `test -f 'src/EnvelopeGenerator.cpp' || echo '$(srcdir)/'`src/EnvelopeGenerator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-EnvelopeGenerator.Tpo src/$(DEPDIR)/libresidfp_la-EnvelopeGenerator.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/EnvelopeGenerator.cpp' object='src/libresidfp_la-EnvelopeGenerator.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-EnvelopeGenerator.lo `test -f 'src/EnvelopeGenerator.cpp' || echo '$(srcdir)/'`src/EnvelopeGenerator.cpp
-
-src/libresidfp_la-ExternalFilter.lo: src/ExternalFilter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-ExternalFilter.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-ExternalFilter.Tpo -c -o src/libresidfp_la-ExternalFilter.lo `test -f 'src/ExternalFilter.cpp' || echo '$(srcdir)/'`src/ExternalFilter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-ExternalFilter.Tpo src/$(DEPDIR)/libresidfp_la-ExternalFilter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/ExternalFilter.cpp' object='src/libresidfp_la-ExternalFilter.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-ExternalFilter.lo `test -f 'src/ExternalFilter.cpp' || echo '$(srcdir)/'`src/ExternalFilter.cpp
-
-src/libresidfp_la-Filter.lo: src/Filter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-Filter.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-Filter.Tpo -c -o src/libresidfp_la-Filter.lo `test -f 'src/Filter.cpp' || echo '$(srcdir)/'`src/Filter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-Filter.Tpo src/$(DEPDIR)/libresidfp_la-Filter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Filter.cpp' object='src/libresidfp_la-Filter.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-Filter.lo `test -f 'src/Filter.cpp' || echo '$(srcdir)/'`src/Filter.cpp
-
-src/libresidfp_la-Filter6581.lo: src/Filter6581.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-Filter6581.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-Filter6581.Tpo -c -o src/libresidfp_la-Filter6581.lo `test -f 'src/Filter6581.cpp' || echo '$(srcdir)/'`src/Filter6581.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-Filter6581.Tpo src/$(DEPDIR)/libresidfp_la-Filter6581.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Filter6581.cpp' object='src/libresidfp_la-Filter6581.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-Filter6581.lo `test -f 'src/Filter6581.cpp' || echo '$(srcdir)/'`src/Filter6581.cpp
-
-src/libresidfp_la-Filter8580.lo: src/Filter8580.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-Filter8580.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-Filter8580.Tpo -c -o src/libresidfp_la-Filter8580.lo `test -f 'src/Filter8580.cpp' || echo '$(srcdir)/'`src/Filter8580.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-Filter8580.Tpo src/$(DEPDIR)/libresidfp_la-Filter8580.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Filter8580.cpp' object='src/libresidfp_la-Filter8580.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-Filter8580.lo `test -f 'src/Filter8580.cpp' || echo '$(srcdir)/'`src/Filter8580.cpp
-
-src/libresidfp_la-FilterModelConfig.lo: src/FilterModelConfig.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-FilterModelConfig.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-FilterModelConfig.Tpo -c -o src/libresidfp_la-FilterModelConfig.lo `test -f 'src/FilterModelConfig.cpp' || echo '$(srcdir)/'`src/FilterModelConfig.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-FilterModelConfig.Tpo src/$(DEPDIR)/libresidfp_la-FilterModelConfig.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/FilterModelConfig.cpp' object='src/libresidfp_la-FilterModelConfig.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-FilterModelConfig.lo `test -f 'src/FilterModelConfig.cpp' || echo '$(srcdir)/'`src/FilterModelConfig.cpp
-
-src/libresidfp_la-FilterModelConfig6581.lo: src/FilterModelConfig6581.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-FilterModelConfig6581.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-FilterModelConfig6581.Tpo -c -o src/libresidfp_la-FilterModelConfig6581.lo `test -f 'src/FilterModelConfig6581.cpp' || echo '$(srcdir)/'`src/FilterModelConfig6581.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-FilterModelConfig6581.Tpo src/$(DEPDIR)/libresidfp_la-FilterModelConfig6581.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/FilterModelConfig6581.cpp' object='src/libresidfp_la-FilterModelConfig6581.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-FilterModelConfig6581.lo `test -f 'src/FilterModelConfig6581.cpp' || echo '$(srcdir)/'`src/FilterModelConfig6581.cpp
-
-src/libresidfp_la-FilterModelConfig8580.lo: src/FilterModelConfig8580.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-FilterModelConfig8580.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-FilterModelConfig8580.Tpo -c -o src/libresidfp_la-FilterModelConfig8580.lo `test -f 'src/FilterModelConfig8580.cpp' || echo '$(srcdir)/'`src/FilterModelConfig8580.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-FilterModelConfig8580.Tpo src/$(DEPDIR)/libresidfp_la-FilterModelConfig8580.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/FilterModelConfig8580.cpp' object='src/libresidfp_la-FilterModelConfig8580.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-FilterModelConfig8580.lo `test -f 'src/FilterModelConfig8580.cpp' || echo '$(srcdir)/'`src/FilterModelConfig8580.cpp
-
-src/libresidfp_la-Integrator6581.lo: src/Integrator6581.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-Integrator6581.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-Integrator6581.Tpo -c -o src/libresidfp_la-Integrator6581.lo `test -f 'src/Integrator6581.cpp' || echo '$(srcdir)/'`src/Integrator6581.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-Integrator6581.Tpo src/$(DEPDIR)/libresidfp_la-Integrator6581.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Integrator6581.cpp' object='src/libresidfp_la-Integrator6581.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-Integrator6581.lo `test -f 'src/Integrator6581.cpp' || echo '$(srcdir)/'`src/Integrator6581.cpp
-
-src/libresidfp_la-Integrator8580.lo: src/Integrator8580.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-Integrator8580.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-Integrator8580.Tpo -c -o src/libresidfp_la-Integrator8580.lo `test -f 'src/Integrator8580.cpp' || echo '$(srcdir)/'`src/Integrator8580.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-Integrator8580.Tpo src/$(DEPDIR)/libresidfp_la-Integrator8580.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Integrator8580.cpp' object='src/libresidfp_la-Integrator8580.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-Integrator8580.lo `test -f 'src/Integrator8580.cpp' || echo '$(srcdir)/'`src/Integrator8580.cpp
-
-src/libresidfp_la-OpAmp.lo: src/OpAmp.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-OpAmp.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-OpAmp.Tpo -c -o src/libresidfp_la-OpAmp.lo `test -f 'src/OpAmp.cpp' || echo '$(srcdir)/'`src/OpAmp.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-OpAmp.Tpo src/$(DEPDIR)/libresidfp_la-OpAmp.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/OpAmp.cpp' object='src/libresidfp_la-OpAmp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-OpAmp.lo `test -f 'src/OpAmp.cpp' || echo '$(srcdir)/'`src/OpAmp.cpp
-
-src/libresidfp_la-SID.lo: src/SID.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-SID.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-SID.Tpo -c -o src/libresidfp_la-SID.lo `test -f 'src/SID.cpp' || echo '$(srcdir)/'`src/SID.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-SID.Tpo src/$(DEPDIR)/libresidfp_la-SID.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/SID.cpp' object='src/libresidfp_la-SID.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-SID.lo `test -f 'src/SID.cpp' || echo '$(srcdir)/'`src/SID.cpp
-
-src/libresidfp_la-Spline.lo: src/Spline.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-Spline.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-Spline.Tpo -c -o src/libresidfp_la-Spline.lo `test -f 'src/Spline.cpp' || echo '$(srcdir)/'`src/Spline.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-Spline.Tpo src/$(DEPDIR)/libresidfp_la-Spline.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Spline.cpp' object='src/libresidfp_la-Spline.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-Spline.lo `test -f 'src/Spline.cpp' || echo '$(srcdir)/'`src/Spline.cpp
-
-src/libresidfp_la-WaveformCalculator.lo: src/WaveformCalculator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-WaveformCalculator.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-WaveformCalculator.Tpo -c -o src/libresidfp_la-WaveformCalculator.lo `test -f 'src/WaveformCalculator.cpp' || echo '$(srcdir)/'`src/WaveformCalculator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-WaveformCalculator.Tpo src/$(DEPDIR)/libresidfp_la-WaveformCalculator.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/WaveformCalculator.cpp' object='src/libresidfp_la-WaveformCalculator.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-WaveformCalculator.lo `test -f 'src/WaveformCalculator.cpp' || echo '$(srcdir)/'`src/WaveformCalculator.cpp
-
-src/libresidfp_la-WaveformGenerator.lo: src/WaveformGenerator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-WaveformGenerator.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-WaveformGenerator.Tpo -c -o src/libresidfp_la-WaveformGenerator.lo `test -f 'src/WaveformGenerator.cpp' || echo '$(srcdir)/'`src/WaveformGenerator.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-WaveformGenerator.Tpo src/$(DEPDIR)/libresidfp_la-WaveformGenerator.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/WaveformGenerator.cpp' object='src/libresidfp_la-WaveformGenerator.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-WaveformGenerator.lo `test -f 'src/WaveformGenerator.cpp' || echo '$(srcdir)/'`src/WaveformGenerator.cpp
-
-src/resample/libresidfp_la-SincResampler.lo: src/resample/SincResampler.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/resample/libresidfp_la-SincResampler.lo -MD -MP -MF src/resample/$(DEPDIR)/libresidfp_la-SincResampler.Tpo -c -o src/resample/libresidfp_la-SincResampler.lo `test -f 'src/resample/SincResampler.cpp' || echo '$(srcdir)/'`src/resample/SincResampler.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/resample/$(DEPDIR)/libresidfp_la-SincResampler.Tpo src/resample/$(DEPDIR)/libresidfp_la-SincResampler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/resample/SincResampler.cpp' object='src/resample/libresidfp_la-SincResampler.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/resample/libresidfp_la-SincResampler.lo `test -f 'src/resample/SincResampler.cpp' || echo '$(srcdir)/'`src/resample/SincResampler.cpp
-
-src/libresidfp_la-version.lo: src/version.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/libresidfp_la-version.lo -MD -MP -MF src/$(DEPDIR)/libresidfp_la-version.Tpo -c -o src/libresidfp_la-version.lo `test -f 'src/version.cc' || echo '$(srcdir)/'`src/version.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libresidfp_la-version.Tpo src/$(DEPDIR)/libresidfp_la-version.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/version.cc' object='src/libresidfp_la-version.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/libresidfp_la-version.lo `test -f 'src/version.cc' || echo '$(srcdir)/'`src/version.cc
-
-src/residfp/libresidfp_la-residfp.lo: src/residfp/residfp.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/residfp/libresidfp_la-residfp.lo -MD -MP -MF src/residfp/$(DEPDIR)/libresidfp_la-residfp.Tpo -c -o src/residfp/libresidfp_la-residfp.lo `test -f 'src/residfp/residfp.cpp' || echo '$(srcdir)/'`src/residfp/residfp.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/residfp/$(DEPDIR)/libresidfp_la-residfp.Tpo src/residfp/$(DEPDIR)/libresidfp_la-residfp.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/residfp/residfp.cpp' object='src/residfp/libresidfp_la-residfp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libresidfp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/residfp/libresidfp_la-residfp.lo `test -f 'src/residfp/residfp.cpp' || echo '$(srcdir)/'`src/residfp/residfp.cpp
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-	-rm -rf src/.libs src/_libs
-	-rm -rf src/resample/.libs src/resample/_libs
-	-rm -rf src/residfp/.libs src/residfp/_libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^....
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[46106] trunk/vice/doc/snapshots -extract.sh

[<gp...@us...>]

Revision: 46106
          http://sourceforge.net/p/vice-emu/code/46106
Author:   gpz
Date:     2026-05-12 17:32:03 +0000 (Tue, 12 May 2026)
Log Message:
-----------
better replace both occurances of the awk line :)

Modified Paths:
--------------
    trunk/vice/doc/snapshots-extract.sh

Modified: trunk/vice/doc/snapshots-extract.sh
===================================================================
--- trunk/vice/doc/snapshots-extract.sh	2026-05-12 16:00:28 UTC (rev 46105)
+++ trunk/vice/doc/snapshots-extract.sh	2026-05-12 17:32:03 UTC (rev 46106)
@@ -299,7 +299,7 @@
         FULL=`grep -i -A 50 "snapshot module.*format" $F`
 
         # extract only the part until next closing comment
-        TAB=`echo "$FULL" | awk '/*\// {exit} {print}'`
+        TAB=$(echo "$FULL" | awk '/\*\// {exit} {print}')
 
         if  [ -z "$__MODULE__" ]; then
             # FIXME: what other formats are in the source?

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46105] trunk/vice/doc/snapshots -extract.sh

[<gp...@us...>]

Revision: 46105
          http://sourceforge.net/p/vice-emu/code/46105
Author:   gpz
Date:     2026-05-12 16:00:28 +0000 (Tue, 12 May 2026)
Log Message:
-----------
fix awk line, should fix #2224

Modified Paths:
--------------
    trunk/vice/doc/snapshots-extract.sh

Modified: trunk/vice/doc/snapshots-extract.sh
===================================================================
--- trunk/vice/doc/snapshots-extract.sh	2026-05-11 17:52:24 UTC (rev 46104)
+++ trunk/vice/doc/snapshots-extract.sh	2026-05-12 16:00:28 UTC (rev 46105)
@@ -350,7 +350,7 @@
 #            echo FULL:"$FULL" >> $LOGFILE
 
             # extract only the part until next closing comment
-            TAB=$(echo "$FULL" | awk '/\*\/ /{exit} {print}')
+            TAB=$(echo "$FULL" | awk '/\*\// {exit} {print}')
 #            echo TAB:"$TAB" >> $LOGFILE
 
             TABLE3=""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46104] trunk/vice

[<gp...@us...>]

Revision: 46104
          http://sourceforge.net/p/vice-emu/code/46104
Author:   gpz
Date:     2026-05-11 17:52:24 +0000 (Mon, 11 May 2026)
Log Message:
-----------
fix autogen.sh to correctly extract the subdir from AX_SUBDIRS_CONFIGURE invocation with more than one parameter. Use only one invocation in configure.ac so it doesnt run configure in the subdir multiple times but actually once with all provided arguments :)

Modified Paths:
--------------
    trunk/vice/autogen.sh
    trunk/vice/configure.ac

Modified: trunk/vice/autogen.sh
===================================================================
--- trunk/vice/autogen.sh	2026-05-11 16:33:38 UTC (rev 46103)
+++ trunk/vice/autogen.sh	2026-05-11 17:52:24 UTC (rev 46104)
@@ -201,7 +201,7 @@
 IFS=$old_IFS
 
 SUBDIRECTORIES=$(sed -ne "s/.*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/p" configure.ac)
-SUBDIRECTORIES2=$(sed -ne "s/.*AX_SUBDIRS_CONFIGURE(\[\(.*\)],.*).*/\1/p" configure.ac)
+SUBDIRECTORIES2=$(sed -ne "s/.*AX_SUBDIRS_CONFIGURE(\[\([a-zA-Z0-9/_-]*\)],.*).*/\1/p" configure.ac)
 
 for A in $SUBDIRECTORIES $SUBDIRECTORIES2; do
     (
@@ -212,17 +212,19 @@
 
 buildfiles
 
-if [ x"$1" = x"--dist" ]; then
-
-    ./configure
-    (cd src/monitor/; make mon_lex.c mon_parse.c)
-
-    (cd po; make cat-id-tbl.c)
-
-    SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c"
-    SVN_ADD_MAKEFILES="`find . -name Makefile.in`"
-
-    svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES
-
-fi
-
+# Whatever this tried to do, its probably obsolete
+#
+#if [ x"$1" = x"--dist" ]; then
+#
+#    ./configure
+#    (cd src/monitor/; make mon_lex.c mon_parse.c)
+#
+#    (cd po; make cat-id-tbl.c)
+#
+#    SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c"
+#    SVN_ADD_MAKEFILES="`find . -name Makefile.in`"
+#
+#    svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES
+#
+#fi
+#

Modified: trunk/vice/configure.ac
===================================================================
--- trunk/vice/configure.ac	2026-05-11 16:33:38 UTC (rev 46103)
+++ trunk/vice/configure.ac	2026-05-11 17:52:24 UTC (rev 46104)
@@ -2048,8 +2048,7 @@
   if test x"$with_residfp" = "xyes" -o x"$with_residfp" = "x"; then
     AC_DEFINE(HAVE_RESIDFP,,[This version provides ReSIDfp support.])
     HAVE_RESIDFP_SUPPORT="yes"
-    AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-option-checking])
-    AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-tests])
+    AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [[--disable-option-checking],[--disable-tests]])
     RESIDFP_DIR=lib/libresidfp
     RESIDFP_LIBS="\$(top_builddir)/src/lib/libresidfp/libresidfp.a"
     RESIDFP_INCLUDES="-I\$(top_srcdir)/src/lib/libresidfp -I\$(top_builddir)/src/lib/libresidfp/src"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46103] trunk/vice

[<gp...@us...>]

Revision: 46103
          http://sourceforge.net/p/vice-emu/code/46103
Author:   gpz
Date:     2026-05-11 16:33:38 +0000 (Mon, 11 May 2026)
Log Message:
-----------
disable building the residfp tests

Modified Paths:
--------------
    trunk/vice/configure.ac
    trunk/vice/doc/snapshots-extract.sh

Modified: trunk/vice/configure.ac
===================================================================
--- trunk/vice/configure.ac	2026-05-11 14:44:45 UTC (rev 46102)
+++ trunk/vice/configure.ac	2026-05-11 16:33:38 UTC (rev 46103)
@@ -2049,6 +2049,7 @@
     AC_DEFINE(HAVE_RESIDFP,,[This version provides ReSIDfp support.])
     HAVE_RESIDFP_SUPPORT="yes"
     AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-option-checking])
+    AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-tests])
     RESIDFP_DIR=lib/libresidfp
     RESIDFP_LIBS="\$(top_builddir)/src/lib/libresidfp/libresidfp.a"
     RESIDFP_INCLUDES="-I\$(top_srcdir)/src/lib/libresidfp -I\$(top_builddir)/src/lib/libresidfp/src"

Modified: trunk/vice/doc/snapshots-extract.sh
===================================================================
--- trunk/vice/doc/snapshots-extract.sh	2026-05-11 14:44:45 UTC (rev 46102)
+++ trunk/vice/doc/snapshots-extract.sh	2026-05-11 16:33:38 UTC (rev 46103)
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-echo SCRIPTDIR: $SCRIPTDIR
+#echo SCRIPTDIR: $SCRIPTDIR
 
 #SOURCE=$1
 SOURCE=$SCRIPTDIR/../src

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46102] trunk/vice/Makefile.am

[<gp...@us...>]

Revision: 46102
          http://sourceforge.net/p/vice-emu/code/46102
Author:   gpz
Date:     2026-05-11 14:44:45 +0000 (Mon, 11 May 2026)
Log Message:
-----------
exclude src/lib from dos2unix run, now really

Modified Paths:
--------------
    trunk/vice/Makefile.am

Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am	2026-05-11 14:34:34 UTC (rev 46101)
+++ trunk/vice/Makefile.am	2026-05-11 14:44:45 UTC (rev 46102)
@@ -244,7 +244,7 @@
 
 # Manually define the dist targets so the correct tar usage will be used.
 dist-gzip:
-	$(DOS2UNIX) `find $(top_srcdir) -not -path "./src/lib*" -name "*.sh"`
+	$(DOS2UNIX) `find $(top_srcdir) -not -path "*/src/lib/*" -name "*.sh"`
 	$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
 	$(MAKE) distdir
 	$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz
@@ -251,7 +251,7 @@
 	$(am__remove_distdir)
 
 dist dist-all:
-	$(DOS2UNIX) `find $(top_srcdir) -not -path "./src/lib*" -name "*.sh"`
+	$(DOS2UNIX) `find $(top_srcdir) -not -path "*/src/lib/*" -name "*.sh"`
 	$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
 	$(MAKE) distdir
 	$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46101] trunk/vice/Makefile.am

[<gp...@us...>]

Revision: 46101
          http://sourceforge.net/p/vice-emu/code/46101
Author:   gpz
Date:     2026-05-11 14:34:34 +0000 (Mon, 11 May 2026)
Log Message:
-----------
exclude src/lib from dos2unix run

Modified Paths:
--------------
    trunk/vice/Makefile.am

Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am	2026-05-11 14:31:32 UTC (rev 46100)
+++ trunk/vice/Makefile.am	2026-05-11 14:34:34 UTC (rev 46101)
@@ -244,7 +244,7 @@
 
 # Manually define the dist targets so the correct tar usage will be used.
 dist-gzip:
-	$(DOS2UNIX) `find $(top_srcdir) -name "*.sh"`
+	$(DOS2UNIX) `find $(top_srcdir) -not -path "./src/lib*" -name "*.sh"`
 	$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
 	$(MAKE) distdir
 	$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz
@@ -251,7 +251,7 @@
 	$(am__remove_distdir)
 
 dist dist-all:
-	$(DOS2UNIX) `find $(top_srcdir) -name "*.sh"`
+	$(DOS2UNIX) `find $(top_srcdir) -not -path "./src/lib*" -name "*.sh"`
 	$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
 	$(MAKE) distdir
 	$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46100] trunk/vice/doc/vice.te xi

[<gp...@us...>]

Revision: 46100
          http://sourceforge.net/p/vice-emu/code/46100
Author:   gpz
Date:     2026-05-11 14:31:32 +0000 (Mon, 11 May 2026)
Log Message:
-----------
remove non ascii character

Modified Paths:
--------------
    trunk/vice/doc/vice.texi

Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi	2026-05-11 13:25:10 UTC (rev 46099)
+++ trunk/vice/doc/vice.texi	2026-05-11 14:31:32 UTC (rev 46100)
@@ -31474,7 +31474,7 @@
     Two variants of this Cartridge existed:
 
     1. Grey Cartridge (Comal Users Group, USA)
-       Produced around 1984-1985, likely with UniComal Denmarks approval.
+       Produced around 1984-1985, likely with UniComal Denmarks approval.
        Approx. 2,000 units distributed (according to COMAL Today).
 
 @itemize @bullet

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46099] trunk/vice/configure.a c

[<gp...@us...>]

Revision: 46099
          http://sourceforge.net/p/vice-emu/code/46099
Author:   gpz
Date:     2026-05-11 13:25:10 +0000 (Mon, 11 May 2026)
Log Message:
-----------
configure fix provided by leandro

Modified Paths:
--------------
    trunk/vice/configure.ac

Modified: trunk/vice/configure.ac
===================================================================
--- trunk/vice/configure.ac	2026-05-10 17:53:30 UTC (rev 46098)
+++ trunk/vice/configure.ac	2026-05-11 13:25:10 UTC (rev 46099)
@@ -2051,7 +2051,7 @@
     AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-option-checking])
     RESIDFP_DIR=lib/libresidfp
     RESIDFP_LIBS="\$(top_builddir)/src/lib/libresidfp/libresidfp.a"
-    RESIDFP_INCLUDES="-I\$(top_builddir)/src/lib/libresidfp"
+    RESIDFP_INCLUDES="-I\$(top_srcdir)/src/lib/libresidfp -I\$(top_builddir)/src/lib/libresidfp/src"
     RESIDFP_DEP=libresidfp
     RESIDFPSUB=lib/libresidfp
   fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46098] trunk/vice/doc/snapshots -extract.sh

[<gp...@us...>]

Revision: 46098
          http://sourceforge.net/p/vice-emu/code/46098
Author:   gpz
Date:     2026-05-10 17:53:30 +0000 (Sun, 10 May 2026)
Log Message:
-----------
attempt to fix #2224

Modified Paths:
--------------
    trunk/vice/doc/snapshots-extract.sh

Modified: trunk/vice/doc/snapshots-extract.sh
===================================================================
--- trunk/vice/doc/snapshots-extract.sh	2026-05-10 17:16:12 UTC (rev 46097)
+++ trunk/vice/doc/snapshots-extract.sh	2026-05-10 17:53:30 UTC (rev 46098)
@@ -350,7 +350,7 @@
 #            echo FULL:"$FULL" >> $LOGFILE
 
             # extract only the part until next closing comment
-            TAB=`echo "$FULL" | awk '/*\// {exit} {print}'`
+            TAB=$(echo "$FULL" | awk '/\*\/ /{exit} {print}')
 #            echo TAB:"$TAB" >> $LOGFILE
 
             TABLE3=""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46097] trunk/vice/src/lib/libre sidfp/src

[<gp...@us...>]

Revision: 46097
          http://sourceforge.net/p/vice-emu/code/46097
Author:   gpz
Date:     2026-05-10 17:16:12 +0000 (Sun, 10 May 2026)
Log Message:
-----------
residfp warning fixes provided by leandro

Modified Paths:
--------------
    trunk/vice/src/lib/libresidfp/src/Filter.cpp
    trunk/vice/src/lib/libresidfp/src/FilterModelConfig6581.cpp
    trunk/vice/src/lib/libresidfp/src/Integrator6581.h
    trunk/vice/src/lib/libresidfp/src/Integrator8580.h
    trunk/vice/src/lib/libresidfp/src/OpAmp.h
    trunk/vice/src/lib/libresidfp/src/SID.cpp
    trunk/vice/src/lib/libresidfp/src/WaveformGenerator.h
    trunk/vice/src/lib/libresidfp/src/array.h
    trunk/vice/src/lib/libresidfp/src/resample/Limiter.h

Modified: trunk/vice/src/lib/libresidfp/src/Filter.cpp
===================================================================
--- trunk/vice/src/lib/libresidfp/src/Filter.cpp	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/Filter.cpp	2026-05-10 17:16:12 UTC (rev 46097)
@@ -112,12 +112,12 @@
     updateMixing();
 }
 
-Filter::Filter(FilterModelConfig& fmc) :
-    mixer(fmc.getMixer()),
-    summer(fmc.getSummer()),
-    resonance(fmc.getResonance()),
-    volume(fmc.getVolume()),
-    fmc(fmc)
+Filter::Filter(FilterModelConfig& new_fmc) :
+    mixer(new_fmc.getMixer()),
+    summer(new_fmc.getSummer()),
+    resonance(new_fmc.getResonance()),
+    volume(new_fmc.getVolume()),
+    fmc(new_fmc)
 {
     input(0);
 }

Modified: trunk/vice/src/lib/libresidfp/src/FilterModelConfig6581.cpp
===================================================================
--- trunk/vice/src/lib/libresidfp/src/FilterModelConfig6581.cpp	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/FilterModelConfig6581.cpp	2026-05-10 17:16:12 UTC (rev 46097)
@@ -300,7 +300,7 @@
 
 unsigned short* FilterModelConfig6581::getDAC(double adjustment) const
 {
-    const double dac_zero = getDacZero(adjustment);
+    const double new_dac_zero = getDacZero(adjustment);
 
     unsigned short* f0_dac = new unsigned short[1 << DAC_BITS];
 
@@ -307,7 +307,7 @@
     for (unsigned int i = 0; i < (1 << DAC_BITS); i++)
     {
         const double fcd = dac.getOutput(i);
-        f0_dac[i] = getNormalizedValue(dac_zero + fcd * dac_scale);
+        f0_dac[i] = getNormalizedValue(new_dac_zero + fcd * dac_scale);
     }
 
     return f0_dac;

Modified: trunk/vice/src/lib/libresidfp/src/Integrator6581.h
===================================================================
--- trunk/vice/src/lib/libresidfp/src/Integrator6581.h	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/Integrator6581.h	2026-05-10 17:16:12 UTC (rev 46097)
@@ -182,16 +182,16 @@
     FilterModelConfig6581& fmc;
 
 public:
-    explicit Integrator6581(FilterModelConfig6581& fmc) :
-        wlSnake(fmc.getWL_snake()),
+    explicit Integrator6581(FilterModelConfig6581& new_fmc) :
+        wlSnake(new_fmc.getWL_snake()),
 #ifdef SLOPE_FACTOR
         n(1.4),
 #endif
         nVddt_Vw_2(0),
-        nVddt(fmc.getNormalizedValue(fmc.getVddt())),
-        nVt(fmc.getNormalizedValue(fmc.getVth())),
-        nVmin(fmc.getNVmin()),
-        fmc(fmc) {}
+        nVddt(new_fmc.getNormalizedValue(new_fmc.getVddt())),
+        nVt(new_fmc.getNormalizedValue(new_fmc.getVth())),
+        nVmin(new_fmc.getNVmin()),
+        fmc(new_fmc) {}
 
     void setVw(unsigned short Vw) { nVddt_Vw_2 = ((nVddt - Vw) * (nVddt - Vw)) >> 1; }
 

Modified: trunk/vice/src/lib/libresidfp/src/Integrator8580.h
===================================================================
--- trunk/vice/src/lib/libresidfp/src/Integrator8580.h	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/Integrator8580.h	2026-05-10 17:16:12 UTC (rev 46097)
@@ -61,8 +61,8 @@
     FilterModelConfig8580& fmc;
 
 public:
-    explicit Integrator8580(FilterModelConfig8580& fmc) :
-        fmc(fmc)
+    explicit Integrator8580(FilterModelConfig8580& new_fmc) :
+        fmc(new_fmc)
     {
         setV(1.5);
     }

Modified: trunk/vice/src/lib/libresidfp/src/OpAmp.h
===================================================================
--- trunk/vice/src/lib/libresidfp/src/OpAmp.h	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/OpAmp.h	2026-05-10 17:16:12 UTC (rev 46097)
@@ -88,12 +88,12 @@
      * @param vmin
      * @param vmax
      */
-    OpAmp(const std::vector<Spline::Point> &opamp_voltages, double Vddt,
-            double vmin, double vmax
+    OpAmp(const std::vector<Spline::Point> &opamp_voltages, double new_Vddt,
+            double new_vmin, double new_vmax
     ) :
-        Vddt(Vddt),
-        vmin(vmin),
-        vmax(vmax),
+        Vddt(new_Vddt),
+        vmin(new_vmin),
+        vmax(new_vmax),
         opamp(opamp_voltages) {}
 
     /**

Modified: trunk/vice/src/lib/libresidfp/src/SID.cpp
===================================================================
--- trunk/vice/src/lib/libresidfp/src/SID.cpp	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/SID.cpp	2026-05-10 17:16:12 UTC (rev 46097)
@@ -218,9 +218,9 @@
     }
 }
 
-void SID::setChipModel(ChipModel model)
+void SID::setChipModel(ChipModel new_model)
 {
-    switch (model)
+    switch (new_model)
     {
     case MOS6581:
         filter = filter6581;
@@ -238,7 +238,7 @@
         throw SIDError("Unknown chip type");
     }
 
-    this->model = model;
+    model = new_model;
 
     // calculate waveform-related tables
     matrix_t* wavetables = WaveformCalculator::getInstance()->getWaveTable();
@@ -283,9 +283,9 @@
     }
 }
 
-void SID::setCombinedWaveforms(CombinedWaveforms cws)
+void SID::setCombinedWaveforms(CombinedWaveforms new_cws)
 {
-    switch (cws)
+    switch (new_cws)
     {
     case AVERAGE:
     case WEAK:
@@ -296,7 +296,7 @@
         throw SIDError("Unknown combined waveforms type");
     }
 
-    this->cws = cws;
+    cws = new_cws;
 
     // rebuild waveform-related tables
     matrix_t* pulldowntables = WaveformCalculator::getInstance()->buildPulldownTable(model, cws);

Modified: trunk/vice/src/lib/libresidfp/src/WaveformGenerator.h
===================================================================
--- trunk/vice/src/lib/libresidfp/src/WaveformGenerator.h	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/WaveformGenerator.h	2026-05-10 17:16:12 UTC (rev 46097)
@@ -187,7 +187,7 @@
      *
      * @param is6581 true if MOS6581, false if CSG8580
      */
-    void setModel(bool is6581) { this->is6581 = is6581; }
+    void setModel(bool new_is6581) { is6581 = new_is6581; }
 
     /**
      * SID clocking.

Modified: trunk/vice/src/lib/libresidfp/src/array.h
===================================================================
--- trunk/vice/src/lib/libresidfp/src/array.h	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/array.h	2026-05-10 17:16:12 UTC (rev 46097)
@@ -53,11 +53,11 @@
     matrix& operator=(const matrix&) = delete;
 
 public:
-    matrix(unsigned int x, unsigned int y) :
-        data(new T[x * y]),
+    matrix(unsigned int new_x, unsigned int new_y) :
+        data(new T[new_x * new_y]),
         count(new counter()),
-        x(x),
-        y(y) {}
+        x(new_x),
+        y(new_y) {}
 
     matrix(const matrix& p) :
         data(p.data),

Modified: trunk/vice/src/lib/libresidfp/src/resample/Limiter.h
===================================================================
--- trunk/vice/src/lib/libresidfp/src/resample/Limiter.h	2026-05-10 17:04:09 UTC (rev 46096)
+++ trunk/vice/src/lib/libresidfp/src/resample/Limiter.h	2026-05-10 17:16:12 UTC (rev 46097)
@@ -34,7 +34,7 @@
     template<int m>
     static inline int clipper(int x)
     {
-        static_assert(m > 0);
+        static_assert(m > 0, "Clipper range must be a positive value");
         assert(x >= 0);
         if (likely(x < threshold))
             return x;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46096] trunk/vice/src/sid

[<gp...@us...>]

Revision: 46096
          http://sourceforge.net/p/vice-emu/code/46096
Author:   gpz
Date:     2026-05-10 17:04:09 +0000 (Sun, 10 May 2026)
Log Message:
-----------
fixed the sound buffer overflows with residfp, also fixed the case when the SID is not running at system clock ("SID card")

Modified Paths:
--------------
    trunk/vice/src/sid/resid.cc
    trunk/vice/src/sid/residfp.cc

Modified: trunk/vice/src/sid/resid.cc
===================================================================
--- trunk/vice/src/sid/resid.cc	2026-05-10 14:58:45 UTC (rev 46095)
+++ trunk/vice/src/sid/resid.cc	2026-05-10 17:04:09 UTC (rev 46096)
@@ -305,15 +305,17 @@
     /* Tried not to mess with resid during 64-bit conversion. clock(...) wants to modify *delta_t ... */
 
     if (psid->factor == 1000) {
+        /* CAUTION: modifies int_delta_t so it contains "cycles left to do" after exit (usually 0) */
         retval = psid->sid->clock(int_delta_t, pbuf, nr, interleave);
         (*delta_t) += int_delta_t - int_delta_t_original;
         return retval;
     }
 
+    /* Used when SID does not run at system clock ("SID card") */
     tmp_buf = getbuf(2 * nr * psid->factor / 1000);
-    retval = psid->sid->clock(int_delta_t, tmp_buf, nr * psid->factor / 1000, interleave) * 1000 / psid->factor;
+    retval = psid->sid->clock(int_delta_t, tmp_buf, nr * psid->factor / 1000, interleave);
     (*delta_t) += int_delta_t - int_delta_t_original;
-    memcpy(pbuf, tmp_buf, 2 * nr);
+    memcpy(pbuf, tmp_buf, retval * 2);
 
     return retval;
 }

Modified: trunk/vice/src/sid/residfp.cc
===================================================================
--- trunk/vice/src/sid/residfp.cc	2026-05-10 14:58:45 UTC (rev 46095)
+++ trunk/vice/src/sid/residfp.cc	2026-05-10 17:04:09 UTC (rev 46096)
@@ -269,17 +269,13 @@
 {
     short *tmp_buf;
     int retval;
-    /*int int_delta_t_original = (int)*delta_t;*/
     int int_delta_t = (int)*delta_t;
 
     /* Tried not to mess with resid during 64-bit conversion. clock(...) wants to modify *delta_t ... */
 
     if (psid->factor == 1000) {
-        /* FIXME: the sound code constantly spits out "buffer overrun" warnings, but sound plays fine,
-         * something is wrong there */
-        /*retval = psid->sid->clock(int_delta_t, pbuf, nr, interleave);*/
-
         tmp_buf = getbuf(2 * nr);
+        /* CAUTION: unlike ReSID; this does NOT return the number of cycles "left to do" in int_delta_t */
         retval = psid->sid->clock(int_delta_t, tmp_buf);
         {
             int n, p = 0;
@@ -289,19 +285,22 @@
             }
         }
 
-        /* printf("%p %p nr:%d interleave:%d retval:%d delta:%d\n", psid, pbuf, nr, interleave, retval, int_delta_t); */
-        /* (*delta_t) += int_delta_t - int_delta_t_original; */
+        (*delta_t) = 0;
         return retval;
     }
 
-    /* FIXME: how to trigger this case for testing? */
-
-    /* retval = psid->sid->clock(int_delta_t, tmp_buf, nr * psid->factor / 1000, interleave) * 1000 / psid->factor; */
+    /* Used when SID does not run at system clock ("SID card") */
     tmp_buf = getbuf(2 * nr * psid->factor / 1000);
     retval = psid->sid->clock(int_delta_t, tmp_buf);
-    /* (*delta_t) += int_delta_t - int_delta_t_original; */
-    memcpy(pbuf, tmp_buf, 2 * nr);
+    {
+        int n, p = 0;
+        for (n = 0; n < retval; n++) {
+            pbuf[p] = tmp_buf[n];
+            p += interleave;
+        }
+    }
 
+    (*delta_t) = 0;
     return retval;
 }
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46095] trunk/vice/src/sid/sid-r esources.c

[<gp...@us...>]

Revision: 46095
          http://sourceforge.net/p/vice-emu/code/46095
Author:   gpz
Date:     2026-05-10 14:58:45 +0000 (Sun, 10 May 2026)
Log Message:
-----------
fix 8580+digifix with residfp

Modified Paths:
--------------
    trunk/vice/src/sid/sid-resources.c

Modified: trunk/vice/src/sid/sid-resources.c
===================================================================
--- trunk/vice/src/sid/sid-resources.c	2026-05-07 20:23:41 UTC (rev 46094)
+++ trunk/vice/src/sid/sid-resources.c	2026-05-10 14:58:45 UTC (rev 46095)
@@ -806,6 +806,7 @@
 #ifdef HAVE_RESIDFP
         case SID_RESIDFP_6581:
         case SID_RESIDFP_8580:
+        case SID_RESIDFP_8580D:
 #endif
             return 0;
 #ifdef HAVE_RESID_DTV

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46094] trunk/vice

[<gp...@us...>]

Revision: 46094
          http://sourceforge.net/p/vice-emu/code/46094
Author:   gpz
Date:     2026-05-07 20:23:41 +0000 (Thu, 07 May 2026)
Log Message:
-----------
add ReSIDfp as an additional engine. bugs included :)

Modified Paths:
--------------
    trunk/vice/configure.ac
    trunk/vice/doc/vice.texi
    trunk/vice/src/Makefile.am
    trunk/vice/src/arch/gtk3/widgets/mixerwidget.c
    trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c
    trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c
    trunk/vice/src/arch/sdl/menu_sid.c
    trunk/vice/src/lib/Makefile.am
    trunk/vice/src/sid/Makefile.am
    trunk/vice/src/sid/sid-cmdline-options.c
    trunk/vice/src/sid/sid-cmdline-options.h
    trunk/vice/src/sid/sid-resources.c
    trunk/vice/src/sid/sid.c
    trunk/vice/src/sid/sid.h
    trunk/vice/src/sound.c

Added Paths:
-----------
    trunk/vice/src/sid/residfp.cc
    trunk/vice/src/sid/residfp.h

Modified: trunk/vice/configure.ac
===================================================================
--- trunk/vice/configure.ac	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/configure.ac	2026-05-07 20:23:41 UTC (rev 46094)
@@ -89,6 +89,7 @@
 VICE_ARG_WITH_LIST(oss,                     [  --with-oss              use the OSS sound system])
 VICE_ARG_WITH_LIST(pulse,                   [  --without-pulse         do not use PulseAudio sound system])
 VICE_ARG_WITH_LIST(resid,                   [  --without-resid         do not use the reSID engine])
+VICE_ARG_WITH_LIST(residfp,                 [  --without-residfp       do not use the reSIDfp engine])
 VICE_ARG_WITH_LIST(sdlsound,                [  --with-sdlsound         use SDL sound system])
 VICE_ARG_WITH_LIST(sun,                     [  --without-sun           do not use the sun/netbsd sound system])
 VICE_ARG_WITH_LIST(vorbis,                  [  --with-vorbis           use Ogg/Vorbis support])
@@ -462,6 +463,7 @@
 HAVE_RAWNET_SUPPORT="no "
 HAVE_REALDEVICE_SUPPORT="no "
 HAVE_RESID_SUPPORT="no "
+HAVE_RESIDFP_SUPPORT="no "
 HAVE_RS232DEV_SUPPORT="no "
 HAVE_RS232NET_SUPPORT="no "
 HAVE_OPENMP_SUPPORT="no "
@@ -1873,6 +1875,8 @@
 dnl by default so we check against "no" ($with_resid being empty means the
 dnl default, ie "yes")
 dnl
+dnl FIXME: residfp?
+dnl
 dnl Remove this check to allow building without a SID engine
 if test x"$with_fastsid" != "xyes" -a x"$with_resid" = "xno"; then
   AC_MSG_ERROR([Neither FastSID nor ReSID sound engine enabled, please enable at least one.])
@@ -1990,6 +1994,89 @@
 AC_SUBST(RESID_DTV_INCLUDES)
 AC_SUBST(RESID_DTV_DEP)
 
+
+RESIDFP_DIR=
+RESIDFP_LIBS=
+RESIDFP_INCLUDES=
+RESIDFP_DEP=
+
+dnl Set linker to C++ compiler/linker: even SDL builds use C++ code (linenoise-ng)
+LINKCC='$(CXX)'
+
+dnl disable reSIDfp for certain platforms
+
+RESIDFPSUB=""
+
+if test x"$with_residfp" = "xno"; then
+  dnl Do not attempt to configure reSIDfp.
+  dnl NOTE: no_recursion is set because directories specified with
+  dnl AC_CONFIG_SUBDIRS are always recursed into regardless of where the
+  dnl macro is used.
+  dnl Another workaround must be found if other self-contained packages go
+  dnl into VICE.
+
+  dnl A workaround for an autoconf bug when not using/checking the C++
+  dnl compiler, we'll define am__fastdepCXX_TRUE as #
+  am__fastdepCXX_TRUE=#
+  am__fastdepCXX_FALSE=
+else
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_PROG_CXX([g++ clang++ cc])
+
+  dnl disable residfp when no C++ compiler is found
+  if test x"$CXX" != "x" ; then
+    LINKCC='$(CXX)'
+
+    dnl Set CXXFLAGS. Use -fno-exceptions for G++ if supported.
+    if test "$ac_test_CXXFLAGS" != set; then
+      if test "$GXX" = yes; then
+        old_CXXFLAGS=$CXXFLAGS
+        CXXFLAGS="$CXXFLAGS -fno-exceptions"
+        AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+        AC_TRY_COMPILE([],
+                       [ int test; ],
+                       [ AC_MSG_RESULT(yes) ],
+                       [ AC_MSG_RESULT(no)
+                         CXXFLAGS=$old_CXXFLAGS
+                         ])
+      fi
+    fi
+    AC_PROG_CXXCPP
+  fi
+
+  if test x"$with_residfp" = "xyes" -o x"$with_residfp" = "x"; then
+    AC_DEFINE(HAVE_RESIDFP,,[This version provides ReSIDfp support.])
+    HAVE_RESIDFP_SUPPORT="yes"
+    AX_SUBDIRS_CONFIGURE([src/lib/libresidfp], [--disable-option-checking])
+    RESIDFP_DIR=lib/libresidfp
+    RESIDFP_LIBS="\$(top_builddir)/src/lib/libresidfp/libresidfp.a"
+    RESIDFP_INCLUDES="-I\$(top_builddir)/src/lib/libresidfp"
+    RESIDFP_DEP=libresidfp
+    RESIDFPSUB=lib/libresidfp
+  fi
+  AC_LANG_RESTORE
+fi
+
+AC_SUBST(RESIDFPSUB)
+
+if test x"$RESIDFPSUB" = "xresidfp"; then
+  AM_CONDITIONAL(RESIDFP_DIR_USED, true)
+else
+  AM_CONDITIONAL(RESIDFP_DIR_USED, false)
+fi
+
+AC_SUBST(LINKCC)
+
+AM_CONDITIONAL(HAVE_RESIDFP, test x"$with_residfp" != "xno")
+
+AC_SUBST(RESIDFP_DIR)
+AC_SUBST(RESIDFP_LIBS)
+AC_SUBST(RESIDFP_INCLUDES)
+AC_SUBST(RESIDFP_DEP)
+
+
+
 dnl Check for typedefs, structures, and compiler characteristics.
 AC_CHECK_HEADERS(sys/types.h)
 
@@ -3673,6 +3760,7 @@
 echo "-----"
 echo "FastSID support              : $HAVE_FASTSID_SUPPORT (--with/without-fastsid)"
 echo "ReSID support                : $HAVE_RESID_SUPPORT (--with/without-resid)"
+echo "ReSIDfp support              : $HAVE_RESIDFP_SUPPORT (--with/without-residfp)"
 echo "New 8580 filter support      : $USE_NEW_8580_FILTER (--enable/disable-new8580filter)"
 echo "PortAudio sound input support: $USE_PORTAUDIO_SUPPORT (--with/without-portaudio)"
 

Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/doc/vice.texi	2026-05-07 20:23:41 UTC (rev 46094)
@@ -12663,7 +12663,7 @@
 @vindex SidEngine
 @item SidEngine
 Integer specifying what SID engine will be used.
-(0: FastSID, 1: ReSID, 2: Catweasel MKIII, 3: HardSID, 4: ParSID Port 1, 5: ParSID Port 2, 6: ParSID Port 3, 7: USBSID-Pico)
+(0: FastSID, 1: ReSID, 2: Catweasel MKIII, 3: HardSID, 4: ParSID Port 1, 5: ParSID Port 2, 6: ParSID Port 3, 7: USBSID-Pico, 8: ReSIDfp)
 
 @vindex SidResidSampling
 @item SidResidSampling
@@ -12704,6 +12704,22 @@
  not downsampled - audio data is written to a file called resid.raw in the current
  working directory.
 
+@vindex SidResid8580Gain
+@item SidResid8580Gain
+Integer that specifies reSID gain in percent [97] (90..100) for 8580.
+
+@vindex SidResid6581FilterCurve
+@item SidResid6581FilterCurve
+Integer that specifies the reSIDfp filter curve parameter [500] (0..1000) for the 6581.
+
+@vindex SidResid6581FilterRange
+@item SidResid6581FilterRange
+Integer that specifies the reSIDfp filter range parameter [500] (0..1000) for the 6581.
+
+@vindex SidResid8580FilterCurve
+@item SidResid8580FilterCurve
+Integer that specifies the reSIDfp filter curve parameter [500] (0..1000) for the 8580.
+
 @vindex SidUSBSIDReadMode
 @item SidUSBSIDReadMode
 Boolean specifying whether to enable USBSID-Pico read mode. When enabled, this
@@ -12883,13 +12899,16 @@
 ParSID Port 1: 1024/parsid/parsid1/par1/lpt1,
 ParSID Port 2: 1280/parsid2/par2/lpt2,
 ParSID Port 3: 1536/parsid3/par3/lpt3,
-USBSID-Pico: 1792/usbsid/usbs/us)
+USBSID-Pico: 1792/usbsid/usbs/us,
+ReSIDfp 6581: 2048/residfp/residfpold/residfp6581,
+ReSIDfp 8580: 2049/residfpnew/residfp8580,
+ReSIDfp 8580 + digiboost: 2050/residfpdigital/residfpd/residfpnewd/residfp8580d)
 
 @findex -sidengine
 @item -sidengine <engine>
 Specify engine for the emulated SID chip
 (@code{SidEngine}).
-(FastSID: 0, ReSID: 1, DTVSID: 2, HardSID: 3, ParSID Port 1: 4, ParSID Port 2: 5, ParSID Port 3: 6, USBSID-Pico: 7)
+(FastSID: 0, ReSID: 1, DTVSID: 2, HardSID: 3, ParSID Port 1: 4, ParSID Port 2: 5, ParSID Port 3: 6, USBSID-Pico: 7, ReSIDfp: 8)
 
 @findex -sidmodel
 @item -sidmodel <model>
@@ -12942,6 +12961,18 @@
  not downsampled - audio data is written to a file called resid.raw in the current
  working directory.
 
+@findex -residfp6581filtercurve
+@item -residfp6581filtercurve <number>
+reSIDfp filter curve setting for 6581 (0..1000).
+
+@findex -residfp6581filterrange
+@item -residfp6581filterrange <number>
+reSIDfp filter range setting for 6581 (0..1000).
+
+@findex -residfp8580filtercurve
+@item -residfp8580filtercurve <number>
+reSIDfp filter curve setting for 8580 (0..1000).
+
 @findex -usreadmode
 @item -usreadmode <0 or 1>
 Enable USBSID-Pico read mode. When enabled, this mode allows for reading from SID

Modified: trunk/vice/src/Makefile.am
===================================================================
--- trunk/vice/src/Makefile.am	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/src/Makefile.am	2026-05-07 20:23:41 UTC (rev 46094)
@@ -593,6 +593,9 @@
 printerdrv_lib = $(top_builddir)/src/printerdrv/libprinterdrv.a
 resid_lib = $(top_builddir)/src/resid/libresid.a
 resid_dtv_lib = $(top_builddir)/src/resid-dtv/libresiddtv.a
+if HAVE_RESIDFP
+residfp_lib = $(top_builddir)/src/lib/libresidfp/src/.libs/libresidfp.a
+endif
 rs232drv_lib = $(top_builddir)/src/rs232drv/librs232drv.a
 rs232drvpet_lib = $(top_builddir)/src/rs232drv/librs232drvpet.a
 raster_lib = $(top_builddir)/src/raster/libraster.a
@@ -628,6 +631,7 @@
 common_libs = @ARCH_LIBS@ @LIBOBJS@
 resid_libs = @RESID_LIBS@
 resid_dtv_libs = @RESID_DTV_LIBS@
+#residfp_libs = @RESIDFP_LIBS@
 
 # external libraries required for all emulators
 emu_extlibs = @UI_LIBS@ @SDL_EXTRA_LIBS@ @SOUND_LIBS@ @JOY_LIBS@ @GFXOUTPUT_LIBS@ @ZLIB_LIBS@ @DYNLIB_LIBS@ @ARCH_LIBS@ $(archdep_lib) $(linenoise_ng_lib)
@@ -638,6 +642,10 @@
 driver_libs += $(usbsiddrv_lib)
 endif
 
+if HAVE_RESIDFP
+driver_libs += $(residfp_lib)
+endif
+
 if SUPPORT_X64
 x64_bin = x64
 else
@@ -681,6 +689,11 @@
 vsid_libs += $(usbsiddrv_lib)
 endif
 
+if HAVE_RESIDFP
+#vsid_libs += $(residfp_libs)
+vsid_libs += $(residfp_lib)
+endif
+
 vsid_SOURCES = $(base_sources) $(midi_sources)
 vsid_LDADD = $(vsid_libs) $(emu_extlibs) @TFE_LIBS@ @NETPLAY_LIBS@ $(VSID_RES)
 
@@ -1354,7 +1367,7 @@
 DISTCLEANFILES = $(BUILT_SOURCES) $(GENFILES)
 
 # Special targets to build libraries in subdirectories.
-.PHONY: @RESID_DEP@ @RESID_DTV_DEP@
+.PHONY: @RESID_DEP@ @RESID_DTV_DEP@ @RESIDFP_DEP@
 
 info.c: infocontrib.h
 
@@ -1646,6 +1659,9 @@
 $(zmbv_lib):
 	@echo "making all in lib/libzmbv"
 	@(cd lib/libzmbv && $(MAKE))
+$(residfp_lib):
+	@echo "making all in lib/libresidfp"
+	@(cd lib/libresidfp && $(MAKE))
 
 
 clean: clean-recursive

Modified: trunk/vice/src/arch/gtk3/widgets/mixerwidget.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/mixerwidget.c	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/src/arch/gtk3/widgets/mixerwidget.c	2026-05-07 20:23:41 UTC (rev 46094)
@@ -13,6 +13,9 @@
  * $VICERES SidResid8580Gain        -vsid
  * $VICERES SidResid8580FilterBias  -vsid
  * $VICERES CB2Lowpass              xpet
+ * $VICERES SidResid6581FilterCurve -vsid
+ * $VICERES SidResid6581FilterRange -vsid
+ * $VICERES SidResid8580FilterCurve -vsid
  */
 
 /*
@@ -137,6 +140,28 @@
 
 #endif
 
+#ifdef HAVE_RESIDFP
+
+/** \brief  ReSIDfp 6581 filter range slider */
+static GtkWidget *range6581;
+
+/** \brief  ReSIDfp 6581 filter curve slider */
+static GtkWidget *curve6581;
+
+/** \brief  ReSIDfp 8580 filter curve slider */
+static GtkWidget *curve8580;
+
+/** \brief  ReSIDfp 6581 filter range label */
+static GtkWidget *range6581label;
+
+/** \brief  ReSIDfp 6581 filter curve label */
+static GtkWidget *curve6581label;
+
+/** \brief  ReSIDfp 8580 filter curve label */
+static GtkWidget *curve8580label;
+
+#endif
+
 /** \brief  CSS provider for labels
  */
 static GtkCssProvider *label_css_provider;
@@ -169,32 +194,68 @@
     resources_get_int("SidModel",  &model);
     resources_get_int("SidEngine", &engine);
 
-    if ((model == SID_MODEL_8580) || (model == SID_MODEL_8580D)) {
-        gtk_widget_hide(passband6581);
-        gtk_widget_hide(gain6581);
-        gtk_widget_hide(bias6581);
-        gtk_widget_show(passband8580);
-        gtk_widget_show(gain8580);
-        gtk_widget_show(bias8580);
-        gtk_widget_hide(passband6581label);
-        gtk_widget_hide(gain6581label);
-        gtk_widget_hide(bias6581label);
-        gtk_widget_show(passband8580label);
-        gtk_widget_show(gain8580label);
-        gtk_widget_show(bias8580label);
+    if (engine == SID_ENGINE_RESIDFP) {
+            gtk_widget_hide(passband6581label);
+            gtk_widget_hide(gain6581label);
+            gtk_widget_hide(bias6581label);
+            gtk_widget_hide(passband8580label);
+            gtk_widget_hide(gain8580label);
+            gtk_widget_hide(bias8580label);
+            gtk_widget_hide(passband6581);
+            gtk_widget_hide(gain6581);
+            gtk_widget_hide(bias6581);
+            gtk_widget_hide(passband8580);
+            gtk_widget_hide(gain8580);
+            gtk_widget_hide(bias8580);
+        if ((model == SID_MODEL_8580) || (model == SID_MODEL_8580D)) {
+            gtk_widget_hide(curve6581label);
+            gtk_widget_hide(curve6581);
+            gtk_widget_hide(range6581label);
+            gtk_widget_hide(range6581);
+            gtk_widget_show(curve8580label);
+            gtk_widget_show(curve8580);
+        } else {
+            gtk_widget_show(curve6581label);
+            gtk_widget_show(curve6581);
+            gtk_widget_show(range6581label);
+            gtk_widget_show(range6581);
+            gtk_widget_hide(curve8580label);
+            gtk_widget_hide(curve8580);
+        }
     } else {
-        gtk_widget_hide(passband8580);
-        gtk_widget_hide(gain8580);
-        gtk_widget_hide(bias8580);
-        gtk_widget_show(passband6581);
-        gtk_widget_show(gain6581);
-        gtk_widget_show(bias6581);
-        gtk_widget_hide(passband8580label);
-        gtk_widget_hide(gain8580label);
-        gtk_widget_hide(bias8580label);
-        gtk_widget_show(passband6581label);
-        gtk_widget_show(gain6581label);
-        gtk_widget_show(bias6581label);
+        gtk_widget_hide(curve6581label);
+        gtk_widget_hide(curve6581);
+        gtk_widget_hide(range6581label);
+        gtk_widget_hide(range6581);
+        gtk_widget_hide(curve8580label);
+        gtk_widget_hide(curve8580);
+        if ((model == SID_MODEL_8580) || (model == SID_MODEL_8580D)) {
+            gtk_widget_hide(passband6581);
+            gtk_widget_hide(gain6581);
+            gtk_widget_hide(bias6581);
+            gtk_widget_show(passband8580);
+            gtk_widget_show(gain8580);
+            gtk_widget_show(bias8580);
+            gtk_widget_hide(passband6581label);
+            gtk_widget_hide(gain6581label);
+            gtk_widget_hide(bias6581label);
+            gtk_widget_show(passband8580label);
+            gtk_widget_show(gain8580label);
+            gtk_widget_show(bias8580label);
+        } else {
+            gtk_widget_hide(passband8580);
+            gtk_widget_hide(gain8580);
+            gtk_widget_hide(bias8580);
+            gtk_widget_show(passband6581);
+            gtk_widget_show(gain6581);
+            gtk_widget_show(bias6581);
+            gtk_widget_hide(passband8580label);
+            gtk_widget_hide(gain8580label);
+            gtk_widget_hide(bias8580label);
+            gtk_widget_show(passband6581label);
+            gtk_widget_show(gain6581label);
+            gtk_widget_show(bias6581label);
+        }
     }
 
     /* enable/disable 8580 filter controls based on --enable-new8580filter */
@@ -224,9 +285,10 @@
 static void on_reset_clicked(GtkWidget *widget, gpointer data)
 {
     int value = 0;
-#ifdef HAVE_RESID
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
     int model = 0;
 #endif
+    int engine = 0;
 
     mixer_widget_sid_type_changed();
     resources_get_default_value("SoundVolume", &value);
@@ -235,9 +297,13 @@
         resources_get_default_value("CB2Lowpass", &value);
         vice_gtk3_resource_exp_range_set_value(GTK_RANGE(lowpass), (gdouble)value);
     }
-#ifdef HAVE_RESID
 
+    resources_get_int("SidEngine", &engine);
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
     resources_get_int("SidModel", &model);
+#endif
+
+#ifdef HAVE_RESID
     if ((model == SID_MODEL_8580) || (model == SID_MODEL_8580D)) {
         vice_gtk3_resource_scale_custom_factory(passband8580);
         vice_gtk3_resource_scale_custom_factory(gain8580);
@@ -248,6 +314,14 @@
         vice_gtk3_resource_scale_custom_factory(bias6581);
     }
 #endif
+#ifdef HAVE_RESIDFP
+    if ((model == SID_MODEL_8580) || (model == SID_MODEL_8580D)) {
+        vice_gtk3_resource_scale_custom_factory(curve8580);
+    } else if (model == SID_MODEL_6581) {
+        vice_gtk3_resource_scale_custom_factory(curve6581);
+        vice_gtk3_resource_scale_custom_factory(range6581);
+    }
+#endif
 }
 
 
@@ -485,7 +559,52 @@
 }
 #endif  /* ifdef HAVE_RESID */
 
+#ifdef HAVE_RESIDFP
 
+/** \brief  Create slider for ReSIDfp 8580 filter curve
+ *
+ * \param[in]   minimal resize slider to minimal size
+ *
+ * \return  GtkScale
+ */
+static GtkWidget *create_curve8580fp_widget(gboolean minimal)
+{
+    return create_slider("SidResid8580FilterCurve", "%1.2f",
+                         RESIDFP_8580_FILTER_CURVE_MIN / RESIDFP_8580_FILTER_CURVE_ONE,
+                         RESIDFP_8580_FILTER_CURVE_MAX / RESIDFP_8580_FILTER_CURVE_ONE,
+                         RESIDFP_8580_FILTER_CURVE_MIN, RESIDFP_8580_FILTER_CURVE_MAX, 0.01f, minimal);
+}
+
+/** \brief  Create slider for ReSIDfp 6581 filter curve
+ *
+ * \param[in]   minimal resize slider to minimal size
+ *
+ * \return  GtkScale
+ */
+static GtkWidget *create_curve6581fp_widget(gboolean minimal)
+{
+    return create_slider("SidResid6581FilterCurve", "%1.2f",
+                         RESIDFP_6581_FILTER_CURVE_MIN / RESIDFP_6581_FILTER_CURVE_ONE,
+                         RESIDFP_6581_FILTER_CURVE_MAX / RESIDFP_6581_FILTER_CURVE_ONE,
+                         RESIDFP_6581_FILTER_CURVE_MIN, RESIDFP_6581_FILTER_CURVE_MAX, 0.01f, minimal);
+}
+
+/** \brief  Create slider for ReSIDfp 6581 filter range
+ *
+ * \param[in]   minimal resize slider to minimal size
+ *
+ * \return  GtkScale
+ */
+static GtkWidget *create_range6581fp_widget(gboolean minimal)
+{
+    return create_slider("SidResid6581FilterRange", "%1.2f",
+                         RESIDFP_6581_FILTER_RANGE_MIN / RESIDFP_6581_FILTER_RANGE_ONE,
+                         RESIDFP_6581_FILTER_RANGE_MAX / RESIDFP_6581_FILTER_RANGE_ONE,
+                         RESIDFP_6581_FILTER_RANGE_MIN, RESIDFP_6581_FILTER_RANGE_MAX, 0.01f, minimal);
+}
+#endif  /* ifdef HAVE_RESIDFP */
+
+
 /** \brief  Create mixer widget
  *
  * \param[in]   minimal     minimize side of sliders and labels
@@ -501,7 +620,7 @@
     GtkWidget *button;
     int row = 0;
     int model = 0;
-#ifdef HAVE_RESID
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
     gboolean sid_present = TRUE;
     int tmp;
 
@@ -517,7 +636,7 @@
         sid_present = (gboolean)tmp;
     }
 #endif
-
+    printf("mixer_widget_create\n");
     grid = vice_gtk3_grid_new_spaced(16, 0);
     gtk_widget_set_margin_start(grid, 8);
     gtk_widget_set_margin_end(grid, 8);
@@ -579,7 +698,6 @@
     }
 
 #ifdef HAVE_RESID
-
     /*
      * 6581 ReSID resources
      */
@@ -637,7 +755,44 @@
     row++;
 #endif
 
+#if defined(HAVE_RESIDFP)
+    /*
+     * 6581 ReSIDfp resources
+     */
+
+    curve6581label = create_label("ReSIDfp 6581 Filter curve", minimal, alignment);
+    curve6581 = create_curve6581fp_widget(minimal);
+    gtk_widget_set_sensitive(curve6581, sid_present);
+    gtk_widget_set_hexpand(curve6581, TRUE);
+    gtk_grid_attach(GTK_GRID(grid), curve6581label, 0, row, 1, 1);
+    gtk_grid_attach(GTK_GRID(grid), curve6581, 1, row, 1, 1);
+    row++;
+
+    range6581label = create_label("ReSIDfp 6581 Filter range", minimal, alignment);
+    range6581 = create_range6581fp_widget(minimal);
+    gtk_widget_set_sensitive(curve6581, sid_present);
+    gtk_widget_set_hexpand(curve6581, TRUE);
+    gtk_grid_attach(GTK_GRID(grid), range6581label, 0, row, 1, 1);
+    gtk_grid_attach(GTK_GRID(grid), range6581, 1, row, 1, 1);
+    row++;
+
+    /*
+     * 8580 ReSIDfp resources
+     */
+
+    curve8580label = create_label("ReSIDfp 8580 Filter curve", minimal, alignment);
+    curve8580 = create_curve8580fp_widget(minimal);
+    gtk_widget_set_sensitive(curve8580, sid_present);
+    gtk_widget_set_hexpand(curve8580, TRUE);
+    gtk_grid_attach(GTK_GRID(grid), curve8580label, 0, row, 1, 1);
+    gtk_grid_attach(GTK_GRID(grid), curve8580, 1, row, 1, 1);
+    row++;
+
+#endif
+
+
     gtk_widget_show_all(grid);
     mixer_widget_sid_type_changed();
+    printf("mixer_widget_create end\n");
     return grid;
 }

Modified: trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c	2026-05-07 20:23:41 UTC (rev 46094)
@@ -29,6 +29,9 @@
  * $VICERES SidEngine                   all
  * $VICERES SidStereo                   all
  * $VICERES SidResidSampling            all
+ * $VICERES SidFilters                  all
+ *
+ * These are related to ReSID
  * $VICERES SidResidPassband            all
  * $VICERES SidResidGain                all
  * $VICERES SidResidFilterBias          all
@@ -35,10 +38,12 @@
  * $VICERES SidResid8580Passband        all
  * $VICERES SidResid8580Gain            all
  * $VICERES SidResid8580FilterBias      all
- * $VICERES SidFilters                  all
- * $VICERES Sid2AddressStart            all
- * $VICERES Sid3AddressStart            all
  *
+ * These are related to ReSIDfp
+ * $VICERES SidResid6581FilterCurve     all
+ * $VICERES SidResid6581FilterBias      all
+ * $VICERES SidResid8580FilterCurve     all
+ *
  * These are related to USBSID
  * $VICERES SidUSBSIDReadMode           all
  * $VICERES SidUSBSIDAudioMode          all
@@ -45,6 +50,9 @@
  * $VICERES SidUSBSIDDiffSize           all
  * $VICERES SidUSBSIDBufferSize         all
  *
+ * $VICERES Sid2AddressStart            all
+ * $VICERES Sid3AddressStart            all
+ *
  * Until PSID files support more than three SIDs, these will be -vsid:
  * $VICERES Sid4AddressStart            -vsid
  * $VICERES Sid5AddressStart            -vsid
@@ -81,7 +89,7 @@
     "}"
 
 
-#ifdef HAVE_RESID
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
 /** \brief  ReSID filter slider declaration
  */
 typedef struct slider_s {
@@ -94,7 +102,9 @@
     int         resmax;     /**< resource maximum value */
     float       step;       /**< scale stepping */
 } slider_t;
+#endif
 
+#ifdef HAVE_RESID
 /** \brief  ReSID filter sliders for 6581
  *
  * Extra leading space in format string is used to keep the slider knob from
@@ -140,6 +150,42 @@
 };
 #endif
 
+#ifdef HAVE_RESIDFP
+/** \brief  ReSIDfp filter sliders for 6581
+ *
+ * Extra leading space in format string is used to keep the slider knob from
+ * touching the text.
+ */
+static const slider_t fp_sliders_6581[] = {
+    { "6581 filter curve", "SidResid6581FilterCurve",       "%1.2f",
+      RESIDFP_6581_FILTER_CURVE_MIN / RESIDFP_6581_FILTER_CURVE_ONE,
+      RESIDFP_6581_FILTER_CURVE_MAX / RESIDFP_6581_FILTER_CURVE_ONE,
+      RESIDFP_6581_FILTER_CURVE_MIN, RESIDFP_6581_FILTER_CURVE_MAX, 0.01f },
+    { "6581 filter range", "SidResid6581FilterRange",       "%1.2f",
+      RESIDFP_6581_FILTER_RANGE_MIN / RESIDFP_6581_FILTER_RANGE_ONE,
+      RESIDFP_6581_FILTER_RANGE_MAX / RESIDFP_6581_FILTER_RANGE_ONE,
+      RESIDFP_6581_FILTER_RANGE_MIN, RESIDFP_6581_FILTER_RANGE_MAX, 0.01f },
+    { NULL,            NULL,                     NULL,          0,    0, 0,    0, 0 }
+};
+
+/** \brief  ReSIDfp filter sliders for 8580 */
+static const slider_t fp_sliders_8580[] = {
+    { "8580 filter curve", "SidResid8580FilterCurve",   "%1.2f",
+      RESIDFP_8580_FILTER_CURVE_MIN / RESIDFP_8580_FILTER_CURVE_ONE,
+      RESIDFP_8580_FILTER_CURVE_MAX / RESIDFP_8580_FILTER_CURVE_ONE,
+      RESIDFP_8580_FILTER_CURVE_MIN, RESIDFP_8580_FILTER_CURVE_MAX, 0.01f },
+    { NULL,            NULL,                     NULL,          0,    0,0,    0,  0 }
+};
+
+/** \brief  Values for the "SidResidSampling" resource
+ */
+static const vice_gtk3_radiogroup_entry_t residfp_sampling_modes[] = {
+    { "Linear Interpolation",   SID_RESID_SAMPLING_INTERPOLATION },
+    { "SINC Resampling",        SID_RESID_SAMPLING_RESAMPLING },
+    { NULL,              -1 }
+};
+#endif
+
 #ifdef HAVE_USBSID
 /** \brief  Values for the "SidUSBSIDDiffSize" resource
  */
@@ -184,6 +230,7 @@
     -1
 };
 
+static GtkWidget *sid_grid;
 
 #ifdef HAVE_RESID
 /** \brief  ReSID sampling widget */
@@ -199,6 +246,20 @@
 static GtkWidget *resid_8580_grid;
 #endif
 
+#ifdef HAVE_RESIDFP
+/** \brief  ReSIDfp sampling widget */
+static GtkWidget *residfp_sampling;
+
+/** \brief  ReSIDfp filters checkbox */
+static GtkWidget *residfp_filters;
+
+/** \brief  ReSIDfp 6581 widgets grid */
+static GtkWidget *residfp_6581_grid;
+
+/** \brief  ReSIDfp 8580 widgets grid */
+static GtkWidget *residfp_8580_grid;
+#endif
+
 #ifdef HAVE_USBSID
 /** \brief  USBSID read mode / audio mode checkbox */
 static GtkWidget *us_switches;
@@ -258,7 +319,10 @@
     return label;
 }
 
-#ifdef HAVE_RESID
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
+static GtkWidget *create_resid_sampling_widget(void);
+static GtkWidget *create_residfp_sampling_widget(void);
+
 /** \brief  Extra callback for the SID engine/model widget
  *
  * \param[in]   engine  SID engine ID
@@ -267,32 +331,88 @@
 static void engine_model_changed_callback(int engine, int model)
 {
     gboolean is_resid = (engine == SID_ENGINE_RESID);
+    gboolean is_residfp = (engine == SID_ENGINE_RESIDFP);
+
+    /*printf("engine_model_changed_callback engine: %d model: %d\n", engine, model);*/
+
     /* Show proper ReSID slider widgets
      *
      * We can't check old model vs new model here, since the resource
      * SidModel has already been updated.
      */
+    gtk_widget_hide(resid_6581_grid);
+    gtk_widget_hide(residfp_6581_grid);
+    gtk_widget_hide(resid_8580_grid);
+    gtk_widget_hide(residfp_8580_grid);
     if (model == SID_MODEL_6581) {
-        gtk_widget_show(resid_6581_grid);
-        gtk_widget_hide(resid_8580_grid);
+        if (is_residfp) {
+            gtk_widget_show(residfp_6581_grid);
+        } else {
+            gtk_widget_show(resid_6581_grid);
+        }
     } else {
-        gtk_widget_hide(resid_6581_grid);
-        gtk_widget_show(resid_8580_grid);
+        if (is_residfp) {
+            gtk_widget_show(residfp_8580_grid);
+        } else {
+            gtk_widget_show(resid_8580_grid);
+        }
     }
 
     /* Update mixer widget in the statusbar */
     mixer_widget_sid_type_changed();
 
+
+
+    resid_sampling = gtk_grid_get_child_at(GTK_GRID(sid_grid), 1, 0);
+    if (resid_sampling != NULL) {
+        gtk_widget_destroy(resid_sampling);
+        resid_sampling = NULL;
+    }
+    residfp_sampling = NULL;
+
+    /* attach both lists to same place, hide what what we don't need */
+#ifdef HAVE_RESID
+    if (engine == SID_ENGINE_RESID) {
+        resid_sampling = create_resid_sampling_widget();
+        gtk_widget_hide(resid_sampling);
+        gtk_grid_attach(GTK_GRID(sid_grid), resid_sampling, 1, 0, 1, 1);
+    }
+#endif
+#ifdef HAVE_RESIDFP
+    if (engine == SID_ENGINE_RESIDFP) {
+        residfp_sampling = create_residfp_sampling_widget();
+        gtk_widget_hide(residfp_sampling);
+        gtk_grid_attach(GTK_GRID(sid_grid), residfp_sampling, 1, 0, 1, 1);
+    }
+#endif
+
     gtk_widget_set_sensitive(resid_filters,   is_resid);
     gtk_widget_set_sensitive(resid_6581_grid, is_resid);
     gtk_widget_set_sensitive(resid_8580_grid, is_resid);
-    gtk_widget_set_sensitive(resid_sampling,  is_resid);
 
+    gtk_widget_set_sensitive(residfp_filters,   is_residfp);
+    gtk_widget_set_sensitive(residfp_6581_grid, is_residfp);
+    gtk_widget_set_sensitive(residfp_8580_grid, is_residfp);
+
+    if (is_residfp) {
+        gtk_widget_show(residfp_filters);
+        if (residfp_sampling) { gtk_widget_show(residfp_sampling); }
+        gtk_widget_hide(resid_filters);
+        if (resid_sampling) { gtk_widget_hide(resid_sampling); }
+    } else {
+        gtk_widget_hide(residfp_filters);
+        if (residfp_sampling) { gtk_widget_hide(residfp_sampling); }
+        gtk_widget_show(resid_filters);
+        if (resid_sampling) {gtk_widget_show(resid_sampling); }
+    }
+
     if (machine_class == VICE_MACHINE_VSID) {
         vsid_mixer_widget_update();
     }
 }
+#endif
 
+#ifdef HAVE_RESID
 /** \brief  Create widget to control ReSID sampling method
  *
  * \return  GtkGrid
@@ -318,6 +438,33 @@
 }
 #endif
 
+
+#ifdef HAVE_RESIDFP
+/** \brief  Create widget to control ReSIDfp sampling method
+ *
+ * \return  GtkGrid
+ */
+static GtkWidget *create_residfp_sampling_widget(void)
+{
+    GtkWidget *grid;
+    GtkWidget *label;
+    GtkWidget *group;
+
+    grid = gtk_grid_new();
+    gtk_grid_set_row_spacing(GTK_GRID(grid), 8);
+
+    label = label_helper("<b>ReSIDfp sampling method</b>");
+    group = vice_gtk3_resource_radiogroup_new("SidResidSampling",
+                                              residfp_sampling_modes,
+                                              GTK_ORIENTATION_VERTICAL);
+
+    gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1);
+    gtk_grid_attach(GTK_GRID(grid), group, 0, 1, 1, 1);
+    gtk_widget_show_all(grid);
+    return grid;
+}
+#endif
+
 #ifdef HAVE_USBSID
 /** \brief  Create widget to control USBSID switches
  *
@@ -618,18 +765,34 @@
     resources_get_int("SidModel",  &current_model);
     resources_get_int("SidStereo", &current_stereo);
 
-    grid = vice_gtk3_grid_new_spaced(8, 0);
+    sid_grid = grid = vice_gtk3_grid_new_spaced(8, 0);
 
     engine = sid_engine_model_widget_create();
-#ifdef HAVE_RESID
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
     sid_engine_model_widget_set_callback(engine_model_changed_callback);
 #endif
     gtk_grid_attach(GTK_GRID(grid), engine, 0, row, 1, 1);
 
+    resid_sampling = gtk_grid_get_child_at(GTK_GRID(grid), 1, row);
+    if (resid_sampling != NULL) {
+        gtk_widget_destroy(resid_sampling);
+        resid_sampling = NULL;
+    }
+    residfp_sampling = NULL;
+
+    /* attach both lists to same place, hide what what we don't need */
 #ifdef HAVE_RESID
-    resid_sampling = create_resid_sampling_widget();
-    gtk_grid_attach(GTK_GRID(grid), resid_sampling, 1, row, 1, 1);
+    if (current_engine == SID_ENGINE_RESID) {
+        resid_sampling = create_resid_sampling_widget();
+        gtk_grid_attach(GTK_GRID(grid), resid_sampling, 1, row, 1, 1);
+    }
 #endif
+#ifdef HAVE_RESIDFP
+    if (current_engine == SID_ENGINE_RESIDFP) {
+        residfp_sampling = create_residfp_sampling_widget();
+        gtk_grid_attach(GTK_GRID(grid), residfp_sampling, 1, row, 1, 1);
+    }
+#endif
     row++;
 
     if (sid_machine_can_have_multiple_sids()) {
@@ -650,8 +813,6 @@
     gtk_widget_set_margin_top(resid_filters, 16);
     gtk_widget_set_margin_bottom(resid_filters, 16);
     gtk_grid_attach(GTK_GRID(grid), resid_filters, 0, row, 3, 1);
-    gtk_widget_set_sensitive(resid_filters, current_engine == SID_ENGINE_RESID);
-    gtk_widget_set_sensitive(resid_sampling, current_engine == SID_ENGINE_RESID);
 
     resid_6581_grid = create_sliders(sliders_6581, "ReSID 6581 filter settings");
     resid_8580_grid = create_sliders(sliders_8580, "ReSID 8580 filter settings");
@@ -663,15 +824,54 @@
     gtk_widget_set_no_show_all(resid_8580_grid, TRUE);
     gtk_widget_set_sensitive(resid_6581_grid, current_engine == SID_ENGINE_RESID);
     gtk_widget_set_sensitive(resid_8580_grid, current_engine == SID_ENGINE_RESID);
-    if (current_model == SID_MODEL_6581) {
-        gtk_widget_show(resid_6581_grid);
-        gtk_widget_hide(resid_8580_grid);
+    if (current_engine == SID_ENGINE_RESID) {
+        if (current_model == SID_MODEL_6581) {
+            gtk_widget_show(resid_6581_grid);
+            gtk_widget_hide(resid_8580_grid);
+        } else {
+            gtk_widget_hide(resid_6581_grid);
+            gtk_widget_show(resid_8580_grid);
+        }
     } else {
         gtk_widget_hide(resid_6581_grid);
-        gtk_widget_show(resid_8580_grid);
+        gtk_widget_hide(resid_8580_grid);
     }
 #endif
 
+#ifdef HAVE_RESIDFP
+    residfp_filters = vice_gtk3_resource_check_button_new("SidFilters",
+                                                        "Enable SID filter emulation");
+    gtk_widget_set_margin_top(residfp_filters, 16);
+    gtk_widget_set_margin_bottom(residfp_filters, 16);
+    gtk_grid_attach(GTK_GRID(grid), residfp_filters, 0, row, 3, 1);
+    gtk_widget_set_sensitive(residfp_filters, current_engine == SID_ENGINE_RESIDFP);
+
+    residfp_6581_grid = create_sliders(fp_sliders_6581, "ReSIDfp 6581 filter settings");
+    residfp_8580_grid = create_sliders(fp_sliders_8580, "ReSIDfp 8580 filter settings");
+    gtk_grid_attach(GTK_GRID(grid), residfp_6581_grid, 0, row + 1, 3 ,1);
+    gtk_grid_attach(GTK_GRID(grid), residfp_8580_grid, 0, row + 2, 3, 1);
+
+    /* only enable appropriate widgets */
+    gtk_widget_set_no_show_all(residfp_6581_grid, TRUE);
+    gtk_widget_set_no_show_all(residfp_8580_grid, TRUE);
+    gtk_widget_set_sensitive(residfp_6581_grid, current_engine == SID_ENGINE_RESIDFP);
+    gtk_widget_set_sensitive(residfp_8580_grid, current_engine == SID_ENGINE_RESIDFP);
+
+    if (current_engine == SID_ENGINE_RESIDFP) {
+        if (current_model == SID_MODEL_6581) {
+            gtk_widget_show(residfp_6581_grid);
+            gtk_widget_hide(residfp_8580_grid);
+        } else {
+            gtk_widget_hide(residfp_6581_grid);
+            gtk_widget_show(residfp_8580_grid);
+        }
+    } else {
+        gtk_widget_hide(residfp_6581_grid);
+        gtk_widget_hide(residfp_8580_grid);
+    }
+#endif
+
+
 /* FIXME: HardSID options are missing */
 
 #ifdef HAVE_USBSID

Modified: trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c	2026-05-07 20:23:41 UTC (rev 46094)
@@ -13,7 +13,9 @@
  * $VICERES SidResid8580Passband    vsid
  * $VICERES SidResid8580Gain        vsid
  * $VICERES SidResid8580FilterBias  vsid
-
+ * $VICERES SidResid6581FilterCurve vsid
+ * $VICERES SidResid6581FilterRange vsid
+ * $VICERES SidResid8580FilterCurve vsid
  */
 
 /*
@@ -215,6 +217,31 @@
 };
 
 
+/** \brief  Custom scale configuration for 6581 */
+static const mixer_scale_t fp_scales_6581[NUM_SCALES] = {
+    { "Filter curve", "SidResid6581FilterCurve",   "%1.2f",
+      RESIDFP_6581_FILTER_CURVE_MIN,   RESIDFP_6581_FILTER_CURVE_MAX,
+      RESIDFP_6581_FILTER_CURVE_MIN / RESIDFP_6581_FILTER_CURVE_ONE,
+      RESIDFP_6581_FILTER_CURVE_MAX / RESIDFP_6581_FILTER_CURVE_ONE,
+      0.01f },
+    { "Filter range", "SidResid6581FilterRange",   "%1.2f",
+      RESIDFP_6581_FILTER_RANGE_MIN,   RESIDFP_6581_FILTER_RANGE_MAX,
+      RESIDFP_6581_FILTER_RANGE_MIN / RESIDFP_6581_FILTER_RANGE_ONE,
+      RESIDFP_6581_FILTER_RANGE_MAX / RESIDFP_6581_FILTER_RANGE_ONE,
+      0.01f },
+
+};
+
+/** \brief  Custom scale configuration for 8580[D] */
+static const mixer_scale_t fp_scales_8580[NUM_SCALES] = {
+    { "Filter curve", "SidResid8580FilterCurve",   "%1.2f",
+      RESIDFP_8580_FILTER_CURVE_MIN,   RESIDFP_8580_FILTER_CURVE_MAX,
+      RESIDFP_8580_FILTER_CURVE_MIN / RESIDFP_8580_FILTER_CURVE_ONE,
+      RESIDFP_8580_FILTER_CURVE_MAX / RESIDFP_8580_FILTER_CURVE_ONE,
+      0.01f },
+};
+
+
 /** \brief  Add custom resource-bound GtkScales to the grid
  *
  * \param[in]   grid    main grid
@@ -223,15 +250,15 @@
  *
  * \return  row in \a grid for additional widgets
  */
-static int add_resid_scales(GtkWidget *grid, int row, int model)
+static int add_resid_scales(GtkWidget *grid, int row, int model, int engine)
 {
     const mixer_scale_t *scales;
     int                  i;
 
     if (model == SID_MODEL_6581) {
-        scales = scales_6581;
+        scales = (engine == SID_ENGINE_RESIDFP) ? fp_scales_6581 : scales_6581;
     } else {
-        scales = scales_8580;
+        scales = (engine == SID_ENGINE_RESIDFP) ? fp_scales_8580 : scales_8580;
     }
 
     for (i = 0; i < NUM_SCALES; i++) {
@@ -246,41 +273,44 @@
         scale = gtk_grid_get_child_at(GTK_GRID(grid), 1, row + i);
         if (scale != NULL) {
             gtk_widget_destroy(scale);
+            scale = NULL;
         }
 
         /* create new widgets */
-        debug_gtk3("adding scale %s at row %d", scales[i].resource_name, row + i);
-        label = create_label(scales[i].label);
-        scale = vice_gtk3_resource_scale_custom_new(scales[i].resource_name,
-                                                    GTK_ORIENTATION_HORIZONTAL,
-                                                    scales[i].resource_low,
-                                                    scales[i].resource_high,
-                                                    scales[i].display_low,
-                                                    scales[i].display_high,
-                                                    scales[i].display_step,
-                                                    scales[i].display_format);
-        gtk_widget_set_hexpand(scale, TRUE);
-        gtk_widget_set_halign(scale, GTK_ALIGN_FILL);
-        gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_RIGHT);
-        gtk_scale_set_draw_value(GTK_SCALE(scale), TRUE);
+        if (scales[i].label != NULL) {
+            debug_gtk3("adding scale %s at row %d", scales[i].resource_name, row + i);
+            label = create_label(scales[i].label);
+            scale = vice_gtk3_resource_scale_custom_new(scales[i].resource_name,
+                                                        GTK_ORIENTATION_HORIZONTAL,
+                                                        scales[i].resource_low,
+                                                        scales[i].resource_high,
+                                                        scales[i].display_low,
+                                                        scales[i].display_high,
+                                                        scales[i].display_step,
+                                                        scales[i].display_format);
+            gtk_widget_set_hexpand(scale, TRUE);
+            gtk_widget_set_halign(scale, GTK_ALIGN_FILL);
+            gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_RIGHT);
+            gtk_scale_set_draw_value(GTK_SCALE(scale), TRUE);
 
-        /* use CSS to customize appearance a bit: make sure the custom formatted
-         * values don't result in different widths for the scales themselves */
-        vice_gtk3_css_provider_add(label, label_css_provider);
-        vice_gtk3_css_provider_add(scale, scale_css_provider);
+            /* use CSS to customize appearance a bit: make sure the custom formatted
+            * values don't result in different widths for the scales themselves */
+            vice_gtk3_css_provider_add(label, label_css_provider);
+            vice_gtk3_css_provider_add(scale, scale_css_provider);
 
-        gtk_grid_attach(GTK_GRID(grid), label, 0, row + i, 1, 1);
-        gtk_grid_attach(GTK_GRID(grid), scale, 1, row + i, 1, 1);
+            gtk_grid_attach(GTK_GRID(grid), label, 0, row + i, 1, 1);
+            gtk_grid_attach(GTK_GRID(grid), scale, 1, row + i, 1, 1);
 
-        /* the "old" 8580 filter implementation doesn't have customizable
-         * filter settings, so we disable the sliders if "old" and 8580 */
-#ifndef HAVE_NEW_8580_FILTER
-        if (model == SID_MODEL_8580 || model == SID_MODEL_8580D) {
-            gtk_widget_set_sensitive(scale, FALSE);
+            /* the "old" 8580 filter implementation doesn't have customizable
+            * filter settings, so we disable the sliders if "old" and 8580 */
+    #ifndef HAVE_NEW_8580_FILTER
+            if (model == SID_MODEL_8580 || model == SID_MODEL_8580D) {
+                gtk_widget_set_sensitive(scale, FALSE);
+            }
+    #endif
+            gtk_widget_show(label);
+            gtk_widget_show(scale);
         }
-#endif
-        gtk_widget_show(label);
-        gtk_widget_show(scale);
         scale_widgets[i] = scale;
     }
 
@@ -310,11 +340,15 @@
     gtk_grid_set_column_spacing(GTK_GRID(grid), 8);
     gtk_widget_set_hexpand(grid, TRUE);
 
-    label = create_label("<b>ReSID settings</b>");
+    if (engine == SID_ENGINE_RESIDFP) {
+        label = create_label("<b>ReSIDfp settings</b>");
+    } else {
+        label = create_label("<b>ReSID settings</b>");
+    }
     gtk_grid_attach(GTK_GRID(grid), label, 0, row, 2, 1);
     row++;
 
-    row = add_resid_scales(grid, row, new_sid_model);
+    row = add_resid_scales(grid, row, new_sid_model, engine);
 
     /* FIXME: does this make sense for non-ReSID? */
     button = gtk_button_new_with_label("Reset to defaults");
@@ -355,16 +389,29 @@
  */
 void vsid_mixer_widget_update(void)
 {
-#ifdef HAVE_RESID
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
+    GtkWidget *label;
+
     resources_get_int("SidEngine", &new_sid_engine);
     resources_get_int("SidModel", &new_sid_model);
     debug_gtk3("old engine = %d, new engine = %d", old_sid_engine, new_sid_engine);
     debug_gtk3("old model = %d, new model = %d", old_sid_model, new_sid_model);
+
     if ((new_sid_engine != old_sid_engine) ||
         (new_sid_model != old_sid_model)) {
         debug_gtk3("engine or model has changed: updating scale widgets");
-        add_resid_scales(main_grid, 1, new_sid_model);
-        gtk_widget_set_sensitive(main_grid, (new_sid_engine == SID_ENGINE_RESID));
+        label = gtk_grid_get_child_at(GTK_GRID(main_grid), 0, 0);
+        if (label != NULL) {
+            gtk_widget_destroy(label);
+        }
+        if (new_sid_engine == SID_ENGINE_RESIDFP) {
+            label = create_label("<b>ReSIDfp settings</b>");
+        } else {
+            label = create_label("<b>ReSID settings</b>");
+        }
+        gtk_grid_attach(GTK_GRID(main_grid), label, 0, 0, 2, 1);
+        add_resid_scales(main_grid, 1, new_sid_model, new_sid_engine);
+        gtk_widget_set_sensitive(main_grid, (new_sid_engine == SID_ENGINE_RESID) || (new_sid_engine == SID_ENGINE_RESIDFP));
 #if 0
         if (new_sid_engine == SID_ENGINE_RESID) {
             gtk_widget_show_all(main_grid);

Modified: trunk/vice/src/arch/sdl/menu_sid.c
===================================================================
--- trunk/vice/src/arch/sdl/menu_sid.c	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/src/arch/sdl/menu_sid.c	2026-05-07 20:23:41 UTC (rev 46094)
@@ -65,7 +65,7 @@
 
 static ui_menu_entry_t *sid_model_menu = NULL;
 
-#ifdef HAVE_RESID
+#if defined(HAVE_RESID) || defined(HAVE_RESIDFP)
 UI_MENU_DEFINE_RADIO(SidResidSampling)
 
 static const ui_menu_entry_t sid_sampling_menu[] = {
@@ -91,7 +91,9 @@
     },
     SDL_MENU_LIST_END
 };
+#endif
 
+#ifdef HAVE_RESID
 UI_MENU_DEFINE_SLIDER(SidResidPassband, 0, 90)
 UI_MENU_DEFINE_SLIDER(SidResidGain, 90, 100)
 UI_MENU_DEFINE_SLIDER(SidResidFilterBias, -5000, 5000)
@@ -169,6 +171,36 @@
 
 #endif /* HAVE_RESID */
 
+#ifdef HAVE_RESIDFP
+UI_MENU_DEFINE_SLIDER(SidResid6581FilterCurve, 0, RESIDFP_6581_FILTER_CURVE_MAX)
+UI_MENU_DEFINE_SLIDER(SidResid6581FilterRange, 0, RESIDFP_6581_FILTER_RANGE_MAX)
+UI_MENU_DEFINE_SLIDER(SidResid8580FilterCurve, 0, RESIDFP_8580_FILTER_CURVE_MAX)
+
+# define VICE_SDL_RESIDFP_OPTIONS                                                                                             \
+    {   .string   = "reSIDfp sampling method",                                                                                \
+        .type     = MENU_ENTRY_SUBMENU,                                                                                       \
+        .callback = submenu_radio_callback,                                                                                   \
+        .data     = (ui_callback_data_t)sid_sampling_menu                                                                     \
+    },                                                                                                                        \
+    {   .string   = "reSIDfp 6581 filter curve",                                                                              \
+        .type     = MENU_ENTRY_RESOURCE_INT,                                                                                  \
+        .callback = slider_SidResid6581FilterCurve_callback,                                                                  \
+        .data     = (ui_callback_data_t)"Set filter curve"                                                                    \
+    },                                                                                                                        \
+    {   .string   = "reSIDfp 6581 filter range",                                                                              \
+        .type     = MENU_ENTRY_RESOURCE_INT,                                                                                  \
+        .callback = slider_SidResid6581FilterRange_callback,                                                                  \
+        .data     = (ui_callback_data_t)"Set filter range"                                                                    \
+    },                                                                                                                        \
+    {   .string   = "reSIDfp 8580 filter curve",                                                                              \
+        .type     = MENU_ENTRY_RESOURCE_INT,                                                                                  \
+        .callback = slider_SidResid8580FilterCurve_callback,                                                                  \
+        .data     = (ui_callback_data_t)"Set filter curve"                                                                    \
+    },                                                                                                                        \
+
+#endif /* HAVE_RESIDFP */
+
+
 #ifdef HAVE_USBSID
 UI_MENU_DEFINE_TOGGLE(SidUSBSIDReadMode)
 UI_MENU_DEFINE_TOGGLE(SidUSBSIDAudioMode)
@@ -769,6 +801,9 @@
 #ifdef HAVE_RESID
     VICE_SDL_RESID_OPTIONS
 #endif
+#ifdef HAVE_RESIDFP
+    VICE_SDL_RESIDFP_OPTIONS
+#endif
 #ifdef HAVE_USBSID
     VICE_SDL_USBSID_OPTIONS
 #endif
@@ -827,6 +862,9 @@
 #ifdef HAVE_RESID
     VICE_SDL_RESID_OPTIONS
 #endif
+#ifdef HAVE_RESIDFP
+    VICE_SDL_RESIDFP_OPTIONS
+#endif
 #ifdef HAVE_USBSID
     VICE_SDL_USBSID_OPTIONS
 #endif
@@ -845,6 +883,9 @@
 #ifdef HAVE_RESID
     VICE_SDL_RESID_OPTIONS
 #endif
+#ifdef HAVE_RESIDFP
+    VICE_SDL_RESIDFP_OPTIONS
+#endif
 #ifdef HAVE_USBSID
     VICE_SDL_USBSID_OPTIONS
 #endif
@@ -863,6 +904,9 @@
 #ifdef HAVE_RESID
     VICE_SDL_RESID_OPTIONS
 #endif
+#ifdef HAVE_RESIDFP
+    VICE_SDL_RESIDFP_OPTIONS
+#endif
 #ifdef HAVE_USBSID
     VICE_SDL_USBSID_OPTIONS
 #endif
@@ -889,6 +933,9 @@
 #ifdef HAVE_RESID
     VICE_SDL_RESID_OPTIONS
 #endif
+#ifdef HAVE_RESIDFP
+    VICE_SDL_RESIDFP_OPTIONS
+#endif
 #ifdef HAVE_USBSID
     VICE_SDL_USBSID_OPTIONS
 #endif
@@ -936,6 +983,9 @@
 #ifdef HAVE_RESID
     VICE_SDL_RESID_OPTIONS
 #endif
+#ifdef HAVE_RESIDFP
+    VICE_SDL_RESIDFP_OPTIONS
+#endif
 #ifdef HAVE_USBSID
     VICE_SDL_USBSID_OPTIONS
 #endif
@@ -985,6 +1035,9 @@
 #ifdef HAVE_RESID
     VICE_SDL_RESID_OPTIONS
 #endif
+#ifdef HAVE_RESIDFP
+    VICE_SDL_RESIDFP_OPTIONS
+#endif
 #ifdef HAVE_USBSID
     VICE_SDL_USBSID_OPTIONS
 #endif

Modified: trunk/vice/src/lib/Makefile.am
===================================================================
--- trunk/vice/src/lib/Makefile.am	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/src/lib/Makefile.am	2026-05-07 20:23:41 UTC (rev 46094)
@@ -4,6 +4,10 @@
 SUBDIRS += libusbsiddrv
 endif
 
+if HAVE_RESIDFP
+SUBDIRS += libresidfp
+endif
+
 AM_CFLAGS = @VICE_CFLAGS@
 
 AM_CXXFLAGS = @VICE_CXXFLAGS@
@@ -26,3 +30,9 @@
 libusbsiddrv:
 	(cd libusbsiddrv; $(MAKE))
 endif
+
+.PHONY: libresidfp
+if HAVE_RESIDFP
+libresidfp:
+	(cd libresidfp; $(MAKE))
+endif

Modified: trunk/vice/src/sid/Makefile.am
===================================================================
--- trunk/vice/src/sid/Makefile.am	2026-05-07 20:22:37 UTC (rev 46093)
+++ trunk/vice/src/sid/Makefile.am	2026-05-07 20:23:41 UTC (rev 46094)
@@ -11,10 +11,12 @@
 AM_CPPFLAGS = \
 	@VICE_CPPFLAGS@ \
 	@ARCH_INCLUDES@ \
+	@RESIDFP_INCLUDES@ \
 	@RESID_INCLUDES@ \
 	@RESID_DTV_INCLUDES@ \
 	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/lib/libresidfp/src/ \
 	-I$(top_srcdir)/src/joyport
 
 AM_CFLAGS = @VICE_CFLAGS@
@@ -33,6 +35,8 @@
 	hardsid.c \
 	parsid.c \
 	usbsid.c \
+	residfp.cc \
+	residfp.h \
 	sid-cmdline-options.c \
 	sid-cmdline-options.h \
 	sid-resources.c \

Added: trunk/vice/src/sid/residfp.cc
===================================================================
--- trunk/vice/src/sid/residfp.cc	                        (rev 0)
+++ trunk/vice/src/sid/residfp.cc	2026-05-07 20:23:41 UTC (rev 46094)
@@ -0,0 +1,448 @@
+/*
+ * residfp.cc - reSIDfp interface code.
+ *
+ * Written by
+ *  Teemu Rantanen <tv...@cs...>
+ *  Dag Lem <re...@ni...>
+ *  Andreas Boose <vic...@t-...>
+ *  groepaz <gr...@gm...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include "vice.h"
+
+#ifdef _M_ARM
+#undef _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1
+#endif
+
+extern "C" {
+
+#include <string.h>
+
+#include "sid/sid.h" /* sid_engine_t */
+#include "lib.h"
+#include "log.h"
+#include "residfp.h"
+#include "resources.h"
+#include "sid-snapshot.h"
+#include "types.h"
+
+extern log_t sound_log;
+
+} // extern "C"
+
+#include "src/SID.h"
+
+using namespace reSIDfp;
+
+extern "C" {
+
+struct sound_s
+{
+    /* speed factor */
+    int factor;
+
+    /* libresidfp does not have a public interface to the internal state of the
+     * emulated SID, so we keep a mirror of the written register values here */
+    int sid_register[0x20];
+
+    /* resid sid implementation */
+    reSIDfp::SID *sid;
+};
+
+typedef struct sound_s sound_t;
+
+/* manage temporary buffers. if the requested size is smaller or equal to the
+ * size of the already allocated buffer, reuse it.  */
+static short *buf = NULL;
+
+static int blen = 0;
+
+static short *getbuf(int len)
+{
+    if ((buf == NULL) || (blen < len)) {
+        if (buf) {
+            lib_free(buf);
+        }
+        blen = len;
+        buf = (short *)lib_calloc(len, 1);
+    }
+    return buf;
+}
+
+static sound_t *residfp_open(uint8_t *sidstate)
+{
+    sound_t *psid;
+    int i;
+
+    psid = new sound_t;
+    psid->sid = new reSIDfp::SID;
+
+    for (i = 0x00; i <= 0x18; i++) {
+        psid->sid->write(i, sidstate[i]);
+    }
+
+    return psid;
+}
+
+static int residfp_init(sound_t *psid, int speed, int cycles_per_sec, int factor)
+{
+    SamplingMethod method;
+    char model_text[100];
+    char method_text[100];
+    double curve, range = 0.5f;
+
+    int filters_enabled, model, sampling, curve_6581_int = 500, range_6581_int = 500, curve_8580_int = 500;
+
+    if (resources_get_int("SidFilters", &filters_enabled) < 0) {
+        return 0;
+    }
+
+    if (resources_get_int("SidModel", &model) < 0) {
+        return 0;
+    }
+    /*printf("residfp_init SidFilters:%d SidModel:%d\n", filters_enabled, model);*/
+
+    /*
+     * Don't even think about changing this to fast during warp :)
+     * the resampled result is visible to the emulator.
+     */
+    if (resources_get_int("SidResidSampling", &sampling) < 0) {
+        return 0;
+    }
+
+    if ((model == 1) || (model == 2)) {
+        /* 8580 */
+        if (resources_get_int("SidResid8580FilterCurve", &curve_8580_int) < 0) {
+            return 0;
+        }
+        curve = ((double)curve_8580_int) / RESIDFP_8580_FILTER_CURVE_ONE;
+    } else {
+        /* 6581 */
+        if (resources_get_int("SidResid6581FilterCurve", &curve_6581_int) < 0) {
+            return 0;
+        }
+
+        if (resources_get_int("SidResid6581FilterRange", &range_6581_int) < 0) {
+            return 0;
+        }
+        curve = ((double)curve_6581_int) / RESIDFP_6581_FILTER_CURVE_ONE;
+        range = ((double)range_6581_int) / RESIDFP_6581_FILTER_RANGE_ONE;
+    }
+    /*printf("residfp_init range int %d curve int:%d %d curve:%f range:%f\n",
+           range_6581_int, curve_6581_int, curve_8580_int, curve, range);*/
+
+    psid->factor = factor;
+
+    switch (model) {
+        default:
+        case 0:
+            psid->sid->setChipModel(MOS6581);
+            psid->sid->input(0);
+            psid->sid->setFilter6581Curve(curve);
+            psid->sid->setFilter6581Range(range);
+            strcpy(model_text, "MOS6581");
+            break;
+        case 1:
+            psid->sid->setChipModel(CSG8580);
+            psid->sid->input(0);
+            psid->sid->setFilter6581Curve(curve);
+            strcpy(model_text, "MOS8580");
+            break;
+        case 2:
+            psid->sid->setChipModel(CSG8580);
+            psid->sid->input(-32768);
+            psid->sid->setFilter8580Curve(curve);
+            strcpy(model_text, "MOS8580 + digi boost");
+            break;
+    }
+    psid->sid->enableFilter(filters_enabled ? true : false);
+
+    switch (sampling) {
+        default:
+        case 0: /* "fast" */
+            method = NONE;
+            strcpy(method_text, "raw 1MHz output");
+            break;
+        case 1: /* "interpolating" */
+            method = DECIMATE;
+            strcpy(method_text, "linear interpolating");
+            break;
+        case 2: /* "resampling" */
+        case 3: /* "fast resample" */
+            method = RESAMPLE;
+            sprintf(method_text, "SINC resampling");
+            break;
+    }
+
+    psid->sid->setSamplingParameters(cycles_per_sec, method, speed);
+
+    /* psid->sid->enable_raw_debug_output(rawoutput); */
+
+    log_message(sound_log, "reSIDfp: %s, filter %s, sampling rate %dHz - %s",
+                model_text,
+                filters_enabled ? "on" : "off",
+                speed, method_text);
+
+    return 1;
+}
+
+static void residfp_close(sound_t *psid)
+{
+    delete psid->sid;
+    delete psid;
+
+    if (buf) {
+        lib_free(buf);
+        buf = NULL;
+    }
+}
+
+static uint8_t residfp_read(sound_t *psid, uint16_t addr)
+{
+    return psid->sid->read(addr);
+}
+
+static void residfp_store(sound_t *psid, uint16_t addr, uint8_t byte)
+{
+    psid->sid_register[addr & 0x1f] = byte;
+    psid->sid->write(addr, byte);
+}
+
+static void residfp_reset(sound_t *psid, CLOCK cpu_clk)
+{
+    psid->sid->reset();
+}
+
+#ifdef SOUND_SYSTEM_FLOAT
+/* FIXME */
+static int residfp_calculate_samples(sound_t *psid, float *pbuf, int nr, CLOCK *delta_t)
+{
+    short *tmp_buf;
+    int retval;
+    int int_delta_t_original = (int)*delta_t;
+    int int_delta_t = (int)*delta_t;
+    int i;
+
+    /* Tried not to mess with resid during 64-bit conversion. clock(...) wants to modify *delta_t ... */
+
+    if (psid->factor == 1000) {
+        tmp_buf = getbuf(2 * nr);
+        retval = psid->sid->clock(int_delta_t, tmp_buf, nr, 0);
+        (*delta_t) += int_delta_t - int_delta_t_original;
+        for (i = 0; i < nr; i++) {
+            pbuf[i] = tmp_buf[i] / 32767.0;
+        }
+        return retval;
+    }
+
+    tmp_buf = getbuf(2 * nr * psid->factor / 1000);
+    retval = psid->sid->clock(int_delta_t, tmp_buf, nr * psid->factor / 1000, 0) * 1000 / psid->factor;
+    (*delta_t) += int_delta_t - int_delta_t_original;
+    for (i = 0; i < nr; i++) {
+        pbuf[i] = tmp_buf[i] / 32767.0;
+    }
+
+    return retval;
+}
+#else
+static int residfp_calculate_samples(sound_t *psid, short *pbuf, int nr, int interleave, CLOCK *delta_t)
+{
+    short *tmp_buf;
+    int retval;
+    /*int int_delta_t_original = (int)*delta_t;*/
+    int int_delta_t = (int)*delta_t;
+
+    /* Tried not to mess with resid during 64-bit conversion. clock(...) wants to modify *delta_t ... */
+
+    if (psid->factor == 1000) {
+        /* FIXME: the sound code constantly spits out "buffer overrun" warnings, but sound plays fine,
+         * something is wrong there */
+        /*retval = psid->sid->clock(int_delta_t, pbuf, nr, interleave);*/
+
+        tmp_buf = getbuf(2 * nr);
+        retval = psid->sid->clock(int_delta_t, tmp_buf);
+        {
+            int n, p = 0;
+            for (n = 0; n < retval; n++) {
+                pbuf[p] = tmp_buf[n];
+                p += interleave;
+            }
+        }
+
+        /* printf("%p %p nr:%d interleave:%d retval:%d delta:%d\n", psid, pbuf, nr, interleave, retval, int_delta_t); */
+        /* (*delta_t) += int_delta_t - int_delta_t_original; */
+        return retval;
+    }
+
+    /* FIXME: how to trigger this case for testing? */
+
+    /* retval = psid->sid->clock(int_delta_t, tmp_buf, nr * psid->factor / 1000, interleave) * 1000 / psid->factor; */
+    tmp_buf = getbuf(2 * nr * psid->factor / 1000);
+    retval = psid->sid->clock(int_delta_t, tmp_buf);
+    /* (*delta_t) += int_delta_t - int_delta_t_original; */
+    memcpy(pbuf, tmp_buf, 2 * nr);
+
+    return retval;
+}
+#endif
+
+static char *residfp_dump_state(sound_t *psid)
+{
+    char strbuf[0x400];
+    /* when sound is disabled *psid is NULL */
+    if (psid && psid->sid) {
+        /*state = psid->sid->read_state();*/
+        psid->sid_register[25] = psid->sid->read(0x19);
+        psid->sid_register[26] = psid->sid->read(0x1a);
+        psid->sid_register[27] = psid->sid->read(0x1b);
+        psid->sid_register[28] = psid->sid->read(0x1c);
+    } else {
+        return lib_strdup("no state available when sound is disabled.");
+    }
+    sprintf(strbuf,
+            "FREQ:   %04x %04x %04x\n"
+            "PULSE:  %04x %04x %04x\n"
+            "CTRL:     %02x   %02x   %02x\n"
+            "ADSR:   %04x %04x %04x\n"
+            "FILTER: %04x RES: %02x MODE/VOL: %02x\n"
+            "ADC: %02x %02x\n"
+            "OSC3: %02x ENV3: %02x\n",
+            ((psid->sid_register[(0 * 7) + 1] << 8) | psid->sid_register[(0 * 7) + 0]) & 0xffff,
+            ((psid->sid_register[(1 * 7) + 1] << 8) | psid->sid_register[(1 * 7) + 0]) & 0xffff,
+            ((psid->sid_register[(2 * 7) + 1] << 8) | psid->sid_register[(2 * 7) + 0]) & 0xffff,
+            ((psid->sid_register[(0 * 7) + 3] << 8) | psid->sid_register[(0 * 7) + 2]) & 0xffff,
+            ((psid->sid_register[(1 * 7) + 3] << 8) | psid->sid_register[(1 * 7) + 2]) & 0xffff,
+            ((psid->sid_register[(2 * 7) + 3] << 8) | psid->sid_register[(2 * 7) + 2]) & 0xffff,
+            (psid->sid_register[(0 * 7) + 4]) & 0xff,
+            (psid->sid_register[(1 * 7) + 4]) & 0xff,
+            (psid->sid_register[(2 * 7) + 4]) & 0xff,
+            ((psid->sid_register[(0 * 7) + 5] << 8) | psid->sid_register[(0 * 7) + 6]) & 0xffff,
+            ((psid->sid_register[(1 * 7) + 5] << 8) | psid->sid_register[(1 * 7) + 6]) & 0xffff,
+            ((psid->sid_register[(2 * 7) + 5] << 8) | psid->sid_register[(2 * 7) + 6]) & 0xffff,
+            ((psid->sid_register[22] << 8) | psid->sid_register[21]) & 0xffff,
+            (psid->sid_register[23]) & 0xff,
+            (psid->sid_register[24]) & 0xff,
+            (psid->sid_register[25]) & 0xff,
+            (psid->sid_register[26]) & 0xff,
+            (psid->sid_register[27]) & 0xff,
+            (psid->sid_register[28]) & 0xff
+            );
+    return lib_strdup(strbuf);
+}
+
+static void res...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[46093] trunk/vice/src/lib

[<gp...@us...>]

Revision: 46093
          http://sourceforge.net/p/vice-emu/code/46093
Author:   gpz
Date:     2026-05-07 20:22:37 +0000 (Thu, 07 May 2026)
Log Message:
-----------
pull libresidfp into the tree. welcome back :)

Added Paths:
-----------
    trunk/vice/src/lib/libresidfp/
    trunk/vice/src/lib/libresidfp/AUTHORS
    trunk/vice/src/lib/libresidfp/COPYING
    trunk/vice/src/lib/libresidfp/Doxyfile.in
    trunk/vice/src/lib/libresidfp/Makefile.am
    trunk/vice/src/lib/libresidfp/Makefile.in
    trunk/vice/src/lib/libresidfp/NEWS.md
    trunk/vice/src/lib/libresidfp/README.md
    trunk/vice/src/lib/libresidfp/aclocal.m4
    trunk/vice/src/lib/libresidfp/build-aux/
    trunk/vice/src/lib/libresidfp/build-aux/compile
    trunk/vice/src/lib/libresidfp/build-aux/config.guess
    trunk/vice/src/lib/libresidfp/build-aux/config.sub
    trunk/vice/src/lib/libresidfp/build-aux/depcomp
    trunk/vice/src/lib/libresidfp/build-aux/install-sh
    trunk/vice/src/lib/libresidfp/build-aux/ltmain.sh
    trunk/vice/src/lib/libresidfp/build-aux/missing
    trunk/vice/src/lib/libresidfp/build-aux/test-driver
    trunk/vice/src/lib/libresidfp/configure
    trunk/vice/src/lib/libresidfp/configure.ac
    trunk/vice/src/lib/libresidfp/docs/
    trunk/vice/src/lib/libresidfp/docs/mainpage.dox
    trunk/vice/src/lib/libresidfp/libresidfp.pc.in
    trunk/vice/src/lib/libresidfp/m4/
    trunk/vice/src/lib/libresidfp/m4/ax_append_compile_flags.m4
    trunk/vice/src/lib/libresidfp/m4/ax_append_flag.m4
    trunk/vice/src/lib/libresidfp/m4/ax_check_compile_flag.m4
    trunk/vice/src/lib/libresidfp/m4/ax_cxx_compile_stdcxx.m4
    trunk/vice/src/lib/libresidfp/m4/ax_require_defined.m4
    trunk/vice/src/lib/libresidfp/m4/libtool.m4
    trunk/vice/src/lib/libresidfp/m4/ltoptions.m4
    trunk/vice/src/lib/libresidfp/m4/ltsugar.m4
    trunk/vice/src/lib/libresidfp/m4/ltversion.m4
    trunk/vice/src/lib/libresidfp/m4/lt~obsolete.m4
    trunk/vice/src/lib/libresidfp/m4/sid_x86_simd_supports.m4
    trunk/vice/src/lib/libresidfp/src/
    trunk/vice/src/lib/libresidfp/src/Dac.cpp
    trunk/vice/src/lib/libresidfp/src/Dac.h
    trunk/vice/src/lib/libresidfp/src/EnvelopeGenerator.cpp
    trunk/vice/src/lib/libresidfp/src/EnvelopeGenerator.h
    trunk/vice/src/lib/libresidfp/src/ExternalFilter.cpp
    trunk/vice/src/lib/libresidfp/src/ExternalFilter.h
    trunk/vice/src/lib/libresidfp/src/Filter.cpp
    trunk/vice/src/lib/libresidfp/src/Filter.h
    trunk/vice/src/lib/libresidfp/src/Filter6581.cpp
    trunk/vice/src/lib/libresidfp/src/Filter6581.h
    trunk/vice/src/lib/libresidfp/src/Filter8580.cpp
    trunk/vice/src/lib/libresidfp/src/Filter8580.h
    trunk/vice/src/lib/libresidfp/src/FilterModelConfig.cpp
    trunk/vice/src/lib/libresidfp/src/FilterModelConfig.h
    trunk/vice/src/lib/libresidfp/src/FilterModelConfig6581.cpp
    trunk/vice/src/lib/libresidfp/src/FilterModelConfig6581.h
    trunk/vice/src/lib/libresidfp/src/FilterModelConfig8580.cpp
    trunk/vice/src/lib/libresidfp/src/FilterModelConfig8580.h
    trunk/vice/src/lib/libresidfp/src/Integrator.h
    trunk/vice/src/lib/libresidfp/src/Integrator6581.cpp
    trunk/vice/src/lib/libresidfp/src/Integrator6581.h
    trunk/vice/src/lib/libresidfp/src/Integrator8580.cpp
    trunk/vice/src/lib/libresidfp/src/Integrator8580.h
    trunk/vice/src/lib/libresidfp/src/OpAmp.cpp
    trunk/vice/src/lib/libresidfp/src/OpAmp.h
    trunk/vice/src/lib/libresidfp/src/SID.cpp
    trunk/vice/src/lib/libresidfp/src/SID.h
    trunk/vice/src/lib/libresidfp/src/Spline.cpp
    trunk/vice/src/lib/libresidfp/src/Spline.h
    trunk/vice/src/lib/libresidfp/src/Voice.h
    trunk/vice/src/lib/libresidfp/src/WaveformCalculator.cpp
    trunk/vice/src/lib/libresidfp/src/WaveformCalculator.h
    trunk/vice/src/lib/libresidfp/src/WaveformGenerator.cpp
    trunk/vice/src/lib/libresidfp/src/WaveformGenerator.h
    trunk/vice/src/lib/libresidfp/src/array.h
    trunk/vice/src/lib/libresidfp/src/resample/
    trunk/vice/src/lib/libresidfp/src/resample/Limiter.h
    trunk/vice/src/lib/libresidfp/src/resample/PassThrough.h
    trunk/vice/src/lib/libresidfp/src/resample/Resampler.h
    trunk/vice/src/lib/libresidfp/src/resample/SincResampler.cpp
    trunk/vice/src/lib/libresidfp/src/resample/SincResampler.h
    trunk/vice/src/lib/libresidfp/src/resample/TwoPassSincResampler.h
    trunk/vice/src/lib/libresidfp/src/resample/ZeroOrderResampler.h
    trunk/vice/src/lib/libresidfp/src/resample/test.cpp
    trunk/vice/src/lib/libresidfp/src/residfp/
    trunk/vice/src/lib/libresidfp/src/residfp/residfp.cpp
    trunk/vice/src/lib/libresidfp/src/residfp/residfp.h
    trunk/vice/src/lib/libresidfp/src/residfp/residfp_defs.h
    trunk/vice/src/lib/libresidfp/src/residfp/sidversion.h.in
    trunk/vice/src/lib/libresidfp/src/siddefs-fp.h.in
    trunk/vice/src/lib/libresidfp/src/version.cc
    trunk/vice/src/lib/libresidfp/tests/
    trunk/vice/src/lib/libresidfp/tests/Main.cpp
    trunk/vice/src/lib/libresidfp/tests/Makefile.am
    trunk/vice/src/lib/libresidfp/tests/Makefile.in
    trunk/vice/src/lib/libresidfp/tests/TestDac.cpp
    trunk/vice/src/lib/libresidfp/tests/TestEnvelopeGenerator.cpp
    trunk/vice/src/lib/libresidfp/tests/TestLimiter.cpp
    trunk/vice/src/lib/libresidfp/tests/TestSID.cpp
    trunk/vice/src/lib/libresidfp/tests/TestSpline.cpp
    trunk/vice/src/lib/libresidfp/tests/TestWaveformGenerator.cpp
    trunk/vice/src/lib/libresidfp/tests/utpp/
    trunk/vice/src/lib/libresidfp/tests/utpp/LICENSE
    trunk/vice/src/lib/libresidfp/tests/utpp/README.md
    trunk/vice/src/lib/libresidfp/tests/utpp/checks.h
    trunk/vice/src/lib/libresidfp/tests/utpp/reporter_dbgout.h
    trunk/vice/src/lib/libresidfp/tests/utpp/reporter_stream.h
    trunk/vice/src/lib/libresidfp/tests/utpp/reporter_xml.h
    trunk/vice/src/lib/libresidfp/tests/utpp/utpp.h

Index: trunk/vice/src/lib/libresidfp
===================================================================
--- trunk/vice/src/lib/libresidfp	2026-05-07 20:18:14 UTC (rev 46092)
+++ trunk/vice/src/lib/libresidfp	2026-05-07 20:22:37 UTC (rev 46093)

Property changes on: trunk/vice/src/lib/libresidfp
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,10 ##
+.aclocal.out
+.autoconf.out
+.autoheader.out
+config.log
+config.status
+Doxyfile
+libresidfp.pc
+libtool
+Makefile
+autom4te.cache
Added: trunk/vice/src/lib/libresidfp/AUTHORS
===================================================================
--- trunk/vice/src/lib/libresidfp/AUTHORS	                        (rev 0)
+++ trunk/vice/src/lib/libresidfp/AUTHORS	2026-05-07 20:22:37 UTC (rev 46093)
@@ -0,0 +1,6 @@
+Authors of reSIDfp.
+
+Dag Lem: Designed and programmed complete emulation engine.
+Antti S. Lankila: Distortion simulation and calculation of combined waveforms
+Ken Händel: source code conversion to Java
+Leandro Nini: port back to c++, merge with reSID 1.0, further improvements

Added: trunk/vice/src/lib/libresidfp/COPYING
===================================================================
--- trunk/vice/src/lib/libresidfp/COPYING	                        (rev 0)
+++ trunk/vice/src/lib/libresidfp/COPYING	2026-05-07 20:22:37 UTC (rev 46093)
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Added: trunk/vice/src/lib/libresidfp/Doxyfile.in
===================================================================
--- trunk/vice/src/lib/libresidfp/Doxyfile.in	                        (rev 0)
+++ trunk/vice/src/lib/libresidfp/Doxyfile.in	2026-05-07 20:22:37 UTC (rev 46093)
@@ -0,0 +1,2958 @@
+# Doxyfile 1.15.0
+
+# This file describes the settings to be used by the documentation system
+# Doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use Doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use Doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = @PACKAGE_NAME@
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = @PACKAGE_VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewers a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# With the PROJECT_ICON tag one can specify an icon that is included in the tabs
+# when the HTML document is shown. Doxygen will copy the logo to the output
+# directory.
+
+PROJECT_ICON           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where Doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = @builddir@/docs
+
+# If the CREATE_SUBDIRS tag is set to YES then Doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding Doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise cause
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, Doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by Doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, Doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, Doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, Doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, Doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which Doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where Doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, Doxygen will generate much shorter (but
+# less readable) file names. This can be useful if your file system doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen will interpret the
+# first line (until the first dot, question mark or exclamation mark) of a
+# Javadoc-style comment as the brief description. If set to NO, the Javadoc-
+# style will behave just like regular Qt-style comments (thus requiring an
+# explicit @brief command for a brief description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the JAVADOC_BANNER tag is set to YES then Doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by Doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will interpret the first
+# line (until the first dot, question mark or exclamation mark) of a Qt-style
+# comment as the brief description. If set to NO, the Qt-style will behave just
+# like regular Qt-style comments (thus requiring an explicit \brief command for
+# a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# By default Python docstrings are displayed as preformatted text and Doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# Doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as Doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then Doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:^^"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by Doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make Doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by Doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then Doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by Doxygen, so you can
+# mix Doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# If the MARKDOWN_STRICT tag is enabled then Doxygen treats text in comments as
+# Markdown formatted also in cases where Doxygen's native markup format
+# conflicts with that of Markdown. This is only relevant in cases where
+# backticks are used. Doxygen's native markup style allows a single quote to end
+# a text fragment started with a backtick and then treat it as a piece of quoted
+# text, whereas in Markdown such text fragment is treated as verbatim and only
+# ends when a second matching backtick is found. Also, Doxygen's native markup
+# format requires double quotes to be escaped when they appear in a backtick
+# section, whereas this is not needed for Markdown.
+# The default value is: YES.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_STRICT        = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 6.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0 and GITHUB use the lower case version of title
+# with any whitespace replaced by '-' and punctuation characters removed.
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
+# When enabled Doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO. Words listed in the
+# AUTOLINK_IGNORE_WORDS tag are excluded from automatic linking.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# This tag specifies a list of words that, when matching the start of a word in
+# the documentation, will suppress auto links generation, if it is enabled via
+# AUTOLINK_SUPPORT. This list does not affect links explicitly created using \#
+# or the \link or commands.
+# This tag requires that the tag AUTOLINK_SUPPORT is set to YES.
+
+AUTOLINK_IGNORE_WORDS  =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let Doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also makes the inheritance and
+# collaboration diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software) sources only. Doxygen will parse
+# them like normal C++ but will assume all classes use public instead of private
+# inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# Doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then Doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = YES
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, Doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# Doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run Doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+# The NUM_PROC_THREADS specifies the number of threads Doxygen is allowed to use
+# during processing. When set to 0 Doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 512, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, Doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_UNDOC_NAMESPACES tag is set to YES, Doxygen will hide all
+# undocumented namespaces that are normally visible in the namespace hierarchy.
+# If set to NO, these namespaces will be included in the various overviews. This
+# option has no effect if EXTRACT_ALL is enabled.
+# The default value is: YES.
+
+HIDE_UNDOC_NAMESPACES  = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# With the correct setting of option CASE_SENSE_NAMES Doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and macOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then Doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then Doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then Doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then Doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then Doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then Doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then Doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and Doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING Doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the d...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[46092] trunk/vice/build/github- actions

[<gp...@us...>]

Revision: 46092
          http://sourceforge.net/p/vice-emu/code/46092
Author:   gpz
Date:     2026-05-07 20:18:14 +0000 (Thu, 07 May 2026)
Log Message:
-----------
don't do the stylechecks in the src/lib directory

Modified Paths:
--------------
    trunk/vice/build/github-actions/check-lastline.sh
    trunk/vice/build/github-actions/check-spaces.sh
    trunk/vice/build/github-actions/check-tabs.sh

Modified: trunk/vice/build/github-actions/check-lastline.sh
===================================================================
--- trunk/vice/build/github-actions/check-lastline.sh	2026-05-04 22:47:16 UTC (rev 46091)
+++ trunk/vice/build/github-actions/check-lastline.sh	2026-05-07 20:18:14 UTC (rev 46092)
@@ -2,6 +2,7 @@
 OLDCWD=`pwd`
 SCRIPT_PATH=`dirname $0`
 CHECK_PATH=./src/
+PRUNE_PATH='./src/lib/*'
 
 cd $SCRIPT_PATH/../../
 
@@ -8,7 +9,7 @@
 nl='
 '
 nl=$'\n'
-FILES=`find $CHECK_PATH -type f \( -name \*.c -o -name \*.h -o -name \*.cc -o -name \*.m -o -name Makefile.am \) -print | while read f; do
+FILES=`find $CHECK_PATH -not -path "$PRUNE_PATH" -type f \( -name \*.c -o -name \*.h -o -name \*.cc -o -name \*.m -o -name Makefile.am \) -print | while read f; do
     t=$(tail -c2 $f; printf x); r1="${nl}$";
     [[ ${t%x} =~ $r1 ]] || echo "$f"
 done`

Modified: trunk/vice/build/github-actions/check-spaces.sh
===================================================================
--- trunk/vice/build/github-actions/check-spaces.sh	2026-05-04 22:47:16 UTC (rev 46091)
+++ trunk/vice/build/github-actions/check-spaces.sh	2026-05-07 20:18:14 UTC (rev 46092)
@@ -2,10 +2,11 @@
 OLDCWD=`pwd`
 SCRIPT_PATH=`dirname $0`
 CHECK_PATH=./src/
+PRUNE_PATH='./src/lib/*'
 
 cd $SCRIPT_PATH/../../
 
-FILES=`find $CHECK_PATH -type f \( -name \*.c -o -name \*.h -o -name \*.cc -o -name \*.m -o -name Makefile.am \) -print | xargs grep -l ' $'`
+FILES=`find $CHECK_PATH -not -path "$PRUNE_PATH" -type f \( -name \*.c -o -name \*.h -o -name \*.cc -o -name \*.m -o -name Makefile.am \) -print | xargs grep -l ' $'`
 
 cd $OLDCWD
 

Modified: trunk/vice/build/github-actions/check-tabs.sh
===================================================================
--- trunk/vice/build/github-actions/check-tabs.sh	2026-05-04 22:47:16 UTC (rev 46091)
+++ trunk/vice/build/github-actions/check-tabs.sh	2026-05-07 20:18:14 UTC (rev 46092)
@@ -2,10 +2,11 @@
 OLDCWD=`pwd`
 SCRIPT_PATH=`dirname $0`
 CHECK_PATH=./src/
+PRUNE_PATH='./src/lib/*'
 
 cd $SCRIPT_PATH/../../
 
-FILES=`find $CHECK_PATH -type f \( \( -name \*.c \! -name mon_lex.c \! -name mon_parse.c \) -o \( -name \*.h \! -name box_drawing.h \! -name p64.h \) -o -name \*.cc -o -name \*.m \) -print | xargs grep -l $'\t'`
+FILES=`find $CHECK_PATH -not -path "$PRUNE_PATH" -type f \( \( -name \*.c \! -name mon_lex.c \! -name mon_parse.c \) -o \( -name \*.h \! -name box_drawing.h \! -name p64.h \) -o -name \*.cc -o -name \*.m \) -print | xargs grep -l $'\t'`
 
 cd $OLDCWD
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46091] trunk/vice/src/c64/cart/ mmc64.c

[<gp...@us...>]

Revision: 46091
          http://sourceforge.net/p/vice-emu/code/46091
Author:   gpz
Date:     2026-05-04 22:47:16 +0000 (Mon, 04 May 2026)
Log Message:
-----------
fix log message

Modified Paths:
--------------
    trunk/vice/src/c64/cart/mmc64.c

Modified: trunk/vice/src/c64/cart/mmc64.c
===================================================================
--- trunk/vice/src/c64/cart/mmc64.c	2026-05-04 14:04:13 UTC (rev 46090)
+++ trunk/vice/src/c64/cart/mmc64.c	2026-05-04 22:47:16 UTC (rev 46091)
@@ -603,7 +603,7 @@
     if (set_mmc64_enabled(enabled, (void*)1) < 0) {
         lib_free(mmc64_bios_filename);
         mmc64_bios_filename = NULL;
-        LOG(("MMC64: set_mmc64_bios_filename done: %d '%s'", mmc64_enabled, mmc64_bios_filename));
+        LOG(("MMC64: set_mmc64_bios_filename done: %d", mmc64_enabled));
         return -1;
     }
     /* should be enabled now */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46090] trunk/vice/doc/Makefile .am

[<gp...@us...>]

Revision: 46090
          http://sourceforge.net/p/vice-emu/code/46090
Author:   gpz
Date:     2026-05-04 14:04:13 +0000 (Mon, 04 May 2026)
Log Message:
-----------
add snapshots-extract.sh to texi tools, so it hopefully ends up in the dist tarball

Modified Paths:
--------------
    trunk/vice/doc/Makefile.am

Modified: trunk/vice/doc/Makefile.am
===================================================================
--- trunk/vice/doc/Makefile.am	2026-05-01 21:40:39 UTC (rev 46089)
+++ trunk/vice/doc/Makefile.am	2026-05-04 14:04:13 UTC (rev 46090)
@@ -12,7 +12,8 @@
 	gpl.texi
 
 TEXI_TOOLS = \
-	fixdates.sh
+	fixdates.sh \
+	snapshots-extract.sh
 
 DOC_TOOLS = \
 	checkdoc.c \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46089] trunk/vice/doc

[<gp...@us...>]

Revision: 46089
          http://sourceforge.net/p/vice-emu/code/46089
Author:   gpz
Date:     2026-05-01 21:40:39 +0000 (Fri, 01 May 2026)
Log Message:
-----------
add a simple script that extracts the snapshot tables from the source and converts them to texinfo. (3/3 this may need testing on various setups/OSs)

Modified Paths:
--------------
    trunk/vice/doc/Makefile.am
    trunk/vice/doc/html/Makefile.am
    trunk/vice/doc/vice.texi

Added Paths:
-----------
    trunk/vice/doc/snapshots-extract.sh

Property Changed:
----------------
    trunk/vice/doc/
    trunk/vice/doc/html/

Index: trunk/vice/doc
===================================================================
--- trunk/vice/doc	2026-05-01 21:26:08 UTC (rev 46088)
+++ trunk/vice/doc	2026-05-01 21:40:39 UTC (rev 46089)

Property changes on: trunk/vice/doc
___________________________________________________________________
Modified: svn:ignore
## -16,3 +16,45 ##
 vice.hlp
 vice.inf
 .vice-texi-charset-ok
+CBM2ROM.snapshots.texi
+CBM2MEM.snapshots.texi
+C64ROM.snapshots.texi
+C64MEM.snapshots.texi
+C500DATA.snapshots.texi
+C128ROM.snapshots.texi
+C128MEM.snapshots.texi
+CIA.snapshots.texi
+CPU6809.snapshots.texi
+CRTC.snapshots.texi
+DWWMEM.snapshots.texi
+MYACIA.snapshots.texi
+MYPIA_NAME.snapshots.texi
+PETMEM.snapshots.texi
+PETROM.snapshots.texi
+PLUS4ROM.snapshots.texi
+RIOT.snapshots.texi
+SID.snapshots.texi
+snapshots.log
+snapshots.texi
+TPI.snapshots.texi
+VIA.snapshots.texi
+VIC-I.snapshots.texi
+VIC-II.snapshots.texi
+VIC20MEM.snapshots.texi
+VIC20ROM.snapshots.texi
+MAIN6510CPU.snapshots.texi
+ACIA.snapshots.texi
+ATA.snapshots.texi
+C64DTVMEM.snapshots.texi
+C64DTVROM.snapshots.texi
+C64SCPUMEM.snapshots.texi
+C64SCPUROM.snapshots.texi
+DTVVIC.snapshots.texi
+MAINVIC20CPU.snapshots.texi
+PIA.snapshots.texi
+PLUS4MEM.snapshots.texi
+SIDRESID.snapshots.texi
+TED.snapshots.texi
+VIC-IISC.snapshots.texi
+MAINC64CPU.snapshots.texi
+MAIN65816CPU.snapshots.texi
Modified: trunk/vice/doc/Makefile.am
===================================================================
--- trunk/vice/doc/Makefile.am	2026-05-01 21:26:08 UTC (rev 46088)
+++ trunk/vice/doc/Makefile.am	2026-05-01 21:40:39 UTC (rev 46089)
@@ -56,6 +56,7 @@
 #if 0
 $(builddir)/vice.txt:	.vice-texi-charset-ok
 	touch vicetmp.txt
+	@$(srcdir)/snapshots-extract.sh
 	LC_ALL=C $(MAKEINFO) -D$(PLATFORM_DOX_FLAGS) -o vicetmp.txt --no-validate --no-headers $(srcdir)/vice.texi
 	$(srcdir)/fixdox.sh txt <vicetmp.txt | LC_ALL=C sed 's/ \+$$//' >$(builddir)/vice.txt
 	rm -f vicetmp.txt
@@ -65,6 +66,7 @@
 $(builddir)/vice.pdf:	.vice-texi-charset-ok
 	@LC_ALL=C sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
 	@$(srcdir)/fixdates.sh vicepdf.texi `grep "VICEDATE_YEAR " $(top_srcdir)/src/vicedate.h | cut -d " " -f 3`
+	@$(srcdir)/snapshots-extract.sh
 	@if $(AM_V_P); then \
 		LC_ALL=C $(TEXI2DVI) -I $(srcdir) -V --clean --pdf "--texinfo=@set $(PLATFORM_DOX_FLAGS) " -o $(builddir)/vice.pdf vicepdf.texi; \
 	else \

Index: trunk/vice/doc/html
===================================================================
--- trunk/vice/doc/html	2026-05-01 21:26:08 UTC (rev 46088)
+++ trunk/vice/doc/html	2026-05-01 21:40:39 UTC (rev 46089)

Property changes on: trunk/vice/doc/html
___________________________________________________________________
Modified: svn:ignore
## -4,3 +4,6 ##
 Makefile.in
 vice_*.html
 vice.texi
+*.snapshots.texi
+snapshots.texi
+snapshots.log
Modified: trunk/vice/doc/html/Makefile.am
===================================================================
--- trunk/vice/doc/html/Makefile.am	2026-05-01 21:26:08 UTC (rev 46088)
+++ trunk/vice/doc/html/Makefile.am	2026-05-01 21:40:39 UTC (rev 46089)
@@ -143,6 +143,7 @@
 
 $(GEN_HTML): vice.texi $(srcdir)/texi2html
 	@echo "generating html documentation..."
+	@"$(srcdir)"/../snapshots-extract.sh
 	$(PERL) "$(srcdir)"/texi2html -I "$(srcdir)"/.. -number -split_chapter -D$(PLATFORM_DOX_FLAGS) "$<"
 endif
 

Added: trunk/vice/doc/snapshots-extract.sh
===================================================================
--- trunk/vice/doc/snapshots-extract.sh	                        (rev 0)
+++ trunk/vice/doc/snapshots-extract.sh	2026-05-01 21:40:39 UTC (rev 46089)
@@ -0,0 +1,426 @@
+#! /bin/bash
+
+SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+echo SCRIPTDIR: $SCRIPTDIR
+
+#SOURCE=$1
+SOURCE=$SCRIPTDIR/../src
+
+LOGFILE=snapshots.log
+TEXIFILE=snapshots.texi
+
+#echo source: $SOURCE
+#echo log: $LOGFILE
+#echo texi: $TEXIFILE
+
+rm -f $LOGFILE
+rm -f $TEXIFILE
+
+echo "extracting documentation on snapshots (see $LOGFILE)"
+
+########################################################################################
+
+declare -a extratexi=(  "MAINC64CPU" "MAINVIC20CPU" "CPU6809" "MAIN65816CPU"
+                          "C64ROM" "C64MEM"
+                          "C64SCPUROM" "C64SCPUMEM"
+                          "C64DTVROM" "C64DTVMEM"
+                          "C128ROM" "C128MEM"
+                          "VIC20ROM" "VIC20MEM"
+                          "PLUS4ROM" "PLUS4MEM"
+                          "PETROM" "PETMEM"
+                          "DWWMEM"
+#                          "PETDWWPIA"
+                          "CBM2ROM" "CBM2MEM"
+                          "C500DATA"
+                          "SID" "SIDRESID"
+                          "CRTC"
+                          "MYPIA_NAME"
+                          "MYACIA"
+                          "VIA"
+                          "RIOT"
+                          "CIA"
+                          "TPI"
+                          "VIC-I"
+                          "VIC-II" "VIC-IISC" "DTVVIC"
+                          "TED"
+                        )
+
+# returns "snapshots.texi" or "MODULE.snapshots.texi", depending on whether
+# $1 is contained in the above array
+
+# $1 __MODULE__
+function texi_check_extra_texi
+{
+    if [[ ${extratexi[@]} =~ $1 ]]
+    then
+        echo "@c generated, do not edit" > "$1.$TEXIFILE"
+        echo "$1.$TEXIFILE"
+    else
+        echo "$TEXIFILE"
+    fi
+}
+
+# $1 __INFILE__
+function texi_table
+{
+
+    if  [ -n "$__MODULE__" ]; then
+        TABLEFILE=`texi_check_extra_texi $__MODULE__`
+        echo "TEXI TABLEFILE:"$TABLEFILE >> $LOGFILE
+        echo -en "\n@b{The "$__MODULE__" module}\n\n" >> $TABLEFILE
+    else
+        return
+    fi
+
+    if  [ -n "$__SNAP_MAJOR__" ] && [ -n "$__SNAP_MINOR__" ]; then
+        echo -en "\nVersion numbers: Major "$__SNAP_MAJOR__", Minor "$__SNAP_MINOR__".\n\n" >> $TABLEFILE
+    fi
+
+    if  [ -n "$TABLE3" ]; then
+        echo "@multitable @columnfractions .2 .3 .5" >> $TABLEFILE
+        echo -en "@item @b{Type}\n@tab @b{Name}\n@tab @b{Description}\n" >> $TABLEFILE
+        echo "$TABLE3" | sed 's:^:@item :g' | sed 's:|:\n@tab :g' >> $TABLEFILE
+        echo -en "@end multitable\n\n" >> $TABLEFILE
+    fi
+
+    if  [ -n "$TABLE4" ]; then
+        echo "@multitable @columnfractions .2 .3 .1 .4" >> $TABLEFILE
+        echo -en "@item @b{Type}\n@tab @b{Name}\n@tab @b{Version}\n@tab @b{Description}\n" >> $TABLEFILE
+        echo "$TABLE4" | sed 's:^:@item :g' | sed 's:|:\n@tab :g' >> $TABLEFILE
+        echo -en "@end multitable\n\n" >> $TABLEFILE
+    fi
+
+    if  [ -n "$__MODULE__" ] || [ -n "$__SNAP_MAJOR__" ] || [ -n "$__SNAP_MINOR__" ] || [ -n "$TABLE3" ] || [ -n "$TABLE4" ]; then
+        echo "@i{ src${F##$SOURCE} }"  >> $TABLEFILE
+    fi
+
+    echo "@sp 1"  >> $TABLEFILE
+
+}
+
+# $1 __INFILE__
+function log_table
+{
+    echo __INFILE__=$1 >> $LOGFILE
+
+    if  [ -n "$__MODULE__" ]; then
+        echo __MODULE__=$__MODULE__ >> $LOGFILE
+    fi
+
+    if  [ -n "$__SNAP_MAJOR__" ]; then
+        echo __SNAP_MAJOR__=$__SNAP_MAJOR__ >> $LOGFILE
+    fi
+    if  [ -n "$__SNAP_MINOR__" ]; then
+        echo __SNAP_MINOR__=$__SNAP_MINOR__ >> $LOGFILE
+    fi
+
+    if  [ -n "$TABLE3" ]; then
+        echo "   Type | Name | Description" >> $LOGFILE
+        echo "$TABLE3" >> $LOGFILE
+        echo -en "\n" >> $LOGFILE
+    fi
+
+    if  [ -n "$TABLE4" ]; then
+        echo "   Type | Name | Version | Description" >> $LOGFILE
+        echo "$TABLE4" >> $LOGFILE
+        echo -en "\n" >> $LOGFILE
+    fi
+}
+
+########################################################################################
+
+# $1 filename
+function grep_module
+{
+    __MODULE__=`grep "[[:space:]]snap_module_name.*=.*\".*" $1 | sed -e 's:.*"\(.*\)".*;:\1:g' | sed -e 's: /.*::g'`
+    if  [ -z "$__MODULE__" ]; then
+        __MODULE__=`grep "snap_ram_module_name.*=.*\".*" $1 | sed -e 's:.*"\(.*\)".*;:\1:g' | sed -e 's: /.*::g'`
+        if  [ -z "$__MODULE__" ]; then
+            __MODULE__=`grep "snap_rom_module_name.*=.*\".*" $1 | sed -e 's:.*"\(.*\)".*;:\1:g' | sed -e 's: /.*::g'`
+            if  [ -z "$__MODULE__" ]; then
+                __MODULE__=`grep "snap_mem_module_name.*=.*\".*" $1 | sed -e 's:.*"\(.*\)".*;:\1:g' | sed -e 's: /.*::g'`
+                if  [ -z "$__MODULE__" ]; then
+                    __MODULE__=`grep "flash_snap_module_name.*=.*\".*" $1 | sed -e 's:.*"\(.*\)".*;:\1:g' | sed -e 's: /.*::g'`
+                    if  [ -z "$__MODULE__" ]; then
+                        __MODULE__=`grep "define.*[[:space:]]SNAP_MODULE_NAME.*\".*" $1 | sed -e 's:#define.*SNAP_MODULE_NAME *"\(.*\)":\1:g' | sed -e 's: /.*::g'`
+                        if  [ -z "$__MODULE__" ]; then
+                            __MODULE__=`grep "define.*FLASH_SNAP_MODULE_NAME*\".*" $1 | sed -e 's:#define.*FLASH_SNAP_MODULE_NAME *"\(.*\)":\1:g' | sed -e 's: /.*::g'`
+                            if  [ -z "$__MODULE__" ]; then
+                                __MODULE__=`grep "snapshot_module_create.*(.*\".*" $1 | sed -e 's:.*"\(.*\)".*:\1:g'`
+                                if  [ -z "$__MODULE__" ]; then
+                                    __MODULE__=`grep "snapshot_create.*(.*\".*" $1 | sed -e 's:.*"\(.*\)".*:\1:g'`
+                                fi
+                            fi
+                        fi
+                    fi
+                fi
+            fi
+        fi
+    fi
+}
+
+# $1 filename
+function grep_major_minor
+{
+    __SNAP_MAJOR__=`grep "define SNAP_MAJOR" $1 | sed -e 's:.*define SNAP_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    if  [ -z "$__SNAP_MAJOR__" ]; then
+        __SNAP_MAJOR__=`grep "define CART_DUMP_VER_MAJOR" $1 | sed -e 's:.*define CART_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+        if  [ -z "$__SNAP_MAJOR__" ]; then
+            __SNAP_MAJOR__=`grep "define C64CART_DUMP_VER_MAJOR" $1 | sed -e 's:.*define C64CART_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+            if  [ -z "$__SNAP_MAJOR__" ]; then
+                __SNAP_MAJOR__=`grep "define FLASH040_DUMP_VER_MAJOR" $1 | sed -e 's:.*define FLASH040_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                if  [ -z "$__SNAP_MAJOR__" ]; then
+                    __SNAP_MAJOR__=`grep "define FLASH800_DUMP_VER_MAJOR" $1 | sed -e 's:.*define FLASH800_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                    if  [ -z "$__SNAP_MAJOR__" ]; then
+                        __SNAP_MAJOR__=`grep "define TPI_DUMP_VER_MAJOR" $1 | sed -e 's:.*define TPI_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                        if  [ -z "$__SNAP_MAJOR__" ]; then
+                            __SNAP_MAJOR__=`grep "define VIA_DUMP_VER_MAJOR" $1 | sed -e 's:.*define VIA_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                            if  [ -z "$__SNAP_MAJOR__" ]; then
+                                __SNAP_MAJOR__=`grep "define CIA_DUMP_VER_MAJOR" $1 | sed -e 's:.*define CIA_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                if  [ -z "$__SNAP_MAJOR__" ]; then
+                                    __SNAP_MAJOR__=`grep "define RIOT_DUMP_VER_MAJOR" $1 | sed -e 's:.*define RIOT_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                    if  [ -z "$__SNAP_MAJOR__" ]; then
+                                        __SNAP_MAJOR__=`grep "define VIC20CART_DUMP_VER_MAJOR" $1 | sed -e 's:.*define VIC20CART_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                        if  [ -z "$__SNAP_MAJOR__" ]; then
+                                            __SNAP_MAJOR__=`grep "define ROM_SNAP_MAJOR" $1 | sed -e 's:.*define ROM_SNAP_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                            if  [ -z "$__SNAP_MAJOR__" ]; then
+                                                __SNAP_MAJOR__=`grep "define DRIVE_SNAP_MAJOR" $1 | sed -e 's:.*define DRIVE_SNAP_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                if  [ -z "$__SNAP_MAJOR__" ]; then
+                                                    __SNAP_MAJOR__=`grep "define CMDHD_SNAP_MAJOR" $1 | sed -e 's:.*define CMDHD_SNAP_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                    if  [ -z "$__SNAP_MAJOR__" ]; then
+                                                        __SNAP_MAJOR__=`grep "define FDD_SNAP_MAJOR" $1 | sed -e 's:.*define FDD_SNAP_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                        if  [ -z "$__SNAP_MAJOR__" ]; then
+                                                            __SNAP_MAJOR__=`grep "define WD1770_SNAP_MAJOR" $1 | sed -e 's:.*define WD1770_SNAP_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                        fi
+                                                    fi
+                                                fi
+                                            fi
+                                        fi
+                                    fi
+                                fi
+                            fi
+                        fi
+                    fi
+                fi
+            fi
+        fi
+    fi
+    if  [ -z "$__SNAP_MAJOR__" ]; then
+        __SNAP_MAJOR__=`grep "define C500DATA_DUMP_VER_MAJOR" $1 | sed -e 's:.*define C500DATA_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    fi
+    if  [ -z "$__SNAP_MAJOR__" ]; then
+        __SNAP_MAJOR__=`grep "define CBM2CART_DUMP_VER_MAJOR" $1 | sed -e 's:.*define CBM2CART_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    fi
+    if  [ -z "$__SNAP_MAJOR__" ]; then
+        __SNAP_MAJOR__=`grep "define PIA_DUMP_VER_MAJOR" $1 | sed -e 's:.*define PIA_DUMP_VER_MAJOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    fi
+
+    __SNAP_MINOR__=`grep "define SNAP_MINOR" $1 | sed -e 's:.*define SNAP_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    if  [ -z "$__SNAP_MINOR__" ]; then
+        __SNAP_MINOR__=`grep "define CART_DUMP_VER_MINOR" $1 | sed -e 's:.*define CART_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+        if  [ -z "$__SNAP_MINOR__" ]; then
+            __SNAP_MINOR__=`grep "define C64CART_DUMP_VER_MINOR" $1 | sed -e 's:.*define C64CART_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+            if  [ -z "$__SNAP_MINOR__" ]; then
+                __SNAP_MINOR__=`grep "define FLASH040_DUMP_VER_MINOR" $1 | sed -e 's:.*define FLASH040_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                if  [ -z "$__SNAP_MINOR__" ]; then
+                    __SNAP_MINOR__=`grep "define FLASH800_DUMP_VER_MINOR" $1 | sed -e 's:.*define FLASH800_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                    if  [ -z "$__SNAP_MINOR__" ]; then
+                        __SNAP_MINOR__=`grep "define TPI_DUMP_VER_MINOR" $1 | sed -e 's:.*define TPI_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                        if  [ -z "$__SNAP_MINOR__" ]; then
+                            __SNAP_MINOR__=`grep "define VIA_DUMP_VER_MINOR" $1 | sed -e 's:.*define VIA_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                            if  [ -z "$__SNAP_MINOR__" ]; then
+                                __SNAP_MINOR__=`grep "define CIA_DUMP_VER_MINOR" $1 | sed -e 's:.*define CIA_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                if  [ -z "$__SNAP_MINOR__" ]; then
+                                    __SNAP_MINOR__=`grep "define RIOT_DUMP_VER_MINOR" $1 | sed -e 's:.*define RIOT_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                    if  [ -z "$__SNAP_MINOR__" ]; then
+                                        __SNAP_MINOR__=`grep "define VIC20CART_DUMP_VER_MINOR" $1 | sed -e 's:.*define VIC20CART_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                        if  [ -z "$__SNAP_MINOR__" ]; then
+                                            __SNAP_MINOR__=`grep "define ROM_SNAP_MINOR" $1 | sed -e 's:.*define ROM_SNAP_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                            if  [ -z "$__SNAP_MINOR__" ]; then
+                                                __SNAP_MINOR__=`grep "define DRIVE_SNAP_MINOR" $1 | sed -e 's:.*define DRIVE_SNAP_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                if  [ -z "$__SNAP_MINOR__" ]; then
+                                                    __SNAP_MINOR__=`grep "define CMDHD_SNAP_MINOR" $1 | sed -e 's:.*define CMDHD_SNAP_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                    if  [ -z "$__SNAP_MINOR__" ]; then
+                                                        __SNAP_MINOR__=`grep "define FDD_SNAP_MINOR" $1 | sed -e 's:.*define FDD_SNAP_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                        if  [ -z "$__SNAP_MINOR__" ]; then
+                                                            __SNAP_MINOR__=`grep "define WD1770_SNAP_MINOR" $1 | sed -e 's:.*define WD1770_SNAP_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+                                                        fi
+                                                    fi
+                                                fi
+                                            fi
+                                        fi
+                                    fi
+                                fi
+                            fi
+                        fi
+                    fi
+                fi
+            fi
+        fi
+    fi
+    if  [ -z "$__SNAP_MINOR__" ]; then
+        __SNAP_MINOR__=`grep "define C500DATA_DUMP_VER_MINOR" $1 | sed -e 's:.*define C500DATA_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    fi
+    if  [ -z "$__SNAP_MINOR__" ]; then
+        __SNAP_MINOR__=`grep "define CBM2CART_DUMP_VER_MINOR" $1 | sed -e 's:.*define CBM2CART_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    fi
+    if  [ -z "$__SNAP_MINOR__" ]; then
+        __SNAP_MINOR__=`grep "define PIA_DUMP_VER_MINOR" $1 | sed -e 's:.*define PIA_DUMP_VER_MINOR *\(.*\) *:\1:g' | sed -e 's: /.*::g'`
+    fi
+}
+
+########################################################################################
+
+for F in `find $SOURCE -iname "*.c" -exec grep -lin snapshot {} \;`; do
+#for F in `find $SOURCE -iname "*.c" -exec grep -lin "snapshot module" {} \;`; do
+
+#    echo scanning: $F
+    echo -ne "."
+
+#    __SVNREVISION__=`svn log -l 1 -q $F | grep -v "^-" | sed 's:r\(.*\) | .* | .*:\1:g'`
+#    echo __SVNREVISION__=$__SVNREVISION__ >> $LOGFILE
+
+#type  | name            | description
+
+    # check how many (legit) tables we find
+    TABLES="`grep -i "snapshot module" $F | grep -i "format" | wc -l`"
+    echo TABLES:$TABLES >> $LOGFILE
+
+    if [ $TABLES == "0" ]; then
+
+        echo "no table: " $F >> $LOGFILE;
+
+    elif [ $TABLES == "1" ]; then
+
+# extract table (one!) directly (old method)
+        grep_module $F
+        grep_major_minor $F
+
+        FULL=`grep -i -A 50 "snapshot module.*format" $F`
+
+        # extract only the part until next closing comment
+        TAB=`echo "$FULL" | awk '/*\// {exit} {print}'`
+
+        if  [ -z "$__MODULE__" ]; then
+            # FIXME: what other formats are in the source?
+            II=`echo "$TAB" | grep -i "snapshot module" | grep -i "format"`
+            # parse headline for the table "<modulename> <module version> * snapshot module *
+            __MODULE__=`echo "$II" | sed -e 's:^[/\* ]*\([^ ]*\).*:\1:g'`
+        fi
+
+#        echo MODULE "$__MODULE__" >> $LOGFILE
+#        echo TAB:"$TAB" >> $LOGFILE
+
+        TABLE3=""
+        TABLE4=""
+        if  [ -n "`echo "$TAB" | grep -i '.*type.*|.*name.*|.*version.*|.*description.*'`" ]; then
+            TABLE4=`echo "$TAB" | grep '[^|]*| [^|]*| [^|]*|[^|]*' | grep -iv '.*type.*|.*name.*|.*version.*|.*description.*'`
+        else
+            if  [ -n "`echo "$TAB" | grep -i '.*type.*|.*name.*|.*description.*'`" ]; then
+                TABLE3=`echo "$TAB" | grep '[^|]*| [^|]*|[^|]*' | grep -iv '.*type.*|.*name.*|.*description.*'`
+            fi
+        fi
+
+        log_table $F
+        texi_table $F
+
+    else
+
+#if there are two or more tables in the same file, we use a different/new method
+
+        # read grep hits into an array (each entry in the array contains multiple lines)
+        readarray -t tabarray <<< `grep -i "snapshot module" $F`
+
+        for I in "${tabarray[@]}"; do
+
+#            echo ARRAY:"$I" >> $LOGFILE
+
+            # FIXME: what other formats are in the source?
+            II=`echo "$I" | grep -i "snapshot module" | grep -i "format"`
+
+            # parse headline for the table "<modulename> <module version> * snapshot module *
+            __MODULE__=`echo "$II" | sed -e 's:^[/\* ]*\([^ ]*\).*:\1:g'`
+            __SNAP_MAJOR__=`echo "$II" | sed -e 's:^[/\* ]*\([^ ]*\) \([^ ]*\)\..*:\2:g'`
+            __SNAP_MINOR__=`echo "$II" | sed -e 's:^[/\* ]*\([^ ]*\) \([^ ]*\)\.\([^ ]*\).*:\3:g'`
+#            echo module:"$__MODULE__" >> $LOGFILE
+#            echo major:"$__SNAP_MAJOR__" >> $LOGFILE
+#            echo minor:"$__SNAP_MINOR__" >> $LOGFILE
+
+            FULL=`grep -A50 "$I" "$F"`
+#            echo FULL:"$FULL" >> $LOGFILE
+
+            # extract only the part until next closing comment
+            TAB=`echo "$FULL" | awk '/*\// {exit} {print}'`
+#            echo TAB:"$TAB" >> $LOGFILE
+
+            TABLE3=""
+            TABLE4=""
+            if  [ -n "`echo "$TAB" | grep -i '.*type.*|.*name.*|.*version.*|.*description.*'`" ]; then
+                TABLE4=`echo "$TAB" | grep '.*| .*| [^|]*|.*' | grep -iv '.*type.*|.*name.*|.*version.*|.*description.*'`
+            else
+                if  [ -n "`echo "$TAB" | grep -i '.*type.*|.*name.*|.*description.*'`" ]; then
+                    TABLE3=`echo "$TAB" | grep '.*| [^|]*|.*' | grep -iv '.*type.*|.*name.*|.*description.*'`
+                fi
+            fi
+
+            log_table $F
+            texi_table $F
+
+
+        done
+
+    fi
+
+    echo -ne "\n\n" >> $LOGFILE
+
+done
+
+echo -ne "\n"
+
+# FIXME: writes data to a (top)module (info not listed)
+#src/core/mc6821core.c
+#src/core/i8255a.c
+#src/sid/fastsid.c
+#src/sid/parsid.c
+#src/sid/hardsid.c
+#src/sid/usbsid.c
+#src/sid/catweaselmkiii.c
+#src/viciisc/vicii-draw-cycle.c
+#src/raster/raster-snapshot.c
+#src/core/ciatimer.c
+#src/core/mc6821core.c
+#src/core/i8255a.c
+#src/interrupt.c
+#src/scpu64/scpu64cpu.c
+#src/joyport/mouse.c
+#src/plus4/plus4acia.c
+
+
+# FIXME: snapshot not implemented (listed without table)
+#src/c64/cart/shortbus_etfe.c
+#src/c64/cart/magicvoice.c
+#src/c64/cart/mmcreplay.c
+#src/c64/cart/rrnetmk3.c
+#src/c64/cart/ethernetcart.c
+#src/tapeport/tapecart.c
+#src/vic20/cart/vic20-ieee488.c
+#src/core/cs8900.c
+#src/core/ser-eeprom.c
+#src/core/t6721.c
+#src/core/spi-sdcard.c
+#src/core/fmopl.c
+#src/vdc/vdc-snapshot.c
+#src/userport/userport_ps2mouse.c
+#src/drive/tcbm/tcbm.c
+#src/vdrive/vdrive-snapshot.c
+#src/tape/tape-snapshot.c (t64)
+
+
+# FIXME: cart+flash (extra flash040 modules won't be listed yet)
+#src/vic20/cart/vic-fp.c
+#src/vic20/cart/finalexpansion.c
+#src/vic20/cart/ultimem.c
+#src/c64/cart/easyflash.c
+#src/c64/cart/gmod2.c
+#src/c64/cart/retroreplay.c
+#src/c128/cart/gmod2c128.c


Property changes on: trunk/vice/doc/snapshots-extract.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi	2026-05-01 21:26:08 UTC (rev 46088)
+++ trunk/vice/doc/vice.texi	2026-05-01 21:40:39 UTC (rev 46089)
@@ -19279,11 +19279,94 @@
 or the memory.
 
 @menu
+* Terminology::
+* Module framework::
 * Emulator modules::
-* Module formats::
+* Common Modules::
 @end menu
 
-@node Emulator modules, Module formats, Snapshot format, Snapshot format
+@subsection Terminology
+
+In this section we use certain abbreviations to define the types of the
+data saved in the snapshot.
+
+@table @code
+@item BYTE
+8 bit integer.
+@item WORD
+16 bit integer.  Saved with low-byte first, high-byte last.
+@item DWORD
+32 bit integer.  Saved with low-word first, then high-word.  Each word saved with its low-byte first.
+@item ARRAY
+Array of BYTE values.  Length depends on the description.
+@end table
+
+The tables for the single modules state the type, name and description
+of the data saved in the modules.  The data is saved in the order it is
+in the tables, so no offset is given.
+
+@node Module framework, CPU 6502 module, Module Terminology, Common Modules
+@subsection Module framework
+
+The VICE snapshot file starts with the magic string and includes the
+fileformat version number.
+
+@multitable @columnfractions .2 .3 .5
+@item Type
+@tab Name
+@tab Description
+@item 19 BYTE
+@tab MAGIC
+@tab "VICE Snapshot File\032", padded with 0
+@item BYTE
+@tab VMAJOR
+@tab fileformat major version number
+@item BYTE
+@tab VMINOR
+@tab fileformat minor version number
+@item 16 BYTE
+@tab MACHINENAME
+@tab Name of emulated machine, like "PET", "CBM-II", "VIC20", "C64" or "C128". zerobyte-padded.
+@item 13 BYTE
+@tab VERSION MAGIC
+@tab "VICE Version\032", padded with 0
+@item 4 BYTE
+@tab VERSION
+@tab Release version (major, minor, micro). Byte 4 is always zero.
+@item DWORD
+@tab SVNVERSION
+@tab SVN revision (or 0 if not available)
+@end multitable
+
+The file header is followed by a number of different snapshot modules.
+
+Each module has a header with the information given in the table below.
+The header includes two version numbers, VMAJOR and VMINOR.  In the past the
+idea was that modules with the same VMAJOR should be able to be exchanged. This
+however proved to be too difficult to maintain, and insanely hard to test for
+correctness, which is why now the emulator will reject the snapshot when it
+finds a module that is too old. @b{Because of this you should not use snapshots
+for permanent/long term storage.}
+
+@multitable @columnfractions .2 .3 .5
+@item Type
+@tab Name
+@tab Description
+@item 16 BYTE
+@tab MODULENAME
+@tab The name of the module in ASCII, padded with 0 to 16 byte.
+@item BYTE
+@tab VMAJOR
+@tab major version number
+@item BYTE
+@tab VMINOR
+@tab minor version number
+@item DWORD
+@tab SIZE
+@tab size of the module, including this header
+@end multitable
+
+@node Emulator modules, Common Modules, Snapshot format, Snapshot format
 @subsection Emulator modules
 
 This section lists the modules that are contained in each of the
@@ -19535,8 +19618,8 @@
 @tab *
 @end multitable
 
-@node Module formats,  , Emulator modules, Snapshot format
-@subsection Module formats
+@node Common Modules,  , Emulator modules, Snapshot format
+@subsection Common Modules
 
 This section shows the basic module framework and the contents of the
 different types of modules.
@@ -19570,89 +19653,9 @@
 * C500 data module::
 @end menu
 
-@node Module Terminology, Module framework, Module formats, Module formats
-@subsubsection Terminology
+@node Module Terminology, Module framework, Common Modules, Common Modules
 
-In this section we use certain abbreviations to define the types of the
-data saved in the snapshot.
-
-@table @code
-@item BYTE
-8 bit integer.
-@item WORD
-16 bit integer.  Saved with low-byte first, high-byte last.
-@item DWORD
-32 bit integer.  Saved with low-word first, then high-word.  Each word saved with its low-byte first.
-@item ARRAY
-Array of BYTE values.  Length depends on the description.
-@end table
-
-The tables for the single modules state the type, name and description
-of the data saved in the modules.  The data is saved in the order it is
-in the tables, so no offset is given.
-
-@node Module framework, CPU 6502 module, Module Terminology, Module formats
-@subsubsection Module framework
-
-The VICE snapshot file starts with the magic string and includes the
-fileformat version number.
-
-@multitable @columnfractions .2 .3 .5
-@item Type
-@tab Name
-@tab Description
-@item 19 BYTE
-@tab MAGIC
-@tab "VICE Snapshot File\032", padded with 0
-@item BYTE
-@tab VMAJOR
-@tab fileformat major version number
-@item BYTE
-@tab VMINOR
-@tab fileformat minor version number
-@item 16 BYTE
-@tab MACHINENAME
-@tab Name of emulated machine, like "PET", "CBM-II", "VIC20", "C64" or "C128". zerobyte-padded.
-@item 13 BYTE
-@tab VERSION MAGIC
-@tab "VICE Version\032", padded with 0
-@item 4 BYTE
-@tab VERSION
-@tab Release version (major, minor, micro). Byte 4 is always zero.
-@item DWORD
-@tab SVNVERSION
-@tab SVN revision (or 0 if not available)
-@end multitable
-
-The file header is followed by a number of different snapshot modules.
-
-Each module has a header with the information given in the table below.
-The header includes two version numbers, VMAJOR and VMINOR.  In the past the
-idea was that modules with the same VMAJOR should be able to be exchanged. This
-however proved to be too difficult to maintain, and insanely hard to test for
-correctness, which is why now the emulator will reject the snapshot when it
-finds a module that is too old. @b{Because of this you should not use snapshots
-for permanent/long term storage.}
-
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item 16 BYTE
-@tab MODULENAME
-@tab The name of the module in ASCII, padded with 0 to 16 byte.
-@item BYTE
-@tab VMAJOR
-@tab major version number
-@item BYTE
-@tab VMINOR
-@tab minor version number
-@item DWORD
-@tab SIZE
-@tab size of the module, including this header
-@end multitable
-
-@node CPU 6502 module, CPU 6809 module, Module framework, Module formats
+@node CPU 6502 module, CPU 6809 module, Module framework, Common Modules
 @subsubsection CPU 6502 module
 
 This module saves the core 6502 state.  You will find a clock value
@@ -19660,50 +19663,12 @@
 value.  However, the drive modules save their clocks relative to their
 appropriate CPUs of course.
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item DWORD
-@tab CLK
-@tab the current CPU clock value.  All other clock values are relative to this.
-@item BYTE
-@tab AC
-@tab Accumulator
-@item BYTE
-@tab XR
-@tab X index register
-@item BYTE
-@tab YR
-@tab Y index register
-@item BYTE
-@tab SP
-@tab Stack Pointer
-@item WORD
-@tab PC
-@tab Programm Counter
-@item BYTE
-@tab ST
-@tab Status Registers
-@item DWORD
-@tab LASTOPCODE
-@tab ?
-@item DWORD
-@tab IRQCLK
-@tab absolute CLK when the IRQ line came active
-@item DOWRD
-@tab NMICLK
-@tab absolute CLK when the NMI line came active
-@item DWORD
-@tab ?
-@tab ?
-@item DWORD
-@tab ?
-@tab ?
-@end multitable
+@c @include CPU6502.snapshots.texi
+@include MAINC64CPU.snapshots.texi
 
+@include MAINVIC20CPU.snapshots.texi
 
-@node CPU 6809 module, CIA 6526 module, CPU 6502 module, Module formats
+@node CPU 6809 module, CIA 6526 module, CPU 6502 module, Common Modules
 @subsubsection CPU 6809 module
 
 This module saves the core 6809 state.  You will find a clock value
@@ -19711,172 +19676,30 @@
 value.  However, the drive modules save their clocks relative to their
 appropriate CPUs of course.
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item DWORD
-@tab CLK
-@tab the current CPU clock value.  All other clock values are relative to this.
-@item WORD
-@tab X
-@tab The X register
-@item WORD
-@tab Y
-@tab The Y register
-@item WORD
-@tab U
-@tab The U register
-@item WORD
-@tab PC
-@tab The Program Counter register
-@item BYTE
-@tab DP
-@tab The Direct Page register
-@item BYTE
-@tab CC
-@tab The Condition Code register
-@item BYTE
-@tab A
-@tab The A register
-@item BYTE
-@tab B
-@tab The B register
-@item
-@tab
-@tab The following are for 6309 compatibility:
-@item WORD
-@tab V
-@tab The V register
-@item BYTE
-@tab E
-@tab The E register
-@item BYTE
-@tab F
-@tab The F register
-@end multitable
+@include CPU6809.snapshots.texi
 
-@node CIA 6526 module, VIA 6522 module, CPU 6809 module, Module formats
+
+@c @node CPU 6809 module, CIA 6526 module, CPU 6502 module, Common Modules
+@subsubsection CPU 65816 module
+
+This module saves the core 65816 state.  You will find a clock value
+there.  All other modules save their own clock values relative to this
+value.  However, the drive modules save their clocks relative to their
+appropriate CPUs of course.
+
+@include MAIN65816CPU.snapshots.texi
+
+
+@node CIA 6526 module, VIA 6522 module, CPU 6809 module, Common Modules
 @subsubsection CIA module
 
 The CIA 6526 is an I/O port chip with 2 8-bit I/O ports, a shift register,
 two timers, a Time of Day clock and interrupts.
 
-Version numbers: Major 1, Minor 1.
+@include CIA.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab ORA
-@tab Output register A
-@item BYTE
-@tab ORB
-@tab Output register B
-@item BYTE
-@tab DDRA
-@tab Data direction register A
-@item BYTE
-@tab DDRB
-@tab Data direction register B
-@item WORD
-@tab TAC
-@tab Timer A counter value
-@item WORD
-@tab TBC
-@tab Timer B counter value
-@item BYTE
-@tab TOD_TEN
-@tab Time of Day - current tenth of second
-@item BYTE
-@tab TOD_SEC
-@tab Time of Day - current seconds
-@item BYTE
-@tab TOD_MIN
-@tab Time of Day - current minutes
-@item BYTE
-@tab TOD_HR
-@tab Time of Day - current hours
-@item BYTE
-@tab SDR
-@tab contents of shift register
-@item BYTE
-@tab IER
-@tab mask of enabled interrupt masks
-@item BYTE
-@tab CRA
-@tab Control register A
-@item BYTE
-@tab CRB
-@tab Control register B
-@item WORD
-@tab TAL
-@tab Timer A latch value
-@item WORD
-@tab TBL
-@tab Timer B latch value
-@item BYTE
-@tab IFR
-@tab mask of currently active interrupts
-@item BYTE
-@tab PBSTATE
-@tab Bit 6/7 reflect the PB6/7 toggle bit state.  Bit 2/3 reflect the corresponding port bit state.
-@item BYTE
-@tab SRHBITS
-@tab number of half-bits to still shift in/out SDR
-@item BYTE
-@tab ALARM_TEN
-@tab Time of Day - alarm tenth of second
-@item BYTE
-@tab ALARM_SEC
-@tab Time of Day - alarm seconds
-@item BYTE
-@tab ALARM_MIN
-@tab Time of Day - alarm minutes
-@item BYTE
-@tab ALARM_HR
-@tab Time of Day - alarm hours
-@item BYTE
-@tab READICR
-@tab current clock minus the clock when ICR was read last plus 128.
-@item BYTE
-@tab TODLATCHED
-@tab Bit 0: 1= latched for reading, Bit 1: 2=stopped for writing
-@item BYTE
-@tab TODL_TEN
-@tab Time of Day - latched tenth of second
-@item BYTE
-@tab TODL_SEC
-@tab Time of Day - latched seconds
-@item BYTE
-@tab TODL_MIN
-@tab Time of Day - latched minutes
-@item BYTE
-@tab TODL_HR
-@tab Time of Day - latched hours
-@item DWORD
-@tab TOD_TICKS
-@tab clk ticks till next tenth of second
-@item --
-@tab --
-@tab The next items have been added in V1.1
-@item WORD
-@tab TASTATE
-@tab The state bits of the CIA timer A, according to ciatimer.h
-@item WORD
-@tab TBSTATE
-@tab The state bits of the CIA timer B, according to ciatimer.h
-@end multitable
 
-The last two items have been added in CIA snapshot version 1.1 due
-to the improved CIA emulation in the newer VICE versions.
-Some state bits correspond to the CIA state as described in the
-"A Software Model of the CIA 6526" document by Wolfgang Lorenz,
-some are delayed versions. For more read the source file
-@code{ciatimer.h}.
-
-@node VIA 6522 module, PIA 6520 module, CIA 6526 module, Module formats
+@node VIA 6522 module, PIA 6520 module, CIA 6526 module, Common Modules
 @subsubsection VIA module
 
 The VIA 6522 is the predecessor of the CIA and also an I/O port chip
@@ -19883,72 +19706,10 @@
 with 2 8-bit I/O ports, a shift register,
 two timers and interrupts.
 
-Version numbers: Major 1, Minor 0.
+@include VIA.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab ORA
-@tab Output register A
-@item BYTE
-@tab DDRA
-@tab Data direction register A
-@item BYTE
-@tab ORB
-@tab Output register B
-@item BYTE
-@tab DDRB
-@tab Data direction register B
-@item WORD
-@tab T1L
-@tab Timer 1 Latch value
-@item WORD
-@tab T1C
-@tab Timer 1 counter value
-@item BYTE
-@tab T2L
-@tab Timer 2 latch (8 bit as only lower byte is used)
-@item WORD
-@tab T2C
-@tab Timer 2 counter value
-@item BYTE
-@tab RUNFL
-@tab bit 7: timer 1 will generate IRQ on underflow; bit 6: timer 2 will generate IRQ on underflow
-@item BYTE
-@tab SR
-@tab Shift register value
-@item BYTE
-@tab ACR
-@tab Auxiliary control register
-@item BYTE
-@tab PCR
-@tab Peripheral control register
-@item BYTE
-@tab IFR
-@tab active interrupts
-@item BYTE
-@tab IER
-@tab interrupt mask
-@item BYTE
-@tab PB7
-@tab bit 7 = pb7 state
-@item BYTE
-@tab SRHBITS
-@tab number of half-bits to shift out on SR
-@item BYTE
-@tab CABSTATE
-@tab bit 7: state of CA2 pin, bit 6: state of CB2 pin
-@item BYTE
-@tab ILA
-@tab Port A Input Latch (see ACR bit 0)
-@item BYTE
-@tab ILB
-@tab Port B Input Latch (see ACR bit 1)
-@end multitable
 
-@node PIA 6520 module, TPI 6525 module, VIA 6522 module, Module formats
+@node PIA 6520 module, TPI 6525 module, VIA 6522 module, Common Modules
 @subsubsection PIA module
 
 The PIA 6520 is a chip with two I/O ports (Parallel Interface Adapter)
@@ -19956,36 +19717,10 @@
 Port A and B, only that Port A implements handshake on read operation
 and port B on write operation.
 
-Version numbers: Major 1, Minor 0.
+@include PIA.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item UBYTE
-@tab ORA
-@tab Output register A
-@item UBYTE
-@tab DDRA
-@tab Data Direction Register A
-@item UBYTE
-@tab CTRLA
-@tab Control Register A
-@item UBYTE
-@tab ORB
-@tab Output register B
-@item UBYTE
-@tab DDRB
-@tab Data Direction Register B
-@item UBYTE
-@tab CTRLB
-@tab Control Register B
-@item UBYTE
-@tab CABSTATE
-@tab Bit 7 = state of CA2, Bit 6 = state of CB2
-@end multitable
 
-@node TPI 6525 module, RIOT 6532 module, PIA 6520 module, Module formats
+@node TPI 6525 module, RIOT 6532 module, PIA 6520 module, Common Modules
 @subsubsection TPI module
 
 The TPI 6525 is a chip with three I/O ports (Tri-Port-Interface).  One of
@@ -19992,45 +19727,10 @@
 the ports can double as an interrupt prioritizer.  Therefore we also have
 to save the states of the interrupt stack etc.
 
-Version numbers: Major 1, Minor 0.
+@include TPI.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab PRA
-@tab Port A output register
-@item BYTE
-@tab PRB
-@tab Port B output register
-@item BYTE
-@tab PRC
-@tab Port C output register (doubles as IRQ latch register)
-@item BYTE
-@tab DDRA
-@tab Port A data direction register
-@item BYTE
-@tab DDRB
-@tab Port B data direction register
-@item BYTE
-@tab DDRC
-@tab Port C data direction register (doubles as IRQ mask register)
-@item BYTE
-@tab CR
-@tab Control Register
-@item BYTE
-@tab AIR
-@tab Active interrupt register
-@item BYTE
-@tab STACK
-@tab Interrupt stack - the interrupt bits that are not (yet) served.
-@item BYTE
-@tab CABSTATE
-@tab State of CA/CB pins.  Bit 7 = state of CA, Bit 6 = state of CB
-@end multitable
 
-@node RIOT 6532 module, SID 6581 module, TPI 6525 module, Module formats
+@node RIOT 6532 module, SID 6581 module, TPI 6525 module, Common Modules
 @subsubsection RIOT module
 
 The RIOT 6532 is a chip with two I/O ports, some RAM and a Timer.
@@ -20037,48 +19737,18 @@
 The chip contains 128 byte RAM, but the RAM is not saved in the
 RIOT snapshot, but in the memory section.
 
-Version numbers: Major 0, Minor 0.
+@include RIOT.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab ORA
-@tab Port A output register
-@item BYTE
-@tab DDRA
-@tab Port A data direction register
-@item BYTE
-@tab ORB
-@tab Port B output register
-@item BYTE
-@tab DDRB
-@tab Port B data direction register
-@item BYTE
-@tab EDGECTRL
-@tab Bit 0/1: A0/A1 address bits written to edgecontrol registers
-@item BYTE
-@tab IRQFL
-@tab Bit 6/7: A6/A7 IRQ flag register. Bit 0: state of the IRQ line (0=inactive, 1=active)
-@item BYTE
-@tab N
-@tab timer value
-@item WORD
-@tab DIVIDER
-@tab Pre-scale divider value (1, 8, 64, or 1024)
-@item WORD
-@tab REST
-@tab cycles since the last counter change
-@item BYTE
-@tab IRQEN
-@tab Bit 0: 0= timer IRQ disabled, 1= timer IRQ enabled
-@end multitable
 
-@node SID 6581 module, ACIA 6551 module, RIOT 6532 module, Module formats
+@node SID 6581 module, ACIA 6551 module, RIOT 6532 module, Common Modules
 @subsubsection SID module
 
-@node ACIA 6551 module, VIC-I module, SID 6581 module, Module formats
+@include SID.snapshots.texi
+
+@include SIDRESID.snapshots.texi
+
+
+@node ACIA 6551 module, VIC-I module, SID 6581 module, Common Modules
 @subsubsection ACIA module
 
 The ACIA 6551 is an RS232 interface chip.  VICE emulates RS232 connections
@@ -20088,158 +19758,45 @@
 is already open when restoring the snapshot, this connection is used
 instead.  If no connection is open, a carrier/DTR drop is emulated.
 
-Version numbers: Major 1, Minor 0.
+@include ACIA.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab TDR
-@tab Transmit Data Register
-@item BYTE
-@tab RDR
-@tab Receiver Data Register
-@item BYTE
-@tab SR
-@tab Status Register
-@item BYTE
-@tab CMD
-@tab Command Register
-@item BYTE
-@tab CTRL
-@tab Ctrl Register
-@item BYTE
-@tab INTX
-@tab 0 = no data to tx; 1 = Data is being transmitted; 2 = Data is being transmitted while data in TDR waiting to be put to internal transmit register
-@item DWORD
-@tab TICKS
-@tab Clock ticks till the next TDR empty interrupt
-@end multitable
 
-@node VIC-I module, VIC-II module, ACIA 6551 module, Module formats
+@node VIC-I module, VIC-II module, ACIA 6551 module, Common Modules
 @subsubsection VIC-I module
 
 @c FIXME: add description
 
-@node VIC-II module, CRTC module, VIC-I module, Module formats
+@include VIC-I.snapshots.texi
+
+
+@node VIC-II module, CRTC module, VIC-I module, Common Modules
 @subsubsection VIC-II module
 
 @c FIXME: add description
 
-@node CRTC module, C64 memory module, VIC-II module, Module formats
+@include VIC-II.snapshots.texi
+
+@include VIC-IISC.snapshots.texi
+
+@include DTVVIC.snapshots.texi
+
+
+@c @node CRTC module, C64 memory module, VIC-II module, Common Modules
+@subsubsection TED module
+
+@c FIXME: add description
+
+@include TED.snapshots.texi
+
+
+@node CRTC module, C64 memory module, VIC-II module, Common Modules
 @subsubsection CRTC module
 
-Version numbers: Major 1, Minor 1.
+@c FIXME: add description
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item
-@tab
-@tab Hardware options
-@item WORD
-@tab VADDR_MASK
-@tab Mask of the address bits valid when accessing the video memory
-@item WORD
-@tab VADDR_CHARSWITCH
-@tab If one bit in the video address is used to switch the character generator, it is masked here.
-@item WORD
-@tab VADDR_CHAROFFSET
-@tab The offset in characters in the character generator that CHARSWITCH switches.
-@item WORD
-@tab VADDR_REVSWITCH
-@tab If one bit in the video address inverts the screen, it is masked here.
-@item WORD
-@tab CHARGEN_MASK
-@tab size of character generator in byte - 1
-@item WORD
-@tab CHARGEN_OFFSET
-@tab offset given by external circuitry
-@item BYTE
-@tab HW_CURSOR
-@tab external hardware cursor circuitry enabled
-@item BYTE
-@tab HW_COLS
-@tab number of displayed columns during one character clock cycle
-@item BYTE
-@tab HW_BLANK
-@tab set if the hardware blank feature is available
-@item
-@tab
-@tab CRTC register
-@item 20 BYTE
-@tab REGISTERS
-@tab register DUMP of the CRTC registers 0-19.
-@item
-@tab
-@tab CRTC internal registers
-@item BYTE
-@tab REGNO
-@tab The current index in the CRTC register file
-@item BYTE
-@tab CHAR
-@tab The current cycle within the current rasterline
-@item BYTE
-@tab CHARLINE
-@tab The current character line
-@item BYTE
-@tab YCOUNTER
-@tab The current rasterline in the character
-@item BYTE
-@tab CRSRCNT
-@tab Framecounter for the blinking cursor
-@item BYTE
-@tab CRSRSTATE
-@tab if set the hardware cursor is visible
-@item BYTE
-@tab CRSRLINES
-@tab set if ycounter is within the active cursor rasterlines for a char
-@item WORD
-@tab CHARGEN_REL
-@tab relative base of currently used character generator in ROM (in byte)
-@item WORD
-@tab SCREEN_REL
-@tab screen address to load the counter at the beginning of the next rasterline
-@item WORD
-@tab VSYNC
-@tab number of rasterlines left within vsync; 0 = not in vsync
-@item BYTE
-@tab VENABLE
-@tab vertical enable flipflop; 1= display, 0= blank.
-@item
-@tab
-@tab (VICE-dependent?) variables
-@item WORD
-@tab SCREEN_WIDTH
-@tab width of the current display window
-@item WORD
-@tab SCREEN_HEIGHT
-@tab height of the current display window
-@item WORD
-@tab SCREEN_XOFFSET
-@tab x position where the first character in a line starts in the window@dots{}
-@item WORD
-@tab HJITTER
-@tab @dots{}but only after adding this jitter
-@item WORD
-@tab SCREEN_YOFFSET
-@tab x position where the first character in a line starts in the window@dots{}
-@item WORD
-@tab FRAMELINES
-@tab expected number of rasterlines for the current frame
-@item WORD
-@tab CURRENT_LINE
-@tab current rasterline as seen from the CRTC
-@item
-@tab
-@tab This value has been added in module version V1.1
-@item BYTE
-@tab FLAG
-@tab Bit 0: If 1 then bit in VADDR_REVSWITCH must be set for reverse; if 0 then bit must be cleared for reverse.
-@end multitable
+@include CRTC.snapshots.texi
 
+
 Here is the reference for the previous CRTC snapshot module. It is outdated
 and will not be read by this and later versions of VICE.
 
@@ -20269,7 +19826,8 @@
 @tab Hardware cursor: Bits 0-3: frame counter till next crsr line toggle. Bit 7: 1= cursor line active
 @end multitable
 
-@node C64 memory module, C128 memory module, CRTC module, Module formats
+
+@node C64 memory module, C128 memory module, CRTC module, Common Modules
 @subsubsection C64 memory module
 
 The C64 memory module actually consists of two modules.  The "C64MEM" module
@@ -20280,49 +19838,20 @@
 configuration. The RAM configuration is saved in the snapshot, and
 restored when the snapshot is loaded.
 
-Version numbers: Major 0, Minor 0
+@include C64MEM.snapshots.texi
 
-@b{The C64MEM module}
+@include C64ROM.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab CPUDATA
-@tab CPU port data byte
-@item BYTE
-@tab CPUDIR
-@tab CPU port direction byte
-@item BYTE
-@tab EXROM
-@tab state of the EXROM line (?)
-@item BYTE
-@tab GAME
-@tab state of the GAME line (?)
-@item ARRAY
-@tab RAM
-@tab 64KiB RAM dump
-@end multitable
+@include C64SCPUMEM.snapshots.texi
 
-@b{The C64ROM module}
+@include C64SCPUROM.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item ARRAY
-@tab KERNAL
-@tab 8KiB dump of the kernal ROM
-@item ARRAY
-@tab BASIC
-@tab 8KiB dump of the basic ROM
-@item ARRAY
-@tab CHARGEN
-@tab 4KiB dump of the chargen ROM
-@end multitable
+@include C64DTVMEM.snapshots.texi
 
-@node C128 memory module, VIC20 memory module, C64 memory module, Module formats
+@include C64DTVROM.snapshots.texi
+
+
+@node C128 memory module, VIC20 memory module, C64 memory module, Common Modules
 @subsubsection C128 memory module
 
 The C128 memory module actually consists of two modules.  The "C128MEM" module
@@ -20334,43 +19863,12 @@
 restored when the snapshot is loaded. The attached cartridges are
 also restored upon load if they have been saved in the snapshot.
 
-Version numbers: Major 0, Minor 0
+@include C128MEM.snapshots.texi
 
-@b{The C128MEM module}
+@include C128ROM.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item 12 BYTE
-@tab MMU
-@tab dump of the 12 MMU registers
-@item ARRAY
-@tab RAM
-@tab 128KiB RAM dump banks 0 and 1
-@end multitable
 
-@b{The C128ROM module}
-
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item ARRAY
-@tab KERNAL
-@tab 8KiB dump of the kernal ROM
-@item ARRAY
-@tab BASIC
-@tab 32KiB dump of the basic ROM
-@item ARRAY
-@tab EDITOR
-@tab 4KiB dump of the editor ROM
-@item ARRAY
-@tab 4KiB CHARGEN
-@tab dump of the chargen ROM
-@end multitable
-
-@node VIC20 memory module, PET memory module, C128 memory module, Module formats
+@node VIC20 memory module, PET memory module, C128 memory module, Common Modules
 @subsubsection VIC20 memory module
 
 The VIC20 memory module actually consists of two modules.  The "VIC20MEM" module
@@ -20382,90 +19880,19 @@
 restored when the snapshot is loaded. The attached cartridges are
 also restored upon load if they have been saved in the snapshot.
 
-@b{The VIC20MEM module}
+@include VIC20MEM.snapshots.texi
 
-Version numbers: Major 1, Minor 0
+@include VIC20ROM.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab CONFIG
-@tab Configuration register.  Bits 0,1,2,3,5 reflect if the corresponding memory block is RAM (bit=1) or not (bit=0).
-@item ARRAY
-@tab RAM0
-@tab 1KiB RAM dump $0000-$03ff
-@item ARRAY
-@tab RAM1
-@tab 4KiB RAM dump $1000-$1fff
-@item ARRAY
-@tab COLORRAM
-@tab 2KiB Color RAM, $9400-$9bff
-@item ARRAY
-@tab BLK0
-@tab if CONFIG & 1 then: 3KiB RAM dump $0400-$0fff
-@item ARRAY
-@tab BLK1
-@tab if CONFIG & 2 then: 8KiB RAM dump $2000-$3fff
-@item ARRAY
-@tab BLK2
-@tab if CONFIG & 4 then: 8KiB RAM dump $4000-$5fff
-@item ARRAY
-@tab BLK3
-@tab if CONFIG & 8 then: 8KiB RAM dump $6000-$7fff
-@item ARRAY
-@tab BLK5
-@tab if CONFIG & 32 then: 8KiB RAM dump $a000-$bfff
-@end multitable
+@c @node VIC20 memory module, PET memory module, C128 memory module, Common Modules
+@subsubsection Plus4 memory module
 
-@b{The VIC20ROM module}
+@include PLUS4MEM.snapshots.texi
 
-Version numbers: Major 1, Minor 1
+@include PLUS4ROM.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab CONFIG
-@tab Bit 0: 1= ROM block $2*** enabled.  Bit 1: 1= ROM block $3*** enabled. Bit 2: 1= ROM block $4*** enabled.  Bit 3: 1= ROM block $5*** enabled. Bit 4: 1= ROM block $6*** enabled. Bit 5: 1= ROM block $7*** enabled. Bit 6: 1= ROM block $A*** enabled. Bit 7: 1= ROM block $B*** enabled.
-@item ARRAY
-@tab KERNAL
-@tab 8KiB KERNAL ROM image $e000-$ffff
-@item ARRAY
-@tab BASIC
-@tab 16KiB BASIC ROM image $c000-$dfff
-@item ARRAY
-@tab CHARGEN
-@tab 4KiB CHARGEN ROM image
-@item ARRAY
-@tab BLK1A
-@tab 4KiB ROM image $2*** (if CONFIG & 1)
-@item ARRAY
-@tab BLK1B
-@tab 4KiB ROM image $3*** (if CONFIG & 2)
-@item ARRAY
-@tab BLK3A
-@tab 4KiB ROM image $6*** (if CONFIG & 16)
-@item ARRAY
-@tab BLK3B
-@tab 4KiB ROM image $7*** (if CONFIG & 32)
-@item ARRAY
-@tab BLK5A
-@tab 4KiB ROM image $A*** (if CONFIG & 64)
-@item ARRAY
-@tab BLK5B
-@tab 4KiB ROM image $B*** (if CONFIG & 128)
-@item ARRAY
-@tab BLK2A
-@tab 4KiB ROM image $4*** (if CONFIG & 4; added in V1.1)
-@item ARRAY
-@tab BLK2B
-@tab 4KiB ROM image $5*** (if CONFIG & 8; added in V1.1)
-@end multitable
 
-@node PET memory module, CBM-II memory module, VIC20 memory module, Module formats
+@node PET memory module, CBM-II memory module, VIC20 memory module, Common Modules
 @subsubsection PET memory module
 
 The PET memory module actually consists of three modules.  The "PETMEM" module
@@ -20478,71 +19905,6 @@
 configuration.  The RAM configuration is saved in the snapshot, and
 restored when the snapshot is loaded.
 
-@b{The PETMEM module}
-
-Version numbers: Major 1, Minor 3
-
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab CONFIG
-@tab Configuration value. Bits 0-3: 0= 40 col PET without CRTC; 1= 40 col PET with CRTC; 2 = 80 col PET (with CRTC); 3= SuperPET; 4= 8096; 5= 8296. Bit 6: 1= RAM at $9***. Bit 7: 1= RAM at $A***.
-@item BYTE
-@tab KEYBOARD
-@tab Keyboard type. 0= UK business; 1= Graphics; 2= German business
-@item BYTE
-@tab MEMSIZE
-@tab memory size of low 32KiB in k (possible values 4, 8, 16, 32)
-@item BYTE
-@tab CONF8X96
-@tab Value of the 8x96 configuration register
-@item BYTE
-@tab SUPERPET
-@tab SuperPET config. Bit 0: 1= $9*** RAM enabled. Bit 1: 1= RAM write protected. Bit 2: 1= CTRL register write protected. Bit 3: 0= DIAG pin active. Bits 4-7: RAM block in use.
-@item ARRAY
-@tab RAM
-@tab 4-32KiB RAM (not 8296, size depends on MEMSIZE)
-@item ARRAY
-@tab VRAM
-@tab 2/4KiB RAM (not 8296, size depends on CONFIG)
-@item ARRAY
-@tab EXTRAM
-@tab 64KiB expansion RAM (SuperPET and 8096 only)
-@item ARRAY
-@tab RAM
-@tab 128KiB RAM (8296 only)
-@item --
-@tab --
-@tab The following item has been added in V1.1
-@item BYTE
-@tab POSITIONAL
-@tab bit 0=0 = symbolic keyboard mapping, bit 0=1 = positional mapping.
-@item --
-@tab --
-@tab The following item has been added in V1.2
-@item BYTE
-@tab EOIBLANK
-@tab bit 0=0 = EOI does not blank screen, bit 0=1 = EOI blanks screen.
-@item --
-@tab --
-@tab The following items have been added in V1.3
-@item WORD
-@tab CPU_SWITCH
-@tab 6502 / 6809 / PROG
-@item BYTE
-@tab VAL, PREVODD, WANTODD
-@tab 6702 dongle state information
-@item WORD[8]
-@tab SHIFT
-@item BYTE
-@tab SuperPET config 2
-@tab Extra bits due to the Super-OS-9 MMU. Bit 5: FIRQ disabled. Bit 6:
-expansion memory in OS-9 flat mode.
-
-@end multitable
-
 The POSITIONAL item has been added in PETMEM snapshot version 1.1. It is
 ignored by earlier restore routines (V1.0) and the V1.1 restore routines
 do not change the current setting when reading a V1.0 snapshot.
@@ -20553,54 +19915,10 @@
 
 In V1.3 the state for SuperPET has been added.
 
-@b{The PETROM module}
+@include PETMEM.snapshots.texi
 
-Version numbers: Major 1, Minor 1
+@include PETROM.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item BYTE
-@tab CONFIG
-@tab Bit 0: 1= $9*** ROM included. Bit 1: 1= $A*** ROM included. Bit 2: 1= $B*** ROM included. Bit 3: 1= $e900-$efff ROM included. Bit 4: 1= SuperPET ROMs included.
-@item ARRAY
-@tab KERNAL
-@tab 4KiB KERNAL ROM image $f000-$ffff
-@item ARRAY
-@tab EDITOR
-@tab 2KiB EDITOR ROM image $e000-$e7ff
-@item ARRAY
-@tab CHARGEN
-@tab 2KiB CHARGEN ROM image
-@item ARRAY
-@tab ROM9
-@tab 4KiB $9*** ROM image (if CONFIG & 1)
-@item ARRAY
-@tab ROMA
-@tab 4KiB $A*** ROM image (if CONFIG & 2)
-@item ARRAY
-@tab ROMB
-@tab 4KiB $B*** ROM image (if CONFIG & 4)
-@item ARRAY
-@tab ROMC
-@tab 4KiB $C*** ROM image
-@item ARRAY
-@tab ROMD
-@tab 4KiB $D*** ROM image
-@item ARRAY
-@tab ROME9
-@tab 7 blocks $e900-$efff ROM image (if CONFIG & 8)
-@item --
-@tab --
-@tab The following items have been added in V1.1
-@item ROM6809
-@tab ROM6809
-@tab 24KiB $A000-$FFFF ROM   (if CONFIG & 16)
-@item ARRAY
-@tab CHARGEN(2)
-@tab upper half of CHARGEN (if CONFIG & 16)
-@end multitable
 
 @b{The PETDWW module}
 
@@ -20609,19 +19927,12 @@
 
 The former has the same format as the PIA1.
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item WORD
-@tab SIZE
-@tab The size of the memory dump that follows, or 0 if DWW disabled.
-@item ARRAY
-@tab MEM
-@tab The memory in the DWW card, SIZE bytes.
-@end multitable
+@include DWWMEM.snapshots.texi
 
-@node CBM-II memory module, C500 data module, PET memory module, Module formats
+@c @include PETDWWPIA.snapshots.texi
+
+
+@node CBM-II memory module, C500 data module, PET memory module, Common Modules
 @subsubsection CBM-II memory module
 
 The CBM-II memory module actually consists of two modules.  The
@@ -20632,58 +19943,9 @@
 configuration.  The RAM configuration is saved in the snapshot, and
 restored when the snapshot is loaded.
 
-Version numbers: Major 1, Minor 0
+@include CBM2MEM.snapshots.texi
 
-@b{The CBM2MEM module}
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item UBYTE
-@tab MEMSIZE
-@tab Memory size in 128KiB blocks (1=128KiB, 2=256KiB, 4=512KiB, 8=1024KiB)
-@item UBYTE
-@tab CONFIG
-@tab Bit 0 = $f0800-$f0fff RAM, Bit 1 = $f1000-$f1fff RAM, Bit 2 = $f2000-$f3fff RAM, Bit 3 = $f4000-$f5fff RAM, Bit 4 = $f6000-$f7fff RAM, Bit 5 = $fc000-$fcfff RAM, Bit 6 = is a C500
-@item UBYTE
-@tab HWCONFIG
-@tab Bit 0/1: model line configuration
-@item UBYTE
-@tab EXECBANK
-@tab CPUs execution bank register
-@item UBYTE
-@tab INDBANK
-@tab CPUs indirection bank register
-@item ARRAY
-@tab SYSRAM
-@tab 2KiB system RAM $f0000-$f07ff
-@item ARRAY
-@tab VIDEO
-@tab 2KiB video RAM $fd000-$fd7ff
-@item ARRAY
-@tab RAM
-@tab RAM dump, size according to MEMSIZE
-@item ARRAY
-@tab RAM08
-@tab if memsize < 1MiB and CONFIG & 1 : 2KiB RAM $f0800-$f0fff
-@item ARRAY
-@tab RAM1
-@tab if memsize < 1MiB and CONFIG & 2 : 4KiB RAM $f1000-$f1fff
-@item ARRAY
-@tab RAM2
-@tab if memsize < 1MiB and CONFIG & 4 : 8KiB RAM $f2000-$f3fff
-@item ARRAY
-@tab RAM4
-@tab if memsize < 1MiB and CONFIG & 8 : 8KiB RAM $f4000-$f5fff
-@item ARRAY
-@tab RAM6
-@tab if memsize < 1MiB and CONFIG & 16 : 8KiB RAM $f6000-$f7fff
-@item ARRAY
-@tab RAMC
-@tab if memsize < 1MiB and CONFIG & 32 : 4KiB RAM $fc000-$fcfff
-@end multitable
-
 The RAM* arrays are only saved if the RAM itself is less than 1MiB.
 If the memory size is 1MiB then those areas are taken from the
 bank 15 area of the normal RAM.
@@ -20692,57 +19954,24 @@
 or at $00000 if 512KiB or more. In case of a C510, then the memory array
 also always starts at $00000.
 
-@b{The CBM2ROM module}
+@include CBM2ROM.snapshots.texi
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item UBYTE
-@tab CONFIG
-@tab Bit 1: 1= $1*** ROM image included. Bit 2: 1= $2000-$3fff ROM image included. Bit 3: 1= $4000-$5fff ROM image included. Bit 4: 1= $6000-$7fff ROM image included. Bit 5: 1= chargen ROM is VIC-II chargen, 0= CRTC chargen.
-@item ARRAY
-@tab KERNAL
-@tab 8 KERNAL ROM image ($e000-$efff)
-@item ARRAY
-@tab BASIC
-@tab BASIC ROM image ($8000-$bfff)
-@item ARRAY
-@tab CHARGEN
-@tab 4KiB CHARGEN ROM image
-@item ARRAY
-@tab ROM1
-@tab 4KiB cartridge ROM image for $1*** (if CONFIG & 2)
-@item ARRAY
-@tab ROM2
-@tab 8KiB cartridge ROM image for $2000-$3fff (if CONFIG & 4)
-@item ARRAY
-@tab ROM4
-@tab 8KiB cartridge ROM image for $4000-$5fff (if CONFIG & 8)
-@item ARRAY
-@tab ROM6
-@tab 8KiB cartridge ROM image for $6000-$7fff (if CONFIG & 16)
-@end multitable
 
-@node C500 data module,  ,CBM-II memory module, Module formats
+
+@node C500 data module,  ,CBM-II memory module, Common Modules
 @subsubsection C500 data module
 
 The C500 data module contains simple state information not already saved
 in the other modules.
 
-Version numbers: Major 0, Minor 0
+@include C500DATA.snapshots.texi
 
-@b{The C500DATA module}
 
-@multitable @columnfractions .1 .4 .5
-@item Type
-@tab Name
-@tab Description
-@item DWORD
-@tab IRQCLK
-@tab CPU clock ticks till next 50Hz IRQ
-@end multitable
+@c @node FIXME
+@subsection other modules
 
+@include snapshots.texi
+
 @c -----------------------------------------------------------------
 @node Media images
 @chapter Media images

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46088] trunk/vice/src

[<gp...@us...>]

Revision: 46088
          http://sourceforge.net/p/vice-emu/code/46088
Author:   gpz
Date:     2026-05-01 21:26:08 +0000 (Fri, 01 May 2026)
Log Message:
-----------
Try to use unique names for snapshot modules (2/3, this renames some snapshot modules)

Modified Paths:
--------------
    trunk/vice/src/c64/c64gluelogic.c
    trunk/vice/src/c64/cart/c64-generic.c
    trunk/vice/src/c64/vsidmemsnapshot.c
    trunk/vice/src/c64dtv/c64dtvmemsnapshot.c
    trunk/vice/src/cbm2/cart/cbm2-generic.c
    trunk/vice/src/event.c
    trunk/vice/src/mainc64cpu.c
    trunk/vice/src/mainviccpu.c
    trunk/vice/src/plus4/cart/plus4-generic.c
    trunk/vice/src/scpu64/scpu64gluelogic.c
    trunk/vice/src/scpu64/scpu64memsnapshot.c
    trunk/vice/src/sid/sid-snapshot.c
    trunk/vice/src/vic20/cart/vic20-generic.c
    trunk/vice/src/vicii/viciidtv-snapshot.c
    trunk/vice/src/viciisc/vicii-snapshot.c

Modified: trunk/vice/src/c64/c64gluelogic.c
===================================================================
--- trunk/vice/src/c64/c64gluelogic.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/c64/c64gluelogic.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -166,7 +166,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-/* GLUE snapshot module format:
+/* C64GLUE 1.1 snapshot module format:
 
    type | name         | description
    ------------------------------
@@ -173,11 +173,13 @@
    BYTE | type         | glue logic type
    BYTE | old vbank    | old video bank
    BYTE | alarm active | alarm is active
+
+   NOTE: renamed from "GLUE" to "C64GLUE" in 1.1
  */
 
-static char snap_module_name[] = "GLUE";
+static char snap_module_name[] = "C64GLUE";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 0
+#define SNAP_MINOR 1
 
 int c64_glue_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/c64/cart/c64-generic.c
===================================================================
--- trunk/vice/src/c64/cart/c64-generic.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/c64/cart/c64-generic.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -394,7 +394,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* CARTGENERIC snapshot module format:
+/* CARTGENERICC64 0.1 snapshot module format:
 
    type  | name | description
    --------------------------
@@ -405,11 +405,13 @@
    type  | name | description
    --------------------------
    ARRAY | ROMH | 8192 BYTES of ROMH data
+
+   NOTE: renamed from "CARTGENERIC" to "CARTGENERICC64" in 0.1
  */
 
-static char snap_module_name[] = "CARTGENERIC";
+static char snap_module_name[] = "CARTGENERICC64";
 #define SNAP_MAJOR   0
-#define SNAP_MINOR   0
+#define SNAP_MINOR   1
 
 int generic_snapshot_write_module(snapshot_t *s, int type)
 {

Modified: trunk/vice/src/c64/vsidmemsnapshot.c
===================================================================
--- trunk/vice/src/c64/vsidmemsnapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/c64/vsidmemsnapshot.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -52,12 +52,24 @@
 #include "c64acia.h"
 #endif
 
+
+/* C64VSIDROM 0.1 snapshot module format:
+
+   type  | name    | description
+   -----------------------------
+   ARRAY | KERNAL  | 8192 BYTES of KERNAL ROM data
+   ARRAY | BASIC   | 8192 BYTES of BASIC ROM data
+   ARRAY | CHARGEN | 4096 BYTES of CHARGEN ROM data
+
+   NOTE: renamed from "C64ROM" to "C64VSIDROM" in 0.1
+*/
+
 #define SNAP_ROM_MAJOR 0
-#define SNAP_ROM_MINOR 0
+#define SNAP_ROM_MINOR 1
 
 static log_t c64_snapshot_log = LOG_DEFAULT;
 
-static const char snap_rom_module_name[] = "C64ROM";
+static const char snap_rom_module_name[] = "C64VSIDROM";
 
 static int c64_snapshot_write_rom_module(snapshot_t *s)
 {
@@ -133,9 +145,25 @@
     return -1;
 }
 
+/* C64VSIDMEM 0.1 snapshot module format:
+
+   type  | name                | version | description
+   ---------------------------------------------------
+   BYTE  | pport data          |   0.0+  | CPU port data register
+   BYTE  | pport dir           |   0.0+  | CPU port direction register
+   BYTE  | EXROM               |   0.0+  | EXROM line state
+   BYTE  | GAME                |   0.0+  | GAME line state
+   ARRAY | RAM                 |   0.0+  | 65536 BYTES of RAM data
+   BYTE  | pport data out      |   0.0+  | CPU port data out lines state
+   BYTE  | pport data read     |   0.0+  | CPU port data in lines state
+   BYTE  | pport dir read      |   0.0+  | CPU port direction in lines state
+
+   NOTE: renamed from "C64MEM" to "C64VSIDMEM" in 0.1
+*/
+
 #define SNAP_MAJOR 0
-#define SNAP_MINOR 0
-static const char snap_mem_module_name[] = "C64MEM";
+#define SNAP_MINOR 1
+static const char snap_mem_module_name[] = "C64VSIDMEM";
 
 int c64_snapshot_write_module(snapshot_t *s, int save_roms)
 {

Modified: trunk/vice/src/c64dtv/c64dtvmemsnapshot.c
===================================================================
--- trunk/vice/src/c64dtv/c64dtvmemsnapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/c64dtv/c64dtvmemsnapshot.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -51,12 +51,24 @@
 #include "c64dtvmemsnapshot.h"
 #include "hummeradc.h"
 
+
+/* C64DTVROM 0.1 snapshot module format:
+
+   type  | name                 | description
+   ------------------------------------------
+   ARRAY | c64dtvflash_mem      | 0x200000
+   BYTE  | c64dtvflash_state    |
+   ARRAY | c64dtvflash_mem_lock | 39
+
+   NOTE: renamed from "C64ROM" to "C64DTVROM" in 0.1
+*/
+
 #define SNAP_ROM_MAJOR 0
-#define SNAP_ROM_MINOR 0
+#define SNAP_ROM_MINOR 1
 
 static log_t c64_snapshot_log = LOG_DEFAULT;
 
-static const char snap_rom_module_name[] = "C64ROM";
+static const char snap_rom_module_name[] = "C64DTVROM";
 
 #define NUM_TRAP_DEVICES 9  /* FIXME: is there a better constant ? */
 static int trapfl[NUM_TRAP_DEVICES];
@@ -178,10 +190,27 @@
     return -1;
 }
 
+/* C64DTVMEM 0.1 snapshot module format:
 
+   type  | name                     | description
+   -----------------------------------------------
+   BYTE  | pport.data               |
+   BYTE  | pport.dir                |
+   ARRAY | mem_ram                  | 0x200000
+   BYTE  | c64dtvmem_memmapper[0]   |
+   BYTE  | c64dtvmem_memmapper[1]   |
+   BYTE  | pport.data_out           |
+   BYTE  | pport.data_read          |
+   BYTE  | pport.dir_read           |
+
+   followed by ROM modules
+
+   NOTE: renamed from "C64MEM" to "C64DTVMEM" in 0.1
+*/
+
 #define SNAP_MAJOR 0
-#define SNAP_MINOR 0
-static const char snap_mem_module_name[] = "C64MEM";
+#define SNAP_MINOR 1
+static const char snap_mem_module_name[] = "C64DTVMEM";
 
 int c64dtv_snapshot_write_module(snapshot_t *s, int save_roms)
 {

Modified: trunk/vice/src/cbm2/cart/cbm2-generic.c
===================================================================
--- trunk/vice/src/cbm2/cart/cbm2-generic.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/cbm2/cart/cbm2-generic.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -471,7 +471,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* CARTGENERIC snapshot module format:
+/* CARTGENERICCBM2 0.2 snapshot module format:
 
    type  | name              | version | description
    -------------------------------------------------
@@ -479,13 +479,15 @@
    ARRAY | ROM C2            |   0.1+  | 8kiB of ROM data
    ARRAY | ROM C4            |   0.1+  | 8kiB of ROM data
    ARRAY | ROM C6            |   0.1+  | 8kiB of ROM data
+
+   NOTE: renamed from "CARTGENERIC" to "CARTGENERICCBM2" in 0.2
  */
 
 /* FIXME: the following is completely untested */
 
-static const char snap_module_name[] = "CARTGENERIC";
+static const char snap_module_name[] = "CARTGENERICCBM2";
 #define SNAP_MAJOR   0
-#define SNAP_MINOR   1
+#define SNAP_MINOR   2
 
 int generic_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/event.c
===================================================================
--- trunk/vice/src/event.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/event.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -1025,6 +1025,24 @@
 
 /*-----------------------------------------------------------------------*/
 
+/*
+   EVENT 0.1 snapshot module format:
+
+   Type    | Name                   | Description
+   ----------------------------------------------
+
+   for each event_list_t this is NOT EVENT_TIMESTAMP
+
+   DWORD   | type                   |
+   CLOCK   | clock                  |
+   DWORD   | size                   |
+   ARRAY   | data                   |
+*/
+
+static char snap_module_name[] = "EVENT";
+#define SNAP_MAJOR 0
+#define SNAP_MINOR 1
+
 int event_snapshot_read_module(struct snapshot_s *s, int event_mode)
 {
     snapshot_module_t *m;
@@ -1036,7 +1054,7 @@
         return 0;
     }
 
-    m = snapshot_module_open(s, "EVENT", &major_version, &minor_version);
+    m = snapshot_module_open(s, snap_module_name, &major_version, &minor_version);
 
     /* This module is not mandatory.  */
     if (m == NULL) {
@@ -1144,7 +1162,7 @@
         return 0;
     }
 
-    m = snapshot_module_create(s, "EVENT", 0, 1);
+    m = snapshot_module_create(s, snap_module_name, SNAP_MAJOR, SNAP_MINOR);
 
     if (m == NULL) {
         return -1;

Modified: trunk/vice/src/mainc64cpu.c
===================================================================
--- trunk/vice/src/mainc64cpu.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/mainc64cpu.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -880,9 +880,29 @@
 
 /* ------------------------------------------------------------------------- */
 
-static char snap_module_name[] = "MAINCPU";
+/* MAINC64CPU 1.5 snapshot module format:
+
+   type  | name                 | description
+   ------------------------------------------
+   CLOCK | main clock           |
+   UBYTE | a                    |
+   UBYTE | x                    |
+   UBYTE | y                    |
+   UBYTE | sp                   |
+   WORD  | pc                   |
+   UBYTE | status               |
+   DWORD | last_opcode_info     |
+   DWORD | ane_log_level        |
+   DWORD | lxa_log_level        |
+   DWORD | maincpu_jammed       |
+   DWORD | maincpu_ba_low_flags |
+
+   Note: renamed "MAINCPU" to "MAINC64CPU" in 1.5
+*/
+
+static char snap_module_name[] = "MAINC64CPU";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 4
+#define SNAP_MINOR 5
 
 int maincpu_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/mainviccpu.c
===================================================================
--- trunk/vice/src/mainviccpu.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/mainviccpu.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -707,9 +707,28 @@
 
 /* ------------------------------------------------------------------------- */
 
-static char snap_module_name[] = "MAINCPU";
+/* MAINVIC20CPU 1.5 snapshot module format:
+
+   type  | name                 | description
+   ------------------------------------------
+   CLOCK | main clock           |
+   UBYTE | a                    |
+   UBYTE | x                    |
+   UBYTE | y                    |
+   UBYTE | sp                   |
+   WORD  | pc                   |
+   UBYTE | status               |
+   DWORD | last_opcode_info     |
+   DWORD | ane_log_level        |
+   DWORD | lxa_log_level        |
+   DWORD | maincpu_jammed       |
+
+   NOTE: renamed from "MAINCPU" to "MAINVIC20CPU" in 1.5
+*/
+
+static char snap_module_name[] = "MAINVIC20CPU";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 4
+#define SNAP_MINOR 5
 
 int maincpu_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/plus4/cart/plus4-generic.c
===================================================================
--- trunk/vice/src/plus4/cart/plus4-generic.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/plus4/cart/plus4-generic.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -413,20 +413,22 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* CARTGENERIC snapshot module format:
+/* CARTGENERICPLUS4 0.2 snapshot module format:
 
    type  | name              | version | description
    -------------------------------------------------
    ARRAY | ROM C1LO          |   0.1+  | 16kiB of ROM data
    ARRAY | ROM C1HI          |   0.1+  | 16kiB of ROM data
+
+   NOTE: renamed from "CARTGENERIC" to "CARTGENERICPLUS4" in 0.2
  */
 
 /* FIXME: since we cant actually make snapshots due to TED bugs, the following
           is completely untested */
 
-static const char snap_module_name[] = "CARTGENERIC";
+static const char snap_module_name[] = "CARTGENERICPLUS4";
 #define SNAP_MAJOR   0
-#define SNAP_MINOR   1
+#define SNAP_MINOR   2
 
 int generic_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/scpu64/scpu64gluelogic.c
===================================================================
--- trunk/vice/src/scpu64/scpu64gluelogic.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/scpu64/scpu64gluelogic.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -158,9 +158,20 @@
 
 /* ------------------------------------------------------------------------- */
 
-static char snap_module_name[] = "GLUE";
+/* SCPU64GLUE 1.1 snapshot module format:
+
+   type  | name                | description
+   -----------------------------------------
+   BYTE  | glue_logic_type     |
+   BYTE  | old_vbank           |
+   BYTE  | glue_alarm_active   |
+
+   NOTE: renamed from "GLUE" to "SCPU64GLUE" in 1.1
+ */
+
+static char snap_module_name[] = "SCPU64GLUE";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 0
+#define SNAP_MINOR 1
 
 int scpu64_glue_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/scpu64/scpu64memsnapshot.c
===================================================================
--- trunk/vice/src/scpu64/scpu64memsnapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/scpu64/scpu64memsnapshot.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -51,14 +51,24 @@
 #include "c64acia.h"
 #endif
 
+/* C64SCPUROM 0.1 snapshot module format:
+
+   type  | name                 | description
+   ------------------------------------------
+   ARRAY | mem_chargen_rom      | SCPU64_CHARGEN_ROM_SIZE
+   ARRAY | scpu64rom_scpu64_rom | SCPU64_SCPU64_ROM_MAXSIZE
+
+   NOTE: renamed from "C64ROM" to "C64SCPUROM" in 0.1
+*/
+
 #define SNAP_ROM_MAJOR 0
-#define SNAP_ROM_MINOR 0
+#define SNAP_ROM_MINOR 1
 
 /* ------------------------ */
 
 static log_t c64_snapshot_log = LOG_DEFAULT;
 
-static const char snap_rom_module_name[] = "C64ROM";
+static const char snap_rom_module_name[] = "C64SCPUROM";
 
 #define NUM_TRAP_DEVICES 9  /* FIXME: is there a better constant ? */
 static int trapfl[NUM_TRAP_DEVICES];
@@ -172,9 +182,35 @@
     return -1;
 }
 
+/* C64SCPUMEM 0.1 snapshot module format:
+
+   type  | name                 | description
+   ------------------------------------------
+   BYTE  | mem_pport            |
+   BYTE  | mem_reg_soft_1mhz    |
+   BYTE  | mem_reg_sys_1mhz     |
+   BYTE  | mem_reg_hwenable     |
+   BYTE  | mem_reg_dosext       |
+   BYTE  | mem_reg_ramlink      |
+   BYTE  | mem_reg_optim        |
+   BYTE  | mem_reg_bootmap      |
+   BYTE  | mem_reg_simm         |
+   BYTE  | exrom                |
+   BYTE  | game                 |
+
+   FIXME: cpu state scpu64_snapshot_write_cpu_state()
+
+   DWORD | mem_simm_ram_mask    |
+   ARRAY | mem_ram              | SCPU64_RAM_SIZE
+   ARRAY | mem_sram             | SCPU64_SRAM_SIZE
+   ARRAY | mem_simm_ram         | mem_simm_ram_mask + 1
+
+   NOTE: renamed from "C64MEM" to "C64SCPUMEM" in 0.1
+*/
+
 #define SNAP_MAJOR 0
-#define SNAP_MINOR 0
-static const char snap_mem_module_name[] = "C64MEM";
+#define SNAP_MINOR 1
+static const char snap_mem_module_name[] = "C64SCPUMEM";
 
 int scpu64_snapshot_write_module(snapshot_t *s, int save_roms)
 {

Modified: trunk/vice/src/sid/sid-snapshot.c
===================================================================
--- trunk/vice/src/sid/sid-snapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/sid/sid-snapshot.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -62,7 +62,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* SID snapshot module format:
+/* SID 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -73,7 +73,7 @@
    ARRAY | sid data |   1.1+  | 32 BYTES of SID registers
  */
 
-/* SID2 snapshot module format:
+/* SID2 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -81,7 +81,7 @@
    ARRAY | sid data |   1.2+  | 32 BYTES of SID registers
  */
 
-/* SID3 snapshot module format:
+/* SID3 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -89,7 +89,7 @@
    ARRAY | sid data |   1.2+  | 32 BYTES of SID registers
  */
 
-/* SID4 snapshot module format:
+/* SID4 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -97,7 +97,7 @@
    ARRAY | sid data |   1.4+  | 32 BYTES of SID registers
  */
 
-/* SID5 snapshot module format:
+/* SID5 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -105,7 +105,7 @@
    ARRAY | sid data |   1.5+  | 32 BYTES of SID registers
  */
 
-/* SID6 snapshot module format:
+/* SID6 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -113,7 +113,7 @@
    ARRAY | sid data |   1.5+  | 32 BYTES of SID registers
  */
 
-/* SID7 snapshot module format:
+/* SID7 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -121,7 +121,7 @@
    ARRAY | sid data |   1.5+  | 32 BYTES of SID registers
  */
 
-/* SID8 snapshot module format:
+/* SID8 1.5 snapshot module format:
 
    type  | name     | version | description
    ----------------------------------------
@@ -397,7 +397,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* SIDEXTENDED (for fastsid engine) snapshot module format:
+/* SIDFASTSID 1.4 (for fastsid engine) snapshot module format:
 
    type   | name            | description
    --------------------------------------
@@ -626,7 +626,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* SIDEXTENDED (for resid engine) snapshot module format:
+/* SIDRESID 1.4 (for resid engine) snapshot module format:
 
    type  | name                       | description
    ------------------------------------------------
@@ -737,7 +737,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* SIDEXTENDED (for catweasel engine) snapshot module format:
+/* SIDCWMKIII 1.4 (for catweasel engine) snapshot module format:
 
    type  | name              | description
    ---------------------------------------
@@ -781,7 +781,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* SIDEXTENDED (for hardsid engine) snapshot module format:
+/* SIDHARDSID 1.4 (for hardsid engine) snapshot module format:
 
    type  | name               | version | description
    --------------------------------------------------
@@ -853,7 +853,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* SIDEXTENDED (for parsid engine) snapshot module format:
+/* SIDPARSID 1.4 snapshot module format:
 
    type  | name      | description
    -------------------------------
@@ -894,6 +894,16 @@
 #endif
 #endif
 
+/* SIDUSBSID 1.4 snapshot module format:
+
+   type  | name                 | description
+   -------------------------------------------
+   ARRAY | registers            | (0x20 * 4) BYTES of register data
+   QWORD | main clk             |
+   QWORD | alarm clk            |
+   BYTE  | lastaccess_chipno    |
+ */
+
 #ifdef HAVE_USBSID
 static int sid_snapshot_write_us_module(snapshot_module_t *m, int sidnr)
 {
@@ -932,41 +942,71 @@
 
 /* ---------------------------------------------------------------------*/
 
-static const char snap_module_name_extended1[] = "SIDEXTENDED";
-static const char snap_module_name_extended2[] = "SIDEXTENDED2";
-static const char snap_module_name_extended3[] = "SIDEXTENDED3";
-static const char snap_module_name_extended4[] = "SIDEXTENDED4";
 #define SNAP_MAJOR_EXTENDED 1
 #define SNAP_MINOR_EXTENDED 4
 
-static int sid_snapshot_write_module_extended(snapshot_t *s, int sidnr)
+static char snap_module_name_extended[0x20];
+
+static char *sid_snapshot_module_name(int sidnr, int sid_engine)
 {
-    snapshot_module_t *m;
-    int sound;
-    int sid_engine = 0;
-    const char *snap_module_name_extended = NULL;
-
-    switch (sidnr) {
-        default:
-        case 0:
-            snap_module_name_extended = snap_module_name_extended1;
+    char *engine = "EXTENDED";
+    switch (sid_engine) {
+#ifdef HAVE_RESID
+        case SID_ENGINE_RESID:
+            engine = "RESID";
             break;
-        case 1:
-            snap_module_name_extended = snap_module_name_extended2;
+#endif
+#ifdef HAVE_CATWEASELMKIII
+        case SID_ENGINE_CATWEASELMKIII:
+            engine = "CWMKIII";
             break;
-        case 2:
-            snap_module_name_extended = snap_module_name_extended3;
+#endif
+#ifdef HAVE_HARDSID
+        case SID_ENGINE_HARDSID:
+            engine = "HARDSID";
             break;
-        case 3:
-            snap_module_name_extended = snap_module_name_extended4;
+#endif
+#ifdef HAVE_PARSID
+#if !defined(WINDOWS_COMPILE) || (defined(WINDOWS_COMPILE) && defined(HAVE_LIBIEEE1284))
+        case SID_ENGINE_PARSID:
+            engine = "PARSID";
             break;
+#endif
+#endif
+#ifdef HAVE_FASTSID
+        case SID_ENGINE_FASTSID:
+            engine = "FASTSID";
+            break;
+#endif
+#ifdef HAVE_USBSID
+        case SID_ENGINE_USBSID:
+            engine = "USBSID";
+            break;
+#endif
     }
+    if (sidnr) {
+        sprintf(snap_module_name_extended, "SID%s%d", engine, sidnr);
+    } else {
+        sprintf(snap_module_name_extended, "SID%s", engine);
+    }
+    printf("sid_snapshot_module_name %d '%s' -> '%s'\n", sidnr, engine, snap_module_name_extended);
+    return snap_module_name_extended;
+}
 
+static int sid_snapshot_write_module_extended(snapshot_t *s, int sidnr)
+{
+    snapshot_module_t *m;
+    int sound;
+    int sid_engine = 0;
+    char *snap_name;
+
     resources_get_int("Sound", &sound);
     resources_get_int("SidEngine", &sid_engine);
 
-    m = snapshot_module_create(s, snap_module_name_extended, SNAP_MAJOR_EXTENDED, SNAP_MINOR_EXTENDED);
+    snap_name = sid_snapshot_module_name(sidnr, sid_engine);
 
+    m = snapshot_module_create(s, snap_name, SNAP_MAJOR_EXTENDED, SNAP_MINOR_EXTENDED);
+
     if (m == NULL) {
         return -1;
     }
@@ -1029,29 +1069,15 @@
     uint8_t major_version, minor_version;
     snapshot_module_t *m;
     int sid_engine;
-    const char *snap_module_name_extended = NULL;
+    char *snap_name;
     int i;
     uint8_t *siddata;
 
     resources_get_int("SidEngine", &sid_engine);
 
-    switch (sidnr) {
-        default:
-        case 0:
-            snap_module_name_extended = snap_module_name_extended1;
-            break;
-        case 1:
-            snap_module_name_extended = snap_module_name_extended2;
-            break;
-        case 2:
-            snap_module_name_extended = snap_module_name_extended3;
-            break;
-        case 3:
-            snap_module_name_extended = snap_module_name_extended4;
-            break;
-    }
+    snap_name = sid_snapshot_module_name(sidnr, sid_engine);
 
-    /* If the sid engine data that was save does not match the current engine
+    /* If the sid engine data that was saved does not match the current engine
        then don't try to load the data */
     if (intended_sid_engine != sid_engine) {
         siddata = sid_get_siddata(sidnr);
@@ -1077,7 +1103,7 @@
         return 0;
     }
 
-    m = snapshot_module_open(s, snap_module_name_extended, &major_version, &minor_version);
+    m = snapshot_module_open(s, snap_name, &major_version, &minor_version);
 
     if (m == NULL) {
         return -1;
@@ -1164,10 +1190,11 @@
         }
     }
 
+    /* number of active SIDs */
     resources_get_int("SidStereo", &sids);
-
     ++sids;
 
+    /* for each SID, write 'simple' and 'extended' snapshot module */
     for (i = 0; i < sids; ++i) {
         if (sid_snapshot_write_module_simple(s, i) < 0) {
            return -1;
@@ -1186,6 +1213,7 @@
     int sids = 0;
     int i;
 
+    /* always read 'simple' and 'extended' snapshot module for the first SID */
     if (sid_snapshot_read_module_simple(s, 0) < 0) {
         return -1;
     }
@@ -1194,6 +1222,7 @@
         return -1;
     }
 
+    /* number of active SIDs */
     resources_get_int("SidStereo", &sids);
     ++sids;
 

Modified: trunk/vice/src/vic20/cart/vic20-generic.c
===================================================================
--- trunk/vice/src/vic20/cart/vic20-generic.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/vic20/cart/vic20-generic.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -836,9 +836,21 @@
 
 /* ------------------------------------------------------------------------- */
 
+/* CARTGENERICVIC20 2.1 snapshot module format:
+
+   type  | name                 | description
+   --------------------------------------
+   DWORD | generic_ram_blocks   | flags for ram blocks
+   DWORD | generic_rom_blocks   | flags for rom blocks
+   ARRAY | cart_ram             | 0x9000 bytes of RAM data
+   ARRAY | cart_rom             | 0x9000 bytes of ROM data
+
+   NOTE: renamed from "GENERICCART" to "CARTGENERICVIC20" in 2.1
+*/
+
 #define VIC20CART_DUMP_VER_MAJOR   2
-#define VIC20CART_DUMP_VER_MINOR   0
-#define SNAP_MODULE_NAME  "GENERICCART"
+#define VIC20CART_DUMP_VER_MINOR   1
+#define SNAP_MODULE_NAME  "CARTGENERICVIC20"
 
 int generic_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/vicii/viciidtv-snapshot.c
===================================================================
--- trunk/vice/src/vicii/viciidtv-snapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/vicii/viciidtv-snapshot.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -67,52 +67,51 @@
 
 
 /*
+   DTVVIC 1.3 snapshot module format:
 
-   This is the format of the VIC-II snapshot module.
+   Type    | Name                   | Description
+   ----------------------------------------------
+   BYTE    | AllowBadLines          | flag: if true, bad lines can happen
+   BYTE    | BadLine                | flag: this is a bad line
+   BYTE    | Blank                  | flag: draw lines in border color
+   40*BYTE | ColorBuf               | character memory buffer (loaded at bad line)
+   BYTE    | IdleState              | flag: idle state enabled
+   BYTE    | LPTrigger              | flag: light pen has been triggered
+   BYTE    | LPX                    | light pen X
+   BYTE    | LPY                    | light pen Y
+   40*BYTE | MatrixBuf              | video matrix buffer (loaded at bad line)
+   BYTE    | NewSpriteDmaMask       | value for SpriteDmaMask after drawing sprites
+   DWORD   | RamBase                | pointer to the start of RAM seen by the VIC
+   BYTE    | RasterCycle            | current vicii.raster cycle
+   WORD    | RasterLine             | current vicii.raster line
+   80*BYTE | Registers              | VIC-II registers
+   x       | DTVstuff               | DTV stuff goes here
+   BYTE    | SbCollMask             | sprite-background collisions so far
+   BYTE    | SpriteDmaMask          | sprites having DMA turned on
+   BYTE    | SsCollMask             | sprite-sprite collisions so far
+   BYTE    | VBank                  | location of memory bank
+   WORD    | Vc                     | internal VIC-II counter
+   BYTE    | VcAdd                  | value to add to Vc at the end of this line (vicii.mem_counter_inc)
+   WORD    | VcBase                 | internal VIC-II memory pointer
+   BYTE    | VideoInt               | status of VIC-II IRQ (vicii.irq_status)
 
-   Name               Type   Size   Description
-
-   AllowBadLines      BYTE   1      flag: if true, bad lines can happen
-   BadLine            BYTE   1      flag: this is a bad line
-   Blank              BYTE   1      flag: draw lines in border color
-   ColorBuf           BYTE   40     character memory buffer (loaded at bad line)
-   IdleState          BYTE   1      flag: idle state enabled
-   LPTrigger          BYTE   1      flag: light pen has been triggered
-   LPX                BYTE   1      light pen X
-   LPY                BYTE   1      light pen Y
-   MatrixBuf          BYTE   40     video matrix buffer (loaded at bad line)
-   NewSpriteDmaMask   BYTE   1      value for SpriteDmaMask after drawing
-                                    sprites
-   RamBase            DWORD  1      pointer to the start of RAM seen by the VIC
-   RasterCycle        BYTE   1      current vicii.raster cycle
-   RasterLine         WORD   1      current vicii.raster line
-   Registers          BYTE   80     VIC-II registers
-   DTVstuff           x      x      DTV stuff goes here
-   SbCollMask         BYTE   1      sprite-background collisions so far
-   SpriteDmaMask      BYTE   1      sprites having DMA turned on
-   SsCollMask         BYTE   1      sprite-sprite collisions so far
-   VBank              BYTE   1      location of memory bank
-   Vc                 WORD   1      internal VIC-II counter
-   VcAdd              BYTE   1      value to add to Vc at the end of this line
-                                    (vicii.mem_counter_inc)
-   VcBase             WORD   1      internal VIC-II memory pointer
-   VideoInt           BYTE   1      status of VIC-II IRQ (vicii.irq_status)
-
    [Sprite section: (repeat 8 times)]
 
-   SpriteXMemPtr      BYTE   1      sprite memory pointer
-   SpriteXMemPtrInc   BYTE   1      value to add to the MemPtr after fetch
-   SpriteXExpFlipFlop BYTE   1      sprite expansion flip-flop
+   BYTE    | SpriteXMemPtr          | sprite memory pointer
+   BYTE    | SpriteXMemPtrInc       | value to add to the MemPtr after fetch
+   BYTE    | SpriteXExpFlipFlop     | sprite expansion flip-flop
 
    [Alarm section]
-   FetchEventTick     DWORD  1      ticks for the next "fetch" (DMA) event
-   FetchEventType     BYTE   1      type of event (0: matrix, 1: sprite check, 2: sprite fetch)
+   DWORD   | FetchEventTick         | ticks for the next "fetch" (DMA) event
+   BYTE    | FetchEventType         | type of event (0: matrix, 1: sprite check, 2: sprite fetch)
 
+   NOTE: renamed from "VIC-II" to "DTVVIC" in 1.3
+
  */
 
-static char snap_module_name[] = "VIC-II";
+static char snap_module_name[] = "DTVVIC";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 2
+#define SNAP_MINOR 3
 
 int vicii_snapshot_write_module(snapshot_t *s)
 {

Modified: trunk/vice/src/viciisc/vicii-snapshot.c
===================================================================
--- trunk/vice/src/viciisc/vicii-snapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
+++ trunk/vice/src/viciisc/vicii-snapshot.c	2026-05-01 21:26:08 UTC (rev 46088)
@@ -52,18 +52,61 @@
 
 
 /*
+   VIC-IISC 1.4 snapshot module format:
 
-   This is the format of the VIC-II snapshot module.
+   Type     | Name                          | Description
+   ------------------------------------------------------
+   ARRAY    | regs                          | 0x40 BYTES state from vicii_s, in the same order
+   DWORD    | raster_cycle                  |
+   DWORD    | cycle_flags                   |
+   DWORD    | raster_line                   |
+   BYTE     | start_of_frame                |
+   BYTE     | irq_status                    |
+   DWORD    | raster_irq_line               |
+   BYTE     | raster_irq_triggered          |
+   ARRAY    | vbuf                          | VICII_SCREEN_TEXTCOLS
+   ARRAY    | cbuf                          | VICII_SCREEN_TEXTCOLS
+   BYTE     | gbuf                          |
+   DWORD    | dbuf_offset                   |
+   ARRAY    | dbuf                          | VICII_DRAW_BUFFER_SIZE
+   DWORD    | ysmooth                       |
+   BYTE     | allow_bad_lines               |
+   BYTE     | sprite_sprite_collisions      |
+   BYTE     | sprite_background_collisions  |
+   BYTE     | clear_collisions              |
+   DWORD    | idle_state                    |
+   DWORD    | vcbase                        |
+   DWORD    | vc                            |
+   DWORD    | rc                            |
+   DWORD    | vmli                          |
+   DWORD    | bad_line                      |
+   BYTE     | light_pen.state               |
+   BYTE     | light_pen.triggered           |
+   DWORD    | light_pen.x                   |
+   DWORD    | light_pen.y                   |
+   DWORD    | light_pen.x_extra_bits        |
+   CLOCK    | light_pen.trigger_cycle       |
+   BYTE     | reg11_delay                   |
+   DWORD    | prefetch_cycles               |
+   DWORD    | sprite_display_bits           |
+   BYTE     | sprite_dma                    |
+   BYTE     | last_color_reg                |
+   BYTE     | last_color_value              |
+   BYTE     | last_read_phi1                |
+   BYTE     | last_bus_phi2                 |
+   BYTE     | vborder                       |
+   BYTE     | set_vborder                   |
+   BYTE     | main_border                   |
+   BYTE     | refresh_counter               |
+   ARRAY    | color_ram                     | 0x400
 
-   Name               Type   Size   Description
+   NOTE: renamed from "VIC-II" to "VIC-IISC" in 1.4
 
-   (FIXME)
+ */
 
-*/
-
-static const char snap_module_name[] = "VIC-II";
+static const char snap_module_name[] = "VIC-IISC";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 3
+#define SNAP_MINOR 4
 
 int vicii_snapshot_write_module(snapshot_t *s)
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46087] trunk/vice/src

[<gp...@us...>]

Revision: 46087
          http://sourceforge.net/p/vice-emu/code/46087
Author:   gpz
Date:     2026-05-01 21:17:47 +0000 (Fri, 01 May 2026)
Log Message:
-----------
add/fix a bunch of snapshot tables (1/3, this commit changes only comments)

Modified Paths:
--------------
    trunk/vice/src/aciacore.c
    trunk/vice/src/c128/c128memsnapshot.c
    trunk/vice/src/c128/cart/comal80.c
    trunk/vice/src/c128/cart/generic.c
    trunk/vice/src/c128/cart/gmod2c128.c
    trunk/vice/src/c128/cart/magicdesk128.c
    trunk/vice/src/c128/cart/partner128.c
    trunk/vice/src/c128/cart/warpspeed128.c
    trunk/vice/src/c64/c64memsnapshot.c
    trunk/vice/src/c64/cart/blackbox9.c
    trunk/vice/src/c64/cart/c64carthooks.c
    trunk/vice/src/c64/cart/drean.c
    trunk/vice/src/c64/cart/easyflash.c
    trunk/vice/src/c64/cart/gmod2.c
    trunk/vice/src/c64/cart/gmod3.c
    trunk/vice/src/c64/cart/gs.c
    trunk/vice/src/c64/cart/magicdesk.c
    trunk/vice/src/c64/cart/magicdesk16.c
    trunk/vice/src/c64/cart/stardos.c
    trunk/vice/src/c64/cart/uc1.c
    trunk/vice/src/c64/cart/uc2.c
    trunk/vice/src/c64dtv/hummeradc.c
    trunk/vice/src/cbm2/cart/cbm2cart.c
    trunk/vice/src/cbm2/cbm2memsnapshot.c
    trunk/vice/src/cbm2/cbm5x0.c
    trunk/vice/src/core/ata.c
    trunk/vice/src/core/ciacore.c
    trunk/vice/src/core/flash040core.c
    trunk/vice/src/core/flash800core.c
    trunk/vice/src/core/m93c86.c
    trunk/vice/src/core/riotcore.c
    trunk/vice/src/core/spi-flash.c
    trunk/vice/src/core/tpicore.c
    trunk/vice/src/core/viacore.c
    trunk/vice/src/crtc/crtc-snapshot.c
    trunk/vice/src/datasette/datasette.c
    trunk/vice/src/drive/drive-snapshot.c
    trunk/vice/src/drive/drivecpu.c
    trunk/vice/src/drive/drivecpu65c02.c
    trunk/vice/src/drive/driverom.c
    trunk/vice/src/drive/iec/cmdhd.c
    trunk/vice/src/drive/iec/fdd.c
    trunk/vice/src/drive/iec/wd1770.c
    trunk/vice/src/drive/ieee/fdc.c
    trunk/vice/src/joyport/joyport.c
    trunk/vice/src/joyport/joystick.c
    trunk/vice/src/joyport/mouse_1351.c
    trunk/vice/src/joyport/mouse_paddle.c
    trunk/vice/src/joyport/mouse_quadrature.c
    trunk/vice/src/keyboard.c
    trunk/vice/src/main65816cpu.c
    trunk/vice/src/maincpu.c
    trunk/vice/src/pet/6809.c
    trunk/vice/src/pet/petdww.c
    trunk/vice/src/pet/pethre.c
    trunk/vice/src/pet/petmemsnapshot.c
    trunk/vice/src/piacore.c
    trunk/vice/src/plus4/cart/plus4cart.c
    trunk/vice/src/plus4/plus4memsnapshot.c
    trunk/vice/src/plus4/ted-snapshot.c
    trunk/vice/src/serial/fsdrive-snapshot.c
    trunk/vice/src/serial/fsdrive.c
    trunk/vice/src/tape/tape-snapshot.c
    trunk/vice/src/userport/userport_hks_joystick.c
    trunk/vice/src/userport/userport_synergy_joystick.c
    trunk/vice/src/userport/userport_v8_joystick.c
    trunk/vice/src/userport/userport_wic64.c
    trunk/vice/src/vdrive/vdrive-snapshot.c
    trunk/vice/src/vic20/cart/behrbonz.c
    trunk/vice/src/vic20/cart/finalexpansion.c
    trunk/vice/src/vic20/cart/ioramcart.c
    trunk/vice/src/vic20/cart/megacart.c
    trunk/vice/src/vic20/cart/mikroassembler.c
    trunk/vice/src/vic20/cart/rabbit.c
    trunk/vice/src/vic20/cart/superexpander.c
    trunk/vice/src/vic20/cart/ultimem.c
    trunk/vice/src/vic20/cart/vic-fp.c
    trunk/vice/src/vic20/cart/vic20cart.c
    trunk/vice/src/vic20/cart/writenow.c
    trunk/vice/src/vic20/vic-snapshot.c
    trunk/vice/src/vic20/vic20memsnapshot.c
    trunk/vice/src/vicii/vicii-snapshot.c

Modified: trunk/vice/src/aciacore.c
===================================================================
--- trunk/vice/src/aciacore.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/aciacore.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -726,25 +726,26 @@
 #define ACIA_DUMP_VER_MAJOR      1 /*!< the major version number of the dump data */
 #define ACIA_DUMP_VER_MINOR      1 /*!< the minor version number of the dump data */
 
-/*
- * Layout of the dump data:
- *
- * UBYTE        TDR     Transmit Data Register
- * UBYTE        RDR     Receiver Data Register
- * UBYTE        SR      Status Register (includes state of IRQ line)
- * UBYTE        CMD     Command Register
- * UBYTE        CTRL    Control Register
- *
- * UBYTE        IN_TX   0 = no data to tx; 2 = TDR valid; 1 = in transmit (cf. enum acia_tx_state)
- *
- * QWORD        TICKSTX ticks till the next TDR empty interrupt
- *
- * QWORD        TICKSRX ticks till the next RDF empty interrupt
- *                      TICKSRX has been added with 2.0.9; if it does not
- *                      exist on read, it is assumed that it has the same
- *                      value as TICKSTX to emulate the old behaviour.
- */
+/* ACIA 1.1 snapshot module format:
 
+   type  | name    | description
+   ------------------------------
+   UBYTE | TDR     | Transmit Data Register
+   UBYTE | RDR     | Receiver Data Register
+   UBYTE | SR      | Status Register (includes state of IRQ line)
+   UBYTE | CMD     | Command Register
+   UBYTE | CTRL    | Control Register
+   UBYTE | IN_TX   | 0 = no data to tx; 1 = Data is being transmitted;
+                   | 2 = Data is being transmitted while data in TDR waiting
+                   | to be put to internal transmit register
+   QWORD | TICKSTX | ticks till the next TDR empty interrupt
+   QWORD | TICKSRX | ticks till the next RDF empty interrupt
+
+   NOTE: TICKSRX has been added with 2.0.9; if it does not
+         exist on read, it is assumed that it has the same
+         value as TICKSTX to emulate the old behaviour.
+*/
+
 /*! the name of this module */
 static const char module_name[] = MYACIA;
 

Modified: trunk/vice/src/c128/c128memsnapshot.c
===================================================================
--- trunk/vice/src/c128/c128memsnapshot.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c128/c128memsnapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -53,6 +53,17 @@
 
 static log_t c128_snapshot_log = LOG_DEFAULT;
 
+
+/* C128ROM 0.0 snapshot module format:
+
+   type  | name    | description
+   -----------------------------
+   ARRAY | KERNAL  | 8192 BYTES of KERNAL ROM data
+   ARRAY | BASIC LO| 16384 BYTES of BASIC ROM data
+   ARRAY | BASIC HI| 16384 BYTES of BASIC ROM data
+   ARRAY | CHARGEN | 8192 BYTES of CHARGEN ROM data
+ */
+
 static char snap_rom_module_name[] = "C128ROM";
 #define SNAP_ROM_MAJOR 0
 #define SNAP_ROM_MINOR 0
@@ -181,6 +192,15 @@
     return -1;
 }
 
+/* C128MEM 0.0 snapshot module format:
+
+   type       | name                | version | description
+   ---------------------------------------------------
+   11 * BYTE  | mmu regs            |   0.0   | dump of mmu registers
+   ARRAY      | RAM                 |   0.0   | 0x40000 BYTES of RAM data
+
+ */
+
 static char snap_module_name[] = "C128MEM";
 #define SNAP_MAJOR 0
 #define SNAP_MINOR 0

Modified: trunk/vice/src/c128/cart/comal80.c
===================================================================
--- trunk/vice/src/c128/cart/comal80.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c128/cart/comal80.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -269,7 +269,10 @@
 
 /* COMAL80C128 snapshot module format:
 
-    FIXME
+   type  | name                 | description
+   ------------------------------------------
+   BYTE  | comal80_register     | bank register value
+   ARRAY | ext_function_rom     | (0x8000 * 5) + 0x4000 bytes of ROM data
  */
 
 static char snap_module_name[] = "COMAL80C128";

Modified: trunk/vice/src/c128/cart/generic.c
===================================================================
--- trunk/vice/src/c128/cart/generic.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c128/cart/generic.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -191,8 +191,10 @@
 
 /* CART128GENERIC snapshot module format:
 
-    FIXME
- */
+   type  | name                 | description
+   ------------------------------------------
+   ARRAY | ext_function_rom     | 0x8000 bytes of ROM data
+*/
 
 static char snap_module_name[] = "CART128GENERIC";
 #define SNAP_MAJOR   0

Modified: trunk/vice/src/c128/cart/gmod2c128.c
===================================================================
--- trunk/vice/src/c128/cart/gmod2c128.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c128/cart/gmod2c128.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -507,6 +507,17 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTGMOD2C128 0.1 snapshot module format:
+
+   type  | name             | description
+   --------------------------------------
+   BYTE  | c128gmod2_bank   |
+   ARRAY | flash_data       | GMOD2_FLASH_SIZE
+
+   followed by m93c86 snapshot module
+   followed by flash040 snapshot module
+*/
+
 static const char snap_module_name[] = "CARTGMOD2C128";
 static const char flash_snap_module_name[] = "FLASH040GMOD2";
 #define SNAP_MAJOR   0

Modified: trunk/vice/src/c128/cart/magicdesk128.c
===================================================================
--- trunk/vice/src/c128/cart/magicdesk128.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c128/cart/magicdesk128.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -257,8 +257,13 @@
 
 /* MAGICDESK128 snapshot module format:
 
-    FIXME
- */
+   type  | name                 | description
+   ------------------------------------------
+   BYTE  | md128reg             |
+   BYTE  | rombank              |
+   BYTE  | bankmask             |
+   ARRAY | ext_function_rom     | 0x40*0x4000 bytes of ROM data
+*/
 
 static char snap_module_name[] = "MAGICDESK128";
 #define SNAP_MAJOR   0

Modified: trunk/vice/src/c128/cart/partner128.c
===================================================================
--- trunk/vice/src/c128/cart/partner128.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c128/cart/partner128.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -355,10 +355,17 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* PARTNER128 snapshot module format:
+/* PARTNER128 0.1 snapshot module format:
 
-    FIXME
- */
+   type  | name                 | description
+   ------------------------------------------
+   BYTE  | regvalue             |
+   BYTE  | rambank              |
+   BYTE  | isdefreezing         |
+   ARRAY | nmivector            | 2 bytes
+   ARRAY | ext_function_rom     | PARTNER_ROM_SIZE
+   ARRAY | rambanks             | PARTNER_RAM_SIZE
+*/
 
 static char snap_module_name[] = "PARTNER128";
 #define SNAP_MAJOR   0

Modified: trunk/vice/src/c128/cart/warpspeed128.c
===================================================================
--- trunk/vice/src/c128/cart/warpspeed128.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c128/cart/warpspeed128.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -230,8 +230,10 @@
 
 /* WARPSPEED128 snapshot module format:
 
-    FIXME
- */
+   type  | name                 | description
+   ------------------------------------------
+   ARRAY | ext_function_rom     | 0x4000 bytes of ROM data
+*/
 
 static char snap_module_name[] = "WARPSPEED128";
 #define SNAP_MAJOR   0

Modified: trunk/vice/src/c64/c64memsnapshot.c
===================================================================
--- trunk/vice/src/c64/c64memsnapshot.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/c64memsnapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -54,7 +54,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* C64ROM snapshot module format:
+/* C64ROM 0.0 snapshot module format:
 
    type  | name    | description
    -----------------------------
@@ -177,7 +177,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* C64MEM snapshot module format:
+/* C64MEM 0.1 snapshot module format:
 
    type  | name                | version | description
    ---------------------------------------------------

Modified: trunk/vice/src/c64/cart/blackbox9.c
===================================================================
--- trunk/vice/src/c64/cart/blackbox9.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/blackbox9.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -250,6 +250,16 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTBLACKBOX9 snapshot module format:
+
+   type  | name       | description
+   --------------------------------
+   BYTE  | currmode   | cartridge mode
+   BYTE  | currbank   | selected bank
+   ARRAY | ROML       | 8192 bytes of ROM data
+   ARRAY | ROMH       | 8192 bytes of ROM data
+ */
+
 static const char snap_module_name[] = "CARTBLACKBOX9";
 #define SNAP_MAJOR   0
 #define SNAP_MINOR   1

Modified: trunk/vice/src/c64/cart/c64carthooks.c
===================================================================
--- trunk/vice/src/c64/cart/c64carthooks.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/c64carthooks.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -3280,6 +3280,43 @@
     Snapshot reading and writing
 */
 
+/* C64CART 0.1 snapshot module format:
+
+   type  | name                             | description
+   ------------------------------------------------------
+   BYTE  | num carts                        | number of active cartridges
+   DWORD | mem_cartridge_type               |
+   BYTE  | game                             |
+   BYTE  | exrom                            |
+   DWORD | romh_bank                        |
+   DWORD | roml_bank                        |
+   BYTE  | export_ram                       |
+   BYTE  | ultimax_phi1                     |
+   BYTE  | ultimax_phi2                     |
+   CLOCK | cart_freeze_alarm_time           |
+   CLOCK | cart_nmi_alarm_time              |
+   BYTE  | export_slot1.game                |
+   BYTE  | export_slot1.exrom               |
+   BYTE  | export_slot1.ultimax_phi1        |
+   BYTE  | export_slot1.ultimax_phi2        |
+   BYTE  | export_slotmain.game             |
+   BYTE  | export_slotmain.exrom            |
+   BYTE  | export_slotmain.ultimax_phi1     |
+   BYTE  | export_slotmain.ultimax_phi2     |
+   BYTE  | export_passthrough.game          |
+   BYTE  | export_passthrough.exrom         |
+   BYTE  | export_passthrough.ultimax_phi1  |
+   BYTE  | export_passthrough.ultimax_phi2  |
+   DWORD | reserved                         |
+   DWORD | reserved                         |
+   DWORD | reserved                         |
+   DWORD | reserved                         |
+   ARRAY | cart ids                         | <num cart> IDs of active cartridges
+
+   followed by individual cartridge modules
+
+ */
+
 #define C64CART_DUMP_MAX_CARTS  16
 
 #define C64CART_DUMP_VER_MAJOR   0

Modified: trunk/vice/src/c64/cart/drean.c
===================================================================
--- trunk/vice/src/c64/cart/drean.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/drean.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -195,6 +195,15 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTDREAN snapshot module format:
+
+   type  | name       | description
+   --------------------------------
+   BYTE  | regval     | bank register value
+   BYTE  | bankmask   | bank mask
+   ARRAY | roml_banks | 4 * 8192 bytes of ROML data
+ */
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   1
 #define SNAP_MODULE_NAME  "CARTDREAN"

Modified: trunk/vice/src/c64/cart/easyflash.c
===================================================================
--- trunk/vice/src/c64/cart/easyflash.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/easyflash.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -676,7 +676,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* CARTEF snapshot module format:
+/* CARTEF 0.0 snapshot module format:
 
    type  | name       | description
    --------------------------------

Modified: trunk/vice/src/c64/cart/gmod2.c
===================================================================
--- trunk/vice/src/c64/cart/gmod2.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/gmod2.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -546,6 +546,18 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTGMOD2 0.2 snapshot module format:
+
+   type  | name             | description
+   --------------------------------------
+   BYTE  | gmod2_cmode      |
+   BYTE  | gmod2_bank       |
+   ARRAY | flash_data       | GMOD2_FLASH_SIZE
+
+   followed by m93c86 snapshot module
+   followed by flash040 snapshot module
+*/
+
 static const char snap_module_name[] = "CARTGMOD2";
 static const char flash_snap_module_name[] = "FLASH040GMOD2";
 #define SNAP_MAJOR   0

Modified: trunk/vice/src/c64/cart/gmod3.c
===================================================================
--- trunk/vice/src/c64/cart/gmod3.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/gmod3.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -593,6 +593,17 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTGMOD3 0.1 snapshot module format:
+
+   type  | name         | description
+   -----------------------------------
+   BYTE  | gmod3_cmode  |
+   BYTE  | gmod3_bank   |
+   ARRAY | gmod3_rom    | GMOD3_16MB_FLASH_SIZE
+
+   followed by SPI flash module
+*/
+
 static const char snap_module_name[] = "CARTGMOD3";
 #define SNAP_MAJOR   0
 #define SNAP_MINOR   1

Modified: trunk/vice/src/c64/cart/gs.c
===================================================================
--- trunk/vice/src/c64/cart/gs.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/gs.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -181,6 +181,15 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTGS snapshot module format:
+
+   type  | name       | description
+   --------------------------------
+   BYTE  | regval     | bank register value
+   BYTE  | currbank   | current bank
+   ARRAY | roml_banks | 64 * 8192 bytes of ROM data
+ */
+
 #define CART_DUMP_VER_MAJOR   1
 #define CART_DUMP_VER_MINOR   1
 #define SNAP_MODULE_NAME  "CARTGS"

Modified: trunk/vice/src/c64/cart/magicdesk.c
===================================================================
--- trunk/vice/src/c64/cart/magicdesk.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/magicdesk.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -224,6 +224,15 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTMAGICD snapshot module format:
+
+   type  | name       | description
+   --------------------------------
+   BYTE  | regval     | bank register value
+   BYTE  | bankmask   | bank mask
+   ARRAY | roml_banks | 128 * 8192 bytes of ROM data
+ */
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   2
 #define SNAP_MODULE_NAME  "CARTMAGICD"

Modified: trunk/vice/src/c64/cart/magicdesk16.c
===================================================================
--- trunk/vice/src/c64/cart/magicdesk16.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/magicdesk16.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -237,6 +237,16 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTMD16 snapshot module format:
+
+   type  | name       | description
+   --------------------------------
+   BYTE  | regval     | bank register value
+   BYTE  | bankmask   | bank mask
+   ARRAY | roml_banks | 128 * 8192 bytes of ROML data
+   ARRAY | romh_banks | 128 * 8192 bytes of ROMH data
+ */
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   2
 #define SNAP_MODULE_NAME  "CARTMD16"

Modified: trunk/vice/src/c64/cart/stardos.c
===================================================================
--- trunk/vice/src/c64/cart/stardos.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/stardos.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -385,6 +385,17 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTSTARDOS snapshot module format:
+
+   type  | name                 | description
+   --------------------------------
+   DWORD | stardos_alarm_time   | alarm time for cap discharge
+   DWORD | cap_voltage          | cap voltage
+   BYTE  | roml_enable          | is roml enabled?
+   ARRAY | roml_banks           | 8192 bytes of ROML data
+   ARRAY | romh_banks           | 8192 bytes of ROMH data
+ */
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   1
 #define SNAP_MODULE_NAME  "CARTSTARDOS"

Modified: trunk/vice/src/c64/cart/uc1.c
===================================================================
--- trunk/vice/src/c64/cart/uc1.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/uc1.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -653,6 +653,18 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTUC1 0.2 snapshot module format:
+
+   type  | name             | description
+   --------------------------------------
+   BYTE  | regval           |
+   BYTE  | bankmask         |
+   ARRAY | roml_banks       | 0x2000 * MAXBANKS
+   ARRAY | romh_banks       | 0x2000 * MAXBANKS
+   ARRAY | cart_ram         | CART_RAM_SIZE
+
+*/
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   2
 #define SNAP_MODULE_NAME  "CARTUC1"

Modified: trunk/vice/src/c64/cart/uc2.c
===================================================================
--- trunk/vice/src/c64/cart/uc2.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64/cart/uc2.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -787,6 +787,18 @@
 
 /* ---------------------------------------------------------------------*/
 
+/* CARTUC2 snapshot module format:
+
+   type  | name         | description
+   --------------------------------
+   BYTE  | regA         | bank register value
+   BYTE  | regB         | mode
+   BYTE  | bankmask     | bank mask
+   ARRAY | roml_banks   | 32 * 8192 bytes of ROML data
+   ARRAY | romh_banks   | 32 * 8192 bytes of ROMH data
+   ARRAY | cart_ram     | 512kiB of RAM data
+ */
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   2
 #define SNAP_MODULE_NAME  "CARTUC2"

Modified: trunk/vice/src/c64dtv/hummeradc.c
===================================================================
--- trunk/vice/src/c64dtv/hummeradc.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/c64dtv/hummeradc.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -401,6 +401,20 @@
     return cmdline_register_options(cmdline_options);
 }
 
+/* ---------------------------------------------------------------------*/
+
+/* HUMMERADC snapshot module format:
+
+   type  | name                 | description
+   -------------------------------------------
+   BYTE  | hummeradc_value      |
+   BYTE  | hummeradc_channel    |
+   BYTE  | hummeradc_control    |
+   BYTE  | hummeradc_chanattr   |
+   BYTE  | hummeradc_chanwakeup |
+   BYTE  | hummeradc_prev       |
+ */
+
 #define SNAP_MAJOR 0
 #define SNAP_MINOR 0
 static const char snap_misc_module_name[] = "HUMMERADC";

Modified: trunk/vice/src/cbm2/cart/cbm2cart.c
===================================================================
--- trunk/vice/src/cbm2/cart/cbm2cart.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/cbm2/cart/cbm2cart.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -884,13 +884,20 @@
 
 /* ------------------------------------------------------------------------- */
 
-/*
-    Snapshot reading and writing
-*/
-
 /* FIXME: due to the snapshots being generally broken as a whole, none of this
           could be tested */
 
+/* CBM2CART 0.1 snapshot module format:
+
+   type  | name                 | description
+   --------------------------------
+   BYTE  | number_of_carts      | number of attached carts
+   BYTE  | mem_cartridge_type   | main type
+   ARRAY | cart_ids             | number_of_carts * DWORD cartridge IDs
+
+   followed by individual cartridges modules
+ */
+
 #define CBM2CART_DUMP_MAX_CARTS  1
 
 #define CBM2CART_DUMP_VER_MAJOR   0

Modified: trunk/vice/src/cbm2/cbm2memsnapshot.c
===================================================================
--- trunk/vice/src/cbm2/cbm2memsnapshot.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/cbm2/cbm2memsnapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -52,33 +52,33 @@
 #define CBM2MEM_DUMP_VER_MAJOR   1
 #define CBM2MEM_DUMP_VER_MINOR   0
 
-/*
- * UBYTE        MEMSIZE         size in 128k (1=128, 2=256, 4=512, 8=1024)
- * UBYTE        CONFIG          Bit 0: cart08_ram
- *                                  1: cart1_ram
- *                                  2: cart2_ram
- *                                  3: cart4_ram
- *                                  4: cart6_ram
- *                                  5: cartC_ram
- *                                  6: 1= RAM starts at 0 (C500), videoram is
- *                                        1k VIC-II video, 1k colorram
- *                                     0= RAM starts at 0x10000 (others),
- *                                        videoram is 2k crtc videoram
- *
- * UBYTE        HCONFIG         Bit 0-1: ModelLine
- *
- * UBYTE        EXECBANK        CPU exec bank register
- * UBYTE        INDBANK         CPU indirect bank register
- * ARRAY        SYSRAM          2k system RAM, Bank15 $0000-$07ff
- * ARRAY        VIDEO           2k video RAM, Bank15 $d000-$d7ff
- * ARRAY        RAM             size according to MEMSIZE
- * ARRAY        RAM08           (only if memsize < 1M) 2k for cart08_ram
- * ARRAY        RAM1            (only if memsize < 1M) 4k for cart1_ram
- * ARRAY        RAM2            (only if memsize < 1M) 8k for cart2_ram
- * ARRAY        RAM4            (only if memsize < 1M) 8k for cart4_ram
- * ARRAY        RAM6            (only if memsize < 1M) 8k for cart6_ram
- * ARRAY        RAMC            (only if memsize < 1M) 4k for cartC_ram
- *
+/* CBM2MEM 1.0 snapshot module format:
+
+   type  | name     | description
+   -----------------------------
+   UBYTE | MEMSIZE  | Memory size in 128KiB blocks (1=128KiB,2=256KiB, 4=512KiB, 8=1024KiB)
+   UBYTE | CONFIG   | Bit 0 = $f0800-$f0fff RAM
+         |          |     1 = $f1000-$f1fff RAM
+         |          |     2 = $f2000-$f3fff RAM
+         |          |     3 = $f4000-$f5fff RAM
+         |          |     4 = $f6000-$f7fff RAM
+         |          |     5 = $fc000-$fcfff RAM
+         |          |     6: 1= RAM starts at 0 (C500), videoram is
+         |          |           1k VIC-II video, 1k colorram
+         |          |        0= RAM starts at 0x10000 (others),
+         |          |           videoram is 2k crtc videoram
+   UBYTE | HWCONFIG | Bit 0-1: ModelLine
+   UBYTE | EXECBANK | CPU exec bank register
+   UBYTE | INDBANK  | CPU indirect bank register
+   ARRAY | SYSRAM   | 2k system RAM, Bank15 $f0000-$f07ff
+   ARRAY | VIDEO    | 2k video RAM, Bank15 $fd000-$fd7ff
+   ARRAY | RAM      | RAM dump, size according to MEMSIZE
+   ARRAY | RAM08    | (only if memsize < 1M) 2k for cart08_ram CONFIG & 1 : 2KiB RAM $f0800-$f0fff
+   ARRAY | RAM1     | (only if memsize < 1M) 4k for cart1_ram CONFIG & 2 : 4KiB RAM $f1000-$f1fff
+   ARRAY | RAM2     | (only if memsize < 1M) 8k for cart2_ram CONFIG & 4 : 8KiB RAM $f2000-$f3fff
+   ARRAY | RAM4     | (only if memsize < 1M) 8k for cart4_ram CONFIG & 8 : 8KiB RAM $f4000-$f5fff
+   ARRAY | RAM6     | (only if memsize < 1M) 8k for cart6_ram CONFIG & 16 : 8KiB RAM $f6000-$f7fff
+   ARRAY | RAMC     | (only if memsize < 1M) 4k for cartC_ram CONFIG & 32 : 4KiB RAM $fc000-$fcfff
  */
 
 static const char module_name[] = "CBM2MEM";
@@ -278,22 +278,24 @@
 
 /*********************************************************************/
 
-/*
- * UBYTE        CONFIG          Bit 1: cart1 ROM included
- *                                  2: cart2 ROM included
- *                                  3: cart4 ROM included
- *                                  4: cart6 ROM included
- *                                  5: chargen is of C510 type (VIC-II)
- *
- * ARRAY        KERNAL          8k Kernal ROM ($e000-$ffff)
- * ARRAY        BASIC           16k Basic ROM ($8000-$bfff)
- * ARRAY        CHARGEN         4k chargen ROM image ($c*** for VIC-II)
- * ARRAY        ROM1            4k for cart1 (if config & 2)
- * ARRAY        ROM2            8k for cart2 (if config & 4)
- * ARRAY        ROM4            8k for cart4 (if config & 8)
- * ARRAY        ROM6            8k for cart6 (if config & 16)
- */
+/* CBM2ROM 1.0 snapshot module format:
 
+   type  | name     | description
+   -----------------------------
+   UBYTE | CONFIG   | Bit 1: cart1 ROM included
+         |          |     2: cart2 ROM included
+         |          |     3: cart4 ROM included
+         |          |     4: cart6 ROM included
+         |          |     5: chargen is of C510 type (VIC-II)
+   ARRAY | KERNAL   | 8k Kernal ROM ($e000-$ffff)
+   ARRAY | BASIC    | 16k Basic ROM ($8000-$bfff)
+   ARRAY | CHARGEN  | 4k chargen ROM image ($c*** for VIC-II)
+   ARRAY | ROM1     | 4k for cart1 (if config & 2)
+   ARRAY | ROM2     | 8k for cart2 (if config & 4)
+   ARRAY | ROM4     | 8k for cart4 (if config & 8)
+   ARRAY | ROM6     | 8k for cart6 (if config & 16)
+*/
+
 static const char module_rom_name[] = "CBM2ROM";
 #define CBM2ROM_DUMP_VER_MAJOR   1
 #define CBM2ROM_DUMP_VER_MINOR   0

Modified: trunk/vice/src/cbm2/cbm5x0.c
===================================================================
--- trunk/vice/src/cbm2/cbm5x0.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/cbm2/cbm5x0.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -592,17 +592,21 @@
     SIGNAL_VERT_BLANK_ON
 }
 
+/* ---------------------------------------------------------------------*/
+
 /*
  * C500 extra data (state of 50Hz clk)
  */
+
+/* C500DATA snapshot module format:
+
+   type  | name       | description
+   --------------------------------
+   DWORD  | IRQCLK    | CPU clock ticks until next 50 Hz IRQ
+*/
+
 #define C500DATA_DUMP_VER_MAJOR   0
 #define C500DATA_DUMP_VER_MINOR   0
-
-/*
- * DWORD        IRQCLK          CPU clock ticks until next 50 Hz IRQ
- *
- */
-
 static const char module_name[] = "C500DATA";
 
 int cbm2_c500_snapshot_write_module(snapshot_t *p)

Modified: trunk/vice/src/core/ata.c
===================================================================
--- trunk/vice/src/core/ata.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/ata.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -1369,6 +1369,44 @@
  * checksum to check if there was any modification meanwhile.
  */
 
+/* ATA 0.7 snapshot module format:
+
+   type   | name                    | description
+   ----------------------------------------------
+   STRING | filename                |
+   DWORD  | type                    |
+   WORD   | geometry.cylinders      |
+   BYTE   | geometry.heads          |
+   BYTE   | geometry.sectors        |
+   DWORD  | geometry.size           |
+   BYTE   | error                   |
+   BYTE   | features                |
+   BYTE   | sector_count            |
+   BYTE   | sector_count_internal   |
+   BYTE   | sector                  |
+   WORD   | cylinder                |
+   BYTE   | head,dev<<4,lba<<6,legacy   |
+   BYTE   | control                 |
+   BYTE   | cmd                     |
+   BYTE   | power                   |
+   ARRAY  | packet                  | sizeof(packet)
+   WORD   | bufp                    |
+   ARRAY  | buffer                  | sector_size
+   WORD   | cylinders               |
+   BYTE   | heads                   |
+   BYTE   | sectors                 |
+   DWORD  | pos                     |
+   DWORD  | pos / sector_size       |
+   BYTE   | wcache                  |
+   BYTE   | lookahead               |
+   BYTE   | busy                    |
+   CLOCK  | spindle_clk             |
+   CLOCK  | head_clk                |
+   CLOCK  | standby_clk             |
+   DWORD  | standby                 |
+   DWORD  | standby_max             |
+*/
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   7
 

Modified: trunk/vice/src/core/ciacore.c
===================================================================
--- trunk/vice/src/core/ciacore.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/ciacore.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -2137,86 +2137,61 @@
 }
 
 /* -------------------------------------------------------------------------- */
-/* The dump format has a module header and the data generated by the
- * chip...
- *
- * The version of this dump description is 2.5
- */
 
 #define CIA_DUMP_VER_MAJOR      2
 #define CIA_DUMP_VER_MINOR      5
 
-/*
- * The dump data:
- *
- * UBYTE        ORA
- * UBYTE        ORB
- * UBYTE        DDRA
- * UBYTE        DDRB
- * UWORD        TA
- * UWORD        TB
- * UBYTE        TOD_TEN         current value
- * UBYTE        TOD_SEC
- * UBYTE        TOD_MIN
- * UBYTE        TOD_HR
- * UBYTE        SDR
- * UBYTE        IER             enabled interrupts mask
- * UBYTE        CRA
- * UBYTE        CRB
- *
- * UWORD        TAL             latch value
- * UWORD        TBL             latch value
- * UBYTE        IFR             interrupts currently active
- * UBYTE        PBSTATE         bit6/7 reflect PB6/7 toggle state
- *                              bit 2/3 reflect port bit state
- * UBYTE        SRHBITS         number of half-bits to still shift in/out SDR
- * UBYTE        ALARM_TEN
- * UBYTE        ALARM_SEC
- * UBYTE        ALARM_MIN
- * UBYTE        ALARM_HR
- *
- * UBYTE        READICR         clk - when ICR was read last + 128
- * UBYTE        TODLATCHED      0=running, 1=latched, 2=stopped (writing)
- * UBYTE        TODL_TEN                latch value
- * UBYTE        TODL_SEC
- * UBYTE        TODL_MIN
- * UBYTE        TODL_HR
- * DWORD        TOD_TICKS       clk ticks till next tenth of second
- *
- * UBYTE        IRQ             0=IRQ line inactive, 1=IRQ line active
- *
- *                              These bits have been added in V1.1
- *
- * WORD         TA              Timer A state bits (see ciatimer.h)
- * WORD         TB              Timer B state bits (see ciatimer.h)
- *
- *                              These bits have been added in V1.2
- *
- * BYTE         SHIFTER         actual shift register (original data)
- * BYTE         SDR_VALID       data in SDR valid to be shifted
- *
- * BYTE         irq_enabled     IRQ enabled
- *
- * BYTE         todtickcounter  TOD tick counter
- *
- *                              These bits have been added in V2.3
- *
- * BYTE         SHIFTER_HI      high byte of SHIFTER
- * BYTE         SDR_ALARM       if an sdr_alarm is pending and when
- * BYTE         SP_CNT_IN       input state of SP and CNT
- *
- *                              These bits have been added in V2.4
- *
- * DWORD        SDR_DELAY       event/history bits for the serial data register
- * BYTE         SP_CNT_OUT      output state of SP and CNT
- *
- *                              These bits have been added in V2.5
- *
- * DWORD        IFR_DELAY       event/history bits for the interrupt flag reg.
- * BYTE         ACK_IRQFLAGS    flags in IFR to acknowledge, i.e. clear.
- * BYTE         NEW_IRQFLAGS    new flags in IFR that were set recently.
- */
+/* CIA 2.5 snapshot module format:
 
+   type  | name             |Version|  description
+   -------------------------------------------------
+   UBYTE | ORA              |       | Output register A
+   UBYTE | ORB              |       | Output register B
+   UBYTE | DDRA             |       | Data direction register A
+   UBYTE | DDRB             |       | Data direction register B
+   UWORD | TA               |       | Timer A counter value
+   UWORD | TB               |       | Timer B counter value
+   UBYTE | TOD_TEN          |       | Time of Day - current tenth of second
+   UBYTE | TOD_SEC          |       | Time of Day - current seconds
+   UBYTE | TOD_MIN          |       | Time of Day - current minutes
+   UBYTE | TOD_HR           |       | Time of Day - current hours
+   UBYTE | SDR              |       | contents of shift register
+   UBYTE | IER              |       | mask of enabled interrupt masks
+   UBYTE | CRA              |       | Control register A
+   UBYTE | CRB              |       | Control register B
+   UWORD | TAL              |       | Timer A latch value
+   UWORD | TBL              |       | Timer B latch value
+   UBYTE | IFR              |       | mask of currently active interrupts
+   UBYTE | PBSTATE          |       | Bit 6/7 reflect the PB6/7 toggle bit state.Bit 2/3 reflect the corresponding port bit state.
+   UBYTE | SRHBITS          |       | number of half-bits to still shift in/out SDR
+   UBYTE | ALARM_TEN        |       | Time of Day - alarm tenth of second
+   UBYTE | ALARM_SEC        |       | Time of Day - alarm seconds
+   UBYTE | ALARM_MIN        |       | Time of Day - alarm minutes
+   UBYTE | ALARM_HR         |       | Time of Day - alarm hours
+   UBYTE | READICR          |       | current clock minus the clock when ICR was read last plus 128.
+   UBYTE | TODLATCHED       |       | Bit 0: 1= latched for reading, Bit 1: 2=stopped for writing
+   UBYTE | TODL_TEN         |       | Time of Day - latched tenth of second
+   UBYTE | TODL_SEC         |       | Time of Day - latched seconds
+   UBYTE | TODL_MIN         |       | Time of Day - latched minutes
+   UBYTE | TODL_HR          |       | Time of Day - latched hours
+   DWORD | TOD_TICKS        |       | clk ticks till next tenth of second
+   UBYTE | IRQ              |       | 0=IRQ line inactive, 1=IRQ line active
+   WORD  | TA state         | 1.1+  | Timer A state bits (see ciatimer.h)
+   WORD  | TB state         | 1.1+  | Timer B state bits (see ciatimer.h)
+   BYTE  | SHIFTER          | 1.2+  | actual shift register (original data)
+   BYTE  | SDR_VALID        | 1.2+  | data in SDR valid to be shifted
+   BYTE  | irq_enabled      | 1.2+  | IRQ enabled
+   BYTE  | todtickcounter   | 1.2+  | TOD tick counter
+   BYTE  | SHIFTER_HI       | 2.3+  | high byte of SHIFTER
+   BYTE  | SDR_ALARM        | 2.3+  | if an sdr_alarm is pending and when
+   BYTE  | SP_CNT_IN        | 2.3+  | input state of SP and CNT
+   DWORD | SDR_DELAY        | 2.4+  | event/history bits for the serial data register
+   BYTE  | SP_CNT_OUT       | 2.4+  | output state of SP and CNT
+   DWORD | IFR_DELAY        | 2.5+  | event/history bits for the interrupt flag reg.
+   BYTE  | ACK_IRQFLAGS     | 2.5+  | flags in IFR to acknowledge, i.e. clear.
+   BYTE  | NEW_IRQFLAGS     | 2.5+  | new flags in IFR that were set recently.
+*/
+
 /* FIXME!!!  Error check.  */
 int ciacore_snapshot_write_module(cia_context_t *cia_context, snapshot_t *s)
 {

Modified: trunk/vice/src/core/flash040core.c
===================================================================
--- trunk/vice/src/core/flash040core.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/flash040core.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -498,6 +498,17 @@
 
 /* -------------------------------------------------------------------------- */
 
+/* FLASH040 2.0 snapshot module format:
+
+   type   | name                    | description
+   ----------------------------------------------
+   BYTE   | state                   |
+   BYTE   | base_state              |
+   BYTE   | program_byte            |
+   ARRAY  | erase_mask              | FLASH040_ERASE_MASK_SIZE
+   BYTE   | last_read               |
+*/
+
 #define FLASH040_DUMP_VER_MAJOR   2
 #define FLASH040_DUMP_VER_MINOR   0
 

Modified: trunk/vice/src/core/flash800core.c
===================================================================
--- trunk/vice/src/core/flash800core.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/flash800core.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -466,6 +466,17 @@
 
 /* -------------------------------------------------------------------------- */
 
+/* FLASH800 2.0 snapshot module format:
+
+   type   | name                    | description
+   ----------------------------------------------
+   BYTE   | state                   |
+   BYTE   | base_state              |
+   BYTE   | program_byte            |
+   ARRAY  | erase_mask              | FLASH800_ERASE_MASK_SIZE
+   BYTE   | last_read               |
+*/
+
 #define FLASH800_DUMP_VER_MAJOR   2
 #define FLASH800_DUMP_VER_MINOR   0
 

Modified: trunk/vice/src/core/m93c86.c
===================================================================
--- trunk/vice/src/core/m93c86.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/m93c86.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -460,8 +460,28 @@
 }
 
 /* ---------------------------------------------------------------------*/
-/*    snapshot support functions                                             */
 
+/* M93C86 0.1 snapshot module format:
+
+   type  | name                 | description
+   ------------------------------------------
+   BYTE  | eeprom_cs            |
+   BYTE  | eeprom_clock         |
+   BYTE  | eeprom_data_in       |
+   BYTE  | eeprom_data_out      |
+   BYTE  | input_shiftreg       |
+   BYTE  | input_count          |
+   BYTE  | output_shiftreg      |
+   BYTE  | output_count         |
+   BYTE  | command              |
+   BYTE  | addr                 |
+   BYTE  | data0                |
+   BYTE  | data1                |
+   BYTE  | write_enable_status  |
+   BYTE  | ready_busy_status    |
+   ARRAY | m93c86_data          | 2048 bytes of ROM data
+ */
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   1
 #define SNAP_MODULE_NAME  "M93C86"

Modified: trunk/vice/src/core/riotcore.c
===================================================================
--- trunk/vice/src/core/riotcore.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/riotcore.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -387,35 +387,25 @@
 
 /*-------------------------------------------------------------------*/
 
-/* The dump format has a module header and the data generated by the
- * chip...
- *
- * The version of this dump description is 0.0
- *
- */
-
 #define RIOT_DUMP_VER_MAJOR      0
 #define RIOT_DUMP_VER_MINOR      0
 
-/*
- * The dump data:
- *
- * UBYTE        ORA
- * UBYTE        DDRA
- * UBYTE        ORB
- * UBYTE        DDRB
- * UBYTE        EDGECTRL        edge control value
- * UBYTE        IRQFL           IRQ fl:
- *                              Bit 6/7: see RIOT IRQ flag
- *                              Bit 0: state of IRQ line (1=active)
- * UBYTE        N               current timer value
- * UWORD        divider         1, 8, 64, 104
- * UWORD        rest            cycles that the divider has done since last
- *                              counter tick
- * UBYTE        irqen           0= timer IRQ disabled, 1= enabled
- *
- */
+/* RIOT 0.0 snapshot module format:
 
+   type  | name         | description
+   ----------------------------------
+   UBYTE | ORA          | Port A output register
+   UBYTE | DDRA         | Port A data direction register
+   UBYTE | ORB          | Port B output register
+   UBYTE | DDRB         | Port B data direction register
+   UBYTE | EDGECTRL     | edge control value: Bit 0/1: A0/A1 address bits written to edgecontrol registers
+   UBYTE | IRQFL        | IRQ fl: Bit 6/7: see RIOT IRQ flag  Bit 0: state of IRQ line (1=active)
+   UBYTE | N            | current timer value
+   UWORD | divider      | Pre-scale divider value (1, 8, 64, or 1024)
+   UWORD | rest         | cycles that the divider has done since last counter tick
+   UBYTE | irqen        | 0= timer IRQ disabled, 1= enabled
+*/
+
 int riotcore_snapshot_write_module(riot_context_t *riot_context, snapshot_t *p)
 {
     snapshot_module_t *m;

Modified: trunk/vice/src/core/spi-flash.c
===================================================================
--- trunk/vice/src/core/spi-flash.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/spi-flash.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -331,6 +331,25 @@
 /* ---------------------------------------------------------------------*/
 /*    snapshot support functions                                             */
 
+/* EN25QH128A 0.1 snapshot module format:
+
+   type   | name                    | description
+   ----------------------------------------------
+   BYTE   | eeprom_cs               |
+   BYTE   | eeprom_clock            |
+   BYTE   | eeprom_data_in          |
+   BYTE   | eeprom_data_out         |
+   BYTE   | input_shiftreg          |
+   BYTE   | input_count             |
+   BYTE   | output_shiftreg         |
+   BYTE   | output_count            |
+   BYTE   | command                 |
+   BYTE   | addr                    |
+   BYTE   | write_enable_status     |
+   BYTE   | ready_busy_status       |
+   ARRAY  | spi_flash_data          | MAX_ROM_SIZE
+*/
+
 #define CART_DUMP_VER_MAJOR   0
 #define CART_DUMP_VER_MINOR   1
 #define SNAP_MODULE_NAME  "EN25QH128A"

Modified: trunk/vice/src/core/tpicore.c
===================================================================
--- trunk/vice/src/core/tpicore.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/tpicore.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -393,32 +393,27 @@
     lib_free(tpi_context);
 }
 
-/* -------------------------------------------------------------------------- */
-/* The dump format has a module header and the data generated by the
- * chip...
- *
- * The version of this dump description is 0/0
+/* ---------------------------------------------------------------------*/
+
+/* TPI 1.0 snapshot module format:
+
+   type  | name       | description
+   --------------------------------
+   UBYTE | PRA        | Port A output register
+   UBYTE | PRB        | Port B output register
+   UBYTE | PRC        | Port C output register (doubles as IRQ latch register)
+   UBYTE | DDRA       | Port A data direction register
+   UBYTE | DDRB       | Port B data direction register
+   UBYTE | DDRC       | Port C data direction register (doubles as IRQ mask register)
+   UBYTE | CR         | Control Register
+   UBYTE | AIR        | Active interrupt register
+   UBYTE | STACK      | irq sources saved on stack
+   UBYTE | CABSTATE   | state of CA and CB pins. Bit 7 = state of CA, Bit 6 = state of CB
  */
 
 #define TPI_DUMP_VER_MAJOR      1
 #define TPI_DUMP_VER_MINOR      0
 
-/*
- * The dump data:
- *
- * UBYTE        PRA     port A output register
- * UBYTE        PRB
- * UBYTE        PRC
- * UBYTE        DDRA    data register A
- * UBYTE        DDRB
- * UBYTE        DDRC
- * UBYTE        CR
- * UBYTE        AIR
- *
- * UBYTE        STACK   irq sources saved on stack
- * UBYTE        CABSTATE state of CA and CB pins
- */
-
 /* FIXME!!!  Error check.  */
 int tpicore_snapshot_write_module(tpi_context_t *tpi_context, snapshot_t *p)
 {

Modified: trunk/vice/src/core/viacore.c
===================================================================
--- trunk/vice/src/core/viacore.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/core/viacore.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -1904,45 +1904,43 @@
 
 /*------------------------------------------------------------------------*/
 
+/* ---------------------------------------------------------------------*/
+
+/* VIA 2.2 snapshot module format:
+
+   type  | name                 |version| description
+   --------------------------------------------------
+   UBYTE | ORA                  |       | Output register A
+   UBYTE | DDRA                 |       | Data direction register A
+   UBYTE | ORB                  |       | Output register B
+   UBYTE | DDRB                 |       | Data direction register B
+   UWORD | T1L                  |       | timer 1 latch value
+   UWORD | T1C                  |       | timer 1 count value
+   UBYTE | T2LL                 |       | Timer 2 latch lo
+   UBYTE | T2LH                 |       | Timer 2 latch hi
+   UBYTE | T2CL                 |       | timer 2 count value lo
+   UBYTE | T2CH                 |       | timer 2 count value hi
+   UWORD | T2C                  |       | timer 2 counter
+   UBYTE | RUNFL                |       | bit 7: timer 1 will generate IRQ on underflow; bit 6: timer 2 will generate IRQ on underflow
+   UBYTE | SR                   |       | shift register value
+   UBYTE | ACR                  |       | auxiliary control register
+   UBYTE | PCR                  |       | peripherial control register
+   UBYTE | IFR                  |       | active interrupts
+   UBYTE | IER                  |       | interrupt masks
+   UBYTE | PB7                  |       | bit 7 = pb7 state
+   UBYTE | SRHBITS              |       | number of half-bits to shift out on SR
+   UBYTE | CABSTATE             |       | bit 7 = ca2 state, bit6 = cb2 state, bit5 = cb1
+   UBYTE | ILA                  |       | input latch port A  (see ACR bit 0)
+   UBYTE | ILB                  |       | input latch port B  (see ACR bit 1)
+   UBYTE | t2_irq_allowed       | 2.2+  |
+   UBYTE | t2_underflow_alarm   | 2.2+  | 0 if not; 1+time delta if set.
+   UBYTE | t2_shift_alarm       | 2.2+  | 0 if not; 1+time delta if set.
+ */
+
 /* The name of the modul must be defined before including this file.  */
 #define VIA_DUMP_VER_MAJOR      2
 #define VIA_DUMP_VER_MINOR      2
 
-/*
- * The dump data:
- *
- * Minor version 1:
- *
- * UBYTE        ORA
- * UBYTE        DDRA
- * UBYTE        ORB
- * UBYTE        DDRB
- * UWORD        T1L             word1   via_context->tal
- * UWORD        T1C             word2   viacore_t1()
- * UBYTE        T2LL
- * UBYTE        T2LH
- * UBYTE        T2CL
- * UBYTE        T2CH
- * UWORD        T2C             word3   viacore_t2()
- * UBYTE        0x80:t1zero | 0x40:t2xx00     byte1
- * UBYTE        SR
- * UBYTE        ACR
- * UBYTE        PCR
- * UBYTE        IFR              active interrupts
- * UBYTE        IER              interrupt masks
- * UBYTE        PB7              byte4  bit 7 = pb7 state
- * UBYTE        SRHBITS          shift register state helper
- * UBYTE        CABSTATE         byte6 bit 7 = ca2 state, bit6 = cb2 state, bi5 = cb1
- * UBYTE        ILA              input latch port A
- * UBYTE        ILB              input latch port B
- *
- * Minor version 2 adds:
- *
- * UBYTE        t2_irq_allowed
- * UBYTE        t2_underflow_alarm 0 if not; 1+time delta if set.
- * UBYTE        t2_shift_alarm   0 if not; 1+time delta if set.
- */
-
 /* FIXME!!!  Error check.  */
 
 int viacore_snapshot_write_module(via_context_t *via_context, snapshot_t *s)

Modified: trunk/vice/src/crtc/crtc-snapshot.c
===================================================================
--- trunk/vice/src/crtc/crtc-snapshot.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/crtc/crtc-snapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -43,8 +43,43 @@
 #include "types.h"
 
 
-/* Snapshot.  */
+/* CRTC 1.2 snapshot module format:
 
+   type     | name              |version|description
+   ------------------------------------------
+    WORD    | VADDR_MASK        |       | Mask of the address bits valid when accessing the video memory
+    WORD    | VADDR_CHARSWITCH  |       | If one bit in the video address is used to switch the character generator, it is masked here.
+    WORD    | VADDR_CHAROFFSET  |       | The offset in characters in the character generator that CHARSWITCH switches.
+    WORD    | VADDR_REVSWITCH   |       | If one bit in the video address inverts the screen, it is masked here.
+    WORD    | CHARGEN_MASK      |       | size of character generator in byte - 1
+    WORD    | CHARGEN_OFFSET    |       | offset given by external circuitry
+    BYTE    | HW_CURSOR         |       | external hardware cursor circuitry enabled
+    BYTE    | HW_COLS           |       | number of displayed columns during one character clock cycle
+    BYTE    | HW_BLANK          |       | set if the hardware blank feature is available CRTC register
+ 20 BYTE    | REGISTERS         |       | register DUMP of the CRTC registers 0-19.
+    BYTE    | REGNO             |       | The current index in the CRTC register file
+    BYTE    | CHAR              |       | The current cycle within the current rasterline
+    BYTE    | CHARLINE          |       | The current character line
+    BYTE    | YCOUNTER          |       | The current rasterline in the character
+    BYTE    | CRSRCNT           |       | Framecounter for the blinking cursor
+    BYTE    | CRSRSTATE         |       | if set the hardware cursor is visible
+    BYTE    | CRSRLINES         |       | set if ycounter is within the active cursor rasterlines for a char
+    WORD    | CHARGEN_REL       |       | relative base of currently used character generator in ROM (in byte)
+    WORD    | SCREEN_REL        |       | screen address to load the counter at the beginning of the next rasterline
+    WORD    | VSYNC             |       | number of rasterlines left within vsync; 0 = not in vsync
+    BYTE    | VENABLE           |       | vertical enable flipflop; 1= display, 0= blank.
+    WORD    | SCREEN_WIDTH      |       | width of the current display window
+    WORD    | SCREEN_HEIGHT     |       | height of the current display window
+    WORD    | SCREEN_XOFFSET    |       | x position where the first character in a line starts in the window
+    WORD    | HJITTER           |       |  but only after adding this jitter
+    WORD    | SCREEN_YOFFSET    |       | x position where the first character in a line starts in the window
+    WORD    | FRAMELINES        |       |  expected number of rasterlines for the current frame
+    WORD    | CURRENT_LINE      |       | current rasterline as seen from the CRTC
+    BYTE    | FLAG              | 1.1+  | Bit 0: If 1 then bit in VADDR_REVSWITCH must be set for reverse; if 0 then bit must be cleared for reverse.
+
+    (followed by raster module data)
+*/
+
 static char snap_module_name[] = "CRTC";
 #define SNAP_MAJOR 1
 #define SNAP_MINOR 2

Modified: trunk/vice/src/datasette/datasette.c
===================================================================
--- trunk/vice/src/datasette/datasette.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/datasette/datasette.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -1360,6 +1360,30 @@
     Snapshot support
  ******************************************************************************/
 
+/* DATASETTE 1.5 snapshot module format:
+
+   type  | name                             | description
+   -------------------------------------------------------
+   BYTE  | datasette_motor                  |
+   BYTE  | notape_mode                      |
+   CLOCK | last_write_clk                   |
+   CLOCK | motor_stop_clk                   |
+   BYTE  | datasette_alarm_pending          |
+   CLOCK | alarm_clk                        |
+   CLOCK | datasette_long_gap_pending       |
+   CLOCK | datasette_long_gap_elapsed       |
+   BYTE  | datasette_last_direction         |
+   DWORD | datasette_counter_offset         |
+   BYTE  | reset_datasette_with_maincpu     |
+   DWORD | datasette_zero_gap_delay         |
+   DWORD | datasette_speed_tuning           |
+   DWORD | datasette_tape_wobble_frequency  |
+   DWORD | datasette_tape_wobble_amplitude  |
+   DWORD | datasette_tape_azimuth_error     |
+   BYTE  | fullwave                         |
+   CLOCK | fullwave_gap                     |
+*/
+
 #define DATASETTE_SNAP_MAJOR 1
 #define DATASETTE_SNAP_MINOR 5
 

Modified: trunk/vice/src/drive/drive-snapshot.c
===================================================================
--- trunk/vice/src/drive/drive-snapshot.c	2026-04-30 03:15:09 UTC (rev 46086)
+++ trunk/vice/src/drive/drive-snapshot.c	2026-05-01 21:17:47 UTC (rev 46087)
@@ -78,35 +78,82 @@
 static int drive_snapshot_read_p64image_module(snapshot_t *s, unsigned int dnr);
 
 /*
-This is the format of the DRIVE snapshot module.
+    DRIVE 2.0 snapshot module format:
 
-Name                 Type   Size   Description
+   Type       | Name                        | Description
+   ------------------------------------------------------
+   BYTE       | has_tde[unit]               |
+   BYTE       | has_drives[unit]            |
+   DWORD      | sync_factor                 |
+   CLOCK      | attach_clk                  |
+   BYTE       | byte_ready_level            |
+   BYTE       | unit->clock_frequency       |
+   WORD       | current_half_track + (side * DRIVE_HALFTRACKS_1571)) |
+   CLOCK      | detach_clk                  |
+   BYTE       | extend_image_policy         |
+   DWORD      | GCR_head_offset             |
+   BYTE       | GCR_read                    |
+   BYTE       | GCR_write_value             |
+   BYTE       | unit->idling_method         |
+   BYTE       | unit->parallel_cable        |
+   BYTE       | read_only                   |
+   DWORD      | rotation_table_ptr[unr]     |
+   DWORD      | unit->type                  |
+   DWORD      | snap_accum                  |
+   CLOCK      | snap_rotation_last_clk      |
+   DWORD      | snap_bit_counter            |
+   DWORD      | snap_zero_count             |
+   WORD       | snap_last_read_data         |
+   BYTE       | snap_last_write_data        |
+   DWORD      | snap_seed                   |
+   DWORD      | snap_speed_zone             |
+   DWORD      | snap_ue7_dcba               |
+   DWORD      | snap_ue7_counter            |
+   DWORD      | snap_uf4_counter            |
+   DWORD      | snap_fr_randcount           |
+   DWORD      | snap_filter_counter         |
+   DWORD      | snap_filter_state           |
+   DWORD      | snap_filter_last_state      |
+   DWORD      | snap_write_flux             |
+   DWORD      | snap_PulseHeadPosition      |
+   DWORD      | snap_xorShift32             |
+   DWORD      | snap_so_delay               |
+   DWORD      | snap_cycle_index            |
+   CLOCK      | snap_ref_advance            |
+   DWORD      | snap_req_ref_cycles         |
+   CLOCK      | attach_detach_clk           |
+   BYTE       | byte_ready_edge             |
+   BYTE       | byte_ready_active           |
+*/
 
-SyncFactor           DWORD  1      sync factor main cpu <-> drive cpu
 
-Accum                DWORD  2
-AttachClk            CLOCK  2      write protect handling on attach
-BitsMoved            DWORD  2      number of bits moved since last access
-ByteReady            BYTE   2      flag: Byte ready
-ClockFrequency       BYTE   2      current clock frequency
-CurrentHalfTrack     WORD   2      current half track of the r/w head
-DetachClk            CLOCK  2      write protect handling on detach
-DiskID1              BYTE   2      disk ID1
-DiskID2              BYTE   2      disk ID2
-ExtendImagePolicy    BYTE   2      Is extending the disk image allowed
-FinishByte           BYTE   2      flag: Mode changed, finish byte
-GCRHeadOffset        DWORD  2      offset from the begin of the track
-GCRRead              BYTE   2      next value to read from disk
-GCRWriteValue        BYTE   2      next value to write to disk
-IdlingMethod         BYTE   2      What idle methode do we use
-LastMode             BYTE   2      flag: Was the last mode read or write
-ParallelCableEnabled BYTE   2      flag: Is the parallel cable enabed
-ReadOnly             BYTE   2      flag: This disk is read only
-RotationLastClk      CLOCK  2
-RotationTablePtr     DWORD  2      pointer to the rotation table
-                                   (offset to the rotation table is saved)
-Type                 DWORD  2      drive type
+/*
+   NOTE: some older version apparently looked like this
 
+   Type       | Name                 | Description
+   -----------------------------------------------
+       DWORD  | SyncFactor           | sync factor main cpu <-> drive cpu
+   2 * DWORD  | Accum                |
+   2 * CLOCK  | AttachClk            | write protect handling on attach
+   2 * DWORD  | BitsMoved            | number of bits moved since last access
+   2 * BYTE   | ByteReady            | flag: Byte ready
+   2 * BYTE   | ClockFrequency       | current clock frequency
+   2 * WORD   | CurrentHalfTrack     | current half track of the r/w head
+   2 * CLOCK  | DetachClk            | write protect handling on detach
+   2 * BYTE   | DiskID1              | disk ID1
+   2 * BYTE   | DiskID2              | disk ID2
+   2 * BYTE   | ExtendImagePolicy    | Is extending the disk image allowed
+   2 * BYTE   | FinishByte           | flag: Mode changed, finish byte
+   2 * DWORD  | GCRHeadOffset        | offset from the begin of the track
+   2 * BYTE   | GCRRead              | next value to read from disk
+   2 * BYTE   | GCRWriteValue        | next value to write to disk
+   2 * BYTE   | IdlingMethod         | What idle methode do we use
+   2 * BYTE   | LastMode             | flag: Was the last mode read or...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[46086] trunk/vice/data/joymaps/ Makefile.am

[<st...@us...>]

Revision: 46086
          http://sourceforge.net/p/vice-emu/code/46086
Author:   strobey
Date:     2026-04-30 03:15:09 +0000 (Thu, 30 Apr 2026)
Log Message:
-----------
Somebody's compile chain probably still expects tabs.

Modified Paths:
--------------
    trunk/vice/data/joymaps/Makefile.am

Modified: trunk/vice/data/joymaps/Makefile.am
===================================================================
--- trunk/vice/data/joymaps/Makefile.am	2026-04-30 03:06:37 UTC (rev 46085)
+++ trunk/vice/data/joymaps/Makefile.am	2026-04-30 03:15:09 UTC (rev 46086)
@@ -2,15 +2,15 @@
 
 sdl_joymaps =	sdl_joymap_8bitdo_6b.vjm \
 		sdl_joymap_ds3.vjm \
-        sdl_joymap_ds3_DsHidMini.vjm \
-        sdl_joymap_ds3_Sony.vjm \
+		sdl_joymap_ds3_DsHidMini.vjm \
+		sdl_joymap_ds3_Sony.vjm \
 		sdl_joymap_ds4.vjm \
 		sdl_joymap_ds4_windows.vjm \
 		sdl_joymap_ds5.vjm \
 		sdl_joymap_keyrah_v3.vjm \
-        sdl_joymap_logitech_x3dpro_windows.vjm \
+		sdl_joymap_logitech_x3dpro_windows.vjm \
 		sdl_joymap_switch_pro.vjm \
-        sdl_joymap_thec64.vjm \
+		sdl_joymap_thec64.vjm \
 		sdl_joymap_xbox360.vjm \
 		sdl_joymap_xbox_one_windows.vjm
 
@@ -23,8 +23,8 @@
 		gtk3_joymap_ds5.vjm \
 		gtk3_joymap_logitech_x3dpro_windows.vjm \
 		gtk3_joymap_switch_pro.vjm \
-        gtk3_joymap_thec64.vjm \
-        gtk3_joymap_xbox_one_windows.vjm
+		gtk3_joymap_thec64.vjm \
+		gtk3_joymap_xbox_one_windows.vjm
 
 EXTRA_DIST = $(sdl_joymaps) $(gtk_joymaps)
 # Do not install joymaps files when configured for headless

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46085] trunk/vice/data/joymaps

[<st...@us...>]

Revision: 46085
          http://sourceforge.net/p/vice-emu/code/46085
Author:   strobey
Date:     2026-04-30 03:06:37 +0000 (Thu, 30 Apr 2026)
Log Message:
-----------
Add Nintendo Switch Pro controller gtk3 & sdl mappings

Modified Paths:
--------------
    trunk/vice/data/joymaps/Makefile.am

Added Paths:
-----------
    trunk/vice/data/joymaps/gtk3_joymap_switch_pro.vjm
    trunk/vice/data/joymaps/sdl_joymap_switch_pro.vjm

Modified: trunk/vice/data/joymaps/Makefile.am
===================================================================
--- trunk/vice/data/joymaps/Makefile.am	2026-04-26 13:52:46 UTC (rev 46084)
+++ trunk/vice/data/joymaps/Makefile.am	2026-04-30 03:06:37 UTC (rev 46085)
@@ -9,7 +9,8 @@
 		sdl_joymap_ds5.vjm \
 		sdl_joymap_keyrah_v3.vjm \
         sdl_joymap_logitech_x3dpro_windows.vjm \
-		sdl_joymap_thec64.vjm \
+		sdl_joymap_switch_pro.vjm \
+        sdl_joymap_thec64.vjm \
 		sdl_joymap_xbox360.vjm \
 		sdl_joymap_xbox_one_windows.vjm
 
@@ -21,7 +22,8 @@
 		gtk3_joymap_ds4_windows.vjm \
 		gtk3_joymap_ds5.vjm \
 		gtk3_joymap_logitech_x3dpro_windows.vjm \
-		gtk3_joymap_thec64.vjm \
+		gtk3_joymap_switch_pro.vjm \
+        gtk3_joymap_thec64.vjm \
         gtk3_joymap_xbox_one_windows.vjm
 
 EXTRA_DIST = $(sdl_joymaps) $(gtk_joymaps)

Added: trunk/vice/data/joymaps/gtk3_joymap_switch_pro.vjm
===================================================================
--- trunk/vice/data/joymaps/gtk3_joymap_switch_pro.vjm	                        (rev 0)
+++ trunk/vice/data/joymaps/gtk3_joymap_switch_pro.vjm	2026-04-30 03:06:37 UTC (rev 46085)
@@ -0,0 +1,70 @@
+# VICE joystick mapping file
+#
+# A joystick map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'joynum inputtype inputindex action'
+#
+# Keywords and their lines are:
+# '!CLEAR'    clear all mappings
+#
+# inputtype:
+# 0      axis
+# 1      button
+# 2      hat
+#
+# For buttons, inputindex is the zero-based index of the button.
+# For hats: hat 0 has inputindex 0,1,2,3 respectively for up, down, left and
+# right. Hat 1 has 5,6,7,8 etc.
+# For axes, and action 1 (joystick) and 2 (keyboard): axis 0 has inputindex
+# 0,1 respectively for positive and negative, axis 1 has 2,3 etc.
+# For axes, and action 6 (pot axis): inputindex is the zero-based index of the
+# axis.
+#
+# action [action_parameters]:
+# 0                none
+# 1 pin            joystick (pin: 1/2/4/8/16/32/64 = u/d/l/r/fire/fire2/fire3)
+# 2 row col flags  keyboard (flags: 1=shift)
+# 3                map
+# 4                UI activate
+# 5 action-name    UI function
+# 6 pot            potentiometer (1=pot x, 2=pot y)
+#
+
+!CLEAR
+
+# [057e:0001] "Pro Controller" (4 axes, 16 buttons, 1 hat) Windows 10, GTK
+
+0 0 0 1 8
+0 0 1 1 4
+
+0 0 2 1 2
+0 0 3 1 1
+
+0 0 2 6 1
+
+0 0 3 6 2
+
+0 1 0 1 16
+0 1 1 1 64
+0 1 2 1 32
+0 1 3 1 128
+0 1 4 1 256
+0 1 5 1 512
+0 1 6 0
+0 1 7 0
+0 1 8 0
+0 1 9 0
+0 1 10 0
+0 1 11 0
+0 1 12 1 2048
+0 1 13 1 1024
+0 1 14 0
+0 1 15 0
+
+0 2 0 1 1
+0 2 1 1 2
+0 2 2 1 4
+0 2 3 1 8

Added: trunk/vice/data/joymaps/sdl_joymap_switch_pro.vjm
===================================================================
--- trunk/vice/data/joymaps/sdl_joymap_switch_pro.vjm	                        (rev 0)
+++ trunk/vice/data/joymaps/sdl_joymap_switch_pro.vjm	2026-04-30 03:06:37 UTC (rev 46085)
@@ -0,0 +1,75 @@
+# VICE joystick mapping file
+#
+# A joystick map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'joynum inputtype inputindex action'
+#
+# Keywords and their lines are:
+# '!CLEAR'    clear all mappings
+#
+# inputtype:
+# 0      axis
+# 1      button
+# 2      hat
+#
+# For buttons, inputindex is the zero-based index of the button.
+# For hats: hat 0 has inputindex 0,1,2,3 respectively for up, down, left and
+# right. Hat 1 has 5,6,7,8 etc.
+# For axes, and action 1 (joystick) and 2 (keyboard): axis 0 has inputindex
+# 0,1 respectively for positive and negative, axis 1 has 2,3 etc.
+# For axes, and action 6 (pot axis): inputindex is the zero-based index of the
+# axis.
+#
+# action [action_parameters]:
+# 0                none
+# 1 pin            joystick (pin: 1/2/4/8/16/32/64 = u/d/l/r/fire/fire2/fire3)
+# 2 row col flags  keyboard (flags: 1=shift)
+# 3                map
+# 4                UI activate
+# 5 action-name    UI function
+# 6 pot            potentiometer (1=pot x, 2=pot y)
+#
+
+!CLEAR
+
+# [057e:2009] "Nintendo Switch Pro Controller" (6 axes, 20 buttons, 0 hats) Windows 10, SDL
+
+0 0 0 1 8
+0 0 1 1 4
+
+0 0 2 1 2
+0 0 3 1 1
+
+0 0 2 6 1
+
+0 0 3 6 2
+
+0 0 8 0
+0 0 9 0
+
+0 0 10 0
+0 0 11 0
+
+0 1 0 1 64
+0 1 1 1 16
+0 1 2 1 128
+0 1 3 1 32
+0 1 4 0
+0 1 5 1 2048
+0 1 6 0
+0 1 7 0
+0 1 8 0
+0 1 9 1 256
+0 1 10 1 512
+0 1 11 1 1
+0 1 12 1 2
+0 1 13 1 4
+0 1 14 1 8
+0 1 15 1 1024
+0 1 16 0
+0 1 17 0
+0 1 18 0
+0 1 19 0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[46084] trunk/vice/src/c64/cart/ turtlegraphics.c

[<gp...@us...>]

Revision: 46084
          http://sourceforge.net/p/vice-emu/code/46084
Author:   gpz
Date:     2026-04-26 13:52:46 +0000 (Sun, 26 Apr 2026)
Log Message:
-----------
use unique name for the snapshot module :)

Modified Paths:
--------------
    trunk/vice/src/c64/cart/turtlegraphics.c

Modified: trunk/vice/src/c64/cart/turtlegraphics.c
===================================================================
--- trunk/vice/src/c64/cart/turtlegraphics.c	2026-04-19 12:51:15 UTC (rev 46083)
+++ trunk/vice/src/c64/cart/turtlegraphics.c	2026-04-26 13:52:46 UTC (rev 46084)
@@ -180,7 +180,7 @@
 
 /* ---------------------------------------------------------------------*/
 
-/* CARTSTB snapshot module format:
+/* CARTTURTLEGFX 0.2 snapshot module format:
 
    type  | name   | version | description
    --------------------------------------
@@ -187,11 +187,13 @@
    BYTE  | bank   |   0.1   | current bank
    BYTE  | active |   0.1   | cartridge active flag
    ARRAY | ROML   |   0.0+  | 16384 BYTES of ROML data
+
+   Note: renamed from "CARTSTB" in 0.2
  */
 
-static const char snap_module_name[] = "CARTSTB";
+static const char snap_module_name[] = "CARTTURTLEGFX";
 #define SNAP_MAJOR   0
-#define SNAP_MINOR   1
+#define SNAP_MINOR   2
 
 int turtlegraphics_snapshot_write_module(snapshot_t *s)
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.