From 78263cd24b301406f9567f3e0a4fa03488445656 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Fri, 17 Feb 2023 23:48:32 -0500
Subject: [PATCH 01/65] Fix OptStackOps label migration case for toscmpbool,
 add test case

---
 src/cc65/coptstop.c |  2 ++
 test/val/bug1989.c  | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 test/val/bug1989.c

diff --git a/src/cc65/coptstop.c b/src/cc65/coptstop.c
index 4d0151c55..8b2821dcd 100644
--- a/src/cc65/coptstop.c
+++ b/src/cc65/coptstop.c
@@ -1153,6 +1153,8 @@ static unsigned Opt_a_toscmpbool (StackOpData* D, const char* BoolTransformer)
 
         /* Save lhs into zeropage */
         AddStoreLhsA (D);
+        /* AddStoreLhsA may have moved the OpIndex, recalculate insertion point to prevent label migration. */
+        D->IP = D->OpIndex + 1;
 
         /* cmp */
         X = NewCodeEntry (OP65_CMP, AM65_ZP, D->ZPLo, 0, D->OpEntry->LI);
diff --git a/test/val/bug1989.c b/test/val/bug1989.c
new file mode 100644
index 000000000..b3e3d4c8d
--- /dev/null
+++ b/test/val/bug1989.c
@@ -0,0 +1,40 @@
+
+/* bug #1989 - OptStackOps Opt_a_toscmpbool bypassed a comparison, discovered in 544a49c */
+
+#include <stdlib.h>
+
+unsigned char i,r,j;
+
+void fail() // for the r=0 case, the == comparison was getting jumped over by OptStackOps
+{
+    if ((i & 0x1f) == (r ? 0 : 16)) j -=8;
+}
+
+void pass()
+{
+    if ((i & 0x1f) == (unsigned char)(r ? 0 : 16)) j -= 8;
+}
+
+void test(unsigned char ti, unsigned char tr, unsigned char tj)
+{
+    unsigned char rj;
+    i = ti;
+    r = tr;
+    j = tj;
+    pass();
+    rj = j;
+    i = ti;
+    r = tr;
+    j = tj;
+    fail();
+    if (j != rj) exit(1);
+}
+
+int main(void)
+{
+    test( 1,0,33);
+    test( 0,0,33);
+    test( 1,1,33);
+    test(16,1,33);
+    return 0;
+}

From 4e411e8526df0c627c5ab0e6338853a82a51c0b2 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Sat, 18 Feb 2023 00:13:34 -0500
Subject: [PATCH 02/65] Opt_a_tosicmp likely has a bug which will incorrectly
 migrate a label on a replaced op in one case.

---
 src/cc65/coptstop.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cc65/coptstop.c b/src/cc65/coptstop.c
index 8b2821dcd..ae40a55e9 100644
--- a/src/cc65/coptstop.c
+++ b/src/cc65/coptstop.c
@@ -1208,6 +1208,8 @@ static unsigned Opt_a_tosicmp (StackOpData* D)
             /* RHS src is not directly comparable */
             X = NewCodeEntry (OP65_STA, AM65_ZP, D->ZPHi, 0, D->OpEntry->LI);
             InsertEntry (D, X, D->Rhs.A.ChgIndex + 1);
+            /* RHS insertion may have moved the OpIndex, recalculate insertion point to prevent label migration. */
+            D->IP = D->OpIndex + 1;
 
             /* Cmp with stored RHS */
             X = NewCodeEntry (OP65_CMP, AM65_ZP, D->ZPHi, 0, D->OpEntry->LI);

From 5c12659cf499343deff1d81c0c4ac235a74192c3 Mon Sep 17 00:00:00 2001
From: compyx <b.wassink@ziggo.nl>
Date: Sun, 19 Feb 2023 14:01:14 +0100
Subject: [PATCH 03/65] make avail: check for presence of binaries before
 creating symbolic links

To avoid creating broken symlinks, first check if the binaries exists in
bin/ and exit when they don't, with a message to first run `make`.
---
 src/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Makefile b/src/Makefile
index 8356d0001..a37fa5811 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -110,11 +110,21 @@ $(RM) /usr/local/bin/$(prog)
 
 endef # UNAVAIL_recipe
 
+define AVAIL_check_prog
+
+@if [ ! -e ../bin/$(prog) ]; then \
+    echo "failed to locate $(prog), please run make first"; \
+    false; \
+fi
+
+endef # AVAIL_check_prog
+
 install:
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(INSTALL) ../bin/* $(DESTDIR)$(bindir)
 
 avail:
+	$(foreach prog,$(PROGS),$(AVAIL_check_prog))
 	$(foreach prog,$(PROGS),$(AVAIL_recipe))
 
 unavail:

From 2ac055383f4619cea09988aa79c2b4324c1bfb40 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Sun, 19 Feb 2023 08:14:04 -0500
Subject: [PATCH 04/65] ld65 fix overwrite segments adding wrong padding or
 causing internal errors

---
 src/ld65/config.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/ld65/config.c b/src/ld65/config.c
index c22ced1ef..c101bd1c6 100644
--- a/src/ld65/config.c
+++ b/src/ld65/config.c
@@ -1945,6 +1945,10 @@ unsigned CfgProcess (void)
             /* Remember the start address before handling this segment */
             unsigned long StartAddr = Addr;
 
+            /* For computing FillLevel */
+            unsigned long FillLevel;
+            unsigned long FillAdded = 0;
+
             /* Take note of "overwrite" segments and make sure there are no
             ** other segment types following them in current memory region.
             */
@@ -2081,14 +2085,19 @@ unsigned CfgProcess (void)
             /* Increment the fill level of the memory area; and, check for an
             ** overflow.
             */
-            M->FillLevel = Addr + S->Seg->Size - M->Start;
-            if (M->FillLevel > M->Size && (M->Flags & MF_OVERFLOW) == 0) {
+            FillLevel = Addr + S->Seg->Size - M->Start;
+            if (FillLevel > M->Size && (M->Flags & MF_OVERFLOW) == 0) {
                 ++Overflows;
                 M->Flags |= MF_OVERFLOW;
                 CfgWarning (GetSourcePos (M->LI),
                             "Segment '%s' overflows memory area '%s' by %lu byte%c",
                             GetString (S->Name), GetString (M->Name),
-                            M->FillLevel - M->Size, (M->FillLevel - M->Size == 1) ? ' ' : 's');
+                            FillLevel - M->Size, (FillLevel - M->Size == 1) ? ' ' : 's');
+            }
+            if (FillLevel > M->FillLevel) {
+                /* Regular segments increase FillLevel. Overwrite segments may increase but not decrease FillLevel. */
+                FillAdded = FillLevel - M->FillLevel;
+                M->FillLevel = FillLevel;
             }
 
             /* If requested, define symbols for the start and size of the
@@ -2107,13 +2116,14 @@ unsigned CfgProcess (void)
             Addr += S->Seg->Size;
 
             /* If this segment will go out to the file, or its place
-            ** in the file will be filled, then increase the file size,
-            ** unless it's an OVERWRITE segment.
+            ** in the file will be filled, then increase the file size.
+            ** An OVERWRITE segment will only increase the size if it overlapped some of the fill area.
             */
             if (S->Load == M &&
-                ((S->Flags & SF_BSS) == 0 || (M->Flags & MF_FILL) != 0) &&
-                    (S->Flags & SF_OVERWRITE) == 0) {
-                M->F->Size += Addr - StartAddr;
+                ((S->Flags & SF_BSS) == 0 || (M->Flags & MF_FILL) != 0)) {
+                M->F->Size += (!(S->Flags & SF_OVERWRITE)) ?
+                    (Addr - StartAddr) :
+                    FillAdded;
             }
         }
 

From 4fc19a3d4c27d193297e928171f85ab361ac2ae7 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Sun, 19 Feb 2023 08:37:07 -0500
Subject: [PATCH 05/65] ld65 overwrite segment should pad with fill value if
 the desired seek position is beyond the end of the file so far

---
 src/ld65/bin.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/ld65/bin.c b/src/ld65/bin.c
