vice-emu-commit Mailing List for VICE (Page 23)

Versatile Commodore Emulator

Brought to you by: blackystardust, gpz

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

You can subscribe to this list here.

2008	Jan	Feb	Mar	Apr (38)	May (60)	Jun (122)	Jul (148)	Aug (178)	Sep (151)	Oct (131)	Nov (208)	Dec (129)
2009	Jan (193)	Feb (209)	Mar (221)	Apr (243)	May (165)	Jun (168)	Jul (198)	Aug (161)	Sep (103)	Oct (98)	Nov (168)	Dec (99)
2010	Jan (263)	Feb (156)	Mar (57)	Apr (93)	May (85)	Jun (124)	Jul (57)	Aug (58)	Sep (113)	Oct (148)	Nov (114)	Dec (193)
2011	Jan (200)	Feb (207)	Mar (91)	Apr (91)	May (142)	Jun (104)	Jul (115)	Aug (137)	Sep (266)	Oct (91)	Nov (85)	Dec (186)
2012	Jan (98)	Feb (146)	Mar (160)	Apr (99)	May (59)	Jun (257)	Jul (84)	Aug (103)	Sep (169)	Oct (206)	Nov (90)	Dec (296)
2013	Jan (294)	Feb (130)	Mar (36)	Apr (14)	May (51)	Jun (74)	Jul (180)	Aug (85)	Sep (26)	Oct (45)	Nov (29)	Dec (21)
2014	Jan (56)	Feb (40)	Mar (57)	Apr (30)	May (31)	Jun (11)	Jul (107)	Aug (135)	Sep (142)	Oct (195)	Nov (139)	Dec (133)
2015	Jan (293)	Feb (161)	Mar (146)	Apr (85)	May (139)	Jun (51)	Jul (21)	Aug (24)	Sep (29)	Oct (136)	Nov (212)	Dec (118)
2016	Jan (119)	Feb (165)	Mar (229)	Apr (219)	May (134)	Jun (119)	Jul (134)	Aug (236)	Sep (203)	Oct (215)	Nov (300)	Dec (140)
2017	Jan (188)	Feb (20)	Mar (147)	Apr (198)	May (26)	Jun (21)	Jul (67)	Aug (219)	Sep (209)	Oct (194)	Nov (144)	Dec (99)
2018	Jan (139)	Feb (122)	Mar (116)	Apr (85)	May (232)	Jun (181)	Jul (190)	Aug (105)	Sep (92)	Oct (178)	Nov (105)	Dec (86)
2019	Jan (119)	Feb (79)	Mar (74)	Apr (117)	May (115)	Jun (307)	Jul (107)	Aug (131)	Sep (103)	Oct (60)	Nov (118)	Dec (70)
2020	Jan (114)	Feb (103)	Mar (77)	Apr (121)	May (193)	Jun (110)	Jul (214)	Aug (210)	Sep (179)	Oct (260)	Nov (237)	Dec (334)
2021	Jan (163)	Feb (186)	Mar (58)	Apr (81)	May (108)	Jun (175)	Jul (154)	Aug (180)	Sep (217)	Oct (204)	Nov (232)	Dec (190)
2022	Jan (253)	Feb (134)	Mar (229)	Apr (190)	May (125)	Jun (70)	Jul (8)	Aug (22)	Sep (19)	Oct (33)	Nov (94)	Dec (164)
2023	Jan (158)	Feb (366)	Mar (272)	Apr (109)	May (198)	Jun (226)	Jul (200)	Aug (94)	Sep (108)	Oct (62)	Nov (175)	Dec (116)
2024	Jan (35)	Feb (40)	Mar (51)	Apr (89)	May (24)	Jun (26)	Jul (53)	Aug (71)	Sep (23)	Oct (11)	Nov (22)	Dec (58)
2025	Jan (26)	Feb (40)	Mar (107)	Apr (39)	May (35)	Jun (20)	Jul (11)	Aug (24)	Sep (35)	Oct (28)	Nov	Dec

Flat | Threaded

<< < 1 .. 21 22 23 24 25 .. 1071 > >> (Page 23 of 1071)

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

From: <gp...@us...> - 2024-07-31 21:10:23

Revision: 45255
          http://sourceforge.net/p/vice-emu/code/45255
Author:   gpz
Date:     2024-07-31 21:10:21 +0000 (Wed, 31 Jul 2024)
Log Message:
-----------
add options to docs

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

Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi	2024-07-31 20:28:35 UTC (rev 45254)
+++ trunk/vice/doc/vice.texi	2024-07-31 21:10:21 UTC (rev 45255)
@@ -6109,6 +6109,11 @@
 @item Sound
 Boolean specifying whether audio emulation is turned on.
 
+@vindex SoundEmulateOnWarp
+@item SoundEmulateOnWarp
+Boolean specifying whether sound chips should be emulated in warp mode.
+(0: do not emulate sound chips in warp mode, 1: emulate sound chips also in warp mode)
+
 @vindex SoundSampleRate
 @item SoundSampleRate
 Integer specifying the sampling frequency in Hz
@@ -6269,6 +6274,12 @@
 Enable/disable sound emulation
 (@code{Sound=1}, @code{Sound=0}).
 
+@findex -soundwarpmode
+@item -soundwarpmode <mode>
+Specify if sound chips should be emulated in warp mode.
+(@code{SoundEmulateOnWarp}).
+(0: do not emulate sound chips in warp mode, 1: emulate sound chips also in warp mode)
+
 @findex -soundrate
 @item -soundrate <value>
 Specify the sound playback sample rate
@@ -9164,8 +9175,22 @@
 @item DebugCartEnable
 Boolean specifying whether the debug "cartridge" used for the test suite is enabled.
 
+@vindex LogLevelANE
+@item LogLevelANE
+Integer specifying the log mode (0=none 1=only unstable 2=all)
+(x64sc, xvic).
+
+@vindex LogLevelLXA
+@item LogLevelLXA
+Integer specifying the log mode (0=none 1=only unstable 2=all)
+(x64sc, xvic).
+
+@end table
+
 @b{The following are only available when the emulators were compiled in DEBUG mode:}
 
+@table @code
+
 @vindex TraceMode
 @item TraceMode
 Integer specifying the trace mode (0=normal 1=small 2=history)
@@ -9220,8 +9245,24 @@
 @itemx +debugcart
 Enable/disable the debug "cartridge" used for the test suite.
 
+@findex -aneloglevel
+@item -aneloglevel <mode>
+Set the log mode (0=none 1=only unstable 2=all)
+(@code{LogLevelANE})
+(x64sc, xvic).
+
+@findex -lxaloglevel
+@item -lxaloglevel <mode>
+Set the log mode (0=none 1=only unstable 2=all)
+(@code{LogLevelLXA})
+(x64sc, xvic).
+
+@end table
+
 @b{The following are only available when the emulators were compiled in DEBUG mode:}
 
+@table @code
+
 @findex -trace_maincpu, +trace_maincpu
 @item -trace_maincpu
 @itemx +trace_maincpu

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:[45254] trunk/vice/src

From: <gp...@us...> - 2024-07-31 20:28:40

Revision: 45254
          http://sourceforge.net/p/vice-emu/code/45254
Author:   gpz
Date:     2024-07-31 20:28:35 +0000 (Wed, 31 Jul 2024)
Log Message:
-----------
add options to UIs

Modified Paths:
--------------
    trunk/vice/src/6510dtvcore.c
    trunk/vice/src/arch/gtk3/widgets/settings_environment.c
    trunk/vice/src/arch/gtk3/widgets/settings_sound.c
    trunk/vice/src/arch/sdl/menu_sound.c
    trunk/vice/src/mainc64cpu.c
    trunk/vice/src/mainviccpu.c
    trunk/vice/src/vic20/vic20.c

Modified: trunk/vice/src/6510dtvcore.c
===================================================================
--- trunk/vice/src/6510dtvcore.c	2024-07-31 17:04:35 UTC (rev 45253)
+++ trunk/vice/src/6510dtvcore.c	2024-07-31 20:28:35 UTC (rev 45254)
@@ -814,7 +814,7 @@
 */
 
 #define ANE_MAGIC       0xef
-#define ANE_RDY_MAGIC   0xee
+#define ANE_RDY_MAGIC   (0xee & ANE_MAGIC)
 
 #ifndef ANE_LOG_LEVEL
 #define ANE_LOG_LEVEL 0

Modified: trunk/vice/src/arch/gtk3/widgets/settings_environment.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/settings_environment.c	2024-07-31 17:04:35 UTC (rev 45253)
+++ trunk/vice/src/arch/gtk3/widgets/settings_environment.c	2024-07-31 20:28:35 UTC (rev 45254)
@@ -30,11 +30,18 @@
 
 #include "cwdwidget.h"
 #include "logfilewidget.h"
+#include "machine.h"
 #include "vice_gtk3.h"
 
 #include "settings_environment.h"
 
 
+static const vice_gtk3_radiogroup_entry_t loglevels[] = {
+    { "no log",        0 },
+    { "unstable only", 1 },
+    { "all",           2 },
+    { NULL,           -1 }
+};
 
 
 /** \brief  Create widget to change host environment settings
@@ -46,10 +53,16 @@
 GtkWidget *settings_environment_widget_create(GtkWidget *parent)
 {
     GtkWidget *grid;
+    GtkWidget *grid2;
     GtkWidget *cwd_label;
     GtkWidget *cwd_widget;
     GtkWidget *logfile_widget;
+    GtkWidget *ane_label;
+    GtkWidget *lxa_label;
+    GtkWidget *ane_widget;
+    GtkWidget *lxa_widget;
     int        row = 0;
+    int        row2 = 0;
 
     grid = gtk_grid_new();
     gtk_grid_set_column_spacing(GTK_GRID(grid), 8);
@@ -71,7 +84,43 @@
     logfile_widget = logfile_widget_create();
     gtk_widget_set_margin_top(logfile_widget, 24);  /* extra space */
     gtk_grid_attach(GTK_GRID(grid), logfile_widget, 0, row, 1, 1);
+    row++;
 
+    if ((machine_class == VICE_MACHINE_C64SC) ||
+        (machine_class == VICE_MACHINE_VIC20)) {
+
+        grid2 = gtk_grid_new();
+        gtk_grid_set_column_spacing(GTK_GRID(grid2), 8);
+        gtk_grid_set_row_spacing(GTK_GRID(grid2), 8);
+
+        ane_label = gtk_label_new(NULL);
+        gtk_label_set_markup(GTK_LABEL(ane_label), "<b>ANE logging</b>");
+        gtk_widget_set_halign(ane_label, GTK_ALIGN_START);
+        gtk_grid_attach(GTK_GRID(grid2), ane_label, 0, row2, 1, 1);
+
+        lxa_label = gtk_label_new(NULL);
+        gtk_label_set_markup(GTK_LABEL(lxa_label), "<b>LXA logging</b>");
+        gtk_widget_set_halign(lxa_label, GTK_ALIGN_START);
+        gtk_grid_attach(GTK_GRID(grid2), lxa_label, 1, row2, 1, 1);
+        row2++;
+
+        ane_widget = vice_gtk3_resource_radiogroup_new("LogLevelANE",
+                                                loglevels,
+                                                GTK_ORIENTATION_VERTICAL);
+        gtk_grid_attach(GTK_GRID(grid2), ane_widget, 0, row2, 1, 1);
+
+        lxa_widget = vice_gtk3_resource_radiogroup_new("LogLevelLXA",
+                                                loglevels,
+                                                GTK_ORIENTATION_VERTICAL);
+        gtk_grid_attach(GTK_GRID(grid2), lxa_widget, 1, row2, 1, 1);
+        row2++;
+
+        gtk_widget_show_all(grid2);
+
+        gtk_grid_attach(GTK_GRID(grid), grid2, 0, row, 1, 1);
+        row++;
+    }
+
     gtk_widget_show_all(grid);
     return grid;
 }

Modified: trunk/vice/src/arch/gtk3/widgets/settings_sound.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/settings_sound.c	2024-07-31 17:04:35 UTC (rev 45253)
+++ trunk/vice/src/arch/gtk3/widgets/settings_sound.c	2024-07-31 20:28:35 UTC (rev 45254)
@@ -101,6 +101,7 @@
     GtkWidget *inner;
     GtkWidget *scale;
     GtkWidget *enabled_check;
+    GtkWidget *warp_enabled_check;
 
     /* outer grid: contains the checkbox and an 'inner' grid for the widgets */
     outer = gtk_grid_new();
@@ -107,7 +108,7 @@
 
     /* add checkbox for 'sound enabled' */
     enabled_check = vice_gtk3_resource_check_button_new("Sound",
-                                                        "Enable sound playback");
+                                                        "Enable sound emulation");
     gtk_grid_attach(GTK_GRID(outer), enabled_check, 0, 0, 1, 1);
 
     scale = vice_gtk3_resource_scale_custom_new_printf("%s",
@@ -123,12 +124,16 @@
     gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_RIGHT);
     gtk_grid_attach(GTK_GRID(outer), scale, 1, 0, 1, 1);
 
+    warp_enabled_check = vice_gtk3_resource_check_button_new("SoundEmulateOnWarp",
+        "Enable sound emulation in warp mode. (Disabling has a negative impact on compatibility)");
+    gtk_grid_attach(GTK_GRID(outer), warp_enabled_check, 0, 1, 2, 1);
+
     /* inner grid: contains widgets and can be enabled/disabled depending on
      * the state of the 'sound enabled' checkbox */
     inner = create_inner_grid();
     gtk_widget_set_margin_top(inner, 16);
 
-    gtk_grid_attach(GTK_GRID(outer), inner, 0, 1, 2, 1);
+    gtk_grid_attach(GTK_GRID(outer), inner, 0, 2, 2, 1);
     gtk_widget_show_all(outer);
     return outer;
 }

Modified: trunk/vice/src/arch/sdl/menu_sound.c
===================================================================
--- trunk/vice/src/arch/sdl/menu_sound.c	2024-07-31 17:04:35 UTC (rev 45253)
+++ trunk/vice/src/arch/sdl/menu_sound.c	2024-07-31 20:28:35 UTC (rev 45254)
@@ -43,6 +43,7 @@
 
 
 UI_MENU_DEFINE_TOGGLE(Sound)
+UI_MENU_DEFINE_TOGGLE(SoundEmulateOnWarp)
 UI_MENU_DEFINE_RADIO(SoundSampleRate)
 UI_MENU_DEFINE_RADIO(SoundFragmentSize)
 UI_MENU_DEFINE_RADIO(SoundDeviceName)
@@ -212,6 +213,10 @@
         .type     = MENU_ENTRY_RESOURCE_TOGGLE,
         .callback = toggle_Sound_callback
     },
+    {   .string   = "Emulate in warp mode",
+        .type     = MENU_ENTRY_RESOURCE_TOGGLE,
+        .callback = toggle_SoundEmulateOnWarp_callback
+    },
     {   .string   = "Volume",
         .type     = MENU_ENTRY_DIALOG,
         .callback = custom_volume_callback

Modified: trunk/vice/src/mainc64cpu.c
===================================================================
--- trunk/vice/src/mainc64cpu.c	2024-07-31 17:04:35 UTC (rev 45253)
+++ trunk/vice/src/mainc64cpu.c	2024-07-31 20:28:35 UTC (rev 45254)
@@ -512,8 +512,8 @@
 
 /* ------------------------------------------------------------------------- */
 
-unsigned int ane_log_level = 0; /* 0: none, 1: unstable only 2: all */
-unsigned int lxa_log_level = 0; /* 0: none, 1: unstable only 2: all */
+int ane_log_level = 0; /* 0: none, 1: unstable only 2: all */
+int lxa_log_level = 0; /* 0: none, 1: unstable only 2: all */
 
 static int set_ane_log_level(int val, void *param)
 {
@@ -874,7 +874,7 @@
 
 static char snap_module_name[] = "MAINCPU";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 2
+#define SNAP_MINOR 3
 
 int maincpu_snapshot_write_module(snapshot_t *s)
 {
@@ -943,8 +943,8 @@
         || SMR_W(m, &pc) < 0
         || SMR_B(m, &status) < 0
         || SMR_DW_UINT(m, &last_opcode_info) < 0
-        || SMR_DW_UINT(m, &ane_log_level) < 0
-        || SMR_DW_UINT(m, &lxa_log_level) < 0
+        || SMR_DW_INT(m, &ane_log_level) < 0
+        || SMR_DW_INT(m, &lxa_log_level) < 0
         || SMR_DW_INT(m, &maincpu_ba_low_flags) < 0) {
         goto fail;
     }

Modified: trunk/vice/src/mainviccpu.c
===================================================================
--- trunk/vice/src/mainviccpu.c	2024-07-31 17:04:35 UTC (rev 45253)
+++ trunk/vice/src/mainviccpu.c	2024-07-31 20:28:35 UTC (rev 45254)
@@ -42,6 +42,8 @@
 #include "monitor.h"
 #include "mos6510.h"
 #include "snapshot.h"
+#include "resources.h"
+#include "cmdline.h"
 #include "traps.h"
 #include "types.h"
 
@@ -337,6 +339,58 @@
 
 /* ------------------------------------------------------------------------- */
 
+int ane_log_level = 0; /* 0: none, 1: unstable only 2: all */
+int lxa_log_level = 0; /* 0: none, 1: unstable only 2: all */
+
+static int set_ane_log_level(int val, void *param)
+{
+    if ((val < 0) || (val > 2)) {
+        return -1;
+    }
+    ane_log_level = val;
+    return 0;
+}
+
+static int set_lxa_log_level(int val, void *param)
+{
+    if ((val < 0) || (val > 2)) {
+        return -1;
+    }
+    lxa_log_level = val;
+    return 0;
+}
+
+static const resource_int_t maincpu_resources_int[] = {
+    { "LogLevelANE", 0, RES_EVENT_NO, NULL,
+      &ane_log_level, set_ane_log_level, NULL },
+    { "LogLevelLXA", 0, RES_EVENT_NO, NULL,
+      &lxa_log_level, set_lxa_log_level, NULL },
+    RESOURCE_INT_LIST_END
+};
+
+int maincpu_resources_init(void)
+{
+    return resources_register_int(maincpu_resources_int);
+}
+
+static const cmdline_option_t cmdline_options_maincpu[] =
+{
+    { "-aneloglevel", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+      NULL, NULL, "LogLevelANE", NULL,
+      "<Type>", "Set ANE log level: (0: None, 1: Unstable, 2: All)" },
+    { "-lxaloglevel", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+      NULL, NULL, "LogLevelLXA", NULL,
+      "<Type>", "Set LXA log level: (0: None, 1: Unstable, 2: All)" },
+    CMDLINE_LIST_END
+};
+
+int maincpu_cmdline_options_init(void)
+{
+    return cmdline_register_options(cmdline_options_maincpu);
+}
+
+/* ------------------------------------------------------------------------- */
+
 monitor_interface_t *maincpu_monitor_interface_get(void)
 {
     maincpu_monitor_interface->cpu_regs = &maincpu_regs;
@@ -522,6 +576,8 @@
     machine_trigger_reset(MACHINE_RESET_MODE_RESET_CPU);
 
     while (1) {
+#define ANE_LOG_LEVEL ane_log_level
+#define LXA_LOG_LEVEL lxa_log_level
 #define CLK maincpu_clk
 #define RMW_FLAG maincpu_rmw_flag
 #define LAST_OPCODE_INFO last_opcode_info
@@ -645,7 +701,7 @@
 
 static char snap_module_name[] = "MAINCPU";
 #define SNAP_MAJOR 1
-#define SNAP_MINOR 2
+#define SNAP_MINOR 3
 
 int maincpu_snapshot_write_module(snapshot_t *s)
 {
@@ -665,7 +721,9 @@
         || SMW_B(m, MOS6510_REGS_GET_SP(&maincpu_regs)) < 0
         || SMW_W(m, (uint16_t)MOS6510_REGS_GET_PC(&maincpu_regs)) < 0
         || SMW_B(m, (uint8_t)MOS6510_REGS_GET_STATUS(&maincpu_regs)) < 0
-        || SMW_DW(m, (uint32_t)last_opcode_info) < 0) {
+        || SMW_DW(m, (uint32_t)last_opcode_info) < 0
+        || SMW_DW(m, (uint32_t)ane_log_level) < 0
+        || SMW_DW(m, (uint32_t)lxa_log_level) < 0) {
         goto fail;
     }
 
@@ -710,7 +768,9 @@
         || SMR_B(m, &sp) < 0
         || SMR_W(m, &pc) < 0
         || SMR_B(m, &status) < 0
-        || SMR_DW_UINT(m, &last_opcode_info) < 0) {
+        || SMR_DW_UINT(m, &last_opcode_info) < 0
+        || SMR_DW_INT(m, &ane_log_level) < 0
+        || SMR_DW_INT(m, &lxa_log_level) < 0) {
         goto fail;
     }
 

Modified: trunk/vice/src/vic20/vic20.c
===================================================================
--- trunk/vice/src/vic20/vic20.c	2024-07-31 17:04:35 UTC (rev 45253)
+++ trunk/vice/src/vic20/vic20.c	2024-07-31 20:28:35 UTC (rev 45254)
@@ -587,6 +587,11 @@
         init_resource_fail("traps");
         return -1;
     }
+    /* FIXME: we might want to move this into machine.c or init.c */
+    if (maincpu_resources_init() < 0) {
+        init_resource_fail("maincpu");
+        return -1;
+    }
     if (vic20_resources_init() < 0) {
         init_resource_fail("vic20");
         return -1;
@@ -797,6 +802,11 @@
         init_cmdline_options_fail("traps");
         return -1;
     }
+    /* FIXME: we might want to move this into machine.c or init.c */
+    if (maincpu_cmdline_options_init() < 0) {
+        init_cmdline_options_fail("maincpu");
+        return -1;
+    }
     if (vic20_cmdline_options_init() < 0) {
         init_cmdline_options_fail("vic20");
         return -1;

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:[45253] trunk/vice/src/sound.c

From: <gp...@us...> - 2024-07-31 17:04:37

Revision: 45253
          http://sourceforge.net/p/vice-emu/code/45253
Author:   gpz
Date:     2024-07-31 17:04:35 +0000 (Wed, 31 Jul 2024)
Log Message:
-----------
added an option that allows to skip soundchip emulation in warpmode (to increase performance).

Modified Paths:
--------------
    trunk/vice/src/sound.c

Modified: trunk/vice/src/sound.c
===================================================================
--- trunk/vice/src/sound.c	2024-07-31 15:44:44 UTC (rev 45252)
+++ trunk/vice/src/sound.c	2024-07-31 17:04:35 UTC (rev 45253)
@@ -531,6 +531,7 @@
 static int amp;
 static int fragment_size;
 static int output_option;
+static int sound_emulation_enabled_on_warp;
 
 /* divisors for fragment size calculation */
 static const int fragment_divisor[] = {
@@ -577,6 +578,14 @@
     return 0;
 }
 
+static int set_sound_emulation_enabled_on_warp(int value, void *param)
+{
+    int val = value ? 1 : 0;
+
+    sound_emulation_enabled_on_warp = val;
+    return 0;
+}
+
 static int set_playback_enabled(int value, void *param)
 {
     int val = value ? 1 : 0;
@@ -707,6 +716,8 @@
       (void *)&volume, set_volume, NULL },
     { "SoundOutput", ARCHDEP_SOUND_OUTPUT_MODE, RES_EVENT_NO, NULL,
       (void *)&output_option, set_output_option, NULL },
+    { "SoundEmulateOnWarp", 1, RES_EVENT_NO, NULL,
+      (void *)&sound_emulation_enabled_on_warp, set_sound_emulation_enabled_on_warp, NULL },
     RESOURCE_INT_LIST_END
 };
 
@@ -762,6 +773,9 @@
     { "-soundvolume", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
       NULL, NULL, "SoundVolume", NULL,
       "<Volume>", "Specify the sound volume (0..100)" },
+    { "-soundwarpmode", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+      NULL, NULL, "SoundEmulateOnWarp", NULL,
+      "<mode>", "Specify how to handle sound emulation in warp mode: (0: do not emulate the sound chips, 1: keep emulating the sound chips)" },
     CMDLINE_LIST_END
 };
 
@@ -1356,6 +1370,12 @@
         }
     }
 