index bd822cc23..15b534f66 100644
--- a/src/ld65/bin.c
+++ b/src/ld65/bin.c
@@ -193,8 +193,16 @@ static void BinWriteMem (BinDesc* D, MemoryArea* M)
                     NewAddr += M->Start;
                 }
                 if (DoWrite || (M->Flags & MF_FILL) != 0) {
-                    /* Seek in "overwrite" segments */
                     if (S->Flags & SF_OVERWRITE) {
+                        /* Seek in "overwrite" segments. Fill if the seek position has not been reached yet. */
+                        unsigned long FileLength;
+                        unsigned long SeekTarget = NewAddr - M->Start + M->FileOffs;
+                        fseek (D->F, 0, SEEK_END);
+                        FileLength = ftell (D->F);
+                        if (SeekTarget > FileLength) {
+                            WriteMult (D->F, M->FillVal, SeekTarget - FileLength);
+                            PrintNumVal ("SF_OVERWRITE", SeekTarget - FileLength);
+                        }
                         fseek (D->F, NewAddr - M->Start + M->FileOffs, SEEK_SET);
                     } else {
                         WriteMult (D->F, M->FillVal, NewAddr-Addr);

From 68ce335f59b9d6d69b6d348ec1e764162021bdbe Mon Sep 17 00:00:00 2001
From: compyx <b.wassink@ziggo.nl>
Date: Sun, 19 Feb 2023 19:17:45 +0100
Subject: [PATCH 06/65] Replace shell code with GNU Make conditionals and
 functions

Use `ifeq` to provide two rules for the `avail` target: one that reports
an error if any of the symlink targets are missing and one that installs
the symlinks for the targets if they're all present.
---
 src/Makefile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a37fa5811..034a2230f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -110,22 +110,16 @@ $(RM) /usr/local/bin/$(prog)
 
 endef # UNAVAIL_recipe
 
-define AVAIL_check_prog
-
-@if [ ! -e ../bin/$(prog) ]; then \
-    echo "failed to locate $(prog), please run make first"; \
-    false; \
-fi
-
-endef # AVAIL_check_prog
-
 install:
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(INSTALL) ../bin/* $(DESTDIR)$(bindir)
 
 avail:
-	$(foreach prog,$(PROGS),$(AVAIL_check_prog))
+ifneq ($(patsubst %,../bin/%,$(PROGS)),$(wildcard $(patsubst %,../bin/%,$(PROGS))))
+	$(error executables are missing, please run make first)
+else
 	$(foreach prog,$(PROGS),$(AVAIL_recipe))
+endif
 
 unavail:
 	$(foreach prog,$(PROGS),$(UNAVAIL_recipe))

From 864eecf7c3764741855801de3228f4363b4d69fa Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Mon, 20 Feb 2023 20:08:58 -0500
Subject: [PATCH 07/65] ca16 doc for A8/A18/I8/I16: use "assume" instead of
 "switch" to avoid implying that a hardware state is changed. See: #1759

---
 doc/ca65.sgml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 19fd3aa2a..c84c57353 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2019,7 +2019,7 @@ Here's a list of all control commands and a description, what they do:
 
 <sect1><tt>.A16</tt><label id=".A16"><p>
 
-  Valid only in 65816 mode. Switch the accumulator to 16 bit.
+  Valid only in 65816 mode. Assume the accumulator is 16 bit.
 
   Note: This command will not emit any code, it will tell the assembler to
   create 16 bit operands for immediate accumulator addressing mode.
@@ -2029,7 +2029,7 @@ Here's a list of all control commands and a description, what they do:
 
 <sect1><tt>.A8</tt><label id=".A8"><p>
 
-  Valid only in 65816 mode. Switch the accumulator to 8 bit.
+  Valid only in 65816 mode. Assume the accumulator is 8 bit.
 
   Note: This command will not emit any code, it will tell the assembler to
   create 8 bit operands for immediate accu addressing mode.
@@ -3036,7 +3036,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
 
 <sect1><tt>.I16</tt><label id=".I16"><p>
 
-  Valid only in 65816 mode. Switch the index registers to 16 bit.
+  Valid only in 65816 mode. Assume the index registers are 16 bit.
 
   Note: This command will not emit any code, it will tell the assembler to
   create 16 bit operands for immediate operands.
@@ -3047,7 +3047,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
 
 <sect1><tt>.I8</tt><label id=".I8"><p>
 
-  Valid only in 65816 mode. Switch the index registers to 8 bit.
+  Valid only in 65816 mode. Assume the index registers are 8 bit.
 
   Note: This command will not emit any code, it will tell the assembler to
   create 8 bit operands for immediate operands.

From f1134cc5f18aef555e3c8573d0fa62b17f3908a0 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Mon, 20 Feb 2023 20:42:09 -0500
Subject: [PATCH 08/65] ca65 improve error for unclosed scopes See: #1779

---
 src/ca65/symtab.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/ca65/symtab.c b/src/ca65/symtab.c
index afe7b3ad6..a01d14bd8 100644
--- a/src/ca65/symtab.c
+++ b/src/ca65/symtab.c
@@ -570,7 +570,18 @@ void SymCheck (void)
 
     /* Check for open scopes */
     if (CurrentScope->Parent != 0) {
-        Error ("Local scope was not closed");
+        if (CurrentScope->Label) {
+            /* proc has a label indicating the line it was opened. */
+            LIError (&CurrentScope->Label->DefLines,
+                     "Local proc '%s' was not closed",
+                     GetString (CurrentScope->Name));
+        } else {
+            /* scope has no label to track a line number, uses end-of-document line instead.
+            ** Anonymous scopes will reveal their internal automatic name.
+            */
+            Error ("Local scope '%s' was not closed",
+                   GetString (CurrentScope->Name));
+        }
     }
 
     /* First pass: Walk through all symbols, checking for undefined's and

From 99ecd9b69d698ad555d01bae5e3622ec1ca07f7b Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 21 Feb 2023 00:53:55 -0500
Subject: [PATCH 09/65] Document expected linker configuration and special
 segments used by cc65

---
 doc/cc65-intern.sgml | 73 +++++++++++++++++++++++++++++++++++++++++++-
 doc/index.sgml       |  2 +-
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/doc/cc65-intern.sgml b/doc/cc65-intern.sgml
index 8e36578b5..904cee070 100644
--- a/doc/cc65-intern.sgml
+++ b/doc/cc65-intern.sgml
@@ -6,7 +6,8 @@
 
 <abstract>
 Internal details of cc65 code generation,
-such as calling assembly functions from C.
+such as the expected linker configuration,
+and calling assembly functions from C.
 </abstract>
 
 <!-- Table of contents -->
@@ -16,6 +17,76 @@ such as calling assembly functions from C.
 
 
 
+<sect>Linker configuration<p>
+
+The C libraries and code generation depend directly on a suitable linker configuration.
+There are premade configuration files in the <tt/cfg&sol;/ directory, normally chosen by the
+linker's selected target. These can be used as a template for customization.
+
+The C libraries depend on several special segments to be defined in your linker configuration.
+Generated code will also use some of them by default.
+Some platform libraries have additional special segments.
+
+Memory areas are free to be defined in a way that is appropriate to each platform,
+and the segments they contain are used as a layer of semantics and abstraction,
+to allow much of the reorganization to be done with the linker config,
+rather than requiring platform-specific code source changes.
+
+<sect1><tt/ZEROPAGE/ segment<p>
+
+Used by the C library and generated code for efficient internal and temporary state storage,
+also called "pseudo-registers".
+
+<sect1><tt/STARTUP/ segment<p>
+
+Used by each platform instance of the C library in <tt/crt0.s/ to contain the entry point
+of the program.
+
+The startup module will export <tt/__STARTUP__ : absolute = 1/ to force the linker to
+always include <tt/crt0.s/ from the library.
+
+<sect1><tt/CODE/ segment<p>
+
+The default segment for generated code, and most C library code will be located here.
+
+Use <tt/#pragma code-name/ to redirect generated code to another segment.
+
+<sect1><tt/BSS/ segment<p>
+
+Used for uninitialized variables.
+Originally an acronym for "Block Started by Symbol", but the meaning of this is now obscure.
+
+Use <tt/#pragma bss-name/ to redirect uninitialized variables to another segment.
+
+<sect1><tt/DATA/ segment<p>
+
+Used for initialized variables.
+
+On some platforms, this may be initialized as part of the program loading process,
+but on others it may have a separate <tt/LOAD/ and <tt/RUN/ address,
+allowing <tt/copydata/ to copy the initialization from the loaded location
+into their run destination in RAM.
+
+Use <tt/#pragma data-name/ to redirect initialized variables to another segment.
+
+<sect1><tt/RODATA/ segment<p>
+
+Used for read-only (constant) data.
+
+Use <tt/#pragma rodata-name/ to redirect constant data to another segment.
+
+<sect1><tt/FEATURES/ table<p>
+
+This currently defines table locations for the <tt/CONDES/
+constructor, destructor, and interruptor features.
+Some platform libraries use these.
+
+The constructors will be called with <tt/initlib/ at startup,
+and the destructors with <tt/donelib/ at program exit.
+Interruptors are called with <tt/callirq/.
+
+
+
 <sect>Calling assembly functions from C<p>
 
 <sect1>Calling conventions<p>
diff --git a/doc/index.sgml b/doc/index.sgml
index bfce63486..727364028 100644
--- a/doc/index.sgml
+++ b/doc/index.sgml
@@ -59,7 +59,7 @@
   Contains hints on creating the most effective code with cc65.
 
   <tag><htmlurl url="cc65-intern.html" name="cc65-intern.html"></tag>
-  Describes internal details of cc65, such as calling conventions.
+  Describes internal details of cc65: linker configuration, calling conventions, etc.
 
   <tag><htmlurl url="using-make.html" name="using-make.html"></tag>
   Build programs, using the GNU Make utility.

From ccf3994e3b6f669d18ce83329adc1998a04923fe Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 21 Feb 2023 04:00:34 -0500
Subject: [PATCH 10/65] ca65 jsr/jmp/rts will not promote to jsl/jml/rtl by
 default, but can still be enabled with new feature long_jsr_jmp_rts

---
 doc/ca65.sgml      | 23 ++++++++++++++++--
 src/ca65/feature.c |  2 ++
 src/ca65/feature.h |  1 +
 src/ca65/global.c  |  1 +
 src/ca65/global.h  |  1 +
 src/ca65/instr.c   | 60 ++++++++++++++++++++++++++++++++++++++++------
 6 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 19fd3aa2a..276a2b697 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -183,7 +183,7 @@ Here is a description of all the command line options:
 
   Enable an emulation feature. This is identical as using <tt/.FEATURE/
   in the source with two exceptions: Feature names must be lower case, and
-  each feature must be specified by using an extra <tt/--feature/ option,
+  each feature must be specified by using a separate <tt/--feature/ option,
   comma separated lists are not allowed.
 
   See the discussion of the <tt><ref id=".FEATURE" name=".FEATURE"></tt>
@@ -2825,6 +2825,23 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
     overridden. When using this feature, you may also get into trouble if
     later versions of the assembler define new keywords starting with a dot.
 
+  <tag><tt>long_jsr_jmp_rts</tt><label id="long_jsr_jmp_rts"></tag>
+
+    Affects 65816 mode only.
+
+    Allows <tt>jsr</tt> and <tt>jmp</tt> to produce long jumps if the target
+    address has been previously declared in a <tt>far</tt> segment,
+    or imported as <tt>far</tt>.
+    Otherwise <tt>jsl</tt> and <tt>jml</tt> must be used instead.
+
+    Also allows <tt><ref id=".SMART" name=".SMART"></tt> to convert <tt>rts</tt>
+    to a long return <tt>rtl</tt> when the enclosing scope or memory model
+    indicates returning from a <tt>far</tt> procedure.
+
+    This permits compatibility with the old behavior of this assembler, or other
+    assemblers which similarly allowed <tt>jsr</tt> and <tt>jmp</tt> to be used
+    this way.
+
   <tag><tt>loose_char_term</tt><label id="loose_char_term"></tag>
 
     Accept single quotes as well as double quotes as terminators for char
@@ -3994,7 +4011,9 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
         the assembler cannot trace the execution flow this may lead to false
         results in some cases. If in doubt, use the <tt/.Inn/ and <tt/.Ann/
         instructions to tell the assembler about the current settings.
-  <item>In 65816 mode, replace a <tt/RTS/ instruction by <tt/RTL/ if it is
+  <item>In 65816 mode, if the <tt><ref id="long_jsr_jmp_rts"
+        name="long_jsr_jmp_rts"></tt> feature is enabled,
+        smart mode will replace a <tt/RTS/ instruction by <tt/RTL/ if it is
         used within a procedure declared as <tt/far/, or if the procedure has
         no explicit address specification, but it is <tt/far/ because of the
         memory model used.
diff --git a/src/ca65/feature.c b/src/ca65/feature.c
index b11345338..754b645cf 100644
--- a/src/ca65/feature.c
+++ b/src/ca65/feature.c
@@ -66,6 +66,7 @@ static const char* const FeatureKeys[FEAT_COUNT] = {
     "addrsize",
     "bracket_as_indirect",
     "string_escapes",
+    "long_jsr_jmp_rts",
 };
 
 
@@ -125,6 +126,7 @@ feature_t SetFeature (const StrBuf* Key)
         case FEAT_ADDRSIZE:                   AddrSize          = 1;    break;
         case FEAT_BRACKET_AS_INDIRECT:        BracketAsIndirect = 1;    break;
         case FEAT_STRING_ESCAPES:             StringEscapes     = 1;    break;
+        case FEAT_LONG_JSR_JMP_RTS:           LongJsrJmpRts     = 1;    break;
         default:                         /* Keep gcc silent */          break;
     }
 
diff --git a/src/ca65/feature.h b/src/ca65/feature.h
index 876f3c4a8..a29ee0172 100644
--- a/src/ca65/feature.h
+++ b/src/ca65/feature.h
@@ -68,6 +68,7 @@ typedef enum {
     FEAT_ADDRSIZE,
     FEAT_BRACKET_AS_INDIRECT,
     FEAT_STRING_ESCAPES,
+    FEAT_LONG_JSR_JMP_RTS,
 
     /* Special value: Number of features available */
     FEAT_COUNT
diff --git a/src/ca65/global.c b/src/ca65/global.c
index a216fc406..962f368db 100644
--- a/src/ca65/global.c
+++ b/src/ca65/global.c
@@ -67,6 +67,7 @@ unsigned char LineCont           = 0;   /* Allow line continuation */
 unsigned char LargeAlignment     = 0;   /* Don't warn about large alignments */
 unsigned char RelaxChecks        = 0;   /* Relax a few assembler checks */
 unsigned char StringEscapes      = 0;   /* Allow C-style escapes in strings */
+unsigned char LongJsrJmpRts      = 0;   /* Allow JSR/JMP/RTS as alias for JSL/JML/RTL */
 
 /* Emulation features */
 unsigned char DollarIsPC         = 0;   /* Allow the $ symbol as current PC */
diff --git a/src/ca65/global.h b/src/ca65/global.h
index 77d90beca..c92291ad3 100644
--- a/src/ca65/global.h
+++ b/src/ca65/global.h
@@ -69,6 +69,7 @@ extern unsigned char    LineCont;           /* Allow line continuation */
 extern unsigned char    LargeAlignment;     /* Don't warn about large alignments */
 extern unsigned char    RelaxChecks;        /* Relax a few assembler checks */
 extern unsigned char    StringEscapes;      /* Allow C-style escapes in strings */
+extern unsigned char    LongJsrJmpRts;      /* Allow JSR/JMP/RTS as alias for JSL/JML/RTL */
 
 /* Emulation features */
 extern unsigned char    DollarIsPC;         /* Allow the $ symbol as current PC */
diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index d0d7ce64c..745072a09 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -120,9 +120,21 @@ static void PutJMP (const InsDesc* Ins);
 ** to check for this case and is otherwise identical to PutAll.
 */
 
+static void PutJMP816 (const InsDesc* Ins);
+/* Handle the JMP instruction for the 816.
+** Allowing the long_jsr_jmp_rts feature to permit a long JMP.
+** Note that JMP [abs] and JML [abs] are always both permitted for instruction $DC,
+** because the [] notation for long indirection makes the generated instruction unambiguous.
+*/
+
+static void PutJSR816 (const InsDesc* Ins);
+/* Handle the JSR instruction for the 816.
+** Allowing the long_jsr_jmp_rts feature to permit a long JSR.
+*/
+
 static void PutRTS (const InsDesc* Ins attribute ((unused)));
 /* Handle the RTS instruction for the 816. In smart mode emit a RTL opcode if
-** the enclosing scope is FAR.
+** the enclosing scope is FAR, but only if the long_jsr_jmp_rts feature applies.
 */
 
 static void PutAll (const InsDesc* Ins);
@@ -758,9 +770,9 @@ static const struct {
         { "INX",  0x0000001, 0xe8, 0, PutAll },
         { "INY",  0x0000001, 0xc8, 0, PutAll },
         { "JML",  0x4000010, 0x5c, 1, PutAll },
-        { "JMP",  0x4010818, 0x4c, 6, PutAll },
+        { "JMP",  0x4010818, 0x4c, 6, PutJMP816 },
         { "JSL",  0x0000010, 0x20, 7, PutAll },
-        { "JSR",  0x0010018, 0x20, 7, PutAll },
+        { "JSR",  0x0010018, 0x20, 7, PutJSR816 },
         { "LDA",  0x0b8f6fc, 0xa0, 0, PutAll },
         { "LDX",  0x0c0030c, 0xa2, 1, PutAll },
         { "LDY",  0x0c0006c, 0xa0, 1, PutAll },
@@ -1627,12 +1639,46 @@ static void PutJMP (const InsDesc* Ins)
 
 
 
-static void PutRTS (const InsDesc* Ins attribute ((unused)))
-/* Handle the RTS instruction for the 816. In smart mode emit a RTL opcode if
-** the enclosing scope is FAR.
+static void PutJMP816 (const InsDesc* Ins)
+/* Handle the JMP instruction for the 816.
+** Allowing the long_jsr_jmp_rts feature to permit a long JMP.
+** Note that JMP [abs] and JML [abs] are always both permitted for instruction $DC,
+** because the [] notation for long indirection makes the generated instruction unambiguous.
 */
 {
-    if (SmartMode && CurrentScope->AddrSize == ADDR_SIZE_FAR) {
+    if (LongJsrJmpRts) {
+        PutJMP (Ins);
+    } else {
+        InsDesc InsAbs = *Ins;
+        InsAbs.AddrMode &= ~(AM65_ABS_LONG);
+        PutJMP (&InsAbs);
+    }
+}
+
+
+
+static void PutJSR816 (const InsDesc* Ins)
+/* Handle the JSR instruction for the 816.
+** Allowing the long_jsr_jmp_rts feature to permit a long JSR.
+*/
+{
+    if (LongJsrJmpRts) {
+        PutAll (Ins);
+    } else {
+        InsDesc InsAbs = *Ins;
+        InsAbs.AddrMode &= ~(AM65_ABS_LONG);
+        PutJMP (&InsAbs);
+    }
+}
+
+
+
+static void PutRTS (const InsDesc* Ins attribute ((unused)))
+/* Handle the RTS instruction for the 816. In smart mode emit a RTL opcode if
+** the enclosing scope is FAR, but only if the long_jsr_jmp_rts feature applies.
+*/
+{
+    if (LongJsrJmpRts && SmartMode && CurrentScope->AddrSize == ADDR_SIZE_FAR) {
         Emit0 (0x6B);       /* RTL */
     } else {
         Emit0 (0x60);       /* RTS */

From 4b29d257d9c1aaa256b5bf1537daf9eb1e18a8ee Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 21 Feb 2023 04:38:17 -0500
Subject: [PATCH 11/65] fix dasm test65816 which relied on JMP automatic
 promotion, add test of new long_jsr_jmp_rts and smart

---
 test/dasm/test65816.s | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/dasm/test65816.s b/test/dasm/test65816.s
index 3d764fb6e..1b447d0fe 100644
--- a/test/dasm/test65816.s
+++ b/test/dasm/test65816.s
@@ -151,10 +151,11 @@ BVC LABEL
 BVS LABEL
 BRL LABEL
 JMP $1234
-JMP $FEDCBA
+JML $FEDCBA
 JMP ($1234)
 JMP ($1234,X)
 JMP [$1234]
+JML [$1234] ; alternative to JMP []
 JSL $123456
 JSR $1234
 JSR ($1234,X)
@@ -271,3 +272,15 @@ BIT #$5432
 LDA #$5432
 LDX #$5432
 LDY #$5432
+
+; test of smart and long_jsr_jmp_rts
+.smart
+.proc short_rts : far
+RTS ; not promoted to RTL
+.endproc
+.feature long_jsr_jmp_rts
+JSR $FEDCBA ; promoted to JSL
+JMP $FEDCBA ; promoted to JML
+.proc long_rts : far
+RTS ; promoted to RTL
+.endproc

From 2cdab999f54a8c6047657507e2e8a5f0a9242c0e Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 21 Feb 2023 05:22:28 -0500
Subject: [PATCH 12/65] dasm test extend 65816.info to include added code

---
 test/dasm/65816.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/dasm/65816.info b/test/dasm/65816.info
index 2a3394680..a6d836688 100644
--- a/test/dasm/65816.info
+++ b/test/dasm/65816.info
@@ -3,5 +3,5 @@ GLOBAL {
 };
 
 RANGE { START $8000; END $8229; ADDRMODE "MX"; TYPE Code;};
-RANGE { START $822a; END $824b; ADDRMODE "mx"; TYPE Code;};
+RANGE { START $822a; END $825b; ADDRMODE "mx"; TYPE Code;};
 

From 13f1d37403017a3b399eb9bc2c61e6613a1ebdfa Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 21 Feb 2023 06:48:46 -0500
Subject: [PATCH 13/65] suppress spurious "large alignment" warning when the
 combined alignment is not larger than any of the explictly requested ones

---
 doc/ca65.sgml       | 13 +++++++------
 src/ca65/segment.c  |  2 +-
 src/ld65/segments.c |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 19fd3aa2a..f2f7e94c0 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2112,14 +2112,15 @@ Here's a list of all control commands and a description, what they do:
   </verb></tscreen>
 
   the assembler will force a segment alignment to the least common multiple of
-  15, 18 and 251 - which is 22590. To protect the user against errors, the
-  assembler will issue a warning when the combined alignment exceeds 256. The
-  command line option <tt><ref id="option--large-alignment"
-  name="--large-alignment"></tt> will disable this warning.
+  15, 18 and 251 - which is 22590. To protect the user against errors, when the
+  combined alignment is larger than the explicitly requested alignments,
+  and also exceeds 256, the assembler will issue a warning. The  command line
+  option <tt><ref id="option--large-alignment" name="--large-alignment"></tt>
+  will disable this warning.
 
   Please note that with alignments that are a power of two (which were the
-  only alignments possible in older versions of the assembler), the problem is
-  less severe, because the least common multiple of powers to the same base is
+  only alignments possible in older versions of the assembler) will not cause
+  a warning, because the least common multiple of powers to the same base is
   always the larger one.
 
 
diff --git a/src/ca65/segment.c b/src/ca65/segment.c
index 26b568711..aadc35009 100644
--- a/src/ca65/segment.c
+++ b/src/ca65/segment.c
@@ -306,7 +306,7 @@ void SegAlign (unsigned long Alignment, int FillVal)
         ActiveSeg->Align = CombinedAlignment;
 
         /* Output a warning for larger alignments if not suppressed */
-        if (CombinedAlignment >= LARGE_ALIGNMENT && !LargeAlignment) {
+        if (CombinedAlignment >= LARGE_ALIGNMENT && CombinedAlignment > ActiveSeg->Align && CombinedAlignment > Alignment && !LargeAlignment) {
             Warning (0, "Combined alignment is suspiciously large (%lu)",
                      CombinedAlignment);
         }
diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index 10d2cda2c..255b8ccd1 100644
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -230,7 +230,7 @@ Section* ReadSection (FILE* F, ObjData* O)
                    "%lu. Last module requiring alignment was '%s'.",
                    GetString (Name), Alignment, MAX_ALIGNMENT,
                    GetObjFileName (O));
-        } else if (Alignment >= LARGE_ALIGNMENT && !LargeAlignment) {
+        } else if (Alignment >= LARGE_ALIGNMENT && Alignment > S->Alignment && Alignment > Sec->Alignment && !LargeAlignment) {
             Warning ("Combined alignment for segment '%s' is suspiciously "
                      "large (%lu). Last module requiring alignment was '%s'.",
                      GetString (Name), Alignment, GetObjFileName (O));

From 23cc295b08661bab604237582acd5bf5773dd6d3 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 21 Feb 2023 07:32:38 -0500
Subject: [PATCH 14/65] improve description of large-alignment warning

---
 doc/ca65.sgml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index f2f7e94c0..062b6d0c7 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2114,14 +2114,13 @@ Here's a list of all control commands and a description, what they do:
   the assembler will force a segment alignment to the least common multiple of
   15, 18 and 251 - which is 22590. To protect the user against errors, when the
   combined alignment is larger than the explicitly requested alignments,
-  and also exceeds 256, the assembler will issue a warning. The  command line
+  the assembler will issue a warning if it also exceeds 256. The command line
   option <tt><ref id="option--large-alignment" name="--large-alignment"></tt>
   will disable this warning.
 
-  Please note that with alignments that are a power of two (which were the
-  only alignments possible in older versions of the assembler) will not cause
-  a warning, because the least common multiple of powers to the same base is
-  always the larger one.
+  Please note that with only alignments that are a power of two, a warning will
+  never occur, because the least common multiple of powers to the same base is
+  always simply the larger one.
 
 
 

From fedfc3443de7adacb290cc33adb4b8fb63739e41 Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Fri, 24 Feb 2023 02:12:19 +0100
Subject: [PATCH 15/65] fix for issue #1973 (printf("%c", '\0') doesn't _write
 '\0' to fd 0)

---
 libsrc/common/_printf.s | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libsrc/common/_printf.s b/libsrc/common/_printf.s
index 840d42127..a0074583e 100644
--- a/libsrc/common/_printf.s
+++ b/libsrc/common/_printf.s
@@ -502,10 +502,10 @@ DoFormat:
 ; It is a character
 
         jsr     GetIntArg               ; Get the argument (promoted to int)
-        sta     Buf                     ; Place it as zero terminated string...
-        lda     #0
-        sta     Buf+1                   ; ...into the buffer
-        jmp     HaveArg                 ; Done
+        sta     Buf                     ; Place it into the buffer
+        ldx     #0
+        lda     #1                      ; Buffer length is 1
+        jmp     HaveArg1
 
 ; Is it an integer?
 
@@ -671,6 +671,7 @@ HaveArg:
         lda     Str
         ldx     Str+1
         jsr     _strlen                 ; Get length of argument
+HaveArg1:                               ; Jumped into here from %c handling
         sta     ArgLen
         stx     ArgLen+1
 

From da150aeeac5e030d34a208bf3efabdaaac23e81b Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Fri, 24 Feb 2023 18:00:58 -0500
Subject: [PATCH 16/65] allow .feature to both enable and disable

---
 doc/ca65.sgml      | 14 ++++++++-----
 src/ca65/feature.c | 50 +++++++++++++++++++---------------------------
 src/ca65/feature.h |  6 ++----
 src/ca65/main.c    | 11 ++++++----
 src/ca65/pseudo.c  | 25 +++++++++++++++--------
 5 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index b65d337bb..02ed5ad8a 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2746,15 +2746,19 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   This directive may be used to enable one or more compatibility features
   of the assembler. While the use of <tt/.FEATURE/ should be avoided when
   possible, it may be useful when porting sources written for other
-  assemblers. There is no way to switch a feature off, once you have
-  enabled it, so using
+  assemblers. After the feature name an optional '+' or '-' may specify whether
+  to enable or disable the feature (enable if omitted). Multiple features may be
+  enabled, separated by commas. Examples:
 
   <tscreen><verb>
-        .FEATURE        xxx
+        ; enable c_comments
+        .feature   c_comments
+        .feature   c_comments +
+        ; enable force_range, disable underline_in_numbers, enable labels_without_colons
+        .feature   force_range, underline_in_numbers -, labels_without_colons +
+        .feature   force_range +, underline_in_numbers off, labels_without_colons on
   </verb></tscreen>
 
-  will enable the feature until end of assembly is reached.
-
   The following features are available:
 
   <descrip>
diff --git a/src/ca65/feature.c b/src/ca65/feature.c
index 754b645cf..41177d66b 100644
--- a/src/ca65/feature.c
+++ b/src/ca65/feature.c
@@ -98,38 +98,30 @@ feature_t FindFeature (const StrBuf* Key)
 
 
 
-feature_t SetFeature (const StrBuf* Key)
-/* Find the feature and set the corresponding flag if the feature is known.
-** In any case, return the feature found. An invalid Key will return
-** FEAT_UNKNOWN.
+void SetFeature (feature_t Feature, unsigned char On)
+/* Set the corresponding feature flag if Feature is valid.
 */
 {
-    /* Map the string to an enum value */
-    feature_t Feature = FindFeature (Key);
-
     /* Set the flags */
     switch (Feature) {
-        case FEAT_DOLLAR_IS_PC:               DollarIsPC        = 1;    break;
-        case FEAT_LABELS_WITHOUT_COLONS:      NoColonLabels     = 1;    break;
-        case FEAT_LOOSE_STRING_TERM:          LooseStringTerm   = 1;    break;
-        case FEAT_LOOSE_CHAR_TERM:            LooseCharTerm     = 1;    break;
-        case FEAT_AT_IN_IDENTIFIERS:          AtInIdents        = 1;    break;
-        case FEAT_DOLLAR_IN_IDENTIFIERS:      DollarInIdents    = 1;    break;
-        case FEAT_LEADING_DOT_IN_IDENTIFIERS: LeadingDotInIdents= 1;    break;
-        case FEAT_ORG_PER_SEG:                OrgPerSeg         = 1;    break;
-        case FEAT_PC_ASSIGNMENT:              PCAssignment      = 1;    break;
-        case FEAT_MISSING_CHAR_TERM:          MissingCharTerm   = 1;    break;
-        case FEAT_UBIQUITOUS_IDENTS:          UbiquitousIdents  = 1;    break;
-        case FEAT_C_COMMENTS:                 CComments         = 1;    break;
-        case FEAT_FORCE_RANGE:                ForceRange        = 1;    break;
-        case FEAT_UNDERLINE_IN_NUMBERS:       UnderlineInNumbers= 1;    break;
-        case FEAT_ADDRSIZE:                   AddrSize          = 1;    break;
-        case FEAT_BRACKET_AS_INDIRECT:        BracketAsIndirect = 1;    break;
-        case FEAT_STRING_ESCAPES:             StringEscapes     = 1;    break;
-        case FEAT_LONG_JSR_JMP_RTS:           LongJsrJmpRts     = 1;    break;
-        default:                         /* Keep gcc silent */          break;
+        case FEAT_DOLLAR_IS_PC:               DollarIsPC        = On;    break;
+        case FEAT_LABELS_WITHOUT_COLONS:      NoColonLabels     = On;    break;
+        case FEAT_LOOSE_STRING_TERM:          LooseStringTerm   = On;    break;
+        case FEAT_LOOSE_CHAR_TERM:            LooseCharTerm     = On;    break;
+        case FEAT_AT_IN_IDENTIFIERS:          AtInIdents        = On;    break;
+        case FEAT_DOLLAR_IN_IDENTIFIERS:      DollarInIdents    = On;    break;
+        case FEAT_LEADING_DOT_IN_IDENTIFIERS: LeadingDotInIdents= On;    break;
+        case FEAT_ORG_PER_SEG:                OrgPerSeg         = On;    break;
+        case FEAT_PC_ASSIGNMENT:              PCAssignment      = On;    break;
+        case FEAT_MISSING_CHAR_TERM:          MissingCharTerm   = On;    break;
+        case FEAT_UBIQUITOUS_IDENTS:          UbiquitousIdents  = On;    break;
+        case FEAT_C_COMMENTS:                 CComments         = On;    break;
+        case FEAT_FORCE_RANGE:                ForceRange        = On;    break;
+        case FEAT_UNDERLINE_IN_NUMBERS:       UnderlineInNumbers= On;    break;
+        case FEAT_ADDRSIZE:                   AddrSize          = On;    break;
+        case FEAT_BRACKET_AS_INDIRECT:        BracketAsIndirect = On;    break;
+        case FEAT_STRING_ESCAPES:             StringEscapes     = On;    break;
+        case FEAT_LONG_JSR_JMP_RTS:           LongJsrJmpRts     = On;    break;
+        default:                                                         break;
     }
-
-    /* Return the value found */
-    return Feature;
 }
diff --git a/src/ca65/feature.h b/src/ca65/feature.h
index a29ee0172..8eeb62e6f 100644
--- a/src/ca65/feature.h
+++ b/src/ca65/feature.h
@@ -87,10 +87,8 @@ feature_t FindFeature (const StrBuf* Key);
 ** feature is invalid, return FEAT_UNKNOWN.
 */
 
-feature_t SetFeature (const StrBuf* Key);
-/* Find the feature and set the corresponding flag if the feature is known.
-** In any case, return the feature found. An invalid Key will return
-** FEAT_UNKNOWN.
+void SetFeature (feature_t Feature, unsigned char On);
+/* Set the corresponding feature flag if Feature is valid.
 */
 
 
diff --git a/src/ca65/main.c b/src/ca65/main.c
index 9710924bf..7183ff046 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -489,12 +489,15 @@ static void OptDebugInfo (const char* Opt attribute ((unused)),
 static void OptFeature (const char* Opt attribute ((unused)), const char* Arg)
 /* Set an emulation feature */
 {
-    /* Make a string buffer from Arg */
-    StrBuf Feature;
+    /* Make a string buffer from Arg and use it to find the feature. */
+    StrBuf StrFeature;
+    feature_t Feature = FindFeature (SB_InitFromString (&StrFeature, Arg));
 
-    /* Set the feature, check for errors */
-    if (SetFeature (SB_InitFromString (&Feature, Arg)) == FEAT_UNKNOWN) {
+    /* Enable the feature, check for errors */
+    if (Feature == FEAT_UNKNOWN) {
         AbEnd ("Illegal emulation feature: '%s'", Arg);
+    } else {
+        SetFeature (Feature, 1);
     }
 }
 
diff --git a/src/ca65/pseudo.c b/src/ca65/pseudo.c
index 843f5b9d2..1877512d5 100644
--- a/src/ca65/pseudo.c
+++ b/src/ca65/pseudo.c
@@ -1023,7 +1023,10 @@ static void DoFatal (void)
 static void DoFeature (void)
 /* Switch the Feature option */
 {
-    /* Allow a list of comma separated keywords */
+    feature_t Feature;
+    unsigned char On;
+
+    /* Allow a list of comma separated feature keywords with optional +/- or ON/OFF */
     while (1) {
 
         /* We expect an identifier */
@@ -1034,18 +1037,24 @@ static void DoFeature (void)
 
         /* Make the string attribute lower case */
         LocaseSVal ();
-
-        /* Set the feature and check for errors */
-        if (SetFeature (&CurTok.SVal) == FEAT_UNKNOWN) {
+        Feature = FindFeature(&CurTok.SVal);
+        if (Feature == FEAT_UNKNOWN) {
             /* Not found */
             ErrorSkip ("Invalid feature: '%m%p'", &CurTok.SVal);
             return;
-        } else {
-            /* Skip the keyword */
-            NextTok ();
+        }
+        NextTok ();
+
+        /* Optional +/- or ON/OFF */
+        On = 1;
+        if (CurTok.Tok != TOK_COMMA && !TokIsSep (CurTok.Tok)) {
+            SetBoolOption(&On);
         }
 
-        /* Allow more than one keyword */
+        /* Apply feature setting. */
+        SetFeature (Feature, On);
+
+        /* Allow more than one feature separated by commas. */
         if (CurTok.Tok == TOK_COMMA) {
             NextTok ();
         } else {

From 230230819eb8a10be5eda01ee646acd8ce57c796 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Fri, 24 Feb 2023 19:35:38 -0500
Subject: [PATCH 17/65] document the undocumented test/asm/listing behaviours

---
 test/asm/listing/readme.txt | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/test/asm/listing/readme.txt b/test/asm/listing/readme.txt
index e43f2008a..d6280b954 100644
--- a/test/asm/listing/readme.txt
+++ b/test/asm/listing/readme.txt
@@ -6,22 +6,38 @@ The name of a test is everything in the form <test>.s.
 
 The following reference files can be added:
 
-- <test>.bin-ref:
+- ref/<test>.bin-ref:
   This is a reference for the resulting binary.
   The binary as binary tested against this file.
   If they are not equal, the test fails.
 
-- <test>.list-ref
+- ref/<test>.list-ref
   This is a reference for the resulting listing output
   This file *must* have the first line of the listing removed, as that
   contains a ca65 version string, and almost always this will be changed!
 
+- ref/<test>.err-ref
+  This is a reference for the resulting ca65 stdout (>) output.
+
+- ref/<test>.err2-ref
+  This is a reference for the resulting ca65 stderr (2>) output.
+
+- ref/<test>.ld65err-ref
+  This is a reference for the resutling ld65 stdout (>) output.
+
+- ref/<test>.ld65err2-ref
+  This is a reference for the resulting ld65 stderr (2>) output.
+
+The following control files can be added to control the tests.
+These files are empty (contents ignored), and only the filename is used:
+
+- control/<test>.err
+  Test is expected to produce an error.
+
+- control/<test>.no-ld65
+  Skip the ld65 step.
+
 
 Note that the resulting .bin file is generated twice: Once with no listing
 file, and once with listing file. This way, one can find out if the listing
 file generation changes anything with the resulting binary output.
-
-
-TODO:
-- add the possibility to test for specific error output that are to be
-  expected

From c2bc40f2138152c333021cff7d60931d24380f18 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Fri, 24 Feb 2023 20:00:56 -0500
Subject: [PATCH 18/65] test for all ca65 .feature options

---
 test/asm/listing/108-long-rts.s           |   8 ++
 test/asm/listing/ref/108-long-rts.bin-ref |   1 +
 test/asm/val/feature.s                    | 147 ++++++++++++++++++++++
 3 files changed, 156 insertions(+)
 create mode 100644 test/asm/listing/108-long-rts.s
 create mode 100644 test/asm/listing/ref/108-long-rts.bin-ref
 create mode 100644 test/asm/val/feature.s

diff --git a/test/asm/listing/108-long-rts.s b/test/asm/listing/108-long-rts.s
new file mode 100644
index 000000000..a8bf860cd
--- /dev/null
+++ b/test/asm/listing/108-long-rts.s
@@ -0,0 +1,8 @@
+; test of long-rts promotion
+
+.p816
+.feature long_jsr_jmp_rts
+.smart +
+.proc farproc : far
+    rts ; should be $6B (RTL) and not $60 (RTS)
+.endproc
diff --git a/test/asm/listing/ref/108-long-rts.bin-ref b/test/asm/listing/ref/108-long-rts.bin-ref
new file mode 100644
index 000000000..23fa7d31a
--- /dev/null
+++ b/test/asm/listing/ref/108-long-rts.bin-ref
@@ -0,0 +1 @@
+k
\ No newline at end of file
diff --git a/test/asm/val/feature.s b/test/asm/val/feature.s
new file mode 100644
index 000000000..4428cf4c2
--- /dev/null
+++ b/test/asm/val/feature.s
@@ -0,0 +1,147 @@
+; a simple test of every .feature
+
+.export _main
+
+.segment "ZEROPAGE"
+zplabel:
+
+.segment "CODE"
+abslabel:
+
+; exit with 0
+
+_main:
+    ; if any feature needs a runtime test,
+    ; it can be added here.
+    lda #0
+    tax
+    rts
+
+
+.feature addrsize +
+.assert .addrsize(zplabel) = 1, error, ".addrsize 1 expected for ZEROPAGE"
+.assert .addrsize(abslabel) = 2, error, ".addrsize 2 expected for absolute"
+.feature addrsize -
+
+
+.feature at_in_identifiers on
+ident@with@at:
+    rts
+.feature at_in_identifiers off
+
+
+.feature bracket_as_indirect
+    lda [$82],y
+.feature bracket_as_indirect-
+
+
+.feature c_comments
+    lda zplabel /* comment */
+    /* comment */
+/* multiline
+** comment
+*/
+.feature c_comments -
+
+
+.feature dollar_in_identifiers
+ident$with$dollar:
+    rts
+.feature dollar_in_identifiers -
+
+
+.feature dollar_is_pc
+.assert $ = *, error, "dollar_is_pc failure"
+.feature dollar_is_pc -
+
+
+.feature force_range
+    lda #-1
+.feature force_range -
+
+
+.feature labels_without_colons
+labelwithoutcolon
+    jmp labelwithoutcolon
+.feature labels_without_colons -
+
+
+.feature leading_dot_in_identifiers
+.identifierwithdot:
+    rts
+.feature leading_dot_in_identifiers -
+
+
+.feature long_jsr_jmp_rts
+.p816
+    ; long addresses require alternate instruction names JSL, JML without this feature
+    jsr $123456
+    jmp $123456
+; smart + far + long_jsr_jmp_rts will promote rts to rtl
+.smart +
+.proc long_rts : far
+    rts ; should become RTL ($6B) instead of RTS ($60)
+    ; the emitted opcode is not verified by this test,
+    ; see test/asm/listing/108-long-rts
+.endproc
+.smart -
+.p02
+.feature long_jsr_jmp_rts -
+
+
+.feature loose_char_term
+.byte 'a'
+.byte "a"
+.feature loose_char_term -
+
+
+.feature loose_string_term
+.asciiz "string"
+.asciiz 'string'
+.feature loose_string_term -
+
+
+.feature missing_char_term
+    lda #'a
+.feature missing_char_term -
+
+
+.feature org_per_seg
+.segment "RODATA"
+.org $5678
+.assert * = $5678, error, "org_per_seg failed"
+.segment "CODE"
+.org $9ABC
+.assert * = $9ABC, error, "org_per_seg failed"
+.segment "RODATA"
+.assert * = $5678, error, "org_per_seg failed"
+.reloc
+.segment "CODE"
+.assert * = $9ABC, error, "org_per_seg failed"
+.reloc
+.feature org_per_seg -
+
+
+.feature pc_assignment
+* = $1234
+.assert * = $1234, error, "pc_assignment failed"
+.reloc
+.feature pc_assignment -
+
+
+.feature string_escapes
+.asciiz "quote:\""
+.feature string_escapes -
+
+
+.feature ubiquitous_idents
+.macro bit
+    brk
+.endmacro
+    bit
+.feature ubiquitous_idents -
+
+
+.feature underline_in_numbers
+.byte %10_10_10_10
+.feature underline_in_numbers -

From cd8fa3906631c6ba4dda3f37077eb0770daf769a Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Fri, 24 Feb 2023 22:40:29 -0500
Subject: [PATCH 19/65] optional BRK signature on all 6502 CPUs, not just 65816
 (also COP)

---
 src/ca65/instr.c                              |  16 ++++----
 test/asm/listing/109-brk-signature.s          |  36 ++++++++++++++++++
 .../asm/listing/ref/109-brk-signature.bin-ref | Bin 0 -> 28 bytes
 3 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 test/asm/listing/109-brk-signature.s
 create mode 100644 test/asm/listing/ref/109-brk-signature.bin-ref

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 745072a09..2ed5ba734 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -181,7 +181,7 @@ static const struct {
         { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -252,7 +252,7 @@ static const struct {
         { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -342,7 +342,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x12, 0, PutPCRel8 },      /* DTV */
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -418,7 +418,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -510,7 +510,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -622,7 +622,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 6, PutAll },
         { "BSR",  0x0040000, 0x63, 0, PutPCRel4510 },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
@@ -756,7 +756,7 @@ static const struct {
         { "CLI",  0x0000001, 0x58, 0, PutAll },
         { "CLV",  0x0000001, 0xb8, 0, PutAll },
         { "CMP",  0x0b8f6fc, 0xc0, 0, PutAll },
-        { "COP",  0x0000004, 0x02, 6, PutAll },
+        { "COP",  0x0000005, 0x02, 6, PutAll },
         { "CPA",  0x0b8f6fc, 0xc0, 0, PutAll },   /* == CMP */
         { "CPX",  0x0c0000c, 0xe0, 1, PutAll },
         { "CPY",  0x0c0000c, 0xc0, 1, PutAll },
@@ -909,7 +909,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000001, 0x00, 0, PutAll },
+        { "BRK",  0x0000005, 0x00, 6, PutAll },
         { "BSR",  0x0020000, 0x44, 0, PutPCRel8 },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
diff --git a/test/asm/listing/109-brk-signature.s b/test/asm/listing/109-brk-signature.s
new file mode 100644
index 000000000..b150e088a
--- /dev/null
+++ b/test/asm/listing/109-brk-signature.s
@@ -0,0 +1,36 @@
+; test of optional signature byte for BRK on all 6502-derived CPUs
+; and also COP on 65C816
+
+.setcpu "6502"
+brk ; 1 byte
+brk 0 ; 2 bytes
+brk $60 ; 2 bytes
+
+.setcpu "6502X"
+brk
+brk $60
+
+.setcpu "6502DTV"
+brk
+brk $60
+
+.setcpu "65SC02"
+brk
+brk $60
+
+.setcpu "65816"
+brk
+brk $60
+cop
+cop $60
+; WDM is a NOP that gives +2 PC, probably not useful to make its signature byte optional
+;wdm
+wdm $60
+
+.setcpu "4510"
+brk
+brk $60
+
+.setcpu "HuC6280"
+brk
+brk $60
diff --git a/test/asm/listing/ref/109-brk-signature.bin-ref b/test/asm/listing/ref/109-brk-signature.bin-ref
new file mode 100644
index 0000000000000000000000000000000000000000..0f46d29fd39f8d79bd403ca35bd6eb6aa7ced41c
GIT binary patch
literal 28
TcmZQzU|>i<ModfzPEY{=EA|7Y

literal 0
HcmV?d00001


From 3f8252311efaae97cae48b6acb2e76d1a4dcf14f Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Fri, 24 Feb 2023 23:00:30 -0500
Subject: [PATCH 20/65] 65C816 document brk optional signature, and mvn/mvp
 syntax

---
 doc/ca65.sgml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index b65d337bb..d4c002408 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -439,6 +439,14 @@ The assembler accepts
       <tt><ref id=".P4510" name=".P4510"></tt> command was given).
 </itemize>
 
+On 6502-derived platforms the <tt/BRK/ instruction has an optional signature
+byte. If omitted, the assembler will only produce only 1 byte.
+
+<tscreen><verb>
+                brk                     ; 1-byte:  $00
+                brk     $34             ; 2-bytes: $00 $34
+</verb></tscreen>
+
 
 <sect1>65816 mode<p>
 
@@ -456,6 +464,17 @@ mnemonics:
 <item><tt>TSA</tt> is an alias for <tt>TSC</tt>
 </itemize>
 
+The <tt/MVN/ and <tt/MVP/ instructions accept two different argument forms.
+Either two bank bytes may be given with a <tt/#/ prefix,
+or two far addresses whose high byte will be used.
+
+<tscreen><verb>
+                mvn     #^src, #^dst       ; bank of src to bank of dst
+                mvn     src, dst           ; bank of src to bank of dst
+                mvp     #$12, #$78         ; bank $12 to $78
+                mvp     $123456, $789ABC   ; bank $12 to $78
+</verb></tscreen>
+
 
 <sect1>6502X mode<label id="6502X-mode"><p>
 

From 3d41a5b51647fbc1c840d2d8167c76456faa3dec Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Sat, 25 Feb 2023 08:23:47 -0500
Subject: [PATCH 21/65] allow immedite style syntax variation for BRK signature
 byte

---
 doc/ca65.sgml                                 |   1 +
 src/ca65/instr.c                              |  20 +++++++++---------
 test/asm/listing/109-brk-signature.s          |   9 ++++++++
 .../asm/listing/ref/109-brk-signature.bin-ref | Bin 28 -> 46 bytes
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index d4c002408..1bef0b551 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -445,6 +445,7 @@ byte. If omitted, the assembler will only produce only 1 byte.
 <tscreen><verb>
                 brk                     ; 1-byte:  $00
                 brk     $34             ; 2-bytes: $00 $34
+                brk     #$34            ; 2-bytes: $00 $34
 </verb></tscreen>
 
 
diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 2ed5ba734..b72be6711 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -181,7 +181,7 @@ static const struct {
         { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -252,7 +252,7 @@ static const struct {
         { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -342,7 +342,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x12, 0, PutPCRel8 },      /* DTV */
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -418,7 +418,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -510,7 +510,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
         { "CLC",  0x0000001, 0x18, 0, PutAll },
@@ -622,7 +622,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BSR",  0x0040000, 0x63, 0, PutPCRel4510 },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
@@ -747,7 +747,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BRL",  0x0040000, 0x82, 0, PutPCRel16 },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
@@ -756,7 +756,7 @@ static const struct {
         { "CLI",  0x0000001, 0x58, 0, PutAll },
         { "CLV",  0x0000001, 0xb8, 0, PutAll },
         { "CMP",  0x0b8f6fc, 0xc0, 0, PutAll },
-        { "COP",  0x0000005, 0x02, 6, PutAll },
+        { "COP",  0x0800005, 0x02, 6, PutAll },
         { "CPA",  0x0b8f6fc, 0xc0, 0, PutAll },   /* == CMP */
         { "CPX",  0x0c0000c, 0xe0, 1, PutAll },
         { "CPY",  0x0c0000c, 0xc0, 1, PutAll },
@@ -833,7 +833,7 @@ static const struct {
         { "TYA",  0x0000001, 0x98, 0, PutAll },
         { "TYX",  0x0000001, 0xbb, 0, PutAll },
         { "WAI",  0x0000001, 0xcb, 0, PutAll },
-        { "WDM",  0x0000004, 0x42, 6, PutAll },
+        { "WDM",  0x0800004, 0x42, 6, PutAll },
         { "XBA",  0x0000001, 0xeb, 0, PutAll },
         { "XCE",  0x0000001, 0xfb, 0, PutAll }
     }
@@ -909,7 +909,7 @@ static const struct {
         { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
         { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
         { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
-        { "BRK",  0x0000005, 0x00, 6, PutAll },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
         { "BSR",  0x0020000, 0x44, 0, PutPCRel8 },
         { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
         { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
diff --git a/test/asm/listing/109-brk-signature.s b/test/asm/listing/109-brk-signature.s
index b150e088a..e9c23dd63 100644
--- a/test/asm/listing/109-brk-signature.s
+++ b/test/asm/listing/109-brk-signature.s
@@ -5,32 +5,41 @@
 brk ; 1 byte
 brk 0 ; 2 bytes
 brk $60 ; 2 bytes
+brk #$60 ; 2 bytes
 
 .setcpu "6502X"
 brk
 brk $60
+brk #$60
 
 .setcpu "6502DTV"
 brk
 brk $60
+brk #$60
 
 .setcpu "65SC02"
 brk
 brk $60
+brk #$60
 
 .setcpu "65816"
 brk
 brk $60
+brk #$60
 cop
 cop $60
+cop #$60
 ; WDM is a NOP that gives +2 PC, probably not useful to make its signature byte optional
 ;wdm
 wdm $60
+wdm #$60
 
 .setcpu "4510"
 brk
 brk $60
+brk #$60
 
 .setcpu "HuC6280"
 brk
 brk $60
+brk #$60
diff --git a/test/asm/listing/ref/109-brk-signature.bin-ref b/test/asm/listing/ref/109-brk-signature.bin-ref
index 0f46d29fd39f8d79bd403ca35bd6eb6aa7ced41c..0eaa09faa5e113f3fe15fcb8e23837523fe04edc 100644
GIT binary patch
literal 46
YcmZQzU|>i9LM#LmQvy?h6A&UK0hde%O8@`>

literal 28
TcmZQzU|>i<ModfzPEY{=EA|7Y


From e87325033d04955ea871e367f015b7ec508ae481 Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Sat, 25 Feb 2023 12:39:36 -0500
Subject: [PATCH 22/65] Fix .endmacro in a .define in a macro body

---
 src/ca65/macro.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 4812b12c4..16d916c88 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -391,6 +391,7 @@ void MacDef (unsigned Style)
     Macro* M;
     TokNode* N;
     int HaveParams;
+    int DefineActive = 0;
 
     /* We expect a macro name here */
     if (CurTok.Tok != TOK_IDENT) {
@@ -491,8 +492,8 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, only .endmacro is allowed */
-            if (CurTok.Tok == TOK_ENDMACRO) {
+            /* In classic macros, only .endmacro is allowed, but ignore it if it is in a .define */
+            if (CurTok.Tok == TOK_ENDMACRO && !DefineActive) {
                 /* Done */
                 break;
             }
@@ -573,6 +574,13 @@ void MacDef (unsigned Style)
         }
         ++M->TokCount;
 
+        /* Mark if .define has been read until end of line has been reached */
+        if (CurTok.Tok == TOK_DEFINE) {
+            DefineActive = 1;
+        } else if (TokIsSep(CurTok.Tok)) {
+            DefineActive = 0;
+        }
+
         /* Read the next token */
         NextTok ();
     }
@@ -582,7 +590,7 @@ void MacDef (unsigned Style)
         NextTok ();
     }
 
-    /* Reset the Incomplete flag now that parsing is done */
+/* Reset the Incomplete flag now that parsing is done */
     M->Incomplete = 0;
 
 Done:

From 429e90dffdc326bbb23a332ea3b7b11dc67f8c67 Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Sat, 25 Feb 2023 12:42:26 -0500
Subject: [PATCH 23/65] Fix .endmacro in a .define in a macro body

---
 src/ca65/macro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 16d916c88..24cdcad38 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -590,7 +590,7 @@ void MacDef (unsigned Style)
         NextTok ();
     }
 
-/* Reset the Incomplete flag now that parsing is done */
+    /* Reset the Incomplete flag now that parsing is done */
     M->Incomplete = 0;
 
 Done:

From 0a05f78d47c8a6ea20b97fd570d0f5db054aa387 Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Sat, 25 Feb 2023 13:38:02 -0500
Subject: [PATCH 24/65] Fix .endmacro not at the start of the line.

---
 src/ca65/macro.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 24cdcad38..c09b2412f 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -391,7 +391,7 @@ void MacDef (unsigned Style)
     Macro* M;
     TokNode* N;
     int HaveParams;
-    int DefineActive = 0;
+    int LastTokWasSep = 0;
 
     /* We expect a macro name here */
     if (CurTok.Tok != TOK_IDENT) {
@@ -493,7 +493,7 @@ void MacDef (unsigned Style)
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
             /* In classic macros, only .endmacro is allowed, but ignore it if it is in a .define */
-            if (CurTok.Tok == TOK_ENDMACRO && !DefineActive) {
+            if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
                 break;
             }
@@ -574,12 +574,8 @@ void MacDef (unsigned Style)
         }
         ++M->TokCount;
 
-        /* Mark if .define has been read until end of line has been reached */
-        if (CurTok.Tok == TOK_DEFINE) {
-            DefineActive = 1;
-        } else if (TokIsSep(CurTok.Tok)) {
-            DefineActive = 0;
-        }
+        /* Save if last token was a separator to know if .endmacro is valid */
+        LastTokWasSep = TokIsSep(CurTok.Tok);
 
         /* Read the next token */
         NextTok ();

From 4b29615f2bad008cc5a7b015616883a4e837972b Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Sat, 25 Feb 2023 13:49:19 -0500
Subject: [PATCH 25/65] Fix .endmacro not at the start of the line. Allow empty
 macro

---
 src/ca65/macro.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index c09b2412f..fa90009b5 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -480,6 +480,7 @@ void MacDef (unsigned Style)
     */
     if (Style == MAC_STYLE_CLASSIC) {
         ConsumeSep ();
+        LastTokWasSep = 1;
     } else if (HaveParams) {
         ConsumeRParen ();
     }

From 7d894fbe04f64aa0917404412cc5b14a1c970818 Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Sat, 25 Feb 2023 13:52:13 -0500
Subject: [PATCH 26/65] Fix .endmacro not at the start of the line. Fix comment

---
 src/ca65/macro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index fa90009b5..92a0f6e9a 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -493,7 +493,7 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, only .endmacro is allowed, but ignore it if it is in a .define */
+            /* In classic macros, only .endmacro is allowed, but ignore it if it is not at the start of the line */
             if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
                 break;

From ffa83c32a4d4cb2f7bd7749aa3e2766c370e60a7 Mon Sep 17 00:00:00 2001
From: mrdudz <mrdudz@users.noreply.github.com>
Date: Sun, 26 Feb 2023 20:03:41 +0100
Subject: [PATCH 27/65] clean-up of driver return codes

---
 Contributing.md                               | 17 +++++++-
 libsrc/apple2/emd/a2.auxmem.s                 |  3 +-
 libsrc/apple2/joy/a2.stdjoy.s                 |  5 ++-
 libsrc/apple2/mou/a2.stdmou.s                 |  4 +-
 libsrc/apple2/ser/a2.ssc.s                    | 43 +++++++++++--------
 libsrc/atari/joy/atrmj8.s                     |  3 +-
 libsrc/atari/joy/atrstd.s                     |  3 +-
 libsrc/atari/mou/atrjoy.s                     |  5 ++-
 libsrc/atari/mou/atrst.s                      |  5 ++-
 libsrc/atari/mou/atrtt.s                      |  5 ++-
 libsrc/atari/ser/atrrdev.s                    | 35 ++++++++-------
 libsrc/atari5200/joy/atr5200std.s             |  3 +-
 libsrc/atari7800/joy/atari7800-stdjoy.s       |  5 ++-
 libsrc/atmos/joy/atmos-ijk.s                  |  7 +--
 libsrc/atmos/joy/atmos-pase.s                 |  3 +-
 libsrc/atmos/ser/atmos-acia.s                 | 28 ++++++------
 libsrc/atmos/tgi/atmos-228-200-3.s            |  3 +-
 libsrc/c128/emd/c128-efnram.s                 |  7 +--
 libsrc/c128/emd/c128-georam.s                 |  8 ++--
 libsrc/c128/emd/c128-ifnram.s                 |  7 +--
 libsrc/c128/emd/c128-ram.s                    |  3 +-
 libsrc/c128/emd/c128-ram2.s                   |  3 +-
 libsrc/c128/emd/c128-ramcart.s                |  9 ++--
 libsrc/c128/emd/c128-reu.s                    |  5 ++-
 libsrc/c128/emd/c128-vdc.s                    |  5 ++-
 libsrc/c128/joy/c128-ptvjoy.s                 |  5 ++-
 libsrc/c128/joy/c128-stdjoy.s                 |  5 ++-
 libsrc/c128/mou/c128-1351.s                   |  5 ++-
 libsrc/c128/mou/c128-inkwell.s                |  3 +-
 libsrc/c128/mou/c128-joy.s                    |  5 ++-
 libsrc/c128/mou/c128-pot.s                    |  5 ++-
 libsrc/c128/ser/c128-swlink.s                 | 39 +++++++++--------
 libsrc/c16/emd/c16-ram.s                      |  9 ++--
 libsrc/c64/emd/c64-65816.s                    |  9 ++--
 libsrc/c64/emd/c64-c256k.s                    |  9 ++--
 libsrc/c64/emd/c64-dqbb.s                     |  9 ++--
 libsrc/c64/emd/c64-georam.s                   |  9 ++--
 libsrc/c64/emd/c64-isepic.s                   |  9 ++--
 libsrc/c64/emd/c64-kerberos.s                 |  9 ++--
 libsrc/c64/emd/c64-ram.s                      |  5 ++-
 libsrc/c64/emd/c64-ramcart.s                  |  8 ++--
 libsrc/c64/emd/c64-reu.s                      |  6 ++-
 libsrc/c64/emd/c64-vdc.s                      |  9 ++--
 libsrc/c64/emd/dtv-himem.s                    |  9 ++--
 libsrc/c64/joy/c64-hitjoy.s                   |  5 ++-
 libsrc/c64/joy/c64-numpad.s                   | 10 +++--
 libsrc/c64/joy/c64-ptvjoy.s                   |  5 ++-
 libsrc/c64/joy/c64-stdjoy.s                   |  5 ++-
 libsrc/c64/mou/c64-1351.s                     |  9 ++--
 libsrc/c64/mou/c64-inkwell.s                  |  5 ++-
 libsrc/c64/mou/c64-joy.s                      |  9 ++--
 libsrc/c64/mou/c64-pot.s                      |  9 ++--
 libsrc/c64/ser/c64-swlink.s                   | 39 +++++++++--------
 libsrc/cbm510/emd/cbm510-ram.s                |  5 ++-
 libsrc/cbm510/joy/cbm510-std.s                |  5 ++-
 libsrc/cbm510/mou/cbm510-inkwl.s              |  5 ++-
 libsrc/cbm510/mou/cbm510-joy.s                |  7 +--
 libsrc/cbm510/ser/cbm510-std.s                | 34 ++++++++-------
 libsrc/cbm610/emd/cbm610-ram.s                |  5 ++-
 libsrc/cbm610/ser/cbm610-std.s                | 31 +++++++------
 libsrc/creativision/joy/creativision-stdjoy.s |  3 +-
 libsrc/cx16/joy/cx16-std.s                    |  5 ++-
 libsrc/cx16/mou/cx16-std.s                    |  7 +--
 libsrc/gamate/joy/gamate-stdjoy.s             |  5 ++-
 libsrc/geos-cbm/emd/geos-vdc.s                |  5 ++-
 libsrc/geos-cbm/joy/geos-stdjoy.s             |  5 ++-
 libsrc/joystick/joy_unload.s                  |  7 ++-
 libsrc/lynx/joy/lynx-stdjoy.s                 |  5 ++-
 libsrc/lynx/ser/lynx-comlynx.s                | 33 +++++++-------
 libsrc/mouse/mouse_unload.s                   |  7 ++-
 libsrc/nes/joy/nes-stdjoy.s                   |  3 +-
 libsrc/pce/joy/pce-stdjoy.s                   |  5 ++-
 libsrc/pet/joy/pet-ptvjoy.s                   |  5 ++-
 libsrc/plus4/joy/plus4-stdjoy.s               |  5 ++-
 libsrc/plus4/ser/plus4-stdser.s               | 34 ++++++++-------
 libsrc/serial/ser_unload.s                    | 10 ++---
 libsrc/supervision/joy/supervision-stdjoy.s   |  5 ++-
 libsrc/telestrat/joy/telestrat.s              |  5 ++-
 libsrc/vic20/emd/vic20-georam.s               |  8 ++--
 libsrc/vic20/emd/vic20-rama.s                 |  9 ++--
 libsrc/vic20/joy/vic20-ptvjoy.s               |  5 ++-
 libsrc/vic20/joy/vic20-stdjoy.s               |  5 ++-
 82 files changed, 438 insertions(+), 322 deletions(-)

diff --git a/Contributing.md b/Contributing.md
index 74e6ead17..eb26e920b 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -134,7 +134,22 @@ You can refer to Annex B of the ISO C99 standard ([here](https://www.open-std.or
 * Hexadecimal number constants should be used except where decimal or binary numbers make much more sense in that constant's context.
 * Hexadecimal letters should be upper-case.
 * When you set two registers or two memory locations to an immediate 16-bit zero, you should use the expressions ```#<$0000``` and ```#>$0000``` (they make it obvious where you are putting the lower and upper bytes).
-* If a function is declared to return a char-sized value, it actually must return an integer-sized value.  (When cc65 promotes a returned value, it sometimes assumes that the value already is an integer.)
+* If a function is declared to return a char-sized value, it actually must return an integer-sized value.  (When cc65 promotes a returned value, it sometimes assumes that the value already is an integer.) This must be done in one of the following ways:
+<pre>
+    lda #RETURN_VALUE
+    ldx #0 ; return value is char
+</pre>
+or, if the value is 0, you can use:
+<pre>
+    lda #RETURN_VALUE
+    .assert RETURN_VALUE = 0
+    tax
+</pre>
+sometimes jumping to return0 could save a byte:
+<pre>
+    .assert RETURN_VALUE = 0
+    jmp return 0
+</pre>
 * Functions, that are intended for a platform's system library, should be optimized as much as possible.
 * Sometimes, there must be a trade-off between size and speed.  If you think that a library function won't be used often, then you should make it small.  Otherwise, you should make it fast.
 * Comments that are put on the right side of instructions must be aligned (start in the same character columns).
diff --git a/libsrc/apple2/emd/a2.auxmem.s b/libsrc/apple2/emd/a2.auxmem.s
index 5ef2564b1..c582e9eec 100644
--- a/libsrc/apple2/emd/a2.auxmem.s
+++ b/libsrc/apple2/emd/a2.auxmem.s
@@ -73,7 +73,8 @@ INSTALL:
         and     #$f0
         cmp     #$80
         bne     @L1
-        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        txa
         rts
 @L1:    lda     #EM_ERR_NO_DEVICE
 ;       rts
diff --git a/libsrc/apple2/joy/a2.stdjoy.s b/libsrc/apple2/joy/a2.stdjoy.s
index 558013910..11be52eb4 100644
--- a/libsrc/apple2/joy/a2.stdjoy.s
+++ b/libsrc/apple2/joy/a2.stdjoy.s
@@ -71,8 +71,9 @@ INSTALL:
         stx     gettype+2
 gettype:jsr     $0000
         sta     ostype
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
         ; Fall through
 
 ; UNINSTALL routine. Is called before the driver is removed from memory.
diff --git a/libsrc/apple2/mou/a2.stdmou.s b/libsrc/apple2/mou/a2.stdmou.s
index dfc69a942..c54c09d34 100644
--- a/libsrc/apple2/mou/a2.stdmou.s
+++ b/libsrc/apple2/mou/a2.stdmou.s
@@ -133,8 +133,8 @@ next:   inc     ptr1+1
         bcc     :+
 
         ; Mouse firmware not found
-        lda     #<MOUSE_ERR_NO_DEVICE
-        ldx     #>MOUSE_ERR_NO_DEVICE
+        lda     #MOUSE_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
         ; Check Pascal 1.1 Firmware Protocol ID bytes
diff --git a/libsrc/apple2/ser/a2.ssc.s b/libsrc/apple2/ser/a2.ssc.s
index d49bf3526..6ad9c3825 100644
--- a/libsrc/apple2/ser/a2.ssc.s
+++ b/libsrc/apple2/ser/a2.ssc.s
@@ -168,8 +168,9 @@ SER_CLOSE:
         sta     ACIA_CMD,x
 
         ; Done, return an error code
-:       lda     #<SER_ERR_OK
-        tax                     ; A is zero
+:       lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         stx     Index           ; Mark port as closed
         rts
 
@@ -256,23 +257,24 @@ SER_OPEN:
 
         ; Done
         stx     Index                   ; Mark port as open
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
         ; Device (hardware) not found
-NoDevice:lda    #<SER_ERR_NO_DEVICE
-        ldx     #>SER_ERR_NO_DEVICE
+NoDevice:lda    #SER_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
         ; Invalid parameter
-InvParam:lda    #<SER_ERR_INIT_FAILED
-        ldx     #>SER_ERR_INIT_FAILED
+InvParam:lda    #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
         ; Baud rate not available
-InvBaud:lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+InvBaud:lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -292,8 +294,8 @@ SER_GET:
 :       lda     RecvFreeCnt     ; (25)
         cmp     #$FF
         bne     :+
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 
         ; Check for flow stopped & enough free: release flow control
@@ -336,8 +338,8 @@ SER_PUT:
         ; Put byte into send buffer & send
 :       ldy     SendFreeCnt
         bne     :+
-        lda     #<SER_ERR_OVERFLOW
-        ldx     #>SER_ERR_OVERFLOW
+        lda     #SER_ERR_OVERFLOW
+        ldx     #0 ; return value is char
         rts
 
 :       ldy     SendTail
@@ -346,7 +348,8 @@ SER_PUT:
         dec     SendFreeCnt
         lda     #$FF            ; TryHard = true
         jsr     TryToSend
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -359,7 +362,8 @@ SER_STATUS:
         lda     ACIA_STATUS,x
         ldx     #$00
         sta     (ptr1,x)
-        txa                     ; SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        txa
         rts
 
 ;----------------------------------------------------------------------------
@@ -379,11 +383,12 @@ SER_IOCTL:
         bcs     :+
 
         stx     Slot
-        tax                     ; SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
-:       lda     #<SER_ERR_INV_IOCTL
-        ldx     #>SER_ERR_INV_IOCTL
+:       lda     #SER_ERR_INV_IOCTL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/atari/joy/atrmj8.s b/libsrc/atari/joy/atrmj8.s
index 3a26c381d..daf11651d 100644
--- a/libsrc/atari/joy/atrmj8.s
+++ b/libsrc/atari/joy/atrmj8.s
@@ -69,7 +69,8 @@ INSTALL:
         lda     #$34
         sta     PACTL
         lda     #JOY_ERR_OK
-        ldx     #0
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/atari/joy/atrstd.s b/libsrc/atari/joy/atrstd.s
index fd1d99d31..1a124192f 100644
--- a/libsrc/atari/joy/atrstd.s
+++ b/libsrc/atari/joy/atrstd.s
@@ -62,7 +62,8 @@ JOY_COUNT       = 4             ; Number of joysticks we support
 
 INSTALL:
         lda     #JOY_ERR_OK
-        ldx     #0
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/atari/mou/atrjoy.s b/libsrc/atari/mou/atrjoy.s
index 3ea428576..a93c7de13 100644
--- a/libsrc/atari/mou/atrjoy.s
+++ b/libsrc/atari/mou/atrjoy.s
@@ -137,9 +137,10 @@ INSTALL:
         ldx     YPos+1
         jsr     CMOVEY
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
diff --git a/libsrc/atari/mou/atrst.s b/libsrc/atari/mou/atrst.s
index 5d8a5cd12..626b7a8f7 100644
--- a/libsrc/atari/mou/atrst.s
+++ b/libsrc/atari/mou/atrst.s
@@ -268,9 +268,10 @@ INSTALL:
         and     #$0f
         sta     old_porta_vbi
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
diff --git a/libsrc/atari/mou/atrtt.s b/libsrc/atari/mou/atrtt.s
index 61963aa61..b1e53935e 100644
--- a/libsrc/atari/mou/atrtt.s
+++ b/libsrc/atari/mou/atrtt.s
@@ -132,9 +132,10 @@ INSTALL:
         ldx     YPos+1
         jsr     CMOVEY
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
diff --git a/libsrc/atari/ser/atrrdev.s b/libsrc/atari/ser/atrrdev.s
index 3a7bc21c2..1d2b98e8d 100644
--- a/libsrc/atari/ser/atrrdev.s
+++ b/libsrc/atari/ser/atrrdev.s
@@ -135,8 +135,8 @@ my_CIOV:
         .code
 
 invbaud:
-        lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+        lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
 openerr:
         rts
 
@@ -229,8 +229,9 @@ SER_OPEN:
         jsr     my_CIOV
         bmi     cioerr
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 inverr: jmp     my___inviocb
@@ -240,8 +241,8 @@ cioerr:
         jsr     my_fddecusage   ; decrement usage counter of fd as open failed
 
 init_err:
-        ldx     #0
         lda     #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
 ;---- open the device
@@ -313,8 +314,9 @@ SER_CLOSE:
         stx     rshand+1
         inx
         stx     cm_run
-@done:  lda     #<SER_ERR_OK
-        ldx     #>SER_ERR_OK
+@done:  lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -365,16 +367,16 @@ SER_GET:
         rts
 
 @nix_da:lda     #SER_ERR_NO_DATA
-        ldx     #0
+        ldx     #0 ; return value is char
         rts
 
 ser_error:
         lda     #SER_ERR_OVERFLOW       ; there is no large selection of serial error codes... :-/
-        ldx     #0
+        ldx     #0 ; return value is char
         rts
 
 ni_err: lda     #SER_ERR_NOT_OPEN
-        ldx     #0
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -427,8 +429,8 @@ SER_STATUS:
 ;
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL      ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -456,8 +458,8 @@ search: lda     HATABS,y                ; get device name
 
 ; R: device not found, return error
 
-        lda     #<SER_ERR_NO_DEVICE
-        ldx     #0
+        lda     #SER_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 ; R: device found, initialize jump table into main program
@@ -554,8 +556,9 @@ found:  lda     ptr3
         pla
         sta     ptr3
 
-        lda     #<SER_ERR_OK
-        tax                     ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 
diff --git a/libsrc/atari5200/joy/atr5200std.s b/libsrc/atari5200/joy/atr5200std.s
index fb7946bea..980428d13 100644
--- a/libsrc/atari5200/joy/atr5200std.s
+++ b/libsrc/atari5200/joy/atr5200std.s
@@ -47,7 +47,8 @@ INSTALL:
         lda     #$04            ; enable POT input from the joystick ports, see section "GTIA" in
         sta     CONSOL          ;   http://www.atarimuseum.com/videogames/consoles/5200/conv_to_5200.html
         lda     #JOY_ERR_OK
-        ldx     #0
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/atari7800/joy/atari7800-stdjoy.s b/libsrc/atari7800/joy/atari7800-stdjoy.s
index d76e1d105..59f656ada 100644
--- a/libsrc/atari7800/joy/atari7800-stdjoy.s
+++ b/libsrc/atari7800/joy/atari7800-stdjoy.s
@@ -62,8 +62,9 @@ INSTALL:
         sty SWCHB ; enable 2-button 7800 controller 2: pull pin 6 (INPT4) high
 
 reset:
-        lda #<JOY_ERR_OK
-        ldx #>JOY_ERR_OK
+        lda #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/atmos/joy/atmos-ijk.s b/libsrc/atmos/joy/atmos-ijk.s
index 6e75a3e0b..c2bdd67ab 100644
--- a/libsrc/atmos/joy/atmos-ijk.s
+++ b/libsrc/atmos/joy/atmos-ijk.s
@@ -55,11 +55,12 @@ INSTALL:
         lda     VIA::PRA
         and     #%00100000
         bne     ijkPresent
-        lda     #<JOY_ERR_NO_DEVICE
+        lda     #JOY_ERR_NO_DEVICE
         .byte   $2C             ; Skip next opcode
 ijkPresent:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/atmos/joy/atmos-pase.s b/libsrc/atmos/joy/atmos-pase.s
index fd64901c9..d9982cafe 100644
--- a/libsrc/atmos/joy/atmos-pase.s
+++ b/libsrc/atmos/joy/atmos-pase.s
@@ -58,7 +58,8 @@ temp2:  .byte   $00
 
 INSTALL:
         lda     #JOY_ERR_OK
-        ldx     #0
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/atmos/ser/atmos-acia.s b/libsrc/atmos/ser/atmos-acia.s
index f84b66a0a..f679125d1 100644
--- a/libsrc/atmos/ser/atmos-acia.s
+++ b/libsrc/atmos/ser/atmos-acia.s
@@ -141,8 +141,9 @@ SER_CLOSE:
         sta     ACIA::CMD,x
 
         ; Done, return an error code
-:       lda     #<SER_ERR_OK
-        tax                     ; A is zero
+:       lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         stx     Index           ; Mark port as closed
         rts
 
@@ -205,8 +206,9 @@ SER_OPEN:
 
         ; Done
         stx     Index                   ; Mark port as open
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
         ; Invalid parameter
@@ -235,8 +237,8 @@ SER_GET:
 :       lda     RecvFreeCnt     ; (25)
         cmp     #$FF
         bne     :+
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 
         ; Check for flow stopped & enough free: release flow control
@@ -277,8 +279,8 @@ SER_PUT:
         ; Put byte into send buffer & send
 :       ldy     SendFreeCnt
         bne     :+
-        lda     #<SER_ERR_OVERFLOW
-        ldx     #>SER_ERR_OVERFLOW
+        lda     #SER_ERR_OVERFLOW
+        ldx     #0 ; return value is char
         rts
 
 :       ldy     SendTail
@@ -287,7 +289,8 @@ SER_PUT:
         dec     SendFreeCnt
         lda     #$FF            ; TryHard = true
         jsr     TryToSend
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -299,7 +302,8 @@ SER_STATUS:
         lda     ACIA::STATUS
         ldx     #$00
         sta     (ptr1,x)
-        txa                     ; SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        txa
         rts
 
 ;----------------------------------------------------------------------------
@@ -308,8 +312,8 @@ SER_STATUS:
 ; Must return an SER_ERR_xx code in a/x.
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/atmos/tgi/atmos-228-200-3.s b/libsrc/atmos/tgi/atmos-228-200-3.s
index 98d2cef96..466f6922a 100644
--- a/libsrc/atmos/tgi/atmos-228-200-3.s
+++ b/libsrc/atmos/tgi/atmos-228-200-3.s
@@ -215,7 +215,8 @@ SETPALETTE:
         jsr     PAPER
         ldy     #1
         jsr     flipcolor
-        dey                     ; TGI_ERR_OK
+        .assert TGI_ERR_OK = 0, error
+        dey
         sty     ERROR
         sty     PARAM1+1
         jmp     INK
diff --git a/libsrc/c128/emd/c128-efnram.s b/libsrc/c128/emd/c128-efnram.s
index 788c73e0f..909c90048 100644
--- a/libsrc/c128/emd/c128-efnram.s
+++ b/libsrc/c128/emd/c128-efnram.s
@@ -87,16 +87,17 @@ INSTALL:
         cli
         cmp     tmp1
         beq     @ram_present
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @ram_present:
         ldx     #$FF
         stx     curpage
         stx     curpage+1               ; Invalidate the current page
+        .assert EM_ERR_OK = 0, error
         inx
-        txa                             ; A = X = EM_ERR_OK
+        txa
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c128/emd/c128-georam.s b/libsrc/c128/emd/c128-georam.s
index 7511c6841..ecf12f6cd 100644
--- a/libsrc/c128/emd/c128-georam.s
+++ b/libsrc/c128/emd/c128-georam.s
@@ -120,16 +120,16 @@ INSTALL:
         bne     @setok
 
 @notpresent:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @setok:
         lda     #0
         sta     pagecount
         stx     pagecount+1
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 check:
diff --git a/libsrc/c128/emd/c128-ifnram.s b/libsrc/c128/emd/c128-ifnram.s
index 01a4fdf8e..c51b775b2 100644
--- a/libsrc/c128/emd/c128-ifnram.s
+++ b/libsrc/c128/emd/c128-ifnram.s
@@ -87,16 +87,17 @@ INSTALL:
         cli
         cmp     tmp1
         beq     @ram_present
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @ram_present:
         ldx     #$FF
         stx     curpage
         stx     curpage+1               ; Invalidate the current page
+        .assert EM_ERR_OK = 0, error
         inx
-        txa                             ; A = X = EM_ERR_OK
+        txa
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c128/emd/c128-ram.s b/libsrc/c128/emd/c128-ram.s
index 3fc52c9cc..0ae504b84 100644
--- a/libsrc/c128/emd/c128-ram.s
+++ b/libsrc/c128/emd/c128-ram.s
@@ -68,8 +68,9 @@ INSTALL:
         ldx     #$FF
         stx     curpage
         stx     curpage+1               ; Invalidate the current page
+        .assert EM_ERR_OK = 0, error
         inx
-        txa                             ; A = X = EM_ERR_OK
+        txa
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c128/emd/c128-ram2.s b/libsrc/c128/emd/c128-ram2.s
index 7d2703fa5..92e72700a 100644
--- a/libsrc/c128/emd/c128-ram2.s
+++ b/libsrc/c128/emd/c128-ram2.s
@@ -107,8 +107,9 @@ INSTALL:
         ldx     #$FF
         stx     curpage
         stx     curpage+1       ; Invalidate the current page
+        .assert EM_ERR_OK = 0, error
         inx
-        txa                     ; A = X = EM_ERR_OK
+        txa
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c128/emd/c128-ramcart.s b/libsrc/c128/emd/c128-ramcart.s
index e72d053ac..c58c1cd1b 100644
--- a/libsrc/c128/emd/c128-ramcart.s
+++ b/libsrc/c128/emd/c128-ramcart.s
@@ -97,13 +97,14 @@ INSTALL:
         lda     #0
         sta     pagecount
         stx     pagecount+1
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 @notpresent:
 @readonly:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c128/emd/c128-reu.s b/libsrc/c128/emd/c128-reu.s
index 84e7cb695..8228a0517 100644
--- a/libsrc/c128/emd/c128-reu.s
+++ b/libsrc/c128/emd/c128-reu.s
@@ -126,8 +126,9 @@ size_found:
 pagecount_ok:
         stx     pagecount
         sty     pagecount+1
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 ; common REU setup for size check
diff --git a/libsrc/c128/emd/c128-vdc.s b/libsrc/c128/emd/c128-vdc.s
index accb82154..8d0b77fd2 100644
--- a/libsrc/c128/emd/c128-vdc.s
+++ b/libsrc/c128/emd/c128-vdc.s
@@ -121,8 +121,9 @@ INSTALL:
         lda     vdc_cset_save
         jsr     vdcputreg
 @keep64kBit:
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 test64k:
diff --git a/libsrc/c128/joy/c128-ptvjoy.s b/libsrc/c128/joy/c128-ptvjoy.s
index 180f7667d..0a1c53587 100644
--- a/libsrc/c128/joy/c128-ptvjoy.s
+++ b/libsrc/c128/joy/c128-ptvjoy.s
@@ -53,8 +53,9 @@ JOY_COUNT       = 4             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c128/joy/c128-stdjoy.s b/libsrc/c128/joy/c128-stdjoy.s
index bf2e2fea7..ee04374ee 100644
--- a/libsrc/c128/joy/c128-stdjoy.s
+++ b/libsrc/c128/joy/c128-stdjoy.s
@@ -57,8 +57,9 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c128/mou/c128-1351.s b/libsrc/c128/mou/c128-1351.s
index 79ccbe0de..76e28d9f7 100644
--- a/libsrc/c128/mou/c128-1351.s
+++ b/libsrc/c128/mou/c128-1351.s
@@ -194,9 +194,10 @@ INSTALL:
         sta     (ptr3),y
         cli
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
diff --git a/libsrc/c128/mou/c128-inkwell.s b/libsrc/c128/mou/c128-inkwell.s
index b8e71bbb1..2aac7d32d 100644
--- a/libsrc/c128/mou/c128-inkwell.s
+++ b/libsrc/c128/mou/c128-inkwell.s
@@ -228,9 +228,10 @@ INSTALL:
         jsr     MoveX
         cli
 
-; Done, return zero.
+; Done
 
         lda     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         tax
         rts
 
diff --git a/libsrc/c128/mou/c128-joy.s b/libsrc/c128/mou/c128-joy.s
index 065674dc0..d809db526 100644
--- a/libsrc/c128/mou/c128-joy.s
+++ b/libsrc/c128/mou/c128-joy.s
@@ -195,9 +195,10 @@ INSTALL:
         sta     (ptr3),y
         cli
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
diff --git a/libsrc/c128/mou/c128-pot.s b/libsrc/c128/mou/c128-pot.s
index e582d64fb..1cbe4aa18 100644
--- a/libsrc/c128/mou/c128-pot.s
+++ b/libsrc/c128/mou/c128-pot.s
@@ -195,9 +195,10 @@ INSTALL:
         sta     (ptr3),y
         cli
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
diff --git a/libsrc/c128/ser/c128-swlink.s b/libsrc/c128/ser/c128-swlink.s
index 3337e2668..7d36eb5bc 100644
--- a/libsrc/c128/ser/c128-swlink.s
+++ b/libsrc/c128/ser/c128-swlink.s
@@ -187,8 +187,9 @@ SetNMI: sta     NMIVec
 
 ; Done, return an error code
 
-        lda     #<SER_ERR_OK
-        tax                     ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -264,22 +265,23 @@ SER_OPEN:
 
 ; Done
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ; Invalid parameter
 
 InvParam:
-        lda     #<SER_ERR_INIT_FAILED
-        ldx     #>SER_ERR_INIT_FAILED
+        lda     #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
 ; Baud rate not available
 
 InvBaud:
-        lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+        lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -300,8 +302,9 @@ SER_CLOSE:
 
 ; Return OK
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -322,8 +325,8 @@ SER_GET:
 @L1:    lda     RecvFreeCnt             ; (25)
         cmp     #$ff
         bne     @L2
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 
 ; Check for flow stopped & enough free: release flow control
@@ -370,7 +373,7 @@ SER_PUT:
 
 @L2:    ldx     SendFreeCnt
         bne     @L3
-        lda     #<SER_ERR_OVERFLOW      ; X is already zero
+        lda     #SER_ERR_OVERFLOW       ; X is already zero
         rts
 
 @L3:    ldx     SendTail
@@ -379,7 +382,8 @@ SER_PUT:
         dec     SendFreeCnt
         lda     #$ff
         jsr     TryToSend
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -392,7 +396,8 @@ SER_STATUS:
         lda     ACIA_STATUS
         ldx     #0
         sta     (ptr1,x)
-        txa                             ; SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        txa
         rts
 
 ;----------------------------------------------------------------------------
@@ -402,8 +407,8 @@ SER_STATUS:
 ;
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL      ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/c16/emd/c16-ram.s b/libsrc/c16/emd/c16-ram.s
index a8083aca4..937019974 100644
--- a/libsrc/c16/emd/c16-ram.s
+++ b/libsrc/c16/emd/c16-ram.s
@@ -77,12 +77,13 @@ INSTALL:
 
         ldx     #$FF
         stx     curpage                 ; Invalidate the current page
-        inx                             ; X = 0
-        txa                             ; A = X = EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        inx
+        txa
         rts
 
-nomem:  ldx     #>EM_ERR_NO_DEVICE
-        lda     #<EM_ERR_NO_DEVICE
+nomem:  ldx     #EM_ERR_NO_DEVICE
+        lda     #0 ; return value is char
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-65816.s b/libsrc/c64/emd/c64-65816.s
index 39f323d28..ce9491fbe 100644
--- a/libsrc/c64/emd/c64-65816.s
+++ b/libsrc/c64/emd/c64-65816.s
@@ -120,13 +120,14 @@ INSTALL:
         dex
 @noextradex:
         stx     bankcount
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 @not_present:
         cli
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
 ;       rts                             ; Run into UNINSTALL instead
 
 
diff --git a/libsrc/c64/emd/c64-c256k.s b/libsrc/c64/emd/c64-c256k.s
index 79706e8fb..5a4bc54c3 100644
--- a/libsrc/c64/emd/c64-c256k.s
+++ b/libsrc/c64/emd/c64-c256k.s
@@ -158,13 +158,14 @@ INSTALL:
         jsr     restore_data
         cpy     #$01
         beq     @present
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @present:
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-dqbb.s b/libsrc/c64/emd/c64-dqbb.s
index 986c5939d..6a63b3baa 100644
--- a/libsrc/c64/emd/c64-dqbb.s
+++ b/libsrc/c64/emd/c64-dqbb.s
@@ -147,13 +147,14 @@ INSTALL:
         jsr     restore_data
         cpy     #$01
         beq     @present
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @present:
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-georam.s b/libsrc/c64/emd/c64-georam.s
index 97f1a7cc4..0116fe8ea 100644
--- a/libsrc/c64/emd/c64-georam.s
+++ b/libsrc/c64/emd/c64-georam.s
@@ -121,16 +121,17 @@ INSTALL:
         bne     @setok
 
 @notpresent:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 @setok:
         lda     #0
         sta     pagecount
         stx     pagecount+1
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 check:
diff --git a/libsrc/c64/emd/c64-isepic.s b/libsrc/c64/emd/c64-isepic.s
index 3764443e2..2b7949757 100644
--- a/libsrc/c64/emd/c64-isepic.s
+++ b/libsrc/c64/emd/c64-isepic.s
@@ -76,13 +76,14 @@ INSTALL:
         beq     @setok
 
 @notpresent:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @setok:
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-kerberos.s b/libsrc/c64/emd/c64-kerberos.s
index 30183362f..20be4e409 100644
--- a/libsrc/c64/emd/c64-kerberos.s
+++ b/libsrc/c64/emd/c64-kerberos.s
@@ -82,13 +82,14 @@ INSTALL:
         cmp     #$AA
         bne     @notpresent
 
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 @notpresent:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         ; use rts from UNINSTALL below
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-ram.s b/libsrc/c64/emd/c64-ram.s
index 5355b552d..cdd7b8965 100644
--- a/libsrc/c64/emd/c64-ram.s
+++ b/libsrc/c64/emd/c64-ram.s
@@ -65,8 +65,9 @@ window:         .res    256             ; Memory "window"
 INSTALL:
         ldx     #$FF
         stx     curpage                 ; Invalidate the current page
-        inx                             ; X = 0
-        txa                             ; A = X = EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        inx
+        txa
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-ramcart.s b/libsrc/c64/emd/c64-ramcart.s
index 8998bb6d6..a99f25b4f 100644
--- a/libsrc/c64/emd/c64-ramcart.s
+++ b/libsrc/c64/emd/c64-ramcart.s
@@ -98,13 +98,13 @@ INSTALL:
         lda     #0
         sta     pagecount
         stx     pagecount+1
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 @notpresent:
 @readonly:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-reu.s b/libsrc/c64/emd/c64-reu.s
index 07ac1fbed..832e66f51 100644
--- a/libsrc/c64/emd/c64-reu.s
+++ b/libsrc/c64/emd/c64-reu.s
@@ -127,8 +127,9 @@ size_found:
 pagecount_ok:
         stx     pagecount
         sty     pagecount+1
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 ; common REU setup for size check
@@ -152,6 +153,7 @@ reu_size_check_common:
 
 nodevice:
         lda     #EM_ERR_NO_DEVICE
+        .assert EM_ERR_OK = 0, error
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/emd/c64-vdc.s b/libsrc/c64/emd/c64-vdc.s
index 2448f09d4..60fbccbbf 100644
--- a/libsrc/c64/emd/c64-vdc.s
+++ b/libsrc/c64/emd/c64-vdc.s
@@ -87,8 +87,8 @@ INSTALL:
         bne     @L0
         iny
         bne     @L0
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+;       ldx     #0 ; return value is char
         rts
 
 @present:
@@ -131,8 +131,9 @@ INSTALL:
         sta     pagecount
         stx     pagecount+1
 @endok:
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 test64k:
diff --git a/libsrc/c64/emd/dtv-himem.s b/libsrc/c64/emd/dtv-himem.s
index 6dde874f7..4d19b19d5 100644
--- a/libsrc/c64/emd/dtv-himem.s
+++ b/libsrc/c64/emd/dtv-himem.s
@@ -93,15 +93,16 @@ INSTALL:
 
 ; DTV not found
 
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @present:
         ldx     #$FF
         stx     curpage+1               ; Invalidate curpage
-        inx                             ; X = 0
-        txa                             ; A/X = EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        inx
+        txa
 
 ;       rts                             ; Run into UNINSTALL instead
 
diff --git a/libsrc/c64/joy/c64-hitjoy.s b/libsrc/c64/joy/c64-hitjoy.s
index 3b4a0b909..a9d454fd0 100644
--- a/libsrc/c64/joy/c64-hitjoy.s
+++ b/libsrc/c64/joy/c64-hitjoy.s
@@ -59,8 +59,9 @@ temp4:  .byte 0
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 
 ;       rts             ; Run into UNINSTALL instead
 
diff --git a/libsrc/c64/joy/c64-numpad.s b/libsrc/c64/joy/c64-numpad.s
index 0ccdc4fcd..f6839d6cf 100644
--- a/libsrc/c64/joy/c64-numpad.s
+++ b/libsrc/c64/joy/c64-numpad.s
@@ -100,12 +100,14 @@ masktable:
 ;
 
 INSTALL:
-        lda     #JOY_ERR_OK             ; Assume we have a joystick
-        ldx     VIC_CLK_128             ; Test for a C128
-        cpx     #$FF
+        lda     #JOY_ERR_OK             ; Assume we have a "joystick"
+        .assert JOY_ERR_OK = 0, error
+        tax                             ; Set high byte
+        ldy     VIC_CLK_128             ; Test for a C128
+        cpy     #$FF
         bne     @C128                   ; Jump if we have one
         lda     #JOY_ERR_NO_DEVICE      ; No C128 -> no numpad
-@C128:  ldx     #0                      ; Set high byte
+@C128:
 
 ;       rts                     ; Run into UNINSTALL instead
 
diff --git a/libsrc/c64/joy/c64-ptvjoy.s b/libsrc/c64/joy/c64-ptvjoy.s
index a772fb5f6..30466b2c2 100644
--- a/libsrc/c64/joy/c64-ptvjoy.s
+++ b/libsrc/c64/joy/c64-ptvjoy.s
@@ -52,8 +52,9 @@ JOY_COUNT       = 4             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/c64/joy/c64-stdjoy.s b/libsrc/c64/joy/c64-stdjoy.s
index d11093fba..511032507 100644
--- a/libsrc/c64/joy/c64-stdjoy.s
+++ b/libsrc/c64/joy/c64-stdjoy.s
@@ -56,8 +56,9 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 
 ;       rts                     ; Run into UNINSTALL instead
 
diff --git a/libsrc/c64/mou/c64-1351.s b/libsrc/c64/mou/c64-1351.s
index a7d042c7b..ce0f18803 100644
--- a/libsrc/c64/mou/c64-1351.s
+++ b/libsrc/c64/mou/c64-1351.s
@@ -152,9 +152,10 @@ INSTALL:
         jsr     CMOVEY
         cli
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
@@ -307,8 +308,8 @@ INFO:   jsr     POS
 ; Must return an error code in a/x.
 ;
 
-IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>MOUSE_ERR_INV_IOCTL
+IOCTL:  lda     #MOUSE_ERR_INV_IOCTL    ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/c64/mou/c64-inkwell.s b/libsrc/c64/mou/c64-inkwell.s
index 9c876a7c8..d2f14a6f0 100644
--- a/libsrc/c64/mou/c64-inkwell.s
+++ b/libsrc/c64/mou/c64-inkwell.s
@@ -168,6 +168,7 @@ INSTALL:
 ; Done, return zero.
 
         lda     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         tax
         rts
 
@@ -319,8 +320,8 @@ INFO:   jsr     POS
 ; Must return an error code in .XA.
 ;
 
-IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL     ; We don't support ioctls, for now
-        ldx     #>MOUSE_ERR_INV_IOCTL
+IOCTL:  lda     #MOUSE_ERR_INV_IOCTL    ; We don't support ioctls, for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/c64/mou/c64-joy.s b/libsrc/c64/mou/c64-joy.s
index f2a501000..5ee1b4f84 100644
--- a/libsrc/c64/mou/c64-joy.s
+++ b/libsrc/c64/mou/c64-joy.s
@@ -156,9 +156,10 @@ INSTALL:
         jsr     CMOVEY
         cli
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
@@ -312,8 +313,8 @@ INFO:   jsr     POS
 ; Must return an error code in a/x.
 ;
 
-IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>MOUSE_ERR_INV_IOCTL
+IOCTL:  lda     #MOUSE_ERR_INV_IOCTL    ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/c64/mou/c64-pot.s b/libsrc/c64/mou/c64-pot.s
index 102ca351c..9bdf24f62 100644
--- a/libsrc/c64/mou/c64-pot.s
+++ b/libsrc/c64/mou/c64-pot.s
@@ -139,9 +139,10 @@ INSTALL:
         jsr     CMOVEY
         cli
 
-; Done, return zero (= MOUSE_ERR_OK)
+; Done
 
-        ldx     #$00
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
@@ -297,8 +298,8 @@ INFO:   jsr     POS
 ; Must return an error code in a/x.
 ;
 
-IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>MOUSE_ERR_INV_IOCTL
+IOCTL:  lda     #MOUSE_ERR_INV_IOCTL    ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/c64/ser/c64-swlink.s b/libsrc/c64/ser/c64-swlink.s
index 597cf1dd6..81c9916a6 100644
--- a/libsrc/c64/ser/c64-swlink.s
+++ b/libsrc/c64/ser/c64-swlink.s
@@ -161,8 +161,9 @@ SetNMI: sta     NMIVec
 
 ; Done, return an error code
 
-        lda     #<SER_ERR_OK
-        tax                     ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -238,22 +239,23 @@ SER_OPEN:
 
 ; Done
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ; Invalid parameter
 
 InvParam:
-        lda     #<SER_ERR_INIT_FAILED
-        ldx     #>SER_ERR_INIT_FAILED
+        lda     #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
 ; Baud rate not available
 
 InvBaud:
-        lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+        lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -274,8 +276,9 @@ SER_CLOSE:
 
 ; Return OK
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -296,8 +299,8 @@ SER_GET:
 @L1:    lda     RecvFreeCnt             ; (25)
         cmp     #$ff
         bne     @L2
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 
 ; Check for flow stopped & enough free: release flow control
@@ -344,7 +347,7 @@ SER_PUT:
 
 @L2:    ldx     SendFreeCnt
         bne     @L3
-        lda     #<SER_ERR_OVERFLOW      ; X is already zero
+        lda     #SER_ERR_OVERFLOW      ; X is already zero
         rts
 
 @L3:    ldx     SendTail
@@ -353,7 +356,8 @@ SER_PUT:
         dec     SendFreeCnt
         lda     #$ff
         jsr     TryToSend
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -366,7 +370,8 @@ SER_STATUS:
         lda     ACIA_STATUS
         ldx     #0
         sta     (ptr1,x)
-        txa                             ; SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        txa
         rts
 
 ;----------------------------------------------------------------------------
@@ -376,8 +381,8 @@ SER_STATUS:
 ;
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL      ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/cbm510/emd/cbm510-ram.s b/libsrc/cbm510/emd/cbm510-ram.s
index f724c7360..6cc319b7f 100644
--- a/libsrc/cbm510/emd/cbm510-ram.s
+++ b/libsrc/cbm510/emd/cbm510-ram.s
@@ -81,8 +81,9 @@ INSTALL:
         sbc     #$00
         sta     pagecount
 
-@L1:    lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+@L1:    lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/cbm510/joy/cbm510-std.s b/libsrc/cbm510/joy/cbm510-std.s
index 4e47fc1a0..f7cbb2cdc 100644
--- a/libsrc/cbm510/joy/cbm510-std.s
+++ b/libsrc/cbm510/joy/cbm510-std.s
@@ -57,8 +57,9 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/cbm510/mou/cbm510-inkwl.s b/libsrc/cbm510/mou/cbm510-inkwl.s
index 91bc52fcd..ea6d95934 100644
--- a/libsrc/cbm510/mou/cbm510-inkwl.s
+++ b/libsrc/cbm510/mou/cbm510-inkwl.s
@@ -175,6 +175,7 @@ INSTALL:
 ; Done, return zero.
 
         lda     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         tax
         rts
 
@@ -331,8 +332,8 @@ INFO:   jsr     POS
 ; Must return an error code in .XA.
 ;
 
-IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL     ; We don't support ioctls, for now
-        ldx     #>MOUSE_ERR_INV_IOCTL
+IOCTL:  lda     #MOUSE_ERR_INV_IOCTL     ; We don't support ioctls, for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/cbm510/mou/cbm510-joy.s b/libsrc/cbm510/mou/cbm510-joy.s
index 8aa3a778e..4daa49272 100644
--- a/libsrc/cbm510/mou/cbm510-joy.s
+++ b/libsrc/cbm510/mou/cbm510-joy.s
@@ -140,7 +140,8 @@ INSTALL:
 
 ; Done, return zero.
 
-        ldx     #>MOUSE_ERR_OK
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
@@ -315,8 +316,8 @@ POS:    ldy     #MOUSE_POS::XCOORD      ; Structure offset
 ; Must return an error code in .XA.
 ;
 
-IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL   ; We don't support ioctls, for now
-        ldx     #>MOUSE_ERR_INV_IOCTL
+IOCTL:  lda     #MOUSE_ERR_INV_IOCTL    ; We don't support ioctls, for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/cbm510/ser/cbm510-std.s b/libsrc/cbm510/ser/cbm510-std.s
index 64f613cd5..cc58c1233 100644
--- a/libsrc/cbm510/ser/cbm510-std.s
+++ b/libsrc/cbm510/ser/cbm510-std.s
@@ -148,8 +148,9 @@ SER_CLOSE:
 
 ; Done, return an error code
 
-        lda     #<SER_ERR_OK
-        tax                     ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -217,22 +218,23 @@ SER_OPEN:
 
 ; Done
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ; Invalid parameter
 
 InvParam:
-        lda     #<SER_ERR_INIT_FAILED
-        ldx     #>SER_ERR_INIT_FAILED
+        lda     #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
 ; Baud rate not available
 
 InvBaud:
-        lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+        lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -253,8 +255,8 @@ SER_GET:
 @L1:    lda     RecvFreeCnt
         cmp     #$ff
         bne     @L2
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 
 ; Check for flow stopped & enough free: release flow control
@@ -301,7 +303,7 @@ SER_PUT:
 
 @L2:    ldx     SendFreeCnt
         bne     @L3
-        lda     #<SER_ERR_OVERFLOW      ; X is already zero
+        lda     #SER_ERR_OVERFLOW      ; X is already zero
         rts
 
 @L3:    ldx     SendTail
@@ -310,7 +312,8 @@ SER_PUT:
         dec     SendFreeCnt
         lda     #$ff
         jsr     TryToSend
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -328,7 +331,8 @@ SER_STATUS:
         sta     (ptr1,x)
         lda     IndReg
         sta     ExecReg
-        txa                             ; SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        txa
         rts
 
 ;----------------------------------------------------------------------------
@@ -338,8 +342,8 @@ SER_STATUS:
 ;
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL      ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/cbm610/emd/cbm610-ram.s b/libsrc/cbm610/emd/cbm610-ram.s
index 5c67df7a4..5aa43b0c2 100644
--- a/libsrc/cbm610/emd/cbm610-ram.s
+++ b/libsrc/cbm610/emd/cbm610-ram.s
@@ -81,8 +81,9 @@ INSTALL:
         sbc     #$00
         sta     pagecount
 
-@L1:    lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+@L1:    lda     #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/cbm610/ser/cbm610-std.s b/libsrc/cbm610/ser/cbm610-std.s
index 7cdb285bd..f7ddde935 100644
--- a/libsrc/cbm610/ser/cbm610-std.s
+++ b/libsrc/cbm610/ser/cbm610-std.s
@@ -149,8 +149,9 @@ SER_CLOSE:
 
 ; Done, return an error code
 
-        lda     #<SER_ERR_OK
-        tax                     ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -218,22 +219,23 @@ SER_OPEN:
 
 ; Done
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ; Invalid parameter
 
 InvParam:
-        lda     #<SER_ERR_INIT_FAILED
-        ldx     #>SER_ERR_INIT_FAILED
+        lda     #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
 ; Baud rate not available
 
 InvBaud:
-        lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+        lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -254,8 +256,8 @@ SER_GET:
 @L1:    lda     RecvFreeCnt
         cmp     #$ff
         bne     @L2
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 
 ; Check for flow stopped & enough free: release flow control
@@ -302,7 +304,7 @@ SER_PUT:
 
 @L2:    ldx     SendFreeCnt
         bne     @L3
-        lda     #<SER_ERR_OVERFLOW      ; X is already zero
+        lda     #SER_ERR_OVERFLOW      ; X is already zero
         rts
 
 @L3:    ldx     SendTail
@@ -311,7 +313,8 @@ SER_PUT:
         dec     SendFreeCnt
         lda     #$ff
         jsr     TryToSend
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -339,8 +342,8 @@ SER_STATUS:
 ;
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL      ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/creativision/joy/creativision-stdjoy.s b/libsrc/creativision/joy/creativision-stdjoy.s
index 73b0c249f..43f9a2b40 100644
--- a/libsrc/creativision/joy/creativision-stdjoy.s
+++ b/libsrc/creativision/joy/creativision-stdjoy.s
@@ -59,7 +59,8 @@ JOY_RIGHT       =       $08
 ;
 
 INSTALL:        lda     #JOY_ERR_OK
-                ldx     #>$0000
+                .assert JOY_ERR_OK = 0, error
+                tax
 ;               rts                             ; Fall through
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/cx16/joy/cx16-std.s b/libsrc/cx16/joy/cx16-std.s
index a40fcb061..5def55511 100644
--- a/libsrc/cx16/joy/cx16-std.s
+++ b/libsrc/cx16/joy/cx16-std.s
@@ -55,8 +55,9 @@ JOY_COUNT       = $05           ; Number of joysticks we support
 ; Must return a JOY_ERR_xx code in .XA .
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/cx16/mou/cx16-std.s b/libsrc/cx16/mou/cx16-std.s
index 3af7d2eb3..f211815de 100644
--- a/libsrc/cx16/mou/cx16-std.s
+++ b/libsrc/cx16/mou/cx16-std.s
@@ -139,7 +139,8 @@ INSTALL:
 
 ; Done, return zero
 
-        ldx     #>MOUSE_ERR_OK
+        ldx     #MOUSE_ERR_OK
+        .assert MOUSE_ERR_OK = 0, error
         txa
         rts
 
@@ -300,8 +301,8 @@ INFO:   jsr     BUTTONS                 ; Will not touch ptr1
 ; specific data in ptr1, and the ioctl code in A.
 ; Must return an error code in .XA .
 
-IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL   ; We don't support ioctls, for now
-        ldx     #>MOUSE_ERR_INV_IOCTL
+IOCTL:  lda     #MOUSE_ERR_INV_IOCTL    ; We don't support ioctls, for now
+        ldx     #0 ; return value is char
 ;       rts                             ; Fall through
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/gamate/joy/gamate-stdjoy.s b/libsrc/gamate/joy/gamate-stdjoy.s
index 8f927cdf5..514f92db4 100644
--- a/libsrc/gamate/joy/gamate-stdjoy.s
+++ b/libsrc/gamate/joy/gamate-stdjoy.s
@@ -47,8 +47,9 @@ JOY_COUNT       = 1             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 
 ;        rts                     ; Run into UNINSTALL instead
 
diff --git a/libsrc/geos-cbm/emd/geos-vdc.s b/libsrc/geos-cbm/emd/geos-vdc.s
index 27316e1a0..2e7d19c03 100644
--- a/libsrc/geos-cbm/emd/geos-vdc.s
+++ b/libsrc/geos-cbm/emd/geos-vdc.s
@@ -125,8 +125,9 @@ INSTALL:
         pla
         sta $01
         plp
-        lda #<EM_ERR_OK
-        ldx #>EM_ERR_OK
+        lda #EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 test64k:
diff --git a/libsrc/geos-cbm/joy/geos-stdjoy.s b/libsrc/geos-cbm/joy/geos-stdjoy.s
index 2787cb594..a3fd4ffc8 100644
--- a/libsrc/geos-cbm/joy/geos-stdjoy.s
+++ b/libsrc/geos-cbm/joy/geos-stdjoy.s
@@ -53,8 +53,9 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda #<JOY_ERR_OK
-        ldx #>JOY_ERR_OK
+        lda #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/joystick/joy_unload.s b/libsrc/joystick/joy_unload.s
index 25d54ff02..f52b7a2c1 100644
--- a/libsrc/joystick/joy_unload.s
+++ b/libsrc/joystick/joy_unload.s
@@ -10,7 +10,7 @@
         .include        "modload.inc"
 
         .import         joy_clear_ptr
-        .import         return0
+        .import         return0, return1
 
 
 
@@ -31,7 +31,6 @@ _joy_unload:
         jmp     return0                 ; Return JOY_ERR_OK
 
 no_driver:
-        tax                             ; X = 0
         pla                             ; Remove pushed junk
-        lda     #JOY_ERR_NO_DRIVER
-        rts
+        .assert JOY_ERR_NO_DRIVER = 1, error
+        jmp     return1                 ; Return JOY_ERR_NO_DRIVER
diff --git a/libsrc/lynx/joy/lynx-stdjoy.s b/libsrc/lynx/joy/lynx-stdjoy.s
index c81a97dbf..45eb8ab4e 100644
--- a/libsrc/lynx/joy/lynx-stdjoy.s
+++ b/libsrc/lynx/joy/lynx-stdjoy.s
@@ -58,8 +58,9 @@ JOY_COUNT       = 1             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda #<JOY_ERR_OK
-        ldx #>JOY_ERR_OK
+        lda #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/lynx/ser/lynx-comlynx.s b/libsrc/lynx/ser/lynx-comlynx.s
index ded862eaa..8aa3c838e 100644
--- a/libsrc/lynx/ser/lynx-comlynx.s
+++ b/libsrc/lynx/ser/lynx-comlynx.s
@@ -75,8 +75,9 @@ SER_UNINSTALL:
 SER_CLOSE:
         ; Disable interrupts
         ; Done, return an error code
-        lda     #<SER_ERR_OK
-        ldx     #>SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -190,8 +191,8 @@ SER_OPEN:
         cmp     #SER_BAUD_134_5
         beq     setbaudrate
 
-        lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+        lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
         rts
 setprescaler:
         stx     TIM4CTLA
@@ -238,12 +239,13 @@ checkhs:
         lda     contrl
         ora     #RxIntEnable|ResetErr
         sta     SERCTL
-        lda     #<SER_ERR_OK
-        ldx     #>SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 invparameter:
-        lda     #<SER_ERR_INIT_FAILED
-        ldx     #>SER_ERR_INIT_FAILED
+        lda     #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -255,8 +257,8 @@ SER_GET:
         lda     RxPtrIn
         cmp     RxPtrOut
         bne     GetByte
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 GetByte:
         ldy     RxPtrOut
@@ -277,8 +279,8 @@ SER_PUT:
         ina
         cmp     TxPtrOut
         bne     PutByte
-        lda     #<SER_ERR_OVERFLOW
-        ldx     #>SER_ERR_OVERFLOW
+        lda     #SER_ERR_OVERFLOW
+        ldx     #0 ; return value is char
         rts
 PutByte:
         ldy     TxPtrIn
@@ -296,7 +298,8 @@ PutByte:
         sta     TxDone
         plp
 @L1:
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -317,8 +320,8 @@ SER_STATUS:
 ; Must return an SER_ERR_xx code in a/x.
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/mouse/mouse_unload.s b/libsrc/mouse/mouse_unload.s
index 8c9018484..ecd7846ab 100644
--- a/libsrc/mouse/mouse_unload.s
+++ b/libsrc/mouse/mouse_unload.s
@@ -8,7 +8,7 @@
         .include        "mouse-kernel.inc"
         .include        "modload.inc"
 
-        .import         return0
+        .import         return0, return1
 
 
 
@@ -29,7 +29,6 @@ _mouse_unload:
         jmp     return0                 ; Return MOUSE_ERR_OK
 
 no_driver:
-        tax                             ; X = 0
         pla                             ; Remove pushed junk
-        lda     #<MOUSE_ERR_NO_DRIVER
-        rts
+        .assert MOUSE_ERR_NO_DRIVER = 1, error
+        jmp     return1                 ; Return MOUSE_ERR_NO_DRIVER
diff --git a/libsrc/nes/joy/nes-stdjoy.s b/libsrc/nes/joy/nes-stdjoy.s
index 63caf364b..0d0e7d9ac 100644
--- a/libsrc/nes/joy/nes-stdjoy.s
+++ b/libsrc/nes/joy/nes-stdjoy.s
@@ -53,7 +53,8 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 
 INSTALL:
         lda     #JOY_ERR_OK
-        ldx     #0
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/pce/joy/pce-stdjoy.s b/libsrc/pce/joy/pce-stdjoy.s
index 2de3d0c4c..dc8576c87 100644
--- a/libsrc/pce/joy/pce-stdjoy.s
+++ b/libsrc/pce/joy/pce-stdjoy.s
@@ -50,8 +50,9 @@ padbuffer:      .res    JOY_COUNT
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 
 ;        rts                     ; Run into UNINSTALL instead
 
diff --git a/libsrc/pet/joy/pet-ptvjoy.s b/libsrc/pet/joy/pet-ptvjoy.s
index c098072fb..ee14c95c8 100644
--- a/libsrc/pet/joy/pet-ptvjoy.s
+++ b/libsrc/pet/joy/pet-ptvjoy.s
@@ -51,8 +51,9 @@ JOY_COUNT       = 2                     ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/plus4/joy/plus4-stdjoy.s b/libsrc/plus4/joy/plus4-stdjoy.s
index e8e85fedc..86f080dae 100644
--- a/libsrc/plus4/joy/plus4-stdjoy.s
+++ b/libsrc/plus4/joy/plus4-stdjoy.s
@@ -58,8 +58,9 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/plus4/ser/plus4-stdser.s b/libsrc/plus4/ser/plus4-stdser.s
index bb44a4cf9..fbdc61b2e 100644
--- a/libsrc/plus4/ser/plus4-stdser.s
+++ b/libsrc/plus4/ser/plus4-stdser.s
@@ -157,8 +157,9 @@ SER_CLOSE:
 
 ; Done, return an error code
 
-        lda     #<SER_ERR_OK
-        tax                     ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ;----------------------------------------------------------------------------
@@ -225,22 +226,23 @@ SER_OPEN:
 
 ; Done
 
-        lda     #<SER_ERR_OK
-        tax                             ; A is zero
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        tax
         rts
 
 ; Invalid parameter
 
 InvParam:
-        lda     #<SER_ERR_INIT_FAILED
-        ldx     #>SER_ERR_INIT_FAILED
+        lda     #SER_ERR_INIT_FAILED
+        ldx     #0 ; return value is char
         rts
 
 ; Baud rate not available
 
 InvBaud:
-        lda     #<SER_ERR_BAUD_UNAVAIL
-        ldx     #>SER_ERR_BAUD_UNAVAIL
+        lda     #SER_ERR_BAUD_UNAVAIL
+        ldx     #0 ; return value is char
         rts
 
 ;----------------------------------------------------------------------------
@@ -261,8 +263,8 @@ SER_GET:
 @L1:    lda     RecvFreeCnt             ; (25)
         cmp     #$ff
         bne     @L2
-        lda     #<SER_ERR_NO_DATA
-        ldx     #>SER_ERR_NO_DATA
+        lda     #SER_ERR_NO_DATA
+        ldx     #0 ; return value is char
         rts
 
 ; Check for flow stopped & enough free: release flow control
@@ -309,7 +311,7 @@ SER_PUT:
 
 @L2:    ldx     SendFreeCnt
         bne     @L3
-        lda     #<SER_ERR_OVERFLOW      ; X is already zero
+        lda     #SER_ERR_OVERFLOW      ; X is already zero
         rts
 
 @L3:    ldx     SendTail
@@ -318,7 +320,8 @@ SER_PUT:
         dec     SendFreeCnt
         lda     #$ff
         jsr     TryToSend
-        lda     #<SER_ERR_OK
+        lda     #SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
         tax
         rts
 
@@ -331,7 +334,8 @@ SER_STATUS:
         lda     ACIA_STATUS
         ldx     #0
         sta     (ptr1,x)
-        txa                             ; SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        txa
         rts
 
 ;----------------------------------------------------------------------------
@@ -341,8 +345,8 @@ SER_STATUS:
 ;
 
 SER_IOCTL:
-        lda     #<SER_ERR_INV_IOCTL     ; We don't support ioclts for now
-        ldx     #>SER_ERR_INV_IOCTL
+        lda     #SER_ERR_INV_IOCTL      ; We don't support ioclts for now
+        ldx     #0 ; return value is char
         rts                             ; Run into IRQ instead
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/serial/ser_unload.s b/libsrc/serial/ser_unload.s
index bf7201255..7cd0f7125 100644
--- a/libsrc/serial/ser_unload.s
+++ b/libsrc/serial/ser_unload.s
@@ -10,7 +10,7 @@
         .include        "modload.inc"
 
         .import         ser_clear_ptr
-        .import         return0
+        .import         return0, return1
 
 
 
@@ -28,10 +28,10 @@ _ser_unload:
         tax
         pla                             ; Get pointer to driver
         jsr     _mod_free               ; Free the driver
-        jmp     return0                 ; Return SER_ERR_OK
+        .assert SER_ERR_OK = 0, error
+        jmp     return0
 
 no_driver:
-        tax                             ; X = 0
         pla                             ; Remove pushed junk
-        lda     #<SER_ERR_NO_DRIVER
-        rts
+        .assert SER_ERR_NO_DRIVER = 1, error
+        jmp     return1
diff --git a/libsrc/supervision/joy/supervision-stdjoy.s b/libsrc/supervision/joy/supervision-stdjoy.s
index ef790ec0b..2469abf31 100644
--- a/libsrc/supervision/joy/supervision-stdjoy.s
+++ b/libsrc/supervision/joy/supervision-stdjoy.s
@@ -46,8 +46,9 @@ JOY_COUNT       = 1             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 
 ;        rts                     ; Run into UNINSTALL instead
 
diff --git a/libsrc/telestrat/joy/telestrat.s b/libsrc/telestrat/joy/telestrat.s
index 0f5d28651..7472ab187 100644
--- a/libsrc/telestrat/joy/telestrat.s
+++ b/libsrc/telestrat/joy/telestrat.s
@@ -54,8 +54,9 @@ INSTALL:
         sta     VIA2::PRB
         ; We could detect joysticks because with previous command bit0,1,2,3,4 should be set to 1 after
         ; But if some one press fire or press direction, we could reach others values which could break joystick detection.
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/vic20/emd/vic20-georam.s b/libsrc/vic20/emd/vic20-georam.s
index a960e9a1a..4e3121c05 100644
--- a/libsrc/vic20/emd/vic20-georam.s
+++ b/libsrc/vic20/emd/vic20-georam.s
@@ -119,16 +119,16 @@ INSTALL:
         bne     @setok
 
 @notpresent:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
+        lda     #EM_ERR_NO_DEVICE
+        ldx     #0 ; return value is char
         rts
 
 @setok:
         lda     #0
         sta     pagecount
         stx     pagecount+1
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        tax
         rts
 
 check:
diff --git a/libsrc/vic20/emd/vic20-rama.s b/libsrc/vic20/emd/vic20-rama.s
index 133c3974b..4264e2caf 100644
--- a/libsrc/vic20/emd/vic20-rama.s
+++ b/libsrc/vic20/emd/vic20-rama.s
@@ -71,12 +71,13 @@ INSTALL:
 
         ldx     #$FF
         stx     curpage                 ; Invalidate the current page
-        inx                             ; X = 0
-        txa                             ; A = X = EM_ERR_OK
+        .assert EM_ERR_OK = 0, error
+        inx
+        txa
         rts
 
-nomem:  ldx     #>EM_ERR_NO_DEVICE
-        lda     #<EM_ERR_NO_DEVICE
+nomem:  ldx     #0 ; return value is char
+        lda     #EM_ERR_NO_DEVICE
 ;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/vic20/joy/vic20-ptvjoy.s b/libsrc/vic20/joy/vic20-ptvjoy.s
index 496653e9d..c29d1d5ed 100644
--- a/libsrc/vic20/joy/vic20-ptvjoy.s
+++ b/libsrc/vic20/joy/vic20-ptvjoy.s
@@ -53,8 +53,9 @@ JOY_COUNT       = 3             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/vic20/joy/vic20-stdjoy.s b/libsrc/vic20/joy/vic20-stdjoy.s
index ee8dc93d7..b3de8766c 100644
--- a/libsrc/vic20/joy/vic20-stdjoy.s
+++ b/libsrc/vic20/joy/vic20-stdjoy.s
@@ -57,8 +57,9 @@ JOY_COUNT       = 1             ; Number of joysticks we support
 ;
 
 INSTALL:
-        lda     #<JOY_ERR_OK
-        ldx     #>JOY_ERR_OK
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
 ;       rts                     ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------

From 993054c9d300a222e3a7abbf9d7217fa4e47e4b3 Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Wed, 1 Mar 2023 11:58:42 -0500
Subject: [PATCH 28/65] Fix .endmacro not at the start of the line. .ENDMACRO
 error with line number of macro definition start

---
 src/ca65/macro.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 92a0f6e9a..84f0e8bcd 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -364,7 +364,7 @@ static void FreeMacExp (MacExp* E)
 
 
 
-static void MacSkipDef (unsigned Style)
+static void MacSkipDef (unsigned Style, FilePos Pos)
 /* Skip a macro definition */
 {
     if (Style == MAC_STYLE_CLASSIC) {
@@ -375,7 +375,7 @@ static void MacSkipDef (unsigned Style)
         if (CurTok.Tok != TOK_EOF) {
             SkipUntilSep ();
         } else {
-            Error ("'.ENDMACRO' expected");
+            PError (&Pos, "'.ENDMACRO' expected");
         }
     } else {
         /* Skip until end of line */
@@ -391,19 +391,26 @@ void MacDef (unsigned Style)
     Macro* M;
     TokNode* N;
     int HaveParams;
-    int LastTokWasSep = 0;
+
+    /* Remember if we are at the beginning of the line. If the macro name 
+    ** and parameters pass then this will be set, so set it now  */
+    int LastTokWasSep = 1;
+
+    /* Save the position of the start of the macro definition to allow 
+    ** using Perror to display the error if .ENDMACRO isn't found */
+    FilePos Pos = CurTok.Pos;
 
     /* We expect a macro name here */
     if (CurTok.Tok != TOK_IDENT) {
         Error ("Identifier expected");
-        MacSkipDef (Style);
+        MacSkipDef (Style, Pos);
         return;
     } else if (!UbiquitousIdents && FindInstruction (&CurTok.SVal) >= 0) {
         /* The identifier is a name of a 6502 instruction, which is not
         ** allowed if not explicitly enabled.
         */
         Error ("Cannot use an instruction as macro name");
-        MacSkipDef (Style);
+        MacSkipDef (Style, Pos);
         return;
     }
 
@@ -412,7 +419,7 @@ void MacDef (unsigned Style)
         /* Macro is already defined */
         Error ("A macro named '%m%p' is already defined", &CurTok.SVal);
         /* Skip tokens until we reach the final .endmacro */
-        MacSkipDef (Style);
+        MacSkipDef (Style, Pos);
         return;
     }
 
@@ -480,7 +487,6 @@ void MacDef (unsigned Style)
     */
     if (Style == MAC_STYLE_CLASSIC) {
         ConsumeSep ();
-        LastTokWasSep = 1;
     } else if (HaveParams) {
         ConsumeRParen ();
     }
@@ -493,14 +499,14 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, only .endmacro is allowed, but ignore it if it is not at the start of the line */
+            /* In classic macros, only .endmacro is allowed, but do no exit the macro definition if not at the start of a line */
             if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
                 break;
             }
             /* May not have end of file in a macro definition */
             if (CurTok.Tok == TOK_EOF) {
-                Error ("'.ENDMACRO' expected");
+                PError (&Pos, "'.ENDMACRO' expected");
                 goto Done;
             }
         } else {

From 1c60bc50098ac981f05131eb4e85556f0cd0a5be Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Wed, 1 Mar 2023 21:47:50 -0500
Subject: [PATCH 29/65] Fix .endmacro not at the start of the line. Fix style,
 add doc., add tests

---
 doc/ca65.sgml    | 14 +++++++++++++-
 src/ca65/macro.c | 35 ++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index b65d337bb..b19a66a2d 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2522,7 +2522,19 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
 
 <sect1><tt>.ENDMAC, .ENDMACRO</tt><label id=".ENDMACRO"><p>
 
-  Marks the end of a macro definition.
+  Marks the end of a macro definition. Note, <tt>.ENDMACRO</tt> should be on 
+  its own line to successfully end the macro definition. It is possible to use
+  <tt><ref id=".DEFINE" name=".DEFINE"></tt> to create a symbol that references
+  <tt>.ENDMACRO</tt> without ending the macro definition.
+
+  Example:
+
+  <tscreen><verb>
+        .macro  new_mac
+                .define startmac .macro
+                .define endmac .endmacro
+        .endmacro
+  </verb></tscreen>
 
   See: <tt><ref id=".DELMACRO" name=".DELMACRO"></tt>,
        <tt><ref id=".EXITMACRO" name=".EXITMACRO"></tt>,
diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 84f0e8bcd..72436fdec 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -364,7 +364,7 @@ static void FreeMacExp (MacExp* E)
 
 
 
-static void MacSkipDef (unsigned Style, FilePos Pos)
+static void MacSkipDef (unsigned Style)
 /* Skip a macro definition */
 {
     if (Style == MAC_STYLE_CLASSIC) {
@@ -375,7 +375,7 @@ static void MacSkipDef (unsigned Style, FilePos Pos)
         if (CurTok.Tok != TOK_EOF) {
             SkipUntilSep ();
         } else {
-            PError (&Pos, "'.ENDMACRO' expected");
+            Error ("'.ENDMACRO' expected");
         }
     } else {
         /* Skip until end of line */
@@ -390,27 +390,32 @@ void MacDef (unsigned Style)
 {
     Macro* M;
     TokNode* N;
+    FilePos Pos;
     int HaveParams;
+    int LastTokWasSep;
 
-    /* Remember if we are at the beginning of the line. If the macro name 
-    ** and parameters pass then this will be set, so set it now  */
-    int LastTokWasSep = 1;
+    /* For classic macros, remember if we are at the beginning of the line. 
+    ** If the macro name and parameters pass our checks then we will be on a 
+    ** new line, so set it now  
+    */
+    LastTokWasSep = 1;
 
     /* Save the position of the start of the macro definition to allow 
-    ** using Perror to display the error if .ENDMACRO isn't found */
-    FilePos Pos = CurTok.Pos;
+    ** using Perror to display the error if .ENDMACRO isn't found 
+    */
+    Pos = CurTok.Pos;
 
     /* We expect a macro name here */
     if (CurTok.Tok != TOK_IDENT) {
         Error ("Identifier expected");
-        MacSkipDef (Style, Pos);
+        MacSkipDef (Style);
         return;
     } else if (!UbiquitousIdents && FindInstruction (&CurTok.SVal) >= 0) {
         /* The identifier is a name of a 6502 instruction, which is not
         ** allowed if not explicitly enabled.
         */
         Error ("Cannot use an instruction as macro name");
-        MacSkipDef (Style, Pos);
+        MacSkipDef (Style);
         return;
     }
 
@@ -419,7 +424,7 @@ void MacDef (unsigned Style)
         /* Macro is already defined */
         Error ("A macro named '%m%p' is already defined", &CurTok.SVal);
         /* Skip tokens until we reach the final .endmacro */
-        MacSkipDef (Style, Pos);
+        MacSkipDef (Style);
         return;
     }
 
@@ -499,14 +504,16 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, only .endmacro is allowed, but do no exit the macro definition if not at the start of a line */
+            /* In classic macros, if .endmacro is not at the start of the line 
+            ** it will be added to the macro definition instead of closing it. 
+            */
             if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
                 break;
             }
             /* May not have end of file in a macro definition */
             if (CurTok.Tok == TOK_EOF) {
-                PError (&Pos, "'.ENDMACRO' expected");
+                PError (&Pos, "'.ENDMACRO' expected for macro '%m%p'", &M->Name);
                 goto Done;
             }
         } else {
@@ -581,7 +588,9 @@ void MacDef (unsigned Style)
         }
         ++M->TokCount;
 
-        /* Save if last token was a separator to know if .endmacro is valid */
+        /* Save if last token was a separator to know if .endmacro is at 
+        ** the start of a line 
+        */
         LastTokWasSep = TokIsSep(CurTok.Tok);
 
         /* Read the next token */

From 0b71d1cfff0bf3fd7d329701e231fb9b0bbb818a Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Wed, 1 Mar 2023 21:55:14 -0500
Subject: [PATCH 30/65] Fix .endmacro not at the start of the line. Fix last
 commit

---
 doc/ca65.sgml          |  2 +-
 src/ca65/macro.c       | 18 +++++++++---------
 test/asm/err/bug2013.s |  6 ++++++
 test/asm/val/bug2013.s | 30 ++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 test/asm/err/bug2013.s
 create mode 100644 test/asm/val/bug2013.s

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index b19a66a2d..b68acb639 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2522,7 +2522,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
 
 <sect1><tt>.ENDMAC, .ENDMACRO</tt><label id=".ENDMACRO"><p>
 
-  Marks the end of a macro definition. Note, <tt>.ENDMACRO</tt> should be on 
+  Marks the end of a macro definition. Note, <tt>.ENDMACRO</tt> should be on
   its own line to successfully end the macro definition. It is possible to use
   <tt><ref id=".DEFINE" name=".DEFINE"></tt> to create a symbol that references
   <tt>.ENDMACRO</tt> without ending the macro definition.
diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 72436fdec..6e059f421 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -394,14 +394,14 @@ void MacDef (unsigned Style)
     int HaveParams;
     int LastTokWasSep;
 
-    /* For classic macros, remember if we are at the beginning of the line. 
-    ** If the macro name and parameters pass our checks then we will be on a 
-    ** new line, so set it now  
+    /* For classic macros, remember if we are at the beginning of the line.
+    ** If the macro name and parameters pass our checks then we will be on a
+    ** new line, so set it now
     */
     LastTokWasSep = 1;
 
-    /* Save the position of the start of the macro definition to allow 
-    ** using Perror to display the error if .ENDMACRO isn't found 
+    /* Save the position of the start of the macro definition to allow
+    ** using Perror to display the error if .ENDMACRO isn't found
     */
     Pos = CurTok.Pos;
 
@@ -504,8 +504,8 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, if .endmacro is not at the start of the line 
-            ** it will be added to the macro definition instead of closing it. 
+            /* In classic macros, if .endmacro is not at the start of the line
+            ** it will be added to the macro definition instead of closing it.
             */
             if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
@@ -588,8 +588,8 @@ void MacDef (unsigned Style)
         }
         ++M->TokCount;
 
-        /* Save if last token was a separator to know if .endmacro is at 
-        ** the start of a line 
+        /* Save if last token was a separator to know if .endmacro is at
+        ** the start of a line
         */
         LastTokWasSep = TokIsSep(CurTok.Tok);
 
diff --git a/test/asm/err/bug2013.s b/test/asm/err/bug2013.s
new file mode 100644
index 000000000..8907675fb
--- /dev/null
+++ b/test/asm/err/bug2013.s
@@ -0,0 +1,6 @@
+; for PR #2013
+; should produce error output:
+; ... Error: '.ENDMACRO' expected for macro 'test'
+
+.macro test
+    nop .endmacro
diff --git a/test/asm/val/bug2013.s b/test/asm/val/bug2013.s
new file mode 100644
index 000000000..b6e9e37e6
--- /dev/null
+++ b/test/asm/val/bug2013.s
@@ -0,0 +1,30 @@
+; for PR #2013
+    .import _exit
+    .export _main
+
+    ; this macro is invalid, but should not cause an error (if it is never expanded)
+    .macro invalid
+        nop .endmacro
+    .endmacro
+
+    .define temp_endmac .endmacro
+    .macro new_mac
+        .define startmac .macro
+        .define endmac .endmacro
+    temp_endmac
+
+    .undefine temp_endmac
+
+    new_mac
+
+    startmac dex2
+        dex
+        dex
+    endmac
+
+_main:
+    ldx #$02
+    dex2
+    ; x should be zero
+    txa
+    jmp _exit
\ No newline at end of file

From 98d2d9ee4e3d86c1d44d9a1d696d631031cdeffe Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Wed, 1 Mar 2023 21:59:00 -0500
Subject: [PATCH 31/65] Fix .endmacro not at the start of the line. Fix style

---
 test/asm/val/bug2013.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/asm/val/bug2013.s b/test/asm/val/bug2013.s
index b6e9e37e6..cfb8efefb 100644
--- a/test/asm/val/bug2013.s
+++ b/test/asm/val/bug2013.s
@@ -27,4 +27,4 @@ _main:
     dex2
     ; x should be zero
     txa
-    jmp _exit
\ No newline at end of file
+    jmp _exit

From 3f2129894be43d2840c28c5a33cd39c306984c1e Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Thu, 2 Mar 2023 15:12:30 -0500
Subject: [PATCH 32/65] Fix .endmacro not at the start of the line. Rename test
 files.

---
 test/asm/err/{bug2013.s => endmacro.s} | 0
 test/asm/val/{bug2013.s => endmacro.s} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/asm/err/{bug2013.s => endmacro.s} (100%)
 rename test/asm/val/{bug2013.s => endmacro.s} (100%)

diff --git a/test/asm/err/bug2013.s b/test/asm/err/endmacro.s
similarity index 100%
rename from test/asm/err/bug2013.s
rename to test/asm/err/endmacro.s
diff --git a/test/asm/val/bug2013.s b/test/asm/val/endmacro.s
similarity index 100%
rename from test/asm/val/bug2013.s
rename to test/asm/val/endmacro.s

From 90d5f41b377dfe810758c3cfdd0dd42d735a3bc7 Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Thu, 2 Mar 2023 17:26:05 -0500
Subject: [PATCH 33/65] Consistent case for .endmacro in comments

---
 src/ca65/macro.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 6e059f421..d776411be 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -394,14 +394,14 @@ void MacDef (unsigned Style)
     int HaveParams;
     int LastTokWasSep;
 
-    /* For classic macros, remember if we are at the beginning of the line.
-    ** If the macro name and parameters pass our checks then we will be on a
-    ** new line, so set it now
+    /* For classic macros, remember if we are at the beginning of the line. 
+    ** If the macro name and parameters pass our checks then we will be on a 
+    ** new line, so set it now  
     */
     LastTokWasSep = 1;
 
-    /* Save the position of the start of the macro definition to allow
-    ** using Perror to display the error if .ENDMACRO isn't found
+    /* Save the position of the start of the macro definition to allow 
+    ** using Perror to display the error if .endmacro isn't found
     */
     Pos = CurTok.Pos;
 
@@ -504,8 +504,8 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, if .endmacro is not at the start of the line
-            ** it will be added to the macro definition instead of closing it.
+            /* In classic macros, if .endmacro is not at the start of the line 
+            ** it will be added to the macro definition instead of closing it. 
             */
             if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
@@ -588,8 +588,8 @@ void MacDef (unsigned Style)
         }
         ++M->TokCount;
 
-        /* Save if last token was a separator to know if .endmacro is at
-        ** the start of a line
+        /* Save if last token was a separator to know if .endmacro is at 
+        ** the start of a line 
         */
         LastTokWasSep = TokIsSep(CurTok.Tok);
 

From c092f57b73a92b6db55d43a4b4f649059d77bf2e Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Thu, 2 Mar 2023 17:31:55 -0500
Subject: [PATCH 34/65] Consistent case for .endmacro in comments, remove
 trailing spaces

---
 src/ca65/macro.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index d776411be..904c80756 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -394,13 +394,13 @@ void MacDef (unsigned Style)
     int HaveParams;
     int LastTokWasSep;
 
-    /* For classic macros, remember if we are at the beginning of the line. 
-    ** If the macro name and parameters pass our checks then we will be on a 
-    ** new line, so set it now  
+    /* For classic macros, remember if we are at the beginning of the line.
+    ** If the macro name and parameters pass our checks then we will be on a
+    ** new line, so set it now
     */
     LastTokWasSep = 1;
 
-    /* Save the position of the start of the macro definition to allow 
+    /* Save the position of the start of the macro definition to allow
     ** using Perror to display the error if .endmacro isn't found
     */
     Pos = CurTok.Pos;
@@ -504,8 +504,8 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, if .endmacro is not at the start of the line 
-            ** it will be added to the macro definition instead of closing it. 
+            /* In classic macros, if .endmacro is not at the start of the line
+            ** it will be added to the macro definition instead of closing it.
             */
             if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
@@ -588,8 +588,8 @@ void MacDef (unsigned Style)
         }
         ++M->TokCount;
 
-        /* Save if last token was a separator to know if .endmacro is at 
-        ** the start of a line 
+        /* Save if last token was a separator to know if .endmacro is at
+        ** the start of a line
         */
         LastTokWasSep = TokIsSep(CurTok.Tok);
 

From 016b03e3562666db24e5364b8034ad07314a96fc Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:00:38 -0500
Subject: [PATCH 35/65] ca65 jmp (abs) wrap warning only applies to 6502, later
 CPUs do not have this bug

---
 src/ca65/instr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index b72be6711..7cbefaecf 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -1617,11 +1617,12 @@ static void PutJMP (const InsDesc* Ins)
     if (EvalEA (Ins, &A)) {
 
         /* Check for indirect addressing */
-        if (A.AddrModeBit & AM65_ABS_IND) {
+        if (A.AddrModeBit & AM65_ABS_IND && CPU < CPU_65SC02) {
 
             /* Compare the low byte of the expression to 0xFF to check for
             ** a page cross. Be sure to use a copy of the expression otherwise
-            ** things will go weird later.
+            ** things will go weird later. This only affects the 6502 CPU,
+            ** and was corrected in 65C02 and later CPUs in this family.
             */
             ExprNode* E = GenNE (GenByteExpr (CloneExpr (A.Expr)), 0xFF);
 

From 8b818aac673b186a9a1558f1f6dfd7559f056f1f Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 7 Mar 2023 18:42:20 -0500
Subject: [PATCH 36/65] remove trailing space on segment "bytes" warning plural

---
 src/ld65/config.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ld65/config.c b/src/ld65/config.c
index 38b4f96d0..6c1f6ad4c 100644
--- a/src/ld65/config.c
+++ b/src/ld65/config.c
@@ -2043,14 +2043,14 @@ unsigned CfgProcess (void)
                             ++Overflows;
                             if (S->Flags & SF_OFFSET) {
                                 CfgWarning (GetSourcePos (S->LI),
-                                            "Segment '%s' offset is too small in '%s' by %lu byte%c",
+                                            "Segment '%s' offset is too small in '%s' by %lu byte%s",
                                             GetString (S->Name), GetString (M->Name),
-                                            Addr - NewAddr, (Addr - NewAddr == 1) ? ' ' : 's');
+                                            Addr - NewAddr, (Addr - NewAddr == 1) ? "" : "s");
                             } else {
                                 CfgWarning (GetSourcePos (S->LI),
-                                            "Segment '%s' start address is too low in '%s' by %lu byte%c",
+                                            "Segment '%s' start address is too low in '%s' by %lu byte%s",
                                             GetString (S->Name), GetString (M->Name),
-                                            Addr - NewAddr, (Addr - NewAddr == 1) ? ' ' : 's');
+                                            Addr - NewAddr, (Addr - NewAddr == 1) ? "" : "s");
                             }
                         } else {
                             Addr = NewAddr;
@@ -2095,9 +2095,9 @@ unsigned CfgProcess (void)
                 ++Overflows;
                 M->Flags |= MF_OVERFLOW;
                 CfgWarning (GetSourcePos (M->LI),
-                            "Segment '%s' overflows memory area '%s' by %lu byte%c",
+                            "Segment '%s' overflows memory area '%s' by %lu byte%s",
                             GetString (S->Name), GetString (M->Name),
-                            FillLevel - M->Size, (FillLevel - M->Size == 1) ? ' ' : 's');
+                            FillLevel - M->Size, (FillLevel - M->Size == 1) ? "" : "s");
             }
             if (FillLevel > M->FillLevel) {
                 /* Regular segments increase FillLevel. Overwrite segments may increase but not decrease FillLevel. */

From 4732e937ad0aee2bdc2f693861e67eab263e6880 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 7 Mar 2023 18:44:56 -0500
Subject: [PATCH 37/65] overwrite segment tests asm/listing linker CFG support
 asm and asm/listing test documentation

---
 test/asm/listing/200-overwrite.cfg            |  20 ++++++++
 test/asm/listing/200-overwrite.s              |  29 +++++++++++
 test/asm/listing/201-overwrite-overflow.cfg   |  12 +++++
 test/asm/listing/201-overwrite-overflow.s     |  13 +++++
 test/asm/listing/Makefile                     |  16 ++++++
 .../control/201-overwrite-overflow.err        |   0
 test/asm/listing/readme.txt                   |   2 +
 test/asm/listing/ref/200-overwrite.bin-ref    | Bin 0 -> 30 bytes
 .../ref/201-overwrite-overflow.ld65err2-ref   |   3 ++
 test/asm/readme.txt                           |  46 ++++++++++--------
 10 files changed, 121 insertions(+), 20 deletions(-)
 create mode 100644 test/asm/listing/200-overwrite.cfg
 create mode 100644 test/asm/listing/200-overwrite.s
 create mode 100644 test/asm/listing/201-overwrite-overflow.cfg
 create mode 100644 test/asm/listing/201-overwrite-overflow.s
 create mode 100644 test/asm/listing/control/201-overwrite-overflow.err
 create mode 100644 test/asm/listing/ref/200-overwrite.bin-ref
 create mode 100644 test/asm/listing/ref/201-overwrite-overflow.ld65err2-ref

diff --git a/test/asm/listing/200-overwrite.cfg b/test/asm/listing/200-overwrite.cfg
new file mode 100644
index 000000000..b7b2fee49
--- /dev/null
+++ b/test/asm/listing/200-overwrite.cfg
@@ -0,0 +1,20 @@
+MEMORY
+{
+    A: start = 0, size = 8, file = %O, fill = yes, fillval = $33;
+    B: start = 8, size = 8, file = %O, fill = yes, fillval = $44;
+    C: start = 0, size = 8, file = %O, fill = yes, fillval = $55;
+    D: start = 8, size = 8, file = %O, fill = no,  fillval = $66;
+}
+SEGMENTS
+{
+    A:  load = A, type = ro;
+    B:  load = B, type = ro;
+    C0: load = C, type = ro;
+    C1: load = C, type = ro, start = 5;
+    D:  load = D, type = ro;
+
+    AO: load = A, type = overwrite, start = 4;
+    BO: load = B, type = overwrite, start = 8+5;
+    CO: load = C, type = overwrite, start = 2;
+    DO: load = D, type = overwrite, start = 8+4;
+}
diff --git a/test/asm/listing/200-overwrite.s b/test/asm/listing/200-overwrite.s
new file mode 100644
index 000000000..cd2349c6a
--- /dev/null
+++ b/test/asm/listing/200-overwrite.s
@@ -0,0 +1,29 @@
+; verification of overwrite segment feature
+; See: https://github.com/cc65/cc65/issues/1366
+
+; A: full memory area which is overwritten to the end
+.segment "A"
+.byte 0,1,2,3,4,5,6,7
+.segment "AO"
+.byte $24,$25,$26,$27
+
+; B: incomplete memory area overwritten in the fill area
+.segment "B"
+.byte 0,1,2
+.segment "BO"
+.byte $25,$26
+
+; C: memory area with gap overwritten across the gap
+.segment "C0"
+.byte 0,1,2
+.segment "C1"
+.byte 5,6,7
+.segment "CO"
+.byte $22,$23,$24,$25
+
+; D: incomplete memory area without fill,
+;    but overwrite extends past existing segments
+.segment "D"
+.byte 0,1,2
+.segment "DO"
+.byte $24,$25
diff --git a/test/asm/listing/201-overwrite-overflow.cfg b/test/asm/listing/201-overwrite-overflow.cfg
new file mode 100644
index 000000000..cada57d5a
--- /dev/null
+++ b/test/asm/listing/201-overwrite-overflow.cfg
@@ -0,0 +1,12 @@
+MEMORY
+{
+    A: start = 0, size = 8, file = %O, fill = yes, fillval = $33;
+    B: start = 8, size = 8, file = %O, fill = yes, fillval = $44;
+}
+SEGMENTS
+{
+    A:  load = A, type = ro;
+    B:  load = B, type = ro;
+    AO: load = A, type = overwrite, start = 6;
+    BO: load = B, type = overwrite, start = 8+6;
+}
diff --git a/test/asm/listing/201-overwrite-overflow.s b/test/asm/listing/201-overwrite-overflow.s
new file mode 100644
index 000000000..156388ab5
--- /dev/null
+++ b/test/asm/listing/201-overwrite-overflow.s
@@ -0,0 +1,13 @@
+; verification of overwrite segment overflow cases
+
+; error: overflow past end of A memory area
+.segment "A"
+.byte 0,1,2,3
+.segment "AO"
+.byte $26,$27,$28
+
+; error: overflow past end of B memory area
+.segment "B"
+.byte 0,1,2,3
+.segment "BO"
+.byte $26,$27,$28
diff --git a/test/asm/listing/Makefile b/test/asm/listing/Makefile
index 3c4c404af..204984b64 100644
--- a/test/asm/listing/Makefile
+++ b/test/asm/listing/Makefile
@@ -58,12 +58,20 @@ $(WORKDIR)/$1.bin: $1.s $(ISEQUAL)
 ifeq ($(wildcard control/$1.err),)
 	$(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2> $$(@:.bin=.err2)
 ifeq ($(wildcard control/$1.no-ld65),)
+ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2)
+else
+	$(LD65) -C $$(<:.s=.cfg) -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2)
+endif
 endif
 else
 	$(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2> $$(@:.bin=.err2) || $(TRUE)
 ifeq ($(wildcard control/$1.no-ld65),)
+ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2) || $(TRUE)
+else
+	$(LD65) -C $$(<:.s=.cfg) -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2) || $(TRUE)
+endif
 endif
 endif
 
@@ -117,12 +125,20 @@ endif
 ifeq ($(wildcard control/$1.err),)
 	$(CA65) -t none -l $$(@:.bin=.list-lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2> $$(@:.bin=.list-err2)
 ifeq ($(wildcard control/$1.no-ld65),)
+ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2)
+else
+	$(LD65) -C $$(<:.s=.cfg) -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2)
+endif
 endif
 else
 	$(CA65) -t none -l $$(@:.bin=.list-lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2> $$(@:.bin=.list-err2) || $(TRUE)
 ifeq ($(wildcard control/$1.no-ld65),)
+ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2) || $(TRUE)
+else
+	$(LD65) -C $$(<:.s=.cfg) -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2) || $(TRUE)
+endif
 endif
 endif
 
diff --git a/test/asm/listing/control/201-overwrite-overflow.err b/test/asm/listing/control/201-overwrite-overflow.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/readme.txt b/test/asm/listing/readme.txt
index d6280b954..5436b234a 100644
--- a/test/asm/listing/readme.txt
+++ b/test/asm/listing/readme.txt
@@ -4,6 +4,8 @@ Overall test:
 These testcases can be used to test different aspects of the assembler.
 The name of a test is everything in the form <test>.s.
 
+If a custom linker configuration is needed, also include <test>.cfg. 
+
 The following reference files can be added:
 
 - ref/<test>.bin-ref:
diff --git a/test/asm/listing/ref/200-overwrite.bin-ref b/test/asm/listing/ref/200-overwrite.bin-ref
new file mode 100644
index 0000000000000000000000000000000000000000..b3a6f4f63cbcf5aa6c02e3980227eac3edd378f2
GIT binary patch
literal 30
jcmZQzWMWoPRa0kRWO8v)RdZorR8m$^Wn%~O(^OOeDdYnM

literal 0
HcmV?d00001

diff --git a/test/asm/listing/ref/201-overwrite-overflow.ld65err2-ref b/test/asm/listing/ref/201-overwrite-overflow.ld65err2-ref
new file mode 100644
index 000000000..e372938ef
--- /dev/null
+++ b/test/asm/listing/ref/201-overwrite-overflow.ld65err2-ref
@@ -0,0 +1,3 @@
+ld65: Warning: 201-overwrite-overflow.cfg:3: Segment 'AO' overflows memory area 'A' by 1 byte
+ld65: Warning: 201-overwrite-overflow.cfg:4: Segment 'BO' overflows memory area 'B' by 1 byte
+ld65: Error: Cannot generate most of the files due to memory area overflows
diff --git a/test/asm/readme.txt b/test/asm/readme.txt
index c3198c12a..db7f64504 100644
--- a/test/asm/readme.txt
+++ b/test/asm/readme.txt
@@ -1,32 +1,38 @@
 Assembler Testcases
 ===================
 
-Opcode Tests:
--------------
+cpudetect
+---------
 
-these go into opcodes/. Refer to opcodes/readme.txt
+Tests the --cpu command line option of ca65/ld65.
+Refer to cpudetect/readme.txt
 
 
-CPU Detect Tests
-----------------
+opcodes
+-------
 
-these go into cpudetect/. Refer to cpudetect/readme.txt
+Test of assembler opcodes for each CPU.
+Refer to opcodes/readme.txt
 
 
-Overall tests:
---------------
-
-These go into listing/. Refer to listing/readme.txt
-
-val:
-----
-
-Works very much like the /val directory used to test the compiler -  individual
-tests are run in the simulator and should exit with an exit code of 0 when they
-pass, or either -1 or a number indicating what part of the test failed on error.
-
 err:
 ----
 
-Works very much like the /err directory used to test the compiler - individual
-tests are assembled and MUST NOT assemble without error.
+Used to test assembler errors. These tests MUST NOT assemble without error.
+
+
+listing:
+--------
+
+This is the most versatile assembler test form, allowing control customizations,
+reference tests for binary output, stdout and error text ouput, error tests,
+listings, custom linker configuration, etc. as needed.
+Refer to listing/readme.txt
+
+
+val:
+----
+
+Runtime assembly tests using sim65 that should exit with an exit code of 0 when
+the pass, or either -1 or a number indicating what part of the test failed on
+error.

From 6be7c160133d4315686d49149029149e7106a958 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 7 Mar 2023 18:48:30 -0500
Subject: [PATCH 38/65] linkter test with custom config should not use none.lib

---
 test/asm/listing/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/asm/listing/Makefile b/test/asm/listing/Makefile
index 204984b64..23aa3969c 100644
--- a/test/asm/listing/Makefile
+++ b/test/asm/listing/Makefile
@@ -61,7 +61,7 @@ ifeq ($(wildcard control/$1.no-ld65),)
 ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2)
 else
-	$(LD65) -C $$(<:.s=.cfg) -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2)
+	$(LD65) -C $$(<:.s=.cfg) -o $$@ $$(@:.bin=.o) > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2)
 endif
 endif
 else
@@ -70,7 +70,7 @@ ifeq ($(wildcard control/$1.no-ld65),)
 ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2) || $(TRUE)
 else
-	$(LD65) -C $$(<:.s=.cfg) -o $$@ $$(@:.bin=.o) none.lib > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2) || $(TRUE)
+	$(LD65) -C $$(<:.s=.cfg) -o $$@ $$(@:.bin=.o) > $$(@:.bin=.ld65-err) 2> $$(@:.bin=.ld65-err2) || $(TRUE)
 endif
 endif
 endif
@@ -128,7 +128,7 @@ ifeq ($(wildcard control/$1.no-ld65),)
 ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2)
 else
-	$(LD65) -C $$(<:.s=.cfg) -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2)
+	$(LD65) -C $$(<:.s=.cfg) -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2)
 endif
 endif
 else
@@ -137,7 +137,7 @@ ifeq ($(wildcard control/$1.no-ld65),)
 ifeq ($(wildcard $1.cfg),)
 	$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2) || $(TRUE)
 else
-	$(LD65) -C $$(<:.s=.cfg) -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2) || $(TRUE)
+	$(LD65) -C $$(<:.s=.cfg) -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) > $$(@:.bin=.list-ld65-err) 2> $$(@:.bin=.list-ld65-err2) || $(TRUE)
 endif
 endif
 endif

From 99220f60af8fca4817bde91a9dce8fb20e83e53f Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 7 Mar 2023 18:53:30 -0500
Subject: [PATCH 39/65] test/asm readme val description revision

---
 test/asm/readme.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/asm/readme.txt b/test/asm/readme.txt
index db7f64504..49b530d1c 100644
--- a/test/asm/readme.txt
+++ b/test/asm/readme.txt
@@ -33,6 +33,6 @@ Refer to listing/readme.txt
 val:
 ----
 
-Runtime assembly tests using sim65 that should exit with an exit code of 0 when
-the pass, or either -1 or a number indicating what part of the test failed on
-error.
+Runtime assembly tests using sim65 that should end with an exit code of 0 if
+they pass. If they fail the exit code should be either -1, or a number
+indicating what part of the test failed.

From c8c6fc6a4064efb1a69a99fe75b37cdf5944f60f Mon Sep 17 00:00:00 2001
From: jede <jede@oric.org>
Date: Fri, 17 Mar 2023 23:10:15 +0100
Subject: [PATCH 40/65] add xfseek

---
 asminc/telestrat.inc     |  2 ++
 libsrc/telestrat/lseek.s | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 libsrc/telestrat/lseek.s

diff --git a/asminc/telestrat.inc b/asminc/telestrat.inc
index 682696887..c57bd3de8 100644
--- a/asminc/telestrat.inc
+++ b/asminc/telestrat.inc
@@ -277,6 +277,8 @@ XRECLK           = $3C          ; Reset clock
 XCLCL            = $3D          ; Close clock
 XWRCLK           = $3E          ; Displays clock in the address in A & Y registers
 
+XFSEEK           = $3F          ; Only in Orix
+
 ; Sound primitives
 XSONPS           = $40          ; Send data to PSG register (14 values)
 XOUPS            = $42          ; Send Oups sound into PSG
diff --git a/libsrc/telestrat/lseek.s b/libsrc/telestrat/lseek.s
new file mode 100644
index 000000000..11d1fad33
--- /dev/null
+++ b/libsrc/telestrat/lseek.s
@@ -0,0 +1,39 @@
+;
+; Jede (jede@oric.org), 2023-03-13
+;
+
+; off_t __fastcall__ lseek(int fd, off_t offset, int whence);
+
+        .export         _lseek
+
+        .include        "telestrat.inc"
+        .include        "zeropage.inc"
+
+        .import         popax
+
+.proc _lseek
+        ; Save whence
+        sta     tmp1
+        ; Skip X
+
+        ; Get offset and store
+
+        jsr     popax
+        sta     tmp2
+        stx     tmp3
+
+        jsr     popax
+        sta     RESB
+        stx     RESB+1
+
+        ; Get FD
+        jsr     popax
+        ; Does not need X
+        sta     RES           ; Save FD
+
+        lda     tmp2
+        ldy     tmp3
+        ldx     tmp1          ; Get whence
+        BRK_TELEMON XFSEEK
+        rts
+.endproc

From fcbcbea4ad7653b279012b948b463bc6aa096080 Mon Sep 17 00:00:00 2001
From: Jeff Tranter <tranter@pobox.com>
Date: Mon, 27 Mar 2023 09:23:40 -0400
Subject: [PATCH 41/65] Make some documentation fixes for KIM-1 platform.

---
 doc/kim1.sgml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/kim1.sgml b/doc/kim1.sgml
index c3494b9b9..1387d3b19 100644
--- a/doc/kim1.sgml
+++ b/doc/kim1.sgml
@@ -45,8 +45,10 @@ system configuration before compiling and linking user programs.
 The ROMs and I/O areas are defined in the configuration files, as are most of the entry points
 for useful subroutines in the KIM-1 monitor ROM.  cc65 generated programs compiled and linked
 using 4k config run in the memory range of &dollar;200 - &dollar;0FFF.  The 60k config expands
-this range to &dollar;DFFF. The starting memory location and entry point for running the program is
-&dollar;200, so when the program is transferred to the KIM-1, it is executed by typing '200 G'.
+this range to &dollar;DFFF. When using the 4k config the starting memory location and entry point
+for running the program is &dollar;200, so when the program is transferred to the KIM-1, it is
+executed by typing '200 G'. With the 60k config the default starting memory location and entry
+point is &dollar;2000.
 
 Special locations:
 
@@ -65,7 +67,7 @@ Special locations:
 
 <sect>Platform specific header files<p>
 
-Programs containing KIM-1 code may use the <tt/kim.h/ header file.  See the header file for more information.
+Programs containing KIM-1 code may use the <tt/kim1.h/ header file.  See the header file for more information.
 
 <sect>Loadable drivers<p>
 

From 806ffe56757ee192d478565f9fb438f1e146ab08 Mon Sep 17 00:00:00 2001
From: Jeff Tranter <tranter@pobox.com>
Date: Mon, 27 Mar 2023 17:56:25 -0400
Subject: [PATCH 42/65] Fixes and improvements to KIM-1 i/o routines. Tested on
 real KIM-1 hardware.

read.s:
- Remove commented out line.
- Remove unused check for bell character.
- Remove echo of newline (hardware always echoes entered characters).
- This fixes gets() and fgets() so they return when CR is entered.

write.s:
- Fix check for adding return after linefeed (failed to work because OUTCHR changes A)
- Remove unused check for bell character.

kim1.inc:
- Add symbol for monitor entry

crt0.s:
- Jump to KIM-1 monitor by address rather than using BRK (which relies on vector being set in RAM)
---
 asminc/kim1.inc     | 2 +-
 libsrc/kim1/crt0.s  | 6 ++----
 libsrc/kim1/read.s  | 7 +------
 libsrc/kim1/write.s | 7 +++----
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/asminc/kim1.inc b/asminc/kim1.inc
index 68f059490..2fb1117fa 100644
--- a/asminc/kim1.inc
+++ b/asminc/kim1.inc
@@ -15,7 +15,7 @@ OUTCHR   := $1EA0     ; Output character
 INTCHR   := $1E5A     ; Input character without case conversion
 DUMPT    := $1800     ; Dump memory to tape
 LOADT    := $1873     ; Load memory from tape
-
+START    := $1C4F     ; Enter KIM-1 monitor
 
 ; ---------------------------------------------------------------------------
 ; System Memory
diff --git a/libsrc/kim1/crt0.s b/libsrc/kim1/crt0.s
index f1fee86c1..906b3b980 100644
--- a/libsrc/kim1/crt0.s
+++ b/libsrc/kim1/crt0.s
@@ -40,8 +40,6 @@ _init:    cld                          ; Clear decimal mode
 
           jsr     _main
 
-; Back from main (this is also the _exit entry).  There may be a more elegant way to
-; return to the monitor on the KIM-1, but I don't know it!
-
-_exit:    brk
+; Back from main (this is also the _exit entry).  Jumps to the KIM-1 monitor.
 
+_exit:    jmp   START
diff --git a/libsrc/kim1/read.s b/libsrc/kim1/read.s
index 5566a9f27..dd178ee98 100644
--- a/libsrc/kim1/read.s
+++ b/libsrc/kim1/read.s
@@ -27,15 +27,10 @@ begin:  dec     ptr2
         beq     done             ; If buffer full, return
 
 getch:  jsr     INTCHR           ; Get character using Monitor ROM call
-        ;jsr     OUTCHR           ; Echo it
         and     #$7F             ; Clear top bit
-        cmp     #$07             ; Check for '\a'
-        bne     chkcr            ; ...if BEL character
-        ;jsr     BEEP             ; Make beep sound TODO
-chkcr:  cmp     #$0D             ; Check for '\r'
+        cmp     #$0D             ; Check for '\r'
         bne     putch            ; ...if CR character
         lda     #$0A             ; Replace with '\n'
-        jsr     OUTCHR           ; and echo it
 
 putch:  ldy     #$00             ; Put char into return buffer
         sta     (ptr1),y
diff --git a/libsrc/kim1/write.s b/libsrc/kim1/write.s
index 216f5031c..96bcc91d1 100644
--- a/libsrc/kim1/write.s
+++ b/libsrc/kim1/write.s
@@ -28,11 +28,10 @@ begin:  dec     ptr2
 
 outch:  ldy     #0
         lda     (ptr1),y
+        pha                     ; Save A (changed by OUTCHR)
         jsr     OUTCHR          ; Send character using Monitor call
-        cmp     #$07            ; Check for '\a'
-        bne     chklf           ; ...if BEL character
-;jsr     BEEP            ; Make beep sound
-chklf:  cmp     #$0A            ; Check for 'n'
+        pla                     ; Restore A
+        cmp     #$0A            ; Check for '\n'
         bne     next            ; ...if LF character
         lda     #$0D            ; Add a carriage return
         jsr     OUTCHR

From 2dd558eae9cc31e794beeda3a3e31278ee971977 Mon Sep 17 00:00:00 2001
From: mooinglemur <mooinglemur@users.noreply.github.com>
Date: Tue, 28 Mar 2023 21:18:02 -0700
Subject: [PATCH 43/65] cx16: update RAM constants for ROM ver R42

---
 asminc/cx16.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/asminc/cx16.inc b/asminc/cx16.inc
index 1a916ecdb..be63780c8 100644
--- a/asminc/cx16.inc
+++ b/asminc/cx16.inc
@@ -239,12 +239,12 @@ BASIC_BUF       := $0200        ; Location of command-line
 BASIC_BUF_LEN   = 81            ; Maximum length of command-line
 
 SCREEN_PTR      := $0262        ; Pointer to current row on text screen (16 bits)
-STATUS          := $0289        ; Status from previous I/O operation
-IN_DEV          := $028D        ; Current input device number
-OUT_DEV         := $028E        ; Current output device number
-FNAM_LEN        := $0291        ; Length of filename
-SECADR          := $0293        ; Secondary address
-DEVNUM          := $0294        ; Device number
+STATUS          := $0287        ; Status from previous I/O operation
+IN_DEV          := $028B        ; Current input device number
+OUT_DEV         := $028C        ; Current output device number
+FNAM_LEN        := $028F        ; Length of filename
+SECADR          := $0291        ; Secondary address
+DEVNUM          := $0292        ; Device number
 CURS_COLOR      := $0373        ; Color under the cursor
 CHARCOLOR       := $0376        ; Cursor's color nybbles (high: background, low: foreground)
 RVS             := $0377        ; Reverse flag
@@ -258,8 +258,8 @@ LLEN            := $0386        ; Line length
 NLINES          := $0387        ; Number of screen lines
 
 ; BASIC
-VARTAB          := $03E2        ; Pointer to start of BASIC variables
-MEMSIZE         := $03EA        ; Pointer to highest BASIC RAM location (+1)
+VARTAB          := $03E1        ; Pointer to start of BASIC variables
+MEMSIZE         := $03E9        ; Pointer to highest BASIC RAM location (+1)
 
 ; ---------------------------------------------------------------------------
 ; Vector and other locations

From 3a5fbd34da2daf0004a51fd24f853ebfb90e7307 Mon Sep 17 00:00:00 2001
From: Jeff Tranter <tranter@pobox.com>
Date: Wed, 29 Mar 2023 18:40:10 -0400
Subject: [PATCH 44/65] Add KIM-1 functions to write to the 7-segment LED
 display and get keypresses from the keypad. Includes sample program
 illustrating how to use them. Tested on real KIM-1 hardware.

---
 asminc/kim1.inc           |  4 +++
 include/kim1.h            | 13 ++++++++++
 libsrc/kim1/getkey.s      | 18 ++++++++++++++
 libsrc/kim1/scandisplay.s | 21 ++++++++++++++++
 samples/kim1/kimKeyDisp.c | 52 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 108 insertions(+)
 create mode 100644 libsrc/kim1/getkey.s
 create mode 100644 libsrc/kim1/scandisplay.s
 create mode 100644 samples/kim1/kimKeyDisp.c

diff --git a/asminc/kim1.inc b/asminc/kim1.inc
index 2fb1117fa..81e83b83c 100644
--- a/asminc/kim1.inc
+++ b/asminc/kim1.inc
@@ -16,6 +16,10 @@ INTCHR   := $1E5A     ; Input character without case conversion
 DUMPT    := $1800     ; Dump memory to tape
 LOADT    := $1873     ; Load memory from tape
 START    := $1C4F     ; Enter KIM-1 monitor
+SCANDS   := $1F1F     ; Scan 7-segment display
+KEYIN    := $1F40     ; Open up keyboard channel
+GETKEY   := $1F6A     ; Return key from keyboard
+
 
 ; ---------------------------------------------------------------------------
 ; System Memory
diff --git a/include/kim1.h b/include/kim1.h
index dae246944..99843f8f8 100644
--- a/include/kim1.h
+++ b/include/kim1.h
@@ -56,5 +56,18 @@ int __fastcall__ loadt (unsigned char);
 /* Write to tape */
 int __fastcall__ dumpt (unsigned char, const void*, const void*);
 
+
+/* Write to 7-segment LED display. Due to hardware limitations it only
+** displays briefly, so must be called repeatedly to update the
+** display.
+**/
+void __fastcall__ scandisplay(unsigned char left, unsigned char middle, unsigned char right);
+
+/*
+** Get a keypress from the keypad. Returns $00-$0F(0-F), $10(AD), $11(DA), $12(+),
+** $13(GO), $14(PC) or $15 for no keypress.
+**/
+int __fastcall__ getkey();
+
 /* End of sym1.h */
 #endif
diff --git a/libsrc/kim1/getkey.s b/libsrc/kim1/getkey.s
new file mode 100644
index 000000000..b36cd4b4c
--- /dev/null
+++ b/libsrc/kim1/getkey.s
@@ -0,0 +1,18 @@
+;
+; int __fastcall__ getkey();
+;
+
+.include        "kim1.inc"
+
+.import         popa
+
+.export         _getkey
+
+.proc           _getkey
+
+        jsr     KEYIN           ; Open up keyboard channel
+        jsr     GETKEY          ; Get key code
+        ldx     #0              ; MSB of return value is zero
+        rts
+
+.endproc
diff --git a/libsrc/kim1/scandisplay.s b/libsrc/kim1/scandisplay.s
new file mode 100644
index 000000000..0f46a5de4
--- /dev/null
+++ b/libsrc/kim1/scandisplay.s
@@ -0,0 +1,21 @@
+;
+; void __fastcall__ scandisplay(unsigned char left, unsigned char middle, unsigned char right);
+;
+
+.include        "kim1.inc"
+
+.import         popa
+
+.export         _scandisplay
+
+.proc           _scandisplay
+
+        sta     $F9             ; Rightmost display data
+        jsr     popa
+        sta     $FA             ; Middle display data
+        jsr     popa
+        sta     $FB             ; Leftmost display data
+        jsr     SCANDS
+        rts
+
+.endproc
diff --git a/samples/kim1/kimKeyDisp.c b/samples/kim1/kimKeyDisp.c
new file mode 100644
index 000000000..63839d19e
--- /dev/null
+++ b/samples/kim1/kimKeyDisp.c
@@ -0,0 +1,52 @@
+/* Example illustrating scandisplay() and getkey() functions. */
+
+#include <stdio.h>
+#include <kim1.h>
+
+int main (void)
+{
+    int i, j, k, l;
+    int last = 15;
+
+    printf("\nKIM-1 Demo\n");
+
+    for (i = 0; i < 16; i++) {
+        for (j = 0; j < 16; j++) {
+            for (k = 0; k < 16; k++) {
+                scandisplay(i, j, k);
+
+                l = getkey();
+
+                if (l != last) {
+                    switch (l) {
+                    case 0x0: case 0x1: case 0x2: case 0x3:
+                    case 0x4: case 0x5: case 0x6: case 0x7:
+                    case 0x8: case 0x9: case 0xa: case 0xb:
+                    case 0xc: case 0xd: case 0xe: case 0xf:
+                        printf("Key pressed: %X\n", l);
+                        break;
+                    case 0x10:
+                        printf("Key pressed: AD\n");
+                        break;
+                    case 0x11:
+                        printf("Key pressed: DA\n");
+                        break;
+                    case 0x12:
+                        printf("Key pressed: +\n");
+                        break;
+                    case 0x13:
+                        printf("Key pressed: GO\n");
+                        break;
+                    case 0x14:
+                        printf("Key pressed: PC\n");
+                        break;
+                    }
+
+                    last = l;
+                }
+            }
+        }
+    }
+
+    return 0;
+}

From ed4edd908b8274a13ca1b8f988dfe5cdbb194d02 Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Tue, 4 Apr 2023 00:40:33 +0200
Subject: [PATCH 45/65] fix copy'n'paste typo

---
 include/kim1.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/kim1.h b/include/kim1.h
index 99843f8f8..03c496223 100644
--- a/include/kim1.h
+++ b/include/kim1.h
@@ -69,5 +69,5 @@ void __fastcall__ scandisplay(unsigned char left, unsigned char middle, unsigned
 **/
 int __fastcall__ getkey();
 
-/* End of sym1.h */
+/* End of kim1.h */
 #endif

From 19349acdcf731fe54d28f839385a4f431ee62d20 Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Tue, 4 Apr 2023 00:57:52 +0200
Subject: [PATCH 46/65] fix typo in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 697132fde..e0e2c24e7 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Core team members:
 * [Christian Groessler](https://github.com/groessler): Atari, Atari5200, and CreatiVision library Maintainer
 * [dqh](https://github.com/dqh-au): GHA help
 * [Greg King](https://github.com/greg-king5): all around hackery
-* [groepaz](https://github.com/mrdudz): CBM libary, Project Maintainer
+* [groepaz](https://github.com/mrdudz): CBM library, Project Maintainer
 * [Oliver Schmidt](https://github.com/oliverschmidt): Apple II library Maintainer
 
 External contributors:

From 2a7533268cfcec42f217b7cf521a567da866e29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com>
Date: Fri, 7 Apr 2023 23:44:30 +0200
Subject: [PATCH 47/65] Don't use hardcoded paths on Amiga

Hardcoded paths don't make sense on AmigaOS, AROS and MorphOS.
---
 src/ca65/incpath.c  | 2 +-
 src/cc65/incpath.c  | 2 +-
 src/cl65/main.c     | 2 +-
 src/ld65/filepath.c | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c
index 8ea67df6f..461f1ad79 100644
--- a/src/ca65/incpath.c
+++ b/src/ca65/incpath.c
@@ -75,7 +75,7 @@ void FinishIncludePaths (void)
     AddSubSearchPathFromEnv (IncSearchPath, "CC65_HOME", "asminc");
 
     /* Add some compiled-in search paths if defined at compile time. */
-#if defined(CA65_INC) && !defined(_WIN32)
+#if defined(CA65_INC) && !defined(_WIN32) && !defined(_AMIGA)
     AddSearchPath (IncSearchPath, CA65_INC);
 #endif
 
diff --git a/src/cc65/incpath.c b/src/cc65/incpath.c
index 85f6e070b..3069079ac 100644
--- a/src/cc65/incpath.c
+++ b/src/cc65/incpath.c
@@ -76,7 +76,7 @@ void FinishIncludePaths (void)
     AddSubSearchPathFromEnv (SysIncSearchPath, "CC65_HOME", "include");
 
     /* Add some compiled-in search paths if defined at compile time. */
-#if defined(CC65_INC) && !defined(_WIN32)
+#if defined(CC65_INC) && !defined(_WIN32) && !defined(_AMIGA)
     AddSearchPath (SysIncSearchPath, CC65_INC);
 #endif
 
diff --git a/src/cl65/main.c b/src/cl65/main.c
index 67e9444f4..553fb9ca6 100644
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -1216,7 +1216,7 @@ static void OptPrintTargetPath (const char* Opt attribute ((unused)),
 
     SearchPaths* TargetPaths = NewSearchPath ();
     AddSubSearchPathFromEnv (TargetPaths, "CC65_HOME", "target");
-#if defined(CL65_TGT) && !defined(_WIN32)
+#if defined(CL65_TGT) && !defined(_WIN32) && !defined(_AMIGA)
     AddSearchPath (TargetPaths, CL65_TGT);
 #endif
     AddSubSearchPathFromBin (TargetPaths, "target");
diff --git a/src/ld65/filepath.c b/src/ld65/filepath.c
index 1ceb2333e..c84fe6f46 100644
--- a/src/ld65/filepath.c
+++ b/src/ld65/filepath.c
@@ -88,13 +88,13 @@ void InitSearchPaths (void)
     AddSubSearchPathFromEnv (CfgDefaultPath, "CC65_HOME", "cfg");
 
     /* Add some compiled-in search paths if defined at compile time. */
-#if defined(LD65_LIB) && !defined(_WIN32)
+#if defined(LD65_LIB) && !defined(_WIN32) && !defined(_AMIGA)
     AddSearchPath (LibDefaultPath, LD65_LIB);
 #endif
-#if defined(LD65_OBJ) && !defined(_WIN32)
+#if defined(LD65_OBJ) && !defined(_WIN32) && !defined(_AMIGA)
     AddSearchPath (ObjDefaultPath, LD65_OBJ);
 #endif
-#if defined(LD65_CFG) && !defined(_WIN32)
+#if defined(LD65_CFG) && !defined(_WIN32) && !defined(_AMIGA)
     AddSearchPath (CfgDefaultPath, LD65_CFG);
 #endif
 

From 1f9594560ed0392bd0420dc79e1f586cc8c63218 Mon Sep 17 00:00:00 2001
From: Janne Johansson <icepic.dz@gmail.com>
Date: Wed, 19 Apr 2023 09:15:03 +0200
Subject: [PATCH 48/65] Update lynxsprite.c

Remove compiler warning about (signed) char wrapping around to -1 when set to 255.
---
 src/sp65/lynxsprite.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sp65/lynxsprite.c b/src/sp65/lynxsprite.c
index 566edacbe..6bd9b03de 100644
--- a/src/sp65/lynxsprite.c
+++ b/src/sp65/lynxsprite.c
@@ -312,7 +312,7 @@ static void AssembleByte(unsigned bits, char val)
 static unsigned char AnalyseNextChunks(signed *newlen, signed len, char data[32], char ColorBits)
 {
     char longest = 1;
-    char prev = 255;
+    unsigned char prev = 255;
     char count = 0;
     char index = 0;
     char lindex = 0;

From 08223360d539aede5719696be9d287747950500b Mon Sep 17 00:00:00 2001
From: Bob Andrews <mrdudz@users.noreply.github.com>
Date: Tue, 2 May 2023 12:43:50 +0200
Subject: [PATCH 49/65] Update instr.c

---
 src/ca65/instr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 7cbefaecf..4f95ec75c 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -1617,7 +1617,7 @@ static void PutJMP (const InsDesc* Ins)
     if (EvalEA (Ins, &A)) {
 
         /* Check for indirect addressing */
-        if (A.AddrModeBit & AM65_ABS_IND && CPU < CPU_65SC02) {
+        if ((A.AddrModeBit & AM65_ABS_IND) && (CPU < CPU_65SC02)) {
 
             /* Compare the low byte of the expression to 0xFF to check for
             ** a page cross. Be sure to use a copy of the expression otherwise

From 1c26b1cf1b90172f16f7f7b0eed7ab36baa49165 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 2 May 2023 14:42:00 -0400
Subject: [PATCH 50/65] RHS primary integer promotion must happen after loading
 the primary, not before. See: #2060

---
 src/cc65/expr.c    |  3 ++-
 test/val/bug2060.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 test/val/bug2060.c

diff --git a/src/cc65/expr.c b/src/cc65/expr.c
index 691010b0a..9460569ed 100644
--- a/src/cc65/expr.c
+++ b/src/cc65/expr.c
@@ -3090,9 +3090,10 @@ static void parseadd (ExprDesc* Expr, int DoArrayRef)
                 Expr->Type = Expr2.Type;
             } else if (!DoArrayRef && IsClassInt (lhst) && IsClassInt (rhst)) {
                 /* Integer addition */
-                flags = typeadjust (Expr, &Expr2, 0);
                 /* Load rhs into the primary */
                 LoadExpr (CF_NONE, &Expr2);
+                /* Adjust rhs primary if needed  */
+                flags = typeadjust (Expr, &Expr2, 0);
             } else {
                 /* OOPS */
                 AddDone = -1;
diff --git a/test/val/bug2060.c b/test/val/bug2060.c
new file mode 100644
index 000000000..59b4774a4
--- /dev/null
+++ b/test/val/bug2060.c
@@ -0,0 +1,56 @@
+/* Test of bug: https://github.com/cc65/cc65/issues/2060 */
+
+#include <stdio.h>
+
+#define W 320
+
+unsigned long test1(unsigned char* p, unsigned long n)
+{
+    (void)p;
+    return n;
+}
+
+unsigned long test0(unsigned char* p, int x, int y, unsigned char b)
+{
+    (void)b;
+    return test1(p, (long)y * W + x);
+}
+
+#define TEST(ta,tb) \
+    expect = (long)tb * W + ta; \
+    result = test0(p,ta,tb,0x56); \
+    printf("%4d * %3d + %4d = %08lx",tb,W,ta,result); \
+    if (expect != result) { printf(" expected: %08lx\n",expect); ++fail; } \
+    else printf("\n");
+
+int main(void)
+{
+    unsigned char* p = (unsigned char*)0x1234;
+    unsigned long expect, result;
+    int fail = 0;
+
+    TEST(1,3);
+    TEST(50,60);
+    TEST(99,88);
+    TEST(128,102);
+    TEST(129,102);
+    TEST(320,102);
+    /* Bug 2060 indicated failure when y > 102.
+       Because: (y * 320) > 32767
+       The promotion of x from int to long had an incorrect high word,
+       because it was done before loading x into AX, rather than after.
+    */
+    TEST(0,103);
+    TEST(150,170);
+    TEST(300,180);
+    /* x < 0 also fails because its high word sign extend is incorrect. */
+    TEST(-100,50);
+    TEST(-49,99);
+    TEST(-300,-180);
+    /* This passed despite the bug, because y * 320 coincidentally had the
+       same high word.
+    */
+    TEST(-1,-1);
+
+    return fail;
+}

From 2c47ea45af0ad91a611c866b9f99a5c7eae4e5f1 Mon Sep 17 00:00:00 2001
From: Brad Smith <bbbradsmith@users.noreply.github.com>
Date: Tue, 2 May 2023 18:18:10 -0400
Subject: [PATCH 51/65] bug895.c compliant token pasting syntax to remove
 warnings

Gets rid of some unnecessary warning spam in the test log of lines like this:
```
bug895.c:95: Warning: Pasting formed "unsigned_long_14(", an invalid preprocessing token
```
---
 test/val/bug895.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/val/bug895.c b/test/val/bug895.c
index c4892d7b1..3c0331a6d 100644
--- a/test/val/bug895.c
+++ b/test/val/bug895.c
@@ -21,7 +21,7 @@ unsigned int  uia, uib;
 unsigned long ula, ulb;
 
 #define OPTCMP8TEST_SINGLE(num,cmpop,asmprefix,vara,varb,b0,b1,a0,a1,typename,name) \
-    typename name ## _ ## num ## (void) { \
+    typename name ## _ ## num(void) { \
         varb = b0; \
         asm( asmprefix ); \
         vara = a0; \
@@ -30,7 +30,7 @@ unsigned long ula, ulb;
     }
 
 #define OPTCMP8TEST_VERIFY(num,b,desc,printterm,name) \
-    ASSERT_AreEqual(name ## _ ## num ##(),b,printterm,"Incorrect optimization of const comparison (" #name "_" #num ": " desc ").");
+    ASSERT_AreEqual(name ## _ ## num(),b,printterm,"Incorrect optimization of const comparison (" #name "_" #num ": " desc ").");
 
 /* Generates a set of comparison tests for one type and set of test values.
 **     name = a name for this test (no spaces)

From e7046a02ff392d793647fccd76245ce1bc00c4cc Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 2 May 2023 19:00:34 -0400
Subject: [PATCH 52/65] Disallow pass/return of 3-byte struct (#2022), document
 capability added in #1102.

---
 doc/cc65.sgml       | 5 ++---
 src/cc65/datatype.c | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 683249bda..2e99f3201 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -806,9 +806,8 @@ and the one defined by the ISO standard:
 
 <item>  The datatypes "float" and "double" are not available.
         <p>
-<item>  C Functions may not return structs (or unions), and structs may not
-        be passed as parameters by value. However, struct assignment *is*
-        possible.
+<item>  C Functions may return structs (or unions) by value, but only of
+        1, 2 or 4 byte sizes.
         <p>
 <item>  Most of the C library is available with only the fastcall calling
         convention (<ref id="extension-fastcall" name="see below">).  It means
diff --git a/src/cc65/datatype.c b/src/cc65/datatype.c
index 6907ee099..caa41a7a4 100644
--- a/src/cc65/datatype.c
+++ b/src/cc65/datatype.c
@@ -803,7 +803,6 @@ const Type* GetStructReplacementType (const Type* SType)
     switch (SizeOf (SType)) {
         case 1:     NewType = type_uchar;   break;
         case 2:     NewType = type_uint;    break;
-        case 3:     /* FALLTHROUGH */
         case 4:     NewType = type_ulong;   break;
         default:    NewType = SType;        break;
     }

From af11d4d947d090419827907604d8751a3eb01411 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 2 May 2023 19:21:21 -0400
Subject: [PATCH 53/65] Document that struct-param is default off since:
 3129266

---
 doc/cc65.sgml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 2e99f3201..023204f4d 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -741,7 +741,7 @@ Here is a description of all the command line options:
   <tag><tt/return-type/</tag>
         Warn about no return statement in function returning non-void.
   <tag><tt/struct-param/</tag>
-        Warn when passing structs by value.
+        Warn when passing structs by value. (Disabled by default.)
   <tag><tt/unknown-pragma/</tag>
         Warn about #pragmas that aren't recognized by cc65.
   <tag><tt/unreachable-code/</tag>

From bf22f94a436345334e81fe70d196a8e805b7a778 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Tue, 2 May 2023 20:02:58 -0400
Subject: [PATCH 54/65] struct pass and return by value test

---
 test/val/struct-by-value.c | 144 +++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 test/val/struct-by-value.c

diff --git a/test/val/struct-by-value.c b/test/val/struct-by-value.c
new file mode 100644
index 000000000..0e846c117
--- /dev/null
+++ b/test/val/struct-by-value.c
@@ -0,0 +1,144 @@
+/* Test of passing and returning structs by value.
+   Structs of 1, 2 and 4 bytes are supported.
+   Note that structs of 3 bytes are disabled, see:
+       https://github.com/cc65/cc65/issues/2022
+*/
+
+int fail = 0;
+
+struct s1 { char a; };
+struct s2 { char a, b; };
+struct s3 { char a, b, c; };
+struct s4 { char a, b, c, d; };
+
+const struct s1 c1 = { 1 };
+const struct s2 c2 = { 2, 3 };
+const struct s3 c3 = { 4, 5, 6 };
+const struct s4 c4 = { 7, 8, 9, 10 };
+
+struct s1 return1() { return c1; }
+struct s2 return2() { return c2; }
+/*struct s3 return3() { return c3; }*/
+struct s4 return4() { return c4; }
+
+int compare1(struct s1 a, struct s1 b)
+{
+    if (a.a != b.a) return 1;
+    return 0;
+}
+
+int compare2(struct s2 a, struct s2 b)
+{
+    if (a.a != b.a) return 1;
+    if (a.b != b.b) return 1;
+    return 0;
+}
+
+/*int compare3(struct s3 a, struct s3 b)
+{
+    if (a.a != b.a) return 1;
+    if (a.b != b.b) return 1;
+    if (a.c != b.c) return 1;
+    return 0;
+}*/
+
+int compare4(struct s4 a, struct s4 b)
+{
+    if (a.a != b.a) return 1;
+    if (a.b != b.b) return 1;
+    if (a.c != b.c) return 1;
+    if (a.d != b.d) return 1;
+    return 0;
+}
+
+int pass1(struct s1 p1)
+{
+    struct s1 a1;
+    a1 = p1;
+    if (a1.a != c1.a) return 1;
+    return 0;
+}
+
+int pass2(struct s2 p2)
+{
+    struct s2 a2;
+    a2 = p2;
+    if (a2.a != c2.a) return 1;
+    if (a2.b != c2.b) return 1;
+    return 0;
+}
+
+/*int pass3(struct s3 p3)
+{
+    struct s3 a3;
+    a3 = p3;
+    if (a3.a != c3.a) return 1;
+    if (a3.b != c3.b) return 1;
+    if (a3.c != c3.c) return 1;
+    return 0;
+}*/
+
+int pass4(struct s4 p4)
+{
+    struct s4 a4;
+    a4 = p4;
+    if (a4.a != c4.a) return 1;
+    if (a4.b != c4.b) return 1;
+    if (a4.c != c4.c) return 1;
+    if (a4.d != c4.d) return 1;
+    return 0;
+}
+
+void reset(char* gg)
+{
+    char i;
+    for (i=0;i<5;++i) gg[i] = 128+i;
+}
+
+int test(char* gg, char start)
+{
+    char i;
+    for (i=start;i<5;++i)
+        if (gg[i] != 128+i) return 1;
+    return 0;
+}
+
+int main()
+{
+    /* Used to check #2022 bug condition of extra bytes being overwritten. */
+    union
+    {
+        char gg[5];
+        struct s1 g1;
+        struct s2 g2;
+        struct s3 g3;
+        struct s4 g4;
+    } guard;
+
+    reset(guard.gg);
+    guard.g1 = return1();
+    fail += compare1(guard.g1,c1);
+    fail += test(guard.gg,1);
+
+    reset(guard.gg);
+    guard.g2 = return2();
+    fail += compare2(guard.g2,c2);
+    fail += test(guard.gg,2);
+
+    /*reset(guard.gg);
+    guard.g3 = return3();
+    fail += compare3(guard.g3,c3);
+    fail += test(guard.gg,3);*/
+
+    reset(guard.gg);
+    guard.g4 = return4();
+    fail += compare4(guard.g4,c4);
+    fail += test(guard.gg,4);
+
+    fail += pass1(c1);
+    fail += pass2(c2);
+    /*fail += pass3(c3);*/
+    fail += pass4(c4);
+
+    return fail;
+}

From 65f773f5ee96d3d872fe6fd06fba079fa6b64c6a Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 01:01:21 -0400
Subject: [PATCH 55/65] Explicit z: should suppress "Suspicious address
 expression" warning #194

---
 src/ca65/ea.h    | 5 +++++
 src/ca65/ea65.c  | 2 ++
 src/ca65/instr.c | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/ca65/ea.h b/src/ca65/ea.h
index d861e9a6c..487027c02 100644
--- a/src/ca65/ea.h
+++ b/src/ca65/ea.h
@@ -43,6 +43,10 @@
 /*****************************************************************************/
 
 
+/* EffAddr Flags */
+#define EFFADDR_OVERRIDE_ZP     0x00000001UL
+
+
 
 /* GetEA result struct */
 typedef struct EffAddr EffAddr;
@@ -51,6 +55,7 @@ struct EffAddr {
     unsigned long       AddrModeSet;    /* Possible addressing modes */
     struct ExprNode*    Expr;           /* Expression if any (NULL otherwise) */
     unsigned            Reg;            /* Register number in sweet16 mode */
+    unsigned long       Flags;          /* Other properties */
 
     /* The following fields are used inside instr.c */
     unsigned            AddrMode;       /* Actual addressing mode used */
diff --git a/src/ca65/ea65.c b/src/ca65/ea65.c
index 275d90b56..5bd2ba82b 100644
--- a/src/ca65/ea65.c
+++ b/src/ca65/ea65.c
@@ -72,11 +72,13 @@ void GetEA (EffAddr* A)
     /* Clear the output struct */
     A->AddrModeSet = 0;
     A->Expr = 0;
+    A->Flags = 0;
 
     /* Handle an addressing size override */
     switch (CurTok.Tok) {
         case TOK_OVERRIDE_ZP:
             Restrictions = AM65_DIR | AM65_DIR_X | AM65_DIR_Y;
+            A->Flags |= EFFADDR_OVERRIDE_ZP;
             NextTok ();
             break;
 
diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 4f95ec75c..89162c3c6 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -1269,7 +1269,8 @@ static int EvalEA (const InsDesc* Ins, EffAddr* A)
         ExprNode* Left = A->Expr->Left;
         if ((A->Expr->Op == EXPR_BYTE0 || A->Expr->Op == EXPR_BYTE1) &&
             Left->Op == EXPR_SYMBOL                                  &&
-            GetSymAddrSize (Left->V.Sym) != ADDR_SIZE_ZP) {
+            GetSymAddrSize (Left->V.Sym) != ADDR_SIZE_ZP             &&
+            !(A->Flags & EFFADDR_OVERRIDE_ZP)) {
 
             /* Output a warning */
             Warning (1, "Suspicious address expression");

From 4d698bf18c89e8426e4ba8a37e4b72d1d51ee7ba Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 03:05:14 -0400
Subject: [PATCH 56/65] Don't use a,x,y in macro parameter example, document
 why not. #392

---
 doc/ca65.sgml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 360b0bab2..2f95a032e 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -4262,8 +4262,13 @@ macro actually takes in the definition. You may also leave intermediate
 parameters empty. Empty parameters are replaced by empty space (that is,
 they are removed when the macro is expanded). If you have a look at our
 macro definition above, you will see, that replacing the "addr" parameter
-by nothing will lead to wrong code in most lines. To help you, writing
-macros with a variable parameter list, there are some control commands:
+by nothing will lead to wrong code in most lines.
+
+The names "a", "x" and "y" should be avoided for macro parameters, as these
+will usually conflict with the 6502 registers.
+
+For writing macros with a variable parameter list, control commands are
+available:
 
 <tt><ref id=".IFBLANK" name=".IFBLANK"></tt> tests the rest of the line and
 returns true, if there are any tokens on the remainder of the line. Since
@@ -4274,15 +4279,15 @@ opposite.
 Look at this example:
 
 <tscreen><verb>
-.macro  ldaxy   a, x, y
-.ifnblank       a
-        lda     #a
+.macro  ldaxy   i, j, k
+.ifnblank       i
+        lda     #i
 .endif
-.ifnblank       x
-        ldx     #x
+.ifnblank       j
+        ldx     #j
 .endif
-.ifnblank       y
-        ldy     #y
+.ifnblank       k
+        ldy     #k
 .endif
 .endmacro
 </verb></tscreen>

From 2b60adfa11ad6b348b70cc224337f1cac6b4c125 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 03:26:10 -0400
Subject: [PATCH 57/65] Document directives that use SetBoolOption "can" use
 +/- rather than "must" #1772

---
 doc/ca65.sgml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 360b0bab2..72a133299 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2283,7 +2283,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   Switch on or off case sensitivity on identifiers. The default is off
   (that is, identifiers are case sensitive), but may be changed by the
   -i switch on the command line.
-  The command must be followed by a '+' or '-' character to switch the
+  The command can be followed by a '+' or '-' character to switch the
   option on or off respectively.
 
   Example:
@@ -2432,7 +2432,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   Switch on or off debug info generation. The default is off (that is,
   the object file will not contain debug infos), but may be changed by the
   -g switch on the command line.
-  The command must be followed by a '+' or '-' character to switch the
+  The command can be followed by a '+' or '-' character to switch the
   option on or off respectively.
 
   Example:
@@ -3380,7 +3380,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   Note: Line continuations do not work in a comment. A backslash at the
   end of a comment is treated as part of the comment and does not trigger
   line continuation.
-  The command must be followed by a '+' or '-' character to switch the
+  The command can be followed by a '+' or '-' character to switch the
   option on or off respectively.
 
   Example:
@@ -3395,7 +3395,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
 
 <sect1><tt>.LIST</tt><label id=".LIST"><p>
 
-  Enable output to the listing. The command must be followed by a boolean
+  Enable output to the listing. The command can be followed by a boolean
   switch ("on", "off", "+" or "-") and will enable or disable listing
   output.
   The option has no effect if the listing is not enabled by the command line
@@ -4040,7 +4040,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
 
 <sect1><tt>.SMART</tt><label id=".SMART"><p>
 
-  Switch on or off smart mode. The command must be followed by a '+' or '-'
+  Switch on or off smart mode. The command can be followed by a '+' or '-'
   character to switch the option on or off respectively. The default is off
   (that is, the assembler doesn't try to be smart), but this default may be
   changed by the -s switch on the command line.

From 86e3a640d5f785311dea52a266ef16bf290d9e0c Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 05:03:11 -0400
Subject: [PATCH 58/65] Support for three line ending types: \r, \r\n, \n.
 #1894

---
 src/ca65/scanner.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index bf0a85183..d32939646 100644
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -112,6 +112,7 @@ struct CharSource {
     CharSource*                 Next;   /* Linked list of char sources */
     token_t                     Tok;    /* Last token */
     int                         C;      /* Last character */
+    int                         SkipN;  /* For '\r\n' line endings, skip '\n\ if next */
     const CharSourceFunctions*  Func;   /* Pointer to function table */
     union {
         InputFile               File;   /* File data */
@@ -325,6 +326,7 @@ static void UseCharSource (CharSource* S)
     Source      = S;
 
     /* Read the first character from the new file */
+    S->SkipN    = 0;
     S->Func->NextChar (S);
 
     /* Setup the next token so it will be skipped on the next call to
@@ -386,6 +388,10 @@ static void IFNextChar (CharSource* S)
         while (1) {
 
             int N = fgetc (S->V.File.F);
+            if (N == '\n' && S->SkipN)
+                N = fgetc (S->V.File.F);
+            S->SkipN = 0;
+
             if (N == EOF) {
                 /* End of file. Accept files without a newline at the end */
                 if (SB_NotEmpty (&S->V.File.Line)) {
@@ -401,9 +407,12 @@ static void IFNextChar (CharSource* S)
 
             /* Check for end of line */
             } else if (N == '\n') {
-
                 /* End of line */
                 break;
+            } else if (N == '\r') {
+                /* End of line, skip '\n' if it's the next character */
+                S->SkipN = 1;
+                break;
 
             /* Collect other stuff */
             } else {

From 456fa9f963dcba838a135416a5d52957b54c3ffb Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 05:36:37 -0400
Subject: [PATCH 59/65] cc65 document: both pass and return of structs are
 allowed

---
 doc/cc65.sgml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 023204f4d..1476b40a3 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -806,8 +806,8 @@ and the one defined by the ISO standard:
 
 <item>  The datatypes "float" and "double" are not available.
         <p>
-<item>  C Functions may return structs (or unions) by value, but only of
-        1, 2 or 4 byte sizes.
+<item>  C Functions may pass and return structs (or unions) by value, but only
+        of 1, 2 or 4 byte sizes.
         <p>
 <item>  Most of the C library is available with only the fastcall calling
         convention (<ref id="extension-fastcall" name="see below">).  It means

From 6ffc4004d7d7bbae4ba48aba53263545d651d750 Mon Sep 17 00:00:00 2001
From: Bob Andrews <mrdudz@users.noreply.github.com>
Date: Wed, 3 May 2023 14:24:13 +0200
Subject: [PATCH 60/65] Revert "Forbid 3-byte struct pass/return by value,
 document struct value pass/return"

---
 doc/cc65.sgml              |   7 +-
 src/cc65/datatype.c        |   1 +
 test/val/struct-by-value.c | 144 -------------------------------------
 3 files changed, 5 insertions(+), 147 deletions(-)
 delete mode 100644 test/val/struct-by-value.c

diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 1476b40a3..683249bda 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -741,7 +741,7 @@ Here is a description of all the command line options:
   <tag><tt/return-type/</tag>
         Warn about no return statement in function returning non-void.
   <tag><tt/struct-param/</tag>
-        Warn when passing structs by value. (Disabled by default.)
+        Warn when passing structs by value.
   <tag><tt/unknown-pragma/</tag>
         Warn about #pragmas that aren't recognized by cc65.
   <tag><tt/unreachable-code/</tag>
@@ -806,8 +806,9 @@ and the one defined by the ISO standard:
 
 <item>  The datatypes "float" and "double" are not available.
         <p>
-<item>  C Functions may pass and return structs (or unions) by value, but only
-        of 1, 2 or 4 byte sizes.
+<item>  C Functions may not return structs (or unions), and structs may not
+        be passed as parameters by value. However, struct assignment *is*
+        possible.
         <p>
 <item>  Most of the C library is available with only the fastcall calling
         convention (<ref id="extension-fastcall" name="see below">).  It means
diff --git a/src/cc65/datatype.c b/src/cc65/datatype.c
index caa41a7a4..6907ee099 100644
--- a/src/cc65/datatype.c
+++ b/src/cc65/datatype.c
@@ -803,6 +803,7 @@ const Type* GetStructReplacementType (const Type* SType)
     switch (SizeOf (SType)) {
         case 1:     NewType = type_uchar;   break;
         case 2:     NewType = type_uint;    break;
+        case 3:     /* FALLTHROUGH */
         case 4:     NewType = type_ulong;   break;
         default:    NewType = SType;        break;
     }
diff --git a/test/val/struct-by-value.c b/test/val/struct-by-value.c
deleted file mode 100644
index 0e846c117..000000000
--- a/test/val/struct-by-value.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Test of passing and returning structs by value.
-   Structs of 1, 2 and 4 bytes are supported.
-   Note that structs of 3 bytes are disabled, see:
-       https://github.com/cc65/cc65/issues/2022
-*/
-
-int fail = 0;
-
-struct s1 { char a; };
-struct s2 { char a, b; };
-struct s3 { char a, b, c; };
-struct s4 { char a, b, c, d; };
-
-const struct s1 c1 = { 1 };
-const struct s2 c2 = { 2, 3 };
-const struct s3 c3 = { 4, 5, 6 };
-const struct s4 c4 = { 7, 8, 9, 10 };
-
-struct s1 return1() { return c1; }
-struct s2 return2() { return c2; }
-/*struct s3 return3() { return c3; }*/
-struct s4 return4() { return c4; }
-
-int compare1(struct s1 a, struct s1 b)
-{
-    if (a.a != b.a) return 1;
-    return 0;
-}
-
-int compare2(struct s2 a, struct s2 b)
-{
-    if (a.a != b.a) return 1;
-    if (a.b != b.b) return 1;
-    return 0;
-}
-
-/*int compare3(struct s3 a, struct s3 b)
-{
-    if (a.a != b.a) return 1;
-    if (a.b != b.b) return 1;
-    if (a.c != b.c) return 1;
-    return 0;
-}*/
-
-int compare4(struct s4 a, struct s4 b)
-{
-    if (a.a != b.a) return 1;
-    if (a.b != b.b) return 1;
-    if (a.c != b.c) return 1;
-    if (a.d != b.d) return 1;
-    return 0;
-}
-
-int pass1(struct s1 p1)
-{
-    struct s1 a1;
-    a1 = p1;
-    if (a1.a != c1.a) return 1;
-    return 0;
-}
-
-int pass2(struct s2 p2)
-{
-    struct s2 a2;
-    a2 = p2;
-    if (a2.a != c2.a) return 1;
-    if (a2.b != c2.b) return 1;
-    return 0;
-}
-
-/*int pass3(struct s3 p3)
-{
-    struct s3 a3;
-    a3 = p3;
-    if (a3.a != c3.a) return 1;
-    if (a3.b != c3.b) return 1;
-    if (a3.c != c3.c) return 1;
-    return 0;
-}*/
-
-int pass4(struct s4 p4)
-{
-    struct s4 a4;
-    a4 = p4;
-    if (a4.a != c4.a) return 1;
-    if (a4.b != c4.b) return 1;
-    if (a4.c != c4.c) return 1;
-    if (a4.d != c4.d) return 1;
-    return 0;
-}
-
-void reset(char* gg)
-{
-    char i;
-    for (i=0;i<5;++i) gg[i] = 128+i;
-}
-
-int test(char* gg, char start)
-{
-    char i;
-    for (i=start;i<5;++i)
-        if (gg[i] != 128+i) return 1;
-    return 0;
-}
-
-int main()
-{
-    /* Used to check #2022 bug condition of extra bytes being overwritten. */
-    union
-    {
-        char gg[5];
-        struct s1 g1;
-        struct s2 g2;
-        struct s3 g3;
-        struct s4 g4;
-    } guard;
-
-    reset(guard.gg);
-    guard.g1 = return1();
-    fail += compare1(guard.g1,c1);
-    fail += test(guard.gg,1);
-
-    reset(guard.gg);
-    guard.g2 = return2();
-    fail += compare2(guard.g2,c2);
-    fail += test(guard.gg,2);
-
-    /*reset(guard.gg);
-    guard.g3 = return3();
-    fail += compare3(guard.g3,c3);
-    fail += test(guard.gg,3);*/
-
-    reset(guard.gg);
-    guard.g4 = return4();
-    fail += compare4(guard.g4,c4);
-    fail += test(guard.gg,4);
-
-    fail += pass1(c1);
-    fail += pass2(c2);
-    /*fail += pass3(c3);*/
-    fail += pass4(c4);
-
-    return fail;
-}

From 016008b6df5a1a0283a29ba1e18255e39a229dd5 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 11:57:50 -0400
Subject: [PATCH 61/65] ca65: Suppress '.size' error for multiply-defined
 symbols

---
 src/ca65/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ca65/main.c b/src/ca65/main.c
index 7183ff046..d45201cad 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -858,7 +858,11 @@ static void OneLine (void)
             /* The line has switched the segment */
             Size = 0;
         }
-        DefSizeOfSymbol (Sym, Size);
+        /* Suppress .size Symbol if this Symbol already has a multiply-defined error,
+        ** as it will only create its own additional unnecessary error.
+        */
+        if ((Sym->Flags & SF_MULTDEF) == 0)
+            DefSizeOfSymbol (Sym, Size);
     }
 
     /* Line separator must come here */

From 4e6b94de5cf3e073897c610e09c372d9ac36e57c Mon Sep 17 00:00:00 2001
From: Brad Smith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 12:19:05 -0400
Subject: [PATCH 62/65] braces

---
 src/ca65/scanner.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index d32939646..add365e84 100644
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -388,8 +388,9 @@ static void IFNextChar (CharSource* S)
         while (1) {
 
             int N = fgetc (S->V.File.F);
-            if (N == '\n' && S->SkipN)
+            if (N == '\n' && S->SkipN) {
                 N = fgetc (S->V.File.F);
+            }
             S->SkipN = 0;
 
             if (N == EOF) {

From 1f18ab218ed96d9d7eaf3aecb97d1a7764bb15fd Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 13:35:51 -0400
Subject: [PATCH 63/65] Improve struct size error message to include the
 detected size

---
 src/cc65/function.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc65/function.c b/src/cc65/function.c
index 39f04843f..38a8f45aa 100644
--- a/src/cc65/function.c
+++ b/src/cc65/function.c
@@ -601,7 +601,7 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
                 ** We don't currently support this case.
                 */
                 if (RType == Param->Type) {
-                    Error ("Passing '%s' of this size by value is not supported", GetFullTypeName (Param->Type));
+                    Error ("Passing '%s' of this size (%d) by value is not supported", GetFullTypeName (Param->Type), SizeOf (RType));
                 }
             }
 

From ae7a1416fe53de39b991c26a8dc2050a6e98fbe4 Mon Sep 17 00:00:00 2001
From: Bob Andrews <mrdudz@users.noreply.github.com>
Date: Wed, 3 May 2023 20:02:12 +0200
Subject: [PATCH 64/65] Revert "Revert "Forbid 3-byte struct pass/return by
 value, document struct value pass/return""

---
 doc/cc65.sgml              |   7 +-
 src/cc65/datatype.c        |   1 -
 test/val/struct-by-value.c | 144 +++++++++++++++++++++++++++++++++++++
 3 files changed, 147 insertions(+), 5 deletions(-)
 create mode 100644 test/val/struct-by-value.c

diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 683249bda..1476b40a3 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -741,7 +741,7 @@ Here is a description of all the command line options:
   <tag><tt/return-type/</tag>
         Warn about no return statement in function returning non-void.
   <tag><tt/struct-param/</tag>
-        Warn when passing structs by value.
+        Warn when passing structs by value. (Disabled by default.)
   <tag><tt/unknown-pragma/</tag>
         Warn about #pragmas that aren't recognized by cc65.
   <tag><tt/unreachable-code/</tag>
@@ -806,9 +806,8 @@ and the one defined by the ISO standard:
 
 <item>  The datatypes "float" and "double" are not available.
         <p>
-<item>  C Functions may not return structs (or unions), and structs may not
-        be passed as parameters by value. However, struct assignment *is*
-        possible.
+<item>  C Functions may pass and return structs (or unions) by value, but only
+        of 1, 2 or 4 byte sizes.
         <p>
 <item>  Most of the C library is available with only the fastcall calling
         convention (<ref id="extension-fastcall" name="see below">).  It means
diff --git a/src/cc65/datatype.c b/src/cc65/datatype.c
index 6907ee099..caa41a7a4 100644
--- a/src/cc65/datatype.c
+++ b/src/cc65/datatype.c
@@ -803,7 +803,6 @@ const Type* GetStructReplacementType (const Type* SType)
     switch (SizeOf (SType)) {
         case 1:     NewType = type_uchar;   break;
         case 2:     NewType = type_uint;    break;
-        case 3:     /* FALLTHROUGH */
         case 4:     NewType = type_ulong;   break;
         default:    NewType = SType;        break;
     }
diff --git a/test/val/struct-by-value.c b/test/val/struct-by-value.c
new file mode 100644
index 000000000..0e846c117
--- /dev/null
+++ b/test/val/struct-by-value.c
@@ -0,0 +1,144 @@
+/* Test of passing and returning structs by value.
+   Structs of 1, 2 and 4 bytes are supported.
+   Note that structs of 3 bytes are disabled, see:
+       https://github.com/cc65/cc65/issues/2022
+*/
+
+int fail = 0;
+
+struct s1 { char a; };
+struct s2 { char a, b; };
+struct s3 { char a, b, c; };
+struct s4 { char a, b, c, d; };
+
+const struct s1 c1 = { 1 };
+const struct s2 c2 = { 2, 3 };
+const struct s3 c3 = { 4, 5, 6 };
+const struct s4 c4 = { 7, 8, 9, 10 };
+
+struct s1 return1() { return c1; }
+struct s2 return2() { return c2; }
+/*struct s3 return3() { return c3; }*/
+struct s4 return4() { return c4; }
+
+int compare1(struct s1 a, struct s1 b)
+{
+    if (a.a != b.a) return 1;
+    return 0;
+}
+
+int compare2(struct s2 a, struct s2 b)
+{
+    if (a.a != b.a) return 1;
+    if (a.b != b.b) return 1;
+    return 0;
+}
+
+/*int compare3(struct s3 a, struct s3 b)
+{
+    if (a.a != b.a) return 1;
+    if (a.b != b.b) return 1;
+    if (a.c != b.c) return 1;
+    return 0;
+}*/
+
+int compare4(struct s4 a, struct s4 b)
+{
+    if (a.a != b.a) return 1;
+    if (a.b != b.b) return 1;
+    if (a.c != b.c) return 1;
+    if (a.d != b.d) return 1;
+    return 0;
+}
+
+int pass1(struct s1 p1)
+{
+    struct s1 a1;
+    a1 = p1;
+    if (a1.a != c1.a) return 1;
+    return 0;
+}
+
+int pass2(struct s2 p2)
+{
+    struct s2 a2;
+    a2 = p2;
+    if (a2.a != c2.a) return 1;
+    if (a2.b != c2.b) return 1;
+    return 0;
+}
+
+/*int pass3(struct s3 p3)
+{
+    struct s3 a3;
+    a3 = p3;
+    if (a3.a != c3.a) return 1;
+    if (a3.b != c3.b) return 1;
+    if (a3.c != c3.c) return 1;
+    return 0;
+}*/
+
+int pass4(struct s4 p4)
+{
+    struct s4 a4;
+    a4 = p4;
+    if (a4.a != c4.a) return 1;
+    if (a4.b != c4.b) return 1;
+    if (a4.c != c4.c) return 1;
+    if (a4.d != c4.d) return 1;
+    return 0;
+}
+
+void reset(char* gg)
+{
+    char i;
+    for (i=0;i<5;++i) gg[i] = 128+i;
+}
+
+int test(char* gg, char start)
+{
+    char i;
+    for (i=start;i<5;++i)
+        if (gg[i] != 128+i) return 1;
+    return 0;
+}
+
+int main()
+{
+    /* Used to check #2022 bug condition of extra bytes being overwritten. */
+    union
+    {
+        char gg[5];
+        struct s1 g1;
+        struct s2 g2;
+        struct s3 g3;
+        struct s4 g4;
+    } guard;
+
+    reset(guard.gg);
+    guard.g1 = return1();
+    fail += compare1(guard.g1,c1);
+    fail += test(guard.gg,1);
+
+    reset(guard.gg);
+    guard.g2 = return2();
+    fail += compare2(guard.g2,c2);
+    fail += test(guard.gg,2);
+
+    /*reset(guard.gg);
+    guard.g3 = return3();
+    fail += compare3(guard.g3,c3);
+    fail += test(guard.gg,3);*/
+
+    reset(guard.gg);
+    guard.g4 = return4();
+    fail += compare4(guard.g4,c4);
+    fail += test(guard.gg,4);
+
+    fail += pass1(c1);
+    fail += pass2(c2);
+    /*fail += pass3(c3);*/
+    fail += pass4(c4);
+
+    return fail;
+}

From 440c91fad96e6b94cdec1e4cf249dc0ca0d28fe6 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 3 May 2023 14:11:30 -0400
Subject: [PATCH 65/65] braces for 1-line if

---
 src/ca65/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ca65/main.c b/src/ca65/main.c
index d45201cad..fedbb0d4b 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -861,8 +861,9 @@ static void OneLine (void)
         /* Suppress .size Symbol if this Symbol already has a multiply-defined error,
         ** as it will only create its own additional unnecessary error.
         */
-        if ((Sym->Flags & SF_MULTDEF) == 0)
+        if ((Sym->Flags & SF_MULTDEF) == 0) {
             DefSizeOfSymbol (Sym, Size);
+        }
     }
 
     /* Line separator must come here */