+    /* if "disable sound emulation on warp" is enabled, exit */
+    if ((sound_emulation_enabled_on_warp == 0) && warp_mode_enabled) {
+        snddata.lastclk = maincpu_clk;
+        return 0;
+    }
+
     /* Handling of cycle based sound engines. */
     if (cycle_based) {
         delta_t = maincpu_clk - snddata.lastclk;

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:[45252] trunk/vice/src

From: <gp...@us...> - 2024-07-31 15:44:50

Revision: 45252
          http://sourceforge.net/p/vice-emu/code/45252
Author:   gpz
Date:     2024-07-31 15:44:44 +0000 (Wed, 31 Jul 2024)
Log Message:
-----------
disable ANE/LXA logging by default, add cmdline options only for c64 right now (WIP). Fixes the problem with terrible performance drops with code that uses those opcodes a lot (which was not quite expected...)

Modified Paths:
--------------
    trunk/vice/src/6510dtvcore.c
    trunk/vice/src/c64/c64.c
    trunk/vice/src/log.h
    trunk/vice/src/mainc64cpu.c
    trunk/vice/src/maincpu.c
    trunk/vice/src/maincpu.h

Modified: trunk/vice/src/6510dtvcore.c
===================================================================
--- trunk/vice/src/6510dtvcore.c	2024-07-19 20:53:52 UTC (rev 45251)
+++ trunk/vice/src/6510dtvcore.c	2024-07-31 15:44:44 UTC (rev 45252)
@@ -816,15 +816,19 @@
 #define ANE_MAGIC       0xef
 #define ANE_RDY_MAGIC   0xee
 
-/* FIXME: perhaps we should make the log level a user setting */
+#ifndef ANE_LOG_LEVEL
+#define ANE_LOG_LEVEL 0
+#warning "ANE_LOG_LEVEL not defined, disabling by default"
+#endif
+
 #if 1
-static int ane_log_level = 1; /* 0: none, 1: unstable only 2: all */
+/* static int ane_log_level = 1; */ /* 0: none, 1: unstable only 2: all */
 
 #define ANE_LOGGING(rdy)                                                                    \
     do {                                                                                    \
         unsigned int result = ((reg_a_read | (rdy ? ANE_RDY_MAGIC : ANE_MAGIC)) & reg_x & p1); \
         unsigned int unstablebits = ((reg_a_read ^ 0xff) & (p1 & reg_x));                   \
-        if ((ane_log_level == 2) || ((ane_log_level == 1) && (unstablebits != 0))) {        \
+        if ((ANE_LOG_LEVEL == 2) || ((ANE_LOG_LEVEL == 1) && (unstablebits != 0))) {        \
             if (unstablebits == 0) {                                                        \
                 log_warning(LOG_DEFAULT, "%04x ANE #$%02x ; A=$%02x X=$%02x -> A=$%02x%s",  \
                     reg_pc, p1, reg_a_read, reg_x, result, rdy ? " (RDY cycle)" : "");      \
@@ -1263,15 +1267,20 @@
 #define LXA_MAGIC       0xee    /* needs to be 0xee for wizball */
 #define LXA_RDY_MAGIC   0xee
 
+#ifndef LXA_LOG_LEVEL
+#define LXA_LOG_LEVEL 0
+#warning "LXA_LOG_LEVEL not defined, disabling by default"
+#endif
+
 /* FIXME: perhaps we should make the log level a user setting */
 #if 1
-static int lxa_log_level = 1; /* 0: none, 1: unstable only 2: all */
+/* static int lxa_log_level = 1; */ /* 0: none, 1: unstable only 2: all */
 
 #define LXA_LOGGING(rdy)                                                                    \
     do {                                                                                    \
         unsigned int result = (reg_a_read | (rdy ? LXA_RDY_MAGIC : LXA_MAGIC)) & p1;        \
         unsigned int unstablebits = (reg_a_read ^ 0xff) & p1;                               \
-        if ((lxa_log_level == 2) || ((lxa_log_level == 1) && (unstablebits != 0))) {        \
+        if ((LXA_LOG_LEVEL == 2) || ((LXA_LOG_LEVEL == 1) && (unstablebits != 0))) {        \
             if (unstablebits == 0) {                                                        \
                 log_warning(LOG_DEFAULT, "%04x LAX #$%02x ; A=$%02x -> A=X=$%02x%s",        \
                     reg_pc, p1, reg_a_read, result, rdy ? " (RDY cycle)" : "");             \

Modified: trunk/vice/src/c64/c64.c
===================================================================
--- trunk/vice/src/c64/c64.c	2024-07-19 20:53:52 UTC (rev 45251)
+++ trunk/vice/src/c64/c64.c	2024-07-31 15:44:44 UTC (rev 45252)
@@ -674,6 +674,11 @@
         init_resource_fail("rombanks");
         return -1;
     }
+    /* FIXME: we might want to move this into machine.c or init.c */
+    if (maincpu_resources_init() < 0) {
+        init_resource_fail("maincpu");
+        return -1;
+    }
     if (c64_resources_init() < 0) {
         init_resource_fail("c64");
         return -1;
@@ -938,6 +943,11 @@
         init_cmdline_options_fail("traps");
         return -1;
     }
+    /* FIXME: we might want to move this into machine.c or init.c */
+    if (maincpu_cmdline_options_init() < 0) {
+        init_cmdline_options_fail("maincpu");
+        return -1;
+    }
     if (c64_cmdline_options_init() < 0) {
         init_cmdline_options_fail("c64");
         return -1;

Modified: trunk/vice/src/log.h
===================================================================
--- trunk/vice/src/log.h	2024-07-19 20:53:52 UTC (rev 45251)
+++ trunk/vice/src/log.h	2024-07-31 15:44:44 UTC (rev 45252)
@@ -52,6 +52,7 @@
 int log_message(log_t log, const char *format, ...) VICE_ATTR_PRINTF2;
 int log_warning(log_t log, const char *format, ...) VICE_ATTR_PRINTF2;
 int log_error(log_t log, const char *format, ...) VICE_ATTR_PRINTF2;
+
 int log_debug(const char *format, ...) VICE_ATTR_PRINTF;
 int log_verbose(const char *format, ...) VICE_ATTR_PRINTF;
 

Modified: trunk/vice/src/mainc64cpu.c
===================================================================
--- trunk/vice/src/mainc64cpu.c	2024-07-19 20:53:52 UTC (rev 45251)
+++ trunk/vice/src/mainc64cpu.c	2024-07-31 15:44:44 UTC (rev 45252)
@@ -40,6 +40,7 @@
 #endif
 
 #include "debug.h"
+#include "cmdline.h"
 #include "interrupt.h"
 #include "machine.h"
 #include "mainc64cpu.h"
@@ -49,6 +50,7 @@
 #include "monitor.h"
 #include "mos6510.h"
 #include "reu.h"
+#include "resources.h"
 #include "snapshot.h"
 #include "traps.h"
 #include "types.h"
@@ -510,6 +512,58 @@
 
 /* ------------------------------------------------------------------------- */
 
+unsigned int ane_log_level = 0; /* 0: none, 1: unstable only 2: all */
+unsigned int lxa_log_level = 0; /* 0: none, 1: unstable only 2: all */
+
+static int set_ane_log_level(int val, void *param)
+{
+    if ((val < 0) || (val > 2)) {
+        return -1;
+    }
+    ane_log_level = val;
+    return 0;
+}
+
+static int set_lxa_log_level(int val, void *param)
+{
+    if ((val < 0) || (val > 2)) {
+        return -1;
+    }
+    lxa_log_level = val;
+    return 0;
+}
+
+static const resource_int_t maincpu_resources_int[] = {
+    { "LogLevelANE", 0, RES_EVENT_NO, NULL,
+      &ane_log_level, set_ane_log_level, NULL },
+    { "LogLevelLXA", 0, RES_EVENT_NO, NULL,
+      &lxa_log_level, set_lxa_log_level, NULL },
+    RESOURCE_INT_LIST_END
+};
+
+int maincpu_resources_init(void)
+{
+    return resources_register_int(maincpu_resources_int);
+}
+
+static const cmdline_option_t cmdline_options_maincpu[] =
+{
+    { "-aneloglevel", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+      NULL, NULL, "LogLevelANE", NULL,
+      "<Type>", "Set ANE log level: (0: None, 1: Unstable, 2: All)" },
+    { "-lxaloglevel", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+      NULL, NULL, "LogLevelLXA", NULL,
+      "<Type>", "Set LXA log level: (0: None, 1: Unstable, 2: All)" },
+    CMDLINE_LIST_END
+};
+
+int maincpu_cmdline_options_init(void)
+{
+    return cmdline_register_options(cmdline_options_maincpu);
+}
+
+/* ------------------------------------------------------------------------- */
+
 monitor_interface_t *maincpu_monitor_interface_get(void)
 {
     maincpu_monitor_interface->cpu_regs = &maincpu_regs;
@@ -695,6 +749,8 @@
     machine_trigger_reset(MACHINE_RESET_MODE_RESET_CPU);
 
     while (1) {
+#define ANE_LOG_LEVEL ane_log_level
+#define LXA_LOG_LEVEL lxa_log_level
 #define CLK maincpu_clk
 #define RMW_FLAG maincpu_rmw_flag
 #define LAST_OPCODE_INFO last_opcode_info
@@ -839,6 +895,8 @@
         || SMW_W(m, (uint16_t)MOS6510_REGS_GET_PC(&maincpu_regs)) < 0
         || SMW_B(m, (uint8_t)MOS6510_REGS_GET_STATUS(&maincpu_regs)) < 0
         || SMW_DW(m, (uint32_t)last_opcode_info) < 0
+        || SMW_DW(m, (uint32_t)ane_log_level) < 0
+        || SMW_DW(m, (uint32_t)lxa_log_level) < 0
         || SMW_DW(m, (uint32_t)maincpu_ba_low_flags) < 0) {
         goto fail;
     }
@@ -885,6 +943,8 @@
         || SMR_W(m, &pc) < 0
         || SMR_B(m, &status) < 0
         || SMR_DW_UINT(m, &last_opcode_info) < 0
+        || SMR_DW_UINT(m, &ane_log_level) < 0
+        || SMR_DW_UINT(m, &lxa_log_level) < 0
         || SMR_DW_INT(m, &maincpu_ba_low_flags) < 0) {
         goto fail;
     }

Modified: trunk/vice/src/maincpu.c
===================================================================
--- trunk/vice/src/maincpu.c	2024-07-19 20:53:52 UTC (rev 45251)
+++ trunk/vice/src/maincpu.c	2024-07-31 15:44:44 UTC (rev 45252)
@@ -49,6 +49,8 @@
 #endif
 #include "h6809regs.h"
 #include "snapshot.h"
+#include "resources.h"
+#include "cmdline.h"
 #include "traps.h"
 #include "types.h"
 
@@ -290,6 +292,29 @@
 
 /* ------------------------------------------------------------------------- */
 
+static const resource_int_t maincpu_resources_int[] = {
+    /* TODO: add resources */
+    RESOURCE_INT_LIST_END
+};
+
+int maincpu_resources_init(void)
+{
+    return resources_register_int(maincpu_resources_int);
+}
+
+static const cmdline_option_t cmdline_options_maincpu[] =
+{
+    /* TODO: add options */
+    CMDLINE_LIST_END
+};
+
+int maincpu_cmdline_options_init(void)
+{
+    return cmdline_register_options(cmdline_options_maincpu);
+}
+
+/* ------------------------------------------------------------------------- */
+
 monitor_interface_t *maincpu_monitor_interface_get(void)
 {
 #ifdef C64DTV

Modified: trunk/vice/src/maincpu.h
===================================================================
--- trunk/vice/src/maincpu.h	2024-07-19 20:53:52 UTC (rev 45251)
+++ trunk/vice/src/maincpu.h	2024-07-31 15:44:44 UTC (rev 45252)
@@ -93,6 +93,8 @@
 struct monitor_interface_s *maincpu_monitor_interface_get(void);
 int maincpu_snapshot_read_module(struct snapshot_s *s);
 int maincpu_snapshot_write_module(struct snapshot_s *s);
+int maincpu_resources_init(void);
+int maincpu_cmdline_options_init(void);
 
 void maincpu_set_pc(int);
 void maincpu_set_a(int);

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:[45251] testprogs/general/Lorenz -2.15

From: <gp...@us...> - 2024-07-19 20:53:55

Revision: 45251
          http://sourceforge.net/p/vice-emu/code/45251
Author:   gpz
Date:     2024-07-19 20:53:52 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
trap tests: use rom macros - this fixes the following trap tests for xplus4: trap 1, 2, 3, 9, 11. 13, patch by Uffe Jakobsen

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/Disk2.d64
    testprogs/general/Lorenz-2.15/Disk2DTV.d64
    testprogs/general/Lorenz-2.15/Disk2c128.d64
    testprogs/general/Lorenz-2.15/Disk2plus4.d64
    testprogs/general/Lorenz-2.15/Disk4.d64
    testprogs/general/Lorenz-2.15/Lorenz.d81
    testprogs/general/Lorenz-2.15/LorenzDTV.d81
    testprogs/general/Lorenz-2.15/LorenzPlus4.d81
    testprogs/general/Lorenz-2.15/Lorenznew.d81
    testprogs/general/Lorenz-2.15/src/Disk2.d64
    testprogs/general/Lorenz-2.15/src/Disk2DTV.d64
    testprogs/general/Lorenz-2.15/src/Disk2c128.d64
    testprogs/general/Lorenz-2.15/src/Disk2plus4.d64
    testprogs/general/Lorenz-2.15/src/Disk4.d64
    testprogs/general/Lorenz-2.15/src/Lorenz.d81
    testprogs/general/Lorenz-2.15/src/LorenzDTV.d81
    testprogs/general/Lorenz-2.15/src/LorenzPlus4.d81
    testprogs/general/Lorenz-2.15/src/Lorenznew.d81
    testprogs/general/Lorenz-2.15/src/trap1-15.s
    testprogs/general/Lorenz-2.15/src/trap1-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap1-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap1.prg
    testprogs/general/Lorenz-2.15/src/trap10-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap10-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap10.prg
    testprogs/general/Lorenz-2.15/src/trap10ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap10ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap10ane.prg
    testprogs/general/Lorenz-2.15/src/trap10lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap10lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap10lxa.prg
    testprogs/general/Lorenz-2.15/src/trap11-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap11-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap11.prg
    testprogs/general/Lorenz-2.15/src/trap11ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap11ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap11ane.prg
    testprogs/general/Lorenz-2.15/src/trap11lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap11lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap11lxa.prg
    testprogs/general/Lorenz-2.15/src/trap12-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap12-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap12.prg
    testprogs/general/Lorenz-2.15/src/trap12ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap12ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap12ane.prg
    testprogs/general/Lorenz-2.15/src/trap12lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap12lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap12lxa.prg
    testprogs/general/Lorenz-2.15/src/trap13-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap13-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap13.prg
    testprogs/general/Lorenz-2.15/src/trap13ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap13ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap13ane.prg
    testprogs/general/Lorenz-2.15/src/trap13lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap13lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap13lxa.prg
    testprogs/general/Lorenz-2.15/src/trap14-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap14-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap14.prg
    testprogs/general/Lorenz-2.15/src/trap14ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap14ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap14ane.prg
    testprogs/general/Lorenz-2.15/src/trap14lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap14lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap14lxa.prg
    testprogs/general/Lorenz-2.15/src/trap15-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap15-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap15.prg
    testprogs/general/Lorenz-2.15/src/trap15ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap15ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap15ane.prg
    testprogs/general/Lorenz-2.15/src/trap15lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap15lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap15lxa.prg
    testprogs/general/Lorenz-2.15/src/trap1ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap1ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap1ane.prg
    testprogs/general/Lorenz-2.15/src/trap1lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap1lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap1lxa.prg
    testprogs/general/Lorenz-2.15/src/trap2-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap2-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap2.prg
    testprogs/general/Lorenz-2.15/src/trap2ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap2ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap2ane.prg
    testprogs/general/Lorenz-2.15/src/trap2lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap2lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap2lxa.prg
    testprogs/general/Lorenz-2.15/src/trap3-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap3-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap3.prg
    testprogs/general/Lorenz-2.15/src/trap3ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap3ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap3ane.prg
    testprogs/general/Lorenz-2.15/src/trap3lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap3lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap3lxa.prg
    testprogs/general/Lorenz-2.15/src/trap4-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap4-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap4.prg
    testprogs/general/Lorenz-2.15/src/trap4ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap4ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap4ane.prg
    testprogs/general/Lorenz-2.15/src/trap4lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap4lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap4lxa.prg
    testprogs/general/Lorenz-2.15/src/trap5-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap5-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap5.prg
    testprogs/general/Lorenz-2.15/src/trap5ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap5ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap5ane.prg
    testprogs/general/Lorenz-2.15/src/trap5lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap5lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap5lxa.prg
    testprogs/general/Lorenz-2.15/src/trap6-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap6-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap6.prg
    testprogs/general/Lorenz-2.15/src/trap6ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap6ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap6ane.prg
    testprogs/general/Lorenz-2.15/src/trap6lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap6lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap6lxa.prg
    testprogs/general/Lorenz-2.15/src/trap7-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap7-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap7.prg
    testprogs/general/Lorenz-2.15/src/trap7ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap7ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap7ane.prg
    testprogs/general/Lorenz-2.15/src/trap7lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap7lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap7lxa.prg
    testprogs/general/Lorenz-2.15/src/trap8-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap8-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap8.prg
    testprogs/general/Lorenz-2.15/src/trap8ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap8ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap8ane.prg
    testprogs/general/Lorenz-2.15/src/trap8lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap8lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap8lxa.prg
    testprogs/general/Lorenz-2.15/src/trap9-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap9-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap9.prg
    testprogs/general/Lorenz-2.15/src/trap9ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap9ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap9ane.prg
    testprogs/general/Lorenz-2.15/src/trap9lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap9lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap9lxa.prg

Modified: testprogs/general/Lorenz-2.15/Disk2.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2c128.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Lorenz.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/LorenzDTV.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/LorenzPlus4.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Lorenznew.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2c128.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Lorenz.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/LorenzDTV.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/LorenzPlus4.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Lorenznew.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1-15.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/trap1-15.s	2024-07-19 18:56:09 UTC (rev 45250)
+++ testprogs/general/Lorenz-2.15/src/trap1-15.s	2024-07-19 20:53:52 UTC (rev 45251)
@@ -422,10 +422,7 @@
 
            jmp nostop
 return
-           lda #$37
-           sta 1
-           lda #$2f
-           sta 0
+           #RESET_MEMORY_MAP
            rts
 
 ok
@@ -666,14 +663,7 @@
            lda #>continue
            sta $ffff
            sei
-           lda 0
-           sta old0+1
-           lda #47
-           sta 0
-           lda 1
-           sta old1+1
-           and #$fd
-           sta 1
+           #SET_ROM_DISABLE
            lda #0
            pha
            lda #ab
@@ -689,12 +679,7 @@
            sty ya
            pla
            sta pa
-old1
-           lda #$11
-           sta 1
-old0
-           lda #$11
-           sta 0
+           #SET_ROM_ENABLE
            lda #db
            sta da
            cli

Modified: testprogs/general/Lorenz-2.15/src/trap1-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap10lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap11lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap12lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap13lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap14lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap15lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap1lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap2lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap3lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap4lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap5lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap6lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap7lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap8lxa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9ane-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9ane-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9ane.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9lxa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9lxa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/trap9lxa.prg
===================================================================
(Binary files differ)

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:[45250] trunk/vice/src/pet

From: <gp...@us...> - 2024-07-19 18:56:10

Revision: 45250
          http://sourceforge.net/p/vice-emu/code/45250
Author:   gpz
Date:     2024-07-19 18:56:09 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
remove commented-out code related to power grid frequency, PETs don't need this

Modified Paths:
--------------
    trunk/vice/src/pet/pet-cmdline-options.c
    trunk/vice/src/pet/pet-resources.c

Modified: trunk/vice/src/pet/pet-cmdline-options.c
===================================================================
--- trunk/vice/src/pet/pet-cmdline-options.c	2024-07-19 18:51:45 UTC (rev 45249)
+++ trunk/vice/src/pet/pet-cmdline-options.c	2024-07-19 18:56:09 UTC (rev 45250)
@@ -45,14 +45,6 @@
     { "-ntsc", SET_RESOURCE, CMDLINE_ATTRIB_NONE,
       NULL, NULL, "MachineVideoStandard", (void *)MACHINE_SYNC_NTSC,
       NULL, "Use NTSC sync factor" },
-#if 0 /* FIXME: do any of the PETs actually use the power grid frequency? */
-    { "-power50", SET_RESOURCE, CMDLINE_ATTRIB_NONE,
-      NULL, NULL, "MachinePowerFrequency", (void *)50,
-      NULL, "Use 50Hz Power-grid frequency" },
-    { "-power60", SET_RESOURCE, CMDLINE_ATTRIB_NONE,
-      NULL, NULL, "MachinePowerFrequency", (void *)60,
-      NULL, "Use 60Hz Power-grid frequency" },
-#endif
     { "-model", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
       pet_set_model, NULL, NULL, NULL,
       "<modelnumber>", "Specify PET model to emulate. (2001/3008/3016/3032/3032B/4016/4032/4032B/8032/8096/8296/SuperPET)" },

Modified: trunk/vice/src/pet/pet-resources.c
===================================================================
--- trunk/vice/src/pet/pet-resources.c	2024-07-19 18:51:45 UTC (rev 45249)
+++ trunk/vice/src/pet/pet-resources.c	2024-07-19 18:56:09 UTC (rev 45250)
@@ -47,11 +47,6 @@
 
 static int sync_factor;
 
-#if 0 /* FIXME: do any of the PETs actually use the power grid frequency? */
-/* Frequency of the power grid in Hz */
-static int power_freq = 1;
-#endif
-
 static int set_ramsize(int size, void *param);
 static int set_superpet_enabled(int value, void *param);
 
@@ -333,33 +328,6 @@
     return 0;
 }
 
-#if 0 /* FIXME: do any of the PETs actually use the power grid frequency? */
-static int set_power_freq(int val, void *param)
-{
-    int change_timing = 0;
-
-    if (power_freq != val) {
-        change_timing = 1;
-    }
-
-    switch (val) {
-        case 50:
-        case 60:
-            break;
-        default:
-            return -1;
-    }
-    power_freq = val;
-    if (change_timing) {
-        if (sync_factor > 0) {
-            machine_change_timing(sync_factor, val, 0);
-        }
-    }
-
-    return 0;
-}
-#endif
-
 static int set_h6809_rom_name(const char *val, void *param)
 {
     unsigned int num = vice_ptr_to_uint(param);
@@ -466,10 +434,6 @@
 static const resource_int_t resources_int[] = {
     { "MachineVideoStandard", MACHINE_SYNC_PAL, RES_EVENT_SAME, NULL,
       &sync_factor, set_sync_factor, NULL },
-#if 0 /* FIXME: do any of the PETs actually use the power grid frequency? */
-    { "MachinePowerFrequency", 50, RES_EVENT_SAME, NULL,
-      &power_freq, set_power_freq, NULL },
-#endif
     { "RamSize", 32, RES_EVENT_SAME, NULL,
       &petres.model.ramSize, set_ramsize, NULL },
     { "IOSize", 0x100, RES_EVENT_SAME, NULL,

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:[45249] trunk/vice/src/tools/car tconv/cartconv.c

From: <gp...@us...> - 2024-07-19 18:51:46

Revision: 45249
          http://sourceforge.net/p/vice-emu/code/45249
Author:   gpz
Date:     2024-07-19 18:51:45 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
check+warn about exrom/game also for non c64 cartridges

Modified Paths:
--------------
    trunk/vice/src/tools/cartconv/cartconv.c

Modified: trunk/vice/src/tools/cartconv/cartconv.c
===================================================================
--- trunk/vice/src/tools/cartconv/cartconv.c	2024-07-19 18:08:17 UTC (rev 45248)
+++ trunk/vice/src/tools/cartconv/cartconv.c	2024-07-19 18:51:45 UTC (rev 45249)
@@ -883,28 +883,43 @@
         return;
     }
 
-    if (crtid == 0) {
-        /* for generic cartridge having both zero is broken */
-        if ((headerbuffer[0x18] == 0x01) && (headerbuffer[0x19] == 0x01)) {
-            *exrom = "Warning: exrom in crt image set incorrectly.\n";
-            *game = "Warning: game in crt image set incorrectly.\n";
-        }
-    } else if ((crtid == CARTRIDGE_OCEAN) &&
-                (printbanks(name, 1) == CARTRIDGE_SIZE_512KB)) {
-        /* 512k Ocean uses a different startup config than whats in the table */
-        if (headerbuffer[0x18] != 0x00) {
-            *exrom = "Warning: exrom in crt image set incorrectly";
-        }
-        if (headerbuffer[0x19] != 0x01) {
-            *game = "Warning: game in crt image set incorrectly";
-        }
-    } else {
-        if (headerbuffer[0x18] != cart_info[crtid].exrom) {
-            *exrom = "Warning: exrom in crt image set incorrectly";
-        }
-        if (headerbuffer[0x19] != cart_info[crtid].game) {
-            *game = "Warning: game in crt image set incorrectly";
-        }
+    switch (machine_class) {
+        case VICE_MACHINE_C64:
+            if (crtid == 0) {
+                /* for generic cartridge having both zero is broken */
+                if ((headerbuffer[0x18] == 0x01) && (headerbuffer[0x19] == 0x01)) {
+                    *exrom = "Warning: exrom in crt image set incorrectly";
+                    *game = "Warning: game in crt image set incorrectly";
+                }
+            } else if ((crtid == CARTRIDGE_OCEAN) &&
+                        (printbanks(name, 1) == CARTRIDGE_SIZE_512KB)) {
+                /* 512k Ocean uses a different startup config than whats in the table */
+                if (headerbuffer[0x18] != 0x00) {
+                    *exrom = "Warning: exrom in crt image set incorrectly";
+                }
+                if (headerbuffer[0x19] != 0x01) {
+                    *game = "Warning: game in crt image set incorrectly";
+                }
+            } else {
+                if (headerbuffer[0x18] != cart_info[crtid].exrom) {
+                    *exrom = "Warning: exrom in crt image set incorrectly";
+                }
+                if (headerbuffer[0x19] != cart_info[crtid].game) {
+                    *game = "Warning: game in crt image set incorrectly";
+                }
+            }
+        break;
+        case VICE_MACHINE_C128:
+        case VICE_MACHINE_CBM5x0:
+        case VICE_MACHINE_CBM6x0:
+            /* game and exrom bytes are only used for C64 cartridges */
+            if (headerbuffer[0x18] != 0) {
+                *exrom = "Warning: exrom in crt image set incorrectly";
+            }
+            if (headerbuffer[0x19] != 0) {
+                *game = "Warning: game in crt image set incorrectly";
+            }
+        break;
     }
 }
 
@@ -943,8 +958,6 @@
                 } else {
                     modename = "?";
                 }
-
-                checkgameexrom(name, crtid, &game_warning, &exrom_warning);
             break;
             case VICE_MACHINE_C128:
                 if ((crtid >= 0) && (crtid <= CARTRIDGE_C128_LAST)) {
@@ -968,6 +981,7 @@
                 }
             break;
         }
+        checkgameexrom(name, crtid, &game_warning, &exrom_warning);
 
         memcpy(systemname, &headerbuffer[0], 0x10); systemname[0x10] = 0;
         if (systemname[0x0f] == 0x20) { systemname[0x0f] = 0; }
@@ -981,14 +995,15 @@
 
         if (machine_class == VICE_MACHINE_C64) {
             printf("Mode: exrom: %d game: %d (%s)\n", headerbuffer[0x18], headerbuffer[0x19], modename);
-            if (exrom_warning) {
-                printf("%s.\n", exrom_warning);
-            }
-            if (game_warning) {
-                printf("%s.\n", game_warning);
-            }
         }
 
+        if (exrom_warning) {
+            printf("%s.\n", exrom_warning);
+        }
+        if (game_warning) {
+            printf("%s.\n", game_warning);
+        }
+
         if (load_input_file(name) < 0) {
             printf("Error: this file seems broken.\n\n");
         }

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:[45248] trunk/vice/src/c128/cart /generic.c

From: <gp...@us...> - 2024-07-19 18:08:25

Revision: 45248
          http://sourceforge.net/p/vice-emu/code/45248
Author:   gpz
Date:     2024-07-19 18:08:17 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
better error output

Modified Paths:
--------------
    trunk/vice/src/c128/cart/generic.c

Modified: trunk/vice/src/c128/cart/generic.c
===================================================================
--- trunk/vice/src/c128/cart/generic.c	2024-07-19 16:30:12 UTC (rev 45247)
+++ trunk/vice/src/c128/cart/generic.c	2024-07-19 18:08:17 UTC (rev 45248)
@@ -123,7 +123,12 @@
             len *= 2;
         }
     } else {
-        log_error(LOG_DEFAULT, "invalid CRT CHIP address: $%04x", chip.start);
+        if ((chip.start != 0x8000) && (chip.start != 0xc000)) {
+            log_error(LOG_DEFAULT, "invalid CRT CHIP address: $%04x", chip.start);
+        }
+        if (chip.size > 0x4000) {
+            log_error(LOG_DEFAULT, "invalid CRT CHIP size: $%04x", chip.size);
+        }
         return -1;
     }
 
@@ -156,7 +161,12 @@
             len *= 2;
         }
     } else {
-        log_error(LOG_DEFAULT, "invalid CRT CHIP address: $%04x", chip.start);
+        if ((chip.start != 0x8000) && (chip.start != 0xc000)) {
+            log_error(LOG_DEFAULT, "invalid CRT CHIP address: $%04x", chip.start);
+        }
+        if (chip.size > 0x4000) {
+            log_error(LOG_DEFAULT, "invalid CRT CHIP size: $%04x", chip.size);
+        }
         return -1;
     }
     c128generic_common_attach();

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:[45247] trunk/vice/src

From: <pot...@us...> - 2024-07-19 16:30:14

Revision: 45247
          http://sourceforge.net/p/vice-emu/code/45247
Author:   pottendo
Date:     2024-07-19 16:30:12 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
WiC64: disable coloring in log-files, add background col; log.c: avoid closing stdout

Modified Paths:
--------------
    trunk/vice/src/log.c
    trunk/vice/src/userport/userport_wic64.c

Modified: trunk/vice/src/log.c
===================================================================
--- trunk/vice/src/log.c	2024-07-18 21:01:32 UTC (rev 45246)
+++ trunk/vice/src/log.c	2024-07-19 16:30:12 UTC (rev 45247)
@@ -116,7 +116,9 @@
     }
 
     if (log_file) {
-        fclose(log_file);
+        if (log_file != stdout) {
+            fclose(log_file);
+        }
         log_file_open();
     }
 

Modified: trunk/vice/src/userport/userport_wic64.c
===================================================================
--- trunk/vice/src/userport/userport_wic64.c	2024-07-18 21:01:32 UTC (rev 45246)
+++ trunk/vice/src/userport/userport_wic64.c	2024-07-19 16:30:12 UTC (rev 45247)
@@ -371,9 +371,9 @@
 #define INPUT_EXP_ARGS 6
 
 #define CONS_COL_NO ""
-#define CONS_COL_RED "\x1B[31m"
-#define CONS_COL_GREEN "\x1B[32m"
-#define CONS_COL_BLUE "\x1B[36m"
+#define CONS_COL_RED "\x1B[91;40m"
+#define CONS_COL_GREEN "\x1B[92;40m"
+#define CONS_COL_BLUE "\x1B[96;40m"
 #define CONS_COL_OFF "\033[0m\t\t"
 
 static const char *cmd2string[256];
@@ -708,13 +708,17 @@
     va_list args;
     const char *col_before = "";
     const char *col_after = "";
+    const char *lf;
 
     if (!wic64_logenabled) {
         return;
     }
-    if (col && wic64_colorize_log) {
-        col_before = col;
-        col_after = CONS_COL_OFF;
+    if (resources_get_string("LogFileName", &lf) != -1) {
+        if ((col && wic64_colorize_log) &&
+            ((*lf == '\0') || (strncmp(lf, "-", 1) == 0))) {
+            col_before = col;
+            col_after = CONS_COL_OFF;
+        }
     }
     va_start(args, fmt);
     vsnprintf(t, 256, fmt, args);
@@ -730,8 +734,9 @@
     char t[256];
     va_list args;
 
-    if (wic64_loglevel < lv)
+    if (wic64_loglevel < lv) {
         return;
+    }
     va_start(args, fmt);
     vsnprintf(t, 256, fmt, args);
     wic64_log(col, "%s", t);

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:[45246] trunk/vice/src

From: <gp...@us...> - 2024-07-18 21:01:35

Revision: 45246
          http://sourceforge.net/p/vice-emu/code/45246
Author:   gpz
Date:     2024-07-18 21:01:32 +0000 (Thu, 18 Jul 2024)
Log Message:
-----------
don't check for userport drive cable in xvic

Modified Paths:
--------------
    trunk/vice/src/c64/c64parallel.c
    trunk/vice/src/userport/userport.c

Modified: trunk/vice/src/c64/c64parallel.c
===================================================================
--- trunk/vice/src/c64/c64parallel.c	2024-07-18 20:17:43 UTC (rev 45245)
+++ trunk/vice/src/c64/c64parallel.c	2024-07-18 21:01:32 UTC (rev 45246)
@@ -65,6 +65,23 @@
 
 18, CB1     8, PC2      <- this one is NOT connected on the "21sec Backup" cable!
 39, CA2     B, FLAG2
+
+
+"Data Becker Floppy Express" cable
+
+VIA#1   User port plug
+ 2, PA0     C, PB0
+ 3, PA1     D, PB1
+ 4, PA2     E, PB2
+ 5, PA3     F, PB3
+ 6, PA4     H, PB4
+ 7, PA5     J, PB5
+ 8, PA6     K, PB6
+ 9, PA7     L, PB7
+
+39, CA2     B, FLAG2
+???         M, PA2      <- connects to extra logic on the floppy board
+
 */
 
 #define PC_PORT_STANDARD        0

Modified: trunk/vice/src/userport/userport.c
===================================================================
--- trunk/vice/src/userport/userport.c	2024-07-18 20:17:43 UTC (rev 45245)
+++ trunk/vice/src/userport/userport.c	2024-07-18 21:01:32 UTC (rev 45246)
@@ -302,6 +302,12 @@
     }
     userport_current_device = id;
 
+    /* FIXME: some emulators have userport devices, but no userport parallel
+              cable, remove this once it is implemented. */
+    if (machine_class == VICE_MACHINE_VIC20) {
+        return 0;
+    }
+
     /* check if any drive has a parallel cable enabled */
     for (dnr = 0; dnr < NUM_DISK_UNITS; dnr++) {
         int cable;

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:[45245] testprogs/testbench

From: <gp...@us...> - 2024-07-18 20:17:46

Revision: 45245
          http://sourceforge.net/p/vice-emu/code/45245
Author:   gpz
Date:     2024-07-18 20:17:43 +0000 (Thu, 18 Jul 2024)
Log Message:
-----------
updated testlists

Modified Paths:
--------------
    testprogs/testbench/c64-testlist.in
    testprogs/testbench/c64rmk2-testlist.txt
    testprogs/testbench/chameleon-testlist.txt
    testprogs/testbench/denise-testlist.txt
    testprogs/testbench/dtv-testlist.in
    testprogs/testbench/emu64-testlist.txt
    testprogs/testbench/hoxs64-testlist.txt
    testprogs/testbench/kernal64c128c64-testlist.txt
    testprogs/testbench/kernal64c64-testlist.txt
    testprogs/testbench/kernal64scpu64-testlist.txt
    testprogs/testbench/micro64-testlist.txt
    testprogs/testbench/u64-testlist.txt
    testprogs/testbench/x128c64-testlist.txt
    testprogs/testbench/x64-testlist.txt
    testprogs/testbench/x64dtv-testlist.txt
    testprogs/testbench/x64sc-testlist.txt
    testprogs/testbench/xscpu64-testlist.txt
    testprogs/testbench/yace-testlist.txt
    testprogs/testbench/z64kc128c64-testlist.txt
    testprogs/testbench/z64kc64-testlist.txt

Modified: testprogs/testbench/c64-testlist.in
===================================================================
--- testprogs/testbench/c64-testlist.in	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/c64-testlist.in	2024-07-18 20:17:43 UTC (rev 45245)
@@ -287,6 +287,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/c64rmk2-testlist.txt
===================================================================
--- testprogs/testbench/c64rmk2-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/c64rmk2-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -279,6 +279,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/chameleon-testlist.txt
===================================================================
--- testprogs/testbench/chameleon-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/chameleon-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/denise-testlist.txt
===================================================================
--- testprogs/testbench/denise-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/denise-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/dtv-testlist.in
===================================================================
--- testprogs/testbench/dtv-testlist.in	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/dtv-testlist.in	2024-07-18 20:17:43 UTC (rev 45245)
@@ -275,6 +275,40 @@
 ../general/Lorenz-2.15/src/,trap15-dtv.prg,exitcode,20000000,comment:broken test
 ../general/Lorenz-2.15/src/,trap16-dtv.prg,exitcode,21000000,comment:broken test
 ../general/Lorenz-2.15/src/,trap17-dtv.prg,exitcode,25000000,comment:broken test
+../general/Lorenz-2.15/src/,trap1-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap2-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap3-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap4-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap5-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap6-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap7-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap8-dtvane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap10-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap11-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap12-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap13-dtvane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14-dtvane.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap15-dtvane.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap16-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap17-dtvane.prg,exitcode,25000000,comment:broken test
+../general/Lorenz-2.15/src/,trap1-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap2-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap3-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap4-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap5-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap6-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap7-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap8-dtvlxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap10-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap11-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap12-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap13-dtvlxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14-dtvlxa.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap15-dtvlxa.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap16-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap17-dtvlxa.prg,exitcode,25000000,comment:broken test
 ../general/Lorenz-2.15/src/,branchwrap-dtv.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,mmufetch-dtv.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,mmu-dtv.prg,exitcode,36000000

Modified: testprogs/testbench/emu64-testlist.txt
===================================================================
--- testprogs/testbench/emu64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/emu64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/hoxs64-testlist.txt
===================================================================
--- testprogs/testbench/hoxs64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/hoxs64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/kernal64c128c64-testlist.txt
===================================================================
--- testprogs/testbench/kernal64c128c64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/kernal64c128c64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/kernal64c64-testlist.txt
===================================================================
--- testprogs/testbench/kernal64c64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/kernal64c64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/kernal64scpu64-testlist.txt
===================================================================
--- testprogs/testbench/kernal64scpu64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/kernal64scpu64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -17,8 +17,9 @@
 # CPU
 ################################################################################
 ../CPU/jeek816/,suite-a.prg,exitcode,10800000
-../interrupts/irqnoack/,ackcia.prg,exitcode,7000000
-../interrupts/irqnoack/,ackraster.prg,exitcode,7000000,expect:timeout
+# this needs to be tested on real SCPU
+#../interrupts/irqnoack/,ackcia.prg,exitcode,7000000
+#../interrupts/irqnoack/,ackraster.prg,exitcode,7000000,expect:timeout
 ################################################################################
 ../SCPU/scputest/,scputest.prg,interactive,0
 ../SCPU/scputest/,scputest-0.prg,exitcode,30000000

Modified: testprogs/testbench/micro64-testlist.txt
===================================================================
--- testprogs/testbench/micro64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/micro64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/u64-testlist.txt
===================================================================
--- testprogs/testbench/u64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/u64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -284,6 +284,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/x128c64-testlist.txt
===================================================================
--- testprogs/testbench/x128c64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/x128c64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/x64-testlist.txt
===================================================================
--- testprogs/testbench/x64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/x64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/x64dtv-testlist.txt
===================================================================
--- testprogs/testbench/x64dtv-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/x64dtv-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -27,8 +27,9 @@
 ################################################################################
 # CPU
 ################################################################################
-../interrupts/irqnoack/,ackcia.prg,exitcode,12000000
-../interrupts/irqnoack/,ackraster.prg,exitcode,12000000,expect:timeout
+# this needs to be tested on real DTV
+#../interrupts/irqnoack/,ackcia.prg,exitcode,12000000
+#../interrupts/irqnoack/,ackraster.prg,exitcode,12000000,expect:timeout
 ################################################################################
 # Lorenz Suite
 #
@@ -275,6 +276,40 @@
 ../general/Lorenz-2.15/src/,trap15-dtv.prg,exitcode,20000000,comment:broken test
 ../general/Lorenz-2.15/src/,trap16-dtv.prg,exitcode,21000000,comment:broken test
 ../general/Lorenz-2.15/src/,trap17-dtv.prg,exitcode,25000000,comment:broken test
+../general/Lorenz-2.15/src/,trap1-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap2-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap3-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap4-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap5-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap6-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap7-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap8-dtvane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap10-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap11-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap12-dtvane.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap13-dtvane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14-dtvane.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap15-dtvane.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap16-dtvane.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap17-dtvane.prg,exitcode,25000000,comment:broken test
+../general/Lorenz-2.15/src/,trap1-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap2-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap3-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap4-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap5-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap6-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap7-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap8-dtvlxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap10-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap11-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap12-dtvlxa.prg,exitcode,20500000,comment:broken test
+../general/Lorenz-2.15/src/,trap13-dtvlxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14-dtvlxa.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap15-dtvlxa.prg,exitcode,20000000,comment:broken test
+../general/Lorenz-2.15/src/,trap16-dtvlxa.prg,exitcode,21000000,comment:broken test
+../general/Lorenz-2.15/src/,trap17-dtvlxa.prg,exitcode,25000000,comment:broken test
 ../general/Lorenz-2.15/src/,branchwrap-dtv.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,mmufetch-dtv.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,mmu-dtv.prg,exitcode,36000000

Modified: testprogs/testbench/x64sc-testlist.txt
===================================================================
--- testprogs/testbench/x64sc-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/x64sc-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/xscpu64-testlist.txt
===================================================================
--- testprogs/testbench/xscpu64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/xscpu64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -17,8 +17,9 @@
 # CPU
 ################################################################################
 ../CPU/jeek816/,suite-a.prg,exitcode,10800000
-../interrupts/irqnoack/,ackcia.prg,exitcode,7000000
-../interrupts/irqnoack/,ackraster.prg,exitcode,7000000,expect:timeout
+# this needs to be tested on real SCPU
+#../interrupts/irqnoack/,ackcia.prg,exitcode,7000000
+#../interrupts/irqnoack/,ackraster.prg,exitcode,7000000,expect:timeout
 ################################################################################
 ../SCPU/scputest/,scputest.prg,interactive,0
 ../SCPU/scputest/,scputest-0.prg,exitcode,30000000

Modified: testprogs/testbench/yace-testlist.txt
===================================================================
--- testprogs/testbench/yace-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/yace-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/z64kc128c64-testlist.txt
===================================================================
--- testprogs/testbench/z64kc128c64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/z64kc128c64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

Modified: testprogs/testbench/z64kc64-testlist.txt
===================================================================
--- testprogs/testbench/z64kc64-testlist.txt	2024-07-18 20:00:13 UTC (rev 45244)
+++ testprogs/testbench/z64kc64-testlist.txt	2024-07-18 20:17:43 UTC (rev 45245)
@@ -288,6 +288,36 @@
 ../general/Lorenz-2.15/src/,trap13.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap14.prg,exitcode,20000000
 ../general/Lorenz-2.15/src/,trap15.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15ane.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap1lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap2lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap3lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap4lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap5lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap6lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap7lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap8lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap9lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap10lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap11lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap12lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap13lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap14lxa.prg,exitcode,20000000
+../general/Lorenz-2.15/src/,trap15lxa.prg,exitcode,20000000
 #FIXME: port trap16/17 to NTSC/NTSCOLD
 ../general/Lorenz-2.15/src/,trap16.prg,exitcode,21000000,vicii-pal
 ../general/Lorenz-2.15/src/,trap17.prg,exitcode,20000000,vicii-pal

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:[45244] testprogs/general/Lorenz -2.15

From: <gp...@us...> - 2024-07-18 20:00:18

Revision: 45244
          http://sourceforge.net/p/vice-emu/code/45244
Author:   gpz
Date:     2024-07-18 20:00:13 +0000 (Thu, 18 Jul 2024)
Log Message:
-----------
created extra versions of the trap tests, the regular one does no more perform ane/lxa. moved all tests that perform ane/lxa to a seperate disk, this helps to run the testsuite unattended on real hardware (where these could fail sometimes).

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/Disk2.d64
    testprogs/general/Lorenz-2.15/Disk2DTV.d64
    testprogs/general/Lorenz-2.15/Disk2c128.d64
    testprogs/general/Lorenz-2.15/Disk2plus4.d64
    testprogs/general/Lorenz-2.15/Disk3.d64
    testprogs/general/Lorenz-2.15/Disk3DTV.d64
    testprogs/general/Lorenz-2.15/Disk3new.d64
    testprogs/general/Lorenz-2.15/Lorenz.d81
    testprogs/general/Lorenz-2.15/LorenzDTV.d81
    testprogs/general/Lorenz-2.15/LorenzPlus4.d81
    testprogs/general/Lorenz-2.15/Lorenznew.d81
    testprogs/general/Lorenz-2.15/Makefile
    testprogs/general/Lorenz-2.15/readme.txt
    testprogs/general/Lorenz-2.15/src/Disk2.d64
    testprogs/general/Lorenz-2.15/src/Disk2DTV.d64
    testprogs/general/Lorenz-2.15/src/Disk2c128.d64
    testprogs/general/Lorenz-2.15/src/Disk2plus4.d64
    testprogs/general/Lorenz-2.15/src/Disk3.d64
    testprogs/general/Lorenz-2.15/src/Disk3DTV.d64
    testprogs/general/Lorenz-2.15/src/Disk3new.d64
    testprogs/general/Lorenz-2.15/src/Disk3plus4.d64
    testprogs/general/Lorenz-2.15/src/Lorenz.d81
    testprogs/general/Lorenz-2.15/src/LorenzDTV.d81
    testprogs/general/Lorenz-2.15/src/LorenzPlus4.d81
    testprogs/general/Lorenz-2.15/src/Lorenznew.d81
    testprogs/general/Lorenz-2.15/src/Makefile
    testprogs/general/Lorenz-2.15/src/Makefile.dtv
    testprogs/general/Lorenz-2.15/src/Makefile.plus4
    testprogs/general/Lorenz-2.15/src/arrb-dtv.prg
    testprogs/general/Lorenz-2.15/src/arrb-plus4.prg
    testprogs/general/Lorenz-2.15/src/arrb.prg
    testprogs/general/Lorenz-2.15/src/arrb.s
    testprogs/general/Lorenz-2.15/src/cia2tb-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia2tb.prg
    testprogs/general/Lorenz-2.15/src/cia2tb.s
    testprogs/general/Lorenz-2.15/src/cia2tbnew.prg
    testprogs/general/Lorenz-2.15/src/lxab-dtv.prg
    testprogs/general/Lorenz-2.15/src/lxab-plus4.prg
    testprogs/general/Lorenz-2.15/src/lxab.prg
    testprogs/general/Lorenz-2.15/src/lxab.s
    testprogs/general/Lorenz-2.15/src/nextdisk.s
    testprogs/general/Lorenz-2.15/src/trap-table.s
    testprogs/general/Lorenz-2.15/src/trap1-15.s
    testprogs/general/Lorenz-2.15/src/trap1-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap1-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap1.prg
    testprogs/general/Lorenz-2.15/src/trap10-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap10-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap10.prg
    testprogs/general/Lorenz-2.15/src/trap11-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap11-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap11.prg
    testprogs/general/Lorenz-2.15/src/trap12-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap12-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap12.prg
    testprogs/general/Lorenz-2.15/src/trap13-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap13-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap13.prg
    testprogs/general/Lorenz-2.15/src/trap14-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap14-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap14.prg
    testprogs/general/Lorenz-2.15/src/trap15-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap15-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap15.prg
    testprogs/general/Lorenz-2.15/src/trap16-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap16-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap16.prg
    testprogs/general/Lorenz-2.15/src/trap16.s
    testprogs/general/Lorenz-2.15/src/trap17-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap17-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap17.prg
    testprogs/general/Lorenz-2.15/src/trap17.s
    testprogs/general/Lorenz-2.15/src/trap2-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap2-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap2.prg
    testprogs/general/Lorenz-2.15/src/trap3-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap3-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap3.prg
    testprogs/general/Lorenz-2.15/src/trap4-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap4-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap4.prg
    testprogs/general/Lorenz-2.15/src/trap5-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap5-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap5.prg
    testprogs/general/Lorenz-2.15/src/trap6-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap6-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap6.prg
    testprogs/general/Lorenz-2.15/src/trap7-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap7-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap7.prg
    testprogs/general/Lorenz-2.15/src/trap8-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap8-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap8.prg
    testprogs/general/Lorenz-2.15/src/trap9-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap9-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap9.prg

Added Paths:
-----------
    testprogs/general/Lorenz-2.15/Disk3plus4.d64
    testprogs/general/Lorenz-2.15/Disk4.d64
    testprogs/general/Lorenz-2.15/Disk4DTV.d64
    testprogs/general/Lorenz-2.15/Disk4plus4.d64
    testprogs/general/Lorenz-2.15/src/Disk4.d64
    testprogs/general/Lorenz-2.15/src/Disk4DTV.d64
    testprogs/general/Lorenz-2.15/src/Disk4plus4.d64
    testprogs/general/Lorenz-2.15/src/nextdisk3-dtv.prg
    testprogs/general/Lorenz-2.15/src/nextdisk3-plus4.prg
    testprogs/general/Lorenz-2.15/src/nextdisk3.prg
    testprogs/general/Lorenz-2.15/src/trap10ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap10ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap10ane.prg
    testprogs/general/Lorenz-2.15/src/trap10lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap10lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap10lxa.prg
    testprogs/general/Lorenz-2.15/src/trap11ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap11ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap11ane.prg
    testprogs/general/Lorenz-2.15/src/trap11lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap11lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap11lxa.prg
    testprogs/general/Lorenz-2.15/src/trap12ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap12ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap12ane.prg
    testprogs/general/Lorenz-2.15/src/trap12lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap12lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap12lxa.prg
    testprogs/general/Lorenz-2.15/src/trap13ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap13ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap13ane.prg
    testprogs/general/Lorenz-2.15/src/trap13lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap13lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap13lxa.prg
    testprogs/general/Lorenz-2.15/src/trap14ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap14ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap14ane.prg
    testprogs/general/Lorenz-2.15/src/trap14lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap14lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap14lxa.prg
    testprogs/general/Lorenz-2.15/src/trap15ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap15ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap15ane.prg
    testprogs/general/Lorenz-2.15/src/trap15lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap15lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap15lxa.prg
    testprogs/general/Lorenz-2.15/src/trap16ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap16ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap16ane.prg
    testprogs/general/Lorenz-2.15/src/trap16lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap16lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap16lxa.prg
    testprogs/general/Lorenz-2.15/src/trap17ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap17ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap17ane.prg
    testprogs/general/Lorenz-2.15/src/trap17lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap17lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap17lxa.prg
    testprogs/general/Lorenz-2.15/src/trap1ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap1ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap1ane.prg
    testprogs/general/Lorenz-2.15/src/trap1lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap1lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap1lxa.prg
    testprogs/general/Lorenz-2.15/src/trap2ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap2ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap2ane.prg
    testprogs/general/Lorenz-2.15/src/trap2lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap2lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap2lxa.prg
    testprogs/general/Lorenz-2.15/src/trap3ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap3ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap3ane.prg
    testprogs/general/Lorenz-2.15/src/trap3lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap3lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap3lxa.prg
    testprogs/general/Lorenz-2.15/src/trap4ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap4ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap4ane.prg
    testprogs/general/Lorenz-2.15/src/trap4lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap4lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap4lxa.prg
    testprogs/general/Lorenz-2.15/src/trap5ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap5ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap5ane.prg
    testprogs/general/Lorenz-2.15/src/trap5lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap5lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap5lxa.prg
    testprogs/general/Lorenz-2.15/src/trap6ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap6ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap6ane.prg
    testprogs/general/Lorenz-2.15/src/trap6lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap6lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap6lxa.prg
    testprogs/general/Lorenz-2.15/src/trap7ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap7ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap7ane.prg
    testprogs/general/Lorenz-2.15/src/trap7lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap7lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap7lxa.prg
    testprogs/general/Lorenz-2.15/src/trap8ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap8ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap8ane.prg
    testprogs/general/Lorenz-2.15/src/trap8lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap8lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap8lxa.prg
    testprogs/general/Lorenz-2.15/src/trap9ane-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap9ane-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap9ane.prg
    testprogs/general/Lorenz-2.15/src/trap9lxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap9lxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap9lxa.prg

Modified: testprogs/general/Lorenz-2.15/Disk2.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2c128.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk3.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk3DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk3new.d64
===================================================================
(Binary files differ)

Added: testprogs/general/Lorenz-2.15/Disk3plus4.d64
===================================================================
(Binary files differ)

Index: testprogs/general/Lorenz-2.15/Disk3plus4.d64
===================================================================
--- testprogs/general/Lorenz-2.15/Disk3plus4.d64	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/Disk3plus4.d64	2024-07-18 20:00:13 UTC (rev 45244)

Property changes on: testprogs/general/Lorenz-2.15/Disk3plus4.d64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: testprogs/general/Lorenz-2.15/Disk4.d64
===================================================================
(Binary files differ)

Index: testprogs/general/Lorenz-2.15/Disk4.d64
===================================================================
--- testprogs/general/Lorenz-2.15/Disk4.d64	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/Disk4.d64	2024-07-18 20:00:13 UTC (rev 45244)

Property changes on: testprogs/general/Lorenz-2.15/Disk4.d64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: testprogs/general/Lorenz-2.15/Disk4DTV.d64
===================================================================
(Binary files differ)

Index: testprogs/general/Lorenz-2.15/Disk4DTV.d64
===================================================================
--- testprogs/general/Lorenz-2.15/Disk4DTV.d64	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/Disk4DTV.d64	2024-07-18 20:00:13 UTC (rev 45244)

Property changes on: testprogs/general/Lorenz-2.15/Disk4DTV.d64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: testprogs/general/Lorenz-2.15/Disk4plus4.d64
===================================================================
(Binary files differ)

Index: testprogs/general/Lorenz-2.15/Disk4plus4.d64
===================================================================
--- testprogs/general/Lorenz-2.15/Disk4plus4.d64	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/Disk4plus4.d64	2024-07-18 20:00:13 UTC (rev 45244)

Property changes on: testprogs/general/Lorenz-2.15/Disk4plus4.d64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: testprogs/general/Lorenz-2.15/Lorenz.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/LorenzDTV.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/LorenzPlus4.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Lorenznew.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Makefile
===================================================================
--- testprogs/general/Lorenz-2.15/Makefile	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/Makefile	2024-07-18 20:00:13 UTC (rev 45244)
@@ -11,6 +11,7 @@
 	cp src/Disk2c128.d64 .
 	cp src/Disk3.d64 .
 	cp src/Disk3new.d64 .
+	cp src/Disk4.d64 .
 	cp src/Lorenz.d81 .
 	cp src/Lorenznew.d81 .
 	
@@ -19,6 +20,7 @@
 	cp src/Disk1DTV.d64 .
 	cp src/Disk2DTV.d64 .
 	cp src/Disk3DTV.d64 .
+	cp src/Disk4DTV.d64 .
 	cp src/LorenzDTV.d81 .
 	
 plus4:
@@ -25,6 +27,8 @@
 	make -C src -f Makefile.plus4
 	cp src/Disk1plus4.d64 .
 	cp src/Disk2plus4.d64 .
+	cp src/Disk3plus4.d64 .
+	cp src/Disk4plus4.d64 .
 	cp src/LorenzPlus4.d81 .
 	
 disk3:	
@@ -48,14 +52,18 @@
 	$(RM) Disk2c128.d64
 	$(RM) Disk3.d64
 	$(RM) Disk3new.d64
+	$(RM) Disk4.d64
 	$(RM) Lorenz.d81
 	$(RM) Lorenznew.d81
 	$(RM) Disk1DTV.d64
 	$(RM) Disk2DTV.d64
 	$(RM) Disk3DTV.d64
+	$(RM) Disk4DTV.d64
 	$(RM) LorenzDTV.d81
 	$(RM) Disk1plus4.d64
 	$(RM) Disk2plus4.d64
+	$(RM) Disk3plus4.d64
+	$(RM) Disk4plus4.d64
 	$(RM) LorenzPlus4.d81
 	$(RM) *~
 

Modified: testprogs/general/Lorenz-2.15/readme.txt
===================================================================
--- testprogs/general/Lorenz-2.15/readme.txt	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/readme.txt	2024-07-18 20:00:13 UTC (rev 45244)
@@ -125,6 +125,11 @@
 match. Wait a few minutes, letting the computer "warm up", before you run the
 test again eventually (the "magic value" is temperature dependent).
 
+All tests that perform the unstable "ANE" or "LXA" opcodes were moved to an
+extra disk (disk4) which will run after all other thests. This helps with
+running the testsuite unattended on real hardware, and lets you easily re-run
+all these "unstable" tests.
+
 NOTE: if any of the above tests fail - in particular on real CPUs - you might
 want to check the additional tests from the VICE test repository, located in:
 

Modified: testprogs/general/Lorenz-2.15/src/Disk2.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2c128.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3new.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3plus4.d64
===================================================================
(Binary files differ)

Added: testprogs/general/Lorenz-2.15/src/Disk4.d64
===================================================================
(Binary files differ)

Index: testprogs/general/Lorenz-2.15/src/Disk4.d64
===================================================================
--- testprogs/general/Lorenz-2.15/src/Disk4.d64	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/Disk4.d64	2024-07-18 20:00:13 UTC (rev 45244)

Property changes on: testprogs/general/Lorenz-2.15/src/Disk4.d64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: testprogs/general/Lorenz-2.15/src/Disk4DTV.d64
===================================================================
(Binary files differ)

Index: testprogs/general/Lorenz-2.15/src/Disk4DTV.d64
===================================================================
--- testprogs/general/Lorenz-2.15/src/Disk4DTV.d64	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/Disk4DTV.d64	2024-07-18 20:00:13 UTC (rev 45244)

Property changes on: testprogs/general/Lorenz-2.15/src/Disk4DTV.d64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: testprogs/general/Lorenz-2.15/src/Disk4plus4.d64
===================================================================
(Binary files differ)

Index: testprogs/general/Lorenz-2.15/src/Disk4plus4.d64
===================================================================
--- testprogs/general/Lorenz-2.15/src/Disk4plus4.d64	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/Disk4plus4.d64	2024-07-18 20:00:13 UTC (rev 45244)

Property changes on: testprogs/general/Lorenz-2.15/src/Disk4plus4.d64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: testprogs/general/Lorenz-2.15/src/Lorenz.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/LorenzDTV.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/LorenzPlus4.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Lorenznew.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Makefile
===================================================================
--- testprogs/general/Lorenz-2.15/src/Makefile	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/Makefile	2024-07-18 20:00:13 UTC (rev 45244)
@@ -229,8 +229,6 @@
 	axsix.prg \
 	alrb.prg \
 	arrb.prg \
-	aneb.prg \
-	lxab.prg \
 	sbxb.prg \
 	shaay.prg \
 	shaiy.prg \
@@ -389,11 +387,7 @@
 	  cia1ta.prg \
 	  cia1tb.prg \
 	  cia2ta.prg \
-	  cia2tb.prg \
-	\
-	finish.prg \
-	\
-	template.prg
+	  cia2tb.prg
 
 DISK3PROGSNEW = \
 	  irqnew.prg \
@@ -415,23 +409,65 @@
 	  cia1tanew.prg \
 	  cia1tbnew.prg \
 	  cia2tanew.prg \
-	  cia2tbnew.prg \
+	  cia2tbnew.prg
+
+DISK3NEXT = aneb.prg
+
+DISK4PROGS = \
+	aneb.prg \
+	lxab.prg \
 	\
+	trap1ane.prg \
+	trap2ane.prg \
+	trap3ane.prg \
+	trap4ane.prg \
+	trap5ane.prg \
+	trap6ane.prg \
+	trap7ane.prg \
+	trap8ane.prg \
+	trap9ane.prg \
+	trap10ane.prg \
+	trap11ane.prg \
+	trap12ane.prg \
+	trap13ane.prg \
+	trap14ane.prg \
+	trap15ane.prg \
+	trap16ane.prg \
+	trap17ane.prg \
+	\
+	trap1lxa.prg \
+	trap2lxa.prg \
+	trap3lxa.prg \
+	trap4lxa.prg \
+	trap5lxa.prg \
+	trap6lxa.prg \
+	trap7lxa.prg \
+	trap8lxa.prg \
+	trap9lxa.prg \
+	trap10lxa.prg \
+	trap11lxa.prg \
+	trap12lxa.prg \
+	trap13lxa.prg \
+	trap14lxa.prg \
+	trap15lxa.prg \
+	trap16lxa.prg \
+	trap17lxa.prg \
+	\
 	finish.prg \
 	\
 	template.prg
 
-ALLPROGSOLD = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD)
-ALLPROGSNEW = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSNEW)
+ALLPROGSOLD = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD) # $(DISK4PROGS)
+ALLPROGSNEW = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSNEW) # $(DISK4PROGS)
 
-ALLPROGS = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD) $(DISK3PROGSNEW)
-ALLDISKS = Disk1.d64 Disk2.d64 Disk3.d64 Disk3new.d64 Lorenz.d81 Lorenznew.d81
+ALLPROGS = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD) $(DISK3PROGSNEW) $(DISK4PROGS)
+ALLDISKS = Disk1.d64 Disk2.d64 Disk3.d64 Disk3new.d64 Disk4.d64 Lorenz.d81 Lorenznew.d81
 
-ALLPROGSOLD128 = $(DISK1PROGS) $(DISK2PROGS128) $(DISK3PROGSOLD)
-ALLPROGSNEW128 = $(DISK1PROGS) $(DISK2PROGS128) $(DISK3PROGSNEW)
+ALLPROGSOLD128 = $(DISK1PROGS) $(DISK2PROGS128) $(DISK3PROGSOLD) $(DISK4PROGS)
+ALLPROGSNEW128 = $(DISK1PROGS) $(DISK2PROGS128) $(DISK3PROGSNEW) $(DISK4PROGS)
 
-ALLPROGS128 = $(DISK1PROGS) $(DISK2PROGS128) $(DISK3PROGSOLD) $(DISK3PROGSNEW)
-ALLDISKS128 = Disk1.d64 Disk2c128.d64 Disk3.d64 Disk3new.d64
+ALLPROGS128 = $(DISK1PROGS) $(DISK2PROGS128) $(DISK3PROGSOLD) $(DISK3PROGSNEW) $(DISK4PROGS)
+ALLDISKS128 = Disk1.d64 Disk2c128.d64 Disk3.d64 Disk4.d64 Disk3new.d64
 
 ASFLAGS=-C -T -a -q -I ./common -D TARGET=0
 
@@ -443,40 +479,110 @@
 	64tass $(ASFLAGS) -D ISC128C64=1 -i cpuport.s -o cpuport128.prg
 
 trap1.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=1 -i trap1-15.s -o trap1.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=1 -i trap1-15.s -o trap1.prg
 trap2.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=2 -i trap1-15.s -o trap2.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=2 -i trap1-15.s -o trap2.prg
 trap3.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=3 -i trap1-15.s -o trap3.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=3 -i trap1-15.s -o trap3.prg
 trap4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=4 -i trap1-15.s -o trap4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=4 -i trap1-15.s -o trap4.prg
 trap5.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=5 -i trap1-15.s -o trap5.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=5 -i trap1-15.s -o trap5.prg
 trap6.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=6 -i trap1-15.s -o trap6.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=6 -i trap1-15.s -o trap6.prg
 trap7.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=7 -i trap1-15.s -o trap7.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=7 -i trap1-15.s -o trap7.prg
 trap8.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=8 -i trap1-15.s -o trap8.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=8 -i trap1-15.s -o trap8.prg
 trap9.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=9 -i trap1-15.s -o trap9.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=9 -i trap1-15.s -o trap9.prg
 trap10.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=10 -i trap1-15.s -o trap10.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=10 -i trap1-15.s -o trap10.prg
 trap11.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=11 -i trap1-15.s -o trap11.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=11 -i trap1-15.s -o trap11.prg
 trap12.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=12 -i trap1-15.s -o trap12.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=12 -i trap1-15.s -o trap12.prg
 trap13.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=13 -i trap1-15.s -o trap13.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=13 -i trap1-15.s -o trap13.prg
 trap14.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=14 -i trap1-15.s -o trap14.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=14 -i trap1-15.s -o trap14.prg
 trap15.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=15 -i trap1-15.s -o trap15.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=15 -i trap1-15.s -o trap15.prg
 trap16.prg: trap16.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=16 -i trap16.s -o trap16.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=16 -i trap16.s -o trap16.prg
 trap17.prg: trap17.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=17 -i trap17.s -o trap17.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=17 -i trap17.s -o trap17.prg
 
+trap1ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=1 -i trap1-15.s -o trap1ane.prg
+trap2ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=2 -i trap1-15.s -o trap2ane.prg
+trap3ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=3 -i trap1-15.s -o trap3ane.prg
+trap4ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=4 -i trap1-15.s -o trap4ane.prg
+trap5ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=5 -i trap1-15.s -o trap5ane.prg
+trap6ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=6 -i trap1-15.s -o trap6ane.prg
+trap7ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=7 -i trap1-15.s -o trap7ane.prg
+trap8ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=8 -i trap1-15.s -o trap8ane.prg
+trap9ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=9 -i trap1-15.s -o trap9ane.prg
+trap10ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=10 -i trap1-15.s -o trap10ane.prg
+trap11ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=11 -i trap1-15.s -o trap11ane.prg
+trap12ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=12 -i trap1-15.s -o trap12ane.prg
+trap13ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=13 -i trap1-15.s -o trap13ane.prg
+trap14ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=14 -i trap1-15.s -o trap14ane.prg
+trap15ane.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=15 -i trap1-15.s -o trap15ane.prg
+trap16ane.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=16 -i trap16.s -o trap16ane.prg
+trap17ane.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=17 -i trap17.s -o trap17ane.prg
+
+trap1lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=1 -i trap1-15.s -o trap1lxa.prg
+trap2lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=2 -i trap1-15.s -o trap2lxa.prg
+trap3lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=3 -i trap1-15.s -o trap3lxa.prg
+trap4lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=4 -i trap1-15.s -o trap4lxa.prg
+trap5lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=5 -i trap1-15.s -o trap5lxa.prg
+trap6lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=6 -i trap1-15.s -o trap6lxa.prg
+trap7lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=7 -i trap1-15.s -o trap7lxa.prg
+trap8lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=8 -i trap1-15.s -o trap8lxa.prg
+trap9lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=9 -i trap1-15.s -o trap9lxa.prg
+trap10lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=10 -i trap1-15.s -o trap10lxa.prg
+trap11lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=11 -i trap1-15.s -o trap11lxa.prg
+trap12lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=12 -i trap1-15.s -o trap12lxa.prg
+trap13lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=13 -i trap1-15.s -o trap13lxa.prg
+trap14lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=14 -i trap1-15.s -o trap14lxa.prg
+trap15lxa.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=15 -i trap1-15.s -o trap15lxa.prg
+trap16lxa.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=16 -i trap16.s -o trap16lxa.prg
+trap17lxa.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=17 -i trap17.s -o trap17lxa.prg
+
 irq.prg: irq.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEWCIA=0 -i irq.s -o irq.prg
 irqnew.prg: irq.s $(COMMONSRC)
@@ -518,6 +624,8 @@
 	64tass $(ASFLAGS) -D NEXT=1 -i nextdisk.s -o nextdisk1.prg
 nextdisk2.prg: nextdisk.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEXT=2 -i nextdisk.s -o nextdisk2.prg
+nextdisk3.prg: nextdisk.s $(COMMONSRC)
+	64tass $(ASFLAGS) -D NEXT=3 -i nextdisk.s -o nextdisk3.prg
 
 %.prg : %.s $(COMMONSRC)
 	64tass $(ASFLAGS) -i "$*.s" -o "$*.prg"
@@ -536,17 +644,25 @@
 	done
 	c1541 Disk2.d64 -write "nextdisk2.prg" "$(basename $(DISK2NEXT))" > /dev/null
 #	c1541 Disk2.d64 -list
-Disk3.d64: $(DISK3PROGSOLD)
+Disk3.d64: $(DISK3PROGSOLD) nextdisk3.prg
 	c1541 -format "test suite 2.15+,#3" d64 Disk3.d64 > /dev/null
 	for I in $(basename $(DISK3PROGSOLD)); do \
 		c1541 Disk3.d64 -write "$$I.prg" "$$I" > /dev/null; \
 	done
+	c1541 Disk3.d64 -write "nextdisk3.prg" "$(basename $(DISK3NEXT))" > /dev/null
 #	c1541 Disk3.d64 -list
-Disk3new.d64: $(DISK3PROGSNEW)
+Disk4.d64: $(DISK4PROGS)
+	c1541 -format "test suite 2.15+,#4" d64 Disk4.d64 > /dev/null
+	for I in $(basename $(DISK4PROGS)); do \
+		c1541 Disk4.d64 -write "$$I.prg" "$$I" > /dev/null; \
+	done
+#	c1541 Disk4.d64 -list
+Disk3new.d64: $(DISK3PROGSNEW) nextdisk3.prg
 	c1541 -format "test suite 2.15+,#3" d64 Disk3new.d64 > /dev/null
 	for I in $(basename $(DISK3PROGSNEW)); do \
 		c1541 Disk3new.d64 -write "$$I.prg" $$(echo "$$I" | sed -e 's:new$$::') > /dev/null; \
 	done
+	c1541 Disk3new.d64 -write "nextdisk3.prg" "$(basename $(DISK3NEXT))" > /dev/null
 #	c1541 Disk3new.d64 -list
 Lorenz.d81: $(ALLPROGSOLD)
 	c1541 -format "test suite 2.15+,#1" d81 Lorenz.d81 > /dev/null

Modified: testprogs/general/Lorenz-2.15/src/Makefile.dtv
===================================================================
--- testprogs/general/Lorenz-2.15/src/Makefile.dtv	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/Makefile.dtv	2024-07-18 20:00:13 UTC (rev 45244)
@@ -229,8 +229,6 @@
 	axsix-dtv.prg \
 	alrb-dtv.prg \
 	arrb-dtv.prg \
-	aneb-dtv.prg \
-	lxab-dtv.prg \
 	sbxb-dtv.prg \
 	shaay-dtv.prg \
 	shaiy-dtv.prg \
@@ -286,16 +284,58 @@
 	  cia1ta-dtv.prg \
 	  cia1tb-dtv.prg \
 	  cia2ta-dtv.prg \
-	  cia2tb-dtv.prg \
+	  cia2tb-dtv.prg
+
+DISK3NEXT = aneb-dtv.prg
+
+DISK4PROGS = \
+	aneb-dtv.prg \
+	lxab-dtv.prg \
 	\
+	trap1ane-dtv.prg \
+	trap2ane-dtv.prg \
+	trap3ane-dtv.prg \
+	trap4ane-dtv.prg \
+	trap5ane-dtv.prg \
+	trap6ane-dtv.prg \
+	trap7ane-dtv.prg \
+	trap8ane-dtv.prg \
+	trap9ane-dtv.prg \
+	trap10ane-dtv.prg \
+	trap11ane-dtv.prg \
+	trap12ane-dtv.prg \
+	trap13ane-dtv.prg \
+	trap14ane-dtv.prg \
+	trap15ane-dtv.prg \
+	trap16ane-dtv.prg \
+	trap17ane-dtv.prg \
+	\
+	trap1lxa-dtv.prg \
+	trap2lxa-dtv.prg \
+	trap3lxa-dtv.prg \
+	trap4lxa-dtv.prg \
+	trap5lxa-dtv.prg \
+	trap6lxa-dtv.prg \
+	trap7lxa-dtv.prg \
+	trap8lxa-dtv.prg \
+	trap9lxa-dtv.prg \
+	trap10lxa-dtv.prg \
+	trap11lxa-dtv.prg \
+	trap12lxa-dtv.prg \
+	trap13lxa-dtv.prg \
+	trap14lxa-dtv.prg \
+	trap15lxa-dtv.prg \
+	trap16lxa-dtv.prg \
+	trap17lxa-dtv.prg \
+	\
 	finish-dtv.prg \
 	\
 	template-dtv.prg
 
-ALLPROGSOLD = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD)
+ALLPROGSOLD = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD) # $(DISK4PROGS)
 
-ALLPROGS = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD)
-ALLDISKS = Disk1DTV.d64 Disk2DTV.d64 Disk3DTV.d64 LorenzDTV.d81
+ALLPROGS = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD) $(DISK4PROGS)
+ALLDISKS = Disk1DTV.d64 Disk2DTV.d64 Disk3DTV.d64 Disk4DTV.d64 LorenzDTV.d81
 
 ASFLAGS=--m65dtv02 -C -T -a -q -I ./common -D TARGET=5
 
@@ -305,40 +345,110 @@
 	64tass $(ASFLAGS) -D ISC128C64=0 -i cpuport.s -o cpuport-dtv.prg
 
 trap1-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=1 -i trap1-15.s -o trap1-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=1 -i trap1-15.s -o trap1-dtv.prg
 trap2-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=2 -i trap1-15.s -o trap2-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=2 -i trap1-15.s -o trap2-dtv.prg
 trap3-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=3 -i trap1-15.s -o trap3-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=3 -i trap1-15.s -o trap3-dtv.prg
 trap4-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=4 -i trap1-15.s -o trap4-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=4 -i trap1-15.s -o trap4-dtv.prg
 trap5-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=5 -i trap1-15.s -o trap5-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=5 -i trap1-15.s -o trap5-dtv.prg
 trap6-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=6 -i trap1-15.s -o trap6-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=6 -i trap1-15.s -o trap6-dtv.prg
 trap7-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=7 -i trap1-15.s -o trap7-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=7 -i trap1-15.s -o trap7-dtv.prg
 trap8-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=8 -i trap1-15.s -o trap8-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=8 -i trap1-15.s -o trap8-dtv.prg
 trap9-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=9 -i trap1-15.s -o trap9-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=9 -i trap1-15.s -o trap9-dtv.prg
 trap10-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=10 -i trap1-15.s -o trap10-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=10 -i trap1-15.s -o trap10-dtv.prg
 trap11-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=11 -i trap1-15.s -o trap11-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=11 -i trap1-15.s -o trap11-dtv.prg
 trap12-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=12 -i trap1-15.s -o trap12-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=12 -i trap1-15.s -o trap12-dtv.prg
 trap13-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=13 -i trap1-15.s -o trap13-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=13 -i trap1-15.s -o trap13-dtv.prg
 trap14-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=14 -i trap1-15.s -o trap14-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=14 -i trap1-15.s -o trap14-dtv.prg
 trap15-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=15 -i trap1-15.s -o trap15-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=15 -i trap1-15.s -o trap15-dtv.prg
 trap16-dtv.prg: trap16.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=16 -i trap16.s -o trap16-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=16 -i trap16.s -o trap16-dtv.prg
 trap17-dtv.prg: trap17.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=17 -i trap17.s -o trap17-dtv.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=17 -i trap17.s -o trap17-dtv.prg
 
+trap1ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=1 -i trap1-15.s -o trap1ane-dtv.prg
+trap2ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=2 -i trap1-15.s -o trap2ane-dtv.prg
+trap3ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=3 -i trap1-15.s -o trap3ane-dtv.prg
+trap4ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=4 -i trap1-15.s -o trap4ane-dtv.prg
+trap5ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=5 -i trap1-15.s -o trap5ane-dtv.prg
+trap6ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=6 -i trap1-15.s -o trap6ane-dtv.prg
+trap7ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=7 -i trap1-15.s -o trap7ane-dtv.prg
+trap8ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=8 -i trap1-15.s -o trap8ane-dtv.prg
+trap9ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=9 -i trap1-15.s -o trap9ane-dtv.prg
+trap10ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=10 -i trap1-15.s -o trap10ane-dtv.prg
+trap11ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=11 -i trap1-15.s -o trap11ane-dtv.prg
+trap12ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=12 -i trap1-15.s -o trap12ane-dtv.prg
+trap13ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=13 -i trap1-15.s -o trap13ane-dtv.prg
+trap14ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=14 -i trap1-15.s -o trap14ane-dtv.prg
+trap15ane-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=15 -i trap1-15.s -o trap15ane-dtv.prg
+trap16ane-dtv.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=16 -i trap16.s -o trap16ane-dtv.prg
+trap17ane-dtv.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=17 -i trap17.s -o trap17ane-dtv.prg
+
+trap1lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=1 -i trap1-15.s -o trap1lxa-dtv.prg
+trap2lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=2 -i trap1-15.s -o trap2lxa-dtv.prg
+trap3lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=3 -i trap1-15.s -o trap3lxa-dtv.prg
+trap4lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=4 -i trap1-15.s -o trap4lxa-dtv.prg
+trap5lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=5 -i trap1-15.s -o trap5lxa-dtv.prg
+trap6lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=6 -i trap1-15.s -o trap6lxa-dtv.prg
+trap7lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=7 -i trap1-15.s -o trap7lxa-dtv.prg
+trap8lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=8 -i trap1-15.s -o trap8lxa-dtv.prg
+trap9lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=9 -i trap1-15.s -o trap9lxa-dtv.prg
+trap10lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=10 -i trap1-15.s -o trap10lxa-dtv.prg
+trap11lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=11 -i trap1-15.s -o trap11lxa-dtv.prg
+trap12lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=12 -i trap1-15.s -o trap12lxa-dtv.prg
+trap13lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=13 -i trap1-15.s -o trap13lxa-dtv.prg
+trap14lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=14 -i trap1-15.s -o trap14lxa-dtv.prg
+trap15lxa-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=15 -i trap1-15.s -o trap15lxa-dtv.prg
+trap16lxa-dtv.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=16 -i trap16.s -o trap16lxa-dtv.prg
+trap17lxa-dtv.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=17 -i trap17.s -o trap17lxa-dtv.prg
+
 irq-dtv.prg: irq.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEWCIA=0 -i irq.s -o irq-dtv.prg
 irqnew-dtv.prg: irq.s $(COMMONSRC)
@@ -364,6 +474,8 @@
 	64tass $(ASFLAGS) -D NEXT=1 -i nextdisk.s -o nextdisk1-dtv.prg
 nextdisk2-dtv.prg: nextdisk.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEXT=2 -i nextdisk.s -o nextdisk2-dtv.prg
+nextdisk3-dtv.prg: nextdisk.s $(COMMONSRC)
+	64tass $(ASFLAGS) -D NEXT=3 -i nextdisk.s -o nextdisk3-dtv.prg
 
 %-dtv.prg : %.s $(COMMONSRC)
 	64tass $(ASFLAGS) -i "$*.s" -o "$*-dtv.prg"
@@ -382,12 +494,19 @@
 	done
 	c1541 Disk2DTV.d64 -write "nextdisk2-dtv.prg" $$(echo "$(basename $(DISK2NEXT))" | sed 's:-dtv::g') > /dev/null
 #	c1541 Disk2DTV.d64 -list
-Disk3DTV.d64: $(DISK3PROGSOLD)
+Disk3DTV.d64: $(DISK3PROGSOLD) nextdisk3-dtv.prg
 	c1541 -format "test suite 2.15+,#3" d64 Disk3DTV.d64 > /dev/null
 	for I in $(basename $(DISK3PROGSOLD)); do \
 		c1541 Disk3DTV.d64 -write "$$I.prg" $$(echo "$$I" | sed 's:-dtv::g') > /dev/null; \
 	done
+	c1541 Disk3DTV.d64 -write "nextdisk3-dtv.prg" "$(basename $(DISK3NEXT))" > /dev/null
 #	c1541 Disk3DTV.d64 -list
+Disk4DTV.d64: $(DISK4PROGSOLD)
+	c1541 -format "test suite 2.15+,#4" d64 Disk4DTV.d64 > /dev/null
+	for I in $(basename $(DISK4PROGSOLD)); do \
+		c1541 Disk4DTV.d64 -write "$$I.prg" $$(echo "$$I" | sed 's:-dtv::g') > /dev/null; \
+	done
+#	c1541 Disk4DTV.d64 -list
 LorenzDTV.d81: $(ALLPROGSOLD)
 	c1541 -format "test suite 2.15+,#1" d81 LorenzDTV.d81 > /dev/null
 	for I in $(basename $(ALLPROGSOLD)); do \

Modified: testprogs/general/Lorenz-2.15/src/Makefile.plus4
===================================================================
--- testprogs/general/Lorenz-2.15/src/Makefile.plus4	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/Makefile.plus4	2024-07-18 20:00:13 UTC (rev 45244)
@@ -229,8 +229,6 @@
 	axsix-plus4.prg \
 	alrb-plus4.prg \
 	arrb-plus4.prg \
-	aneb-plus4.prg \
-	lxab-plus4.prg \
 	sbxb-plus4.prg \
 	shaay-plus4.prg \
 	shaiy-plus4.prg \
@@ -267,16 +265,56 @@
 	  cpuport-plus4.prg \
 	  cputiming-plus4.prg \
 	  irq-plus4.prg \
-	  nmi-plus4.prg \
+	  nmi-plus4.prg
+
+DISK4PROGS = \
+	aneb-plus4.prg \
+	lxab-plus4.prg \
 	\
+	trap1ane-plus4.prg \
+	trap2ane-plus4.prg \
+	trap3ane-plus4.prg \
+	trap4ane-plus4.prg \
+	trap5ane-plus4.prg \
+	trap6ane-plus4.prg \
+	trap7ane-plus4.prg \
+	trap8ane-plus4.prg \
+	trap9ane-plus4.prg \
+	trap10ane-plus4.prg \
+	trap11ane-plus4.prg \
+	trap12ane-plus4.prg \
+	trap13ane-plus4.prg \
+	trap14ane-plus4.prg \
+	trap15ane-plus4.prg \
+	trap16ane-plus4.prg \
+	trap17ane-plus4.prg \
+	\
+	trap1lxa-plus4.prg \
+	trap2lxa-plus4.prg \
+	trap3lxa-plus4.prg \
+	trap4lxa-plus4.prg \
+	trap5lxa-plus4.prg \
+	trap6lxa-plus4.prg \
+	trap7lxa-plus4.prg \
+	trap8lxa-plus4.prg \
+	trap9lxa-plus4.prg \
+	trap10lxa-plus4.prg \
+	trap11lxa-plus4.prg \
+	trap12lxa-plus4.prg \
+	trap13lxa-plus4.prg \
+	trap14lxa-plus4.prg \
+	trap15lxa-plus4.prg \
+	trap16lxa-plus4.prg \
+	trap17lxa-plus4.prg \
+	\
 	finish-plus4.prg \
 	\
 	template-plus4.prg
 
-ALLPROGSOLD = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD)
+ALLPROGSOLD = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD) # $(DISK4PROGS)
 
-ALLPROGS = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD)
-ALLDISKS = Disk1plus4.d64 Disk2plus4.d64 Disk3plus4.d64 LorenzPlus4.d81
+ALLPROGS = $(DISK1PROGS) $(DISK2PROGS) $(DISK3PROGSOLD) $(DISK4PROGS)
+ALLDISKS = Disk1plus4.d64 Disk2plus4.d64 Disk3plus4.d64 Disk4plus4.d64 LorenzPlus4.d81
 
 ASFLAGS=-C -T -a -q -I ./common -D TARGET=4
 
@@ -286,40 +324,110 @@
 	64tass $(ASFLAGS) -D ISC128C64=0 -i cpuport.s -o cpuport-plus4.prg
 
 trap1-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=1 -i trap1-15.s -o trap1-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=1 -i trap1-15.s -o trap1-plus4.prg
 trap2-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=2 -i trap1-15.s -o trap2-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=2 -i trap1-15.s -o trap2-plus4.prg
 trap3-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=3 -i trap1-15.s -o trap3-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=3 -i trap1-15.s -o trap3-plus4.prg
 trap4-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=4 -i trap1-15.s -o trap4-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=4 -i trap1-15.s -o trap4-plus4.prg
 trap5-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=5 -i trap1-15.s -o trap5-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=5 -i trap1-15.s -o trap5-plus4.prg
 trap6-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=6 -i trap1-15.s -o trap6-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=6 -i trap1-15.s -o trap6-plus4.prg
 trap7-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=7 -i trap1-15.s -o trap7-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=7 -i trap1-15.s -o trap7-plus4.prg
 trap8-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=8 -i trap1-15.s -o trap8-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=8 -i trap1-15.s -o trap8-plus4.prg
 trap9-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=9 -i trap1-15.s -o trap9-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=9 -i trap1-15.s -o trap9-plus4.prg
 trap10-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=10 -i trap1-15.s -o trap10-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=10 -i trap1-15.s -o trap10-plus4.prg
 trap11-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=11 -i trap1-15.s -o trap11-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=11 -i trap1-15.s -o trap11-plus4.prg
 trap12-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=12 -i trap1-15.s -o trap12-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=12 -i trap1-15.s -o trap12-plus4.prg
 trap13-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=13 -i trap1-15.s -o trap13-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=13 -i trap1-15.s -o trap13-plus4.prg
 trap14-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=14 -i trap1-15.s -o trap14-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=14 -i trap1-15.s -o trap14-plus4.prg
 trap15-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=15 -i trap1-15.s -o trap15-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=15 -i trap1-15.s -o trap15-plus4.prg
 trap16-plus4.prg: trap16.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=16 -i trap16.s -o trap16-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=16 -i trap16.s -o trap16-plus4.prg
 trap17-plus4.prg: trap17.s $(COMMONSRC) trap-table.s
-	64tass $(ASFLAGS) -D TRAP=17 -i trap17.s -o trap17-plus4.prg
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=0 -D TRAP=17 -i trap17.s -o trap17-plus4.prg
 
+trap1ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=1 -i trap1-15.s -o trap1ane-plus4.prg
+trap2ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=2 -i trap1-15.s -o trap2ane-plus4.prg
+trap3ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=3 -i trap1-15.s -o trap3ane-plus4.prg
+trap4ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=4 -i trap1-15.s -o trap4ane-plus4.prg
+trap5ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=5 -i trap1-15.s -o trap5ane-plus4.prg
+trap6ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=6 -i trap1-15.s -o trap6ane-plus4.prg
+trap7ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=7 -i trap1-15.s -o trap7ane-plus4.prg
+trap8ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=8 -i trap1-15.s -o trap8ane-plus4.prg
+trap9ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=9 -i trap1-15.s -o trap9ane-plus4.prg
+trap10ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=10 -i trap1-15.s -o trap10ane-plus4.prg
+trap11ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=11 -i trap1-15.s -o trap11ane-plus4.prg
+trap12ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=12 -i trap1-15.s -o trap12ane-plus4.prg
+trap13ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=13 -i trap1-15.s -o trap13ane-plus4.prg
+trap14ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=14 -i trap1-15.s -o trap14ane-plus4.prg
+trap15ane-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=15 -i trap1-15.s -o trap15ane-plus4.prg
+trap16ane-plus4.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=16 -i trap16.s -o trap16ane-plus4.prg
+trap17ane-plus4.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=1 -D TESTLXA=0 -D TRAP=17 -i trap17.s -o trap17ane-plus4.prg
+
+trap1lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=1 -i trap1-15.s -o trap1lxa-plus4.prg
+trap2lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=2 -i trap1-15.s -o trap2lxa-plus4.prg
+trap3lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=3 -i trap1-15.s -o trap3lxa-plus4.prg
+trap4lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=4 -i trap1-15.s -o trap4lxa-plus4.prg
+trap5lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=5 -i trap1-15.s -o trap5lxa-plus4.prg
+trap6lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=6 -i trap1-15.s -o trap6lxa-plus4.prg
+trap7lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=7 -i trap1-15.s -o trap7lxa-plus4.prg
+trap8lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=8 -i trap1-15.s -o trap8lxa-plus4.prg
+trap9lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=9 -i trap1-15.s -o trap9lxa-plus4.prg
+trap10lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=10 -i trap1-15.s -o trap10lxa-plus4.prg
+trap11lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=11 -i trap1-15.s -o trap11lxa-plus4.prg
+trap12lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=12 -i trap1-15.s -o trap12lxa-plus4.prg
+trap13lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=13 -i trap1-15.s -o trap13lxa-plus4.prg
+trap14lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=14 -i trap1-15.s -o trap14lxa-plus4.prg
+trap15lxa-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=15 -i trap1-15.s -o trap15lxa-plus4.prg
+trap16lxa-plus4.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=16 -i trap16.s -o trap16lxa-plus4.prg
+trap17lxa-plus4.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TESTANE=0 -D TESTLXA=1 -D TRAP=17 -i trap17.s -o trap17lxa-plus4.prg
+
 irq-plus4.prg: irq.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEWCIA=0 -i irq.s -o irq-plus4.prg
 irqnew-plus4.prg: irq.s $(COMMONSRC)
@@ -345,6 +453,8 @@
 	64tass $(ASFLAGS) -D NEXT=1 -i nextdisk.s -o nextdisk1-plus4.prg
 nextdisk2-plus4.prg: nextdisk.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEXT=2 -i nextdisk.s -o nextdisk2-plus4.prg
+nextdisk3-plus4.prg: nextdisk.s $(COMMONSRC)
+	64tass $(ASFLAGS) -D NEXT=3 -i nextdisk.s -o nextdisk3-plus4.prg
 
 %-plus4.prg : %.s $(COMMONSRC)
 	64tass $(ASFLAGS) -i "$*.s" -o "$*-plus4.prg"
@@ -363,12 +473,19 @@
 	done
 	c1541 Disk2plus4.d64 -write "nextdisk2-plus4.prg" $$(echo "$(basename $(DISK2NEXT))" | sed 's:-plus4::g') > /dev/null
 #	c1541 Disk2plus4.d64 -list
-Disk3plus4.d64: $(DISK3PROGSOLD)
+Disk3plus4.d64: $(DISK3PROGSOLD) nextdisk3-plus4.prg
 	c1541 -format "test suite 2.15+,#3" d64 Disk3plus4.d64 > /dev/null
 	for I in $(basename $(DISK3PROGSOLD)); do \
 		c1541 Disk3plus4.d64 -write "$$I.prg" $$(echo "$$I" | sed 's:-plus4::g') > /dev/null; \
 	done
+	c1541 Disk3plus4.d64 -write "nextdisk3-plus4.prg" "$(basename $(DISK3NEXT))" > /dev/null
 #	c1541 Disk3plus4.d64 -list
+Disk4plus4.d64: $(DISK4PROGSOLD)
+	c1541 -format "test suite 2.15+,#4" d64 Disk4plus4.d64 > /dev/null
+	for I in $(basename $(DISK3PROGSOLD)); do \
+		c1541 Disk4plus4.d64 -write "$$I.prg" $$(echo "$$I" | sed 's:-plus4::g') > /dev/null; \
+	done
+#	c1541 Disk4plus4.d64 -list
 LorenzPlus4.d81: $(ALLPROGSOLD)
 	c1541 -format "test suite 2.15+,#1" d81 LorenzPlus4.d81 > /dev/null
 	for I in $(basename $(ALLPROGSOLD)); do \

Modified: testprogs/general/Lorenz-2.15/src/arrb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/arrb-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/arrb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/arrb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/arrb.s	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/arrb.s	2024-07-18 20:00:13 UTC (rev 45244)
@@ -9,7 +9,7 @@
 
 ;------------------------------------------------------------------------------
 thisname   .null "arrb"      ; name of this test
-nextname   .null "aneb"      ; name of next test, "-" means no more tests
+nextname   .null "sbxb"      ; name of next test, "-" means no more tests
 ;------------------------------------------------------------------------------
 main:
          lda #%00011011

Modified: testprogs/general/Lorenz-2.15/src/cia2tb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/cia2tb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/cia2tb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia2tb.s	2024-07-17 23:51:12 UTC (rev 45243)
+++ testprogs/general/Lorenz-2.15/src/cia2tb.s	2024-07-18 20:00:13 UTC (rev 45244)
@@ -17,7 +17,7 @@
 .endif
            .byte 0
 
-nextname:   .null "finish"
+nextname:   .null "aneb"
 ;-------------------------------------------------------------------------------
 report
            .block

Modified: testprogs/general/Lorenz-2.15/src/cia2tbnew.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/lxab-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/lxab-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/lxab.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/lxab.s
=======================================...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[45243] testprogs/general/Lorenz -2.15

From: <gp...@us...> - 2024-07-17 23:51:21

Revision: 45243
          http://sourceforge.net/p/vice-emu/code/45243
Author:   gpz
Date:     2024-07-17 23:51:12 +0000 (Wed, 17 Jul 2024)
Log Message:
-----------
fix Plus4 Makefile, update all binaries

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/Disk1.d64
    testprogs/general/Lorenz-2.15/Disk1DTV.d64
    testprogs/general/Lorenz-2.15/Disk1plus4.d64
    testprogs/general/Lorenz-2.15/Disk2.d64
    testprogs/general/Lorenz-2.15/Disk2DTV.d64
    testprogs/general/Lorenz-2.15/Disk2c128.d64
    testprogs/general/Lorenz-2.15/Disk2plus4.d64
    testprogs/general/Lorenz-2.15/Disk3.d64
    testprogs/general/Lorenz-2.15/Disk3DTV.d64
    testprogs/general/Lorenz-2.15/Disk3new.d64
    testprogs/general/Lorenz-2.15/Lorenz.d81
    testprogs/general/Lorenz-2.15/LorenzDTV.d81
    testprogs/general/Lorenz-2.15/LorenzPlus4.d81
    testprogs/general/Lorenz-2.15/Lorenznew.d81
    testprogs/general/Lorenz-2.15/src/Disk1.d64
    testprogs/general/Lorenz-2.15/src/Disk1DTV.d64
    testprogs/general/Lorenz-2.15/src/Disk1plus4.d64
    testprogs/general/Lorenz-2.15/src/Disk2.d64
    testprogs/general/Lorenz-2.15/src/Disk2DTV.d64
    testprogs/general/Lorenz-2.15/src/Disk2c128.d64
    testprogs/general/Lorenz-2.15/src/Disk2plus4.d64
    testprogs/general/Lorenz-2.15/src/Disk3.d64
    testprogs/general/Lorenz-2.15/src/Disk3DTV.d64
    testprogs/general/Lorenz-2.15/src/Disk3new.d64
    testprogs/general/Lorenz-2.15/src/Disk3plus4.d64
    testprogs/general/Lorenz-2.15/src/Lorenz.d81
    testprogs/general/Lorenz-2.15/src/LorenzDTV.d81
    testprogs/general/Lorenz-2.15/src/LorenzPlus4.d81
    testprogs/general/Lorenz-2.15/src/Lorenznew.d81
    testprogs/general/Lorenz-2.15/src/Makefile.plus4
    testprogs/general/Lorenz-2.15/src/adca-dtv.prg
    testprogs/general/Lorenz-2.15/src/adca-plus4.prg
    testprogs/general/Lorenz-2.15/src/adca.prg
    testprogs/general/Lorenz-2.15/src/adcax-dtv.prg
    testprogs/general/Lorenz-2.15/src/adcax-plus4.prg
    testprogs/general/Lorenz-2.15/src/adcax.prg
    testprogs/general/Lorenz-2.15/src/adcay-dtv.prg
    testprogs/general/Lorenz-2.15/src/adcay-plus4.prg
    testprogs/general/Lorenz-2.15/src/adcay.prg
    testprogs/general/Lorenz-2.15/src/adcb-dtv.prg
    testprogs/general/Lorenz-2.15/src/adcb-plus4.prg
    testprogs/general/Lorenz-2.15/src/adcb.prg
    testprogs/general/Lorenz-2.15/src/adcix-dtv.prg
    testprogs/general/Lorenz-2.15/src/adcix-plus4.prg
    testprogs/general/Lorenz-2.15/src/adcix.prg
    testprogs/general/Lorenz-2.15/src/adciy-dtv.prg
    testprogs/general/Lorenz-2.15/src/adciy-plus4.prg
    testprogs/general/Lorenz-2.15/src/adciy.prg
    testprogs/general/Lorenz-2.15/src/adcz-dtv.prg
    testprogs/general/Lorenz-2.15/src/adcz-plus4.prg
    testprogs/general/Lorenz-2.15/src/adcz.prg
    testprogs/general/Lorenz-2.15/src/adczx-dtv.prg
    testprogs/general/Lorenz-2.15/src/adczx-plus4.prg
    testprogs/general/Lorenz-2.15/src/adczx.prg
    testprogs/general/Lorenz-2.15/src/alrb-dtv.prg
    testprogs/general/Lorenz-2.15/src/alrb-plus4.prg
    testprogs/general/Lorenz-2.15/src/alrb.prg
    testprogs/general/Lorenz-2.15/src/ancb-dtv.prg
    testprogs/general/Lorenz-2.15/src/ancb-plus4.prg
    testprogs/general/Lorenz-2.15/src/ancb.prg
    testprogs/general/Lorenz-2.15/src/anda-dtv.prg
    testprogs/general/Lorenz-2.15/src/anda-plus4.prg
    testprogs/general/Lorenz-2.15/src/anda.prg
    testprogs/general/Lorenz-2.15/src/andax-dtv.prg
    testprogs/general/Lorenz-2.15/src/andax-plus4.prg
    testprogs/general/Lorenz-2.15/src/andax.prg
    testprogs/general/Lorenz-2.15/src/anday-dtv.prg
    testprogs/general/Lorenz-2.15/src/anday-plus4.prg
    testprogs/general/Lorenz-2.15/src/anday.prg
    testprogs/general/Lorenz-2.15/src/andb-dtv.prg
    testprogs/general/Lorenz-2.15/src/andb-plus4.prg
    testprogs/general/Lorenz-2.15/src/andb.prg
    testprogs/general/Lorenz-2.15/src/andix-dtv.prg
    testprogs/general/Lorenz-2.15/src/andix-plus4.prg
    testprogs/general/Lorenz-2.15/src/andix.prg
    testprogs/general/Lorenz-2.15/src/andiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/andiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/andiy.prg
    testprogs/general/Lorenz-2.15/src/andz-dtv.prg
    testprogs/general/Lorenz-2.15/src/andz-plus4.prg
    testprogs/general/Lorenz-2.15/src/andz.prg
    testprogs/general/Lorenz-2.15/src/andzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/andzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/andzx.prg
    testprogs/general/Lorenz-2.15/src/aneb-dtv.prg
    testprogs/general/Lorenz-2.15/src/aneb-plus4.prg
    testprogs/general/Lorenz-2.15/src/aneb.prg
    testprogs/general/Lorenz-2.15/src/arrb-dtv.prg
    testprogs/general/Lorenz-2.15/src/arrb-plus4.prg
    testprogs/general/Lorenz-2.15/src/arrb.prg
    testprogs/general/Lorenz-2.15/src/asla-dtv.prg
    testprogs/general/Lorenz-2.15/src/asla-plus4.prg
    testprogs/general/Lorenz-2.15/src/asla.prg
    testprogs/general/Lorenz-2.15/src/aslax-dtv.prg
    testprogs/general/Lorenz-2.15/src/aslax-plus4.prg
    testprogs/general/Lorenz-2.15/src/aslax.prg
    testprogs/general/Lorenz-2.15/src/asln-dtv.prg
    testprogs/general/Lorenz-2.15/src/asln-plus4.prg
    testprogs/general/Lorenz-2.15/src/asln.prg
    testprogs/general/Lorenz-2.15/src/aslz-dtv.prg
    testprogs/general/Lorenz-2.15/src/aslz-plus4.prg
    testprogs/general/Lorenz-2.15/src/aslz.prg
    testprogs/general/Lorenz-2.15/src/aslzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/aslzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/aslzx.prg
    testprogs/general/Lorenz-2.15/src/asoa-dtv.prg
    testprogs/general/Lorenz-2.15/src/asoa-plus4.prg
    testprogs/general/Lorenz-2.15/src/asoa.prg
    testprogs/general/Lorenz-2.15/src/asoax-dtv.prg
    testprogs/general/Lorenz-2.15/src/asoax-plus4.prg
    testprogs/general/Lorenz-2.15/src/asoax.prg
    testprogs/general/Lorenz-2.15/src/asoay-dtv.prg
    testprogs/general/Lorenz-2.15/src/asoay-plus4.prg
    testprogs/general/Lorenz-2.15/src/asoay.prg
    testprogs/general/Lorenz-2.15/src/asoix-dtv.prg
    testprogs/general/Lorenz-2.15/src/asoix-plus4.prg
    testprogs/general/Lorenz-2.15/src/asoix.prg
    testprogs/general/Lorenz-2.15/src/asoiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/asoiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/asoiy.prg
    testprogs/general/Lorenz-2.15/src/asoz-dtv.prg
    testprogs/general/Lorenz-2.15/src/asoz-plus4.prg
    testprogs/general/Lorenz-2.15/src/asoz.prg
    testprogs/general/Lorenz-2.15/src/asozx-dtv.prg
    testprogs/general/Lorenz-2.15/src/asozx-plus4.prg
    testprogs/general/Lorenz-2.15/src/asozx.prg
    testprogs/general/Lorenz-2.15/src/axsa-dtv.prg
    testprogs/general/Lorenz-2.15/src/axsa-plus4.prg
    testprogs/general/Lorenz-2.15/src/axsa.prg
    testprogs/general/Lorenz-2.15/src/axsix-dtv.prg
    testprogs/general/Lorenz-2.15/src/axsix-plus4.prg
    testprogs/general/Lorenz-2.15/src/axsix.prg
    testprogs/general/Lorenz-2.15/src/axsz-dtv.prg
    testprogs/general/Lorenz-2.15/src/axsz-plus4.prg
    testprogs/general/Lorenz-2.15/src/axsz.prg
    testprogs/general/Lorenz-2.15/src/axszy-dtv.prg
    testprogs/general/Lorenz-2.15/src/axszy-plus4.prg
    testprogs/general/Lorenz-2.15/src/axszy.prg
    testprogs/general/Lorenz-2.15/src/bccr-dtv.prg
    testprogs/general/Lorenz-2.15/src/bccr-plus4.prg
    testprogs/general/Lorenz-2.15/src/bccr.prg
    testprogs/general/Lorenz-2.15/src/bcsr-dtv.prg
    testprogs/general/Lorenz-2.15/src/bcsr-plus4.prg
    testprogs/general/Lorenz-2.15/src/bcsr.prg
    testprogs/general/Lorenz-2.15/src/beqr-dtv.prg
    testprogs/general/Lorenz-2.15/src/beqr-plus4.prg
    testprogs/general/Lorenz-2.15/src/beqr.prg
    testprogs/general/Lorenz-2.15/src/bita-dtv.prg
    testprogs/general/Lorenz-2.15/src/bita-plus4.prg
    testprogs/general/Lorenz-2.15/src/bita.prg
    testprogs/general/Lorenz-2.15/src/bitz-dtv.prg
    testprogs/general/Lorenz-2.15/src/bitz-plus4.prg
    testprogs/general/Lorenz-2.15/src/bitz.prg
    testprogs/general/Lorenz-2.15/src/bmir-dtv.prg
    testprogs/general/Lorenz-2.15/src/bmir-plus4.prg
    testprogs/general/Lorenz-2.15/src/bmir.prg
    testprogs/general/Lorenz-2.15/src/bner-dtv.prg
    testprogs/general/Lorenz-2.15/src/bner-plus4.prg
    testprogs/general/Lorenz-2.15/src/bner.prg
    testprogs/general/Lorenz-2.15/src/bplr-dtv.prg
    testprogs/general/Lorenz-2.15/src/bplr-plus4.prg
    testprogs/general/Lorenz-2.15/src/bplr.prg
    testprogs/general/Lorenz-2.15/src/branchwrap-dtv.prg
    testprogs/general/Lorenz-2.15/src/branchwrap-plus4.prg
    testprogs/general/Lorenz-2.15/src/branchwrap.prg
    testprogs/general/Lorenz-2.15/src/brkn-dtv.prg
    testprogs/general/Lorenz-2.15/src/brkn-plus4.prg
    testprogs/general/Lorenz-2.15/src/brkn.prg
    testprogs/general/Lorenz-2.15/src/bvcr-dtv.prg
    testprogs/general/Lorenz-2.15/src/bvcr-plus4.prg
    testprogs/general/Lorenz-2.15/src/bvcr.prg
    testprogs/general/Lorenz-2.15/src/bvsr-dtv.prg
    testprogs/general/Lorenz-2.15/src/bvsr-plus4.prg
    testprogs/general/Lorenz-2.15/src/bvsr.prg
    testprogs/general/Lorenz-2.15/src/cia1pb6-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia1pb6.prg
    testprogs/general/Lorenz-2.15/src/cia1pb7-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia1pb7.prg
    testprogs/general/Lorenz-2.15/src/cia1ta-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia1ta.prg
    testprogs/general/Lorenz-2.15/src/cia1tab-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia1tab.prg
    testprogs/general/Lorenz-2.15/src/cia1tabnew.prg
    testprogs/general/Lorenz-2.15/src/cia1tanew.prg
    testprogs/general/Lorenz-2.15/src/cia1tb-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia1tb.prg
    testprogs/general/Lorenz-2.15/src/cia1tb123-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia1tb123.prg
    testprogs/general/Lorenz-2.15/src/cia1tbnew.prg
    testprogs/general/Lorenz-2.15/src/cia2pb6-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia2pb6.prg
    testprogs/general/Lorenz-2.15/src/cia2pb7-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia2pb7.prg
    testprogs/general/Lorenz-2.15/src/cia2ta-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia2ta.prg
    testprogs/general/Lorenz-2.15/src/cia2tanew.prg
    testprogs/general/Lorenz-2.15/src/cia2tb-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia2tb.prg
    testprogs/general/Lorenz-2.15/src/cia2tb123-dtv.prg
    testprogs/general/Lorenz-2.15/src/cia2tb123.prg
    testprogs/general/Lorenz-2.15/src/cia2tbnew.prg
    testprogs/general/Lorenz-2.15/src/clcn-dtv.prg
    testprogs/general/Lorenz-2.15/src/clcn-plus4.prg
    testprogs/general/Lorenz-2.15/src/clcn.prg
    testprogs/general/Lorenz-2.15/src/cldn-dtv.prg
    testprogs/general/Lorenz-2.15/src/cldn-plus4.prg
    testprogs/general/Lorenz-2.15/src/cldn.prg
    testprogs/general/Lorenz-2.15/src/clin-dtv.prg
    testprogs/general/Lorenz-2.15/src/clin-plus4.prg
    testprogs/general/Lorenz-2.15/src/clin.prg
    testprogs/general/Lorenz-2.15/src/clvn-dtv.prg
    testprogs/general/Lorenz-2.15/src/clvn-plus4.prg
    testprogs/general/Lorenz-2.15/src/clvn.prg
    testprogs/general/Lorenz-2.15/src/cmpa-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpa-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpa.prg
    testprogs/general/Lorenz-2.15/src/cmpax-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpax-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpax.prg
    testprogs/general/Lorenz-2.15/src/cmpay-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpay-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpay.prg
    testprogs/general/Lorenz-2.15/src/cmpb-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpb-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpb.prg
    testprogs/general/Lorenz-2.15/src/cmpix-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpix-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpix.prg
    testprogs/general/Lorenz-2.15/src/cmpiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpiy.prg
    testprogs/general/Lorenz-2.15/src/cmpz-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpz-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpz.prg
    testprogs/general/Lorenz-2.15/src/cmpzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/cmpzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/cmpzx.prg
    testprogs/general/Lorenz-2.15/src/cntdef-dtv.prg
    testprogs/general/Lorenz-2.15/src/cntdef.prg
    testprogs/general/Lorenz-2.15/src/cnto2-dtv.prg
    testprogs/general/Lorenz-2.15/src/cnto2.prg
    testprogs/general/Lorenz-2.15/src/cpuport-dtv.prg
    testprogs/general/Lorenz-2.15/src/cpuport-plus4.prg
    testprogs/general/Lorenz-2.15/src/cpuport.prg
    testprogs/general/Lorenz-2.15/src/cpuport128.prg
    testprogs/general/Lorenz-2.15/src/cputiming-dtv.prg
    testprogs/general/Lorenz-2.15/src/cputiming-plus4.prg
    testprogs/general/Lorenz-2.15/src/cputiming.prg
    testprogs/general/Lorenz-2.15/src/cpxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/cpxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/cpxa.prg
    testprogs/general/Lorenz-2.15/src/cpxb-dtv.prg
    testprogs/general/Lorenz-2.15/src/cpxb-plus4.prg
    testprogs/general/Lorenz-2.15/src/cpxb.prg
    testprogs/general/Lorenz-2.15/src/cpxz-dtv.prg
    testprogs/general/Lorenz-2.15/src/cpxz-plus4.prg
    testprogs/general/Lorenz-2.15/src/cpxz.prg
    testprogs/general/Lorenz-2.15/src/cpya-dtv.prg
    testprogs/general/Lorenz-2.15/src/cpya-plus4.prg
    testprogs/general/Lorenz-2.15/src/cpya.prg
    testprogs/general/Lorenz-2.15/src/cpyb-dtv.prg
    testprogs/general/Lorenz-2.15/src/cpyb-plus4.prg
    testprogs/general/Lorenz-2.15/src/cpyb.prg
    testprogs/general/Lorenz-2.15/src/cpyz-dtv.prg
    testprogs/general/Lorenz-2.15/src/cpyz-plus4.prg
    testprogs/general/Lorenz-2.15/src/cpyz.prg
    testprogs/general/Lorenz-2.15/src/dcma-dtv.prg
    testprogs/general/Lorenz-2.15/src/dcma-plus4.prg
    testprogs/general/Lorenz-2.15/src/dcma.prg
    testprogs/general/Lorenz-2.15/src/dcmax-dtv.prg
    testprogs/general/Lorenz-2.15/src/dcmax-plus4.prg
    testprogs/general/Lorenz-2.15/src/dcmax.prg
    testprogs/general/Lorenz-2.15/src/dcmay-dtv.prg
    testprogs/general/Lorenz-2.15/src/dcmay-plus4.prg
    testprogs/general/Lorenz-2.15/src/dcmay.prg
    testprogs/general/Lorenz-2.15/src/dcmix-dtv.prg
    testprogs/general/Lorenz-2.15/src/dcmix-plus4.prg
    testprogs/general/Lorenz-2.15/src/dcmix.prg
    testprogs/general/Lorenz-2.15/src/dcmiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/dcmiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/dcmiy.prg
    testprogs/general/Lorenz-2.15/src/dcmz-dtv.prg
    testprogs/general/Lorenz-2.15/src/dcmz-plus4.prg
    testprogs/general/Lorenz-2.15/src/dcmz.prg
    testprogs/general/Lorenz-2.15/src/dcmzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/dcmzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/dcmzx.prg
    testprogs/general/Lorenz-2.15/src/deca-dtv.prg
    testprogs/general/Lorenz-2.15/src/deca-plus4.prg
    testprogs/general/Lorenz-2.15/src/deca.prg
    testprogs/general/Lorenz-2.15/src/decax-dtv.prg
    testprogs/general/Lorenz-2.15/src/decax-plus4.prg
    testprogs/general/Lorenz-2.15/src/decax.prg
    testprogs/general/Lorenz-2.15/src/decz-dtv.prg
    testprogs/general/Lorenz-2.15/src/decz-plus4.prg
    testprogs/general/Lorenz-2.15/src/decz.prg
    testprogs/general/Lorenz-2.15/src/deczx-dtv.prg
    testprogs/general/Lorenz-2.15/src/deczx-plus4.prg
    testprogs/general/Lorenz-2.15/src/deczx.prg
    testprogs/general/Lorenz-2.15/src/dexn-dtv.prg
    testprogs/general/Lorenz-2.15/src/dexn-plus4.prg
    testprogs/general/Lorenz-2.15/src/dexn.prg
    testprogs/general/Lorenz-2.15/src/deyn-dtv.prg
    testprogs/general/Lorenz-2.15/src/deyn-plus4.prg
    testprogs/general/Lorenz-2.15/src/deyn.prg
    testprogs/general/Lorenz-2.15/src/eora-dtv.prg
    testprogs/general/Lorenz-2.15/src/eora-plus4.prg
    testprogs/general/Lorenz-2.15/src/eora.prg
    testprogs/general/Lorenz-2.15/src/eorax-dtv.prg
    testprogs/general/Lorenz-2.15/src/eorax-plus4.prg
    testprogs/general/Lorenz-2.15/src/eorax.prg
    testprogs/general/Lorenz-2.15/src/eoray-dtv.prg
    testprogs/general/Lorenz-2.15/src/eoray-plus4.prg
    testprogs/general/Lorenz-2.15/src/eoray.prg
    testprogs/general/Lorenz-2.15/src/eorb-dtv.prg
    testprogs/general/Lorenz-2.15/src/eorb-plus4.prg
    testprogs/general/Lorenz-2.15/src/eorb.prg
    testprogs/general/Lorenz-2.15/src/eorix-dtv.prg
    testprogs/general/Lorenz-2.15/src/eorix-plus4.prg
    testprogs/general/Lorenz-2.15/src/eorix.prg
    testprogs/general/Lorenz-2.15/src/eoriy-dtv.prg
    testprogs/general/Lorenz-2.15/src/eoriy-plus4.prg
    testprogs/general/Lorenz-2.15/src/eoriy.prg
    testprogs/general/Lorenz-2.15/src/eorz-dtv.prg
    testprogs/general/Lorenz-2.15/src/eorz-plus4.prg
    testprogs/general/Lorenz-2.15/src/eorz.prg
    testprogs/general/Lorenz-2.15/src/eorzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/eorzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/eorzx.prg
    testprogs/general/Lorenz-2.15/src/finish-dtv.prg
    testprogs/general/Lorenz-2.15/src/finish-plus4.prg
    testprogs/general/Lorenz-2.15/src/finish.prg
    testprogs/general/Lorenz-2.15/src/flipos-dtv.prg
    testprogs/general/Lorenz-2.15/src/flipos.prg
    testprogs/general/Lorenz-2.15/src/icr01-dtv.prg
    testprogs/general/Lorenz-2.15/src/icr01.prg
    testprogs/general/Lorenz-2.15/src/icr01new.prg
    testprogs/general/Lorenz-2.15/src/imr-dtv.prg
    testprogs/general/Lorenz-2.15/src/imr.prg
    testprogs/general/Lorenz-2.15/src/imrnew.prg
    testprogs/general/Lorenz-2.15/src/inca-dtv.prg
    testprogs/general/Lorenz-2.15/src/inca-plus4.prg
    testprogs/general/Lorenz-2.15/src/inca.prg
    testprogs/general/Lorenz-2.15/src/incax-dtv.prg
    testprogs/general/Lorenz-2.15/src/incax-plus4.prg
    testprogs/general/Lorenz-2.15/src/incax.prg
    testprogs/general/Lorenz-2.15/src/incz-dtv.prg
    testprogs/general/Lorenz-2.15/src/incz-plus4.prg
    testprogs/general/Lorenz-2.15/src/incz.prg
    testprogs/general/Lorenz-2.15/src/inczx-dtv.prg
    testprogs/general/Lorenz-2.15/src/inczx-plus4.prg
    testprogs/general/Lorenz-2.15/src/inczx.prg
    testprogs/general/Lorenz-2.15/src/insa-dtv.prg
    testprogs/general/Lorenz-2.15/src/insa-plus4.prg
    testprogs/general/Lorenz-2.15/src/insa.prg
    testprogs/general/Lorenz-2.15/src/insax-dtv.prg
    testprogs/general/Lorenz-2.15/src/insax-plus4.prg
    testprogs/general/Lorenz-2.15/src/insax.prg
    testprogs/general/Lorenz-2.15/src/insay-dtv.prg
    testprogs/general/Lorenz-2.15/src/insay-plus4.prg
    testprogs/general/Lorenz-2.15/src/insay.prg
    testprogs/general/Lorenz-2.15/src/insix-dtv.prg
    testprogs/general/Lorenz-2.15/src/insix-plus4.prg
    testprogs/general/Lorenz-2.15/src/insix.prg
    testprogs/general/Lorenz-2.15/src/insiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/insiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/insiy.prg
    testprogs/general/Lorenz-2.15/src/insz-dtv.prg
    testprogs/general/Lorenz-2.15/src/insz-plus4.prg
    testprogs/general/Lorenz-2.15/src/insz.prg
    testprogs/general/Lorenz-2.15/src/inszx-dtv.prg
    testprogs/general/Lorenz-2.15/src/inszx-plus4.prg
    testprogs/general/Lorenz-2.15/src/inszx.prg
    testprogs/general/Lorenz-2.15/src/inxn-dtv.prg
    testprogs/general/Lorenz-2.15/src/inxn-plus4.prg
    testprogs/general/Lorenz-2.15/src/inxn.prg
    testprogs/general/Lorenz-2.15/src/inyn-dtv.prg
    testprogs/general/Lorenz-2.15/src/inyn-plus4.prg
    testprogs/general/Lorenz-2.15/src/inyn.prg
    testprogs/general/Lorenz-2.15/src/irq-dtv.prg
    testprogs/general/Lorenz-2.15/src/irq-plus4.prg
    testprogs/general/Lorenz-2.15/src/irq.prg
    testprogs/general/Lorenz-2.15/src/irqnew.prg
    testprogs/general/Lorenz-2.15/src/jmpi-dtv.prg
    testprogs/general/Lorenz-2.15/src/jmpi-plus4.prg
    testprogs/general/Lorenz-2.15/src/jmpi.prg
    testprogs/general/Lorenz-2.15/src/jmpw-dtv.prg
    testprogs/general/Lorenz-2.15/src/jmpw-plus4.prg
    testprogs/general/Lorenz-2.15/src/jmpw.prg
    testprogs/general/Lorenz-2.15/src/jsrw-dtv.prg
    testprogs/general/Lorenz-2.15/src/jsrw-plus4.prg
    testprogs/general/Lorenz-2.15/src/jsrw.prg
    testprogs/general/Lorenz-2.15/src/lasay-dtv.prg
    testprogs/general/Lorenz-2.15/src/lasay-plus4.prg
    testprogs/general/Lorenz-2.15/src/lasay.prg
    testprogs/general/Lorenz-2.15/src/laxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/laxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/laxa.prg
    testprogs/general/Lorenz-2.15/src/laxay-dtv.prg
    testprogs/general/Lorenz-2.15/src/laxay-plus4.prg
    testprogs/general/Lorenz-2.15/src/laxay.prg
    testprogs/general/Lorenz-2.15/src/laxix-dtv.prg
    testprogs/general/Lorenz-2.15/src/laxix-plus4.prg
    testprogs/general/Lorenz-2.15/src/laxix.prg
    testprogs/general/Lorenz-2.15/src/laxiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/laxiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/laxiy.prg
    testprogs/general/Lorenz-2.15/src/laxz-dtv.prg
    testprogs/general/Lorenz-2.15/src/laxz-plus4.prg
    testprogs/general/Lorenz-2.15/src/laxz.prg
    testprogs/general/Lorenz-2.15/src/laxzy-dtv.prg
    testprogs/general/Lorenz-2.15/src/laxzy-plus4.prg
    testprogs/general/Lorenz-2.15/src/laxzy.prg
    testprogs/general/Lorenz-2.15/src/ldaa-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldaa-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldaa.prg
    testprogs/general/Lorenz-2.15/src/ldaax-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldaax-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldaax.prg
    testprogs/general/Lorenz-2.15/src/ldaay-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldaay-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldaay.prg
    testprogs/general/Lorenz-2.15/src/ldab-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldab-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldab.prg
    testprogs/general/Lorenz-2.15/src/ldaix-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldaix-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldaix.prg
    testprogs/general/Lorenz-2.15/src/ldaiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldaiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldaiy.prg
    testprogs/general/Lorenz-2.15/src/ldaz-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldaz-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldaz.prg
    testprogs/general/Lorenz-2.15/src/ldazx-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldazx-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldazx.prg
    testprogs/general/Lorenz-2.15/src/ldxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldxa.prg
    testprogs/general/Lorenz-2.15/src/ldxay-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldxay-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldxay.prg
    testprogs/general/Lorenz-2.15/src/ldxb-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldxb-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldxb.prg
    testprogs/general/Lorenz-2.15/src/ldxz-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldxz-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldxz.prg
    testprogs/general/Lorenz-2.15/src/ldxzy-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldxzy-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldxzy.prg
    testprogs/general/Lorenz-2.15/src/ldya-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldya-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldya.prg
    testprogs/general/Lorenz-2.15/src/ldyax-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldyax-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldyax.prg
    testprogs/general/Lorenz-2.15/src/ldyb-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldyb-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldyb.prg
    testprogs/general/Lorenz-2.15/src/ldyz-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldyz-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldyz.prg
    testprogs/general/Lorenz-2.15/src/ldyzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/ldyzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/ldyzx.prg
    testprogs/general/Lorenz-2.15/src/loadth-dtv.prg
    testprogs/general/Lorenz-2.15/src/loadth.prg
    testprogs/general/Lorenz-2.15/src/lsea-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsea-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsea.prg
    testprogs/general/Lorenz-2.15/src/lseax-dtv.prg
    testprogs/general/Lorenz-2.15/src/lseax-plus4.prg
    testprogs/general/Lorenz-2.15/src/lseax.prg
    testprogs/general/Lorenz-2.15/src/lseay-dtv.prg
    testprogs/general/Lorenz-2.15/src/lseay-plus4.prg
    testprogs/general/Lorenz-2.15/src/lseay.prg
    testprogs/general/Lorenz-2.15/src/lseix-dtv.prg
    testprogs/general/Lorenz-2.15/src/lseix-plus4.prg
    testprogs/general/Lorenz-2.15/src/lseix.prg
    testprogs/general/Lorenz-2.15/src/lseiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/lseiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/lseiy.prg
    testprogs/general/Lorenz-2.15/src/lsez-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsez-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsez.prg
    testprogs/general/Lorenz-2.15/src/lsezx-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsezx-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsezx.prg
    testprogs/general/Lorenz-2.15/src/lsra-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsra-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsra.prg
    testprogs/general/Lorenz-2.15/src/lsrax-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsrax-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsrax.prg
    testprogs/general/Lorenz-2.15/src/lsrn-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsrn-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsrn.prg
    testprogs/general/Lorenz-2.15/src/lsrz-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsrz-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsrz.prg
    testprogs/general/Lorenz-2.15/src/lsrzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/lsrzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/lsrzx.prg
    testprogs/general/Lorenz-2.15/src/lxab-dtv.prg
    testprogs/general/Lorenz-2.15/src/lxab-plus4.prg
    testprogs/general/Lorenz-2.15/src/lxab.prg
    testprogs/general/Lorenz-2.15/src/mmu-dtv.prg
    testprogs/general/Lorenz-2.15/src/mmu-plus4.prg
    testprogs/general/Lorenz-2.15/src/mmu.prg
    testprogs/general/Lorenz-2.15/src/mmufetch-dtv.prg
    testprogs/general/Lorenz-2.15/src/mmufetch-plus4.prg
    testprogs/general/Lorenz-2.15/src/mmufetch.prg
    testprogs/general/Lorenz-2.15/src/nextdisk1-dtv.prg
    testprogs/general/Lorenz-2.15/src/nextdisk1-plus4.prg
    testprogs/general/Lorenz-2.15/src/nextdisk1.prg
    testprogs/general/Lorenz-2.15/src/nextdisk2-dtv.prg
    testprogs/general/Lorenz-2.15/src/nextdisk2-plus4.prg
    testprogs/general/Lorenz-2.15/src/nextdisk2.prg
    testprogs/general/Lorenz-2.15/src/nmi-dtv.prg
    testprogs/general/Lorenz-2.15/src/nmi-plus4.prg
    testprogs/general/Lorenz-2.15/src/nmi.prg
    testprogs/general/Lorenz-2.15/src/nminew.prg
    testprogs/general/Lorenz-2.15/src/nopa-dtv.prg
    testprogs/general/Lorenz-2.15/src/nopa-plus4.prg
    testprogs/general/Lorenz-2.15/src/nopa.prg
    testprogs/general/Lorenz-2.15/src/nopax-dtv.prg
    testprogs/general/Lorenz-2.15/src/nopax-plus4.prg
    testprogs/general/Lorenz-2.15/src/nopax.prg
    testprogs/general/Lorenz-2.15/src/nopb-dtv.prg
    testprogs/general/Lorenz-2.15/src/nopb-plus4.prg
    testprogs/general/Lorenz-2.15/src/nopb.prg
    testprogs/general/Lorenz-2.15/src/nopn-dtv.prg
    testprogs/general/Lorenz-2.15/src/nopn-plus4.prg
    testprogs/general/Lorenz-2.15/src/nopn.prg
    testprogs/general/Lorenz-2.15/src/nopz-dtv.prg
    testprogs/general/Lorenz-2.15/src/nopz-plus4.prg
    testprogs/general/Lorenz-2.15/src/nopz.prg
    testprogs/general/Lorenz-2.15/src/nopzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/nopzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/nopzx.prg
    testprogs/general/Lorenz-2.15/src/oneshot-dtv.prg
    testprogs/general/Lorenz-2.15/src/oneshot.prg
    testprogs/general/Lorenz-2.15/src/oraa-dtv.prg
    testprogs/general/Lorenz-2.15/src/oraa-plus4.prg
    testprogs/general/Lorenz-2.15/src/oraa.prg
    testprogs/general/Lorenz-2.15/src/oraax-dtv.prg
    testprogs/general/Lorenz-2.15/src/oraax-plus4.prg
    testprogs/general/Lorenz-2.15/src/oraax.prg
    testprogs/general/Lorenz-2.15/src/oraay-dtv.prg
    testprogs/general/Lorenz-2.15/src/oraay-plus4.prg
    testprogs/general/Lorenz-2.15/src/oraay.prg
    testprogs/general/Lorenz-2.15/src/orab-dtv.prg
    testprogs/general/Lorenz-2.15/src/orab-plus4.prg
    testprogs/general/Lorenz-2.15/src/orab.prg
    testprogs/general/Lorenz-2.15/src/oraix-dtv.prg
    testprogs/general/Lorenz-2.15/src/oraix-plus4.prg
    testprogs/general/Lorenz-2.15/src/oraix.prg
    testprogs/general/Lorenz-2.15/src/oraiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/oraiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/oraiy.prg
    testprogs/general/Lorenz-2.15/src/oraz-dtv.prg
    testprogs/general/Lorenz-2.15/src/oraz-plus4.prg
    testprogs/general/Lorenz-2.15/src/oraz.prg
    testprogs/general/Lorenz-2.15/src/orazx-dtv.prg
    testprogs/general/Lorenz-2.15/src/orazx-plus4.prg
    testprogs/general/Lorenz-2.15/src/orazx.prg
    testprogs/general/Lorenz-2.15/src/phan-dtv.prg
    testprogs/general/Lorenz-2.15/src/phan-plus4.prg
    testprogs/general/Lorenz-2.15/src/phan.prg
    testprogs/general/Lorenz-2.15/src/phpn-dtv.prg
    testprogs/general/Lorenz-2.15/src/phpn-plus4.prg
    testprogs/general/Lorenz-2.15/src/phpn.prg
    testprogs/general/Lorenz-2.15/src/plan-dtv.prg
    testprogs/general/Lorenz-2.15/src/plan-plus4.prg
    testprogs/general/Lorenz-2.15/src/plan.prg
    testprogs/general/Lorenz-2.15/src/plpn-dtv.prg
    testprogs/general/Lorenz-2.15/src/plpn-plus4.prg
    testprogs/general/Lorenz-2.15/src/plpn.prg
    testprogs/general/Lorenz-2.15/src/rlaa-dtv.prg
    testprogs/general/Lorenz-2.15/src/rlaa-plus4.prg
    testprogs/general/Lorenz-2.15/src/rlaa.prg
    testprogs/general/Lorenz-2.15/src/rlaax-dtv.prg
    testprogs/general/Lorenz-2.15/src/rlaax-plus4.prg
    testprogs/general/Lorenz-2.15/src/rlaax.prg
    testprogs/general/Lorenz-2.15/src/rlaay-dtv.prg
    testprogs/general/Lorenz-2.15/src/rlaay-plus4.prg
    testprogs/general/Lorenz-2.15/src/rlaay.prg
    testprogs/general/Lorenz-2.15/src/rlaix-dtv.prg
    testprogs/general/Lorenz-2.15/src/rlaix-plus4.prg
    testprogs/general/Lorenz-2.15/src/rlaix.prg
    testprogs/general/Lorenz-2.15/src/rlaiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/rlaiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/rlaiy.prg
    testprogs/general/Lorenz-2.15/src/rlaz-dtv.prg
    testprogs/general/Lorenz-2.15/src/rlaz-plus4.prg
    testprogs/general/Lorenz-2.15/src/rlaz.prg
    testprogs/general/Lorenz-2.15/src/rlazx-dtv.prg
    testprogs/general/Lorenz-2.15/src/rlazx-plus4.prg
    testprogs/general/Lorenz-2.15/src/rlazx.prg
    testprogs/general/Lorenz-2.15/src/rola-dtv.prg
    testprogs/general/Lorenz-2.15/src/rola-plus4.prg
    testprogs/general/Lorenz-2.15/src/rola.prg
    testprogs/general/Lorenz-2.15/src/rolax-dtv.prg
    testprogs/general/Lorenz-2.15/src/rolax-plus4.prg
    testprogs/general/Lorenz-2.15/src/rolax.prg
    testprogs/general/Lorenz-2.15/src/roln-dtv.prg
    testprogs/general/Lorenz-2.15/src/roln-plus4.prg
    testprogs/general/Lorenz-2.15/src/roln.prg
    testprogs/general/Lorenz-2.15/src/rolz-dtv.prg
    testprogs/general/Lorenz-2.15/src/rolz-plus4.prg
    testprogs/general/Lorenz-2.15/src/rolz.prg
    testprogs/general/Lorenz-2.15/src/rolzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/rolzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/rolzx.prg
    testprogs/general/Lorenz-2.15/src/rora-dtv.prg
    testprogs/general/Lorenz-2.15/src/rora-plus4.prg
    testprogs/general/Lorenz-2.15/src/rora.prg
    testprogs/general/Lorenz-2.15/src/rorax-dtv.prg
    testprogs/general/Lorenz-2.15/src/rorax-plus4.prg
    testprogs/general/Lorenz-2.15/src/rorax.prg
    testprogs/general/Lorenz-2.15/src/rorn-dtv.prg
    testprogs/general/Lorenz-2.15/src/rorn-plus4.prg
    testprogs/general/Lorenz-2.15/src/rorn.prg
    testprogs/general/Lorenz-2.15/src/rorz-dtv.prg
    testprogs/general/Lorenz-2.15/src/rorz-plus4.prg
    testprogs/general/Lorenz-2.15/src/rorz.prg
    testprogs/general/Lorenz-2.15/src/rorzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/rorzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/rorzx.prg
    testprogs/general/Lorenz-2.15/src/rraa-dtv.prg
    testprogs/general/Lorenz-2.15/src/rraa-plus4.prg
    testprogs/general/Lorenz-2.15/src/rraa.prg
    testprogs/general/Lorenz-2.15/src/rraax-dtv.prg
    testprogs/general/Lorenz-2.15/src/rraax-plus4.prg
    testprogs/general/Lorenz-2.15/src/rraax.prg
    testprogs/general/Lorenz-2.15/src/rraay-dtv.prg
    testprogs/general/Lorenz-2.15/src/rraay-plus4.prg
    testprogs/general/Lorenz-2.15/src/rraay.prg
    testprogs/general/Lorenz-2.15/src/rraix-dtv.prg
    testprogs/general/Lorenz-2.15/src/rraix-plus4.prg
    testprogs/general/Lorenz-2.15/src/rraix.prg
    testprogs/general/Lorenz-2.15/src/rraiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/rraiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/rraiy.prg
    testprogs/general/Lorenz-2.15/src/rraz-dtv.prg
    testprogs/general/Lorenz-2.15/src/rraz-plus4.prg
    testprogs/general/Lorenz-2.15/src/rraz.prg
    testprogs/general/Lorenz-2.15/src/rrazx-dtv.prg
    testprogs/general/Lorenz-2.15/src/rrazx-plus4.prg
    testprogs/general/Lorenz-2.15/src/rrazx.prg
    testprogs/general/Lorenz-2.15/src/rtin-dtv.prg
    testprogs/general/Lorenz-2.15/src/rtin-plus4.prg
    testprogs/general/Lorenz-2.15/src/rtin.prg
    testprogs/general/Lorenz-2.15/src/rtsn-dtv.prg
    testprogs/general/Lorenz-2.15/src/rtsn-plus4.prg
    testprogs/general/Lorenz-2.15/src/rtsn.prg
    testprogs/general/Lorenz-2.15/src/sbca-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbca-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbca.prg
    testprogs/general/Lorenz-2.15/src/sbcax-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbcax-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbcax.prg
    testprogs/general/Lorenz-2.15/src/sbcay-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbcay-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbcay.prg
    testprogs/general/Lorenz-2.15/src/sbcb-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbcb-eb-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbcb-eb-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbcb-eb.prg
    testprogs/general/Lorenz-2.15/src/sbcb-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbcb.prg
    testprogs/general/Lorenz-2.15/src/sbcix-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbcix-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbcix.prg
    testprogs/general/Lorenz-2.15/src/sbciy-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbciy-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbciy.prg
    testprogs/general/Lorenz-2.15/src/sbcz-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbcz-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbcz.prg
    testprogs/general/Lorenz-2.15/src/sbczx-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbczx-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbczx.prg
    testprogs/general/Lorenz-2.15/src/sbxb-dtv.prg
    testprogs/general/Lorenz-2.15/src/sbxb-plus4.prg
    testprogs/general/Lorenz-2.15/src/sbxb.prg
    testprogs/general/Lorenz-2.15/src/secn-dtv.prg
    testprogs/general/Lorenz-2.15/src/secn-plus4.prg
    testprogs/general/Lorenz-2.15/src/secn.prg
    testprogs/general/Lorenz-2.15/src/sedn-dtv.prg
    testprogs/general/Lorenz-2.15/src/sedn-plus4.prg
    testprogs/general/Lorenz-2.15/src/sedn.prg
    testprogs/general/Lorenz-2.15/src/sein-dtv.prg
    testprogs/general/Lorenz-2.15/src/sein-plus4.prg
    testprogs/general/Lorenz-2.15/src/sein.prg
    testprogs/general/Lorenz-2.15/src/shaay-dtv.prg
    testprogs/general/Lorenz-2.15/src/shaay-plus4.prg
    testprogs/general/Lorenz-2.15/src/shaay.prg
    testprogs/general/Lorenz-2.15/src/shaiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/shaiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/shaiy.prg
    testprogs/general/Lorenz-2.15/src/shsay-dtv.prg
    testprogs/general/Lorenz-2.15/src/shsay-plus4.prg
    testprogs/general/Lorenz-2.15/src/shsay.prg
    testprogs/general/Lorenz-2.15/src/shxay-dtv.prg
    testprogs/general/Lorenz-2.15/src/shxay-plus4.prg
    testprogs/general/Lorenz-2.15/src/shxay.prg
    testprogs/general/Lorenz-2.15/src/shyax-dtv.prg
    testprogs/general/Lorenz-2.15/src/shyax-plus4.prg
    testprogs/general/Lorenz-2.15/src/shyax.prg
    testprogs/general/Lorenz-2.15/src/staa-dtv.prg
    testprogs/general/Lorenz-2.15/src/staa-plus4.prg
    testprogs/general/Lorenz-2.15/src/staa.prg
    testprogs/general/Lorenz-2.15/src/staax-dtv.prg
    testprogs/general/Lorenz-2.15/src/staax-plus4.prg
    testprogs/general/Lorenz-2.15/src/staax.prg
    testprogs/general/Lorenz-2.15/src/staay-dtv.prg
    testprogs/general/Lorenz-2.15/src/staay-plus4.prg
    testprogs/general/Lorenz-2.15/src/staay.prg
    testprogs/general/Lorenz-2.15/src/staix-dtv.prg
    testprogs/general/Lorenz-2.15/src/staix-plus4.prg
    testprogs/general/Lorenz-2.15/src/staix.prg
    testprogs/general/Lorenz-2.15/src/staiy-dtv.prg
    testprogs/general/Lorenz-2.15/src/staiy-plus4.prg
    testprogs/general/Lorenz-2.15/src/staiy.prg
    testprogs/general/Lorenz-2.15/src/start-dtv.prg
    testprogs/general/Lorenz-2.15/src/start-plus4.prg
    testprogs/general/Lorenz-2.15/src/start.prg
    testprogs/general/Lorenz-2.15/src/staz-dtv.prg
    testprogs/general/Lorenz-2.15/src/staz-plus4.prg
    testprogs/general/Lorenz-2.15/src/staz.prg
    testprogs/general/Lorenz-2.15/src/stazx-dtv.prg
    testprogs/general/Lorenz-2.15/src/stazx-plus4.prg
    testprogs/general/Lorenz-2.15/src/stazx.prg
    testprogs/general/Lorenz-2.15/src/stxa-dtv.prg
    testprogs/general/Lorenz-2.15/src/stxa-plus4.prg
    testprogs/general/Lorenz-2.15/src/stxa.prg
    testprogs/general/Lorenz-2.15/src/stxz-dtv.prg
    testprogs/general/Lorenz-2.15/src/stxz-plus4.prg
    testprogs/general/Lorenz-2.15/src/stxz.prg
    testprogs/general/Lorenz-2.15/src/stxzy-dtv.prg
    testprogs/general/Lorenz-2.15/src/stxzy-plus4.prg
    testprogs/general/Lorenz-2.15/src/stxzy.prg
    testprogs/general/Lorenz-2.15/src/stya-dtv.prg
    testprogs/general/Lorenz-2.15/src/stya-plus4.prg
    testprogs/general/Lorenz-2.15/src/stya.prg
    testprogs/general/Lorenz-2.15/src/styz-dtv.prg
    testprogs/general/Lorenz-2.15/src/styz-plus4.prg
    testprogs/general/Lorenz-2.15/src/styz.prg
    testprogs/general/Lorenz-2.15/src/styzx-dtv.prg
    testprogs/general/Lorenz-2.15/src/styzx-plus4.prg
    testprogs/general/Lorenz-2.15/src/styzx.prg
    testprogs/general/Lorenz-2.15/src/taxn-dtv.prg
    testprogs/general/Lorenz-2.15/src/taxn-plus4.prg
    testprogs/general/Lorenz-2.15/src/taxn.prg
    testprogs/general/Lorenz-2.15/src/tayn-dtv.prg
    testprogs/general/Lorenz-2.15/src/tayn-plus4.prg
    testprogs/general/Lorenz-2.15/src/tayn.prg
    testprogs/general/Lorenz-2.15/src/template-dtv.prg
    testprogs/general/Lorenz-2.15/src/template-plus4.prg
    testprogs/general/Lorenz-2.15/src/template.prg
    testprogs/general/Lorenz-2.15/src/trap1-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap1-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap1.prg
    testprogs/general/Lorenz-2.15/src/trap10-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap10-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap10.prg
    testprogs/general/Lorenz-2.15/src/trap11-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap11-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap11.prg
    testprogs/general/Lorenz-2.15/src/trap12-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap12-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap12.prg
    testprogs/general/Lorenz-2.15/src/trap13-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap13-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap13.prg
    testprogs/general/Lorenz-2.15/src/trap14-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap14-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap14.prg
    testprogs/general/Lorenz-2.15/src/trap15-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap15-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap15.prg
    testprogs/general/Lorenz-2.15/src/trap16-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap16-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap16.prg
    testprogs/general/Lorenz-2.15/src/trap17-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap17-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap17.prg
    testprogs/general/Lorenz-2.15/src/trap2-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap2-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap2.prg
    testprogs/general/Lorenz-2.15/src/trap3-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap3-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap3.prg
    testprogs/general/Lorenz-2.15/src/trap4-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap4-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap4.prg
    testprogs/general/Lorenz-2.15/src/trap5-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap5-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap5.prg
    testprogs/general/Lorenz-2.15/src/trap6-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap6-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap6.prg
    testprogs/general/Lorenz-2.15/src/trap7-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap7-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap7.prg
    testprogs/general/Lorenz-2.15/src/trap8-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap8-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap8.prg
    testprogs/general/Lorenz-2.15/src/trap9-dtv.prg
    testprogs/general/Lorenz-2.15/src/trap9-plus4.prg
    testprogs/general/Lorenz-2.15/src/trap9.prg
    testprogs/general/Lorenz-2.15/src/tsxn-dtv.prg
    testprogs/general/Lorenz-2.15/src/tsxn-plus4.prg
    testprogs/general/Lorenz-2.15/src/tsxn.prg
    testprogs/general/Lorenz-2.15/src/txan-dtv.prg
    testprogs/general/Lorenz-2.15/src/txan-plus4.prg
    testprogs/general/Lorenz-2.15/src/txan.prg
    testprogs/general/Lorenz-2.15/src/txsn-dtv.prg
    testprogs/general/Lorenz-2.15/src/txsn-plus4.prg
    testprogs/general/Lorenz-2.15/src/txsn.prg
    testprogs/general/Lorenz-2.15/src/tyan-dtv.prg
    testprogs/general/Lorenz-2.15/src/tyan-plus4.prg
    testprogs/general/Lorenz-2.15/src/tyan.prg

Modified: testprogs/general/Lorenz-2.15/Disk1.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk1DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk1plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2c128.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk2plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk3.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk3DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Disk3new.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Lorenz.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/LorenzDTV.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/LorenzPlus4.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/Lorenznew.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk1.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk1DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk1plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2c128.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk2plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3DTV.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3new.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Disk3plus4.d64
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Lorenz.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/LorenzDTV.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/LorenzPlus4.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Lorenznew.d81
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/Makefile.plus4
===================================================================
--- testprogs/general/Lorenz-2.15/src/Makefile.plus4	2024-07-17 23:38:54 UTC (rev 45242)
+++ testprogs/general/Lorenz-2.15/src/Makefile.plus4	2024-07-17 23:51:12 UTC (rev 45243)
@@ -259,13 +259,13 @@
 	trap17-plus4.prg \
 	branchwrap-plus4.prg \
 	mmufetch-plus4.prg \
-	mmu-plus4.prg \
-	cpuport-plus4.prg \
-	cputiming-plus4.prg
+	mmu-plus4.prg
 
-DISK2NEXT = irq-plus4.prg
+DISK2NEXT = cpuport-plus4.prg
 
 DISK3PROGSOLD = \
+	  cpuport-plus4.prg \
+	  cputiming-plus4.prg \
 	  irq-plus4.prg \
 	  nmi-plus4.prg \
 	\

Modified: testprogs/general/Lorenz-2.15/src/adca-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adca-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adca.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcax-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcax-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcax.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcay-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcay-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcay.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcb-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcix-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcix-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcix.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adciy-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adciy-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adciy.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcz-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcz-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adcz.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adczx-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adczx-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/adczx.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/alrb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/alrb-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/alrb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/ancb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/ancb-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/ancb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/anda-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/anda-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/anda.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andax-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andax-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andax.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/anday-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/anday-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/anday.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andb-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andix-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andix-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andix.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andiy-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andiy-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andiy.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andz-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andz-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andz.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andzx-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andzx-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/andzx.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aneb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aneb-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aneb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/arrb-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/arrb-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/arrb.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asla-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asla-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asla.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslax-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslax-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslax.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asln-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asln-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asln.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslz-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslz-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslz.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslzx-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslzx-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/aslzx.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoa-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoa-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoa.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoax-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoax-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoax.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoay-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoay-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoay.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoix-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoix-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoix.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoiy-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoiy-plus4.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoiy.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoz-dtv.prg
===================================================================
(Binary files differ)

Modified: testprogs/general/Lorenz-2.15/src/asoz-plus4.prg
=======...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[45242] testprogs/general/Lorenz -2.15/readme.txt

From: <gp...@us...> - 2024-07-17 23:38:56

Revision: 45242
          http://sourceforge.net/p/vice-emu/code/45242
Author:   gpz
Date:     2024-07-17 23:38:54 +0000 (Wed, 17 Jul 2024)
Log Message:
-----------
add some info about the instable opcodes

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/readme.txt

Modified: testprogs/general/Lorenz-2.15/readme.txt
===================================================================
--- testprogs/general/Lorenz-2.15/readme.txt	2024-07-17 23:38:37 UTC (rev 45241)
+++ testprogs/general/Lorenz-2.15/readme.txt	2024-07-17 23:38:54 UTC (rev 45242)
@@ -107,15 +107,30 @@
 Two operand commands: 256 data combinations 00/00, 00/11, ... FF/EE, FF/FF 
 multiplied by 256 flag combinations.
 
-ANEb, LASay, SHAay, SHAiy, SHXay, SHYax and SHSay are executed only in the y 
-border. These commands cause unpredictable results when a DMA comes between the 
-command byte and the operand.
+///////////////////////////////////////////////////////////////////////////////
+Notes on tests that perform unstable undocumented opcodes:
 
+ANEb, LXAb, LASay, SHAay, SHAiy, SHXay, SHYax and SHSay are executed only in the
+vertical border. These commands cause unpredictable results when a DMA comes
+between the command byte and the operand.
+
 SHAay, SHAiy, SHXay, SHYax and SHSay are tested on a data address xxFF only. 
 When the hibyte of the indexed address needs adjustment, these commands will 
 write to different locations, depending on the data written.
 
+ANEb and LXAb output the unstable "magic value" before the test (this value will
+be used during testing) and on failure determines it again and prints the new
+value. However, due to the unstable nature of this constant, these tests may not
+pass on some CPUs - even when the printed values before and after the test
+match. Wait a few minutes, letting the computer "warm up", before you run the
+test again eventually (the "magic value" is temperature dependent).
 
+NOTE: if any of the above tests fail - in particular on real CPUs - you might
+want to check the additional tests from the VICE test repository, located in:
+
+testprogs/CPU/ane, testprogs/CPU/lax, testprogs/CPU/sha, testprogs/CPU/shs,
+testprogs/CPU/shxy
+
 ///////////////////////////////////////////////////////////////////////////////
 Programs TRAP* - 6510 IO traps, page boundaries and wrap arounds
 
@@ -170,6 +185,8 @@
 offset 80 no jump, offset 80 jump. For the offset 80, a RTS is written to the 
 location at code - 7E.
 
+NOTE: If the CPU port related tests fail, also check the additional tests in
+the VICE test repo, located in testprogs/CPU/cpuport/
 
 ///////////////////////////////////////////////////////////////////////////////
 Program BRANCHWRAP - Forward branches from FFxx to 00xx

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:[45241] testprogs/general/Lorenz -2.15/src

From: <gp...@us...> - 2024-07-17 23:38:38

Revision: 45241
          http://sourceforge.net/p/vice-emu/code/45241
Author:   gpz
Date:     2024-07-17 23:38:37 +0000 (Wed, 17 Jul 2024)
Log Message:
-----------
print 'magic values' before the test, and after the test when it failed

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/src/common/printhb.asm
    testprogs/general/Lorenz-2.15/src/trap1-15.s
    testprogs/general/Lorenz-2.15/src/trap16.s
    testprogs/general/Lorenz-2.15/src/trap17.s

Modified: testprogs/general/Lorenz-2.15/src/common/printhb.asm
===================================================================
--- testprogs/general/Lorenz-2.15/src/common/printhb.asm	2024-07-17 18:41:51 UTC (rev 45240)
+++ testprogs/general/Lorenz-2.15/src/common/printhb.asm	2024-07-17 23:38:37 UTC (rev 45241)
@@ -1,5 +1,7 @@
 ; this file is part of the C64 Emulator Test Suite. public domain, no copyright
 
+; TODO: this function is called "hexb" in some sourcefiles
+
             ; print hex byte in Akku
 printhb
             .block

Modified: testprogs/general/Lorenz-2.15/src/trap1-15.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/trap1-15.s	2024-07-17 18:41:51 UTC (rev 45240)
+++ testprogs/general/Lorenz-2.15/src/trap1-15.s	2024-07-17 23:38:37 UTC (rev 45241)
@@ -3,6 +3,8 @@
 ; original file was: trap1-15.asm
 ;-------------------------------------------------------------------------------
 
+TESTFAILURE = 0
+
             .include "common.asm"
             .include "printhb.asm"
             .include "waitborder.asm"
@@ -161,6 +163,7 @@
            ldx #$ff
            ane #$ff
            sta anemagic
+
            ; calc reference test result
            lda #$c6 ; value in A
 anemagic = * + 1
@@ -179,6 +182,11 @@
            ora #$02
            sta aneresultstatus
 sk1:
+            jsr print
+            .text 13, "ane magic value: ", 0
+            lda anemagic
+            jsr printhb
+
            jsr waitborder
            ; read the LAX "magic constant"
            lda #0
@@ -202,7 +210,12 @@
            ora #$02
            sta laxresultstatus
 sk2:
+            jsr print
+            .text 13, "lxa magic value: ", 0
+            lda laxmagic
+            jsr printhb
 
+
            lda #<code
            sta pcode+0
            lda #>code
@@ -236,6 +249,10 @@
 
 jump       jsr $1111
 
+.ifeq (TESTFAILURE - 1)
+            jmp error
+.endif
+
            ldy #5
            lda da
            cmp (ptable),y
@@ -339,9 +356,35 @@
            iny
            lda (ptable),y
            jsr printhb
-           lda #13
-           jsr $ffd2
+;           lda #13
+;           jsr $ffd2
 
+            ; show magic again
+            jsr waitborder
+
+            lda #0
+            ldx #$ff
+            .byte $8b, $ff
+            sta anemagic
+
+            ; read the LAX "magic constant"
+            lda #0
+            .byte $ab, $ff
+            sta laxmagic
+
+            jsr print
+            .text 13, "ane magic value: ", 0
+            lda anemagic
+            jsr printhb
+
+            jsr print
+            .text 13, "lax magic value: ", 0
+            lda laxmagic
+            jsr printhb
+
+            lda #13
+            jsr cbmk_bsout
+
             #SET_EXIT_CODE_FAILURE
 
 wait     jsr $ffe4

Modified: testprogs/general/Lorenz-2.15/src/trap16.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/trap16.s	2024-07-17 18:41:51 UTC (rev 45240)
+++ testprogs/general/Lorenz-2.15/src/trap16.s	2024-07-17 23:38:37 UTC (rev 45241)
@@ -3,6 +3,8 @@
 ; original file was: trap16.asm
 ;-------------------------------------------------------------------------------
 
+TESTFAILURE = 0
+
             .include "common.asm"
             .include "printhb.asm"
             .include "waitborder.asm"
@@ -39,6 +41,11 @@
            ora #$02
            sta aneresultstatus
 sk1
+            jsr print
+            .text 13, "ane magic value: ", 0
+            lda anemagic
+            jsr printhb
+
            jsr waitborder
            ; read the LAX "magic constant"
            lda #0
@@ -62,6 +69,10 @@
            ora #$02
            sta laxresultstatus
 sk2:
+            jsr print
+            .text 13, "lxa magic value: ", 0
+            lda laxmagic
+            jsr printhb
 
            jmp main2
 
@@ -118,14 +129,7 @@
 nextcommand
 
            jsr waitborder
-;waitborder
-;           lda $d011
-;           bpl waitborder
-;           bmi isborder
-;           lda $d012
-;           cmp #30
-;           bcs waitborder
-;isborder
+
            jsr ram
            lda #$60
            sta $ffff
@@ -144,6 +148,9 @@
 
 jump       jsr $1111
 
+.ifeq (TESTFAILURE - 1)
+            jmp error
+.endif
            jsr rom
 
            ldy #5
@@ -251,9 +258,35 @@
            iny
            lda (ptable),y
            jsr printhb
-           lda #13
-           jsr $ffd2
+;           lda #13
+;           jsr $ffd2
 
+            ; show magic again
+            jsr waitborder
+
+            lda #0
+            ldx #$ff
+            .byte $8b, $ff
+            sta anemagic
+
+            ; read the LAX "magic constant"
+            lda #0
+            .byte $ab, $ff
+            sta laxmagic
+
+            jsr print
+            .text 13, "ane magic value: ", 0
+            lda anemagic
+            jsr printhb
+
+            jsr print
+            .text 13, "lax magic value: ", 0
+            lda laxmagic
+            jsr printhb
+
+            lda #13
+            jsr cbmk_bsout
+
             #SET_EXIT_CODE_FAILURE
 
 wait        jsr $ffe4

Modified: testprogs/general/Lorenz-2.15/src/trap17.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/trap17.s	2024-07-17 18:41:51 UTC (rev 45240)
+++ testprogs/general/Lorenz-2.15/src/trap17.s	2024-07-17 23:38:37 UTC (rev 45241)
@@ -3,6 +3,8 @@
 ; original file was: trap17.asm
 ;-------------------------------------------------------------------------------
 
+TESTFAILURE = 0
+
             .include "common.asm"
             .include "printhb.asm"
             .include "waitborder.asm"
@@ -39,6 +41,11 @@
            ora #$02
            sta aneresultstatus
 sk1
+            jsr print
+            .text 13, "ane magic value: ", 0
+            lda anemagic
+            jsr printhb
+
            jsr waitborder
            ; read the LAX "magic constant"
            lda #0
@@ -62,6 +69,10 @@
            ora #$02
            sta laxresultstatus
 sk2:
+            jsr print
+            .text 13, "lxa magic value: ", 0
+            lda laxmagic
+            jsr printhb
 
            jmp main2
 
@@ -122,14 +133,7 @@
 nextcommand
 
            jsr waitborder
-;waitborder
-;           lda $d011
-;           bpl waitborder
-;           bmi isborder
-;           lda $d012
-;           cmp #20
-;           bcs waitborder
-;isborder
+
            jsr ram
 
            lda #$60
@@ -150,6 +154,10 @@
 
 jump       jsr $1111
 
+.ifeq (TESTFAILURE - 1)
+            jmp error
+.endif
+
            jsr rom
 
            ldy #5
@@ -258,9 +266,35 @@
            iny
            lda (ptable),y
            jsr printhb
-           lda #13
-           jsr $ffd2
+;           lda #13
+;           jsr $ffd2
 
+            ; show magic again
+            jsr waitborder
+
+            lda #0
+            ldx #$ff
+            .byte $8b, $ff
+            sta anemagic
+
+            ; read the LAX "magic constant"
+            lda #0
+            .byte $ab, $ff
+            sta laxmagic
+
+            jsr print
+            .text 13, "ane magic value: ", 0
+            lda anemagic
+            jsr printhb
+
+            jsr print
+            .text 13, "lax magic value: ", 0
+            lda laxmagic
+            jsr printhb
+
+            lda #13
+            jsr cbmk_bsout
+
             #SET_EXIT_CODE_FAILURE
 
 wait     jsr $ffe4

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:[45240] testprogs/general/Lorenz -2.15/src/common

From: <gp...@us...> - 2024-07-17 18:41:52

Revision: 45240
          http://sourceforge.net/p/vice-emu/code/45240
Author:   gpz
Date:     2024-07-17 18:41:51 +0000 (Wed, 17 Jul 2024)
Log Message:
-----------
missing stuff from r45237

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/src/common/print.asm
    testprogs/general/Lorenz-2.15/src/common/printhb.asm
    testprogs/general/Lorenz-2.15/src/common/showregs.asm
    testprogs/general/Lorenz-2.15/src/common/startup.asm
    testprogs/general/Lorenz-2.15/src/common/waitborder.asm
    testprogs/general/Lorenz-2.15/src/common/waitkey.asm

Modified: testprogs/general/Lorenz-2.15/src/common/print.asm
===================================================================
--- testprogs/general/Lorenz-2.15/src/common/print.asm	2024-07-17 18:13:47 UTC (rev 45239)
+++ testprogs/general/Lorenz-2.15/src/common/print.asm	2024-07-17 18:41:51 UTC (rev 45240)
@@ -3,7 +3,7 @@
 ;print text which immediately follows
 ;the JSR and return to address after 0
 ; return addr on stack == ptr to string
-print      
+print
             .block
             pla
             sta print0+1
@@ -16,7 +16,7 @@
             jsr cbmk_bsout
             inx
             bne print0
-print1     
+print1
             sec
             txa
             adc print0+1

Modified: testprogs/general/Lorenz-2.15/src/common/printhb.asm
===================================================================
--- testprogs/general/Lorenz-2.15/src/common/printhb.asm	2024-07-17 18:13:47 UTC (rev 45239)
+++ testprogs/general/Lorenz-2.15/src/common/printhb.asm	2024-07-17 18:41:51 UTC (rev 45240)
@@ -20,5 +20,5 @@
             jsr cbmk_bsout
             rts
             .bend
- 
- 
+
+

Modified: testprogs/general/Lorenz-2.15/src/common/showregs.asm
===================================================================
--- testprogs/general/Lorenz-2.15/src/common/showregs.asm	2024-07-17 18:13:47 UTC (rev 45239)
+++ testprogs/general/Lorenz-2.15/src/common/showregs.asm	2024-07-17 18:41:51 UTC (rev 45240)
@@ -1,7 +1,7 @@
 ; this file is part of the C64 Emulator Test Suite. public domain, no copyright
 
         ; x/y - pointer to register dump
-showregs 
+showregs
         .block
          stx 172
          sty 173
@@ -99,4 +99,4 @@
          lda (172),y
         jmp printhb
          .bend
- 
+

Modified: testprogs/general/Lorenz-2.15/src/common/startup.asm
===================================================================
--- testprogs/general/Lorenz-2.15/src/common/startup.asm	2024-07-17 18:13:47 UTC (rev 45239)
+++ testprogs/general/Lorenz-2.15/src/common/startup.asm	2024-07-17 18:41:51 UTC (rev 45240)
@@ -72,7 +72,7 @@
 ;            lda #0
 ;            sta $0a    ; load flag
 ;            sta $b9    ; secondary address
-; 
+;
 ;            stx $b7  ; namelen
 ;            lda #<nextname
 ;            sta $bb  ; namelo

Modified: testprogs/general/Lorenz-2.15/src/common/waitborder.asm
===================================================================
--- testprogs/general/Lorenz-2.15/src/common/waitborder.asm	2024-07-17 18:13:47 UTC (rev 45239)
+++ testprogs/general/Lorenz-2.15/src/common/waitborder.asm	2024-07-17 18:41:51 UTC (rev 45240)
@@ -14,7 +14,7 @@
 ok
         inc $d020
             rts
-           .bend 
+           .bend
 .endif
 
 .ifeq (TARGET - TARGETDTV)
@@ -30,7 +30,7 @@
 ok
         inc $d020
             rts
-           .bend 
+           .bend
 .endif
 
 .ifeq (TARGET - TARGETPLUS4)
@@ -53,5 +53,5 @@
 ok
         inc $ff19
             rts
-           .bend 
+           .bend
 .endif

Modified: testprogs/general/Lorenz-2.15/src/common/waitkey.asm
===================================================================
--- testprogs/general/Lorenz-2.15/src/common/waitkey.asm	2024-07-17 18:13:47 UTC (rev 45239)
+++ testprogs/general/Lorenz-2.15/src/common/waitkey.asm	2024-07-17 18:41:51 UTC (rev 45240)
@@ -20,7 +20,7 @@
             .byte 13,0
             jmp loadnext
             ;jmp $a474
-            
+
 ;load
 ;            jsr print
 ;            .byte 13

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:[45239] testprogs/CIA/cia-timer

From: <gp...@us...> - 2024-07-17 18:13:53

Revision: 45239
          http://sourceforge.net/p/vice-emu/code/45239
Author:   gpz
Date:     2024-07-17 18:13:47 +0000 (Wed, 17 Jul 2024)
Log Message:
-----------
added alternative versions of the the test which will always show the value read from the ICR

Modified Paths:
--------------
    testprogs/CIA/cia-timer/Makefile
    testprogs/CIA/cia-timer/cia-timer.asm
    testprogs/CIA/cia-timer/readme.txt

Added Paths:
-----------
    testprogs/CIA/cia-timer/cia-timer-alt-newcias.prg
    testprogs/CIA/cia-timer/cia-timer-alt-oldcias.prg

Modified: testprogs/CIA/cia-timer/Makefile
===================================================================
--- testprogs/CIA/cia-timer/Makefile	2024-07-17 16:01:38 UTC (rev 45238)
+++ testprogs/CIA/cia-timer/Makefile	2024-07-17 18:13:47 UTC (rev 45239)
@@ -1,13 +1,21 @@
 
-all: cia-timer-oldcias.prg cia-timer-newcias.prg
+all: cia-timer-oldcias.prg cia-timer-newcias.prg cia-timer-alt-oldcias.prg cia-timer-alt-newcias.prg
 
 cia-timer-oldcias.prg: cia-timer.asm dump-oldcia.bin
-	dasm cia-timer.asm -DDUMP=0 -ocia-timer-oldcias.prg
-	
+	dasm cia-timer.asm -DDUMP=0 -DSHOWREF=1 -ocia-timer-oldcias.prg
+
 cia-timer-newcias.prg: cia-timer.asm dump-newcia.bin
-	dasm cia-timer.asm -DDUMP=1 -ocia-timer-newcias.prg
-	
+	dasm cia-timer.asm -DDUMP=1 -DSHOWREF=1 -ocia-timer-newcias.prg
+
+cia-timer-alt-oldcias.prg: cia-timer.asm dump-oldcia.bin
+	dasm cia-timer.asm -DDUMP=0 -DSHOWREF=0 -ocia-timer-alt-oldcias.prg
+
+cia-timer-alt-newcias.prg: cia-timer.asm dump-newcia.bin
+	dasm cia-timer.asm -DDUMP=1 -DSHOWREF=0 -ocia-timer-alt-newcias.prg
+
 clean:
-	rm -f *~
-	rm -f cia-timer-oldcias.prg
-	rm -f cia-timer-newcias.prg
+	$(RM) *~
+	$(RM) cia-timer-oldcias.prg
+	$(RM) cia-timer-newcias.prg
+	$(RM) cia-timer-alt-oldcias.prg
+	$(RM) cia-timer-alt-newcias.prg

Added: testprogs/CIA/cia-timer/cia-timer-alt-newcias.prg
===================================================================
(Binary files differ)

Index: testprogs/CIA/cia-timer/cia-timer-alt-newcias.prg
===================================================================
--- testprogs/CIA/cia-timer/cia-timer-alt-newcias.prg	2024-07-17 16:01:38 UTC (rev 45238)
+++ testprogs/CIA/cia-timer/cia-timer-alt-newcias.prg	2024-07-17 18:13:47 UTC (rev 45239)

Property changes on: testprogs/CIA/cia-timer/cia-timer-alt-newcias.prg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-commodore-exec
\ No newline at end of property
Added: testprogs/CIA/cia-timer/cia-timer-alt-oldcias.prg
===================================================================
(Binary files differ)

Index: testprogs/CIA/cia-timer/cia-timer-alt-oldcias.prg
===================================================================
--- testprogs/CIA/cia-timer/cia-timer-alt-oldcias.prg	2024-07-17 16:01:38 UTC (rev 45238)
+++ testprogs/CIA/cia-timer/cia-timer-alt-oldcias.prg	2024-07-17 18:13:47 UTC (rev 45239)

Property changes on: testprogs/CIA/cia-timer/cia-timer-alt-oldcias.prg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-commodore-exec
\ No newline at end of property
Modified: testprogs/CIA/cia-timer/cia-timer.asm
===================================================================
--- testprogs/CIA/cia-timer/cia-timer.asm	2024-07-17 16:01:38 UTC (rev 45238)
+++ testprogs/CIA/cia-timer/cia-timer.asm	2024-07-17 18:13:47 UTC (rev 45239)
@@ -309,7 +309,11 @@
   .word $0450,$0518,$0464,$052c,$0608,$06d0,$061c,$06e4
 
 greet_msg:
+    if SHOWREF = 1
     dc.b 147,"CIA-TIMER R03 / REFERENCE: "
+    else
+    dc.b 147,"CIA-TIMER-ALT R03 / REFERENCE: "
+    endif
     if DUMP = 0
     dc.b "OLD"
     endif
@@ -338,8 +342,10 @@
     cmp #2
     bne skp1a
     sta bordercol
+    if SHOWREF = 1
     lda data_compare+$000,y
     sta $0428,y
+    endif
 skp1a:
 
     ldx #2
@@ -353,8 +359,10 @@
     cmp #2
     bne skp2a
     sta bordercol
+    if SHOWREF = 1
     lda data_compare+$100,y
     sta $0528,y
+    endif
 skp2a:
 
     ldx #2
@@ -368,8 +376,10 @@
     cmp #2
     bne skp3a
     sta bordercol
+    if SHOWREF = 1
     lda data_compare+$200,y
     sta $0628,y
+    endif
 skp3a:
 
     iny
@@ -387,8 +397,10 @@
     cmp #2
     bne skp4a
     sta bordercol
+    if SHOWREF = 1
     lda data_compare+$300,y
     sta $0728,y
+    endif
 skp4a:
 
     iny

Modified: testprogs/CIA/cia-timer/readme.txt
===================================================================
--- testprogs/CIA/cia-timer/readme.txt	2024-07-17 16:01:38 UTC (rev 45238)
+++ testprogs/CIA/cia-timer/readme.txt	2024-07-17 18:13:47 UTC (rev 45239)
@@ -19,7 +19,14 @@
   CIA2TA     CIA2TB
    ICR=1      ICR=1
 
+NOTE: cia-timer-oldcias.prg and cia-timer-newcias.prg will always show the
+expected values/the reference data on screen, and color the non matching
+positions red.
 
+cia-timer-alt-oldcias.prg and cia-timer-alt-newcias.prg will always show the
+values that were read from the ICR.
+
+
 Results for real boxes
 ======================
 

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:[45238] testprogs/CIA/cia-timer/ readme.txt

From: <gp...@us...> - 2024-07-17 16:01:39

Revision: 45238
          http://sourceforge.net/p/vice-emu/code/45238
Author:   gpz
Date:     2024-07-17 16:01:38 +0000 (Wed, 17 Jul 2024)
Log Message:
-----------
fix typo

Modified Paths:
--------------
    testprogs/CIA/cia-timer/readme.txt

Modified: testprogs/CIA/cia-timer/readme.txt
===================================================================
--- testprogs/CIA/cia-timer/readme.txt	2024-07-17 15:58:59 UTC (rev 45237)
+++ testprogs/CIA/cia-timer/readme.txt	2024-07-17 16:01:38 UTC (rev 45238)
@@ -3,8 +3,8 @@
 =========
 
 - eight tests using timers of CIA1/2 and check ICR near the timer underrun
-- for upper tests interrupt is disabled, only the IRC is read and displayed
-- lower tests enable the timer interrupt and IRC is checked even inside the 
+- for upper tests interrupt is disabled, only the ICR is read and displayed
+- lower tests enable the timer interrupt and ICR is checked even inside the
   interrupt handler
 
   CIA1TA     CIA1TB

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:[45237] testprogs/general/Lorenz -2.15/src

From: <gp...@us...> - 2024-07-17 15:59:04

Revision: 45237
          http://sourceforge.net/p/vice-emu/code/45237
Author:   gpz
Date:     2024-07-17 15:58:59 +0000 (Wed, 17 Jul 2024)
Log Message:
-----------
kill dangling whitespace, patch by Uffe Jakobsen

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/src/adcax.s
    testprogs/general/Lorenz-2.15/src/adcay.s
    testprogs/general/Lorenz-2.15/src/adcb.s
    testprogs/general/Lorenz-2.15/src/adcix.s
    testprogs/general/Lorenz-2.15/src/adciy.s
    testprogs/general/Lorenz-2.15/src/adcz.s
    testprogs/general/Lorenz-2.15/src/adczx.s
    testprogs/general/Lorenz-2.15/src/alrb.s
    testprogs/general/Lorenz-2.15/src/ancb.s
    testprogs/general/Lorenz-2.15/src/anda.s
    testprogs/general/Lorenz-2.15/src/andax.s
    testprogs/general/Lorenz-2.15/src/anday.s
    testprogs/general/Lorenz-2.15/src/andb.s
    testprogs/general/Lorenz-2.15/src/andix.s
    testprogs/general/Lorenz-2.15/src/andiy.s
    testprogs/general/Lorenz-2.15/src/andz.s
    testprogs/general/Lorenz-2.15/src/andzx.s
    testprogs/general/Lorenz-2.15/src/aneb.s
    testprogs/general/Lorenz-2.15/src/arrb.s
    testprogs/general/Lorenz-2.15/src/asla.s
    testprogs/general/Lorenz-2.15/src/aslax.s
    testprogs/general/Lorenz-2.15/src/asln.s
    testprogs/general/Lorenz-2.15/src/aslz.s
    testprogs/general/Lorenz-2.15/src/aslzx.s
    testprogs/general/Lorenz-2.15/src/asoa.s
    testprogs/general/Lorenz-2.15/src/asoax.s
    testprogs/general/Lorenz-2.15/src/asoay.s
    testprogs/general/Lorenz-2.15/src/asoix.s
    testprogs/general/Lorenz-2.15/src/asoiy.s
    testprogs/general/Lorenz-2.15/src/asoz.s
    testprogs/general/Lorenz-2.15/src/asozx.s
    testprogs/general/Lorenz-2.15/src/axsa.s
    testprogs/general/Lorenz-2.15/src/axsix.s
    testprogs/general/Lorenz-2.15/src/axsz.s
    testprogs/general/Lorenz-2.15/src/axszy.s
    testprogs/general/Lorenz-2.15/src/bccr.s
    testprogs/general/Lorenz-2.15/src/bcsr.s
    testprogs/general/Lorenz-2.15/src/beqr.s
    testprogs/general/Lorenz-2.15/src/bita.s
    testprogs/general/Lorenz-2.15/src/bitz.s
    testprogs/general/Lorenz-2.15/src/bmir.s
    testprogs/general/Lorenz-2.15/src/bner.s
    testprogs/general/Lorenz-2.15/src/bplr.s
    testprogs/general/Lorenz-2.15/src/branchwrap.s
    testprogs/general/Lorenz-2.15/src/bvcr.s
    testprogs/general/Lorenz-2.15/src/bvsr.s
    testprogs/general/Lorenz-2.15/src/cia1pb6.s
    testprogs/general/Lorenz-2.15/src/cia1pb7.s
    testprogs/general/Lorenz-2.15/src/cia1ta.s
    testprogs/general/Lorenz-2.15/src/cia1tab.s
    testprogs/general/Lorenz-2.15/src/cia1tb.s
    testprogs/general/Lorenz-2.15/src/cia1tb123.s
    testprogs/general/Lorenz-2.15/src/cia2pb6.s
    testprogs/general/Lorenz-2.15/src/cia2pb7.s
    testprogs/general/Lorenz-2.15/src/cia2ta.s
    testprogs/general/Lorenz-2.15/src/cia2tb.s
    testprogs/general/Lorenz-2.15/src/cia2tb123.s
    testprogs/general/Lorenz-2.15/src/clcn.s
    testprogs/general/Lorenz-2.15/src/cldn.s
    testprogs/general/Lorenz-2.15/src/clin.s
    testprogs/general/Lorenz-2.15/src/clvn.s
    testprogs/general/Lorenz-2.15/src/cmpa.s
    testprogs/general/Lorenz-2.15/src/cmpax.s
    testprogs/general/Lorenz-2.15/src/cmpay.s
    testprogs/general/Lorenz-2.15/src/cmpb.s
    testprogs/general/Lorenz-2.15/src/cmpix.s
    testprogs/general/Lorenz-2.15/src/cmpiy.s
    testprogs/general/Lorenz-2.15/src/cmpz.s
    testprogs/general/Lorenz-2.15/src/cmpzx.s
    testprogs/general/Lorenz-2.15/src/cpuport.s
    testprogs/general/Lorenz-2.15/src/cputiming.s
    testprogs/general/Lorenz-2.15/src/cpxa.s
    testprogs/general/Lorenz-2.15/src/cpxb.s
    testprogs/general/Lorenz-2.15/src/cpxz.s
    testprogs/general/Lorenz-2.15/src/cpya.s
    testprogs/general/Lorenz-2.15/src/cpyb.s
    testprogs/general/Lorenz-2.15/src/cpyz.s
    testprogs/general/Lorenz-2.15/src/dcma.s
    testprogs/general/Lorenz-2.15/src/dcmax.s
    testprogs/general/Lorenz-2.15/src/dcmay.s
    testprogs/general/Lorenz-2.15/src/dcmix.s
    testprogs/general/Lorenz-2.15/src/dcmiy.s
    testprogs/general/Lorenz-2.15/src/dcmz.s
    testprogs/general/Lorenz-2.15/src/dcmzx.s
    testprogs/general/Lorenz-2.15/src/deca.s
    testprogs/general/Lorenz-2.15/src/decax.s
    testprogs/general/Lorenz-2.15/src/decz.s
    testprogs/general/Lorenz-2.15/src/deczx.s
    testprogs/general/Lorenz-2.15/src/dexn.s
    testprogs/general/Lorenz-2.15/src/deyn.s
    testprogs/general/Lorenz-2.15/src/eora.s
    testprogs/general/Lorenz-2.15/src/eorax.s
    testprogs/general/Lorenz-2.15/src/eoray.s
    testprogs/general/Lorenz-2.15/src/eorb.s
    testprogs/general/Lorenz-2.15/src/eorix.s
    testprogs/general/Lorenz-2.15/src/eoriy.s
    testprogs/general/Lorenz-2.15/src/eorz.s
    testprogs/general/Lorenz-2.15/src/eorzx.s
    testprogs/general/Lorenz-2.15/src/finish.s
    testprogs/general/Lorenz-2.15/src/icr01.s
    testprogs/general/Lorenz-2.15/src/inca.s
    testprogs/general/Lorenz-2.15/src/incax.s
    testprogs/general/Lorenz-2.15/src/incz.s
    testprogs/general/Lorenz-2.15/src/inczx.s
    testprogs/general/Lorenz-2.15/src/insa.s
    testprogs/general/Lorenz-2.15/src/insax.s
    testprogs/general/Lorenz-2.15/src/insay.s
    testprogs/general/Lorenz-2.15/src/insix.s
    testprogs/general/Lorenz-2.15/src/insiy.s
    testprogs/general/Lorenz-2.15/src/insz.s
    testprogs/general/Lorenz-2.15/src/inszx.s
    testprogs/general/Lorenz-2.15/src/inxn.s
    testprogs/general/Lorenz-2.15/src/inyn.s
    testprogs/general/Lorenz-2.15/src/irq.s
    testprogs/general/Lorenz-2.15/src/jmpi.s
    testprogs/general/Lorenz-2.15/src/jmpw.s
    testprogs/general/Lorenz-2.15/src/jsrw.s
    testprogs/general/Lorenz-2.15/src/lasay.s
    testprogs/general/Lorenz-2.15/src/laxa.s
    testprogs/general/Lorenz-2.15/src/laxay.s
    testprogs/general/Lorenz-2.15/src/laxix.s
    testprogs/general/Lorenz-2.15/src/laxiy.s
    testprogs/general/Lorenz-2.15/src/laxz.s
    testprogs/general/Lorenz-2.15/src/laxzy.s
    testprogs/general/Lorenz-2.15/src/ldaa.s
    testprogs/general/Lorenz-2.15/src/ldaax.s
    testprogs/general/Lorenz-2.15/src/ldaay.s
    testprogs/general/Lorenz-2.15/src/ldab.s
    testprogs/general/Lorenz-2.15/src/ldaix.s
    testprogs/general/Lorenz-2.15/src/ldaiy.s
    testprogs/general/Lorenz-2.15/src/ldaz.s
    testprogs/general/Lorenz-2.15/src/ldazx.s
    testprogs/general/Lorenz-2.15/src/ldxa.s
    testprogs/general/Lorenz-2.15/src/ldxay.s
    testprogs/general/Lorenz-2.15/src/ldxb.s
    testprogs/general/Lorenz-2.15/src/ldxz.s
    testprogs/general/Lorenz-2.15/src/ldxzy.s
    testprogs/general/Lorenz-2.15/src/ldya.s
    testprogs/general/Lorenz-2.15/src/ldyax.s
    testprogs/general/Lorenz-2.15/src/ldyb.s
    testprogs/general/Lorenz-2.15/src/ldyz.s
    testprogs/general/Lorenz-2.15/src/ldyzx.s
    testprogs/general/Lorenz-2.15/src/lsea.s
    testprogs/general/Lorenz-2.15/src/lseax.s
    testprogs/general/Lorenz-2.15/src/lseay.s
    testprogs/general/Lorenz-2.15/src/lseix.s
    testprogs/general/Lorenz-2.15/src/lseiy.s
    testprogs/general/Lorenz-2.15/src/lsez.s
    testprogs/general/Lorenz-2.15/src/lsezx.s
    testprogs/general/Lorenz-2.15/src/lsra.s
    testprogs/general/Lorenz-2.15/src/lsrax.s
    testprogs/general/Lorenz-2.15/src/lsrn.s
    testprogs/general/Lorenz-2.15/src/lsrz.s
    testprogs/general/Lorenz-2.15/src/lsrzx.s
    testprogs/general/Lorenz-2.15/src/lxab.s
    testprogs/general/Lorenz-2.15/src/mmu.s
    testprogs/general/Lorenz-2.15/src/mmufetch.s
    testprogs/general/Lorenz-2.15/src/nextdisk.s
    testprogs/general/Lorenz-2.15/src/nmi.s
    testprogs/general/Lorenz-2.15/src/nopa.s
    testprogs/general/Lorenz-2.15/src/nopax.s
    testprogs/general/Lorenz-2.15/src/nopb.s
    testprogs/general/Lorenz-2.15/src/nopn.s
    testprogs/general/Lorenz-2.15/src/nopz.s
    testprogs/general/Lorenz-2.15/src/nopzx.s
    testprogs/general/Lorenz-2.15/src/oneshot.s
    testprogs/general/Lorenz-2.15/src/oraa.s
    testprogs/general/Lorenz-2.15/src/oraax.s
    testprogs/general/Lorenz-2.15/src/oraay.s
    testprogs/general/Lorenz-2.15/src/orab.s
    testprogs/general/Lorenz-2.15/src/oraix.s
    testprogs/general/Lorenz-2.15/src/oraiy.s
    testprogs/general/Lorenz-2.15/src/oraz.s
    testprogs/general/Lorenz-2.15/src/orazx.s
    testprogs/general/Lorenz-2.15/src/phan.s
    testprogs/general/Lorenz-2.15/src/phpn.s
    testprogs/general/Lorenz-2.15/src/plan.s
    testprogs/general/Lorenz-2.15/src/plpn.s
    testprogs/general/Lorenz-2.15/src/rlaa.s
    testprogs/general/Lorenz-2.15/src/rlaax.s
    testprogs/general/Lorenz-2.15/src/rlaay.s
    testprogs/general/Lorenz-2.15/src/rlaix.s
    testprogs/general/Lorenz-2.15/src/rlaiy.s
    testprogs/general/Lorenz-2.15/src/rlaz.s
    testprogs/general/Lorenz-2.15/src/rlazx.s
    testprogs/general/Lorenz-2.15/src/rola.s
    testprogs/general/Lorenz-2.15/src/rolax.s
    testprogs/general/Lorenz-2.15/src/roln.s
    testprogs/general/Lorenz-2.15/src/rolz.s
    testprogs/general/Lorenz-2.15/src/rolzx.s
    testprogs/general/Lorenz-2.15/src/rora.s
    testprogs/general/Lorenz-2.15/src/rorax.s
    testprogs/general/Lorenz-2.15/src/rorn.s
    testprogs/general/Lorenz-2.15/src/rorz.s
    testprogs/general/Lorenz-2.15/src/rorzx.s
    testprogs/general/Lorenz-2.15/src/rraa.s
    testprogs/general/Lorenz-2.15/src/rraax.s
    testprogs/general/Lorenz-2.15/src/rraay.s
    testprogs/general/Lorenz-2.15/src/rraix.s
    testprogs/general/Lorenz-2.15/src/rraiy.s
    testprogs/general/Lorenz-2.15/src/rraz.s
    testprogs/general/Lorenz-2.15/src/rrazx.s
    testprogs/general/Lorenz-2.15/src/rtin.s
    testprogs/general/Lorenz-2.15/src/rtsn.s
    testprogs/general/Lorenz-2.15/src/sbca.s
    testprogs/general/Lorenz-2.15/src/sbcax.s
    testprogs/general/Lorenz-2.15/src/sbcay.s
    testprogs/general/Lorenz-2.15/src/sbcb-eb.s
    testprogs/general/Lorenz-2.15/src/sbcb.s
    testprogs/general/Lorenz-2.15/src/sbcix.s
    testprogs/general/Lorenz-2.15/src/sbciy.s
    testprogs/general/Lorenz-2.15/src/sbcz.s
    testprogs/general/Lorenz-2.15/src/sbczx.s
    testprogs/general/Lorenz-2.15/src/sbxb.s
    testprogs/general/Lorenz-2.15/src/secn.s
    testprogs/general/Lorenz-2.15/src/sedn.s
    testprogs/general/Lorenz-2.15/src/sein.s
    testprogs/general/Lorenz-2.15/src/shaay.s
    testprogs/general/Lorenz-2.15/src/shaiy.s
    testprogs/general/Lorenz-2.15/src/shsay.s
    testprogs/general/Lorenz-2.15/src/shxay.s
    testprogs/general/Lorenz-2.15/src/shyax.s
    testprogs/general/Lorenz-2.15/src/staa.s
    testprogs/general/Lorenz-2.15/src/staax.s
    testprogs/general/Lorenz-2.15/src/staay.s
    testprogs/general/Lorenz-2.15/src/staix.s
    testprogs/general/Lorenz-2.15/src/staiy.s
    testprogs/general/Lorenz-2.15/src/start.s
    testprogs/general/Lorenz-2.15/src/staz.s
    testprogs/general/Lorenz-2.15/src/stazx.s
    testprogs/general/Lorenz-2.15/src/stxa.s
    testprogs/general/Lorenz-2.15/src/stxz.s
    testprogs/general/Lorenz-2.15/src/stxzy.s
    testprogs/general/Lorenz-2.15/src/stya.s
    testprogs/general/Lorenz-2.15/src/styz.s
    testprogs/general/Lorenz-2.15/src/styzx.s
    testprogs/general/Lorenz-2.15/src/taxn.s
    testprogs/general/Lorenz-2.15/src/tayn.s
    testprogs/general/Lorenz-2.15/src/template.s
    testprogs/general/Lorenz-2.15/src/trap1-15.s
    testprogs/general/Lorenz-2.15/src/trap16.s
    testprogs/general/Lorenz-2.15/src/trap17.s
    testprogs/general/Lorenz-2.15/src/tsxn.s
    testprogs/general/Lorenz-2.15/src/txan.s
    testprogs/general/Lorenz-2.15/src/txsn.s
    testprogs/general/Lorenz-2.15/src/tyan.s

Modified: testprogs/general/Lorenz-2.15/src/adcax.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/adcax.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/adcax.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -6,11 +6,11 @@
             .include "common.asm"
             .include "printhb.asm"
             .include "showregs.asm"
-           
-;------------------------------------------------------------------------------           
+
+;------------------------------------------------------------------------------
 thisname   .null "adcax"      ; name of this test
 nextname   .null "adcay"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 main:
 
          lda #%00011011
@@ -290,4 +290,4 @@
 wait     jsr $ffe4
          beq wait
          rts
-            
+

Modified: testprogs/general/Lorenz-2.15/src/adcay.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/adcay.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/adcay.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -6,11 +6,11 @@
             .include "common.asm"
             .include "printhb.asm"
             .include "showregs.asm"
-           
-;------------------------------------------------------------------------------           
+
+;------------------------------------------------------------------------------
 thisname   .null "adcay"      ; name of this test
 nextname   .null "adcix"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/adcb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/adcb.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/adcb.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "adcb"      ; name of this test
 nextname   .null "adcz"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/adcix.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/adcix.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/adcix.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -6,11 +6,11 @@
             .include "common.asm"
             .include "printhb.asm"
             .include "showregs.asm"
-           
-;------------------------------------------------------------------------------           
+
+;------------------------------------------------------------------------------
 thisname   .null "adcix"      ; name of this test
 nextname   .null "adciy"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/adciy.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/adciy.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/adciy.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -6,11 +6,11 @@
             .include "common.asm"
             .include "printhb.asm"
             .include "showregs.asm"
-           
-;------------------------------------------------------------------------------           
+
+;------------------------------------------------------------------------------
 thisname   .null "adciy"      ; name of this test
 nextname   .null "sbcb"       ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/adcz.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/adcz.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/adcz.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "adcz"      ; name of this test
 nextname   .null "adczx"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/adczx.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/adczx.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/adczx.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "adczx"      ; name of this test
 nextname   .null "adca"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/alrb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/alrb.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/alrb.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "alrb"      ; name of this test
 nextname   .null "arrb"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/ancb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/ancb.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/ancb.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "ancb"      ; name of this test
 nextname   .null "lasay"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/anda.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/anda.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/anda.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "anda"      ; name of this test
 nextname   .null "andax"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/andax.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/andax.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/andax.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "andax"      ; name of this test
 nextname   .null "anday"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/anday.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/anday.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/anday.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "anday"      ; name of this test
 nextname   .null "andix"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/andb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/andb.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/andb.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "andb"      ; name of this test
 nextname   .null "andz"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/andix.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/andix.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/andix.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "andix"      ; name of this test
 nextname   .null "andiy"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/andiy.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/andiy.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/andiy.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "andiy"      ; name of this test
 nextname   .null "orab"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/andz.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/andz.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/andz.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "andz"      ; name of this test
 nextname   .null "andzx"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/andzx.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/andzx.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/andzx.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "andzx"      ; name of this test
 nextname   .null "anda"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/aneb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/aneb.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/aneb.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -10,10 +10,10 @@
             .include "showregs.asm"
             .include "waitborder.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "aneb"      ; name of this test
 nextname   .null "lxab"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
         jsr waitborder
 

Modified: testprogs/general/Lorenz-2.15/src/arrb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/arrb.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/arrb.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "arrb"      ; name of this test
 nextname   .null "aneb"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asla.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asla.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asla.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asla"      ; name of this test
 nextname   .null "aslax"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/aslax.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/aslax.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/aslax.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "aslax"      ; name of this test
 nextname   .null "lsrn"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asln.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asln.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asln.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asln"      ; name of this test
 nextname   .null "aslz"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/aslz.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/aslz.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/aslz.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "aslz"      ; name of this test
 nextname   .null "aslzx"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/aslzx.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/aslzx.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/aslzx.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "aslzx"      ; name of this test
 nextname   .null "asla"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asoa.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asoa.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asoa.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asoa"      ; name of this test
 nextname   .null "asoax"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asoax.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asoax.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asoax.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asoax"      ; name of this test
 nextname   .null "asoay"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asoay.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asoay.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asoay.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asoay"      ; name of this test
 nextname   .null "asoix"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asoix.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asoix.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asoix.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asoix"      ; name of this test
 nextname   .null "asoiy"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asoiy.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asoiy.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asoiy.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asoiy"      ; name of this test
 nextname   .null "rlaz"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asoz.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asoz.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asoz.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asoz"      ; name of this test
 nextname   .null "asozx"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/asozx.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/asozx.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/asozx.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "asozx"      ; name of this test
 nextname   .null "asoa"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/axsa.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/axsa.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/axsa.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "axsa"      ; name of this test
 nextname   .null "axsix"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/axsix.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/axsix.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/axsix.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "axsix"      ; name of this test
 nextname   .null "alrb"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/axsz.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/axsz.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/axsz.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "axsz"      ; name of this test
 nextname   .null "axszy"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/axszy.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/axszy.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/axszy.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "axszy"      ; name of this test
 nextname   .null "axsa"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bccr.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bccr.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bccr.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bccr"      ; name of this test
 nextname   .null "bvsr"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bcsr.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bcsr.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bcsr.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bcsr"      ; name of this test
 nextname   .null "bccr"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/beqr.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/beqr.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/beqr.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "beqr"      ; name of this test
 nextname   .null "bner"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bita.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bita.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bita.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bita"      ; name of this test
 nextname   .null "brkn"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bitz.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bitz.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bitz.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bitz"      ; name of this test
 nextname   .null "bita"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bmir.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bmir.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bmir.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bmir"      ; name of this test
 nextname   .null "bplr"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bner.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bner.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bner.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bner"      ; name of this test
 nextname   .null "bmir"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bplr.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bplr.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bplr.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bplr"      ; name of this test
 nextname   .null "bcsr"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/branchwrap.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/branchwrap.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/branchwrap.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -6,10 +6,10 @@
 
             .include "common.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname    .null "branchwrap" ; name of this test
 nextname    .null "mmufetch"   ; name of next test, "-" means no more tests
-;-------------------------------------------------------------------------------           
+;-------------------------------------------------------------------------------
 
 irqdisable
         ; disable timer irq
@@ -63,7 +63,7 @@
 lp1
         ; flag cleared, branch taken
         ;
-        ; NV-BDIZC 
+        ; NV-BDIZC
         ; 00110000
         lda #$30
         pha
@@ -76,10 +76,10 @@
         ; $0004 rts
         bne ok1
         jmp failed
-ok1:        
+ok1:
         ; flag set, branch not taken
         ;
-        ; NV-BDIZC 
+        ; NV-BDIZC
         ; 11110011
         lda #$f3
         pha
@@ -92,8 +92,8 @@
         ; $0004 rts
         beq ok2
         jmp failed
-ok2:        
-        
+ok2:
+
         clc
         lda $ffbe
         adc #$40
@@ -102,11 +102,11 @@
 
         lda #$30  ; bmi
         sta $ffbe
-        
+
 lp2
         ; flag cleared, branch not taken
         ;
-        ; NV-BDIZC 
+        ; NV-BDIZC
         ; 00110000
         lda #$30
         pha
@@ -115,14 +115,14 @@
         ; $ffbe bpl, bvc, bcc, bne $0002
         ; $ffc0 lda #$00   <-
         ; $ffc2 rts
-        ; $0002 lda #$01    
+        ; $0002 lda #$01
         ; $0004 rts
         beq ok3
         jmp failed
-ok3:        
+ok3:
         ; flag set, branch taken
         ;
-        ; NV-BDIZC 
+        ; NV-BDIZC
         ; 11110011
         lda #$f3
         pha
@@ -129,14 +129,14 @@
         plp
         jsr $ffbe
         ; $ffbe bmi, bvs, bcs, beq $0002
-        ; $ffc0 lda #$00    
+        ; $ffc0 lda #$00
         ; $ffc2 rts
         ; $0002 lda #$01    <-
         ; $0004 rts
         bne ok4
         jmp failed
-ok4:        
-        
+ok4:
+
         clc
         lda $ffbe
         adc #$40

Modified: testprogs/general/Lorenz-2.15/src/bvcr.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bvcr.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bvcr.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bvcr"      ; name of this test
 nextname   .null "nopn"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/bvsr.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/bvsr.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/bvsr.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,10 +7,10 @@
             .include "printhb.asm"
             .include "showregs.asm"
 
-;------------------------------------------------------------------------------           
+;------------------------------------------------------------------------------
 thisname   .null "bvsr"      ; name of this test
 nextname   .null "bvcr"      ; name of next test, "-" means no more tests
-;------------------------------------------------------------------------------ 
+;------------------------------------------------------------------------------
 main:
          lda #%00011011
          sta db

Modified: testprogs/general/Lorenz-2.15/src/cia1pb6.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia1pb6.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/cia1pb6.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,11 +7,11 @@
             .include "printhb.asm"
             .include "waitborder.asm"
             .include "waitkey.asm"
-           
-;-------------------------------------------------------------------------------           
+
+;-------------------------------------------------------------------------------
 thisname .null "cia1pb6"
 nextname .null "cia1pb7"
-;-------------------------------------------------------------------------------           
+;-------------------------------------------------------------------------------
 
 main:
 

Modified: testprogs/general/Lorenz-2.15/src/cia1pb7.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia1pb7.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/cia1pb7.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,14 +7,14 @@
             .include "printhb.asm"
             .include "waitborder.asm"
             .include "waitkey.asm"
-           
-;-------------------------------------------------------------------------------           
+
+;-------------------------------------------------------------------------------
 thisname .null "cia1pb7"
 nextname .null "cia2pb6"
-;-------------------------------------------------------------------------------           
-         
-main:         
+;-------------------------------------------------------------------------------
 
+main:
+
 ;---------------------------------------
 ;old crb 0 start
 ;    crb 1 pb7out

Modified: testprogs/general/Lorenz-2.15/src/cia1ta.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia1ta.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/cia1ta.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,8 +7,8 @@
             .include "printhb.asm"
 ;            .include "waitborder.asm"
             .include "waitkey.asm"
-           
-;-------------------------------------------------------------------------------           
+
+;-------------------------------------------------------------------------------
 thisname:
 .ifeq NEWCIA - 1
            .null "cia1ta (new cia)"
@@ -17,8 +17,8 @@
 .endif
 
 nextname .null "cia1tb"
-;-------------------------------------------------------------------------------           
-         
+;-------------------------------------------------------------------------------
+
 waitborder
            .block
 ;           lda $d011
@@ -1046,7 +1046,7 @@
 
            jsr print
            .byte 13
-           .text "init   " 
+           .text "init   "
            .byte 0
            lda i4
            jsr printhb

Modified: testprogs/general/Lorenz-2.15/src/cia1tab.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia1tab.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/cia1tab.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -154,9 +154,9 @@
          .text "   "
          .byte 0
          jsr print12
-         
-        #SET_EXIT_CODE_FAILURE 
-         
+
+        #SET_EXIT_CODE_FAILURE
+
          jsr waitkey
          jmp outend
 

Modified: testprogs/general/Lorenz-2.15/src/cia1tb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia1tb.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/cia1tb.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,8 +7,8 @@
             .include "printhb.asm"
             .include "waitborder.asm"
             .include "waitkey.asm"
-           
-;-------------------------------------------------------------------------------           
+
+;-------------------------------------------------------------------------------
 thisname:
 .ifeq NEWCIA - 1
            .null "cia1tb (new cia)"
@@ -17,7 +17,7 @@
 .endif
 
 nextname:   .null "cia2ta"
-;-------------------------------------------------------------------------------           
+;-------------------------------------------------------------------------------
 
 
 report
@@ -979,7 +979,7 @@
 
            jsr print
            .byte 13
-           .text "init   " 
+           .text "init   "
            .byte 0
            lda i4
            jsr printhb
@@ -1058,7 +1058,7 @@
             bne lp
             .bend
 
-            
+
             rts ; SUCCESS
 
 testoktab

Modified: testprogs/general/Lorenz-2.15/src/cia1tb123.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia1tb123.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/cia1tb123.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,11 +7,11 @@
             .include "printhb.asm"
             .include "waitborder.asm"
             .include "waitkey.asm"
-           
-;-------------------------------------------------------------------------------           
+
+;-------------------------------------------------------------------------------
 thisname:   .null "cia1tb123"
 nextname:   .null "cia2tb123"
-;-------------------------------------------------------------------------------           
+;-------------------------------------------------------------------------------
 
 newbrk
          pla

Modified: testprogs/general/Lorenz-2.15/src/cia2pb6.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia2pb6.s	2024-07-16 18:58:09 UTC (rev 45236)
+++ testprogs/general/Lorenz-2.15/src/cia2pb6.s	2024-07-17 15:58:59 UTC (rev 45237)
@@ -7,11 +7,11 @@
             .include "printhb.asm"
             .include "waitborder.asm"
             .include "waitkey.asm"
-           
-;-------------------------------------------------------------------------------           
+
+;-------------------------------------------------------------------------------
 thisname .null "cia2pb6"
 nextname .null "cia2pb7"
-;-------------------------------------------------------------------------------           
+;-------------------------------------------------------------------------------
 main:
 
 ;---------------------------------------

Modified: testprogs/general/Lorenz-2.15/src/cia2pb7.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/cia2pb7.s	2024-07-16 18:58:09 UTC...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[45236] testprogs/general/Lorenz -2.15/src

From: <gp...@us...> - 2024-07-16 18:58:12

Revision: 45236
          http://sourceforge.net/p/vice-emu/code/45236
Author:   gpz
Date:     2024-07-16 18:58:09 +0000 (Tue, 16 Jul 2024)
Log Message:
-----------
move common table into a shared file

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/src/Makefile
    testprogs/general/Lorenz-2.15/src/Makefile.dtv
    testprogs/general/Lorenz-2.15/src/Makefile.plus4
    testprogs/general/Lorenz-2.15/src/trap1-15.s
    testprogs/general/Lorenz-2.15/src/trap16.s
    testprogs/general/Lorenz-2.15/src/trap17.s

Added Paths:
-----------
    testprogs/general/Lorenz-2.15/src/trap-table.s

Modified: testprogs/general/Lorenz-2.15/src/Makefile
===================================================================
--- testprogs/general/Lorenz-2.15/src/Makefile	2024-07-15 23:53:07 UTC (rev 45235)
+++ testprogs/general/Lorenz-2.15/src/Makefile	2024-07-16 18:58:09 UTC (rev 45236)
@@ -442,36 +442,40 @@
 cpuport128.prg: cpuport.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D ISC128C64=1 -i cpuport.s -o cpuport128.prg
 
-trap1.prg: trap1-15.s $(COMMONSRC)
+trap1.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=1 -i trap1-15.s -o trap1.prg
-trap2.prg: trap1-15.s $(COMMONSRC)
+trap2.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=2 -i trap1-15.s -o trap2.prg
-trap3.prg: trap1-15.s $(COMMONSRC)
+trap3.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=3 -i trap1-15.s -o trap3.prg
-trap4.prg: trap1-15.s $(COMMONSRC)
+trap4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=4 -i trap1-15.s -o trap4.prg
-trap5.prg: trap1-15.s $(COMMONSRC)
+trap5.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=5 -i trap1-15.s -o trap5.prg
-trap6.prg: trap1-15.s $(COMMONSRC)
+trap6.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=6 -i trap1-15.s -o trap6.prg
-trap7.prg: trap1-15.s $(COMMONSRC)
+trap7.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=7 -i trap1-15.s -o trap7.prg
-trap8.prg: trap1-15.s $(COMMONSRC)
+trap8.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=8 -i trap1-15.s -o trap8.prg
-trap9.prg: trap1-15.s $(COMMONSRC)
+trap9.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=9 -i trap1-15.s -o trap9.prg
-trap10.prg: trap1-15.s $(COMMONSRC)
+trap10.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=10 -i trap1-15.s -o trap10.prg
-trap11.prg: trap1-15.s $(COMMONSRC)
+trap11.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=11 -i trap1-15.s -o trap11.prg
-trap12.prg: trap1-15.s $(COMMONSRC)
+trap12.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=12 -i trap1-15.s -o trap12.prg
-trap13.prg: trap1-15.s $(COMMONSRC)
+trap13.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=13 -i trap1-15.s -o trap13.prg
-trap14.prg: trap1-15.s $(COMMONSRC)
+trap14.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=14 -i trap1-15.s -o trap14.prg
-trap15.prg: trap1-15.s $(COMMONSRC)
+trap15.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=15 -i trap1-15.s -o trap15.prg
+trap16.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TRAP=16 -i trap16.s -o trap16.prg
+trap17.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TRAP=17 -i trap17.s -o trap17.prg
 
 irq.prg: irq.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEWCIA=0 -i irq.s -o irq.prg

Modified: testprogs/general/Lorenz-2.15/src/Makefile.dtv
===================================================================
--- testprogs/general/Lorenz-2.15/src/Makefile.dtv	2024-07-15 23:53:07 UTC (rev 45235)
+++ testprogs/general/Lorenz-2.15/src/Makefile.dtv	2024-07-16 18:58:09 UTC (rev 45236)
@@ -304,36 +304,40 @@
 cpuport-dtv.prg: cpuport.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D ISC128C64=0 -i cpuport.s -o cpuport-dtv.prg
 
-trap1-dtv.prg: trap1-15.s $(COMMONSRC)
+trap1-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=1 -i trap1-15.s -o trap1-dtv.prg
-trap2-dtv.prg: trap1-15.s $(COMMONSRC)
+trap2-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=2 -i trap1-15.s -o trap2-dtv.prg
-trap3-dtv.prg: trap1-15.s $(COMMONSRC)
+trap3-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=3 -i trap1-15.s -o trap3-dtv.prg
-trap4-dtv.prg: trap1-15.s $(COMMONSRC)
+trap4-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=4 -i trap1-15.s -o trap4-dtv.prg
-trap5-dtv.prg: trap1-15.s $(COMMONSRC)
+trap5-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=5 -i trap1-15.s -o trap5-dtv.prg
-trap6-dtv.prg: trap1-15.s $(COMMONSRC)
+trap6-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=6 -i trap1-15.s -o trap6-dtv.prg
-trap7-dtv.prg: trap1-15.s $(COMMONSRC)
+trap7-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=7 -i trap1-15.s -o trap7-dtv.prg
-trap8-dtv.prg: trap1-15.s $(COMMONSRC)
+trap8-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=8 -i trap1-15.s -o trap8-dtv.prg
-trap9-dtv.prg: trap1-15.s $(COMMONSRC)
+trap9-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=9 -i trap1-15.s -o trap9-dtv.prg
-trap10-dtv.prg: trap1-15.s $(COMMONSRC)
+trap10-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=10 -i trap1-15.s -o trap10-dtv.prg
-trap11-dtv.prg: trap1-15.s $(COMMONSRC)
+trap11-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=11 -i trap1-15.s -o trap11-dtv.prg
-trap12-dtv.prg: trap1-15.s $(COMMONSRC)
+trap12-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=12 -i trap1-15.s -o trap12-dtv.prg
-trap13-dtv.prg: trap1-15.s $(COMMONSRC)
+trap13-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=13 -i trap1-15.s -o trap13-dtv.prg
-trap14-dtv.prg: trap1-15.s $(COMMONSRC)
+trap14-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=14 -i trap1-15.s -o trap14-dtv.prg
-trap15-dtv.prg: trap1-15.s $(COMMONSRC)
+trap15-dtv.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=15 -i trap1-15.s -o trap15-dtv.prg
+trap16-dtv.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TRAP=16 -i trap16.s -o trap16-dtv.prg
+trap17-dtv.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TRAP=17 -i trap17.s -o trap17-dtv.prg
 
 irq-dtv.prg: irq.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEWCIA=0 -i irq.s -o irq-dtv.prg

Modified: testprogs/general/Lorenz-2.15/src/Makefile.plus4
===================================================================
--- testprogs/general/Lorenz-2.15/src/Makefile.plus4	2024-07-15 23:53:07 UTC (rev 45235)
+++ testprogs/general/Lorenz-2.15/src/Makefile.plus4	2024-07-16 18:58:09 UTC (rev 45236)
@@ -285,36 +285,40 @@
 cpuport-plus4.prg: cpuport.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D ISC128C64=0 -i cpuport.s -o cpuport-plus4.prg
 
-trap1-plus4.prg: trap1-15.s $(COMMONSRC)
+trap1-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=1 -i trap1-15.s -o trap1-plus4.prg
-trap2-plus4.prg: trap1-15.s $(COMMONSRC)
+trap2-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=2 -i trap1-15.s -o trap2-plus4.prg
-trap3-plus4.prg: trap1-15.s $(COMMONSRC)
+trap3-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=3 -i trap1-15.s -o trap3-plus4.prg
-trap4-plus4.prg: trap1-15.s $(COMMONSRC)
+trap4-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=4 -i trap1-15.s -o trap4-plus4.prg
-trap5-plus4.prg: trap1-15.s $(COMMONSRC)
+trap5-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=5 -i trap1-15.s -o trap5-plus4.prg
-trap6-plus4.prg: trap1-15.s $(COMMONSRC)
+trap6-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=6 -i trap1-15.s -o trap6-plus4.prg
-trap7-plus4.prg: trap1-15.s $(COMMONSRC)
+trap7-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=7 -i trap1-15.s -o trap7-plus4.prg
-trap8-plus4.prg: trap1-15.s $(COMMONSRC)
+trap8-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=8 -i trap1-15.s -o trap8-plus4.prg
-trap9-plus4.prg: trap1-15.s $(COMMONSRC)
+trap9-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=9 -i trap1-15.s -o trap9-plus4.prg
-trap10-plus4.prg: trap1-15.s $(COMMONSRC)
+trap10-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=10 -i trap1-15.s -o trap10-plus4.prg
-trap11-plus4.prg: trap1-15.s $(COMMONSRC)
+trap11-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=11 -i trap1-15.s -o trap11-plus4.prg
-trap12-plus4.prg: trap1-15.s $(COMMONSRC)
+trap12-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=12 -i trap1-15.s -o trap12-plus4.prg
-trap13-plus4.prg: trap1-15.s $(COMMONSRC)
+trap13-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=13 -i trap1-15.s -o trap13-plus4.prg
-trap14-plus4.prg: trap1-15.s $(COMMONSRC)
+trap14-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=14 -i trap1-15.s -o trap14-plus4.prg
-trap15-plus4.prg: trap1-15.s $(COMMONSRC)
+trap15-plus4.prg: trap1-15.s $(COMMONSRC) trap-table.s
 	64tass $(ASFLAGS) -D TRAP=15 -i trap1-15.s -o trap15-plus4.prg
+trap16-plus4.prg: trap16.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TRAP=16 -i trap16.s -o trap16-plus4.prg
+trap17-plus4.prg: trap17.s $(COMMONSRC) trap-table.s
+	64tass $(ASFLAGS) -D TRAP=17 -i trap17.s -o trap17-plus4.prg
 
 irq-plus4.prg: irq.s $(COMMONSRC)
 	64tass $(ASFLAGS) -D NEWCIA=0 -i irq.s -o irq-plus4.prg

Added: testprogs/general/Lorenz-2.15/src/trap-table.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/trap-table.s	                        (rev 0)
+++ testprogs/general/Lorenz-2.15/src/trap-table.s	2024-07-16 18:58:09 UTC (rev 45236)
@@ -0,0 +1,782 @@
+           ; byte after opcode, returned akku, returned x, returned y, returned status
+table
+           .text "brk"
+           .word brkn
+           .byte $1b,$c6,$b1,$6c,$34
+           .text "ora"
+           .word ix
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "aso"
+           .word ix
+           .byte $36,$f6,$b1,$6c,$b0
+           .text "nop"
+           .word z
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ora"
+           .word z
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "asl"
+           .word z
+           .byte $36,$c6,$b1,$6c,$30
+           .text "aso"
+           .word z
+           .byte $36,$f6,$b1,$6c,$b0
+           .text "php"
+           .word phpn
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ora"
+           .word b
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "asl"
+           .word n
+           .byte $1b,$8c,$b1,$6c,$b1
+           .text "anc"
+           .word b
+           .byte $1b,$02,$b1,$6c,$30
+           .text "nop"
+           .word ac
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ora"
+           .word ac
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "asl"
+           .word ac
+           .byte $36,$c6,$b1,$6c,$30
+           .text "aso"
+           .word ac
+           .byte $36,$f6,$b1,$6c,$b0
+           .text "bpl"
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "ora"
+           .word iy
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "aso"
+           .word iy
+           .byte $36,$f6,$b1,$6c,$b0
+           .text "nop"
+           .word zx
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ora"
+           .word zx
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "asl"
+           .word zx
+           .byte $36,$c6,$b1,$6c,$30
+           .text "aso"
+           .word zx
+           .byte $36,$f6,$b1,$6c,$b0
+           .text "clc"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ora"
+           .word ay
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "nop"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "aso"
+           .word ay
+           .byte $36,$f6,$b1,$6c,$b0
+           .text "nop"
+           .word ax
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ora"
+           .word ax
+           .byte $1b,$df,$b1,$6c,$b0
+           .text "asl"
+           .word ax
+           .byte $36,$c6,$b1,$6c,$30
+           .text "aso"
+           .word ax
+           .byte $36,$f6,$b1,$6c,$b0
+           .text "jsr"
+           .word jsrw
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "and"
+           .word ix
+           .byte $1b,$02,$b1,$6c,$30
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "rla"
+           .word ix
+           .byte $36,$06,$b1,$6c,$30
+           .text "bit"
+           .word z
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "and"
+           .word z
+           .byte $1b,$02,$b1,$6c,$30
+           .text "rol"
+           .word z
+           .byte $36,$c6,$b1,$6c,$30
+           .text "rla"
+           .word z
+           .byte $36,$06,$b1,$6c,$30
+           .text "plp"
+           .word plpn
+           .byte $1b,$c6,$b1,$6c,$b3
+           .text "and"
+           .word b
+           .byte $1b,$02,$b1,$6c,$30
+           .text "rol"
+           .word n
+           .byte $1b,$8c,$b1,$6c,$b1
+           .text "anc"
+           .word b
+           .byte $1b,$02,$b1,$6c,$30
+           .text "bit"
+           .word ac
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "and"
+           .word ac
+           .byte $1b,$02,$b1,$6c,$30
+           .text "rol"
+           .word ac
+           .byte $36,$c6,$b1,$6c,$30
+           .text "rla"
+           .word ac
+           .byte $36,$06,$b1,$6c,$30
+           .text "bmi"
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "and"
+           .word iy
+           .byte $1b,$02,$b1,$6c,$30
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "rla"
+           .word iy
+           .byte $36,$06,$b1,$6c,$30
+           .text "nop"
+           .word zx
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "and"
+           .word zx
+           .byte $1b,$02,$b1,$6c,$30
+           .text "rol"
+           .word zx
+           .byte $36,$c6,$b1,$6c,$30
+           .text "rla"
+           .word zx
+           .byte $36,$06,$b1,$6c,$30
+           .text "sec"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$31
+           .text "and"
+           .word ay
+           .byte $1b,$02,$b1,$6c,$30
+           .text "nop"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "rla"
+           .word ay
+           .byte $36,$06,$b1,$6c,$30
+           .text "nop"
+           .word ax
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "and"
+           .word ax
+           .byte $1b,$02,$b1,$6c,$30
+           .text "rol"
+           .word ax
+           .byte $36,$c6,$b1,$6c,$30
+           .text "rla"
+           .word ax
+           .byte $36,$06,$b1,$6c,$30
+           .text "rti"
+           .word rtin
+           .byte $1b,$c6,$b1,$6c,$b3
+           .text "eor"
+           .word ix
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "lse"
+           .word ix
+           .byte $0d,$cb,$b1,$6c,$b1
+           .text "nop"
+           .word z
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "eor"
+           .word z
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "lsr"
+           .word z
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "lse"
+           .word z
+           .byte $0d,$cb,$b1,$6c,$b1
+           .text "pha"
+           .word phan
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "eor"
+           .word b
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "lsr"
+           .word n
+           .byte $1b,$63,$b1,$6c,$30
+           .text "alr"
+           .word b
+           .byte $1b,$01,$b1,$6c,$30
+           .text "jmp"
+           .word jmpw
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "eor"
+           .word ac
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "lsr"
+           .word ac
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "lse"
+           .word ac
+           .byte $0d,$cb,$b1,$6c,$b1
+           .text "bvc"
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "eor"
+           .word iy
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "lse"
+           .word iy
+           .byte $0d,$cb,$b1,$6c,$b1
+           .text "nop"
+           .word zx
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "eor"
+           .word zx
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "lsr"
+           .word zx
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "lse"
+           .word zx
+           .byte $0d,$cb,$b1,$6c,$b1
+           .text "cli"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "eor"
+           .word ay
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "nop"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "lse"
+           .word ay
+           .byte $0d,$cb,$b1,$6c,$b1
+           .text "nop"
+           .word ax
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "eor"
+           .word ax
+           .byte $1b,$dd,$b1,$6c,$b0
+           .text "lsr"
+           .word ax
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "lse"
+           .word ax
+           .byte $0d,$cb,$b1,$6c,$b1
+           .text "rts"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "adc"
+           .word ix
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "rra"
+           .word ix
+           .byte $0d,$d4,$b1,$6c,$b0
+           .text "nop"
+           .word z
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "adc"
+           .word z
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "ror"
+           .word z
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "rra"
+           .word z
+           .byte $0d,$d4,$b1,$6c,$b0
+           .text "pla"
+           .word plan
+           .byte $1b,$f0,$b1,$6c,$b0
+           .text "adc"
+           .word b
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "ror"
+           .word n
+           .byte $1b,$63,$b1,$6c,$30
+           .text "arr"
+           .word b
+           .byte $1b,$01,$b1,$6c,$30
+           .text "jmp"
+           .word jmpi
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "adc"
+           .word ac
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "ror"
+           .word ac
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "rra"
+           .word ac
+           .byte $0d,$d4,$b1,$6c,$b0
+           .text "bvs"
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "adc"
+           .word iy
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "rra"
+           .word iy
+           .byte $0d,$d4,$b1,$6c,$b0
+           .text "nop"
+           .word zx
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "adc"
+           .word zx
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "ror"
+           .word zx
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "rra"
+           .word zx
+           .byte $0d,$d4,$b1,$6c,$b0
+           .text "sei"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$34
+           .text "adc"
+           .word ay
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "nop"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "rra"
+           .word ay
+           .byte $0d,$d4,$b1,$6c,$b0
+           .text "nop"
+           .word ax
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "adc"
+           .word ax
+           .byte $1b,$e1,$b1,$6c,$b0
+           .text "ror"
+           .word ax
+           .byte $0d,$c6,$b1,$6c,$31
+           .text "rra"
+           .word ax
+           .byte $0d,$d4,$b1,$6c,$b0
+           .text "nop"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "sta"
+           .word ix
+           .byte $c6,$c6,$b1,$6c,$30
+           .text "nop"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "axs"
+           .word ix
+           .byte $80,$c6,$b1,$6c,$30
+           .text "sty"
+           .word z
+           .byte $6c,$c6,$b1,$6c,$30
+           .text "sta"
+           .word z
+           .byte $c6,$c6,$b1,$6c,$30
+           .text "stx"
+           .word z
+           .byte $b1,$c6,$b1,$6c,$30
+           .text "axs"
+           .word z
+           .byte $80,$c6,$b1,$6c,$30
+           .text "dey"
+           .word n
+           .byte $1b,$c6,$b1,$6b,$30
+           .text "nop"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "txa"
+           .word n
+           .byte $1b,$b1,$b1,$6c,$b0
+
+           .text "ane"  ; $8b
+           .word b
+aneresult = * + 1
+aneresultstatus = * + 4
+           .byte $1b,$00,$b1,$6c,$32
+
+           .text "sty"  ; $8c
+           .word ac
+           .byte $6c,$c6,$b1,$6c,$30
+           .text "sta"  ; $8d
+           .word ac
+           .byte $c6,$c6,$b1,$6c,$30
+           .text "stx"  ; $8e
+           .word ac
+           .byte $b1,$c6,$b1,$6c,$30
+           .text "axs"  ; $8f
+           .word ac
+           .byte $80,$c6,$b1,$6c,$30
+           .text "bcc"  ; $90
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "sta"  ; $91
+           .word iy
+           .byte $c6,$c6,$b1,$6c,$30
+           .text "hlt"  ; $92
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "sha"  ; $93
+           .word shaiy
+           .byte $00,$c6,$b1,$6c,$30
+           .text "sty"  ; $94
+           .word zx
+           .byte $6c,$c6,$b1,$6c,$30
+           .text "sta"  ; $95
+           .word zx
+           .byte $c6,$c6,$b1,$6c,$30
+           .text "stx"  ; $96
+           .word zy
+           .byte $b1,$c6,$b1,$6c,$30
+           .text "axs"  ; $97
+           .word zy
+           .byte $80,$c6,$b1,$6c,$30
+           .text "tya"  ; $98
+           .word n
+           .byte $1b,$6c,$b1,$6c,$30
+           .text "sta"  ; $99
+           .word ay
+           .byte $c6,$c6,$b1,$6c,$30
+           .text "txs"  ; $9a
+           .word txsn
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "shs"  ; $9b
+           .word shsay
+           .byte $00,$c6,$b1,$6c,$30
+           .text "shy"  ; $9c
+           .word shyax
+           .byte $00,$c6,$b1,$6c,$30
+           .text "sta"  ; $9d
+           .word ax
+           .byte $c6,$c6,$b1,$6c,$30
+           .text "shx"  ; $9e
+           .word shxay
+           .byte $00,$c6,$b1,$6c,$30
+           .text "sha"  ; $9f
+           .word shaay
+           .byte $00,$c6,$b1,$6c,$30
+           .text "ldy"  ; $a0
+           .word b
+           .byte $1b,$c6,$b1,$1b,$30
+           .text "lda"  ; $a1
+           .word ix
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "ldx"  ; $a2
+           .word b
+           .byte $1b,$c6,$1b,$6c,$30
+           .text "lax"  ; $a3
+           .word ix
+           .byte $1b,$1b,$1b,$6c,$30
+           .text "ldy"  ; $a4
+           .word z
+           .byte $1b,$c6,$b1,$1b,$30
+           .text "lda"  ; $a5
+           .word z
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "ldx"  ; $a6
+           .word z
+           .byte $1b,$c6,$1b,$6c,$30
+           .text "lax"  ; $a7
+           .word z
+           .byte $1b,$1b,$1b,$6c,$30
+           .text "tay"  ; $a8
+           .word n
+           .byte $1b,$c6,$b1,$c6,$b0
+           .text "lda"  ; $a9
+           .word b
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "tax"  ; $aa
+           .word n
+           .byte $1b,$c6,$c6,$6c,$b0
+
+           .text "lxa"  ; $ab
+           .word b
+laxresulta = * + 1
+laxresultx = * + 2
+laxresultstatus = * + 4
+           .byte $1b,$0a,$0a,$6c,$30
+
+           .text "ldy"  ; $ac
+           .word ac
+           .byte $1b,$c6,$b1,$1b,$30
+           .text "lda"  ; $ad
+           .word ac
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "ldx"  ; $ae
+           .word ac
+           .byte $1b,$c6,$1b,$6c,$30
+           .text "lax"  ; $af
+           .word ac
+           .byte $1b,$1b,$1b,$6c,$30
+           .text "bcs"
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "lda"
+           .word iy
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "lax"
+           .word iy
+           .byte $1b,$1b,$1b,$6c,$30
+           .text "ldy"
+           .word zx
+           .byte $1b,$c6,$b1,$1b,$30
+           .text "lda"
+           .word zx
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "ldx"
+           .word zy
+           .byte $1b,$c6,$1b,$6c,$30
+           .text "lax"
+           .word zy
+           .byte $1b,$1b,$1b,$6c,$30
+           .text "clv"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "lda"
+           .word ay
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "tsx"
+           .word tsxn
+           .byte $1b,$c6,$00,$6c,$00
+           .text "las"
+           .word lasay
+           .byte $1b,$00,$00,$6c,$00
+           .text "ldy"
+           .word ax
+           .byte $1b,$c6,$b1,$1b,$30
+           .text "lda"
+           .word ax
+           .byte $1b,$1b,$b1,$6c,$30
+           .text "ldx"
+           .word ay
+           .byte $1b,$c6,$1b,$6c,$30
+           .text "lax"
+           .word ay
+           .byte $1b,$1b,$1b,$6c,$30
+           .text "cpy"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$31
+           .text "cmp"
+           .word ix
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "nop"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "dcm"
+           .word ix
+           .byte $1a,$c6,$b1,$6c,$b1
+           .text "cpy"
+           .word z
+           .byte $1b,$c6,$b1,$6c,$31
+           .text "cmp"
+           .word z
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "dec"
+           .word z
+           .byte $1a,$c6,$b1,$6c,$30
+           .text "dcm"
+           .word z
+           .byte $1a,$c6,$b1,$6c,$b1
+           .text "iny"
+           .word n
+           .byte $1b,$c6,$b1,$6d,$30
+           .text "cmp"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "dex"
+           .word n
+           .byte $1b,$c6,$b0,$6c,$b0
+           .text "sbx"
+           .word b
+           .byte $1b,$c6,$65,$6c,$31
+           .text "cpy"
+           .word ac
+           .byte $1b,$c6,$b1,$6c,$31
+           .text "cmp"
+           .word ac
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "dec"
+           .word ac
+           .byte $1a,$c6,$b1,$6c,$30
+           .text "dcm"
+           .word ac
+           .byte $1a,$c6,$b1,$6c,$b1
+           .text "bne"
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "cmp"
+           .word iy
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "dcm"
+           .word iy
+           .byte $1a,$c6,$b1,$6c,$b1
+           .text "nop"
+           .word zx
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "cmp"
+           .word zx
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "dec"
+           .word zx
+           .byte $1a,$c6,$b1,$6c,$30
+           .text "dcm"
+           .word zx
+           .byte $1a,$c6,$b1,$6c,$b1
+           .text "cld"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "cmp"
+           .word ay
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "nop"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "dcm"
+           .word ay
+           .byte $1a,$c6,$b1,$6c,$b1
+           .text "nop"
+           .word ax
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "cmp"
+           .word ax
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "dec"
+           .word ax
+           .byte $1a,$c6,$b1,$6c,$30
+           .text "dcm"
+           .word ax
+           .byte $1a,$c6,$b1,$6c,$b1
+           .text "cpx"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "sbc"
+           .word ix
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "nop"
+           .word b
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ins"
+           .word ix
+           .byte $1c,$a9,$b1,$6c,$b1
+           .text "cpx"
+           .word z
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "sbc"
+           .word z
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "inc"
+           .word z
+           .byte $1c,$c6,$b1,$6c,$30
+           .text "ins"
+           .word z
+           .byte $1c,$a9,$b1,$6c,$b1
+           .text "inx"
+           .word n
+           .byte $1b,$c6,$b2,$6c,$b0
+           .text "sbc"
+           .word b
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "nop"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "sbc"
+           .word b
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "cpx"
+           .word ac
+           .byte $1b,$c6,$b1,$6c,$b1
+           .text "sbc"
+           .word ac
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "inc"
+           .word ac
+           .byte $1c,$c6,$b1,$6c,$30
+           .text "ins"
+           .word ac
+           .byte $1c,$a9,$b1,$6c,$b1
+           .text "beq"
+           .word r
+           .byte $1b,$c6,$b1,$6c,$f3
+           .text "sbc"
+           .word iy
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "hlt"
+           .word hltn
+           .byte $00,$00,$00,$00,$00
+           .text "ins"
+           .word iy
+           .byte $1c,$a9,$b1,$6c,$b1
+           .text "nop"
+           .word zx
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "sbc"
+           .word zx
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "inc"
+           .word zx
+           .byte $1c,$c6,$b1,$6c,$30
+           .text "ins"
+           .word zx
+           .byte $1c,$a9,$b1,$6c,$b1
+           .text "sed"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$38
+           .text "sbc"
+           .word ay
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "nop"
+           .word n
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "ins"
+           .word ay
+           .byte $1c,$a9,$b1,$6c,$b1
+           .text "nop"
+           .word ax
+           .byte $1b,$c6,$b1,$6c,$30
+           .text "sbc"
+           .word ax
+           .byte $1b,$aa,$b1,$6c,$b1
+           .text "inc"
+           .word ax
+           .byte $1c,$c6,$b1,$6c,$30
+           .text "ins"
+           .word ax
+           .byte $1c,$a9,$b1,$6c,$b1
+           .byte 0
+
+

Modified: testprogs/general/Lorenz-2.15/src/trap1-15.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/trap1-15.s	2024-07-15 23:53:07 UTC (rev 45235)
+++ testprogs/general/Lorenz-2.15/src/trap1-15.s	2024-07-16 18:58:09 UTC (rev 45236)
@@ -5,7 +5,7 @@
 
             .include "common.asm"
             .include "printhb.asm"
-            ;.include "waitborder.asm"
+            .include "waitborder.asm"
             ;.include "waitkey.asm"
             ;.include "showregs.asm"
            
@@ -155,7 +155,7 @@
 pa         .byte 0
 
 main:
-           
+           jsr waitborder
            ; read ANE "magic constant"
            lda #0
            ldx #$ff
@@ -179,6 +179,7 @@
            ora #$02
            sta aneresultstatus
 sk1:
+           jsr waitborder
            ; read the LAX "magic constant"
            lda #0
            .byte $ab, $ff
@@ -230,13 +231,9 @@
            iny
            lda (ptable),y
            sta jump+2
-waitborder
-           lda $d011
-           bpl waitborder
-;           bmi jump
-;           lda $d012
-;           cmp #30
-;           bcs waitborder
+
+           jsr waitborder
+
 jump       jsr $1111
 
            ldy #5
@@ -471,7 +468,7 @@
            sta da
            rts
 
-a_
+ac
            ldy #1
            lda #<da
            sta (pcode),y
@@ -1129,786 +1126,4 @@
            sta (ptable),y
            rts
 
-           
-           ; byte after opcode, returned akku, returned x, returned y, returned status
-table
-           .text "brk"
-           .word brkn
-           .byte $1b,$c6,$b1,$6c,$34
-           .text "ora"
-           .word ix
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "aso"
-           .word ix
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "nop"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word z
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word z
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word z
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "php"
-           .word phpn
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word b
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word n
-           .byte $1b,$8c,$b1,$6c,$b1
-           .text "anc"
-           .word b
-           .byte $1b,$02,$b1,$6c,$30
-           .text "nop"
-           .word a_
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word a_
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word a_
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word a_
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "bpl"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "ora"
-           .word iy
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "aso"
-           .word iy
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word zx
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word zx
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word zx
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "clc"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word ay
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "aso"
-           .word ay
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "nop"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word ax
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word ax
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word ax
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "jsr"
-           .word jsrw
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word ix
-           .byte $1b,$02,$b1,$6c,$30
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "rla"
-           .word ix
-           .byte $36,$06,$b1,$6c,$30
-           .text "bit"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word z
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word z
-           .byte $36,$c6,$b1,$6c,$30
-           .text "rla"
-           .word z
-           .byte $36,$06,$b1,$6c,$30
-           .text "plp"
-           .word plpn
-           .byte $1b,$c6,$b1,$6c,$b3
-           .text "and"
-           .word b
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word n
-           .byte $1b,$8c,$b1,$6c,$b1
-           .text "anc"
-           .word b
-           .byte $1b,$02,$b1,$6c,$30
-           .text "bit"
-           .word a_
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word a_
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word a_
-           .byte $36,$c6,$b1,$6c,$30
-           .text "rla"
-           .word a_
-           .byte $36,$06,$b1,$6c,$30
-           .text "bmi"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "and"
-           .word iy
-           .byte $1b,$02,$b1,$6c,$30
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "rla"
-           .word iy
-           .byte $36,$06,$b1,$6c,$30
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word zx
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word zx
-           .byte $36,$c6,$b1,$6c,$30
-           .text "rla"
-           .word zx
-           .byte $36,$06,$b1,$6c,$30
-           .text "sec"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$31
-           .text "and"
-           .word ay
-           .byte $1b,$02,$b1,$6c,$30
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "rla"
-           .word ay
-           .byte $36,$06,$b1,$6c,$30
-           .text "nop"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word ax
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word ax
-           .byte $36,$c6,$b1,$6c,$30
-           .text "rla"
-           .word ax
-           .byte $36,$06,$b1,$6c,$30
-           .text "rti"
-           .word rtin
-           .byte $1b,$c6,$b1,$6c,$b3
-           .text "eor"
-           .word ix
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "lse"
-           .word ix
-           .byte $0d,$cb,$b1,$6c,$b1
-           .text "nop"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "eor"
-           .word z
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "lsr"
-           .word z
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "lse"
-           .word z
-           .byte $0d,$cb,$b1,$6c,$b1
-           .text "pha"
-           .word phan
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "eor"
-           .word b
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "lsr"
-           .word n
-           .byte $1b,$63,$b1,$6c,$30
-           .text "alr"
-           .word b
-           .byte $1b,$01,$b1,$6c,$30
-           .text "jmp"
-           .word jmpw
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "eor"
-           .word a_
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "lsr"
-           .word a_
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "lse"
-           .word a_
-           .byte $0d,$cb,$b1,$6c,$b1
-           .text "bvc"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "eor"
-           .word iy
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "lse"
-           .word iy
-           .byte $0d,$cb,$b1,$6c,$b1
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "eor"
-           .word zx
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "lsr"
-           .word zx
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "lse"
-           .word zx
-           .byte $0d,$cb,$b1,$6c,$b1
-           .text "cli"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "eor"
-           .word ay
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "lse"
-           .word ay
-           .byte $0d,$cb,$b1,$6c,$b1
-           .text "nop"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "eor"
-           .word ax
-           .byte $1b,$dd,$b1,$6c,$b0
-           .text "lsr"
-           .word ax
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "lse"
-           .word ax
-           .byte $0d,$cb,$b1,$6c,$b1
-           .text "rts"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "adc"
-           .word ix
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "rra"
-           .word ix
-           .byte $0d,$d4,$b1,$6c,$b0
-           .text "nop"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "adc"
-           .word z
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "ror"
-           .word z
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "rra"
-           .word z
-           .byte $0d,$d4,$b1,$6c,$b0
-           .text "pla"
-           .word plan
-           .byte $1b,$f0,$b1,$6c,$b0
-           .text "adc"
-           .word b
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "ror"
-           .word n
-           .byte $1b,$63,$b1,$6c,$30
-           .text "arr"
-           .word b
-           .byte $1b,$01,$b1,$6c,$30
-           .text "jmp"
-           .word jmpi
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "adc"
-           .word a_
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "ror"
-           .word a_
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "rra"
-           .word a_
-           .byte $0d,$d4,$b1,$6c,$b0
-           .text "bvs"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "adc"
-           .word iy
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "rra"
-           .word iy
-           .byte $0d,$d4,$b1,$6c,$b0
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "adc"
-           .word zx
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "ror"
-           .word zx
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "rra"
-           .word zx
-           .byte $0d,$d4,$b1,$6c,$b0
-           .text "sei"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$34
-           .text "adc"
-           .word ay
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "rra"
-           .word ay
-           .byte $0d,$d4,$b1,$6c,$b0
-           .text "nop"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "adc"
-           .word ax
-           .byte $1b,$e1,$b1,$6c,$b0
-           .text "ror"
-           .word ax
-           .byte $0d,$c6,$b1,$6c,$31
-           .text "rra"
-           .word ax
-           .byte $0d,$d4,$b1,$6c,$b0
-           .text "nop"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "sta"
-           .word ix
-           .byte $c6,$c6,$b1,$6c,$30
-           .text "nop"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "axs"
-           .word ix
-           .byte $80,$c6,$b1,$6c,$30
-           .text "sty"
-           .word z
-           .byte $6c,$c6,$b1,$6c,$30
-           .text "sta"
-           .word z
-           .byte $c6,$c6,$b1,$6c,$30
-           .text "stx"
-           .word z
-           .byte $b1,$c6,$b1,$6c,$30
-           .text "axs"
-           .word z
-           .byte $80,$c6,$b1,$6c,$30
-           .text "dey"
-           .word n
-           .byte $1b,$c6,$b1,$6b,$30
-           .text "nop"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "txa"
-           .word n
-           .byte $1b,$b1,$b1,$6c,$b0
-
-           .text "ane"  ; $8b
-           .word b
-aneresult = * + 1
-aneresultstatus = * + 4
-           .byte $1b,$00,$b1,$6c,$32
-
-           .text "sty"  ; $8c
-           .word a_
-           .byte $6c,$c6,$b1,$6c,$30
-           .text "sta"  ; $8d
-           .word a_
-           .byte $c6,$c6,$b1,$6c,$30
-           .text "stx"  ; $8e
-           .word a_
-           .byte $b1,$c6,$b1,$6c,$30
-           .text "axs"  ; $8f
-           .word a_
-           .byte $80,$c6,$b1,$6c,$30
-           .text "bcc"  ; $90
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "sta"  ; $91
-           .word iy
-           .byte $c6,$c6,$b1,$6c,$30
-           .text "hlt"  ; $92
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "sha"  ; $93
-           .word shaiy
-           .byte $00,$c6,$b1,$6c,$30
-           .text "sty"  ; $94
-           .word zx
-           .byte $6c,$c6,$b1,$6c,$30
-           .text "sta"  ; $95
-           .word zx
-           .byte $c6,$c6,$b1,$6c,$30
-           .text "stx"  ; $96
-           .word zy
-           .byte $b1,$c6,$b1,$6c,$30
-           .text "axs"  ; $97
-           .word zy
-           .byte $80,$c6,$b1,$6c,$30
-           .text "tya"  ; $98
-           .word n
-           .byte $1b,$6c,$b1,$6c,$30
-           .text "sta"  ; $99
-           .word ay
-           .byte $c6,$c6,$b1,$6c,$30
-           .text "txs"  ; $9a
-           .word txsn
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "shs"  ; $9b
-           .word shsay
-           .byte $00,$c6,$b1,$6c,$30
-           .text "shy"  ; $9c
-           .word shyax
-           .byte $00,$c6,$b1,$6c,$30
-           .text "sta"  ; $9d
-           .word ax
-           .byte $c6,$c6,$b1,$6c,$30
-           .text "shx"  ; $9e
-           .word shxay
-           .byte $00,$c6,$b1,$6c,$30
-           .text "sha"  ; $9f
-           .word shaay
-           .byte $00,$c6,$b1,$6c,$30
-           .text "ldy"  ; $a0
-           .word b
-           .byte $1b,$c6,$b1,$1b,$30
-           .text "lda"  ; $a1
-           .word ix
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "ldx"  ; $a2
-           .word b
-           .byte $1b,$c6,$1b,$6c,$30
-           .text "lax"  ; $a3
-           .word ix
-           .byte $1b,$1b,$1b,$6c,$30
-           .text "ldy"  ; $a4
-           .word z
-           .byte $1b,$c6,$b1,$1b,$30
-           .text "lda"  ; $a5
-           .word z
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "ldx"  ; $a6
-           .word z
-           .byte $1b,$c6,$1b,$6c,$30
-           .text "lax"  ; $a7
-           .word z
-           .byte $1b,$1b,$1b,$6c,$30
-           .text "tay"  ; $a8
-           .word n
-           .byte $1b,$c6,$b1,$c6,$b0
-           .text "lda"  ; $a9
-           .word b
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "tax"  ; $aa
-           .word n
-           .byte $1b,$c6,$c6,$6c,$b0
-           
-           .text "lxa"  ; $ab
-           .word b
-laxresulta = * + 1
-laxresultx = * + 2
-laxresultstatus = * + 4
-           .byte $1b,$0a,$0a,$6c,$30
-           
-           .text "ldy"  ; $ac
-           .word a_
-           .byte $1b,$c6,$b1,$1b,$30
-           .text "lda"  ; $ad
-           .word a_
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "ldx"  ; $ae
-           .word a_
-           .byte $1b,$c6,$1b,$6c,$30
-           .text "lax"  ; $af
-           .word a_
-           .byte $1b,$1b,$1b,$6c,$30
-           .text "bcs"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "lda"
-           .word iy
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "lax"
-           .word iy
-           .byte $1b,$1b,$1b,$6c,$30
-           .text "ldy"
-           .word zx
-           .byte $1b,$c6,$b1,$1b,$30
-           .text "lda"
-           .word zx
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "ldx"
-           .word zy
-           .byte $1b,$c6,$1b,$6c,$30
-           .text "lax"
-           .word zy
-           .byte $1b,$1b,$1b,$6c,$30
-           .text "clv"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "lda"
-           .word ay
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "tsx"
-           .word tsxn
-           .byte $1b,$c6,$00,$6c,$00
-           .text "las"
-           .word lasay
-           .byte $1b,$00,$00,$6c,$00
-           .text "ldy"
-           .word ax
-           .byte $1b,$c6,$b1,$1b,$30
-           .text "lda"
-           .word ax
-           .byte $1b,$1b,$b1,$6c,$30
-           .text "ldx"
-           .word ay
-           .byte $1b,$c6,$1b,$6c,$30
-           .text "lax"
-           .word ay
-           .byte $1b,$1b,$1b,$6c,$30
-           .text "cpy"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$31
-           .text "cmp"
-           .word ix
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "nop"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "dcm"
-           .word ix
-           .byte $1a,$c6,$b1,$6c,$b1
-           .text "cpy"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$31
-           .text "cmp"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "dec"
-           .word z
-           .byte $1a,$c6,$b1,$6c,$30
-           .text "dcm"
-           .word z
-           .byte $1a,$c6,$b1,$6c,$b1
-           .text "iny"
-           .word n
-           .byte $1b,$c6,$b1,$6d,$30
-           .text "cmp"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "dex"
-           .word n
-           .byte $1b,$c6,$b0,$6c,$b0
-           .text "sbx"
-           .word b
-           .byte $1b,$c6,$65,$6c,$31
-           .text "cpy"
-           .word a_
-           .byte $1b,$c6,$b1,$6c,$31
-           .text "cmp"
-           .word a_
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "dec"
-           .word a_
-           .byte $1a,$c6,$b1,$6c,$30
-           .text "dcm"
-           .word a_
-           .byte $1a,$c6,$b1,$6c,$b1
-           .text "bne"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "cmp"
-           .word iy
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "dcm"
-           .word iy
-           .byte $1a,$c6,$b1,$6c,$b1
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "cmp"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "dec"
-           .word zx
-           .byte $1a,$c6,$b1,$6c,$30
-           .text "dcm"
-           .word zx
-           .byte $1a,$c6,$b1,$6c,$b1
-           .text "cld"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "cmp"
-           .word ay
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "dcm"
-           .word ay
-           .byte $1a,$c6,$b1,$6c,$b1
-           .text "nop"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "cmp"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "dec"
-           .word ax
-           .byte $1a,$c6,$b1,$6c,$30
-           .text "dcm"
-           .word ax
-           .byte $1a,$c6,$b1,$6c,$b1
-           .text "cpx"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "sbc"
-           .word ix
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "nop"
-           .word b
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ins"
-           .word ix
-           .byte $1c,$a9,$b1,$6c,$b1
-           .text "cpx"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "sbc"
-           .word z
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "inc"
-           .word z
-           .byte $1c,$c6,$b1,$6c,$30
-           .text "ins"
-           .word z
-           .byte $1c,$a9,$b1,$6c,$b1
-           .text "inx"
-           .word n
-           .byte $1b,$c6,$b2,$6c,$b0
-           .text "sbc"
-           .word b
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "sbc"
-           .word b
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "cpx"
-           .word a_
-           .byte $1b,$c6,$b1,$6c,$b1
-           .text "sbc"
-           .word a_
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "inc"
-           .word a_
-           .byte $1c,$c6,$b1,$6c,$30
-           .text "ins"
-           .word a_
-           .byte $1c,$a9,$b1,$6c,$b1
-           .text "beq"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "sbc"
-           .word iy
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "ins"
-           .word iy
-           .byte $1c,$a9,$b1,$6c,$b1
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "sbc"
-           .word zx
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "inc"
-           .word zx
-           .byte $1c,$c6,$b1,$6c,$30
-           .text "ins"
-           .word zx
-           .byte $1c,$a9,$b1,$6c,$b1
-           .text "sed"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$38
-           .text "sbc"
-           .word ay
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ins"
-           .word ay
-           .byte $1c,$a9,$b1,$6c,$b1
-           .text "nop"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "sbc"
-           .word ax
-           .byte $1b,$aa,$b1,$6c,$b1
-           .text "inc"
-           .word ax
-           .byte $1c,$c6,$b1,$6c,$30
-           .text "ins"
-           .word ax
-           .byte $1c,$a9,$b1,$6c,$b1
-           .byte 0
-
-
+           .include "trap-table.s"

Modified: testprogs/general/Lorenz-2.15/src/trap16.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/trap16.s	2024-07-15 23:53:07 UTC (rev 45235)
+++ testprogs/general/Lorenz-2.15/src/trap16.s	2024-07-16 18:58:09 UTC (rev 45236)
@@ -5,7 +5,7 @@
 
             .include "common.asm"
             .include "printhb.asm"
-            ;.include "waitborder.asm"
+            .include "waitborder.asm"
             ;.include "waitkey.asm"
             ;.include "showregs.asm"
 
@@ -15,6 +15,7 @@
 ;-------------------------------------------------------------------------------
             
 main:           
+           jsr waitborder
            ; read ANE "magic constant"
            lda #0
            ldx #$ff
@@ -38,6 +39,7 @@
            ora #$02
            sta aneresultstatus
 sk1
+           jsr waitborder
            ; read the LAX "magic constant"
            lda #0
            .byte $ab, $ff
@@ -115,9 +117,10 @@
 
 nextcommand
 
-waitborder
-           lda $d011
-           bpl waitborder
+           jsr waitborder
+;waitborder
+;           lda $d011
+;           bpl waitborder
 ;           bmi isborder
 ;           lda $d012
 ;           cmp #30
@@ -1036,780 +1039,4 @@
            sta (ptable),y
            rts
 
-table
-           .text "brk"
-           .word brkn
-           .byte $1b,$c6,$b1,$6c,$34
-           .text "ora"
-           .word ix
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "aso"
-           .word ix
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "nop"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word z
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word z
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word z
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "php"
-           .word phpn
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word b
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word n
-           .byte $1b,$8c,$b1,$6c,$b1
-           .text "anc"
-           .word b
-           .byte $1b,$02,$b1,$6c,$30
-           .text "nop"
-           .word ac
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word ac
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word ac
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word ac
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "bpl"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "ora"
-           .word iy
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "aso"
-           .word iy
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word zx
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word zx
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word zx
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "clc"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word ay
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "nop"
-           .word n
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "aso"
-           .word ay
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "nop"
-           .word ax
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "ora"
-           .word ax
-           .byte $1b,$df,$b1,$6c,$b0
-           .text "asl"
-           .word ax
-           .byte $36,$c6,$b1,$6c,$30
-           .text "aso"
-           .word ax
-           .byte $36,$f6,$b1,$6c,$b0
-           .text "jsr"
-           .word jsrw
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word ix
-           .byte $1b,$02,$b1,$6c,$30
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "rla"
-           .word ix
-           .byte $36,$06,$b1,$6c,$30
-           .text "bit"
-           .word z
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word z
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word z
-           .byte $36,$c6,$b1,$6c,$30
-           .text "rla"
-           .word z
-           .byte $36,$06,$b1,$6c,$30
-           .text "plp"
-           .word plpn
-           .byte $1b,$c6,$b1,$6c,$b3
-           .text "and"
-           .word b
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word n
-           .byte $1b,$8c,$b1,$6c,$b1
-           .text "anc"
-           .word b
-           .byte $1b,$02,$b1,$6c,$30
-           .text "bit"
-           .word ac
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-           .word ac
-           .byte $1b,$02,$b1,$6c,$30
-           .text "rol"
-           .word ac
-           .byte $36,$c6,$b1,$6c,$30
-           .text "rla"
-           .word ac
-           .byte $36,$06,$b1,$6c,$30
-           .text "bmi"
-           .word r
-           .byte $1b,$c6,$b1,$6c,$f3
-           .text "and"
-           .word iy
-           .byte $1b,$02,$b1,$6c,$30
-           .text "hlt"
-           .word hltn
-           .byte $00,$00,$00,$00,$00
-           .text "rla"
-           .word iy
-           .byte $36,$06,$b1,$6c,$30
-           .text "nop"
-           .word zx
-           .byte $1b,$c6,$b1,$6c,$30
-           .text "and"
-    ...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[45235] testprogs/general/Lorenz -2.15/src

From: <gp...@us...> - 2024-07-15 23:53:09

Revision: 45235
          http://sourceforge.net/p/vice-emu/code/45235
Author:   gpz
Date:     2024-07-15 23:53:07 +0000 (Mon, 15 Jul 2024)
Log Message:
-----------
some cleanup and comments, in aneb and lxab tests print the magic value before the test, and again after the test when it failed.

Modified Paths:
--------------
    testprogs/general/Lorenz-2.15/src/aneb.s
    testprogs/general/Lorenz-2.15/src/lasay.s
    testprogs/general/Lorenz-2.15/src/lxab.s
    testprogs/general/Lorenz-2.15/src/shaay.s
    testprogs/general/Lorenz-2.15/src/shaiy.s
    testprogs/general/Lorenz-2.15/src/shsay.s
    testprogs/general/Lorenz-2.15/src/shxay.s
    testprogs/general/Lorenz-2.15/src/shyax.s

Modified: testprogs/general/Lorenz-2.15/src/aneb.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/aneb.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/aneb.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -3,6 +3,8 @@
 ; original file was: aneb.asm
 ;-------------------------------------------------------------------------------
 
+TESTFAILURE = 0
+
             .include "common.asm"
             .include "printhb.asm"
             .include "showregs.asm"
@@ -13,16 +15,18 @@
 nextname   .null "lxab"      ; name of next test, "-" means no more tests
 ;------------------------------------------------------------------------------ 
 main:
+        jsr waitborder
+
         lda #0
         ldx #$ff
         .byte $8b, $ff
         sta magicvalue+1
 
-         lda #32
-         jsr cbmk_bsout
-         lda magicvalue+1
-         jsr hexb
-        
+        jsr print
+        .text 13, "magic value: ", 0
+        lda magicvalue+1
+        jsr hexb
+
          lda #%00011011
          sta db
          lda #%11000110
@@ -78,14 +82,6 @@
          sta sr
 
          jsr waitborder
-;waitborder
-;         lda $d011
-;         bmi border
-;         lda $d012
-;         cmp #40
-;         bcs waitborder
-;border
-;        inc $d020
 
          ldx sb
          txs
@@ -96,7 +92,7 @@
          ldy yb
          plp
 
-cmd      .byte $8b
+cmd      .byte $8b              ; ANE #imm
          .byte 0
 
          php
@@ -110,8 +106,6 @@
          stx sa
          jsr check
 
-;        dec $d020
-
          inc ab
          clc
          lda db
@@ -155,6 +149,9 @@
 
 check
          .block
+.ifeq (TESTFAILURE - 1)
+        jmp error
+.endif
          lda da
          cmp dr
          bne error
@@ -196,9 +193,25 @@
          ldx #<dr
          ldy #>dr
          jsr showregs
-         lda #13
-         jsr $ffd2
+;         lda #13
+;         jsr cbmk_bsout
 
+        ; show magic again
+        jsr waitborder
+
+        lda #0
+        ldx #$ff
+        .byte $8b, $ff
+        sta magicvalue+1
+
+        jsr print
+        .text 13, "magic value: ", 0
+        lda magicvalue+1
+        jsr hexb
+
+        lda #13
+        jsr cbmk_bsout
+
          #SET_EXIT_CODE_FAILURE
 
 wait     jsr $ffe4
@@ -211,24 +224,24 @@
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          ldx #"n"
@@ -237,7 +250,7 @@
          ldx #"N"
 ok7      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"v"
          asl a
@@ -245,7 +258,7 @@
          ldx #"V"
 ok6      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"0"
          asl a
@@ -253,7 +266,7 @@
          ldx #"1"
 ok5      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"b"
          asl a
@@ -261,7 +274,7 @@
          ldx #"B"
 ok4      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"d"
          asl a
@@ -269,7 +282,7 @@
          ldx #"D"
 ok3      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"i"
          asl a
@@ -277,7 +290,7 @@
          ldx #"I"
 ok2      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"z"
          asl a
@@ -285,7 +298,7 @@
          ldx #"Z"
 ok1      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"c"
          asl a
@@ -293,10 +306,10 @@
          ldx #"C"
 ok0      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          .bend
@@ -312,4 +325,4 @@
          cmp #$3a
          bcc hexn0
          adc #6
-hexn0    jmp $ffd2
+hexn0    jmp cbmk_bsout

Modified: testprogs/general/Lorenz-2.15/src/lasay.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/lasay.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/lasay.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -73,13 +73,6 @@
 .endif
 
         jsr waitborder
-;waitborder
-;         lda $d011
-;         bmi isborder
-;         lda $d012
-;         cmp #30
-;         bcs waitborder
-;isborder
 
          ldx sb
          txs
@@ -90,7 +83,7 @@
          ldy yb
          plp
 
-cmd      .byte $bb
+cmd      .byte $bb          ; LAS abs, y
          .word da
 
          php

Modified: testprogs/general/Lorenz-2.15/src/lxab.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/lxab.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/lxab.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -3,6 +3,8 @@
 ; original file was: lxab.asm
 ;-------------------------------------------------------------------------------
 
+TESTFAILURE = 0
+
             .include "common.asm"
             .include "printhb.asm"
             .include "showregs.asm"
@@ -13,12 +15,14 @@
 nextname   .null "sbxb"      ; name of next test, "-" means no more tests
 ;------------------------------------------------------------------------------ 
 main:
+        jsr waitborder
+
         lda #0
         .byte $ab, $ff
         sta magicvalue+1
 
-        lda #32
-        jsr $ffd2
+        jsr print
+        .text 13, "magic value: ", 0
         lda magicvalue+1
         jsr hexb
 
@@ -73,14 +77,6 @@
          sta sr
 
          jsr waitborder
-;waitborder
-;         lda $d011
-;         bmi border
-;         lda $d012
-;         cmp #40
-;         bcs waitborder
-border
-;        inc $d020
 
          ldx sb
          txs
@@ -91,7 +87,7 @@
          ldy yb
          plp
 
-cmd      .byte $ab
+cmd      .byte $ab      ; LXA #imm
          .byte 0
 
          php
@@ -105,8 +101,6 @@
          stx sa
          jsr check
 
-;        dec $d020
-         
          inc ab
          clc
          lda db
@@ -150,6 +144,9 @@
 
 check
          .block
+.ifeq (TESTFAILURE - 1)
+        jmp error
+.endif
          lda da
          cmp dr
          bne error
@@ -191,9 +188,24 @@
          ldx #<dr
          ldy #>dr
          jsr showregs
-         lda #13
-         jsr $ffd2
+;         lda #13
+;         jsr cbmk_bsout
 
+        ; show magic again
+        jsr waitborder
+
+        lda #0
+        .byte $ab, $ff
+        sta magicvalue+1
+
+        jsr print
+        .text 13, "magic value: ", 0
+        lda magicvalue+1
+        jsr hexb
+
+        lda #13
+        jsr cbmk_bsout
+
          #SET_EXIT_CODE_FAILURE
 
 wait     jsr $ffe4
@@ -206,24 +218,24 @@
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          jsr hexb
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          ldx #"n"
@@ -232,7 +244,7 @@
          ldx #"N"
 ok7      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"v"
          asl a
@@ -240,7 +252,7 @@
          ldx #"V"
 ok6      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"0"
          asl a
@@ -248,7 +260,7 @@
          ldx #"1"
 ok5      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"b"
          asl a
@@ -256,7 +268,7 @@
          ldx #"B"
 ok4      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"d"
          asl a
@@ -264,7 +276,7 @@
          ldx #"D"
 ok3      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"i"
          asl a
@@ -272,7 +284,7 @@
          ldx #"I"
 ok2      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"z"
          asl a
@@ -280,7 +292,7 @@
          ldx #"Z"
 ok1      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          ldx #"c"
          asl a
@@ -288,10 +300,10 @@
          ldx #"C"
 ok0      pha
          txa
-         jsr $ffd2
+         jsr cbmk_bsout
          pla
          lda #32
-         jsr $ffd2
+         jsr cbmk_bsout
          iny
          lda (172),y
          .bend
@@ -307,4 +319,4 @@
          cmp #$3a
          bcc hexn0
          adc #6
-hexn0    jmp $ffd2
+hexn0    jmp cbmk_bsout

Modified: testprogs/general/Lorenz-2.15/src/shaay.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/shaay.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/shaay.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -69,16 +69,7 @@
         sta sr
 
         jsr waitborder
-;waitborder
-;        lda $d011
-;        bmi isborder
-;        lda $d012
-;        cmp #30
-;        bcs waitborder
-;isborder
 
-;        inc $d020
-
         ldx sb ; stackpointer
         txs
         lda pb ; status
@@ -103,8 +94,6 @@
         lda mem
         sta da
 
-;        dec $d020
-
         jsr check
 
         inc cmd+1      ; adr lo

Modified: testprogs/general/Lorenz-2.15/src/shaiy.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/shaiy.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/shaiy.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -67,13 +67,6 @@
          sta sr
 
          jsr waitborder
-;waitborder
-;         lda $d011
-;         bmi isborder
-;         lda $d012
-;         cmp #30
-;         bcs waitborder
-;isborder
 
          ldx sb
          txs
@@ -84,7 +77,7 @@
          ldy yb
          plp
 
-cmd      .byte $93
+cmd      .byte $93      ; SHA (zp),y
          .byte 174
 
          php

Modified: testprogs/general/Lorenz-2.15/src/shsay.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/shsay.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/shsay.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -71,13 +71,6 @@
          sta sr
 
          jsr waitborder
-;waitborder
-;         lda $d011
-;         bmi isborder
-;         lda $d012
-;         cmp #30
-;         bcs waitborder
-;isborder
 
          ldx sb
          txs
@@ -88,7 +81,7 @@
          ldy yb
          plp
 
-cmd      .byte $9b
+cmd      .byte $9b      ; TAS abs, y
          .word mem
 
          php

Modified: testprogs/general/Lorenz-2.15/src/shxay.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/shxay.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/shxay.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -61,13 +61,6 @@
          sta sr
 
          jsr waitborder
-;waitborder
-;         lda $d011
-;         bmi isborder
-;         lda $d012
-;         cmp #30
-;         bcs waitborder
-;isborder
 
          ldx sb
          txs
@@ -78,7 +71,7 @@
          ldy yb
          plp
 
-cmd      .byte $9e
+cmd      .byte $9e      ; SHX abs, y
          .word mem
 
          php

Modified: testprogs/general/Lorenz-2.15/src/shyax.s
===================================================================
--- testprogs/general/Lorenz-2.15/src/shyax.s	2024-07-15 23:39:23 UTC (rev 45234)
+++ testprogs/general/Lorenz-2.15/src/shyax.s	2024-07-15 23:53:07 UTC (rev 45235)
@@ -61,13 +61,6 @@
          sta sr
 
          jsr waitborder
-;waitborder
-;         lda $d011
-;         bmi isborder
-;         lda $d012
-;         cmp #30
-;         bcs waitborder
-;isborder
 
          ldx sb
          txs

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:[45234] trunk/vice/src/plus4

From: <gp...@us...> - 2024-07-15 23:39:24

Revision: 45234
          http://sourceforge.net/p/vice-emu/code/45234
Author:   gpz
Date:     2024-07-15 23:39:23 +0000 (Mon, 15 Jul 2024)
Log Message:
-----------
fix warnings, patch by Uffe Jakobsen

Modified Paths:
--------------
    trunk/vice/src/plus4/ted-snapshot.c
    trunk/vice/src/plus4/tedtypes.h

Modified: trunk/vice/src/plus4/ted-snapshot.c
===================================================================
--- trunk/vice/src/plus4/ted-snapshot.c	2024-07-15 22:11:49 UTC (rev 45233)
+++ trunk/vice/src/plus4/ted-snapshot.c	2024-07-15 23:39:23 UTC (rev 45234)
@@ -262,7 +262,7 @@
 
     if (RasterCycle != (uint8_t)TED_RASTER_CYCLE(maincpu_clk)) {
         log_error(ted.log,
-                  "Not matching raster cycle (%d) in snapshot; should be %lu.",
+                  "Not matching raster cycle (%d) in snapshot; should be %u.",
                   RasterCycle, TED_RASTER_CYCLE(maincpu_clk));
         goto fail;
     }

Modified: trunk/vice/src/plus4/tedtypes.h
===================================================================
--- trunk/vice/src/plus4/tedtypes.h	2024-07-15 22:11:49 UTC (rev 45233)
+++ trunk/vice/src/plus4/tedtypes.h	2024-07-15 23:39:23 UTC (rev 45234)
@@ -130,8 +130,7 @@
                                                                   ? 1 - ted.screen_height : 1) : 0)) & 0x1ff))
 
 /* Cycle # within the current line.  */
-/*#define TED_RASTER_CYCLE(clk)       ((unsigned int)((clk) - ted.last_emulate_line_clk - (((clk) - ted.last_emulate_line_clk) >= 114 ? 114 : 0)))*/
-#define TED_RASTER_CYCLE(clk)       ((clk) - ted.last_emulate_line_clk - (((clk) - ted.last_emulate_line_clk) >= 114 ? 114 : 0))
+#define TED_RASTER_CYCLE(clk)       ((unsigned int)((clk) - ted.last_emulate_line_clk - (((clk) - ted.last_emulate_line_clk) >= 114 ? 114 : 0)))
 
 /* `clk' value for the beginning of the current line.  */
 /* FIXME: assigned to (CLOCK)ted.raster_irq_clk in ted-irq.c:ted_irq_set_raster_line() */

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:[45233] trunk/vice/src/plus4

From: <gp...@us...> - 2024-07-15 22:11:52

Revision: 45233
          http://sourceforge.net/p/vice-emu/code/45233
Author:   gpz
Date:     2024-07-15 22:11:49 +0000 (Mon, 15 Jul 2024)
Log Message:
-----------
Fix for bug ticket #2030: Plus/4 emulator hangs after a while, patch by Uffe Jakobsen

Modified Paths:
--------------
    trunk/vice/src/plus4/ted-irq.c
    trunk/vice/src/plus4/ted-mem.c
    trunk/vice/src/plus4/tedtypes.h

Modified: trunk/vice/src/plus4/ted-irq.c
===================================================================
--- trunk/vice/src/plus4/ted-irq.c	2024-07-15 19:20:40 UTC (rev 45232)
+++ trunk/vice/src/plus4/ted-irq.c	2024-07-15 22:11:49 UTC (rev 45233)
@@ -114,11 +114,11 @@
 
     if (line < ted.screen_height) {
         unsigned int current_line = TED_RASTER_Y(maincpu_clk);
-
+        /* int casts are to ensure that subtraction can become negative */
         ted.raster_irq_clk = (TED_LINE_START_CLK(maincpu_clk)
                               + TED_RASTER_IRQ_DELAY - INTERRUPT_DELAY
                               + (ted.cycles_per_line
-                                 * (line - current_line)));
+                                 * ((int)line - (int)current_line)));
 
         /* Raster interrupts on line 0 are delayed by 1 cycle.  */
         /* FIXME this needs to be checked */
@@ -134,10 +134,11 @@
     } else {
         unsigned int current_line = TED_RASTER_Y(maincpu_clk);
         if (current_line >= ted.screen_height) {
+            /* int casts are to ensure that subtraction can become negative */
             ted.raster_irq_clk = (TED_LINE_START_CLK(maincpu_clk)
                                   + TED_RASTER_IRQ_DELAY - INTERRUPT_DELAY
                                   + (ted.cycles_per_line
-                                     * (line - current_line)));
+                                     * ((int)line - (int)current_line)));
 
             if (line <= current_line) {
                 ted.raster_irq_clk = CLOCK_MAX;

Modified: trunk/vice/src/plus4/ted-mem.c
===================================================================
--- trunk/vice/src/plus4/ted-mem.c	2024-07-15 19:20:40 UTC (rev 45232)
+++ trunk/vice/src/plus4/ted-mem.c	2024-07-15 22:11:49 UTC (rev 45233)
@@ -726,10 +726,11 @@
     }
 
     if (ted.raster_irq_line < ted.screen_height) {
+        /* int casts are to ensure that subtraction can become negative */
         ted.raster_irq_clk = (TED_LINE_START_CLK(maincpu_clk)
                               + TED_RASTER_IRQ_DELAY - INTERRUPT_DELAY
                               + (ted.cycles_per_line
-                                 * (ted.raster_irq_line - new_raster)));
+                                 * ((int)ted.raster_irq_line - (int)new_raster)));
 
         /* Raster interrupts on line 0 are delayed by 1 cycle.  */
         /* FIXME this needs to be checked */
@@ -743,10 +744,11 @@
         alarm_set(ted.raster_irq_alarm, ted.raster_irq_clk);
     } else {
         if (new_raster >= ted.screen_height) {
+            /* int casts are to ensure that subtraction can become negative */
             ted.raster_irq_clk = (TED_LINE_START_CLK(maincpu_clk)
                                   + TED_RASTER_IRQ_DELAY - INTERRUPT_DELAY
                                   + (ted.cycles_per_line
-                                     * (ted.raster_irq_line - new_raster)));
+                                     * ((int)ted.raster_irq_line - (int)new_raster)));
 
             if (ted.raster_irq_line <= new_raster) {
                 ted.raster_irq_clk = CLOCK_MAX;

Modified: trunk/vice/src/plus4/tedtypes.h
===================================================================
--- trunk/vice/src/plus4/tedtypes.h	2024-07-15 19:20:40 UTC (rev 45232)
+++ trunk/vice/src/plus4/tedtypes.h	2024-07-15 22:11:49 UTC (rev 45233)
@@ -136,7 +136,7 @@
 /* `clk' value for the beginning of the current line.  */
 /* FIXME: assigned to (CLOCK)ted.raster_irq_clk in ted-irq.c:ted_irq_set_raster_line() */
 /* FIXME: assigned to (CLOCK)ted.raster_irq_clk in ted-mem.c:ted1c1d_store() */
-#define TED_LINE_START_CLK(clk)     ((unsigned int)(ted.last_emulate_line_clk + (((clk) - ted.last_emulate_line_clk) >= 114UL ? 114UL : 0UL)))
+#define TED_LINE_START_CLK(clk)     ((CLOCK)(ted.last_emulate_line_clk + (((clk) - ted.last_emulate_line_clk) >= 114UL ? 114UL : 0UL)))
 
 /* # of the previous and next raster line.  Handles wrap over.  */
 /* FIXME not always true, previous line can be 511 */

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:[45232] trunk/vice/src/fsdevice/ fsdevice-read.c

From: <rh...@us...> - 2024-07-15 19:20:49

Revision: 45232
          http://sourceforge.net/p/vice-emu/code/45232
Author:   rhialto
Date:     2024-07-15 19:20:40 +0000 (Mon, 15 Jul 2024)
Log Message:
-----------
Use size_t to store the result from strlen().

Modified Paths:
--------------
    trunk/vice/src/fsdevice/fsdevice-read.c

Modified: trunk/vice/src/fsdevice/fsdevice-read.c
===================================================================
--- trunk/vice/src/fsdevice/fsdevice-read.c	2024-07-15 19:03:39 UTC (rev 45231)
+++ trunk/vice/src/fsdevice/fsdevice-read.c	2024-07-15 19:20:40 UTC (rev 45232)
@@ -450,8 +450,8 @@
                 /* Handle ONE * followed by text but no more (like 1581):
                  * When at the * in A*XYZ, skip to 3 positions before
                  * the end of the file name to try to match XYZ.  */
-                int rest_of_filename = strlen((const char *)p);
-                int rest_of_pattern = strlen(&bufinfo->dirmask[i + 1]);
+                size_t rest_of_filename = strlen((const char *)p);
+                size_t rest_of_pattern = strlen(&bufinfo->dirmask[i + 1]);
 
                 if (rest_of_filename < rest_of_pattern) {
                     break;      /* no match: file name too short */

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:[45231] testprogs/interrupts/irq noack

From: <gp...@us...> - 2024-07-15 19:03:40

Revision: 45231
          http://sourceforge.net/p/vice-emu/code/45231
Author:   gpz
Date:     2024-07-15 19:03:39 +0000 (Mon, 15 Jul 2024)
Log Message:
-----------
add FIXME note for ackraster - this test will not report 'green' when it works as expected, but time out instead

Modified Paths:
--------------
    testprogs/interrupts/irqnoack/ackraster.s
    testprogs/interrupts/irqnoack/readme.txt

Modified: testprogs/interrupts/irqnoack/ackraster.s
===================================================================
--- testprogs/interrupts/irqnoack/ackraster.s	2024-07-15 18:48:29 UTC (rev 45230)
+++ testprogs/interrupts/irqnoack/ackraster.s	2024-07-15 19:03:39 UTC (rev 45231)
@@ -1,4 +1,5 @@
-
+;FIXME: i couldn't make the test report "pass" after a while, like the CIA test
+;       does - instead it will run forever/time out when it works correctly
         * = $0801
         !word eol,0
         !byte $9e, $32,$30,$36,$31, 0 ; sys 2061

Modified: testprogs/interrupts/irqnoack/readme.txt
===================================================================
--- testprogs/interrupts/irqnoack/readme.txt	2024-07-15 18:48:29 UTC (rev 45230)
+++ testprogs/interrupts/irqnoack/readme.txt	2024-07-15 19:03:39 UTC (rev 45231)
@@ -8,6 +8,8 @@
 ackraster.prg:
 Sets up a raster interrupt and a CIA1 Timer interrupt. The Timer interrupt is
 never acknowledged, so it will immediately trigger again after the RTI.
+(FIXME: i couldn't make the test report "pass" after a while, like the CIA test
+does - instead it will run forever/time out when it works correctly)
 
 
 TODO: this should probably also be tested with other IRQ and NMI sources, and

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

19 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 21 22 23 24 25 .. 1071 > >> (Page 23 of 1071)