diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..75d9b00d3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,16 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+**Compiler and OS**
+It is important to know what version of the compiler/assembler you used (call it with --version to get this info). Sometimes we also need to know what OS you are using.
+
+**Describe the bug**
+Please tell us what you did, what happened, and what you expected to happen instead.
+
+**To Reproduce**
+If it isnt obvious how to reproduce the problem, please give use some detailed instructions on how to reproduce it. Ideally provide a testcase (program) that we can put into the testbench later.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..09cadc0ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..5215c557d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,9 @@
+## Summary
+
+Provide description of the bug (if an issue exists, link to it) and the fix.
+
+## Checklist
+
+- [ ] The fix meets the codestyle requirements
+- [ ] New unit tests have been added to prevent future regressions
+- [ ] The documentation has been updated if necessary
diff --git a/.github/checks/Makefile b/.github/checks/Makefile
index 93eeddd19..7fc51d8d4 100644
--- a/.github/checks/Makefile
+++ b/.github/checks/Makefile
@@ -5,14 +5,18 @@ endif
 
 ifdef CMD_EXE
 
-.PHONY: checkstyle
+.PHONY: checkstyle sorted
 
 checkstyle:
 	$(info INFO: style checks require bash.)
+sorted:
+	$(info INFO: table checks require bash.)
 
 else
 
-.PHONY: checkstyle lineendings tabs lastline spaces noexec
+.PHONY: checkstyle lineendings tabs lastline spaces noexec sorted
+
+all: checkstyle sorted
 
 checkstyle: lineendings tabs lastline spaces noexec
 
@@ -31,4 +35,12 @@ spaces: spaces.sh
 noexec: noexec.sh
 	@./noexec.sh
 
+sorted: sorted.sh sorted_codeopt.sh sorted_opcodes.sh
+	@./sorted.sh
+	@./sorted_codeopt.sh
+	@./sorted_opcodes.sh
+
+checksp: checksp.sh
+	@./checksp.sh
+
 endif
diff --git a/.github/checks/checksp.sh b/.github/checks/checksp.sh
new file mode 100755
index 000000000..f70d92e25
--- /dev/null
+++ b/.github/checks/checksp.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+OD65_EXE=../bin/od65
+CHECK_PATH=../../libwrk
+
+cd "${CHECK_PATH}" || {
+    echo "error: Directory ${CHECK_PATH} doesn't seem to exist" >&2
+    exit 1
+}
+
+[ -x "${OD65_EXE}" ] || {
+    echo "error: This check requires the od65 executable to be built" >&2
+    exit 1
+}
+
+EXITCODE=0
+find . -name \*.o -print | while read OBJ; do
+    "${OD65_EXE}" --dump-imports "${OBJ}" | grep -q "\"sp\"" && {
+        echo "error: Usage of symbol 'sp' found in module ${OBJ}" >&2
+        EXITCODE=1
+    }
+done
+exit ${EXITCODE}
diff --git a/.github/checks/lastline.sh b/.github/checks/lastline.sh
index d80d2fb57..6bb6e0dc5 100755
--- a/.github/checks/lastline.sh
+++ b/.github/checks/lastline.sh
@@ -9,7 +9,7 @@ nl='
 '
 nl=$'\n'
 r1="${nl}$"
-FILES=`find $CHECK_PATH -type f \( -name \*.inc -o -name Makefile -o -name \*.cfg -o -name \*.\[chs\] -o -name \*.mac -o -name \*.asm -o -name \*.sgml \) -print | while read f; do
+FILES=`find $CHECK_PATH -type f -size +0 \( -name \*.inc -o -name Makefile -o -name \*.cfg -o -name \*.\[chs\] -o -name \*.mac -o -name \*.asm -o -name \*.sgml \) -print | while read f; do
     t=$(tail -c2 $f; printf x)
     [[ ${t%x} =~ $r1 ]] || echo "$f"
 done`
@@ -23,3 +23,4 @@ if [ x"$FILES"x != xx ]; then
     done
     exit -1
 fi
+exit 0
diff --git a/.github/checks/lineendings.sh b/.github/checks/lineendings.sh
index 5b445522f..5baac514e 100755
--- a/.github/checks/lineendings.sh
+++ b/.github/checks/lineendings.sh
@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
     done
     exit -1
 fi
+exit 0
diff --git a/.github/checks/noexec.sh b/.github/checks/noexec.sh
index c76ae481d..5e53fe869 100755
--- a/.github/checks/noexec.sh
+++ b/.github/checks/noexec.sh
@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
     done
     exit -1
 fi
+exit 0
diff --git a/.github/checks/sorted.sh b/.github/checks/sorted.sh
new file mode 100755
index 000000000..e15c04475
--- /dev/null
+++ b/.github/checks/sorted.sh
@@ -0,0 +1,39 @@
+#! /bin/bash
+OLDCWD=`pwd`
+SCRIPT_PATH=`dirname $0`
+
+CHECK_DIR=../../src
+
+SORT_OPT="-u -c"
+
+# $1: filename
+function checkarray_quoted_name
+{
+    CHECK_FILE="$1"
+    START="\\/\\* BEGIN SORTED.SH \\*\\/"
+    END="\\/\\* END SORTED.SH \\*\\/"
+
+    awk '/'"$START"'/{flag=1; count++; next} /'"$END"'/{flag=0;} flag {printf("%04d##%s\n", count, $0)}' "$CHECK_FILE" | \
+        sed -e 's:\(.*\)##.*\"\(.*\)\".*:\1##\2:g' > .a.tmp
+
+    if [[ -z $(grep '[^[:space:]]' .a.tmp) ]] ; then
+        echo "error: "$1" table is empty"
+        rm -rf .a.tmp
+        exit -1
+    fi
+
+    if `LC_COLLATE=C sort $SORT_OPT .a.tmp`; then
+        echo ""$1" tables OK"
+    else
+        echo "error: "$1" tables are not sorted."
+        rm -rf .a.tmp
+        exit -1
+    fi
+    rm -rf .a.tmp
+}
+
+
+find "$CHECK_DIR" -name \*.\[ch\] -print | while read N; do
+    grep -q "BEGIN SORTED.SH" "$N" && checkarray_quoted_name "$N"
+done
+exit 0
diff --git a/.github/checks/sorted_codeopt.sh b/.github/checks/sorted_codeopt.sh
new file mode 100755
index 000000000..370bbfc9f
--- /dev/null
+++ b/.github/checks/sorted_codeopt.sh
@@ -0,0 +1,69 @@
+#! /bin/bash
+OLDCWD=`pwd`
+SCRIPT_PATH=`dirname $0`
+
+CHECK_DIR=../../src
+
+SORT_OPT="-u -c"
+
+# $1: filename
+function checkarray
+{
+    CHECK_FILE="$1"
+    START="\\/\\* BEGIN DECL SORTED_CODEOPT.SH \\*\\/"
+    END="\\/\\* END DECL SORTED_CODEOPT.SH \\*\\/"
+
+    awk '/'"$START"'/{flag=1; count++; next} /'"$END"'/{flag=0;} flag {printf("%04d##%s\n", count, $0)}' "$CHECK_FILE" | \
+        sed -e 's:\(.*##\).*"\(.*\)",.*:\1\2:g' > .a.tmp
+
+    if [[ -z $(grep '[^[:space:]]' .a.tmp) ]] ; then
+        echo "error: "$1" table is empty"
+        rm -rf .a.tmp
+        exit -1
+    fi
+
+    if `LC_COLLATE=C sort $SORT_OPT .a.tmp`; then
+        echo ""$1" decls sorted."
+    else
+        echo "error: "$1" decls are not sorted."
+        rm -rf .a.tmp
+        exit -1
+    fi
+
+    START="\\/\\* BEGIN SORTED_CODEOPT.SH \\*\\/"
+    END="\\/\\* END SORTED_CODEOPT.SH \\*\\/"
+
+    awk '/'"$START"'/{flag=1; count++; next} /'"$END"'/{flag=0;} flag {printf("%04d##%s\n", count, $0)}' "$CHECK_FILE" | \
+        sed -e 's:\(.*##\).*&D\(.*\),.*:\1\2:g' > .b.tmp
+
+    if [[ -z $(grep '[^[:space:]]' .b.tmp) ]] ; then
+        echo "error: "$1" table is empty"
+        rm -rf .a.tmp .b.tmp
+        exit -1
+    fi
+
+    if `LC_COLLATE=C sort $SORT_OPT .b.tmp`; then
+        echo ""$1" tables sorted."
+    else
+        echo "error: "$1" tables are not sorted."
+        rm -rf .a.tmp .b.tmp
+        exit -1
+    fi
+
+    if cmp --silent -- .a.tmp .b.tmp; then
+        echo ""$1" tables OK"
+    else
+        echo "error: "$1" tables are different."
+        diff -y .a.tmp .b.tmp
+        rm -rf .a.tmp .b.tmp
+        exit -1
+    fi
+
+    rm -rf .a.tmp .b.tmp
+}
+
+
+find "$CHECK_DIR" -name \*.\[ch\] -print | while read N; do
+    grep -q "BEGIN DECL SORTED_CODEOPT.SH" "$N" && checkarray "$N"
+done
+exit 0
diff --git a/.github/checks/sorted_opcodes.sh b/.github/checks/sorted_opcodes.sh
new file mode 100755
index 000000000..8f8764c6a
--- /dev/null
+++ b/.github/checks/sorted_opcodes.sh
@@ -0,0 +1,40 @@
+#! /bin/bash
+OLDCWD=`pwd`
+SCRIPT_PATH=`dirname $0`
+
+CHECK_DIR=../../src
+
+SORT_OPT="-u -c"
+
+# $1: filename
+function checkarray_quoted_name
+{
+    CHECK_FILE="$1"
+    START="\\/\\* BEGIN SORTED_OPCODES.SH \\*\\/"
+    END="\\/\\* END SORTED_OPCODES.SH \\*\\/"
+
+    awk '/'"$START"'/{flag=1; count++; next} /'"$END"'/{flag=0;} flag {printf("%04d##%s\n", count, $0)}' "$CHECK_FILE" | \
+        sed 's:/\*.*::g' | \
+        grep '".*",' | \
+        sed -e 's:\(.*\)##.*\"\(.*\)\".*:\1##\2:g' > .a.tmp
+
+    if [[ -z $(grep '[^[:space:]]' .a.tmp) ]] ; then
+        echo "error: "$1" table is empty"
+        rm -rf .a.tmp
+        exit -1
+    fi
+
+    if `LC_COLLATE=C sort $SORT_OPT .a.tmp`; then
+        echo ""$1" tables OK"
+    else
+        echo "error: "$1" tables are not sorted."
+        rm -rf .a.tmp
+        exit -1
+    fi
+    rm -rf .a.tmp
+}
+
+find "$CHECK_DIR" -name \*.\[ch\] -print | while read N; do
+    grep -q "BEGIN SORTED_OPCODES.SH" "$N" && checkarray_quoted_name "$N"
+done
+exit 0
diff --git a/.github/checks/spaces.sh b/.github/checks/spaces.sh
index 945e9acc3..f2eea6f3f 100755
--- a/.github/checks/spaces.sh
+++ b/.github/checks/spaces.sh
@@ -5,7 +5,7 @@ CHECK_PATH=.
 
 cd $SCRIPT_PATH/../../
 
-FILES=`find $CHECK_PATH -type f \( -name \*.inc -o -name Makefile -o -name \*.cfg -o -name \*.\[chs\] -o -name \*.mac -o -name \*.asm -o -name \*.sgml \) -print | grep -v "libwrk/" | grep -v "testwrk/" | xargs grep -l ' $'`
+FILES=`find $CHECK_PATH -type f \( -name \*.inc -o -name Makefile -o -name \*.cfg -o -name \*.\[chs\] -o -name \*.mac -o -name \*.asm -o -name \*.sgml \) -print | grep -v "test/" | grep -v "libwrk/" | grep -v "testwrk/" | xargs grep -l ' $'`
 
 cd $OLDCWD
 
@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
     done
     exit -1
 fi
+exit 0
diff --git a/.github/checks/tabs.sh b/.github/checks/tabs.sh
index 1c32def17..ed8d45bac 100755
--- a/.github/checks/tabs.sh
+++ b/.github/checks/tabs.sh
@@ -5,7 +5,7 @@ CHECK_PATH=.
 
 cd $SCRIPT_PATH/../../
 
-FILES=`find $CHECK_PATH -type f \( \( -name \*.inc -a \! -name Makefile.inc \) -o -name \*.cfg -o -name \*.\[chs\] -o -name \*.mac -o -name \*.asm -o -name \*.sgml \) -print | grep -v "libwrk/" | grep -v "testwrk/" | xargs grep -l $'\t'`
+FILES=`find $CHECK_PATH -type f \( \( -name \*.inc -a \! -name Makefile.inc \) -o -name \*.cfg -o -name \*.\[chs\] -o -name \*.mac -o -name \*.asm -o -name \*.sgml \) -print | grep -v "test/" | grep -v "libwrk/" | grep -v "testwrk/" | xargs grep -l $'\t'`
 
 cd $OLDCWD
 
@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
     done
     exit -1
 fi
+exit 0
diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
index 55be5db1e..f5aacca31 100644
--- a/.github/workflows/build-on-pull-request.yml
+++ b/.github/workflows/build-on-pull-request.yml
@@ -19,42 +19,51 @@ jobs:
       - shell: bash
         run: git config --global core.autocrlf input
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Do some simple style checks
         shell: bash
         run: make -j2 checkstyle
+      - name: Check bsearch tables
+        shell: bash
+        run: make -j2 sorted
       - name: Build the tools.
         shell: bash
-        run: make -j2 bin USER_CFLAGS=-Werror
+        run: make -j2 bin USER_CFLAGS=-Werror QUIET=1
+      - name: Build the dbginfo example
+        shell: bash
+        run: make -j2 -C src test QUIET=1
       - name: Build the utilities.
         shell: bash
-        run: make -j2 util
+        run: make -j2 util QUIET=1
       - name: Build the platform libraries.
         shell: bash
         run: make -j2 lib QUIET=1
+      - name: check test that no modules use sp
+        shell: bash
+        run: make -j2 checksp QUIET=1
       - name: Run the regression tests.
         shell: bash
-        run: make test QUIET=1
+        run: make -j2 test QUIET=1
       - name: Test that the samples can be built.
-        run: make -C samples platforms
+        run: make -C samples platforms QUIET=1
       - name: Test that the targettest programs can be built.
-        run: make -C targettest platforms
+        run: make -C targettest platforms QUIET=1
       - name: Build the document files.
         shell: bash
-        run: make -j2 doc
+        run: make -j2 doc QUIET=1
       - name: Upload a documents snapshot.
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs
           path: ./html
       - name: Build 64-bit Windows versions of the tools.
         run: |
-          make -C src clean
-          make -j2 bin USER_CFLAGS=-Werror CROSS_COMPILE=x86_64-w64-mingw32-
+          make -C src clean QUIET=1
+          make -j2 bin QUIET=1 USER_CFLAGS=-Werror CROSS_COMPILE=x86_64-w64-mingw32-
 
   build_windows:
-    name: Build (Windows)
+    name: Build and Test (Windows)
     runs-on: windows-latest
 
     steps:
@@ -62,13 +71,31 @@ jobs:
         run: git config --global core.autocrlf input
 
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
 
-      - name: Build app (debug)
-        run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Debug
+      - name: Build app (x86 debug)
+        run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Debug -property:Platform=Win32
 
-      - name: Build app (release)
-        run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Release
+      - name: Build app (x86 release)
+        run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Release -property:Platform=Win32
+
+      - name: Build app (x64 release)
+        run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Debug -property:Platform=x64
+
+      - name: Build app (x64 release)
+        run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Release -property:Platform=x64
+
+      - name: Build utils (MinGW)
+        shell: cmd
+        run: make -j2 util QUIET=1 SHELL=cmd
+
+      - name: Build the platform libraries (make lib)
+        shell: cmd
+        run: make -j2 lib QUIET=1 SHELL=cmd
+
+      - name: Run the regression tests (make test)
+        shell: cmd
+        run: make -j2 test QUIET=1 SHELL=cmd
diff --git a/.github/workflows/snapshot-on-push-master.yml b/.github/workflows/snapshot-on-push-master.yml
index 571947c9b..591b221be 100644
--- a/.github/workflows/snapshot-on-push-master.yml
+++ b/.github/workflows/snapshot-on-push-master.yml
@@ -18,10 +18,10 @@ jobs:
         run: git config --global core.autocrlf input
 
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Build app (debug)
         run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Debug
@@ -44,60 +44,63 @@ jobs:
       - shell: bash
         run: git config --global core.autocrlf input
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Do some simple style checks
         shell: bash
         run: make -j2 checkstyle
+      - name: Check bsearch tables
+        shell: bash
+        run: make -j2 sorted
       - name: Build the tools.
         shell: bash
         run: |
-            make -j2 bin USER_CFLAGS=-Werror
-            make -j2 util
+            make -j2 bin USER_CFLAGS=-Werror  QUIET=1
+            make -j2 util QUIET=1
       - name: Build the platform libraries.
         shell: bash
         run: make -j2 lib QUIET=1
       - name: Run the regression tests.
         shell: bash
-        run: make test QUIET=1
+        run: make -j2 test QUIET=1
       - name: Test that the samples can be built.
         shell: bash
-        run: make -j2 samples
+        run: make -j2 samples QUIET=1
       - name: Remove the output from the samples tests.
         shell: bash
-        run: make -C samples clean
+        run: make -C samples clean QUIET=1
       - name: Remove programs in util directory
         shell: bash
-        run: make -C util clean
+        run: make -C util clean QUIET=1
       - name: Build the document files.
         shell: bash
-        run: make -j2 doc
+        run: make -j2 doc QUIET=1
       - name: Build and package 64-bit Windows versions of the tools.
         run: |
-          make -C src clean
-          make -j2 bin USER_CFLAGS=-Werror CROSS_COMPILE=x86_64-w64-mingw32-
+          make -C src clean QUIET=1
+          make -j2 bin QUIET=1 USER_CFLAGS=-Werror CROSS_COMPILE=x86_64-w64-mingw32-
           make zip
           mv cc65.zip cc65-snapshot-win64.zip
       - name: Build and package 32-bit Windows versions of the tools.
         run: |
-          make -C src clean
-          make -j2 bin USER_CFLAGS=-Werror CROSS_COMPILE=i686-w64-mingw32-
+          make -C src clean QUIET=1
+          make -j2 bin USER_CFLAGS=-Werror QUIET=1 CROSS_COMPILE=i686-w64-mingw32-
           make zip
           mv cc65.zip cc65-snapshot-win32.zip
 
       - name: Upload a 32-bit Snapshot Zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cc65-snapshot-win32
           path: cc65-snapshot-win32.zip
       - name: Upload a 64-bit Snapshot Zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cc65-snapshot-win64
           path: cc65-snapshot-win64.zip
 
       - name: Get the online documents repo.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: cc65/doc
           # this token will expire, if it does, generate a new one as decribed in https://github.com/cc65/cc65/issues/2065
@@ -120,7 +123,7 @@ jobs:
       - name: Package offline documents.
         run: 7z a cc65-snapshot-docs.zip ./html/*.*
       - name: Upload a Documents Snapshot Zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cc65-snapshot-docs
           path: cc65-snapshot-docs.zip
diff --git a/.github/workflows/windows-test-scheduled.yml b/.github/workflows/windows-test-scheduled.yml
index 451b37f79..2e24e1d01 100644
--- a/.github/workflows/windows-test-scheduled.yml
+++ b/.github/workflows/windows-test-scheduled.yml
@@ -30,7 +30,7 @@ jobs:
         run: mkdir ~/.cache-sha
 
       - name: Cache SHA
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: check-sha
         with:
           path: ~/.cache-sha
@@ -43,11 +43,11 @@ jobs:
 
       - name: Checkout source
         if: steps.check-sha.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Add msbuild to PATH
         if: steps.check-sha.outputs.cache-hit != 'true'
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Build app (MSVC debug)
         if: steps.check-sha.outputs.cache-hit != 'true'
@@ -60,19 +60,19 @@ jobs:
       - name: Build utils (MinGW)
         if: steps.check-sha.outputs.cache-hit != 'true'
         shell: cmd
-        run: make -j2 util SHELL=cmd
+        run: make -j2 util SHELL=cmd QUIET=1
 
       - name: Build the platform libraries (make lib)
         if: steps.check-sha.outputs.cache-hit != 'true'
         shell: cmd
-        run: make -j2 lib QUIET=1 SHELL=cmd
+        run: make -j2 lib QUIET=1 SHELL=cmd QUIET=1
 
       - name: Run the regression tests (make test)
         if: steps.check-sha.outputs.cache-hit != 'true'
         shell: cmd
-        run: make test QUIET=1 SHELL=cmd
+        run: make -j2 test QUIET=1 SHELL=cmd QUIET=1
 
       - name: Test that the samples can be built (make samples)
         if: steps.check-sha.outputs.cache-hit != 'true'
         shell: cmd
-        run: make -j2 samples SHELL=cmd
+        run: make -j2 samples SHELL=cmd QUIET=1
diff --git a/Contributing.md b/Contributing.md
index 25c6217aa..10d687424 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -1,186 +1,321 @@
-This document contains all kinds of information that you should know if you want to contribute to the cc65 project. Before you start, please read all of it. If something is not clear to you, please ask - this document is an ongoing effort and may well be incomplete.
+Contributing to cc65
+====================
 
-(''Note:'' The word "must" indicates a requirement.  The word "should" indicates a recomendation.)
+This document contains all kinds of information that you
+should know if you want to contribute to the cc65 project.
+Before you start, please read all of it.  If something is not
+clear to you, please ask - this document is an ongoing effort
+and may well be incomplete. 
 
-*this is work in progress and is constantly updated - if in doubt, please ask*
+Also, before you put a lot of work into implementing
+something you want to contribute, please get in touch with
+one of the developers and ask if what you are going to do is
+actually wanted and has a chance of being merged.  Perhaps
+someone else is already working on it, or perhaps what you
+have in mind is not how we'd expect it to be - talking to us
+before you start might save you a lot of work in those cases.
 
-# generally
+(''Note:'' The word "must" indicates a requirement.  The word
+ "should" indicates a recomendation.)
 
-* You must obey these rules when contributing new code or documentation to cc65. We are well aware that not all existing code may respect all rules outlined here - but this is no reason for you not to respect them.
-* One commit/patch/PR per issue. Do not mix several things unless they are very closely related.
-* Sometimes when you make a PR, it may break completely unrelated tests. However, any PR is expected to merge cleanly with no failures. That means in practise that you are expected to fix/update the failing tests if required - for example this might be needed if you make changes to the compiler that changes the format of error- or warning messages. In that case you might have to update some reference files in the testbench. Obviously still check if that is actually the right thing to do ;)
+*this is work in progress and is constantly updated - if in
+doubt, please ask*
+
+# Generally
+
+* You must obey these rules when contributing new code or
+  documentation to cc65. We are well aware that not all
+  existing code may respect all rules outlined here - but this
+  is no reason for you not to respect them.
+* One commit/patch/PR per issue. Do not mix several things
+  unless they are very closely related.
+* Sometimes when you make a PR, it may break completely
+  unrelated tests. However, any PR is expected to merge
+  cleanly with no failures.  That means in practise that you
+  are expected to fix/update the failing tests if required -
+  for example this might be needed if you make changes to the
+  compiler that changes the format of error- or warning
+  messages.  In that case you might have to update some
+  reference files in the testbench.  Obviously still check if
+  that is actually the right thing to do. ;)
 
 # Codestyle rules
 
-## All Sources
+## All sources
 
 ### Line endings
 
-All files must only contain Unix style 'LF' line endings. Please configure your editors accordingly.
+All files must only contain Unix style 'LF' line endings.
+Please configure your editors accordingly.
 
 ### TABs and spaces
 
-This is an ongoing controversial topic - everyone knows that. However, the following is how we do it :)
+This is an ongoing controversial topic - everyone knows
+that.  However, the following is how we do it :)
 
 * TAB characters must be expanded to spaces.
-* 4 spaces per indention level (rather than 8) are preferred, especially if there are many different levels.
+* 4 spaces per indention level (rather than 8) are
+  preferred, especially if there are many different levels.
 * No extra spaces at the end of lines.
-* All text files must end with new-line characters.  Don't leave the last line "dangling".
+* All text files must end with new-line characters.  Don't
+  leave the last line "dangling".
 
-The (bash) scripts used to check the above rules can be found in ```.github/check```. You can also run all checks using ```make check```.
+The (bash) scripts used to check the above rules can be
+found in ```.github/check```.  You can also run all checks
+using ```make check```.
 
-### Identifiers and Symbol names
+### Identifiers and symbol names
 
-The C Standard defines certain identifiers and symbol names, which we can not use
-in our code. Since it is not always obvious which parts of the library code will
-actually end up in a linked program, the following applies to ALL of the library.
+The C Standard defines certain identifiers and symbol names,
+which we can not use in our code.  Since it is not always
+obvious which parts of the library code will actually end up
+in a linked program, the following applies to ALL of the
+library.
 
-Any non standard identifier/symbol/function that is exported from source files,
-or appears in header files:
+Any non standard identifier/symbol/function that is exported
+from source files, or appears in header files:
 
-* must not be in the "_symbol" form in C, or "__symbol" form in assembly.
-* must start with (at least) two (C Code) or three (assembly code) underscores, unless the symbol appears in a non standard header file.
+* must not be in the "_symbol" form in C, or "__symbol" form
+  in assembly,
+* must start with (at least) two (C Code) or three (assembly
+  code) underscores, unless the symbol appears in a non
+  standard header file.
 
-This is likely more than the standard dictates us to do - but it is certainly
-standard compliant - and easy to remember.
+This is likely more than the standard dictates us to do -
+but it is certainly standard compliant - and easy to
+remember.
 
-Also see the discussion in https://github.com/cc65/cc65/issues/1796
+Also see the discussion in
+https://github.com/cc65/cc65/issues/1796
 
-### misc
+### Miscellaneous
 
-* 80 characters is the desired maximum width of files.  But, it isn't a "strong" rule; sometimes, you will want to type longer lines, in order to keep the parts of expressions or comments together on the same line.
+* 80 characters is the desired maximum width of files.  But,
+  it isn't a "strong" rule; sometimes, you will want to type
+  longer lines, in order to keep the parts of expressions or
+  comments together on the same line.
 * You should avoid typing non-ASCII characters.
-* If you change "normal" source code into comments, then you must add a comment about why that code is a comment.
-* When you want to create a comment from several lines of code, you should use preprocessor lines, instead of ```/* */``` or "```;```".  Example:
-<pre>
+* If you change "normal" source code into comments, then you
+  must add a comment about why that code is a comment.
+* When you want to create a comment from several lines of
+  code, you should use preprocessor lines, instead of ```/*
+  */``` or "```;```".  Example:
+
+~~~C
 #if 0
-    one ();
-    two ();
-    three = two () + one ();
+  one (); two ();
+  three = two () + one ();
 #endif
-</pre>
+~~~
+
 * You should type upper case characters for hex values.
-* When you type zero-page addresses in hexadecimal, you should type two hex characters (after the hex prefix).  When you type non-zero-page addresses in hex, you should type four hex characters.
-* When you type lists of addresses, it is a good idea to sort them in ascending numerical order.  That makes it easier for readers to build mental pictures of where things are in an address space.  And, it is easier to see how big the variables and buffers are. Example:
-<pre>
+* When you type zero-page addresses in hexadecimal, you
+  should type two hex characters (after the hex prefix).
+  When you type non-zero-page addresses in hex, you should
+  type four hex characters.
+* When you type lists of addresses, it is a good idea to
+  sort them in ascending numerical order.  That makes it
+  easier for readers to build mental pictures of where things
+  are in an address space.  And, it is easier to see how big
+  the variables and buffers are.  Example:
+
+~~~asm
 xCoord := $0703
-yCoord := $0705        ; (this address implies that xCoord is 16 bits)
-cmdbuf := $0706        ; (this address implies that yCoord is 8 bits)
-cmdlen := $0786        ; (this address implies that cmdbuf is 128 bytes)
+yCoord := $0705 ; (this address implies that xCoord is 16 bits)
+cmdbuf := $0706 ; (this address implies that yCoord is 8 bits)
+cmdlen := $0786 ; (this address implies that cmdbuf is 128 bytes)
 color  := $0787
-</pre>
+~~~
 
-## C Sources
+## C sources
 
-The following is still very incomplete - if in doubt please look at existing sourcefiles and adapt to the existing style
+The following is still very incomplete - if in doubt please
+look at existing sourcefiles and adapt to the existing style.
 
-* Your files should generally obey the C89 standard, with a few C99 things (this is a bit similar to what cc65 itself supports). The exceptions are:
-   * use stdint.h for variables that require a certain bit size
-   * In printf-style functions use the PRIX64 (and similar) macros to deal with 64bit values (from inttypes.h)
-This list is not necessarily complete - if in doubt, please ask.
+Your files should generally obey the C89 standard, with a
+few C99 things (this is a bit similar to what cc65 itself
+supports). The exceptions are:
+
+* Use stdint.h for variables that require a certain bit size
+* In printf-style functions use the PRIX64 (and similar)
+  macros to deal with 64bit values (from inttypes.h) This
+  list is not necessarily complete - if in doubt, please ask.
 * We generally have a "no warnings" policy
-   * Warnings must not be hidden by using typecasts - fix the code instead
+* Warnings must not be hidden by using typecasts - fix the
+  code instead
 * The normal indentation width should be four spaces.
-* You must use ANSI C comments (```/* */```); you must not use C++ comments (```//```).
-* When you add functions to an existing file, you should separate them by the same number of blank lines that separate the functions that already are in that file.
-* All function declarations must be followed by a comment block that tells at least briefly what the function does, what the parameters are, and what is returned. This comment must sit between the declaration and the function body, like this:
-<pre>
+* You must use ANSI C comments (```/* */```); you must not
+  use C++ comments (```//```).
+* When you add functions to an existing file, you should
+  separate them by the same number of blank lines that
+  separate the functions that already are in that file.
+* All function declarations must be followed by a comment
+  block that tells at least briefly what the function does,
+  what the parameters are, and what is returned. This comment
+  must sit between the declaration and the function body, like
+  this:
+
+~~~C
 int foo(int bar)
 /* Add 1 to bar, takes bar and returns the result */
 {
     return bar + 1;
 }
-</pre>
-* When a function's argument list wraps around to a next line, you should indent that next line by either the normal width or enough spaces to align it with the arguments on the previous line.
-* All declarations in a block must be at the beginning of that block.
-* You should put a blank line between a list of local variable declarations and the first line of code.
-* Always use curly braces even for single statements after ```if```, and the single statement should go into a new line.
-* Use "cuddling" braces, ie the opening brace goes in the same line as the ```if```:
-<pre>
+~~~
+
+* When a function's argument list wraps around to a next
+  line, you should indent that next line by either the
+  normal width or enough spaces to align it with the arguments
+  on the previous line.
+* All declarations in a block must be at the beginning of
+  that block.
+* You should put a blank line between a list of local
+  variable declarations and the first line of code.
+* Always use curly braces even for single statements after
+  ```if```, and the single statement should go into a new
+  line.
+* Use "cuddling" braces, ie the opening brace goes in the
+  same line as the ```if```:
+
+~~~C
 if (foo > 42) {
     bar = 23;
 }
-</pre>
-* Should the ```if``` statement be followed by an empty conditional block, there should be a comment telling why this is the case
-<pre>
-if (check()) {
-    /* nothing happened, do nothing */
-}
-</pre>
-* You must separate function names and parameter/argument lists by one space.
-* When declaring/defining pointers, you must put the asterisk (```*```) next to the data type, with a space between it and the variable's name.  Examples:
-<pre>
-    int* namedPtr[5];
-    char* nextLine (FILE* f);
-</pre>
+~~~
+
+* Should the ```if``` statement be followed by an empty
+  conditional block, there should be a comment telling why
+  this is the case:
+
+~~~C
+if (check()) { /* nothing happened, do nothing */ }
+~~~
+
+* You must separate function names and parameter/argument
+  lists by one space.
+* When declaring/defining pointers, you must put the
+  asterisk (```*```) next to the data type, with a space
+  between it and the variable's name.  Examples:
+
+~~~C
+int* namedPtr[5];
+char* nextLine (FILE* f);
+~~~
 
 ### Header files
 
-Headers that belong to the standard library (libc) must conform with the C standard. That means:
-* all non standard functions, or functions that only exist in a certain standard, should be in #ifdefs
-    * the same is true for macros or typedefs
-<pre>
-#if __CC65_STD__ == __CC65_STD_C99__
-/* stuff that only exists in C99 here */
-#endif
-#if __CC65_STD__ == __CC65_STD_CC65__
-/* non standard stuff here */
-#endif
-</pre>
-You can refer to Annex B of the ISO C99 standard ([here](https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf) is the draft).
+* All Headers should start with a copyright/license banner
+* Function prototypes must be a single line, not contain the redundant
+  "extern" keyword, and followed by a brief comment that explains what
+  the function does, and separated from the next prototype by a blank
+  line:
 
-## Assembly Sources
+~~~C
+void __fastcall__ cclear (unsigned char length);
+/* Clear part of a line (write length spaces). */
 
-* Op-code mnemonics must have lower-case letters.  The names of instruction macroes may have upper-case letters.
-* Op-codes must use their official and commonly used mnemonics, ie bcc and bcs and not bgt and blt
-* Hexadecimal number constants should be used except where decimal or binary numbers make much more sense in that constant's context.
+~~~
+
+Headers that belong to the standard library (libc) must
+conform with the C standard. That means:
+
+* All non standard functions, or functions that only exist
+  in a certain standard, should be in #ifdefs
+* The same is true for macros or typedefs.
+  You can refer to Annex B of the ISO C99 standard
+  ([here](https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf)
+  is the draft).  Example:
+
+~~~C
+#if __CC65_STD__ == __CC65_STD_C99__ /* stuff that only exists in C99 here */
+#endif
+#if __CC65_STD__ == __CC65_STD_CC65__ /* non standard stuff here */
+#endif </pre>
+~~~
+
+## Assembly sources
+
+* Opcode mnemonics must have lower-case letters.  The names
+  of instruction macroes may have upper-case letters.
+* Opcodes must use their official and commonly used
+  mnemonics, ie 'bcc' and 'bcs' and not 'bgt' and 'blt'.
+* 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.) This must be done in one of the following ways:
-<pre>
+* 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.)
+  This must be done in one of the following ways:
+
+~~~asm
     lda #RETURN_VALUE
     ldx #0 ; Promote char return value
-</pre>
-or, if the value is 0, you can use:
-<pre>
+
+    ; If the value is 0, you can use:
     lda #RETURN_VALUE
     .assert RETURN_VALUE = 0
     tax
-</pre>
-sometimes jumping to return0 could save a byte:
-<pre>
+
+    ; Sometimes jumping to 'return 0' could save a byte:
     .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).
-* Assembly source fields (label, operation, operand, comment) should start ''after'' character columns that are multiples of eight (such as 1, 9, 17, 33, and 41).
+~~~
+
+* 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).
+* Assembly source fields (label, operation, operand,
+  comment) should start ''after'' character columns that are
+  multiples of eight (such as 1, 9, 17, 33, and 41).
   
-## LinuxDoc Sources
+## LinuxDoc sources
 
 * TAB characters must be expanded to spaces.
-* All text files must end with new-line characters.  Don't leave the last line "dangling".
+* All text files must end with new-line characters.  Don't
+  leave the last line "dangling".
 * 80 characters is the desired maximum width of files.
 * You should avoid typing non-ASCII characters.
 
 * You should put blank lines between LinuxDoc sections:
-  * Three blank lines between ```<sect>``` sections.
-  * Two blank lines between ```<sect1>``` sections.
-  * One blank line between other sections.
+* Three blank lines between ```<sect>``` sections.
+* Two blank lines between ```<sect1>``` sections.
+* One blank line between other sections.
 
 # Library implementation rules
 
-* By default the toolchain must output a "standard" binary for the platform, no emulator formats, no extra headers used by tools. If the resulting binaries can not be run as is on emulators or eg flash cartridges, the process of converting them to something that can be used with these should be documented in the user manual.
-* Generally every function should live in a seperate source file - unless the functions are so closely related that splitting makes no sense.
-* Source files should not contain commented out code - if they do, there should be a comment that explains why that commented out code exists.
+* By default the toolchain must output a "standard" binary
+  for the platform, no emulator formats, no extra headers
+  used by tools.  If the resulting binaries can not be run as
+  is on emulators or eg flash cartridges, the process of
+  converting them to something that can be used with these
+  should be documented in the user manual.
+* Generally every function should live in a seperate source
+  file - unless the functions are so closely related that
+  splitting makes no sense.
+* Source files should not contain commented out code - if
+  they do, there should be a comment that explains why that
+  commented out code exists.
 
 # Makefile rules
 
-* Makefiles must generally work on both *nix (ba)sh and windows cmd.exe.
-* Makefiles must not use external tools that are not provided by the cc65 toolchain itself.
+* Makefiles must generally work on both *nix (ba)sh and
+  windows cmd.exe.
+* Makefiles must not use external tools that are not
+  provided by the cc65 toolchain itself.
 
-The only exception to the above are actions that are exclusive to the github actions - those may rely on bash and/or linux tools.
+The only exception to the above are actions that are exclusive
+to the github actions - those may rely on bash and/or linux tools.
 
 # Documentation rules
 
@@ -190,107 +325,42 @@ The only exception to the above are actions that are exclusive to the github act
 
 ## Wiki
 
-* The Wiki is strictly for additional information that does not fit into the regular user manual (LinuxDoc). The wiki must not duplicate any information that is present in the user manual
+* The Wiki is strictly for additional information that does
+  not fit into the regular user manual (LinuxDoc).  The wiki
+  must not duplicate any information that is present in the
+  user manual.
 
-# Roadmap / TODOs / open Ends
+# Roadmap / TODOs / open ends
 
 ## Documentation
 
-* the printf family of function does not completely implement all printf modifiers and does not behave as expected in some cases - all this should be documented in detail
+* The printf() family of functions does not completely
+  implement all printf() modifiers and does not behave as
+  expected in some cases - all this should be documented in
+  detail.
 
 ## Compiler
 
-* We need a way that makes it possible to feed arbitrary assembler code into the optimzer, so we can have proper tests for it
+* We need a way that makes it possible to feed arbitrary
+  assembler code into the optimzer, so we can have proper
+  tests for it.
 
 ### Floating point support
 
-The first step is implementing the datatype "float" as IEEE 754 floats. Help welcomed!
+The first step is implementing the datatype "float" as IEEE
+754 floats.  Help welcomed!
 
-* WIP compiler/library changes are here: https://github.com/cc65/cc65/pull/1777
+* WIP compiler/library changes are here:
+  https://github.com/cc65/cc65/pull/1777
 
 ## Library
 
-### name clashes in the library
-
-see "Identifiers and Symbol names" above - not all identifiers have been checked
-and renamed yet. The following is a list of those that still might need to be
-fixed:
-
-```
-common
-
-__argc                  libsrc/runtime/callmain.s libsrc/cbm610/mainargs.s libsrc/cx16/mainargs.s libsrc/plus4/mainargs.s libsrc/lynx/mainargs.s libsrc/c16/mainargs.s libsrc/geos-common/system/mainargs.s libsrc/sim6502/mainargs.s libsrc/c128/mainargs.s libsrc/vic20/mainargs.s libsrc/nes/mainargs.s libsrc/atari/getargs.s libsrc/apple2/mainargs.s libsrc/cbm510/mainargs.s libsrc/telestrat/mainargs.s libsrc/c64/mainargs.s libsrc/pet/mainargs.s libsrc/atmos/mainargs.s 
-__argv                  libsrc/runtime/callmain.s libsrc/cbm610/mainargs.s libsrc/cx16/mainargs.s libsrc/plus4/mainargs.s libsrc/lynx/mainargs.s libsrc/c16/mainargs.s libsrc/geos-common/system/mainargs.s libsrc/sim6502/mainargs.s libsrc/c128/mainargs.s libsrc/vic20/mainargs.s libsrc/nes/mainargs.s libsrc/atari/getargs.s libsrc/apple2/mainargs.s libsrc/cbm510/mainargs.s libsrc/telestrat/mainargs.s libsrc/c64/mainargs.s libsrc/pet/mainargs.s libsrc/atmos/mainargs.s 
-__cos                   libsrc/common/sincos.s
-__ctypeidx              libsrc/common/ctype.s libsrc/common/ctypemask.s libsrc/geos-common/system/ctype.s libsrc/atari/ctype.s libsrc/cbm/ctype.s libsrc/atmos/ctype.s asminc/ctype_common.inc
-__cwd                   libsrc/common/getcwd.s libsrc/common/_cwd.s libsrc/atari/initcwd.s libsrc/apple2/initcwd.s libsrc/apple2/initcwd.s libsrc/telestrat/initcwd.s libsrc/cbm/initcwd.s
-__cwd_buf_size          libsrc/common/_cwd.s
-__envcount              libsrc/common/searchenv.s libsrc/common/_environ.s libsrc/common/putenv.s libsrc/common/getenv.s
-__environ               libsrc/common/searchenv.s libsrc/common/_environ.s libsrc/common/putenv.s libsrc/common/getenv.s
-__envsize               libsrc/common/_environ.s libsrc/common/putenv.s
-__fdesc                 libsrc/common/_fdesc.s libsrc/common/fopen.s
-__filetab               libsrc/common/_fdesc.s libsrc/common/_file.s asminc/_file.inc
-__fopen                 libsrc/common/fopen.s libsrc/common/_fopen.s
-__printf                libsrc/common/vsnprintf.s libsrc/common/_printf.s libsrc/common/vfprintf.s libsrc/conio/vcprintf.s libsrc/pce/_printf.s
-__scanf                 libsrc/common/_scanf.inc libsrc/common/vsscanf.s libsrc/conio/vcscanf.s
-__sin                   libsrc/common/sincos.s
-__sys                   libsrc/common/_sys.s libsrc/apple2/_sys.s
-__sys_oserrlist         libsrc/common/stroserr.s libsrc/geos-common/system/oserrlist.s libsrc/atari/oserrlist.s libsrc/apple2/oserrlist.s libsrc/cbm/oserrlist.s libsrc/atmos/oserrlist.s
-__syschdir              libsrc/common/chdir.s libsrc/atari/syschdir.s libsrc/apple2/syschdir.s libsrc/telestrat/syschdir.s libsrc/cbm/syschdir.s
-__sysmkdir              libsrc/common/mkdir.s libsrc/atari/sysmkdir.s libsrc/apple2/sysmkdir.s libsrc/telestrat/sysmkdir.s
-__sysremove             libsrc/common/remove.s libsrc/geos-common/file/sysremove.s libsrc/atari/sysremove.s libsrc/atari/sysrmdir.s libsrc/apple2/sysremove.s libsrc/apple2/sysrmdir.s libsrc/telestrat/sysremove.s libsrc/cbm/sysremove.s
-__sysrename             libsrc/common/rename.s libsrc/geos-common/file/sysrename.s libsrc/atari/sysrename.s libsrc/apple2/sysrename.s libsrc/cbm/sysrename.s
-__sysrmdir              libsrc/common/rmdir.s libsrc/atari/sysrmdir.s libsrc/apple2/sysrmdir.s
-__sysuname              libsrc/common/uname.s libsrc/cbm610/sysuname.s libsrc/cx16/sysuname.s libsrc/plus4/sysuname.s libsrc/lynx/sysuname.s libsrc/c16/sysuname.s libsrc/geos-common/system/sysuname.s libsrc/c128/sysuname.s libsrc/creativision/sysuname.s libsrc/vic20/sysuname.s libsrc/nes/sysuname.s libsrc/atari/sysuname.s libsrc/apple2/sysuname.s libsrc/cbm510/sysuname.s libsrc/telestrat/sysuname.s libsrc/c64/sysuname.s libsrc/pet/sysuname.s libsrc/atari5200/sysuname.s libsrc/atmos/sysuname.s
-
-apple2
-
-__auxtype               libsrc/apple2/open.s
-__datetime              libsrc/apple2/open.s
-__dos_type              libsrc/apple2/dioopen.s libsrc/apple2/curdevice.s libsrc/apple2/mainargs.s libsrc/apple2/settime.s libsrc/apple2/getdevice.s libsrc/apple2/dosdetect.s libsrc/apple2/irq.s libsrc/apple2/open.s libsrc/apple2/mli.s libsrc/apple2/getres.s
-__filetype              libsrc/apple2/open.s  libsrc/apple2/exehdr.s
-
-
-atari
-
-__defdev                libsrc/atari/posixdirent.s libsrc/atari/ucase_fn.s libsrc/atari/getdefdev.s
-__dos_type              libsrc/atari/getargs.s libsrc/atari/exec.s libsrc/atari/settime.s libsrc/atari/syschdir.s libsrc/atari/dosdetect.s libsrc/atari/is_cmdline_dos.s libsrc/atari/sysrmdir.s libsrc/atari/gettime.s libsrc/atari/lseek.s libsrc/atari/getres.s libsrc/atari/getdefdev.s
-__do_oserror            libsrc/atari/posixdirent.s libsrc/atari/do_oserr.s libsrc/atari/serref.s libsrc/atari/read.s libsrc/atari/write.s libsrc/atari/close.s
-__getcolor              libsrc/atari/setcolor.s
-__getdefdev             libsrc/atari/getdefdev.s
-__graphics              libsrc/atari/graphics.s
-__inviocb               libsrc/atari/serref.s libsrc/atari/ser/atrrdev.s libsrc/atari/inviocb.s libsrc/atari/read.s libsrc/atari/write.s libsrc/atari/lseek.s libsrc/atari/close.s
-__is_cmdline_dos        libsrc/atari/is_cmdline_dos.s libsrc/atari/doesclrscr.s
-__rest_vecs             libsrc/atari/savevec.s
-__rwsetup               libsrc/atari/rwcommon.s libsrc/atari/read.s libsrc/atari/write.s
-__save_vecs             libsrc/atari/savevec.s
-__scroll                libsrc/atari/scroll.s
-__setcolor              libsrc/atari/setcolor.s
-__setcolor_low          libsrc/atari/setcolor.s
-__sio_call              libsrc/atari/diowritev.s libsrc/atari/diopncls.s libsrc/atari/siocall.s libsrc/atari/diowrite.s libsrc/atari/dioread.s
-
-
-cbm
-
-__cbm_filetype          libsrc/cbm/cbm_filetype.s asminc/cbm_filetype.in
-__dirread               libsrc/cbm/dir.inc libsrc/cbm/dir.s
-__dirread1              libsrc/cbm/dir.inc libsrc/cbm/dir.s
-
-
-lynx
-
-__iodat                 libsrc/lynx/lynx-cart.s libsrc/lynx/bootldr.s libsrc/lynx/extzp.s libsrc/lynx/crt0.s libsrc/lynx/extzp.inc
-__iodir                 libsrc/lynx/extzp.s libsrc/lynx/crt0.s libsrc/lynx/extzp.inc
-__sprsys                libsrc/lynx/tgi/lynx-160-102-16.s libsrc/lynx/extzp.s libsrc/lynx/crt0.s libsrc/lynx/extzp.inc
-__viddma                libsrc/lynx/tgi/lynx-160-102-16.s libsrc/lynx/extzp.s libsrc/lynx/crt0.s libsrc/lynx/extzp.inc
-
-
-pce
-
-__nmi                   libsrc/pce/irq.s libsrc/pce/crt0.s
-```
+Some name clashes need to be resolved.  Please see the
+[detailed list of name clashes](libsrc/NameClashes.md).
 
 ## Test suite
 
-* specific tests to check the optimizer (rather than the codegenerator) are needed.
-* we need more specific tests to check standard conformance of the library headers
+* Specific tests to check the optimizer (rather than the code
+  generator) are needed.
+* We need more specific tests to check standard conformance
+  of the library headers.
diff --git a/Makefile b/Makefile
index 29fcbbf96..222fea5ac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,39 @@
-.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test util checkstyle check
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
+.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test util checkstyle check checkprefix
 
 .SUFFIXES:
 
-all install zip:
-	@$(MAKE) -C src     --no-print-directory $@
-	@$(MAKE) -C libsrc  --no-print-directory $@
-	@$(MAKE) -C doc     --no-print-directory $@
-	@$(MAKE) -C util    --no-print-directory $@
-	@$(MAKE) -C samples --no-print-directory $@
+all:
+	@$(MAKE) -C src         --no-print-directory $@
+	@$(MAKE) -C libsrc      --no-print-directory $@
+	@$(MAKE) -C doc         --no-print-directory $@
+	@$(MAKE) -C util        --no-print-directory $@
+	@$(MAKE) -C samples     --no-print-directory $@
+	@$(MAKE) checkprefix    --no-print-directory
+
+zip:
+	@$(MAKE) -C src         --no-print-directory $@
+	@$(MAKE) -C libsrc      --no-print-directory $@
+	@$(MAKE) -C doc         --no-print-directory $@
+	@$(MAKE) -C util        --no-print-directory $@
+	@$(MAKE) -C samples     --no-print-directory $@
+
+install:
+ifndef PREFIX
+ifndef DESTDIR
+	$(error Error: PREFIX or DESTDIR must be set for install to work)
+endif
+endif
+	@$(MAKE) -C src        --no-print-directory $@
+	@$(MAKE) -C libsrc     --no-print-directory $@
+	@$(MAKE) -C doc        --no-print-directory $@
+	@$(MAKE) -C util       --no-print-directory $@
+	@$(MAKE) -C samples    --no-print-directory $@
 
 mostlyclean clean:
 	@$(MAKE) -C src        --no-print-directory $@
@@ -18,30 +44,53 @@ mostlyclean clean:
 	@$(MAKE) -C test       --no-print-directory $@
 	@$(MAKE) -C targettest --no-print-directory $@
 
-avail unavail bin:
-	@$(MAKE) -C src     --no-print-directory $@
+avail unavail:
+# FIXME: actually not true, PREFIX is ignored?
+#ifndef PREFIX
+#    $(error Error: PREFIX must be set for avail/unavail to work)
+#endif
+	@$(MAKE) -C src        --no-print-directory $@
+
+bin:
+	@$(MAKE) -C src         --no-print-directory $@
+	@$(MAKE) checkprefix    --no-print-directory
 
 lib libtest:
-	@$(MAKE) -C libsrc  --no-print-directory $@
+	@$(MAKE) -C libsrc     --no-print-directory $@
 
 doc html info:
-	@$(MAKE) -C doc     --no-print-directory $@
+	@$(MAKE) -C doc        --no-print-directory $@
 
 samples:
-	@$(MAKE) -C samples --no-print-directory $@
+	@$(MAKE) -C samples    --no-print-directory $@
 
 util:
-	@$(MAKE) -C util    --no-print-directory $@
+	@$(MAKE) -C util       --no-print-directory $@
 
 %65:
-	@$(MAKE) -C src     --no-print-directory $@
+	@$(MAKE) -C src        --no-print-directory $@
 
 %:
-	@$(MAKE) -C libsrc  --no-print-directory $@
+	@$(MAKE) -C libsrc     --no-print-directory $@
+
+checkprefix:
+ifndef PREFIX
+ifndef DESTDIR
+	$(warning Warning: PREFIX and DESTDIR are empty - make install will not work)
+endif
+endif
 
 # check the code style
 checkstyle:
-	@$(MAKE) -C .github/checks       --no-print-directory $@
+	@$(MAKE) -C .github/checks --no-print-directory $@
+
+# check bsearch tables
+sorted:
+	@$(MAKE) -C .github/checks --no-print-directory $@
+
+# check that no modules use "sp", requires the binaries to be built first
+checksp:
+	@$(MAKE) -C .github/checks --no-print-directory $@
 
 # runs regression tests, requires libtest target libraries
 test:
@@ -50,6 +99,8 @@ test:
 # GNU "check" target, which runs all tests
 check:
 	@$(MAKE) -C .github/checks checkstyle --no-print-directory
+	@$(MAKE) -C .github/checks sorted     --no-print-directory
+	@$(MAKE) -C src test                  --no-print-directory
 	@$(MAKE) test
 	@$(MAKE) -C targettest platforms      --no-print-directory
 	@$(MAKE) -C samples platforms         --no-print-directory
diff --git a/README.md b/README.md
index f8a0d4ff2..891c31e86 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,63 @@
-# About cc65
+The cc65 cross-compiler suite
+=============================
 
-cc65 is a complete cross development package for 65(C)02 systems, including
-a powerful macro assembler, a C compiler, linker, archiver and several
-other tools. cc65 has C and runtime library support for many of the old 6502 machines.
-For details look at the [Website](https://cc65.github.io).
+cc65 is a complete cross-development package for 65(C)02 systems,
+including a powerful macro assembler, a C compiler, linker, archiver,
+simulator and several other tools.  cc65 has C and runtime library
+support for many of the old 6502 machines.  For details look at
+the [cc65 web site](https://cc65.github.io):
+
+| Company / People        | Machine / Environment               |
+|-------------------------|-------------------------------------|
+| Apple                   | Apple II                            |
+|                         | Apple IIe enhanced                  |
+| Atari                   | Atari 400/800                       |
+|                         | Atari 2600                          |
+|                         | Atari 5200                          |
+|                         | Atari 7800                          |
+|                         | Atari XL                            |
+|                         | Lynx                                |
+| Tangerine               | Oric Atmos                          |
+| Eureka                  | Oric Telestrat                      |
+| Acorn                   | BBC series                          |
+| Commodore               | C128                                |
+|                         | C16                                 |
+|                         | C64                                 |
+|                         | CBM 510/610                         |
+|                         | PET                                 |
+|                         | Plus/4                              |
+|                         | VIC-20                              |
+| VTech                   | CreatiVision                        |
+| Commander X16 Community | Commander X16                       |
+| Bit Corporation         | Gamate                              |
+| Berkeley Softworks      | GEOS (Apple/CBM)                    |
+| LUnix Team              | LUnix (C64)                         |
+| Nintendo                | Nintendo Entertainment System (NES) |
+| Ohio Scientific         | OSI C1P                             |
+| MOS Technology, Inc.    | KIM-1                               |
+| NEC                     | PC Engine (PCE)                     |
+| Dr. Jozo Dujmović       | Picocomputer (RP6502)               |
+| Watara                  | Watura/QuickShot Supervision        |
+| Synertek                | SYM-1                               |
+| USSR                    | Agat-7/9                            |
+
+A generic configuration to adapt cc65 to new targets is also around.
 
 ## People
 
-Project founder:
+cc65 is originally based on the "Small C" compiler by Ron Cain and
+enhanced by James E. Hendrix.
 
-* Ullrich von Bassewitz
+### Project founders
 
-Core team members:
+* John R. Dunning: [original implementation](https://public.websites.umich.edu/~archive/atari/8bit/Languages/Cc65/)
+  of the C compiler and runtime library, Atari hosted.
+* Ullrich von Bassewitz:
+  * moved Dunning's code to modern systems,
+  * rewrote most parts of the compiler,
+  * rewrote all of the runtime library.
+
+### Core team members
 
 * [Christian Groessler](https://github.com/groessler): Atari, Atari5200, and CreatiVision library Maintainer
 * [dqh](https://github.com/dqh-au): GHA help
@@ -19,7 +65,7 @@ Core team members:
 * [groepaz](https://github.com/mrdudz): CBM library, Project Maintainer
 * [Oliver Schmidt](https://github.com/oliverschmidt): Apple II library Maintainer
 
-External contributors:
+### External contributors
 
 * [acqn](https://github.com/acqn): various compiler fixes
 * [jedeoric](https://github.com/jedeoric): Telestrat target
@@ -28,31 +74,35 @@ External contributors:
 * [Stephan Mühlstrasser](https://github.com/smuehlst): osic1p target
 * [Wayne Parham](https://github.com/WayneParham): Sym-1 target
 * [Dave Plummer](https://github.com/davepl): KIM-1 target
+* [rumbledethumps](https://github.com/rumbledethumps): Picocomputer target
 
 *(The above list is incomplete, if you feel left out - please speak up or add yourself in a PR)*
 
-For a complete list look at the [full team list](https://github.com/orgs/cc65/teams) or the list of [all contributors](https://github.com/cc65/cc65/graphs/contributors)
+For a complete list look at the [full team list](https://github.com/orgs/cc65/teams)
+or the list of [all contributors](https://github.com/cc65/cc65/graphs/contributors).
 
 # Contact
 
-For general discussion, questions, etc subscribe to the [mailing list](https://cc65.github.io/mailing-lists.html) or use the [github discussions](https://github.com/cc65/cc65/discussions).
+For general discussion, questions, etc subscribe to the
+[mailing list](https://cc65.github.io/mailing-lists.html)
+or use the [github discussions](https://github.com/cc65/cc65/discussions).
 
-Some of us may also be around on IRC [#cc65](https://web.libera.chat/#cc65) on libera.chat
+Some of us may also be around on IRC [#cc65](https://web.libera.chat/#cc65) on libera.chat.
 
 # Documentation
 
-* The main [Documentation](https://cc65.github.io/doc) for users and developers
-
-* Info on [Contributing](Contributing.md) to the CC65 project. Please read this before working on something you want to contribute, and before reporting bugs.
-
-* The [Wiki](https://github.com/cc65/wiki/wiki) contains some extra info that does not fit into the regular documentation.
+* The main [Documentation](https://cc65.github.io/doc) for users and
+  developers.
+* Info on [Contributing](Contributing.md) to the CC65 project. Please
+  read this before working on something you want to contribute, and
+  before reporting bugs.
+* The [Wiki](https://github.com/cc65/wiki/wiki) contains some extra info
+  that does not fit into the regular documentation.
 
 # Downloads
 
 * [Windows 64bit Snapshot](https://sourceforge.net/projects/cc65/files/cc65-snapshot-win64.zip)
-
 * [Windows 32bit Snapshot](https://sourceforge.net/projects/cc65/files/cc65-snapshot-win32.zip)
-
 * [Linux Snapshot DEB and RPM](https://software.opensuse.org/download.html?project=home%3Astrik&package=cc65)
 
 [![Snapshot Build](https://github.com/cc65/cc65/actions/workflows/snapshot-on-push-master.yml/badge.svg?branch=master)](https://github.com/cc65/cc65/actions/workflows/snapshot-on-push-master.yml)
diff --git a/asminc/agat.inc b/asminc/agat.inc
new file mode 100644
index 000000000..b96d31834
--- /dev/null
+++ b/asminc/agat.inc
@@ -0,0 +1,39 @@
+
+;-----------------------------------------------------------------------------
+; Zero page stuff
+
+WNDLFT  :=      $20     ; Text window left
+WNDWDTH :=      $21     ; Text window width
+WNDTOP  :=      $22     ; Text window top
+WNDBTM  :=      $23     ; Text window bottom+1
+CH      :=      $24     ; Cursor horizontal position
+CV      :=      $25     ; Cursor vertical position
+BASL    :=      $28     ; Text base address low
+BASH    :=      $29     ; Text base address high
+CURSOR  :=      $2D     ; Cursor character
+TATTR   :=      $32     ; Text attributes
+PROMPT  :=      $33     ; Used by GETLN
+VCOUT   :=      $36     ; COUT Subroutine Vector
+VCIN    :=      $38     ; CIN Subroutine Vector
+RNDL    :=      $4E     ; Random counter low
+RNDH    :=      $4F     ; Random counter high
+HIMEM   :=      $73     ; Highest available memory address+1
+
+;-----------------------------------------------------------------------------
+; Vectors
+
+DOSWARM :=      $03D0   ; DOS warmstart vector
+BRKVec  :=      $03F0   ; Break vector
+SOFTEV  :=      $03F2   ; Vector for warm start
+PWREDUP :=      $03F4   ; This must be = EOR #$A5 of SOFTEV+1
+
+;-----------------------------------------------------------------------------
+; Hardware
+
+; Keyboard input
+KBD     :=      $C000   ; Read keyboard
+KBDSTRB :=      $C010   ; Clear keyboard strobe
+
+; Game controller
+BUTN0   :=      $C061   ; Open-Apple Key
+BUTN1   :=      $C062   ; Closed-Apple Key
diff --git a/asminc/apple2.inc b/asminc/apple2.inc
index 528c463a1..bde383882 100644
--- a/asminc/apple2.inc
+++ b/asminc/apple2.inc
@@ -24,6 +24,14 @@ DOSWARM :=      $03D0   ; DOS warmstart vector
 BRKVec  :=      $03F0   ; Break vector
 SOFTEV  :=      $03F2   ; Vector for warm start
 PWREDUP :=      $03F4   ; This must be = EOR #$A5 of SOFTEV+1
+ROM_RST :=      $FFFC   ; 6502 reset vector
+ROM_IRQ :=      $FFFE   ; 6502 IRQ vector
+
+;-----------------------------------------------------------------------------
+; 80 column firmware
+
+OURCH   :=      $057B   ; Cursor horizontal position
+OURCV   :=      $05FB   ; Cursor vertical position
 
 ;-----------------------------------------------------------------------------
 ; Hardware
diff --git a/asminc/apple2.mac b/asminc/apple2.mac
index b9860c092..c0c957102 100644
--- a/asminc/apple2.mac
+++ b/asminc/apple2.mac
@@ -36,6 +36,12 @@
                 ; Just output the character
                 _scrcode        arg1
 
+        ; Check for an identifier
+        .elseif .match (.left (1, {arg1}), identifier)
+
+                ; Just output the identifier
+                _scrcode        arg1
+
         ; Anything else is an error
         .else
 
diff --git a/asminc/atari.mac b/asminc/atari.mac
index 3916254d0..952af8732 100644
--- a/asminc/atari.mac
+++ b/asminc/atari.mac
@@ -46,6 +46,12 @@
                 ; Just output the character
                 _scrcode        arg1
 
+        ; Check for an identifier
+        .elseif .match (.left (1, {arg1}), identifier)
+
+                ; Just output the identifier
+                _scrcode        arg1
+
         ; Anything else is an error
         .else
 
diff --git a/asminc/c65.inc b/asminc/c65.inc
new file mode 100644
index 000000000..ff3572f1f
--- /dev/null
+++ b/asminc/c65.inc
@@ -0,0 +1,239 @@
+
+; ---------------------------------------------------------------------------
+; Zero page, Commodore stuff
+
+TXTPTR          := $3C          ; Pointer into BASIC source code
+STATUS          := $90          ; Kernal I/O completion status
+FNAM_LEN        := $B7          ; Length of filename
+SECADR          := $B9          ; Secondary address
+DEVNUM          := $BA          ; Device number
+FNAM            := $BB          ; Address of filename
+FNAM_BANK       := $BE          ; Bank for filename
+KEY_COUNT       := $D0          ; Number of keys in input buffer
+FKEY_COUNT      := $D1          ; Characters for function key
+MODE            := $D7          ; 40-/80-column mode (bit 7: 80 columns)
+GRAPHM          := $D8          ; Graphics mode flags (bits 5-7)
+CHARDIS         := $D9          ; Bit 2 shadow for location $01
+CURS_X          := $EC          ; Cursor column
+CURS_Y          := $EB          ; Cursor row
+SCREEN_PTR      := $E0          ; Pointer to current char in text screen
+CRAM_PTR        := $E2          ; Pointer to current char in color RAM
+CHARCOLOR       := $F1
+RVS             := $F3          ; Reverse output flag
+SCROLL          := $F8          ; Disable scrolling flag
+
+BASIC_BUF       := $0200        ; Location of command-line
+BASIC_BUF_LEN   = 161           ; Maximum length of command-line
+
+FKEY_LEN        := $1000        ; Function key lengths
+FKEY_TEXT       := $100A        ; Function key texts
+
+PALFLAG         := $1103        ; $FF=PAL, $00=NTSC
+INIT_STATUS     := $1104        ; Flags: Reset/Restore initiation status
+TIME            := $110C        ; 60HZ clock
+
+KBDREPEAT       := $111a
+KBDREPEATRATE   := $111b
+KBDREPEATDELAY  := $111c
+
+; ---------------------------------------------------------------------------
+; Vectors
+
+IRQVec          := $0314
+BRKVec          := $0316
+NMIVec          := $0318
+
+; ---------------------------------------------------------------------------
+; I/O: VIC
+
+VIC             := $D000
+VIC_SPR0_X      := $D000
+VIC_SPR0_Y      := $D001
+VIC_SPR1_X      := $D002
+VIC_SPR1_Y      := $D003
+VIC_SPR2_X      := $D004
+VIC_SPR2_Y      := $D005
+VIC_SPR3_X      := $D006
+VIC_SPR3_Y      := $D007
+VIC_SPR4_X      := $D008
+VIC_SPR4_Y      := $D009
+VIC_SPR5_X      := $D00A
+VIC_SPR5_Y      := $D00B
+VIC_SPR6_X      := $D00C
+VIC_SPR6_Y      := $D00D
+VIC_SPR7_X      := $D00E
+VIC_SPR7_Y      := $D00F
+VIC_SPR_HI_X    := $D010
+VIC_SPR_ENA     := $D015
+VIC_SPR_EXP_Y   := $D017
+VIC_SPR_EXP_X   := $D01D
+VIC_SPR_MCOLOR  := $D01C
+VIC_SPR_BG_PRIO := $D01B
+VIC_SPR_COLL    := $D01E
+VIC_SPR_BG_COLL := $D01F
+
+VIC_SPR_MCOLOR0 := $D025
+VIC_SPR_MCOLOR1 := $D026
+
+VIC_SPR0_COLOR  := $D027
+VIC_SPR1_COLOR  := $D028
+VIC_SPR2_COLOR  := $D029
+VIC_SPR3_COLOR  := $D02A
+VIC_SPR4_COLOR  := $D02B
+VIC_SPR5_COLOR  := $D02C
+VIC_SPR6_COLOR  := $D02D
+VIC_SPR7_COLOR  := $D02E
+
+VIC_CTRL1       := $D011
+VIC_CTRL2       := $D016
+
+VIC_HLINE       := $D012
+
+VIC_LPEN_X      := $D013
+VIC_LPEN_Y      := $D014
+
+VIC_VIDEO_ADR   := $D018
+
+VIC_IRR         := $D019        ; Interrupt request register
+VIC_IMR         := $D01A        ; Interrupt mask register
+
+VIC_BORDERCOLOR := $D020
+VIC_BG_COLOR0   := $D021
+VIC_BG_COLOR1   := $D022
+VIC_BG_COLOR2   := $D023
+VIC_BG_COLOR3   := $D024
+
+
+; ---------------------------------------------------------------------------
+; I/O: FDC
+
+FDC             := $D080
+
+; ---------------------------------------------------------------------------
+; I/O: SID
+
+SID1            := $D400
+SID1_S1Lo       := $D400
+SID1_S1Hi       := $D401
+SID1_PB1Lo      := $D402
+SID1_PB1Hi      := $D403
+SID1_Ctl1       := $D404
+SID1_AD1        := $D405
+SID1_SUR1       := $D406
+
+SID1_S2Lo       := $D407
+SID1_S2Hi       := $D408
+SID1_PB2Lo      := $D409
+SID1_PB2Hi      := $D40A
+SID1_Ctl2       := $D40B
+SID1_AD2        := $D40C
+SID1_SUR2       := $D40D
+
+SID1_S3Lo       := $D40E
+SID1_S3Hi       := $D40F
+SID1_PB3Lo      := $D410
+SID1_PB3Hi      := $D411
+SID1_Ctl3       := $D412
+SID1_AD3        := $D413
+SID1_SUR3       := $D414
+
+SID1_FltLo      := $D415
+SID1_FltHi      := $D416
+SID1_FltCtl     := $D417
+SID1_Amp        := $D418
+SID1_ADConv1    := $D419
+SID1_ADConv2    := $D41A
+SID1_Noise      := $D41B
+SID1_Read3      := $D41C
+
+SID2            := $D420
+SID2_S1Lo       := $D420
+SID2_S1Hi       := $D421
+SID2_PB1Lo      := $D422
+SID2_PB1Hi      := $D423
+SID2_Ctl1       := $D424
+SID2_AD1        := $D425
+SID2_SUR1       := $D426
+
+SID2_S2Lo       := $D427
+SID2_S2Hi       := $D428
+SID2_PB2Lo      := $D429
+SID2_PB2Hi      := $D42A
+SID2_Ctl2       := $D42B
+SID2_AD2        := $D42C
+SID2_SUR2       := $D42D
+
+SID2_S3Lo       := $D42E
+SID2_S3Hi       := $D42F
+SID2_PB3Lo      := $D430
+SID2_PB3Hi      := $D431
+SID2_Ctl3       := $D432
+SID2_AD3        := $D433
+SID2_SUR3       := $D434
+
+SID2_FltLo      := $D435
+SID2_FltHi      := $D436
+SID2_FltCtl     := $D437
+SID2_Amp        := $D438
+SID2_ADConv1    := $D439
+SID2_ADConv2    := $D43A
+SID2_Noise      := $D43B
+SID2_Read3      := $D43C
+
+; ---------------------------------------------------------------------------
+; I/O: Complex Interface Adapters
+
+CIA1            := $DC00
+CIA1_PRA        := $DC00        ; Port A
+CIA1_PRB        := $DC01        ; Port B
+CIA1_DDRA       := $DC02        ; Data direction register for port A
+CIA1_DDRB       := $DC03        ; Data direction register for port B
+CIA1_TA         := $DC04        ; 16-bit timer A
+CIA1_TB         := $DC06        ; 16-bit timer B
+CIA1_TOD10      := $DC08        ; Time-of-day tenths of a second
+CIA1_TODSEC     := $DC09        ; Time-of-day seconds
+CIA1_TODMIN     := $DC0A        ; Time-of-day minutes
+CIA1_TODHR      := $DC0B        ; Time-of-day hours
+CIA1_SDR        := $DC0C        ; Serial data register
+CIA1_ICR        := $DC0D        ; Interrupt control register
+CIA1_CRA        := $DC0E        ; Control register for timer A
+CIA1_CRB        := $DC0F        ; Control register for timer B
+
+CIA2            := $DD00
+CIA2_PRA        := $DD00
+CIA2_PRB        := $DD01
+CIA2_DDRA       := $DD02
+CIA2_DDRB       := $DD03
+CIA2_TA         := $DD04
+CIA2_TB         := $DD06
+CIA2_TOD10      := $DD08
+CIA2_TODSEC     := $DD09
+CIA2_TODMIN     := $DD0A
+CIA2_TODHR      := $DD0B
+CIA2_SDR        := $DD0C
+CIA2_ICR        := $DD0D
+CIA2_CRA        := $DD0E
+CIA2_CRB        := $DD0F
+
+; ---------------------------------------------------------------------------
+; I/O: DMA
+
+DMA             := $D700
+
+
+; ---------------------------------------------------------------------------
+; Processor Port at $01
+
+LORAM           = $01           ; Enable the basic rom
+HIRAM           = $02           ; Enable the kernal rom
+IOEN            = $04           ; Enable I/O
+CASSDATA        = $08           ; Cassette data
+CASSPLAY        = $10           ; Cassette: Play
+CASSMOT         = $20           ; Cassette motor on
+TP_FAST         = $80           ; Switch Rossmoeller TurboProcess to fast mode
+
+RAMONLY         = $F8           ; (~(LORAM | HIRAM | IOEN)) & $FF
+
+; temporary, to get conio working
+XSIZE = 80
+YSIZE = 50
diff --git a/asminc/cbm.mac b/asminc/cbm.mac
index 6d7ac7e8d..5c542b228 100644
--- a/asminc/cbm.mac
+++ b/asminc/cbm.mac
@@ -40,6 +40,12 @@
                 ; Just output the character
                 _scrcode        arg1
 
+        ; Check for an identifier
+        .elseif .match (.left (1, {arg1}), identifier)
+
+                ; Just output the identifier
+                _scrcode        arg1
+
         ; Anything else is an error
         .else
                 .error  "scrcode: invalid argument type"
diff --git a/asminc/cbm_kernal.inc b/asminc/cbm_kernal.inc
index 4d78cf93f..f06483a47 100644
--- a/asminc/cbm_kernal.inc
+++ b/asminc/cbm_kernal.inc
@@ -63,6 +63,43 @@
   MOUSE_GET                     := $FF6B
 .endif
 
+.if .def (__MEGA65__)
+  ; extended C65 jump table
+
+; memory before $ff3b is all $ff in mega65 ROM?
+;  VERSIONQ     := $FF2F
+;  RESET_RUN    := $FF32
+;  CURSOR       := $FF35
+
+  SAVEFL       := $FF3B
+  GETIO        := $FF41
+  GETLFS       := $FF44
+  KEYLOCKS     := $FF47
+  ADDKEY       := $FF4A
+.endif
+
+.if .def(__C65__) || .def (__MEGA65__)
+  CURSOR       := $E030     ; in editor ROM
+
+  SPIN_SPOUT   := $FF4D
+  CLSALL       := $FF50
+  C64MODE      := $FF53
+  MonitorCall  := $FF56
+  BOOT_SYS     := $FF59
+  PHOENIX      := $FF5C
+  LKUPLA       := $FF5F
+  LKUPSA       := $FF62
+  SWAPPER      := $FF65
+  PFKEY        := $FF68
+  SETBNK       := $FF6B
+  JSRFAR       := $FF6E
+  JMPFAR       := $FF71
+  LDA_FAR      := $FF74
+  STA_FAR      := $FF77
+  CMP_FAR      := $FF7A
+  PRIMM        := $FF7D
+.endif
+
 .if .def(__C128__)
   ; C128 extended jump table
   C64MODE      := $FF4D
@@ -83,7 +120,7 @@
   PRIMM        := $FF7D
 .endif
 
-.if .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__)
+.if .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__) || .def(__C65__) || .def (__MEGA65__)
   CINT         := $FF81
   IOINIT       := $FF84
   RAMTAS       := $FF87
@@ -96,7 +133,7 @@
   CINT         := $FF7E
 .endif
 
-.if .def(__VIC20__) || .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__)
+.if .def(__VIC20__) || .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__) || .def(__C65__) || .def (__MEGA65__)
   RESTOR       := $FF8A
   VECTOR       := $FF8D
 .elseif .def(__CBM510__) || .def(__CBM610__)
@@ -112,6 +149,17 @@
   MEMBOT       := $FF9C
   SCNKEY       := $FF9F
   SETTMO       := $FFA2
+.elseif .def(__C65__) || .def (__MEGA65__)
+  SETMSG       := $FF90
+  SECOND       := $FF93
+  TKSA         := $FF96
+  MEMTOP       := $FF99
+  MEMBOT       := $FF9C
+  SCNKEY       := $FF9F
+  MONEXIT      := $FFA2
+.endif
+
+.if .def(__CBM510__) || .def(__CBM610__) || .def(__VIC20__) || .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__) || .def(__C65__) || .def(__MEGA65__)
   ACPTR        := $FFA5
   CIOUT        := $FFA8
   UNTLK        := $FFAB
@@ -136,7 +184,7 @@ CHRIN          := $FFCF
 BSOUT          := $FFD2
 CHROUT         := $FFD2
 
-.if .def(__CBM510__) || .def(__CBM610__) || .def(__VIC20__) || .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__)
+.if .def(__CBM510__) || .def(__CBM610__) || .def(__VIC20__) || .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__) || .def(__C65__) || .def(__MEGA65__)
   LOAD         := $FFD5
   SAVE         := $FFD8
   SETTIM       := $FFDB
@@ -147,9 +195,14 @@ CHROUT         := $FFD2
 STOP           := $FFE1
 GETIN          := $FFE4
 CLALL          := $FFE7
-UDTIM          := $FFEA
 
-.if .def(__CBM510__) || .def(__CBM610__) || .def(__VIC20__) || .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__)
+.if .def(__C65__) || .def(__MEGA65__)
+ScanStopKey    := $FFEA
+.else
+UDTIM          := $FFEA
+.endif
+
+.if .def(__CBM510__) || .def(__CBM610__) || .def(__VIC20__) || .def(__C64__) || .def(__C128__) || .def(__C16__) || .def(__CX16__) || .def(__C65__) || .def(__MEGA65__)
   SCREEN       := $FFED
   PLOT         := $FFF0
   IOBASE       := $FFF3
@@ -173,10 +226,10 @@ UDTIM          := $FFEA
   KBDREAD      := $E5CF
   UPDCRAMPTR   := $EAB2
 .elseif .def(__C64__)
-  CLRSCR       := $E544
-  KBDREAD      := $E5B4
+  CLRSCR       := $E544     ; Clear the screen
+  KBDREAD      := $E5B4     ; Get Character From Keyboard Buffer
   NMIEXIT      := $FEBC
-  UPDCRAMPTR   := $EA24
+  UPDCRAMPTR   := $EA24     ; Update color ram pointer
 .elseif .def(__C128__)
   CLRSCR       := $C142
   KBDREAD      := $C006
@@ -189,4 +242,7 @@ UDTIM          := $FFEA
 .elseif .def(__C16__)
   CLRSCR       := $D88B
   KBDREAD      := $D8C1
+.elseif .def(__C65__) ||  .def(__MEGA65__)
+;  CLRSCR       := $E0EC ; ???
+  KBDREAD      := $E006
 .endif
diff --git a/asminc/cpu.mac b/asminc/cpu.mac
index 31170fbed..092519173 100644
--- a/asminc/cpu.mac
+++ b/asminc/cpu.mac
@@ -1,24 +1,4 @@
-; CPU bitmask constants
-CPU_ISET_NONE      = $0001
-CPU_ISET_6502      = $0002
-CPU_ISET_6502X     = $0004
-CPU_ISET_6502DTV   = $0008
-CPU_ISET_65SC02    = $0010
-CPU_ISET_65C02     = $0020
-CPU_ISET_65816     = $0040
-CPU_ISET_SWEET16   = $0080
-CPU_ISET_HUC6280   = $0100
-;CPU_ISET_M740     = $0200 not actually implemented
-CPU_ISET_4510      = $0400
-
-; CPU capabilities
-CPU_NONE           = CPU_ISET_NONE
-CPU_6502           = CPU_ISET_6502
-CPU_6502X          = CPU_ISET_6502|CPU_ISET_6502X
-CPU_6502DTV        = CPU_ISET_6502|CPU_ISET_6502X|CPU_ISET_6502DTV
-CPU_65SC02         = CPU_ISET_6502|CPU_ISET_65SC02
-CPU_65C02          = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02
-CPU_65816          = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65816
-CPU_SWEET16        = CPU_ISET_SWEET16
-CPU_HUC6280        = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_HUC6280
-CPU_4510           = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_4510
+; This file is no longer needed as the symbols that were defined here are now
+; internal symbols generated by the assembler. It is kept to avoid breaking
+; old sources.
+.warning "'.macpack cpu' is no longer required"
diff --git a/asminc/lynx.inc b/asminc/lynx.inc
index 403d15d07..150bee6d1 100644
--- a/asminc/lynx.inc
+++ b/asminc/lynx.inc
@@ -79,19 +79,91 @@ MATHL       = $FC6D
 MATHK       = $FC6E
 MATHJ       = $FC6F
 
-; Suzy Misc
+; Suzy sprite engine
+
+SPRCTL0          = $FC80
+; Sprite bits-per-pixel definitions
+BPP_MASK         = %11000000  ; Mask for settings bits per pixel
+BPP_1            = %00000000
+BPP_2            = %01000000
+BPP_3            = %10000000
+BPP_4            = %11000000
+; More sprite control 0 bit definitions
+HFLIP            = %00100000
+VFLIP            = %00010000
+; Sprite types - redefined to reflect the reality caused by the shadow error
+TYPE_SHADOW      = %00000111
+TYPE_XOR         = %00000110
+TYPE_NONCOLL     = %00000101  ; Non-colliding
+TYPE_NORMAL      = %00000100
+TYPE_BOUNDARY    = %00000011
+TYPE_BSHADOW     = %00000010  ; Background shadow
+TYPE_BACKNONCOLL = %00000001  ; Background non-colliding
+TYPE_BACKGROUND  = %00000000
 
-SPRCTL0     = $FC80
 SPRCTL1     = $FC81
-SPRCOLL     = $FC82
-SPRINIT     = $FC83
-SUZYHREV    = $FC88
-SUZYSREV    = $FC89
-SUZYBUSEN   = $FC90
-SPRGO       = $FC91
-SPRSYS      = $FC92
-JOYSTICK    = $FCB0
+LITERAL     = %10000000
+PACKED      = %00000000
+ALGO3       = %01000000  ; Broken, do not set this bit!
+; Sprite reload mask definitions
+RELOAD_MASK = %00110000
+RENONE      = %00000000  ; Reload nothing
+REHV        = %00010000  ; Reload hsize, vsize
+REHVS       = %00100000  ; Reload hsize, vsize, stretch
+REHVST      = %00110000  ; Reload hsize, vsize, stretch, tilt
+; More sprite control 1 bit definitions
+REUSEPAL    = %00001000
+SKIP        = %00000100
+DRAWUP      = %00000010
+DRAWLEFT    = %00000001
+
+SPRCOLL   = $FC82
+SPRINIT   = $FC83
+SUZYHREV  = $FC88
+SUZYSREV  = $FC89
+SUZYBUSEN = $FC90
+
+SPRGO = $FC91
+; SPRGO bit definitions
+SPRITE_GO = %00000001  ; sprite process start bit
+EVER_ON   = %00000100  ; everon detector enable
+
+SPRSYS = $FC92
+; SPRSYS bit definitions for write operations
+SIGNMATH      = %10000000  ; signed math
+ACCUMULATE    = %01000000  ; accumulate multiplication results
+NO_COLLIDE    = %00100000  ; do not collide with any sprites (also SPRCOLL bit definition)
+VSTRETCH      = %00010000  ; stretch v
+LEFTHAND      = %00001000
+CLR_UNSAFE    = %00000100  ; unsafe access reset
+SPRITESTOP    = %00000010  ; request to stop sprite process
+; SPRSYS bit definitions for read operations
+MATHWORKING   = %10000000  ; math operation in progress
+MATHWARNING   = %01000000  ; accumulator overflow on multiple or divide by zero
+MATHCARRY     = %00100000  ; last carry bit
+VSTRETCHING   = %00010000
+LEFTHANDED    = %00001000
+UNSAFE_ACCESS = %00000100  ; unsafe access performed
+SPRITETOSTOP  = %00000010  ; requested to stop
+SPRITEWORKING = %00000001  ; sprite process is active
+
+JOYSTICK = $FCB0
+; JOYSTICK bit definitions
+JOYPAD_UP      = %10000000
+JOYPAD_DOWN    = %01000000
+JOYPAD_LEFT    = %00100000
+JOYPAD_RIGHT   = %00010000
+BUTTON_OPTION1 = %00001000
+BUTTON_OPTION2 = %00000100
+BUTTON_INNER   = %00000010
+BUTTON_OUTER   = %00000001
+
 SWITCHES    = $FCB1
+; SWITCHES bit definitions
+CART1_IO_INACTIVE = %00000100
+CART0_IO_INACTIVE = %00000010
+BUTTON_PAUSE      = %00000001
+
 RCART0      = $FCB2
 RCART1      = $FCB3
 LEDS        = $FCC0
@@ -99,181 +171,290 @@ PARSTATUS   = $FCC2
 PARDATA     = $FCC3
 HOWIE       = $FCC4
 
-
-; ***
+;
 ; *** Mikey Addresses
 ; ***
 
-; Mikey Timers
+; Mikey timers
 
-TIMER0      = $FD00
-TIMER1      = $FD04
-TIMER2      = $FD08
-TIMER3      = $FD0C
-TIMER4      = $FD10
-TIMER5      = $FD14
-TIMER6      = $FD18
-TIMER7      = $FD1C
-HTIMER      = $FD00             ; horizontal line timer (timer 0)
-VTIMER      = $FD08             ; vertical blank timer (timer 2)
-STIMER      = $FD1C             ; sound timer (timer 7)
+; Logical timer names
+TIMER0 = $FD00
+TIMER1 = $FD04
+TIMER2 = $FD08
+TIMER3 = $FD0C
+TIMER4 = $FD10
+TIMER5 = $FD14
+TIMER6 = $FD18
+TIMER7 = $FD1C
+HTIMER = TIMER0  ; horizontal line timer (timer 0)
+VTIMER = TIMER2  ; vertical blank timer (timer 2)
+STIMER = TIMER7  ; sound timer (timer 7)
 
-HTIMBKUP    = $FD00             ; horizontal line timer (timer 0)
-HTIMCTLA    = $FD01
-HTIMCNT     = $FD02
-HTIMCTLB    = $FD03
-VTIMBKUP    = $FD08             ; vertical blank timer (timer 2)
-VTIMCTLA    = $FD09
-VTIMCNT     = $FD0A
-VTIMCTLB    = $FD0B
-BAUDBKUP    = $FD10             ; serial timer (timer 4)
-STIMBKUP    = $FD1C             ; sound timer (timer 7)
-STIMCTLA    = $FD1D
-STIMCNT     = $FD1E
-STIMCTLB    = $FD1F
+HTIMBKUP = $FD00  ; horizontal line timer (timer 0)
+HTIMCTLA = $FD01
+HTIMCNT  = $FD02
+HTIMCTLB = $FD03
+VTIMBKUP = $FD08  ; vertical blank timer (timer 2)
+VTIMCTLA = $FD09
+VTIMCNT  = $FD0A
+VTIMCTLB = $FD0B
+BAUDBKUP = $FD10  ; serial timer (timer 4)
+STIMBKUP = $FD1C  ; sound timer (timer 7)
+STIMCTLA = $FD1D
+STIMCNT  = $FD1E
+STIMCTLB = $FD1F
 
-TIM0BKUP    = $FD00
-TIM0CTLA    = $FD01
-TIM0CNT     = $FD02
-TIM0CTLB    = $FD03
-TIM1BKUP    = $FD04
-TIM1CTLA    = $FD05
-TIM1CNT     = $FD06
-TIM1CTLB    = $FD07
-TIM2BKUP    = $FD08
-TIM2CTLA    = $FD09
-TIM2CNT     = $FD0A
-TIM2CTLB    = $FD0B
-TIM3BKUP    = $FD0C
-TIM3CTLA    = $FD0D
-TIM3CNT     = $FD0E
-TIM3CTLB    = $FD0F
-TIM4BKUP    = $FD10
-TIM4CTLA    = $FD11
-TIM4CNT     = $FD12
-TIM4CTLB    = $FD13
-TIM5BKUP    = $FD14
-TIM5CTLA    = $FD15
-TIM5CNT     = $FD16
-TIM5CTLB    = $FD17
-TIM6BKUP    = $FD18
-TIM6CTLA    = $FD19
-TIM6CNT     = $FD1A
-TIM6CTLB    = $FD1B
-TIM7BKUP    = $FD1C
-TIM7CTLA    = $FD1D
-TIM7CNT     = $FD1E
-TIM7CTLB    = $FD1F
+TIM0BKUP = $FD00
+TIM0CTLA = $FD01
+TIM0CNT  = $FD02
+TIM0CTLB = $FD03
+TIM1BKUP = $FD04
+TIM1CTLA = $FD05
+TIM1CNT  = $FD06
+TIM1CTLB = $FD07
+TIM2BKUP = $FD08
+TIM2CTLA = $FD09
+TIM2CNT  = $FD0A
+TIM2CTLB = $FD0B
+TIM3BKUP = $FD0C
+TIM3CTLA = $FD0D
+TIM3CNT  = $FD0E
+TIM3CTLB = $FD0F
+TIM4BKUP = $FD10
+TIM4CTLA = $FD11
+TIM4CNT  = $FD12
+TIM4CTLB = $FD13
+TIM5BKUP = $FD14
+TIM5CTLA = $FD15
+TIM5CNT  = $FD16
+TIM5CTLB = $FD17
+TIM6BKUP = $FD18
+TIM6CTLA = $FD19
+TIM6CNT  = $FD1A
+TIM6CTLB = $FD1B
+TIM7BKUP = $FD1C
+TIM7CTLA = $FD1D
+TIM7CNT  = $FD1E
+TIM7CTLB = $FD1F
+
+; Timer offsets
+TIM_BACKUP   = 0
+TIM_CONTROLA = 1
+TIM_COUNT    = 2
+TIM_CONTROLB = 3
+
+; TIM_CONTROLA control bits
+ENABLE_INT     = %10000000
+RESET_DONE     = %01000000
+ENABLE_RELOAD  = %00010000
+ENABLE_COUNT   = %00001000
+AUD_CLOCK_MASK = %00000111
+; Clock settings
+AUD_LINKING = %00000111
+AUD_64      = %00000110
+AUD_32      = %00000101
+AUD_16      = %00000100
+AUD_8       = %00000011
+AUD_4       = %00000010
+AUD_2       = %00000001
+AUD_1       = %00000000
+
+; TIM_CONTROLB control bits
+TIMER_DONE = %00001000
+LAST_CLOCK = %00000100
+BORROW_IN  = %00000010
+BORROW_OUT = %00000001
 
 ; Mikey Audio
 
-AUDIO0      = $FD20             ; audio channel 0
-AUDIO1      = $FD28             ; audio channel 1
-AUDIO2      = $FD30             ; audio channel 2
-AUDIO3      = $FD38             ; audio channel 3
+AUDIO0 = $FD20  ; audio channel 0
+AUDIO1 = $FD28  ; audio channel 1
+AUDIO2 = $FD30  ; audio channel 2
+AUDIO3 = $FD38  ; audio channel 3
 
-AUD0VOL     = $FD20
-AUD0FEED    = $FD21
-AUD0OUT     = $FD22
-AUD0SHIFT   = $FD23
-AUD0BKUP    = $FD24
-AUD0CTLA    = $FD25
-AUD0CNT     = $FD26
-AUD0CTLB    = $FD27
-AUD1VOL     = $FD28
-AUD1FEED    = $FD29
-AUD1OUT     = $FD2A
-AUD1SHIFT   = $FD2B
-AUD1BKUP    = $FD2C
-AUD1CTLA    = $FD2D
-AUD1CNT     = $FD2E
-AUD1CTLB    = $FD2F
-AUD2VOL     = $FD30
-AUD2FEED    = $FD31
-AUD2OUT     = $FD32
-AUD2SHIFT   = $FD33
-AUD2BKUP    = $FD34
-AUD2CTLA    = $FD35
-AUD2CNT     = $FD36
-AUD2CTLB    = $FD37
-AUD3VOL     = $FD38
-AUD3FEED    = $FD39
-AUD3OUT     = $FD3A
-AUD3SHIFT   = $FD3B
-AUD3BKUP    = $FD3C
-AUD3CTLA    = $FD3D
-AUD3CNT     = $FD3E
-AUD3CTLB    = $FD3F
-MSTEREO     = $FD50
+AUD0VOL   = $FD20
+AUD0FEED  = $FD21
+AUD0OUT   = $FD22
+AUD0SHIFT = $FD23
+AUD0BKUP  = $FD24
+AUD0CTLA  = $FD25
+AUD0CNT   = $FD26
+AUD0CTLB  = $FD27
+AUD1VOL   = $FD28
+AUD1FEED  = $FD29
+AUD1OUT   = $FD2A
+AUD1SHIFT = $FD2B
+AUD1BKUP  = $FD2C
+AUD1CTLA  = $FD2D
+AUD1CNT   = $FD2E
+AUD1CTLB  = $FD2F
+AUD2VOL   = $FD30
+AUD2FEED  = $FD31
+AUD2OUT   = $FD32
+AUD2SHIFT = $FD33
+AUD2BKUP  = $FD34
+AUD2CTLA  = $FD35
+AUD2CNT   = $FD36
+AUD2CTLB  = $FD37
+AUD3VOL   = $FD38
+AUD3FEED  = $FD39
+AUD3OUT   = $FD3A
+AUD3SHIFT = $FD3B
+AUD3BKUP  = $FD3C
+AUD3CTLA  = $FD3D
+AUD3CNT   = $FD3E
+AUD3CTLB  = $FD3F
 
-; Mikey Misc
+; AUD_CONTROL bits are almost identical to TIM_CONTROLA bits.
+; See TIM_CONTROLA above for the other definitions
+FEEDBACK_7       = %10000000
+ENABLE_INTEGRATE = %00100000
+
+; Stereo control registers follow
+; Stereo capability does not exist in all Lynxes
+; Left and right may be reversed, and if so will be corrected in a later
+; release
+ATTENREG0 = $FD40 ; Stereo attenuation registers
+ATTENREG1 = $FD41
+ATTENREG2 = $FD42
+ATTENREG3 = $FD43
+
+MPAN    = $FD44
+MSTEREO = $FD50
+; Bit definitions for MPAN and MSTEREO registers
+LEFT_ATTENMASK  = %11110000
+RIGHT_ATTENMASK = %00001111
+LEFT3_SELECT  = %10000000
+LEFT2_SELECT  = %01000000
+LEFT1_SELECT  = %00100000
+LEFT0_SELECT  = %00010000
+RIGHT3_SELECT = %00001000
+RIGHT2_SELECT = %00000100
+RIGHT1_SELECT = %00000010
+RIGHT0_SELECT = %00000001
+
+; Mikey interrupts
+
+INTRST = $FD80
+INTSET = $FD81
 
 ; Interrupt bits in INTRST and INTSET
-TIMER0_INTERRUPT = $01
-TIMER1_INTERRUPT = $02
-TIMER2_INTERRUPT = $04
-TIMER3_INTERRUPT = $08
-TIMER4_INTERRUPT = $10
-TIMER5_INTERRUPT = $20
-TIMER6_INTERRUPT = $40
-TIMER7_INTERRUPT = $80
+TIMER0_INTERRUPT = %00000001
+TIMER1_INTERRUPT = %00000010
+TIMER2_INTERRUPT = %00000100
+TIMER3_INTERRUPT = %00001000
+TIMER4_INTERRUPT = %00010000
+TIMER5_INTERRUPT = %00100000
+TIMER6_INTERRUPT = %01000000
+TIMER7_INTERRUPT = %10000000
 
-HBL_INTERRUPT = TIMER0_INTERRUPT
-VBL_INTERRUPT = TIMER2_INTERRUPT
+HBL_INTERRUPT    = TIMER0_INTERRUPT
+VBL_INTERRUPT    = TIMER2_INTERRUPT
 SERIAL_INTERRUPT = TIMER4_INTERRUPT
-SND_INTERRUPT = TIMER7_INTERRUPT
+SND_INTERRUPT    = TIMER7_INTERRUPT
 
-INTRST      = $FD80
-INTSET      = $FD81
-MAGRDY0     = $FD84
-MAGRDY1     = $FD85
-AUDIN       = $FD86
-SYSCTL1     = $FD87
-MIKEYHREV   = $FD88
-MIKEYSREV   = $FD89
-IODIR       = $FD8A
-IODAT       = $FD8B
-TxIntEnable = %10000000
-RxIntEnable = %01000000
-TxParEnable = %00010000
-ResetErr    = %00001000
-TxOpenColl  = %00000100
-TxBreak     = %00000010
-ParEven     = %00000001
-TxReady     = %10000000
-RxReady     = %01000000
-TxEmpty     = %00100000
-RxParityErr = %00010000
-RxOverrun   = %00001000
-RxFrameErr  = %00000100
-RxBreak     = %00000010
-ParityBit   = %00000001
-SERCTL      = $FD8C
-SERDAT      = $FD8D
-SDONEACK    = $FD90
-CPUSLEEP    = $FD91
-DISPCTL     = $FD92
-PBKUP       = $FD93
-DISPADRL    = $FD94
-DISPADRH    = $FD95
-MTEST0      = $FD9C
-MTEST1      = $FD9D
-MTEST2      = $FD9E
-PALETTE     = $FDA0                 ; hardware rgb palette
-GCOLMAP     = $FDA0                 ; hardware rgb palette (green)
-RBCOLMAP    = $FDB0                 ; hardware rgb palette (red-blue)
+MAGRDY0 = $FD84
+MAGRDY1 = $FD85
+AUDIN   = $FD86
+SYSCTL1 = $FD87
+; SYSCTL1 bit definitions
+POWERON          = %00000010
+CART_ADDR_STROBE = %00000001
 
+MIKEYHREV = $FD88
+MIKEYSREV = $FD89
 
-; ***
-; *** Misc Hardware + 6502 vectors
-; ***
+IODIR = $FD8A
+IODAT = $FD8B
+; IODIR and IODAT bit definitions
+AUDIN_BIT      = %00010000  ; Note that there is also the address AUDIN
+READ_ENABLE    = %00010000  ; Same bit for AUDIN_BIT
+RESTLESS       = %00001000
+NOEXP          = %00000100  ; If set, redeye is not connected
+CART_ADDR_DATA = %00000010
+CART_POWER_OFF = %00000010  ; Same bit for CART_ADDR_DATA
+EXTERNAL_POWER = %00000001
 
-MAPCTL      = $FFF9
-VECTORS     = $FFFB
-INTVECTL    = $FFFE
-INTVECTH    = $FFFF
-RSTVECTL    = $FFFC
-RSTVECTH    = $FFFD
-NMIVECTL    = $FFFA
-NMIVECTH    = $FFFB
+SERCTL = $FD8C
+; SERCTL bit definitions for write operations
+TXINTEN  = %10000000
+RXINTEN  = %01000000
+PAREN    = %00010000
+RESETERR = %00001000
+TXOPEN   = %00000100
+TXBRK    = %00000010
+PAREVEN  = %00000001
+; SERCTL bit definitions for read operations
+TXRDY    = %10000000
+RXRDY    = %01000000
+TXEMPTY  = %00100000
+PARERR   = %00010000
+OVERRUN  = %00001000
+FRAMERR  = %00000100
+RXBRK    = %00000010
+PARBIT   = %00000001
 
+SERDAT   = $FD8D
+SDONEACK = $FD90
+CPUSLEEP = $FD91
+DISPCTL  = $FD92
+; DISPCTL bit definitions
+DISP_COLOR   = %10000000  ; must be set to 1
+DISP_FOURBIT = %01000000  ; must be set to 1
+DISP_FLIP    = %00100000
+DMA_ENABLE   = %00010000  ; must be set to 1
+
+PBKUP    = $FD93
+DISPADRL = $FD94
+DISPADRH = $FD95
+
+MTEST0 = $FD9C
+; MTEST0 bit definitions
+AT_CNT16   = %10000000
+AT_TEST    = %01000000
+XCLKEN     = %00100000
+UART_TURBO = %00010000
+ROM_SEL    = %00001000
+ROM_TEST   = %00000100
+M_TEST     = %00000010
+CPU_TEST   = %00000001
+
+MTEST1 = $FD9D
+; MTEST1 bit definitions
+P_CNT16     = %01000000
+REF_CNT16   = %00100000
+VID_TRIG    = %00010000
+REF_TRIG    = %00001000
+VID_DMA_DIS = %00000100
+REF_FAST    = %00000010
+REF_DIS     = %00000001
+
+MTEST2 = $FD9E
+; MTEST2 bit definitions
+V_STROBE  = %00010000
+V_ZERO    = %00001000
+H_120     = %00000100
+H_ZERO    = %00000010
+V_BLANKEF = %00000001
+
+PALETTE  = $FDA0  ; hardware rgb palette
+GCOLMAP  = $FDA0  ; hardware rgb palette (green)
+RBCOLMAP = $FDB0  ; hardware rgb palette (red-blue)
+
+; Memory mapping control and 6502 vectors
+
+MAPCTL        = $FFF9
+; MAPCTL bit definitions
+TURBO_DISABLE = %10000000
+VECTOR_SPACE  = %00001000  ; 1 maps RAM into specified space
+ROM_SPACE     = %00000100
+MIKEY_SPACE   = %00000010
+SUZY_SPACE    = %00000001
+
+VECTORS  = $FFFB
+INTVECTL = $FFFE
+INTVECTH = $FFFF
+RSTVECTL = $FFFC
+RSTVECTH = $FFFD
+NMIVECTL = $FFFA
+NMIVECTH = $FFFB
diff --git a/asminc/mega65.inc b/asminc/mega65.inc
new file mode 100644
index 000000000..79a4e7b03
--- /dev/null
+++ b/asminc/mega65.inc
@@ -0,0 +1,239 @@
+
+; ---------------------------------------------------------------------------
+; Zero page, Commodore stuff
+
+TXTPTR          := $3C          ; Pointer into BASIC source code
+STATUS          := $90          ; Kernal I/O completion status
+FNAM_LEN        := $B7          ; Length of filename
+SECADR          := $B9          ; Secondary address
+DEVNUM          := $BA          ; Device number
+FNAM            := $BB          ; Address of filename
+FNAM_BANK       := $BE          ; Bank for filename
+KEY_COUNT       := $D0          ; Number of keys in input buffer
+FKEY_COUNT      := $D1          ; Characters for function key
+MODE            := $D7          ; 40-/80-column mode (bit 7: 80 columns)
+GRAPHM          := $D8          ; Graphics mode flags (bits 5-7)
+CHARDIS         := $D9          ; Bit 2 shadow for location $01
+CURS_X          := $EC          ; Cursor column
+CURS_Y          := $EB          ; Cursor row
+SCREEN_PTR      := $E0          ; Pointer to current char in text screen
+CRAM_PTR        := $E2          ; Pointer to current char in color RAM
+CHARCOLOR       := $F1
+RVS             := $F3          ; Reverse output flag
+SCROLL          := $F8          ; Disable scrolling flag
+
+BASIC_BUF       := $0200        ; Location of command-line
+BASIC_BUF_LEN   = 161           ; Maximum length of command-line
+
+FKEY_LEN        := $1000        ; Function key lengths
+FKEY_TEXT       := $100A        ; Function key texts
+
+PALFLAG         := $1103        ; $FF=PAL, $00=NTSC
+INIT_STATUS     := $1104        ; Flags: Reset/Restore initiation status
+TIME            := $110C        ; 60HZ clock
+
+KBDREPEAT       := $111a
+KBDREPEATRATE   := $111b
+KBDREPEATDELAY  := $111c
+
+; ---------------------------------------------------------------------------
+; Vectors
+
+IRQVec          := $0314
+BRKVec          := $0316
+NMIVec          := $0318
+
+; ---------------------------------------------------------------------------
+; I/O: VIC
+
+VIC             := $D000
+VIC_SPR0_X      := $D000
+VIC_SPR0_Y      := $D001
+VIC_SPR1_X      := $D002
+VIC_SPR1_Y      := $D003
+VIC_SPR2_X      := $D004
+VIC_SPR2_Y      := $D005
+VIC_SPR3_X      := $D006
+VIC_SPR3_Y      := $D007
+VIC_SPR4_X      := $D008
+VIC_SPR4_Y      := $D009
+VIC_SPR5_X      := $D00A
+VIC_SPR5_Y      := $D00B
+VIC_SPR6_X      := $D00C
+VIC_SPR6_Y      := $D00D
+VIC_SPR7_X      := $D00E
+VIC_SPR7_Y      := $D00F
+VIC_SPR_HI_X    := $D010
+VIC_SPR_ENA     := $D015
+VIC_SPR_EXP_Y   := $D017
+VIC_SPR_EXP_X   := $D01D
+VIC_SPR_MCOLOR  := $D01C
+VIC_SPR_BG_PRIO := $D01B
+VIC_SPR_COLL    := $D01E
+VIC_SPR_BG_COLL := $D01F
+
+VIC_SPR_MCOLOR0 := $D025
+VIC_SPR_MCOLOR1 := $D026
+
+VIC_SPR0_COLOR  := $D027
+VIC_SPR1_COLOR  := $D028
+VIC_SPR2_COLOR  := $D029
+VIC_SPR3_COLOR  := $D02A
+VIC_SPR4_COLOR  := $D02B
+VIC_SPR5_COLOR  := $D02C
+VIC_SPR6_COLOR  := $D02D
+VIC_SPR7_COLOR  := $D02E
+
+VIC_CTRL1       := $D011
+VIC_CTRL2       := $D016
+
+VIC_HLINE       := $D012
+
+VIC_LPEN_X      := $D013
+VIC_LPEN_Y      := $D014
+
+VIC_VIDEO_ADR   := $D018
+
+VIC_IRR         := $D019        ; Interrupt request register
+VIC_IMR         := $D01A        ; Interrupt mask register
+
+VIC_BORDERCOLOR := $D020
+VIC_BG_COLOR0   := $D021
+VIC_BG_COLOR1   := $D022
+VIC_BG_COLOR2   := $D023
+VIC_BG_COLOR3   := $D024
+
+
+; ---------------------------------------------------------------------------
+; I/O: FDC
+
+FDC             := $D080
+
+; ---------------------------------------------------------------------------
+; I/O: SID
+
+SID0            := $D400
+SID0_S1Lo       := $D400
+SID0_S1Hi       := $D401
+SID0_PB1Lo      := $D402
+SID0_PB1Hi      := $D403
+SID0_Ctl1       := $D404
+SID0_AD1        := $D405
+SID0_SUR1       := $D406
+
+SID0_S2Lo       := $D407
+SID0_S2Hi       := $D408
+SID0_PB2Lo      := $D409
+SID0_PB2Hi      := $D40A
+SID0_Ctl2       := $D40B
+SID0_AD2        := $D40C
+SID0_SUR2       := $D40D
+
+SID0_S3Lo       := $D40E
+SID0_S3Hi       := $D40F
+SID0_PB3Lo      := $D410
+SID0_PB3Hi      := $D411
+SID0_Ctl3       := $D412
+SID0_AD3        := $D413
+SID0_SUR3       := $D414
+
+SID0_FltLo      := $D415
+SID0_FltHi      := $D416
+SID0_FltCtl     := $D417
+SID0_Amp        := $D418
+SID0_ADConv1    := $D419
+SID0_ADConv2    := $D41A
+SID0_Noise      := $D41B
+SID0_Read3      := $D41C
+
+SID1            := $D420
+SID1_S1Lo       := $D420
+SID1_S1Hi       := $D421
+SID1_PB1Lo      := $D422
+SID1_PB1Hi      := $D423
+SID1_Ctl1       := $D424
+SID1_AD1        := $D425
+SID1_SUR1       := $D426
+
+SID1_S2Lo       := $D427
+SID1_S2Hi       := $D428
+SID1_PB2Lo      := $D429
+SID1_PB2Hi      := $D42A
+SID1_Ctl2       := $D42B
+SID1_AD2        := $D42C
+SID1_SUR2       := $D42D
+
+SID1_S3Lo       := $D42E
+SID1_S3Hi       := $D42F
+SID1_PB3Lo      := $D430
+SID1_PB3Hi      := $D431
+SID1_Ctl3       := $D432
+SID1_AD3        := $D433
+SID1_SUR3       := $D434
+
+SID1_FltLo      := $D435
+SID1_FltHi      := $D436
+SID1_FltCtl     := $D437
+SID1_Amp        := $D438
+SID1_ADConv1    := $D439
+SID1_ADConv2    := $D43A
+SID1_Noise      := $D43B
+SID1_Read3      := $D43C
+
+; ---------------------------------------------------------------------------
+; I/O: Complex Interface Adapters
+
+CIA1            := $DC00
+CIA1_PRA        := $DC00        ; Port A
+CIA1_PRB        := $DC01        ; Port B
+CIA1_DDRA       := $DC02        ; Data direction register for port A
+CIA1_DDRB       := $DC03        ; Data direction register for port B
+CIA1_TA         := $DC04        ; 16-bit timer A
+CIA1_TB         := $DC06        ; 16-bit timer B
+CIA1_TOD10      := $DC08        ; Time-of-day tenths of a second
+CIA1_TODSEC     := $DC09        ; Time-of-day seconds
+CIA1_TODMIN     := $DC0A        ; Time-of-day minutes
+CIA1_TODHR      := $DC0B        ; Time-of-day hours
+CIA1_SDR        := $DC0C        ; Serial data register
+CIA1_ICR        := $DC0D        ; Interrupt control register
+CIA1_CRA        := $DC0E        ; Control register for timer A
+CIA1_CRB        := $DC0F        ; Control register for timer B
+
+CIA2            := $DD00
+CIA2_PRA        := $DD00
+CIA2_PRB        := $DD01
+CIA2_DDRA       := $DD02
+CIA2_DDRB       := $DD03
+CIA2_TA         := $DD04
+CIA2_TB         := $DD06
+CIA2_TOD10      := $DD08
+CIA2_TODSEC     := $DD09
+CIA2_TODMIN     := $DD0A
+CIA2_TODHR      := $DD0B
+CIA2_SDR        := $DD0C
+CIA2_ICR        := $DD0D
+CIA2_CRA        := $DD0E
+CIA2_CRB        := $DD0F
+
+; ---------------------------------------------------------------------------
+; I/O: DMA
+
+DMA             := $D700
+
+
+; ---------------------------------------------------------------------------
+; Processor Port at $01
+
+LORAM           = $01           ; Enable the basic rom
+HIRAM           = $02           ; Enable the kernal rom
+IOEN            = $04           ; Enable I/O
+CASSDATA        = $08           ; Cassette data
+CASSPLAY        = $10           ; Cassette: Play
+CASSMOT         = $20           ; Cassette motor on
+TP_FAST         = $80           ; Switch Rossmoeller TurboProcess to fast mode
+
+RAMONLY         = $F8           ; (~(LORAM | HIRAM | IOEN)) & $FF
+
+; temporary, to get conio working
+XSIZE = 80
+YSIZE = 50
diff --git a/asminc/rp6502.inc b/asminc/rp6502.inc
index 7dd1b8fcd..816712abb 100644
--- a/asminc/rp6502.inc
+++ b/asminc/rp6502.inc
@@ -37,6 +37,7 @@ RIA_OP_PHI2               := $02
 RIA_OP_CODEPAGE           := $03
 RIA_OP_LRAND              := $04
 RIA_OP_STDIN_OPT          := $05
+RIA_OP_CLOCK              := $0F
 RIA_OP_CLOCK_GETRES       := $10
 RIA_OP_CLOCK_GETTIME      := $11
 RIA_OP_CLOCK_SETTIME      := $12
diff --git a/asminc/sim65.inc b/asminc/sim65.inc
new file mode 100644
index 000000000..b8ea264b7
--- /dev/null
+++ b/asminc/sim65.inc
@@ -0,0 +1,75 @@
+
+; *******************************************************************************
+; **                                                                           **
+; **  sim65.inc : assembler definitions for the sim6502 and sim65c02 targets.  **
+; **                                                                           **
+; **  Sidney Cadot, January 2025                                               **
+; **                                                                           **
+; *******************************************************************************
+
+            ; The '_peripherals' symbol is defined in the linker configuration
+            ; file to correspond to the first address in the periperal memory
+            ; aparture.
+            ;
+            ; We use it here as a base address for all peripheral addresses.
+
+            .import _peripherals
+
+; **************************************************************
+; **                                                          **
+; **  Define assembler symbols for the "counter" peripheral.  **
+; **                                                          **
+; **************************************************************
+
+peripheral_counter_base   := _peripherals + 0
+
+peripheral_counter_latch  := peripheral_counter_base + 0
+peripheral_counter_select := peripheral_counter_base + 1
+peripheral_counter_value  := peripheral_counter_base + 2
+
+; Values for the peripheral_counter_select register.
+
+COUNTER_SELECT_CLOCKCYCLE_COUNTER   = $00
+COUNTER_SELECT_INSTRUCTION_COUNTER  = $01
+COUNTER_SELECT_IRQ_COUNTER          = $02
+COUNTER_SELECT_NMI_COUNTER          = $03
+COUNTER_SELECT_WALLCLOCK_TIME       = $80
+COUNTER_SELECT_WALLCLOCK_TIME_SPLIT = $81
+
+; ********************************************************************
+; **                                                                **
+; **  Define assembler symbols for the "sim65 control" peripheral.  **
+; **                                                                **
+; ********************************************************************
+
+peripheral_sim65_base       := _peripherals + 10
+
+peripheral_sim65_cpu_mode   := peripheral_sim65_base + 0
+peripheral_sim65_trace_mode := peripheral_sim65_base + 1
+
+; Values for the peripheral_sim65_cpu_mode register.
+
+SIM65_CPU_MODE_6502  = $00
+SIM65_CPU_MODE_65C02 = $01
+SIM65_CPU_MODE_6502X = $02
+
+; Bitfield values for the peripheral_sim65_trace_mode field.
+
+SIM65_TRACE_MODE_FIELD_INSTR_COUNTER  = $40
+SIM65_TRACE_MODE_FIELD_CLOCK_COUNTER  = $20
+SIM65_TRACE_MODE_FIELD_PC             = $10
+SIM65_TRACE_MODE_FIELD_INSTR_BYTES    = $08
+SIM65_TRACE_MODE_FIELD_INSTR_ASSEMBLY = $04
+SIM65_TRACE_MODE_FIELD_CPU_REGISTERS  = $02
+SIM65_TRACE_MODE_FIELD_CC65_SP        = $01
+
+; Values for the peripheral_sim65_trace_mode field that fully disable / enable tracing.
+
+SIM65_TRACE_MODE_DISABLE              = $00
+SIM65_TRACE_MODE_ENABLE_FULL          = $7F
+
+; ************************
+; **                    **
+; **  End of sim65.inc  **
+; **                    **
+; ************************
diff --git a/asminc/stat.inc b/asminc/stat.inc
new file mode 100644
index 000000000..e5248f06d
--- /dev/null
+++ b/asminc/stat.inc
@@ -0,0 +1,64 @@
+;****************************************************************************
+;*                                                                          *
+;*                              stat.inc                                    *
+;*                                                                          *
+;*                             Stat struct                                  *
+;*                                                                          *
+;*                                                                          *
+;*                                                                          *
+;*(C) 2023 Colin Leroy-Mira <colin@colino.net>                              *
+;*                                                                          *
+;*                                                                          *
+;*This software is provided 'as-is', without any expressed or implied       *
+;*warranty.  In no event will the authors be held liable for any damages    *
+;*arising from the use of this software.                                    *
+;*                                                                          *
+;*Permission is granted to anyone to use this software for any purpose,     *
+;*including commercial applications, and to alter it and redistribute it    *
+;*freely, subject to the following restrictions:                            *
+;*                                                                          *
+;*1. The origin of this software must not be misrepresented; you must not   *
+;*   claim that you wrote the original software. If you use this software   *
+;*   in a product, an acknowledgment in the product documentation would be  *
+;*   appreciated but is not required.                                       *
+;*2. Altered source versions must be plainly marked as such, and must not   *
+;*   be misrepresented as being the original software.                      *
+;*3. This notice may not be removed or altered from any source              *
+;*   distribution.                                                          *
+;*                                                                          *
+;****************************************************************************
+
+        .include        "time.inc"
+
+;------------------------------------------------------------------------------
+; st_mode values
+
+S_IFDIR = $01
+S_IFREG = $02
+
+;------------------------------------------------------------------------------
+; struct stat
+
+.struct stat
+        st_dev            .dword
+        st_ino            .dword
+        st_mode           .byte
+        st_nlink          .dword
+        st_uid            .byte
+        st_gid            .byte
+        st_size           .dword
+        st_atim           .tag timespec
+        st_ctim           .tag timespec
+        st_mtim           .tag timespec
+        .ifdef __APPLE2__
+        st_access         .byte
+        st_type           .byte
+        st_auxtype        .word
+        st_storagetype    .byte
+        st_blocks         .word
+        st_mod_date       .word
+        st_mod_time       .word
+        st_create_date    .word
+        st_create_time    .word
+        .endif
+.endstruct
diff --git a/asminc/statvfs.inc b/asminc/statvfs.inc
new file mode 100644
index 000000000..8674b045d
--- /dev/null
+++ b/asminc/statvfs.inc
@@ -0,0 +1,46 @@
+;****************************************************************************
+;*                                                                          *
+;*                              statvfs.inc                                 *
+;*                                                                          *
+;*                             Statvfs struct                               *
+;*                                                                          *
+;*                                                                          *
+;*                                                                          *
+;*(C) 2023 Colin Leroy-Mira <colin@colino.net>                              *
+;*                                                                          *
+;*                                                                          *
+;*This software is provided 'as-is', without any expressed or implied       *
+;*warranty.  In no event will the authors be held liable for any damages    *
+;*arising from the use of this software.                                    *
+;*                                                                          *
+;*Permission is granted to anyone to use this software for any purpose,     *
+;*including commercial applications, and to alter it and redistribute it    *
+;*freely, subject to the following restrictions:                            *
+;*                                                                          *
+;*1. The origin of this software must not be misrepresented; you must not   *
+;*   claim that you wrote the original software. If you use this software   *
+;*   in a product, an acknowledgment in the product documentation would be  *
+;*   appreciated but is not required.                                       *
+;*2. Altered source versions must be plainly marked as such, and must not   *
+;*   be misrepresented as being the original software.                      *
+;*3. This notice may not be removed or altered from any source              *
+;*   distribution.                                                          *
+;*                                                                          *
+;****************************************************************************
+
+;------------------------------------------------------------------------------
+; struct statvfs
+
+.struct statvfs
+        f_bsize           .dword
+        f_frsize          .dword
+        f_blocks          .dword
+        f_bfree           .dword
+        f_bavail          .dword
+        f_files           .dword
+        f_ffree           .dword
+        f_favail          .dword
+        f_fsid            .dword
+        f_flag            .dword
+        f_namemax         .dword
+.endstruct
diff --git a/asminc/telestrat.inc b/asminc/telestrat.inc
index c57bd3de8..bbfabdf40 100644
--- a/asminc/telestrat.inc
+++ b/asminc/telestrat.inc
@@ -257,8 +257,11 @@ XBINDX           = $28          ; Convert a number into hex and displays on chan
 XDECIM           = $29
 XHEXA            = $2A          ; Convert a number into hex
 
+XMAINARGS        = $2C          ; Only available for Orix
+
 XEDT             = $2D          ; Launch editor
 XINSER           = $2E
+XGETARGV         = $2E          ; Only available for Orix
 
 XSCELG           = $2F          ; Search a line in editor mode
 XOPEN            = $30          ; Only in Orix
diff --git a/asminc/time.inc b/asminc/time.inc
index 6064b4ba3..7c1ab3177 100644
--- a/asminc/time.inc
+++ b/asminc/time.inc
@@ -66,3 +66,9 @@
 .global         _clock_settime
 .global         _localtime
 .global         _mktime
+
+
+;------------------------------------------------------------------------------
+; Constants
+
+CLOCK_REALTIME = 0
diff --git a/asminc/zeropage.inc b/asminc/zeropage.inc
index 6627d86b6..8d508fc5a 100644
--- a/asminc/zeropage.inc
+++ b/asminc/zeropage.inc
@@ -8,11 +8,25 @@
 ; by the compiler, ready for usage in asm code.
 
 
-        .globalzp       sp, sreg, regsave
+        .globalzp       c_sp, sreg, regsave
         .globalzp       ptr1, ptr2, ptr3, ptr4
         .globalzp       tmp1, tmp2, tmp3, tmp4
         .globalzp       regbank
 
+; FIXME: there must be a less ugly way to do this
+.ifp4510
+.else
+.ifp45GS02
+.else
+
+        ; The following symbol is supplied for compatibility reasons only, it
+        ; will get removed in future versions. Using it will cause a linker
+        ; warning.
+        .globalzp       sp
+.endif
+.endif
+
+
 ; The size of the register bank
 regbanksize     = 6
 
diff --git a/cfg/agat.cfg b/cfg/agat.cfg
new file mode 100644
index 000000000..1a740cfc7
--- /dev/null
+++ b/cfg/agat.cfg
@@ -0,0 +1,44 @@
+# Default configuration
+
+FEATURES {
+    STARTADDRESS: default = $1903;
+}
+SYMBOLS {
+    __EXEHDR__:    type = import;
+    __FILETYPE__:  type = weak, value = $0006; # file type
+    __STACKSIZE__: type = weak, value = $0400; # 1k stack
+    __HIMEM__:     type = weak, value = $C000; # Presumed RAM end
+}
+MEMORY {
+    ZP:     file = "", define = yes, start = $0080,        size = $001A;
+    HEADER: file = %O,               start = %S - $003A,   size = $003A;
+    MAIN:   file = %O, define = yes, start = %S,           size = __HIMEM__ - %S;
+    BSS:    file = "",               start = __ONCE_RUN__, size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,             type = zp;
+    EXEHDR:   load = HEADER,         type = ro,  optional = yes;
+    STARTUP:  load = MAIN,           type = ro, optional = yes;
+    LOWCODE:  load = MAIN,           type = ro,  optional = yes;
+    CODE:     load = MAIN,           type = ro;
+    RODATA:   load = MAIN,           type = ro;
+    DATA:     load = MAIN,           type = rw;
+    INIT:     load = MAIN,           type = rw, optional = yes;
+    ONCE:     load = MAIN,           type = ro,  define   = yes;
+    BSS:      load = BSS,            type = bss, define   = yes;
+}
+FEATURES {
+    CONDES: type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__,
+            segment = ONCE;
+    CONDES: type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__,
+            segment = RODATA;
+    CONDES: type    = interruptor,
+            label   = __INTERRUPTOR_TABLE__,
+            count   = __INTERRUPTOR_COUNT__,
+            segment = RODATA,
+            import  = __CALLIRQ__;
+}
diff --git a/cfg/apple2-hgr.cfg b/cfg/apple2-hgr.cfg
index 109fbe4f6..402e53b34 100644
--- a/cfg/apple2-hgr.cfg
+++ b/cfg/apple2-hgr.cfg
@@ -17,6 +17,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = %S,           size = __HIMEM__ - %S;
     BSS:    file = "",               start = __ONCE_RUN__, size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,   size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,        size = %S - $0800;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,             type = zp;
@@ -31,6 +32,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define   = yes;
     LC:       load = MAIN, run = LC, type = ro,  optional = yes;
     BSS:      load = BSS,            type = bss, define   = yes;
+    LOWBSS:   load = LOW,            type = bss, optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/apple2-overlay.cfg b/cfg/apple2-overlay.cfg
index 754ece90f..512b19c16 100644
--- a/cfg/apple2-overlay.cfg
+++ b/cfg/apple2-overlay.cfg
@@ -25,6 +25,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = %S + __OVERLAYSIZE__, size = __HIMEM__ - __OVERLAYSIZE__ - %S;
     BSS:    file = "",               start = __ONCE_RUN__,         size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,           size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,                size = %S - $0800;
     OVL1:   file = "%O.1",           start = %S,                   size = __OVERLAYSIZE__;
     OVL2:   file = "%O.2",           start = %S,                   size = __OVERLAYSIZE__;
     OVL3:   file = "%O.3",           start = %S,                   size = __OVERLAYSIZE__;
@@ -47,6 +48,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define = yes;
     LC:       load = MAIN, run = LC, type = ro,                optional = yes;
     BSS:      load = BSS,            type = bss, define = yes;
+    LOWBSS:   load = LOW,            type = bss,               optional = yes;
     OVERLAY1: load = OVL1,           type = ro,  define = yes, optional = yes;
     OVERLAY2: load = OVL2,           type = ro,  define = yes, optional = yes;
     OVERLAY3: load = OVL3,           type = ro,  define = yes, optional = yes;
diff --git a/cfg/apple2-system.cfg b/cfg/apple2-system.cfg
index 3dd94d793..8720ae800 100644
--- a/cfg/apple2-system.cfg
+++ b/cfg/apple2-system.cfg
@@ -13,6 +13,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = $2000,         size = $BF00 - $2000;
     BSS:    file = "",               start = __ONCE_RUN__,  size = $BF00 - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,    size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,         size = $2000 - $0800;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,             type = zp;
@@ -26,6 +27,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define   = yes;
     LC:       load = MAIN, run = LC, type = ro,  optional = yes;
     BSS:      load = BSS,            type = bss, define   = yes;
+    LOWBSS:   load = LOW,            type = bss, optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/apple2.cfg b/cfg/apple2.cfg
index 19932b1f9..c33bdee2d 100644
--- a/cfg/apple2.cfg
+++ b/cfg/apple2.cfg
@@ -17,6 +17,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = %S,           size = __HIMEM__ - %S;
     BSS:    file = "",               start = __ONCE_RUN__, size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,   size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,        size = %S - $0800;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,             type = zp;
@@ -30,6 +31,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define   = yes;
     LC:       load = MAIN, run = LC, type = ro,  optional = yes;
     BSS:      load = BSS,            type = bss, define   = yes;
+    LOWBSS:   load = LOW,            type = bss, optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/apple2enh-hgr.cfg b/cfg/apple2enh-hgr.cfg
index 109fbe4f6..402e53b34 100644
--- a/cfg/apple2enh-hgr.cfg
+++ b/cfg/apple2enh-hgr.cfg
@@ -17,6 +17,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = %S,           size = __HIMEM__ - %S;
     BSS:    file = "",               start = __ONCE_RUN__, size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,   size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,        size = %S - $0800;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,             type = zp;
@@ -31,6 +32,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define   = yes;
     LC:       load = MAIN, run = LC, type = ro,  optional = yes;
     BSS:      load = BSS,            type = bss, define   = yes;
+    LOWBSS:   load = LOW,            type = bss, optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/apple2enh-overlay.cfg b/cfg/apple2enh-overlay.cfg
index 754ece90f..512b19c16 100644
--- a/cfg/apple2enh-overlay.cfg
+++ b/cfg/apple2enh-overlay.cfg
@@ -25,6 +25,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = %S + __OVERLAYSIZE__, size = __HIMEM__ - __OVERLAYSIZE__ - %S;
     BSS:    file = "",               start = __ONCE_RUN__,         size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,           size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,                size = %S - $0800;
     OVL1:   file = "%O.1",           start = %S,                   size = __OVERLAYSIZE__;
     OVL2:   file = "%O.2",           start = %S,                   size = __OVERLAYSIZE__;
     OVL3:   file = "%O.3",           start = %S,                   size = __OVERLAYSIZE__;
@@ -47,6 +48,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define = yes;
     LC:       load = MAIN, run = LC, type = ro,                optional = yes;
     BSS:      load = BSS,            type = bss, define = yes;
+    LOWBSS:   load = LOW,            type = bss,               optional = yes;
     OVERLAY1: load = OVL1,           type = ro,  define = yes, optional = yes;
     OVERLAY2: load = OVL2,           type = ro,  define = yes, optional = yes;
     OVERLAY3: load = OVL3,           type = ro,  define = yes, optional = yes;
diff --git a/cfg/apple2enh-system.cfg b/cfg/apple2enh-system.cfg
index 3dd94d793..8720ae800 100644
--- a/cfg/apple2enh-system.cfg
+++ b/cfg/apple2enh-system.cfg
@@ -13,6 +13,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = $2000,         size = $BF00 - $2000;
     BSS:    file = "",               start = __ONCE_RUN__,  size = $BF00 - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,    size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,         size = $2000 - $0800;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,             type = zp;
@@ -26,6 +27,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define   = yes;
     LC:       load = MAIN, run = LC, type = ro,  optional = yes;
     BSS:      load = BSS,            type = bss, define   = yes;
+    LOWBSS:   load = LOW,            type = bss, optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/apple2enh.cfg b/cfg/apple2enh.cfg
index 19932b1f9..c33bdee2d 100644
--- a/cfg/apple2enh.cfg
+++ b/cfg/apple2enh.cfg
@@ -17,6 +17,7 @@ MEMORY {
     MAIN:   file = %O, define = yes, start = %S,           size = __HIMEM__ - %S;
     BSS:    file = "",               start = __ONCE_RUN__, size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
     LC:     file = "", define = yes, start = __LCADDR__,   size = __LCSIZE__;
+    LOW:    file = "", define = yes, start = $0800,        size = %S - $0800;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,             type = zp;
@@ -30,6 +31,7 @@ SEGMENTS {
     ONCE:     load = MAIN,           type = ro,  define   = yes;
     LC:       load = MAIN, run = LC, type = ro,  optional = yes;
     BSS:      load = BSS,            type = bss, define   = yes;
+    LOWBSS:   load = LOW,            type = bss, optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/atari-asm-xex.cfg b/cfg/atari-asm-xex.cfg
index f0a6291db..fddf95dd4 100644
--- a/cfg/atari-asm-xex.cfg
+++ b/cfg/atari-asm-xex.cfg
@@ -20,5 +20,6 @@ SEGMENTS {
     CODE:     load = MAIN,    type = rw,                  define = yes;
     RODATA:   load = MAIN,    type = ro   optional = yes;
     DATA:     load = MAIN,    type = rw   optional = yes;
+    INIT:     load = MAIN,    type = bss, optional = yes, define = yes;
     BSS:      load = MAIN,    type = bss, optional = yes, define = yes;
 }
diff --git a/cfg/atari-asm.cfg b/cfg/atari-asm.cfg
index 6fc1c2caa..f824eb264 100644
--- a/cfg/atari-asm.cfg
+++ b/cfg/atari-asm.cfg
@@ -25,6 +25,7 @@ SEGMENTS {
     CODE:     load = MAIN,    type = rw,                  define = yes;
     RODATA:   load = MAIN,    type = ro   optional = yes;
     DATA:     load = MAIN,    type = rw   optional = yes;
+    INIT:     load = MAIN,    type = bss, optional = yes, define = yes;
     BSS:      load = MAIN,    type = bss, optional = yes, define = yes;
     AUTOSTRT: load = TRAILER, type = ro,  optional = yes;
 }
diff --git a/cfg/atari-cassette.cfg b/cfg/atari-cassette.cfg
index 13b34cc73..1d7d02f93 100644
--- a/cfg/atari-cassette.cfg
+++ b/cfg/atari-cassette.cfg
@@ -22,8 +22,8 @@ SEGMENTS {
     CODE:     load = MAIN, type = ro,  define = yes;
     RODATA:   load = MAIN, type = ro,                optional = yes;
     DATA:     load = MAIN, type = rw,                optional = yes;
+    INIT:     load = MAIN, type = bss, define = yes, optional = yes;
     BSS:      load = MAIN, type = bss, define = yes, optional = yes;
-    INIT:     load = MAIN, type = bss,               optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/atari-overlay.cfg b/cfg/atari-overlay.cfg
index 60f98e453..1dde26331 100644
--- a/cfg/atari-overlay.cfg
+++ b/cfg/atari-overlay.cfg
@@ -52,7 +52,7 @@ SEGMENTS {
     CODE:      load = MAIN,       type = ro,  define = yes;
     RODATA:    load = MAIN,       type = ro;
     DATA:      load = MAIN,       type = rw;
-    INIT:      load = MAIN,       type = bss,               optional = yes;
+    INIT:      load = MAIN,       type = bss, define = yes, optional = yes;
     BSS:       load = MAIN,       type = bss, define = yes;
     AUTOSTRT:  load = TRAILER,    type = ro;
     OVERLAY1:  load = OVL1,       type = ro,  define = yes, optional = yes;
diff --git a/cfg/atari-xex.cfg b/cfg/atari-xex.cfg
index deab5c7a5..1ab60af2e 100644
--- a/cfg/atari-xex.cfg
+++ b/cfg/atari-xex.cfg
@@ -36,7 +36,7 @@ SEGMENTS {
     CODE:      load = MAIN,       type = ro,  define = yes;
     RODATA:    load = MAIN,       type = ro;
     DATA:      load = MAIN,       type = rw;
-    INIT:      load = MAIN,       type = bss,               optional = yes;
+    INIT:      load = MAIN,       type = bss, define = yes, optional = yes;
     BSS:       load = MAIN,       type = bss, define = yes;
 }
 FEATURES {
diff --git a/cfg/atari.cfg b/cfg/atari.cfg
index 37337ea53..0af121de3 100644
--- a/cfg/atari.cfg
+++ b/cfg/atari.cfg
@@ -40,7 +40,7 @@ SEGMENTS {
     CODE:      load = MAIN,       type = ro,  define = yes;
     RODATA:    load = MAIN,       type = ro;
     DATA:      load = MAIN,       type = rw;
-    INIT:      load = MAIN,       type = bss,               optional = yes;
+    INIT:      load = MAIN,       type = bss, define = yes, optional = yes;
     BSS:       load = MAIN,       type = bss, define = yes;
     AUTOSTRT:  load = TRAILER,    type = ro;
 }
diff --git a/cfg/atari5200.cfg b/cfg/atari5200.cfg
index e8f6d44a5..a487bdcab 100644
--- a/cfg/atari5200.cfg
+++ b/cfg/atari5200.cfg
@@ -15,7 +15,7 @@ MEMORY {
 SEGMENTS {
     ZEROPAGE:  load = ZP,             type = zp,                optional = yes;
     EXTZP:     load = ZP,             type = zp,                optional = yes;
-    DLIST:     load = ROM  ,          type = ro,  define = yes, optional = yes;
+    DLIST:     load = ROM,            type = ro,  define = yes, optional = yes;
     STARTUP:   load = ROM,            type = ro,  define = yes, optional = yes;
     LOWCODE:   load = ROM,            type = ro,  define = yes, optional = yes;
     ONCE:      load = ROM,            type = ro,                optional = yes;
diff --git a/cfg/atarixl-largehimem.cfg b/cfg/atarixl-largehimem.cfg
index 8f70597aa..6df9b3f80 100644
--- a/cfg/atarixl-largehimem.cfg
+++ b/cfg/atarixl-largehimem.cfg
@@ -67,7 +67,7 @@ SEGMENTS {
     CODE:        load = MAIN,                         type = ro,  define = yes;
     RODATA:      load = MAIN,                         type = ro;
     DATA:        load = MAIN,                         type = rw;
-    INIT:        load = MAIN,                         type = bss,               optional = yes;
+    INIT:        load = MAIN,                         type = bss, define = yes, optional = yes;
     BSS:         load = MAIN,                         type = bss, define = yes;
     AUTOSTRT:    load = TRAILER,                      type = ro;
 }
diff --git a/cfg/atarixl-overlay.cfg b/cfg/atarixl-overlay.cfg
index 3b8da4256..5cfdcdbc5 100644
--- a/cfg/atarixl-overlay.cfg
+++ b/cfg/atarixl-overlay.cfg
@@ -78,7 +78,7 @@ SEGMENTS {
     CODE:        load = MAIN,                          type = ro,  define = yes;
     RODATA:      load = MAIN,                          type = ro;
     DATA:        load = MAIN,                          type = rw;
-    INIT:        load = MAIN,                          type = bss,               optional = yes;
+    INIT:        load = MAIN,                          type = bss, define = yes, optional = yes;
     BSS:         load = MAIN,                          type = bss, define = yes;
     AUTOSTRT:    load = TRAILER,                       type = ro;
 
diff --git a/cfg/atarixl-xex.cfg b/cfg/atarixl-xex.cfg
index 853096c6f..a0a4a971d 100644
--- a/cfg/atarixl-xex.cfg
+++ b/cfg/atarixl-xex.cfg
@@ -58,7 +58,7 @@ SEGMENTS {
     CODE:        load = MAIN,                          type = ro,  define = yes;
     RODATA:      load = MAIN,                          type = ro;
     DATA:        load = MAIN,                          type = rw;
-    INIT:        load = MAIN,                          type = bss,               optional = yes;
+    INIT:        load = MAIN,                          type = bss, define = yes, optional = yes;
     BSS:         load = MAIN,                          type = bss, define = yes;
     SRPREPHDR:   load = UNUSED,                        type = ro;
     SRPREPTRL:   load = UNUSED,                        type = ro;
diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index 1517afb5a..5e7199cd3 100644
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -65,7 +65,7 @@ SEGMENTS {
     CODE:        load = MAIN,                          type = ro,  define = yes;
     RODATA:      load = MAIN,                          type = ro;
     DATA:        load = MAIN,                          type = rw;
-    INIT:        load = MAIN,                          type = bss,               optional = yes;
+    INIT:        load = MAIN,                          type = bss, define = yes, optional = yes;
     BSS:         load = MAIN,                          type = bss, define = yes;
     AUTOSTRT:    load = TRAILER,                       type = ro;
 }
diff --git a/cfg/c16-asm.cfg b/cfg/c16-asm.cfg
new file mode 100644
index 000000000..8cb839304
--- /dev/null
+++ b/cfg/c16-asm.cfg
@@ -0,0 +1,20 @@
+FEATURES {
+    STARTADDRESS: default = $1001;
+}
+SYMBOLS {
+    __LOADADDR__:  type = import;
+}
+MEMORY {
+    ZP:       file = "", start = $0002,  size = $001A;
+    LOADADDR: file = %O, start = %S - 2, size = $0002;
+    MAIN:     file = %O, start = %S,     size = $3000 - %S;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = ro;
+    RODATA:   load = MAIN,     type = ro,  optional = yes;
+    DATA:     load = MAIN,     type = rw,  optional = yes;
+    BSS:      load = MAIN,     type = bss, define   = yes;
+}
diff --git a/cfg/c65-asm.cfg b/cfg/c65-asm.cfg
new file mode 100644
index 000000000..40904ef70
--- /dev/null
+++ b/cfg/c65-asm.cfg
@@ -0,0 +1,20 @@
+FEATURES {
+    STARTADDRESS: default = $2001;
+}
+SYMBOLS {
+    __LOADADDR__: type = import;
+}
+MEMORY {
+    ZP:       file = "", start = $0002,  size = $00FE,      define = yes;
+    LOADADDR: file = %O, start = %S - 2, size = $0002;
+    MAIN:     file = %O, start = %S,     size = $D000 - %S;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = rw;
+    RODATA:   load = MAIN,     type = ro,  optional = yes;
+    DATA:     load = MAIN,     type = rw,  optional = yes;
+    BSS:      load = MAIN,     type = bss, optional = yes, define = yes;
+}
diff --git a/cfg/c65.cfg b/cfg/c65.cfg
new file mode 100644
index 000000000..2d78d26d2
--- /dev/null
+++ b/cfg/c65.cfg
@@ -0,0 +1,44 @@
+FEATURES {
+    STARTADDRESS: default = $2001;
+}
+SYMBOLS {
+    __LOADADDR__:  type = import;
+    __EXEHDR__:    type = import;
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __HIMEM__:     type = weak, value = $8000;
+}
+MEMORY {
+    ZP:       file = "", define = yes, start = $0018,           size = $001A;
+    LOADADDR: file = %O,               start = %S - 2,          size = $0002;
+    HEADER:   file = %O, define = yes, start = %S,              size = $0010;
+    MAIN:     file = %O, define = yes, start = __HEADER_LAST__, size = __HIMEM__ - __HEADER_LAST__;
+    BSS:      file = "",               start = __ONCE_RUN__,    size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = HEADER,   type = ro;
+    STARTUP:  load = MAIN,     type = ro;
+    LOWCODE:  load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = ro;
+    RODATA:   load = MAIN,     type = ro;
+    DATA:     load = MAIN,     type = rw;
+    INIT:     load = MAIN,     type = rw;  # uninitialized, but reserves output space
+    ONCE:     load = MAIN,     type = ro,  define   = yes;
+    BSS:      load = BSS,      type = bss, define   = yes;
+}
+FEATURES {
+    CONDES: type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__,
+            segment = ONCE;
+    CONDES: type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__,
+            segment = RODATA;
+    CONDES: type    = interruptor,
+            label   = __INTERRUPTOR_TABLE__,
+            count   = __INTERRUPTOR_COUNT__,
+            segment = RODATA,
+            import  = __CALLIRQ__;
+}
diff --git a/cfg/kim1-mtu60k.cfg b/cfg/kim1-mtu60k.cfg
new file mode 100644
index 000000000..4f24a4bf4
--- /dev/null
+++ b/cfg/kim1-mtu60k.cfg
@@ -0,0 +1,41 @@
+# kim1-mtu60k.cfg   (4k)
+#
+# for expanded KIM-1 w/ K-1008 Graphics and 60K RAM
+#
+# ld65 --config kim1-mtu60k.cfg -o <prog>.bin <prog>.o
+
+FEATURES {
+    STARTADDRESS: default = $2000;
+    CONDES: segment = STARTUP,
+            type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__;
+    CONDES: segment = STARTUP,
+            type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__;
+}
+
+SYMBOLS {
+    __STACKSIZE__:    type = weak, value = $0080;   # 128 byte program stack
+    __STARTADDRESS__: type = export, value = %S;
+}
+
+MEMORY {
+    ZP:       file = %O, define = yes, start = $0000, size = $00EE;
+    CPUSTACK: file = "", define = yes, start = $0100, size = $0100;
+    RAM:      file = %O, define = yes, start = %S,    size = $E000 - %S - __STACKSIZE__;
+    MAINROM:  file = "", define = yes, start = $E000, size = $1000;
+    TOP:      file = "", define = yes, start = $F000, size = $1000;
+}
+
+SEGMENTS {
+    ZEROPAGE: load = ZP,  type = zp,  define = yes;
+    STARTUP:  load = RAM, type = ro,  define = yes;
+    CODE:     load = RAM, type = ro,  define = yes;
+    RODATA:   load = RAM, type = ro,  define = yes;
+    ONCE:     load = RAM, type = ro,  define = yes;
+    DATA:     load = RAM, type = rw,  define = yes;
+    BSS:      load = RAM, type = bss, define = yes;
+}
+
diff --git a/cfg/kim1-mtuE000.cfg b/cfg/kim1-mtuE000.cfg
new file mode 100644
index 000000000..5f93cc13f
--- /dev/null
+++ b/cfg/kim1-mtuE000.cfg
@@ -0,0 +1,41 @@
+# kim1-mtu60k.cfg   (4k)
+#
+# for expanded KIM-1 w/ K-1008 Graphics and 60K RAM
+#
+# ld65 --config kim1-mtu60k.cfg -o <prog>.bin <prog>.o
+
+FEATURES {
+    STARTADDRESS: default = $E000;
+    CONDES: segment = STARTUP,
+            type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__;
+    CONDES: segment = STARTUP,
+            type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__;
+}
+
+SYMBOLS {
+    __STACKSIZE__:    type = weak, value = $0080;   # 128 byte program stack
+    __STARTADDRESS__: type = export, value = %S;
+}
+
+MEMORY {
+    ZP:       file = %O, define = yes, start = $0000, size = $00EE;
+    CPUSTACK: file = "", define = yes, start = $0100, size = $0100;
+    RAM:      file = %O, define = yes, start = $2000, size = $E000 - $2000 - __STACKSIZE__;
+    MAINROM:  file = "", define = yes, start = $E000, size = $1000;
+    TOP:      file = "", define = yes, start = $F000, size = $1000;
+}
+
+SEGMENTS {
+    ZEROPAGE: load = ZP,  type = zp,  define = yes;
+    STARTUP:  load = RAM, type = ro,  define = yes;
+    CODE:     load = RAM, type = ro,  define = yes;
+    RODATA:   load = RAM, type = ro,  define = yes;
+    ONCE:     load = RAM, type = ro,  define = yes;
+    DATA:     load = RAM, type = rw,  define = yes;
+    BSS:      load = RAM, type = bss, define = yes;
+}
+
diff --git a/cfg/lynx-uploader.cfg b/cfg/lynx-uploader.cfg
index 476b3c5de..62269de90 100644
--- a/cfg/lynx-uploader.cfg
+++ b/cfg/lynx-uploader.cfg
@@ -5,16 +5,17 @@ SYMBOLS {
     __BANK1BLOCKSIZE__:   type = weak, value = $0000; # bank 1 block size
     __EXEHDR__:           type = import;
     __BOOTLDR__:          type = import;
-    __DEFDIR__:           type = import;
     __UPLOADER__:         type = import;
+    __UPLOADERSIZE__:     type = export, value = $61;
+    __HEADERSIZE__:       type = export, value = 64;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0000, size = $0100;
-    HEADER: file = %O,               start = $0000, size = $0040;
+    HEADER: file = %O,               start = $0000, size = __HEADERSIZE__;
     BOOT:   file = %O,               start = $0200, size = __STARTOFDIRECTORY__;
-    DIR:    file = %O,               start = $0000, size = 8;
-    MAIN:   file = %O, define = yes, start = $0200, size = $BD38 - __STACKSIZE__;
-    UPLDR:  file = %O, define = yes, start = $BFDC, size = $005C;
+    DIR:    file = %O,               start = $0000, size = 16;
+    MAIN:   file = %O, define = yes, start = $0200, size = $C038 - __UPLOADERSIZE__ - $200 - __STACKSIZE__;
+    UPLOAD: file = %O, define = yes, start = $C038 - __UPLOADERSIZE__, size = $0061;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,     type = zp;
@@ -30,8 +31,8 @@ SEGMENTS {
     RODATA:   load = MAIN,   type = ro,  define = yes;
     DATA:     load = MAIN,   type = rw,  define = yes;
     BSS:      load = MAIN,   type = bss, define = yes;
-    UPCODE:   load = UPLDR,  type = ro,  define = yes;
-    UPDATA:   load = UPLDR,  type = rw,  define = yes;
+    UPCODE:   load = UPLOAD, type = ro,  define = yes;
+    UPDATA:   load = UPLOAD, type = rw,  define = yes;
 }
 FEATURES {
     CONDES: type    = constructor,
diff --git a/cfg/mega65-asm.cfg b/cfg/mega65-asm.cfg
new file mode 100644
index 000000000..40904ef70
--- /dev/null
+++ b/cfg/mega65-asm.cfg
@@ -0,0 +1,20 @@
+FEATURES {
+    STARTADDRESS: default = $2001;
+}
+SYMBOLS {
+    __LOADADDR__: type = import;
+}
+MEMORY {
+    ZP:       file = "", start = $0002,  size = $00FE,      define = yes;
+    LOADADDR: file = %O, start = %S - 2, size = $0002;
+    MAIN:     file = %O, start = %S,     size = $D000 - %S;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = rw;
+    RODATA:   load = MAIN,     type = ro,  optional = yes;
+    DATA:     load = MAIN,     type = rw,  optional = yes;
+    BSS:      load = MAIN,     type = bss, optional = yes, define = yes;
+}
diff --git a/cfg/mega65.cfg b/cfg/mega65.cfg
new file mode 100644
index 000000000..2d78d26d2
--- /dev/null
+++ b/cfg/mega65.cfg
@@ -0,0 +1,44 @@
+FEATURES {
+    STARTADDRESS: default = $2001;
+}
+SYMBOLS {
+    __LOADADDR__:  type = import;
+    __EXEHDR__:    type = import;
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __HIMEM__:     type = weak, value = $8000;
+}
+MEMORY {
+    ZP:       file = "", define = yes, start = $0018,           size = $001A;
+    LOADADDR: file = %O,               start = %S - 2,          size = $0002;
+    HEADER:   file = %O, define = yes, start = %S,              size = $0010;
+    MAIN:     file = %O, define = yes, start = __HEADER_LAST__, size = __HIMEM__ - __HEADER_LAST__;
+    BSS:      file = "",               start = __ONCE_RUN__,    size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = HEADER,   type = ro;
+    STARTUP:  load = MAIN,     type = ro;
+    LOWCODE:  load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = ro;
+    RODATA:   load = MAIN,     type = ro;
+    DATA:     load = MAIN,     type = rw;
+    INIT:     load = MAIN,     type = rw;  # uninitialized, but reserves output space
+    ONCE:     load = MAIN,     type = ro,  define   = yes;
+    BSS:      load = BSS,      type = bss, define   = yes;
+}
+FEATURES {
+    CONDES: type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__,
+            segment = ONCE;
+    CONDES: type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__,
+            segment = RODATA;
+    CONDES: type    = interruptor,
+            label   = __INTERRUPTOR_TABLE__,
+            count   = __INTERRUPTOR_COUNT__,
+            segment = RODATA,
+            import  = __CALLIRQ__;
+}
diff --git a/cfg/plus4-asm.cfg b/cfg/plus4-asm.cfg
new file mode 100644
index 000000000..df47ba06e
--- /dev/null
+++ b/cfg/plus4-asm.cfg
@@ -0,0 +1,20 @@
+FEATURES {
+    STARTADDRESS: default = $1001;
+}
+SYMBOLS {
+    __LOADADDR__:  type = import;
+}
+MEMORY {
+    ZP:       file = "", start = $0002,  size = $001A;
+    LOADADDR: file = %O, start = %S - 2, size = $0002;
+    MAIN:     file = %O, start = %S,     size = $FD00 - %S;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = ro;
+    RODATA:   load = MAIN,     type = ro,  optional = yes;
+    DATA:     load = MAIN,     type = rw,  optional = yes;
+    BSS:      load = MAIN,     type = bss, define   = yes;
+}
diff --git a/cfg/plus4-hires.cfg b/cfg/plus4-hires.cfg
new file mode 100644
index 000000000..0426c8d8c
--- /dev/null
+++ b/cfg/plus4-hires.cfg
@@ -0,0 +1,56 @@
+# Linker configuration that allows for a hi-res bitmap at $C000-$DF3F, but
+# puts the stack (and a "HIBSS" segment) in the remaining RAM at $DF40-$FD00.
+
+FEATURES {
+    STARTADDRESS: default = $1001;
+}
+SYMBOLS {
+    __LOADADDR__:  type = import;
+    __EXEHDR__:    type = import;
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __HIMEM__:     type = weak, value = $FD00;
+}
+MEMORY {
+    # Reserve 8000 bytes at $C000 for 320x200 bitmap
+    RESERVED: file = "", define = yes, start = $C000,             size = 8000;
+
+    ZP:       file = "", define = yes, start = $0002,             size = $001A;
+    LOADADDR: file = %O,               start = %S - 2,            size = $0002;
+    HEADER:   file = %O, define = yes, start = %S,                size = $000D;
+    MAIN:     file = %O, define = yes, start = __HEADER_LAST__,   size = __RESERVED_START__ - __MAIN_START__;
+
+    # Space between bitmap and top of memory
+    HIRAM:    file = "", define = yes, start = __RESERVED_LAST__, size = __HIMEM__ - __HIRAM_START__ - __STACKSIZE__;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = HEADER,   type = ro;
+    STARTUP:  load = MAIN,     type = ro;
+    LOWCODE:  load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = ro;
+    ONCE:     load = MAIN,     type = ro,  optional = yes;
+    RODATA:   load = MAIN,     type = ro;
+    DATA:     load = MAIN,     type = rw;
+    INIT:     load = MAIN,     type = bss;
+    BSS:      load = MAIN,     type = bss, define   = yes;
+
+    # Allow data between bitmap and top of memory to be used as a second BSS
+    # space. Define symbols for it so that it can be supplied to _heapadd().
+    HIBSS:    load = HIRAM,    type = bss, optional = yes, define = yes;
+}
+FEATURES {
+    CONDES: type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__,
+            segment = ONCE;
+    CONDES: type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__,
+            segment = RODATA;
+    CONDES: type    = interruptor,
+            label   = __INTERRUPTOR_TABLE__,
+            count   = __INTERRUPTOR_COUNT__,
+            segment = RODATA,
+            import  = __CALLIRQ__;
+}
diff --git a/cfg/sim6502.cfg b/cfg/sim6502.cfg
index 39c33581c..72098f750 100644
--- a/cfg/sim6502.cfg
+++ b/cfg/sim6502.cfg
@@ -1,12 +1,15 @@
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    _peripherals:  type = export, value = $FFC0;
 }
+
 MEMORY {
     ZP:     file = "",               start = $0000, size = $0100;
     HEADER: file = %O,               start = $0000, size = $000C;
-    MAIN:   file = %O, define = yes, start = $0200, size = $FDF0 - __STACKSIZE__;
+    MAIN:   file = %O, define = yes, start = $0200, size = $FFC0 - $0200 - __STACKSIZE__;
 }
+
 SEGMENTS {
     ZEROPAGE: load = ZP,     type = zp;
     EXEHDR:   load = HEADER, type = ro;
@@ -18,6 +21,7 @@ SEGMENTS {
     DATA:     load = MAIN,   type = rw;
     BSS:      load = MAIN,   type = bss, define   = yes;
 }
+
 FEATURES {
     CONDES: type    = constructor,
             label   = __CONSTRUCTOR_TABLE__,
diff --git a/cfg/sim65c02.cfg b/cfg/sim65c02.cfg
index 39c33581c..72098f750 100644
--- a/cfg/sim65c02.cfg
+++ b/cfg/sim65c02.cfg
@@ -1,12 +1,15 @@
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    _peripherals:  type = export, value = $FFC0;
 }
+
 MEMORY {
     ZP:     file = "",               start = $0000, size = $0100;
     HEADER: file = %O,               start = $0000, size = $000C;
-    MAIN:   file = %O, define = yes, start = $0200, size = $FDF0 - __STACKSIZE__;
+    MAIN:   file = %O, define = yes, start = $0200, size = $FFC0 - $0200 - __STACKSIZE__;
 }
+
 SEGMENTS {
     ZEROPAGE: load = ZP,     type = zp;
     EXEHDR:   load = HEADER, type = ro;
@@ -18,6 +21,7 @@ SEGMENTS {
     DATA:     load = MAIN,   type = rw;
     BSS:      load = MAIN,   type = bss, define   = yes;
 }
+
 FEATURES {
     CONDES: type    = constructor,
             label   = __CONSTRUCTOR_TABLE__,
diff --git a/cfg/vic20-asm-32k.cfg b/cfg/vic20-asm-32k.cfg
new file mode 100644
index 000000000..3d0341e71
--- /dev/null
+++ b/cfg/vic20-asm-32k.cfg
@@ -0,0 +1,22 @@
+# Assembly program configuration for expanded VICs (>= +8K).
+
+FEATURES {
+    STARTADDRESS: default = $1201;
+}
+SYMBOLS {
+    __LOADADDR__: type = import;
+}
+MEMORY {
+    ZP:       file = "", start = $0002,  size = $001A, define = yes;
+    LOADADDR: file = %O, start = %S - 2, size = $0002;
+    MAIN:     file = %O, start = %S,     size = $8000 - %S;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = ro;
+    RODATA:   load = MAIN,     type = ro;
+    DATA:     load = MAIN,     type = rw;
+    BSS:      load = MAIN,     type = bss, optional = yes, define   = yes;
+}
diff --git a/cfg/vic20-asm-3k.cfg b/cfg/vic20-asm-3k.cfg
new file mode 100644
index 000000000..6ef06957e
--- /dev/null
+++ b/cfg/vic20-asm-3k.cfg
@@ -0,0 +1,22 @@
+# Assembly program configuration for expanded VICs (+3K only).
+
+FEATURES {
+    STARTADDRESS: default = $0401;
+}
+SYMBOLS {
+    __LOADADDR__: type = import;
+}
+MEMORY {
+    ZP:       file = "", start = $0002,  size = $001A, define = yes;
+    LOADADDR: file = %O, start = %S - 2, size = $0002;
+    MAIN:     file = %O, start = %S,     size = $1E00 - %S;
+}
+SEGMENTS {
+    ZEROPAGE: load = ZP,       type = zp,  optional = yes;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
+    CODE:     load = MAIN,     type = ro;
+    RODATA:   load = MAIN,     type = ro;
+    DATA:     load = MAIN,     type = rw;
+    BSS:      load = MAIN,     type = bss, optional = yes, define   = yes;
+}
diff --git a/cfg/vic20-asm.cfg b/cfg/vic20-asm.cfg
index 286a7f95c..531d3f010 100644
--- a/cfg/vic20-asm.cfg
+++ b/cfg/vic20-asm.cfg
@@ -1,3 +1,5 @@
+# Assembly program configuration for unexpanded VICs.
+
 FEATURES {
     STARTADDRESS: default = $1001;
 }
@@ -7,11 +9,12 @@ SYMBOLS {
 MEMORY {
     ZP:       file = "", start = $0002,  size = $001A, define = yes;
     LOADADDR: file = %O, start = %S - 2, size = $0002;
-    MAIN:     file = %O, start = %S,     size = $0DF3 - %S;
+    MAIN:     file = %O, start = %S,     size = $1E00 - %S;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,       type = zp,  optional = yes;
     LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = MAIN,     type = ro,  optional = yes;
     CODE:     load = MAIN,     type = ro;
     RODATA:   load = MAIN,     type = ro;
     DATA:     load = MAIN,     type = rw;
diff --git a/doc/Makefile b/doc/Makefile
index bfdf0cce3..330f7b31c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 ifneq ($(shell echo),)
   CMD_EXE = 1
 endif
diff --git a/doc/agat.sgml b/doc/agat.sgml
new file mode 100644
index 000000000..ca5338c5f
--- /dev/null
+++ b/doc/agat.sgml
@@ -0,0 +1,79 @@
+<!doctype linuxdoc system>
+
+<article>
+<title>Agat-7/9 - specific information for cc65
+
+<author><url url="https://sourceforge.net/u/olegodintsov/profile/" name="Oleg A. Odintsov">,<newline>
+<url url="mailto:sintechs@gmail.com" name="Konstantin Fedorov">
+
+<abstract>
+An overview over the Agat-7 and Agat-9 and theirs interfaces to the cc65 C
+compiler.
+</abstract>
+
+<!-- Table of contents -->
+<toc>
+
+<!-- Begin the document -->
+
+<sect>Overview
+
+<p>The Agat was a series of 8-bit computers produced in the Soviet Union from 1983 to 1993.
+It was based on Apple II architecture with all electronic components made in the Soviet Union except for 6502 microprocessors supplied by UMC (UM6502A).
+<p>If compared to Apple II, Agat had many improvements such as color text mode, additional graphic modes and flexible memory controller.
+Agat-7 had an Apple II compatibility card called "Module 121", while Agat-9 had a built-in Apple II+ mode activated by soft-switch.
+<p>All mass-produced Agat models were disk-based systems, 2K ROM contained only basic machine language monitor and disassembler.
+Agat-7 had 140K floppy-drive based on Apple DISK II, while Agat-9 was supplied with 840K drive having its own sector format and controller.
+
+<sect>Binary format<p>
+
+The standard binary file format generated by the linker for the Agat target is
+an AppleSingle file to be compatible with AppleCommander <url url="https://applecommander.github.io/">.
+The default load address is &dollar;1903.
+
+
+
+<sect>Platform-specific header files<p>
+
+Programs containing Agat-specific code may use the <tt/agat.h/ or
+<tt/agat.inc/ include files.
+
+<sect>Usefull info<p>
+
+<sect1>Emulation<p>
+
+<enum>
+<item>  Oleg Odintsov's Agat Emulator - <url url="https://agatemulator.sourceforge.net/english.html">
+<item>  MAME - <url url="https://www.mamedev.org/">
+</enum>
+
+<sect1>Links<p>
+<enum>
+<item>  Most informative source on Agat (in russian) - <url url="https://agatcomp.ru">
+<item>  Wikipedia - <url url="https://en.wikipedia.org/wiki/Agat_(computer)">
+<item>  Controversial article on Agat from <url name="BYTE Magazine November 1984 Vol. 9, No. 12" url="https://archive.org/details/byte-magazine-1984-11/page/n135/mode/2up?view=theater">.
+The author reviewed custom-build mockup Agat bearing little relation to even the early Agat systems.
+</enum>
+
+
+<sect>License<p>
+
+This software is provided "as-is", without any expressed or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+<enum>
+<item>  The origin of this software must not be misrepresented; you must not
+        claim that you wrote the original software. If you use this software
+        in a product, an acknowledgment in the product documentation would be
+        appreciated, but is not required.
+<item>  Altered source versions must be plainly marked as such, and must not
+        be misrepresented as being the original software.
+<item>  This notice may not be removed or altered from any source
+        distribution.
+</enum>
+
+</article>
diff --git a/doc/apple2.sgml b/doc/apple2.sgml
index 97724c147..ec9598d04 100644
--- a/doc/apple2.sgml
+++ b/doc/apple2.sgml
@@ -62,7 +62,7 @@ Special locations:
 </descrip><p>
 
 While running <tt/main()/ the Language Card bank 2 is enabled for read access.
-However while running module constructors/destructors the Language Card is disabled.
+However while running module constructors the Language Card is disabled.
 
 Enabling the Language Card allows to use it as additional memory for cc65
 generated code. However code is never automatically placed there. Rather code
@@ -87,12 +87,33 @@ several useful settings:
   exit then a plain vanilla ProDOS 8 doesn't make use of the Language Card bank
   2 at all.
 
-  <tag>LC address: &dollar;D000, LC size: &dollar;3000</tag>
+  <tag>LC address: &dollar;D000, LC size: &dollar;2FFC</tag>
   For plain vanilla DOS 3.3 which doesn't make use of the Language Card at all.
 
 </descrip><p>
 
+<descrip>
 
+  <tag/Installing your code in the Language Card/
+  The code in the LC segment will automatically be copied from the end of the
+  binary into the Language Card at startup, even if the segment is empty (a
+  0-byte copy). This allows for tighter code. This code will be copied using the
+  Applesoft BLTU2 function that is available starting with the Apple ][+,
+  but not in the original Apple ][ with an Integer BASIC ROM. This shows as
+  a "RANGE ERROR. STOPPING AT ..." message on startup.
+
+  If you want to target the Integer BASIC original Apple ][, you can link in an
+  alternative implementation of the LC segment loading, at the cost of linking
+  in memcpy (60 bytes):
+
+  Using <tt/apple2-integer-basic-compat.o/ is as simple as placing it on the linker
+  command line like this:
+
+  <tscreen><verb>
+  cl65 -t apple2 myprog.c apple2-integer-basic-compat.o
+  </verb></tscreen>
+
+</descrip>
 
 <sect>Linker configurations<label id="link-configs"><p>
 
@@ -289,9 +310,9 @@ the memory from &dollar;800 to &dollar;1FFF can be added to the heap by calling
 
 ProDOS 8 requires for every open file a page-aligned 1 KB I/O buffer. By default
 these buffers are allocated by the cc65 runtime system on the heap using
-<tt/posix_memalign()/. While this is generally the best solution it means quite
-some overhead for (especially rather small) cc65 programs which do open files
-but don't make use of the heap otherwise.
+<url url="funcref.html#posix_memalign" name="posix_memalign()">. While this is
+generally the best solution it means quite some overhead for (especially rather
+small) cc65 programs which do open files but don't make use of the heap otherwise.
 
 The apple2 package comes with the alternative ProDOS 8 I/O buffer allocation
 module <tt/apple2-iobuf-0800.o/ which uses the memory between &dollar;800 and
@@ -321,18 +342,40 @@ Programs containing Apple&nbsp;&rsqb;&lsqb; specific code may use the
 
 <sect1>Apple&nbsp;&rsqb;&lsqb; specific functions<p>
 
-The functions listed below are special for the Apple&nbsp;&rsqb;&lsqb;. See
-the <url url="funcref.html" name="function reference"> for declaration and
+The functions and variables listed below are special for the Apple&nbsp;&rsqb;&lsqb;.
+See the <url url="funcref.html" name="function reference"> for declaration and
 usage.
 
 <itemize>
 <item>_auxtype
 <item>_dos_type
 <item>_filetype
+<item>_datetime
+<item>allow_lowercase
+<item>beep
+<item>dir_entry_count
+<item>get_tv
 <item>get_ostype
+<item>gmtime_dt
+<item>mktime_dt
 <item>rebootafterexit
 <item>ser_apple2_slot
 <item>tgi_apple2_mix
+<item>videomode
+</itemize>
+
+
+<sect1>Apple IIgs specific functions in accelerator.h<p>
+
+In addition to those, the <tt/accelerator.h/ header file contains three functions
+to help determine whether the program is running on a IIgs, and change the IIgs
+CPU speed. See the <url url="funcref.html" name="function reference"> for declaration and
+usage.
+
+<itemize>
+<item>detect_iigs
+<item>get_iigs_speed
+<item>set_iigs_speed
 </itemize>
 
 
@@ -364,6 +407,10 @@ The names in the parentheses denote the symbols to be used for static linking of
   with <tt/-S $4000/ to reserve the first hires page or with <tt/-S $6000/
   to reserve both hires pages.
 
+  Note that the second hires page is only available if the text display is not in
+  80 column mode. This can be asserted by calling <tt/videomode (VIDEOMODE_40COL);/
+  before installing the driver.
+
   The function <tt/tgi_apple2_mix()/ allows to activate 4 lines of text. The
   function doesn't clear the corresponding area at the bottom of the screen.
 
@@ -434,10 +481,15 @@ The names in the parentheses denote the symbols to be used for static linking of
   (RTS/CTS) and does interrupt driven receives. Speeds faster than 9600 baud
   aren't reachable because the ROM and ProDOS IRQ handlers are too slow.
   Software flow control (XON/XOFF) is not supported.
+
   Note that because of the peculiarities of the 6551 chip transmits are not
   interrupt driven, and the transceiver blocks if the receiver asserts
   flow control because of a full buffer.
 
+  Note that using the driver at SER_BAUD_115200 will disable IRQs. It will be up
+  to the users to use the serial port, either by re-enabling IRQs themselves,
+  or by directly poll-reading the ACIA DATA register without the help of ser_get().
+
   The driver defaults to slot 2. Call <tt/ser_apple2_slot()/ prior to
   <tt/ser_open()/ in order to select a different slot. <tt/ser_apple2_slot()/
   succeeds for all Apple&nbsp;II slots, but <tt/ser_open()/ fails with
@@ -569,6 +621,28 @@ program. See the discussion of the <tt/.CONDES/ feature in the <url
 url="ca65.html" name="assembler manual">.
 
 
+<sect1>ProDOS date/time manipulation<p>
+
+<descrip>
+The readdir and stat function return ProDOS timestamps in their file
+creation/modification time attributes. You can convert them to more portable
+time representations using either:
+
+<tag/struct tm/
+<tt/struct tm* __fastcall__ gmtime_dt (const struct datetime* dt);/
+
+Converts a <tt/struct datetime/ into a <tt/struct tm/. Returns NULL in case
+of error and sets errno.
+
+<tag/time_t/
+<tt/time_t __fastcall__ mktime_dt (const struct datetime* dt);/
+
+Parses a <tt/struct datetime/ and returns a UNIX timestamp. Returns 0 on error and
+sets errno.
+
+</descrip>
+
+
 <sect1>DIO<p>
 
 <descrip>
@@ -630,6 +704,16 @@ url="ca65.html" name="assembler manual">.
   that can be used to set these variables. It is included in
   <tt/apple2.h/.
 
+  The global variable <tt/_datetime/ allows the file creation date/time
+  to be set before a call to <tt/fopen()/
+  or <tt/open()/ that creates the file. It is defined in <tt/apple2.h/:
+
+  <tscreen>
+  <verb>
+  extern struct datetime _datetime;
+  </verb>
+  </tscreen>
+
   <tag>Example</tag>
 
   A text file cannot be created with just the
diff --git a/doc/apple2enh.sgml b/doc/apple2enh.sgml
index 11d4feb7e..1e94d3b60 100644
--- a/doc/apple2enh.sgml
+++ b/doc/apple2enh.sgml
@@ -63,7 +63,7 @@ Special locations:
 </descrip><p>
 
 While running <tt/main()/ the Language Card bank 2 is enabled for read access.
-However while running module constructors/destructors the Language Card is disabled.
+However while running module constructors the Language Card is disabled.
 
 Enabling the Language Card allows to use it as additional memory for cc65
 generated code. However code is never automatically placed there. Rather code
@@ -88,7 +88,7 @@ several useful settings:
   exit then a plain vanilla ProDOS 8 doesn't make use of the Language Card bank
   2 at all.
 
-  <tag>LC address: &dollar;D000, LC size: &dollar;3000</tag>
+  <tag>LC address: &dollar;D000, LC size: &dollar;2FFC</tag>
   For plain vanilla DOS 3.3 which doesn't make use of the Language Card at all.
 
 </descrip><p>
@@ -290,9 +290,9 @@ the memory from &dollar;800 to &dollar;1FFF can be added to the heap by calling
 
 ProDOS 8 requires for every open file a page-aligned 1 KB I/O buffer. By default
 these buffers are allocated by the cc65 runtime system on the heap using
-<tt/posix_memalign()/. While this is generally the best solution it means quite
-some overhead for (especially rather small) cc65 programs which do open files
-but don't make use of the heap otherwise.
+<url url="funcref.html#posix_memalign" name="posix_memalign()">. While this is
+generally the best solution it means quite some overhead for (especially rather
+small) cc65 programs which do open files but don't make use of the heap otherwise.
 
 The apple2enh package comes with the alternative ProDOS 8 I/O buffer allocation
 module <tt/apple2enh-iobuf-0800.o/ which uses the memory between &dollar;800 and
@@ -322,15 +322,21 @@ Programs containing enhanced&nbsp;Apple&nbsp;//e specific code may use the
 
 <sect1>Enhanced&nbsp;Apple&nbsp;//e specific functions<p>
 
-The functions listed below are special for the enhanced&nbsp;Apple&nbsp;//e. See
-the <url url="funcref.html" name="function reference"> for declaration and
+The functions and variables listed below are special for the Apple&nbsp;&rsqb;&lsqb;.
+See the <url url="funcref.html" name="function reference"> for declaration and
 usage.
 
 <itemize>
 <item>_auxtype
 <item>_dos_type
 <item>_filetype
+<item>_datetime
+<item>beep
+<item>dir_entry_count
+<item>get_tv
 <item>get_ostype
+<item>gmtime_dt
+<item>mktime_dt
 <item>rebootafterexit
 <item>ser_apple2_slot
 <item>tgi_apple2_mix
@@ -339,6 +345,20 @@ usage.
 </itemize>
 
 
+<sect1>Apple IIgs specific functions in accelerator.h<p>
+
+In addition to those, the <tt/accelerator.h/ header file contains three functions
+to help determine whether the program is running on a IIgs, and change the IIgs
+CPU speed. See the <url url="funcref.html" name="function reference"> for declaration and
+usage.
+
+<itemize>
+<item>detect_iigs
+<item>get_iigs_speed
+<item>set_iigs_speed
+</itemize>
+
+
 <sect1>Hardware access<p>
 
 There's currently no support for direct hardware access. This does not mean
@@ -435,10 +455,15 @@ The names in the parentheses denote the symbols to be used for static linking of
   (RTS/CTS) and does interrupt driven receives. Speeds faster than 9600 baud
   aren't reachable because the ROM and ProDOS IRQ handlers are too slow.
   Software flow control (XON/XOFF) is not supported.
+
   Note that because of the peculiarities of the 6551 chip transmits are not
   interrupt driven, and the transceiver blocks if the receiver asserts
   flow control because of a full buffer.
 
+  Note that using the driver at SER_BAUD_115200 will disable IRQs. It will be up
+  to the users to use the serial port, either by re-enabling IRQs themselves,
+  or by directly poll-reading the ACIA DATA register without the help of ser_get().
+
   The driver defaults to slot 2. Call <tt/ser_apple2_slot()/ prior to
   <tt/ser_open()/ in order to select a different slot. <tt/ser_apple2_slot()/
   succeeds for all Apple&nbsp;II slots, but <tt/ser_open()/ fails with
@@ -575,6 +600,28 @@ program. See the discussion of the <tt/.CONDES/ feature in the <url
 url="ca65.html" name="assembler manual">.
 
 
+<sect1>ProDOS date/time manipulation<p>
+
+<descrip>
+The readdir and stat function return ProDOS timestamps in their file
+creation/modification time attributes. You can convert them to more portable
+time representations using either:
+
+<tag/struct tm/
+<tt/struct tm* __fastcall__ gmtime_dt (const struct datetime* dt);/
+
+Converts a <tt/struct datetime/ into a <tt/struct tm/. Returns -1 in case
+of error and sets errno, 0 on success.
+
+<tag/time_t/
+<tt/time_t __fastcall__ mktime_dt (const struct datetime* dt);/
+
+Parses a <tt/struct datetime/ and returns a UNIX timestamp. Returns 0 on error and
+sets errno.
+
+</descrip>
+
+
 <sect1>DIO<p>
 
 <descrip>
@@ -619,7 +666,7 @@ url="ca65.html" name="assembler manual">.
   auxiliary type. Therefore, some additional mechanism for specifying
   the file types is needed.
 
-  <tag>Specifying the File Type and Auxiliary Type</tag>
+  <tag>Specifying the File Type, Auxiliary Type and creation date</tag>
 
   There are two global variables provided that allow the file type
   and auxiliary type to be specified before a call to <tt/fopen()/
@@ -636,6 +683,16 @@ url="ca65.html" name="assembler manual">.
   that can be used to set these variables. It is included in
   <tt/apple2.h/, which is in turn included in <tt/apple2enh.h/.
 
+  The global variable <tt/_datetime/ allows the file creation date/time
+  to be set before a call to <tt/fopen()/
+  or <tt/open()/ that creates the file. It is defined in <tt/apple2.h/:
+
+  <tscreen>
+  <verb>
+  extern struct datetime _datetime;
+  </verb>
+  </tscreen>
+
   <tag>Example</tag>
 
   A text file cannot be created with just the
diff --git a/doc/atari.sgml b/doc/atari.sgml
index 3057cd8a6..1a83d74fb 100644
--- a/doc/atari.sgml
+++ b/doc/atari.sgml
@@ -412,8 +412,9 @@ Please mind that ANTIC has memory alignment requirements for "player
 missile graphics"-data, font data, display lists and screen memory. Creation
 of a special linker configuration with appropriate aligned segments and
 switching to that segment in the c-code is usually necessary. A more memory
-hungry solution consists in using the "<tt/posix_memalign()/" function in
-conjunction with copying your data to the allocated memory.
+hungry solution consists in using the <url url="funcref.html#posix_memalign"
+name="posix_memalign()"> function in conjunction with copying your data to the
+allocated memory.
 
 <sect1>Character mapping<p>
 
@@ -1120,7 +1121,7 @@ If BSS and/or the stack shouldn't stay at the end of the program,
 some parts of the cc65 runtime lib need to be replaced/modified.
 
 common/_heap.s defines the location of the heap and atari/crt0.s
-defines the location of the stack by initializing sp.
+defines the location of the stack by initializing c_sp.
 
 
 <sect1>Upgrading from an older cc65 version<p>
diff --git a/doc/atmos.sgml b/doc/atmos.sgml
index cef7770e4..e330d9517 100644
--- a/doc/atmos.sgml
+++ b/doc/atmos.sgml
@@ -1,15 +1,15 @@
 <!doctype linuxdoc system>
 
 <article>
-<title>Oric Atmos-specific information for cc65
+<title>Tangerine Oric Atmos-specific information for cc65
 <author>
 <url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
-<url url="mailto:polluks@sdf.lonestar.org" name="Stefan A. Haubenthal">,<newline>
+<url url="mailto:polluks@sdf.org" name="Stefan A. Haubenthal">,<newline>
 <url url="mailto:greg.king5@verizon.net" name="Greg King">
 
 <abstract>
-An overview over the Atmos runtime system as it is implemented for the cc65 C
-compiler.
+An overview over the Oric Atmos runtime system as it is implemented for the cc65
+C compiler. This target is not Oric-1 compatible.
 </abstract>
 
 <!-- Table of contents -->
diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 0b37b39b0..fe3047b09 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -153,8 +153,21 @@ Here is a description of all the command line options:
 
   Set the default for the CPU type. The option takes a parameter, which
   may be one of
-
-        6502, 6502X, 6502DTV, 65SC02, 65C02, 65816, sweet16, HuC6280, 4510
+  <itemize>
+  <item>6502 - NMOS 6502 (all legal instructions)
+  <item>6502X - NMOS 6502 with all undocumented instructions
+  <item>6502DTV - the emulated CPU of the C64DTV device
+  <item>65SC02 - first CMOS instruction set (no bit manipulation, no wai/stp)
+  <item>65C02 - CMOS with Rockwell extensions
+  <item>W65C02 - full CMOS instruction set (has bit manipulation and wai/stp)
+  <item>65CE02 - CMOS with CSG extensions
+  <item>4510 - the CPU of the Commodore C65
+  <item>45GS02 - the CPU of the Commodore MEGA65
+  <item>HuC6280 - the CPU of the PC engine
+  <item>M740 - a Microcontroller by Mitsubishi
+  <item>65816 - the CPU of the SNES, and the SCPU
+  <item>sweet16 - an interpreter for a pseudo 16 bit CPU
+  </itemize>
 
 
   <label id="option-create-dep">
@@ -304,7 +317,7 @@ Here is a description of all the command line options:
   character constants into the character set of the target platform. The
   default for the target system is "none", which means that no translation
   will take place. The assembler supports the same target systems as the
-  compiler, see there for a list.
+  compiler, see <htmlurl url="ca65.html#option-t" name="there for a list">.
 
   Depending on the target, the default CPU type is also set. This can be
   overridden by using the <tt/<ref id="option--cpu" name="--cpu">/ option.
@@ -401,7 +414,7 @@ name="--bin-include-dir">/ option on the command line.
 
 
 
-<sect>Input format<p>
+<sect>Input format<p><label id="input-format">
 
 <sect1>Assembler syntax<p>
 
@@ -428,22 +441,36 @@ Here are some examples for valid input lines:
 The assembler accepts
 
 <itemize>
-<item>all valid 6502 mnemonics when in 6502 mode (the default or after the
+<item>all valid 6502 mnemonics when in <ref id="6502-mode" name="6502 mode">
+      (the default or after the
       <tt><ref id=".P02" name=".P02"></tt> command was given).
-<item>all valid 6502 mnemonics plus a set of illegal instructions when in
-      <ref id="6502X-mode" name="6502X mode">.
-<item>all valid 6502DTV mnemonics when in 6502DTV mode (after the
+<item>all valid 6502 mnemonics, plus a set of illegal instructions, when in
+      <ref id="6502X-mode" name="6502X mode"> (after the
+      <tt><ref id=".P02X" name=".P02X"></tt> command was given).
+<item>all valid 6502DTV mnemonics when in <ref id="DTV-mode" name="DTV mode"> (after the
       <tt><ref id=".PDTV" name=".PDTV"></tt> command was given).
-<item>all valid 65SC02 mnemonics when in 65SC02 mode (after the
+<item>all valid 65SC02 mnemonics when in <ref id="65SC02-mode" name="65SC02 mode"> (after the
       <tt><ref id=".PSC02" name=".PSC02"></tt> command was given).
-<item>all valid 65C02 mnemonics when in 65C02 mode (after the
+<item>all valid 65C02 mnemonics when in <ref id="65C02-mode" name="65C02 mode"> (after the
       <tt><ref id=".PC02" name=".PC02"></tt> command was given).
-<item>all valid 65816 mnemonics when in 65816 mode (after the
-      <tt><ref id=".P816" name=".P816"></tt> command was given).
-<item>all valid 4510 mnemonics when in 4510 mode (after the
+<item>all valid W65C02 mnemonics when in <ref id="W65C02-mode" name="W65C02 mode"> (after the
+      <tt><ref id=".PWC02" name=".PWC02"></tt> command was given).
+<item>all valid 65CE02 mnemonics when in <ref id="65CE02-mode" name="65CE02 mode"> (after the
+      <tt><ref id=".PCE02" name=".PCE02"></tt> command was given).
+<item>all valid 4510 mnemonics when in <ref id="4510-mode" name="4510 mode"> (after the
       <tt><ref id=".P4510" name=".P4510"></tt> command was given).
+<item>all valid 45GS02 mnemonics when in <ref id="45GS02-mode" name="45GS02 mode"> (after the
+      <tt><ref id=".P45GS02" name=".P45GS02"></tt> command was given).
+<item>all valid HuC6280 mnemonics when in <ref id="HUC6280-mode" name="HuC6280 mode"> (after the
+      <tt><ref id=".P6280" name=".P6280"></tt> command was given).
+<item>all valid M740 mnemonics when in <ref id="M740-mode" name="M740 mode"> (after the
+      <tt><ref id=".PM740" name=".PM740"></tt> command was given).
+<item>all valid 65816 mnemonics when in <ref id="65816-mode" name="65816 mode"> (after the
+      <tt><ref id=".P816" name=".P816"></tt> command was given).
 </itemize>
 
+for more details on the various CPUs, see <tt><htmlurl url="cpus.html" name="here"></tt>.
+
 On 6502-derived platforms the <tt/BRK/ instruction has an optional signature
 byte. If omitted, the assembler will only produce only 1 byte.
 
@@ -453,8 +480,138 @@ byte. If omitted, the assembler will only produce only 1 byte.
                 brk     #$34            ; 2-bytes: $00 $34
 </verb></tscreen>
 
+<sect2>6502 mode<label id="6502-mode"><p>
 
-<sect1>65816 mode<p>
+In 6502 mode (which is the default) the assembler accepts all regular "legal"
+6502 mnemonics and addressing modes.
+
+<sect2>6502X mode<label id="6502X-mode"><p>
+
+6502X mode is an extension to the normal 6502 mode. In this mode, several
+mnemonics for undocumented instructions of the NMOS 6502 CPUs are accepted.
+
+Note: Since these instructions are undocumented, there are no official mnemonics
+for them.
+
+<itemize>
+<item><tt>ALR: A:=(A and #{imm})/2;</tt>
+<item><tt>ANC: A:= A and #{imm};</tt> Generates opcode &dollar;0B.
+<item><tt>ANE: A:= (A or CONST) and X and #{imm};</tt>
+<item><tt>ARR: A:=(A and #{imm})/2;</tt>
+<item><tt>AXS: X:=A and X-#{imm};</tt>
+<item><tt>DCP: {addr}:={addr}-1; A-{addr};</tt>
+<item><tt>ISC: {addr}:={addr}+1; A:=A-{addr};</tt>
+<item><tt>JAM:</tt>
+<item><tt>LAS: A,X,S:={addr} and S;</tt>
+<item><tt>LAX: A,X:={addr};</tt>
+<item><tt>NOP: #{imm}; zp; zp,x; abs; abs,x</tt>
+<item><tt>RLA: {addr}:={addr}rol; A:=A and {addr};</tt>
+<item><tt>RRA: {addr}:={addr}ror; A:=A adc {addr};</tt>
+<item><tt>SAX: {addr}:=A and X;</tt>
+<item><tt>SHA: {addr}:=A and X and {addr hi +1};</tt>
+<item><tt>SHX: {addr}:=X and {addr hi +1};</tt>
+<item><tt>SHY: {addr}:=Y and {addr hi +1};</tt>
+<item><tt>SLO: {addr}:={addr}*2; A:=A or {addr};</tt>
+<item><tt>SRE: {addr}:={addr}/2; A:=A xor {addr};</tt>
+<item><tt>TAS: {addr}:=A and X and {addr hi +1}; SP:=A and X;</tt>
+</itemize>
+
+
+<sect2>DTV mode<label id="DTV-mode"><p>
+
+The C64DTV CPU is based on the 6510, but adds some instructions, and does not
+support all undocumented instructions.
+
+<itemize>
+<item><tt>bra {rel}</tt> Generates opcode &dollar;12.
+<item><tt>sac #{imm}</tt> Generates opcode &dollar;32.
+<item><tt>sir #{imm}</tt> Generates opcode &dollar;42.
+</itemize>
+
+Supported undocumented instructions:
+
+<itemize>
+<item><tt>ALR: A:=(A and #{imm})/2;</tt>
+<item><tt>ANC: A:=A and #{imm};</tt> Generates opcode &dollar;0B.
+<item><tt>ARR: A:=(A and #{imm})/2;</tt>
+<item><tt>AXS: X:=A and X-#{imm};</tt>
+<item><tt>LAS: A,X,S:={addr} and S;</tt>
+<item><tt>LAX: A,X:={addr};</tt>
+<item><tt>NOP: #{imm}; zp; zp,x; abs; abs,x</tt>
+<item><tt>RLA: {addr}:={addr}rol; A:=A and {addr};</tt>
+<item><tt>RRA: {addr}:={addr}ror; A:=A adc {addr};</tt>
+<item><tt>SHX: {addr}:=X and {addr hi +1};</tt>
+<item><tt>SHY: {addr}:=y and {addr hi +1};</tt>
+</itemize>
+
+
+<sect2>65SC02 mode<label id="65SC02-mode"><p>
+
+65SC02 mode supports all regular 6502 instructions, plus the original CMOS
+instructions.
+
+
+<sect2>65C02 mode (CMOS with Rockwell extensions)<label id="65C02-mode"><p>
+
+65C02 mode supports all original CMOS instructions, plus the Rockwell (bit
+manipulation instructions) extensions.
+
+
+<sect2>W65C02 mode (CMOS with WDC extensions)<label id="W65C02-mode"><p>
+
+W65C02 mode supports the Rockwell extensions, plus wai and stp.
+
+
+<sect2>65CE02 mode<label id="65CE02-mode"><p>
+
+All 65CE02 instructions are accepted, plus the Rockwell extensions.
+
+
+<sect2>4510 mode<label id="4510-mode"><p>
+
+The 4510 is a microcontroller that is the core of the Commodore C65 aka C64DX.
+It contains among other functions a slightly modified 65CE02/4502 CPU, to allow
+address mapping for 20 bits of address space (1 megabyte addressable area).
+
+As compared to the description of the CPU in the
+<url url="http://www.zimmers.net/anonftp/pub/cbm/c65/c65manualupdated.txt.gz"
+name="C65 System Specification">
+<url url="https://raw.githubusercontent.com/MEGA65/c65-specifications/master/c65manualupdated.txt"
+name="(updated version)"> uses these changes:
+<itemize>
+<item><tt>LDA (d,SP),Y</tt> may also be written as <tt>LDA (d,S),Y</tt>
+(matching the 65816 notation).
+<item>All branch instruction allow now 16 bit offsets. To use a 16 bit
+branch you have to prefix these with an "L" (e.g. "<tt>LBNE</tt>" instead of
+"<tt>BNE</tt>"). This might change at a later implementation of the assembler.
+</itemize>
+
+For more information about the Commodore C65/C64DX and the 4510 CPU, see
+<url url="http://www.zimmers.net/anonftp/pub/cbm/c65/"> and
+<url url="https://en.wikipedia.org/wiki/Commodore_65" name="Wikipedia">.
+
+<sect2>45GS02 mode<label id="45GS02-mode"><p>
+
+The 45GS02 is a microcontroller that is the core of the MEGA65.
+It is an extension of the 4510 CPU and adds 32-bit addressing and a 32-bit
+pseudo register Q that is comprised of the four registers A, X, Y, and Z.
+
+<sect2>HUC6280 mode (CMOS with Hudson extensions)<label id="HUC6280-mode"><p>
+
+The HUC6280 is a superset of 65C02, used in the PC Engine.
+
+
+<sect2>M740 mode<label id="M740-mode"><p>
+
+The M740 is a microcontroller by Mitsubishi, which was marketed for embedded
+devices in the mid 80s. It is a superset of 6502, and a subset of 65SC02, plus
+some new instructions.
+
+For more information about the M740 Controllers, see
+<url url="https://en.wikipedia.org/wiki/Mitsubishi_740" name="Wikipedia">.
+
+
+<sect2>65816 mode<label id="65816-mode"><p><p>
 
 In 65816 mode, several aliases are accepted, in addition to the official
 mnemonics:
@@ -481,57 +638,15 @@ or two far addresses whose high byte will be used.
                 mvp     $123456, $789ABC   ; bank $12 to $78
 </verb></tscreen>
 
-
-<sect1>6502X mode<label id="6502X-mode"><p>
-
-6502X mode is an extension to the normal 6502 mode. In this mode, several
-mnemonics for illegal instructions of the NMOS 6502 CPUs are accepted. Since
-these instructions are illegal, there are no official mnemonics for them. The
-unofficial ones are taken from <url
-url="http://www.oxyron.de/html/opcodes02.html">. Please note that only the
-ones marked as "stable" are supported. The following table uses information
-from the mentioned web page, for more information, see there.
-
-<itemize>
-<item><tt>ALR: A:=(A and #{imm})/2;</tt>
-<item><tt>ANC: A:=A and #{imm};</tt> Generates opcode &dollar;0B.
-<item><tt>ARR: A:=(A and #{imm})/2;</tt>
-<item><tt>AXS: X:=A and X-#{imm};</tt>
-<item><tt>DCP: {adr}:={adr}-1; A-{adr};</tt>
-<item><tt>ISC: {adr}:={adr}+1; A:=A-{adr};</tt>
-<item><tt>LAS: A,X,S:={adr} and S;</tt>
-<item><tt>LAX: A,X:={adr};</tt>
-<item><tt>RLA: {adr}:={adr}rol; A:=A and {adr};</tt>
-<item><tt>RRA: {adr}:={adr}ror; A:=A adc {adr};</tt>
-<item><tt>SAX: {adr}:=A and X;</tt>
-<item><tt>SLO: {adr}:={adr}*2; A:=A or {adr};</tt>
-<item><tt>SRE: {adr}:={adr}/2; A:=A xor {adr};</tt>
-</itemize>
+also see <ref id="long_jsr_jmp_rts" name="long_jsr_jmp_rts">
+ <ref id=".SMART" name=".SMART">
+ <ref id=".A8" name=".A8">
+ <ref id=".A16" name=".A16">
+ <ref id=".I8" name=".I8">
+ <ref id=".I16" name=".I16">
 
 
-<sect1>4510 mode<p>
-
-The 4510 is a microcontroller that is the core of the Commodore C65 aka C64DX.
-It contains among other functions a slightly modified 65CE02/4502 CPU, to allow
-address mapping for 20 bits of address space (1 megabyte addressable area).
-As compared to the description of the CPU in the
-<url url="http://www.zimmers.net/anonftp/pub/cbm/c65/c65manualupdated.txt.gz"
-name="C65 System Specification">
-<url url="https://raw.githubusercontent.com/MEGA65/c65-specifications/master/c65manualupdated.txt"
-name="(updated version)"> uses these changes:
-<itemize>
-<item><tt>LDA (d,SP),Y</tt> may also be written as <tt>LDA (d,S),Y</tt>
-(matching the 65816 notataion).
-<item>All branch instruction allow now 16 bit offsets. To use a 16 bit
-branch you have to prefix these with an "L" (e.g. "<tt>LBNE</tt>" instead of
-"<tt>BNE</tt>"). This might change at a later implementation of the assembler.
-</itemize>
-For more information about the Commodore C65/C64DX and the 4510 CPU, see
-<url url="http://www.zimmers.net/anonftp/pub/cbm/c65/"> and
-<url url="https://en.wikipedia.org/wiki/Commodore_65" name="Wikipedia">.
-
-
-<sect1>sweet16 mode<label id="sweet16-mode"><p>
+<sect2>sweet16 mode<label id="sweet16-mode"><p>
 
 SWEET 16 is an interpreter for a pseudo 16 bit CPU written by Steve Wozniak
 for the Apple ][ machines. It is available in the Apple ][ ROM. ca65 can
@@ -831,49 +946,40 @@ names like "Loop". Here is an example:
                 bne    @Loop            ; ERROR: Unknown identifier!
 </verb></tscreen>
 
+
 <sect1>Unnamed labels<p>
 
-If you really want to write messy code, there are also unnamed labels. These
-labels do not have a name (you guessed that already, didn't you?). A colon is
-used to mark the absence of the name.
+If you really want to write messy code, there are also unnamed labels. To define
+an unnamed label, use sole <tt>:</tt>.
 
-Unnamed labels may be accessed by using the colon plus several minus or plus
-characters as a label designator. Using the '-' characters will create a back
-reference (use the n'th label backwards), using '+' will create a forward
-reference (use the n'th label in forward direction). An example will help to
-understand this:
+To reference an unnamed label, use <tt>:</tt> with several <tt>-</tt> or <tt>+</tt> characters.
+The <tt>-</tt> characters will create a back reference (n'th label backwards),
+the <tt>+</tt> will create a forward reference (n'th label in forward direction).
+As an alternative, angle brackets <tt>&lt;</tt> and <tt>&gt;</tt> may be used
+instead of <tt>-</tt> and <tt>+</tt> with the same meaning.
+
+Example:
 
 <tscreen><verb>
-        :       lda     (ptr1),y        ; #1
-                cmp     (ptr2),y
-                bne     :+              ; -> #2
-                tax
-                beq     :+++            ; -> #4
-                iny
-                bne     :-              ; -> #1
-                inc     ptr1+1
-                inc     ptr2+1
-                bne     :-              ; -> #1
-
-        :       bcs     :+              ; #2 -> #3
-                ldx     #$FF
-                rts
-
-        :       ldx     #$01            ; #3
-        :       rts                     ; #4
+        cpy #0
+        beq :++
+    :
+        sta $2007
+        dey
+        bne :-
+    :
+        rts
 </verb></tscreen>
 
-As you can see from the example, unnamed labels will make even short
-sections of code hard to understand, because you have to count labels
-to find branch targets (this is the reason why I for my part do
-prefer the "cheap" local labels). Nevertheless, unnamed labels are
-convenient in some situations, so it's your decision.
+Unnamed labels may make even short sections of code hard to understand, because
+you have to count labels to find branch targets. It's better to prefer the
+"cheap" local labels. Nevertheless, unnamed labels are convenient in some
+situations, so it's up to your discretion.
 
 <em/Note:/ <ref id="scopes" name="Scopes"> organize named symbols, not
 unnamed ones, so scopes don't have an effect on unnamed labels.
 
 
-
 <sect1>Using macros to define labels and constants<p>
 
 While there are drawbacks with this approach, it may be handy in a few rare
@@ -1068,7 +1174,7 @@ The namespace token (<tt/::/) is used to access other scopes:
         .endscope
 
                 ...
-                lda     foo::bar        ; Access foo in scope bar
+                lda     #foo::bar        ; Access bar in scope foo
 </verb></tscreen>
 
 The only way to deny access to a scope from the outside is to declare a scope
@@ -1297,16 +1403,76 @@ writable.
   Reading this pseudo variable will give a constant integer value that
   tells which CPU is currently enabled. It can also tell which instruction
   set the CPU is able to translate. The value read from the pseudo variable
-  should be further examined by using one of the constants defined by the
-  "cpu" macro package (see <tt/<ref id=".MACPACK" name=".MACPACK">/).
+  should be further examined by using one of the following constants:
 
-  It may be used to replace the .IFPxx pseudo instructions or to construct
-  even more complex expressions.
+<tscreen><verb>
+    CPU_6502
+    CPU_65SC02
+    CPU_65C02
+    CPU_65816
+    CPU_SWEET16
+    CPU_HUC6280
+    CPU_4510
+    CPU_45GS02
+    CPU_6502DTV
+    CPU_M740
+</verb></tscreen>
+
+Above constants may be used to determine the exact type of the currently
+enabled CPU. In addition to that, for each CPU instruction set, another
+constant is defined:
+
+<tscreen><verb>
+    CPU_ISET_6502
+    CPU_ISET_65SC02
+    CPU_ISET_65C02
+    CPU_ISET_65816
+    CPU_ISET_SWEET16
+    CPU_ISET_HUC6280
+    CPU_ISET_4510
+    CPU_ISET_45GS02
+    CPU_ISET_6502DTV
+    CPU_ISET_M740
+</verb></tscreen>
+
+<!-- Sorry but explaining these with the changes from #2751 is too cringy for
+     me - must be done by someone else. The remainder is from the old
+     ".macpack cpu" section"
+
+The value read from the <tt/<ref id=".CPU" name=".CPU">/ pseudo variable may
+be checked with <tt/<ref id="operators" name=".BITAND">/ to determine if the
+currently enabled CPU supports a specific instruction set. For example the
+65C02 supports all instructions of the 65SC02 CPU, so it has the
+<tt/CPU_ISET_65SC02/ bit set in addition to its native <tt/CPU_ISET_65C02/
+bit. Using
+
+<tscreen><verb>
+        .if (.cpu .bitand CPU_ISET_65SC02)
+                lda     (c_sp)
+        .else
+                ldy     #$00
+                lda     (c_sp),y
+        .endif
+</verb></tscreen>
+
+it is possible to determine if the
+
+<tscreen><verb>
+                lda     (c_sp)
+</verb></tscreen>
+
+instruction is supported, which is the case for the 65SC02, 65C02 and 65816
+CPUs (the latter two are upwards compatible to the 65SC02).
+
+see section <ref id="6502-mode" name="6502 format"> and following.
+-->
+
+  <tt/.CPU/ may be used to replace the .IFPxx pseudo instructions or to
+  construct even more complex expressions.
 
   Example:
 
   <tscreen><verb>
-        .macpack        cpu
         .if     (.cpu .bitand CPU_ISET_65816)
                 phx
                 phy
@@ -1318,6 +1484,9 @@ writable.
         .endif
   </verb></tscreen>
 
+  See also: <tt><ref id=".CAP" name=".CAP"></tt>
+
+
 
 <sect1><tt>.ISIZE</tt><label id=".ISIZE"><p>
 
@@ -1490,6 +1659,61 @@ either a string or an expression value.
 
 
 
+<sect1><tt>.CAP, .CAPABILITY</tt><label id=".CAP"><p>
+
+  Builtin function. The function allows to check for capabilities of the
+  currently selected CPU or target system. It must be called with a comma
+  separated list of identifiers and returns non zero if all of the given
+  capabilities are available. Otherwise it returns zero.
+
+  Existing capabilities are:
+
+<descrip>
+
+  <tag><tt>CPU_HAS_BITIMM</tt></tag>
+  Checks for the availability of the "bit #imm" instruction.
+
+  <tag><tt>CPU_HAS_BRA8</tt></tag>
+  Checks for the availability of a short (8 bit) branch.
+
+  <tag><tt>CPU_HAS_INA</tt></tag>
+  Checks for the availability of accu inc/dec instructions.
+
+  <tag><tt>CPU_HAS_PUSHXY</tt></tag>
+  Checks for the capability to push and pop the X and Y registers.
+
+  <tag><tt>CPU_HAS_ZPIND</tt></tag>
+  Checks for the availability of the "zeropage indirect" addressing mode as it
+  is implemented in the 65SC02 CPU.
+
+  <tag><tt>CPU_HAS_STZ</tt></tag>
+  Checks for the availability of the "store zero" instruction as it is
+  implemented in the 65SC02 CPU.
+
+</descrip>
+
+  Case is ignored when checking the identifiers. The <tt/.cap/ function is
+  easier to use than checking <tt/.cpu/ and requires no intimate knowledge
+  of all instruction sets. For more detailed checking <tt/.cpu/ is still
+  available.
+
+  Example:
+
+  <tscreen><verb>
+        .if     .cap(CPU_HAS_BRA, CPU_HAS_PUSHXY)
+                phx
+                bra     L1
+        .else
+                txa
+                pha
+                jmp     L1
+        .endif
+  </verb></tscreen>
+
+  See also: <tt><ref id=".CPU" name=".CPU"></tt>
+
+
+
 <sect1><tt>.CONCAT</tt><label id=".CONCAT"><p>
 
   Builtin string function. The function allows to concatenate a list of string
@@ -2869,6 +3093,26 @@ 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>line_continuations</tt><label id="line_continuations"></tag>
+
+    Switch on or off line continuations using the backslash character
+    before a newline. The option is off by default.
+    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.
+
+  Example:
+
+    <tscreen><verb>
+          .feature line_continuations +   ; Allow line continuations
+
+          lda     \
+                  #$20                    ; This is legal now
+    </verb></tscreen>
+
+    For backward compatibility reasons, the <tt>.LINECONT +</tt> control command
+    is also supported and enables the same feature.
+
   <tag><tt>long_jsr_jmp_rts</tt><label id="long_jsr_jmp_rts"></tag>
 
     Affects 65816 mode only.
@@ -3225,12 +3469,30 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   (see <tt><ref id=".P02" name=".P02"></tt> command).
 
 
+<sect1><tt>.IFP02X</tt><label id=".IFP02X"><p>
+
+  Conditional assembly: Check if the assembler is currently in 6502X mode
+  (see <tt><ref id=".P02X" name=".P02X"></tt> command).
+
+
 <sect1><tt>.IFP4510</tt><label id=".IFP4510"><p>
 
   Conditional assembly: Check if the assembler is currently in 4510 mode
   (see <tt><ref id=".P4510" name=".P4510"></tt> command).
 
 
+<sect1><tt>.IFP45GS02</tt><label id=".IFP45GS02"><p>
+
+  Conditional assembly: Check if the assembler is currently in 45GS02 mode
+  (see <tt><ref id=".P45GS02" name=".P45GS02"></tt> command).
+
+
+<sect1><tt>.IFP6280</tt><label id=".IFP816"><p>
+
+  Conditional assembly: Check if the assembler is currently in HuC6280 mode
+  (see <tt><ref id=".P6280" name=".P6280"></tt> command).
+
+
 <sect1><tt>.IFP816</tt><label id=".IFP816"><p>
 
   Conditional assembly: Check if the assembler is currently in 65816 mode
@@ -3243,18 +3505,36 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   (see <tt><ref id=".PC02" name=".PC02"></tt> command).
 
 
+<sect1><tt>.IFPCE02</tt><label id=".IFPCE02"><p>
+
+  Conditional assembly: Check if the assembler is currently in 65CE02 mode
+  (see <tt><ref id=".PCE02" name=".PCE02"></tt> command).
+
+
 <sect1><tt>.IFPDTV</tt><label id=".IFPDTV"><p>
 
   Conditional assembly: Check if the assembler is currently in 6502DTV mode
   (see <tt><ref id=".PDTV" name=".PDTV"></tt> command).
 
 
+<sect1><tt>.IFPM740</tt><label id=".IFPM740"><p>
+
+  Conditional assembly: Check if the assembler is currently in M740 mode
+  (see <tt><ref id=".PM740" name=".PM740"></tt> command).
+
+
 <sect1><tt>.IFPSC02</tt><label id=".IFPSC02"><p>
 
   Conditional assembly: Check if the assembler is currently in 65SC02 mode
   (see <tt><ref id=".PSC02" name=".PSC02"></tt> command).
 
 
+<sect1><tt>.IFPSWEET16</tt><label id=".IFPSWEET16"><p>
+
+  Conditional assembly: Check if the assembler is currently in Sweet16 mode
+  (see <tt><ref id=".PSWEET16" name=".PSWEET16"></tt> command).
+
+
 <sect1><tt>.IFREF</tt><label id=".IFREF"><p>
 
   Conditional assembly: Check if a symbol is referenced. Must be followed
@@ -3278,6 +3558,12 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   <tt><ref id=".REFERTO" name=".REFERTO"></tt>
 
 
+<sect1><tt>.IFPWC02</tt><label id=".IFPWC02"><p>
+
+  Conditional assembly: Check if the assembler is currently in 65WC02 mode
+  (see <tt><ref id=".PWC02" name=".PWC02"></tt> command).
+
+
 <sect1><tt>.IMPORT</tt><label id=".IMPORT"><p>
 
   Import a symbol from another module. The command is followed by a comma
@@ -3373,26 +3659,6 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
   the feature in more detail.
 
 
-<sect1><tt>.LINECONT</tt><label id=".LINECONT"><p>
-
-  Switch on or off line continuations using the backslash character
-  before a newline. The option is off by default.
-  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 can be followed by a '+' or '-' character to switch the
-  option on or off respectively.
-
-  Example:
-
-  <tscreen><verb>
-        .linecont       +               ; Allow line continuations
-
-        lda     \
-                #$20                    ; This is legal now
-  </verb></tscreen>
-
-
 <sect1><tt>.LIST</tt><label id=".LIST"><p>
 
   Enable output to the listing. The command can be followed by a boolean
@@ -3627,6 +3893,17 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   instructions. This is the default if not overridden by the
   <tt><ref id="option--cpu" name="--cpu"></tt> command line option.
 
+  See: <tt><ref id=".PC02" name=".PC02"></tt>, <tt><ref id=".PSC02"
+  name=".PSC02"></tt>, <tt><ref id=".P816" name=".P816"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
+
+
+<sect1><tt>.P02X</tt><label id=".P02X"><p>
+
+  Enable the 6502X instruction set, disable 65SC02, 65C02 and 65816
+  instructions.
+
   See: <tt><ref id=".PC02" name=".PC02"></tt>, <tt><ref id=".PSC02"
   name=".PSC02"></tt>, <tt><ref id=".P816" name=".P816"></tt> and
   <tt><ref id=".P4510" name=".P4510"></tt>
@@ -3638,8 +3915,31 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   6502 instruction sets.
 
   See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
-  name=".PSC02"></tt>, <tt><ref id=".PC02" name=".PC02"></tt> and
-  <tt><ref id=".P816" name=".P816"></tt>
+  name=".PSC02"></tt>, <tt><ref id=".PC02" name=".PC02"></tt>,
+  <tt><ref id=".P816" name=".P816"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
+
+
+<sect1><tt>.P45GS02</tt><label id=".P45GS02"><p>
+
+  Enable the 45GS02 instruction set. This is a superset of the 4510, 65C02, and
+  6502 instruction sets.
+
+  See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
+  name=".PSC02"></tt>, <tt><ref id=".PC02" name=".PC02"></tt>,
+  <tt><ref id=".P816" name=".P816"></tt>, and
+  <tt><ref id=".P4510" name=".P4510"></tt>
+
+
+<sect1><tt>.P6280</tt><label id=".P6280"><p>
+
+  Enable the HuC6280 instruction set. This is a superset of the 65C02 and
+  6502 instruction sets.
+
+  See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
+  name=".PSC02"></tt>, <tt><ref id=".PC02" name=".PC02"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
 
 
 <sect1><tt>.P816</tt><label id=".P816"><p>
@@ -3648,8 +3948,9 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   6502 instruction sets.
 
   See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
-  name=".PSC02"></tt>, <tt><ref id=".PC02" name=".PC02"></tt> and
-  <tt><ref id=".P4510" name=".P4510"></tt>
+  name=".PSC02"></tt>, <tt><ref id=".PC02" name=".PC02"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
 
 
 <sect1><tt>.PAGELEN, .PAGELENGTH</tt><label id=".PAGELENGTH"><p>
@@ -3677,8 +3978,19 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   6502 and 65SC02 instructions.
 
   See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
-  name=".PSC02"></tt>, <tt><ref id=".P816" name=".P816"></tt> and
-  <tt><ref id=".P4510" name=".P4510"></tt>
+  name=".PSC02"></tt>, <tt><ref id=".P816" name=".P816"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
+
+<sect1><tt>.PCE02</tt><label id=".PCE02"><p>
+
+  Enable the 65CE02 instructions set. This instruction set includes all
+  6502 and extended 65CE02 instructions.
+
+  See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
+  name=".PSC02"></tt>, <tt><ref id=".P816" name=".P816"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
 
 
 <sect1><tt>.PDTV</tt><label id=".PDTV"><p>
@@ -3689,6 +4001,14 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   See: <tt><ref id=".P02" name=".P02"></tt>
 
 
+<sect1><tt>.PM740</tt><label id=".PM740"><p>
+
+  Enable the M740 instruction set. This is a superset of the 6502
+  instruction set.
+
+  See: <tt><ref id=".P02" name=".P02"></tt>
+
+
 <sect1><tt>.POPCHARMAP</tt><label id=".POPCHARMAP"><p>
 
   Pop the last character mapping from the stack, and activate it.
@@ -3774,8 +4094,19 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   6502 instructions.
 
   See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PC02"
-  name=".PC02"></tt>, <tt><ref id=".P816" name=".P816"></tt> and
-  <tt><ref id=".P4510" name=".P4510"></tt>
+  name=".PC02"></tt>, <tt><ref id=".P816" name=".P816"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
+
+
+<sect1><tt>.PSWEET16</tt><label id=".PSWEET16"><p>
+
+  Enable the Sweet16 instructions set.
+
+  See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PC02"
+  name=".PC02"></tt>, <tt><ref id=".P816" name=".P816"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
 
 
 <sect1><tt>.PUSHCHARMAP</tt><label id=".PUSHCHARMAP"><p>
@@ -3826,6 +4157,17 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   See: <tt><ref id=".POPSEG" name=".POPSEG"></tt>
 
 
+<sect1><tt>.PWC02</tt><label id=".PWC02"><p>
+
+  Enable the W65C02 instructions set. This instruction set includes all
+  6502, 65SC02, 65C02 and two extra instructions (wai and stp)
+
+  See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
+  name=".PSC02"></tt>, <tt><ref id=".P816" name=".P816"></tt>,
+  <tt><ref id=".P4510" name=".P4510"></tt>, and
+  <tt><ref id=".P45GS02" name=".P45GS02"></tt>
+
+
 <sect1><tt>.REFERTO, .REFTO</tt><label id=".REFERTO"><p>
 
   Mark a symbol as referenced.
@@ -3906,7 +4248,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
 
   Reserve storage. The command is followed by one or two constant
   expressions. The first one is mandatory and defines, how many bytes of
-  storage should be defined. The second, optional expression must by a
+  storage should be defined. The second, optional expression must be a
   constant byte value that will be used as value of the data. If there
   is no fill value given, the linker will use the value defined in the
   linker configuration file (default: zero).
@@ -4023,18 +4365,23 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
   Switch the CPU instruction set. The command is followed by a string that
   specifies the CPU. Possible values are those that can also be supplied to
   the <tt><ref id="option--cpu" name="--cpu"></tt> command line option,
-  namely: 6502, 6502X, 6502DTV, 65SC02, 65C02, 65816, 4510 and HuC6280.
+  namely: 6502, 6502X, 6502DTV, 65SC02, 65C02, 65816, 4510, 45GS02, HuC6280 and m740.
 
   See: <tt><ref id=".CPU" name=".CPU"></tt>,
        <tt><ref id=".IFP02" name=".IFP02"></tt>,
+       <tt><ref id=".IFP02X" name=".IFP02X"></tt>,
        <tt><ref id=".IFPDTV" name=".IFPDTV"></tt>,
        <tt><ref id=".IFP816" name=".IFP816"></tt>,
        <tt><ref id=".IFPC02" name=".IFPC02"></tt>,
+       <tt><ref id=".IFPM740" name=".IFPM740"></tt>,
        <tt><ref id=".IFPSC02" name=".IFPSC02"></tt>,
        <tt><ref id=".P02" name=".P02"></tt>,
+       <tt><ref id=".P02X" name=".P02X"></tt>,
        <tt><ref id=".P816" name=".P816"></tt>,
        <tt><ref id=".P4510" name=".P4510"></tt>,
+       <tt><ref id=".P45GS02" name=".P45GS02"></tt>,
        <tt><ref id=".PC02" name=".PC02"></tt>,
+       <tt><ref id=".PM740" name=".PM740"></tt>,
        <tt><ref id=".PSC02" name=".PSC02"></tt>
 
 
@@ -4088,7 +4435,9 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
 
 <sect1><tt>.TAG</tt><label id=".TAG"><p>
 
-  Allocate space for a struct or union.
+  Allocate space for a struct or union. This is equivalent to
+  <tt><ref id=".RES" name=".RES"></tt> with the
+  <tt><ref id=".SIZEOF" name=".SIZEOF"></tt> of a struct.
 
   Example:
 
@@ -4102,6 +4451,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".BYTE" name=".BYTE"
                 .tag    Point           ; Allocate 4 bytes
   </verb></tscreen>
 
+  See: <ref id="structs" name="&quot;Structs and unions&quot;">
 
 <sect1><tt>.UNDEF, .UNDEFINE</tt><label id=".UNDEFINE"><p>
 
@@ -4491,9 +4841,9 @@ different:
 
 <item>  Macros defined with <tt><ref id=".DEFINE" name=".DEFINE"></tt> may not
         span more than a line. You may use line continuation (see <tt><ref
-        id=".LINECONT" name=".LINECONT"></tt>) to spread the definition over
-        more than one line for increased readability, but the macro itself
-        may not contain an end-of-line token.
+        id="line_continuations" name="line_continuations"></tt>) to spread the
+        definition over more than one line for increased readability, but the
+        macro itself may not contain an end-of-line token.
 
 <item>  Macros defined with <tt><ref id=".DEFINE" name=".DEFINE"></tt> share
         the name space with classic macros, but they are detected and replaced
@@ -4755,64 +5105,6 @@ This macro package defines a macro named <tt/scrcode/. It takes a string
 as argument and places this string into memory translated into screen codes.
 
 
-<sect1><tt>.MACPACK cpu</tt><p>
-
-This macro package does not define any macros but constants used to examine
-the value read from the <tt/<ref id=".CPU" name=".CPU">/ pseudo variable. For
-each supported CPU a constant similar to
-
-<tscreen><verb>
-    CPU_6502
-    CPU_65SC02
-    CPU_65C02
-    CPU_65816
-    CPU_SWEET16
-    CPU_HUC6280
-    CPU_4510
-    CPU_6502DTV
-</verb></tscreen>
-
-is defined. These constants may be used to determine the exact type of the
-currently enabled CPU. In addition to that, for each CPU instruction set,
-another constant is defined:
-
-<tscreen><verb>
-    CPU_ISET_6502
-    CPU_ISET_65SC02
-    CPU_ISET_65C02
-    CPU_ISET_65816
-    CPU_ISET_SWEET16
-    CPU_ISET_HUC6280
-    CPU_ISET_4510
-    CPU_ISET_6502DTV
-</verb></tscreen>
-
-The value read from the <tt/<ref id=".CPU" name=".CPU">/ pseudo variable may
-be checked with <tt/<ref id="operators" name=".BITAND">/ to determine if the
-currently enabled CPU supports a specific instruction set. For example the
-65C02 supports all instructions of the 65SC02 CPU, so it has the
-<tt/CPU_ISET_65SC02/ bit set in addition to its native <tt/CPU_ISET_65C02/
-bit. Using
-
-<tscreen><verb>
-        .if (.cpu .bitand CPU_ISET_65SC02)
-                lda     (sp)
-        .else
-                ldy     #$00
-                lda     (sp),y
-        .endif
-</verb></tscreen>
-
-it is possible to determine if the
-
-<tscreen><verb>
-                lda     (sp)
-</verb></tscreen>
-
-instruction is supported, which is the case for the 65SC02, 65C02 and 65816
-CPUs (the latter two are upwards compatible to the 65SC02).
-
-
 <sect1><tt>.MACPACK module</tt><p>
 
 This macro package defines a macro named <tt/module_header/. It takes an
@@ -4867,10 +5159,15 @@ compiler, depending on the target system selected:
 
 Structs and unions are special forms of <ref id="scopes" name="scopes">.  They
 are, to some degree, comparable to their C counterparts. Both have a list of
-members. Each member allocates storage, and optionally may have a name whose
-value, in the case of a struct, usually is the storage offset from the
-beginning, and in the case of a union, doesn't change, and usually is zero.
+members. Each member allocates storage, and optionally may have a name.
 
+Each named member has a constant value equal to the storage offset from the
+beginning of the structure. In the case of a union, all members are placed at
+the same offset, typically 0.
+
+Each named member also has a storage size which can be accessed with the
+<tt><ref id=".SIZEOF" name=".SIZEOF"></tt> operator. The struct or union itself
+also has a <tt/.SIZEOF/ indicating its total storage size.
 
 <sect1>Declaration<p>
 
@@ -4897,8 +5194,9 @@ A struct or union may not necessarily have a name. If it is anonymous, no
 local scope is opened; the identifiers used to name the members are placed
 into the current scope instead.
 
-A struct may contain unnamed members and definitions of local structs/unions.
-The storage allocators may contain a multiplier, as in the example below:
+Storage allocators may contain a multiplier. A struct may also contain members
+and definitions of local structs/unions. Example:
+
 <tscreen><verb>
       .struct Circle
               .struct Point
@@ -4907,7 +5205,8 @@ The storage allocators may contain a multiplier, as in the example below:
               Radius  .word
       .endstruct
 </verb></tscreen>
-The size of the Circle struct is 6 (three words).
+
+In this example the size of the Circle struct is 6 (three words).
 
 
 <sect1>The storage allocator keywords<p>
@@ -4917,7 +5216,7 @@ The size of the Circle struct is 6 (three words).
   <tag/.BYTE, .RES/
     Allocates multiples of 1 byte.  <tt/.RES/ requires an operand.
 
-  <tag/.DBYTE, .WORD, .ADDR/
+  <tag/.DBYT, .WORD, .ADDR/
     Allocates multiples of 2 bytes.
 
   <tag/.FARADDR/
@@ -4926,6 +5225,15 @@ The size of the Circle struct is 6 (three words).
   <tag/.DWORD/
     Allocates multiples of 4 bytes.
 
+  <tag/.TAG/
+    Allocates a previously defined struct.
+
+  <tag/.STRUCT, .UNION/
+    Begins a nested .struct or .union definition, and allocates it.
+    Note that its member offset values will begin at 0, unless this nested
+    structure is anonymous, in which case they will instead become members of
+    the enclosing scope.
+
   </descrip>
 
 
@@ -4970,13 +5278,54 @@ name=".TAG"> directive.
 C:      .tag    Circle
 </verb></tscreen>
 
-Currently, members are just offsets from the start of the struct or union. To
+Members are just offsets from the start of the struct or union. To
 access a field of a struct, the member offset must be added to the address of
 the struct variable itself:
 <tscreen><verb>
-        lda     C+Circle::Radius        ; Load circle radius into A
+        lda    C + Circle::Radius                    ; Load circle radius
+        lda    C + Circle::Origin + Point::ycoord    ; Load circle origin.ycoord
 </verb></tscreen>
-That may change in a future version of the assembler.
+
+Nested structures or unions are treated differently depending on whether they
+are anonymous. If named, a new structure definition is created within the
+enclosing scope, with its offsets beginning at 0. If anonymous, the members of
+the new structure are added to the enclosing scope instead, with offsets
+continuing through that scope. Example:
+
+<tscreen><verb>
+      .struct Object
+              id .byte                ; Object::id = 0
+              target .struct Point    ; Object::target = 1
+                      xcoord  .word   ; Object::Point::xcoord = 0
+                      ycoord  .word   ; Object::Point::ycoord = 2
+              .endstruct
+               cost .struct           ; Object::cost = 5
+                      price  .word    ; Object::price = 5
+                      tax  .word      ; Object::tax = 7
+              .endstruct
+              .struct
+                      radius  .word   ; Object::radius = 9
+              .endstruct
+      .endstruct
+
+O:    .tag   Object
+      lda    O + Object::target + Object::Point::ycoord  ; Named struct
+      lda    O + Object::tax                             ; Anonymous
+      lda    O + Object::radius                          ; Anonymous
+
+      ; Be careful not to use a named nested structure without also adding the
+      ; offset to the nested structure itself.
+      lda    O + Object::Point::ycoord                   ; Incorrect!
+      lda    O + Object::target + Object::Point::ycoord  ; Correct
+</verb></tscreen>
+
+In this example, the first nested structure is named "Point", and its member
+offsets begin at 0. On the other hand, the two anonymous structures simply
+continue to add members to the enclosing "Object" structure.
+
+Note that an anonymous structure does not need a member name, since all of its
+members become part of the enclosing structure. The "cost" member in the
+example is redundantly the same offset as its first member "price".
 
 
 <sect1>Limitations<p>
diff --git a/doc/cc65-intern.sgml b/doc/cc65-intern.sgml
index 904cee070..9c59cd79a 100644
--- a/doc/cc65-intern.sgml
+++ b/doc/cc65-intern.sgml
@@ -131,7 +131,7 @@ All other parameters will be pushed to the C-stack from left to right.
 The rightmost parameter will have the lowest address on the stack,
 and multi-byte parameters will have their least significant byte at the lower address.
 
-The <tt/sp/ pseudo-register is a zeropage pointer to the base of the C-stack.
+The <tt/c_sp/ pseudo-register is a zeropage pointer to the base of the C-stack.
 If the function is variadic, the <tt/Y/ register will contain the number of
 bytes pushed to the stack for this function.
 
@@ -153,10 +153,10 @@ void cdecl foo(unsigned bar, unsigned char baz);
 ; Example code for accessing bar. The variable is in A/X after this code snippet:
 ;
     ldy     #2      ; Offset of high byte of bar
-    lda     (sp),y  ; High byte now in A
+    lda     (c_sp),y  ; High byte now in A
     tax             ; High byte now in X
     dey             ; Offset of low byte of bar
-    lda     (sp),y  ; Low byte now in A
+    lda     (c_sp),y  ; Low byte now in A
 </verb></tscreen>
 
 <sect1>Epilogue, after the function call<p>
@@ -175,12 +175,12 @@ used if the return type is 32-bit.
 If the function has a void return type, the compiler will not depend on the result
 of <tt>A/X/sreg</tt>, so these may be clobbered by the function.
 
-The C-stack pointer <tt/sp/ must be restored by the function to its value before the
+The C-stack pointer <tt/c_sp/ must be restored by the function to its value before the
 function call prologue. It may pop all of its parameters from the C-stack
 (e.g. using the <tt/runtime/ function <tt/popa/),
-or it could adjust <tt/sp/ directly.
+or it could adjust <tt/c_sp/ directly.
 If the function is variadic, the <tt/Y/ register contains the number of bytes
-pushed to the stack on entry, which may be added to <tt/sp/ to restore its
+pushed to the stack on entry, which may be added to <tt/c_sp/ to restore its
 original state.
 
 The internal pseudo-register <tt/regbank/ must not be changed by the function.
diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 37e3e493d..734e4eaf4 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -61,8 +61,10 @@ Short options:
   -Os                           Inline some standard functions
   -T                            Include source as comment
   -V                            Print the compiler version number
-  -W warning[,...]              Suppress warnings
+  -W [-+]warning[,...]          Control warnings ('-' disables, '+' enables)
   -d                            Debug mode
+  -dM                           Output all user macros (needs -E)
+  -dP                           Output all predefined macros (needs -E)
   -g                            Add debug info to object file
   -h                            Help (this text)
   -j                            Default characters are signed
@@ -84,8 +86,9 @@ Long options:
   --create-full-dep name        Create a full make dependency file
   --data-name seg               Set the name of the DATA segment
   --debug                       Debug mode
+  --debug-tables name           Write symbol table debug info to a file
   --debug-info                  Add debug info to object file
-  --debug-opt name              Configure optimizations with a file
+  --debug-opt name              Debug optimization steps
   --debug-opt-output            Debug output of each optimization step
   --dep-target target           Use this dependency target
   --disable-opt name            Disable an optimization step
@@ -198,6 +201,28 @@ Here is a description of all the command line options:
   Enables debug mode, for debugging the behavior of cc65.
 
 
+
+  <label id="option-dM">
+  <tag><tt>-dM</tt></tag>
+
+  When used with -E, will output <tt>#define</tt> directives for all the user
+  macros defined during execution of the preprocessor. This does not include
+  macros defined by the compiler.
+
+  Note: Can be combined with <tt/<ref id="option-dP" name="-dP">/ by using
+  <tt/-dMP/.
+
+
+  <label id="option-dP">
+  <tag><tt>-dP</tt></tag>
+
+  When used with -E, will output <tt>#define</tt> directives for all the macros
+  defined by the compiler itself. This does not include any user defined macros.
+
+  Note: Can be combined with <tt/<ref id="option-dM" name="-dM">/ by using
+  <tt/-dMP/.
+
+
   <tag><tt>--debug-tables name</tt></tag>
 
   Writes symbol table information to a file, which includes details on structs, unions
@@ -585,27 +610,42 @@ Here is a description of all the command line options:
 
   <itemize>
   <item>none
+  <item>agat (a russian apple2 like computer)
   <item>apple2
   <item>apple2enh
   <item>atari
+  <item>atari2600
+  <item>atari5200
+  <item>atari7800
   <item>atarixl
   <item>atmos
+  <item>bbc
   <item>c16 (works also for the c116 with memory up to 32K)
   <item>c64
+  <item>c65
   <item>c128
   <item>cbm510 (CBM-II series with 40 column video)
   <item>cbm610 (all CBM-II II computers with 80 column video)
+  <item>creativision
+  <item>cx16
+  <item>gamate
   <item>geos-apple
   <item>geos-cbm
+  <item>geos (alias for geos-cbm)
+  <item>kim1
   <item>lunix
   <item>lynx
+  <item>mega65
   <item>nes
   <item>osic1p
+  <item>pce (PC engine)
   <item>pet (all CBM PET systems except the 2001)
   <item>plus4
+  <item>p6502
   <item>sim6502
   <item>sim65c02
   <item>supervision
+  <item>sym1
   <item>telestrat
   <item>vic20
   </itemize>
@@ -823,6 +863,11 @@ and the one defined by the ISO standard:
         as it sounds, since the 6502 has so few registers that it isn't
         possible to keep values in registers anyway.
         <p>
+<item>  In <tt/cc65/ mode, <tt/main()/ cannot be called recursively. If this
+        is necessary, the program must be compiled in <tt/c89/ or <tt/c99/ mode
+        using the <tt><ref id="option--standard" name="--standard"></tt>
+        command line option.
+        <p>
 </itemize>
 
 There may be some more minor differences I'm currently not aware of. The
@@ -1047,6 +1092,16 @@ This cc65 version has some extensions to the ISO C standard.
         unsigned char foo = 0b101; // sets it to 5
         </verb></tscreen>
 
+<item>  The character escape '\e', a GCC C extension, is accepted.
+        In ASCII this is the escape character 0x1B, which may be
+        remapped in other character sets via a #pragma charmap.
+        It can be disabled with the <tt><ref id="option--standard"
+        name="--standard"></tt> option.
+
+        <tscreen><verb>
+        unsigned char foo = '\e'; // sets it to 0x1B or equivalent
+        </verb></tscreen>
+
 </itemize>
 <p>
 
@@ -1138,6 +1193,134 @@ The compiler defines several macros at startup:
   <item><tt/__CC65_STD_CC65__/
   </itemize>
 
+  <label id="macro-CPU">
+  <tag><tt>__CPU__</tt></tag>
+
+  This macro contains a bitset that allows to check if a specific instruction
+  set is supported. For example, the 65C02 CPU supports all instructions of the
+  65SC02. So testing for the instruction set of the 65SC02 using the following
+  check will succeed for both CPUs (and also for the 65816 and HUC6280).
+
+  <tscreen><verb>
+  #if (__CPU__ & __CPU_ISET_65SC02__)
+  </verb></tscreen>
+
+  This is much simpler and more future proof than checking for specific CPUs.
+
+  The compiler defines a set of constants named <tt/__CPU_ISET_xxx/ to do the
+  checks. The <tt/__CPU__/ variable is usually derived from the target system
+  given, but can be changed using the <tt/<ref id="option--cpu" name="--cpu">/
+  command line option.
+
+  <tag><tt>__CPU_4510__</tt></tag>
+
+  This macro is defined if the code is compiled for a 4510 CPU.
+
+  <tag><tt>__CPU_45GS02__</tt></tag>
+
+  This macro is defined if the code is compiled for a 45GS02 CPU.
+
+  <tag><tt>__CPU_6502__</tt></tag>
+
+  This macro is defined if the code is compiled for a 6502 CPU.
+
+  <tag><tt>__CPU_6502X__</tt></tag>
+
+  This macro is defined if the code is compiled for a 6502 CPU with invalid
+  opcodes.
+
+  <tag><tt>__CPU_6502DTV__</tt></tag>
+
+  This macro is defined if the code is compiled for a DTV CPU.
+
+  <tag><tt>__CPU_65SC02__</tt></tag>
+
+  This macro is defined if the code is compiled for a 65SC02 CPU.
+
+  <tag><tt>__CPU_65C02__</tt></tag>
+
+  This macro is defined if the code is compiled for a 65C02 CPU.
+
+  <tag><tt>__CPU_65CE02__</tt></tag>
+
+  This macro is defined if the code is compiled for a 65CE02 CPU.
+
+  <tag><tt>__CPU_65816__</tt></tag>
+
+  This macro is defined if the code is compiled for a 65816 CPU.
+
+  <tag><tt>__CPU_HUC6280__</tt></tag>
+
+  This macro is defined if the code is compiled for a HUC6280 CPU.
+
+  <tag><tt>__CPU_M740__</tt></tag>
+
+  This macro is defined if the code is compiled for a M740 CPU.
+
+  <tag><tt>__CPU_W65C02__</tt></tag>
+
+  This macro is defined if the code is compiled for a W65C02 CPU.
+
+  <tag><tt>__CPU_ISET_6502__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the 6502 CPU.
+
+  <tag><tt>__CPU_ISET_6502X__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the 6502X CPU.
+
+  <tag><tt>__CPU_ISET_6502DTV__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the 6502DTV CPU.
+
+  <tag><tt>__CPU_ISET_65SC02__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the 65SC02 CPU.
+
+  <tag><tt>__CPU_ISET_65C02__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the 65C02 CPU.
+
+  <tag><tt>__CPU_ISET_65CE02__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the 65CE02 CPU.
+
+  <tag><tt>__CPU_ISET_65816__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the 65816 CPU.
+
+  <tag><tt>__CPU_ISET_HUC6280__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the HUC6280 CPU.
+
+  <tag><tt>__CPU_ISET_M740__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the M740 CPU.
+
+  <tag><tt>__CPU_ISET_W65C02__</tt></tag>
+
+  This macro expands to a numeric constant that can be used to check the
+  <tt/<ref id="macro-CPU" name="__CPU__">/ macro for the instruction set
+  of the W65C02 CPU.
+
   <tag><tt>__CX16__</tt></tag>
 
   This macro is defined if the target is the Commander X16 (-t cx16).
@@ -1273,6 +1456,12 @@ If the first parameter is <tt/push/, the old value is saved onto a stack
 before changing it. The value may later be restored by using the <tt/pop/
 parameter with the <tt/#pragma/.
 
+For all pragma names that contain hyphens, the same name using underlines
+instead of the hyphens is available as an alternative. While the former
+resembles the corresponding command line option and is more orthogonal, the
+latter may be more compatible with external tools that rewrite the token
+sequences of the input.
+
 
 <sect1><tt>#pragma allow-eager-inline ([push,] on|off)</tt><label id="pragma-allow-eager-inline"><p>
 
@@ -1358,7 +1547,7 @@ parameter with the <tt/#pragma/.
   Example:
   <tscreen><verb>
   /* Use a space wherever an 'a' occurs in ISO-8859-1 source */
-  #pragma charmap (0x61, 0x20);
+  #pragma charmap (0x61, 0x20)
   </verb></tscreen>
 
 
@@ -1613,13 +1802,13 @@ parameter with the <tt/#pragma/.
 
   This pragma sets a wrapper for functions, often used for trampolines.
 
-  The name is a function returning <tt/void/, and taking no parameters.
+  The <tt/name/ is a wrapper function returning <tt/void/, and taking no parameters.
   It must preserve the CPU's <tt/A/ and <tt/X/ registers if it wraps any
   <tt/__fastcall__/ functions that have parameters.  It must preserve
   the <tt/Y/ register if it wraps any variadic functions (they have "<tt/.../"
   in their prototypes).
 
-  The identifier is an 8-bit number that's set into <tt/tmp4/. If the identifier
+  The <tt/identifier/ is an 8-bit number that's set into <tt/tmp4/. If the <tt/identifier/
   is "bank", then ca65's <tt><url url="ca65.html#.BANK" name=".bank"></tt> function will be used
   to determine the number from the bank attribute defined in the linker config,
   see <url url="ld65.html#MEMORY" name="Other MEMORY area attributes">. Note that
@@ -1629,6 +1818,11 @@ parameter with the <tt/#pragma/.
   The address of a wrapped function is passed in <tt/ptr4/.  The wrapper can
   call that function by using "<tt/jsr callptr4/".
 
+  All functions ever declared or defined when this pragma is in effect will be wrapped
+  when they are called explicitly by their names later in the same translation unit.
+  Invocation of these functions in any other ways, for example, that via a function
+  pointer or in inline assembly code, will not be wrapped.
+
   This feature is useful, for example, with banked memory, to switch banks
   automatically to where a wrapped function resides, and then to restore the
   previous bank when it returns.
diff --git a/doc/chrcvt65.sgml b/doc/chrcvt65.sgml
index a631a0004..00909e12f 100644
--- a/doc/chrcvt65.sgml
+++ b/doc/chrcvt65.sgml
@@ -19,7 +19,7 @@ the native format.
 
 chrcvt65 is a vector font converter. It is able to convert a "BGI Stroked
 Font" to a compact TGI native vector font. See the function <url
-url="funcref.html#tgi_load_vectorfont" name="tgi_load_vectorfont"> for usage.
+url="tgi.html#tgi_load_vectorfont" name="tgi_load_vectorfont"> for usage.
 
 
 
diff --git a/doc/cl65.sgml b/doc/cl65.sgml
index 24d2f5927..f48e1353c 100644
--- a/doc/cl65.sgml
+++ b/doc/cl65.sgml
@@ -261,6 +261,9 @@ different options for different files on the command line. As an example.
 translates main.c with full optimization and module.c with less optimization
 and debug info enabled.
 
+Note that the target system (-t , --target) must be specified before any file
+unless using the default target of c64
+
 The type of an input file is derived from its extension:
 
 <itemize>
diff --git a/doc/cpus.sgml b/doc/cpus.sgml
new file mode 100644
index 000000000..60230408f
--- /dev/null
+++ b/doc/cpus.sgml
@@ -0,0 +1,1082 @@
+<!doctype linuxdoc system>
+
+<article>
+<title>ca65/da65 Users Guide
+<author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
+<url url="mailto:groepaz@gmx.net" name="Groepaz">
+
+<abstract>
+An Overview on all supported CPUs
+</abstract>
+
+<!-- Table of contents -->
+<toc>
+
+<!-- Begin the document -->
+
+<sect>Overview<p>
+
+  <itemize>
+  <item><ref id="6502-mode" name="6502"> - NMOS 6502 (all legal instructions)
+  <item><ref id="6502X-mode" name="6502X"> - NMOS 6502 with all undocumented instructions
+  <item><ref id="DTV-mode" name="6502DTV"> - the CPU of the C64 DTV device
+  <item><ref id="65SC02-mode" name="65SC02"> - original CMOS
+  <item><ref id="65C02-mode" name="65C02"> - CMOS with Rockwell extensions
+  <item><ref id="65CE02-mode" name="65CE02"> - CMOS with CSG extensions
+  <item><ref id="W65C02-mode" name="W65C02"> - CMOS with WDC extensions
+  <item><ref id="4510-mode" name="4510"> - the CPU of the Commodore C65
+  <item><ref id="45GS02-mode" name="45GS02"> - the CPU of the Commodore MEGA65
+  <item><ref id="HUC6280-mode" name="HuC6280"> - the CPU of the PC engine
+  <item><ref id="M740-mode" name="M740"> - a Microcontroller by Mitsubishi
+  <item><ref id="65816-mode" name="65816"> - the CPU of the SNES, and the SCPU
+  <item><ref id="sweet16-mode" name="Sweet16"> - an interpreter for a pseudo 16 bit CPU
+  </itemize>
+
+<sect>NMOS branch<p>
+
+<sect1>6502<label id="6502-mode"><p>
+
+The original NMOS 6502 CPU.
+
+For Example: MOS MCS6502 Rev. D, Rockwell R6502, Synertek SY6502, UMC UM6502
+
+(56 instructions, 151 opcodes)
+
+<tscreen><verb>
+$00  brk
+$01  ora (zp,x)
+$05  ora zp
+$06  asl zp
+$08  php
+$09  ora #imm
+$0a  asl a
+$0d  ora addr
+$0e  asl addr
+$10  bpl rel80
+$11  ora (zp),y
+$15  ora zp,x
+$16  asl zp,x
+$18  clc
+$19  ora addr,y
+$1d  ora addr,x
+$1e  asl addr,x
+$20  jsr addr
+$21  and (zp,x)
+$24  bit zp
+$25  and zp
+$26  rol zp
+$28  plp
+$29  and #imm
+$2a  rol a
+$2c  bit addr
+$2d  and addr
+$2e  rol addr
+$30  bmi rel8
+$31  and (zp),y
+$35  and zp,x
+$36  rol zp,x
+$38  sec
+$39  and addr,y
+$3d  and addr,x
+$3e  rol addr,x
+$40  rti
+$41  eor (zp,x)
+$45  eor zp
+$46  lsr zp
+$48  pha
+$49  eor #imm
+$4a  lsr a
+$4c  jmp addr
+$4d  eor addr
+$4e  lsr addr
+$50  bvc rel8
+$51  eor (zp),y
+$55  eor zp,x
+$56  lsr zp,x
+$58  cli
+$59  eor addr,y
+$5d  eor addr,x
+$5e  lsr addr,x
+$60  rts
+$61  adc (zp,x)
+$65  adc zp
+$66  ror zp
+$68  pla
+$69  adc #imm
+$6a  ror a
+$6c  jmp (addr)
+$6d  adc addr
+$6e  ror addr
+$70  bvs rel8
+$71  adc (zp),y
+$75  adc zp,x
+$76  ror zp,x
+$78  sei
+$79  adc addr,y
+$7d  adc addr,x
+$7e  ror addr,x
+$81  sta (zp,x)
+$84  sty zp
+$85  sta zp
+$86  stx zp
+$88  dey
+$8a  txa
+$8c  sty addr
+$8d  sta addr
+$8e  stx addr
+$90  bcc rel8
+$91  sta (zp),y
+$94  sty zp,x
+$95  sta zp,x
+$96  stx zp,y
+$98  tya
+$99  sta addr,y
+$9a  txs
+$9d  sta addr,x
+$a0  ldy #imm
+$a1  lda (zp,x)
+$a2  ldx #imm
+$a4  ldy zp
+$a5  lda zp
+$a6  ldx zp
+$a8  tay
+$a9  lda #imm
+$aa  tax
+$ac  ldy addr
+$ad  lda addr
+$ae  ldx addr
+$b0  bcs rel8
+$b1  lda (zp),y
+$b4  ldy zp,x
+$b5  lda zp,x
+$b6  ldx zp,y
+$b8  clv
+$b9  lda addr,y
+$ba  tsx
+$bc  ldy addr,x
+$bd  lda addr,x
+$be  ldx addr,y
+$c0  cpy #imm
+$c1  cmp (zp,x)
+$c4  cpy zp
+$c5  cmp zp
+$c6  dec zp
+$c8  iny
+$c9  cmp #imm
+$ca  dex
+$cc  cpy addr
+$cd  cmp addr
+$ce  dec addr
+$d0  bne rel8
+$d1  cmp (zp),y
+$d5  cmp zp,x
+$d6  dec zp,x
+$d8  cld
+$d9  cmp addr,y
+$dd  cmp addr,x
+$de  dec addr,x
+$e0  cpx #imm
+$e1  sbc (zp,x)
+$e4  cpx zp
+$e5  sbc zp
+$e6  inc zp
+$e8  inx
+$e9  sbc #imm
+$ea  nop
+$ec  cpx addr
+$ed  sbc addr
+$ee  inc addr
+$f0  beq rel81
+$f1  sbc (zp),y
+$f5  sbc zp,x
+$f6  inc zp,x
+$f8  sed
+$f9  sbc addr,y
+$fd  sbc addr,x
+$fe  inc addr,x
+</verb></tscreen>
+
+
+
+<sect1>6502X<label id="6502X-mode"><p>
+
+6502X mode is an extension to the normal 6502 mode. In this mode, several
+mnemonics for undocumented instructions of the NMOS 6502 CPUs are accepted.
+
+Note: Since these instructions are undocumented, there are no official mnemonics
+for them.
+
+(20 new instructions, 105 new opcodes, 76 instructions/256 opcodes total)
+
+<itemize>
+<item><tt>ALR: A:=(A and #imm)/2;</tt>
+<item><tt>ANC: A:= A and #imm;</tt> Generates opcode &dollar;0B.
+<item><tt>ANE: A:= (A or CONST) and X and #imm;</tt>
+<item><tt>ARR: A:=(A and #imm)/2;</tt>
+<item><tt>AXS: X:=A and X-#imm;</tt>
+<item><tt>DCP: addr:=addr-1; A-addr;</tt>
+<item><tt>ISC: addr:=addr+1; A:=A-addr;</tt>
+<item><tt>JAM:</tt>
+<item><tt>LAS: A,X,S:=addr and S;</tt>
+<item><tt>LAX: A,X:=addr;</tt>
+<item><tt>NOP: #imm; zp; zp,x; abs; abs,x</tt>
+<item><tt>RLA: addr:=addrrol; A:=A and addr;</tt>
+<item><tt>RRA: addr:=addrror; A:=A adc addr;</tt>
+<item><tt>SAX: addr:=A and X;</tt>
+<item><tt>SHA: addr:=A and X and {addr hi +1};</tt>
+<item><tt>SHX: addr:=X and {addr hi +1};</tt>
+<item><tt>SHY: addr:=Y and {addr hi +1};</tt>
+<item><tt>SLO: addr:=addr*2; A:=A or addr;</tt>
+<item><tt>SRE: addr:=addr/2; A:=A xor addr;</tt>
+<item><tt>TAS: addr:=A and X and {addr hi +1}; SP:=A and X;</tt>
+</itemize>
+
+<tscreen><verb>
+$02  jam
+$03  slo (zp,x)
+$04  nop zp
+$07  slo zp
+$0b  anc #imm
+$0c  nop addr
+$0f  slo addr
+$12  jam
+$13  slo (zp),y
+$14  nop zp,x
+$17  slo zp,y
+$1a  nop
+$1b  slo addr,y
+$1c  nop addr,x
+$1f  slo addr,x
+$22  jam
+$23  rla (zp,x)
+$27  rla zp
+$2b  anc #imm
+$2f  rla addr
+$32  jam
+$33  rla (zp),y
+$34  nop zp,x
+$37  rla zp,y
+$3a  nop
+$3b  rla addr,y
+$3c  nop addr,x
+$3f  rla addr,x
+$42  jam
+$43  sre (zp,x)
+$44  nop zp
+$47  sre zp
+$4b  alr #imm
+$4f  sre addr
+$52  jam
+$53  sre (zp),y
+$54  nop zp,x
+$57  sre zp,y
+$5a  nop
+$5b  sre addr,y
+$5c  nop addr,x
+$5f  sre addr,x
+$62  jam
+$63  rra (zp,x)
+$64  nop zp
+$67  rra zp
+$6b  arr #imm
+$6f  rra addr
+$72  jam
+$73  rra (zp),y
+$74  nop zp,x
+$77  rra zp,y
+$7a  nop
+$7b  rra addr,y
+$7c  nop addr,x
+$7f  rra addr,x
+$80  nop #imm
+$82  nop #imm
+$83  sax (zp,x)
+$87  sax zp
+$89  nop #imm
+$8b  ane #imm
+$8f  sax addr
+$92  jam
+$93  sha (zp),y
+$97  sax zp,y
+$9b  tas addr,y
+$9c  shy addr,x
+$9e  shx addr,y
+$9f  sha addr,y
+$a3  lax (zp,x)
+$a7  lax zp
+$ab  lax #imm
+$af  lax addr
+$b2  jam
+$b3  lax (zp),y
+$b7  lax zp,y
+$bb  las addr,y
+$bf  lax addr,y
+$c2  nop #imm
+$c3  dcp (zp,x)
+$c7  dcp zp
+$cb  axs #imm
+$cf  dcp addr
+$d2  jam
+$d3  dcp (zp),y
+$d4  nop zp,x
+$d7  dcp zp,y
+$da  nop
+$db  dcp addr,y
+$dc  nop addr,x
+$df  dcp addr,x
+$e2  nop #imm
+$e3  isc (zp,x)
+$e7  isc zp
+$eb  sbc #imm
+$ef  isc addr
+$f2  jam
+$f3  isc (zp),y
+$f4  nop zp,x
+$f7  isc zp,y
+$fa  nop
+$fb  isc addr,y
+$fc  nop addr,x
+$ff  isc addr,x
+</verb></tscreen>
+
+
+
+<sect1>6502DTV<label id="DTV-mode"><p>
+
+The CPU of the C64 DTV is based on the 6510. It adds some instructions, and does
+not support all undocumented 6510 instructions.
+
+(3+10 new instructions, 3+56 new opcodes, 69 instructions/210 opcodes total)
+
+Opcodes added over 6502 (these are JAM on 6502):
+
+<tscreen><verb>
+$12  bra rel8
+$32  sac #imm
+$42  sir #imm
+</verb></tscreen>
+
+Supported undocumented 6510 instructions (nop, anc, rla, lax, las, alr, arr,
+rra, shy, shx, axs, sbc):
+
+<tscreen><verb>
+$04  nop zp
+$0b  anc #imm
+$0c  nop addr
+$14  nop zp,x
+$1a  nop
+$1c  nop addr,x
+$23  rla (zp,x)
+$27  rla zp
+$2b  anc #imm
+$2f  rla addr
+$33  rla (zp),y
+$34  nop zp,x
+$37  rla zp,y
+$3a  nop
+$3b  rla addr,y
+$3c  nop addr,x
+$3f  rla addr,x
+$44  nop zp
+$4b  alr #imm
+$54  nop zp,x
+$5a  nop
+$5c  nop addr,x
+$63  rra (zp,x)
+$64  nop zp
+$67  rra zp
+$6b  arr #imm
+$6f  rra addr
+$73  rra (zp),y
+$74  nop zp,x
+$77  rra zp,y
+$7a  nop
+$7b  rra addr,y
+$7c  nop addr,x
+$7f  rra addr,x
+$80  nop #imm
+$82  nop #imm
+$89  nop #imm
+$9c  shy addr,x
+$9e  shx addr,y
+$a3  lax (zp,x)
+$a7  lax zp
+$ab  lax #imm
+$af  lax addr
+$b3  lax (zp),y
+$b7  lax zp,y
+$bb  las addr,y
+$bf  lax addr,y
+$c2  nop #imm
+$cb  axs #imm
+$d4  nop zp,x
+$da  nop
+$dc  nop addr,x
+$e2  nop #imm
+$eb  sbc #imm
+$f4  nop zp,x
+$fa  nop
+$fc  nop addr,x
+</verb></tscreen>
+
+
+<sect>CMOS branch<p>
+
+The original CMOS version was apparently developed already back in the Commodore
+days, but never saw the light of day. It was then licensed by (now) WDC to
+different other vendors. Unfortunately some of those named their chips "65C02"
+(not SC), which causes a lot of confusion now. So keep that in mind: some chips
+that are named "65C02" will only support the original 65SC02 instruction set.
+
+
+<sect1>65SC02 (Original CMOS)<label id="65SC02-mode"><p>
+
+The first CMOS instruction set, without bit manipulation, nor wai/stp. It adds
+8 new instructions (phx, phy, plx, ply, bra, stz, tsb, trb) and two new address
+modes (zeropage-indirect, absolute-x-indexed-indirect) to the original (legal)
+6502 instructions.
+
+For example: Synertek SY65C02, GTE G65SC02, CMD G65SC02, NCR 65C02
+
+(8 new instructions, 27 new opcodes, 64 instructions/178 opcodes total)
+
+<tscreen><verb>
+$04  tsb zp
+$0c  tsb abs16
+$12  ora (zp)
+$14  trb zp
+$1a  inc
+$1c  trb abs16
+$32  and (zp)
+$34  bit zp, x
+$3a  dec
+$3c  bit abs16, x
+$52  eor (zp)
+$5a  phy
+$64  stz zp
+$72  adc (zp)
+$74  stz zp, x
+$7a  ply
+$7c  jmp (abs16, x)
+$80  bra rel8
+$89  bit #imm8
+$92  sta (zp)
+$9c  stz abs16
+$9e  stz abs16, x
+$b2  lda (zp)
+$d2  cmp (zp)
+$da  phx
+$f2  sbc (zp)
+$fa  plx
+</verb></tscreen>
+
+
+
+<sect1>65C02 (CMOS with Rockwell extensions)<label id="65C02-mode"><p>
+
+The Rockwell extensions add additional bit manipulation and bit test-and-branch
+commands to the original 65SC02 instruction set.
+
+For Example: Rockwell R65C02, Ricoh RP65C02, NCR 65CX02
+
+(4 new instructions, 32 new opcodes, 68 instructions/210 opcodes total)
+
+<tscreen><verb>
+$07  rmb0 zp          clear bit in zp location
+$0f  bbr0 zp, rel8    branch if bit is not set in zp location
+$17  rmb1 zp
+$1f  bbr1 zp, rel8
+$27  rmb2 zp
+$2f  bbr2 zp, rel8
+$37  rmb3 zp
+$3f  bbr3 zp, rel8
+$47  rmb4 zp
+$4f  bbr4 zp, rel8
+$57  rmb5 zp
+$5f  bbr5 zp, rel8
+$67  rmb6 zp
+$6f  bbr6 zp, rel8
+$77  rmb7 zp
+$7f  bbr7 zp, rel8
+$87  smb0 zp          set bit in zp location
+$8f  bbs0 zp, rel8    branch if bit is set in zp location
+$97  smb1 zp
+$9f  bbs1 zp, rel8
+$a7  smb2 zp
+$af  bbs2 zp, rel8
+$b7  smb3 zp
+$bf  bbs3 zp, rel8
+$c7  smb4 zp
+$cf  bbs4 zp, rel8
+$d7  smb5 zp
+$df  bbs5 zp, rel8
+$e7  smb6 zp
+$ef  bbs6 zp, rel8
+$f7  smb7 zp
+$ff  bbs7 zp, rel8
+</verb></tscreen>
+
+All "illegal" opcodes perform NOP on this CPU.
+
+
+
+<sect1>W65C02 (CMOS with WDC extensions)<label id="W65C02-mode"><p>
+
+For their W65C02S WDC took the Rockwell extensions, and added two extra
+instructions (which they also added to the 65C816/65C802)
+
+(2 new instructions, 2 new opcodes, 70 instructions/212 opcodes total)
+
+<tscreen><verb>
+$cb  wai    wait for interrupt
+$db  stp    wait for reset
+</verb></tscreen>
+
+All "illegal" opcodes perform NOP on this CPU.
+
+
+
+<sect1>65CE02 (CMOS with CSG extensions)<label id="65CE02-mode"><p>
+
+CSG took the Rockwell extensions and developed them further. Notable additions
+are long relative branches/jumps, and finally a real z register. Note that the
+two opcodes used by the WDC extensions have been repurposed for something else,
+so the 65CE02 is not 100% compatible with the W65C02.
+
+For Example: CSG 65CE02 (used on the Amiga A2232 Serial Card)
+
+(34 new instructions, 46 new opcodes, 102 instructions/256 opcodes total)
+
+<tscreen><verb>
+$02  cle              clear stack extend disable
+$03  see              set stack extend disable
+$0b  tsy              transfer stack_ptr_high to Y
+$12  ora (zp), z
+$13  lbpl rel16
+$1b  inz              increment Z
+$22  jsr (abs16)
+$23  jsr (abs16, x)
+$2b  tys              transfer Y to stack_ptr_high
+$32  and (zp), z
+$33  lbmi rel16
+$3b  dez              decrement Z
+$42  neg              negate A
+$43  asr
+$44  asr zp
+$4b  taz              transfer A to Z
+$52  eor (zp), z
+$53  lbvc rel16
+$54  asr zp, x
+$5b  tab
+$5c  aug              "4-byte NOP reserved for future expansion"
+$62  rtn #imm8
+$63  lbsr rel16       relative jsr, "branch to subroutine"
+$64  stz zp           store Z
+$6b  tza              transfer Z to A
+$72  adc (zp), z
+$73  lbvs rel16
+$74  stz zp, x        store Z
+$7b  tba
+$82  sta (off8, s), y
+$83  lbra rel16       relative jmp
+$8b  sty abs16, x
+$92  sta (zp), z
+$93  lbcc rel16
+$9b  stx abs16, y
+$9c  stz abs16        store Z
+$9e  stz abs16, x     store Z
+$a3  ldz #imm8
+$ab  ldz abs16
+$b2  lda (zp), z
+$b3  lbcs rel16
+$bb  ldz abs16, x
+$c2  cpz #imm8
+$c3  dew zp
+$cb  asw abs16
+$d2  cmp (zp), z
+$d3  lbne rel16
+$d4  cpz zp
+$db  phz              push Z
+$dc  cpz abs16
+$e2  lda (off8, s), y
+$e3  inw zp
+$eb  row abs16
+$f2  sbc (zp), z
+$f3  lbeq rel16
+$f4  phw #imm16
+$fb  plz              pull Z
+$fc  phw abs16
+</verb></tscreen>
+
+One notable change is that some instructions of the original CMOS instruction set
+were changed from "zeropage indirect" addressing to "zeropage indirect, z indexed".
+This could be done, because the z register is initially guaranteed to be zero,
+making the CPU binary compatible with older CMOS variants.
+
+<tscreen><verb>
+$12  ora (zp)  ->  ora (zp), z
+$32  and (zp)  ->  and (zp), z
+$52  eor (zp)  ->  eor (zp), z
+$72  adc (zp)  ->  adc (zp), z
+$92  sta (zp)  ->  sta (zp), z
+$b2  lda (zp)  ->  cmp (zp), z
+$d2  cmp (zp)  ->  lda (zp), z
+$f2  sbc (zp)  ->  sbc (zp), z
+</verb></tscreen>
+
+Additional to that, the meaning of the following instruction changes from "store
+zero" to "store z register". Again, this makes the CPU binary compatible with
+older CMOS variants
+
+<tscreen><verb>
+$64  stz zp
+$74  stz zp, x
+$9c  stz abs16
+$9e  stz abs16, x
+</verb></tscreen>
+
+The other 65SC02 instructions (phx, phy, plx, ply, tsb, trb, bra) are unchanged.
+
+
+
+<sect1>4510<label id="4510-mode"><p>
+
+The 4510 is a microcontroller that is the core of the Commodore C65 aka C64DX.
+It contains among other functions a slightly modified 65CE02/4502 CPU, to allow
+address mapping for 20 bits of address space (1 megabyte addressable area).
+
+The 4510 supports the complete 65CE02 instruction set, but changes
+the 4-Byte NOP into the "map" instruction:
+
+<tscreen><verb>
+$5c  map
+</verb></tscreen>
+
+For more information about the Commodore C65/C64DX and the 4510 CPU, see
+<url url="http://www.zimmers.net/anonftp/pub/cbm/c65/"> and
+<url url="https://en.wikipedia.org/wiki/Commodore_65" name="Wikipedia">.
+
+
+
+<sect1>45GS02<label id="45GS02-mode"><p>
+
+The 45GS02 is a microcontroller that is the core of the MEGA65.
+It is an extension of the 4510 CPU and adds 32-bit addressing and a 32-bit
+pseudo register Q that is comprised of the four registers A, X, Y, and Z.
+
+<tscreen><verb>
+$42 $42 $05      orq zp
+$42 $42 $06      aslq zp
+$42 $42 $0a      aslq
+$42 $42 $0d      orq addr
+$42 $42 $0e      aslq addr
+$42 $42 $12      orq (zp)
+$42 $42 $16      aslq zp,x
+$42 $42 $1a      inq
+$42 $42 $1e      aslq addr,x
+$42 $42 $24      bitq zp
+$42 $42 $25      andq zp
+$42 $42 $26      rolq zp
+$42 $42 $2a      rolq
+$42 $42 $2c      bitq addr
+$42 $42 $2d      andq addr
+$42 $42 $2e      rolq addr
+$42 $42 $32      andq (zp)
+$42 $42 $36      rolq zp, x
+$42 $42 $3a      deq
+$42 $42 $3e      rolq addr, x
+$42 $42 $43      asrq
+$42 $42 $44      asrq zp
+$42 $42 $45      eorq zp
+$42 $42 $46      lsrq zp
+$42 $42 $4a      lsrq
+$42 $42 $4d      eorq addr
+$42 $42 $4e      lsrq addr
+$42 $42 $52      eorq (zp)
+$42 $42 $54      asrq zp, x
+$42 $42 $56      lsrq zp, x
+$42 $42 $5e      lsrq addr, x
+$42 $42 $65      adcq zp
+$42 $42 $66      rorq zp
+$42 $42 $6a      rorq
+$42 $42 $6d      adcq addr
+$42 $42 $6e      rorq addr
+$42 $42 $72      adcq (zp)
+$42 $42 $76      rorq zp, x
+$42 $42 $7e      rorq addr, x
+$42 $42 $85      stq zp
+$42 $42 $8d      stq addr
+$42 $42 $92      stq (zp)
+$42 $42 $a5      ldq zp
+$42 $42 $ad      ldq addr
+$42 $42 $b2      ldq (zp), z
+$42 $42 $c5      cmpq zp
+$42 $42 $c6      deq zp
+$42 $42 $cd      cmpq addr
+$42 $42 $ce      deq addr
+$42 $42 $d2      cmpq (zp)
+$42 $42 $d6      deq zp, x
+$42 $42 $de      deq addr, x
+$42 $42 $e5      sbcq zp
+$42 $42 $e6      inq zp
+$42 $42 $ed      sbcq addr
+$42 $42 $ee      inq addr
+$42 $42 $f2      sbcq (zp)
+$42 $42 $f6      inq zp, x
+$42 $42 $fe      inq addr, x
+
+$ea $12          ora [zp], z
+$ea $32          and [zp], z
+$ea $52          eor [zp], z
+$ea $72          adc [zp], z
+$ea $92          sta [zp], z
+$ea $b2          lda [zp], z
+$ea $d2          cmp [zp], z
+$ea $f2          sbc [zp], z
+
+$42 $42 $ea $12  orq [zp]
+$42 $42 $ea $32  andq [zp]
+$42 $42 $ea $52  eorq [zp]
+$42 $42 $ea $72  adcq [zp]
+$42 $42 $ea $92  stq [zp]
+$42 $42 $ea $b2  ldq [zp], z
+$42 $42 $ea $d2  cmpq [zp]
+$42 $42 $ea $f2  sbcq [zp]
+</verb></tscreen>
+
+
+<sect1>HUC6280<label id="HUC6280-mode"><p>
+
+The HUC6280 is a superset of 65C02. It implements the original CMOS instructions
+with Rockwell extensions, plus some other instructions:
+
+<tscreen><verb>
+$02  sxy
+$03  st0 #imm
+$13  st1 #imm
+$22  sax
+$23  st2 #imm
+$42  say
+$43  tma #imm
+$44  bsr rel8
+$53  tam #imm
+$54  csl
+$62  cla
+$73  tii addr, addr, addr
+$82  clx
+$83  tst #imm, zp
+$82  clx
+$83  tst #imm, zp
+$93  tst #imm, addr
+$a3  tst #imm, zp, x
+$b3  tst #imm, addr, x
+$c2  cly
+$c3  tdd addr, addr, addr
+$d3  tin addr, addr, addr
+$d4  csh
+$e3  tia addr, addr, addr
+$f3  tai addr, addr, addr
+$f4  set
+</verb></tscreen>
+
+
+<sect1>M740<label id="M740-mode"><p>
+
+The M740 is a microcontroller by Mitsubishi, which was marketed for embedded
+devices in the mid 80s. It is a superset of 6502, the added CMOS instructions
+seem to be completely custom however:
+
+<tscreen><verb>
+$02  jsr (zp)
+$03  bbs0 a, rel8
+$07  bbs0 zp, rel8
+$0b  seb0 a
+$0f  seb0 zp
+$12  clt
+$13  bbc0 a, rel8
+$17  bbc0 zp, rel8
+$1a  inc a
+$1b  clb0 a
+$1f  clb0 zp
+$22  jsr $ff12
+$23  bbs1 a, rel8
+$27  bbs1 zp, rel8
+$2b  seb1 a
+$2f  seb1 zp
+$32  set
+$33  bbc1 a, rel8
+$37  bbc1 zp, rel8
+$3a  dec a
+$3b  clb1 a
+$3c  ldm zp, #imm
+$3f  clb1 zp
+$42  stp
+$43  bbs2 a, rel8
+$44  com zp
+$47  bbs2 zp, rel8
+$4b  seb2 a
+$4f  seb2 zp
+$53  bbc2 a, rel8
+$57  bbc2 zp, rel8
+$5b  clb2 a
+$5f  clb2 zp
+$63  bbs3 a, rel8
+$64  tst zp
+$67  bbs3 zp, rel8
+$6b  seb3 a
+$6f  seb3 zp
+$73  bbc3 a, rel8
+$77  bbc3 zp, rel8
+$7b  clb3 a
+$7f  clb3 zp
+$80  bra rel8
+$82  rrf zp
+$83  bbs4 a, rel8
+$87  bbs4 zp, rel8
+$8b  seb4 a
+$8f  seb4 zp
+$93  bbc4 a, rel8
+$97  bbc4 zp, rel8
+$9b  clb4 a
+$9f  clb4 zp
+$a3  bbs5 a, rel8
+$a7  bbs5 zp, rel8
+$ab  seb5 a
+$af  seb5 zp
+$b2  lda (zp)
+$b3  bbc5 a, rel8
+$b7  bbc5 zp, rel8
+$bb  clb5 a
+$bf  clb5 zp
+$c2  slw
+$c3  bbs6 a, rel8
+$c7  bbs6 zp, rel8
+$cb  seb6 a
+$cf  seb6 zp
+$d3  bbc6 a, rel8
+$d7  bbc6 zp, rel8
+$db  clb6 a
+$df  clb6 zp
+$e2  fst
+$e3  bbs7 a, rel8
+$e7  bbs7 zp, rel8
+$eb  seb7 a
+$ef  seb7 zp
+$f3  bbc7 a, rel8
+$f7  bbc7 zp, rel8
+$fb  clb7 a
+$ff  clb7 zp
+</verb></tscreen>
+
+Four instructions are the same on 65SC02:
+
+<tscreen><verb>
+$1a  inc a
+$3a  dec a
+$80  bra rel8
+$b2  lda (zp)
+</verb></tscreen>
+
+These four instructions are different from 65SC02:
+
+<tscreen><verb>
+$12  ora (zp)     -> clt
+$32  and (zp)     -> set
+$3c  bit addr,x   -> ldm zp, #imm
+$64  stz zp       -> tst zp
+</verb></tscreen>
+
+The following 65SC02 instructions are not implemented:
+
+<tscreen><verb>
+$04  tsb zp
+$0c  tsb addr
+$14  trb zp
+$1c  trb addr
+$34  bit zp,y
+$52  eor (zp)
+$5a  phy
+$72  adc (zp)
+$74  stz zp,y
+$7a  ply
+$7c  jmp (addr)
+$89  bit #imm8
+$92  sta (zp)
+$9c  stz addr
+$9e  stz addr,x
+$d2  cmp (zp)
+$da  phx
+$f2  sbc (zp)
+$fa  plx
+</verb></tscreen>
+
+For more information about the M740 Controllers, see
+<url url="https://en.wikipedia.org/wiki/Mitsubishi_740" name="Wikipedia">.
+
+
+
+<sect1>65816<label id="65816-mode"><p><p>
+
+The W65C816S is a 16bit CPU developed by WDC. The instruction set contains the
+complete legal 6502 instructions, the original CMOS instructions (65SC02), plus
+some new instructions and addressing modes. It has wai/stp, but it does NOT have
+the Rockwell extensions (BBRx, BBSx, RMBx and SMBx bit manipulation instructions).
+
+(24 new instructions, 77 new opcodes, 88 instructions/256 opcodes total)
+
+<tscreen><verb>
+$02  cop imm8               coprocessor operation
+$03  ora offs8, s
+$07  ora [dp]
+$0b  phd                    push direct page register
+$0f  ora abs24
+$13  ora (offs8, s), y
+$17  ora [dp], y
+$1b  tcs                    transfer C to stack pointer
+$1f  ora abs24, x
+$22  jsl abs24
+$23  and offs8, s
+$27  and [dp]
+$2b  pld                    pull direct page register
+$2f  and abs24
+$33  and (offs8, s), y
+$37  and [dp], y
+$3b  tsc                    transfer stack pointer to C
+$3f  and abs24, x
+$42  wdm                    (reserved for future expansion)
+$43  eor offs8, s
+$44  mvp src, dst
+$47  eor [dp]
+$4b  phk                    push program bank register
+$4f  eor abs24
+$53  eor (offs8, s), y
+$54  mvn src, dst
+$57  eor [dp], y
+$5b  tcd                    transfer C to direct page register
+$5c  jml abs24
+$5f  eor abs24, x
+$62  per rel16              push effective relative address
+$63  adc offs8, s
+$67  adc [dp]
+$6b  rtl                    return long (fetches 24-bit address from stack)
+$6f  adc abs24
+$73  adc (offs8, s), y
+$77  adc [dp], y
+$7b  tdc                    transfer direct page register to C
+$7f  adc abs24, x
+$82  brl rel16              branch long (16-bit offset)
+$83  sta offs8, s
+$87  sta [dp]
+$8b  phb                    push data bank register
+$8f  sta abs24
+$93  sta (offs8, s), y
+$97  sta [dp], y
+$9b  txy                    transfer X to Y
+$9f  sta abs24, x
+$a3  lda offs8, s
+$a7  lda [dp]
+$ab  plb                    pull data bank register
+$af  lda abs24
+$b3  lda (offs8, s), y
+$b7  lda [dp], y
+$bb  tyx                    transfer Y to X
+$bf  lda abs24, x
+$c2  rep #imm8              clear bits in status register
+$c3  cmp offs8, s
+$c7  cmp [dp]
+$cb  wai                    wait for interrupt
+$cf  cmp abs24
+$d3  cmp (offs8, s), y
+$d4  pei (dp)               push effective indirect address
+$d7  cmp [dp], y
+$db  stp                    wait for reset
+$dc  jmp [abs16]
+$df  cmp abs24, x
+$e2  sep #imm8              set bits in status register
+$e3  sbc offs8, s
+$e7  sbc [dp]
+$eb  xba                    exchange high and low bytes of accumulator
+$ef  sbc abs24
+$f3  sbc (offs8, s), y
+$f4  pea abs16              push effective absolute address
+$f7  sbc [dp], y
+$fb  xce                    exchange Carry and Emulation bits
+$fc  jsr (abs16, x)
+$ff  sbc abs24, x
+</verb></tscreen>
+
+
+
+<sect>other<p>
+
+<sect1>Sweet16<label id="sweet16-mode"><p><p>
+
+SWEET 16 is an interpreter for a pseudo 16 bit CPU written by Steve Wozniak
+for the Apple ][ machines. It is available in the Apple ][ ROM.
+
+It implements the following opcodes:
+
+<tscreen><verb>
+00   1     RTN                                (Return to 6502 mode)
+01   2     BR        ea                       (Branch always)
+02   2     BNC       ea                       (Branch if No Carry)
+03   2     BC        ea                       (Branch if Carry)
+04   2     BP        ea                       (Branch if Plus)
+05   2     BM        ea                       (Branch if Minus)
+06   2     BZ        ea                       (Branch if Zero)
+07   2     BNZ       ea                       (Branch if NonZero)
+08   2     BM1       ea                       (Branch if Minus 1)
+09   2     BNM1      ea                       (Branch if Not Minus 1)
+0A   1     BK                                 (Break to Monitor)
+0B   1     RS                                 (Return from Subroutine)
+0C   1     BS        ea                       (Branch to Subroutine)
+1n   3     SET       Rn    R<-2 byte constant (Set Constant) (load register immediate)
+2n   1     LD        Rn    ACC<-R             (Load)
+3n   1     ST        Rn    ACC->R (Store)
+4n   1     LD        @Rn   ACC<-@R, R<-R+1    (Load Indirect)
+5n   1     ST        @Rn   ACC->@R, R<-R+1    (Store Indirect)
+6n   1     LDD       @Rn   ACC<-@R double     (Load Double Indirect)
+7n   1     STD       @Rn   ACC->@R double     (Store Double Indirect)
+8n   1     POP       @Rn   R<-R-1, ACC<-@R    (pop) (Pop Indirect)
+9n   1     STP       @Rn   R<-R-1, ACC->@R    (Store POP Indirect)
+An   1     ADD       Rn    ACC<-@R            (pop) double (Add)
+Bn   1     SUB       Rn    compare ACC to R   (Sub)
+Cn   1     POPD      @Rn   ACC<-ACC+R         (Pop Double Indirect)
+Dn   1     CPR       Rn    ACC<-ACC-R         (Compare)
+En   1     INR       Rn    R<-R+1             (Increment)
+Fn   1     DCR       Rn    R<-R-1             (Decrement)
+</verb></tscreen>
+
+For more information about SWEET 16, see
+<url url="http://www.6502.org/source/interpreters/sweet16.htm">.
+
+
+
+<sect>Copyright<p>
+
+ca65 (and all cc65 binutils) are (C) Copyright 1998-2003 Ullrich von
+Bassewitz. For usage of the binaries and/or sources the following
+conditions do apply:
+
+This software is provided 'as-is', without any expressed or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+<enum>
+<item>  The origin of this software must not be misrepresented; you must not
+        claim that you wrote the original software. If you use this software
+        in a product, an acknowledgment in the product documentation would be
+        appreciated but is not required.
+<item>  Altered source versions must be plainly marked as such, and must not
+        be misrepresented as being the original software.
+<item>  This notice may not be removed or altered from any source
+        distribution.
+</enum>
+
+
+
+</article>
diff --git a/doc/customizing.sgml b/doc/customizing.sgml
index e18bcf86c..ffca0ce58 100644
--- a/doc/customizing.sgml
+++ b/doc/customizing.sgml
@@ -140,7 +140,7 @@ FEATURES {
 
 SYMBOLS {
     # Define the stack size for the application
-    __STACKSIZE__:  value = $0200, weak = yes;
+    __STACKSIZE__:  value = $0200, type = weak;
 }
 </code></tscreen>
 
@@ -193,9 +193,9 @@ _init:    LDX     #$FF                 ; Initialize stack pointer to $01FF
 ; Set cc65 argument stack pointer
 
           LDA     #&lt;(__RAM_START__ + __RAM_SIZE__)
-          STA     sp
+          STA     c_sp
           LDA     #&gt;(__RAM_START__ + __RAM_SIZE__)
-          STA     sp+1
+          STA     c_sp+1
 
 ; ---------------------------------------------------------------------------
 ; Initialize memory storage
diff --git a/doc/cx16.sgml b/doc/cx16.sgml
index 78a51206b..a718e52fa 100644
--- a/doc/cx16.sgml
+++ b/doc/cx16.sgml
@@ -243,6 +243,12 @@ point to <tt/cx320p1.tgi (cx320p1_tgi)/.
   a way that's compatible with some of the other color drivers).
 </descrip><p>
 
+<descrip>
+  <tag><tt/cx640p1.tgi (cx640p1_tgi)/</tag>
+  This driver features a resolution of 640 across and 480 down with 2 colors,
+  black and white.
+</descrip><p>
+
 
 <sect1>Extended memory drivers<p>
 
diff --git a/doc/da65.sgml b/doc/da65.sgml
index 113eb6f97..ba3ceb165 100644
--- a/doc/da65.sgml
+++ b/doc/da65.sgml
@@ -46,14 +46,16 @@ The assembler accepts the following options:
 ---------------------------------------------------------------------------
 Usage: da65 [options] [inputfile]
 Short options:
+  -d                    Debug mode
   -g                    Add debug info to object file
   -h                    Help (this text)
   -i name               Specify an info file
+  -m                    Run multiple passes to resolve labels
   -o name               Name the output file
   -v                    Increase verbosity
   -F                    Add formfeeds to the output
-  -s                    Accept line markers in the info file
   -S addr               Set the start/load address
+  -s                    Accept line markers in the info file
   -V                    Print the disassembler version
 
 Long options:
@@ -61,6 +63,7 @@ Long options:
   --comment-column n    Specify comment start column
   --comments n          Set the comment level for the output
   --cpu type            Set cpu type
+  --debug               Debug mode
   --debug-info          Add debug info to object file
   --formfeeds           Add formfeeds to the output
   --help                Help (this text)
@@ -68,6 +71,7 @@ Long options:
   --info name           Specify an info file
   --label-break n       Add newline if label exceeds length n
   --mnemonic-column n   Specify mnemonic start column
+  --multi-pass          Run multiple passes to resolve labels
   --pagelength n        Set the page length for the listing
   --start-addr addr     Set the start/load address
   --sync-lines          Accept line markers in the info file
@@ -110,19 +114,23 @@ Here is a description of all the command line options:
 
   Set the CPU type. The option takes a parameter, which may be one of
   <itemize>
-  <item>6502
-  <item>6502x
-  <item>6502dtv
-  <item>65sc02
-  <item>65c02
-  <item>65816
-  <item>huc6280
-  <item>4510
+  <item>6502 - NMOS 6502 (all legal instructions)
+  <item>6502X - NMOS 6502 with all undocumented instructions
+  <item>6502DTV - the emulated CPU of the C64DTV device
+  <item>65SC02 - first CMOS instruction set (no bit manipulation, no wai/stp)
+  <item>65C02 - full CMOS instruction set (has bit manipulation and wai/stp)
+  <item>65816 - the CPU of the SNES, and the SCPU
+  <item>HuC6280 - the CPU of the PC engine
+  <item>4510 - the CPU of the Commodore C65
+  <item>45GS02 - the CPU of the Commodore MEGA65
+  <item>M740 - a Microcontroller by Mitsubishi
   </itemize>
 
-  6502x is for the NMOS 6502 with unofficial opcodes. 6502dtv is for the
-  emulated CPU of the C64DTV device. huc6280 is the CPU of the PC engine.
-  4510 is the CPU of the Commodore C65. 65816 is the CPU of the SNES.
+
+  <tag><tt>-d, --debug</tt></tag>
+
+  Enables debug mode, something that should not be needed for mere
+  mortals:-)
 
 
   <label id="option--formfeeds">
@@ -181,6 +189,15 @@ Here is a description of all the command line options:
   <tt><ref id="LABELBREAK" name="LABELBREAK"></tt>.
 
 
+  <tag><tt>-m, --multi-pass</tt></tag>
+
+  This option causes the disassembler to run multiple passes over the input
+  binary to find and create all necessary labels. Without this option the
+  disassembler may detect the necessity for a label in the final pass, when
+  output was already partially generated. It will output numerical addresses
+  or program counter relative expressions in this case.
+
+
   <label id="option--mnemonic-column">
   <tag><tt>--mnemonic-column n</tt></tag>
 
@@ -246,23 +263,85 @@ Here is a description of all the command line options:
 
 <sect1>Supported CPUs<p>
 
+With the command line option <tt><ref id="option--cpu" name="--cpu"></tt>, the
+disassembler may be told which CPU to support:
+
+  <itemize>
+  <item>6502 - NMOS 6502 (all legal instructions)
+  <item>6502X - NMOS 6502 with all undocumented instructions
+  <item>6502DTV - the emulated CPU of the C64DTV device
+  <item>65SC02 - first CMOS instruction set (no bit manipulation, no wai/stp)
+  <item>65C02 - CMOS with Rockwell extensions
+  <item>W65C02 - full CMOS instruction set (has bit manipulation and wai/stp)
+  <item>65CE02 - CMOS with CSG extensions
+  <item>4510 - the CPU of the Commodore C65
+  <item>45GS02 - the CPU of the Commodore MEGA65
+  <item>HuC6280 - the CPU of the PC engine
+  <item>M740 - a Microcontroller by Mitsubishi
+  <item>65816 - the CPU of the SNES, and the SCPU
+  </itemize>
+
+for more details on the various CPUs, see <tt><htmlurl url="cpus.html" name="here"></tt>.
+
+
+<sect2>6502 mode<label id="6502-mode"><p>
+
 The default (no CPU given on the command line or in the <tt/GLOBAL/ section of
 the info file) is the 6502 CPU. The disassembler knows all "official" opcodes
 for this CPU. Invalid opcodes are translated into <tt/.byte/ commands.
 
-With the command line option <tt><ref id="option--cpu" name="--cpu"></tt>, the
-disassembler may be told to recognize either the 65SC02 or 65C02 CPUs. The
-latter understands the same opcodes as the former, plus 16 additional bit
-manipulation and bit test-and-branch commands. Using 6502x as CPU the illegal
-opcodes of 6502 CPU are detected and displayed. 6502dtv setting recognizes the
-emulated CPU instructons of the C64DTV device.
+<sect2>6502X mode<label id="6502X-mode"><p>
 
+Using 6502X as CPU the illegal opcodes of 6502 CPU are detected and displayed.
+
+
+<sect2>DTV mode<label id="DTV-mode"><p>
+
+6502DTV setting recognizes the emulated CPU instructions of the C64DTV device.
+
+
+<sect2>65SC02 mode<label id="65SC02-mode"><p>
+
+The first CMOS instruction set, without bit manipulation or wai/stp.
+
+
+<sect2>65C02 mode<label id="65C02-mode"><p>
+
+The 65C02 understands the same opcodes as the 65SC02, plus 16 additional bit
+manipulation and bit test-and-branch commands.
+
+<sect2>W65C02 mode<label id="W65C02-mode"><p>
+
+This mode also supports wai/stp.
+
+<sect2>65CE02 mode<label id="65CE02-mode"><p>
+
+
+<sect2>4510 mode<label id="4510-mode"><p>
 
 When disassembling 4510 code, due to handling of 16-bit wide branches, da65
 can produce output that can not be re-assembled, when one or more of those
 branches point outside of the disassembled memory. This can happen when text
 or binary data is processed.
 
+
+<sect2>45GS02 mode<label id="45GS02-mode"><p>
+
+All compound instructions are supported.
+
+
+<sect2>HUC6280 mode<label id="HUC6280-mode"><p>
+
+All special opcodes are supported.
+
+
+<sect2>M740 mode<label id="M740-mode"><p>
+
+All special opcodes are supported.
+
+
+<sect2>65816 mode<label id="65816-mode"><p><p>
+
 The 65816 support requires annotating ranges with the M and X flag states.
 This can be recorded with an emulator that supports Code and Data Logging,
 for example. Disassemble one bank at a time.
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 524818b19..82d5cf8bb 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -71,18 +71,21 @@ function.
 <item><ref id="detect_c64dtv" name="detect_c64dtv">
 <item><ref id="detect_c65" name="detect_c65">
 <item><ref id="detect_chameleon" name="detect_chameleon">
+<item><ref id="detect_iigs" name="detect_iigs">
 <item><ref id="detect_scpu" name="detect_scpu">
 <item><ref id="detect_turbomaster" name="detect_turbomaster">
 <item><ref id="get_c128_speed" name="get_c128_speed">
 <item><ref id="get_c64dtv_speed" name="get_c64dtv_speed">
 <item><ref id="get_c65_speed" name="get_c65_speed">
 <item><ref id="get_chameleon_speed" name="get_chameleon_speed">
+<item><ref id="get_iigs_speed" name="get_iigs_speed">
 <item><ref id="get_scpu_speed" name="get_scpu_speed">
 <item><ref id="get_turbomaster_speed" name="get_turbomaster_speed">
 <item><ref id="set_c128_speed" name="set_c128_speed">
 <item><ref id="set_c64dtv_speed" name="set_c64dtv_speed">
 <item><ref id="set_c65_speed" name="set_c65_speed">
 <item><ref id="set_chameleon_speed" name="set_chameleon_speed">
+<item><ref id="set_iigs_speed" name="set_iigs_speed">
 <item><ref id="set_scpu_speed" name="set_scpu_speed">
 <item><ref id="set_turbomaster_speed" name="set_turbomaster_speed">
 </itemize>
@@ -92,8 +95,16 @@ function.
 
 <itemize>
 <item>_dos_type
+<item>allow_lowercase
+<item><ref id="beep" name="beep">
+<item><ref id="dir_entry_count" name="dir_entry_count">
+<item><ref id="get_tv" name="get_tv">
 <item><ref id="get_ostype" name="get_ostype">
+<item><ref id="gmtime_dt" name="gmtime_dt">
+<item><ref id="mktime_dt" name="mktime_dt">
 <item>rebootafterexit
+<item><ref id="videomode" name="videomode">
+<item><ref id="waitvsync" name="waitvsync">
 </itemize>
 
 
@@ -101,9 +112,15 @@ function.
 
 <itemize>
 <item>_dos_type
+<item><ref id="beep" name="beep">
+<item><ref id="dir_entry_count" name="dir_entry_count">
+<item><ref id="get_tv" name="get_tv">
 <item><ref id="get_ostype" name="get_ostype">
+<item><ref id="gmtime_dt" name="gmtime_dt">
+<item><ref id="mktime_dt" name="mktime_dt">
 <item>rebootafterexit
 <item><ref id="videomode" name="videomode">
+<item><ref id="waitvsync" name="waitvsync">
 </itemize>
 
 
@@ -128,7 +145,7 @@ function.
 <!-- <item><ref id="_setcolor_low" name="_setcolor_low"> -->
 <item><ref id="_sound" name="_sound">
 <item><ref id="get_ostype" name="get_ostype">
-<!-- <item><ref id="get_tv" name="get_tv"> -->
+<item><ref id="get_tv" name="get_tv">
 </itemize>
 
 (incomplete)
@@ -145,6 +162,7 @@ function.
 <item><ref id="atmos_tick" name="atmos_tick">
 <item><ref id="atmos_tock" name="atmos_tock">
 <item><ref id="atmos_zap" name="atmos_zap">
+<item><ref id="waitvsync" name="waitvsync">
 </itemize>
 
 
@@ -214,7 +232,7 @@ function.
 <!-- <item><ref id="cbm_readdir" name="cbm_readdir"> -->
 <!-- <item><ref id="cbm_save" name="cbm_save"> -->
 <!-- <item><ref id="cbm_write" name="cbm_write"> -->
-<!-- <item><ref id="get_tv" name="get_tv"> -->
+<item><ref id="get_tv" name="get_tv">
 <item><ref id="kbrepeat" name="kbrepeat">
 <item><ref id="waitvsync" name="waitvsync">
 </itemize>
@@ -271,6 +289,7 @@ function.
 <item><ref id="cclear" name="cclear">
 <item><ref id="cclearxy" name="cclearxy">
 <item><ref id="cgetc" name="cgetc">
+<item><ref id="cgets" name="cgets">
 <item><ref id="chline" name="chline">
 <item><ref id="chlinexy" name="chlinexy">
 <item><ref id="clrscr" name="clrscr">
@@ -283,6 +302,7 @@ function.
 <item><ref id="cputcxy" name="cputcxy">
 <item><ref id="cputs" name="cputs">
 <item><ref id="cputsxy" name="cputsxy">
+<item><ref id="cscanf" name="cscanf">
 <item><ref id="cursor" name="cursor">
 <item><ref id="cvline" name="cvline">
 <item><ref id="cvlinexy" name="cvlinexy">
@@ -335,7 +355,7 @@ function.
 <itemize>
 <!-- <item><ref id="get_numbanks" name="get_numbanks"> -->
 <item><ref id="get_ostype" name="get_ostype">
-<!-- <item><ref id="get_tv" name="get_tv"> -->
+<item><ref id="get_tv" name="get_tv">
 <!-- <item><ref id="set_tv" name="set_tv"> -->
 <!-- <item><ref id="vera_layer_enable" name="vera_layer_enable"> -->
 <!-- <item><ref id="vera_sprites_enable" name="vera_sprites_enable"> -->
@@ -430,7 +450,7 @@ see also <tt>testcode/lib/em-test.c</tt> and <tt>samples/multidemo.c</tt>.
 <sect1><tt/gamate.h/<label id="gamate.h"><p>
 
 <itemize>
-<!-- <item><ref id="get_tv" name="get_tv"> -->
+<item><ref id="get_tv" name="get_tv">
 <item><ref id="waitvsync" name="waitvsync">
 </itemize>
 
@@ -506,6 +526,14 @@ see also <tt>testcode/lib/em-test.c</tt> and <tt>samples/multidemo.c</tt>.
 </itemize>
 
 
+<sect1><tt/lzsa.h/<label id="lzsa.h"><p>
+
+<itemize>
+<item><ref id="decompress_lzsa1" name="decompress_lzsa1">
+<item><ref id="decompress_lzsa2" name="decompress_lzsa2">
+</itemize>
+
+
 <sect1><tt/modload.h/<label id="modload.h"><p>
 
 <itemize>
@@ -537,7 +565,7 @@ see also <tt>testcode/lib/em-test.c</tt> and <tt>samples/multidemo.c</tt>.
 <sect1><tt/nes.h/<label id="nes.h"><p>
 
 <itemize>
-<!-- <item><ref id="get_tv" name="get_tv"> -->
+<item><ref id="get_tv" name="get_tv">
 <item><ref id="waitvsync" name="waitvsync">
 </itemize>
 
@@ -555,7 +583,7 @@ It does not declare any functions.
 <sect1><tt/pce.h/<label id="pce.h"><p>
 
 <itemize>
-<!-- <item><ref id="get_tv" name="get_tv"> -->
+<item><ref id="get_tv" name="get_tv">
 <item><ref id="waitvsync" name="waitvsync">
 </itemize>
 
@@ -725,7 +753,7 @@ communication, see also <tt>testcode/lib/ser-test.c</tt>.
 <item><ref id="ltoa" name="ltoa">
 <item><ref id="malloc" name="malloc">
 <item><ref id="perror" name="perror">
-<!-- <item><ref id="posix_memalign" name="posix_memalign"> -->
+<item><ref id="posix_memalign" name="posix_memalign">
 <!-- <item><ref id="putenv" name="putenv"> -->
 <item><ref id="qsort" name="qsort">
 <item><ref id="rand" name="rand">
@@ -771,6 +799,7 @@ communication, see also <tt>testcode/lib/ser-test.c</tt>.
 <item><ref id="strqtok" name="strqtok">
 <item><ref id="strrchr" name="strrchr">
 <item><ref id="strspn" name="strspn">
+<item><ref id="strcasestr" name="strcasestr">
 <item><ref id="strstr" name="strstr">
 <item><ref id="strtok" name="strtok">
 <item><ref id="strxfrm" name="strxfrm">
@@ -846,6 +875,20 @@ communication, see also <tt>testcode/lib/ser-test.c</tt>.
 (incomplete)
 
 
+<sect1><tt/stat.h/<label id="sys/stat.h"><p>
+
+<itemize>
+<item><ref id="stat" name="stat">
+</itemize>
+
+
+<sect1><tt/statvfs.h/<label id="sys/statvfs.h"><p>
+
+<itemize>
+<item><ref id="statvfs" name="statvfs">
+</itemize>
+
+
 <sect1><tt/vic20.h/<label id="vic20.h"><p>
 
 (incomplete)
@@ -863,6 +906,13 @@ communication, see also <tt>testcode/lib/ser-test.c</tt>.
 (incomplete)
 
 
+<sect1><tt/zx02.h/<label id="zx02.h"><p>
+
+<itemize>
+<item><ref id="decompress_zx02" name="decompress_zx02">
+</itemize>
+
+
 <sect>Alphabetical function reference<p>
 
 <sect1>_DE_ISDIR<label id="_DE_ISDIR"><p>
@@ -1750,10 +1800,11 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Beep sound.
 <tag/Header/<tt/<ref id="sym1.h" name="sym1.h">/
+<tag/Header/<tt/<ref id="apple2.h" name="apple2.h">/
 <tag/Declaration/<tt/void beep(void);/
 <tag/Description/<tt/beep/ makes a brief tone.
 <tag/Notes/<itemize>
-<item>The function is specific to the Sym-1.
+<item>The function is specific to the Sym-1 and Apple2 platforms.
 </itemize>
 <tag/Availability/cc65
 <tag/See also/
@@ -2407,7 +2458,7 @@ the address must first be ORed with $60.
 <tag/Availability/cc65
 <tag/See also/
 <ref id="cbm_k_listen" name="cbm_k_listen">
-<tag/Exampe/None.
+<tag/Example/None.
 </descrip>
 </quote>
 
@@ -2666,6 +2717,45 @@ see anything that you type.  (See the description of <tt/cbm_k_scnkey()/.)
 </quote>
 
 
+<sect1>cgets<label id="cgets"><p>
+
+<quote>
+<descrip>
+<tag/Function/Input a string directly from the console.
+<tag/Header/<tt/<ref id="conio.h" name="conio.h">/
+<tag/Declaration/<tt/char* __fastcall__ cgets (const char* buffer, int size);/
+<tag/Description/The function inputs a string of at most <tt/size - 1/
+characters from the console into <tt/buffer/. It returns when <tt/size - 1/
+characters or either <tt/CR/ or <tt/LF/ are entered. It also handles both
+multi-line input and backspacing.
+<tag/Notes/<itemize>
+<item>The function echoes <tt/CRLF/ when either <tt/CR/ or <tt/LF/ are read
+but does NOT append either in <tt/buffer/.
+<item>The function is only available as fastcall function, so it may only
+be used in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="cgetc" name="cgetc">,
+<ref id="cscanf" name="cscanf">
+<tag/Example/<verb>
+#include &lt;conio.h&gt;
+
+int main (void)
+{
+    char buffer[200], *p;
+
+    cputs ("Type a lot and backspace a lot: ");
+    if (p = cgets (buffer, sizeof(buffer)))
+        cputs (p);
+
+    return 0;
+}
+</verb>
+</descrip>
+</quote>
+
+
 <sect1>chline<label id="chline"><p>
 
 <quote>
@@ -2851,6 +2941,79 @@ setting the time may not work. See also the platform-specific information.
 </quote>
 
 
+<sect1>gmtime_dt<label id="gmtime_dt"><p>
+
+<quote>
+<descrip>
+<tag/Function/Converts a ProDOS date to a struct tm.
+<tag/Header/<tt/<ref id="apple2.h" name="apple2.h">/
+<tag/Declaration/<tt/struct tm* __fastcall__ gmtime_dt (const struct datetime* dt);/
+<tag/Description/The <tt/gmtime_dt/ function converts the given
+proDOS date/time to a struct tm. On error, NULL is returned and <tt/errno/ is set
+to an error code describing the reason for the failure.
+<tag/Notes/<itemize>
+<item>The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+<item>This function is only available on Apple II.
+<item>On Apple II, you can't stat() an opened file. stat() before opening.
+</itemize>
+<tag/Availability/cc65
+<tag/Example/
+<verb>
+
+#include <stdio.h>
+#include <time.h>
+#include <sys/stat.h>
+int main(void)
+{
+    struct stat st;
+    struct tm* tm;
+    if (stat ("/disk/file", &amp;st) == 0) {
+        tm = gmtime_dt (&amp;st.st_ctime);
+        if (tm)
+            printf ("File created on %s\n", asctime(tm));
+    }
+}
+</verb>
+</descrip>
+</quote>
+
+
+<sect1>mktime_dt<label id="mktime_dt"><p>
+
+<quote>
+<descrip>
+<tag/Function/Converts a ProDOS date to a time_t.
+<tag/Header/<tt/<ref id="apple2.h" name="apple2.h">/
+<tag/Declaration/<tt/time_t __fastcall__ mktime_dt (const struct datetime* dt);/
+<tag/Description/The <tt/mktime_dt/ function parses the given
+proDOS date/time and returns a time_t timestamp. On error, 0 is returned,
+and errno is set.
+<tag/Notes/<itemize>
+<item>The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+<item>This function is only available on Apple II.
+</itemize>
+<tag/Availability/cc65
+<tag/Example/
+<verb>
+
+#include <stdio.h>
+#include <time.h>
+#include <sys/stat.h>
+int main(void)
+{
+    struct stat st;
+    if (stat ("/disk/file", &amp;st) == 0) {
+        printf ("File created on %s\n",
+          localtime (mktime_dt (&amp;st.st_ctime)));
+    }
+}
+</verb>
+</descrip>
+</quote>
+
+
 <sect1>clrscr<label id="clrscr"><p>
 
 <quote>
@@ -3192,6 +3355,47 @@ be used in presence of a prototype.
 </quote>
 
 
+<sect1>cscanf<label id="cscanf"><p>
+
+<quote>
+<descrip>
+<tag/Function/Read formatted input from the console
+<tag/Header/<tt/<ref id="conio.h" name="conio.h">/
+<tag/Declaration/<tt/int cscanf (const char* format, ...);/
+<tag/Description/The <tt/cscanf()/ function scans input from the console under
+control of the argument <tt/format/. Following the format string is a list of
+addresses to receive values. The format string is identical to that of the
+<tt/scanf()/ function.
+<tag/Notes/<itemize>
+<item>A direct call to <tt/cursor()/ may be required to show the cursor.
+<item>Some control characters like backspaces are not recognized.
+<item>A better user experience can sometimes be provided by using <tt/cgets()/
+to retrieve the input, and then using <tt/sscanf()/ to parse it.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="cgets" name="cgets">,
+<ref id="cursor" name="cursor">
+<tag/Example/<verb>
+#include &lt;conio.h&gt;
+
+int main (void)
+{
+    int a, b, c;
+
+    cputs ("Type three integers that add to 100: ");
+    if (cscanf ("%d %d %d", &amp;a, &amp;b, &amp;c) == 3 && a + b + c == 100)
+        cputs ("\r\nYou passed!\r\n");
+    else
+        cputs ("\r\nYou failed!\r\n");
+
+    return 0;
+}
+</verb>
+</descrip>
+</quote>
+
+
 <sect1>cursor<label id="cursor"><p>
 
 <quote>
@@ -3277,6 +3481,70 @@ used in presence of a prototype.
 <tag/Description/<tt/decompress_lz4/ uncompresses a LZ4-compressed buffer.
 <tag/Notes/<itemize>
 <item>Use LZ4_compress_HC with compression level 16 for best compression.
+<item>Your program will need to know the uncompressed size of the buffer as
+there is no end-of-stream marker.
+<item>LZ4 is the biggest and second-slowest decompressor shipped in cc65 runtime.
+It is also the least efficient compression algorithm.
+</itemize>
+<tag/Availability/cc65
+<tag/Example/None.
+</descrip>
+</quote>
+
+
+<sect1>decompress_lzsa1<label id="decompress_lzsa1"><p>
+
+<quote>
+<descrip>
+<tag/Function/Uncompress a LZSA buffer with format 1.
+<tag/Header/<tt/<ref id="lzsa.h" name="lzsa.h">/
+<tag/Declaration/<tt/void decompress_lzsa1 (const unsigned char* src, unsigned char* const dst);/
+<tag/Description/<tt/decompress_lz4/ uncompresses a LZSA buffer with format 1.
+<tag/Notes/<itemize>
+<item>Use <tt/lzsa -f 1 -r input.bin output.lzsa1/ to compress your input.
+<item>The project and compressor can be found at <url url="https://github.com/emmanuel-marty/lzsa">
+<item>LZSA1 is the fastest decompressor shipped in cc65 runtime, but data is less
+compressed than with LZSA2 and ZX02.
+</itemize>
+<tag/Availability/cc65
+<tag/Example/None.
+</descrip>
+</quote>
+
+
+<sect1>decompress_lzsa2<label id="decompress_lzsa2"><p>
+
+<quote>
+<descrip>
+<tag/Function/Uncompress a LZSA buffer with format 2.
+<tag/Header/<tt/<ref id="lzsa.h" name="lzsa.h">/
+<tag/Declaration/<tt/void decompress_lzsa2 (const unsigned char* src, unsigned char* const dst);/
+<tag/Description/<tt/decompress_lz4/ uncompresses a LZSA buffer with format 2.
+<tag/Notes/<itemize>
+<item>Use <tt/lzsa -f 2 -r input.bin output.lzsa2/ to compress your input.
+<item>The project and compressor can be found at <url url="https://github.com/emmanuel-marty/lzsa">
+<item>LZSA2 is the second fastest decompressor shipped in cc65 runtime, but data is less
+compressed than with ZX02.
+</itemize>
+<tag/Availability/cc65
+<tag/Example/None.
+</descrip>
+</quote>
+
+
+<sect1>decompress_zx02<label id="decompress_zx02"><p>
+
+<quote>
+<descrip>
+<tag/Function/Uncompress a ZX02 buffer.
+<tag/Header/<tt/<ref id="zx02.h" name="zx02.h">/
+<tag/Declaration/<tt/void decompress_zx02 (const unsigned char* src, unsigned char* const dst);/
+<tag/Description/<tt/decompress_zx02/ uncompresses a ZX02 buffer with format 2.
+<tag/Notes/<itemize>
+<item>Use <tt/zx02 input.bin output.zx02/ to compress your input.
+<item>The project and compressor can be found at <url url="https://github.com/dmsc/zx02">
+<item>ZX02 is the slowest decompressor shipped with cc65 runtime, but is also the
+smallest and has the best compression ratio.
 </itemize>
 <tag/Availability/cc65
 <tag/Example/None.
@@ -3364,6 +3632,26 @@ used in presence of a prototype.
 </quote>
 
 
+<sect1>detect_iigs<label id="detect_iigs"><p>
+
+<quote>
+<descrip>
+<tag/Function/Check whether we are running on an Apple IIgs..
+<tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
+<tag/Declaration/<tt/unsigned char detect_iigs (void);/
+<tag/Description/The function returns a 1 if running on an Apple IIgs.
+<tag/Notes/<itemize>
+<item>The function is specific to the Apple2 and Apple2enh platforms.
+</itemize>
+<tag/Availability/cc65 (not all platforms)
+<tag/See also/
+<ref id="get_iigs_speed" name="get_iigs_speed">,
+<ref id="set_iigs_speed" name="set_iigs_speed">,
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>detect_scpu<label id="detect_scpu"><p>
 
 <quote>
@@ -3404,6 +3692,25 @@ used in presence of a prototype.
 </quote>
 
 
+<sect1>dir_entry_count<label id="dir_entry_count"><p>
+
+<quote>
+<descrip>
+<tag/Function/Returns the number of entries in the directory.
+<tag/Header/<tt/<ref id="apple2.h" name="apple2.h">/
+<tag/Declaration/<tt/unsigned int __fastcall__ dir_entry_count(DIR *dir);/
+<tag/Description/<tt/dir_entry_count/ is machine dependent and does not exist for
+all supported targets. If it exists, it returns the number of active
+(non-deleted) files and directories in the directory.
+<tag/Notes/<itemize>
+<item>The function does not exist on all platforms.
+</itemize>
+<tag/Availability/cc65 (not all platforms)
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>div<label id="div"><p>
 
 <quote>
@@ -3967,6 +4274,31 @@ be used in presence of a prototype.
 </quote>
 
 
+<sect1>get_tv<label id="get_tv"><p>
+
+<quote>
+<descrip>
+<tag/Function/The function returns the system's vertical blank frequency.
+<tag/Header/<tt/<ref id="apple2.h" name="apple2.h">,
+<ref id="atari.h" name="atari.h">, <ref id="cbm.h" name="cbm.h">,
+<ref id="cx16.h" name="cx16.h">, <ref id="gamate.h" name="gamate.h">,
+<ref id="nes.h" name="nes.h">, <ref id="pce.h" name="pce.h">/
+<tag/Declaration/<tt/unsigned char get_tv (void);/
+<tag/Description/<tt/get_tv/ is machine dependent and does not exist for
+all supported targets. If it exists, it returns a number that identifies the
+frequency at which the screen vertical blank happens (either 50 or 60Hz),
+if possible.
+<tag/Notes/<itemize>
+<item>The function does not exist on all platforms.
+<item>Return TV_NTSC for 60Hz systems, TV_PAL for 50Hz systems, or
+TV_OTHER if the scan frequency can not be determined.
+</itemize>
+<tag/Availability/cc65 (not all platforms)
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>get_ostype<label id="get_ostype"><p>
 
 <quote>
@@ -4078,6 +4410,27 @@ header files define constants that can be used to check the return code.
 </quote>
 
 
+<sect1>get_iigs_speed<label id="get_iigs_speed"><p>
+
+<quote>
+<descrip>
+<tag/Function/Get the current speed of the Apple IIgs.
+<tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
+<tag/Declaration/<tt/unsigned char get_iigs_speed (void);/
+<tag/Description/The function returns the current speed of the Apple IIgs.
+<tag/Notes/<itemize>
+<item>The function is specific to the Apple2 and Apple2enh platforms.
+<item>See the accelerator.h header for the speed definitions.
+</itemize>
+<tag/Availability/cc65 (not all platforms)
+<tag/See also/
+<ref id="detect_iigs" name="detect_iigs">,
+<ref id="set_iigs_speed" name="set_iigs_speed">,
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>get_scpu_speed<label id="get_scpu_speed"><p>
 
 <quote>
@@ -6061,6 +6414,32 @@ be used in presence of a prototype.
 </quote>
 
 
+<sect1>posix_memalign<label id="posix_memalign"><p>
+
+<quote>
+<descrip>
+<tag/Function/Allocate aligned dynamic memory.
+<tag/Header/<tt/<ref id="stdlib.h" name="stdlib.h">/
+<tag/Declaration/<tt/int __fastcall__ posix_memalign (void** memptr, size_t alignment, size_t size);/
+<tag/Description/Allocate a block of memory with the given "size", which is aligned to a
+memory address that is a multiple of "alignment".  "alignment" <em/must not/ be
+zero, and <em/must/ be a power of two; otherwise, this function will return
+EINVAL.  The function returns ENOMEM if not enough memory is available
+to satisfy the request.  "memptr" must point to a variable; that variable
+will return the address of the allocated memory.  Use free() to release that
+allocated block.
+<tag/Notes/<itemize>
+<item>The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+</itemize>
+<tag/Availability/POSIX 1003.1
+<tag/See also/
+<ref id="free" name="free">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>psg_delay<label id="psg_delay"><p>
 
 <quote>
@@ -6229,6 +6608,9 @@ be used in presence of a prototype.
 <item>The returned pointer may point to a statically allocated instance of
 <tt/struct dirent/, so it may get overwritten by subsequent calls to
 <tt/readdir/.
+<item>On the Apple II platform, the d_ctime and d_mtime returned are in the
+ProDOS format. You can convert them to more portable time representations using
+the ProDOS datetime conversion functions.
 <item>On several platforms, namely the CBMs and the Atari, the disk drives get
 confused when opening/closing files between directory reads. So for example a
 program that reads the list of files on a disk, and after each call to
@@ -6893,6 +7275,30 @@ clean-up when exiting the program.
 </quote>
 
 
+<sect1>set_iigs_speed<label id="set_iigs_speed"><p>
+
+<quote>
+<descrip>
+<tag/Function/Set the current speed of the Apple IIgs.
+<tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
+<tag/Declaration/<tt/unsigned char __fastcall__ set_iigs_speed (unsigned char speed);/
+<tag/Description/The function sets the speed of the Apple IIgs CPU (and returns
+the new speed).
+<tag/Notes/<itemize>
+<item>The function is specific to the Apple2 and Apple2enh platforms.
+<item>See the accelerator.h header for the speed definitions.
+<item>Accepted parameters are SPEED_SLOW and SPEED_FAST (all other values are
+considered SPEED_FAST).
+</itemize>
+<tag/Availability/cc65 (not all platforms)
+<tag/See also/
+<ref id="detect_iigs" name="detect_iigs">,
+<ref id="get_iigs_speed" name="get_iigs_speed">,
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>set_scpu_speed<label id="set_scpu_speed"><p>
 
 <quote>
@@ -7075,6 +7481,85 @@ be used in presence of a prototype.
 </quote>
 
 
+<sect1>stat<label id="stat"><p>
+
+<quote>
+<descrip>
+<tag/Function/Get file status.
+<tag/Header/<tt/<ref id="sys/stat.h" name="sys/stat.h">/
+<tag/Declaration/<tt/int __fastcall__ stat (const char* pathname, struct stat* statbuf);/
+<tag/Description/<tt/stat/ gets information for the file with the given name. On success,
+zero is returned. On error, -1 is returned and <tt/errno/ is set to an error
+code describing the reason for the failure.
+<tag/Notes/<itemize>
+<item>The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+<item>On the Apple II platform, the st_ctim, st_mtim and st_atim members are left
+to zero, for size and performance reasons. The ProDOS creation and modification dates
+are returned in the ProDOS format in st_ctime and st_mtime. The access date does
+not exist. You can convert them to POSIX-style time representations using
+the <url url="apple2.html#ss9.3" name="ProDOS datetime conversion functions">.
+</itemize>
+<tag/Availability/POSIX 1003.1
+<tag/See also/
+<ref id="statvfs" name="statvfs">
+<tag/Example/
+<verb>
+#include &lt;sys/stat.h&gt;
+
+#define FILENAME "helloworld"
+struct stat stbuf;
+if (stat (FILENAME, &amp;stbuf) == 0) {
+    printf ("%s size is %lu bytes (created on %s)\n", FILENAME, stbuf.st_size,
+#ifndef __APPLE2__
+    localtime (&amp;stbuf.st_ctim.tv_sec)
+#else
+    localtime (mktime_dt (&amp;stbuf.st_ctime))
+#endif
+    );
+} else {
+    printf ("There was a problem stat'ing %s: %d\n", FILENAME, errno);
+}
+</verb>
+</descrip>
+</quote>
+
+
+<sect1>statvfs<label id="statvfs"><p>
+
+<quote>
+<descrip>
+<tag/Function/Get filesystem statistics.
+<tag/Header/<tt/<ref id="sys/statvfs.h" name="sys/statvfs.h">/
+<tag/Declaration/<tt/int __fastcall__ statvfs (const char* pathname, struct statvfs* buf);/
+<tag/Description/<tt/statvfs/ gets information for the filesystem on which the given file
+resides. On success,
+zero is returned. On error, -1 is returned and <tt/errno/ is set to an error
+code describing the reason for the failure.
+<tag/Notes/<itemize>
+<item>The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+<item>The function requires an absolute pathname.
+</itemize>
+<tag/Availability/POSIX 1003.1
+<tag/See also/
+<ref id="stat" name="stat">
+<tag/Example/
+<verb>
+#include &lt;sys/statvfs.h&gt;
+
+#define FILENAME "/disk/helloworld"
+struct statvfs stvbuf;
+if (statvfs (FILENAME, &amp;stvbuf) == 0) {
+    printf ("%s filesystem has %u blocks of %u size, %u of them free.\n", FILENAME, stvbuf.f_blocks, stvbuf.f_bsize, stvbuf.f_bfree);
+} else {
+    printf ("There was a problem statvfs'ing %s: %d\n", FILENAME, errno);
+}
+</verb>
+</descrip>
+</quote>
+
+
 <sect1>strcasecmp<label id="strcasecmp"><p>
 
 <quote>
@@ -7655,22 +8140,47 @@ be used in presence of a prototype.
 </quote>
 
 
-<sect1>strstr<label id="strstr"><p>
+<sect1>strcasestr<label id="strcasestr"><p>
 
 <quote>
 <descrip>
-<tag/Function/Find a substring.
+<tag/Function/Find a substring, case-insensitive.
 <tag/Header/<tt/<ref id="string.h" name="string.h">/
-<tag/Declaration/<tt/char* __fastcall__ strstr (const char* str, const char* substr);/
-<tag/Description/<tt/strstr/ searches for the first occurrence of the string
-<tt/substr/ within <tt/str/. If found, it returns a pointer to the copy,
-otherwise it returns <tt/NULL/.
+<tag/Declaration/<tt/char* __fastcall__ strcasestr (const char* str, const char* substr);/
+<tag/Description/<tt/strcasestr/ searches for the first occurrence of the string
+<tt/substr/ within <tt/str/. If found, it returns a pointer to the start of the
+match in <tt/str/, otherwise it returns <tt/NULL/.
 <tag/Notes/<itemize>
 <item>The function is only available as fastcall function, so it may only
 be used in presence of a prototype.
 </itemize>
 <tag/Availability/ISO 9899
 <tag/See also/
+<ref id="strstr" name="strstr">,
+<ref id="strcspn" name="strcspn">,
+<ref id="strspn" name="strspn">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
+<sect1>strstr<label id="strstr"><p>
+
+<quote>
+<descrip>
+<tag/Function/Find a substring, case-sensitive.
+<tag/Header/<tt/<ref id="string.h" name="string.h">/
+<tag/Declaration/<tt/char* __fastcall__ strstr (const char* str, const char* substr);/
+<tag/Description/<tt/strstr/ searches for the first occurrence of the string
+<tt/substr/ within <tt/str/. If found, it returns a pointer to the start of the
+match in <tt/str/, otherwise it returns <tt/NULL/.
+<tag/Notes/<itemize>
+<item>The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+</itemize>
+<tag/Availability/ISO 9899
+<tag/See also/
+<ref id="strcasestr" name="strcasestr">,
 <ref id="strcspn" name="strcspn">,
 <ref id="strspn" name="strspn">
 <tag/Example/None.
@@ -8052,24 +8562,27 @@ used in presence of a prototype.
 <tag/Function/Switch to either 40- or 80-column text mode, or a standard
 graphics mode.
 <tag/Header/<tt/
+<ref id="apple2.h" name="apple2.h">,
 <ref id="apple2enh.h" name="apple2enh.h">,
 <ref id="c128.h" name="c128.h">,
 <ref id="cx16.h" name="cx16.h">/
 <tag/Declaration/
-<tt>unsigned __fastcall__ videomode (unsigned Mode); /* for apple2enh and c128 */</tt><newline>
-<tt>signed char __fastcall__ videomode (signed char Mode); /* for cx16 */</tt>
+<tt>unsigned __fastcall__ videomode (unsigned Mode); /* for c128 */</tt><newline>
+<tt>signed char __fastcall__ videomode (signed char Mode); /* for apple2 and cx16 */</tt>
 <tag/Description/Switch to a 40- or 80-column text or graphics mode, depending
 on the argument. If the requested mode is already active, nothing happens. The
 old mode is returned from the call.
 <tag/Notes/<itemize>
-<item>The function is specific to the Commodore 128, the enhanced Apple //e,
+<item>The function is specific to the Commodore 128, the Apple II,
 and the Commander X16.
 <item>This function replaces <ref id="toggle_videomode"
 name="toggle_videomode">.
 <item>The function is available as only a fastcall function, so it may be used
 only in the presence of a prototype.
+<item>On Apple II, this functions returns the previously active video mode, or -1
+if the mode is not supported due to lack of hardware.
 </itemize>
-<tag/Availability/C128, enhanced Apple //e, and CX16
+<tag/Availability/C128, Apple II, and CX16
 <tag/See also/
 <ref id="fast" name="fast">,
 <ref id="isfast" name="isfast">,
@@ -8087,13 +8600,21 @@ only in the presence of a prototype.
 <descrip>
 <tag/Function/Wait until the start of the next video frame.
 <tag/Header/<tt/
+<ref id="apple2.h" name="apple2.h">,
+<ref id="atmos.h" name="atmos.h">,
 <ref id="cbm.h" name="cbm.h">,
 <ref id="gamate.h" name="gamate.h">,
 <ref id="nes.h" name="nes.h">,
 <ref id="pce.h" name="pce.h">/
-<tag/Declaration/<tt/void waitvsync (void);/
+<tag/Declaration/
+<tt>void waitvsync (void);</tt><newline>
 <tag/Description/Wait for vertical sync, to reduce flickering.
+<tag/Notes/<itemize>
+<item>The function will silently fail when the feature is not
+supported, like on the Apple&nbsp;&rsqb;&lsqb;+.
+</itemize>
 <tag/Availability/Platforms served by the headers above
+(Atmos requires the VSync hack)
 <tag/Example/None.
 </descrip>
 </quote>
diff --git a/doc/index.sgml b/doc/index.sgml
index 92df5e018..e39fd11b4 100644
--- a/doc/index.sgml
+++ b/doc/index.sgml
@@ -109,6 +109,9 @@
 
 <descrip>
 
+  <tag><htmlurl url="agat.html" name="agat.html"></tag>
+  Topics specific to the Agat machines.
+
   <tag><htmlurl url="apple2.html" name="apple2.html"></tag>
   Topics specific to the Apple&nbsp;&rsqb;&lsqb;.
 
diff --git a/doc/ld65.sgml b/doc/ld65.sgml
index 1ad04b395..b889645f5 100644
--- a/doc/ld65.sgml
+++ b/doc/ld65.sgml
@@ -1180,6 +1180,202 @@ The ZPSAVE segment contains the original values of the zeropage locations used
 by the ZEROPAGE segment. It is placed in its own segment because it must not be
 initialized.
 
+<sect>Debug Info<p>
+
+The debug info and the API mirrors closely the items available in the sources
+used to build an executable. To use the API efficiently, it is necessary to
+understand from which blocks the information is built.
+
+<itemize>
+<item>  Libraries
+<item>  Lines
+<item>  Modules
+<item>  Scopes
+<item>  Segments
+<item>  Source files
+<item>  Spans
+<item>  Symbols
+<item>  Types
+</itemize>
+
+Each item of each type has something like a primary index called an 'id'.
+The ids can be thought of as array indices, so looking up something by its
+id is fast. Invalid ids are marked with the special value CC65_INV_ID.
+Data passed back for an item may contain ids of other objects. A scope for
+example contains the id of the parent scope (or CC65_INV_ID if there is no
+parent scope). Most API functions use ids to lookup related objects.
+
+
+<sect1>Libraries<p>
+
+This information comes from the linker and is currently used in only one
+place:To mark the origin of a module. The information available for a library
+is its name including the path.
+
+<itemize>
+<item> Library id
+<item> Name and path of library
+</itemize>
+
+
+<sect1>Lines<p>
+
+A line is a location in a source file. It is module dependent, which means
+that if two modules use the same source file, each one has its own line
+information for this file. While the assembler has also column information,
+it is dropped early because it would generate much more data. A line may have
+one or more spans attached if code or data is generated.
+
+<itemize>
+<item> Line id
+<item> Id of the source file, the line is from
+<item> The line number in the file (starting with 1)
+<item> The type of the line: Assembler/C source or macro
+<item> A count for recursive macros if the line comes from a macro
+</itemize>
+
+
+<sect1>Modules<p>
+
+A module is actually an object file. It is generated from one or more source
+files and may come from a library. The assembler generates a main scope for
+symbols declared outside user generated scopes. The main scope has an empty name.
+
+<itemize>
+<item> Module id
+<item> The name of the module including the path
+<item> The id of the main source file (the one specified on the command line)
+<item> The id of the library the module comes from, or CC65_INV_ID
+<item> The id of the main scope for this module
+</itemize>
+
+
+<sect1>Scopes<p>
+
+Each module has a main scope where all symbols live, that are specified outside
+other scopes. Additional nested scopes may be specified in the sources. So scopes
+have a one to many relation: Each scope (with the exception of the main scope) has
+exactly one parent and may have several child scopes. Scopes may not cross modules.
+
+<itemize>
+<item> Scope id
+<item> The name of the scope (may be empty)
+<item> The type of the scope: Module, .SCOPE or .PROC, .STRUCT and .ENUM
+<item> The size of the scope (the size of the span for the active segment)
+<item> The id of the parent scope (CC65_INV_ID in case of the main scope)
+<item> The id of the attached symbol for .PROC scopes
+<item> The id of the module where the scope comes from
+</itemize>
+
+
+<sect1>Segment Info<p>
+
+<itemize>
+<item> Segment id
+<item> The name of the segment
+<item> The start address of the segment
+<item> The size of the segment
+<item> The name of the output file, this segment was written to (may be empty)
+<item> The offset of the segment in the output file (only if name not empty)
+<item> The bank number of the segment's memory area
+</itemize>
+
+It is also possible to retrieve the spans for sections (a section is the part of a
+segment that comes from one module). Since the main scope covers a whole module, and
+the main scope has spans assigned (if not empty), the spans for the main scope of a
+module are also the spans for the sections in the segments.
+
+
+<sect1>Source files<p>
+
+Modules are generated from source files. Since some source files are used several times
+when generating a list of modules (header files for example), the linker will merge
+duplicates to reduce redundant information. Source files are considered identical if the
+full name including the path is identical, and the size and time of last modification
+matches. Please note that there may be still duplicates if files are accessed using
+different paths.
+
+<itemize>
+<item> Source file id
+<item> The name of the source file including the path
+<item> The size of the file at the time when it was read
+<item> The time of last modification at the time when the file was read
+</itemize>
+
+
+<sect1>Spans<p>
+
+A span is a small part of a segment. It has a start address and a size. Spans are used
+to record sizes of other objects. Line infos and scopes may have spans attached, so it
+is possible to lookup which data was generated for these items.
+
+<itemize>
+<item> Span id
+<item> The start address of the span. This is an absolute address
+<item> The end address of the span. This is inclusive which means if start==end then => size==1
+<item> The id of the segment were the span is located
+<item> The type of the data in the span (optional, maybe NULL)
+<item> The number of line infos available for this span
+<item> The number of scope infos available for this span
+</itemize>
+
+The last two fields will save a call to cc65_line_byspan or cc65_scope_byspan by providing
+information about the number of items that can be retrieved by these calls.
+
+
+<sect1>Symbols<p>
+
+<itemize>
+<item> Symbol id
+<item> The name of the symbol
+<item> The type of the symbol, which may be label, equate or import
+<item> The size of the symbol (size of attached code or data). Only for labels. Zero if unknown
+<item> The value of the symbol. For an import, this is taken from the corresponding export
+<item> The id of the corresponding export. Only valid for imports, CC65_INV_ID for other symbols
+<item> The segment id if the symbol is segment based. For an import, taken from the export
+<item> The id of the scope this symbols was defined in
+<item> The id of the parent symbol. This is only set for cheap locals and CC65_INV_ID otherwise
+</itemize>
+
+Beware: Even for an import, the id of the corresponding export may be CC65_INV_ID.
+This happens if the module with the export has no debug information. So make sure
+that your application can handle it.
+
+
+<sect1>Types<p>
+
+A type is somewhat special. You cannot retrieve data about it in a similar way as with the other
+items. Instead you have to call a special routine that parses the type data and returns it
+in a set of data structures that can be processed by a C or C++ program.
+
+The type information is language independent and doesn't encode things like 'const' or
+'volatile'. Instead it defines a set of simple data types and a few ways to aggregate
+them (arrays, structs and unions).
+
+Type information is currently generated by the assembler for storage allocating commands
+like .BYTE or .WORD. For example, the assembler code
+
+<tscreen><verb>
+foo:    .byte $01, $02, $03
+</verb></tscreen>
+
+will assign the symbol foo a size of 3, but will also generate a span with a size of 3
+bytes and a type ARRAY[3] OF BYTE.
+Evaluating the type of a span allows a debugger to display the data in the same way as it
+was defined in the assembler source.
+
+<table>
+<tabular ca="clc">
+<bf/Assembler Command/| <bf/Generated Type Information/@<hline>
+.ADDR| ARRAY OF LITTLE ENDIAN POINTER WITH SIZE 2 TO VOID@
+.BYTE| ARRAY OF UNSIGNED WITH SIZE 1@
+.DBYT| ARRAY OF BIG ENDIAN UNSIGNED WITH SIZE 2@
+.DWORD| ARRAY OF LITTLE ENDIAN UNSIGNED WITH SIZE 4@
+.FARADDR| ARRAY OF LITTLE ENDIAN POINTER WITH SIZE 3 TO VOID@
+.WORD| ARRAY OF LITTLE ENDIAN UNSIGNED WITH SIZE 2
+</tabular>
+</table>
+
 
 
 <sect>Copyright<p>
diff --git a/doc/plus4.sgml b/doc/plus4.sgml
index 79a2597d0..578f61c33 100644
--- a/doc/plus4.sgml
+++ b/doc/plus4.sgml
@@ -165,8 +165,26 @@ The names in the parentheses denote the symbols to be used for static linking of
 
 <sect1>Graphics drivers<p>
 
-No graphics drivers are currently available for the Plus/4.
+<descrip>
+  <tag><tt/ted-hi.tgi (ted_hi_tgi)/</tag>
+  This driver features a resolution of 320*200 with two colors and an
+  adjustable palette (that means that the two colors can be chosen out of a
+  palette of the 121 TED colors).
 
+  Note that the text-mode character matrix and color data are destroyed by this
+  driver. The driver calls the Kernal <tt/CLRSCR/ routine to return the text
+  screen to a usable (if empty) state on <tt/tgi_done()/.
+
+  This driver places the bitmap at &dollar;C000-&dollar;E000. Programs using
+  this driver must either be linked with the option <tt/-D
+  __HIMEM__=&dollar;C000/, or use the <tt/plus4-hires.cfg/ linker configuration.
+
+  The <tt/plus4-hires.cfg/ is preferable, as it allows the stack to remain at
+  &dollar;FCFF, and exposes the remaining high memory from the end of the bitmap
+  to the stack top as a <tt/HIBSS/ segment that can be used by the programmer,
+  or given to <tt/_heapadd()/ (using the symbols <tt/_HIBSS_START__/ and
+  <tt/_HIBSS_SIZE__/).
+</descrip><p>
 
 <sect1>Extended memory drivers<p>
 
diff --git a/doc/sim65.sgml b/doc/sim65.sgml
index c2740bbad..46ef961cb 100644
--- a/doc/sim65.sgml
+++ b/doc/sim65.sgml
@@ -40,6 +40,8 @@ The simulator is called as follows:
         Long options:
           --help                Help (this text)
           --cycles              Print amount of executed CPU cycles
+          --cpu <type>          Override CPU type (6502, 65C02, 6502X)
+          --trace               Enable CPU trace
           --verbose             Increase verbosity
           --version             Print the simulator version number
 </verb></tscreen>
@@ -70,6 +72,17 @@ Here is a description of all the command line options:
   count.
 
 
+  <tag><tt>--cpu &lt;type&gt;</tt></tag>
+
+  Specify the CPU type to use while executing the program. This CPU type
+  is normally determined from the program file header, but it can be useful
+  to override it.
+
+  <tag><tt>--trace</tt></tag>
+
+  Print a single line of information for each instruction or interrupt that
+  is executed by the CPU to stdout.
+
   <tag><tt>-v, --verbose</tt></tag>
 
   Increase the simulator verbosity.
@@ -115,37 +128,78 @@ PVExit ($01)
 
 <sect>Creating a Test in C<p>
 
-For a C test compiled and linked with <tt/--target sim6502/ the
+For a C test linked with <tt/--target sim6502/ and the <tt/sim6502.lib/ library,
 command line arguments to <tt/sim65/ will be passed to <tt/main/,
 and the return value from <tt/main/ will become sim65's exit code.
-The <tt/exit/ function may also be used to terminate with an exit code.
+The <tt/stdlib.h/ <tt/exit/ function may also be used to terminate with an exit code.
 
-Exit codes are limited to 8 bits.
+Exit codes are limited to an unsigned 8 bit value. (E.g. returning -1 will give an exit code of 255.)
 
 The standard C library high level file input and output is functional.
 A sim65 application can be written like a command line application,
-providing arguments to <tt/main/ and using the <tt/stdio.h/ interfaces.
+providing command line arguments to <tt/main/ and using the <tt/stdio.h/ interfaces
+to interact with the console or access files.
 
 Internally, file input and output is provided at a lower level by
-a set of built-in paravirtualization functions (<ref id="paravirt-internal" name="see below">).
+a set of built-in paravirtualization functions (see <ref id="paravirt-internal" name="below">).
 
+Example:
+
+<tscreen><verb>
+#include <stdio.h>
+int main()
+{
+    printf("Hello!\n");
+    return 5;
+}
+
+// Build and run:
+//   cl65 -t sim6502 -o example.prg example.c
+//   sim65 example.prg
+
+// Build and run, separate steps:
+//   cc65 -t sim6502 -o example.s example.c
+//   ca65 -t sim6502 -o example.o example.s
+//   ld65 -t sim6502 -o example.prg example.o sim6502.lib
+//   sim65 example.prg
+</verb></tscreen>
 
 <sect>Creating a Test in Assembly<p>
 
-Assembly tests may similarly be assembled and linked with
-<tt/--target sim6502/ or <tt/--target sim65c02/.
-Define and export <tt/_main/ as an entry point,
+Though a C test may also link with assembly code,
+a pure assembly test can also be created.
+
+Link with <tt/--target sim6502/ or <tt/--target sim65c02/ and the corresponding library,
+define and export <tt/_main/ as an entry point,
 and the sim65 library provides two ways to return an 8-bit exit code:
 
 <itemize>
 
 <item>Return from <tt/_main/ with the exit code in <tt/A/.
 
-<item><tt/jmp exit/ with the code in <tt/A/.
+<item><tt/jmp exit/ with the code in <tt/A/. (<tt/.import exit/ from the sim65 library.)
 
 </itemize>
 
-The binary file has a 12 byte header:
+Example:
+
+<tscreen><verb>
+.export _main
+_main:
+    lda #5
+    rts
+
+; Build and run:
+;   cl65 -t sim6502 -o example.prg example.s
+;   sim65 example.prg
+
+; Build and run, separate steps:
+;   ca65 -t sim6502 -o example.o example.s
+;   ld65 -t sim6502 -o example.prg example.o sim6502.lib
+;   sim65 example.prg
+</verb></tscreen>
+
+Internally, the binary program file has a 12 byte header provided by the library:
 
 <itemize>
 
@@ -155,7 +209,7 @@ The binary file has a 12 byte header:
 
 <item>1 byte <bf/CPU type/: <tt/0/ = 6502, <tt/1/ = 65C02
 
-<item>1 byte <bf/sp address/: the zero page address of the C parameter stack pointer <tt/sp/ used by the paravirtualization functions
+<item>1 byte <bf/c_sp address/: the zero page address of the C parameter stack pointer <tt/c_sp/ used by the paravirtualization functions
 
 <item>1 word <bf/load address/: where to load the data from the file into memory (default: <tt/$0200/)
 
@@ -182,8 +236,204 @@ These use cc65 calling conventions, and are intended for use with the sim65 targ
 <item><tt/IRQ/ and <tt/NMI/ events will not be generated, though <tt/BRK/
 can be used if the IRQ vector at <tt/$FFFE/ is manually prepared by the test code.
 
+<item>The <tt/sim6502/ or <tt/sim65c02/ targets provide a default configuration,
+but if customization is needed <tt/sim6502.cfg/ or <tt/sim65c02.cfg/ might be used as a template.
+
 </itemize>
 
+<sect>Counter peripheral
+
+<p>The sim65 simulator supports a memory-mapped counter peripheral that manages
+a number of 64-bit counters that are continuously updated as the simulator is
+running. For each counter, it also provides a 64 bit "latching" register.
+
+<p>The functionality of the counter peripheral is accessible through 3 registers:
+
+<itemize>
+<item><tt>PERIPHERALS_COUNTER_LATCH</tt> ($FFC0, write-only)
+<item><tt>PERIPHERALS_COUNTER_SELECT</tt> ($FFC1, read/write)
+<item><tt>PERIPHERALS_COUNTER_VALUE</tt> ($FFC2..$FFC9, read-only)
+</itemize>
+
+<p>These three registers are used as follows.
+
+<p>When a program explicitly requests a "counter latch" operation by writing any value
+to the <tt>PERIPHERALS_COUNTER_LATCH</tt> address ($FFC0), all live registers are simultaneously
+copied to the latch registers. They will keep their newly latched values until another latch
+operation is requested.
+
+<p>The <tt>PERIPHERALS_COUNTER_SELECT</tt> address ($FFC1) register holds an 8-bit value that
+specifies which 64-bit latch register is currently readable through the <tt>PERIPHERALS_COUNTER_VALUE</tt>
+address range. Six values are currently defined:
+
+<itemize>
+<item>$00: latched clock cycle counter selected.
+<item>$01: latched CPU instruction counter selected.
+<item>$02: latched IRQ interrupt counter selected.
+<item>$03: latched NMI interrupt counter selected.
+<item>$80: latched wallclock time (nanoseconds) selected.
+<item>$81: latched wallclock time (split: seconds, nanoseconds) selected.
+</itemize>
+
+<p>Values $00 to $03 provide access to the latched (frozen) value of their respective live
+counters at the time of the last write to <tt>PERIPHERALS_COUNTER_LATCH</tt>.
+
+<p>When <tt>PERIPHERALS_COUNTER_SELECT</tt> equals $80, the <tt>PERIPHERALS_COUNTER_VALUE</tt>
+will be a 64-bit value corresponding to the number of nanoseconds elapsed since the Unix epoch
+(Midnight, Jan 1st, 1970 UTC), at the time of the last latch operation.
+
+<p>When <tt>PERIPHERALS_COUNTER_SELECT</tt> equals $81, the high 32 bits of <tt>PERIPHERALS_COUNTER_VALUE</tt>
+will be a 32-bit value corresponding to the number of seconds elapsed since the Unix epoch (Midnight, Jan 1st,
+1970 UTC), at the time of the last latch operation. The low 32 bits of
+<tt>PERIPHERALS_COUNTER_VALUE</tt> will hold the nanoseconds since the start of that second.
+
+<p>The two different wallclock-time latch registers will always refer to precisely the same time instant.
+For some applications, the single 64-bit value measured in nanoseconds will be more convenient, while
+for other applications, the split 32/32 bits representation with separate second and nanosecond
+values will be more convenient.
+
+<p>Note that the time elapsed since the Unix epoch is an approximation, as the implementation depends on the
+way POSIX defines time-since-the-epoch. Unfortunately, POSIX incorrectly assumes that all days are precisely
+86400 seconds long, which is not true in case of leap seconds. The way this inconsistency is resolved is
+system dependent.
+
+<p>On reset, <tt>PERIPHERALS_COUNTER_SELECT</tt> is initialized to zero. If the <tt>PERIPHERALS_COUNTER_SELECT</tt>
+register holds a value other than one of the six values described above, all <tt>PERIPHERALS_COUNTER_VALUE</tt>
+bytes will read as zero.
+
+<p>The <tt>PERIPHERALS_COUNTER_VALUE</tt> addresses ($FFC2..$FFC9) are used to read to currently
+selected 64-bit latch register value. Address $FFC2 holds the least significant byte (LSB),
+while address $FFC9 holds the most significant byte (MSB).
+
+<p>On reset, all latch registers are reset to zero. Reading any of the <tt>PERIPHERALS_COUNTER_VALUE</tt>
+bytes before the first write to <tt>PERIPHERALS_COUNTER_LATCH</tt> will yield zero.
+
+Example:
+
+<tscreen><verb>
+/* This example uses the peripheral support in sim65.h */
+
+#include <stdio.h>
+#include <sim65.h>
+
+static void print_current_counters(void)
+{
+    peripherals.counter.latch = 0; /* latch values */
+
+    peripherals.counter.select = COUNTER_SELECT_CLOCKCYCLE_COUNTER;
+    printf("clock cycles ............... : %08lx %08lx\n", peripherals.counter.value32[1], peripherals.counter.value32[0]);
+    peripherals.counter.select = COUNTER_SELECT_INSTRUCTION_COUNTER;
+    printf("instructions ............... : %08lx %08lx\n", peripherals.counter.value32[1], peripherals.counter.value32[0]);
+    peripherals.counter.select = COUNTER_SELECT_WALLCLOCK_TIME;
+    printf("wallclock time ............. : %08lx %08lx\n", peripherals.counter.value32[1], peripherals.counter.value32[0]);
+    peripherals.counter.select = COUNTER_SELECT_WALLCLOCK_TIME_SPLIT;
+    printf("wallclock time, split ...... : %08lx %08lx\n", peripherals.counter.value32[1], peripherals.counter.value32[0]);
+    printf("\n");
+}
+
+int main(void)
+{
+    print_current_counters();
+    print_current_counters();
+    return 0;
+}
+</verb></tscreen>
+
+<sect>SIM65 control peripheral
+
+<p>The sim65 simulator supports a memory-mapped peripheral that allows control
+of the simulator behavior itself.
+
+<p>The sim65 control peripheral interface consists of 2 registers:
+
+<itemize>
+<item><tt>PERIPHERALS_SIMCONTROL_CPUMODE</tt> ($FFCA, read/write)
+<item><tt>PERIPHERALS_SIMCONTROL_TRACEMODE</tt> ($FFCB, read/write)
+</itemize>
+
+<p>Address <tt>PERIPHERALS_SIMCONTROL_CPUMODE</tt> allows access to the currently active CPU mode.
+
+<p>Possible values are CPU_6502 (0), CPU_65C02 (1), and CPU_6502X (2). For specialized applications,
+it may be useful to switch CPU models at runtime; this is supported by writing 0, 1, or 2 to this address.
+Writing any other value will be ignored.
+
+<p>Address <tt>PERIPHERALS_SIMCONTROL_TRACEMODE</tt> allows inspection and control of the currently active
+CPU tracing mode.
+
+<p>A value of 0 means tracing is disabled; a value of $7F fully enables tracing. The 7
+lower bits of the value actually provide control over which fields are printed; see below
+for an explanation of the seven fields.
+
+<p>Having the ability to enable/disable tracing on the fly can be a useful debugging aid. For example,
+it can be used to enable tracing for short fragments of code. Consider the following example:
+
+<tscreen><verb>
+/* This example uses the TRACE_ON and TRACE_OFF macros defined in sim65.h */
+
+#include <stdio.h>
+#include <sim65.h>
+
+unsigned x;
+
+int main(void)
+{
+    TRACE_ON();
+
+    x = 0x1234; /* We want to see what happens here. */
+
+    TRACE_OFF();
+
+    return 0;
+}
+</verb></tscreen>
+
+<p>This small test program, when compiled with optimizations enabled (-O), produces the output trace below:
+
+<tscreen><verb>
+70           232  022E  A2 12     ldx  #$12         A=7F X=00 Y=04 S=FD Flags=nvdizC    SP=FFBC
+71           234  0230  A9 34     lda  #$34         A=7F X=12 Y=04 S=FD Flags=nvdizC    SP=FFBC
+72           236  0232  8D C8 02  sta  $02C8        A=34 X=12 Y=04 S=FD Flags=nvdizC    SP=FFBC
+73           240  0235  8E C9 02  stx  $02C9        A=34 X=12 Y=04 S=FD Flags=nvdizC    SP=FFBC
+74           244  0238  A9 00     lda  #$00         A=34 X=12 Y=04 S=FD Flags=nvdizC    SP=FFBC
+75           246  023A  8D CB FF  sta  $FFCB        A=00 X=12 Y=04 S=FD Flags=nvdiZC    SP=FFBC
+</verb></tscreen>
+
+<p>The example output shows the full trace format, consisting of the following seven fields:
+
+<itemize>
+<item>The first field is an instruction counter. We see here that the assignment '<tt>x = 0x1234;</tt>'
+starts at the 70th CPU instruction since the start of the simulator, and takes four 6502 instructions.
+The two instructions that follow correspond to the execution of the <tt>TRACE_OFF</tt>' macro
+that disables tracing.
+<item>The second field shows the clock cycles since the start of the program. Here we see that the
+first four instructions take 12 clock cycles in total (262 - 250 = 12).
+<item>The third field shows the program counter as a four-digit, i.e., the PC register. Its 16-bit
+      value is displayed as a 4-digit hecadecimal number.
+<item>The fourth field shows one to three hexadecimal byte values that make up the instruction.
+<item>The fifth field shows the instruction in human-readable assembly language.
+<item>The sixth field shows the CPU registers before execution of the instruction. The A, X, Y, and
+      S registers are each shown as a single byte value. The six status bits of the CPU are shown in
+      the order NVDIZC (Negative, Overflow, Decimal, Interrupt, Zero, Carry). They are displayed as
+      a capital letter if the flag is set, or a small letter if the flag is unset.
+<item>The seventh and last field shows the software stack pointer SP as used by CC65 programs that
+      conform to the CC65 conventions.
+</itemize>
+
+<p>Writing a specific value to <tt>PERIPHERALS_SIMCONTROL_TRACEMODE</tt> will control which of these
+seven fields are displayed. The following values are defined to denote the seven fields:
+
+<itemize>
+<item>TRACE_FIELD_INSTR_COUNTER   = 0x40
+<item>TRACE_FIELD_CLOCK_COUNTER   = 0x20
+<item>TRACE_FIELD_PC              = 0x10
+<item>TRACE_FIELD_INSTR_BYTES     = 0x08
+<item>TRACE_FIELD_INSTR_ASSEMBLY  = 0x04
+<item>TRACE_FIELD_CPU_REGISTERS   = 0x02
+<item>TRACE_FIELD_CC65_SP         = 0x01
+</itemize>
+
+<p>For example, writing the value $16 to <tt>PERIPHERALS_SIMCONTROL_TRACEMODE</tt> will only display
+the program counter, instruction assembly, and CPU registers fields.
 
 <sect>Copyright<p>
 
diff --git a/doc/tgi.sgml b/doc/tgi.sgml
index 29acd8ce6..96709ae31 100644
--- a/doc/tgi.sgml
+++ b/doc/tgi.sgml
@@ -43,7 +43,7 @@ of range.
 <ref id="tgi_setcolor" name="tgi_setcolor">
 <tag/Example/<tscreen><verb>
 /* Draw the upper half of an ellipse */
-tgi_setcolor(TGI_COLOR_BLUE);
+tgi_setcolor(1);
 tgi_arc (50, 50, 40, 20, 0, 180);
 </verb></tscreen>
 </descrip>
@@ -67,7 +67,7 @@ be used in presence of a prototype.
 <tag/Availability/cc65
 <tag/See also/Other tgi function
 <tag/Example/<tscreen><verb>
-tgi_setcolor(TGI_COLOR_GREEN);
+tgi_setcolor(1);
 tgi_bar(10, 10, 100, 60);
 </verb></tscreen>
 </descrip>
@@ -94,7 +94,7 @@ be used in presence of a prototype.
 <ref id="tgi_pieslice" name="tgi_pieslice">,
 <ref id="tgi_setcolor" name="tgi_setcolor">
 <tag/Example/<tscreen><verb>
-tgi_setcolor(TGI_COLOR_BLACK);
+tgi_setcolor(1);
 tgi_circle(50, 40, 40);
 </verb></tscreen>
 </descrip>
@@ -154,7 +154,7 @@ be used in presence of a prototype.
 <ref id="tgi_pieslice" name="tgi_pieslice">,
 <ref id="tgi_setcolor" name="tgi_setcolor">
 <tag/Example/<tscreen><verb>
-tgi_setcolor(TGI_COLOR_RED);
+tgi_setcolor(1);
 tgi_ellipse (50, 40, 40, 20);
 </verb></tscreen>
 </descrip>
@@ -216,17 +216,19 @@ original aspect ratio.
 
 <quote>
 <descrip>
-<tag/Function/Return the current drawing color.
+<tag/Function/Return the current drawing color (palette index).
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
 <tag/Declaration/<tt/unsigned char tgi_getcolor (void);/
 <tag/Description/The actual color is an index to a palette. During tgi_init
-you will get a default palette. The number of colors depend on the platform.
-All platforms recognize at least TGI_COLOR_BLACK and TGI_COLOR_WHITE. But some
-platforms have many more predefined colors. If you paint using TGI_COLOR_GREEN
-and then you change the green of the palette to blue using tgi_setpalette then
-after this painting in TGI_COLOR_GREEN will actually be blue.
+you will get a default palette.
+A default palette has always two entries with values equal to TGI_COLOR_BLACK
+and TGI_COLOR_WHITE. However, which default palette entries have those two
+values is target specific.
+Note that both the number of colors, and also the available colors, depend on
+the target and/or driver.
 <tag/Availability/cc65
-<tag/See also/Other tgi functions
+<tag/See also/<ref id="tgi_setcolor" name="tgi_setcolor">,
+<ref id="tgi_setpalette" name="tgi_setpalette">
 <tag/Example/<tscreen><verb>
 color = tgi_getcolor();
 </verb></tscreen>
@@ -238,7 +240,8 @@ color = tgi_getcolor();
 
 <quote>
 <descrip>
-<tag/Function/Get the number of available colors.
+<tag/Function/Get the number of available colors in the palette for the current
+driver.
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
 <tag/Declaration/<tt/unsigned char tgi_getcolorcount (void);/
 <tag/Description/TGI platforms use indexed color palettes. This function
@@ -287,8 +290,6 @@ if (num_colors == 0) {
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
 <tag/Declaration/<tt/const unsigned char* tgi_getdefpalette (void);/
 <tag/Description/The tgi driver has a default palette that is active at startup.
-The named colors TGI_COLOR_BLACK, TGI_COLOR_WHITE, TGI_COLOR_RED... need this
-palette to work correctly.
 <tag/Availability/cc65
 <tag/See also/Other tgi functions
 <tag/Example/None.
@@ -418,10 +419,10 @@ be used in presence of a prototype.
 
 <quote>
 <descrip>
-<tag/Function/Get the color of a pixel from the viewpage.
+<tag/Function/Get the color (palette index) of a pixel from the viewpage.
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
 <tag/Declaration/<tt/unsigned char __fastcall__ tgi_getpixel (int x, int y);/
-<tag/Description/Get the color of a pixel from the viewpage.
+<tag/Description/Get the color (palette index) of a pixel from the viewpage.
 <tag/Notes/<itemize>
 <item>The function is only available as fastcall function, so it may only
 be used in presence of a prototype.
@@ -477,10 +478,10 @@ be used in presence of a prototype.
 
 <quote>
 <descrip>
-<tag/Function/Get number of horisontal pixels on the screen.
+<tag/Function/Get number of horizontal pixels on the screen.
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
 <tag/Declaration/<tt/unsigned tgi_getxres (void);/
-<tag/Description/Get number of horisontal pixels on the screen.
+<tag/Description/Get number of horizontal pixels on the screen.
 This is same as tgi_maxx()+1.
 <tag/Availability/cc65
 <tag/See also/Other tgi functions.
@@ -626,7 +627,7 @@ be used in presence of a prototype.
 #define tgi_updatedisplay() tgi_ioctl(4, (void*)1)
 if (!tgi_busy()) {
   tgi_sprite(&amp;background);
-  tgi_setcolor(TGI_COLOR_BLUE);
+  tgi_setcolor(1);
   tgi_outttextxy(20,40,"Hello World");
   tgi_updatedisplay();
 }
@@ -791,7 +792,7 @@ of range.
 <ref id="tgi_setcolor" name="tgi_setcolor">
 <tag/Example/<tscreen><verb>
 /* Draw the closed upper half of an ellipse */
-tgi_setcolor(TGI_COLOR_BLUE);
+tgi_setcolor(1);
 tgi_pieslice (50, 50, 40, 20, 0, 180);
 </verb></tscreen>
 </descrip>
@@ -834,20 +835,21 @@ only in the presence of a prototype.
 
 <quote>
 <descrip>
-<tag/Function/Set color to be used in future draw operations.
+<tag/Function/Set color (palette index) to be used in future draw operations.
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
-<tag/Declaration/<tt/void __fastcall__ tgi_setcolor (unsigned char color);/
-<tag/Description/Set color to be used in future draw operations.
+<tag/Declaration/<tt/void __fastcall__ tgi_setcolor (unsigned char color_index);/
+<tag/Description/Set color (palette index) to be used in future draw operations.
 <tag/Notes/<itemize>
 <item>The function is only available as fastcall function, so it may only
 be used in presence of a prototype.
 </itemize>
 <tag/Availability/cc65
-<tag/See also/Other tgi functions.
+<tag/See also/<ref id="tgi_getcolor" name="tgi_getcolor">,
+<ref id="tgi_setpalette" name="tgi_setpalette">
 <tag/Example/<tscreen><verb>
-tgi_setcolor(TGI_COLOR_BLACK);
+tgi_setcolor(1);
 tgi_bar(0,0,30,30);
-tgi_setcolor(TGI_COLOR_WHITE);
+tgi_setcolor(2);
 tgi_bar(10,10,20,20);
 </verb></tscreen>
 </descrip>
@@ -893,13 +895,21 @@ Palette is a pointer to as many entries as there are colors.
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
 <tag/Declaration/<tt/void __fastcall__ tgi_setpalette (const unsigned char* palette);/
 <tag/Description/Set the palette (not available with all drivers/hardware).
-Palette is a pointer to as many entries as there are colors.
+Palette is a pointer to as many entries as there are colors. The values in the
+palette are target specific, some (hopefully, more or less) portable values are
+defined in the TGI_COLOR_XY defines. Note that different platforms provide
+different colors, only TGI_COLOR_BLACK and TGI_COLOR_WHITE are guaranteed to
+exist (needed for the default palette).
 <tag/Notes/<itemize>
 <item>The function is only available as fastcall function, so it may only
 be used in presence of a prototype.
+<item>The palette is the (only) place where to use the TGI_COLOR_XY values. This
+has been an ongoing and reoccurring misunderstanding in the past: At every other
+place, the "color" values are indices into the current palette.
 </itemize>
 <tag/Availability/cc65
-<tag/See also/Other tgi functions.
+<tag/See also/<ref id="tgi_setcolor" name="tgi_setcolor">,
+<ref id="tgi_getpalette" name="tgi_getpalette">
 <tag/Example/None.
 </descrip>
 </quote>
diff --git a/include/_mikey.h b/include/_mikey.h
index b9b7f6906..6e16e98ca 100644
--- a/include/_mikey.h
+++ b/include/_mikey.h
@@ -27,7 +27,7 @@
 #ifndef __MIKEY_H
 #define __MIKEY_H
 
-/* timer structure */
+/* Timer structure */
 typedef struct _mikey_timer {
   unsigned char reload;
   unsigned char control;
@@ -39,7 +39,7 @@ typedef struct _mikey_all_timers {
   struct _mikey_timer timer[8];
 } _mikey_all_timers;
 
-/* audio channel structure */
+/* Audio channel structure */
 typedef struct _mikey_audio {
   unsigned char volume;
   unsigned char feedback;
@@ -53,54 +53,212 @@ typedef struct _mikey_audio {
 
 /* Define a structure with the mikey register offsets */
 struct __mikey {
-  struct _mikey_timer timer0;       // 0xFD00
-  struct _mikey_timer timer1;       // 0xFD04
-  struct _mikey_timer timer2;       // 0xFD08
-  struct _mikey_timer timer3;       // 0xFD0C
-  struct _mikey_timer timer4;       // 0xFD10
-  struct _mikey_timer timer5;       // 0xFD14
-  struct _mikey_timer timer6;       // 0xFD18
-  struct _mikey_timer timer7;       // 0xFD1C
-  struct _mikey_audio channel_a;    // 0xFD20
-  struct _mikey_audio channel_b;    // 0xFD28
-  struct _mikey_audio channel_c;    // 0xFD30
-  struct _mikey_audio channel_d;    // 0xFD38
-  unsigned char     attena;         // 0xFD40  ?? not yet allocated?
-  unsigned char     attenb;         // 0xFD41      |
-  unsigned char     attenc;         // 0xFD42      |
-  unsigned char     attend;         // 0xFD43      |
-  unsigned char     panning;        // 0xFD44      |
-  unsigned char     unused0[11];    // 0xFD45 - 0xFD4F  not used
-  unsigned char     mstereo;        // 0xFD50  stereo control bits
-  unsigned char     unused1[47];    // 0xFD51 - 0xFD7F  not used
-  unsigned char     intrst;         // 0xFD80  interrupt poll 0
-  unsigned char     intset;         // 0xFD81  interrupt poll 1
-  unsigned char     unused2[2];     // 0xFD82 - 0xFD83  not used
-  unsigned char     magrdy0;        // 0xFD84  mag tape channel0 ready bit
-  unsigned char     magrdy1;        // 0xFD85  mag tape channel1 ready bit
-  unsigned char     audin;          // 0xFD86  audio in
-  unsigned char     sysctl1;        // 0xFD87  control bits
-  unsigned char     mikeyrev;       // 0xFD88  mikey hardware rev
-  unsigned char     mikeysrev;      // 0xFD89  mikey software rev
-  unsigned char     iodir;          // 0xFD8A  parallel i/o data dir
-  unsigned char     iodat;          // 0xFD8B  parallel data
-  unsigned char     serctl;         // 0xFD8C  serial control register
-  unsigned char     serdat;         // 0xFD8D  serial data
-  unsigned char     unused3[2];     // 0xFD8E - 0xFD8F  not used
-  unsigned char     sdoneack;       // 0xFD90  suzy done acknowledge
-  unsigned char     cpusleep;       // 0xFD91  cpu bus request disable
-  unsigned char     dispctl;        // 0xFD92  video bus request enable, viddma
-  unsigned char     pkbkup;         // 0xFD93  magic 'P' count
-  unsigned char     *scrbase;       // 0xFD94  start address of video display
-  unsigned char     unused4[6];     // 0xFD96 - 0xFD9B  not used
-  unsigned char     mtest0;         // 0xFD9C
-  unsigned char     mtest1;         // 0xFD9D
-  unsigned char     mtest2;         // 0xFD9E
-  unsigned char     unused5;        // 0xFD9F  not used
-  unsigned char     palette[32];    // 0xFDA0 - 0xFDBF  palette 32 bytes
-                                    // 0xFDC0 - 0xFDFF  not used
+  struct _mikey_timer timer0;    /* 0xFD00 */
+  struct _mikey_timer timer1;    /* 0xFD04 */
+  struct _mikey_timer timer2;    /* 0xFD08 */
+  struct _mikey_timer timer3;    /* 0xFD0C */
+  struct _mikey_timer timer4;    /* 0xFD10 */
+  struct _mikey_timer timer5;    /* 0xFD14 */
+  struct _mikey_timer timer6;    /* 0xFD18 */
+  struct _mikey_timer timer7;    /* 0xFD1C */
+  struct _mikey_audio channel_a; /* 0xFD20 */
+  struct _mikey_audio channel_b; /* 0xFD28 */
+  struct _mikey_audio channel_c; /* 0xFD30 */
+  struct _mikey_audio channel_d; /* 0xFD38 */
+  unsigned char attena;          /* 0xFD40  ?? not yet allocated? */
+  unsigned char attenb;          /* 0xFD41      | */
+  unsigned char attenc;          /* 0xFD42      | */
+  unsigned char attend;          /* 0xFD43      | */
+  unsigned char panning;         /* 0xFD44      | */
+  unsigned char unused0[11];     /* 0xFD45 - 0xFD4F  not used */
+  unsigned char mstereo;         /* 0xFD50  stereo control bits */
+  unsigned char unused1[47];     /* 0xFD51 - 0xFD7F  not used */
+  unsigned char intrst;          /* 0xFD80  interrupt poll 0 */
+  unsigned char intset;          /* 0xFD81  interrupt poll 1 */
+  unsigned char unused2[2];      /* 0xFD82 - 0xFD83  not used */
+  unsigned char magrdy0;         /* 0xFD84  mag tape channel0 ready bit */
+  unsigned char magrdy1;         /* 0xFD85  mag tape channel1 ready bit */
+  unsigned char audin;           /* 0xFD86  audio in */
+  unsigned char sysctl1;         /* 0xFD87  control bits */
+  unsigned char mikeyrev;        /* 0xFD88  mikey hardware rev */
+  unsigned char mikeysrev;       /* 0xFD89  mikey software rev */
+  unsigned char iodir;           /* 0xFD8A  parallel i/o data dir */
+  unsigned char iodat;           /* 0xFD8B  parallel data */
+  unsigned char serctl;          /* 0xFD8C  serial control register */
+  unsigned char serdat;          /* 0xFD8D  serial data */
+  unsigned char unused3[2];      /* 0xFD8E - 0xFD8F  not used */
+  unsigned char sdoneack;        /* 0xFD90  suzy done acknowledge */
+  unsigned char cpusleep;        /* 0xFD91  cpu bus request disable */
+  unsigned char dispctl;         /* 0xFD92  video bus request enable, viddma */
+  unsigned char pkbkup;          /* 0xFD93  magic 'P' count */
+  unsigned char *scrbase;        /* 0xFD94  start address of video display */
+  unsigned char unused4[6];      /* 0xFD96 - 0xFD9B  not used */
+  unsigned char mtest0;          /* 0xFD9C */
+  unsigned char mtest1;          /* 0xFD9D */
+  unsigned char mtest2;          /* 0xFD9E */
+  unsigned char unused5;         /* 0xFD9F  not used */
+  unsigned char palette[32];     /* 0xFDA0 - 0xFDBF  palette 32 bytes */
+  unsigned char unused6[64];     /* 0xFDC0 - 0xFDFF  not used */
+  unsigned char bootrom[504];    /* 0xFE00 - 0xFFD8  boot rom */
+  unsigned char reserved;        /* 0xFFD8  reserved for future hardware */
+  unsigned char mapctl;          /* 0xFFF9  map control register */
+  struct {
+    unsigned char *nmi;          /* 0xFFFA  NMI vector */
+    unsigned char *reset;        /* 0xFFFB  reset vector */
+    unsigned char *irq;          /* 0xFFFC  IRQ vector */
+  } vectors;
 };
 
+/* TIM_CONTROLA control bit definitions */
+enum {
+    ENABLE_INT       = 0x80,
+    RESET_DONE       = 0x40,
+    ENABLE_RELOAD    = 0x10,
+    ENABLE_COUNT     = 0x08
+};
+
+/* AUD_CONTROL control bit definitions */
+enum {
+    FEEDBACK_7       = 0x80,
+    ENABLE_INTEGRATE = 0x20
+};
+
+/* Audio and timer clock settings for source period */
+enum {
+    AUD_LINKING      = 0x07,
+    AUD_64           = 0x06,
+    AUD_32           = 0x05,
+    AUD_16           = 0x04,
+    AUD_8            = 0x03,
+    AUD_4            = 0x02,
+    AUD_2            = 0x01,
+    AUD_1            = 0x00
+};
+
+/* TIM_CONTROLB control bit definitions */
+enum {
+    TIMER_DONE       = 0x08,
+    LAST_CLOCK       = 0x04,
+    BORROW_IN        = 0x02,
+    BORROW_OUT       = 0x01
+};
+
+/* MPAN and MSTEREO registers bit definitions */
+enum {
+    LEFT3_SELECT     = 0x80,
+    LEFT2_SELECT     = 0x40,
+    LEFT1_SELECT     = 0x20,
+    LEFT0_SELECT     = 0x10,
+    RIGHT3_SELECT    = 0x08,
+    RIGHT2_SELECT    = 0x04,
+    RIGHT1_SELECT    = 0x02,
+    RIGHT0_SELECT    = 0x01,
+    LEFT_ATTENMASK   = 0xF0,
+    RIGHT_ATTENMASK  = 0x0F
+};
+
+/* Interrupt Reset and Set bit definitions */
+enum {
+    TIMER7_INT       = 0x80,
+    TIMER6_INT       = 0x40,
+    TIMER5_INT       = 0x20,
+    TIMER4_INT       = 0x10,
+    TIMER3_INT       = 0x08,
+    TIMER2_INT       = 0x04,
+    TIMER1_INT       = 0x02,
+    TIMER0_INT       = 0x01,
+    SERIAL_INT       = TIMER4_INT,
+    VERTICAL_INT     = TIMER2_INT,
+    HORIZONTAL_INT   = TIMER0_INT
+};
+
+/* SYSCTL1 bit definitions */
+enum {
+    POWERON          = 0x02,
+    CART_ADDR_STROBE = 0x01
+};
+
+/* IODIR and IODAT bit definitions */
+enum {
+    AUDIN_BIT        = 0x10, /* different from AUDIN address */
+    READ_ENABLE      = 0x10, /* same bit for AUDIN_BIT */
+    RESTLESS         = 0x08,
+    NOEXP            = 0x04, /* if set, redeye is not connected */
+    CART_ADDR_DATA   = 0x02,
+    CART_POWER_OFF   = 0x02, /* same bit for CART_ADDR_DATA */
+    EXTERNAL_POWER   = 0x01
+};
+
+/* SERCTL bit definitions for write operations */
+enum {
+    TXINTEN          = 0x80,
+    RXINTEN          = 0x40,
+    PAREN            = 0x10,
+    RESETERR         = 0x08,
+    TXOPEN           = 0x04,
+    TXBRK            = 0x02,
+    PAREVEN          = 0x01
+};
+
+/* SERCTL bit definitions for read operations */
+enum {
+    TXRDY            = 0x80,
+    RXRDY            = 0x40,
+    TXEMPTY          = 0x20,
+    PARERR           = 0x10,
+    OVERRUN          = 0x08,
+    FRAMERR          = 0x04,
+    RXBRK            = 0x02,
+    PARBIT           = 0x01
+};
+
+/* DISPCTL bit definitions */
+enum {
+    DISP_COLOR       = 0x08, /* must be set to 1 */
+    DISP_FOURBIT     = 0x04, /* must be set to 1 */
+    DISP_FLIP        = 0x02,
+    DMA_ENABLE       = 0x01  /* must be set to 1 */
+};
+
+/* MTEST0 bit definitions */
+enum {
+    AT_CNT16         = 0x80,
+    AT_TEST          = 0x40,
+    XCLKEN           = 0x20,
+    UART_TURBO       = 0x10,
+    ROM_SEL          = 0x08,
+    ROM_TEST         = 0x04,
+    M_TEST           = 0x02,
+    CPU_TEST         = 0x01
+};
+
+/* MTEST1 bit definitions */
+enum {
+    P_CNT16          = 0x40,
+    REF_CNT16        = 0x20,
+    VID_TRIG         = 0x10,
+    REF_TRIG         = 0x08,
+    VID_DMA_DIS      = 0x04,
+    REF_FAST         = 0x02,
+    REF_DIS          = 0x01
+};
+
+/* MTEST2 bit definitions */
+enum {
+    V_STROBE         = 0x10,
+    V_ZERO           = 0x08,
+    H_120            = 0x04,
+    H_ZERO           = 0x02,
+    V_BLANKEF        = 0x01
+};
+
+/* MAPCTL bit definitions */
+enum {
+    TURBO_DISABLE    = 0x80,
+    VECTOR_SPACE     = 0x08,
+    ROM_SPACE        = 0x04,
+    MIKEY_SPACE      = 0x02,
+    SUZY_SPACE       = 0x01
+};
 
 #endif
-
diff --git a/include/_suzy.h b/include/_suzy.h
index 8ab7f68dd..50845c958 100644
--- a/include/_suzy.h
+++ b/include/_suzy.h
@@ -24,75 +24,65 @@
 /*                                                                           */
 /*****************************************************************************/
 
-
 #ifndef __SUZY_H
 #define __SUZY_H
 
-/* Joypad $FCB0 */
-#define JOYPAD_RIGHT    0x10
-#define JOYPAD_LEFT     0x20
-#define JOYPAD_DOWN     0x40
-#define JOYPAD_UP       0x80
-#define BUTTON_OPTION1  0x08
-#define BUTTON_OPTION2  0x04
-#define BUTTON_INNER    0x02
-#define BUTTON_OUTER    0x01
+/* JOYSTICK bit definitions */
+enum {
+  JOYPAD_RIGHT   = 0x10,
+  JOYPAD_LEFT    = 0x20,
+  JOYPAD_DOWN    = 0x40,
+  JOYPAD_UP      = 0x80,
+  BUTTON_OPTION1 = 0x08,
+  BUTTON_OPTION2 = 0x04,
+  BUTTON_INNER   = 0x02,
+  BUTTON_OUTER   = 0x01
+};
 
-/* Switches $FCB1 */
-#define BUTTON_PAUSE    0x01
+/* SWITCHES bit definitions */
+enum {
+    CART1_IO_INACTIVE = 0x04,
+    CART0_IO_INACTIVE = 0x02,
+    BUTTON_PAUSE      = 0x01
+};
 
+/* SPRCTL0 bit definitions */
+enum {
+  BPP_4            = 0xC0,
+  BPP_3            = 0x80,
+  BPP_2            = 0x40,
+  BPP_1            = 0x00,
+  HFLIP            = 0x20,
+  VFLIP            = 0x10,
+  TYPE_SHADOW      = 0x07,
+  TYPE_XOR         = 0x06,
+  TYPE_NONCOLL     = 0x05,
+  TYPE_NORMAL      = 0x04,
+  TYPE_BOUNDARY    = 0x03,
+  TYPE_BSHADOW     = 0x02,
+  TYPE_BACKNONCOLL = 0x01,
+  TYPE_BACKGROUND  = 0x00
+};
 
-/* Hardware Math */
-#define FACTOR_A *(unsigned int *) 0xFC54
-#define FACTOR_B *(unsigned int *) 0xFC52
-#define PRODUCT0 *(unsigned int *) 0xFC60
-#define PRODUCT1 *(unsigned int *) 0xFC62
-#define PRODUCT *(long *) 0xFC60
+/* SPRCTL1 bit definitions */
+enum {
+  LITERAL  = 0x80,
+  PACKED   = 0x00,
+  ALGO3    = 0x40,
+  RENONE   = 0x00,
+  REHV     = 0x10,
+  REHVS    = 0x20,
+  REHVST   = 0x30,
+  REUSEPAL = 0x08,
+  SKIP     = 0x04,
+  DRAWUP   = 0x02,
+  DRAWLEFT = 0x01
+};
 
-#define DIVIDEND0 *(unsigned int *) 0xFC60
-#define DIVIDEND1 *(unsigned int *) 0xFC62
-#define DIVIDEND *(long *) 0xFC60
-#define DIVISOR *(unsigned int *) 0xFC56
-#define QUOTIENT0 *(unsigned int *) 0xFC52
-#define QUOTIENT1 *(unsigned int *) 0xFC54
-#define QUOTIENT *(long *) 0xFC52
-#define REMAINDER0 *(unsigned int *) 0xFC6C
-#define REMAINDER1 *(unsigned int *) 0xFC6E
-#define REMAINDER *(long *) 0xFC6C
+/* Sprite control block (SCB) definitions */
 
-
-/* Sprite control block (SCB) defines */
-
-/* SPRCTL0 $FC80 */
-#define BPP_4            0xC0
-#define BPP_3            0x80
-#define BPP_2            0x40
-#define BPP_1            0x00
-#define HFLIP            0x20
-#define VFLIP            0x10
-#define TYPE_SHADOW      0x07
-#define TYPE_XOR         0x06
-#define TYPE_NONCOLL     0x05
-#define TYPE_NORMAL      0x04
-#define TYPE_BOUNDARY    0x03
-#define TYPE_BSHADOW     0x02
-#define TYPE_BACKNONCOLL 0x01
-#define TYPE_BACKGROUND  0x00
-
-/* SPRCTL1 $FC81 */
-#define LITERAL          0x80
-#define PACKED           0x00
-#define ALGO3            0x40
-#define RENONE           0x00
-#define REHV             0x10
-#define REHVS            0x20
-#define REHVST           0x30
-#define REUSEPAL         0x08
-#define SKIP             0x04
-#define DRAWUP           0x02
-#define DRAWLEFT         0x01
-
-typedef struct SCB_REHVST_PAL {             // SCB with all attributes
+/* SCB with all attributes */
+typedef struct SCB_REHVST_PAL {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -107,7 +97,8 @@ typedef struct SCB_REHVST_PAL {             // SCB with all attributes
   unsigned char penpal[8];
 } SCB_REHVST_PAL;
 
-typedef struct SCB_REHVST {                  // SCB without pallette
+/* SCB without pallette */
+typedef struct SCB_REHVST {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -121,7 +112,8 @@ typedef struct SCB_REHVST {                  // SCB without pallette
   unsigned int tilt;
 } SCB_REHVST;
 
-typedef struct SCB_REHV {                 // SCB without stretch/tilt
+/* SCB without stretch/tilt */
+typedef struct SCB_REHV {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -133,7 +125,8 @@ typedef struct SCB_REHV {                 // SCB without stretch/tilt
   unsigned int vsize;
 } SCB_REHV;
 
-typedef struct SCB_REHV_PAL {             // SCB without str/tilt, w/ penpal
+/* SCB without stretch/tilt, with penpal */
+typedef struct SCB_REHV_PAL {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -146,7 +139,8 @@ typedef struct SCB_REHV_PAL {             // SCB without str/tilt, w/ penpal
   unsigned char penpal[8];
 } SCB_REHV_PAL;
 
-typedef struct SCB_REHVS {                // SCB w/o tilt & penpal
+/* SCB without tilt/penpal */
+typedef struct SCB_REHVS {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -159,7 +153,8 @@ typedef struct SCB_REHVS {                // SCB w/o tilt & penpal
   unsigned int stretch;
 } SCB_REHVS;
 
-typedef struct SCB_REHVS_PAL {            // SCB w/o tilt w/penpal
+/* SCB without tilt, with penpal */
+typedef struct SCB_REHVS_PAL {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -173,7 +168,8 @@ typedef struct SCB_REHVS_PAL {            // SCB w/o tilt w/penpal
   unsigned char penpal[8];
 } SCB_REHVS_PAL;
 
-typedef struct SCB_RENONE {                 // SCB w/o size/stretch/tilt/pal
+/* SCB without size/stretch/tilt/penpal */
+typedef struct SCB_RENONE {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -183,7 +179,8 @@ typedef struct SCB_RENONE {                 // SCB w/o size/stretch/tilt/pal
   signed int vpos;
 } SCB_RENONE;
 
-typedef struct SCB_RENONE_PAL {             // SCB w/o size/str/tilt w/penpal
+/* SCB without size/str/tilt, with penpal */
+typedef struct SCB_RENONE_PAL {
   unsigned char sprctl0;
   unsigned char sprctl1;
   unsigned char sprcoll;
@@ -210,30 +207,124 @@ typedef struct PENPAL_1 {
   unsigned char penpal[1];
 } PENPAL_1;
 
-/* Misc system defines */
+/* SPRGO bit definitions */
+enum {
+    SPRITE_GO = 0x01,  /* sprite process start bit */
+    EVER_ON   = 0x04   /* everon detector enable */
+};
 
-/* SPRGO $FC91 */
-#define EVER_ON         0x04
-#define SPRITE_GO       0x01
+/* SPRSYS bit definitions for write operations */
+enum {
+    SIGNMATH   = 0x80,  /* signed math */
+    ACCUMULATE = 0x40,  /* accumulate multiplication results */
+    NO_COLLIDE = 0x20,  /* do not collide with any sprites (also SPRCOLL bit definition) */
+    VSTRETCH   = 0x10,  /* stretch v */
+    LEFTHAND   = 0x08,
+    CLR_UNSAFE = 0x04,  /* unsafe access reset */
+    SPRITESTOP = 0x02   /* request to stop sprite process */
+};
 
-/* SPRSYS (write) $FC92 */
-#define SIGNMATH        0x80
-#define ACCUMULATE      0x40
-#define NO_COLLIDE      0x20
-#define VSTRETCH        0x10
-#define LEFTHAND        0x08
-#define CLR_UNSAFE      0x04
-#define SPRITESTOP      0x02
+/* SPRSYS bit definitions for read operations */
+enum {
+    MATHWORKING   = 0x80,  /* math operation in progress */
+    MATHWARNING   = 0x40,  /* accumulator overflow on multiple or divide by zero */
+    MATHCARRY     = 0x20,  /* last carry bit */
+    VSTRETCHING   = 0x10,
+    LEFTHANDED    = 0x08,
+    UNSAFE_ACCESS = 0x04,  /* unsafe access performed */
+    SPRITETOSTOP  = 0x02,  /* requested to stop */
+    SPRITEWORKING = 0x01   /* sprite process is active */
+};
 
-/* SPRSYS (read) $FC92 */
-#define MATHWORKING     0x80
-#define MATHWARNING     0x40
-#define MATHCARRY       0x20
-#define VSTRETCHING     0x10
-#define LEFTHANDED      0x08
-#define UNSAFE_ACCESS   0x04
-#define SPRITETOSTOP    0x02
-#define SPRITEWORKING   0x01
+/* Suzy hardware registers */
+struct __suzy {
+  unsigned char *tmpadr;        /* 0xFC00  Temporary address */
+  unsigned int tiltacc;         /* 0xFC02  Tilt accumulator */
+  unsigned int hoff;            /* 0xFC04  Offset to H edge of screen */
+  unsigned int voff;            /* 0xFC06  Offset to V edge of screen */
+  unsigned char *sprbase;       /* 0xFC08  Base address of sprite */
+  unsigned char *colbase;       /* 0xFC0A  Base address of collision buffer */
+  unsigned char *vidadr;        /* 0xFC0C  Current vid buffer address */
+  unsigned char *coladr;        /* 0xFC0E  Current col buffer address */
+  unsigned char *scbnext;       /* 0xFC10  Address of next SCB */
+  unsigned char *sprdline;      /* 0xFC12  start of sprite data line address */
+  unsigned int hposstrt;        /* 0xFC14  start hpos */
+  unsigned int vposstrt;        /* 0xFC16  start vpos */
+  unsigned int sprhsize;        /* 0xFC18  sprite h size */
+  unsigned int sprvsize;        /* 0xFC1A  sprite v size */
+  unsigned int stretchl;        /* 0xFC1C  H size adder */
+  unsigned int tilt;            /* 0xFC1E  H pos adder */
+  unsigned int sprdoff;         /* 0xFC20  offset to next sprite data line */
+  unsigned int sprvpos;         /* 0xFC22  current vpos */
+  unsigned int colloff;         /* 0xFC24  offset to collision depository */
+  unsigned int vsizeacc;        /* 0xFC26  vertical size accumulator */
+  unsigned int hsizeoff;        /* 0xFC28  horizontal size offset */
+  unsigned int vsizeoff;        /* 0xFC2A  vertical size offset */
+  unsigned char *scbaddr;       /* 0xFC2C  address of current SCB */
+  unsigned char *procaddr;      /* 0xFC2E  address of current spr data proc */
+  unsigned char unused0[32];    /* 0xFC30 - 0xFC4F  reserved/unused */
+  unsigned char unused1[2];     /* 0xFC50 - 0xFC51  do not use */
+  unsigned char mathd;          /* 0xFC52 */
+  unsigned char mathc;          /* 0xFC53 */
+  unsigned char mathb;          /* 0xFC54 */
+  unsigned char matha;          /* 0xFC55  write starts a multiply operation */
+  unsigned char mathp;          /* 0xFC56 */
+  unsigned char mathn;          /* 0xFC57 */
+  unsigned char unused2[8];     /* 0xFC58 - 0xFC5F  do not use */
+  unsigned char mathh;          /* 0xFC60 */
+  unsigned char mathg;          /* 0xFC61 */
+  unsigned char mathf;          /* 0xFC62 */
+  unsigned char mathe;          /* 0xFC63  write starts a divide operation */
+  unsigned char unused3[8];     /* 0xFC64 - 0xFC6B  do not use */
+  unsigned char mathm;          /* 0xFC6C */
+  unsigned char mathl;          /* 0xFC6D */
+  unsigned char mathk;          /* 0xFC6E */
+  unsigned char mathj;          /* 0xFC6F */
+  unsigned char unused4[16];    /* 0xFC70 - 0xFC7F  do not use */
+  unsigned char sprctl0;        /* 0xFC80  sprite control bits 0 */
+  unsigned char sprctl1;        /* 0xFC81  sprite control bits 1 */
+  unsigned char sprcoll;        /* 0xFC82  sprite collision number */
+  unsigned char sprinit;        /* 0xFC83  sprite initialization bits */
+  unsigned char unused5[4];     /* 0xFC84 - 0xFC87  unused */
+  unsigned char suzyhrev;       /* 0xFC88  suzy hardware rev */
+  unsigned char suzysrev;       /* 0xFC89  suzy software rev */
+  unsigned char unused6[6];     /* 0xFC8A - 0xFC8F  unused */
+  unsigned char suzybusen;      /* 0xFC90  suzy bus enable */
+  unsigned char sprgo;          /* 0xFC91  sprite process start bit */
+  unsigned char sprsys;         /* 0xFC92  sprite system control bits */
+  unsigned char unused7[29];    /* 0xFC93 - 0xFCAF  unused */
+  unsigned char joystick;       /* 0xFCB0  joystick and buttons */
+  unsigned char switches;       /* 0xFCB1  other switches */
+  unsigned char cart0;          /* 0xFCB2  cart0 r/w */
+  unsigned char cart1;          /* 0xFCB3  cart1 r/w */
+  unsigned char unused8[8];     /* 0xFCB4 - 0xFCBF  unused */
+  unsigned char leds;           /* 0xFCC0  leds */
+  unsigned char unused9;        /* 0xFCC1  unused */
+  unsigned char parstat;        /* 0xFCC2  parallel port status */
+  unsigned char pardata;        /* 0xFCC3  parallel port data */
+  unsigned char howie;          /* 0xFCC4  howie (?) */
+                                /* 0xFCC5 - 0xFCFF  unused */
+};
+
+/* Hardware math registers */
+#define FACTOR_A *(unsigned int *) 0xFC54
+#define FACTOR_B *(unsigned int *) 0xFC52
+#define PRODUCT0 *(unsigned int *) 0xFC60
+#define PRODUCT1 *(unsigned int *) 0xFC62
+#define PRODUCT *(long *) 0xFC60
+
+#define DIVIDEND0 *(unsigned int *) 0xFC60
+#define DIVIDEND1 *(unsigned int *) 0xFC62
+#define DIVIDEND *(long *) 0xFC60
+#define DIVISOR *(unsigned int *) 0xFC56
+#define QUOTIENT0 *(unsigned int *) 0xFC52
+#define QUOTIENT1 *(unsigned int *) 0xFC54
+#define QUOTIENT *(long *) 0xFC52
+#define REMAINDER0 *(unsigned int *) 0xFC6C
+#define REMAINDER1 *(unsigned int *) 0xFC6E
+#define REMAINDER *(long *) 0xFC6C
+
+/* Deprecated definitions */
 
 /* MAPCTL $FFF9 */
 #define HIGHSPEED       0x80
@@ -242,77 +333,4 @@ typedef struct PENPAL_1 {
 #define MIKEYSPACE      0x02
 #define SUZYSPACE       0x01
 
-
-/* Suzy Hardware Registers */
-struct __suzy {
-  unsigned int  tmpadr;         // 0xFC00  Temporary address
-  unsigned int  tiltacc;        // 0xFC02  Tilt accumulator
-  unsigned int  hoff;           // 0xFC04  Offset to H edge of screen
-  unsigned int  voff;           // 0xFC06  Offset to V edge of screen
-  unsigned char *sprbase;       // 0xFC08  Base address of sprite
-  unsigned char *colbase;       // 0xFC0A  Base address of collision buffer
-  unsigned char *vidadr;        // 0xFC0C  Current vid buffer address
-  unsigned char *coladr;        // 0xFC0E  Current col buffer address
-  unsigned char *scbnext;       // 0xFC10  Address of next SCB
-  unsigned char *sprdline;      // 0xFC12  start of sprite data line address
-  unsigned char *hposstrt;      // 0xFC14  start hpos
-  unsigned char *vposstrt;      // 0xFC16  start vpos
-  unsigned char *sprhsize;      // 0xFC18  sprite h size
-  unsigned char *sprvsize;      // 0xFC1A  sprite v size
-  unsigned int  stretchl;       // 0xFC1C  H size adder
-  unsigned int  tilt;           // 0xFC1E  H pos adder
-  unsigned int  sprdoff;        // 0xFC20  offset to next sprite data line
-  unsigned int  sprvpos;        // 0xFC22  current vpos
-  unsigned int  colloff;        // 0xFC24  offset to collision depository
-  unsigned int  vsizeacc;       // 0xFC26  vertical size accumulator
-  unsigned int  hsizeoff;       // 0xFC28  horizontal size offset
-  unsigned int  vsizeoff;       // 0xFC2A  vertical size offset
-  unsigned char *scbaddr;       // 0xFC2C  address of current SCB
-  unsigned char *procaddr;      // 0xFC2E  address of current spr data proc
-  unsigned char unused0[32];    // 0xFC30 - 0xFC4F  reserved/unused
-  unsigned char unused1[2];     // 0xFC50 - 0xFC51  do not use
-  unsigned char mathd;          // 0xFC52
-  unsigned char mathc;          // 0xFC53
-  unsigned char mathb;          // 0xFC54
-  unsigned char matha;          // 0xFC55
-  unsigned char mathp;          // 0xFC56
-  unsigned char mathn;          // 0xFC57
-  unsigned char unused2[8];     // 0xFC58 - 0xFC5F  do not use
-  unsigned char mathh;          // 0xFC60
-  unsigned char mathg;          // 0xFC61
-  unsigned char mathf;          // 0xFC62
-  unsigned char mathe;          // 0xFC63
-  unsigned char unused3[8];     // 0xFC64 - 0xFC6B  do not use
-  unsigned char mathm;          // 0xFC6C
-  unsigned char mathl;          // 0xFC6D
-  unsigned char mathk;          // 0xFC6E
-  unsigned char mathj;          // 0xFC6F
-  unsigned char unused4[16];    // 0xFC70 - 0xFC7F  do not use
-  unsigned char sprctl0;        // 0xFC80  sprite control bits 0
-  unsigned char sprctl1;        // 0xFC81  sprite control bits 1
-  unsigned char sprcoll;        // 0xFC82  sprite collision number
-  unsigned char sprinit;        // 0xFC83  sprite initialization bits
-  unsigned char unused5[4];     // 0xFC84 - 0xFC87  unused
-  unsigned char suzyhrev;       // 0xFC88  suzy hardware rev
-  unsigned char suzysrev;       // 0xFC89  suzy software rev
-  unsigned char unused6[6];     // 0xFC8A - 0xFC8F  unused
-  unsigned char suzybusen;      // 0xFC90  suzy bus enable
-  unsigned char sprgo;          // 0xFC91  sprite process start bit
-  unsigned char sprsys;         // 0xFC92  sprite system control bits
-  unsigned char unused7[29];    // 0xFC93 - 0xFCAF  unused
-  unsigned char joystick;       // 0xFCB0  joystick and buttons
-  unsigned char switches;       // 0xFCB1  other switches
-  unsigned char cart0;          // 0xFCB2  cart0 r/w
-  unsigned char cart1;          // 0xFCB3  cart1 r/w
-  unsigned char unused8[8];     // 0xFCB4 - 0xFCBF  unused
-  unsigned char leds;           // 0xFCC0  leds
-  unsigned char unused9;        // 0xFCC1  unused
-  unsigned char parstat;        // 0xFCC2  parallel port status
-  unsigned char pardata;        // 0xFCC3  parallel port data
-  unsigned char howie;          // 0xFCC4  howie (?)
-                                // 0xFCC5 - 0xFCFF  unused
-};
-
-
 #endif
-
diff --git a/include/_vic3.h b/include/_vic3.h
new file mode 100644
index 000000000..820591656
--- /dev/null
+++ b/include/_vic3.h
@@ -0,0 +1,188 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                  _vic3.h                                  */
+/*                                                                           */
+/*                Internal include file, do not use directly                 */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 1998-2012, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef __VIC3_H
+#define __VIC3_H
+
+/* FIXME: only VIC2 registers right now */
+
+/* Define a structure with the vic register offsets. In cc65 mode, there
+** are aliases for the field accessible as arrays.
+*/
+#if __CC65_STD__ == __CC65_STD_CC65__
+struct __vic3 {
+    union {
+        struct {
+            unsigned char   spr0_x;         /* Sprite 0, X coordinate */
+            unsigned char   spr0_y;         /* Sprite 0, Y coordinate */
+            unsigned char   spr1_x;         /* Sprite 1, X coordinate */
+            unsigned char   spr1_y;         /* Sprite 1, Y coordinate */
+            unsigned char   spr2_x;         /* Sprite 2, X coordinate */
+            unsigned char   spr2_y;         /* Sprite 2, Y coordinate */
+            unsigned char   spr3_x;         /* Sprite 3, X coordinate */
+            unsigned char   spr3_y;         /* Sprite 3, Y coordinate */
+            unsigned char   spr4_x;         /* Sprite 4, X coordinate */
+            unsigned char   spr4_y;         /* Sprite 4, Y coordinate */
+            unsigned char   spr5_x;         /* Sprite 5, X coordinate */
+            unsigned char   spr5_y;         /* Sprite 5, Y coordinate */
+            unsigned char   spr6_x;         /* Sprite 6, X coordinate */
+            unsigned char   spr6_y;         /* Sprite 6, Y coordinate */
+            unsigned char   spr7_x;         /* Sprite 7, X coordinate */
+            unsigned char   spr7_y;         /* Sprite 7, Y coordinate */
+        };
+        struct {
+            unsigned char   x;              /* X coordinate */
+            unsigned char   y;              /* Y coordinate */
+        } spr_pos[8];
+    };
+    unsigned char           spr_hi_x;       /* High bits of X coordinate */
+    unsigned char           ctrl1;          /* Control register 1 */
+    unsigned char           rasterline;     /* Current raster line */
+    union {
+        struct {
+            unsigned char   strobe_x;       /* Light pen, X position */
+            unsigned char   strobe_y;       /* Light pen, Y position */
+        };
+        struct {
+            unsigned char   x;              /* Light pen, X position */
+            unsigned char   y;              /* Light pen, Y position */
+        } strobe;
+    };
+    unsigned char           spr_ena;        /* Enable sprites */
+    unsigned char           ctrl2;          /* Control register 2 */
+    unsigned char           spr_exp_y;      /* Expand sprites in Y dir */
+    unsigned char           addr;           /* Address of chargen and video ram */
+    unsigned char           irr;            /* Interrupt request register */
+    unsigned char           imr;            /* Interrupt mask register */
+    unsigned char           spr_bg_prio;    /* Priority to background */
+    unsigned char           spr_mcolor;     /* Sprite multicolor bits */
+    unsigned char           spr_exp_x;      /* Expand sprites in X dir */
+    unsigned char           spr_coll;       /* Sprite/sprite collision reg */
+    unsigned char           spr_bg_coll;    /* Sprite/background collision reg */
+    unsigned char           bordercolor;    /* Border color */
+    union {
+        struct {
+            unsigned char   bgcolor0;       /* Background color 0 */
+            unsigned char   bgcolor1;       /* Background color 1 */
+            unsigned char   bgcolor2;       /* Background color 2 */
+            unsigned char   bgcolor3;       /* Background color 3 */
+        };
+        unsigned char       bgcolor[4];     /* Background colors */
+    };
+    union {
+        struct {
+            unsigned char   spr_mcolor0;    /* Color 0 for multicolor sprites */
+            unsigned char   spr_mcolor1;    /* Color 1 for multicolor sprites */
+        };
+        /* spr_color is already used ... */
+        unsigned char       spr_mcolors[2]; /* Color for multicolor sprites */
+    };
+    union {
+        struct {
+            unsigned char   spr0_color;     /* Color sprite 0 */
+            unsigned char   spr1_color;     /* Color sprite 1 */
+            unsigned char   spr2_color;     /* Color sprite 2 */
+            unsigned char   spr3_color;     /* Color sprite 3 */
+            unsigned char   spr4_color;     /* Color sprite 4 */
+            unsigned char   spr5_color;     /* Color sprite 5 */
+            unsigned char   spr6_color;     /* Color sprite 6 */
+            unsigned char   spr7_color;     /* Color sprite 7 */
+        };
+        unsigned char       spr_color[8];   /* Colors for the sprites */
+    };
+
+    /* The following ones are only valid in the C128: */
+    unsigned char           x_kbd;          /* Additional keyboard lines */
+    unsigned char           clock;          /* Clock switch bit */
+};
+#else
+struct __vic3 {
+    unsigned char           spr0_x;         /* Sprite 0, X coordinate */
+    unsigned char           spr0_y;         /* Sprite 0, Y coordinate */
+    unsigned char           spr1_x;         /* Sprite 1, X coordinate */
+    unsigned char           spr1_y;         /* Sprite 1, Y coordinate */
+    unsigned char           spr2_x;         /* Sprite 2, X coordinate */
+    unsigned char           spr2_y;         /* Sprite 2, Y coordinate */
+    unsigned char           spr3_x;         /* Sprite 3, X coordinate */
+    unsigned char           spr3_y;         /* Sprite 3, Y coordinate */
+    unsigned char           spr4_x;         /* Sprite 4, X coordinate */
+    unsigned char           spr4_y;         /* Sprite 4, Y coordinate */
+    unsigned char           spr5_x;         /* Sprite 5, X coordinate */
+    unsigned char           spr5_y;         /* Sprite 5, Y coordinate */
+    unsigned char           spr6_x;         /* Sprite 6, X coordinate */
+    unsigned char           spr6_y;         /* Sprite 6, Y coordinate */
+    unsigned char           spr7_x;         /* Sprite 7, X coordinate */
+    unsigned char           spr7_y;         /* Sprite 7, Y coordinate */
+    unsigned char           spr_hi_x;       /* High bits of X coordinate */
+    unsigned char           ctrl1;          /* Control register 1 */
+    unsigned char           rasterline;     /* Current raster line */
+    unsigned char           strobe_x;       /* Light pen, X position */
+    unsigned char           strobe_y;       /* Light pen, Y position */
+    unsigned char           spr_ena;        /* Enable sprites */
+    unsigned char           ctrl2;          /* Control register 2 */
+    unsigned char           spr_exp_y;      /* Expand sprites in Y dir */
+    unsigned char           addr;           /* Address of chargen and video ram */
+    unsigned char           irr;            /* Interrupt request register */
+    unsigned char           imr;            /* Interrupt mask register */
+    unsigned char           spr_bg_prio;    /* Priority to background */
+    unsigned char           spr_mcolor;     /* Sprite multicolor bits */
+    unsigned char           spr_exp_x;      /* Expand sprites in X dir */
+    unsigned char           spr_coll;       /* Sprite/sprite collision reg */
+    unsigned char           spr_bg_coll;    /* Sprite/background collision reg */
+    unsigned char           bordercolor;    /* Border color */
+    unsigned char           bgcolor0;       /* Background color 0 */
+    unsigned char           bgcolor1;       /* Background color 1 */
+    unsigned char           bgcolor2;       /* Background color 2 */
+    unsigned char           bgcolor3;       /* Background color 3 */
+    unsigned char           spr_mcolor0;    /* Color 0 for multicolor sprites */
+    unsigned char           spr_mcolor1;    /* Color 1 for multicolor sprites */
+    unsigned char           spr0_color;     /* Color sprite 0 */
+    unsigned char           spr1_color;     /* Color sprite 1 */
+    unsigned char           spr2_color;     /* Color sprite 2 */
+    unsigned char           spr3_color;     /* Color sprite 3 */
+    unsigned char           spr4_color;     /* Color sprite 4 */
+    unsigned char           spr5_color;     /* Color sprite 5 */
+    unsigned char           spr6_color;     /* Color sprite 6 */
+    unsigned char           spr7_color;     /* Color sprite 7 */
+};
+#endif
+
+
+
+/* End of _vic3.h */
+#endif
+
+
+
diff --git a/include/accelerator.h b/include/accelerator.h
index b5d8d0194..0137a7fed 100644
--- a/include/accelerator.h
+++ b/include/accelerator.h
@@ -304,6 +304,36 @@ unsigned char detect_turbomaster (void);
  * 0x01  : C64 Turbo Master cartridge present
  */
 
+unsigned char __fastcall__ set_iigs_speed (unsigned char speed);
+
+/* Set the speed of the Apple IIgs CPU.
+ *
+ * Possible values:
+ * SPEED_SLOW  : 1 Mhz mode
+ * SPEED_FAST  : Fast mode (2.8MHz or more, depending on the presence of
+ *               an accelerator)
+ *
+ * Any other value will be interpreted as SPEED_FAST.
+ */
+
+unsigned char get_iigs_speed (void);
+
+/* Get the speed of the Apple IIgs CPU.
+ *
+ * Possible return values:
+ * SPEED_SLOW  : 1 Mhz mode
+ * SPEED_FAST  : Fast mode (2.8MHz or more, depending on the presence of
+ *               an accelerator)
+ */
+
+unsigned char detect_iigs (void);
+
+/* Check whether we are running on an Apple IIgs.
+ *
+ * Possible return values:
+ * 0x00  : No
+ * 0x01  : Yes
+ */
+
 /* End of accelerator.h */
 #endif
-
diff --git a/include/agat.h b/include/agat.h
new file mode 100644
index 000000000..04ec16984
--- /dev/null
+++ b/include/agat.h
@@ -0,0 +1,76 @@
+#ifndef _AGAT_H
+#define _AGAT_H
+
+/* Check for errors */
+#if !defined(__AGAT__)
+#  error This module may only be used when compiling for the Agat!
+#endif
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* Color defines */
+#define COLOR_BLACK    0x00
+#define COLOR_RED      0x01
+#define COLOR_GREEN    0x02
+#define COLOR_YELLOW   0x03
+#define COLOR_BLUE     0x04
+#define COLOR_MAGENTA  0x05
+#define COLOR_CYAN     0x06
+#define COLOR_WHITE    0x07
+
+/* Characters codes */
+#define CH_CTRL_C      0x03
+#define CH_ENTER       0x0D
+#define CH_ESC         0x1B
+#define CH_CURS_LEFT   0x08
+#define CH_CURS_RIGHT  0x15
+#define CH_CURS_UP     0x19
+#define CH_CURS_DOWN   0x1A
+#define CH_ESC         0x1B
+#define CH_HLINE       0x1B
+#define CH_VLINE       0x5C
+#define CH_ULCORNER    0x10
+#define CH_URCORNER    0x12
+#define CH_LLCORNER    0x1D
+#define CH_LRCORNER    0x1F
+
+/* Masks for joy_read */
+#define JOY_UP_MASK    0x10
+#define JOY_DOWN_MASK  0x20
+#define JOY_LEFT_MASK  0x04
+#define JOY_RIGHT_MASK 0x08
+#define JOY_BTN_1_MASK 0x40
+#define JOY_BTN_2_MASK 0x80
+
+/* Return codes for get_ostype */
+#define AGAT_UNKNOWN   0x00
+#define AGAT_7         0x10  /* Agat 7 */
+#define AGAT_9         0x20  /* Agat 9 */
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+unsigned char get_ostype (void);
+/* Get the machine type. Returns one of the AGAT_xxx codes. */
+
+void rebootafterexit (void);
+/* Reboot machine after program termination has completed. */
+
+/* The following #defines will cause the matching functions calls in conio.h
+** to be overlaid by macros with the same names, saving the function call
+** overhead.
+*/
+#define _bgcolor(color)         COLOR_BLACK
+#define _bordercolor(color)     COLOR_BLACK
+
+/* End of agat.h */
+
+
+#endif
diff --git a/include/apple2.h b/include/apple2.h
index 8b9a3e0ea..82f8dd3e4 100644
--- a/include/apple2.h
+++ b/include/apple2.h
@@ -41,6 +41,7 @@
 #  error This module may only be used when compiling for the Apple ][!
 #endif
 
+#include <time.h>
 #include <apple2_filetype.h>
 
 
@@ -82,7 +83,77 @@
 #define CH_CURS_LEFT    0x08
 #define CH_CURS_RIGHT   0x15
 
-#if !defined(__APPLE2ENH__)
+/* These characters are not available on the ][+, but
+ * are on the //e. */
+#if defined(__APPLE2ENH__) || defined(APPLE2_INCLUDE_IIE_CHARS)
+#define CH_DEL          0x7F
+#define CH_CURS_UP      0x0B
+#define CH_CURS_DOWN    0x0A
+
+/* These are defined to be OpenApple + NumberKey */
+#define CH_F1   0xB1
+#define CH_F2   0xB2
+#define CH_F3   0xB3
+#define CH_F4   0xB4
+#define CH_F5   0xB5
+#define CH_F6   0xB6
+#define CH_F7   0xB7
+#define CH_F8   0xB8
+#define CH_F9   0xB9
+#define CH_F10  0xB0
+#endif
+
+#if defined(__APPLE2ENH__)
+
+/* MouseText-based functions for boxes and lines drawing */
+void mt_chline (unsigned char length);
+void mt_cvline (unsigned char length);
+void mt_chlinexy (unsigned char x, unsigned char y, unsigned char length);
+void mt_cvlinexy (unsigned char x, unsigned char y, unsigned char length);
+
+#define CH_HLINE        0x5F
+#define CH_VLINE        0xDF
+#define CH_ULCORNER     0x5F
+#define CH_URCORNER     0x20
+#define CH_LLCORNER     0xD4
+#define CH_LRCORNER     0xDF
+#define CH_TTEE         0x5F
+#define CH_BTEE         0xD4
+#define CH_LTEE         0xD4
+#define CH_RTEE         0xDF
+#define CH_CROSS        0xD4
+
+#define _chline(length)       mt_chline(length)
+#define _chlinexy(x,y,length) mt_chlinexy(x,y,length)
+#define _cvline(length)       mt_cvline(length)
+#define _cvlinexy(x,y,length) mt_cvlinexy(x,y,length)
+
+#else
+
+/* Functions that don't depend on MouseText to draw boxes and lines */
+void dyn_chline (unsigned char h, unsigned char length);
+void dyn_cvline (unsigned char v, unsigned char length);
+void dyn_chlinexy (unsigned char h, unsigned char x, unsigned char y, unsigned char length);
+void dyn_cvlinexy (unsigned char v, unsigned char x, unsigned char y, unsigned char length);
+
+#if defined(DYN_BOX_DRAW)
+/* When the user defines DYN_BOX_DRAW, we'll adapt to the machine
+** we run on.
+ */
+extern char CH_HLINE;
+extern char CH_VLINE;
+extern char CH_ULCORNER;
+extern char CH_URCORNER;
+extern char CH_LLCORNER;
+extern char CH_LRCORNER;
+extern char CH_TTEE;
+extern char CH_BTEE;
+extern char CH_LTEE;
+extern char CH_RTEE;
+extern char CH_CROSS;
+
+#else
+/* Otherwise, fallback to safety and don't use MouseText at all. */
 #define CH_HLINE        '-'
 #define CH_VLINE        '!'
 #define CH_ULCORNER     '+'
@@ -94,7 +165,14 @@
 #define CH_LTEE         '+'
 #define CH_RTEE         '+'
 #define CH_CROSS        '+'
-#endif
+#endif /* DYN_BOX_DRAW */
+
+#define _chline(length)         dyn_chline(CH_HLINE, length)
+#define _chlinexy(x, y, length) dyn_chlinexy(CH_HLINE, x ,y, length)
+#define _cvline(length)         dyn_cvline(CH_VLINE, length)
+#define _cvlinexy(x, y, length) dyn_cvlinexy(CH_VLINE, x, y, length)
+
+#endif /* __APPLE2ENH__ */
 
 /* Masks for joy_read */
 #define JOY_UP_MASK     0x10
@@ -121,6 +199,17 @@
 #define APPLE_IIGS1     0x81  /* Apple IIgs (ROM 1)          */
 #define APPLE_IIGS3     0x83  /* Apple IIgs (ROM 3)          */
 
+/* Return codes for get_tv() */
+#define TV_NTSC  0
+#define TV_PAL   1
+#define TV_OTHER 2
+
+/* Video modes */
+#define VIDEOMODE_40x24     0x15
+#define VIDEOMODE_80x24     0x00
+#define VIDEOMODE_40COL     VIDEOMODE_40x24
+#define VIDEOMODE_80COL     VIDEOMODE_80x24
+
 extern unsigned char _dos_type;
 /* Valid _dos_type values:
 **
@@ -142,6 +231,27 @@ extern unsigned char _dos_type;
 ** ProDOS 8 2.4.x - 0x24
 */
 
+/* struct stat.st_mode values */
+#define S_IFDIR  0x01
+#define S_IFREG  0x02
+#define S_IFBLK  0xFF
+#define S_IFCHR  0xFF
+#define S_IFIFO  0xFF
+#define S_IFLNK  0xFF
+#define S_IFSOCK 0xFF
+
+struct datetime {
+    struct {
+        unsigned day  :5;
+        unsigned mon  :4;
+        unsigned year :7;
+    }                 date;
+    struct {
+        unsigned char min;
+        unsigned char hour;
+    }                 time;
+};
+
 
 
 /*****************************************************************************/
@@ -151,20 +261,10 @@ extern unsigned char _dos_type;
 
 
 /* The file stream implementation and the POSIX I/O functions will use the
-** following struct to set the date and time stamp on files. This specificially
+** following struct to set the date and time stamp on files. This specifically
 ** applies to the open and fopen functions.
 */
-extern struct {
-    struct {
-        unsigned day  :5;
-        unsigned mon  :4;
-        unsigned year :7;
-    }             createdate;    /* Current date: 0 */
-    struct {
-        unsigned char min;
-        unsigned char hour;
-    }             createtime;    /* Current time: 0 */
-} _datetime;
+extern struct datetime _datetime;
 
 /* The addresses of the static drivers */
 #if !defined(__APPLE2ENH__)
@@ -185,6 +285,12 @@ extern void a2_lo_tgi[];
 
 
 
+void beep (void);
+/* Beep beep. */
+
+unsigned char get_tv (void);
+/* Get the machine vblank frequency. Returns one of the TV_xxx codes. */
+
 unsigned char get_ostype (void);
 /* Get the machine type. Returns one of the APPLE_xxx codes. */
 
@@ -211,6 +317,35 @@ void rebootafterexit (void);
 #define _cpeekcolor()           COLOR_WHITE
 #define _cpeekrevers()          0
 
+struct tm* __fastcall__ gmtime_dt (const struct datetime* dt);
+/* Converts a ProDOS date/time structure to a struct tm */
+
+time_t __fastcall__ mktime_dt (const struct datetime* dt);
+/* Converts a ProDOS date/time structure to a time_t UNIX timestamp */
+
+typedef struct DIR DIR;
+
+unsigned int __fastcall__ dir_entry_count(DIR *dir);
+/* Returns the number of active files in a ProDOS directory */
+
+#if !defined(__APPLE2ENH__)
+unsigned char __fastcall__ allow_lowercase (unsigned char onoff);
+/* If onoff is 0, lowercase characters printed to the screen via STDIO and
+** CONIO are forced to uppercase. If onoff is 1, lowercase characters are
+** printed to the screen untouched.  By default lowercase characters are
+** forced to uppercase because a stock Apple ][+ doesn't support lowercase
+** display. The function returns the old lowercase setting.
+*/
+#endif
+
+signed char __fastcall__ videomode (unsigned mode);
+/* Set the video mode, return the old mode, or -1 if 80-column hardware is not
+** installed. Call with one of the VIDEOMODE_xx constants.
+*/
+
+void waitvsync (void);
+/* Wait for start of next frame */
+
 
 
 /* End of apple2.h */
diff --git a/include/apple2enh.h b/include/apple2enh.h
index 3989d0b8d..84e6f4ab3 100644
--- a/include/apple2enh.h
+++ b/include/apple2enh.h
@@ -46,49 +46,6 @@
 
 
 
-/*****************************************************************************/
-/*                                   Data                                    */
-/*****************************************************************************/
-
-
-
-/* Characters codes */
-#define CH_DEL          0x7F
-#define CH_CURS_UP      0x0B
-#define CH_CURS_DOWN    0x0A
-
-#define CH_HLINE        0x5F
-#define CH_VLINE        0xDF
-#define CH_ULCORNER     0x5F
-#define CH_URCORNER     0x20
-#define CH_LLCORNER     0xD4
-#define CH_LRCORNER     0xDF
-#define CH_TTEE         0x5F
-#define CH_BTEE         0xD4
-#define CH_LTEE         0xD4
-#define CH_RTEE         0xDF
-#define CH_CROSS        0xD4
-
-/* These are defined to be OpenApple + NumberKey */
-#define CH_F1   0xB1
-#define CH_F2   0xB2
-#define CH_F3   0xB3
-#define CH_F4   0xB4
-#define CH_F5   0xB5
-#define CH_F6   0xB6
-#define CH_F7   0xB7
-#define CH_F8   0xB8
-#define CH_F9   0xB9
-#define CH_F10  0xB0
-
-/* Video modes */
-#define VIDEOMODE_40x24     0x0011
-#define VIDEOMODE_80x24     0x0012
-#define VIDEOMODE_40COL     VIDEOMODE_40x24
-#define VIDEOMODE_80COL     VIDEOMODE_80x24
-
-
-
 /*****************************************************************************/
 /*                                 Variables                                 */
 /*****************************************************************************/
@@ -106,21 +63,5 @@ extern void a2e_lo_tgi[];
 
 
 
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-unsigned __fastcall__ videomode (unsigned mode);
-/* Set the video mode, return the old mode. Call with one of the VIDEOMODE_xx
-** constants.
-*/
-
-void waitvsync (void);
-/* Wait for start of next frame */
-
-
-
 /* End of apple2enh.h */
 #endif
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index cd353a2bb..3d715766f 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -40,6 +40,20 @@
 /*****************************************************************************/
 
 
+#if (__CPU__ & __CPU_ISET_65SC02__)
+/* Always inline, three bytes is not more than a jsr */
+
+#define ntohs(x)                \
+    (                           \
+        __AX__=(x),             \
+        asm("phx"),             \
+        asm("tax"),             \
+        asm("pla"),             \
+        __AX__                  \
+    )
+#define htons(x) ntohs(x)
+
+#else
 
 #if (__OPT_i__ < 200)
 int __fastcall__ ntohs (int val);
@@ -56,12 +70,12 @@ int __fastcall__ htons (int val);
     )
 #define htons(x) ntohs(x)
 
-#endif
+#endif /* __OPT_i__ < 200 */
+
+#endif /* __CPU__ & __CPU_ISET_65SC02__ */
 
 long __fastcall__ ntohl (long val);
 long __fastcall__ htonl (long val);
 
-
-
 /* End of arpa/inet.h */
 #endif
diff --git a/include/atari.h b/include/atari.h
index 04cacab33..0af109264 100644
--- a/include/atari.h
+++ b/include/atari.h
@@ -220,17 +220,17 @@
 /* Color register functions                                                  */
 /*****************************************************************************/
 
-extern void __fastcall__ _setcolor     (unsigned char color_reg, unsigned char hue, unsigned char luminance);
-extern void __fastcall__ _setcolor_low (unsigned char color_reg, unsigned char color_value);
-extern unsigned char __fastcall__ _getcolor (unsigned char color_reg);
+void __fastcall__ _setcolor     (unsigned char color_reg, unsigned char hue, unsigned char luminance);
+void __fastcall__ _setcolor_low (unsigned char color_reg, unsigned char color_value);
+unsigned char __fastcall__ _getcolor (unsigned char color_reg);
 
 /*****************************************************************************/
 /* Other screen functions                                                    */
 /*****************************************************************************/
 
-extern void waitvsync (void);                            /* wait for start of next frame */
-extern int  __fastcall__ _graphics (unsigned char mode); /* mode value same as in BASIC */
-extern void __fastcall__ _scroll (signed char numlines);
+void waitvsync (void);                            /* wait for start of next frame */
+int  __fastcall__ _graphics (unsigned char mode); /* mode value same as in BASIC */
+void __fastcall__ _scroll (signed char numlines);
                                           /* numlines > 0  scrolls up */
                                           /* numlines < 0  scrolls down */
 
@@ -239,18 +239,18 @@ extern void __fastcall__ _scroll (signed char numlines);
 /*    Sound function                                                         */
 /*****************************************************************************/
 
-extern void  __fastcall__ _sound (unsigned char voice, unsigned char frequency, unsigned char distortion, unsigned char volume);
+void  __fastcall__ _sound (unsigned char voice, unsigned char frequency, unsigned char distortion, unsigned char volume);
 
 /*****************************************************************************/
 /* Misc. functions                                                           */
 /*****************************************************************************/
 
-extern unsigned char get_ostype(void);       /* get ROM version */
-extern unsigned char get_tv(void);           /* get TV system */
-extern void _save_vecs(void);                /* save system vectors */
-extern void _rest_vecs(void);                /* restore system vectors */
-extern char *_getdefdev(void);               /* get default floppy device */
-extern unsigned char _is_cmdline_dos(void);  /* does DOS support command lines */
+unsigned char get_ostype(void);       /* get ROM version */
+unsigned char get_tv(void);           /* get TV system */
+void _save_vecs(void);                /* save system vectors */
+void _rest_vecs(void);                /* restore system vectors */
+char *_getdefdev(void);               /* get default floppy device */
+unsigned char _is_cmdline_dos(void);  /* does DOS support command lines */
 
 
 /*****************************************************************************/
diff --git a/include/atari5200.h b/include/atari5200.h
index ff176c15b..9a0399d0e 100644
--- a/include/atari5200.h
+++ b/include/atari5200.h
@@ -94,7 +94,7 @@ extern void atr5200std_joy[];        /* referred to by joy_static_stddrv[] */
 #define _bordercolor(color) 0
 
 /* wait for start of next frame */
-extern void waitvsync (void);
+void waitvsync (void);
 
 /* end of atari5200.h */
 #endif
diff --git a/include/atari7800.h b/include/atari7800.h
index 3cbeedb8b..b289bb41e 100644
--- a/include/atari7800.h
+++ b/include/atari7800.h
@@ -52,7 +52,7 @@
 /* No support for dynamically loadable drivers */
 #define DYN_DRV 0
 
-extern unsigned char get_tv(void);           /* get TV system */
+unsigned char get_tv(void);           /* get TV system */
 
 #include <_tia.h>
 #define TIA (*(struct __tia*)0x0000)
diff --git a/include/atmos.h b/include/atmos.h
index 38d423c46..9b1b021c1 100644
--- a/include/atmos.h
+++ b/include/atmos.h
@@ -170,6 +170,20 @@ void atmos_zap (void);
 /* Raygun sound effect */
 
 
+/* The following #defines will cause the matching function prototypes
+** in conio.h to be overlaid by macroes with the same names,
+** thereby saving the function call overhead.
+*/
+#define _textcolor(color)       COLOR_WHITE
+#define _bgcolor(color)         COLOR_BLACK
+#define _bordercolor(color)     COLOR_BLACK
+#define _cpeekcolor(color)      COLOR_WHITE
+
+
+void waitvsync (void);
+/* Wait for start of next frame */
+
+
 
 /* End of atmos.h */
 #endif
diff --git a/include/c65.h b/include/c65.h
new file mode 100644
index 000000000..34270be03
--- /dev/null
+++ b/include/c65.h
@@ -0,0 +1,120 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                c65.h                                      */
+/*                                                                           */
+/*                     C65 system specific definitions                       */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 1998-2013, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef _C65_H
+#define _C65_H
+
+
+
+/* Check for errors */
+#if !defined(__C65__)
+#  error This module may only be used when compiling for the MEGA65!
+#endif
+
+
+
+/* Additional key defines */
+#define CH_F1                   133
+#define CH_F2                   137
+#define CH_F3                   134
+#define CH_F4                   138
+#define CH_F5                   135
+#define CH_F6                   139
+#define CH_F7                   136
+#define CH_F8                   140
+
+/* Color defines */
+#define COLOR_BLACK             0x00
+#define COLOR_WHITE             0x01
+#define COLOR_RED               0x02
+#define COLOR_CYAN              0x03
+#define COLOR_PURPLE            0x04
+#define COLOR_GREEN             0x05
+#define COLOR_BLUE              0x06
+#define COLOR_YELLOW            0x07
+#define COLOR_ORANGE            0x08
+#define COLOR_BROWN             0x09
+#define COLOR_LIGHTRED          0x0A
+#define COLOR_GRAY1             0x0B
+#define COLOR_GRAY2             0x0C
+#define COLOR_LIGHTGREEN        0x0D
+#define COLOR_LIGHTBLUE         0x0E
+#define COLOR_GRAY3             0x0F
+
+/* TGI color defines */
+#define TGI_COLOR_BLACK         COLOR_BLACK
+#define TGI_COLOR_WHITE         COLOR_WHITE
+#define TGI_COLOR_RED           COLOR_RED
+#define TGI_COLOR_CYAN          COLOR_CYAN
+#define TGI_COLOR_PURPLE        COLOR_PURPLE
+#define TGI_COLOR_GREEN         COLOR_GREEN
+#define TGI_COLOR_BLUE          COLOR_BLUE
+#define TGI_COLOR_YELLOW        COLOR_YELLOW
+#define TGI_COLOR_ORANGE        COLOR_ORANGE
+#define TGI_COLOR_BROWN         COLOR_BROWN
+#define TGI_COLOR_LIGHTRED      COLOR_LIGHTRED
+#define TGI_COLOR_GRAY1         COLOR_GRAY1
+#define TGI_COLOR_GRAY2         COLOR_GRAY2
+#define TGI_COLOR_LIGHTGREEN    COLOR_LIGHTGREEN
+#define TGI_COLOR_LIGHTBLUE     COLOR_LIGHTBLUE
+#define TGI_COLOR_GRAY3         COLOR_GRAY3
+
+/* Masks for joy_read */
+#define JOY_UP_MASK             0x01
+#define JOY_DOWN_MASK           0x02
+#define JOY_LEFT_MASK           0x04
+#define JOY_RIGHT_MASK          0x08
+#define JOY_BTN_1_MASK          0x10
+
+
+/* Define hardware */
+#include <_vic3.h>
+#define VIC     (*(struct __vic2*)0xD000)
+
+#include <_sid.h>
+#define SID1    (*(struct __sid*)0xD400)
+#define SID2    (*(struct __sid*)0xD420)
+
+#include <_6526.h>
+#define CIA1    (*(struct __6526*)0xDC00)
+#define CIA2    (*(struct __6526*)0xDD00)
+
+
+/* Define special memory areas */
+#define COLOR_RAM       ((unsigned char*)0xD800)
+
+
+/* End of c65.h */
+#endif
diff --git a/include/cbm.h b/include/cbm.h
index 0679b2d65..89c01ffc0 100644
--- a/include/cbm.h
+++ b/include/cbm.h
@@ -67,6 +67,10 @@
 #  include <pet.h>
 #elif defined(__CX16__)   && !defined(_CX16_H)
 #  include <cx16.h>
+#elif defined(__C65__)   && !defined(_C65_H)
+#  include <c65.h>
+#elif defined(__MEGA65__)   && !defined(_MEGA65_H)
+#  include <mega65.h>
 #endif
 
 /* Include definitions for CBM file types */
diff --git a/include/cbm264.h b/include/cbm264.h
index 4951df518..c220bf407 100644
--- a/include/cbm264.h
+++ b/include/cbm264.h
@@ -97,7 +97,7 @@
 #define COLOR_WHITE             (BCOLOR_WHITE | CATTR_LUMA7)
 #define COLOR_RED               (BCOLOR_RED | CATTR_LUMA4)
 #define COLOR_CYAN              (BCOLOR_CYAN | CATTR_LUMA7)
-#define COLOR_PURPLE            (BCOLOR_VIOLET | CATTR_LUMA7)
+#define COLOR_PURPLE            (BCOLOR_LIGHTVIOLET | CATTR_LUMA7)
 #define COLOR_GREEN             (BCOLOR_GREEN | CATTR_LUMA7)
 #define COLOR_BLUE              (BCOLOR_BLUE | CATTR_LUMA7)
 #define COLOR_YELLOW            (BCOLOR_YELLOW | CATTR_LUMA7)
@@ -110,7 +110,23 @@
 #define COLOR_LIGHTBLUE         (BCOLOR_LIGHTBLUE | CATTR_LUMA7)
 #define COLOR_GRAY3             (BCOLOR_WHITE | CATTR_LUMA5)
 
-
+/* TGI color defines */
+#define TGI_COLOR_BLACK         (BCOLOR_BLACK)
+#define TGI_COLOR_WHITE         (BCOLOR_WHITE | CATTR_LUMA7)
+#define TGI_COLOR_RED           (BCOLOR_RED | CATTR_LUMA4)
+#define TGI_COLOR_CYAN          (BCOLOR_CYAN | CATTR_LUMA7)
+#define TGI_COLOR_PURPLE        (BCOLOR_LIGHTVIOLET | CATTR_LUMA7)
+#define TGI_COLOR_GREEN         (BCOLOR_GREEN | CATTR_LUMA7)
+#define TGI_COLOR_BLUE          (BCOLOR_BLUE | CATTR_LUMA7)
+#define TGI_COLOR_YELLOW        (BCOLOR_YELLOW | CATTR_LUMA7)
+#define TGI_COLOR_ORANGE        (BCOLOR_ORANGE | CATTR_LUMA7)
+#define TGI_COLOR_BROWN         (BCOLOR_BROWN | CATTR_LUMA7)
+#define TGI_COLOR_LIGHTRED      (BCOLOR_RED | CATTR_LUMA7)
+#define TGI_COLOR_GRAY1         (BCOLOR_WHITE | CATTR_LUMA1)
+#define TGI_COLOR_GRAY2         (BCOLOR_WHITE | CATTR_LUMA3)
+#define TGI_COLOR_LIGHTGREEN    (BCOLOR_LIGHTGREEN | CATTR_LUMA7)
+#define TGI_COLOR_LIGHTBLUE     (BCOLOR_LIGHTBLUE | CATTR_LUMA7)
+#define TGI_COLOR_GRAY3         (BCOLOR_WHITE | CATTR_LUMA5)
 
 /* Masks for joy_read */
 #define JOY_UP_MASK             0x01
diff --git a/include/conio.h b/include/conio.h
index bac20e3c5..3e1614cc1 100644
--- a/include/conio.h
+++ b/include/conio.h
@@ -110,6 +110,21 @@ char cgetc (void);
 ** 1 (see below), a blinking cursor is displayed while waiting.
 */
 
+char* __fastcall__ cgets (char* buffer, int size);
+/* Get a string of characters directly from the console. The function returns
+** when size - 1 characters or either CR/LF are read. Note the parameters are
+** more aligned with stdio fgets() as opposed to the quirky "standard" conio
+** cgets(). Besides providing saner parameters, the function also echoes CRLF
+** when either CR/LF are read but does NOT append either in the buffer. This is
+** to correspond to stdio fgets() which echoes CRLF, but prevents a "gotcha"
+** where the buffer might not be able to accommodate both CR and LF at the end.
+**
+**   param: buffer - where to save the input, must be non-NULL
+**   param: size - size of the buffer, must be > 1
+**  return: buffer if successful, NULL on error
+**  author: Russell-S-Harper
+*/
+
 int cscanf (const char* format, ...);
 /* Like scanf(), but uses direct keyboard input */
 
@@ -216,7 +231,18 @@ void __fastcall__ cputhex16 (unsigned val);
 #  define cpeekrevers()         _cpeekrevers()
 #endif
 
-
+#ifdef _chline
+#  define chline(len)      _chline(len)
+#endif
+#ifdef _cvline
+#  define cvline(len)      _cvline(len)
+#endif
+#ifdef _chlinexy
+#  define chlinexy(x, y, len)      _chlinexy(x, y, len)
+#endif
+#ifdef _cvlinexy
+#  define cvlinexy(x, y, len)      _cvlinexy(x, y, len)
+#endif
 
 /* End of conio.h */
 #endif
diff --git a/include/cx16.h b/include/cx16.h
index 5bbd21247..6a3705631 100644
--- a/include/cx16.h
+++ b/include/cx16.h
@@ -3,7 +3,7 @@
 /*                                  cx16.h                                   */
 /*                                                                           */
 /*                      CX16 system-specific definitions                     */
-/*                             For prerelease 39                             */
+/*                             For prerelease 43                             */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided "as-is", without any expressed or implied       */
@@ -176,6 +176,11 @@ enum {
 #define VIDEOMODE_40x15         0x04
 #define VIDEOMODE_20x30         0x05
 #define VIDEOMODE_20x15         0x06
+#define VIDEOMODE_22x23         0x07
+#define VIDEOMODE_64x50         0x08
+#define VIDEOMODE_64x25         0x09
+#define VIDEOMODE_32x50         0x0A
+#define VIDEOMODE_32x25         0x0B
 #define VIDEOMODE_80COL         VIDEOMODE_80x60
 #define VIDEOMODE_40COL         VIDEOMODE_40x30
 #define VIDEOMODE_320x240       0x80
diff --git a/include/dirent.h b/include/dirent.h
index 124c7f224..60982ba05 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -33,6 +33,8 @@
 #ifndef _DIRENT_H
 #define _DIRENT_H
 
+#include <target.h>
+
 
 
 /*****************************************************************************/
@@ -46,31 +48,15 @@ typedef struct DIR DIR;
 #if defined(__APPLE2__)
 
 struct dirent {
-    char          d_name[16];
-    unsigned      d_ino;
-    unsigned      d_blocks;
-    unsigned long d_size;
-    unsigned char d_type;
-    struct {
-        unsigned day  :5;
-        unsigned mon  :4;
-        unsigned year :7;
-    }             d_cdate;
-    struct {
-        unsigned char min;
-        unsigned char hour;
-    }             d_ctime;
-    unsigned char d_access;
-    unsigned      d_auxtype;
-    struct {
-        unsigned day  :5;
-        unsigned mon  :4;
-        unsigned year :7;
-    }             d_mdate;
-    struct {
-        unsigned char min;
-        unsigned char hour;
-    }             d_mtime;
+    char            d_name[16];
+    unsigned        d_ino;
+    unsigned        d_blocks;
+    unsigned long   d_size;
+    unsigned char   d_type;
+    struct datetime d_ctime;
+    unsigned char   d_access;
+    unsigned        d_auxtype;
+    struct datetime d_mtime;
 };
 
 #define _DE_ISREG(t)  ((t) != 0x0F)
@@ -161,7 +147,5 @@ void __fastcall__ seekdir (DIR* dir, long offs);
 
 void __fastcall__ rewinddir (DIR* dir);
 
-
-
 /* End of dirent.h */
 #endif
diff --git a/include/lynx.h b/include/lynx.h
index 41dc5acb3..259b3da71 100644
--- a/include/lynx.h
+++ b/include/lynx.h
@@ -31,27 +31,15 @@
 /*                                                                           */
 /*****************************************************************************/
 
-
-
 #ifndef _LYNX_H
 #define _LYNX_H
 
-
-
 /* Check for errors */
 #if !defined(__LYNX__)
 #  error This module may only be used when compiling for the Lynx game console!
 #endif
 
-
-
-/*****************************************************************************/
-/*                                   Data                                    */
-/*****************************************************************************/
-
-
-
-/* Color defines */
+/* Color definitions */
 #define COLOR_TRANSPARENT       0x00
 #define COLOR_BLACK             0x01
 #define COLOR_RED               0x02
@@ -88,6 +76,56 @@
 #define TGI_COLOR_LIGHTBLUE     COLOR_LIGHTBLUE
 #define TGI_COLOR_WHITE         COLOR_WHITE
 
+/* No support for dynamically loadable drivers */
+#define DYN_DRV 0
+
+/* Addresses of static drivers */
+extern void lynx_stdjoy_joy[];        /* Referred to by joy_static_stddrv[] */
+extern void lynx_comlynx_ser[];       /* Referred to by ser_static_stddrv[] */
+extern void lynx_160_102_16_tgi[];    /* Referred to by tgi_static_stddrv[] */
+
+/* Sound support */
+void lynx_snd_init (void); /* Initialize the sound driver */
+void lynx_snd_pause (void); /* Pause sound */
+void lynx_snd_continue (void); /* Continue sound after pause */
+void __fastcall__ lynx_snd_play (unsigned char channel, unsigned char *music); /* Play tune on channel */
+void lynx_snd_stop (void); /* Stop sound on all channels */
+void __fastcall__ lynx_snd_stop_channel (unsigned char channel); /* Stop sound on all channels */
+unsigned char lynx_snd_active(void); /* Show which channels are active */
+
+/* Cartridge access */
+void __fastcall__ lynx_load (int file_number); /* Load a file into RAM using a zero-based index */
+void __fastcall__ lynx_exec (int file_number); /* Load a file into ram and execute it */
+
+/* EEPROM access */
+unsigned __fastcall__ lynx_eeprom_read (unsigned char cell); /* Read a 16 bit word from the given address */
+unsigned __fastcall__ lynx_eeprom_write (unsigned char cell, unsigned val); /* Write the word at the given address */
+void __fastcall__ lynx_eeprom_erase (unsigned char cell); /* Clear the word at the given address */
+unsigned __fastcall__ lynx_eeread (unsigned cell); /* Read a 16 bit word from the given address 93C46, 93C66 or 93C86 */
+unsigned __fastcall__ lynx_eewrite (unsigned cell, unsigned val); /* Write the word at the given address 93C46, 93C66 or 93C86 */
+
+/* TGI extras */
+#define tgi_sprite(spr) tgi_ioctl(0, spr)
+#define tgi_flip() tgi_ioctl(1, (void*)0)
+#define tgi_setbgcolor(bgcol) tgi_ioctl(2, (void*)(bgcol))
+#define tgi_setframerate(rate) tgi_ioctl(3, (void*)(rate))
+#define tgi_busy() tgi_ioctl(4, (void*)0)
+#define tgi_updatedisplay() tgi_ioctl(4, (void*)1)
+#define tgi_setcollisiondetection(active) tgi_ioctl(5, (void*)(active))
+
+/* Hardware definitions */
+#include <_mikey.h>
+#define MIKEY (*(struct __mikey *)0xFD00)
+
+#define _MIKEY_TIMERS (*(struct _mikey_all_timers *) 0xFD00)  /* mikey_timers[8] */
+#define _HBL_TIMER (*(struct _mikey_timer *) 0xFD00)          /* timer0 (HBL) */
+#define _VBL_TIMER (*(struct _mikey_timer *) 0xFD08)          /* timer2 (VBL) */
+#define _UART_TIMER (*(struct _mikey_timer *) 0xFD14)         /* timer4 (UART) */
+#define _VIDDMA (*(unsigned int *) 0xFD92)                    /* DISPCTL/VIDDMA */
+
+#include <_suzy.h>
+#define SUZY (*(volatile struct __suzy*)0xFC00)
+
 /* Masks for joy_read */
 #define JOY_UP_MASK             0x80
 #define JOY_DOWN_MASK           0x40
@@ -102,118 +140,5 @@
 #define JOY_BTN_A(v)            ((v) & JOY_BTN_A_MASK)
 #define JOY_BTN_B(v)            ((v) & JOY_BTN_B_MASK)
 
-/* No support for dynamically loadable drivers */
-#define DYN_DRV 0
-
-
-
-/*****************************************************************************/
-/*                                 Variables                                 */
-/*****************************************************************************/
-
-
-
-/* The addresses of the static drivers */
-extern void lynx_stdjoy_joy[];        /* Referred to by joy_static_stddrv[] */
-extern void lynx_comlynx_ser[];       /* Referred to by ser_static_stddrv[] */
-extern void lynx_160_102_16_tgi[];    /* Referred to by tgi_static_stddrv[] */
-
-
-
-/*****************************************************************************/
-/*                           Sound support                                   */
-/*****************************************************************************/
-
-
-
-void lynx_snd_init (void);
-/* Initialize the sound driver */
-
-void lynx_snd_pause (void);
-/* Pause sound */
-
-void lynx_snd_continue (void);
-/* Continue sound after pause */
-
-void __fastcall__ lynx_snd_play (unsigned char channel, unsigned char *music);
-/* Play tune on channel */
-
-void lynx_snd_stop (void);
-/* Stop sound on all channels */
-
-void __fastcall__ lynx_snd_stop_channel (unsigned char channel);
-/* Stop sound on all channels */
-
-unsigned char lynx_snd_active(void);
-/* Show which channels are active */
-
-
-
-/*****************************************************************************/
-/*                           Accessing the cart                              */
-/*****************************************************************************/
-
-
-
-void __fastcall__ lynx_load (int fileno);
-/* Load a file into ram. The first entry is fileno=0. */
-
-void __fastcall__ lynx_exec (int fileno);
-/* Load a file into ram and execute it. */
-
-
-
-/*****************************************************************************/
-/*                           Accessing the EEPROM                            */
-/*****************************************************************************/
-
-
-
-unsigned __fastcall__ lynx_eeprom_read (unsigned char cell);
-/* Read a 16 bit word from the given address */
-
-unsigned __fastcall__ lynx_eeprom_write (unsigned char cell, unsigned val);
-/* Write the word at the given address */
-
-void __fastcall__ lynx_eeprom_erase (unsigned char cell);
-/* Clear the word at the given address */
-
-unsigned __fastcall__ lynx_eeread (unsigned cell);
-/* Read a 16 bit word from the given address 93C46 93C66 or 93C86*/
-
-unsigned __fastcall__ lynx_eewrite (unsigned cell, unsigned val);
-/* Write the word at the given address 93C46 93C66 or 93C86*/
-
-
-
-/*****************************************************************************/
-/*                           TGI extras                                      */
-/*****************************************************************************/
-
-
-
-#define tgi_sprite(spr) tgi_ioctl(0, spr)
-#define tgi_flip() tgi_ioctl(1, (void*)0)
-#define tgi_setbgcolor(bgcol) tgi_ioctl(2, (void*)(bgcol))
-#define tgi_setframerate(rate) tgi_ioctl(3, (void*)(rate))
-#define tgi_busy() tgi_ioctl(4, (void*)0)
-#define tgi_updatedisplay() tgi_ioctl(4, (void*)1)
-#define tgi_setcollisiondetection(active) tgi_ioctl(5, (void*)(active))
-
-/* Define Hardware */
-#include <_mikey.h>
-#define MIKEY (*(struct __mikey *)0xFD00)
-
-#define _MIKEY_TIMERS (*(struct _mikey_all_timers *) 0xFD00)  // mikey_timers[8]
-#define _HBL_TIMER (*(struct _mikey_timer *) 0xFD00)          // timer0 (HBL)
-#define _VBL_TIMER (*(struct _mikey_timer *) 0xFD08)          // timer2 (VBL)
-#define _UART_TIMER (*(struct _mikey_timer *) 0xFD14)         // timer4 (UART)
-#define _VIDDMA (*(unsigned int *) 0xFD92)                    // dispctl/viddma
-
-#include <_suzy.h>
-#define SUZY        (*(struct __suzy*)0xFC00)
-
-
-
 /* End of lynx.h */
 #endif
diff --git a/include/lzsa.h b/include/lzsa.h
new file mode 100644
index 000000000..9b0eb82e5
--- /dev/null
+++ b/include/lzsa.h
@@ -0,0 +1,56 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                 lzsa.h                                    */
+/*                                                                           */
+/*              Decompression routine for the 'lzsa' format                  */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2022 John Brandwood                                                   */
+/*                                                                           */
+/*                                                                           */
+/* Boost license:                                                            */
+/* Distributed under the Boost Software License, Version 1.0.                */
+/* Boost Software License - Version 1.0 - August 17th, 2003                  */
+/*                                                                           */
+/* Permission is hereby granted, free of charge, to any person or            */
+/* organization                                                              */
+/* obtaining a copy of the software and accompanying documentation covered by*/
+/* this license (the "Software") to use, reproduce, display, distribute,     */
+/* execute, and transmit the Software, and to prepare derivative works of the*/
+/* Software, and to permit third-parties to whom the Software is furnished to*/
+/* do so, all subject to the following:                                      */
+/*                                                                           */
+/* The copyright notices in the Software and this entire statement, including*/
+/* the above license grant, this restriction and the following disclaimer,   */
+/* must be included in all copies of the Software, in whole or in part, and  */
+/* all derivative works of the Software, unless such copies or derivative    */
+/* works are solely in the form of machine-executable object code generated  */
+/* by a source language processor.                                           */
+/*                                                                           */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*/
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  */
+/* FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT */
+/* SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE */
+/* FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR          */
+/* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE */
+/* USE OR OTHER DEALINGS IN THE SOFTWARE.                                    */
+/*****************************************************************************/
+
+
+
+#ifndef _LZSA_H
+#define _LZSA_H
+
+void __fastcall__ decompress_lzsa1 (const unsigned char* src, unsigned char* const dst);
+/* Decompresses the source buffer into the destination buffer.
+** compress with lzsa -r -f 1 input.bin output.lzsa1
+ */
+
+void __fastcall__ decompress_lzsa2 (const unsigned char* src, unsigned char* const dst);
+/* Decompresses the source buffer into the destination buffer.
+** compress with lzsa -r -f 2 input.bin output.lzsa2
+ */
+
+/* end of lzsa.h */
+#endif
diff --git a/include/mega65.h b/include/mega65.h
new file mode 100644
index 000000000..83d48606d
--- /dev/null
+++ b/include/mega65.h
@@ -0,0 +1,120 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                mega65.h                                   */
+/*                                                                           */
+/*                     MEGA65 system specific definitions                    */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 1998-2013, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef _MEGA65_H
+#define _MEGA65_H
+
+
+
+/* Check for errors */
+#if !defined(__MEGA65__)
+#  error This module may only be used when compiling for the MEGA65!
+#endif
+
+
+
+/* Additional key defines */
+#define CH_F1                   133
+#define CH_F2                   137
+#define CH_F3                   134
+#define CH_F4                   138
+#define CH_F5                   135
+#define CH_F6                   139
+#define CH_F7                   136
+#define CH_F8                   140
+
+/* Color defines */
+#define COLOR_BLACK             0x00
+#define COLOR_WHITE             0x01
+#define COLOR_RED               0x02
+#define COLOR_CYAN              0x03
+#define COLOR_PURPLE            0x04
+#define COLOR_GREEN             0x05
+#define COLOR_BLUE              0x06
+#define COLOR_YELLOW            0x07
+#define COLOR_ORANGE            0x08
+#define COLOR_BROWN             0x09
+#define COLOR_LIGHTRED          0x0A
+#define COLOR_GRAY1             0x0B
+#define COLOR_GRAY2             0x0C
+#define COLOR_LIGHTGREEN        0x0D
+#define COLOR_LIGHTBLUE         0x0E
+#define COLOR_GRAY3             0x0F
+
+/* TGI color defines */
+#define TGI_COLOR_BLACK         COLOR_BLACK
+#define TGI_COLOR_WHITE         COLOR_WHITE
+#define TGI_COLOR_RED           COLOR_RED
+#define TGI_COLOR_CYAN          COLOR_CYAN
+#define TGI_COLOR_PURPLE        COLOR_PURPLE
+#define TGI_COLOR_GREEN         COLOR_GREEN
+#define TGI_COLOR_BLUE          COLOR_BLUE
+#define TGI_COLOR_YELLOW        COLOR_YELLOW
+#define TGI_COLOR_ORANGE        COLOR_ORANGE
+#define TGI_COLOR_BROWN         COLOR_BROWN
+#define TGI_COLOR_LIGHTRED      COLOR_LIGHTRED
+#define TGI_COLOR_GRAY1         COLOR_GRAY1
+#define TGI_COLOR_GRAY2         COLOR_GRAY2
+#define TGI_COLOR_LIGHTGREEN    COLOR_LIGHTGREEN
+#define TGI_COLOR_LIGHTBLUE     COLOR_LIGHTBLUE
+#define TGI_COLOR_GRAY3         COLOR_GRAY3
+
+/* Masks for joy_read */
+#define JOY_UP_MASK             0x01
+#define JOY_DOWN_MASK           0x02
+#define JOY_LEFT_MASK           0x04
+#define JOY_RIGHT_MASK          0x08
+#define JOY_BTN_1_MASK          0x10
+
+
+/* Define hardware */
+#include <_vic3.h>
+#define VIC     (*(struct __vic2*)0xD000)
+
+#include <_sid.h>
+#define SID1    (*(struct __sid*)0xD400)
+#define SID2    (*(struct __sid*)0xD420)
+
+#include <_6526.h>
+#define CIA1    (*(struct __6526*)0xDC00)
+#define CIA2    (*(struct __6526*)0xDD00)
+
+
+/* Define special memory areas */
+#define COLOR_RAM       ((unsigned char*)0xD800)
+
+
+/* End of mega65.h */
+#endif
diff --git a/include/plus4.h b/include/plus4.h
index 7730938e8..5eb14d24d 100644
--- a/include/plus4.h
+++ b/include/plus4.h
@@ -57,8 +57,7 @@
 /* The addresses of the static drivers */
 extern void plus4_stdjoy_joy[];   /* Referred to by joy_static_stddrv[] */
 extern void plus4_stdser_ser[];   /* Referred to by ser_static_stddrv[] */
-
-
+extern void ted_hi_tgi[];
 
 /* End of plus4.h */
 #endif
diff --git a/include/rp6502.h b/include/rp6502.h
index 033684b72..7deeebc4c 100644
--- a/include/rp6502.h
+++ b/include/rp6502.h
@@ -47,8 +47,7 @@ struct __RP6502
     unsigned char step1;
     unsigned int addr1;
     unsigned char xstack;
-    unsigned char errno_lo;
-    unsigned char errno_hi;
+    unsigned int errno;
     unsigned char op;
     unsigned char irq;
     const unsigned char spin;
@@ -72,8 +71,8 @@ void __fastcall__ ria_push_long (unsigned long val);
 void __fastcall__ ria_push_int (unsigned int val);
 #define ria_push_char(v) RIA.xstack = v
 
-long __fastcall__ ria_pop_long (void);
-int __fastcall__ ria_pop_int (void);
+long ria_pop_long (void);
+int ria_pop_int (void);
 #define ria_pop_char() RIA.xstack
 
 /* Set the RIA fastcall register */
@@ -101,6 +100,7 @@ long __fastcall__ ria_call_long_errno (unsigned char op);
 #define RIA_OP_CODEPAGE 0x03
 #define RIA_OP_LRAND 0x04
 #define RIA_OP_STDIN_OPT 0x05
+#define RIA_OP_CLOCK 0x0F
 #define RIA_OP_CLOCK_GETRES 0x10
 #define RIA_OP_CLOCK_GETTIME 0x11
 #define RIA_OP_CLOCK_SETTIME 0x12
@@ -117,10 +117,12 @@ long __fastcall__ ria_call_long_errno (unsigned char op);
 
 /* C API for the operating system. */
 
+int __cdecl__ xregn (char device, char channel, unsigned char address, unsigned count,
+    ...);
 int __cdecl__ xreg (char device, char channel, unsigned char address, ...);
-int __fastcall__ phi2 (void);
-int __fastcall__ codepage (void);
-long __fastcall__ lrand (void);
+int phi2 (void);
+int codepage (void);
+long lrand (void);
 int __fastcall__ stdin_opt (unsigned long ctrl_bits, unsigned char str_length);
 int __fastcall__ read_xstack (void* buf, unsigned count, int fildes);
 int __fastcall__ read_xram (unsigned buf, unsigned count, int fildes);
diff --git a/include/sim65.h b/include/sim65.h
new file mode 100644
index 000000000..ef59955ff
--- /dev/null
+++ b/include/sim65.h
@@ -0,0 +1,136 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                 sim65.h                                   */
+/*                                                                           */
+/*              Definitions for the sim6502 and sim65c02 targets             */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2025 Sidney Cadot                                                     */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+#ifndef _SIM65_H
+#define _SIM65_H
+
+/* Check that we include this file  while compiling to a compatible target. */
+#if !defined(__SIM6502__) && !defined(__SIM65C02__)
+#  error This module may only be used when compiling for the sim6502 or sim65c02 targets!
+#endif
+
+#include <stdint.h>
+
+/* The sim65 targets (sim6502, sim65c02) have a peripheral memory aperture located at
+ * address range 0xFFC0 .. 0xFFDF. Currently, the following peripherals are located
+ * inside that memory apeture:
+ *
+ * $FFC0 .. $FFC9      "counter" peripheral
+ * $FFCA .. $FFCB      "sim65 control" peripheral
+ * $FFCC .. $FFDF      (currently unused)
+ *
+ * The "peripherals" structure below corresponds to the register layout of the currently
+ * defined peripherals in this memory range. Combined with the fact that the sim6502 and
+ * sim65c02 linker configuration files define the "peripherals" symbol to be fixed at
+ * address $FFC0, this provides easy-to-use and efficient access to the peripheral registers.
+ *
+ * After including "sim65.h", it is possible for a C program to do things like:
+ *
+ * {
+ *     peripherals.counter.latch = 0;
+ *     peripherals.sim65.cpu_mode = SIM65_CPU_MODE_6502X;
+ *     peripherals.sim65.trace_mode = SIM65_TRACE_MODE_ENABLE_FULL;
+ * }
+ *
+ * Note that "peripherals" variable is declared volatile. This instructs a C compiler to
+ * forego optimizations on memory accesses to the variable. However, CC65 currently ignores
+ * the volatile attribute. Fortunately, it is not smart with respect to optimizing
+ * memory accesses, so accessing the "peripherals" fields works fine in practice.
+ */
+
+extern volatile struct {
+    struct {
+        uint8_t  latch;
+        uint8_t  select;
+        union {
+            uint8_t  value   [8]; /* Access value as eight separate bytes.  */
+            uint16_t value16 [4]; /* Access value as four 16-bit words.     */
+            uint32_t value32 [2]; /* Access value as two 32-bit long words. */
+        };
+    } counter;
+    struct {
+        uint8_t  cpu_mode;
+        uint8_t  trace_mode;
+    } sim65;
+} peripherals;
+
+/* Values for the peripherals.counter.select field. */
+#define COUNTER_SELECT_CLOCKCYCLE_COUNTER    0x00
+#define COUNTER_SELECT_INSTRUCTION_COUNTER   0x01
+#define COUNTER_SELECT_IRQ_COUNTER           0x02
+#define COUNTER_SELECT_NMI_COUNTER           0x03
+#define COUNTER_SELECT_WALLCLOCK_TIME        0x80
+#define COUNTER_SELECT_WALLCLOCK_TIME_SPLIT  0x81
+
+/* Values for the peripherals.sim65.cpu_mode field. */
+#define SIM65_CPU_MODE_6502                  0x00
+#define SIM65_CPU_MODE_65C02                 0x01
+#define SIM65_CPU_MODE_6502X                 0x02
+
+/* Bitfield values for the peripherals.sim65.trace_mode field. */
+#define SIM65_TRACE_MODE_FIELD_INSTR_COUNTER   0x40
+#define SIM65_TRACE_MODE_FIELD_CLOCK_COUNTER   0x20
+#define SIM65_TRACE_MODE_FIELD_PC              0x10
+#define SIM65_TRACE_MODE_FIELD_INSTR_BYTES     0x08
+#define SIM65_TRACE_MODE_FIELD_INSTR_ASSEMBLY  0x04
+#define SIM65_TRACE_MODE_FIELD_CPU_REGISTERS   0x02
+#define SIM65_TRACE_MODE_FIELD_CC65_SP         0x01
+
+/* Values for the peripherals.sim65.trace_mode field that fully disable / enable tracing. */
+#define SIM65_TRACE_MODE_DISABLE               0x00
+#define SIM65_TRACE_MODE_ENABLE_FULL           0x7F
+
+/* Convenience macros to enable / disable tracing at runtime. */
+#define TRACE_ON()  do peripherals.sim65.trace_mode = SIM65_TRACE_MODE_ENABLE_FULL; while(0)
+#define TRACE_OFF() do peripherals.sim65.trace_mode = SIM65_TRACE_MODE_DISABLE;     while(0)
+
+/* Convenience macro to query the CPU mode at runtime. */
+#define GET_CPU_MODE() peripherals.sim65.cpu_mode
+
+/* Convenience macro to set the CPU mode at runtime.
+ *
+ * Use SIM65_CPU_MODE_6502, SIM65_CPU_MODE_65C02, or SIM65_CPU_MODE_6502 as argument.
+ *
+ * Important Note:
+ *
+ * When running in a program compiled for the "sim6502" target, it is safe to switch to
+ * 65C02 or 6502X mode, since the runtime library will only use plain 6502 opcodes, and
+ * those work the same in 65C02 and 6502X mode.
+ *
+ * However, when running in a program compiled for the "sim65c02" target, it is NOT safe
+ * to switch to 6502 or 6502X mode, since many routines in the runtime library use
+ * 65C02-specific opcodes, and these will not work as expected when the CPU is switched
+ * to 6502 or 6502X mode. When such an instruction is encountered, the program will
+ * exhibit undefined behavior.
+ */
+#define SET_CPU_MODE(mode)  do peripherals.sim65.cpu_mode = mode; while(0)
+
+/* End of sim65.h */
+#endif
diff --git a/include/stdint.h b/include/stdint.h
index 5d6f04769..6d51565e0 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -52,15 +52,15 @@ typedef unsigned char       uint8_t;
 typedef unsigned            uint16_t;
 typedef unsigned long       uint32_t;
 
-#define INT8_MIN            ((int8_t) 0x80)
-#define INT8_MAX            ((int8_t) 0x7F)
-#define INT16_MIN           ((int16_t) 0x8000)
-#define INT16_MAX           ((int16_t) 0x7FFF)
-#define INT32_MIN           ((int32_t) 0x80000000)
-#define INT32_MAX           ((int32_t) 0x7FFFFFFF)
-#define UINT8_MAX           ((uint8_t) 0xFF)
-#define UINT16_MAX          ((uint16_t) 0xFFFF)
-#define UINT32_MAX          ((uint32_t) 0xFFFFFFFF)
+#define INT8_MIN            -128
+#define INT8_MAX            127
+#define INT16_MIN           (-32767 - 1)
+#define INT16_MAX           32767
+#define INT32_MIN           (-2147483647L - 1L)
+#define INT32_MAX           2147483647L
+#define UINT8_MAX           255
+#define UINT16_MAX          65535U
+#define UINT32_MAX          4294967295UL
 
 /* Minimum-width integer types */
 typedef signed char         int_least8_t;
@@ -70,15 +70,15 @@ typedef unsigned char       uint_least8_t;
 typedef unsigned            uint_least16_t;
 typedef unsigned long       uint_least32_t;
 
-#define INT_LEAST8_MIN      ((int_least8_t) 0x80)
-#define INT_LEAST8_MAX      ((int_least8_t) 0x7F)
-#define INT_LEAST16_MIN     ((int_least16_t) 0x8000)
-#define INT_LEAST16_MAX     ((int_least16_t) 0x7FFF)
-#define INT_LEAST32_MIN     ((int_least32_t) 0x80000000)
-#define INT_LEAST32_MAX     ((int_least32_t) 0x7FFFFFFF)
-#define UINT_LEAST8_MAX     ((uint_least8_t) 0xFF)
-#define UINT_LEAST16_MAX    ((uint_least16_t) 0xFFFF)
-#define UINT_LEAST32_MAX    ((uint_least32_t) 0xFFFFFFFF)
+#define INT_LEAST8_MIN      INT8_MIN
+#define INT_LEAST8_MAX      INT8_MAX
+#define INT_LEAST16_MIN     INT16_MIN
+#define INT_LEAST16_MAX     INT16_MAX
+#define INT_LEAST32_MIN     INT32_MIN
+#define INT_LEAST32_MAX     INT32_MAX
+#define UINT_LEAST8_MAX     UINT8_MAX
+#define UINT_LEAST16_MAX    UINT16_MAX
+#define UINT_LEAST32_MAX    UINT32_MAX
 
 /* Fastest minimum-width integer types */
 typedef signed char         int_fast8_t;
@@ -88,40 +88,40 @@ typedef unsigned char       uint_fast8_t;
 typedef unsigned            uint_fast16_t;
 typedef unsigned long       uint_fast32_t;
 
-#define INT_FAST8_MIN       ((int_fast8_t) 0x80)
-#define INT_FAST8_MAX       ((int_fast8_t) 0x7F)
-#define INT_FAST16_MIN      ((int_fast16_t) 0x8000)
-#define INT_FAST16_MAX      ((int_fast16_t) 0x7FFF)
-#define INT_FAST32_MIN      ((int_fast32_t) 0x80000000)
-#define INT_FAST32_MAX      ((int_fast32_t) 0x7FFFFFFF)
-#define UINT_FAST8_MAX      ((uint_fast8_t) 0xFF)
-#define UINT_FAST16_MAX     ((uint_fast16_t) 0xFFFF)
-#define UINT_FAST32_MAX     ((uint_fast32_t) 0xFFFFFFFF)
+#define INT_FAST8_MIN       INT8_MIN
+#define INT_FAST8_MAX       INT8_MAX
+#define INT_FAST16_MIN      INT16_MIN
+#define INT_FAST16_MAX      INT16_MAX
+#define INT_FAST32_MIN      INT32_MIN
+#define INT_FAST32_MAX      INT32_MAX
+#define UINT_FAST8_MAX      UINT8_MAX
+#define UINT_FAST16_MAX     UINT16_MAX
+#define UINT_FAST32_MAX     UINT32_MAX
 
 /* Integer types capable of holding object pointers */
 typedef int                 intptr_t;
 typedef unsigned            uintptr_t;
 
-#define INTPTR_MIN          ((intptr_t)0x8000)
-#define INTPTR_MAX          ((intptr_t)0x7FFF)
-#define UINTPTR_MAX         ((uintptr_t) 0xFFFF)
+#define INTPTR_MIN          INT16_MIN
+#define INTPTR_MAX          INT16_MAX
+#define UINTPTR_MAX         UINT16_MAX
 
 /* Greatest width integer types */
 typedef long                intmax_t;
 typedef unsigned long       uintmax_t;
 
-#define INTMAX_MIN          ((intmax_t) 0x80000000)
-#define INTMAX_MAX          ((intmax_t) 0x7FFFFFFF)
-#define UINTMAX_MAX         ((uintmax_t) 0xFFFFFFFF)
+#define INTMAX_MIN          INT32_MIN
+#define INTMAX_MAX          INT32_MAX
+#define UINTMAX_MAX         UINT32_MAX
 
 /* Limits of other integer types */
-#define PTRDIFF_MIN         ((int) 0x8000)
-#define PTRDIFF_MAX         ((int) 0x7FFF)
+#define PTRDIFF_MIN         INT16_MIN
+#define PTRDIFF_MAX         INT16_MAX
 
-#define SIG_ATOMIC_MIN      ((unsigned char) 0x00)
-#define SIG_ATOMIC_MAX      ((unsigned char) 0xFF)
+#define SIG_ATOMIC_MIN      0
+#define SIG_ATOMIC_MAX      UINT8_MAX
 
-#define SIZE_MAX            0xFFFF
+#define SIZE_MAX            UINT16_MAX
 
 /* Macros for minimum width integer constants */
 #define INT8_C(c)           c
diff --git a/include/stdio.h b/include/stdio.h
index 012b8e2ba..35ebd7784 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -86,6 +86,10 @@ extern FILE* stderr;
 #  define FILENAME_MAX      (80+1)
 #elif defined(__TELESTRAT__)
 #  define FILENAME_MAX      (50+1)
+#elif defined(__SIM6502__)
+#  define FILENAME_MAX      (1024+1)
+#elif defined(__SIM65C02__)
+#  define FILENAME_MAX      (1024+1)
 #else
 #  define FILENAME_MAX      (16+1)
 #endif
diff --git a/include/string.h b/include/string.h
index abaf80e7d..3b7ece1d9 100644
--- a/include/string.h
+++ b/include/string.h
@@ -81,6 +81,7 @@ void __fastcall__ bzero (void* ptr, size_t n);                /* BSD */
 char* __fastcall__ strdup (const char* s);                    /* SYSV/BSD */
 int __fastcall__ stricmp (const char* s1, const char* s2);    /* DOS/Windows */
 int __fastcall__ strcasecmp (const char* s1, const char* s2); /* Same for Unix */
+char* __fastcall__ strcasestr (const char* str, const char* substr);
 int __fastcall__ strnicmp (const char* s1, const char* s2, size_t count);     /* DOS/Windows */
 int __fastcall__ strncasecmp (const char* s1, const char* s2, size_t count);  /* Same for Unix */
 size_t __fastcall__ strnlen (const char* s, size_t maxlen);     /* POSIX.1-2008 */
@@ -89,6 +90,7 @@ char* __fastcall__ strlower (char* s);
 char* __fastcall__ strupr (char* s);
 char* __fastcall__ strupper (char* s);
 char* __fastcall__ strqtok (char* s1, const char* s2);
+char* __fastcall__ stpcpy (char* dest, const char* src);
 #endif
 
 const char* __fastcall__ __stroserror (unsigned char errcode);
diff --git a/include/sys/stat.h b/include/sys/stat.h
index d8fc09c75..0e1589d52 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -2,7 +2,7 @@
 /*                                                                           */
 /*                                  stat.h                                   */
 /*                                                                           */
-/*              Constants for the mode argument of open and creat            */
+/*                             stat(2) definition                            */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
@@ -11,6 +11,9 @@
 /*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
+/* (C) 2023      Colin Leroy-Mira                                            */
+/* EMail:        colin@colino.net                                            */
+/*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
 /* warranty.  In no event will the authors be held liable for any damages    */
@@ -36,6 +39,10 @@
 #ifndef _STAT_H
 #define _STAT_H
 
+#include <time.h>
+#include <target.h>
+#include <sys/types.h>
+
 
 
 /*****************************************************************************/
@@ -47,6 +54,30 @@
 #define S_IREAD  0x01
 #define S_IWRITE 0x02
 
+#define S_IFMT   0x03
+
+struct stat {
+    dev_t           st_dev;
+    ino_t           st_ino;
+    mode_t          st_mode;
+    nlink_t         st_nlink;
+    uid_t           st_uid;
+    gid_t           st_gid;
+    off_t           st_size;
+    struct timespec st_atim;
+    struct timespec st_ctim;
+    struct timespec st_mtim;
+    #ifdef __APPLE2__
+    unsigned char   st_access;
+    unsigned char   st_type;
+    unsigned int    st_auxtype;
+    unsigned char   st_storagetype;
+    unsigned int    st_blocks;
+    struct datetime st_mtime;
+    struct datetime st_ctime;
+    #endif
+};
+
 
 
 /*****************************************************************************/
@@ -55,5 +86,9 @@
 
 
 
+int __fastcall__ stat (const char* pathname, struct stat* statbuf);
+
+
+
 /* End of stat.h */
 #endif
diff --git a/libsrc/apple2/rewinddir.c b/include/sys/statvfs.h
similarity index 69%
rename from libsrc/apple2/rewinddir.c
rename to include/sys/statvfs.h
index 3329852d8..d9edc2f23 100644
--- a/libsrc/apple2/rewinddir.c
+++ b/include/sys/statvfs.h
@@ -1,12 +1,13 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                               rewinddir.c                                 */
+/*                                  statvfs.h                                */
 /*                                                                           */
-/*                          Reset directory stream                           */
+/*                             statvfs(3) definition                         */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2005  Oliver Schmidt, <ol.sc@web.de>                                  */
+/* (C) 2023      Colin Leroy-Mira                                            */
+/* EMail:        colin@colino.net                                            */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -30,11 +31,32 @@
 
 
 
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <dirent.h>
-#include "dir.h"
+#ifndef _STATVFS_H
+#define _STATVFS_H
+
+#include <sys/types.h>
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+struct statvfs {
+    unsigned long     f_bsize;
+    unsigned long     f_frsize;
+    fsblkcnt_t        f_blocks;
+    fsblkcnt_t        f_bfree;
+    fsblkcnt_t        f_bavail;
+    fsfilcnt_t        f_files;
+    fsfilcnt_t        f_ffree;
+    fsfilcnt_t        f_favail;
+    unsigned long     f_fsid;
+    unsigned long     f_flag;
+    unsigned long     f_namemax;
+};
 
 
 
@@ -44,26 +66,9 @@
 
 
 
-void __fastcall__ rewinddir (register DIR* dir)
-{
-    /* Rewind directory file */
-    if (lseek (dir->fd, 0, SEEK_SET)) {
+int __fastcall__ statvfs (const char* pathname, struct statvfs* buf);
 
-        /* Read directory key block */
-        if (read (dir->fd,
-                  dir->block.bytes,
-                  sizeof (dir->block)) == sizeof (dir->block)) {
 
-            /* Skip directory header entry */
-            dir->current_entry = 1;
 
-            /* Return success */
-            return;
-        }
-    }
-
-    /* Assert that no subsequent readdir() finds an active entry */
-    memset (dir->block.bytes, 0, sizeof (dir->block));
-
-    /* Return failure */
-}
+/* End of statvfs.h */
+#endif
diff --git a/include/sys/types.h b/include/sys/types.h
index e75dd7d46..89b91c5b4 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -50,6 +50,46 @@
 typedef long int off_t;
 #endif
 
+#ifndef _HAVE_dev_t
+#define _HAVE_dev_t
+typedef unsigned long int dev_t;
+#endif
+
+#ifndef _HAVE_ino_t
+#define _HAVE_ino_t
+typedef unsigned long int ino_t;
+#endif
+
+#ifndef _HAVE_nlink_t
+#define _HAVE_nlink_t
+typedef unsigned long int nlink_t;
+#endif
+
+#ifndef _HAVE_uid_t
+#define _HAVE_uid_t
+typedef unsigned char uid_t;
+#endif
+
+#ifndef _HAVE_gid_t
+#define _HAVE_gid_t
+typedef unsigned char gid_t;
+#endif
+
+#ifndef _HAVE_mode_t
+#define _HAVE_mode_t
+typedef unsigned char mode_t;
+#endif
+
+#ifndef _HAVE_fsblkcnt_t
+#define _HAVE_fsblkcnt_t
+typedef unsigned long int fsblkcnt_t;
+#endif
+
+#ifndef _HAVE_fsfilcnt_t
+#define _HAVE_fsfilcnt_t
+typedef unsigned long int fsfilcnt_t;
+#endif
+
 
 
 /*****************************************************************************/
@@ -60,6 +100,3 @@ typedef long int off_t;
 
 /* End of types.h */
 #endif
-
-
-
diff --git a/include/target.h b/include/target.h
index 7663a39dd..5f9d8859c 100644
--- a/include/target.h
+++ b/include/target.h
@@ -37,6 +37,8 @@
 #  include <apple2enh.h>
 #elif defined(__APPLE2__)
 #  include <apple2.h>
+#elif defined(__AGAT__)
+#  include <agat.h>
 #elif defined(__ATARI__)
 #  include <atari.h>
 #elif defined(__ATARI2600__)
diff --git a/include/tgi.h b/include/tgi.h
index 2ef65b856..ecd98e6e8 100644
--- a/include/tgi.h
+++ b/include/tgi.h
@@ -141,15 +141,16 @@ unsigned char tgi_getmaxcolor (void);
 ** then be getmaxcolor()+1).
 */
 
-void __fastcall__ tgi_setcolor (unsigned char color);
-/* Set the current drawing color. */
+void __fastcall__ tgi_setcolor (unsigned char color_index);
+/* Set the current drawing color (palette index). */
 
 unsigned char tgi_getcolor (void);
-/* Return the current drawing color. */
+/* Return the current drawing color (palette index). */
 
 void __fastcall__ tgi_setpalette (const unsigned char* palette);
 /* Set the palette (not available with all drivers/hardware). palette is
-** a pointer to as many entries as there are colors.
+** a pointer to as many entries as there are colors required for the drivers
+** palette. This palette is the (only) place where to use the TGI_COLOR values.
 */
 
 const unsigned char* tgi_getpalette (void);
diff --git a/include/time.h b/include/time.h
index bfc2ac435..5eb6f144a 100644
--- a/include/time.h
+++ b/include/time.h
@@ -37,6 +37,11 @@
 #define _TIME_H
 
 
+/* Forward declaration for target.h */
+typedef unsigned long time_t;
+typedef unsigned long clock_t;
+
+
 
 /* NULL pointer */
 #ifndef NULL
@@ -49,9 +54,6 @@
 typedef unsigned size_t;
 #endif
 
-typedef unsigned long time_t;
-typedef unsigned long clock_t;
-
 /* Structure for broken down time */
 struct tm {
     int     tm_sec;
@@ -84,6 +86,8 @@ struct tm {
 #  define CLOCKS_PER_SEC        135   /* FIXME */
 #elif defined(__GEOS__)
 #  define CLOCKS_PER_SEC        1
+#elif defined (__RP6502__)
+#  define CLOCKS_PER_SEC        100
 #elif defined(__TELESTRAT__)
 #  define CLOCKS_PER_SEC        10
 #elif defined(__ATARI__) || defined (__LYNX__)
diff --git a/include/zx02.h b/include/zx02.h
new file mode 100644
index 000000000..b3e711d56
--- /dev/null
+++ b/include/zx02.h
@@ -0,0 +1,44 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                 zx02.h                                    */
+/*                                                                           */
+/*              Decompression routine for the 'zx02' format                  */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2022 DMSC                                                             */
+/*                                                                           */
+/*                                                                           */
+/* MIT license:                                                              */
+/* Permission is hereby granted, free of charge, to any person obtaining a   */
+/* copy of this software and associated documentation files (the “Software”),*/
+/* to deal in the Software without restriction, including without limitation */
+/* the rights to use, copy, modify, merge, publish, distribute, sublicense,  */
+/* and/or sell copies of the Software, and to permit persons to whom the     */
+/* Software is furnished to do so, subject to the following conditions:      */
+/*                                                                           */
+/* The above copyright notice and this permission notice shall be included   */
+/* in all copies or substantial portions of the Software.                    */
+/*                                                                           */
+/* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS   */
+/* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF                */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN */
+/* NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,  */
+/* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR     */
+/* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE */
+/* USE OR OTHER DEALINGS IN THE SOFTWARE.                                    */
+/*****************************************************************************/
+
+
+
+#ifndef _ZX02_H
+#define _ZX02_H
+
+void __fastcall__ decompress_zx02 (const unsigned char* src, unsigned char* const dst);
+/* Decompresses the source buffer into the destination buffer.
+** compress with zx02 input.bin output.zx02
+ */
+
+
+/* end of zx02.h */
+#endif
diff --git a/libsrc/Makefile b/libsrc/Makefile
index 8a4f11414..821ff8372 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -1,13 +1,31 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 ifneq ($(shell echo),)
   CMD_EXE = 1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+endif
+
 CBMS = c128   \
        c16    \
        c64    \
+       c65    \
        cbm510 \
        cbm610 \
        cx16   \
+       mega65 \
        pet    \
        plus4  \
        vic20
@@ -15,7 +33,8 @@ CBMS = c128   \
 GEOS = geos-apple \
        geos-cbm
 
-TARGETS = apple2       \
+TARGETS = agat         \
+          apple2       \
           apple2enh    \
           atari        \
           atarixl      \
@@ -124,7 +143,7 @@ zip:
 	$(foreach dir,$(OUTPUTDIRS),$(ZIP_recipe))
 
 $(TARGETS): | ../lib
-	@$(MAKE) --no-print-directory $@
+	@$(MAKE) $(PD) $@ $(PQ)
 
 # ../lib must be created globally before doing lib targets in parallel
 ../lib:
@@ -243,8 +262,8 @@ $1_DYNS = $$(patsubst $$($1_SRCPAT),$$($1_DYNPAT),$$($1_SRCS))
 $1_DRVS = $$(patsubst $$($1_DYNPAT),$$($1_DRVPAT),$$($1_DYNS))
 
 $$($1_STCPAT): $$($1_SRCPAT)
-	@echo $$(TARGET) - $$< - static
-	@$$(CA65) -t $$(TARGET) -D DYN_DRV=0 $$(CA65FLAGS) --create-dep $$(@:.o=.d) -o $$@ $$<
+	$$(if $$(QUIET),@echo $$(TARGET) - $$< - static)
+	$$(CA65) -t $$(TARGET) -D DYN_DRV=0 $$(CA65FLAGS) --create-dep $$(@:.o=.d) -o $$@ $$<
 
 OBJS += $$($1_STCS)
 DEPS += $$($1_STCS:.o=.d)
@@ -252,8 +271,8 @@ DEPS += $$($1_STCS:.o=.d)
 $$($1_DYNS): | $$($1_DYNDIR)
 
 $$($1_DRVPAT): $$($1_DYNPAT) $$(ZPOBJ) | $$($1_DRVDIR)
-	@echo $$(TARGET) - $$(<F)
-	@$$(LD65) -o $$@ -t module $$^
+	$$(if $$(QUIET),@echo $$(TARGET) - $$(<F))
+	$$(LD65) -o $$@ -t module $$^
 
 $$($1_DYNDIR) $$($1_DRVDIR):
 	@$$(call MKDIR,$$@)
@@ -275,16 +294,16 @@ export CC65_HOME := $(abspath ..)
 
 define ASSEMBLE_recipe
 
-$(if $(QUIET),,@echo $(TARGET) - $<)
-@$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $<
+    $(if $(QUIET),@echo $(TARGET) - $<)
+    $(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $<
 
 endef # ASSEMBLE_recipe
 
 define COMPILE_recipe
 
-$(if $(QUIET),,@echo $(TARGET) - $<)
-@$(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
-@$(CA65) -t $(TARGET) -o $@ $(@:.o=.s)
+    $(if $(QUIET),@echo $(TARGET) - $<)
+    $(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
+    $(CA65) -t $(TARGET) -o $@ $(@:.o=.s)
 
 endef # COMPILE_recipe
 
@@ -295,12 +314,13 @@ endef # COMPILE_recipe
 	$(COMPILE_recipe)
 
 $(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../libwrk/$(TARGET) ../lib
-	@echo $(TARGET) - $(<F)
+	$(if $(QUIET),@echo $(TARGET) - $(<F))
 	@$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:../lib/%.o=../libwrk/$(TARGET)/%.d) -o $@ $<
 
 $(EXTRA_OBJS): | ../lib
 
 ../lib/$(TARGET).lib: $(OBJS) | ../lib
+	$(if $(QUIET),@echo $(TARGET) - $<)
 	$(AR65) a $@ $?
 
 ../libwrk/$(TARGET) ../target/$(TARGET)/util:
diff --git a/libsrc/NameClashes.md b/libsrc/NameClashes.md
new file mode 100644
index 000000000..ef2105602
--- /dev/null
+++ b/libsrc/NameClashes.md
@@ -0,0 +1,380 @@
+List of cc65 library name clashes
+=================================
+
+The following is a list of identifiers that might need
+to be fixed, sorted by directory and identifier:
+
+# common
+
+## \_\_argc
+
+* libsrc/runtime/callmain.s
+* libsrc/cbm610/mainargs.s
+* libsrc/cx16/mainargs.s
+* libsrc/plus4/mainargs.s
+* libsrc/lynx/mainargs.s
+* libsrc/c16/mainargs.s
+* libsrc/geos-common/system/mainargs.s
+* libsrc/sim6502/mainargs.s
+* libsrc/c128/mainargs.s
+* libsrc/vic20/mainargs.s
+* libsrc/nes/mainargs.s
+* libsrc/atari/getargs.s
+* libsrc/apple2/mainargs.s
+* libsrc/cbm510/mainargs.s
+* libsrc/telestrat/mainargs.s
+* libsrc/c64/mainargs.s
+* libsrc/pet/mainargs.s
+* libsrc/atmos/mainargs.s
+
+## \_\_argv
+
+* libsrc/runtime/callmain.s
+* libsrc/cbm610/mainargs.s
+* libsrc/cx16/mainargs.s
+* libsrc/plus4/mainargs.s
+* libsrc/lynx/mainargs.s
+* libsrc/c16/mainargs.s
+* libsrc/geos-common/system/mainargs.s
+* libsrc/sim6502/mainargs.s
+* libsrc/c128/mainargs.s
+* libsrc/vic20/mainargs.s
+* libsrc/nes/mainargs.s
+* libsrc/atari/getargs.s
+* libsrc/apple2/mainargs.s
+* libsrc/cbm510/mainargs.s
+* libsrc/telestrat/mainargs.s
+* libsrc/c64/mainargs.s
+* libsrc/pet/mainargs.s
+* libsrc/atmos/mainargs.s
+
+## \_\_cos
+
+* libsrc/common/sincos.s
+
+## \_\_ctypeidx
+
+* libsrc/common/ctype.s
+* libsrc/common/ctypemask.s
+* libsrc/geos-common/system/ctype.s
+* libsrc/atari/ctype.s
+* libsrc/cbm/ctype.s
+* libsrc/atmos/ctype.s
+* asminc/ctype\_common.inc
+
+## \_\_cwd
+
+* libsrc/common/getcwd.s
+* libsrc/common/_cwd.s
+* libsrc/atari/initcwd.s
+* libsrc/apple2/initcwd.s
+* libsrc/apple2/initcwd.s
+* libsrc/telestrat/initcwd.s
+* libsrc/cbm/initcwd.s
+
+## \_\_cwd\_buf\_size
+
+* libsrc/common/_cwd.s
+
+## \_\_envcount
+
+* libsrc/common/searchenv.s
+* libsrc/common/_environ.s
+* libsrc/common/putenv.s
+* libsrc/common/getenv.s
+
+## \_\_environ
+
+* libsrc/common/searchenv.s
+* libsrc/common/_environ.s
+* libsrc/common/putenv.s
+* libsrc/common/getenv.s
+
+## \_\_envsize
+
+* libsrc/common/_environ.s
+* libsrc/common/putenv.s
+
+## \_\_fdesc
+
+* libsrc/common/_fdesc.s
+* libsrc/common/fopen.s
+
+## \_\_filetab
+
+* libsrc/common/_fdesc.s
+* libsrc/common/_file.s
+* asminc/_file.inc
+
+## \_\_fopen
+
+* libsrc/common/fopen.s
+* libsrc/common/_fopen.s
+
+## \_\_printf
+
+* libsrc/common/vsnprintf.s
+* libsrc/common/_printf.s
+* libsrc/common/vfprintf.s
+* libsrc/conio/vcprintf.s
+* libsrc/pce/_printf.s
+
+## \_\_scanf
+
+* libsrc/common/_scanf.inc
+* libsrc/common/vsscanf.s
+* libsrc/conio/vcscanf.s
+
+## \_\_sin
+
+* libsrc/common/sincos.s
+
+## \_\_sys
+
+* libsrc/common/_sys.s
+* libsrc/apple2/_sys.s
+
+## \_\_sys\_oserrlist
+
+* libsrc/common/stroserr.s
+* libsrc/geos-common/system/oserrlist.s
+* libsrc/atari/oserrlist.s
+* libsrc/apple2/oserrlist.s
+* libsrc/cbm/oserrlist.s
+* libsrc/atmos/oserrlist.s
+
+## \_\_syschdir
+
+* libsrc/common/chdir.s
+* libsrc/atari/syschdir.s
+* libsrc/apple2/syschdir.s
+* libsrc/telestrat/syschdir.s
+* libsrc/cbm/syschdir.s
+
+## \_\_sysmkdir
+
+* libsrc/common/mkdir.s
+* libsrc/atari/sysmkdir.s
+* libsrc/apple2/sysmkdir.s
+* libsrc/telestrat/sysmkdir.s
+
+## \_\_sysremove
+
+* libsrc/common/remove.s
+* libsrc/geos-common/file/sysremove.s
+* libsrc/atari/sysremove.s
+* libsrc/atari/sysrmdir.s
+* libsrc/apple2/sysremove.s
+* libsrc/apple2/sysrmdir.s
+* libsrc/telestrat/sysremove.s
+* libsrc/cbm/sysremove.s
+
+## \_\_sysrename
+
+* libsrc/common/rename.s
+* libsrc/geos-common/file/sysrename.s
+* libsrc/atari/sysrename.s
+* libsrc/apple2/sysrename.s
+* libsrc/cbm/sysrename.s
+
+## \_\_sysrmdir
+
+* libsrc/common/rmdir.s
+* libsrc/atari/sysrmdir.s
+* libsrc/apple2/sysrmdir.s
+
+\_\_sysuname
+
+* libsrc/common/uname.s
+* libsrc/cbm610/sysuname.s
+* libsrc/cx16/sysuname.s
+* libsrc/plus4/sysuname.s
+* libsrc/lynx/sysuname.s
+* libsrc/c16/sysuname.s
+* libsrc/geos-common/system/sysuname.s
+* libsrc/c128/sysuname.s
+* libsrc/creativision/sysuname.s
+* libsrc/vic20/sysuname.s
+* libsrc/nes/sysuname.s
+* libsrc/atari/sysuname.s
+* libsrc/apple2/sysuname.s
+* libsrc/cbm510/sysuname.s
+* libsrc/telestrat/sysuname.s
+* libsrc/c64/sysuname.s
+* libsrc/pet/sysuname.s
+* libsrc/atari5200/sysuname.s
+* libsrc/atmos/sysuname.s
+
+# apple2
+
+## \_\_auxtype
+
+* libsrc/apple2/open.s
+
+## \_\_datetime
+
+* libsrc/apple2/open.s
+
+## \_\_dos\_type
+
+* libsrc/apple2/dioopen.s
+* libsrc/apple2/curdevice.s
+* libsrc/apple2/mainargs.s
+* libsrc/apple2/settime.s
+* libsrc/apple2/getdevice.s
+* libsrc/apple2/dosdetect.s
+* libsrc/apple2/irq.s
+* libsrc/apple2/open.s
+* libsrc/apple2/mli.s
+* libsrc/apple2/getres.s
+
+## \_\_filetype
+
+* libsrc/apple2/open.s
+* libsrc/apple2/exehdr.s
+
+## atari
+
+## \_\_defdev
+
+* libsrc/atari/posixdirent.s
+* libsrc/atari/ucase\_fn.s
+* libsrc/atari/getdefdev.s
+
+## \_\_dos\_type
+
+* libsrc/atari/getargs.s
+* libsrc/atari/exec.s
+* libsrc/atari/settime.s
+* libsrc/atari/syschdir.s
+* libsrc/atari/dosdetect.s
+* libsrc/atari/is\_cmdline\_dos.s
+* libsrc/atari/sysrmdir.s
+* libsrc/atari/gettime.s
+* libsrc/atari/lseek.s
+* libsrc/atari/getres.s
+* libsrc/atari/getdefdev.s
+
+## \_\_do\_oserror
+
+* libsrc/atari/posixdirent.s
+* libsrc/atari/do\_oserr.s
+* libsrc/atari/serref.s
+* libsrc/atari/read.s
+* libsrc/atari/write.s
+* libsrc/atari/close.s
+
+## \_\_getcolor
+
+* libsrc/atari/setcolor.s
+
+## \_\_getdefdev
+
+* libsrc/atari/getdefdev.s
+
+## \_\_graphics
+
+* libsrc/atari/graphics.s
+
+## \_\_inviocb
+
+* libsrc/atari/serref.s
+* libsrc/atari/ser/atrrdev.s
+* libsrc/atari/inviocb.s
+* libsrc/atari/read.s
+* libsrc/atari/write.s
+* libsrc/atari/lseek.s
+* libsrc/atari/close.s
+
+## \_\_is\_cmdline\_dos
+
+* libsrc/atari/is\_cmdline\_dos.s
+* libsrc/atari/doesclrscr.s
+
+## \_\_rest\_vecs
+
+* libsrc/atari/savevec.s
+
+## \_\_rwsetup
+
+* libsrc/atari/rwcommon.s
+* libsrc/atari/read.s
+* libsrc/atari/write.s
+
+## \_\_save\_vecs
+
+* libsrc/atari/savevec.s
+
+## \_\_scroll
+
+* libsrc/atari/scroll.s
+
+## \_\_setcolor
+
+* libsrc/atari/setcolor.s
+
+## \_\_setcolor\_low
+
+* libsrc/atari/setcolor.s
+
+## \_\_sio\_call
+
+* libsrc/atari/diowritev.s
+* libsrc/atari/diopncls.s
+* libsrc/atari/siocall.s
+* libsrc/atari/diowrite.s
+* libsrc/atari/dioread.s
+
+# cbm
+
+## \_\_cbm\_filetype
+
+* libsrc/cbm/cbm\_filetype.s
+* asminc/cbm\_filetype.in
+
+## \_\_dirread
+
+* libsrc/cbm/dir.inc
+* libsrc/cbm/dir.s
+
+## \_\_dirread1
+
+* libsrc/cbm/dir.inc
+* libsrc/cbm/dir.s
+
+# lynx
+
+## \_\_iodat
+
+* libsrc/lynx/lynx-cart.s
+* libsrc/lynx/bootldr.s
+* libsrc/lynx/extzp.s
+* libsrc/lynx/crt0.s
+* libsrc/lynx/extzp.inc
+
+## \_\_iodir
+
+* libsrc/lynx/extzp.s
+* libsrc/lynx/crt0.s
+* libsrc/lynx/extzp.inc
+
+## \_\_sprsys
+
+* libsrc/lynx/tgi/lynx-160-102-16.s
+* libsrc/lynx/extzp.s
+* libsrc/lynx/crt0.s
+* libsrc/lynx/extzp.inc
+
+## \_\_viddma
+
+* libsrc/lynx/tgi/lynx-160-102-16.s
+* libsrc/lynx/extzp.s
+* libsrc/lynx/crt0.s
+* libsrc/lynx/extzp.inc
+
+# pce
+
+## \_\_nmi
+
+* libsrc/pce/irq.s
+* libsrc/pce/crt0.s
diff --git a/libsrc/agat/_scrsize.s b/libsrc/agat/_scrsize.s
new file mode 100644
index 000000000..09d7e879f
--- /dev/null
+++ b/libsrc/agat/_scrsize.s
@@ -0,0 +1,23 @@
+;
+; Ullrich von Bassewitz, 26.10.2000
+; Konstantin Fedorov, 12.06.2025
+;
+; Screen size variables
+;
+
+        .export         screensize
+
+        .include        "agat.inc"
+
+screensize:
+        lda    WNDWDTH
+        bit    TATTR
+        bmi    t64
+        lsr
+t64:
+        tax
+        lda    WNDBTM
+        sec
+        sbc    WNDTOP
+        tay
+        rts
diff --git a/libsrc/agat/break.s b/libsrc/agat/break.s
new file mode 100644
index 000000000..d46679ba2
--- /dev/null
+++ b/libsrc/agat/break.s
@@ -0,0 +1,113 @@
+;
+; Ullrich von Bassewitz, 27.09.1998
+; Oleg A. Odintsov, Moscow, 2024
+;
+; void __fastcall__ set_brk (unsigned Addr);
+; void reset_brk (void);
+;
+
+        .export         _set_brk, _reset_brk
+        .destructor     _reset_brk
+
+        ; Be sure to export the following variables absolute
+        .export         _brk_a: abs, _brk_x: abs, _brk_y: abs
+        .export         _brk_sr: abs, _brk_pc: abs
+
+        .include        "agat.inc"
+
+_brk_a = $45
+_brk_x = $46
+_brk_y = $47
+_brk_sr = $48
+_brk_sp = $49
+_brk_pc = $3A
+
+.bss
+oldvec:         .res    2               ; Old vector
+
+
+.data
+uservec:        jmp     $FFFF           ; Patched at runtime
+
+
+.code
+
+; Set the break vector
+.proc   _set_brk
+
+        sta     uservec+1
+        stx     uservec+2       ; Set the user vector
+
+        lda     oldvec
+        ora     oldvec+1        ; Did we save the vector already?
+        bne     L1              ; Jump if we installed the handler already
+
+        lda     BRKVec
+        sta     oldvec
+        lda     BRKVec+1
+        sta     oldvec+1        ; Save the old vector
+
+L1:     lda     #<brk_handler   ; Set the break vector to our routine
+        ldx     #>brk_handler
+        sta     BRKVec
+        stx     BRKVec+1
+        rts
+
+.endproc
+
+
+; Reset the break vector
+.proc   _reset_brk
+
+        lda     oldvec
+        ldx     oldvec+1
+        beq     @L9             ; Jump if vector not installed
+        sta     BRKVec
+        stx     BRKVec+1
+        lda     #$00
+        sta     oldvec          ; Clear the old vector
+        stx     oldvec+1
+@L9:    rts
+
+.endproc
+
+
+
+; Break handler, called if a break occurs
+
+.proc   brk_handler
+
+        sec
+        lda     _brk_pc
+        sbc     #$02            ; Point to start of brk
+        sta     _brk_pc
+        lda     _brk_pc+1
+        sbc     #$00
+        sta     _brk_pc+1
+
+        clc
+        lda     _brk_sp
+        adc     #$04            ; Adjust stack pointer
+        sta     _brk_sp
+
+        lda     _brk_sr         ; Clear brk
+        and     #$EF
+        sta     _brk_sr
+
+        jsr     uservec         ; Call the user's routine
+
+        lda     _brk_pc+1
+        pha
+        lda     _brk_pc
+        pha
+        lda     _brk_sr
+        pha
+
+        ldx     _brk_x
+        ldy     _brk_y
+        lda     _brk_a
+
+        rti                     ; Jump back...
+
+.endproc
+
diff --git a/libsrc/agat/cclear.s b/libsrc/agat/cclear.s
new file mode 100644
index 000000000..93a561ef4
--- /dev/null
+++ b/libsrc/agat/cclear.s
@@ -0,0 +1,18 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+;
+; void __fastcall__ cclear (unsigned char length);
+;
+
+    .export     _cclear
+    .import     COUT
+    .include    "zeropage.inc"
+
+_cclear:
+    sta    ptr1
+    lda    #$A0
+next:
+    jsr    COUT
+    dec    ptr1
+    bne    next
+    rts
diff --git a/libsrc/agat/cgetc.s b/libsrc/agat/cgetc.s
new file mode 100644
index 000000000..839e4314a
--- /dev/null
+++ b/libsrc/agat/cgetc.s
@@ -0,0 +1,23 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+;
+; char cgetc (void);
+;
+
+    .export     _cgetc
+    .import     cursor
+    .include    "agat.inc"
+
+_cgetc:
+    lda    #$DF ; _
+    bit    cursor
+    bne    hascur
+    lda    #$00
+hascur:
+    sta    CURSOR
+    jsr    j1
+    cmp    #$A0
+    bpl    :+
+    and    #$7F
+:   rts
+j1: jmp    (VCIN)
diff --git a/libsrc/agat/chline.s b/libsrc/agat/chline.s
new file mode 100644
index 000000000..bc95b2a16
--- /dev/null
+++ b/libsrc/agat/chline.s
@@ -0,0 +1,33 @@
+;
+; Ullrich von Bassewitz, 08.08.1998
+; Colin Leroy-Mira, 26.05.2025
+; Konstantin Fedorov, 12.06.2025
+;
+; void chlinexy (unsigned char x, unsigned char y, unsigned char length);
+; void chline (unsigned char length);
+;
+
+        .export         _chlinexy, _chline, chlinedirect
+        .import         gotoxy, putchar
+
+        .include        "zeropage.inc"
+
+_chlinexy:
+        pha                     ; Save the length
+        jsr     gotoxy          ; Call this one, will pop params
+        pla                     ; Restore the length and run into _chline
+
+_chline:
+        ldx     #$1B            ; horizontal line character
+
+chlinedirect:
+        stx     tmp1
+        cmp     #$00            ; Is the length zero?
+        beq     done            ; Jump if done
+        sta     tmp2
+:       lda     tmp1            ; Screen code
+        jsr     putchar         ; Direct output
+        dec     tmp2
+        bne     :-
+done:   rts
+
diff --git a/libsrc/agat/clrscr.s b/libsrc/agat/clrscr.s
new file mode 100644
index 000000000..8b2d7100b
--- /dev/null
+++ b/libsrc/agat/clrscr.s
@@ -0,0 +1,10 @@
+;
+; Kevin Ruland
+;
+; void clrscr (void);
+;
+
+    .export    _clrscr
+    .import    HOME
+
+_clrscr := HOME
diff --git a/libsrc/agat/color.s b/libsrc/agat/color.s
new file mode 100644
index 000000000..0992bb860
--- /dev/null
+++ b/libsrc/agat/color.s
@@ -0,0 +1,20 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+;
+; unsigned char __fastcall__ textcolor (unsigned char color);
+;
+
+
+    .export     _textcolor
+    .include    "agat.inc"
+
+
+_textcolor:
+    ldx    TATTR
+    eor    TATTR
+    and    #$07
+    eor    TATTR
+    sta    TATTR
+    txa
+    and    #$0F
+    rts
diff --git a/libsrc/agat/cout.s b/libsrc/agat/cout.s
new file mode 100644
index 000000000..ae9d8a177
--- /dev/null
+++ b/libsrc/agat/cout.s
@@ -0,0 +1,14 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+;
+; COUT routine
+;
+
+    .export     COUT
+    .include    "agat.inc"
+
+COUT:
+        cmp    #$10
+        bpl    out
+        ora    #$80
+out:    jmp    (VCOUT)
diff --git a/libsrc/agat/cputc.s b/libsrc/agat/cputc.s
new file mode 100644
index 000000000..b82ce22e6
--- /dev/null
+++ b/libsrc/agat/cputc.s
@@ -0,0 +1,60 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+; Konstantin Fedorov, 12.06.2025
+;
+; void __fastcall__ cputcxy (unsigned char x, unsigned char y, char c);
+; void __fastcall__ cputc (char c);
+;
+
+    .import     COUT
+    .export     _cputcxy, _cputc, newline, putchar,putchardirect
+    .import     gotoxy, VTABZ
+    .include    "agat.inc"
+
+_cputcxy:
+    pha
+    jsr    gotoxy
+    pla
+_cputc:
+    cmp    #$0D         ; Test for \r = carriage return
+    bne    notleft
+    ldy    #$00
+    sty    CH
+    rts
+notleft:
+    cmp    #$0A         ; Test for \n = line feed
+    beq    newline
+
+putchar:
+    ldy    CH
+    sta    (BASL),Y
+    iny
+    lda    TATTR
+    bmi    wch          ; Skip if t64
+    sta    (BASL),Y
+    iny
+wch:
+    sty    CH
+    cpy    WNDWDTH
+    bcc    noend
+    ldy    #$00
+    sty    CH
+newline:
+    inc    CV
+    lda    CV
+    cmp    WNDBTM
+    bcc    :+
+    lda    WNDTOP
+    sta    CV
+:   jmp    VTABZ
+noend:
+    rts
+
+putchardirect:
+    ldy    CH
+    sta    (BASL),Y
+    lda    TATTR
+    bmi    :+
+    iny
+    sta    (BASL),Y
+:   rts
diff --git a/libsrc/agat/crt0.s b/libsrc/agat/crt0.s
new file mode 100644
index 000000000..eaca89308
--- /dev/null
+++ b/libsrc/agat/crt0.s
@@ -0,0 +1,78 @@
+;
+; Startup code for cc65 (Agat version)
+;
+
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
+        .export         _exit
+
+        .import         initlib, donelib
+        .import         zerobss, callmain
+        .import         __ONCE_LOAD__, __ONCE_SIZE__    ; Linker generated
+
+        .include        "zeropage.inc"
+        .include        "agat.inc"
+
+; ------------------------------------------------------------------------
+
+    .segment        "STARTUP"
+    jsr    init
+    jsr    zerobss
+    jsr    callmain
+_exit:
+    ldx    #<exit
+    lda    #>exit
+    jsr    reset
+    jsr    donelib
+exit:
+    ldx    #$02
+:   lda    rvsave,x
+    sta    SOFTEV,x
+    dex
+    bpl    :-
+    ldx    #zpspace-1
+:   lda    zpsave,x
+    sta    c_sp,x
+    dex
+    bpl    :-
+    ldx    #$FF
+    txs
+    jmp    DOSWARM
+
+
+
+    .segment    "ONCE"
+
+init:
+    ldx    #zpspace-1
+:   lda    c_sp,x
+    sta    zpsave,x
+    dex
+    bpl    :-
+
+    ldx    #$02
+:   lda    SOFTEV,x
+    sta    rvsave,x
+    dex
+    bpl    :-
+
+    lda    HIMEM
+    ldx    HIMEM+1
+    sta    c_sp
+    stx    c_sp+1
+    ldx    #<_exit
+    lda    #>_exit
+    jsr    reset
+    jmp    initlib
+
+    .code
+
+reset:
+    stx    SOFTEV
+    sta    SOFTEV+1
+    eor    #$A5
+    sta    PWREDUP
+    rts
+
+    .segment    "INIT"
+zpsave:    .res    zpspace
+rvsave:    .res    3
diff --git a/libsrc/agat/cvline.s b/libsrc/agat/cvline.s
new file mode 100644
index 000000000..63c0d4daf
--- /dev/null
+++ b/libsrc/agat/cvline.s
@@ -0,0 +1,29 @@
+;
+; Ullrich von Bassewitz, 08.08.1998
+; Colin Leroy-Mira, 26.05.2025
+; Konstantin Fedorov, 12.06.2025
+;
+; void cvlinexy (unsigned char x, unsigned char y, unsigned char length);
+; void cvline (unsigned char length);
+;
+
+        .export         _cvlinexy, _cvline
+        .import         gotoxy, putchardirect, newline
+
+        .include        "zeropage.inc"
+
+_cvlinexy:
+        pha                     ; Save the length
+        jsr     gotoxy          ; Call this one, will pop params
+        pla                     ; Restore the length and run into _cvline
+
+_cvline:
+        cmp     #$00            ; Is the length zero?
+        beq     done            ; Jump if done
+        sta     tmp2
+:       lda     #$5C            ; vertical line character
+        jsr     putchardirect   ; Write, no cursor advance
+        jsr     newline         ; Advance cursor to next line
+        dec     tmp2
+        bne     :-
+done:   rts
diff --git a/libsrc/agat/exehdr.s b/libsrc/agat/exehdr.s
new file mode 100644
index 000000000..3f3047bf9
--- /dev/null
+++ b/libsrc/agat/exehdr.s
@@ -0,0 +1,43 @@
+;
+; Oliver Schmidt, 2012-06-10
+;
+; This module supplies an AppleSingle version 2 file header + entry with
+; ID 11 according to https://tools.ietf.org/rfc/rfc1740.txt Appendix A.
+;
+; Agat target uses this header only for compatibility with Apple Commander
+; because Agat's 140K disk filesystem is identical to Apple II DOS 3.3 and
+; "ac.jar -as" option can be used to import binaries into disk images.
+
+        .export         __EXEHDR__ : absolute = 1       ; Linker referenced
+        .import         __FILETYPE__                    ; Linker generated
+        .import         __MAIN_START__, __MAIN_LAST__   ; Linker generated
+
+; ------------------------------------------------------------------------
+
+; Data Fork
+ID01_LENGTH = __MAIN_LAST__ - __MAIN_START__
+ID01_OFFSET = ID01 - START
+
+; ProDOS File Info
+ID11_LENGTH = ID01 - ID11
+ID11_OFFSET = ID11 - START
+
+; ------------------------------------------------------------------------
+
+        .segment        "EXEHDR"
+
+START:  .byte           $00, $05, $16, $00                  ; Magic number
+        .byte           $00, $02, $00, $00                  ; Version number
+        .res            16                                  ; Filler
+        .byte           0, 2                                ; Number of entries
+        .byte           0, 0, 0, 1                          ; Entry ID 1 - Data Fork
+        .byte           0, 0, >ID01_OFFSET, <ID01_OFFSET    ; Offset
+        .byte           0, 0, >ID01_LENGTH, <ID01_LENGTH    ; Length
+        .byte           0, 0, 0, 11                         ; Entry ID 11 - ProDOS File Info
+        .byte           0, 0, >ID11_OFFSET, <ID11_OFFSET    ; Offset
+        .byte           0, 0, >ID11_LENGTH, <ID11_LENGTH    ; Length
+ID11:   .byte           0, %11000011                        ; Access - Destroy, Rename, Write, Read
+        .byte           >__FILETYPE__, <__FILETYPE__        ; File Type
+        .byte           0, 0                                ; Auxiliary Type high
+        .byte           >__MAIN_START__, <__MAIN_START__    ; Auxiliary Type low
+ID01:
diff --git a/libsrc/agat/gotoxy.s b/libsrc/agat/gotoxy.s
new file mode 100644
index 000000000..13e7cb747
--- /dev/null
+++ b/libsrc/agat/gotoxy.s
@@ -0,0 +1,28 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+; Oleg A. Odintsov, Moscow, 2024
+;
+; void __fastcall__ gotoxy (unsigned char x, unsigned char y);
+; void __fastcall__ gotox (unsigned char x);
+;
+
+        .export         gotoxy, _gotoxy, _gotox
+        .import         popa, VTABZ
+
+        .include        "agat.inc"
+
+gotoxy:
+    jsr    popa            ; Get Y
+_gotoxy:
+    clc
+    adc    WNDTOP
+    sta    CV              ; Store Y
+    jsr    VTABZ
+    jsr    popa            ; Get X
+_gotox:
+    bit    TATTR
+    bmi    t64
+    asl
+t64:
+    sta     CH              ; Store X
+    rts
diff --git a/libsrc/agat/gotoy.s b/libsrc/agat/gotoy.s
new file mode 100644
index 000000000..ea0eadbf2
--- /dev/null
+++ b/libsrc/agat/gotoy.s
@@ -0,0 +1,16 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+; Oleg A. Odintsov, Moscow, 2024
+;
+; void __fastcall__ gotoy (unsigned char y);
+;
+
+    .import     VTABZ
+    .export     _gotoy
+    .include    "agat.inc"
+
+_gotoy:
+    clc
+    adc    WNDTOP
+    sta    CV
+    jmp    VTABZ
diff --git a/libsrc/agat/home.s b/libsrc/agat/home.s
new file mode 100644
index 000000000..a0434c9bb
--- /dev/null
+++ b/libsrc/agat/home.s
@@ -0,0 +1,15 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+;
+; HOME routine
+;
+
+        .export         HOME
+        .import         COUT
+
+        .include        "agat.inc"
+
+HOME:
+    lda    #$8C
+    jmp    COUT
+    rts
diff --git a/libsrc/agat/kbhit.s b/libsrc/agat/kbhit.s
new file mode 100644
index 000000000..f2bc4fc9f
--- /dev/null
+++ b/libsrc/agat/kbhit.s
@@ -0,0 +1,19 @@
+;
+; Kevin Ruland
+; Ullrich von Bassewitz, 2005-03-25
+; Oleg A. Odintsov, Moscow, 2024
+;
+; unsigned char kbhit (void);
+;
+
+        .export _kbhit
+
+        .include "agat.inc"
+
+_kbhit:
+        lda     KBD             ; Reading KBD checks for keypress
+        rol                     ; if high bit is set, key was pressed
+        lda     #$00
+        tax
+        rol
+        rts
diff --git a/libsrc/agat/randomize.s b/libsrc/agat/randomize.s
new file mode 100644
index 000000000..9eef16f05
--- /dev/null
+++ b/libsrc/agat/randomize.s
@@ -0,0 +1,18 @@
+;
+; Ullrich von Bassewitz, 07.11.2002
+; Oleg A. Odintsov, Moscow, 2024
+;
+; void _randomize (void);
+; /* Initialize the random number generator */
+;
+
+        .export         __randomize
+        .import         _srand
+
+        .include        "agat.inc"
+
+__randomize:
+        ldx     RNDH            ; Use random value supplied by ROM
+        lda     RNDL
+        jmp     _srand          ; Initialize generator
+
diff --git a/libsrc/agat/revers.s b/libsrc/agat/revers.s
new file mode 100644
index 000000000..20c1b9bdb
--- /dev/null
+++ b/libsrc/agat/revers.s
@@ -0,0 +1,38 @@
+;
+; Ullrich von Bassewitz, 2005-03-28
+; Oleg A. Odintsov, Moscow, 2024
+;
+; unsigned char __fastcall__ revers (unsigned char onoff)
+; unsigned char __fastcall__ flash (unsigned char onoff)
+;
+
+    .export    _revers, _flash
+
+    .include    "agat.inc"
+
+_revers:
+    tax
+    beq    noinv
+    lda    TATTR
+    and    #$D7
+    sta    TATTR
+    rts
+noinv:
+    lda    TATTR
+    ora    #$20
+    sta    TATTR
+    rts
+
+_flash:
+    tax
+    beq    noflash
+    lda    TATTR
+    and    #$DF
+    ora    #$08
+    sta    TATTR
+    rts
+noflash:
+    lda    TATTR
+    ora    #$20
+    sta    TATTR
+    rts
diff --git a/libsrc/agat/sysuname.s b/libsrc/agat/sysuname.s
new file mode 100644
index 000000000..b2d2a334f
--- /dev/null
+++ b/libsrc/agat/sysuname.s
@@ -0,0 +1,37 @@
+;
+; Ullrich von Bassewitz, 2003-08-12
+;
+; unsigned char __fastcall__ _sysuname (struct utsname* buf);
+;
+
+        .export         __sysuname, utsdata
+
+        .import         utscopy
+
+        __sysuname = utscopy
+
+;--------------------------------------------------------------------------
+; Data. We define a fixed utsname struct here and just copy it.
+
+.rodata
+
+utsdata:
+        ; sysname
+        .asciiz         "cc65"
+
+        ; nodename
+        .asciiz         ""
+
+        ; release
+        .byte           .string (>.version)
+        .byte           '.'
+        .byte           .string (<.version)
+        .byte           $00
+
+        ; version
+        .byte           '0'     ; unused
+        .byte           $00
+
+        ; machine
+        .asciiz         "Agat"
+
diff --git a/libsrc/agat/vtabz.s b/libsrc/agat/vtabz.s
new file mode 100644
index 000000000..88166eb35
--- /dev/null
+++ b/libsrc/agat/vtabz.s
@@ -0,0 +1,24 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+;
+; VTABZ routine
+;
+
+    .export     VTABZ
+    .include    "agat.inc"
+
+VTABZ:
+    lda    CV
+    ror
+    ror
+    ror
+    and    #$C0
+    sta    BASL
+    lda    CV
+    lsr
+    lsr
+    eor    BASH
+    and    #$07
+    eor    BASH
+    sta    BASH
+    rts
diff --git a/libsrc/agat/wherex.s b/libsrc/agat/wherex.s
new file mode 100644
index 000000000..a83f7cd75
--- /dev/null
+++ b/libsrc/agat/wherex.s
@@ -0,0 +1,19 @@
+;
+; Kevin Ruland
+; Oleg A. Odintsov, Moscow, 2024
+;
+; unsigned char wherex (void);
+;
+
+        .export         _wherex
+
+        .include        "agat.inc"
+
+_wherex:
+    lda    CH
+    bit    TATTR
+    bmi    t64
+    lsr
+t64:
+    ldx     #$00
+    rts
diff --git a/libsrc/agat/wherey.s b/libsrc/agat/wherey.s
new file mode 100644
index 000000000..4660a55f9
--- /dev/null
+++ b/libsrc/agat/wherey.s
@@ -0,0 +1,17 @@
+;
+; Kevin Ruland
+; Oleg A. Odintsov, Moscow, 2024
+;
+; unsigned char wherey (void);
+;
+
+        .export         _wherey
+
+        .include        "agat.inc"
+
+_wherey:
+        lda     CV
+        sec
+        sbc     WNDTOP
+        ldx     #$00
+        rts
diff --git a/libsrc/agat/write.s b/libsrc/agat/write.s
new file mode 100644
index 000000000..6ac28f32c
--- /dev/null
+++ b/libsrc/agat/write.s
@@ -0,0 +1,50 @@
+;
+; Oleg A. Odintsov, Moscow, 2024
+;
+; int __fastcall__ write (int fd, const void* buf, unsigned count);
+;
+
+        .export         _write
+        .import         popax, popptr1
+        .import         COUT
+
+        .include        "zeropage.inc"
+
+_write:
+        sta     ptr2
+        stx     ptr2+1
+        jsr     popptr1
+        jsr     popax
+
+        ; Check for zero count
+        ora     ptr2
+        beq     done
+
+        ; Get char from buf
+next:   ldy     #$00
+        lda     (ptr1),y
+
+        ; Replace '\n' with '\r'
+        cmp     #$0A
+        bne     output
+        lda     #$8D
+
+        ; Set hi bit and write to device
+output:
+        jsr     COUT            ; Preserves X and Y
+
+        ; Increment pointer
+        inc     ptr1
+        bne     :+
+        inc     ptr1+1
+
+        ; Decrement count
+:       dec     ptr2
+        bne     next
+        dec     ptr2+1
+        bpl     next
+
+        ; Return success
+done:   lda     #$00
+        rts
+
diff --git a/libsrc/apple2/allow_lowercase.s b/libsrc/apple2/allow_lowercase.s
new file mode 100644
index 000000000..b78544a66
--- /dev/null
+++ b/libsrc/apple2/allow_lowercase.s
@@ -0,0 +1,28 @@
+;
+; Oliver Schmidt, 2024-08-06
+;
+; unsigned char __fastcall__ allow_lowercase (unsigned char onoff);
+;
+
+.ifndef __APPLE2ENH__
+
+        .export         _allow_lowercase
+        .import         return0
+        .import         uppercasemask, return1
+
+_allow_lowercase:
+        tax
+        lda     values,x
+        ldx     uppercasemask
+        sta     uppercasemask
+        cpx     #$FF
+        beq     :+
+        jmp     return0
+:       jmp     return1
+
+        .rodata
+
+values: .byte   $DF         ; Force uppercase
+        .byte   $FF         ; Keep lowercase
+
+.endif
diff --git a/libsrc/apple2/beep.s b/libsrc/apple2/beep.s
new file mode 100644
index 000000000..84d132a3a
--- /dev/null
+++ b/libsrc/apple2/beep.s
@@ -0,0 +1,20 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; void beep(void)
+;
+
+        .export         _beep
+
+        .include        "apple2.inc"
+
+        .segment        "LOWCODE"
+
+_beep:
+        ; Switch in ROM and call BELL
+        bit     $C082
+        jsr     $FF3A           ; BELL
+
+        ; Switch in LC bank 2 for R/O and return
+        bit     $C080
+        rts
diff --git a/libsrc/apple2/boxchars.s b/libsrc/apple2/boxchars.s
new file mode 100644
index 000000000..8feee3bd3
--- /dev/null
+++ b/libsrc/apple2/boxchars.s
@@ -0,0 +1,73 @@
+;
+; Colin Leroy-Mira and Oliver Schmidt, 26.05.2025
+;
+; Initialize box-drawing characters according to
+; MouseText availability
+;
+
+.ifndef __APPLE2ENH__
+
+        .constructor    initboxchars
+        .import         machinetype
+
+        .export         _CH_HLINE
+        .export         _CH_VLINE
+        .export         _CH_ULCORNER
+        .export         _CH_URCORNER
+        .export         _CH_LLCORNER
+        .export         _CH_LRCORNER
+        .export         _CH_TTEE
+        .export         _CH_BTEE
+        .export         _CH_LTEE
+        .export         _CH_RTEE
+        .export         _CH_CROSS
+
+        .segment        "ONCE"
+
+initboxchars:
+        bit     machinetype   ; IIe enhanced or newer?
+        bvs     out
+
+        ldx     #NUM_BOXCHARS  ; No mousetext, patch characters
+:       lda     std_boxchars,x
+        sta     boxchars,x
+        dex
+        bpl     :-
+
+out:    rts
+
+; Replacement chars for when MouseText is not available
+std_boxchars:   .byte   '!'
+                .byte   '-'
+                .byte   '+'
+                .byte   '+'
+                .byte   '+'
+                .byte   '+'
+
+        .data
+
+; MouseText-based box characters
+boxchars:
+VERT:           .byte   $DF
+HORIZ:          .byte   $5F
+ULCORNER:       .byte   $5F
+URCORNER:       .byte   $20
+LLCORNER:       .byte   $D4
+LRCORNER:       .byte   $DF
+
+NUM_BOXCHARS          = *-boxchars
+
+; exported symbols, referencing our 6 bytes
+_CH_HLINE             = HORIZ
+_CH_VLINE             = VERT
+_CH_ULCORNER          = ULCORNER
+_CH_URCORNER          = URCORNER
+_CH_LLCORNER          = LLCORNER
+_CH_LRCORNER          = LRCORNER
+_CH_TTEE              = ULCORNER
+_CH_BTEE              = LLCORNER
+_CH_LTEE              = LLCORNER
+_CH_RTEE              = LRCORNER
+_CH_CROSS             = LLCORNER
+
+.endif                ; not __APPLE2ENH__
diff --git a/libsrc/apple2/callmain.s b/libsrc/apple2/callmain.s
new file mode 100644
index 000000000..c43e339aa
--- /dev/null
+++ b/libsrc/apple2/callmain.s
@@ -0,0 +1,75 @@
+;
+; Ullrich von Bassewitz, 2003-03-07
+;
+; Push arguments and call main()
+;
+
+
+        .export         callmain, _exit
+        .export         __argc, __argv
+
+        .import         _main, pushax, done, donelib
+        .import         zpsave, rvsave, reset
+
+        .include        "zeropage.inc"
+        .include        "apple2.inc"
+
+
+;---------------------------------------------------------------------------
+; Setup the stack for main(), then jump to it
+
+callmain:
+        lda     __argc
+        ldx     __argc+1
+        jsr     pushax          ; Push argc
+
+        lda     __argv
+        ldx     __argv+1
+        jsr     pushax          ; Push argv
+
+        ldy     #4              ; Argument size
+        jsr     _main
+
+        ; Avoid a re-entrance of donelib. This is also the exit() entry.
+_exit:  ldx     #<exit
+        lda     #>exit
+        jsr     reset           ; Setup RESET vector
+
+        ; Switch in LC bank 2 for R/O in case it was switched out by a RESET.
+        bit     $C080
+
+        ; Call the module destructors.
+        jsr     donelib
+
+        ; Switch in ROM.
+        bit     $C082
+
+        ; Restore the original RESET vector.
+exit:   ldx     #$02
+:       lda     rvsave,x
+        sta     SOFTEV,x
+        dex
+        bpl     :-
+
+        ; Copy back the zero-page stuff.
+        ldx     #zpspace-1
+:       lda     zpsave,x
+        sta     c_sp,x
+        dex
+        bpl     :-
+
+        ; ProDOS TechRefMan, chapter 5.2.1:
+        ; "System programs should set the stack pointer to $FF at the
+        ;  warm-start entry point."
+        ldx     #$FF
+        txs                     ; Re-init stack pointer
+
+        ; We're done
+        jmp     done
+
+;---------------------------------------------------------------------------
+; Data
+
+.data
+__argc:         .word   0
+__argv:         .addr   0
diff --git a/libsrc/apple2/cgetc.s b/libsrc/apple2/cgetc.s
index ecce9f9de..f0b9566ff 100644
--- a/libsrc/apple2/cgetc.s
+++ b/libsrc/apple2/cgetc.s
@@ -7,8 +7,13 @@
 ;
 
         .export         _cgetc
+
+        .ifndef __APPLE2ENH__
+        .import         machinetype
+        .endif
         .import         cursor, putchardirect
 
+        .include        "zeropage.inc"
         .include        "apple2.inc"
 
 _cgetc:
@@ -17,12 +22,15 @@ _cgetc:
         beq     :+
 
         ; Show caret.
-        .ifdef  __APPLE2ENH__
-        lda     #$7F | $80      ; Checkerboard, screen code
-        .else
+        .ifndef __APPLE2ENH__
         lda     #' ' | $40      ; Blank, flashing
+        bit     machinetype
+        bpl     put_caret
         .endif
-        jsr     putchardirect   ; Returns old character in X
+
+        lda     #$7F | $80      ; Checkerboard, screen code
+put_caret:
+        jsr     putchardirect   ; Saves old character in tmp3
 
         ; Wait for keyboard strobe.
 :       inc     RNDL            ; Increment random counter low
@@ -37,16 +45,20 @@ _cgetc:
 
         ; Restore old character.
         pha
-        txa
+        lda     tmp3
         jsr     putchardirect
         pla
 
         ; At this time, the high bit of the key pressed is set.
 :       bit     KBDSTRB         ; Clear keyboard strobe
-        .ifdef __APPLE2ENH__
+
+        .ifndef __APPLE2ENH__
+        bit     machinetype     ; Apple //e or more recent?
+        bpl     clear
+        .endif
         bit     BUTN0           ; Check if OpenApple is down
         bmi     done
-        .endif
-        and     #$7F            ; If not down, then clear high bit
+
+clear:  and     #$7F            ; If not down, then clear high bit
 done:   ldx     #>$0000
         rts
diff --git a/libsrc/apple2/closedir.s b/libsrc/apple2/closedir.s
new file mode 100644
index 000000000..1f176092b
--- /dev/null
+++ b/libsrc/apple2/closedir.s
@@ -0,0 +1,35 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; int __fastcall__ closedir (DIR *dir)
+;
+
+        .export   _closedir, closedir_ptr1
+
+        .import   _close
+        .import   _free
+        .import   pushax, popax, pushptr1, swapstk
+
+        .importzp ptr1
+
+        .include  "apple2.inc"
+        .include  "dir.inc"
+        .include  "errno.inc"
+        .include  "fcntl.inc"
+        .include  "zeropage.inc"
+
+_closedir:
+        sta       ptr1
+        stx       ptr1+1
+closedir_ptr1:
+        ; Close fd
+        jsr       pushptr1    ; Backup ptr1
+        ldy       #$00
+        lda       (ptr1),y    ; Get fd
+        ldx       #$00
+        jsr       _close
+        jsr       swapstk     ; Store result, pop ptr1
+
+        ; Free dir structure
+        jsr       _free
+        jmp       popax       ; Return result
diff --git a/libsrc/apple2/cpeekc.s b/libsrc/apple2/cpeekc.s
index a547f7867..4f5361461 100644
--- a/libsrc/apple2/cpeekc.s
+++ b/libsrc/apple2/cpeekc.s
@@ -4,25 +4,39 @@
 ; char cpeekc (void);
 ;
 
+        .ifndef __APPLE2ENH__
+        .import         machinetype
+        .endif
+
         .export         _cpeekc
 
         .include        "apple2.inc"
 
 _cpeekc:
         ldy     CH
-        .ifdef  __APPLE2ENH__
+
+        sec                     ; Assume main memory
+
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     peek
+        .endif
+
         bit     RD80VID         ; In 80 column mode?
         bpl     peek            ; No, just go ahead
-        tya
+        lda     OURCH
         lsr                     ; Div by 2
         tay
         bcs     peek            ; Odd cols are in main memory
+        php
+        sei                     ; No valid MSLOT et al. in aux memory
         bit     HISCR           ; Assume SET80COL
-        .endif
+
 peek:   lda     (BASL),Y        ; Get character
-        .ifdef  __APPLE2ENH__
-        bit     LOWSCR          ; Doesn't hurt in 40 column mode
-        .endif
-        eor     #$80            ; Invert high bit
-        ldx     #$00
+        bcs     :+              ; In main memory
+        bit     LOWSCR
+        plp
+
+:       eor     #$80            ; Invert high bit
+        ldx     #>$0000
         rts
diff --git a/libsrc/apple2/cputc.s b/libsrc/apple2/cputc.s
index 035b1c047..5c4bf192e 100644
--- a/libsrc/apple2/cputc.s
+++ b/libsrc/apple2/cputc.s
@@ -5,25 +5,31 @@
 ; void __fastcall__ cputc (char c);
 ;
 
-        .ifdef  __APPLE2ENH__
         .constructor    initconio
-        .endif
         .export         _cputcxy, _cputc
         .export         cputdirect, newline, putchar, putchardirect
         .import         gotoxy, VTABZ
 
-        .include        "apple2.inc"
+        .ifndef __APPLE2ENH__
+        .import         machinetype
+        .import         uppercasemask
+        .endif
 
-        .macpack        cpu
+        .include        "zeropage.inc"
+        .include        "apple2.inc"
 
         .segment        "ONCE"
 
-        .ifdef  __APPLE2ENH__
 initconio:
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bmi     :+
+        rts
+:
+        .endif
         sta     SETALTCHAR      ; Switch in alternate charset
         bit     LORES           ; Limit SET80COL-HISCR to text
         rts
-        .endif
 
         .code
 
@@ -35,7 +41,7 @@ _cputcxy:
         pla                     ; Restore C and run into _cputc
 
 _cputc:
-        cmp     #$0D            ; Test for \r = carrage return
+        cmp     #$0D            ; Test for \r = carriage return
         beq     left
         cmp     #$0A            ; Test for \n = line feed
         beq     newline
@@ -43,24 +49,53 @@ _cputc:
         .ifndef __APPLE2ENH__
         cmp     #$E0            ; Test for lowercase
         bcc     cputdirect
-        and     #$DF            ; Convert to uppercase
+        and     uppercasemask
         .endif
 
 cputdirect:
         jsr     putchar
-        inc     CH              ; Bump to next column
+
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     :+
+        .endif
+        bit     RD80VID         ; In 80 column mode?
+        bpl     :+
+        inc     OURCH           ; Bump to next column
+        lda     OURCH
+        .ifdef __APPLE2ENH__
+        bra     check           ; Must leave CH alone
+        .else
+        jmp     check
+        .endif
+
+:       inc     CH              ; Bump to next column
         lda     CH
-        cmp     WNDWDTH
-        bcc     :+
+check:  cmp     WNDWDTH
+        bcc     done
         jsr     newline
 left:
-        .if (.cpu .bitand CPU_ISET_65SC02)
+        .ifdef  __APPLE2ENH__
         stz     CH              ; Goto left edge of screen
         .else
-        lda     #$00            ; Goto left edge of screen
+        lda     #$00
         sta     CH
         .endif
-:       rts
+
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     done
+        .endif
+
+        bit     RD80VID         ; In 80 column mode?
+        bpl     done
+        .ifdef  __APPLE2ENH__
+        stz     OURCH           ; Goto left edge of screen
+        .else
+        sta     OURCH
+        .endif
+
+done:   rts
 
 newline:
         inc     CV              ; Bump to next line
@@ -84,23 +119,32 @@ putchar:
 mask:   and     INVFLG          ; Apply normal, inverse, flash
 
 putchardirect:
-        pha
-        .ifdef  __APPLE2ENH__
-        lda     CH
+        tax
+        ldy     CH
+
+        sec                     ; Assume main memory
+
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     put
+        .endif
+
         bit     RD80VID         ; In 80 column mode?
         bpl     put             ; No, just go ahead
+        lda     OURCH
         lsr                     ; Div by 2
+        tay
         bcs     put             ; Odd cols go in main memory
+        php
+        sei                     ; No valid MSLOT et al. in aux memory
         bit     HISCR           ; Assume SET80COL
-put:    tay
-        .else
-        ldy     CH
-        .endif
-        lda     (BASL),Y        ; Get current character
-        tax                     ; Return old character for _cgetc
-        pla
+
+put:    lda     (BASL),Y        ; Get current character
+        sta     tmp3            ; Save old character for _cgetc
+        txa
         sta     (BASL),Y
-        .ifdef  __APPLE2ENH__
-        bit     LOWSCR          ; Doesn't hurt in 40 column mode
-        .endif
-        rts
+
+        bcs     :+              ; In main memory
+        bit     LOWSCR
+        plp
+:       rts
diff --git a/libsrc/apple2/crt0.s b/libsrc/apple2/crt0.s
index 60a8516d1..44450b4b9 100644
--- a/libsrc/apple2/crt0.s
+++ b/libsrc/apple2/crt0.s
@@ -4,11 +4,13 @@
 ; Startup code for cc65 (Apple2 version)
 ;
 
-        .export         _exit, done, return
+        .export         done, return
+        .export         zpsave, rvsave, reset
         .export         __STARTUP__ : absolute = 1      ; Mark as startup
 
-        .import         initlib, donelib
+        .import         initlib, _exit
         .import         zerobss, callmain
+        .import         bltu2
         .import         __ONCE_LOAD__, __ONCE_SIZE__    ; Linker generated
         .import         __LC_START__, __LC_LAST__       ; Linker generated
 
@@ -33,41 +35,7 @@
         jsr     zerobss
 
         ; Push the command-line arguments; and, call main().
-        jsr     callmain
-
-        ; Avoid a re-entrance of donelib. This is also the exit() entry.
-_exit:  ldx     #<exit
-        lda     #>exit
-        jsr     reset           ; Setup RESET vector
-
-        ; Switch in ROM, in case it wasn't already switched in by a RESET.
-        bit     $C082
-
-        ; Call the module destructors.
-        jsr     donelib
-
-        ; Restore the original RESET vector.
-exit:   ldx     #$02
-:       lda     rvsave,x
-        sta     SOFTEV,x
-        dex
-        bpl     :-
-
-        ; Copy back the zero-page stuff.
-        ldx     #zpspace-1
-:       lda     zpsave,x
-        sta     sp,x
-        dex
-        bpl     :-
-
-        ; ProDOS TechRefMan, chapter 5.2.1:
-        ; "System programs should set the stack pointer to $FF at the
-        ;  warm-start entry point."
-        ldx     #$FF
-        txs                     ; Re-init stack pointer
-
-        ; We're done
-        jmp     done
+        jmp     callmain
 
 ; ------------------------------------------------------------------------
 
@@ -75,7 +43,7 @@ exit:   ldx     #$02
 
         ; Save the zero-page locations that we need.
 init:   ldx     #zpspace-1
-:       lda     sp,x
+:       lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     :-
@@ -88,8 +56,10 @@ init:   ldx     #zpspace-1
         bpl     :-
 
         ; Check for ProDOS.
-        ldy     $BF00           ; MLI call entry point
-        cpy     #$4C            ; Is MLI present? (JMP opcode)
+        lda     $BF00           ; MLI call entry point
+        sec
+        sbc     #$4C            ; Is MLI present? (JMP opcode)
+        pha                     ; Backup the result for later
         bne     basic
 
         ; Check the ProDOS system bit map.
@@ -113,8 +83,8 @@ basic:  lda     HIMEM
         ldx     HIMEM+1
 
         ; Set up the C stack.
-:       sta     sp
-        stx     sp+1
+:       sta     c_sp
+        stx     c_sp+1
 
         ; ProDOS TechRefMan, chapter 5.3.5:
         ; "Your system program should place in the RESET vector the
@@ -126,11 +96,25 @@ basic:  lda     HIMEM
         ; Call the module constructors.
         jsr     initlib
 
+        ; Copy the LC segment to its destination
         ; Switch in LC bank 2 for W/O.
         bit     $C081
         bit     $C081
 
-        ; Set the source start address.
+        pla                     ; If not running ProDOS, we need to patch 6502 vectors.
+        beq     :+
+
+        lda     #<reset_6502
+        ldx     #>reset_6502
+        sta     ROM_RST
+        stx     ROM_RST+1
+
+        lda     #<irq_6502
+        ldx     #>irq_6502
+        sta     ROM_IRQ
+        stx     ROM_IRQ+1
+
+:       ; Set the source start address.
         ; Aka __LC_LOAD__ iff segment LC exists.
         lda     #<(__ONCE_LOAD__ + __ONCE_SIZE__)
         ldy     #>(__ONCE_LOAD__ + __ONCE_SIZE__)
@@ -153,7 +137,7 @@ basic:  lda     HIMEM
 
         ; Call into Applesoft Block Transfer Up -- which handles zero-
         ; sized blocks well -- to move the content of the LC memory area.
-        jsr     $D39A           ; BLTU2
+        jsr     bltu2
 
         ; Switch in LC bank 2 for R/O and return.
         bit     $C080
@@ -175,6 +159,14 @@ quit:   jsr     $BF00           ; MLI call entry point
         .byte   $65             ; Quit
         .word   q_param
 
+reset_6502:                     ; Used with DOS3.3 programs
+        bit     $C082           ; Switch in ROM
+        jmp     (ROM_RST)       ; Jump to ROM's RESET vector
+
+irq_6502:                       ; Used with DOS3.3 programs
+        bit     $C082           ; Switch in ROM
+        jmp     (ROM_IRQ)       ; Jump to ROM's IRQ/BRK vector
+
 ; ------------------------------------------------------------------------
 
         .rodata
diff --git a/libsrc/apple2/curdevice.s b/libsrc/apple2/curdevice.s
index 9781b8ad0..a450c605f 100644
--- a/libsrc/apple2/curdevice.s
+++ b/libsrc/apple2/curdevice.s
@@ -23,5 +23,5 @@ _getcurrentdevice:
         bne     :+
         lda     #$FF            ; INVALID_DEVICE
 
-:       ldx     #$00
+:       ldx     #>$0000
         rts
diff --git a/libsrc/apple2/detect80cols.s b/libsrc/apple2/detect80cols.s
new file mode 100644
index 000000000..c6f263566
--- /dev/null
+++ b/libsrc/apple2/detect80cols.s
@@ -0,0 +1,56 @@
+;
+; Colin Leroy-Mira, 27/05/2025
+;
+; Verify the presence of a 80 columns card in slot 3,
+; and publish a flag accordingly.
+;
+        .export         aux80col
+
+        .ifndef __APPLE2ENH__
+        .import         machinetype
+        .endif
+
+        .constructor    detect80cols
+
+        .include        "apple2.inc"
+
+        .data
+
+aux80col:        .byte 0
+
+        .segment        "ONCE"
+
+IdOfsTable:                     ; Table of bytes positions, used to check four
+                                ; specific bytes on the slot's firmware to make
+                                ; sure this is a serial card.
+        .byte   $05             ; Pascal 1.0 ID byte
+        .byte   $07             ; Pascal 1.0 ID byte
+        .byte   $0B             ; Pascal 1.1 generic signature byte
+        .byte   $0C             ; Device signature byte
+
+IdValTable:                     ; Table of expected values for the four checked
+                                ; bytes
+        .byte   $38             ; ID Byte 0 (from Pascal 1.0), fixed
+        .byte   $18             ; ID Byte 1 (from Pascal 1.0), fixed
+        .byte   $01             ; Generic signature for Pascal 1.1, fixed
+        .byte   $88             ; Device signature byte (80 columns card)
+
+IdTableLen      = * - IdValTable
+
+detect80cols:
+        .ifndef __APPLE2ENH__
+        bit     machinetype     ; Check we're on a //e at least, otherwise we
+        bpl     NoDev           ; handle no 80cols hardware (like Videx)
+        .endif
+
+        ldx     #IdTableLen-1
+:       ldy     IdOfsTable,x    ; Check Pascal 1.1 Firmware Protocol ID bytes
+        lda     IdValTable,x
+        cmp     $C300,y
+        bne     NoDev
+        dex
+        bpl     :-
+
+        dec     aux80col   ; We have an 80-columns card! Set flag to $FF
+
+NoDev:  rts
diff --git a/libsrc/apple2/detect_iigs.s b/libsrc/apple2/detect_iigs.s
new file mode 100644
index 000000000..f82a464ac
--- /dev/null
+++ b/libsrc/apple2/detect_iigs.s
@@ -0,0 +1,17 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; void __fastcall__ detect_iigs(void)
+;
+
+        .export         _detect_iigs
+        .import         ostype, return0, return1
+
+        .include        "apple2.inc"
+
+        ; Returns 1 if running on IIgs, 0 otherwise
+_detect_iigs:
+        lda     ostype
+        bpl     :+
+        jmp     return1
+:       jmp     return0
diff --git a/libsrc/apple2/diocommon.s b/libsrc/apple2/diocommon.s
index b18f0e6ef..6870ebb51 100644
--- a/libsrc/apple2/diocommon.s
+++ b/libsrc/apple2/diocommon.s
@@ -31,5 +31,5 @@ diocommon:
 dioepilog:
         ; Return success or error
         sta     ___oserror
-        ldx     #$00
+        ldx     #>$0000
         rts
diff --git a/libsrc/apple2/dir.inc b/libsrc/apple2/dir.inc
new file mode 100644
index 000000000..545ae003b
--- /dev/null
+++ b/libsrc/apple2/dir.inc
@@ -0,0 +1,15 @@
+.struct DIR
+        FD                .word
+        ENTRY_LENGTH      .byte
+        ENTRIES_PER_BLOCK .byte
+        FILE_COUNT        .word
+        CURRENT_ENTRY     .byte
+        .union
+                BYTES               .byte 512
+                .struct CONTENT
+                        PREV_BLOCK  .word
+                        NEXT_BLOCK  .word
+                        ENTRIES     .byte
+                .endstruct
+        .endunion
+.endstruct
diff --git a/libsrc/apple2/dir_entry_count.s b/libsrc/apple2/dir_entry_count.s
new file mode 100644
index 000000000..6a80bef28
--- /dev/null
+++ b/libsrc/apple2/dir_entry_count.s
@@ -0,0 +1,24 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; unsigned int __fastcall__ dir_entry_count(DIR *dir);
+;
+
+        .export   _dir_entry_count
+
+        .importzp ptr1
+
+        .include  "apple2.inc"
+        .include  "dir.inc"
+
+.proc _dir_entry_count
+        sta       ptr1
+        stx       ptr1+1
+
+        ldy       #DIR::FILE_COUNT + 1
+        lda       (ptr1),y
+        tax
+        dey
+        lda       (ptr1),y
+        rts
+.endproc
diff --git a/libsrc/apple2/dynchline.s b/libsrc/apple2/dynchline.s
new file mode 100644
index 000000000..74cc5a41e
--- /dev/null
+++ b/libsrc/apple2/dynchline.s
@@ -0,0 +1,41 @@
+;
+; Ullrich von Bassewitz, 08.08.1998
+; Colin Leroy-Mira, 26.05.2025
+;
+; void __fastcall__ dyn_chlinexy (unsigned char c, unsigned char x, unsigned char y, unsigned char length);
+; void __fastcall__ dyn_chline (unsigned char c, unsigned char length);
+;
+
+.ifndef __APPLE2ENH__
+
+        .export         _dyn_chlinexy, _dyn_chline, chlinedirect
+        .import         gotoxy, cputdirect, popa
+        .import         machinetype
+
+        .include        "zeropage.inc"
+        .include        "apple2.inc"
+
+_dyn_chlinexy:
+        pha                     ; Save the length
+        jsr     gotoxy          ; Call this one, will pop params
+        pla                     ; Restore the length and run into _chline
+
+_dyn_chline:
+        pha
+        jsr     popa            ; Get the character to draw
+        eor     #$80            ; Invert high bit
+        tax
+        pla
+
+chlinedirect:
+        stx     tmp1
+        cmp     #$00            ; Is the length zero?
+        beq     done            ; Jump if done
+        sta     tmp2
+:       lda     tmp1            ; Screen code
+        jsr     cputdirect      ; Direct output
+        dec     tmp2
+        bne     :-
+done:   rts
+
+.endif
diff --git a/libsrc/apple2/dyncvline.s b/libsrc/apple2/dyncvline.s
new file mode 100644
index 000000000..b74126a4d
--- /dev/null
+++ b/libsrc/apple2/dyncvline.s
@@ -0,0 +1,40 @@
+;
+; Ullrich von Bassewitz, 08.08.1998
+; Colin Leroy-Mira, 26.05.2025
+;
+; void __fastcall__ dyn_cvlinexy (unsigned char c, unsigned char x, unsigned char y, unsigned char length);
+; void __fastcall__ dyn_cvline (unsigned char c, unsigned char length);
+;
+
+.ifndef __APPLE2ENH__
+
+        .export         _dyn_cvlinexy, _dyn_cvline
+        .import         gotoxy, putchar, newline, popa
+        .import         machinetype
+
+        .include        "zeropage.inc"
+
+_dyn_cvlinexy:
+        pha                     ; Save the length
+        jsr     gotoxy          ; Call this one, will pop params
+        pla                     ; Restore the length and run into _cvline
+
+_dyn_cvline:
+        pha
+        jsr     popa            ; Get the character to draw
+        eor     #$80            ; Invert high bit
+        tax
+        pla
+
+        stx     tmp1
+        cmp     #$00            ; Is the length zero?
+        beq     done            ; Jump if done
+        sta     tmp2
+:       lda     tmp1            ; Screen code
+        jsr     putchar         ; Write, no cursor advance
+        jsr     newline         ; Advance cursor to next line
+        dec     tmp2
+        bne     :-
+done:   rts
+
+.endif
diff --git a/libsrc/apple2/exec.s b/libsrc/apple2/exec.s
index 27a6487bd..38f31ee37 100644
--- a/libsrc/apple2/exec.s
+++ b/libsrc/apple2/exec.s
@@ -5,8 +5,9 @@
 ;
 
         .export         _exec
-        .import         pushname, popname
-        .import         popax, done, _exit
+        .import         mli_file_info_direct
+        .import         aux80col
+        .import         pushname, popname, popax, done, _exit
 
         .include        "zeropage.inc"
         .include        "errno.inc"
@@ -17,13 +18,12 @@
 typerr: lda     #$4A            ; "Incompatible file format"
 
         ; Cleanup name
-oserr:  jsr     popname         ; Preserves A
 
-        ; Set ___oserror
-        jmp     ___mappederrno
+mlierr: jsr     popname
+oserr:  jmp     ___mappederrno
 
 _exec:
-        ; Save cmdline
+        ; Store cmdline
         sta     ptr4
         stx     ptr4+1
 
@@ -32,6 +32,9 @@ _exec:
         jsr     pushname
         bne     oserr
 
+        jsr     mli_file_info_direct
+        bcs     mlierr
+
         ; ProDOS TechRefMan, chapter 5.1.5.1:
         ; "The complete or partial pathname of the system program
         ;  is stored at $280, starting with a length byte."
@@ -39,25 +42,13 @@ _exec:
         ; binary programs so we should do the same too in any case
         ; especially as _we_ rely on it in mainargs.s for argv[0]
         ldy     #$00
-        lda     (sp),y
+        lda     (c_sp),y
         tay
-:       lda     (sp),y
+:       lda     (c_sp),y
         sta     $0280,y
         dey
         bpl     :-
 
-        ; Set pushed name
-        lda     sp
-        ldx     sp+1
-        sta     mliparam + MLI::INFO::PATHNAME
-        stx     mliparam + MLI::INFO::PATHNAME+1
-
-        ; Get file_type and aux_type
-        lda     #GET_INFO_CALL
-        ldx     #GET_INFO_COUNT
-        jsr     callmli
-        bcs     oserr
-
         ; If we get here the program file at least exists so we copy
         ; the loader stub right now and patch it later to set params
         ldx     #size - 1
@@ -121,37 +112,12 @@ setbuf: lda     #$00            ; Low byte
         dex
         dex
 
-        ; Set I/O buffer
-        sta     mliparam + MLI::OPEN::IO_BUFFER
-        stx     mliparam + MLI::OPEN::IO_BUFFER+1
+        ; Set OPEN MLI call I/O buffer parameter
+        sta     io_buffer
+        stx     io_buffer+1
 
-        ; PATHNAME already set
-        .assert MLI::OPEN::PATHNAME = MLI::INFO::PATHNAME, error
-
-        ; Lower file level to avoid program file
-        ; being closed by C library shutdown code
-        ldx     LEVEL
-        stx     level
-        beq     :+
-        dec     LEVEL
-
-        ; Open file
-:       lda     #OPEN_CALL
-        ldx     #OPEN_COUNT
-        jsr     callmli
-
-        ; Restore file level
-        ldx     level
-        stx     LEVEL
-        bcc     :+
-        jmp     oserr
-
-        ; Get and save fd
-:       lda     mliparam + MLI::OPEN::REF_NUM
-        sta     read_ref
-        sta     close_ref
-
-        .ifdef  __APPLE2ENH__
+        bit     aux80col
+        bpl     :+
         ; Calling the 80 column firmware needs the ROM switched
         ; in, otherwise it copies the F8 ROM to the LC (@ $CEF4)
         bit     $C082
@@ -164,9 +130,8 @@ setbuf: lda     #$00            ; Low byte
 
         ; Switch in LC bank 2 for R/O
         bit     $C080
-        .endif
 
-        ; Reset stack as we already passed
+:       ; Reset stack as we already passed
         ; the point of no return anyway
         ldx     #$FF
         txs
@@ -194,14 +159,25 @@ setbuf: lda     #$00            ; Low byte
         ; Initiate C library shutdown
         jmp     _exit
 
-        .bss
-
-level : .res    1
-
         .rodata
 
+source:
+        ; Open program file
+        ; PATHNAME parameter is already set (we reuse
+        ; the copy at $0280); IO_BUFFER has been setup
+        ; before shutting down the C library
+        jsr     $BF00
+        .byte   OPEN_CALL
+        .word   open_param
+        bcs     error
+
+        ; Copy REF_NUM to MLI READ and CLOSE parameters
+        lda     open_ref
+        sta     read_ref
+        sta     close_ref
+
         ; Read whole program file
-source: jsr     $BF00
+        jsr     $BF00
         .byte   READ_CALL
         .word   read_param
         bcs     error
@@ -254,6 +230,14 @@ jump:   jmp     (data_buffer)
 file_type       = * - source + target
         .byte   $00
 
+open_param      = * - source + target
+        .byte   $03             ; PARAM_COUNT
+        .addr   $0280           ; PATHNAME
+io_buffer       = * - source + target
+        .addr   $0000           ; IO_BUFFER
+open_ref        = * - source + target
+        .byte   $00             ; REF_NUM
+
 read_param      = * - source + target
         .byte   $04             ; PARAM_COUNT
 read_ref        = * - source + target
@@ -285,4 +269,8 @@ size            = * - source
 
 target          = DOSWARM - size
 
+        ; Make sure that the loader isn't too big, and
+        ; fits in $300-$3D0
+        .assert target >= $300, error
+
 dosvec: jmp     quit
diff --git a/libsrc/apple2/extra/integer-basic-compat.s b/libsrc/apple2/extra/integer-basic-compat.s
new file mode 100644
index 000000000..c4dc8d8ef
--- /dev/null
+++ b/libsrc/apple2/extra/integer-basic-compat.s
@@ -0,0 +1,33 @@
+;
+; Colin Leroy-Mira, 06.03.2025
+;
+; Copy the LC segment from the end of the binary to the Language Card
+; using _memcpy. This allows running apple2 programs on the original
+; Integer ROM Apple ][.
+;
+
+        .export         bltu2
+
+        .import         _memcpy, pushax
+        .import         __ONCE_LOAD__, __ONCE_SIZE__    ; Linker generated
+        .import         __LC_START__, __LC_LAST__       ; Linker generated
+
+        .segment        "ONCE"
+
+bltu2:
+        ; Get the destination start address.
+        lda     #<__LC_START__
+        ldx     #>__LC_START__
+        jsr     pushax
+
+        ; Get the source start address.
+        lda     #<(__ONCE_LOAD__ + __ONCE_SIZE__)
+        ldx     #>(__ONCE_LOAD__ + __ONCE_SIZE__)
+        jsr     pushax
+
+        ; Set the length
+        lda     #<(__LC_LAST__ - __LC_START__)
+        ldx     #>(__LC_LAST__ - __LC_START__)
+
+        ; And do the copy
+        jmp     _memcpy
diff --git a/libsrc/apple2/extra/iobuf-0800.s b/libsrc/apple2/extra/iobuf-0800.s
index 694b91fdb..b00dba6ae 100644
--- a/libsrc/apple2/extra/iobuf-0800.s
+++ b/libsrc/apple2/extra/iobuf-0800.s
@@ -54,18 +54,20 @@ iobuf_alloc:
         rts
 
         ; Mark table entry as used
-:       lda     #$FF
-        sta     table,x
+:       dec     table,x
 
         ; Convert table index to address hibyte
         txa
         asl
         asl
-        clc
+        ; Skip clearing carry, it can't be set as long as MAX_FDS*4 is
+        ; less than 64.
+        .assert MAX_FDS*4 < $40, error
         adc     #>$0800
 
         ; Store address in "memptr"
-        ldy     #$01
+        ; (Y still equals 0 from popptr1)
+        iny
         sta     (ptr1),y
         dey
         tya
@@ -82,8 +84,7 @@ iobuf_free:
 
         ; Mark table entry as free
         tax
-        lda     #$00
-        sta     table,x
+        inc     table,x
         rts
 
 ; ------------------------------------------------------------------------
diff --git a/libsrc/apple2/filename.s b/libsrc/apple2/filename.s
index aaef6ec2d..f4723ee1f 100644
--- a/libsrc/apple2/filename.s
+++ b/libsrc/apple2/filename.s
@@ -8,6 +8,7 @@
         .import         subysp, addysp, decsp1
 
         .include        "zeropage.inc"
+        .include        "apple2.inc"
         .include        "mli.inc"
 
 pushname:
@@ -15,7 +16,7 @@ pushname:
         stx     ptr1+1
 
         ; Alloc pathname buffer
-        ldy     #64+1           ; Max pathname length + zero
+        ldy     #FILENAME_MAX
         jsr     subysp
 
         ; Check for full pathname
@@ -33,8 +34,8 @@ pushname:
         sta     mliparam + MLI::ON_LINE::UNIT_NUM
 
         ; Use allocated pathname buffer
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         sta     mliparam + MLI::ON_LINE::DATA_BUFFER
         stx     mliparam + MLI::ON_LINE::DATA_BUFFER+1
 
@@ -45,16 +46,16 @@ pushname:
         bcs     addsp65
 
         ; Get volume name length
-        lda     (sp),y
+        lda     (c_sp),y
         and     #15             ; Max volume name length
 
         ; Bracket volume name with slashes to form prefix
         sta     tmp1
         lda     #'/'
-        sta     (sp),y
+        sta     (c_sp),y
         ldy     tmp1
         iny                     ; Leading slash
-        sta     (sp),y
+        sta     (c_sp),y
         iny                     ; Trailing slash
 
         ; Adjust source pointer for copy
@@ -68,24 +69,24 @@ pushname:
 
         ; Copy source to allocated pathname buffer
 copy:   lda     (ptr1),y
-        sta     (sp),y
+        sta     (c_sp),y
         beq     setlen
         iny
-        cpy     #64+1           ; Max pathname length + zero
+        cpy     #FILENAME_MAX
         bcc     copy
 
         ; Load oserror code
         lda     #$40            ; "Invalid pathname"
 
         ; Free pathname buffer
-addsp65:ldy     #64+1
+addsp65:ldy     #FILENAME_MAX
         bne     addsp           ; Branch always
 
         ; Alloc and set length byte
 setlen: tya
         jsr     decsp1          ; Preserves A
         ldy     #$00
-        sta     (sp),y
+        sta     (c_sp),y
 
         ; Return success
         tya
@@ -93,5 +94,5 @@ setlen: tya
 
 popname:
         ; Cleanup stack
-        ldy     #1 + 64+1       ; Length byte + max pathname length + zero
-addsp:  jmp     addysp          ; Preserves A
+        ldy     #1 + FILENAME_MAX
+addsp:  jmp     addysp          ; Preserves A and X
diff --git a/libsrc/apple2/get_iigs_speed.s b/libsrc/apple2/get_iigs_speed.s
new file mode 100644
index 000000000..b960516fa
--- /dev/null
+++ b/libsrc/apple2/get_iigs_speed.s
@@ -0,0 +1,22 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; unsigned char __fastcall__ get_iigs_speed(void)
+;
+
+        .export         _get_iigs_speed
+        .import         ostype, return0
+
+        .include        "apple2.inc"
+        .include        "accelerator.inc"
+
+_get_iigs_speed:
+        lda     ostype          ; Return SLOW if not IIgs
+        bpl     :+
+        lda     CYAREG          ; Check current setting
+        bpl     :+
+        lda     #SPEED_FAST
+        ldx     #>$0000
+        rts
+        .assert SPEED_SLOW = 0, error
+:       jmp     return0         ; SPEED_SLOW
diff --git a/libsrc/apple2/get_ostype.s b/libsrc/apple2/get_ostype.s
index a1b1eb5be..0bd53717c 100644
--- a/libsrc/apple2/get_ostype.s
+++ b/libsrc/apple2/get_ostype.s
@@ -4,8 +4,10 @@
 ; unsigned char get_ostype (void)
 ;
 
+        ; Priority higher than the default one so that things depending
+        ; on ostype can get ostype set when called at normal priority
         .constructor    initostype, 9
-        .export         _get_ostype
+        .export         _get_ostype, ostype
 
 ; Identify machine according to:
 ; Apple II Miscellaneous TechNote #7, Apple II Family Identification
diff --git a/libsrc/apple2/get_tv.s b/libsrc/apple2/get_tv.s
new file mode 100644
index 000000000..b2eb4d857
--- /dev/null
+++ b/libsrc/apple2/get_tv.s
@@ -0,0 +1,189 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2025
+;
+; unsigned char __fastcall__ get_tv(void)
+;
+        .export         _get_tv
+
+        .import         _set_iigs_speed, _get_iigs_speed
+        .import         ostype
+
+        .constructor    calibrate_tv, 8 ; After ostype
+
+        .include    "accelerator.inc"
+        .include    "apple2.inc"
+        .include    "get_tv.inc"
+
+        .segment "ONCE"
+
+; Cycle wasters
+waste_72:
+        jsr     waste_36
+waste_36:
+        jsr     waste_12
+waste_24:
+        jsr     waste_12
+waste_12:
+        rts
+
+.proc calibrate_tv
+        lda     ostype
+        bmi     iigs
+        cmp     #$20
+        bcc     iip
+        cmp     #$40
+        bcc     iie
+
+iic:    jmp     calibrate_iic
+iigs:   jmp     calibrate_iigs
+iie:    jmp     calibrate_iie
+iip:    rts                   ; Keep TV::OTHER.
+.endproc
+
+
+; Magic numbers
+WASTE_LOOP_CYCLES = 92                      ; The wait loop total cycles
+NTSC_LOOP_COUNT   = 17030/WASTE_LOOP_CYCLES ; How many loops expected on NTSC
+PAL_LOOP_COUNT    = 20280/WASTE_LOOP_CYCLES ; How many loops expected on PAL
+STOP_PTRIG        = 16500/WASTE_LOOP_CYCLES ; Stop PTRIG at 16.5ms
+
+; Carry set at enter: wait for VBL +
+; Carry clear at enter: wait for VBL -
+; Increments X every 92 cycles.
+.proc count_until_vbl_bit
+        lda     #$10          ; BPL
+        bcc     :+
+        lda     #$30          ; BMI
+:       sta     sign
+
+        ; Wait for VBLsign change with 92 cycles loops.
+        ; Hit PTRIG repeatedly so that accelerators will slow down.
+        ; But stop hitting PTRIG after 16.5ms cycles, so that on the //c,
+        ; the VBLINT will not be reset right before we get it. 16.5ms
+        ; is a good value because it's far enough from 17ms for NTSC
+        ; models, and close enough to 20.2ms for PAL models that accelerators
+        ; will stay slow until there. (5ms usually).
+
+:       cpx     #STOP_PTRIG   ; 2     - see if we spent 16.5ms already
+        bcs     notrig        ; 4 / 5 - if so, stop hitting PTRIG
+        sta     PTRIG         ; 8     - otherwise hit it
+        bcc     count         ; 11
+notrig:
+        nop                   ;     7 - keep cycle count constant when not
+        nop                   ;     9 - hitting PTRIG
+        nop                   ;     11
+count:
+        inx                   ; 13
+        jsr     waste_72      ; 85
+        bit     RDVBLBAR      ; 89    - Wait for VBL change
+sign:
+        bpl     :-            ; 92    - patched with bpl/bmi
+        rts
+.endproc
+
+.proc calibrate_iic
+        php
+        sei
+
+        sta     IOUDISOFF
+        lda     RDVBLMSK
+        pha                   ; Back up for cleanup
+
+        bit     ENVBL
+        bit     PTRIG         ; Reset VBL interrupt flag
+:       bit     RDVBLBAR      ; Wait for one VBL
+        bpl     :-
+
+        bit     PTRIG         ; Reset VBL interrupt flag again
+        ldx     #$00
+        clc
+        jsr     count_until_vbl_bit
+
+        pla                   ; Cleanup
+        asl
+        bcs     :+            ; VBL interrupts were already enabled
+        bit     DISVBL
+:       sta     IOUDISON      ; IIc Tech Ref Man: The firmware normally leaves IOUDIS on.
+
+        plp
+        jmp     calibrate_done
+.endproc
+
+.proc calibrate_iie
+:       bit     RDVBLBAR      ; Wait for bit 7 to be off (VBL start)
+        bmi     :-
+:       bit     RDVBLBAR      ; Wait for bit 7 to be on (VBL end)
+        bpl     :-
+
+        ; Wait and count during a full cycle
+        ldx     #$00
+        sec
+        jsr     count_until_vbl_bit
+        clc
+        jsr     count_until_vbl_bit
+
+        jmp     calibrate_done
+.endproc
+
+.proc calibrate_iigs
+        ; Backup speed and slow down
+        jsr     _get_iigs_speed
+        pha
+        lda     #SPEED_SLOW
+        jsr     _set_iigs_speed
+
+        ; The same as IIe, but reverted, because... something?
+:       bit     RDVBLBAR      ; Wait for bit 7 to be on (VBL start)
+        bpl     :-
+:       bit     RDVBLBAR      ; Wait for bit 7 to be off (VBL end)
+        bmi     :-
+
+        ; Wait and count during a full cycle
+        ldx     #$00
+        clc
+        jsr     count_until_vbl_bit
+        sec
+        jsr     count_until_vbl_bit
+
+        jsr     calibrate_done
+
+        ; Restore user speed
+        pla
+        jmp     _set_iigs_speed
+.endproc
+
+.proc calibrate_done
+        ; Consider X +/- 3 to be valid,
+        ; anything else is unknown.
+
+        lda     #TV::NTSC
+        cpx     #NTSC_LOOP_COUNT-3
+        bcc     unexpected
+        cpx     #NTSC_LOOP_COUNT+3
+        bcc     matched
+
+        lda     #TV::PAL
+        cpx     #PAL_LOOP_COUNT-3
+        bcc     unexpected
+        cpx     #PAL_LOOP_COUNT+3
+        bcs     unexpected
+
+matched:
+        sta     tv
+
+unexpected:
+        rts
+.endproc
+
+        .code
+
+; The only thing remaining from that code after init
+.proc _get_tv
+        lda     tv
+        ldx     #>$0000
+        rts
+.endproc
+
+        .segment "INIT"
+
+tv:     .byte   TV::OTHER
diff --git a/libsrc/apple2/getdevice.s b/libsrc/apple2/getdevice.s
index 0c674cad0..f3b0d5a86 100644
--- a/libsrc/apple2/getdevice.s
+++ b/libsrc/apple2/getdevice.s
@@ -30,5 +30,5 @@ next:   inx
         bne     next
 
 done:   txa
-        ldx     #$00
+        ldx     #>$0000
         rts
diff --git a/libsrc/apple2/gettime.s b/libsrc/apple2/gettime.s
index 7467b0189..829aaab3b 100644
--- a/libsrc/apple2/gettime.s
+++ b/libsrc/apple2/gettime.s
@@ -4,7 +4,8 @@
 ; int __fastcall__ clock_gettime (clockid_t clk_id, struct timespec *tp);
 ;
 
-        .import         pushax, steaxspidx, incsp1, incsp3, return0
+        .import         pushax, incsp1, incsp3, steaxspidx, return0
+        .import         _mktime_dt
 
         .include        "time.inc"
         .include        "zeropage.inc"
@@ -29,42 +30,12 @@ _clock_gettime:
         jsr     callmli
         bcs     oserr
 
-        ; Get date
-        lda     DATELO+1
-        lsr
-        php                     ; Save month msb
-        cmp     #70             ; Year < 70?
-        bcs     :+              ; No, leave alone
-        adc     #100            ; Move 19xx to 20xx
-:       sta     TM + tm::tm_year
-        lda     DATELO
-        tax                     ; Save day
-        plp                     ; Restore month msb
-        ror
-        lsr
-        lsr
-        lsr
-        lsr
-        beq     erange          ; [1..12] allows for validity check
-        tay
-        dey                     ; Move [1..12] to [0..11]
-        sty     TM + tm::tm_mon
-        txa                     ; Restore day
-        and     #%00011111
-        sta     TM + tm::tm_mday
+        ; Convert DATELO/TIMELO to time_t
+        lda     #<DATELO
+        ldx     #>DATELO
+        jsr     _mktime_dt
 
-        ; Get time
-        lda     TIMELO+1
-        sta     TM + tm::tm_hour
-        lda     TIMELO
-        sta     TM + tm::tm_min
-
-        ; Make time_t
-        lda     #<TM
-        ldx     #>TM
-        jsr     _mktime
-
-        ; Store tv_sec
+        ; Store
         ldy     #timespec::tv_sec
         jsr     steaxspidx
 
@@ -74,21 +45,8 @@ _clock_gettime:
         ; Return success
         jmp     return0
 
-        ; Load errno code
-erange: lda     #ERANGE
-
-        ; Cleanup stack
-        jsr     incsp3          ; Preserves A
-
-        ; Set __errno
-        jmp     ___directerrno
-
         ; Cleanup stack
 oserr:  jsr     incsp3          ; Preserves A
 
         ; Set ___oserror
         jmp     ___mappederrno
-
-        .bss
-
-TM:     .tag    tm
diff --git a/libsrc/apple2/gmtime_dt.s b/libsrc/apple2/gmtime_dt.s
new file mode 100644
index 000000000..a0b8e9f4d
--- /dev/null
+++ b/libsrc/apple2/gmtime_dt.s
@@ -0,0 +1,73 @@
+;
+; Oliver Schmidt, 14.08.2018
+; Colin Leroy-Mira, 2023 <colin@colino.net>
+;
+; struct tm * __fastcall__ gmtime_dt(const struct datetime *dt)
+;
+
+        .export         _gmtime_dt, tm_buf
+
+        .include        "time.inc"
+        .include        "zeropage.inc"
+        .include        "errno.inc"
+        .include        "mli.inc"
+
+        ; Convert ProDOS date/time to a struct tm
+        ; source date address in AX
+        ; on stack:
+        ; destination struct
+
+_gmtime_dt:
+        sta     ptr1
+        stx     ptr1+1
+
+        ; Get time
+        ldy     #$03
+        lda     (ptr1),y
+        sta     tm_buf + tm::tm_hour
+        dey
+        lda     (ptr1),y
+        sta     tm_buf + tm::tm_min
+
+        ; Get date
+        dey
+        lda     (ptr1),y
+        lsr
+        php                     ; Save month msb
+        cmp     #70             ; Year < 70?
+        bcs     :+              ; No, leave alone
+        adc     #100            ; Move 19xx to 20xx
+:       sta     tm_buf + tm::tm_year
+
+        dey
+        lda     (ptr1),y
+        tax                     ; Save day
+        plp                     ; Restore month msb
+        ror
+        lsr
+        lsr
+        lsr
+        lsr
+        beq     erange          ; [1..12] allows for validity check
+        tay
+        dey                     ; Move [1..12] to [0..11]
+        sty     tm_buf + tm::tm_mon
+        txa                     ; Restore day
+        and     #%00011111
+        sta     tm_buf + tm::tm_mday
+
+        lda     #<tm_buf        ; Return pointer to tm_buf
+        ldx     #>tm_buf
+        rts
+
+        ; Load errno code and return NULL
+erange: lda     #ERANGE
+        sta     ___errno
+        lda     #$00
+        tax
+        rts
+
+        .bss
+
+tm_buf:
+        .tag    tm
diff --git a/libsrc/apple2/gotoxy.s b/libsrc/apple2/gotoxy.s
index 6755af8d8..2ecd2a513 100644
--- a/libsrc/apple2/gotoxy.s
+++ b/libsrc/apple2/gotoxy.s
@@ -8,6 +8,10 @@
         .export         gotoxy, _gotoxy, _gotox
         .import         popa, VTABZ
 
+        .ifndef __APPLE2ENH__
+        .import         machinetype
+        .endif
+
         .include        "apple2.inc"
 
 gotoxy:
@@ -22,4 +26,13 @@ _gotoxy:
 
 _gotox:
         sta     CH              ; Store X
-        rts
+
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     :+
+        .endif
+
+        bit     RD80VID         ; In 80 column mode?
+        bpl     :+
+        sta     OURCH           ; Store X
+:       rts
diff --git a/libsrc/apple2/joy/a2.stdjoy.s b/libsrc/apple2/joy/a2.stdjoy.s
index 11be52eb4..b5e7a311b 100644
--- a/libsrc/apple2/joy/a2.stdjoy.s
+++ b/libsrc/apple2/joy/a2.stdjoy.s
@@ -92,7 +92,7 @@ COUNT:
         bvc     noiic           ; Not $4x
         dex                     ; Only one joystick for the //c
 noiic:  txa                     ; Number of joysticks we support
-        ldx     #$00
+        ldx     #>$0000
         rts
 
 ; READ routine. Read a particular joystick passed in A.
@@ -170,5 +170,5 @@ nogs2:  lda     #$00            ; 0 0 0 0 0 0 0 0
 
         ; Finalize
         eor     #%00010100      ; BTN_2 BTN_1 DOWN UP RIGHT LEFT 0 0
-        ldx     #$00
+        ldx     #>$0000
         rts
diff --git a/libsrc/apple2/lc-copy-applesoft.s b/libsrc/apple2/lc-copy-applesoft.s
new file mode 100644
index 000000000..70a04431d
--- /dev/null
+++ b/libsrc/apple2/lc-copy-applesoft.s
@@ -0,0 +1,9 @@
+;
+; Oliver Schmidt, 15.09.2009
+;
+; Copy the LC segment from the end of the binary to the Language Card
+; using AppleSoft's BLTU2 routine.
+;
+        .export         bltu2
+
+bltu2 := $D39A
diff --git a/libsrc/apple2/libref.s b/libsrc/apple2/libref.s
index 8aa54abab..9c6994a5d 100644
--- a/libsrc/apple2/libref.s
+++ b/libsrc/apple2/libref.s
@@ -2,10 +2,8 @@
 ; Oliver Schmidt, 2013-05-31
 ;
 
-        .export         em_libref, mouse_libref, ser_libref, tgi_libref
+        .export         em_libref, ser_libref
         .import         _exit
 
 em_libref       := _exit
-mouse_libref    := _exit
 ser_libref      := _exit
-tgi_libref      := _exit
diff --git a/libsrc/apple2/lseek.s b/libsrc/apple2/lseek.s
index be0078c1b..63a2813dc 100644
--- a/libsrc/apple2/lseek.s
+++ b/libsrc/apple2/lseek.s
@@ -6,7 +6,6 @@
 
         .export         _lseek
         .import         popax, popptr1
-        .macpack        cpu
 
         .include        "zeropage.inc"
         .include        "errno.inc"
diff --git a/libsrc/apple2/machinetype.s b/libsrc/apple2/machinetype.s
new file mode 100644
index 000000000..7fa70f29f
--- /dev/null
+++ b/libsrc/apple2/machinetype.s
@@ -0,0 +1,24 @@
+.ifndef __APPLE2ENH__
+
+        .constructor    initmachinetype, 8
+
+        .import         ostype
+        .export         machinetype
+
+        .segment        "ONCE"
+
+initmachinetype:
+        ldx     ostype
+        cpx     #$31          ; Apple //e enhanced?
+        ror     machinetype   ; Carry to high bit
+        cpx     #$30          ; Apple //e?
+        ror     machinetype
+        rts
+
+        .data
+
+; bit 7: Machine is a //e or newer
+; bit 6: Machine is a //e enhanced or newer
+machinetype:            .byte 0
+
+.endif
diff --git a/libsrc/apple2/mcbdefault.s b/libsrc/apple2/mcbdefault.s
index 556a9d8fb..6a369114c 100644
--- a/libsrc/apple2/mcbdefault.s
+++ b/libsrc/apple2/mcbdefault.s
@@ -9,6 +9,10 @@
 
         .export         _mouse_def_callbacks
 
+        .ifndef __APPLE2ENH__
+        .import         machinetype
+        .endif
+
         .include        "apple2.inc"
 
 ; ------------------------------------------------------------------------
@@ -42,11 +46,14 @@ cursor = '+' | $40              ; Flashing crosshair
         .endif
 
 getcursor:
-        .ifdef  __APPLE2ENH__
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     column
+        .endif
         bit     RD80VID         ; In 80 column mode?
         bpl     column          ; No, skip bank switching
 switch: bit     LOWSCR          ; Patched at runtime
-        .endif
+
 column: ldx     #$00            ; Patched at runtime
 getscr: lda     $0400,x         ; Patched at runtime
         cmp     #cursor
@@ -55,9 +62,7 @@ getscr: lda     $0400,x         ; Patched at runtime
 setcursor:
         lda     #cursor
 setscr: sta     $0400,x         ; Patched at runtime
-        .ifdef  __APPLE2ENH__
         bit     LOWSCR          ; Doesn't hurt in 40 column mode
-        .endif
         rts
 
 ; ------------------------------------------------------------------------
@@ -65,9 +70,7 @@ setscr: sta     $0400,x         ; Patched at runtime
         .code
 
 done:
-        .ifdef  __APPLE2ENH__
         bit     LOWSCR          ; Doesn't hurt in 40 column mode
-        .endif
 return: rts
 
 ; Hide the mouse cursor.
@@ -108,14 +111,14 @@ movex:
         inx
         bcs     :-
         stx     column+1
-        .ifdef  __APPLE2ENH__
+
+        ; Patch switch anyway, it will just be skipped over if in 40-col mode
         adc     #7 / 2          ; Left or right half of 40-col column?
         ldx     #<LOWSCR        ; Columns 1,3,5..79
         bcs     :+
         .assert LOWSCR + 1 = HISCR, error
         inx                     ; Columns 0,2,4..78
 :       stx     switch+1
-        .endif
         rts
 
 ; Move the mouse cursor y position to the value in A/X.
diff --git a/libsrc/apple2/mktime_dt.s b/libsrc/apple2/mktime_dt.s
new file mode 100644
index 000000000..415f52b9e
--- /dev/null
+++ b/libsrc/apple2/mktime_dt.s
@@ -0,0 +1,37 @@
+;
+; Oliver Schmidt, 14.08.2018
+; Colin Leroy-Mira, 2023 <colin@colino.net>
+;
+; time_t __fastcall__ mktime_dt(const struct datetime *dt)
+;
+
+        .import         steaxspidx, pushax, incsp2, _gmtime_dt
+        .import         tm_buf
+        .export         _mktime_dt
+
+        .include        "time.inc"
+        .include        "zeropage.inc"
+        .include        "errno.inc"
+        .include        "mli.inc"
+
+        ; Convert ProDOS date/time to UNIX timestamp
+        ; source date address in AX
+
+_mktime_dt:
+        ; Convert to internal tm
+        jsr     _gmtime_dt
+        cpx     #$00
+        bne     :+
+        cmp     #$00
+        beq     err
+
+        ; Make time_t
+:       lda     #<tm_buf
+        ldx     #>tm_buf
+        jmp     _mktime
+
+err:    lda     #$00
+        tax
+        sta     sreg
+        sta     sreg+1
+        rts
diff --git a/libsrc/apple2/mli.inc b/libsrc/apple2/mli.inc
index 42363d9c9..382a071b0 100644
--- a/libsrc/apple2/mli.inc
+++ b/libsrc/apple2/mli.inc
@@ -83,8 +83,8 @@ EOF_COUNT       = 2
                                 AUX_TYPE        .word
                                 STORAGE_TYPE    .byte
                                 BLOCKS          .word
-                                MODE_DATE       .word
-                                MODE_TIME       .word
+                                MOD_DATE        .word
+                                MOD_TIME        .word
                                 CREATE_DATE     .word
                                 CREATE_TIME     .word
                         .endstruct
@@ -139,3 +139,6 @@ LEVEL   :=      $BF94           ; File level: used in open, flush, close
 MACHID  :=      $BF98           ; Machine identification
 PFIXPTR :=      $BF9A           ; If = 0, no prefix active
 KVERSION:=      $BFFF           ; Kernel version number
+
+; Max filename length
+FILENAME_MAX =  64+1
diff --git a/libsrc/apple2/mli_file_info.s b/libsrc/apple2/mli_file_info.s
new file mode 100644
index 000000000..16e01c07f
--- /dev/null
+++ b/libsrc/apple2/mli_file_info.s
@@ -0,0 +1,33 @@
+;
+; Colin Leroy-Mira, 2023 <colin@colino.net>
+;
+
+        .export         mli_file_info
+        .import         pushname, popname, mli_file_info_direct
+        .import         popax
+        .include        "zeropage.inc"
+        .include        "errno.inc"
+        .include        "mli.inc"
+
+        ; Calls ProDOS MLI GET_FILE_INFO on the filename
+        ; stored as C string in AX at top of stack
+        ; Returns with carry set on error, and sets errno
+mli_file_info:
+        ; Get pathname
+        jsr     popax
+        jsr     pushname
+        bne     oserr
+
+        jsr     mli_file_info_direct
+        php                     ; Save return status
+
+        jsr     popname         ; Preserves A
+
+        plp
+        bcs     oserr
+        rts
+
+oserr:
+        jsr     ___mappederrno
+        sec
+        rts
diff --git a/libsrc/apple2/mli_file_info_direct.s b/libsrc/apple2/mli_file_info_direct.s
new file mode 100644
index 000000000..7fdaa9edf
--- /dev/null
+++ b/libsrc/apple2/mli_file_info_direct.s
@@ -0,0 +1,22 @@
+;
+; Colin Leroy-Mira, 2023 <colin@colino.net>
+;
+
+        .export         mli_file_info_direct
+        .include        "zeropage.inc"
+        .include        "mli.inc"
+
+        ; Calls ProDOS MLI GET_FILE_INFO on the ProDOS style
+        ; filename stored on top of stack
+        ; Returns with carry set on error, and sets errno
+mli_file_info_direct:
+        ; Set pushed name
+        lda     c_sp
+        ldx     c_sp+1
+        sta     mliparam + MLI::INFO::PATHNAME
+        stx     mliparam + MLI::INFO::PATHNAME+1
+
+        ; Get file information
+        lda     #GET_INFO_CALL
+        ldx     #GET_INFO_COUNT
+        jmp     callmli
diff --git a/libsrc/apple2/mou/a2.stdmou.s b/libsrc/apple2/mou/a2.stdmou.s
index c54c09d34..38cd7c957 100644
--- a/libsrc/apple2/mou/a2.stdmou.s
+++ b/libsrc/apple2/mou/a2.stdmou.s
@@ -7,6 +7,7 @@
         .include        "zeropage.inc"
         .include        "mouse-kernel.inc"
         .include        "apple2.inc"
+        .include        "get_tv.inc"
 
         .macpack        module
 
@@ -21,6 +22,7 @@ CLAMPMOUSE      = $17   ; Sets mouse bounds in a window
 HOMEMOUSE       = $18   ; Sets mouse to upper-left corner of clamp win
 INITMOUSE       = $19   ; Resets mouse clamps to default values and
                         ; sets mouse position to 0,0
+TIMEDATA        = $1C   ; Set mousecard's interrupt rate
 
 pos1_lo         := $0478
 pos1_hi         := $0578
@@ -41,6 +43,7 @@ status          := $0778
         .byte   MOUSE_API_VERSION       ; Mouse driver API version number
 
         ; Library reference
+libref:
         .addr   $0000
 
         ; Jump table
@@ -155,6 +158,7 @@ next:   inc     ptr1+1
         ; Disable interrupts now because setting the slot number makes
         ; the IRQ handler (maybe called due to some non-mouse IRQ) try
         ; calling the firmware which isn't correctly set up yet
+        php
         sei
 
         ; Convert to and save slot number
@@ -168,7 +172,31 @@ next:   inc     ptr1+1
         asl
         sta     yparam+1
 
-        ; The AppleMouse II Card needs the ROM switched in
+        ; Apple II technical notes "Varying VBL Interrupt Rate",
+        lda     libref
+        ldx     libref+1
+        sta     ptr1
+        stx     ptr1+1
+
+        .ifdef __APPLE2ENH__
+        lda     (ptr1)
+        .else
+        ldy     #$00
+        lda     (ptr1),y
+        .endif
+
+        cmp     #TV::OTHER
+        beq     :+
+
+        ; The TV values are aligned with the values the mousecard
+        ; expect: 0 for 60Hz, 1 for 50Hz.
+        .assert TV::NTSC = 0, error
+        .assert TV::PAL = 1, error
+
+        ldx     #TIMEDATA
+        jsr     firmware
+
+:       ; The AppleMouse II Card needs the ROM switched in
         ; to be able to detect an Apple //e and use RDVBL
         bit     $C082
 
@@ -211,7 +239,7 @@ next:   inc     ptr1+1
 common: jsr     firmware
 
         ; Enable interrupts and return success
-        cli
+        plp
         lda     #<MOUSE_ERR_OK
         ldx     #>MOUSE_ERR_OK
         rts
@@ -220,6 +248,7 @@ common: jsr     firmware
 ; No return code required (the driver is removed from memory on return).
 UNINSTALL:
         ; Hide cursor
+        php
         sei
         jsr     CHIDE
 
@@ -249,7 +278,8 @@ SETBOX:
         ; Apple II Mouse TechNote #1, Interrupt Environment with the Mouse:
         ; "Disable interrupts before placing position information in the
         ;  screen holes."
-:       sei
+:       php
+        sei
 
         ; Set low clamp
         lda     (ptr1),y
@@ -298,6 +328,7 @@ GETBOX:
 ; the screen). No return code required.
 MOVE:
         ldy     slot
+        php
         sei
 
         ; Set y
@@ -310,10 +341,10 @@ MOVE:
         ldy     #$00            ; Start at top of stack
 
         ; Set x
-        lda     (sp),y
+        lda     (c_sp),y
         iny
         sta     pos1_lo,x
-        lda     (sp),y
+        lda     (c_sp),y
         sta     pos1_hi,x
 
         ; Update cursor
@@ -328,9 +359,10 @@ MOVE:
 ; no special action is required besides hiding the mouse cursor.
 ; No return code required.
 HIDE:
+        php
         sei
         jsr     CHIDE
-        cli
+        plp
         rts
 
 ; SHOW: Is called to show the mouse cursor. The mouse kernel manages a
@@ -339,15 +371,16 @@ HIDE:
 ; no special action is required besides enabling the mouse cursor.
 ; No return code required.
 SHOW:
+        php
         sei
         jsr     CSHOW
-        cli
+        plp
         rts
 
 ; BUTTONS: Return the button mask in A/X.
 BUTTONS:
         lda     info + MOUSE_INFO::BUTTONS
-        ldx     #$00
+        ldx     #>$0000
         rts
 
 ; POS: Return the mouse position in the MOUSE_POS struct pointed to by ptr1.
@@ -360,12 +393,13 @@ POS:
 ; struct pointed to by ptr1. No return code required.
 INFO:
         ldy     #.sizeof(MOUSE_INFO)-1
-copy:   sei
+copy:   php
+        sei
 :       lda     info,y
         sta     (ptr1),y
         dey
         bpl     :-
-        cli
+        plp
         rts
 
 ; IOCTL: Driver defined entry point. The wrapper will pass a pointer to ioctl
diff --git a/libsrc/apple2/mouseref.s b/libsrc/apple2/mouseref.s
new file mode 100644
index 000000000..b0e75c367
--- /dev/null
+++ b/libsrc/apple2/mouseref.s
@@ -0,0 +1,25 @@
+;
+; Colin Leroy-Mira, 2025-05-11
+;
+
+        .export         mouse_libref
+        .import         _get_tv, ostype, return0
+
+        .constructor    init_mousetv
+
+        .include        "get_tv.inc"
+
+        .segment "ONCE"
+
+.proc init_mousetv
+        lda     ostype
+        cmp     #$40          ; Technical notes say not to change
+        bcs     :+            ; interrupt rate on IIc/IIgs, so...
+        jsr     _get_tv
+        sta     mouse_libref
+:       rts                   ; ...don't update "Other" on those machines
+.endproc
+
+        .data
+
+mouse_libref: .byte TV::OTHER
diff --git a/libsrc/apple2/chline.s b/libsrc/apple2/mtchline.s
similarity index 68%
rename from libsrc/apple2/chline.s
rename to libsrc/apple2/mtchline.s
index be157ca9e..71347c563 100644
--- a/libsrc/apple2/chline.s
+++ b/libsrc/apple2/mtchline.s
@@ -1,27 +1,26 @@
 ;
 ; Ullrich von Bassewitz, 08.08.1998
+; Colin Leroy-Mira, 26.05.2025
 ;
-; void __fastcall__ chlinexy (unsigned char x, unsigned char y, unsigned char length);
-; void __fastcall__ chline (unsigned char length);
+; void __fastcall__ mt_chlinexy (unsigned char x, unsigned char y, unsigned char length);
+; void __fastcall__ mt_chline (unsigned char length);
 ;
 
-        .export         _chlinexy, _chline, chlinedirect
+.ifdef  __APPLE2ENH__
+
+        .export         _mt_chlinexy, _mt_chline, chlinedirect
         .import         gotoxy, cputdirect
 
         .include        "zeropage.inc"
         .include        "apple2.inc"
 
-_chlinexy:
+_mt_chlinexy:
         pha                     ; Save the length
         jsr     gotoxy          ; Call this one, will pop params
         pla                     ; Restore the length and run into _chline
 
-_chline:
-        .ifdef  __APPLE2ENH__
+_mt_chline:
         ldx     #'_' | $80      ; Underscore, screen code
-        .else
-        ldx     #'-' | $80      ; Minus, screen code
-        .endif
 
 chlinedirect:
         stx     tmp1
@@ -33,3 +32,5 @@ chlinedirect:
         dec     tmp2
         bne     :-
 done:   rts
+
+.endif
diff --git a/libsrc/apple2/cvline.s b/libsrc/apple2/mtcvline.s
similarity index 57%
rename from libsrc/apple2/cvline.s
rename to libsrc/apple2/mtcvline.s
index 86bbf11f4..03e11bf51 100644
--- a/libsrc/apple2/cvline.s
+++ b/libsrc/apple2/mtcvline.s
@@ -1,34 +1,32 @@
 ;
 ; Ullrich von Bassewitz, 08.08.1998
+; Colin Leroy-Mira, 26.05.2025
 ;
-; void __fastcall__ cvlinexy (unsigned char x, unsigned char y, unsigned char length);
-; void __fastcall__ cvline (unsigned char length);
+; void __fastcall__ mt_cvlinexy (unsigned char x, unsigned char y, unsigned char length);
+; void __fastcall__ mt_cvline (unsigned char length);
 ;
 
-        .export         _cvlinexy, _cvline
+.ifdef __APPLE2ENH__
+
+        .export         _mt_cvlinexy, _mt_cvline
         .import         gotoxy, putchar, newline
 
         .include        "zeropage.inc"
 
-_cvlinexy:
+_mt_cvlinexy:
         pha                     ; Save the length
         jsr     gotoxy          ; Call this one, will pop params
         pla                     ; Restore the length and run into _cvline
 
-_cvline:
-        .ifdef  __APPLE2ENH__
-        ldx     #$5F            ; Left vertical line MouseText character
-        .else
-        ldx     #'!' | $80      ; Exclamation mark, screen code
-        .endif
-
-        stx     tmp1
+_mt_cvline:
         cmp     #$00            ; Is the length zero?
         beq     done            ; Jump if done
         sta     tmp2
-:       lda     tmp1            ; Screen code
+:       lda     #$5F            ; Left vertical line MouseText character
         jsr     putchar         ; Write, no cursor advance
         jsr     newline         ; Advance cursor to next line
         dec     tmp2
         bne     :-
 done:   rts
+
+.endif
diff --git a/libsrc/apple2/open.s b/libsrc/apple2/open.s
index 68c203cd6..8f1df26df 100644
--- a/libsrc/apple2/open.s
+++ b/libsrc/apple2/open.s
@@ -18,6 +18,7 @@
         .include        "fcntl.inc"
         .include        "mli.inc"
         .include        "filedes.inc"
+        .include        "time.inc"
 
         .segment        "ONCE"
 
@@ -100,8 +101,8 @@ found:  tya
         bne     oserr1
 
         ; Set pushed name
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         sta     mliparam + MLI::OPEN::PATHNAME
         stx     mliparam + MLI::OPEN::PATHNAME+1
 
@@ -208,7 +209,7 @@ done:   lda     tmp1            ; Restore fd
         jsr     popname         ; Preserves A
 
         ; Return success
-        ldx     #$00
+        ldx     #>$0000
         stx     ___oserror
         rts
 
diff --git a/libsrc/apple2/opendir.s b/libsrc/apple2/opendir.s
new file mode 100644
index 000000000..317be2755
--- /dev/null
+++ b/libsrc/apple2/opendir.s
@@ -0,0 +1,159 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; DIR* __fastcall__ opendir (register const char* name)
+;
+
+        .export   _opendir, read_dir_block_ptr1
+
+        .import   closedir_ptr1
+        .import   _open, _read, _close
+        .import   _malloc
+        .import    ___directerrno
+
+        .import   ___oserror, __cwd
+
+        .import   pushptr1, popptr1
+        .import   pushax, pusha0
+        .import   return0, returnFFFF
+
+        .importzp ptr1
+
+        .include  "apple2.inc"
+        .include  "dir.inc"
+        .include  "errno.inc"
+        .include  "fcntl.inc"
+        .include  "zeropage.inc"
+
+.proc _opendir
+        sta       ptr1
+        stx       ptr1+1
+
+        ldy       #$00
+        lda       (ptr1),y
+        cmp       #'.'
+        bne       :+
+
+        lda       #<__cwd
+        ldx       #>__cwd
+        sta       ptr1
+        stx       ptr1+1
+
+:       ; Open directory
+        jsr       pushptr1
+        lda       #O_RDONLY
+        jsr       pusha0
+
+        ldy       #$04
+        jsr       _open
+
+        cmp       #$FF        ; Did we succeed?
+        beq       @return_null
+        pha                   ; Yes - Push fd for backup
+
+        ; malloc the dir struct
+        lda       #<.sizeof(DIR)
+        ldx       #>.sizeof(DIR)
+        jsr       _malloc
+        bne       :+
+
+        ; We failed to allocate
+        pla                   ; Get fd back
+        ldx       #$00
+        jsr       _close      ; Close it
+
+        lda       #ENOMEM     ; Set error
+        jsr       ___directerrno
+@return_null:
+        jmp       return0
+
+:       ; Store dir struct to pointer
+        sta       ptr1
+        stx       ptr1+1
+
+        ; Save fd to dir struct
+        lda       #$00
+        ldy       #DIR::FD + 1
+        sta       (ptr1),y
+
+        dey
+        pla                   ; Get fd back
+        sta       (ptr1),y
+
+        jsr       read_dir_block_ptr1
+        bcc       @read_ok
+
+        ; Close directory, free it
+        jsr       closedir_ptr1
+        jmp       return0     ; Return NULL
+
+@read_ok:
+        ; Read succeeded, populate dir struct
+
+        ; Get file_count to entry_length from block
+        ldy       #$26 + DIR::BYTES
+:       lda       (ptr1),y
+        pha
+        dey
+        cpy       #$23 + DIR::BYTES - 1
+        bne       :-
+
+        ; Set entry_length to file_count in struct
+        ldy       #DIR::ENTRY_LENGTH
+:       pla
+        sta       (ptr1),y
+        iny
+        cpy       #DIR::CURRENT_ENTRY
+        bne       :-
+
+        ; Skip directory header entry
+        lda       #$01
+        sta       (ptr1),y
+
+        ; Return pointer to dir struct
+        lda       ptr1
+        ldx       ptr1+1
+        rts
+.endproc
+
+; Read a directory for the DIR* pointer in ptr1
+; Return with carry clear on success
+read_dir_block_ptr1:
+        ; Push ptr1, read will destroy it
+        jsr       pushptr1
+
+        ldy       #DIR::FD
+        lda       (ptr1),y
+
+        jsr       pusha0      ; Push fd for read
+        lda       #<DIR::BYTES
+        clc
+        adc       ptr1
+        pha
+        lda       #>DIR::BYTES
+        adc       ptr1+1
+        tax
+        pla
+        jsr       pushax      ; Push dir->block.bytes for read
+
+        lda       #<.sizeof(DIR::BYTES)
+        ldx       #>.sizeof(DIR::BYTES)
+
+        jsr       _read       ; Read directory block
+        cpx       #>.sizeof(DIR::BYTES)
+        bne       @read_err
+        cmp       #<.sizeof(DIR::BYTES)
+        beq       @read_ok
+
+@read_err:
+        ; Read failed, exit
+        lda       ___oserror
+        bne       :+
+        lda       #EINVAL
+        jsr       ___directerrno
+:       sec
+        bcs       @out
+@read_ok:
+        clc
+@out:
+        jmp       popptr1
diff --git a/libsrc/apple2/oserror.s b/libsrc/apple2/oserror.s
index 5f523340f..db4f146cd 100644
--- a/libsrc/apple2/oserror.s
+++ b/libsrc/apple2/oserror.s
@@ -23,7 +23,7 @@ ___osmaperrno:
 
         ; Found the code
 :       lda     ErrTab-1,x
-        ldx     #$00            ; High byte always zero
+        ldx     #>$0000
         rts
 
         .rodata
diff --git a/libsrc/apple2/readdir.c b/libsrc/apple2/readdir.c
deleted file mode 100644
index 8acfbbe8b..000000000
--- a/libsrc/apple2/readdir.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************/
-/*                                                                           */
-/*                                readdir.c                                  */
-/*                                                                           */
-/*                           Read directory entry                            */
-/*                                                                           */
-/*                                                                           */
-/*                                                                           */
-/* (C) 2005  Oliver Schmidt, <ol.sc@web.de>                                  */
-/*                                                                           */
-/*                                                                           */
-/* This software is provided 'as-is', without any expressed or implied       */
-/* warranty.  In no event will the authors be held liable for any damages    */
-/* arising from the use of this software.                                    */
-/*                                                                           */
-/* Permission is granted to anyone to use this software for any purpose,     */
-/* including commercial applications, and to alter it and redistribute it    */
-/* freely, subject to the following restrictions:                            */
-/*                                                                           */
-/* 1. The origin of this software must not be misrepresented; you must not   */
-/*    claim that you wrote the original software. If you use this software   */
-/*    in a product, an acknowledgment in the product documentation would be  */
-/*    appreciated but is not required.                                       */
-/* 2. Altered source versions must be plainly marked as such, and must not   */
-/*    be misrepresented as being the original software.                      */
-/* 3. This notice may not be removed or altered from any source              */
-/*    distribution.                                                          */
-/*                                                                           */
-/*****************************************************************************/
-
-
-
-#include <stddef.h>
-#include <unistd.h>
-#include <dirent.h>
-#include "dir.h"
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-struct dirent* __fastcall__ readdir (register DIR* dir)
-{
-    register unsigned char* entry;
-
-    /* Search for the next active directory entry */
-    do {
-
-        /* Read next directory block if necessary */
-        if (dir->current_entry == dir->entries_per_block) {
-            if (read (dir->fd,
-                      dir->block.bytes,
-                      sizeof (dir->block)) != sizeof (dir->block)) {
-
-                /* Just return failure as read() has */
-                /* set errno if (and only if) no EOF */
-                return NULL;
-            }
-
-            /* Start with first entry in next block */
-            dir->current_entry = 0;
-        }
-
-        /* Compute pointer to current entry */
-        entry = dir->block.content.entries +
-                dir->current_entry * dir->entry_length;
-
-        /* Switch to next entry */
-        ++dir->current_entry;
-    } while (entry[0x00] == 0);
-
-    /* Move creation date/time to allow for next step below */
-    *(unsigned long*)&entry[0x1A] = *(unsigned long*)&entry[0x18];
-
-    /* Feature unsigned long access to EOF by extension from 3 to 4 bytes */
-    entry[0x18] = 0;
-
-    /* Move file type to allow for next step below */
-    entry[0x19] = entry[0x10];
-
-    /* Zero-terminate file name */
-    entry[0x01 + (entry[0x00] & 0x0F)] = 0;
-
-    /* Return success */
-    return (struct dirent*)&entry[0x01];
-}
diff --git a/libsrc/apple2/readdir.s b/libsrc/apple2/readdir.s
new file mode 100644
index 000000000..e748055e1
--- /dev/null
+++ b/libsrc/apple2/readdir.s
@@ -0,0 +1,113 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; struct dirent * __fastcall__ readdir (DIR *dir)
+;
+        .export                  _readdir
+        .import                  read_dir_block_ptr1
+
+        .import                  incax1, return0
+        .import                  tosaddax, tosumula0, incaxy
+        .import                  pushax, pusha0, pushptr1, popptr1
+        .importzp                ptr1, ptr4
+
+        .include                 "dir.inc"
+
+.proc _readdir
+        sta     ptr1
+        stx     ptr1+1
+
+@next_entry:
+        ; Do we need to read the next directory block?
+        ldy     #DIR::CURRENT_ENTRY
+        lda     (ptr1),y
+        ldy     #DIR::ENTRIES_PER_BLOCK
+        cmp     (ptr1),y
+        bne     @read_entry            ; We don't
+
+        jsr     read_dir_block_ptr1
+        bcc     @read_ok
+
+        ; We had a read error
+        jmp     return0
+
+@read_ok:
+        ldy     #DIR::CURRENT_ENTRY
+        lda     #$00
+        sta     (ptr1),y
+
+@read_entry:
+        ; Compute pointer to current entry:
+        ; entry = dir->block.content.entries +
+        ;    dir->current_entry * dir->entry_length
+
+        jsr     pushptr1                ; Backup ptr1
+        lda     ptr1
+        ldx     ptr1+1
+        ldy     #DIR::BYTES + DIR::CONTENT::ENTRIES
+        jsr     incaxy
+        jsr     pushax
+        ldy     #DIR::CURRENT_ENTRY
+        lda     (ptr1),y
+        jsr     pusha0
+        ldy     #DIR::ENTRY_LENGTH
+        lda     (ptr1),y
+        jsr     tosumula0
+        jsr     tosaddax
+        ; Store pointer to current entry
+        sta     ptr4
+        stx     ptr4+1
+        jsr     popptr1
+
+        ; Switch to next entry
+        ldy     #DIR::CURRENT_ENTRY
+        lda     (ptr1),y
+        clc
+        adc     #1
+        sta     (ptr1),y
+
+        ; Check if entry[0] == 0
+        ldy     #$00
+        lda     (ptr4),y
+        beq     @next_entry             ; Yes, skip entry
+
+        ; Move creation date/time to allow for next step below
+        ; 18-19-1A-1B => 1A-1B-1C-1D
+        ldy     #$1B
+:       lda     (ptr4),y
+        iny
+        iny
+        sta     (ptr4),y
+        dey
+        dey
+        dey
+        cpy     #$17
+        bne     :-
+
+        ; Feature unsigned long access to EOF by extension from 3 to 4 bytes
+        ; entry[0x18] = 0
+        iny
+        lda     #$00
+        sta     (ptr4),y
+
+        ; Move file type to allow for next step below
+        ; entry[0x19] = entry[0x10]
+        ldy     #$10
+        lda     (ptr4),y
+        ldy     #$19
+        sta     (ptr4),y
+
+        ; Zero-terminate file name
+        ldy     #$00
+        lda     (ptr4),y
+        and     #$0F
+        tay
+        iny
+        lda     #$00
+        sta     (ptr4),y
+
+        ; Return pointer to entry+1
+        lda     ptr4
+        ldx     ptr4+1
+        jmp     incax1
+.endproc
diff --git a/libsrc/apple2/revers.s b/libsrc/apple2/revers.s
index 83fcb2ae7..86dfd0d19 100644
--- a/libsrc/apple2/revers.s
+++ b/libsrc/apple2/revers.s
@@ -18,5 +18,5 @@ normal: dex                     ; $00->$FF, $40->$3F
         stx     INVFLG          ; Save new flag value
         bmi     :+              ; Jump if current value is $FF (normal)
         lda     #$01            ; Return "inverse"
-:       ldx     #$00
+:       ldx     #>$0000
         rts
diff --git a/libsrc/apple2/rewinddir.s b/libsrc/apple2/rewinddir.s
new file mode 100644
index 000000000..fd3e5738f
--- /dev/null
+++ b/libsrc/apple2/rewinddir.s
@@ -0,0 +1,70 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; void __fastcall__ rewinddir (DIR* dir)
+;
+        .export                  _rewinddir
+        .import                  read_dir_block_ptr1
+
+        .import                  pusha, pusha0, pushax
+        .import                  pushptr1, popptr1
+        .import                  incaxy
+        .import                  _lseek, _memset
+
+        .importzp                ptr1, sreg
+
+        .include                 "dir.inc"
+        .include                 "stdio.inc"
+
+.proc _rewinddir
+        sta     ptr1
+        stx     ptr1+1
+        jsr     pushptr1      ; Backup ptr1, destroyed by _lseek
+
+        ; Rewind directory file
+        ldy     #DIR::FD
+        lda     (ptr1),y
+        jsr     pusha0        ; Push dir->fd
+
+        tya                   ; Y = 0 here
+        jsr     pusha0
+        jsr     pusha0        ; Push 0L
+
+        lda     #SEEK_SET     ; X = 0 here
+        jsr     _lseek
+
+        ora     sreg          ; Check lseek returned 0L
+        ora     sreg+1
+        bne     @rewind_err
+        txa
+        bne     @rewind_err
+
+        jsr     popptr1       ; Restore ptr1
+
+        ; Read directory key block
+        jsr     read_dir_block_ptr1
+        bcs     @rewind_err
+
+        ; Skip directory header entry
+        lda     #$01
+        ldy     #DIR::CURRENT_ENTRY
+        sta     (ptr1),y
+        rts
+
+@rewind_err:
+        jsr     popptr1       ; Restore ptr1
+
+        ; Assert that no subsequent readdir() finds an active entry
+        lda     ptr1
+        ldx     ptr1+1
+        ldy     #DIR::BYTES + DIR::CONTENT::ENTRIES
+        jsr     incaxy
+        jsr     pushax
+
+        lda     #$00
+        jsr     pusha
+
+        lda     #<.sizeof(DIR::BYTES)
+        ldx     #>.sizeof(DIR::BYTES)
+        jmp     _memset
+.endproc
diff --git a/libsrc/apple2/ser/a2.gs.s b/libsrc/apple2/ser/a2.gs.s
index 3a2db1926..3ad899fc2 100644
--- a/libsrc/apple2/ser/a2.gs.s
+++ b/libsrc/apple2/ser/a2.gs.s
@@ -66,34 +66,16 @@ HSType:         .res    1               ; Flow-control type
 RecvBuf:        .res    256             ; Receive buffers: 256 bytes
 SendBuf:        .res    256             ; Send buffers: 256 bytes
 
+CurClockSource: .res    1               ; Whether to use BRG or RTxC for clock
+
         .data
 
 Opened:         .byte   $00             ; 1 when opened
 Channel:        .byte   $00             ; Channel B by default
-CurChanIrqFlags:.byte   INTR_PENDING_RX_EXT_B
+CurChanIrqFlags:.byte   $00
 
 SerFlagOrig:    .byte   $00
 
-; Tables used to translate cc65 RS232 params into register values
-; (Ref page 5-18 and 5-19)
-BaudLowTable:   .byte   $7E             ; SER_BAUD_300
-                .byte   $5E             ; SER_BAUD_1200
-                .byte   $2E             ; SER_BAUD_2400
-                .byte   $16             ; SER_BAUD_4800
-                .byte   $0A             ; SER_BAUD_9600
-                .byte   $04             ; SER_BAUD_19200
-                .byte   $01             ; SER_BAUD_38400
-                .byte   $00             ; SER_BAUD_57600
-
-BaudHighTable:  .byte   $01             ; SER_BAUD_300
-                .byte   $00             ; SER_BAUD_1200
-                .byte   $00             ; SER_BAUD_2400
-                .byte   $00             ; SER_BAUD_4800
-                .byte   $00             ; SER_BAUD_9600
-                .byte   $00             ; SER_BAUD_19200
-                .byte   $00             ; SER_BAUD_38400
-                .byte   $00             ; SER_BAUD_57600
-
 RxBitTable:     .byte   %00000000       ; SER_BITS_5, in WR_RX_CTRL (WR3)
                 .byte   %10000000       ; SER_BITS_6  (Ref page 5-7)
                 .byte   %01000000       ; SER_BITS_7
@@ -106,29 +88,65 @@ TxBitTable:     .byte   %00000000       ; SER_BITS_5, in WR_TX_CTRL (WR5)
 
         .rodata
 
+ClockMultiplier:.byte   %01000000       ; Clock x16 (300-57600bps, WR4, ref page 5-8)
+                .byte   %10000000       ; Clock x32 (115200bps, ref page 5-8)
+
+ClockSource:    .byte   %01010000       ; Use baud rate generator (ch. B) (WR11, page 5-17)
+                .byte   %00000000       ; Use RTxC (115200bps) (ch. B)
+                .byte   %11010000       ; Use baud rate generator (ch. A)
+                .byte   %10000000       ; Use RTxC (115200bps) (ch. A)
+
+BrgEnabled:     .byte   %00000001       ; Baud rate generator on (WR14, page 5-19)
+                .byte   %00000000       ; BRG Off
+
+ChanIrqFlags:   .byte %00000101         ; ANDed (RX/special IRQ, ch. B) (page 5-25)
+                .byte %00101000         ; ANDed (RX/special IRQ, ch. A)
+
+ChanIrqMask:    .byte %00000111         ; Ch. B IRQ flags mask
+                .byte %00111000         ; Ch. A IRQ flags mask
+
 BaudTable:                              ; bit7 = 1 means setting is invalid
-                                        ; Otherwise refers to the index in
-                                        ; Baud(Low/High)Table
-                .byte   $FF             ; SER_BAUD_45_5
-                .byte   $FF             ; SER_BAUD_50
-                .byte   $FF             ; SER_BAUD_75
-                .byte   $FF             ; SER_BAUD_110
-                .byte   $FF             ; SER_BAUD_134_5
-                .byte   $FF             ; SER_BAUD_150
-                .byte   $00             ; SER_BAUD_300
-                .byte   $FF             ; SER_BAUD_600
-                .byte   $01             ; SER_BAUD_1200
-                .byte   $FF             ; SER_BAUD_1800
-                .byte   $02             ; SER_BAUD_2400
-                .byte   $FF             ; SER_BAUD_3600
-                .byte   $03             ; SER_BAUD_4800
-                .byte   $FF             ; SER_BAUD_7200
-                .byte   $04             ; SER_BAUD_9600
-                .byte   $05             ; SER_BAUD_19200
-                .byte   $06             ; SER_BAUD_38400
-                .byte   $07             ; SER_BAUD_57600
-                .byte   $FF             ; SER_BAUD_115200
-                .byte   $FF             ; SER_BAUD_230400
+                                        ; Indexes cc65 RS232 SER_BAUD enum
+                                        ; into WR12/13 register values
+                                        ; (Ref page 5-18 and 5-19)
+                .word   $FFFF           ; SER_BAUD_45_5
+                .word   $FFFF           ; SER_BAUD_50
+                .word   $FFFF           ; SER_BAUD_75
+                .word   $FFFF           ; SER_BAUD_110
+                .word   $FFFF           ; SER_BAUD_134_5
+                .word   $FFFF           ; SER_BAUD_150
+                .word   $017E           ; SER_BAUD_300
+                .word   $FFFF           ; SER_BAUD_600
+                .word   $005E           ; SER_BAUD_1200
+                .word   $FFFF           ; SER_BAUD_1800
+                .word   $002E           ; SER_BAUD_2400
+                .word   $FFFF           ; SER_BAUD_3600
+                .word   $0016           ; SER_BAUD_4800
+                .word   $FFFF           ; SER_BAUD_7200
+                .word   $000A           ; SER_BAUD_9600
+                .word   $0004           ; SER_BAUD_19200
+                .word   $0001           ; SER_BAUD_38400
+                .word   $0000           ; SER_BAUD_57600
+                .word   $0000           ; SER_BAUD_115200 (constant unused at that speed)
+                .word   $FFFF           ; SER_BAUD_230400
+
+; About the speed selection: either we use the baud rate generator:
+; - Load the time constants from BaudTable into WR12/WR13
+; - Setup the TX/RX clock source to BRG (ClockSource into WR11)
+; - Setup the clock multiplier (WR4)
+; - Enable the baud rate generator (WR14)
+; In this case, the baud rate will be:
+;    rate = crystal_clock/(2+BRG_time_constant))/(2*clock_multiplier)
+; Example: (3686400/(2+0x0004)) / (2*16) = 19200 bps
+;
+; Or we don't use the baud rate generator:
+; - Setup the TX/RX clock source to RTxC
+; - Setup the clock multiplier
+; - Disable the baud rate generator
+; - WR12 and 13 are ignored
+; In this case, the baud rate will be:
+;    rate = crystal_clock/clock_multiplier
+; Example: 3686400/32 = 115200 bps
 
 StopTable:      .byte   %00000100       ; SER_STOP_1, in WR_TX_RX_CTRL (WR4)
                 .byte   %00001100       ; SER_STOP_2  (Ref page 5-8)
@@ -156,6 +174,7 @@ SER_FLAG   := $E10104
 
 ; ------------------------------------------------------------------------
 ; Channels
+
 CHANNEL_B              = 0
 CHANNEL_A              = 1
 
@@ -180,7 +199,6 @@ RX_CTRL_OFF            = %11111110      ; ANDed,Rx disabled
 
 WR_TX_RX_CTRL          = 4
 RR_TX_RX_STATUS        = 4
-TX_RX_CLOCK_MUL        = %01000000      ; Clock x16 (Ref page 5-8)
 
 WR_TX_CTRL             = 5              ; (Ref page 5-9)
 RR_TX_STATUS           = 5              ; Corresponding status register
@@ -197,15 +215,11 @@ MASTER_IRQ_MIE_RST     = %00001010      ; STA'd
 MASTER_IRQ_SET         = %00011001      ; STA'd
 
 WR_CLOCK_CTRL          = 11             ; (Ref page 5-17)
-CLOCK_CTRL_CH_A        = %11010000
-CLOCK_CTRL_CH_B        = %01010000
 
 WR_BAUDL_CTRL          = 12             ; (Ref page 5-18)
 WR_BAUDH_CTRL          = 13             ; (Ref page 5-19)
 
 WR_MISC_CTRL           = 14             ; (Ref page 5-19)
-MISC_CTRL_RATE_GEN_ON  = %00000001      ; ORed
-MISC_CTRL_RATE_GEN_OFF = %11111110      ; ANDed
 
 WR_IRQ_CTRL            = 15             ; (Ref page 5-20)
 IRQ_CLEANUP_EIRQ       = %00001000
@@ -220,13 +234,8 @@ IRQ_RX                 = %00100000
 IRQ_SPECIAL            = %01100000
 
 RR_INTR_PENDING_STATUS = 3              ; (Ref page 5-25)
-INTR_PENDING_RX_EXT_A  = %00101000      ; ANDed (RX or special IRQ)
-INTR_PENDING_RX_EXT_B  = %00000101      ; ANDed (RX or special IRQ)
 INTR_IS_RX             = %00100100      ; ANDed (RX IRQ, channel A or B)
 
-SER_FLAG_CH_A          = %00111000
-SER_FLAG_CH_B          = %00000111
-
         .code
 
 ; Read register value to A.
@@ -286,7 +295,7 @@ SER_CLOSE:
         bcc     IIgs
 
         lda     #SER_ERR_NO_DEVICE      ; Not a IIgs
-        ldx     #$00                    ; Promote char return value
+        ldx     #>$0000
         rts
 
 IIgs:
@@ -295,8 +304,9 @@ IIgs:
 
         ldx     Channel
 
-        ; Deactivate interrupts
-        sei
+        php                             ; Deactivate interrupts
+        sei                             ; if enabled
+
         ldy     #WR_MASTER_IRQ_RST
         lda     #MASTER_IRQ_SHUTDOWN
         jsr     writeSCCReg
@@ -325,16 +335,26 @@ IIgs:
         ldx     #$00
         stx     Opened                  ; Mark port as closed
 
-        cli
+        plp                             ; Reenable interrupts if needed
 :       txa                             ; Promote char return value
         rts
 
+getClockSource:
+        .assert SER_PARAMS::BAUDRATE = 0, error
+        lda     (ptr1)                  ; Baudrate index - cc65 value
+        cmp     #SER_BAUD_115200
+        lda     #$00
+        adc     #$00
+        sta     CurClockSource          ; 0 = BRG, 1 = RTxC
+        rts
+
 ;----------------------------------------------------------------------------
 ; SER_OPEN: A pointer to a ser_params structure is passed in ptr1.
 ; Must return an SER_ERR_xx code in a/x.
 
 SER_OPEN:
-        sei
+        php                             ; Deactivate interrupts
+        sei                             ; if enabled
 
         ; Check if the handshake setting is valid
         ldy     #SER_PARAMS::HANDSHAKE  ; Handshake
@@ -360,11 +380,13 @@ SER_OPEN:
         ldy     #RR_INIT_STATUS         ; Hit rr0 once to sync up
         jsr     readSSCReg
 
-        ldy     #WR_MISC_CTRL           ; Turn everything off
+        ldy     #WR_MISC_CTRL           ; WR14: Turn everything off
         lda     #$00
         jsr     writeSCCReg
 
-        ldy     #SER_PARAMS::STOPBITS
+        jsr     getClockSource          ; Should we use BRG or RTxC?
+
+        ldy     #SER_PARAMS::STOPBITS   ; WR4 setup: clock mult., stop & parity
         lda     (ptr1),y                ; Stop bits
         tay
         lda     StopTable,y             ; Get value
@@ -377,36 +399,33 @@ SER_OPEN:
         ora     ParityTable,y           ; Get value
         bmi     InvParam
 
-        ora     #TX_RX_CLOCK_MUL
+        ldy     CurClockSource          ; Clock multiplier
+        ora     ClockMultiplier,y
 
-        ldy     #WR_TX_RX_CTRL          ; Setup stop & parity bits
-        jsr     writeSCCReg
+        ldy     #WR_TX_RX_CTRL
+        jsr     writeSCCReg             ; End of WR4 setup
 
+        ldy     CurClockSource          ; WR11 setup: clock source
         cpx     #CHANNEL_B
-        bne     ClockA
-ClockB:
+        beq     SetClock
+        iny                             ; Shift to get correct ClockSource val
+        iny                             ; depending on our channel
+
+SetClock:
+        lda     ClockSource,y
         ldy     #WR_CLOCK_CTRL
-        lda     #CLOCK_CTRL_CH_B
-        jsr     writeSCCReg
+        jsr     writeSCCReg             ; End of WR11 setup
 
-        lda     #INTR_PENDING_RX_EXT_B  ; Store which IRQ bits we'll check
-        sta     CurChanIrqFlags
-
-        bra     SetBaud
-ClockA:
-        ldy     #WR_CLOCK_CTRL
-        lda     #CLOCK_CTRL_CH_A
-        jsr     writeSCCReg
-
-        lda     #INTR_PENDING_RX_EXT_A  ; Store which IRQ bits we'll check
+        lda     ChanIrqFlags,x          ; Store which IRQ bits we'll check
         sta     CurChanIrqFlags
 
 SetBaud:
-        ldy     #SER_PARAMS::BAUDRATE
-        lda     (ptr1),y                ; Baudrate index - cc65 value
+        .assert SER_PARAMS::BAUDRATE = 0, error
+        lda     (ptr1)                  ; Baudrate index - cc65 value
+        asl
         tay
 
-        lda     BaudTable,y             ; Get chip value from Low/High tables
+        lda     BaudTable,y             ; Get low byte of register value
         bpl     BaudOK                  ; Verify baudrate is supported
 
 InvParam:
@@ -415,59 +434,57 @@ InvParam:
         bra     SetupOut
 
 BaudOK:
-        tay
-
-        lda     BaudLowTable,y          ; Get low byte
-
-        phy
-        ldy     #WR_BAUDL_CTRL
-        jsr     writeSCCReg
+        phy                             ; WR12 setup: BRG time constant, low byte
+        ldy     #WR_BAUDL_CTRL          ; Setting WR12 & 13 is useless if we're using
+        jsr     writeSCCReg             ; RTxC, but doing it anyway makes code smaller
         ply
 
-        lda     BaudHighTable,y         ; Get high byte
+        iny
+        lda     BaudTable,y             ; WR13 setup: BRG time constant, high byte
         ldy     #WR_BAUDH_CTRL
         jsr     writeSCCReg
 
+        ldy     CurClockSource          ; WR14 setup: BRG enabling
+        lda     BrgEnabled,y
         ldy     #WR_MISC_CTRL           ; Time to turn this thing on
-        lda     #MISC_CTRL_RATE_GEN_ON
         jsr     writeSCCReg
 
-        ldy     #SER_PARAMS::DATABITS
-        lda     (ptr1),y                ; Data bits
+        ldy     #SER_PARAMS::DATABITS   ; WR3 setup: RX data bits
+        lda     (ptr1),y
         tay
-        lda     RxBitTable,y            ; Data bits for RX
-        ora     #RX_CTRL_ON             ; and turn RX on
+        lda     RxBitTable,y
+        ora     #RX_CTRL_ON             ; and turn receiver on
 
         phy
         ldy     #WR_RX_CTRL
-        jsr     writeSCCReg
+        jsr     writeSCCReg             ; End of WR3 setup
         ply
 
-        lda     TxBitTable,y            ; Data bits for TX
-        ora     #TX_CTRL_ON             ; and turn TX on
-        and     #TX_DTR_ON
+        lda     TxBitTable,y            ; WR5 setup: TX data bits
+        ora     #TX_CTRL_ON             ; and turn transmitter on
+        and     #TX_DTR_ON              ; and turn DTR on
 
         sta     RtsOff                  ; Save value for flow control
 
-        ora     #TX_RTS_ON
+        ora     #TX_RTS_ON              ; and turn RTS on
 
         ldy     #WR_TX_CTRL
-        jsr     writeSCCReg
+        jsr     writeSCCReg             ; End of WR5 setup
 
-        ldy     #WR_IRQ_CTRL
+        ldy     #WR_IRQ_CTRL            ; WR15 setup: IRQ
         lda     #IRQ_CLEANUP_EIRQ
         jsr     writeSCCReg
 
-        ldy     #WR_INIT_CTRL           ; Clear ext status (write twice)
+        ldy     #WR_INIT_CTRL           ; WR0 setup: clear existing IRQs
         lda     #INIT_CTRL_CLEAR_EIRQ
-        jsr     writeSCCReg
+        jsr     writeSCCReg             ; Clear (write twice)
         jsr     writeSCCReg
 
-        ldy     #WR_TX_RX_MODE_CTRL      ; Activate RX IRQ
+        ldy     #WR_TX_RX_MODE_CTRL     ; WR1 setup: Activate RX IRQ
         lda     #TX_RX_MODE_RXIRQ
         jsr     writeSCCReg
 
-        lda     SCCBREG                 ; Activate master IRQ
+        lda     SCCBREG                 ; WR9 setup: Activate master IRQ
         ldy     #WR_MASTER_IRQ_RST
         lda     #MASTER_IRQ_SET
         jsr     writeSCCReg
@@ -475,23 +492,16 @@ BaudOK:
         lda     SER_FLAG                ; Get SerFlag's current value
         sta     SerFlagOrig             ; and save it
 
-        cpx     #CHANNEL_B
-        bne     IntA
-IntB:
-        ora     #SER_FLAG_CH_B          ; Inform firmware we want channel B IRQs
-        bra     StoreFlag
-IntA:
-        ora     #SER_FLAG_CH_A          ; Inform firmware we want channel A IRQs
-StoreFlag:
+        ora     ChanIrqMask,x           ; Tell firmware which channel IRQs we want
         sta     SER_FLAG
 
         ldy     #$01                    ; Mark port opened
         lda     #SER_ERR_OK
 
 SetupOut:
-        ldx     #$00                    ; Promote char return value
+        plp                             ; Reenable interrupts if needed
+        ldx     #>$0000
         sty     Opened
-        cli
         rts
 
 ;----------------------------------------------------------------------------
@@ -529,7 +539,7 @@ SER_GET:
         rts
 NoData:
         lda     #SER_ERR_NO_DATA
-        ldx     #$00                    ; Promote char return value
+        ldx     #>$0000
         rts
 
 ;----------------------------------------------------------------------------
@@ -550,7 +560,7 @@ SER_PUT:
 :       ldy     SendFreeCnt             ; Do we have room to store byte?
         bne     :+
         lda     #SER_ERR_OVERFLOW
-        ldx     #$00
+        ldx     #>$0000
         rts
 
 :       ldy     SendTail                ; Put byte into send buffer & send
@@ -561,7 +571,7 @@ SER_PUT:
         jsr     TryToSend
         lda     #SER_ERR_OK
         .assert SER_ERR_OK = 0, error
-        tax
+        tax                             ; Promote char return value
         rts
 
 ;----------------------------------------------------------------------------
@@ -598,11 +608,11 @@ SER_IOCTL:
 
         stx     Channel
         .assert SER_ERR_OK = 0, error
-        tax
+        tax                             ; Promote char return value
         rts
 
 :       lda     #SER_ERR_INV_IOCTL
-        ldx     #$00                    ; Promote char return value
+        ldx     #>$0000
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/apple2/ser/a2.ssc.s b/libsrc/apple2/ser/a2.ssc.s
index c8aa6e9a5..8671d0ad8 100644
--- a/libsrc/apple2/ser/a2.ssc.s
+++ b/libsrc/apple2/ser/a2.ssc.s
@@ -26,7 +26,6 @@
         .include        "ser-error.inc"
 
         .macpack        module
-        .macpack        cpu
 
 ; ------------------------------------------------------------------------
 ; Header. Includes jump table
@@ -121,7 +120,7 @@ BaudTable:                      ; Table used to translate RS232 baudrate param
         .byte   $0F             ; SER_BAUD_19200
         .byte   $FF             ; SER_BAUD_38400
         .byte   $FF             ; SER_BAUD_57600
-        .byte   $FF             ; SER_BAUD_115200
+        .byte   $00             ; SER_BAUD_115200
         .byte   $FF             ; SER_BAUD_230400
 
 BitTable:                       ; Table used to translate RS232 databits param
@@ -302,6 +301,7 @@ HandshakeOK:
         lda     (ptr1),y        ; Baudrate index
         tay
         lda     BaudTable,y     ; Get 6551 value
+        sta     tmp2            ; Backup for IRQ setting
         bpl     BaudOK          ; Check that baudrate is supported
 
         lda     #SER_ERR_BAUD_UNAVAIL
@@ -332,14 +332,19 @@ BaudOK: sta     tmp1
 
         ora     #%00000001      ; Set DTR active
         sta     RtsOff          ; Store value to easily handle flow control later
-        ora     #%00001000      ; Enable receive interrupts (RTS low)
-        sta     ACIA_CMD,x
+
+        ora     #%00001010      ; Disable interrupts and set RTS low
+
+        ldy     tmp2            ; Don't enable IRQs if 115200bps
+        beq     :+
+        and     #%11111101      ; Enable receive IRQs
+:       sta     ACIA_CMD,x
 
         ; Done
         stx     Index           ; Mark port as open
         lda     #SER_ERR_OK
 Out:
-        ldx     #$00            ; Promote char return value
+        ldx     #>$0000
         rts
 
 ;----------------------------------------------------------------------------
@@ -354,7 +359,7 @@ SER_GET:
         cmp     #$FF
         bne     :+
         lda     #SER_ERR_NO_DATA
-        ldx     #$00            ; Promote char return value
+        ldx     #>$0000
         rts
 
 :       ldy     Stopped         ; Check for flow stopped
@@ -402,7 +407,7 @@ SER_PUT:
         ldy     SendFreeCnt     ; Reload SendFreeCnt after TryToSend
         bne     :+
         lda     #SER_ERR_OVERFLOW
-        ldx     #$00            ; Promote char return value
+        ldx     #>$0000
         rts
 
 :       ldy     SendTail        ; Put byte into send buffer
@@ -450,7 +455,7 @@ SER_IOCTL:
         rts
 
 :       lda     #SER_ERR_INV_IOCTL
-        ldx     #$00            ; Promote char return value
+        ldx     #>$0000
         rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/apple2/set_iigs_speed.s b/libsrc/apple2/set_iigs_speed.s
new file mode 100644
index 000000000..f13e8ab6a
--- /dev/null
+++ b/libsrc/apple2/set_iigs_speed.s
@@ -0,0 +1,29 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; unsigned char __fastcall__ detect_iigs(unsigned char speed)
+;
+
+        .export         _set_iigs_speed
+        .import         ostype, return0
+
+        .include        "apple2.inc"
+        .include        "accelerator.inc"
+
+_set_iigs_speed:
+        tax                     ; Keep parameter
+        lda     ostype          ; Return if not IIgs
+        bmi     :+
+        jmp     return0
+
+:       lda     CYAREG
+        cpx     #SPEED_SLOW
+        beq     :+
+        ora     #%10000000
+        bne     set_speed
+:       and     #%01111111
+set_speed:
+        sta     CYAREG
+        txa
+        ldx     #>$0000
+        rts
diff --git a/libsrc/apple2/sleep.s b/libsrc/apple2/sleep.s
new file mode 100644
index 000000000..43873d9f4
--- /dev/null
+++ b/libsrc/apple2/sleep.s
@@ -0,0 +1,54 @@
+;
+; Colin Leroy-Mira <colin@colino.net>, 2024
+;
+; void __fastcall__ sleep(unsigned s)
+;
+;
+
+        .export         _sleep
+        .import         _get_iigs_speed
+        .import         _set_iigs_speed
+        .import         WAIT
+        .importzp       tmp1
+
+        .include        "accelerator.inc"
+
+        ; This functions uses the Apple2 WAIT ROM routine to waste a certain
+        ; amount of cycles and returns approximately after the numbers of
+        ; seconds passed in AX.
+        ;
+        ; It takes 1023730 cycles when called with AX=1 (1,0007s),
+        ; 10236364 cycles when called with AX=10 (10,006 seconds),
+        ; 306064298 cycles with AX=300 (299.2 seconds).
+        ;
+        ; Caveat: IRQs firing during calls to sleep will make the sleep longer
+        ; by the amount of cycles it takes to handle the IRQ.
+        ;
+_sleep:
+        stx     tmp1            ; High byte of s in X
+        tay                     ; Low byte in A
+        ora     tmp1
+        bne     :+
+        rts
+:       jsr     _get_iigs_speed ; Save current CPU speed
+        pha
+        lda     #SPEED_SLOW     ; Down to 1MHz for consistency around WAIT
+        jsr     _set_iigs_speed
+sleep_1s:
+        ldx     #$0A            ; Loop 10 times
+sleep_100ms:
+        lda     #$C7            ; Sleep about 99ms
+        jsr     WAIT
+        lda     #$0D             ; About 1ms
+        jsr     WAIT
+        dex
+        bne     sleep_100ms
+        dey
+        bne     sleep_1s
+        dec     tmp1
+        bmi     done
+        dey                     ; Down to #$FF
+        bne     sleep_1s
+done:
+        pla                     ; Restore CPU speed
+        jmp     _set_iigs_speed
diff --git a/libsrc/apple2/stat.s b/libsrc/apple2/stat.s
new file mode 100644
index 000000000..e0564ae0c
--- /dev/null
+++ b/libsrc/apple2/stat.s
@@ -0,0 +1,129 @@
+;
+; Colin Leroy-Mira, 2023 <colin@colino.net>
+;
+; int __fastcall__ stat(const char *pathname, struct stat *statbuf);
+;
+
+        .export         _stat
+        .import         __errno, _open,_close
+        .import         mli_file_info
+        .import         popax, pushax, pusha0, incsp2
+        .include        "zeropage.inc"
+        .include        "errno.inc"
+        .include        "fcntl.inc"
+        .include        "filedes.inc"
+        .include        "mli.inc"
+        .include        "stat.inc"
+
+_stat:
+        ; Store statbuf pointer
+        sta     ptr4
+        sta     stbuf
+        stx     ptr4+1
+        stx     stbuf+1
+
+        ; Clear statbuf
+        lda     #$00
+        ldy     #.sizeof(stat)-1
+:       sta     (ptr4),y
+        dey
+        bpl     :-
+
+        ; Reset errno
+        sta     ___errno
+
+        ; Store pathname
+        jsr     popax
+        jsr     pushax          ; Push it back for mli_file_info
+        jsr     pushax          ; and for open
+
+        jsr     mli_file_info
+
+        bcc     got_info
+        jmp     incsp2          ; Drop filename copy for open
+
+got_info:
+        ; st_dev
+        lda     DEVNUM
+        lsr                     ; Shift right to cc65 representation
+        lsr
+        lsr
+        lsr
+        ldy     #stat::st_dev
+        sta     (ptr4),y
+
+        ; st_mode (S_IFDIR/S_IFREG only)
+        lda     mliparam + MLI::INFO::FILE_TYPE
+        ldy     #stat::st_mode
+        cmp     #$0f
+        bne     is_reg
+        lda     #S_IFDIR
+        bne     set_st_mode
+
+is_reg: lda     #S_IFREG
+
+set_st_mode:
+        sta     (ptr4),y
+
+        ; st_access through st_create_time
+        ldx     #MLI::INFO::ACCESS
+        ldy     #stat::st_access
+:       lda     mliparam,x
+        sta     (ptr4),y
+        inx
+        iny
+        cpy     #stat::st_create_time + .sizeof(stat::st_create_time)
+        bne     :-
+
+        ; st_size
+        lda     #O_RDONLY
+        jsr     pusha0
+        ldy     #$04
+        jsr     _open
+        cmp     #$FF
+        beq     done
+        pha                     ; Save file descriptor for closing
+
+        ; Get ProDOS's REF_NUM from file descriptor
+        jsr     getfd
+        ; Get file information
+        sta     mliparam + MLI::EOF::REF_NUM
+        lda     #GET_EOF_CALL
+        ldx     #EOF_COUNT
+        jsr     callmli
+        bcs     eoferr
+
+        ; Get struct stat in ptr4 back, open destroyed it
+        lda     stbuf
+        ldx     stbuf+1
+        sta     ptr4
+        stx     ptr4+1
+
+        ; Store size
+        ldy     #stat::st_size
+        lda     mliparam + MLI::EOF::EOF
+        sta     (ptr4),y
+        lda     mliparam + MLI::EOF::EOF+1
+        iny
+        sta     (ptr4),y
+        lda     mliparam + MLI::EOF::EOF+2
+        iny
+        sta     (ptr4),y
+
+        ; Close file
+eoferr:
+        pla
+        ldx     #$00
+        jsr     _close
+
+        ; Set return value if we had an error
+        lda     ___errno
+        beq     done
+        lda     #$FF
+done:
+        tax                     ; Promote char return value
+        rts
+
+        .bss
+
+stbuf:  .res 2
diff --git a/libsrc/apple2/statvfs.s b/libsrc/apple2/statvfs.s
new file mode 100644
index 000000000..8fcf46af8
--- /dev/null
+++ b/libsrc/apple2/statvfs.s
@@ -0,0 +1,123 @@
+;
+; Colin Leroy-Mira, 2023 <colin@colino.net>
+;
+; int __fastcall__ statvfs(const char *pathname, struct statvfs *statvfsbuf);
+;
+
+        .export         _statvfs
+        .import         _dio_query_sectsize
+        .import         mli_file_info, pushax, popax, popptr1, pushptr1
+        .include        "zeropage.inc"
+        .include        "apple2.inc"
+        .include        "errno.inc"
+        .include        "mli.inc"
+        .include        "statvfs.inc"
+
+_statvfs:
+        ; Store statbuf
+        sta     ptr4
+        stx     ptr4+1
+
+        ; Clear statbuf
+        lda     #$00
+        ldy     #.sizeof(statvfs)-1
+:       sta     (ptr4),y
+        dey
+        bpl     :-
+
+        ; Store pathname, keeping only volume name
+        jsr     popptr1
+        ldy     #$00
+        sty     vol_sep
+        lda     (ptr1),y
+        cmp     #'/'            ; Is the path absolute?
+        beq     :+
+        lda     #EINVAL
+        jmp     ___directerrno
+
+:       iny
+        lda     (ptr1),y
+        beq     :+              ; End of string, no other /
+        cpy     #FILENAME_MAX
+        beq     :+              ; Max filename length reached
+        cmp     #'/'
+        bne     :-              ; Not a slash, keep looking
+        sty     vol_sep         ; Register '/' index
+        lda     #$00
+        sta     (ptr1),y        ; Cut pathname at first slash
+:       jsr     pushptr1
+
+        jsr     mli_file_info
+
+        php
+        ldy     vol_sep         ; Put slash back in pathname
+        lda     #'/'
+        sta     (ptr1),y
+        plp
+
+        bcc     got_info
+
+        jmp     ___mappederrno
+
+got_info:
+        ; f_fsid
+        lda     DEVNUM
+        lsr                     ; Shift right to cc65 representation
+        lsr
+        lsr
+        lsr
+        ldy     #statvfs::f_fsid
+        sta     (ptr4),y
+
+        ; total number of blocks
+        lda     mliparam + MLI::INFO::AUX_TYPE
+        ldy     #statvfs::f_blocks
+        sta     (ptr4),y
+        lda     mliparam + MLI::INFO::AUX_TYPE+1
+        iny
+        sta     (ptr4),y
+
+        ; blocks free & avail
+        sec
+        lda     mliparam + MLI::INFO::AUX_TYPE
+        sbc     mliparam + MLI::INFO::BLOCKS
+        ldy     #statvfs::f_bfree
+        sta     (ptr4),y
+        ldy     #statvfs::f_bavail
+        sta     (ptr4),y
+
+        lda     mliparam + MLI::INFO::AUX_TYPE+1
+        sbc     mliparam + MLI::INFO::BLOCKS+1
+        iny
+        sta     (ptr4),y
+        ldy     #statvfs::f_bfree+1
+        sta     (ptr4),y
+
+        ; block sizes
+        jsr     _dio_query_sectsize
+        ; low bytes
+        ldy     #statvfs::f_bsize
+        sta     (ptr4),y
+        ldy     #statvfs::f_frsize
+        sta     (ptr4),y
+        ; f_frsize high byte
+        iny
+        txa
+        sta     (ptr4),y
+        ; f_bsize high byte
+        ldy     #statvfs::f_bsize+1
+        sta     (ptr4),y
+
+        ; f_namemax
+        lda     #FILENAME_MAX
+        ldy     #statvfs::f_namemax
+        sta     (ptr4),y
+
+        lda     #$00
+        sta     ___errno
+        tax
+        rts
+
+        .bss
+
+vol_sep:.res 1
diff --git a/libsrc/apple2/syschdir.s b/libsrc/apple2/syschdir.s
index b3f81e2a5..be78a91b9 100644
--- a/libsrc/apple2/syschdir.s
+++ b/libsrc/apple2/syschdir.s
@@ -17,8 +17,8 @@ __syschdir:
         bne     oserr
 
         ; Set pushed name
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         sta     mliparam + MLI::PREFIX::PATHNAME
         stx     mliparam + MLI::PREFIX::PATHNAME+1
 
diff --git a/libsrc/apple2/sysmkdir.s b/libsrc/apple2/sysmkdir.s
index 7759da260..e59421319 100644
--- a/libsrc/apple2/sysmkdir.s
+++ b/libsrc/apple2/sysmkdir.s
@@ -23,8 +23,8 @@ __sysmkdir:
         bne     oserr
 
         ; Set pushed name
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         sta     mliparam + MLI::CREATE::PATHNAME
         stx     mliparam + MLI::CREATE::PATHNAME+1
 
diff --git a/libsrc/apple2/sysremove.s b/libsrc/apple2/sysremove.s
index 08c4dff68..088407024 100644
--- a/libsrc/apple2/sysremove.s
+++ b/libsrc/apple2/sysremove.s
@@ -16,8 +16,8 @@ __sysremove:
         bne     oserr
 
         ; Set pushed name
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         sta     mliparam + MLI::DESTROY::PATHNAME
         stx     mliparam + MLI::DESTROY::PATHNAME+1
 
diff --git a/libsrc/apple2/sysrename.s b/libsrc/apple2/sysrename.s
index 0fe8dd7b1..3e380548f 100644
--- a/libsrc/apple2/sysrename.s
+++ b/libsrc/apple2/sysrename.s
@@ -22,8 +22,8 @@ __sysrename:
         bne     oserr1
 
         ; Save pushed oldname
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         sta     ptr3
         stx     ptr3+1
 
@@ -40,8 +40,8 @@ __sysrename:
         stx     mliparam + MLI::RENAME::PATHNAME+1
 
         ; Set pushed newname
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         sta     mliparam + MLI::RENAME::NEW_PATHNAME
         stx     mliparam + MLI::RENAME::NEW_PATHNAME+1
 
diff --git a/libsrc/apple2/sysuname.s b/libsrc/apple2/sysuname.s
index cd41eac29..52a7ec7e1 100644
--- a/libsrc/apple2/sysuname.s
+++ b/libsrc/apple2/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/apple2/targetutil/convert.c b/libsrc/apple2/targetutil/convert.c
index ea9273fc3..52dffa745 100644
--- a/libsrc/apple2/targetutil/convert.c
+++ b/libsrc/apple2/targetutil/convert.c
@@ -108,7 +108,7 @@ static unsigned get_dir_entry(char* p_name)
     }
 
     /* Field header_pointer directly follows field last_mod */
-    cur_addr = *(unsigned*)(&dirent->d_mtime.hour + 1);
+    cur_addr = *(unsigned*)(&dirent->d_mtime.time.hour + 1);
 
     dhandle = dio_open(getcurrentdevice());
     if (!dhandle) {
diff --git a/libsrc/apple2/tgi/a2.hi.s b/libsrc/apple2/tgi/a2.hi.s
index aeb24f6be..0398701eb 100644
--- a/libsrc/apple2/tgi/a2.hi.s
+++ b/libsrc/apple2/tgi/a2.hi.s
@@ -83,7 +83,10 @@ Y2      :=      ptr4
 
         .byte   $74, $67, $69   ; "tgi"
         .byte   TGI_API_VERSION ; TGI API version number
+
+libref:
         .addr   $0000           ; Library reference
+
         .word   280             ; X resolution
         .word   192             ; Y resolution
         .byte   8               ; Number of drawing colors
@@ -120,6 +123,10 @@ pages:  .byte   2               ; Number of screens available
 
         .bss
 
+.ifndef __APPLE2ENH__
+machinetype: .res 1
+.endif
+
 ; Absolute variables used in the code
 
 ERROR:  .res    1               ; Error code
@@ -146,13 +153,22 @@ FONT:
 ; most of the time.
 ; Must set an error code: NO
 INSTALL:
-        .ifdef  __APPLE2ENH__
+        .ifndef __APPLE2ENH__
+        lda     libref
+        ldx     libref+1
+        sta     ptr1
+        stx     ptr1+1
+        ldy     #$0
+        lda     (ptr1),y
+        sta     machinetype
+        bpl     :+
+        .endif
         ; No page switching if 80 column store is enabled
         bit     RD80COL
         bpl     :+
         lda     #$01
         sta     pages
-:       .endif
+:
 
         ; Fall through
 
@@ -175,10 +191,16 @@ INIT:
         ; Switch into graphics mode
         bit     MIXCLR
         bit     HIRES
-        .ifdef  __APPLE2ENH__
+
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     clr_txt
+        .endif
+
         sta     IOUDISON
         bit     DHIRESOFF
-        .endif
+
+clr_txt:
         bit     TXTCLR
 
         ; Beagle Bros Shape Mechanic fonts don't
@@ -200,10 +222,8 @@ DONE:
         bit     TXTSET
         bit     LOWSCR
 
-        .ifdef  __APPLE2ENH__
         ; Limit SET80COL-HISCR to text
         bit     LORES
-        .endif
 
         ; Reset the text window top
         lda     #$00
@@ -342,7 +362,7 @@ GETPIXEL:
         lda     #$03            ; 3 (white)
 :       bcc     :+
         adc     #$03            ; += 4 (black -> black2, white -> white2)
-:       ldx     #$00
+:       ldx     #>$0000
         bit     $C080           ; Switch in LC bank 2 for R/O
         rts
 
diff --git a/libsrc/apple2/tgi/a2.lo.s b/libsrc/apple2/tgi/a2.lo.s
index 6d1c6aa4a..b0f608e86 100644
--- a/libsrc/apple2/tgi/a2.lo.s
+++ b/libsrc/apple2/tgi/a2.lo.s
@@ -53,7 +53,7 @@ Y2      :=      ptr4
 
         .byte   $74, $67, $69   ; "tgi"
         .byte   TGI_API_VERSION ; TGI API version number
-        .addr   $0000           ; Library reference
+libref: .addr   $0000           ; Library reference
         .word   40              ; X resolution
         .word   48              ; Y resolution
         .byte   16              ; Number of drawing colors
@@ -93,6 +93,10 @@ Y2      :=      ptr4
 ERROR:  .res    1               ; Error code
 MIX:    .res    1               ; 4 lines of text
 
+.ifndef __APPLE2ENH__
+machinetype: .res 1
+.endif
+
 ; ------------------------------------------------------------------------
 
         .rodata
@@ -126,11 +130,15 @@ INIT:
         bit     $C082           ; Switch in ROM
         jsr     SETGR
         bit     MIXCLR
-        .ifdef  __APPLE2ENH__
+
+        .ifndef  __APPLE2ENH__
+        bit     machinetype
+        bpl     lc_in
+        .endif
+
         sta     IOUDISON
         bit     DHIRESOFF
-        .endif
-        bit     $C080           ; Switch in LC bank 2 for R/O
+lc_in:  bit     $C080           ; Switch in LC bank 2 for R/O
 
         ; Done, reset the error code
         lda     #TGI_ERR_OK
@@ -144,6 +152,16 @@ INIT:
 ; most of the time.
 ; Must set an error code: NO
 INSTALL:
+        .ifndef __APPLE2ENH__
+        lda     libref
+        ldx     libref+1
+        sta     ptr1
+        stx     ptr1+1
+        ldy     #$0
+        lda     (ptr1),y
+        sta     machinetype
+        bpl     :+
+        .endif
         ; Fall through
 
 ; UNINSTALL routine. Is called before the driver is removed from memory. May
@@ -321,7 +339,7 @@ GETPIXEL:
         jsr     SCRN
         tax
         lda     COL2TGI,x
-        ldx     #$00
+        ldx     #>$0000
         bit     $C080           ; Switch in LC bank 2 for R/O
         rts
 
diff --git a/libsrc/apple2/tgi_colors.s b/libsrc/apple2/tgi_colors.s
index 53505b33d..936d89b76 100644
--- a/libsrc/apple2/tgi_colors.s
+++ b/libsrc/apple2/tgi_colors.s
@@ -1,6 +1,7 @@
 ;
 ; Target-specific black & white values for use by the target-shared TGI kernel
 ;
+; NOTE: These are indices into the default palette
 
         .include        "tgi-kernel.inc"
 
diff --git a/libsrc/apple2/tgiref.s b/libsrc/apple2/tgiref.s
new file mode 100644
index 000000000..e9bcab5e8
--- /dev/null
+++ b/libsrc/apple2/tgiref.s
@@ -0,0 +1,18 @@
+;
+; Colin Leroy-Mira, 2025-05-10
+;
+
+        .export         tgi_libref
+        .import          _exit
+
+.ifndef __APPLE2ENH__
+
+        .import         machinetype
+
+tgi_libref      := machinetype
+
+.else
+
+tgi_libref      := _exit
+
+.endif
diff --git a/libsrc/apple2/uppercasemask.s b/libsrc/apple2/uppercasemask.s
new file mode 100644
index 000000000..cd818c5bf
--- /dev/null
+++ b/libsrc/apple2/uppercasemask.s
@@ -0,0 +1,27 @@
+;
+; Oliver Schmidt, 2024-08-06
+;
+
+.ifndef __APPLE2ENH__
+
+        .export         uppercasemask
+
+        .import         machinetype
+        .constructor    detectlowercase
+
+        .segment "ONCE"
+
+detectlowercase:
+        bit     machinetype
+        bpl     :+
+
+        lda     #$FF
+        sta     uppercasemask
+:       rts
+
+
+        .data
+
+uppercasemask:  .byte   $DF     ; Convert to uppercase
+
+.endif
diff --git a/libsrc/apple2/videomode.s b/libsrc/apple2/videomode.s
index 13151a48a..ea9eb28df 100644
--- a/libsrc/apple2/videomode.s
+++ b/libsrc/apple2/videomode.s
@@ -1,68 +1,52 @@
 ;
 ; Oliver Schmidt, 07.09.2009
 ;
-; unsigned __fastcall__ videomode (unsigned mode);
+; signed char __fastcall__ videomode (unsigned mode);
 ;
-        .ifdef  __APPLE2ENH__
-
         .export         _videomode
-        .import         COUT
+
+        .import         aux80col
+        .import         returnFFFF
 
         .include        "apple2.inc"
 
+
+VIDEOMODE_40x24 = $15
+VIDEOMODE_80x24 = $00
+
         .segment        "LOWCODE"
 
 _videomode:
+        bit     aux80col
+        bmi     set_mode
+
+        ; No 80 column card, return error if requested mode is 80cols
+        cmp     #VIDEOMODE_40x24
+        beq     out
+        jmp     returnFFFF
+set_mode:
+
         ; Get and save current videomode flag
         bit     RD80VID
         php
 
-        ; If we are in 80 column mode then the 80 column firmware is
-        ; known to be active so we can just print the ctrl-char code
-        ; (even if this only means staying in the current videomode)
-        bpl     :+
-        jsr     COUT
-        bra     done
-
-        ; If we are in 40 column mode and want to set 40 column mode
-        ; then we explicitly do nothing as we neither know about the
-        ; current state of the 80 column firmware nor want to fix it
-:       cmp     #$11            ; Ctrl-char code for 40 cols
-        beq     done
-
-        ; If we are in 40 column mode and want to set 80 column mode
-        ; then we first presume the 80 column firmware being already
-        ; active and print the ctrl-char code (this causes a garbage
-        ; char to be printed on the screen if isn't already active)
-        jsr     COUT
-
-        ; If we successfully switched to 80 column mode then the 80
-        ; column firmware was in fact already active and we're done
-        bit     RD80VID
-        bmi     done
-
-        ; The 80 column firmware isn't already active so we need to
-        ; initialize it - causing the screen to be cleared and thus
-        ; the garbage char printed above to be erased (but for some
-        ; reason the cursor horizontal position not to be zeroed)
-        stz     CH
-
         ; Initializing the 80 column firmware needs the ROM switched
         ; in, otherwise it would copy the F8 ROM to the LC (@ $CEF4)
         bit     $C082
 
-        ; Initialize 80 column firmware
-        jsr     $C300           ; PR#3
+        ; Call 80 column firmware with ctrl-char code
+        jsr     $C300
 
         ; Switch in LC bank 2 for R/O
         bit     $C080
 
+        ; Switch in alternate charset again
+        sta     SETALTCHAR
+
         ; Return ctrl-char code for setting previous
         ; videomode using the saved videomode flag
-done:   lda     #$11            ; Ctrl-char code for 40 cols
+        lda     #VIDEOMODE_40x24
         plp
-        bpl     :+
-        inc     a               ; Ctrl-char code for 80 cols
-:       rts                     ; X was preserved all the way
-
-        .endif                  ; __APPLE2ENH__
+        bpl     out
+        lda     #VIDEOMODE_80x24
+out:    rts                     ; X was preserved all the way
diff --git a/libsrc/apple2/wait.s b/libsrc/apple2/wait.s
new file mode 100644
index 000000000..3b569215b
--- /dev/null
+++ b/libsrc/apple2/wait.s
@@ -0,0 +1,20 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; WAIT routine
+;
+
+        .export         WAIT
+
+        .include        "apple2.inc"
+
+        .segment        "LOWCODE"
+
+WAIT:
+        ; Switch in ROM and call WAIT
+        bit     $C082
+        jsr     $FCA8           ; Vector to WAIT routine
+
+        ; Switch in LC bank 2 for R/O and return
+        bit     $C080
+        rts
diff --git a/libsrc/apple2/waitvsync.s b/libsrc/apple2/waitvsync.s
index a4ab5ebb3..d02071915 100644
--- a/libsrc/apple2/waitvsync.s
+++ b/libsrc/apple2/waitvsync.s
@@ -3,28 +3,26 @@
 ;
 ; void waitvsync (void);
 ;
-        .ifdef  __APPLE2ENH__
-
-        .constructor    initvsync
         .export         _waitvsync
-        .import         _get_ostype
+        .import         ostype
+
+        .ifndef  __APPLE2ENH__
+        .import         machinetype
+        .endif
 
         .include        "apple2.inc"
 
-        .segment        "ONCE"
-
-initvsync:
-        jsr     _get_ostype
-        sta     ostype
-        rts
-
-        .code
-
 _waitvsync:
+        .ifndef  __APPLE2ENH__
+        bit     machinetype     ; IIe/enh?
+        bpl     out             ; No, silently fail
+        .endif
+
         bit     ostype
         bmi     iigs            ; $8x
         bvs     iic             ; $4x
 
+        ; Apple IIe
 :       bit     RDVBLBAR
         bpl     :-              ; Blanking
 :       bit     RDVBLBAR
@@ -39,7 +37,8 @@ iigs:   bit     RDVBLBAR
         rts
 
         ; Apple IIc TechNote #9, Detecting VBL
-iic:    sei
+iic:    php
+        sei
         sta     IOUDISOFF
         lda     RDVBLMSK
         bit     ENVBL
@@ -50,11 +49,5 @@ iic:    sei
         bcs     :+              ; VBL interrupts were already enabled
         bit     DISVBL
 :       sta     IOUDISON        ; IIc Tech Ref Man: The firmware normally leaves IOUDIS on.
-        cli
-        rts
-
-        .segment        "INIT"
-
-ostype: .res    1
-
-        .endif                  ; __APPLE2ENH__
+        plp
+out:    rts
diff --git a/libsrc/apple2/wherex.s b/libsrc/apple2/wherex.s
index bd717a22b..b447ac6e9 100644
--- a/libsrc/apple2/wherex.s
+++ b/libsrc/apple2/wherex.s
@@ -4,11 +4,23 @@
 ; unsigned char wherex (void);
 ;
 
+        .ifndef __APPLE2ENH__
+        .import         machinetype
+        .endif
+
         .export         _wherex
 
         .include        "apple2.inc"
 
 _wherex:
         lda     CH
-        ldx     #$00
+        .ifndef __APPLE2ENH__
+        bit     machinetype
+        bpl     :+
+        .endif
+        bit     RD80VID         ; In 80 column mode?
+        bpl     :+
+        lda     OURCH
+
+:       ldx     #>$0000
         rts
diff --git a/libsrc/apple2/wherey.s b/libsrc/apple2/wherey.s
index daacaaba7..a3843f606 100644
--- a/libsrc/apple2/wherey.s
+++ b/libsrc/apple2/wherey.s
@@ -12,5 +12,5 @@ _wherey:
         lda     CV
         sec
         sbc     WNDTOP
-        ldx     #$00
+        ldx     #>$0000
         rts
diff --git a/libsrc/apple2/write.s b/libsrc/apple2/write.s
index 7b50d0705..5fb51cca6 100644
--- a/libsrc/apple2/write.s
+++ b/libsrc/apple2/write.s
@@ -7,6 +7,9 @@
         .export         _write
         .import         rwprolog, rwcommon, rwepilog
         .import         COUT
+        .ifndef __APPLE2ENH__
+        .import         uppercasemask
+        .endif
 
         .include        "zeropage.inc"
         .include        "errno.inc"
@@ -84,7 +87,7 @@ next:   lda     (ptr1),y
         .ifndef __APPLE2ENH__
         cmp     #$E0            ; Test for lowercase
         bcc     output
-        and     #$DF            ; Convert to uppercase
+        and     uppercasemask
         .endif
 output: jsr     COUT            ; Preserves X and Y
 
diff --git a/libsrc/atari/cashdr.s b/libsrc/atari/cashdr.s
index 99aefe68f..c0d64a56b 100644
--- a/libsrc/atari/cashdr.s
+++ b/libsrc/atari/cashdr.s
@@ -10,10 +10,10 @@
 
         .include "atari.inc"
 
-        .import __BSS_RUN__, __STARTADDRESS__, _cas_init
+        .import __INIT_RUN__, __STARTADDRESS__, _cas_init
         .export _cas_hdr
 
-.assert ((__BSS_RUN__ - __STARTADDRESS__ + 127) / 128) < $101, error, "File to big to load from cassette"
+.assert ((__INIT_RUN__ - __STARTADDRESS__ + 127) / 128) < $101, error, "File to big to load from cassette"
 
 
 ; for a description of the cassette header, see De Re Atari, appendix C
@@ -22,7 +22,7 @@
 
 _cas_hdr:
         .byte   0                       ; ignored
-        .byte   <((__BSS_RUN__ - __STARTADDRESS__ + 127) / 128)         ; # of 128-byte records to read
+        .byte   <((__INIT_RUN__ - __STARTADDRESS__ + 127) / 128)        ; # of 128-byte records to read
         .word   __STARTADDRESS__        ; load address
         .word   _cas_init               ; init address
 
@@ -31,6 +31,8 @@ _cas_hdr:
         ldy     #80
         sta     (SAVMSC),y
 .endif
+        lda     #$3c                    ; motor off
+        sta     PACTL
         clc
         rts
 
diff --git a/libsrc/atari/cpeekc.s b/libsrc/atari/cpeekc.s
new file mode 100644
index 000000000..a51e477a6
--- /dev/null
+++ b/libsrc/atari/cpeekc.s
@@ -0,0 +1,35 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-21, Greg King
+;
+; char cpeekc (void);
+;
+
+        .export         _cpeekc
+
+        .include        "atari.inc"
+
+
+_cpeekc:
+        lda     OLDCHR          ; get char under cursor
+        and     #<~$80          ; remove reverse bit
+
+        ;; convert internal screen code to AtSCII
+
+        tay
+        and     #%01100000
+        asl     a
+        asl     a
+        rol     a
+        rol     a
+        tax
+        tya
+        eor     intats,x
+        ldx     #>$0000
+        rts
+
+        .rodata
+intats: .byte   %00100000       ; -> %001xxxxx
+        .byte   %01100000       ; -> %010xxxxx
+        .byte   %01000000       ; -> %000xxxxx
+        .byte   %00000000       ; -> %011xxxxx
diff --git a/libsrc/atari/cpeekcolor.s b/libsrc/atari/cpeekcolor.s
new file mode 100644
index 000000000..ed275ec95
--- /dev/null
+++ b/libsrc/atari/cpeekcolor.s
@@ -0,0 +1,8 @@
+;
+; 2017-06-03, Greg King
+;
+; unsigned char cpeekcolor (void);
+;
+
+        .import         return1
+        .export         _cpeekcolor := return1  ; always COLOR_WHITE
diff --git a/libsrc/atari/cpeekrevers.s b/libsrc/atari/cpeekrevers.s
new file mode 100644
index 000000000..15b26fcd4
--- /dev/null
+++ b/libsrc/atari/cpeekrevers.s
@@ -0,0 +1,18 @@
+;
+; 2017-06-21, Greg King
+;
+; unsigned char cpeekrevers (void);
+;
+
+        .export         _cpeekrevers
+
+        .include        "atari.inc"
+
+
+_cpeekrevers:
+        lda     OLDCHR          ; get char under cursor
+        and     #$80            ; get reverse bit
+        asl     a
+        tax                     ; ldx #>$0000
+        rol     a               ; return boolean value
+        rts
diff --git a/libsrc/atari/crt0.s b/libsrc/atari/crt0.s
index 381aa699f..23c1f580c 100644
--- a/libsrc/atari/crt0.s
+++ b/libsrc/atari/crt0.s
@@ -59,8 +59,8 @@ start:
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1
+        sta     c_sp
+        stx     c_sp+1
 
 .else
 
@@ -75,11 +75,11 @@ start:
         lda     MEMTOP
         sbc     #<__RESERVED_MEMORY__
         sta     APPMHI                  ; initialize our APPMHI value
-        sta     sp                      ; set up runtime stack part 1
+        sta     c_sp                    ; set up runtime stack part 1
         lda     MEMTOP+1
         sbc     #>__RESERVED_MEMORY__
         sta     APPMHI+1
-        sta     sp+1                    ; set up runtime stack part 2
+        sta     c_sp+1                  ; set up runtime stack part 2
 
 .endif
 
@@ -204,6 +204,10 @@ APPMHI_save:    .res    2
 
 ; ------------------------------------------------------------------------
 
+.segment "INIT"       ; have at least one (empty) segment of INIT, exehdr.s needs its definition
+
+; ------------------------------------------------------------------------
+
 .segment "LOWCODE"       ; have at least one (empty) segment of LOWCODE, so that the next line works even if the program doesn't make use of this segment
 .assert (__LOWCODE_RUN__ + __LOWCODE_SIZE__ <= $4000 || __LOWCODE_RUN__ > $7FFF || __LOWCODE_SIZE__ = 0), warning, "'lowcode area' reaches into $4000..$7FFF bank memory window"
 ; check for LOWBSS_SIZE = 0 not needed since the only file which uses LOWBSS (irq.s) also uses LOWCODE
diff --git a/libsrc/atari/diopncls.s b/libsrc/atari/diopncls.s
index f40d6bba4..a5c145081 100644
--- a/libsrc/atari/diopncls.s
+++ b/libsrc/atari/diopncls.s
@@ -16,7 +16,7 @@
         .export         sectsizetab
         .import         ___oserror, __sio_call, _dio_read
         .import         pushax, addysp, subysp
-        .importzp       ptr2, sp
+        .importzp       ptr2, c_sp
         .include        "atari.inc"
 
 
@@ -78,10 +78,10 @@ _dio_open:
         ldy     #128
         jsr     subysp          ; allocate buffer on the stack
 
-        lda     sp
+        lda     c_sp
         pha
-        lda     sp+1
-        pha                     ; save sp (buffer address) on processor stack
+        lda     c_sp+1
+        pha                     ; save c_sp (buffer address) on processor stack
 
         lda     ptr2
         ldx     ptr2+1
diff --git a/libsrc/atari/exehdr.s b/libsrc/atari/exehdr.s
index 7abb7c1ac..1ac9a0fbe 100644
--- a/libsrc/atari/exehdr.s
+++ b/libsrc/atari/exehdr.s
@@ -1,11 +1,15 @@
 ; This file defines the EXE header and main chunk load header for Atari executables
 
         .export         __EXEHDR__: absolute = 1
-        .import         __MAIN_START__, __BSS_LOAD__
+        .import         __MAIN_START__, __INIT_LOAD__
 
 .segment        "EXEHDR"
         .word   $FFFF
 
 .segment        "MAINHDR"
         .word   __MAIN_START__
-        .word   __BSS_LOAD__ - 1
+        .word   __INIT_LOAD__ - 1
+
+; Define the INIT segment so that __INIT_LOAD__ from above '.import' is always defined.
+; The segment is normally present when linking a C program, but not necessarily when linking an assembler program.
+.segment        "INIT"
diff --git a/libsrc/atari/fdtable.s b/libsrc/atari/fdtable.s
index fd9f5021b..d1d869387 100644
--- a/libsrc/atari/fdtable.s
+++ b/libsrc/atari/fdtable.s
@@ -6,7 +6,7 @@
 
         .include "atari.inc"
         .include "fd.inc"
-        .importzp tmp1,tmp2,tmp3,ptr4,sp
+        .importzp tmp1,tmp2,tmp3,ptr4,c_sp
         .import fd_table,fd_index
         .import fdt_to_fdi
         .export clriocb
@@ -229,7 +229,7 @@ freefnd:txa
         beq     l2
 
 l1:     ldy     #0
-        lda     (sp),y                  ; get device
+        lda     (c_sp),y                ; get device
 l2:     sta     fd_table+ft_dev,x       ; set device
         lda     #1
         sta     fd_table+ft_usa,x       ; set usage counter
diff --git a/libsrc/atari/getdevice.s b/libsrc/atari/getdevice.s
index e0e700436..b98d3ad5f 100644
--- a/libsrc/atari/getdevice.s
+++ b/libsrc/atari/getdevice.s
@@ -50,7 +50,7 @@ check_device:
         lda     #SIO_STAT
         sta     DCOMND          ; set command into DCB
         lda     #%01000000      ; direction value, "receive data"
-        sta     DSTATS          ; set data flow directon
+        sta     DSTATS          ; set data flow direction
         lda     #15
         sta     DTIMLO          ; value got from DOS source
         lda     #4
diff --git a/libsrc/atari/graphics.s b/libsrc/atari/graphics.s
index 1f7844c39..8b4e8034d 100644
--- a/libsrc/atari/graphics.s
+++ b/libsrc/atari/graphics.s
@@ -23,7 +23,7 @@
 
         .code
 
-; set new grapics mode
+; set new graphics mode
 ; gets new mode in A
 ; returns handle or -1 on error
 ; uses tmp1, tmp2, tmp3, tmp4 (in subroutines)
diff --git a/libsrc/atari/mcbpm.s b/libsrc/atari/mcbpm.s
index 9e6ccc2c5..bc36b6f99 100644
--- a/libsrc/atari/mcbpm.s
+++ b/libsrc/atari/mcbpm.s
@@ -8,7 +8,7 @@
 ;
 
         .include        "atari.inc"
-        .importzp       sp
+        .importzp       c_sp
         .export         _mouse_pm_callbacks
         .constructor    pm_init, 27
         .destructor     pm_down
@@ -193,22 +193,22 @@ pm_init:
 
 .else
 
-; use top of memory and lower sp accordingly
-        sta     sp
+; use top of memory and lower c_sp accordingly
+        sta     c_sp
         sta     MOUSE_PM_BASE
-        lda     sp+1
+        lda     c_sp+1
         and     #7                      ; offset within 2K
         cmp     #3 + MOUSE_PM_RAW + 1   ; can we use it?
         bcc     @decr                   ; no
 
-        lda     sp+1
+        lda     c_sp+1
         and     #$F8
 @set:   adc     #3 + MOUSE_PM_RAW - 1   ; CF is set, so adding MOUSE_PM_RAW + 3
         sta     MOUSE_PM_BASE+1
-        sta     sp+1
+        sta     c_sp+1
         bne     @cont                   ; jump always
 
-@decr:  lda     sp+1
+@decr:  lda     c_sp+1
         and     #$F8
         sbc     #8 - 1                  ; CF is clear, subtracts 8
         bcs     @set                    ; jump always
diff --git a/libsrc/atari/mou/atrjoy.s b/libsrc/atari/mou/atrjoy.s
index a93c7de13..f30d72050 100644
--- a/libsrc/atari/mou/atrjoy.s
+++ b/libsrc/atari/mou/atrjoy.s
@@ -241,11 +241,11 @@ MOVE:   php
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
         jsr     CMOVEX                  ; Move the cursor
 
diff --git a/libsrc/atari/mou/atrst.s b/libsrc/atari/mou/atrst.s
index 626b7a8f7..7f915cc36 100644
--- a/libsrc/atari/mou/atrst.s
+++ b/libsrc/atari/mou/atrst.s
@@ -399,12 +399,12 @@ MOVE:   php
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         sta     XPosWrk+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
         sta     XPosWrk
         jsr     CMOVEX                  ; Move the cursor
diff --git a/libsrc/atari/mou/atrtt.s b/libsrc/atari/mou/atrtt.s
index b1e53935e..516565844 100644
--- a/libsrc/atari/mou/atrtt.s
+++ b/libsrc/atari/mou/atrtt.s
@@ -236,11 +236,11 @@ MOVE:   php
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
         jsr     CMOVEX                  ; Move the cursor
 
@@ -374,7 +374,7 @@ IRQ:
 ; The touch pad is read thru the paddle potentiometers. The possible
 ; values are 1..228. Since the maximum value is less than the X
 ; dimension we have to "stretch" this value. In order to use only
-; divisions by powers of two, we use the following appoximation:
+; divisions by powers of two, we use the following approximation:
 ; 320/227 = 1.4096
 ; 1+1/2-1/8+1/32 = 1.4062
 ; For Y we subtract 1/8 of it to get in the YMax ballpark.
@@ -385,7 +385,7 @@ IRQ:
 
 ; X
 
-        ldx     PADDL0                  ; get X postion
+        ldx     PADDL0                  ; get X position
         dex                             ; decrement, since it's 1-based
         stx     XPos
         txa
@@ -445,7 +445,7 @@ IRQ:
 
 ; Y
 
-        ldx     PADDL1                  ; get Y postion
+        ldx     PADDL1                  ; get Y position
         dex                             ; decrement, since it's 1-based
         stx     YPos
         lda     #228
diff --git a/libsrc/atari/open.s b/libsrc/atari/open.s
index ed3e40b2f..e7e55c54c 100644
--- a/libsrc/atari/open.s
+++ b/libsrc/atari/open.s
@@ -19,7 +19,7 @@
         .import findfreeiocb
         .import incsp4
         .import ldaxysp,addysp
-        .import ___oserror
+        .import ___oserror, returnFFFF
 .ifdef  UCASE_FILENAME
         .import ucase_fn
 .endif
@@ -39,9 +39,7 @@ parmok: jsr     findfreeiocb
         lda     #<EMFILE        ; "too many open files"
 seterr: jsr     ___directerrno
         jsr     incsp4          ; clean up stack
-        lda     #$FF
-        tax
-        rts                     ; return -1
+        jmp     returnFFFF
 
         ; process the mode argument
 
diff --git a/libsrc/atari/read.s b/libsrc/atari/read.s
index 5078b321d..b50bd2856 100644
--- a/libsrc/atari/read.s
+++ b/libsrc/atari/read.s
@@ -33,7 +33,7 @@ done:   lda     ICBLL,x         ; buf len lo
         lda     ICBLH,x         ; get buf len hi
         tax                     ; to X
 okdone: lda     #0
-        sta     ___oserror      ; clear system dependend error code
+        sta     ___oserror      ; clear system dependent error code
         pla                     ; get buf len lo
         rts
 
@@ -147,6 +147,7 @@ icbll_copy:
         sta     dataptr+1
         lda     ICBLL,x
         sta     copylen
+        beq     copied          ; length = 0 if EOF
         pha                     ; remember for return value
         ldy     #0
         ldx     index
@@ -159,7 +160,7 @@ copy:   lda     linebuf,x
         bne     copy
 
         pla                     ; length
-        pha                     ; save length to return at okdone
+copied: pha                     ; save length to return at okdone
 
         clc
         adc     index
diff --git a/libsrc/atari/siocall.s b/libsrc/atari/siocall.s
index 38cbb35d5..b1c19a2d0 100644
--- a/libsrc/atari/siocall.s
+++ b/libsrc/atari/siocall.s
@@ -23,7 +23,7 @@
 .proc   __sio_call
 
         sta     DCOMND          ; set command into DCB
-        stx     DSTATS          ; set data flow directon
+        stx     DSTATS          ; set data flow direction
         jsr     popax           ; get buffer address
         sta     DBUFLO          ; set buffer address into DCB
         stx     DBUFHI
diff --git a/libsrc/atari/sysrename.s b/libsrc/atari/sysrename.s
index e526af5c8..b410ebcfd 100644
--- a/libsrc/atari/sysrename.s
+++ b/libsrc/atari/sysrename.s
@@ -6,7 +6,7 @@
 
         .include "atari.inc"
         .import findfreeiocb
-        .importzp tmp4, sp, ptr2, ptr3
+        .importzp tmp4, c_sp, ptr2, ptr3
         .import incsp2, subysp, addysp, popax
 .ifdef  UCASE_FILENAME
         .importzp tmp3
@@ -118,19 +118,19 @@ L1:     jsr     subysp          ; make room on the stack
 ; copy old name
         ldy     #0
 con:    lda     (ptr3),y
-        sta     (sp),y
+        sta     (c_sp),y
         beq     copyend
         iny
         bne     con
 
 copyend:lda     #$20            ; space
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         tya                     ; get current offset (beyond old name)
         clc
-        adc     sp
+        adc     c_sp
         sta     ptr3
-        lda     sp+1
+        lda     c_sp+1
         adc     #0
         sta     ptr3+1          ; ptr3 now contains pointer to space for new filename
 
@@ -143,9 +143,9 @@ cnn:    lda     (ptr2),y
         bne     cnn
 
 copend2:ldx     tmp4
-        lda     sp
+        lda     c_sp
         sta     ICBAL,x
-        lda     sp+1
+        lda     c_sp+1
         sta     ICBAH,x
         lda     #RENAME
         sta     ICCOM,x
@@ -160,13 +160,13 @@ copend2:ldx     tmp4
 
 ; clean up stack
 
-        lda     sp
+        lda     c_sp
         clc
         adc     sspc
-        sta     sp
-        lda     sp+1
+        sta     c_sp
+        lda     c_sp+1
         adc     sspc+1
-        sta     sp+1
+        sta     c_sp+1
 
 ; handle status
 
diff --git a/libsrc/atari/sysuname.s b/libsrc/atari/sysuname.s
index 25a891a1b..893ebcfdc 100644
--- a/libsrc/atari/sysuname.s
+++ b/libsrc/atari/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/atari/ucase_fn.s b/libsrc/atari/ucase_fn.s
index f7f03915d..534c6a21c 100644
--- a/libsrc/atari/ucase_fn.s
+++ b/libsrc/atari/ucase_fn.s
@@ -24,7 +24,7 @@
         .importzp tmp2
         .import __defdev
 .endif
-        .importzp tmp3,ptr4,sp
+        .importzp tmp3,ptr4,c_sp
         .import subysp,addysp
         .export ucase_fn
 
@@ -63,13 +63,13 @@ hasdev:
         ldy     #0
 
 loop2:  lda     (ptr4),y
-        sta     (sp),y
+        sta     (c_sp),y
         beq     copy_end
         bmi     L1              ; Not lowercase (also, invalid, should reject)
         cmp     #'a'
         bcc     L1              ; Not lowercase
         and     #$DF            ; make upper case char, assume ASCII chars
-        sta     (sp),y          ; store back
+        sta     (c_sp),y        ; store back
 L1:
         iny
         bpl     loop2           ; bpl: this way we only support a max. length of 127
@@ -93,15 +93,15 @@ copy_end:
         jsr     subysp          ; adjust stack pointer
         dey
 cpdev:  lda     __defdev,y
-        sta     (sp),y          ; insert device name, number and ':'
+        sta     (c_sp),y        ; insert device name, number and ':'
         dey
         bpl     cpdev
 hasdev2:
 .endif
 
         ; leave A and X pointing to the modified filename
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         clc                     ; indicate success
         rts
 
diff --git a/libsrc/atari/write.s b/libsrc/atari/write.s
index 2ddb88ee3..b745e5211 100644
--- a/libsrc/atari/write.s
+++ b/libsrc/atari/write.s
@@ -21,7 +21,7 @@ write9:
         lda     ICBLH,x         ; buf len high
         tax
         lda     #0
-        sta     ___oserror      ; clear system dependend error code
+        sta     ___oserror      ; clear system dependent error code
         pla
         rts
 
diff --git a/libsrc/atari2600/crt0.s b/libsrc/atari2600/crt0.s
index 4f09a0a5a..7b5b679b0 100644
--- a/libsrc/atari2600/crt0.s
+++ b/libsrc/atari2600/crt0.s
@@ -35,8 +35,8 @@ clearLoop:
 ; Initialize C stack pointer
         lda     #<(__RAM_START__ + __RAM_SIZE__)
         ldx     #>(__RAM_START__ + __RAM_SIZE__)
-        sta     sp
-        stx     sp+1
+        sta     c_sp
+        stx     c_sp+1
 
 ; Call main
         jsr     _main
diff --git a/libsrc/atari5200/clrscr.s b/libsrc/atari5200/clrscr.s
index 041f34a67..d92419b9e 100644
--- a/libsrc/atari5200/clrscr.s
+++ b/libsrc/atari5200/clrscr.s
@@ -7,8 +7,9 @@
         .export         _clrscr
         .include        "atari5200.inc"
         .importzp       ptr1
+        .importzp       screen_width, screen_height
 
-SCRSIZE =       480             ; 20x24: size of default conio atari5200 screen
+SCRSIZE = screen_width * screen_height
 
 _clrscr:lda     SAVMSC          ; screen memory
         sta     ptr1
diff --git a/libsrc/atari5200/conioscreen.s b/libsrc/atari5200/conioscreen.s
index 8c78fd44f..0c77b14c7 100644
--- a/libsrc/atari5200/conioscreen.s
+++ b/libsrc/atari5200/conioscreen.s
@@ -7,6 +7,7 @@
 SCREEN_BUF_SIZE =       20 * 24
 SCREEN_BUF      =       $4000 - SCREEN_BUF_SIZE
 
+                .import _clrscr
                 .export screen_setup
                 .export screen_width, screen_height
                 .export conio_color
@@ -26,24 +27,10 @@ screen_setup:
                 lda     #>SCREEN_BUF
                 sta     SAVMSC+1
 
-                ; initialize cursor position
-                lda     #0
-                sta     COLCRS_5200
-                sta     ROWCRS_5200
-
                 ; clear screen buffer
-                ldy     #<(SCREEN_BUF_SIZE-1)
-                ldx     #>(SCREEN_BUF_SIZE-1)
-clrscr:         sta     (SAVMSC),y
-                dey
-                cpy     #$FF
-                bne     clrscr
-                dex
-                cpx     #$FF
-                bne     clrscr
+                jsr     _clrscr
 
                 ; set default colors
-
                 lda     #GTIA_COLOR_WHITE
                 sta     COLOR0
                 lda     #GTIA_COLOR_LIGHTRED
@@ -55,7 +42,6 @@ clrscr:         sta     (SAVMSC),y
                 sta     COLOR4          ; background
 
                 ; set display list
-
                 lda     #<dlist
                 sta     SDLSTL
                 lda     #>dlist
@@ -82,7 +68,7 @@ dlist:          .repeat 3
                 .byte   DL_CHR20x8x2
                 .endrepeat
 
-                .byte  DL_JVB
+                .byte   DL_JVB
                 .word   dlist
 
 ; end of display list
diff --git a/libsrc/atari5200/crt0.s b/libsrc/atari5200/crt0.s
index 8f6e02273..a72d7f9f6 100644
--- a/libsrc/atari5200/crt0.s
+++ b/libsrc/atari5200/crt0.s
@@ -27,8 +27,8 @@ start:
 
         lda     #<(__RAM_START__ + __RAM_SIZE__ - __RESERVED_MEMORY__)
         ldx     #>(__RAM_START__ + __RAM_SIZE__ - __RESERVED_MEMORY__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Call the module constructors.
 
diff --git a/libsrc/atari5200/extra/conioscreen-20x12.s b/libsrc/atari5200/extra/conioscreen-20x12.s
index aeb11cb43..c2aa0a65f 100644
--- a/libsrc/atari5200/extra/conioscreen-20x12.s
+++ b/libsrc/atari5200/extra/conioscreen-20x12.s
@@ -7,6 +7,7 @@
 SCREEN_BUF_SIZE =       20 * 12
 SCREEN_BUF      =       $4000 - SCREEN_BUF_SIZE
 
+                .import _clrscr
                 .export screen_setup
                 .export screen_width, screen_height
                 .export conio_color
@@ -26,24 +27,10 @@ screen_setup:
                 lda     #>SCREEN_BUF
                 sta     SAVMSC+1
 
-                ; initialize cursor position
-                lda     #0
-                sta     COLCRS_5200
-                sta     ROWCRS_5200
-
                 ; clear screen buffer
-                ldy     #<(SCREEN_BUF_SIZE-1)
-                ldx     #>(SCREEN_BUF_SIZE-1)
-clrscr:         sta     (SAVMSC),y
-                dey
-                cpy     #$FF
-                bne     clrscr
-                dex
-                cpx     #$FF
-                bne     clrscr
+                jsr     _clrscr
 
                 ; set default colors
-
                 lda     #GTIA_COLOR_WHITE
                 sta     COLOR0
                 lda     #GTIA_COLOR_LIGHTRED
@@ -55,7 +42,6 @@ clrscr:         sta     (SAVMSC),y
                 sta     COLOR4          ; background
 
                 ; set display list
-
                 lda     #<dlist
                 sta     SDLSTL
                 lda     #>dlist
@@ -82,7 +68,7 @@ dlist:          .repeat 3
                 .byte   DL_CHR20x16x2
                 .endrepeat
 
-                .byte  DL_JVB
+                .byte   DL_JVB
                 .word   dlist
 
 ; end of display list
diff --git a/libsrc/atari5200/sysuname.s b/libsrc/atari5200/sysuname.s
index 7fd9281a1..5a75edf04 100644
--- a/libsrc/atari5200/sysuname.s
+++ b/libsrc/atari5200/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/atari7800/crt0.s b/libsrc/atari7800/crt0.s
index e791179f3..dea351473 100644
--- a/libsrc/atari7800/crt0.s
+++ b/libsrc/atari7800/crt0.s
@@ -30,9 +30,9 @@ start:
 
         ; Set up parameter stack
         lda     #<(__RAM3_START__ + __RAM3_SIZE__)
-        sta     sp
+        sta     c_sp
         lda     #>(__RAM3_START__ + __RAM3_SIZE__)
-        sta     sp+1
+        sta     c_sp+1
 
         jsr     copydata
         jsr     zerobss
diff --git a/libsrc/atari7800/joy/atari7800-stdjoy.s b/libsrc/atari7800/joy/atari7800-stdjoy.s
index 59f656ada..c24e87e29 100644
--- a/libsrc/atari7800/joy/atari7800-stdjoy.s
+++ b/libsrc/atari7800/joy/atari7800-stdjoy.s
@@ -53,13 +53,20 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 ; Must return an JOY_ERR_xx code in a/x.
 ;
 
+PB2 = $04 ; Joystick 0
+PB4 = $10 ; Joystick 1
+
 INSTALL:
         ; Assume 7800 2-button controller, can change
         ; to 2600 1-button later
-        lda #$14
-        sta CTLSWB ; enable 2-button 7800 controller 1: set pin 6 to output
+        lda #(PB2 | PB4)
+        ; enable 2-button 7800 controllers on both ports
+        ; by setting PB2 and PB4 to output
+        sta CTLSWB
+        ; enable 2-button 7800 controllers by setting
+        ; the outputs to 0; (INPT4 and INPT5) high
         ldy #$00
-        sty SWCHB ; enable 2-button 7800 controller 2: pull pin 6 (INPT4) high
+        sty SWCHB
 
 reset:
         lda #JOY_ERR_OK
@@ -88,6 +95,28 @@ COUNT:
 ; ------------------------------------------------------------------------
 ; READ: Read a particular joystick passed in A for 2 fire buttons.
 
+readdualbuttons0:
+    ldy #0      ; ........
+    bit INPT0   ; Check for right button
+    bpl L1
+    ldy #2      ; ......2.
+L1: bit INPT1   ; Check for left button
+    bpl L2
+    iny         ; ......21
+L2: tya
+    rts
+
+readdualbuttons1:
+    ldy #0      ; ........
+    bit INPT2   ; Check for right button
+    bpl L1
+    ldy #2      ; ......2.
+L3: bit INPT3   ; Check for left button
+    bpl L2
+    iny         ; ......21
+L4: tya
+    rts
+
 readbuttons:
     ; Y has joystick of interest 0/1
     ; return value:
@@ -97,42 +126,48 @@ readbuttons:
     ;  $03: both buttons
     ; preserves X
     tya
-    beq L5
+    beq readbuttons0
+readbuttons1:
     ; Joystick 1 processing
-    ; 7800 joystick 1 buttons
-    ldy #0      ; ........
-    bit INPT2   ; Check for right button
-    bpl L1
-    ldy #2      ; ......2.
-L1: bit INPT3   ;Check for left button
-    bpl L2
-    iny         ; ......21
-L2: tya
-    bne L4      ; 7800 mode joystick worked
-    ; 2600 Joystick 1
+    ; Start by checking for single button 2600 joystick
     bit INPT5
-    bmi L4
-L3: iny         ; .......1
-    lda #0      ; Fallback to 2600 joystick mode
-    sta CTLSWB
-L4: tya         ; ......21
+    bpl singlebtn1detected
+    jmp readdualbuttons1
+singlebtn1detected:
+    ; Single button joystick detected but could be dual
+    jsr readdualbuttons1
+    bne L5      ; It was a dual button press
+    ; It was a single button press
+    bit INPT5
+    bmi L5
+    iny         ; .......1
+    lda #PB4    ; Joystick 1 is a single button unit
+    clc
+    adc SWCHB
+    sta SWCHB   ; Cut power from the dual button circuit
+L5: tya         ; ......21
     rts
 
-L5: ; Joystick 0 processing
-    ; 7800 joystick 0 buttons
-    ldy #0      ; ........
-    bit INPT0   ; Check for right button
-    bpl L6
-    ldy #2      ; ......2.
-L6: bit INPT1   ;Check for left button
-    bpl L7
-    iny         ; ......21
-L7: tya
-    bne L4      ; 7800 mode joystick worked
-    ; 2600 Joystick 0
+readbuttons0:
+    ; Joystick 0 processing
+    ; Start by checking for single button 2600 joystick
     bit INPT4
-    bmi L4
-    bpl L3
+    bpl singlebtn0detected
+    jmp readdualbuttons0
+singlebtn0detected:
+    ; Single button joystick detected but could be dual
+    jsr readdualbuttons0
+    bne L6      ; It was a dual button press
+    ; It was a single button press
+    bit INPT4
+    bmi L6
+    iny         ; .......1
+    lda #PB2    ; Joystick 0 is a single button unit
+    clc
+    adc SWCHB
+    sta SWCHB   ; Cut power from the dual button circuit
+L6: tya         ; ......21
+    rts
 
 READ:
     tay         ; Store joystick 0/1 in Y
diff --git a/libsrc/atari7800/mono_setcursor.s b/libsrc/atari7800/mono_setcursor.s
index 02e0308f6..995f0d661 100644
--- a/libsrc/atari7800/mono_setcursor.s
+++ b/libsrc/atari7800/mono_setcursor.s
@@ -27,7 +27,7 @@
         .constructor    mono_init_cursor
         .interruptor    mono_blink_cursor
 
-        .importzp       sp
+        .importzp       c_sp
         .import         _zonecounter
         .import         _mono_zones
         .import         cursor
diff --git a/libsrc/atari7800/setcursor.s b/libsrc/atari7800/setcursor.s
index f438de24f..040732cff 100644
--- a/libsrc/atari7800/setcursor.s
+++ b/libsrc/atari7800/setcursor.s
@@ -27,7 +27,7 @@
         .constructor    init_cursor
         .interruptor    blink_cursor
 
-        .importzp       sp
+        .importzp       c_sp
         .import         _zonecounter
         .import         _zones
         .import         cursor
diff --git a/libsrc/atmos/cpeekc.s b/libsrc/atmos/cpeekc.s
new file mode 100644
index 000000000..f0f5f99b1
--- /dev/null
+++ b/libsrc/atmos/cpeekc.s
@@ -0,0 +1,21 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-19, Greg King
+;
+; char cpeekc (void);
+;
+; Atmos version
+;
+
+        .export         _cpeekc
+
+        .import         setscrptr
+        .importzp       ptr2
+
+
+_cpeekc:
+        jsr     setscrptr       ; Set ptr2 and .Y to the cursor's address
+        lda     (ptr2),y        ; Get char
+        and     #<~$80          ; Remove revers() bit
+        ldx     #>$0000
+        rts
diff --git a/libsrc/atmos/cpeekcolor.s b/libsrc/atmos/cpeekcolor.s
new file mode 100644
index 000000000..307c04e96
--- /dev/null
+++ b/libsrc/atmos/cpeekcolor.s
@@ -0,0 +1,10 @@
+;
+; 2017-06-03, Greg King
+;
+; unsigned char cpeekcolor (void);
+;
+; Atmos version
+;
+
+        .import         return1
+        .export         _cpeekcolor := return1  ; always COLOR_WHITE
diff --git a/libsrc/atmos/cpeekrevers.s b/libsrc/atmos/cpeekrevers.s
new file mode 100644
index 000000000..53f907511
--- /dev/null
+++ b/libsrc/atmos/cpeekrevers.s
@@ -0,0 +1,22 @@
+;
+; 2017-06-08, Greg King
+;
+; unsigned char cpeekrevers (void);
+;
+; Atmos version
+;
+
+        .export         _cpeekrevers
+
+        .import         setscrptr
+        .importzp       ptr2
+
+
+_cpeekrevers:
+        jsr     setscrptr       ; Set ptr2 and .Y to the cursor's address
+        lda     (ptr2),y        ; Get char
+        and     #$80            ; get reverse bit
+        asl     a
+        tax                     ; ldx #>$0000
+        rol     a               ; return boolean value
+        rts
diff --git a/libsrc/atmos/cpeeks.s b/libsrc/atmos/cpeeks.s
new file mode 100644
index 000000000..e54563e7d
--- /dev/null
+++ b/libsrc/atmos/cpeeks.s
@@ -0,0 +1,54 @@
+;
+; 2017-06-20, Greg King
+;
+; void cpeeks (char* s, unsigned length);
+;
+
+        .export         _cpeeks
+
+        .import         setscrptr, popax
+        .importzp       ptr1, ptr2, ptr3, tmp1, tmp2
+
+        .macpack        generic
+
+
+_cpeeks:
+        eor     #<$FFFF         ; counting a word upward is faster
+        sta     ptr3            ; so, we use -(length + 1)
+        txa
+        eor     #>$FFFF
+        sta     ptr3+1
+
+        jsr     setscrptr       ; Set ptr2 and .Y to the cursor's address
+        sty     tmp2
+
+        jsr     popax
+        sta     tmp1            ; (will be a .Y index)
+        stx     ptr1+1
+        ldx     #<$0000
+        stx     ptr1
+        bze     L3              ; branch always
+
+L4:     ldy     tmp2
+        lda     (ptr2),y        ; Get char
+        iny
+        bnz     L2
+        inc     ptr2+1
+L2:     sty     tmp2
+        and     #<~$80          ; Remove reverse bit
+        ldy     tmp1
+        sta     (ptr1),y
+        iny
+        bnz     L1
+        inc     ptr1+1
+L1:     sty     tmp1
+
+L3:     inc     ptr3            ; count length
+        bnz     L4
+        inc     ptr3+1
+        bnz     L4
+
+        txa                     ; terminate the string
+        ldy     tmp1
+        sta     (ptr1),y
+        rts
diff --git a/libsrc/atmos/crt0.s b/libsrc/atmos/crt0.s
index 8c2be656c..55c60dd30 100644
--- a/libsrc/atmos/crt0.s
+++ b/libsrc/atmos/crt0.s
@@ -51,7 +51,7 @@ _exit:  jsr     donelib
 
         ldx     #zpspace - 1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
@@ -68,7 +68,7 @@ L2:     lda     zpsave,x
 ; Save the zero-page area that we're about to use.
 
 init:   ldx     #zpspace - 1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -85,8 +85,8 @@ L1:     lda     sp,x
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Call the module constructors.
 
diff --git a/libsrc/atmos/sysuname.s b/libsrc/atmos/sysuname.s
index 546f942ab..7e7bd2341 100644
--- a/libsrc/atmos/sysuname.s
+++ b/libsrc/atmos/sysuname.s
@@ -23,23 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .if             ((.VERSION >> 4) & $0F) > 9
-        .byte           ((.VERSION >> 4) & $0F) / 10 + '0'
-        .byte           ((.VERSION >> 4) & $0F) .MOD 10 + '0'
-        .else
-        .byte           ((.VERSION >> 4) & $0F) + '0'
-        .endif
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .if             (.VERSION & $0F) > 9
-        .byte           (.VERSION & $0F) / 10 + '0'
-        .byte           (.VERSION & $0F) .MOD 10 + '0'
-        .else
-        .byte           (.VERSION & $0F) + '0'
-        .endif
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/atmos/waitvsync.s b/libsrc/atmos/waitvsync.s
new file mode 100644
index 000000000..85e50a795
--- /dev/null
+++ b/libsrc/atmos/waitvsync.s
@@ -0,0 +1,18 @@
+;
+; Written by Stefan Haubenthal <polluks@sdf.org>, requires VSync hack
+;
+; void waitvsync (void);
+;
+
+        .export _waitvsync
+
+        .include "atmos.inc"
+
+.proc   _waitvsync
+
+        lda     #%00010000      ; CB1
+wait:   and     VIA::PRA2
+        bne     wait
+        rts
+
+.endproc
diff --git a/libsrc/c128/break.s b/libsrc/c128/break.s
index 092ca3469..450183dc3 100644
--- a/libsrc/c128/break.s
+++ b/libsrc/c128/break.s
@@ -125,11 +125,10 @@ uservec:        jmp     $FFFF           ; Patched at runtime
 
 .data
 
-; Old break vector preceeded by a jump opcode
+; Old break vector preceded by a jump opcode
 brk_old:
         jmp     $0000
 
-; Indirect vectors preceeded by a jump opcode
+; Indirect vectors preceded by a jump opcode
 brk_ind:
         jmp     $0000
-
diff --git a/libsrc/c128/crt0.s b/libsrc/c128/crt0.s
index ba6a78ac5..f6a55778c 100644
--- a/libsrc/c128/crt0.s
+++ b/libsrc/c128/crt0.s
@@ -39,7 +39,7 @@ Start:
 ; Save the zero-page locations that we need.
 
         ldx     #zpspace-1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -58,8 +58,8 @@ L1:     lda     sp,x
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Call the module constructors.
 
@@ -85,7 +85,7 @@ _exit:  pha                     ; Save the return code on stack
 
         ldx     #zpspace-1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
diff --git a/libsrc/c128/mou/c128-1351.s b/libsrc/c128/mou/c128-1351.s
index 76e28d9f7..f6954c823 100644
--- a/libsrc/c128/mou/c128-1351.s
+++ b/libsrc/c128/mou/c128-1351.s
@@ -296,11 +296,11 @@ MOVE:   sei                             ; No interrupts
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
 
         jsr     CMOVEX                  ; Move the cursor
diff --git a/libsrc/c128/mou/c128-inkwell.s b/libsrc/c128/mou/c128-inkwell.s
index 2aac7d32d..b86959788 100644
--- a/libsrc/c128/mou/c128-inkwell.s
+++ b/libsrc/c128/mou/c128-inkwell.s
@@ -323,10 +323,10 @@ MOVE:   sei                             ; No interrupts
         jsr     MoveY
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         jsr     MoveX                   ; Move the cursor
 
         cli                             ; Allow interrupts
diff --git a/libsrc/c128/mou/c128-joy.s b/libsrc/c128/mou/c128-joy.s
index d809db526..26367f8df 100644
--- a/libsrc/c128/mou/c128-joy.s
+++ b/libsrc/c128/mou/c128-joy.s
@@ -297,11 +297,11 @@ MOVE:   sei                             ; No interrupts
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
 
         jsr     CMOVEX                  ; Move the cursor
diff --git a/libsrc/c128/mou/c128-pot.s b/libsrc/c128/mou/c128-pot.s
index 1cbe4aa18..55de4ac12 100644
--- a/libsrc/c128/mou/c128-pot.s
+++ b/libsrc/c128/mou/c128-pot.s
@@ -297,11 +297,11 @@ MOVE:   sei                             ; No interrupts
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
 
         jsr     CMOVEX                  ; Move the cursor
diff --git a/libsrc/c128/ser/c128-swlink.s b/libsrc/c128/ser/c128-swlink.s
index b8f08159b..796dc3b3b 100644
--- a/libsrc/c128/ser/c128-swlink.s
+++ b/libsrc/c128/ser/c128-swlink.s
@@ -134,7 +134,7 @@ ParityTable:
 ; Interrupt stub that is copied into low RAM. The startup code uses a special
 ; memory configuration with just kernal and I/O enabled (anything else is RAM).
 ; The NMI handler in ROM will switch back to a configuration where just the
-; low 16K RAM are accessible. So we have to copy a smal piece of code into
+; low 16K RAM are accessible. So we have to copy a small piece of code into
 ; low RAM that enables the cc65 configuration and then jumps to the real NMI
 ; handler.
 
@@ -296,7 +296,7 @@ SER_CLOSE:
         lda     #%00001010
         sta     ACIA_CMD
 
-; Initalize buffers. Returns zero in a
+; Initialize buffers. Returns zero in a
 
         jsr     InitBuffers
 
diff --git a/libsrc/c128/sysuname.s b/libsrc/c128/sysuname.s
index 55fe5ba28..b7c7794b5 100644
--- a/libsrc/c128/sysuname.s
+++ b/libsrc/c128/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/c128/tgi/c128-vdc.s b/libsrc/c128/tgi/c128-vdc.s
index f48b530f6..edbdd6cd8 100644
--- a/libsrc/c128/tgi/c128-vdc.s
+++ b/libsrc/c128/tgi/c128-vdc.s
@@ -268,7 +268,7 @@ INIT:
 @L1:    ldx     #$FF
         stx     BITMASK
 
-; Remeber current color value
+; Remember current color value
         ldx     #VDC_COLORS
         jsr     VDCReadReg
         sta     OLDCOLOR
diff --git a/libsrc/c128/tgi/c128-vdc2.s b/libsrc/c128/tgi/c128-vdc2.s
index 4b7b17c57..6b75ee712 100644
--- a/libsrc/c128/tgi/c128-vdc2.s
+++ b/libsrc/c128/tgi/c128-vdc2.s
@@ -277,7 +277,7 @@ INIT:
 @L1:    ldx     #$FF
         stx     BITMASK
 
-; Remeber current color value
+; Remember current color value
         ldx     #VDC_COLORS
         jsr     VDCReadReg
         sta     OLDCOLOR
diff --git a/libsrc/c128/waitvsync.s b/libsrc/c128/waitvsync.s
index e4bbbf7c9..573f574a7 100644
--- a/libsrc/c128/waitvsync.s
+++ b/libsrc/c128/waitvsync.s
@@ -23,8 +23,8 @@ _waitvsync:
 
 @c80:
         ;FIXME: do we have to switch banks?
+        lda     #$20
 @l3:
-        lda     VDC_INDEX
-        and     #$20
+        and     VDC_INDEX
         beq     @l3
         rts
diff --git a/libsrc/c16/crt0.s b/libsrc/c16/crt0.s
index 1df1e5c62..c203fb20f 100644
--- a/libsrc/c16/crt0.s
+++ b/libsrc/c16/crt0.s
@@ -24,7 +24,7 @@ Start:
 ; Save the zero-page locations that we need.
 
         ldx     #zpspace-1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -49,8 +49,8 @@ L1:     lda     sp,x
         bcc     MemOk
         ldy     #$80
         ldx     #$00
-MemOk:  stx     sp
-        sty     sp+1            ; set argument stack ptr
+MemOk:  stx     c_sp
+        sty     c_sp+1          ; set argument stack ptr
 
 ; Call the module constructors.
 
@@ -69,7 +69,7 @@ _exit:  pha                     ; Save the return code on stack
 
         ldx     #zpspace-1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
diff --git a/libsrc/c16/sysuname.s b/libsrc/c16/sysuname.s
index c44ab6acc..960509866 100644
--- a/libsrc/c16/sysuname.s
+++ b/libsrc/c16/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/c64/crt0.s b/libsrc/c64/crt0.s
index 4e5c7c9d4..dea9226aa 100644
--- a/libsrc/c64/crt0.s
+++ b/libsrc/c64/crt0.s
@@ -55,7 +55,7 @@ _exit:  pha                     ; Save the return code on stack
 
         ldx     #zpspace-1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
@@ -85,7 +85,7 @@ init:
 ; Save the zero-page locations that we need.
 
         ldx     #zpspace-1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -94,8 +94,8 @@ L1:     lda     sp,x
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Switch to the second charset.
 
diff --git a/libsrc/c64/emd/c64-rrr.s b/libsrc/c64/emd/c64-rrr.s
index 4d175cd32..8632e5e64 100644
--- a/libsrc/c64/emd/c64-rrr.s
+++ b/libsrc/c64/emd/c64-rrr.s
@@ -212,8 +212,8 @@ MAP:
         cmp pagecount
         bcs return_null
         sta curpage
-        lda #<dummy        ; load .A/.X with adress of data for COPYFROM-call (which expects the
-        ldx #>dummy        ; adress in .A/.X)
+        lda #<dummy        ; load .A/.X with address of data for COPYFROM-call (which expects the
+        ldx #>dummy        ; address in .A/.X)
         jsr COPYFROM
         bcs return_win     ; function returns pointer to window (returns always with carry set!)
 
@@ -224,8 +224,8 @@ COMMIT:
         lda curpage
         cmp pagecount
         bcs return
-        lda #<dummy        ; load .A/.X with adress of data for COPYTO-call (which expects the
-        ldx #>dummy        ; adress in .A/.X)
+        lda #<dummy        ; load .A/.X with address of data for COPYTO-call (which expects the
+        ldx #>dummy        ; address in .A/.X)
 
 ;----------------------------------------------------------------------------------------
 ;void __fastcall__ em_copyto (struct em_copy *copy_data);
@@ -324,7 +324,7 @@ get_struct_data:
         ;read and process the values from the em_copy struct passed to as parameters rameter to the
         ;functions em_copyto and em_copyfrom
 
-        sta aux         ;store adress of struct (passed in .A/.X) into a zp pointer
+        sta aux         ;store address of struct (passed in .A/.X) into a zp pointer
         stx aux+1
         ldy #0          ;index 0
 
@@ -347,7 +347,7 @@ get_struct_data:
         lsr
         lsr             ;shift into bits 3 and 4
         ora #$23        ;set bit 5 (select ram) and 1+2 (game/exrom setting for ULTIMAX-mode)
-        tax             ;.X has now the value to write into $de00 to acess rr-ram at desired 16k-bank
+        tax             ;.X has now the value to write into $de00 to access rr-ram at desired 16k-bank
         iny
         iny             ;skip unused byte
         lda (aux),y     ;read length lo-byte
@@ -357,7 +357,7 @@ get_struct_data:
         iny
         lda (aux),y     ;length hi-byte
         adc c64_ram+1
-        sta len+1       ;tmp2: length, tmp3 contains end adress of transfer in c64-ram.
+        sta len+1       ;tmp2: length, tmp3 contains end address of transfer in c64-ram.
         rts
                         ;55 bytes
 
diff --git a/libsrc/c64/joy/c64-hitjoy.s b/libsrc/c64/joy/c64-hitjoy.s
index a9d454fd0..c57f45780 100644
--- a/libsrc/c64/joy/c64-hitjoy.s
+++ b/libsrc/c64/joy/c64-hitjoy.s
@@ -102,7 +102,7 @@ readadapter:
         lda     #%00010001
         sta     $dd0e           ; control register a
                                 ; timer: start
-                                ;        continous
+                                ;        continuous
                                 ;        forced load
                                 ; serial port: input
 
@@ -110,7 +110,7 @@ readadapter:
         lda     #%01010001
         sta     $dc0e           ; control register a
                                 ; timer: start
-                                ;        continous
+                                ;        continuous
                                 ;        forced load
                                 ; serial port: output
 
diff --git a/libsrc/c64/mou/c64-1351.s b/libsrc/c64/mou/c64-1351.s
index ce0f18803..dcf949730 100644
--- a/libsrc/c64/mou/c64-1351.s
+++ b/libsrc/c64/mou/c64-1351.s
@@ -239,11 +239,11 @@ MOVE:   sei                             ; No interrupts
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
 
         jsr     CMOVEX                  ; Move the cursor
diff --git a/libsrc/c64/mou/c64-inkwell.s b/libsrc/c64/mou/c64-inkwell.s
index d2f14a6f0..68941260c 100644
--- a/libsrc/c64/mou/c64-inkwell.s
+++ b/libsrc/c64/mou/c64-inkwell.s
@@ -249,10 +249,10 @@ MOVE:   sei                             ; No interrupts
         jsr     MoveY
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         jsr     MoveX                   ; Move the cursor
 
         cli                             ; Allow interrupts
diff --git a/libsrc/c64/mou/c64-joy.s b/libsrc/c64/mou/c64-joy.s
index 5ee1b4f84..901b9c42d 100644
--- a/libsrc/c64/mou/c64-joy.s
+++ b/libsrc/c64/mou/c64-joy.s
@@ -245,11 +245,11 @@ MOVE:   sei                             ; No interrupts
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
 
         jsr     CMOVEX                  ; Move the cursor
diff --git a/libsrc/c64/mou/c64-pot.s b/libsrc/c64/mou/c64-pot.s
index 9bdf24f62..1728913e1 100644
--- a/libsrc/c64/mou/c64-pot.s
+++ b/libsrc/c64/mou/c64-pot.s
@@ -230,11 +230,11 @@ MOVE:   sei                             ; No interrupts
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
 
         jsr     CMOVEX                  ; Move the cursor
diff --git a/libsrc/c64/ser/c64-swlink.s b/libsrc/c64/ser/c64-swlink.s
index 067a7ca92..2c06bb39b 100644
--- a/libsrc/c64/ser/c64-swlink.s
+++ b/libsrc/c64/ser/c64-swlink.s
@@ -270,7 +270,7 @@ SER_CLOSE:
         lda     #%00001010
         sta     ACIA_CMD
 
-; Initalize buffers. Returns zero in a
+; Initialize buffers. Returns zero in a
 
         jsr     InitBuffers
 
diff --git a/libsrc/c64/sysuname.s b/libsrc/c64/sysuname.s
index 1903986c9..1f6cfc410 100644
--- a/libsrc/c64/sysuname.s
+++ b/libsrc/c64/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/c65/_scrsize.s b/libsrc/c65/_scrsize.s
new file mode 100644
index 000000000..3fc955657
--- /dev/null
+++ b/libsrc/c65/_scrsize.s
@@ -0,0 +1,17 @@
+;
+; Ullrich von Bassewitz, 26.10.2000
+;
+; Screen size variables
+;
+
+        .export         screensize
+        .include        "cbm_kernal.inc"
+
+.proc   screensize
+
+        jsr     SCREEN
+        inx
+        iny
+        rts
+
+.endproc
diff --git a/libsrc/c65/bordercolor.s b/libsrc/c65/bordercolor.s
new file mode 100644
index 000000000..6b3c7f86c
--- /dev/null
+++ b/libsrc/c65/bordercolor.s
@@ -0,0 +1,17 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; unsigned char __fastcall__ bordercolor (unsigned char color);
+;
+
+
+        .export         _bordercolor
+
+        .include        "c65.inc"
+
+_bordercolor:
+        ldx     VIC_BORDERCOLOR ; get old value
+        sta     VIC_BORDERCOLOR ; set new value
+        txa
+        rts
+
diff --git a/libsrc/c65/cgetc.s b/libsrc/c65/cgetc.s
new file mode 100644
index 000000000..3b2d5934d
--- /dev/null
+++ b/libsrc/c65/cgetc.s
@@ -0,0 +1,32 @@
+
+
+        .include    "cbm_kernal.inc"
+        .import     cursor
+        .export     _cgetc
+_cgetc:
+
+        lda cursor
+        beq nocursor
+
+        ; enable the cursor
+        clc
+        jsr CURSOR
+
+nocursor:
+        ; wait for a key
+       ; FIXME: is $d610 mega65 specific?
+:
+        lda $d610
+        beq :-
+
+        jsr KBDREAD
+
+        pha
+        ; disable the cursor
+        sec
+        jsr CURSOR
+
+        pla
+        ldx #0
+        rts
+
diff --git a/libsrc/c65/clrscr.s b/libsrc/c65/clrscr.s
new file mode 100644
index 000000000..84fef5eac
--- /dev/null
+++ b/libsrc/c65/clrscr.s
@@ -0,0 +1,15 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; void clrscr (void);
+;
+
+        .export         _clrscr
+
+        .include        "cbm_kernal.inc"
+
+;_clrscr = CLRSCR
+
+_clrscr:
+        lda #$93
+        jmp CHROUT
diff --git a/libsrc/c65/color.s b/libsrc/c65/color.s
new file mode 100644
index 000000000..b80ba2367
--- /dev/null
+++ b/libsrc/c65/color.s
@@ -0,0 +1,24 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; unsigned char __fastcall__ textcolor (unsigned char color);
+; unsigned char __fastcall__ bgcolor (unsigned char color);
+;
+
+
+        .export         _textcolor, _bgcolor
+
+        .include        "c65.inc"
+
+_textcolor:
+        ldx     CHARCOLOR       ; get old value
+        sta     CHARCOLOR       ; set new value
+        txa
+        rts
+
+
+_bgcolor:
+        ldx     VIC_BG_COLOR0   ; get old value
+        sta     VIC_BG_COLOR0   ; set new value
+        txa
+        rts
diff --git a/libsrc/c65/conio.s b/libsrc/c65/conio.s
new file mode 100644
index 000000000..6c90a6d2e
--- /dev/null
+++ b/libsrc/c65/conio.s
@@ -0,0 +1,10 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; Low level stuff for screen output/console input
+;
+
+        .exportzp       CURS_X, CURS_Y
+
+        .include        "c65.inc"
+
diff --git a/libsrc/c65/cpeekc.s b/libsrc/c65/cpeekc.s
new file mode 100644
index 000000000..a64e13cfd
--- /dev/null
+++ b/libsrc/c65/cpeekc.s
@@ -0,0 +1,45 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-22, Greg King
+;
+; char cpeekc (void);
+;
+
+        .include        "c65.inc"
+
+        .export         _cpeekc
+        .importzp       ptr1
+
+_cpeekc:
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$0800
+        sta     ptr1 + 1
+        lda     SCREEN_PTR
+        sta     ptr1
+
+        ldy     CURS_X
+        lda     (ptr1),y  ; get screen code
+        ldx     #>$0000
+        and     #<~$80          ; remove reverse bit
+
+; Convert the screen code into a PetSCII code.
+; $00 - $1F: +$40
+; $20 - $3F
+; $40 - $5f: +$20
+; $60 - $7F: +$40
+
+        cmp     #$20
+        bcs     @sk1            ;(bge)
+        ora     #$40
+        rts
+
+@sk1:   cmp     #$40
+        bcc     @end            ;(blt)
+        cmp     #$60
+        bcc     @sk2            ;(blt)
+        ;sec
+        adc     #$20 - $01
+@sk2:   ;clc                    ; both above cmp and adc clear carry flag
+        adc     #$20
+@end:   rts
diff --git a/libsrc/c65/cpeekcolor.s b/libsrc/c65/cpeekcolor.s
new file mode 100644
index 000000000..f4b4a5573
--- /dev/null
+++ b/libsrc/c65/cpeekcolor.s
@@ -0,0 +1,25 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-22, Greg King
+;
+; unsigned char cpeekcolor (void);
+;
+
+        .include        "c65.inc"
+
+        .export         _cpeekcolor
+        .importzp       ptr1
+
+_cpeekcolor:
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$D800
+        sta     ptr1 + 1
+        lda     SCREEN_PTR
+        sta     ptr1
+
+        ldy     #0
+        lda     (ptr1),y
+
+        ldx     #>$0000
+        rts
diff --git a/libsrc/c65/cpeekrevers.s b/libsrc/c65/cpeekrevers.s
new file mode 100644
index 000000000..4fef17340
--- /dev/null
+++ b/libsrc/c65/cpeekrevers.s
@@ -0,0 +1,28 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-15, Greg King
+;
+; unsigned char cpeekrevers (void);
+;
+
+        .include        "c65.inc"
+
+        .export         _cpeekrevers
+        .importzp       ptr1
+
+_cpeekrevers:
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$0800
+        sta     ptr1 + 1
+        lda     SCREEN_PTR
+        sta     ptr1
+
+        ldy     CURS_X
+        lda     (ptr1),y  ; get screen code
+        and     #$80            ; get reverse bit
+        asl     a
+        tax                     ; ldx #>$0000
+        rol     a               ; return boolean value
+
+        rts
diff --git a/libsrc/c65/cpeeks.s b/libsrc/c65/cpeeks.s
new file mode 100644
index 000000000..9c33831f1
--- /dev/null
+++ b/libsrc/c65/cpeeks.s
@@ -0,0 +1,80 @@
+;
+; 2017-07-05, Greg King
+;
+; void cpeeks (char* s, unsigned length);
+;
+
+        .include "c65.inc"
+
+        .export         _cpeeks
+
+        .import         popax
+        .importzp       ptr1, ptr2, ptr3, tmp1, tmp2
+
+        .macpack        generic
+
+_cpeeks:
+        eor     #<$FFFF         ; counting a word upward is faster
+        sta     ptr3            ; so, we use -(length + 1)
+        txa
+        eor     #>$FFFF
+        sta     ptr3+1
+
+        lda     SCREEN_PTR
+        sta     ptr2
+        lda     SCREEN_PTR+1
+        clc
+        adc     #>$0800
+        sta     ptr2+1
+
+        ldy     CURS_X
+        sty     tmp2
+
+        jsr     popax
+        sta     tmp1            ; (will be a .Y index)
+        stx     ptr1+1
+        ldx     #<$0000
+        stx     ptr1
+        bze     L3              ; branch always
+
+L4:     ldy     tmp2
+        lda     (ptr2),y        ; get char
+        iny
+        bnz     L2
+        inc     ptr2+1
+L2:     sty     tmp2
+        and     #<~$80          ; remove reverse bit
+
+; Convert the screen code into a PetSCII code.
+; $00 - $1F: +$40
+; $20 - $3F
+; $40 - $5f: +$20
+; $60 - $7F: +$40
+
+        cmp     #$20
+        blt     @sk1            ;(bcc)
+        cmp     #$40
+        blt     L5
+        cmp     #$60
+        blt     @sk2            ;(bcc)
+        clc
+@sk1:   adc     #$20
+@sk2:   ;clc                    ; both above cmp and adc clear carry flag
+        adc     #$20
+
+L5:     ldy     tmp1
+        sta     (ptr1),y
+        iny
+        bnz     L1
+        inc     ptr1+1
+L1:     sty     tmp1
+
+L3:     inc     ptr3            ; count length
+        bnz     L4
+        inc     ptr3+1
+        bnz     L4
+
+        txa                     ; terminate the string
+        ldy     tmp1
+        sta     (ptr1),y
+        rts
diff --git a/libsrc/c65/cputc.s b/libsrc/c65/cputc.s
new file mode 100644
index 000000000..1a8dd1fee
--- /dev/null
+++ b/libsrc/c65/cputc.s
@@ -0,0 +1,120 @@
+;
+; Ullrich von Bassewitz, 1998-08-06, 2009-09-26
+;
+; void __fastcall__ cputcxy (unsigned char x, unsigned char y, char c);
+; void __fastcall__ cputc (char c);
+;
+
+        .export         _cputcxy, _cputc, cputdirect, putchar
+        .export         newline, plot
+        .import         gotoxy
+        .import         PLOT
+        .importzp       ptr4
+
+        .include        "c65.inc"
+
+_cputcxy:
+        pha                     ; Save C
+        jsr     gotoxy          ; Set cursor, drop x and y
+        pla                     ; Restore C
+
+; Plot a character - also used as internal function
+
+_cputc: cmp     #$0A            ; CR?
+        bne     L1
+        lda     #0
+        sta     CURS_X
+        beq     plot            ; Recalculate pointers
+
+L1:     cmp     #$0D            ; LF?
+        beq     newline         ; Recalculate pointers
+
+; Printable char of some sort
+
+        cmp     #' '
+        bcc     cputdirect      ; Other control char
+        tay
+        bmi     L10
+        cmp     #$60
+        bcc     L2
+        and     #$DF
+        bne     cputdirect      ; Branch always
+L2:     and     #$3F
+
+cputdirect:
+        jsr     putchar         ; Write the character to the screen
+
+; Advance cursor position
+
+advance:
+        iny
+        cpy     #XSIZE
+        bne     L3
+        jsr     newline         ; new line
+        ldy     #0              ; + cr
+L3:     sty     CURS_X
+        rts
+
+newline:
+        clc
+        lda     #XSIZE
+        adc     SCREEN_PTR
+        sta     SCREEN_PTR
+        bcc     L4
+        inc     SCREEN_PTR+1
+        clc
+L4:     lda     #XSIZE
+        adc     CRAM_PTR
+        sta     CRAM_PTR
+        bcc     L5
+        inc     CRAM_PTR+1
+L5:     inc     CURS_Y
+        rts
+
+; Handle character if high bit set
+
+L10:    and     #$7F
+        cmp     #$7F            ; PI?
+        bne     L11
+        lda     #$5E            ; Load screen code for PI
+L11:    ora     #$40
+        bne     cputdirect
+
+
+
+; Set cursor position, calculate RAM pointers.
+
+plot:   ldy     CURS_X
+        ldx     CURS_Y
+        clc
+        jmp     PLOT            ; Set the new cursor
+
+
+
+; Write one character to the screen without doing anything else, return X
+; position in Y
+
+putchar:
+        ora     RVS             ; Set revers bit
+
+        tay
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$0800
+        sta     ptr4 + 1
+        lda     SCREEN_PTR
+        sta     ptr4
+        tya
+
+        ldy     CURS_X
+        sta     (ptr4),y  ; Set char
+
+        lda     ptr4 + 1
+        clc
+        adc     #>$d000
+        sta     ptr4 + 1
+
+        lda     CHARCOLOR
+        sta     (ptr4),y    ; Set color
+
+        rts
diff --git a/libsrc/c65/crt0.s b/libsrc/c65/crt0.s
new file mode 100644
index 000000000..380d04e2e
--- /dev/null
+++ b/libsrc/c65/crt0.s
@@ -0,0 +1,123 @@
+;
+; Startup code for cc65 (C65 version)
+;
+
+        .export         _exit
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
+
+        .import         initlib, donelib
+        .import         zerobss, callmain
+        .import         BSOUT
+        .import         __MAIN_START__, __MAIN_SIZE__   ; Linker generated
+        .import         __STACKSIZE__                   ; from configure file
+
+        .include        "zeropage.inc"
+        .include        "c65.inc"
+
+
+; ------------------------------------------------------------------------
+; Startup code
+
+.segment        "STARTUP"
+
+Start:
+
+; Switch off the BASIC ROM.
+
+; FIXME
+;        lda     $01
+;        sta     mmusave         ; Save the memory configuration
+;        and     #$F8
+;        ora     #$06            ; Enable Kernal+I/O, disable BASIC
+;        sta     $01
+;        sei
+;        lda #%00000000  ; lower offset 15-8
+;        ldx #%00000000  ; map blk3-1 | lower offset 19-6
+;        ldy #%00000000  ; upper offset 15-8
+;        ldz #%00000000  ; map blk7-4 | upper offset 19-6
+;        map
+;        eom
+
+        tsx
+        stx     spsave          ; Save the system stack ptr
+
+; Save space by putting some of the start-up code in the ONCE segment,
+; which can be re-used by the BSS segment, the heap and the C stack.
+
+        jsr     init
+
+; Clear the BSS data.
+
+        jsr     zerobss
+
+; Push the command-line arguments; and, call main().
+
+        jsr     callmain
+
+; Back from main() [this is also the exit() entry]. Run the module destructors.
+
+_exit:  pha                     ; Save the return code on stack
+        jsr     donelib
+
+; Copy back the zero-page stuff.
+
+        ldx     #zpspace-1
+L2:     lda     zpsave,x
+        sta     c_sp,x
+        dex
+        bpl     L2
+
+; Place the program return code into BASIC's status variable.
+
+        pla
+        sta     STATUS
+
+; Restore the system stuff.
+
+        ldx     spsave
+        txs                     ; Restore stack pointer
+
+; Back to BASIC.
+
+        rts
+
+
+; ------------------------------------------------------------------------
+
+.segment        "ONCE"
+
+init:
+
+; Save the zero-page locations that we need.
+
+        ldx     #zpspace-1
+L1:     lda     c_sp,x
+        sta     zpsave,x
+        dex
+        bpl     L1
+
+; Set up the stack.
+
+        lda     #<(__MAIN_START__ + __MAIN_SIZE__)
+        ldx     #>(__MAIN_START__ + __MAIN_SIZE__)
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
+
+; Switch to the second charset.
+
+        lda     #14
+        jsr     BSOUT
+
+; Call the module constructors.
+
+        jmp     initlib
+
+
+; ------------------------------------------------------------------------
+; Data
+
+.segment        "INIT"
+
+mmusave:.res    1
+spsave: .res    1
+zpsave: .res    zpspace
diff --git a/libsrc/c65/devnum.s b/libsrc/c65/devnum.s
new file mode 100644
index 000000000..412b63fd7
--- /dev/null
+++ b/libsrc/c65/devnum.s
@@ -0,0 +1,7 @@
+;
+; Oliver Schmidt, 2010-02-14
+;
+
+        .include        "c65.inc"
+
+        .exportzp       devnum := DEVNUM
diff --git a/libsrc/c65/exehdr.s b/libsrc/c65/exehdr.s
new file mode 100644
index 000000000..645fc12e7
--- /dev/null
+++ b/libsrc/c65/exehdr.s
@@ -0,0 +1,32 @@
+;
+; Ullrich von Bassewitz, 2010-11-14
+;
+; This module supplies a small BASIC stub program that jumps to the machine
+; language code that follows it using SYS.
+;
+
+        ; The following symbol is used by linker config to force the module
+        ; to get included into the output file
+        .export         __EXEHDR__: absolute = 1
+
+.segment        "EXEHDR"
+
+        .addr   Next
+        .word   .version        ; Line number
+        .byte   $fe, $02, "0:"  ; BANK 0
+        .byte   $9e             ; SYS
+;       .byte   <(((Start / 10000) .mod 10) + '0')
+        .byte   <(((Start /  1000) .mod 10) + '0')
+        .byte   <(((Start /   100) .mod 10) + '0')
+        .byte   <(((Start /    10) .mod 10) + '0')
+        .byte   <(((Start /     1) .mod 10) + '0')
+        .byte   $00             ; End of BASIC line
+Next:   .word   0               ; BASIC end marker
+Start:
+
+; If the start address is larger than 4 digits, the header generated above
+; will not contain the highest digit. Instead of wasting one more digit that
+; is almost never used, check it at link time and generate an error so the
+; user knows something is wrong.
+
+.assert (Start < 10000), error, "Start address too large for generated BASIC stub"
diff --git a/libsrc/c65/get_tv.s b/libsrc/c65/get_tv.s
new file mode 100644
index 000000000..2093e45fd
--- /dev/null
+++ b/libsrc/c65/get_tv.s
@@ -0,0 +1,25 @@
+;
+; Ullrich von Bassewitz, 2002-12-03
+;
+; unsigned char get_tv (void);
+; /* Return the video mode the machine is using */
+;
+
+        .include        "get_tv.inc"
+        .include        "c65.inc"
+
+
+;--------------------------------------------------------------------------
+; _get_tv
+
+.proc   _get_tv
+
+        ldx     #TV::PAL        ; Assume PAL
+        lda     PALFLAG
+        bne     pal
+        dex                     ; NTSC
+pal:    txa
+        ldx     #0
+        rts
+
+.endproc
diff --git a/libsrc/c65/gettime.s b/libsrc/c65/gettime.s
new file mode 100644
index 000000000..c4b200a5d
--- /dev/null
+++ b/libsrc/c65/gettime.s
@@ -0,0 +1,83 @@
+;
+; Stefan Haubenthal, 27.7.2009
+; Oliver Schmidt, 14.8.2018
+;
+; int __fastcall__ clock_gettime (clockid_t clk_id, struct timespec *tp);
+;
+
+        .include        "time.inc"
+        .include        "c65.inc"
+
+        .importzp       sreg, tmp1, tmp2
+        .import         pushax, pusheax, tosmul0ax, steaxspidx, incsp1, return0
+        .import         TM, load_tenth
+
+
+;----------------------------------------------------------------------------
+.code
+
+.proc   _clock_gettime
+
+        jsr     pushax
+        jsr     pushax
+
+        lda     CIA1_TODHR
+        sed
+        tax                     ; Save PM flag
+        and     #%01111111
+        cmp     #$12            ; 12 AM/PM
+        bcc     @L1
+        sbc     #$12
+@L1:    inx                     ; Get PM flag
+        bpl     @L2
+        clc
+        adc     #$12
+@L2:    cld
+        jsr     BCD2dec
+        sta     TM + tm::tm_hour
+        lda     CIA1_TODMIN
+        jsr     BCD2dec
+        sta     TM + tm::tm_min
+        lda     CIA1_TODSEC
+        jsr     BCD2dec
+        sta     TM + tm::tm_sec
+        lda     #<TM
+        ldx     #>TM
+        jsr     _mktime
+
+        ldy     #timespec::tv_sec
+        jsr     steaxspidx      ; Pops address pushed by 2. pushax
+
+        jsr     load_tenth
+        jsr     pusheax
+        lda     CIA1_TOD10
+        ldx     #>$0000
+        jsr     tosmul0ax
+
+        ldy     #timespec::tv_nsec
+        jsr     steaxspidx      ; Pops address pushed by 1. pushax
+
+        jsr     incsp1
+        jmp     return0
+
+.endproc
+
+;----------------------------------------------------------------------------
+; dec = (((BCD>>4)*10) + (BCD&0xf))
+
+.proc   BCD2dec
+
+        tax
+        and     #%00001111
+        sta     tmp1
+        txa
+        and     #%11110000      ; *16
+        lsr                     ; *8
+        sta     tmp2
+        lsr
+        lsr                     ; *2
+        adc     tmp2            ; = *10
+        adc     tmp1
+        rts
+
+.endproc
diff --git a/libsrc/c65/joy/c65-stdjoy.s b/libsrc/c65/joy/c65-stdjoy.s
new file mode 100644
index 000000000..1723c916a
--- /dev/null
+++ b/libsrc/c65/joy/c65-stdjoy.s
@@ -0,0 +1,111 @@
+;
+; Standard joystick driver for the C65. May be used multiple times when linked
+; to the statically application.
+;
+; Ullrich von Bassewitz, 2002-12-20
+;
+
+        .include        "zeropage.inc"
+
+        .include        "joy-kernel.inc"
+        .include        "joy-error.inc"
+        .include        "c65.inc"
+
+        .macpack        generic
+        .macpack        module
+
+
+; ------------------------------------------------------------------------
+; Header. Includes jump table
+
+        module_header   _c65_stdjoy_joy
+
+; Driver signature
+
+        .byte   $6A, $6F, $79           ; "joy"
+        .byte   JOY_API_VERSION         ; Driver API version number
+
+; Library reference
+
+        .addr   $0000
+
+; Jump table.
+
+        .addr   INSTALL
+        .addr   UNINSTALL
+        .addr   COUNT
+        .addr   READ
+
+; ------------------------------------------------------------------------
+; Constants
+
+JOY_COUNT       = 2             ; Number of joysticks we support
+
+
+; ------------------------------------------------------------------------
+; Data.
+
+
+.code
+
+; ------------------------------------------------------------------------
+; INSTALL routine. Is called after the driver is loaded into memory. If
+; possible, check if the hardware is present and determine the amount of
+; memory available.
+; Must return an JOY_ERR_xx code in a/x.
+;
+
+INSTALL:
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
+
+;       rts                     ; Run into UNINSTALL instead
+
+; ------------------------------------------------------------------------
+; UNINSTALL routine. Is called before the driver is removed from memory.
+; Can do cleanup or whatever. Must not return anything.
+;
+
+UNINSTALL:
+        rts
+
+
+; ------------------------------------------------------------------------
+; COUNT: Return the total number of available joysticks in a/x.
+;
+
+COUNT:
+        lda     #<JOY_COUNT
+        ldx     #>JOY_COUNT
+        rts
+
+; ------------------------------------------------------------------------
+; READ: Read a particular joystick passed in A.
+;
+
+READ:   tax                     ; Joystick number into X
+        bne     joy2
+
+; Read joystick 1
+
+joy1:   lda     #$7F
+        sei
+        sta     CIA1_PRA
+        lda     CIA1_PRB
+        cli
+        jmp     end
+
+; Read joystick 2
+
+joy2:   ldx     #0
+        lda     #$E0
+        ldy     #$FF
+        sei
+        sta     CIA1_DDRA
+        lda     CIA1_PRA
+        sty     CIA1_DDRA
+        cli
+end:    and     #$1F
+        eor     #$1F
+        rts
diff --git a/libsrc/c65/joy_stat_stddrv.s b/libsrc/c65/joy_stat_stddrv.s
new file mode 100644
index 000000000..3a4deffcd
--- /dev/null
+++ b/libsrc/c65/joy_stat_stddrv.s
@@ -0,0 +1,14 @@
+;
+; Address of the static standard joystick driver
+;
+; Oliver Schmidt, 2012-11-01
+;
+; const void joy_static_stddrv[];
+;
+
+        .export _joy_static_stddrv
+        .import _c65_stdjoy_joy
+
+.rodata
+
+_joy_static_stddrv := _c65_stdjoy_joy
diff --git a/libsrc/c65/joy_stddrv.s b/libsrc/c65/joy_stddrv.s
new file mode 100644
index 000000000..4232d9647
--- /dev/null
+++ b/libsrc/c65/joy_stddrv.s
@@ -0,0 +1,14 @@
+;
+; Name of the standard joystick driver
+;
+; Ullrich von Bassewitz, 2002-12-21
+;
+; const char joy_stddrv[];
+;
+
+        .export _joy_stddrv
+
+.rodata
+
+_joy_stddrv:    .asciiz "c65-stdjoy.joy"
+
diff --git a/libsrc/c65/kbhit.s b/libsrc/c65/kbhit.s
new file mode 100644
index 000000000..683451b03
--- /dev/null
+++ b/libsrc/c65/kbhit.s
@@ -0,0 +1,14 @@
+
+       ; FIXME: is $d610 mega65 specific?
+       ; FIXME: this should rather use the kernal (with keyboard buffer etc)
+
+        .export _kbhit
+_kbhit:
+        lda $d610
+        beq :+
+
+        lda #1
+:
+        ldx #>$0000
+        rts
+
diff --git a/libsrc/c65/kernal.s b/libsrc/c65/kernal.s
new file mode 100644
index 000000000..fac8be514
--- /dev/null
+++ b/libsrc/c65/kernal.s
@@ -0,0 +1,47 @@
+;
+; Ullrich von Bassewitz, 19.11.2002
+;
+; C65 Kernal functions
+;
+
+        .include "cbm_kernal.inc"
+
+        .export         CINT
+        .export         IOINIT
+        .export         RAMTAS
+        .export         RESTOR
+        .export         VECTOR
+        .export         SETMSG
+        .export         SECOND
+        .export         TKSA
+        .export         MEMTOP
+        .export         MEMBOT
+        .export         SCNKEY
+        .export         ACPTR
+        .export         CIOUT
+        .export         UNTLK
+        .export         UNLSN
+        .export         LISTEN
+        .export         TALK
+        .export         READST
+        .export         SETLFS
+        .export         SETNAM
+        .export         OPEN
+        .export         CLOSE
+        .export         CHKIN
+        .export         CKOUT
+        .export         CLRCH
+        .export         BASIN
+        .export         CHRIN
+        .export         BSOUT
+        .export         CHROUT
+        .export         LOAD
+        .export         SAVE
+        .export         SETTIM
+        .export         RDTIM
+        .export         STOP
+        .export         GETIN
+        .export         CLALL
+        .export         SCREEN
+        .export         IOBASE
+        .export         PLOT
diff --git a/libsrc/c65/libref.s b/libsrc/c65/libref.s
new file mode 100644
index 000000000..e4afa7eb1
--- /dev/null
+++ b/libsrc/c65/libref.s
@@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit
diff --git a/libsrc/c65/loadaddr.s b/libsrc/c65/loadaddr.s
new file mode 100644
index 000000000..0675dd67d
--- /dev/null
+++ b/libsrc/c65/loadaddr.s
@@ -0,0 +1,16 @@
+;
+; Ullrich von Bassewitz, 2010-11-13
+;
+; This module supplies the load address that is expected by Commodore
+; machines in the first two bytes of an excutable disk file.
+;
+
+
+        ; The following symbol is used by linker config to force the module
+        ; to get included into the output file
+        .export         __LOADADDR__: absolute = 1
+
+.segment        "LOADADDR"
+
+        .addr   *+2
+
diff --git a/libsrc/c65/mainargs.s b/libsrc/c65/mainargs.s
new file mode 100644
index 000000000..e2249819f
--- /dev/null
+++ b/libsrc/c65/mainargs.s
@@ -0,0 +1,137 @@
+; mainargs.s
+;
+; Ullrich von Bassewitz, 2003-03-07
+; Based on code from Stefan A. Haubenthal, <polluks@web.de>
+; 2003-05-18, Greg King
+; 2004-04-28, 2005-02-26, Ullrich von Bassewitz
+;
+; Scan a group of arguments that are in BASIC's input-buffer.
+; Build an array that points to the beginning of each argument.
+; Send, to main(), that array and the count of the arguments.
+;
+; Command-lines look like these lines:
+;
+; run
+; run : rem
+; run:rem arg1 " arg 2 is quoted "  arg3 "" arg5
+;
+; "run" and "rem" are entokenned; the args. are not.  Leading and trailing
+; spaces outside of quotes are ignored.
+;
+; TO-DO:
+; - The "file-name" might be a path-name; don't copy the directory-components.
+; - Add a control-character quoting mechanism.
+
+        .constructor    initmainargs, 24
+        .import         __argc, __argv
+
+        .include        "c65.inc"
+
+
+MAXARGS  = 10                   ; Maximum number of arguments allowed
+REM      = $8f                  ; BASIC token-code
+NAME_LEN = 16                   ; Maximum length of command-name
+
+; Get possible command-line arguments. Goes into the special ONCE segment,
+; which may be reused after the startup code is run
+
+.segment        "ONCE"
+
+initmainargs:
+
+; Assume that the program was loaded, a moment ago, by the traditional LOAD
+; statement.  Save the "most-recent filename" as argument #0.
+
+        lda     #0              ; The terminating NUL character
+        ldy     FNAM_LEN
+        cpy     #NAME_LEN + 1
+        bcc     L1
+        ldy     #NAME_LEN       ; Limit the length
+        bne     L1              ; Branch always
+L0:     lda     (FNAM),y
+L1:     sta     name,y
+        dey
+        bpl     L0
+        inc     __argc          ; argc always is equal to, at least, 1
+
+; Find the "rem" token.
+
+        ldx     #0
+L2:     lda     BASIC_BUF,x
+        beq     done            ; No "rem," no args.
+        inx
+        cmp     #REM
+        bne     L2
+        ldy     #1 * 2
+
+; Find the next argument
+
+next:   lda     BASIC_BUF,x
+        beq     done            ; End of line reached
+        inx
+        cmp     #' '            ; Skip leading spaces
+        beq     next
+
+; Found start of next argument. We've incremented the pointer in X already, so
+; it points to the second character of the argument. This is useful since we
+; will check now for a quoted argument, in which case we will have to skip this
+; first character.
+
+found:  cmp     #'"'            ; Is the argument quoted?
+        beq     setterm         ; Jump if so
+        dex                     ; Reset pointer to first argument character
+        lda     #' '            ; A space ends the argument
+setterm:sta     term            ; Set end of argument marker
+
+; Now store a pointer to the argument into the next slot. Since the BASIC
+; input buffer is located at the start of a RAM page, no calculations are
+; necessary.
+
+        txa                     ; Get low byte
+        sta     argv,y          ; argv[y]= &arg
+        iny
+        lda     #>BASIC_BUF
+        sta     argv,y
+        iny
+        inc     __argc          ; Found another arg
+
+; Search for the end of the argument
+
+argloop:lda     BASIC_BUF,x
+        beq     done
+        inx
+        cmp     term
+        bne     argloop
+
+; We've found the end of the argument. X points one character behind it, and
+; A contains the terminating character. To make the argument a valid C string,
+; replace the terminating character by a zero.
+
+        lda     #0
+        sta     BASIC_BUF-1,x
+
+; Check if the maximum number of command line arguments is reached. If not,
+; parse the next one.
+
+        lda     __argc          ; Get low byte of argument count
+        cmp     #MAXARGS        ; Maximum number of arguments reached?
+        bcc     next            ; Parse next one if not
+
+; (The last vector in argv[] already is NULL.)
+
+done:   lda     #<argv
+        ldx     #>argv
+        sta     __argv
+        stx     __argv + 1
+        rts
+
+.segment        "INIT"
+
+term:   .res    1
+name:   .res    NAME_LEN + 1
+
+.data
+
+; char* argv[MAXARGS+1]={name};
+argv:   .addr   name
+        .res    MAXARGS * 2
diff --git a/libsrc/c65/randomize.s b/libsrc/c65/randomize.s
new file mode 100644
index 000000000..8ee5d1381
--- /dev/null
+++ b/libsrc/c65/randomize.s
@@ -0,0 +1,18 @@
+;
+; 2002-11-05, Ullrich von Bassewitz
+; 2015-09-11, Greg King
+;
+; void __randomize (void);
+; /* Initialize the random number generator */
+;
+
+        .export         ___randomize
+        .import         _srand
+
+        .include        "c65.inc"
+
+___randomize:
+        ldx     VIC_HLINE       ; Use VIC rasterline as high byte
+        lda     TIME+2          ; Use 60HZ clock as low byte
+        jmp     _srand          ; Initialize generator
+
diff --git a/libsrc/c65/revers.s b/libsrc/c65/revers.s
new file mode 100644
index 000000000..f6bd88688
--- /dev/null
+++ b/libsrc/c65/revers.s
@@ -0,0 +1,27 @@
+;
+; Ullrich von Bassewitz, 07.08.1998
+;
+; unsigned char revers (unsigned char onoff);
+;
+
+        .export         _revers
+
+        .include        "c65.inc"
+
+.proc   _revers
+
+        ldx     #$00            ; Assume revers off
+        tay                     ; Test onoff
+        beq     L1              ; Jump if off
+        ldx     #$80            ; Load on value
+        ldy     #$00            ; Assume old value is zero
+L1:     lda     RVS             ; Load old value
+        stx     RVS             ; Set new value
+        beq     L2              ; Jump if old value zero
+        iny                     ; Make old value = 1
+L2:     ldx     #$00            ; Load high byte of result
+        tya                     ; Load low byte, set CC
+        rts
+
+.endproc
+
diff --git a/libsrc/c65/settime.s b/libsrc/c65/settime.s
new file mode 100644
index 000000000..8b376e089
--- /dev/null
+++ b/libsrc/c65/settime.s
@@ -0,0 +1,84 @@
+;
+; Oliver Schmidt, 16.8.2018
+;
+; int __fastcall__ clock_settime (clockid_t clk_id, const struct timespec *tp);
+;
+
+        .include        "time.inc"
+        .include        "c65.inc"
+
+        .importzp       sreg, ptr1
+        .import         pushax, pusheax, ldax0sp, ldeaxidx
+        .import         tosdiveax, incsp3, return0
+        .import         TM, load_tenth
+
+
+;----------------------------------------------------------------------------
+.code
+
+.proc   _clock_settime
+
+        jsr     pushax
+
+        .assert timespec::tv_sec = 0, error
+        jsr     _localtime
+        sta     ptr1
+        stx     ptr1+1
+        ldy     #.sizeof(tm)-1
+@L1:    lda     (ptr1),y
+        sta     TM,y
+        dey
+        bpl     @L1
+
+        lda     TM + tm::tm_hour
+        jsr     dec2BCD
+        tax                     ; Force flags
+        bne     @L2
+        lda     #$92            ; 12 AM
+        bne     @L3
+@L2:    cmp     #$13            ; 1 PM
+        bcc     @L3
+        sed
+        sbc     #$12
+        cld
+        ora     #%10000000
+@L3:    sta     CIA1_TODHR
+        lda     TM + tm::tm_min
+        jsr     dec2BCD
+        sta     CIA1_TODMIN
+        lda     TM + tm::tm_sec
+        jsr     dec2BCD
+        sta     CIA1_TODSEC
+
+        jsr     ldax0sp
+        ldy     #3+timespec::tv_nsec
+        jsr     ldeaxidx
+        jsr     pusheax
+        jsr     load_tenth
+        jsr     tosdiveax
+        sta     CIA1_TOD10
+
+        jsr     incsp3
+        jmp     return0
+
+.endproc
+
+;----------------------------------------------------------------------------
+; Just sum up the value in BCD mode.
+; http://forum.6502.org/viewtopic.php?p=7629#p7629
+
+.proc   dec2BCD
+
+        tax
+        dex
+        bmi     @L9
+        lda     #0
+        clc
+        sed
+@L1:    adc     #1
+        dex
+        bpl     @L1
+        cld
+@L9:    rts
+
+.endproc
diff --git a/libsrc/c65/status.s b/libsrc/c65/status.s
new file mode 100644
index 000000000..c6f279230
--- /dev/null
+++ b/libsrc/c65/status.s
@@ -0,0 +1,5 @@
+;
+; Oliver Schmidt, 2012-09-30
+;
+
+        .exportzp       ST := $90       ; IEC status byte
diff --git a/libsrc/c65/sysuname.s b/libsrc/c65/sysuname.s
new file mode 100644
index 000000000..b0a24a236
--- /dev/null
+++ b/libsrc/c65/sysuname.s
@@ -0,0 +1,37 @@
+;
+; Ullrich von Bassewitz, 2003-08-12
+;
+; unsigned char __fastcall__ _sysuname (struct utsname* buf);
+;
+
+        .export         __sysuname, utsdata
+
+        .import         utscopy
+
+        __sysuname = utscopy
+
+;--------------------------------------------------------------------------
+; Data. We define a fixed utsname struct here and just copy it.
+
+.rodata
+
+utsdata:
+        ; sysname
+        .asciiz         "cc65"
+
+        ; nodename
+        .asciiz         ""
+
+        ; release
+        .byte           .string (>.version)
+        .byte           '.'
+        .byte           .string (<.version)
+        .byte           $00
+
+        ; version
+        .byte           '0'     ; unused
+        .byte           $00
+
+        ; machine
+        .asciiz         "Commodore 65"
+
diff --git a/libsrc/c65/tmcommon.s b/libsrc/c65/tmcommon.s
new file mode 100644
index 000000000..52094b68e
--- /dev/null
+++ b/libsrc/c65/tmcommon.s
@@ -0,0 +1,64 @@
+;
+; Oliver Schmidt, 16.8.2018
+;
+; Common stuff for the clock routines
+;
+
+        .include        "c65.inc"
+        .include        "get_tv.inc"
+
+        .export         TM, load_tenth
+
+        .constructor    inittime
+        .importzp       sreg
+        .import         _get_tv
+
+
+;----------------------------------------------------------------------------
+.code
+
+.proc   load_tenth
+
+        lda     #<(100 * 1000 * 1000 / $10000)
+        ldx     #>(100 * 1000 * 1000 / $10000)
+        sta     sreg
+        stx     sreg+1
+        lda     #<(100 * 1000 * 1000)
+        ldx     #>(100 * 1000 * 1000)
+        rts
+
+.endproc
+
+;----------------------------------------------------------------------------
+; Constructor that writes to the 1/10 sec register of the TOD to kick it
+; into action. If this is not done, the clock hangs. We will read the register
+; and write it again, ignoring a possible change in between.
+.segment "ONCE"
+
+.proc   inittime
+
+        lda     CIA1_TOD10
+        sta     CIA1_TOD10
+        jsr     _get_tv
+        cmp     #TV::PAL
+        bne     @60Hz
+        lda     CIA1_CRA
+        ora     #$80
+        sta     CIA1_CRA
+@60Hz:  rts
+
+.endproc
+
+;----------------------------------------------------------------------------
+; TM struct with date set to 1970-01-01
+.data
+
+TM:     .word           0       ; tm_sec
+        .word           0       ; tm_min
+        .word           0       ; tm_hour
+        .word           1       ; tm_mday
+        .word           0       ; tm_mon
+        .word           70      ; tm_year
+        .word           0       ; tm_wday
+        .word           0       ; tm_yday
+        .word           0       ; tm_isdst
diff --git a/libsrc/cbm/cbm_read.s b/libsrc/cbm/cbm_read.s
index 8a9939eca..c449567b1 100644
--- a/libsrc/cbm/cbm_read.s
+++ b/libsrc/cbm/cbm_read.s
@@ -24,7 +24,7 @@
 ;         /* the kernal routine BASIN sets ST to EOF if the end of file
 ;         ** is reached the first time, then we have store tmp.
 ;         ** every subsequent call returns EOF and READ ERROR in ST, then
-;         ** we have to exit the loop here immediatly.
+;         ** we have to exit the loop here immediately.
 ;         */
 ;         if (cbm_k_readst() & 0xBF) break;
 ;
@@ -40,7 +40,7 @@
 
         .export         _cbm_read
         .importzp       ptr1, ptr2, ptr3, tmp1
-        .import         popax, popa
+        .import         popax, popa, returnFFFF
         .import         ___oserror
 
 
@@ -107,7 +107,4 @@ _cbm_read:
 ; CHKIN failed
 
 @E1:    sta     ___oserror
-        lda     #$FF
-        tax
-        rts                     ; return -1
-
+        jmp     returnFFFF
diff --git a/libsrc/cbm/cbm_write.s b/libsrc/cbm/cbm_write.s
index 18c6f4684..a4ecfbe3f 100644
--- a/libsrc/cbm/cbm_write.s
+++ b/libsrc/cbm/cbm_write.s
@@ -32,7 +32,7 @@
 
         .export         _cbm_write
         .importzp       ptr1, ptr2, ptr3
-        .import         popax, popa
+        .import         popax, popa, returnFFFF
         .import         ___oserror
 
 
@@ -88,7 +88,4 @@ _cbm_write:
 ; Error entry, error code is in A
 
 @E2:    sta     ___oserror
-        lda     #$FF
-        tax
-        rts                     ; return -1
-
+        jmp     returnFFFF
diff --git a/libsrc/cbm/clock.s b/libsrc/cbm/clock.s
index 90e4263a8..91fde6f58 100644
--- a/libsrc/cbm/clock.s
+++ b/libsrc/cbm/clock.s
@@ -9,14 +9,13 @@
         .importzp       sreg
 
         .include        "cbm.inc"
-        .macpack        cpu
 
 
 .proc   _clock
 
 ; Some accelerator adaptors have CMOS ICs.
 
-.if (.cpu & ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg + 1
 .else
         lda     #$00            ; Byte 3 always is zero
diff --git a/libsrc/cbm/dir.s b/libsrc/cbm/dir.s
index 734485aaf..a78fc94a5 100644
--- a/libsrc/cbm/dir.s
+++ b/libsrc/cbm/dir.s
@@ -44,10 +44,10 @@ __dirread:
 ; Replace dir by dir->fd
 
         ldy     #2
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1
         ldy     #DIR::fd+1
         lda     (ptr1),y
@@ -55,10 +55,10 @@ __dirread:
         dey
         lda     (ptr1),y
         ldy     #2
-        sta     (sp),y
+        sta     (c_sp),y
         pla
         iny
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Get count, save it again, clear the high byte and call read(). By the
 ; previous actions, the stack frame is as read() needs it, and read() will
diff --git a/libsrc/cbm/exec.c b/libsrc/cbm/exec.c
index b9c1bdc96..49ab53553 100644
--- a/libsrc/cbm/exec.c
+++ b/libsrc/cbm/exec.c
@@ -89,7 +89,7 @@ int __fastcall__ exec (const char* progname, const char* cmdline)
     }
     utoa (dv, basic.unit, 10);
 
-    /* Tape files can be openned only once; skip this test for the Datasette. */
+    /* Tape files can be opened only once; skip this test for the Datasette. */
     if (dv != 1) {
         /* Don't try to run a program that can't be found. */
         fd = open (progname, O_RDONLY);
diff --git a/libsrc/cbm/getdevice.s b/libsrc/cbm/getdevice.s
index 08ba6d5f8..b68e716b4 100644
--- a/libsrc/cbm/getdevice.s
+++ b/libsrc/cbm/getdevice.s
@@ -54,7 +54,7 @@ next:   inx
 
         lda     ST
 
-; Either the Kernal calls above were successfull or there was
+; Either the Kernal calls above were successful or there was
 ; already a cmdchannel to the device open - which is a pretty
 ; good indication of its existence ;-)
 
diff --git a/libsrc/cbm/loadaddr.s b/libsrc/cbm/loadaddr.s
index 0675dd67d..4329f201f 100644
--- a/libsrc/cbm/loadaddr.s
+++ b/libsrc/cbm/loadaddr.s
@@ -2,7 +2,7 @@
 ; Ullrich von Bassewitz, 2010-11-13
 ;
 ; This module supplies the load address that is expected by Commodore
-; machines in the first two bytes of an excutable disk file.
+; machines in the first two bytes of an executable disk file.
 ;
 
 
diff --git a/libsrc/cbm/open.s b/libsrc/cbm/open.s
index 47224925d..bf937ee0f 100644
--- a/libsrc/cbm/open.s
+++ b/libsrc/cbm/open.s
@@ -12,7 +12,7 @@
         .import         opencmdchannel, closecmdchannel, readdiskerror
         .import         fnunit, fnisfile
         .import         _close
-        .importzp       sp, tmp2, tmp3
+        .importzp       c_sp, tmp2, tmp3
 
         .include        "errno.inc"
         .include        "fcntl.inc"
diff --git a/libsrc/cbm/write.s b/libsrc/cbm/write.s
index 172e45382..43c7582f0 100644
--- a/libsrc/cbm/write.s
+++ b/libsrc/cbm/write.s
@@ -8,7 +8,7 @@
         .constructor    initstdout
 
         .import         rwcommon
-        .importzp       sp, ptr1, ptr2, ptr3
+        .importzp       c_sp, ptr1, ptr2, ptr3
 
         .include        "cbm.inc"
         .include        "errno.inc"
diff --git a/libsrc/cbm510/crt0.s b/libsrc/cbm510/crt0.s
index 86137b1ca..80d587ff5 100644
--- a/libsrc/cbm510/crt0.s
+++ b/libsrc/cbm510/crt0.s
@@ -117,7 +117,7 @@ entry:  php
         tya
         sec
         sbc     #7
-        sta     $1FF            ; Save new sp
+        sta     $1FF            ; Save new c_sp
         tay
 
         tsx
@@ -145,7 +145,7 @@ entry:  php
         iny
         sta     (sysp1),y
 
-        ldy     $1FF            ; Restore sp in bank 15
+        ldy     $1FF            ; Restore c_sp in bank 15
 
         lda     #.hibyte(expull-1)
         sta     (sysp1),y
@@ -245,7 +245,7 @@ L1:     lda     extzp,x
         dex
         bpl     L1
 
-; Save the old stack pointer from the system bank; and, set up our hw sp.
+; Save the old stack pointer from the system bank; and, set up our hw c_sp.
 
         tsx
         txa
@@ -279,9 +279,9 @@ L3:     lda     vectors,x
 ; Set up the C stack.
 
         lda     #.lobyte(callbank15::entry)
-        sta     sp
+        sta     c_sp
         lda     #.hibyte(callbank15::entry)
-        sta     sp+1
+        sta     c_sp+1
 
 ; Set up the subroutine and jump vector table that redirects Kernal calls to
 ; the system bank.
@@ -495,7 +495,7 @@ _exit:  pha                     ; Save the return code on stack
 ; Set up the welcome code at the stack bottom in the system bank.
 
         ldy     #$FF
-        lda     (sysp1),y       ; Load system bank sp
+        lda     (sysp1),y       ; Load system bank c_sp
         tax
         iny                     ; Y = 0
         lda     #$58            ; CLI opcode
diff --git a/libsrc/cbm510/joy/cbm510-std.s b/libsrc/cbm510/joy/cbm510-std.s
index f7cbb2cdc..640b0d2a8 100644
--- a/libsrc/cbm510/joy/cbm510-std.s
+++ b/libsrc/cbm510/joy/cbm510-std.s
@@ -117,7 +117,7 @@ READ:   ldx     #$0F            ; Switch to the system bank
         lsr     tmp1
         lsr     tmp1
 
-; Mask the relavant bits, get the push button bit
+; Mask the relevant bits, get the push button bit
 
 @L2:    asl     a               ; push button bit into carry
         lda     tmp1
diff --git a/libsrc/cbm510/mou/cbm510-inkwl.s b/libsrc/cbm510/mou/cbm510-inkwl.s
index ea6d95934..e5328cf75 100644
--- a/libsrc/cbm510/mou/cbm510-inkwl.s
+++ b/libsrc/cbm510/mou/cbm510-inkwl.s
@@ -256,10 +256,10 @@ MOVE:   sei                             ; No interrupts
         jsr     MoveY
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         jsr     MoveX                   ; Move the cursor
 
         cli                             ; Allow interrupts
diff --git a/libsrc/cbm510/mou/cbm510-joy.s b/libsrc/cbm510/mou/cbm510-joy.s
index 4daa49272..912842be7 100644
--- a/libsrc/cbm510/mou/cbm510-joy.s
+++ b/libsrc/cbm510/mou/cbm510-joy.s
@@ -225,11 +225,11 @@ MOVE:   sei                             ; No interrupts
         jsr     MoveY                   ; Set new y position
 
         ldy     #1
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         jsr     MoveX                   ; Move the pointer
 
         cli                             ; Allow interrupts
diff --git a/libsrc/cbm510/sysuname.s b/libsrc/cbm510/sysuname.s
index 24d4dc03b..579908d19 100644
--- a/libsrc/cbm510/sysuname.s
+++ b/libsrc/cbm510/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/cbm610/crt0.s b/libsrc/cbm610/crt0.s
index 0ad343d7f..dc56fa2de 100644
--- a/libsrc/cbm610/crt0.s
+++ b/libsrc/cbm610/crt0.s
@@ -115,7 +115,7 @@ entry:  php
         tya
         sec
         sbc     #7
-        sta     $1FF            ; Save new sp
+        sta     $1FF            ; Save new c_sp
         tay
 
         tsx
@@ -143,7 +143,7 @@ entry:  php
         iny
         sta     (sysp1),y
 
-        ldy     $1FF            ; Restore sp in bank 15
+        ldy     $1FF            ; Restore c_sp in bank 15
 
         lda     #.hibyte(expull-1)
         sta     (sysp1),y
@@ -243,7 +243,7 @@ L1:     lda     extzp,x
         dex
         bpl     L1
 
-; Save the old stack pointer from the system bank; and, set up our hw sp.
+; Save the old stack pointer from the system bank; and, set up our hw c_sp.
 
         tsx
         txa
@@ -277,9 +277,9 @@ L3:     lda     vectors,x
 ; Set up the C stack.
 
         lda     #.lobyte(callbank15::entry)
-        sta     sp
+        sta     c_sp
         lda     #.hibyte(callbank15::entry)
-        sta     sp+1
+        sta     c_sp+1
 
 ; Set up the subroutine and jump vector table that redirects Kernal calls to
 ; the system bank.
@@ -400,7 +400,7 @@ _exit:  pha                     ; Save the return code
 ; Set up the welcome code at the stack bottom in the system bank.
 
         ldy     #$FF
-        lda     (sysp1),y       ; Load system bank sp
+        lda     (sysp1),y       ; Load system bank c_sp
         tax
         iny                     ; Y = 0
         lda     #$58            ; CLI opcode
diff --git a/libsrc/cbm610/sysuname.s b/libsrc/cbm610/sysuname.s
index 984cb93df..dab807a4f 100644
--- a/libsrc/cbm610/sysuname.s
+++ b/libsrc/cbm610/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/common/_directerrno.s b/libsrc/common/_directerrno.s
index 20060bdd7..74e2f89cd 100644
--- a/libsrc/common/_directerrno.s
+++ b/libsrc/common/_directerrno.s
@@ -7,8 +7,6 @@
 
         .include        "errno.inc"
 
-        .macpack        cpu
-
 ; ----------------------------------------------------------------------------
 ; int __fastcall__ __directerrno (unsigned char code);
 ; /* Set errno to a specific error code, clear __oserror, and return -1. Used
@@ -18,7 +16,7 @@
 ___directerrno:
         jsr     ___seterrno             ; Set errno (returns with .A = 0)
         sta     ___oserror              ; Clear ___oserror
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_INA)
         dec     a
 .else
         lda     #$FF                    ; Return -1
diff --git a/libsrc/common/_fopen.s b/libsrc/common/_fopen.s
index 17a1ec19b..0c234097e 100644
--- a/libsrc/common/_fopen.s
+++ b/libsrc/common/_fopen.s
@@ -9,7 +9,7 @@
 
         .import         _open
         .import         pushax, incsp4, return0
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
 
         .include        "errno.inc"
@@ -28,10 +28,10 @@
 ; Get a pointer to the mode string
 
         ldy     #1
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1
 
 ; Look at the first character in mode
@@ -78,10 +78,10 @@ invmode:
 
 modeok: ldy     #$00
         txa                     ; Mode -> A
-        sta     (sp),y
+        sta     (c_sp),y
         tya
         iny
-        sta     (sp),y
+        sta     (c_sp),y
         ldy     #4              ; Size of arguments in bytes
         jsr     _open           ; Will cleanup the stack
 
diff --git a/libsrc/common/_heap.s b/libsrc/common/_heap.s
index eb680fa20..e5d71d1be 100644
--- a/libsrc/common/_heap.s
+++ b/libsrc/common/_heap.s
@@ -6,7 +6,7 @@
 
         .constructor    initheap, 24
         .import         __BSS_RUN__, __BSS_SIZE__, __STACKSIZE__
-        .importzp       sp
+        .importzp       c_sp
 
         .include        "_heap.inc"
 
@@ -31,10 +31,10 @@ ___heaplast:
 
 initheap:
         sec
-        lda     sp
+        lda     c_sp
         sbc     #<__STACKSIZE__
         sta     ___heapend
-        lda     sp+1
+        lda     c_sp+1
         sbc     #>__STACKSIZE__
         sta     ___heapend+1
         rts
diff --git a/libsrc/common/_heapblocksize.s b/libsrc/common/_heapblocksize.s
index e9b0cdad9..774056032 100644
--- a/libsrc/common/_heapblocksize.s
+++ b/libsrc/common/_heapblocksize.s
@@ -12,7 +12,6 @@
         .include        "_heap.inc"
 
         .macpack        generic
-        .macpack        cpu
 
 ;-----------------------------------------------------------------------------
 ; Code
@@ -39,7 +38,7 @@ ___heapblocksize:
         ldy     #usedblock::size+1
         lda     (ptr2),y
         tax
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         lda     (ptr2)
 .else
         dey
diff --git a/libsrc/common/_idiv32by16r16.s b/libsrc/common/_idiv32by16r16.s
index 7df78f4dd..9534f751f 100644
--- a/libsrc/common/_idiv32by16r16.s
+++ b/libsrc/common/_idiv32by16r16.s
@@ -20,17 +20,17 @@
 ; Copy from stack to zeropage. This assumes ptr1 and ptr2 are adjacent.
 
         ldy     #3
-@L1:    lda     (sp),y
+@L1:    lda     (c_sp),y
         sta     ptr1,y
         dey
         bpl     @L1
 
         lda     #4
         clc
-        adc     sp
-        sta     sp
+        adc     c_sp
+        sta     c_sp
         bcc     @L2
-        inc     sp+1
+        inc     c_sp+1
 
 @L2:    pla                     ; Old rhs
         jmp     idiv32by16r16
diff --git a/libsrc/common/_mappederrno.s b/libsrc/common/_mappederrno.s
index 83565b723..4ea3174b6 100644
--- a/libsrc/common/_mappederrno.s
+++ b/libsrc/common/_mappederrno.s
@@ -8,7 +8,6 @@
         .include        "errno.inc"
 
         .macpack        generic
-        .macpack        cpu
 
 ; ----------------------------------------------------------------------------
 ; int __fastcall__ __mappederrno (unsigned char code);
@@ -24,7 +23,7 @@ ___mappederrno:
         bze     ok                      ; Branch if no
         jsr     ___osmaperrno           ; Map OS error into errno code
         jsr     ___seterrno             ; Save in errno (returns with .A = 0)
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_INA)
         dec     a
 .else
         lda     #$FF                    ; Return -1 if error
diff --git a/libsrc/common/_printf.s b/libsrc/common/_printf.s
index a0074583e..335485cc6 100644
--- a/libsrc/common/_printf.s
+++ b/libsrc/common/_printf.s
@@ -37,7 +37,11 @@ FCount          = ptr2
 
 GetFormatChar:
         ldy     #0
+        .if .cap(CPU_HAS_ZPIND)
+        lda     (Format)
+        .else
         lda     (Format),y
+        .endif
 IncFormatPtr:
         inc     Format
         bne     @L1
@@ -110,7 +114,11 @@ GetIntArg:
         lda     (ArgList),y
         tax
         dey
+        .if .cap(CPU_HAS_ZPIND)
+        lda     (ArgList)
+        .else
         lda     (ArgList),y
+        .endif
         rts
 
 ; ----------------------------------------------------------------------------
@@ -135,9 +143,9 @@ ReadInt:
         pha                             ; Save digit value
         lda     ptr1
         ldx     ptr1+1
-        asl     ptr1
+        asl     a
         rol     ptr1+1                  ; * 2
-        asl     ptr1
+        asl     a
         rol     ptr1+1                  ; * 4, assume carry clear
         adc     ptr1
         sta     ptr1
@@ -265,10 +273,16 @@ Save:   lda     regbank,y
 ; Initialize the output counter in the output descriptor to zero
 
         lda     #0
+        .if .cap(CPU_HAS_ZPIND)
+        sta     (OutData)
+        ldy     #$01
+        sta     (OutData),y
+        .else
         tay
         sta     (OutData),y
         iny
         sta     (OutData),y
+        .endif
 
 ; Get the output function from the output descriptor and remember it
 
@@ -323,22 +337,26 @@ MainLoop:
         jsr     decsp6                  ; 3 args
         ldy     #5
         lda     OutData+1
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     OutData
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FSave+1
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FSave
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FCount+1
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FCount
-        sta     (sp),y
+        .if .cap(CPU_HAS_ZPIND)
+        sta     (c_sp)
+        .else
+        sta     (c_sp),y
+        .endif
         jsr     CallOutFunc             ; Call the output function
 
 ; We're back from out(), or we didn't call it. Check for end of string.
@@ -551,10 +569,16 @@ CheckCount:
         jsr     GetIntArg
         sta     ptr1
         stx     ptr1+1                  ; Get user supplied pointer
+        .if .cap(CPU_HAS_ZPIND)
+        lda     (OutData)             ; Low byte of OutData->ccount
+        sta     (ptr1)
+        ldy     #1
+        .else
         ldy     #0
         lda     (OutData),y             ; Low byte of OutData->ccount
         sta     (ptr1),y
         iny
+        .endif
         lda     (OutData),y             ; High byte of OutData->ccount
         sta     (ptr1),y
         jmp     MainLoop                ; Done
diff --git a/libsrc/common/_time_t_to_tm.s b/libsrc/common/_time_t_to_tm.s
new file mode 100644
index 000000000..21e662384
--- /dev/null
+++ b/libsrc/common/_time_t_to_tm.s
@@ -0,0 +1,127 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; struct tm* __fastcall__ _time_t_to_tm (const time_t t)
+;
+; Helper to gmtime and localtime. Breaks down a number of
+; seconds since Jan 1, 1970 into days, hours and seconds,
+; so that each of them fits in 16 bits; passes the
+; result to _mktime which fixes all values in the struct,
+; and returns a pointer to the struct to callers.
+;
+
+        .export         __time_t_to_tm
+        .import         udiv32, _mktime
+        .importzp       sreg, tmp3, ptr1, ptr2, ptr3, ptr4
+
+        .include        "time.inc"
+
+__time_t_to_tm:
+        ; Divide number of seconds since epoch, in ptr1:sreg,
+        ; by 86400 to get the number of days since epoch, and
+        ; the number of seconds today in the remainder.
+
+        ; Load t as dividend (sreg is already set by the caller)
+        sta     ptr1
+        stx     ptr1+1
+
+        ; Load 86400 as divisor
+        lda     #$80
+        sta     ptr3
+        lda     #$51
+        sta     ptr3+1
+        lda     #$01
+        sta     ptr4
+        lda     #$00
+        sta     ptr4+1
+
+        ; Clear TM buf while we have zero in A
+        ldx     #.sizeof(tm)-1
+:       sta     TM,x
+        dex
+        bpl     :-
+
+        ; Divide t/86400
+        jsr     udiv32
+
+        ; Store the quotient (the number of full days), and increment
+        ; by one as epoch starts at day 1.
+        clc
+        lda     ptr1
+        adc     #1
+        sta     TM + tm::tm_mday
+        lda     ptr1+1
+        adc     #0
+        sta     TM + tm::tm_mday+1
+
+        ; Now divide the number of remaining seconds by 3600,
+        ; to get the number of hours, and the seconds in the
+        ; current hour, in neat 16-bit integers.
+
+        ; Load the previous division's remainder (in ptr2:tmp3:tmp4)
+        ; as dividend
+        lda     ptr2
+        sta     ptr1
+        lda     ptr2+1
+        sta     ptr1+1
+        lda     tmp3
+        sta     sreg
+        ; We ignore the high byte stored in tmp4 because it will be
+        ; zero. We'll zero sreg+1 right below, when we'll have
+        ; a convenient zero already in A.
+
+        ; Load divisor
+        lda     #<3600
+        sta     ptr3
+        lda     #>3600
+        sta     ptr3+1
+
+        ; Zero the two high bytes of the divisor and the high byte
+        ; of the dividend.
+        .if .cap(CPU_HAS_STZ)
+        stz     ptr4
+        stz     ptr4+1
+        stz     sreg+1
+        .else
+        lda     #$00
+        sta     ptr4
+        sta     ptr4+1
+        sta     sreg+1
+        .endif
+
+        ; Do the division
+        jsr     udiv32
+
+        ; Store year
+        lda     #70
+        sta     TM + tm::tm_year
+
+        ; Store hours (the quotient of the last division)
+        lda     ptr1
+        sta     TM + tm::tm_hour
+        lda     ptr1+1
+        sta     TM + tm::tm_hour+1
+
+        ; Store seconds (the remainder of the last division)
+        lda     ptr2
+        sta     TM + tm::tm_sec
+        lda     ptr2+1
+        sta     TM + tm::tm_sec+1
+
+        ; The rest of the struct tm fields are zero. mktime
+        ; will take care of shifting extra seconds to minutes,
+        ; and extra days to months and years.
+
+        ; Call mktime
+        lda     #<TM
+        ldx     #>TM
+        jsr     _mktime
+
+        ; And return our pointer
+        lda     #<TM
+        ldx     #>TM
+        rts
+
+        .bss
+
+TM: .tag tm
diff --git a/libsrc/common/_udiv32by16r16.s b/libsrc/common/_udiv32by16r16.s
index a1d5f4e66..987390c04 100644
--- a/libsrc/common/_udiv32by16r16.s
+++ b/libsrc/common/_udiv32by16r16.s
@@ -21,17 +21,17 @@
 ; Copy from stack to zeropage. This assumes ptr1 and ptr2 are adjacent.
 
         ldy     #3
-@L1:    lda     (sp),y
+@L1:    lda     (c_sp),y
         sta     ptr1,y
         dey
         bpl     @L1
 
         lda     #4
         clc
-        adc     sp
-        sta     sp
+        adc     c_sp
+        sta     c_sp
         bcc     @L2
-        inc     sp+1
+        inc     c_sp+1
 
 @L2:    jmp     udiv32by16r16m
 
diff --git a/libsrc/common/asctime.s b/libsrc/common/asctime.s
new file mode 100644
index 000000000..b56371594
--- /dev/null
+++ b/libsrc/common/asctime.s
@@ -0,0 +1,79 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; char* __fastcall__ asctime (const struct tm* timep)
+;
+
+        .export         _asctime
+        .import         _strftime, pushax
+        .importzp       ptr1
+        .include        "time.inc"
+
+; ------------------------------------------------------------------------
+; Special values
+
+; We need to be able to store up to 38 bytes:
+;     1234567890123456789012345678901234567
+;    "Wednesday September ..1 00:00:00 1970"
+MAX_BUF_LEN = 38
+
+; ------------------------------------------------------------------------
+; Code
+
+_asctime:
+        ; Backup timep
+        .if .cap(CPU_HAS_PUSHXY)
+        pha
+        phx
+        .else
+        sta     ptr1
+        stx     ptr1+1
+        .endif
+
+        ; Push buf
+        lda     #<buf
+        ldx     #>buf
+        jsr     pushax
+
+        ; Push sizeof(buf)
+        lda     #<MAX_BUF_LEN
+        ldx     #>MAX_BUF_LEN
+        jsr     pushax
+
+        ; Push format string
+        lda     #<fmt
+        ldx     #>fmt
+        jsr     pushax
+
+        ; Restore timep
+        .if .cap(CPU_HAS_PUSHXY)
+        plx
+        pla
+        .else
+        lda     ptr1
+        ldx     ptr1+1
+        .endif
+
+        ; Call formatter
+        jsr     _strftime
+
+        ; Check return status
+        bne     :+
+        cpx     #$00
+        bne     :+
+        rts
+
+:       lda     #<buf
+        ldx     #>buf
+        rts
+
+        .data
+
+fmt:    .byte '%'
+        .byte 'c'
+        .byte $0A
+        .byte $00
+
+        .bss
+
+buf:    .res MAX_BUF_LEN
diff --git a/libsrc/common/atexit.s b/libsrc/common/atexit.s
index 47a1dfd4d..ccbc2e69f 100644
--- a/libsrc/common/atexit.s
+++ b/libsrc/common/atexit.s
@@ -10,8 +10,6 @@
 
         .include        "errno.inc"
 
-        .macpack        cpu
-
 ; ---------------------------------------------------------------------------
 
 .proc   _atexit
@@ -41,7 +39,7 @@
         jsr     ___seterrno
         ldx     #$FF            ; Return -1
         txa
-        rts
+Exit:   rts
 
 .endproc
 
@@ -54,7 +52,7 @@
 .proc   doatexit
 
         ldy     exitfunc_index          ; Get index
-        beq     @L9                     ; Jump if done
+        beq     _atexit::Exit           ; Jump if done
         dey
         lda     exitfunc_table,y
         tax
@@ -62,14 +60,12 @@
         lda     exitfunc_table,y
         sty     exitfunc_index
         jsr     callax                  ; Call the function
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_BRA8)
         bra     doatexit
 .else
         jmp     doatexit                ; Next one
 .endif
 
-@L9:    rts
-
 .endproc
 
 
diff --git a/libsrc/common/checkferror.s b/libsrc/common/checkferror.s
new file mode 100644
index 000000000..736fa3ccd
--- /dev/null
+++ b/libsrc/common/checkferror.s
@@ -0,0 +1,24 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; Helper to check for file opened, not eof, not ferror
+; Expects file pointer in ptr1,
+; Returns with Z flag set if everything is OK,
+; Destroys A, X, Y,
+; Sets file flags in A
+;
+
+        .export         checkferror
+        .importzp       ptr1
+
+        .include        "_file.inc"
+
+checkferror:
+        ldy     #_FILE::f_flags
+        lda     (ptr1),y
+        tax
+        and     #(_FOPEN|_FERROR|_FEOF); Check for file open, error/eof
+        tay
+        txa
+        cpy     #_FOPEN
+        rts
diff --git a/libsrc/common/ctype.s b/libsrc/common/ctype.s
index 220ad79c1..d51b1bf2b 100644
--- a/libsrc/common/ctype.s
+++ b/libsrc/common/ctype.s
@@ -7,7 +7,7 @@
 ;
 ; See "LICENSE" file for legal information.
 ;
-; Character specification table, matching serveral consoles.
+; Character specification table, matching several consoles.
 ;
 
         .include        "ctypetable.inc"
diff --git a/libsrc/common/divt.s b/libsrc/common/divt.s
index 7f2b4e1bb..52b6efd04 100644
--- a/libsrc/common/divt.s
+++ b/libsrc/common/divt.s
@@ -3,7 +3,7 @@
 ; 2002-10-22, Greg King
 ;
 ; This signed-division function returns both the quotient and the remainder,
-; in this structure:
+; in this structure: (quotient in sreg, remainder in AX)
 ;
 ; typedef struct {
 ;     int rem, quot;
diff --git a/libsrc/common/fclose.s b/libsrc/common/fclose.s
index 2368bf9f6..f6c57841e 100644
--- a/libsrc/common/fclose.s
+++ b/libsrc/common/fclose.s
@@ -7,7 +7,7 @@
 
         .export         _fclose
 
-        .import         _close
+        .import         _close, ___directerrno
         .importzp       ptr1
 
         .include        "errno.inc"
@@ -31,10 +31,7 @@
 ; File is not open
 
         lda     #EINVAL
-        jsr     ___seterrno
-        lda     #$FF            ; Return -1
-        tax
-        rts
+        jmp     ___directerrno
 
 ; File is open. Reset the flags and close the file.
 
@@ -47,4 +44,3 @@
         jmp     _close          ; Will set errno and return an error flag
 
 .endproc
-
diff --git a/libsrc/common/fgetc.c b/libsrc/common/fgetc.c
deleted file mode 100644
index b4ba18d73..000000000
--- a/libsrc/common/fgetc.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-** fgetc.c
-**
-** (C) Copyright 1998, 2002 Ullrich von Bassewitz (uz@cc65.org)
-**
-*/
-
-
-
-#include <stdio.h>
-#include <unistd.h>
-#include "_file.h"
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-int __fastcall__ fgetc (register FILE* f)
-{
-    unsigned char c;
-
-    /* Check if the file is open or if there is an error condition */
-    if ((f->f_flags & _FOPEN) == 0 || (f->f_flags & (_FERROR | _FEOF)) != 0) {
-        return EOF;
-    }
-
-    /* If we have a pushed back character, return it */
-    if (f->f_flags & _FPUSHBACK) {
-        f->f_flags &= ~_FPUSHBACK;
-        return f->f_pushback;
-    }
-
-    /* Read one byte */
-    switch (read (f->f_fd, &c, 1)) {
-
-        case -1:
-            /* Error */
-            f->f_flags |= _FERROR;
-            return EOF;
-
-        case 0:
-            /* EOF */
-            f->f_flags |= _FEOF;
-            return EOF;
-
-        default:
-            /* Char read */
-            return c;
-
-    }
-}
-
-
-
diff --git a/libsrc/common/fgetc.s b/libsrc/common/fgetc.s
new file mode 100644
index 000000000..6d08f69a3
--- /dev/null
+++ b/libsrc/common/fgetc.s
@@ -0,0 +1,92 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; int __fastcall__ fgetc (register FILE* f)
+;
+
+        .export         _fgetc
+        .import         _read, checkferror
+        .import         pusha0, pushax, popptr1, incsp2, returnFFFF
+        .importzp       ptr1
+
+        .include        "stdio.inc"
+        .include        "_file.inc"
+
+_fgetc:
+        sta     ptr1
+        stx     ptr1+1
+        jsr     pushax          ; Backup our ptr
+
+        jsr     checkferror
+        bne     ret_eof
+
+        .if .cap(CPU_HAS_BITIMM)
+        bit     #_FPUSHBACK     ; Check for pushed back char
+        beq     do_read
+        .else
+        tax
+        and     #_FPUSHBACK     ; Check for pushed back char
+        beq     do_read
+        txa
+        .endif
+
+        and     #<(~_FPUSHBACK) ; Reset flag
+        sta     (ptr1),y
+
+        .assert _FILE::f_pushback = _FILE::f_flags+1, error
+        iny
+        jsr     incsp2          ; Drop our ptr copy
+        lda     (ptr1),y        ; Return pushed back char
+        ldx     #$00
+        rts
+
+do_read:
+        ; Push _read parameters
+        ldy     #_FILE::f_fd
+        lda     (ptr1),y
+        jsr     pusha0
+
+        lda     #<c
+        ldx     #>c
+        jsr     pushax
+
+        lda     #$01
+        ldx     #$00
+
+        ; Read
+        jsr     _read
+
+        ; Check for errors
+        cmp     #$00
+        beq     set_feof
+
+        cmp     #<(-1)
+        beq     set_ferror
+
+        jsr     incsp2
+        ; Return char
+        ldx     #$00
+        lda     c
+        rts
+
+ret_eof:
+        jsr     incsp2
+        jmp     returnFFFF
+
+set_ferror:
+        lda     #_FERROR
+        bne     set_err
+set_feof:
+        lda     #_FEOF
+set_err:
+        pha
+        jsr     popptr1
+        pla
+        ldy     #_FILE::f_flags
+        ora     (ptr1),y
+        sta     (ptr1),y
+        jmp     returnFFFF
+
+        .bss
+
+c:      .res 1
diff --git a/libsrc/common/fgets.c b/libsrc/common/fgets.c
deleted file mode 100644
index 21a991fd6..000000000
--- a/libsrc/common/fgets.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-** Ullrich von Bassewitz, 11.08.1998
-**
-** char* fgets (char* s, int size, FILE* f);
-*/
-
-
-
-#include <stdio.h>
-#include <errno.h>
-#include "_file.h"
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-char* __fastcall__ fgets (char* s, unsigned size, register FILE* f)
-{
-    register char* p = s;
-    unsigned i;
-    int c;
-
-    if (size == 0) {
-        /* Invalid size */
-        return (char*) _seterrno (EINVAL);
-    }
-
-    /* Read input */
-    i = 0;
-    while (--size) {
-
-        /* Get next character */
-        if ((c = fgetc (f)) == EOF) {
-            /* Error or EOF */
-            if ((f->f_flags & _FERROR) != 0 || i == 0) {
-                /* ERROR or EOF on first char */
-                *p = '\0';
-                return 0;
-            } else {
-                /* EOF with data already read */
-                break;
-            }
-        }
-
-        /* One char more */
-        *p = c;
-        ++p;
-        ++i;
-
-        /* Stop at end of line */
-        if ((char)c == '\n') {
-            break;
-        }
-    }
-
-    /* Terminate the string */
-    *p = '\0';
-
-    /* Done */
-    return s;
-}
-
-
-
diff --git a/libsrc/common/fgets.s b/libsrc/common/fgets.s
new file mode 100644
index 000000000..fde3a78a9
--- /dev/null
+++ b/libsrc/common/fgets.s
@@ -0,0 +1,117 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; char* __fastcall__ fgets (char* s, unsigned size, register FILE* f)
+;
+
+        .export         _fgets
+        .import         _fgetc, popptr1, pushptr1, popax, pushax, return0, ___errno
+        .importzp       ptr1, ptr4
+
+        .feature        string_escapes
+
+        .include        "errno.inc"
+        .include        "stdio.inc"
+        .include        "_file.inc"
+
+terminate_ptr:
+        lda     #$00
+        tax
+        .if .cap(CPU_HAS_ZPIND)
+        sta     (ptr4)
+        .else
+        tay
+        sta     (ptr4),y
+        .endif
+        rts
+
+_fgets:
+        sta     ptr1
+        stx     ptr1+1
+
+        jsr     popax
+        sta     size
+        stx     size+1
+
+        jsr     popax
+        sta     ptr4
+        stx     ptr4+1
+        sta     buf
+        stx     buf+1
+
+        .if .cap(CPU_HAS_STZ)
+        stz     didread
+        .else
+        lda     #$00            ; We have read nothing yet
+        sta     didread
+        .endif
+
+        ; Check size
+        lda     size
+        ora     size+1
+        bne     read_loop
+        lda     #EINVAL
+        sta     ___errno
+        jmp     return0
+
+read_loop:
+        lda     size            ; Dec size
+        bne     :+
+        dec     size+1
+:       dec     size
+
+        bne     :+              ; Check bound
+        ldx     size+1
+        beq     done
+
+:       jsr     pushptr1        ; Push ptr1 for backup and load it to AX for fgetc
+        jsr     _fgetc          ; Read a char
+
+        pha
+        jsr     popptr1         ; Get ptr1 back
+        pla
+
+        cpx     #<EOF
+        beq     got_eof
+
+        ldy     #$01
+        sty     didread         ; We read at least one char
+
+        .if .cap(CPU_HAS_ZPIND)
+        sta     (ptr4)
+        .else
+        dey
+        sta     (ptr4),y
+        .endif
+
+        inc     ptr4
+        bne     :+
+        inc     ptr4+1
+
+:       cmp     #'\n'    ; #'\n' should get translated properly
+        beq     done
+        bne     read_loop
+
+got_eof:
+        lda     didread
+        beq     stopped_at_first_char
+        ldy     #_FILE::f_flags
+        lda     (ptr1),y
+        and     #_FERROR
+        bne     stopped_at_first_char
+
+done:
+        jsr     terminate_ptr
+        ldx     #>buf
+        lda     #<buf
+        rts
+
+stopped_at_first_char:
+        jmp     terminate_ptr
+
+        .bss
+
+c:      .res 1
+buf:    .res 2
+size:   .res 2
+didread:.res 1
diff --git a/libsrc/common/fmisc.s b/libsrc/common/fmisc.s
index 90b48e8a6..d189db8a8 100644
--- a/libsrc/common/fmisc.s
+++ b/libsrc/common/fmisc.s
@@ -5,7 +5,7 @@
 ;
 
         .export         _clearerr, _feof, _ferror, _fileno, _fflush
-        .import         return0
+        .import         return0, ___directerrno
         .importzp       ptr1
 
         .include        "_file.inc"
@@ -78,10 +78,7 @@ err:    rts
 ; If the file is not valid, fileno must set errno and return -1
 
 error:  lda     #<EBADF
-        jsr     ___seterrno
-        lda     #$FF
-        tax
-        rts
+        jmp     ___directerrno
 .endproc
 
 ;
@@ -89,5 +86,3 @@ error:  lda     #<EBADF
 ;
 
 _fflush = return0
-
-
diff --git a/libsrc/common/fprintf.s b/libsrc/common/fprintf.s
index 1582e6521..af9a58ebc 100644
--- a/libsrc/common/fprintf.s
+++ b/libsrc/common/fprintf.s
@@ -6,7 +6,7 @@
 
         .export         _fprintf
         .import         addysp, decsp4, _vfprintf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -38,9 +38,9 @@ _fprintf:
 ; Calculate a pointer to the Format argument
 
         lda     ParamSize
-        add     sp
+        add     c_sp
         sta     ptr1
-        ldx     sp+1
+        ldx     c_sp+1
         bcc     @L1
         inx
 @L1:    stx     ptr1+1
@@ -49,7 +49,7 @@ _fprintf:
 
         ldy     #4-1
 @L2:    lda     (ptr1),y
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         bpl     @L2
 
diff --git a/libsrc/common/fputc.c b/libsrc/common/fputc.c
deleted file mode 100644
index b623949d3..000000000
--- a/libsrc/common/fputc.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-** fputc.c
-**
-** Ullrich von Bassewitz, 02.06.1998
-*/
-
-
-
-#include <stdio.h>
-#include <unistd.h>
-#include "_file.h"
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-int __fastcall__ fputc (int c, register FILE* f)
-{
-    /* Check if the file is open or if there is an error condition */
-    if ((f->f_flags & _FOPEN) == 0 || (f->f_flags & (_FERROR | _FEOF)) != 0) {
-        goto ReturnEOF;
-    }
-
-    /* Write the byte */
-    if (write (f->f_fd, &c, 1) != 1) {
-        /* Error */
-        f->f_flags |= _FERROR;
-ReturnEOF:
-        return EOF;
-    }
-
-    /* Return the byte written */
-    return c & 0xFF;
-}
-
-
-
diff --git a/libsrc/common/fputc.s b/libsrc/common/fputc.s
new file mode 100644
index 000000000..358723538
--- /dev/null
+++ b/libsrc/common/fputc.s
@@ -0,0 +1,66 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; int __fastcall__ fputc (int c, FILE* f);
+;
+
+        .export         _fputc
+        .importzp       ptr1
+        .import         _write, checkferror
+        .import         pushax, pusha0, popax, incsp2
+        .import         pushptr1, popptr1, returnFFFF
+
+        .include        "stdio.inc"
+        .include        "_file.inc"
+
+_fputc:
+        sta     ptr1
+        stx     ptr1+1
+
+        jsr     popax           ; Get char, as we'll have
+        sta     c               ; to return it anyway
+        stx     c+1
+
+        jsr     checkferror
+        bne     ret_eof
+
+        jsr     pushptr1        ; Backup fp pointer
+
+        ; Push _write parameters
+        ldy     #_FILE::f_fd
+        lda     (ptr1),y
+        jsr     pusha0
+
+        lda     #<c
+        ldx     #>c
+        jsr     pushax
+
+        lda     #$01
+        ldx     #$00
+
+        ; Write
+        jsr     _write
+
+        ; Check for errors
+        cmp     #$01
+        bne     set_ferror
+
+        ; Return char
+        lda     c
+        ldx     #$00
+        jmp     incsp2          ; Drop fp pointer copy
+
+ret_eof:
+        jmp     returnFFFF
+
+set_ferror:
+        jsr     popptr1
+        lda     #_FERROR
+        ldy     #_FILE::f_flags
+        ora     (ptr1),y
+        sta     (ptr1),y
+        jmp     returnFFFF
+
+        .bss
+
+c:      .res 2
diff --git a/libsrc/common/fputs.c b/libsrc/common/fputs.c
deleted file mode 100644
index be476a3f0..000000000
--- a/libsrc/common/fputs.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-** int fputs (const char* s, FILE* f);
-**
-** Ullrich von Bassewitz, 11.08.1998
-*/
-
-
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "_file.h"
-
-
-
-int __fastcall__ fputs (const char* s, register FILE* f)
-{
-    /* Check if the file is open or if there is an error condition */
-    if ((f->f_flags & _FOPEN) == 0 || (f->f_flags & (_FERROR | _FEOF)) != 0) {
-        return EOF;
-    }
-
-    /* Write the string */
-    return write (f->f_fd, s, strlen (s));
-}
-
-
-
diff --git a/libsrc/common/fputs.s b/libsrc/common/fputs.s
new file mode 100644
index 000000000..b79a4707f
--- /dev/null
+++ b/libsrc/common/fputs.s
@@ -0,0 +1,36 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; int __fastcall__ fputs (const char* s, register FILE* f)
+;
+
+        .export         _fputs
+        .importzp       ptr1, ptr2
+        .import         _write, _strlen, checkferror
+        .import         swapstk, pushax, returnFFFF
+
+        .include        "stdio.inc"
+        .include        "_file.inc"
+
+_fputs:
+        sta     ptr1
+        stx     ptr1+1
+
+        jsr     checkferror
+        bne     ret_eof
+
+        ; Push _write parameters
+        ldy     #_FILE::f_fd
+        lda     (ptr1),y
+        ldx     #$00
+        jsr     swapstk         ; Push fd, get s
+
+        jsr     pushax          ; Push s
+
+        jsr     _strlen         ; Get length
+
+        ; Write
+        jmp     _write
+
+ret_eof:
+        jmp     returnFFFF
diff --git a/libsrc/common/fread.s b/libsrc/common/fread.s
index 647a7f2c8..beb9e707e 100644
--- a/libsrc/common/fread.s
+++ b/libsrc/common/fread.s
@@ -14,7 +14,7 @@
         .import         pushwysp
         .import         tosumulax, tosudivax
 
-        .importzp       ptr1, sp
+        .importzp       ptr1, c_sp
 
         .include        "errno.inc"
         .include        "_file.inc"
@@ -47,13 +47,21 @@
 
         ldy     #_FILE::f_flags
         lda     (file),y
+        .if .cap(CPU_HAS_BITIMM)
+        bit     #_FOPEN                 ; Is the file open?
+        .else
         and     #_FOPEN                 ; Is the file open?
+        .endif
         beq     @L1                     ; Branch if no
 
 ; Check if the stream is in an error state
 
+        .if .cap(CPU_HAS_BITIMM)
+        bit     #_FERROR
+        .else
         lda     (file),y                ; get file->f_flags again
         and     #_FERROR
+        .endif
         beq     @L2
 
 ; File not open or in error state
@@ -65,11 +73,17 @@
 
 ; Remember if we have a pushed back character and reset the flag.
 
-@L2:    tax                             ; X = 0
+@L2:    .if .cap(CPU_HAS_BITIMM)
+        ldx     #$00
+        bit     #_FPUSHBACK
+        beq     @L3
+        .else
+        tax                             ; X = 0
         lda     (file),y
         and     #_FPUSHBACK
         beq     @L3
         lda     (file),y
+        .endif
         and     #<~_FPUSHBACK
         sta     (file),y                ; file->f_flags &= ~_FPUSHBACK;
         inx                             ; X = 1
@@ -118,24 +132,36 @@
 ; Copy the buffer pointer into ptr1, and increment the pointer value passed
 ; to read() by one, so read() starts to store data at buf+1.
 
-        ldy     #0
-        lda     (sp),y
+        .if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
         sta     ptr1
         add     #1
-        sta     (sp),y
+        sta     (c_sp)
+        ldy     #1
+        .else
+        ldy     #0
+        lda     (c_sp),y
+        sta     ptr1
+        add     #1
+        sta     (c_sp),y
         iny
-        lda     (sp),y
+        .endif
+        lda     (c_sp),y
         sta     ptr1+1
         adc     #0
-        sta     (sp),y                  ; ptr1 = buf++;
+        sta     (c_sp),y                ; ptr1 = buf++;
 
 ; Get the buffered character and place it as first character into the read
 ; buffer.
 
         ldy     #_FILE::f_pushback
         lda     (file),y
+        .if .cap(CPU_HAS_ZPIND)
+        sta     (ptr1)                  ; *buf = file->f_pushback;
+        .else
         ldy     #0
         sta     (ptr1),y                ; *buf = file->f_pushback;
+        .endif
 
 ; Restore the low byte of count and decrement count by one. This may result
 ; in count being zero, so check for that.
@@ -210,4 +236,3 @@
 .bss
 save:   .res    2
 pb:     .res    1
-
diff --git a/libsrc/common/fscanf.s b/libsrc/common/fscanf.s
index a3d1ec0a1..c687a0624 100644
--- a/libsrc/common/fscanf.s
+++ b/libsrc/common/fscanf.s
@@ -6,7 +6,7 @@
 
         .export         _fscanf
         .import         addysp, decsp4, _vfscanf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -50,9 +50,9 @@ _fscanf:
 ; Calculate a pointer to the Format argument
 
         lda     ParamSize
-        add     sp
+        add     c_sp
         sta     ptr1
-        ldx     sp+1
+        ldx     c_sp+1
         bcc     @L1
         inx
 @L1:    stx     ptr1+1
@@ -61,7 +61,7 @@ _fscanf:
 
         ldy     #4-1
 @L2:    lda     (ptr1),y
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         bpl     @L2
 
diff --git a/libsrc/common/fwrite.s b/libsrc/common/fwrite.s
index 861feb120..6f631b816 100644
--- a/libsrc/common/fwrite.s
+++ b/libsrc/common/fwrite.s
@@ -8,7 +8,7 @@
         .export         _fwrite
 
         .import         _write
-        .import         pushax, incsp6, addysp, ldaxysp, pushwysp, return0
+        .import         pushax, pusha0, incsp6, addysp, ldaxysp, pushwysp, return0
         .import         tosumulax, tosudivax
 
         .importzp       ptr1
@@ -16,7 +16,6 @@
         .include        "errno.inc"
         .include        "_file.inc"
 
-
 ; ------------------------------------------------------------------------
 ; Code
 
@@ -33,7 +32,11 @@
 
         ldy     #_FILE::f_flags
         lda     (ptr1),y
+        .if .cap(CPU_HAS_BITIMM)
+        bit     #_FOPEN
+        .else
         and     #_FOPEN                 ; Is the file open?
+        .endif
         bne     @L2                     ; Branch if yes
 
 ; File not open
@@ -45,7 +48,9 @@
 
 ; Check if the stream is in an error state
 
-@L2:    lda     (ptr1),y                ; get file->f_flags again
+@L2:    .if .not .cap(CPU_HAS_BITIMM)
+        lda     (ptr1),y                ; get file->f_flags again
+        .endif
         and     #_FERROR
         bne     @L1
 
@@ -53,8 +58,7 @@
 
         ldy     #_FILE::f_fd
         lda     (ptr1),y
-        ldx     #$00
-        jsr     pushax                  ; file->f_fd
+        jsr     pusha0                  ; file->f_fd
 
         ldy     #9
         jsr     pushwysp                ; buf
@@ -123,4 +127,3 @@
 
 .bss
 file:   .res    2
-
diff --git a/libsrc/common/gets.c b/libsrc/common/gets.c
deleted file mode 100644
index 2936c70de..000000000
--- a/libsrc/common/gets.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-** gets.c
-**
-** Ullrich von Bassewitz, 11.08.1998
-*/
-
-
-
-#include <stdio.h>
-#include "_file.h"
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-char* __fastcall__ gets (char* s)
-{
-    register char* p = s;
-    int c;
-    unsigned i = 0;
-
-    while (1) {
-
-        /* Get next character */
-        if ((c = fgetc (stdin)) == EOF) {
-            /* Error or EOF */
-            *p = '\0';
-            if (stdin->f_flags & _FERROR) {
-                /* ERROR */
-                return 0;
-            } else {
-                /* EOF */
-                if (i) {
-                    return s;
-                } else {
-                    return 0;
-                }
-            }
-        }
-
-        /* One char more. Newline ends the input */
-        if ((char) c == '\n') {
-            *p = '\0';
-            break;
-        } else {
-            *p = c;
-            ++p;
-            ++i;
-        }
-
-    }
-
-    /* Done */
-    return s;
-}
-
-
-
-
diff --git a/libsrc/common/gets.s b/libsrc/common/gets.s
new file mode 100644
index 000000000..dfaf2def3
--- /dev/null
+++ b/libsrc/common/gets.s
@@ -0,0 +1,47 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; char* __fastcall__ gets (char* s)
+;
+
+        .export         _gets
+        .import         _fgets, _stdin, popax, pushax
+        .importzp       ptr4
+
+_gets:
+        ; Push buffer
+        sta     ptr4
+        stx     ptr4+1
+        jsr     pushax
+
+        ; Push size (there's no limit!)
+        lda     #$FF
+        tax
+        jsr     pushax
+
+        lda     _stdin
+        ldx     _stdin+1
+
+        jsr     _fgets
+
+        ; Check return value
+        bne     :+
+        cpx     #$00
+        bne     :+
+        rts
+
+:       ; At least one byte written.
+        jsr     pushax          ; Store returned pointer
+
+        ; Remove \n if there is one.
+        lda     ptr4            ; _fgets returns with ptr4 at
+        bne     :+              ; end of buffer
+        dec     ptr4+1
+:       dec     ptr4
+        lda     (ptr4),y        ; _fgets returns with Y=0
+        cmp     #$0A
+        bne     :+
+        tya
+        sta     (ptr4),y        ; Set terminator over \n
+
+:       jmp     popax
diff --git a/libsrc/common/gmtime.s b/libsrc/common/gmtime.s
new file mode 100644
index 000000000..288b285eb
--- /dev/null
+++ b/libsrc/common/gmtime.s
@@ -0,0 +1,20 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; struct tm* __fastcall__ gmtime (const time_t* timep);
+;
+
+        .export         _gmtime
+        .import         __time_t_to_tm
+        .import         ldeaxi
+
+_gmtime:
+        cpx     #$00            ; Check for null pointer
+        bne     :+
+        cmp     #$00
+        beq     no_pointer
+:       jsr     ldeaxi          ; Load value from pointer
+        jmp     __time_t_to_tm  ; Convert it
+
+no_pointer:
+        rts                     ; A/X already set
diff --git a/libsrc/common/interrupt.s b/libsrc/common/interrupt.s
index 6bdbb5fe4..a67d51fda 100644
--- a/libsrc/common/interrupt.s
+++ b/libsrc/common/interrupt.s
@@ -93,8 +93,8 @@ zpsave: .res    zpsavespace
         ; Set C level interrupt stack
         lda     irqsp
         ldx     irqsp+1
-        sta     sp
-        stx     sp+1
+        sta     c_sp
+        stx     c_sp+1
 
         ; Call C level interrupt request handler
         jsr     irqvec
diff --git a/libsrc/common/itoa.s b/libsrc/common/itoa.s
index 808f9bc33..a1cd53c8b 100644
--- a/libsrc/common/itoa.s
+++ b/libsrc/common/itoa.s
@@ -8,7 +8,7 @@
         .export         _itoa, _utoa
         .import         addysp1
         .import         __hextab
-        .importzp       sp, sreg, ptr2, ptr3, tmp1
+        .importzp       c_sp, sreg, ptr2, ptr3, tmp1
 
 .rodata
 specval:
@@ -21,18 +21,18 @@ specval:
 
 dopop:  sta     tmp1            ; will lose high byte
         ldy     #0
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr2
         sta     ptr3
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr2+1
         sta     ptr3+1
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg+1
         jmp     addysp1         ; Bump stack pointer
 
diff --git a/libsrc/common/localtime.s b/libsrc/common/localtime.s
new file mode 100644
index 000000000..279442c9d
--- /dev/null
+++ b/libsrc/common/localtime.s
@@ -0,0 +1,29 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; struct tm* __fastcall__ localtime (const time_t* timep);
+;
+
+        .export         _localtime
+        .import         __time_t_to_tm, __tz
+        .import         ldeaxi, tosaddeax, pusheax
+        .importzp       sreg
+
+_localtime:
+        cpx     #$00            ; Check for null pointer
+        bne     :+
+        cmp     #$00
+        beq     no_pointer
+:       jsr     ldeaxi          ; Load value
+        jsr     pusheax         ; Push it
+        lda     __tz+1+3
+        sta     sreg+1
+        lda     __tz+1+2
+        sta     sreg
+        ldx     __tz+1+1
+        lda     __tz+1
+        jsr     tosaddeax       ; Add _tz.timezone
+       jmp     __time_t_to_tm   ; Convert to struct tm
+
+no_pointer:
+        rts                     ; A/X already set
diff --git a/libsrc/common/longjmp.s b/libsrc/common/longjmp.s
index 91606a442..8855286a9 100644
--- a/libsrc/common/longjmp.s
+++ b/libsrc/common/longjmp.s
@@ -7,7 +7,7 @@
 
         .export         _longjmp
         .import         popptr1
-        .importzp       sp, ptr1, ptr2
+        .importzp       c_sp, ptr1, ptr2
 
 _longjmp:
         sta     ptr2            ; Save retval
@@ -23,10 +23,10 @@ _longjmp:
 
         lda     (ptr1),y
         iny
-        sta     sp
+        sta     c_sp
         lda     (ptr1),y
         iny
-        sta     sp+1
+        sta     c_sp+1
 
 ; Get the old stack pointer
 
diff --git a/libsrc/common/ltoa.s b/libsrc/common/ltoa.s
index 78e43e23f..7c31d471f 100644
--- a/libsrc/common/ltoa.s
+++ b/libsrc/common/ltoa.s
@@ -10,8 +10,6 @@
         .import         __hextab, __longminstr
         .importzp       sreg, ptr1, ptr2, ptr3, tmp1
 
-        .macpack        cpu
-
 .code
 
 ;
@@ -64,7 +62,7 @@ L2:     txa                     ; get high byte
         bpl     ultoa
         lda     #'-'
 
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         sta     (ptr2)
 .else
         ldy     #0
diff --git a/libsrc/common/lz4.s b/libsrc/common/lz4.s
index 4702137bc..5d26cb56a 100644
--- a/libsrc/common/lz4.s
+++ b/libsrc/common/lz4.s
@@ -6,20 +6,73 @@
 ; Almost 7 times faster, uses no RAM (vs 14 bytes BSS), and takes 1/4 the space
 ; vs the official C source.
 ;
+;
+; C implementation was:
 
-        .importzp       sp, sreg, regsave, regbank
+; void decompress_lz4 (unsigned char *in, unsigned char *out, const int outlen) {
+;   unsigned char token, tmp;
+;   unsigned int offset;
+;   unsigned char *end = out+outlen;
+;   unsigned char *copysrc;
+;
+;   while (out < end) {
+;     token = *in++;
+;     offset = token >> 4;
+;
+;     token &= 0x0f;
+;     token += 4; // Minmatch
+;
+;     if (offset == 15) {
+; moreliterals:
+;       tmp = *in++;
+;       offset += tmp;
+;       if (tmp == 255)
+;         goto moreliterals;
+;     }
+;
+;     if (offset) {
+;       memcpy(out, in, offset);
+;       out += offset;
+;       in += offset;
+;     }
+;
+;     if (out >= end) {
+;       return;
+;     }
+;
+;     offset = (*in);
+;     in++;
+;     offset += (*in)<<8;
+;     in++;
+;
+;     copysrc = out - offset;
+;     offset = token;
+;
+;     if (token == 19) {
+; morematches:
+;       tmp = *in++;
+;       offset += tmp;
+;       if (tmp == 255)
+;         goto morematches;
+;     }
+;
+;     memcpy(out, copysrc, offset);
+;     out += offset;
+;   }
+; }
+
+        .importzp       c_sp, sreg, regsave, regbank
         .importzp       tmp1, tmp2, tmp3, tmp4, ptr1, ptr2, ptr3, ptr4
         .macpack        longbranch
         .import         memcpy_upwards,pushax,popax
         .export         _decompress_lz4
 
 out = regsave
-written = regsave + 2
+end = regsave + 2
 tmp = tmp1
 token = tmp2
 offset = ptr3
 in = sreg
-outlen = ptr4
 
 ; ---------------------------------------------------------------
 ; void decompress_lz4 (const u8 *in, u8 * const out, const u16 outlen)
@@ -29,37 +82,43 @@ outlen = ptr4
 
 .proc   _decompress_lz4: near
 
-        sta     outlen
-        stx     outlen+1
+        sta     tmp
+        stx     tmp+1
 
+;
+; end = out + outlen;
+;
         jsr     popax
         sta     out
-        stx     out+1
+        clc
+        adc     tmp
+        sta     end
+        txa
+        sta     out+1
+        adc     tmp+1
+        sta     end+1
 
         jsr     popax
         sta     in
         stx     in+1
 
 ;
-; written = 0;
+; while (out < end) {
 ;
-        lda     #$00
-        sta     written
-;
-; while (written < outlen) {
-;
-        jmp     L0046
+        jmp     check_len
 ;
 ; token = *in++;
 ;
-L0004:  ldy     #$00
+get_token:
+        ldy     #$00
         lda     (in),y
-        sta     token
+        tay                   ; Backup token to Y
 
         inc     in
-        bne     L000A
+        bne     :+
         inc     in+1
-L000A:
+
+:
 ;
 ; offset = token >> 4;
 ;
@@ -74,7 +133,7 @@ L000A:
 ; token &= 0xf;
 ; token += 4; // Minmatch
 ;
-        lda     token
+        tya                   ; Get token back from Y
         and     #$0F
         clc
         adc     #$04
@@ -84,7 +143,8 @@ L000A:
 ;
         lda     offset
         cmp     #$0F
-L0013:  bne     L001A
+moreliterals:
+        bne     check_offset_not_zero
 ;
 ; tmp = *in++;
 ;
@@ -93,9 +153,10 @@ L0013:  bne     L001A
         sta     tmp
 
         inc     in
-        bne     L0017
+        bne     :+
         inc     in+1
-L0017:
+
+:
 ;
 ; offset += tmp;
 ;
@@ -113,24 +174,20 @@ L0017:
 ;
 ; goto moreliterals;
 ;
-        jmp     L0013
+        jmp     moreliterals
 ;
 ; if (offset) {
 ;
-L001A:  lda     offset
+check_offset_not_zero:
+        lda     offset
         ora     offset+1
-        beq     L001C
+        beq     check_end
 ;
-; memcpy(&out[written], in, offset);
+; memcpy(out, in, offset);
 ;
         lda     out
-        clc
-        adc     written
         sta     ptr2
-        lda     out+1
-        adc     written+1
-        tax
-        lda     ptr2
+        ldx     out+1
         stx     ptr2+1
         jsr     pushax
         lda     in
@@ -140,15 +197,15 @@ L001A:  lda     offset
 ;        ldy     #$00 - not needed as pushax zeroes Y
         jsr     memcpy_upwards
 ;
-; written += offset;
+; out += offset;
+; memcpy returned a pointer to out
 ;
-        lda     offset
         clc
-        adc     written
-        sta     written
-        lda     offset+1
-        adc     written+1
-        sta     written+1
+        adc     offset
+        sta     out
+        txa
+        adc     offset+1
+        sta     out+1
 ;
 ; in += offset;
 ;
@@ -160,21 +217,23 @@ L001A:  lda     offset
         adc     in+1
         sta     in+1
 ;
-; if (written >= outlen)
+; if (out >= end)
 ;
-L001C:  lda     written
-        cmp     outlen
-        lda     written+1
-        sbc     outlen+1
+check_end:
+        lda     out
+        cmp     end
+        lda     out+1
+        sbc     end+1
 ;
 ; return;
 ;
-        bcc     L0047
+        bcc     end_not_reached
         rts
 ;
 ; memcpy(&offset, in, 2);
 ;
-L0047:  ldy     #$00
+end_not_reached:
+        ldy     #$00
         lda     (in),y
         sta     offset
         iny
@@ -187,23 +246,18 @@ L0047:  ldy     #$00
         clc
         adc     in
         sta     in
-        bcc     L002F
+        bcc     :+
         inc     in+1
+
+:
 ;
-; copysrc = out + written - offset;
+; copysrc = out - offset;
 ;
-L002F:  lda     out
-        clc
-        adc     written
-        tay
-        lda     out+1
-        adc     written+1
-        tax
-        tya
+        lda     out
         sec
         sbc     offset
         sta     ptr1
-        txa
+        lda     out+1
         sbc     offset+1
         sta     ptr1+1
 ;
@@ -217,7 +271,8 @@ L002F:  lda     out
 ; if (token == 19) {
 ;
         cmp     #$13
-L0045:  bne     L003C
+morematches:
+        bne     token_not_19
 ;
 ; tmp = *in++;
 ;
@@ -226,9 +281,9 @@ L0045:  bne     L003C
         sta     tmp
 
         inc     in
-        bne     L0039
+        bne     :+
         inc     in+1
-L0039:
+:
 ;
 ; offset += tmp;
 ;
@@ -246,41 +301,36 @@ L0039:
 ;
 ; goto morematches;
 ;
-        jmp     L0045
+        jmp     morematches
 ;
-; memcpy(&out[written], copysrc, offset);
+; memcpy(out, copysrc, offset);
 ;
-L003C:  lda     out
-        clc
-        adc     written
+token_not_19:
+        lda     out
         sta     ptr2
-        lda     out+1
-        adc     written+1
-        tax
-        lda     ptr2
+        ldx     out+1
         stx     ptr2+1
         jsr     pushax
         jsr     memcpy_upwards
 ;
-; written += offset;
+; out += offset;
 ;
-        lda     offset
         clc
-        adc     written
-        sta     written
-        lda     offset+1
-        adc     written+1
-L0046:  sta     written+1
+        adc     offset
+        sta     out
+        txa
+        adc     offset+1
+        sta     out+1     ; 0 on the first loop iteration
+check_len:
 ;
-; while (written < outlen) {
+; while (out < end) {
 ;
-        lda     written
-        cmp     outlen
-        lda     written+1
-        sbc     outlen+1
-        jcc     L0004
+        lda     out
+        cmp     end
+        lda     out+1
+        sbc     end+1
+        jcc     get_token
 
         rts
 
 .endproc
-
diff --git a/libsrc/common/lzsa1.s b/libsrc/common/lzsa1.s
new file mode 100644
index 000000000..bbff728f7
--- /dev/null
+++ b/libsrc/common/lzsa1.s
@@ -0,0 +1,207 @@
+; void __fastcall__ decompress_lzsa1(const void *src, void *dest)
+;
+; NMOS 6502 decompressor for data stored in Emmanuel Marty's LZSA1 format.
+;
+; Compress with:
+; lzsa -r -f 1 input.bin output.lzsa1
+;
+; Copyright John Brandwood 2021.
+;
+; Distributed under the Boost Software License, Version 1.0.
+; Boost Software License - Version 1.0 - August 17th, 2003
+;
+; Permission is hereby granted, free of charge, to any person or organization
+; obtaining a copy of the software and accompanying documentation covered by
+; this license (the "Software") to use, reproduce, display, distribute,
+; execute, and transmit the Software, and to prepare derivative works of the
+; Software, and to permit third-parties to whom the Software is furnished to
+; do so, all subject to the following:
+;
+; The copyright notices in the Software and this entire statement, including
+; the above license grant, this restriction and the following disclaimer,
+; must be included in all copies of the Software, in whole or in part, and
+; all derivative works of the Software, unless such copies or derivative
+; works are solely in the form of machine-executable object code generated by
+; a source language processor.
+;
+; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+; FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+; SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+; FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+; ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+; DEALINGS IN THE SOFTWARE.
+
+        .export         _decompress_lzsa1
+
+        .import         popax
+        .importzp       ptr1, ptr2, ptr3, ptr4, tmp1, tmp2, tmp3
+
+lzsa_cmdbuf     =       tmp1                    ; 1 byte.
+lzsa_winptr     =       ptr1                    ; 1 word.
+lzsa_srcptr     =       ptr2                    ; 1 word.
+lzsa_dstptr     =       ptr3                    ; 1 word.
+
+lzsa_offset     =       lzsa_winptr
+
+.proc _decompress_lzsa1
+                sta     lzsa_dstptr
+                stx     lzsa_dstptr+1
+                jsr     popax
+                sta     lzsa_srcptr
+                stx     lzsa_srcptr+1
+
+lzsa1_unpack:   ldy     #0                      ; Initialize source index.
+                ldx     #0                      ; Initialize hi-byte of length.
+
+                ;
+                ; Copy bytes from compressed source data.
+                ;
+                ; N.B. X=0 is expected and guaranteed when we get here.
+                ;
+
+cp_length:      lda     (lzsa_srcptr),y
+                inc     lzsa_srcptr
+                bne     cp_skip0
+                inc     lzsa_srcptr+1
+
+cp_skip0:       sta     lzsa_cmdbuf             ; Preserve this for later.
+                and     #$70                    ; Extract literal length.
+                lsr                             ; Set CC before ...
+                beq     lz_offset               ; Skip directly to match?
+
+                lsr                             ; Get 3-bit literal length.
+                lsr
+                lsr
+                cmp     #$07                    ; Extended length?
+                bcc     cp_got_len
+
+                jsr     get_length              ; X=0, CS from CMP, returns CC.
+                stx     cp_npages+1             ; Hi-byte of length.
+
+cp_got_len:     tax                             ; Lo-byte of length.
+
+cp_byte:        lda     (lzsa_srcptr),y         ; CC throughout the execution of
+                sta     (lzsa_dstptr),y         ; of this .cp_page loop.
+                inc     lzsa_srcptr
+                bne     cp_skip1
+                inc     lzsa_srcptr+1
+cp_skip1:       inc     lzsa_dstptr
+                bne     cp_skip2
+                inc     lzsa_dstptr+1
+cp_skip2:       dex
+                bne     cp_byte
+cp_npages:      lda     #0                      ; Any full pages left to copy?
+                beq     lz_offset
+
+                dec     cp_npages+1            ; Unlikely, so can be slow.
+                bcc     cp_byte                ; Always true!
+
+                ;
+                ; Copy bytes from decompressed window.
+                ;
+                ; Longer but faster.
+                ;
+                ; N.B. X=0 is expected and guaranteed when we get here.
+                ;
+
+lz_offset:      lda     (lzsa_srcptr),y         ; Get offset-lo.
+                inc     lzsa_srcptr
+                bne     offset_lo
+                inc     lzsa_srcptr+1
+
+offset_lo:      sta     lzsa_offset
+
+                lda     #$FF                    ; Get offset-hi.
+                bit     lzsa_cmdbuf
+                bpl     offset_hi
+
+                lda     (lzsa_srcptr),y
+                inc     lzsa_srcptr
+                bne     offset_hi
+                inc     lzsa_srcptr+1
+
+offset_hi:      sta     lzsa_offset+1
+
+lz_length:      lda     lzsa_cmdbuf             ; X=0 from previous loop.
+                and     #$0F
+                adc     #$03                    ; Always CC from .cp_page loop.
+                cmp     #$12                    ; Extended length?
+                bcc     got_lz_len
+
+                jsr     get_length              ; X=0, CS from CMP, returns CC.
+
+got_lz_len:     inx                             ; Hi-byte of length+256.
+
+                eor     #$FF                    ; Negate the lo-byte of length
+                tay
+                eor     #$FF
+
+get_lz_dst:     adc     lzsa_dstptr             ; Calc address of partial page.
+                sta     lzsa_dstptr             ; Always CC from previous CMP.
+                iny
+                bcs     get_lz_win
+                beq     get_lz_win              ; Is lo-byte of length zero?
+                dec     lzsa_dstptr+1
+
+get_lz_win:     clc                             ; Calc address of match.
+                adc     lzsa_offset             ; N.B. Offset is negative!
+                sta     lzsa_winptr
+                lda     lzsa_dstptr+1
+                adc     lzsa_offset+1
+                sta     lzsa_winptr+1
+
+lz_byte:        lda     (lzsa_winptr),y
+                sta     (lzsa_dstptr),y
+                iny
+                bne     lz_byte
+                inc     lzsa_dstptr+1
+                dex                             ; Any full pages left to copy?
+                bne     lz_more
+
+                jmp     cp_length               ; Loop around to the beginning.
+
+lz_more:        inc     lzsa_winptr+1           ; Unlikely, so can be slow.
+                bne     lz_byte                 ; Always true!
+
+                ;
+                ; Get 16-bit length in X:A register pair, return with CC.
+                ;
+                ; N.B. X=0 is expected and guaranteed when we get here.
+                ;
+
+get_length:     clc                             ; Add on the next byte to get
+                adc     (lzsa_srcptr),y         ; the length.
+                inc     lzsa_srcptr
+                bne     skip_inc
+                inc     lzsa_srcptr+1
+
+skip_inc:       bcc     got_length              ; No overflow means done.
+                clc                             ; MUST return CC!
+                tax                             ; Preserve overflow value.
+
+extra_byte:     jsr     get_byte                ; So rare, this can be slow!
+                pha
+                txa                             ; Overflow to 256 or 257?
+                beq     extra_word
+
+check_length:   pla                             ; Length-lo.
+                bne     got_length              ; Check for zero.
+                dex                             ; Do one less page loop if so.
+got_length:     rts
+
+extra_word:     jsr     get_byte                ; So rare, this can be slow!
+                tax
+                bne     check_length            ; Length-hi == 0 at EOF.
+
+finished:       pla                             ; Length-lo.
+                pla                             ; Decompression completed, pop
+                pla                             ; return address.
+                rts
+
+get_byte:       lda     (lzsa_srcptr),y         ; Subroutine version for when
+                inc     lzsa_srcptr             ; inlining isn't advantageous.
+                bne     got_byte
+                inc     lzsa_srcptr+1          ; Inc & test for bank overflow.
+got_byte:       rts
+.endproc
diff --git a/libsrc/common/lzsa2.s b/libsrc/common/lzsa2.s
new file mode 100644
index 000000000..e851970e1
--- /dev/null
+++ b/libsrc/common/lzsa2.s
@@ -0,0 +1,308 @@
+; void __fastcall__ decompress_lzsa2(const void *src, void *dest)
+;
+; NMOS 6502 decompressor for data stored in Emmanuel Marty's LZSA2 format.
+;
+; Compress with:
+; lzsa -r -f 2 input.bin output.lzsa2
+;
+; Copyright John Brandwood 2021.
+;
+; Distributed under the Boost Software License, Version 1.0.
+; Boost Software License - Version 1.0 - August 17th, 2003
+;
+; Permission is hereby granted, free of charge, to any person or organization
+; obtaining a copy of the software and accompanying documentation covered by
+; this license (the "Software") to use, reproduce, display, distribute,
+; execute, and transmit the Software, and to prepare derivative works of the
+; Software, and to permit third-parties to whom the Software is furnished to
+; do so, all subject to the following:
+;
+; The copyright notices in the Software and this entire statement, including
+; the above license grant, this restriction and the following disclaimer,
+; must be included in all copies of the Software, in whole or in part, and
+; all derivative works of the Software, unless such copies or derivative
+; works are solely in the form of machine-executable object code generated by
+; a source language processor.
+;
+; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+; FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+; SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+; FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+; ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+; DEALINGS IN THE SOFTWARE.
+
+        .export         _decompress_lzsa2
+
+        .import         popax
+        .importzp       ptr1, ptr2, ptr3, ptr4, tmp1, tmp2, tmp3
+
+lzsa_length     =       lzsa_winptr             ; 1 word.
+
+lzsa_cmdbuf     =       tmp1                    ; 1 byte.
+lzsa_nibflg     =       tmp2                    ; 1 byte.
+lzsa_nibble     =       tmp3                    ; 1 byte.
+lzsa_offset     =       ptr1                    ; 1 word.
+lzsa_winptr     =       ptr2                    ; 1 word.
+lzsa_srcptr     =       ptr3                    ; 1 word.
+lzsa_dstptr     =       ptr4                    ; 1 word.
+
+.proc _decompress_lzsa2
+        sta     lzsa_dstptr
+        stx     lzsa_dstptr+1
+        jsr     popax
+        sta     lzsa_srcptr
+        stx     lzsa_srcptr+1
+
+lzsa2_unpack:
+        ldx     #$00                    ; Hi-byte of length or offset.
+        ldy     #$00                    ; Initialize source index.
+        sty     lzsa_nibflg             ; Initialize nibble buffer.
+
+        ;
+        ; Copy bytes from compressed source data.
+        ;
+        ; N.B. X=0 is expected and guaranteed when we get here.
+        ;
+
+cp_length:
+        lda     (lzsa_srcptr),y
+        inc     lzsa_srcptr
+        bne     cp_skip0
+        inc     lzsa_srcptr+1
+
+cp_skip0:
+        sta     lzsa_cmdbuf             ; Preserve this for later.
+        and     #$18                    ; Extract literal length.
+        beq     lz_offset               ; Skip directly to match?
+
+        lsr                             ; Get 2-bit literal length.
+        lsr
+        lsr
+        cmp     #$03                    ; Extended length?
+        bcc     cp_got_len
+
+        jsr     get_length             ; X=0 for literals, returns CC.
+        stx     cp_npages+1            ; Hi-byte of length.
+
+cp_got_len:
+        tax                             ; Lo-byte of length.
+
+cp_byte:
+        lda     (lzsa_srcptr),y         ; CC throughout the execution of
+        sta     (lzsa_dstptr),y         ; of this .cp_page loop.
+        inc     lzsa_srcptr
+        bne     cp_skip1
+        inc     lzsa_srcptr+1
+cp_skip1:
+        inc     lzsa_dstptr
+        bne     cp_skip2
+        inc     lzsa_dstptr+1
+cp_skip2:
+        dex
+        bne     cp_byte
+cp_npages:
+        lda     #0                      ; Any full pages left to copy?
+        beq     lz_offset
+
+        dec     cp_npages+1             ; Unlikely, so can be slow
+        bcc     cp_byte                 ; Always true!
+
+        ;
+        ; Copy bytes from decompressed window.
+        ;
+        ; N.B. X=0 is expected and guaranteed when we get here.
+        ;
+        ; xyz
+        ; ===========================
+        ; 00z  5-bit offset
+        ; 01z  9-bit offset
+        ; 10z  13-bit offset
+        ; 110  16-bit offset
+        ; 111  repeat offset
+        ;
+
+lz_offset:
+        lda     lzsa_cmdbuf
+        asl
+        bcs     get_13_16_rep
+
+get_5_9_bits:
+        dex                             ; X=$FF for a 5-bit offset.
+        asl
+        bcs     get_9_bits              ; Fall through if 5-bit.
+
+get_13_bits:
+        asl                             ; Both 5-bit and 13-bit read
+        php                             ; a nibble.
+        jsr     get_nibble
+        plp
+        rol                             ; Shift into position, clr C.
+        eor     #$E1
+        cpx     #$00                    ; X=$FF for a 5-bit offset.
+        bne     set_offset
+        sbc     #2                      ; 13-bit offset from $FE00.
+        bne     set_hi_8                ; Always NZ from previous SBC.
+
+get_9_bits:
+        asl                             ; X=$FF if CC, X=$FE if CS.
+        bcc     get_lo_8
+        dex
+        bcs     get_lo_8                ; Always CS from previous BCC.
+
+get_13_16_rep:
+        asl
+        bcc     get_13_bits             ; Shares code with 5-bit path.
+
+get_16_rep:
+        bmi     lz_length               ; Repeat previous offset.
+
+get_16_bits:
+        jsr     get_byte                ; Get hi-byte of offset.
+
+set_hi_8:
+        tax
+
+get_lo_8:
+        lda     (lzsa_srcptr),y         ; Get lo-byte of offset.
+        inc     lzsa_srcptr
+        bne     set_offset
+        inc     lzsa_srcptr+1
+
+set_offset:
+        sta     lzsa_offset             ; Save new offset.
+        stx     lzsa_offset+1
+
+lz_length:
+        ldx     #1                      ; Hi-byte of length+256.
+
+        lda     lzsa_cmdbuf
+        and     #$07
+        clc
+        adc     #$02
+        cmp     #$09                    ; Extended length?
+        bcc     got_lz_len
+
+        jsr     get_length              ; X=1 for match, returns CC.
+        inx                             ; Hi-byte of length+256.
+
+got_lz_len:
+        eor     #$FF                    ; Negate the lo-byte of length.
+        tay
+        eor     #$FF
+
+get_lz_dst:
+        adc     lzsa_dstptr             ; Calc address of partial page.
+        sta     lzsa_dstptr             ; Always CC from previous CMP.
+        iny
+        bcs     get_lz_win
+        beq     get_lz_win              ; Is lo-byte of length zero?
+        dec     lzsa_dstptr+1
+
+get_lz_win:
+        clc                             ; Calc address of match.
+        adc     lzsa_offset             ; N.B. Offset is negative!
+        sta     lzsa_winptr
+        lda     lzsa_dstptr+1
+        adc     lzsa_offset+1
+        sta     lzsa_winptr+1
+
+lz_byte:
+        lda     (lzsa_winptr),y
+        sta     (lzsa_dstptr),y
+        iny
+        bne     lz_byte
+        inc     lzsa_dstptr+1
+        dex                             ; Any full pages left to copy?
+        bne     lz_more
+
+        jmp     cp_length               ; Loop around to the beginning.
+
+lz_more:
+        inc     lzsa_winptr+1          ; Unlikely, so can be slow.
+        bne     lz_byte                 ; Always true!
+
+        ;
+        ; Lookup tables to differentiate literal and match lengths.
+        ;
+
+nibl_len_tbl:
+        .byte   3                       ; 0+3 (for literal).
+        .byte   9                       ; 2+7 (for match).
+
+byte_len_tbl:
+        .byte   18 - 1                  ; 0+3+15 - CS (for literal).
+        .byte   24 - 1                  ; 2+7+15 - CS (for match).
+
+        ;
+        ; Get 16-bit length in X:A register pair, return with CC.
+        ;
+
+get_length:
+        jsr     get_nibble
+        cmp     #$0F                    ; Extended length?
+        bcs     byte_length
+        adc     nibl_len_tbl,x          ; Always CC from previous CMP.
+
+got_length:
+        ldx     #$00                    ; Set hi-byte of 4 & 8 bit
+        rts                             ; lengths.
+
+byte_length:
+        jsr     get_byte                ; So rare, this can be slow!
+        adc     byte_len_tbl,x          ; Always CS from previous CMP
+        bcc     got_length
+        beq     finished
+
+word_length:
+        clc                             ; MUST return CC!
+        jsr     get_byte                ; So rare, this can be slow!
+        pha
+        jsr     get_byte                ; So rare, this can be slow!
+        tax
+        pla
+        bne     got_word                ; Check for zero lo-byte.
+        dex                             ; Do one less page loop if so.
+got_word:
+        rts
+
+get_byte:
+        lda     (lzsa_srcptr),y         ; Subroutine version for when
+        inc     lzsa_srcptr             ; inlining isn't advantageous.
+        bne     got_byte
+        inc     lzsa_srcptr+1
+got_byte:
+        rts
+
+finished:
+        pla                             ; Decompression completed, pop
+        pla                             ; return address.
+        rts
+
+        ;
+        ; Get a nibble value from compressed data in A.
+        ;
+
+get_nibble:
+        lsr     lzsa_nibflg             ; Is there a nibble waiting?
+        lda     lzsa_nibble             ; Extract the lo-nibble.
+        bcs     got_nibble
+
+        inc     lzsa_nibflg             ; Reset the flag.
+
+        lda     (lzsa_srcptr),y
+        inc     lzsa_srcptr
+        bne     set_nibble
+        inc     lzsa_srcptr+1
+
+set_nibble:
+        sta     lzsa_nibble             ; Preserve for next time.
+        lsr                             ; Extract the hi-nibble.
+        lsr
+        lsr
+        lsr
+
+got_nibble:
+        and     #$0F
+        rts
+.endproc
diff --git a/libsrc/common/malloc.s b/libsrc/common/malloc.s
index 6872f1f2e..72c4aedaa 100644
--- a/libsrc/common/malloc.s
+++ b/libsrc/common/malloc.s
@@ -131,6 +131,7 @@ _malloc:
         sta     ptr1
         bcc     @L1
         inc     ptr1+1
+        beq     OutOfHeapSpace          ; if high byte's 0, we overflowed!
 @L1:    ldx     ptr1+1
         bne     @L2
         cmp     #HEAP_MIN_BLOCKSIZE+1
@@ -336,4 +337,3 @@ RetUserPtr:
         bcc     @L9
         inx
 @L9:    rts
-
diff --git a/libsrc/common/memcpy.s b/libsrc/common/memcpy.s
index fd090c788..8f6531956 100644
--- a/libsrc/common/memcpy.s
+++ b/libsrc/common/memcpy.s
@@ -12,7 +12,7 @@
 
         .export         _memcpy, memcpy_upwards, memcpy_getparams
         .import         popax, popptr1
-        .importzp       sp, ptr1, ptr2, ptr3
+        .importzp       c_sp, ptr1, ptr2, ptr3
 
 ; ----------------------------------------------------------------------
 _memcpy:
@@ -70,10 +70,10 @@ memcpy_getparams:               ; IMPORTANT! Function has to leave with Y=0!
         iny                     ; Y=0 guaranteed by popptr1, we need '1' here...
                                 ; (direct stack access is three cycles faster
                                 ; (total cycle count with return))
-        lda     (sp),y
+        lda     (c_sp),y
         tax
         stx     ptr2+1          ; save high byte of ptr2
         dey                     ; Y = 0
-        lda     (sp),y          ; Get ptr2 low
+        lda     (c_sp),y        ; Get ptr2 low
         sta     ptr2
         rts
diff --git a/libsrc/common/memset.s b/libsrc/common/memset.s
index be78fc30d..5d56507a5 100644
--- a/libsrc/common/memset.s
+++ b/libsrc/common/memset.s
@@ -17,7 +17,7 @@
 
         .export         _memset, _bzero, ___bzero
         .import         popax
-        .importzp       sp, ptr1, ptr2, ptr3
+        .importzp       c_sp, ptr1, ptr2, ptr3
 
 _bzero:
 ___bzero:
@@ -36,10 +36,10 @@ _memset:
 
 common:                         ; Fill value is in X!
         ldy     #1
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1          ; save high byte of ptr
         dey                     ; Y = 0
-        lda     (sp),y          ; Get ptr
+        lda     (c_sp),y        ; Get ptr
         sta     ptr1
 
         lsr     ptr3+1          ; divide number of
diff --git a/libsrc/common/mktime.c b/libsrc/common/mktime.c
deleted file mode 100644
index 275589dbb..000000000
--- a/libsrc/common/mktime.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*****************************************************************************/
-/*                                                                           */
-/*                                 mktime.c                                  */
-/*                                                                           */
-/*           Make calendar time from broken down time and cleanup            */
-/*                                                                           */
-/*                                                                           */
-/*                                                                           */
-/* (C) 2002      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
-/*                                                                           */
-/*                                                                           */
-/* This software is provided 'as-is', without any expressed or implied       */
-/* warranty.  In no event will the authors be held liable for any damages    */
-/* arising from the use of this software.                                    */
-/*                                                                           */
-/* Permission is granted to anyone to use this software for any purpose,     */
-/* including commercial applications, and to alter it and redistribute it    */
-/* freely, subject to the following restrictions:                            */
-/*                                                                           */
-/* 1. The origin of this software must not be misrepresented; you must not   */
-/*    claim that you wrote the original software. If you use this software   */
-/*    in a product, an acknowledgment in the product documentation would be  */
-/*    appreciated but is not required.                                       */
-/* 2. Altered source versions must be plainly marked as such, and must not   */
-/*    be misrepresented as being the original software.                      */
-/* 3. This notice may not be removed or altered from any source              */
-/*    distribution.                                                          */
-/*                                                                           */
-/*****************************************************************************/
-
-
-
-#include <limits.h>
-#include <stdlib.h>
-#include <time.h>
-
-
-
-/*****************************************************************************/
-/*                                   Data                                    */
-/*****************************************************************************/
-
-
-
-#define JANUARY         0
-#define FEBRUARY        1
-#define DECEMBER       11
-#define JAN_1_1970      4               /* 1/1/1970 is a thursday */
-
-
-
-static const unsigned char MonthLength [] = {
-    31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-static const unsigned MonthDays [] = {
-    0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
-};
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-static unsigned char __fastcall__ IsLeapYear (unsigned Year)
-/* Returns 1 if the given year is a leap year */
-{
-    return (((Year % 4) == 0) && ((Year % 100) != 0 || (Year % 400) == 0));
-}
-
-
-
-time_t __fastcall__ mktime (register struct tm* TM)
-/* Make a time in seconds since 1/1/1970 from the broken down time in TM.
-** A call to mktime does also correct the time in TM to contain correct
-** values.
-*/
-{
-    register div_t D;
-    int Max;
-    unsigned DayCount;
-
-    /* Check if TM is valid */
-    if (TM == 0) {
-        /* Invalid data */
-        goto Error;
-    }
-
-    /* Adjust seconds. */
-    D = div (TM->tm_sec, 60);
-    TM->tm_sec = D.rem;
-
-    /* Adjust minutes */
-    if (TM->tm_min + D.quot < 0) {
-        goto Error;
-    }
-    TM->tm_min += D.quot;
-    D = div (TM->tm_min, 60);
-    TM->tm_min = D.rem;
-
-    /* Adjust hours */
-    if (TM->tm_hour + D.quot < 0) {
-        goto Error;
-    }
-    TM->tm_hour += D.quot;
-    D = div (TM->tm_hour, 24);
-    TM->tm_hour = D.rem;
-
-    /* Adjust days */
-    if (TM->tm_mday + D.quot < 0) {
-        goto Error;
-    }
-    TM->tm_mday += D.quot;
-
-    /* Adjust month and year. This is an iterative process, since changing
-    ** the month will change the allowed days for this month.
-    */
-    while (1) {
-
-        /* Make sure, month is in the range 0..11 */
-        D = div (TM->tm_mon, 12);
-        TM->tm_mon = D.rem;
-        if (TM->tm_year + D.quot < 0) {
-            goto Error;
-        }
-        TM->tm_year += D.quot;
-
-        /* Now check if mday is in the correct range, if not, correct month
-        ** and eventually year and repeat the process.
-        */
-        if (TM->tm_mon == FEBRUARY && IsLeapYear (TM->tm_year + 1900)) {
-            Max = 29;
-        } else {
-            Max = MonthLength[TM->tm_mon];
-        }
-        if (TM->tm_mday > Max) {
-            /* Must correct month and eventually, year */
-            if (TM->tm_mon == DECEMBER) {
-                TM->tm_mon = JANUARY;
-                ++TM->tm_year;
-            } else {
-                ++TM->tm_mon;
-            }
-            TM->tm_mday -= Max;
-        } else {
-            /* Done */
-            break;
-        }
-    }
-
-    /* Ok, all time/date fields are now correct. Calculate the days in this
-    ** year.
-    */
-    TM->tm_yday = MonthDays[TM->tm_mon] + TM->tm_mday - 1;
-    if (TM->tm_mon > FEBRUARY && IsLeapYear (TM->tm_year + 1900)) {
-        ++TM->tm_yday;
-    }
-
-    /* Calculate days since 1/1/1970. In the complete epoch (1/1/1970 to
-    ** somewhere in 2038) all years dividable by 4 are leap years, so
-    ** dividing by 4 gives the days that must be added cause of leap years.
-    ** (and the last leap year before 1970 was 1968)
-    */
-    DayCount = ((unsigned) (TM->tm_year-70)) * 365U +
-               (((unsigned) (TM->tm_year-(68+1))) / 4) +
-               TM->tm_yday;
-
-    /* Calculate the weekday */
-    TM->tm_wday = (JAN_1_1970 + DayCount) % 7;
-
-    /* No (US) daylight saving (for now) */
-    TM->tm_isdst = 0;
-
-    /* Return seconds since 1970 */
-    return DayCount * 86400UL +
-           ((unsigned) TM->tm_hour) * 3600UL +
-           ((unsigned) TM->tm_min) * 60U +
-           ((unsigned) TM->tm_sec) -
-           _tz.timezone;
-
-Error:
-    /* Error exit */
-    return (time_t) -1L;
-}
-
-
-
diff --git a/libsrc/common/mktime.s b/libsrc/common/mktime.s
new file mode 100644
index 000000000..e84cee040
--- /dev/null
+++ b/libsrc/common/mktime.s
@@ -0,0 +1,476 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; time_t __fastcall__ mktime (register struct tm* TM)
+;
+; Converts a struct tm to a time_t timestamp, making sure
+; day, month, year, hour, minute and seconds are in the
+; correct range.
+;
+
+        .export         _mktime
+        .import         __tz
+        .import         pushax, pusha0, pusheax
+        .import         shrax2, _div, tosumulax, tosumodax, tossubeax, tosaddeax, tosumuleax
+        .importzp       ptr2, tmp3, sreg
+
+        .include        "time.inc"
+
+; ------------------------------------------------------------------------
+; Special values
+
+FEBRUARY   = 1
+MARCH      = 2
+JAN_1_1970 = 4
+N_SEC      = 60
+N_MIN      = 60
+N_HOUR     = 24
+N_MON      = 12
+N_DAY_YEAR = 365
+; ------------------------------------------------------------------------
+; Helpers
+
+        ; Helper to shift overflows from one field to the next
+        ; Current field in Y, divisor in A
+        ; Keeps remainder in current field, and adds the quotient
+        ; to the next one
+adjust_field:
+        pha                     ; Push divisor
+        iny                     ; Point to high byte of current field
+        lda     (ptr2),y
+        tax
+        dey
+        sty     tmp3            ; Store current field (_div will mess with
+        lda     (ptr2),y        ; tmp1 and tmp2)
+        jsr     pushax
+        pla                     ; Load divisor
+        ldx     #$00
+
+        jsr     _div
+
+        ldy     tmp3            ; Store remainder in current field
+        sta     (ptr2),y
+        iny
+        txa
+        sta     (ptr2),y
+
+        lda     sreg            ; Add quotient to next field
+        iny
+        clc
+        adc     (ptr2),y
+        sta     (ptr2),y
+        iny
+        lda     sreg+1
+        adc     (ptr2),y
+        sta     (ptr2),y
+        rts
+
+        ; Returns 1 in A if the given year is a leap year. Expects a year
+        ; from 0 to 206, without 1900 added.
+is_leap_year:
+        cmp     #$00            ; Y 0 (1900) is not a leap year
+        beq     not_leap
+        cmp     #$C8            ; Y 200 (2100) is not a leap year
+        beq     not_leap
+        and     #$03            ; Year % 4 == 0 means leap year
+        bne     not_leap
+        lda     #$01            ; Return 1
+        rts
+not_leap:
+        lda     #$00            ; Return 0
+        rts
+
+        ; Returns the number of days in the current month/year in A
+get_days_in_month:
+        ldy     #tm::tm_mon
+        lda     (ptr2),y
+        tax
+        lda     months_len,x
+        cpx     #FEBRUARY
+        beq     :+
+        rts
+:       tax
+        ldy     #tm::tm_year    ; Adjust for leap years
+        lda     (ptr2),y
+        jsr     is_leap_year
+        beq     :+
+        inx
+:       txa
+        rts
+
+        ; Add AX to counter
+addaxcounter:
+        clc
+        adc     Counter
+        sta     Counter            ; Store in Counter
+        txa
+        adc     Counter+1
+        sta     Counter+1
+        rts
+
+        ; Helpers for long chain of arithmetic on day counter.
+        ; Reload Counter and push it on the stack
+load_and_push_counter:
+        lda     Counter+3
+        sta     sreg+1
+        lda     Counter+2
+        sta     sreg
+        lda     Counter
+        ldx     Counter+1
+        jsr     pusheax
+        rts
+
+        ; Store result in AX:sreg to Counter
+store_counter:
+        sta     Counter
+        stx     Counter+1
+        lda     sreg
+        sta     Counter+2
+        lda     sreg+1
+        sta     Counter+3
+        rts
+
+; ------------------------------------------------------------------------
+; Code
+
+_mktime:
+        sta ptr2                ; Store struct to ptr2, which arithmetic
+        stx ptr2+1              ; functions won't touch
+
+        ; Check pointer validity
+        ora ptr2+1
+        bne :+
+        lda     #$FF
+        tax
+        sta     sreg
+        sta     sreg+1
+        rts
+
+        ; Adjust seconds
+:       ldy     #tm::tm_sec
+        lda     #N_SEC
+        jsr     adjust_field
+
+        ; Adjust minutes
+        ldy     #tm::tm_min
+        lda     #N_MIN
+        jsr     adjust_field
+
+        ; Adjust hours
+        ldy     #tm::tm_hour
+        lda     #N_HOUR
+        jsr     adjust_field
+
+        ;Shift one year as long as tm_mday is more than a year
+        ldy     #tm::tm_year
+        lda     (ptr2),y
+
+dec_by_year:
+        jsr     is_leap_year    ; Compute max numbers of days in year
+        clc
+        adc     #<N_DAY_YEAR    ; No care about carry,
+        sta     Max             ; 365+1 doesn't overflow low byte
+
+        ldy     #tm::tm_mday+1  ; Do we have more days in store?
+        lda     (ptr2),y
+        cmp     #>N_DAY_YEAR
+        beq     :+              ; High byte equal, check low byte
+        bcs     do_year_dec     ; High byte greater, decrement
+        bcc     dec_by_month    ; Low byte lower, we're done
+:       dey
+        lda     (ptr2),y
+        cmp     Max
+        bcc     dec_by_month
+        beq     dec_by_month
+
+do_year_dec:
+        ; Decrement days
+        ldy     #tm::tm_mday
+        lda     (ptr2),y
+        sbc     Max             ; Carry already set
+        sta     (ptr2),y
+        iny
+        lda     (ptr2),y
+        sbc     #>N_DAY_YEAR
+        sta     (ptr2),y
+
+        ; Increment year
+        ldy     #tm::tm_year
+        lda     (ptr2),y
+        clc
+        adc     #1
+        sta     (ptr2),y        ; No carry possible here either
+        bcc     dec_by_year     ; bra, go check next year
+
+dec_by_month:
+        ; We're done decrementing days by full years, now do it
+        ; month per month.
+        ldy     #tm::tm_mon
+        lda     #N_MON
+        jsr     adjust_field
+
+        ; Get max day for this month
+        jsr     get_days_in_month
+        sta     Max
+
+        ; So, do we have more days than this month?
+        ldy     #tm::tm_mday+1
+        lda     (ptr2),y
+        bne     do_month_dec    ; High byte not zero, sure we do
+        dey
+        lda     (ptr2),y
+        cmp     Max
+        bcc     calc_tm_yday    ; No
+        beq     calc_tm_yday
+
+do_month_dec:
+        ; Decrement days
+        ldy     #tm::tm_mday
+        lda     (ptr2),y
+        sec
+        sbc     Max
+        sta     (ptr2),y
+        iny
+        lda     (ptr2),y
+        sbc     #$00
+        sta     (ptr2),y
+
+        ; Increment month
+        ldy     #tm::tm_mon
+        lda     (ptr2),y
+        clc
+        adc      #1
+        sta      (ptr2),y
+
+        bne     dec_by_month    ; Check next month
+
+calc_tm_yday:
+        ; We finished decrementing tm_mday and have put it in the correct
+        ; year/month range. Now compute the day of the year.
+        ldy     #tm::tm_mday    ; Get current day of month
+        lda     (ptr2),y
+        sta     Counter         ; Store it in Counter
+
+        lda     #$00            ; Init counter high bytes
+        sta     Counter+1
+        sta     Counter+2
+        sta     Counter+3
+
+        ldy     #tm::tm_mon     ; Get current month
+        lda     (ptr2),y
+        asl
+        tax
+        clc
+        lda     yday_by_month,x ; Get yday for this month's start
+        adc     Counter         ; Add it to counter
+        sta     Counter
+        inx
+        lda     yday_by_month,x
+        adc     Counter+1
+        sta     Counter+1
+
+        ldy     #tm::tm_year    ; Adjust for leap years (if after feb)
+        lda     (ptr2),y
+        jsr     is_leap_year
+        beq     dec_counter
+        ldy     #tm::tm_mon     ; Leap year, get current month
+        lda     (ptr2),y
+        cmp     #MARCH
+        bcs     store_yday
+
+dec_counter:
+        lda     Counter         ; Decrease counter by one (yday starts at 0),
+        bne     :+              ; unless we're after february in a leap year
+        dec     Counter+1
+:       dec     Counter
+
+store_yday:
+        ldy     #tm::tm_yday    ; Store tm_yday
+        lda     Counter
+        sta     (ptr2),y
+        iny
+        lda     Counter+1
+        sta     (ptr2),y
+
+        ; Now calculate total day count since epoch with the formula:
+        ; ((unsigned) (TM->tm_year-70)) * 365U +     (number of days per year since 1970)
+        ;  (((unsigned) (TM->tm_year-(68+1))) / 4) + (one extra day per leap year since 1970)
+        ;   TM->tm_yday                              (number of days in this year)
+
+        ldy     #tm::tm_year    ; Get full years
+        lda     (ptr2),y
+        sec
+        sbc     #70
+        ldx     #0
+        jsr     pushax
+        lda     #<N_DAY_YEAR
+        ldx     #>N_DAY_YEAR
+
+        jsr     tosumulax
+        jsr     addaxcounter
+
+        ; Add one day per leap year
+        ldy     #tm::tm_year    ; Get full years
+        lda     (ptr2),y
+        sec
+        sbc     #69
+        ldx     #0
+        jsr     shrax2        ; Divide by 4
+
+        jsr     addaxcounter
+
+        ; Handle the 2100 exception (which was considered leap by "Add one day
+        ; per leap year" just before)
+        ldy     #tm::tm_year  ; Get full years
+        lda     (ptr2),y
+        cmp     #201
+        bcc     finish_calc   ; <= 200, nothing to do
+
+        lda     Counter
+        bne     :+
+        dec     Counter+1
+:       dec     Counter
+
+finish_calc:
+        ; Now we can compute the weekday.
+        lda     Counter
+        clc
+        adc     #JAN_1_1970
+        pha
+        lda     Counter+1
+        adc     #0
+        tax
+        pla
+        jsr     pushax
+
+        lda     #7              ; Modulo 7
+        ldx     #0
+        jsr     tosumodax
+
+        ldy     #tm::tm_wday    ; Store tm_wday
+        sta     (ptr2),y
+        iny
+        txa
+        sta     (ptr2),y
+
+        ; DST
+        lda     #$00            ; Store tm_isdst
+        ldy     #tm::tm_isdst
+        sta     (ptr2),y
+        iny
+        sta     (ptr2),y
+
+        ; Our struct tm is all fixed and every field calculated.
+        ; We can finally count seconds according to this formula:
+        ; seconds = (full days since epoch) * 86400UL +
+        ;            ((unsigned) TM->tm_hour) * 3600UL +
+        ;            ((unsigned) TM->tm_min) * 60U +
+        ;            ((unsigned) TM->tm_sec) -
+        ;            _tz.timezone;
+
+        ; We already have the number of days since epoch in our counter,
+        ; from just before when we computed tm_wday. Reuse it.
+        jsr     load_and_push_counter
+        lda     #$00            ; Multiply by 86400
+        sta     sreg+1
+        lda     #$01
+        sta     sreg
+        lda     #$80
+        ldx     #$51
+        jsr     tosumuleax
+        jsr     store_counter   ; Store into counter
+
+        ; Push counter to add 3600 * hours to it
+        jsr     load_and_push_counter
+
+        ldx     #$00            ; Load hours
+        stx     sreg
+        stx     sreg+1
+        ldy     #tm::tm_hour
+        lda     (ptr2),y
+        jsr     pusheax         ; Push
+        ldx     #$00            ; Load 3600
+        stx     sreg
+        stx     sreg+1
+        lda     #<3600
+        ldx     #>3600
+        jsr     tosumuleax      ; Multiply (pops the pushed hours)
+        jsr     tosaddeax       ; Add to counter (pops the pushed counter)
+        jsr     store_counter   ; Store counter
+
+        ; Push counter to add 60 * min to it
+        jsr     load_and_push_counter
+
+        ldy     #tm::tm_min     ; Load minutes
+        lda     (ptr2),y
+        jsr     pusha0          ; Push
+        lda     #N_MIN
+        ldx     #0
+        stx     sreg
+        stx     sreg+1
+        jsr     tosumulax       ; Multiply
+        jsr     tosaddeax       ; Add to pushed counter
+        jsr     store_counter   ; Store
+
+        ; Add seconds
+        jsr     load_and_push_counter
+
+        ldy     #tm::tm_sec     ; Load seconds
+        lda     (ptr2),y
+        ldx     #0
+        stx     sreg
+        stx     sreg+1
+        jsr     tosaddeax       ; Simple addition there
+
+        ; No need to store/load/push the counter here, simply to push it
+        ; for the last subtraction
+        jsr     pusheax
+
+        ; Subtract timezone
+        lda     __tz+1+3
+        sta     sreg+1
+        lda     __tz+1+2
+        sta     sreg
+        ldx     __tz+1+1
+        lda     __tz+1
+        jsr     tossubeax
+
+        ; And we're done!
+        rts
+
+        .data
+
+months_len:
+        .byte    31
+        .byte    28
+        .byte    31
+        .byte    30
+        .byte    31
+        .byte    30
+        .byte    31
+        .byte    31
+        .byte    30
+        .byte    31
+        .byte    30
+        .byte    31
+
+yday_by_month:
+        .word    0
+        .word    31
+        .word    59
+        .word    90
+        .word    120
+        .word    151
+        .word    181
+        .word    212
+        .word    243
+        .word    273
+        .word    304
+        .word    334
+
+
+        .bss
+
+Max:    .res 1                  ; We won't need a high byte
+Counter:
+        .res 4
diff --git a/libsrc/common/pmemalign.c b/libsrc/common/pmemalign.c
index 52adb240d..4499084d1 100644
--- a/libsrc/common/pmemalign.c
+++ b/libsrc/common/pmemalign.c
@@ -50,7 +50,6 @@
 */
 
 
-
 int __fastcall__ posix_memalign (void** memptr, size_t alignment, size_t size)
 /* Allocate a block of memory with the given "size", which is aligned to a
 ** memory address that is a multiple of "alignment".  "alignment" MUST NOT be
@@ -64,20 +63,27 @@ int __fastcall__ posix_memalign (void** memptr, size_t alignment, size_t size)
     size_t rawsize;
     size_t uppersize;
     size_t lowersize;
+    char err;
     register struct usedblock* b;       /* points to raw Block */
     register struct usedblock* u;       /* points to User block */
     register struct usedblock* p;       /* Points to upper block */
 
     /* Handle requests for zero-sized blocks */
     if (size == 0) {
+err_einval:
+        err = EINVAL;
+err_out:
         *memptr = NULL;
-        return EINVAL;
+        return err;
     }
 
-    /* Test alignment: is it a power of two? There must be only one bit set. */
-    if (alignment == 0 || (alignment & (alignment - 1)) != 0) {
-        *memptr = NULL;
-        return EINVAL;
+    /* Test alignment: is it a power of two? There must be one and only one bit set. */
+    if (alignment == 0) {
+        goto err_einval;
+    }
+
+    if (alignment & (alignment - 1)) {
+        goto err_einval;
     }
 
     /* Augment the block size up to the alignment, and allocate memory.
@@ -90,8 +96,8 @@ int __fastcall__ posix_memalign (void** memptr, size_t alignment, size_t size)
 
     /* Handle out-of-memory */
     if (b == NULL) {
-        *memptr = NULL;
-        return ENOMEM;
+        err = ENOMEM;
+        goto err_out;
     }
 
     /* Create (and return) a new pointer that points to the user-visible
diff --git a/libsrc/common/printf.s b/libsrc/common/printf.s
index 8d645dfa2..76e08e584 100644
--- a/libsrc/common/printf.s
+++ b/libsrc/common/printf.s
@@ -6,7 +6,7 @@
 
         .export         _printf
         .import         _stdout, pushax, addysp, _vfprintf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -43,8 +43,8 @@ _printf:
 
 ; Now calculate the va_list pointer, which does points to Format
 
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         add     ParamSize
         bcc     @L1
         inx
diff --git a/libsrc/common/putenv.s b/libsrc/common/putenv.s
index 5febcc71e..13f0e7dc4 100644
--- a/libsrc/common/putenv.s
+++ b/libsrc/common/putenv.s
@@ -10,7 +10,7 @@
         .import _malloc, _free
         .import searchenv, copyenvptr
         .import __environ, __envcount, __envsize
-        .import return0
+        .import return0, ___directerrno
         .import ptr1:zp, ptr2:zp, ptr3:zp, tmp1:zp
 
         .include "errno.inc"
@@ -169,10 +169,7 @@ addentry:
 ; Error entries
 
 nomem:  lda     #ENOMEM
-error:  jsr     ___seterrno
-        lda     #$FF                    ; Return -1
-        tax
-        rts
+error:  jmp     ___directerrno
 
 .endproc
 
@@ -184,5 +181,3 @@ error:  jsr     ___seterrno
 
 name:           .addr   0               ; Pointer to name
 newsize:        .byte   0               ; New environment size
-
-
diff --git a/libsrc/common/realloc.c b/libsrc/common/realloc.c
deleted file mode 100644
index eeb1eeea5..000000000
--- a/libsrc/common/realloc.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************/
-/*                                                                           */
-/*                                 realloc.c                                 */
-/*                                                                           */
-/*               Change the size of an allocated memory block                */
-/*                                                                           */
-/*                                                                           */
-/*                                                                           */
-/* (C) 1998-2004 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
-/*                                                                           */
-/*                                                                           */
-/* This software is provided 'as-is', without any expressed or implied       */
-/* warranty.  In no event will the authors be held liable for any damages    */
-/* arising from the use of this software.                                    */
-/*                                                                           */
-/* Permission is granted to anyone to use this software for any purpose,     */
-/* including commercial applications, and to alter it and redistribute it    */
-/* freely, subject to the following restrictions:                            */
-/*                                                                           */
-/* 1. The origin of this software must not be misrepresented; you must not   */
-/*    claim that you wrote the original software. If you use this software   */
-/*    in a product, an acknowledgment in the product documentation would be  */
-/*    appreciated but is not required.                                       */
-/* 2. Altered source versions must be plainly marked as such, and must not   */
-/*    be misrepresented as being the original software.                      */
-/* 3. This notice may not be removed or altered from any source              */
-/*    distribution.                                                          */
-/*                                                                           */
-/*****************************************************************************/
-
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <_heap.h>
-
-
-
-void* __fastcall__ realloc (void* block, register size_t size)
-{
-    register struct usedblock* b;
-    struct usedblock* newblock;
-    unsigned oldsize;
-    unsigned newhptr;
-
-    /* Check the block parameter */
-    if (!block) {
-        /* Block is NULL, same as malloc */
-        return malloc (size);
-    }
-
-    /* Check the size parameter */
-    if (size == 0) {
-        /* Block is not NULL, but size is: free the block */
-        free (block);
-        return 0;
-    }
-
-    /* Make the internal used size from the given size */
-    size += HEAP_ADMIN_SPACE;
-    if (size < sizeof (struct freeblock)) {
-        size = sizeof (struct freeblock);
-    }
-
-    /* The word below the user block contains a pointer to the start of the
-    ** raw memory block. The first word of this raw memory block is the full
-    ** size of the block. Get a pointer to the real block, get the old block
-    ** size.
-    */
-    b = (((struct usedblock*) block) - 1)->start;
-    oldsize = b->size;
-
-    /* Is the block at the current heap top? */
-    if (((unsigned) b) + oldsize == ((unsigned) __heapptr)) {
-        /* Check if we've enough memory at the heap top */
-        newhptr = ((unsigned) __heapptr) - oldsize + size;
-        if (newhptr <= ((unsigned) __heapend)) {
-            /* Ok, there's space enough */
-            __heapptr = (unsigned*) newhptr;
-            b->size = size;
-            b->start = b;
-            return block;
-        }
-    }
-
-    /* The given block was not located on top of the heap, or there's no
-    ** room left. Try to allocate a new block and copy the data.
-    */
-    if (newblock = malloc (size)) {
-
-        /* Adjust the old size to the user visible portion */
-        oldsize -= HEAP_ADMIN_SPACE;
-
-        /* If the new block is larger than the old one, copy the old
-        ** data only
-        */
-        if (size > oldsize) {
-            size = oldsize;
-        }
-
-        /* Copy the block data */
-        memcpy (newblock, block, size);
-        free (block);
-    }
-    return newblock;
-}
-
-
-
diff --git a/libsrc/common/realloc.s b/libsrc/common/realloc.s
new file mode 100644
index 000000000..16d5eea41
--- /dev/null
+++ b/libsrc/common/realloc.s
@@ -0,0 +1,213 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; void* __fastcall__ realloc (void* block, register size_t size)
+;
+
+        .importzp       ptr1, ptr2, ptr3, ptr4, tmp1, tmp2, tmp3, tmp4, c_sp
+        .import         _malloc, _memcpy, _free
+        .import         pushax, popptr1, return0
+        .import          incsp2, decsp2
+        .export         _realloc
+
+        .include        "_heap.inc"
+
+        .macpack        generic
+
+;----------------------------------------------------------------------------
+; Aliases for clarity
+
+block     = ptr1
+size      = ptr2
+ublock    = ptr3
+oldsize   = ptr4
+newblock  = tmp1                ; (and tmp2)
+orgblock  = tmp3                ; (and tmp4)
+
+;----------------------------------------------------------------------------
+; Code
+
+_realloc:
+        sta     size            ; Store size
+        stx     size+1
+
+        jsr     popptr1         ; Pop block
+
+        lda     block+1         ; Is block null?
+        tax
+        ora     block
+        bne     :+
+
+        lda     size            ; Block is null, just malloc
+        ldx     size+1
+        jmp     _malloc
+
+:       lda     size            ; Is size 0?
+        ora     size+1
+        bne     :+
+
+        lda     block           ; It is: free block (high byte already in X)
+        jsr     _free
+        jmp     return0
+
+:       clc                     ; Add internal used size
+        lda     size
+        adc     #HEAP_ADMIN_SPACE
+        sta     size
+        bcc     :+
+        inc     size+1
+        bne     :+
+
+        lda     #$00            ; Size high byte now 0: We overflowed!
+        tax
+        rts
+
+:       ldx     size+1          ; Should we round size up?
+        bne     :+
+        cmp     #.sizeof (freeblock)
+        bcs     :+
+
+        lda     #.sizeof (freeblock)
+        sta     size            ; (we presuppose that sizeof (freeblock) is < 256)
+
+:       lda     block           ; Get pointer to raw memory block
+        sta     orgblock        ; Store original pointer
+        sec
+        sbc     #.sizeof(usedblock)
+        sta     ublock
+        lda     block+1
+        sta     orgblock+1      ; Finish storing original pointer
+        sbc     #0
+        sta     ublock+1        ; We have our usedblock struct
+
+                                ; Get block start
+        ldy     #usedblock::start+1
+        lda     (ublock),y
+        tax                     ; Backup ublock high
+        dey
+        lda     (ublock),y
+
+        sta     ublock          ; Store ublock
+        stx     ublock+1
+
+                                ; Remember oldsize
+        ldy     #usedblock::size+1
+        lda     (ublock),y
+        sta     oldsize+1
+        dey
+        lda     (ublock),y
+        sta     oldsize
+
+        clc                     ; Is the block at heap top?
+        adc     ublock
+        tay
+        lda     ublock+1
+        adc     oldsize+1
+        cmp     ___heapptr+1
+        bne     must_malloc_new
+        cpy     ___heapptr
+        bne     must_malloc_new
+
+        tya                     ; Put ___heapptr back in A
+        sec                     ; Check if we have enough memory at heap top
+        sbc     oldsize         ; Subtract oldsize
+        sta     newblock
+        lda     ___heapptr+1
+        sbc     oldsize+1
+        sta     newblock+1
+        clc
+        lda     newblock        ; And add size
+        adc     size
+        sta     newblock
+        lda     newblock+1
+        adc     size+1
+        sta     newblock+1
+        bcs     must_malloc_new ; If we have a carry there we overflowed
+
+        cmp     ___heapend+1
+        bne     :+
+        lda     newblock
+        cmp     ___heapend
+:       bcc     :+
+        bne     must_malloc_new
+
+:       lda     newblock        ; There is enough space
+        sta     ___heapptr      ; Update heapptr
+        lda     newblock+1
+        sta     ___heapptr+1
+
+        ldy     #usedblock::start+1
+        lda     ublock+1
+        sta     (ublock),y      ; Update block start
+        dey
+        lda     ublock
+        sta     (ublock),y
+        dey
+
+        .assert usedblock::size = usedblock::start-2, error
+        lda     size+1
+        sta     (ublock),y      ; Update block size
+        dey
+        lda     size
+        sta     (ublock),y
+
+        lda     orgblock        ; Return original block
+        ldx     orgblock+1
+        rts
+
+must_malloc_new:                ; The block is not at heap top, or too big
+        lda     size+1
+        pha                     ; Backup new size (at this point the only ptr
+        tax                     ; we'll need after malloc). tmp* are safe
+        lda     size            ; from malloc, memcpy and free.
+        pha
+        jsr     _malloc
+
+        cmp     #$00            ; Did malloc succeed?
+        bne     :+
+        cpx     #$00
+        bne     :+
+        pla                     ; Pop size backup and return NULL
+        pla
+        txa                     ; X already 0
+        rts                     ; No
+
+:       sta     newblock        ; Yes, store newblock
+        stx     newblock+1
+        jsr     pushax          ; Push newblock for memcpy
+
+        lda     orgblock        ; Push orgblock for memcpy
+        ldx     orgblock+1
+        jsr     pushax
+
+        sec                     ; Remove admin space from oldsize
+        lda     oldsize
+        sbc     #<HEAP_ADMIN_SPACE
+        sta     oldsize
+        lda     oldsize+1
+        sbc     #>HEAP_ADMIN_SPACE
+        sta     oldsize+1
+
+        pla                     ; Restore new size to AX
+        tay
+        pla
+        tax
+        tya
+
+        cmp     oldsize         ; Find the smallest size
+        bcc     :+
+        cpx     oldsize+1
+        bcc     :+
+
+        lda     oldsize
+        ldx     oldsize+1
+
+:       jsr     _memcpy         ; And copy data
+
+        lda     orgblock        ; Free old block
+        ldx     orgblock+1
+        jsr     _free
+
+        lda     newblock        ; Return new block
+        ldx     newblock+1
+        rts
diff --git a/libsrc/common/rewind.c b/libsrc/common/rewind.c
deleted file mode 100644
index 333230b74..000000000
--- a/libsrc/common/rewind.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-** rewind.c
-**
-** Christian Groessler, 07-Aug-2000
-*/
-
-
-
-#include <stdio.h>
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-void __fastcall__ rewind (FILE* f)
-{
-    fseek(f, 0L, SEEK_SET);
-    clearerr(f);
-}
-
-
diff --git a/libsrc/common/rewind.s b/libsrc/common/rewind.s
new file mode 100644
index 000000000..e7013505c
--- /dev/null
+++ b/libsrc/common/rewind.s
@@ -0,0 +1,35 @@
+;
+; Colin Leroy-Mira <colin@colino.net>
+;
+; void __fastcall__ rewind (FILE* f)
+; /* Rewind a file */
+;
+
+        .export         _rewind
+
+        .import         _fseek, _clearerr
+        .import         pushax, pushl0, popax
+
+        .include        "stdio.inc"
+
+
+; ------------------------------------------------------------------------
+; Code
+
+.proc   _rewind
+
+        ; Push f twice (once for fseek, once for clearerr later)
+        jsr     pushax
+        jsr     pushax
+
+        ; Push offset (long) zero
+        jsr     pushl0
+
+        lda     #SEEK_SET
+        jsr     _fseek
+
+        ; Clear error
+        jsr     popax
+        jmp     _clearerr
+
+.endproc
diff --git a/libsrc/common/scanf.s b/libsrc/common/scanf.s
index dd6c16ad1..92460b629 100644
--- a/libsrc/common/scanf.s
+++ b/libsrc/common/scanf.s
@@ -8,7 +8,7 @@
         .export         _scanf
 
         .import         _stdin, pushax, addysp, _vfscanf
-        .import         sp:zp, ptr1:zp
+        .import         c_sp:zp, ptr1:zp
 
         .macpack        generic
 
@@ -34,8 +34,8 @@ _scanf:
 
 ; Now, calculate the va_list pointer, which does point to Format.
 
-        lda     sp
-        ldx     sp+1
+        lda     c_sp
+        ldx     c_sp+1
         add     ArgSize
         bcc     @L1
         inx
diff --git a/libsrc/common/setjmp.s b/libsrc/common/setjmp.s
index 886853368..3c0b8aa17 100644
--- a/libsrc/common/setjmp.s
+++ b/libsrc/common/setjmp.s
@@ -8,7 +8,7 @@
         .export         ___setjmp
 
         .import         return0
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
 ___setjmp:
         sta     ptr1            ; Save buf
@@ -17,10 +17,10 @@ ___setjmp:
 
 ; The parameter stack is now empty, put it into buf
 
-        lda     sp
+        lda     c_sp
         sta     (ptr1),y
         iny
-        lda     sp+1
+        lda     c_sp+1
         sta     (ptr1),y
         iny
 
diff --git a/libsrc/common/snprintf.s b/libsrc/common/snprintf.s
index 33afb434d..c922a55bc 100644
--- a/libsrc/common/snprintf.s
+++ b/libsrc/common/snprintf.s
@@ -6,7 +6,7 @@
 
         .export         _snprintf
         .import         pushax, addysp, decsp6, _vsnprintf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -38,9 +38,9 @@ _snprintf:
 ; Calculate a pointer to the Format argument
 
         lda     ParamSize
-        add     sp
+        add     c_sp
         sta     ptr1
-        ldx     sp+1
+        ldx     c_sp+1
         bcc     @L1
         inx
 @L1:    stx     ptr1+1
@@ -49,7 +49,7 @@ _snprintf:
 
         ldy     #6-1
 @L2:    lda     (ptr1),y
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         bpl     @L2
 
diff --git a/libsrc/common/sprintf.s b/libsrc/common/sprintf.s
index d502d8638..d2ce6602e 100644
--- a/libsrc/common/sprintf.s
+++ b/libsrc/common/sprintf.s
@@ -6,7 +6,7 @@
 
         .export         _sprintf
         .import         pushax, addysp, decsp4, _vsprintf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -38,9 +38,9 @@ _sprintf:
 ; Calculate a pointer to the Format argument
 
         lda     ParamSize
-        add     sp
+        add     c_sp
         sta     ptr1
-        ldx     sp+1
+        ldx     c_sp+1
         bcc     @L1
         inx
 @L1:    stx     ptr1+1
@@ -49,7 +49,7 @@ _sprintf:
 
         ldy     #4-1
 @L2:    lda     (ptr1),y
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         bpl     @L2
 
diff --git a/libsrc/common/sscanf.s b/libsrc/common/sscanf.s
index 941f54e92..d393087d8 100644
--- a/libsrc/common/sscanf.s
+++ b/libsrc/common/sscanf.s
@@ -6,7 +6,7 @@
 
         .export         _sscanf
         .import         addysp, decsp4, _vsscanf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -51,9 +51,9 @@ _sscanf:
 ; Calculate a pointer to the fixed parameters
 
         lda     ParamSize
-        add     sp
+        add     c_sp
         sta     ptr1
-        ldx     sp+1
+        ldx     c_sp+1
         bcc     @L1
         inx
 @L1:    stx     ptr1+1
@@ -62,7 +62,7 @@ _sscanf:
 
         ldy     #4-1
 @L2:    lda     (ptr1),y
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         bpl     @L2
 
diff --git a/libsrc/common/stpcpy.s b/libsrc/common/stpcpy.s
new file mode 100644
index 000000000..c8a10db94
--- /dev/null
+++ b/libsrc/common/stpcpy.s
@@ -0,0 +1,22 @@
+;
+; Colin Leroy-Mira, 4 Sept. 2024
+;
+; char* stpcpy (char* dest, const char* src);
+;
+
+        .export         _stpcpy
+        .import         _strcpy
+
+        .importzp       tmp1, ptr2
+
+_stpcpy:
+        jsr     _strcpy
+
+        ldx     ptr2+1        ; Load dest pointer's last high byte
+        tya                   ; Get the last offset strcpy wrote to
+
+        clc
+        adc     ptr2          ; Add to low byte value
+        bcc     :+
+        inx
+:       rts                   ; Return pointer to dest's terminator
diff --git a/libsrc/common/strcasestr.s b/libsrc/common/strcasestr.s
new file mode 100644
index 000000000..58364f419
--- /dev/null
+++ b/libsrc/common/strcasestr.s
@@ -0,0 +1,95 @@
+;
+; Ullrich von Bassewitz, 11.12.1998
+;
+; char* strcasestr (const char* haystack, const char* needle);
+;
+
+        .export         _strcasestr
+        .import         popptr1, return0, tolowerdirect
+        .importzp       ptr1, ptr2, ptr3, ptr4, tmp1, tmp2, tmp3, tmp4
+        .include        "ctype.inc"
+
+        .segment "LOWCODE"
+
+_strcasestr:
+        sta     ptr2            ; Save needle
+        stx     ptr2+1
+        sta     ptr4            ; Setup temp copy for later
+
+        jsr     popptr1         ; Get haystack to ptr1
+
+; If needle is empty, return haystack
+
+        ; ldy     #$00            Y=0 guaranteed by popptr1
+        lda     (ptr2),y        ; Get first byte of needle
+        beq     @Found          ; Needle is empty --> we're done
+
+; Search for the beginning of the string (this is not an optimal search
+; strategy [in fact, it's pretty dumb], but it's simple to implement).
+
+        jsr     tolowerdirect   ; Lowercase
+        sta     tmp1            ; Save start of needle
+@L1:    lda     (ptr1),y        ; Get next char from haystack
+        beq     @NotFound       ; Jump if end
+
+        jsr     tolowerdirect   ; Lowercase
+        cmp     tmp1            ; Start of needle found?
+        beq     @L2             ; Jump if so
+        iny                     ; Next char
+        bne     @L1
+        inc     ptr1+1          ; Bump high byte
+        bne     @L1             ; Branch always
+
+; We found the start of needle in haystack
+
+@L2:    tya                     ; Get offset
+        clc
+        adc     ptr1
+        sta     ptr1            ; Make ptr1 point to start
+        bcc     @L3
+        inc     ptr1+1
+
+; ptr1 points to the start of needle in haystack now. Setup temporary pointers for the
+; search. The low byte of ptr4 is already set.
+
+@L3:    sta     ptr3
+        lda     ptr1+1
+        sta     ptr3+1
+        lda     ptr2+1
+        sta     ptr4+1
+        ldy     #1              ; First char is identical, so start on second
+
+; Do the compare
+
+@L4:    lda     (ptr4),y        ; Get char from needle
+        beq     @Found          ; Jump if end of needle (-> found)
+
+        jsr     tolowerdirect   ; Lowercase
+        sta     tmp2
+
+        lda     (ptr3),y        ; Compare with haystack
+
+        jsr     tolowerdirect   ; Lowercase
+        cmp     tmp2
+        bne     @L5             ; Jump if not equal
+        iny                     ; Next char
+        bne     @L4
+        inc     ptr3+1
+        inc     ptr4+1          ; Bump hi byte of pointers
+        bne     @L4             ; Next char (branch always)
+
+; The strings did not compare equal, search next start of needle
+
+@L5:    ldy     #1              ; Start after this char
+        bne     @L1             ; Branch always
+
+; We found the start of needle
+
+@Found: lda     ptr1
+        ldx     ptr1+1
+        rts
+
+; We reached end of haystack without finding needle
+
+@NotFound:
+        jmp     return0         ; return NULL
diff --git a/libsrc/common/strcat.s b/libsrc/common/strcat.s
index f9cd94633..963b037b9 100644
--- a/libsrc/common/strcat.s
+++ b/libsrc/common/strcat.s
@@ -8,7 +8,6 @@
         .export         _strcat
         .import         popax
         .importzp       ptr1, ptr2, tmp3
-        .macpack        cpu
 
 _strcat:
         sta ptr1        ; Save src
@@ -16,7 +15,7 @@ _strcat:
         jsr popax       ; Get dest
         sta tmp3        ; Remember for function return
         tay
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz ptr2
 .else
         lda #0
diff --git a/libsrc/common/strchr.s b/libsrc/common/strchr.s
index 206b5160e..ac7f5397a 100644
--- a/libsrc/common/strchr.s
+++ b/libsrc/common/strchr.s
@@ -8,14 +8,13 @@
         .export         _strchr
         .import         popax
         .importzp       ptr1, tmp1
-        .macpack        cpu
 
 _strchr:
         sta tmp1        ; Save c
         jsr popax       ; get s
         tay             ; low byte of pointer to y
         stx ptr1+1
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz ptr1
 .else
         lda #0
diff --git a/libsrc/common/strcpy.s b/libsrc/common/strcpy.s
index 77b39fe76..9a100f540 100644
--- a/libsrc/common/strcpy.s
+++ b/libsrc/common/strcpy.s
@@ -25,6 +25,9 @@ L1:     lda     (ptr1),y
         inc     ptr2+1
         bne     L1
 
-L9:     lda     ptr2            ; X still contains high byte
-        rts
+L9:     lda     ptr2            ; X still contains dest's original high byte
 
+        ; On exit, we want AX to be dest (as this is what strcpy returns).
+        ; We also want (ptr2),y to still point to dest's terminator, as this
+        ; is used by stpcpy().
+        rts
diff --git a/libsrc/common/strcspn.s b/libsrc/common/strcspn.s
index 4bb01479a..418bf6ac2 100644
--- a/libsrc/common/strcspn.s
+++ b/libsrc/common/strcspn.s
@@ -7,13 +7,13 @@
 
         .export         _strcspn
         .import         popptr1, _strlen
-        .importzp       ptr1, ptr2, tmp1, tmp2
+        .importzp       ptr1, ptr4, tmp1, tmp2
 
 _strcspn:
-        jsr _strlen         ; get length in a/x and transfer s2 to ptr2
+        jsr _strlen         ; get length in a/x and transfer s2 to ptr4
                             ; Note: It does not make sense to
                             ; have more than 255 test chars, so
-                            ; we don't support a high byte here! (ptr2+1 is
+                            ; we don't support a high byte here! (ptr4+1 is
                             ; also unchanged in strlen then (important!))
                             ; -> the original implementation also
                             ; ignored this case
@@ -38,7 +38,7 @@ checkNext:
         iny
 check:  cpy tmp1            ; compare with length of test character string
         beq endOfTestChars
-        cmp (ptr2),y        ; found matching char?
+        cmp (ptr4),y        ; found matching char?
         bne checkNext
 
 leave:  txa                 ; restore position of finding
diff --git a/libsrc/common/strdup.s b/libsrc/common/strdup.s
index 3ab07bda1..4cf643614 100644
--- a/libsrc/common/strdup.s
+++ b/libsrc/common/strdup.s
@@ -1,85 +1,60 @@
 ;
 ; Ullrich von Bassewitz, 18.07.2000
+; Colin Leroy-Mira, 05.01.2024
 ;
 ; char* __fastcall__ strdup (const char* S);
 ;
-; Note: The code knowns which zero page locations are used by malloc.
+; Note: The code knowns which zero page locations are used by malloc,
+; memcpy and strlen.
 ;
 
-        .importzp       sp, tmp1, ptr4
-        .import         pushax, decsp4, incsp4
-        .import         _strlen, _malloc, _memcpy
+        .importzp       ptr2, ptr3, ptr4, tmp1, tmp2, tmp3
+        .import         _strlen_ptr4, _malloc, _memcpy, pushax
         .export         _strdup
 
-        .macpack        cpu
-        .macpack        generic
-
 _strdup:
+        ; Get length (and store source in ptr4)
+        sta     ptr4
+        stx     ptr4+1
+        stx     tmp1            ; Backup high byte, which
+        jsr     _strlen_ptr4    ; strlen may increment
 
-; Since we need some place to store the intermediate results, allocate a
-; stack frame. To make this somewhat more efficient, create the stackframe
-; as needed for the final call to the memcpy function.
-
-        pha                     ; decsp will destroy A (but not X)
-        jsr     decsp4          ; Target/source
-
-; Store the pointer into the source slot
-
-        ldy     #1
-        txa
-        sta     (sp),y
-        pla
-.if (.cpu .bitand CPU_ISET_65SC02)
-        sta     (sp)
+        ; Add null byte for terminator
+.if .cap(CPU_HAS_INA)
+        inc     a
 .else
-        dey
-        sta     (sp),y
+        clc
+        adc     #1
 .endif
-
-; Get length of S (which is still in a/x)
-
-        jsr     _strlen
-
-; Calculate strlen(S)+1 (the space needed)
-
-        add     #1
-        bcc     @L1
+        bne     :+
         inx
 
-; Save the space we're about to allocate in ptr4
-
-@L1:    sta     ptr4
-        stx     ptr4+1
-
-; Allocate memory. _malloc will not use ptr4
+        ; Store length
+:       sta     tmp2
+        stx     tmp3
 
+        ; Allocate memory
         jsr     _malloc
 
-; Store the result into the target stack slot
-
-        ldy     #2
-        sta     (sp),y          ; Store low byte
-        sta     tmp1
-        txa                     ; Get high byte
-        iny
-        sta     (sp),y          ; Store high byte
-
-; Check for a NULL pointer
-
-        ora     tmp1
+        ; Check for NULL
+        bne     :+
+        cpx     #$00
         beq     OutOfMemory
 
-; Copy the string. memcpy will return the target string which is exactly
-; what we need here. It will also drop the allocated stack frame.
+        ; Push dest
+:       jsr    pushax
 
+        ; Push source
         lda     ptr4
-        ldx     ptr4+1          ; Load size
-        jmp     _memcpy         ; Copy string, drop stackframe
+        ldx     tmp1
+        jsr     pushax
 
-; Out of memory, return NULL (A = 0)
+        ; Push length
+        lda     tmp2
+        ldx     tmp3
+
+        ; Copy and return the dest pointer
+        jmp     _memcpy
 
 OutOfMemory:
-        tax
-        jmp     incsp4          ; Drop stack frame
-
-
+        rts
diff --git a/libsrc/common/strftime.c b/libsrc/common/strftime.c
index 38ea4850e..2f3cadc2e 100644
--- a/libsrc/common/strftime.c
+++ b/libsrc/common/strftime.c
@@ -40,7 +40,7 @@
 
 
 /* Use static local variables for speed */
-#pragma static-locals (on);
+#pragma static-locals (on)
 
 
 
diff --git a/libsrc/common/strlen.s b/libsrc/common/strlen.s
index 8d5bc20fc..6247d0c51 100644
--- a/libsrc/common/strlen.s
+++ b/libsrc/common/strlen.s
@@ -2,19 +2,19 @@
 ; Ullrich von Bassewitz, 31.05.1998
 ;
 ; Note: strspn & strcspn call internally this function and rely on
-; the usage of only ptr2 here! Keep in mind when appling changes
+; the usage of only ptr4 here! Keep in mind when applying changes
 ; and check the other implementations too!
 ;
 ; size_t __fastcall__ strlen (const char* s);
 ;
 
-        .export         _strlen
-        .importzp       ptr2
-        .macpack        cpu
+        .export         _strlen, _strlen_ptr4
+        .importzp       ptr4
 
 _strlen:
-        sta     ptr2            ; Save s
-        stx     ptr2+1
+        sta     ptr4            ; Save s
+        stx     ptr4+1
+_strlen_ptr4:
 .if (.cpu .bitand ::CPU_ISET_HUC6280)
         clx
         cly
@@ -27,11 +27,11 @@ _strlen:
 .endif
 .endif
 
-L1:     lda     (ptr2),y
+L1:     lda     (ptr4),y
         beq     L9
         iny
         bne     L1
-        inc     ptr2+1
+        inc     ptr4+1
         inx
         bne     L1
 
diff --git a/libsrc/common/strncat.s b/libsrc/common/strncat.s
index 75572db7c..e4e321591 100644
--- a/libsrc/common/strncat.s
+++ b/libsrc/common/strncat.s
@@ -8,64 +8,63 @@
 .export         _strncat
 .import         popax, popptr1
 .importzp       ptr1, ptr2, ptr3, tmp1, tmp2
-.macpack        cpu
 
 _strncat:
-    inx
-    stx tmp2
-    tax
-    inx
-    stx tmp1        ; save count with each byte incremented separately
+        inx
+        stx     tmp2
+        tax
+        inx
+        stx     tmp1        ; save count with each byte incremented separately
 
-    jsr popptr1     ; get src
+        jsr     popptr1     ; get src
 
-    jsr popax       ; get dest
-    sta ptr3        ; remember for function return
-    stx ptr3+1
-    stx ptr2+1
-    tay             ; low byte as offset in Y
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-    stz ptr2
+        jsr     popax       ; get dest
+        sta     ptr3        ; remember for function return
+        stx     ptr3+1
+        stx     ptr2+1
+        tay             ; low byte as offset in Y
+.if .cap(CPU_HAS_STZ)
+        stz     ptr2
 .else
-    ldx #0
-    stx ptr2        ; destination on page boundary
+        ldx     #0
+        stx     ptr2        ; destination on page boundary
 .endif
 
 ; find end of dest
 
-L1: lda (ptr2),y
-    beq L2
-    iny
-    bne L1
-    inc ptr2+1
-    bne L1
+L1:     lda     (ptr2),y
+        beq     L2
+        iny
+        bne     L1
+        inc     ptr2+1
+        bne     L1
 
 ; end found, apply offset to dest ptr and reset y
-L2: sty ptr2
+L2:     sty     ptr2
 
 ; copy src. We've put the ones complement of the count into the counter, so
 ; we'll increment the counter on top of the loop
 
-L3: ldy #0
-    ldx tmp1        ; low counter byte
+L3:     ldy     #0
+        ldx     tmp1        ; low counter byte
 
-L4: dex
-    bne L5
-    dec tmp2
-    beq L6          ; jump if done
-L5: lda (ptr1),y
-    sta (ptr2),y
-    beq L7
-    iny
-    bne L4
-    inc ptr1+1
-    inc ptr2+1
-    bne L4
+L4:     dex
+        bne     L5
+        dec     tmp2
+        beq     L6          ; jump if done
+L5:     lda     (ptr1),y
+        sta     (ptr2),y
+        beq     L7
+        iny
+        bne     L4
+        inc     ptr1+1
+        inc     ptr2+1
+        bne     L4
 
 ; done, set the trailing zero and return pointer to dest
 
-L6: lda #0
-    sta (ptr2),y
-L7: lda ptr3
-    ldx ptr3+1
-    rts
+L6:     lda     #0
+        sta     (ptr2),y
+L7:     lda     ptr3
+        ldx     ptr3+1
+        rts
diff --git a/libsrc/common/strspn.s b/libsrc/common/strspn.s
index 6fda716be..7e3f707d1 100644
--- a/libsrc/common/strspn.s
+++ b/libsrc/common/strspn.s
@@ -7,13 +7,13 @@
 
         .export         _strspn
         .import         popptr1, _strlen
-        .importzp       ptr1, ptr2, tmp1, tmp2
+        .importzp       ptr1, ptr4, tmp1, tmp2
 
 _strspn:
-        jsr _strlen         ; get length in a/x and transfer s2 to ptr2
+        jsr _strlen         ; get length in a/x and transfer s2 to ptr4
                             ; Note: It does not make sense to
                             ; have more than 255 test chars, so
-                            ; we don't support a high byte here! (ptr2+1 is
+                            ; we don't support a high byte here! (ptr4+1 is
                             ; also unchanged in strlen then (important!))
                             ; -> the original implementation also
                             ; ignored this case
@@ -38,7 +38,7 @@ checkNext:
         iny
 check:  cpy tmp1            ; compare with length of test character string
         beq leave
-        cmp (ptr2),y        ; found matching char?
+        cmp (ptr4),y        ; found matching char?
         bne checkNext
 
 foundTestChar:
diff --git a/libsrc/common/strstr.s b/libsrc/common/strstr.s
index 84f633245..691e5ba5c 100644
--- a/libsrc/common/strstr.s
+++ b/libsrc/common/strstr.s
@@ -82,14 +82,3 @@ _strstr:
         lda     #$00            ; return NULL
         tax
         rts
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libsrc/common/tgi_colors.s b/libsrc/common/tgi_colors.s
index 6ef3729b4..ba14ffa09 100644
--- a/libsrc/common/tgi_colors.s
+++ b/libsrc/common/tgi_colors.s
@@ -1,6 +1,7 @@
 ;
 ; Target-specific black & white values for use by the target-shared TGI kernel
 ;
+; NOTE: These are indices into the default palette
 
         .include        "tgi-kernel.inc"
 
diff --git a/libsrc/common/time.s b/libsrc/common/time.s
index 40b470f5b..4092e71c6 100644
--- a/libsrc/common/time.s
+++ b/libsrc/common/time.s
@@ -6,7 +6,7 @@
 
         .export         _time
 
-        .import         decsp1, ldeaxi
+        .import         pusha, ldeaxi
         .importzp       ptr1, sreg, tmp1, tmp2
 
         .include        "time.inc"
@@ -22,54 +22,50 @@
 
 ; Get the time (machine dependent)
 
-        jsr     decsp1
+        .assert timespec::tv_sec = 0, error
+        lda     #CLOCK_REALTIME
+        jsr     pusha
         lda     #<time
         ldx     #>time
         jsr     _clock_gettime
-        sta     tmp2
-        lda     #<time
-        ldx     #>time
-        .assert timespec::tv_sec = 0, error
-        jsr     ldeaxi
-        sta     tmp1            ; Save low byte of result
+
+; _clock_gettime returns 0 on success and -1 on error. Check that.
+
+        inx                     ; Did _clock_gettime return -1?
+        bne     @L2             ; Jump if not
+
+; We had an error so invalidate time. A contains $FF.
+
+        ldy     #3
+@L1:    sta     time,y
+        dey
+        bpl     @L1
 
 ; Restore timep and check if it is NULL
 
-        pla
+@L2:    pla
         sta     ptr1+1
         pla
         sta     ptr1            ; Restore timep
         ora     ptr1+1          ; timep == 0?
-        beq     @L1
+        beq     @L4
 
 ; timep is not NULL, store the result there
 
         ldy     #3
-        lda     sreg+1
+@L3:    lda     time,y
         sta     (ptr1),y
         dey
-        lda     sreg
-        sta     (ptr1),y
-        dey
-        txa
-        sta     (ptr1),y
-        dey
-        lda     tmp1
-        sta     (ptr1),y
+        bpl     @L3
 
-; If the result is != 0, return -1
+; Load the final result.
 
-@L1:    lda     tmp2
-        beq     @L2
-
-        tax
-        sta     sreg
+@L4:    lda     time+3
         sta     sreg+1
-        rts
-
-; Reload the low byte of the result and return
-
-@L2:    lda     tmp1
+        lda     time+2
+        sta     sreg
+        ldx     time+1
+        lda     time
         rts
 
 .endproc
diff --git a/libsrc/common/tolower.s b/libsrc/common/tolower.s
index 828be1cb1..9c143f1ce 100644
--- a/libsrc/common/tolower.s
+++ b/libsrc/common/tolower.s
@@ -10,19 +10,20 @@
 ; int tolower (int c);
 ;
 
-        .export         _tolower
+        .export         _tolower, tolowerdirect
         .include        "ctype.inc"
         .import         ctypemaskdirect
 
 _tolower:
         cpx     #$00            ; out of range?
-        bne     @L2             ; if so, return the argument unchanged
-        tay                     ; save char
+        bne     out             ; if so, return the argument unchanged
+tolowerdirect:
+        pha                     ; save char
         jsr     ctypemaskdirect ; get character classification
         and     #CT_UPPER       ; upper case char?
         beq     @L1             ; jump if no
-        tya                     ; restore char
+        pla                     ; restore char
         adc     #<('a'-'A')     ; make lower case char (ctypemaskdirect ensures carry clear)
         rts
-@L1:    tya                     ; restore char
-@L2:    rts
+@L1:    pla                     ; restore char
+out:    rts
diff --git a/libsrc/common/ungetc.s b/libsrc/common/ungetc.s
index 7e8c1f94f..c661600af 100644
--- a/libsrc/common/ungetc.s
+++ b/libsrc/common/ungetc.s
@@ -62,10 +62,6 @@
 ; File is not open or the character is invalid
 
 error:  lda     #EINVAL
-        jsr     ___seterrno
-        lda     #$FF                    ; Return -1
-        tax
-        rts
+        jmp     ___directerrno
 
 .endproc
-
diff --git a/libsrc/common/vfprintf.s b/libsrc/common/vfprintf.s
index 1225bcc47..3dc1e6729 100644
--- a/libsrc/common/vfprintf.s
+++ b/libsrc/common/vfprintf.s
@@ -8,7 +8,7 @@
         .export         _vfprintf
         .import         push1, pushwysp, incsp6
         .import         _fwrite, __printf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -121,15 +121,15 @@ _vfprintf:
 ; exactly as _printf expects it. Parameters will get dropped by _printf.
 
         ldy     #2
-        lda     (sp),y          ; Low byte of f
+        lda     (c_sp),y        ; Low byte of f
         sta     ptr
         lda     #<outdesc
-        sta     (sp),y
+        sta     (c_sp),y
         iny
-        lda     (sp),y          ; High byte of f
+        lda     (c_sp),y        ; High byte of f
         sta     ptr+1
         lda     #>outdesc
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Restore low byte of ap and call _printf
 
diff --git a/libsrc/common/vfscanf.s b/libsrc/common/vfscanf.s
index c7d6e5564..71d7c634c 100644
--- a/libsrc/common/vfscanf.s
+++ b/libsrc/common/vfscanf.s
@@ -61,16 +61,16 @@ _vfscanf:
 ; Swap f against &d on the stack, placing f into d.data
 
         ldy     #2              ; Offset of f on the stack
-        lda     (sp),y
+        lda     (c_sp),y
         sta     d + SCANFDATA::DATA
         lda     #<d
-        sta     (sp),y
+        sta     (c_sp),y
 
         iny                     ; High byte
-        lda     (sp),y
+        lda     (c_sp),y
         sta     d + SCANFDATA::DATA + 1
         lda     #>d
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Restore the low byte of ap, and call the _scanf function
 
diff --git a/libsrc/common/vprintf.s b/libsrc/common/vprintf.s
index 0958b1038..1c44b61ef 100644
--- a/libsrc/common/vprintf.s
+++ b/libsrc/common/vprintf.s
@@ -7,7 +7,7 @@
         .export         _vprintf
         .import         _vfprintf, _stdout
         .import         decsp2
-        .importzp       sp
+        .importzp       c_sp
 
 
 .proc   _vprintf
@@ -23,20 +23,20 @@
 ; Move the format parameter down and store stdout in it's place
 
         ldy     #2
-        lda     (sp),y
+        lda     (c_sp),y
         ldy     #0
-        sta     (sp),y
+        sta     (c_sp),y
         ldy     #3
-        lda     (sp),y
+        lda     (c_sp),y
         ldy     #1
-        sta     (sp),y
+        sta     (c_sp),y
 
         iny
         lda     _stdout
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         lda     _stdout+1
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Restore A
 
diff --git a/libsrc/common/vscanf.s b/libsrc/common/vscanf.s
index 94afe527f..a97bd163a 100644
--- a/libsrc/common/vscanf.s
+++ b/libsrc/common/vscanf.s
@@ -31,22 +31,22 @@ _vscanf:
 ; Move the format down
 
         ldy     #2
-        lda     (sp),y          ; Load byte of format
+        lda     (c_sp),y        ; Load byte of format
         ldy     #0
-        sta     (sp),y
+        sta     (c_sp),y
         ldy     #3
-        lda     (sp),y
+        lda     (c_sp),y
         ldy     #1
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Store stdin into the stack frame
 
         iny
         lda     _stdin
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         lda     _stdin+1
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Restore the low byte of ap and jump to vfscanf, which will cleanup the stack
 
diff --git a/libsrc/common/vsnprintf.s b/libsrc/common/vsnprintf.s
index 048a756c3..780ab10ee 100644
--- a/libsrc/common/vsnprintf.s
+++ b/libsrc/common/vsnprintf.s
@@ -8,7 +8,7 @@
         .export         _vsnprintf, vsnprintf
         .import         ldaxysp, popax, incsp2, incsp6
         .import         _memcpy, __printf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .include        "errno.inc"
 
@@ -55,19 +55,19 @@ vsnprintf:
 ; be formatted and counted.
 
         ldy     #2
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1
 
         lda     #<outdesc
-        sta     (sp),y
+        sta     (c_sp),y
 
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         bmi     L9              ; More than $7FFF
         sta     ptr1+1
 
         lda     #>outdesc
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Write size-1 to outdesc.uns.  It will be -1 if there is no buffer.
 
@@ -178,12 +178,12 @@ out:
         clc
         adc     ccount+0
         ldy     #4
-        sta     (sp),y
+        sta     (c_sp),y
 
         lda     bufptr+1
         adc     ccount+1
         iny
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Get Count from stack
 
diff --git a/libsrc/common/vsprintf.s b/libsrc/common/vsprintf.s
index b4cb9c419..65a961955 100644
--- a/libsrc/common/vsprintf.s
+++ b/libsrc/common/vsprintf.s
@@ -30,7 +30,7 @@ _vsprintf:
         ldy     #2
         jsr     staxysp
 
-; Contine by jumping to vsnprintf, which expects ap on the CPU stack and will
+; Continue by jumping to vsnprintf, which expects ap on the CPU stack and will
 ; cleanup the C stack
 
         jmp     vsnprintf
diff --git a/libsrc/common/vsscanf.s b/libsrc/common/vsscanf.s
index 335712b20..2061861dc 100644
--- a/libsrc/common/vsscanf.s
+++ b/libsrc/common/vsscanf.s
@@ -9,7 +9,7 @@
         .export         _vsscanf
 
         .import         popax, __scanf
-        .importzp       sp, ptr1, ptr2
+        .importzp       c_sp, ptr1, ptr2
 
         .macpack        generic
 
@@ -165,15 +165,15 @@ d:      .addr   get
 ; to d
 
         ldy     #2                      ; Stack offset of str
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sd + SSCANFDATA::STR
         lda     #<d
-        sta     (sp),y
+        sta     (c_sp),y
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sd + SSCANFDATA::STR+1
         lda     #>d
-        sta     (sp),y
+        sta     (c_sp),y
 
         lda     #$00
         sta     sd + SSCANFDATA::INDEX
diff --git a/libsrc/common/zx02.s b/libsrc/common/zx02.s
new file mode 100644
index 000000000..02256a768
--- /dev/null
+++ b/libsrc/common/zx02.s
@@ -0,0 +1,148 @@
+; void __fastcall__ decompress_zx02(const void *src, void *dest)
+;
+; De-compressor for ZX02 files
+;
+; Compress with:
+;    zx02 input.bin output.zx0
+;
+; (c) 2022 DMSC
+; Code under MIT license, see LICENSE file.
+
+        .export         _decompress_zx02
+
+        .import         popax
+        .importzp       ptr1, ptr2, ptr3, tmp1, tmp2
+
+offset_hi = tmp1
+ZX0_src   = ptr1
+ZX0_dst   = ptr2
+bitr      = tmp2
+pntr      = ptr3
+
+.proc _decompress_zx02
+        sta     ZX0_dst
+        stx     ZX0_dst+1
+
+        jsr     popax
+        sta     ZX0_src
+        stx     ZX0_src+1
+
+        ; Init values
+        lda     #$80
+        sta     bitr
+        ldy     #$FF
+        sty     pntr
+        iny
+        sty     offset_hi ; Y = 0 at end of init
+
+; Decode literal: Copy next N bytes from compressed file
+; Elias(length)  byte[1]  byte[2]  ...  byte[N]
+decode_literal:
+        ldx     #$01
+        jsr     get_elias
+
+cop0:
+        lda     (ZX0_src), y
+        inc     ZX0_src
+        bne     :+
+        inc     ZX0_src+1
+
+:       sta     (ZX0_dst),y
+        inc     ZX0_dst
+        bne     :+
+        inc     ZX0_dst+1
+
+:       dex
+        bne     cop0
+
+        asl     bitr
+        bcs     dzx0s_new_offset
+
+        ; Copy from last offset (repeat N bytes from last offset)
+        ; Elias(length)
+        inx
+        jsr     get_elias
+
+dzx0s_copy:
+        lda     ZX0_dst+1
+        sbc     offset_hi  ; C=0 from get_elias
+        sta     pntr+1
+
+cop1:
+        ldy     ZX0_dst
+        lda     (pntr), y
+        ldy     #0
+        sta     (ZX0_dst),y
+        inc     ZX0_dst
+        bne     :+
+        inc     ZX0_dst+1
+        inc     pntr+1
+:       dex
+        bne     cop1
+
+        asl     bitr
+        bcc     decode_literal
+
+; Copy from new offset (repeat N bytes from new offset)
+; Elias(MSB(offset))  LSB(offset)  Elias(length-1)
+dzx0s_new_offset:
+        ; Read elias code for high part of offset
+        inx
+        jsr     get_elias
+        beq     exit  ; Read a 0, signals the end
+
+        ; Decrease and divide by 2
+        dex
+        txa
+        lsr
+        sta     offset_hi
+
+        ; Get low part of offset, a literal 7 bits
+        lda     (ZX0_src), y
+        inc     ZX0_src
+        bne     :+
+        inc     ZX0_src+1
+
+:       ; Divide by 2
+        ror
+        eor     #$ff
+        sta     pntr
+
+        ; And get the copy length.
+        ; Start elias reading with the bit already in carry:
+        ldx     #1
+        jsr     elias_skip1
+
+        inx
+        bcc     dzx0s_copy
+
+; Read an elias-gamma interlaced code.
+elias_get:
+        ; Read next data bit to result
+        asl     bitr
+        rol
+        tax
+
+get_elias:
+        ; Get one bit
+        asl     bitr
+        bne     elias_skip1
+
+        ; Read new bit from stream
+        lda     (ZX0_src), y
+        inc     ZX0_src
+        bne     :+
+        inc     ZX0_src+1
+
+:     ; sec   ; not needed, C=1 guaranteed from last bit
+        rol
+        sta     bitr
+
+elias_skip1:
+        txa
+        bcs     elias_get
+
+        ; Got ending bit, stop reading
+exit:
+        rts
+.endproc
diff --git a/libsrc/conio/cgets.c b/libsrc/conio/cgets.c
new file mode 100644
index 000000000..290a6b131
--- /dev/null
+++ b/libsrc/conio/cgets.c
@@ -0,0 +1,76 @@
+/*  Created: 2025-06-15 Russell-S-Harper
+** Modified: <iso-date> <author>
+**    Notes: <e.g. revisions made to support target, edge cases, bugs, etc.>
+**
+** char* __fastcall__ cgets (char* buffer, int size);
+*/
+
+#include <stddef.h>
+#include <conio.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifndef CRLF
+#define CRLF "\r\n"
+#endif /* CRLF */
+
+char* __fastcall__ cgets (char* buffer, int size)
+/* Get a string of characters directly from the console. The function returns
+** when size - 1 characters or either CR/LF are read. Note the parameters are
+** more aligned with stdio fgets() as opposed to the quirky "standard" conio
+** cgets(). Besides providing saner parameters, the function also echoes CRLF
+** when either CR/LF are read but does NOT append either in the buffer. This is
+** to correspond to stdio fgets() which echoes CRLF, but prevents a "gotcha"
+** where the buffer might not be able to accommodate both CR and LF at the end.
+**
+**   param: buffer - where to save the input, must be non-NULL
+**   param: size - size of the buffer, must be > 1
+**  return: buffer if successful, NULL on error
+*/
+{
+    int i = 0;
+    unsigned char w, x, y;
+    char c;
+
+    if (buffer && size > 1) {
+        /* Just need the width */
+        screensize (&w, &y);
+        /* Actually just the last column! */
+        --w;
+        cursor (1);
+        for (buffer[i] = '\0', --size; i < size; ) {
+            c = cgetc ();
+            /* Handle CR/LF */
+            if (strchr (CRLF, c)) {
+                /* Echo CRLF, but don't append either CR/LF */
+                cputs (CRLF);
+                break;
+            }
+            /* Handle backspace */
+            if (c == '\b') {
+                if (i > 0) {
+                    /* Remove the character */
+                    buffer[--i] = '\0';
+                    /* Logic to account for line wrapping */
+                    y = wherey ();
+                    x = wherex ();
+                    y = x? y: y - 1;
+                    x = x? x - 1: w;
+                    /* Clear the character */
+                    gotoxy (x, y);
+                    cputc (' ');
+                    gotoxy (x, y);
+                }
+            /* Handle regular characters */
+            } else if (isprint (c)) {
+                cputc (c);
+                buffer[i] = c;
+                buffer[++i] = '\0';
+            }
+        }
+        cursor (0);
+    }
+
+    /* Done */
+    return (i > 0)? buffer: NULL;
+}
diff --git a/libsrc/conio/cprintf.s b/libsrc/conio/cprintf.s
index 01bd0bbc6..80bca2308 100644
--- a/libsrc/conio/cprintf.s
+++ b/libsrc/conio/cprintf.s
@@ -6,7 +6,7 @@
 
         .export         _cprintf
         .import         pushax, addysp, _vcprintf
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
         .macpack        generic
 
@@ -31,9 +31,9 @@ _cprintf:
         dey
         dey                             ; Sub size of Format
         tya
-        add     sp
+        add     c_sp
         sta     ptr1
-        ldx     sp+1
+        ldx     c_sp+1
         bcc     @L1
         inx
 @L1:    stx     ptr1+1
diff --git a/libsrc/conio/cputs.s b/libsrc/conio/cputs.s
index 62e757b84..d6024c0e5 100644
--- a/libsrc/conio/cputs.s
+++ b/libsrc/conio/cputs.s
@@ -8,13 +8,12 @@
         .export         _cputsxy, _cputs
         .import         gotoxy, _cputc
         .importzp       ptr1, tmp1
-        .macpack        cpu
 
 _cputsxy:
         sta     ptr1            ; Save s for later
         stx     ptr1+1
         jsr     gotoxy          ; Set cursor, pop x and y
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_BRA8)
         bra     L0              ; Same as cputs...
 .else
         jmp     L0              ; Same as cputs...
@@ -23,31 +22,17 @@ _cputsxy:
 _cputs: sta     ptr1            ; Save s
         stx     ptr1+1
 
-.if (.cpu .bitand CPU_ISET_65SC02)
-
-L0:     lda     (ptr1)          ; (5)
-        beq     L9              ; (7)  Jump if done
-        jsr     _cputc          ; (13) Output char, advance cursor
-        inc     ptr1            ; (18) Bump low byte
-        bne     L0              ; (20) Next char
-        inc     ptr1+1          ; (25) Bump high byte
-        bne     L0
-
+L0:
+.if .cap(CPU_HAS_ZPIND)
+        lda     (ptr1)          ; (5)
 .else
-
-L0:     ldy     #0              ; (2)
-L1:     lda     (ptr1),y        ; (7)
-        beq     L9              ; (9)  Jump if done
-        iny
-        sty     tmp1            ; (14) Save offset
-        jsr     _cputc          ; (20) Output char, advance cursor
-        ldy     tmp1            ; (23) Get offset
-        bne     L1              ; (25) Next char
-        inc     ptr1+1          ; (30) Bump high byte
-        bne     L1
-
+        ldy     #0              ; (2)
+        lda     (ptr1),y        ; (7)
 .endif
-
-; Done
-
+        beq     L9              ; (7/9)  Jump if done
+        jsr     _cputc          ; (13/15) Output char, advance cursor
+        inc     ptr1            ; (18/20) Bump low byte
+        bne     L0              ; (20/22) Next char
+        inc     ptr1+1          ; (25/27) Bump high byte
+        bne     L0
 L9:     rts
diff --git a/libsrc/conio/cscanf.s b/libsrc/conio/cscanf.s
index 7e54a844f..7ee532626 100644
--- a/libsrc/conio/cscanf.s
+++ b/libsrc/conio/cscanf.s
@@ -23,8 +23,8 @@ _cscanf:
 
 ; Now, calculate the va_list pointer -- which points to format.
 
-        ldx     sp+1
-        add     sp
+        ldx     c_sp+1
+        add     c_sp
         bcc     @L1
         inx
 @L1:    sta     ptr1
diff --git a/libsrc/conio/scrsize.s b/libsrc/conio/scrsize.s
index 834c14820..fc1691b87 100644
--- a/libsrc/conio/scrsize.s
+++ b/libsrc/conio/scrsize.s
@@ -10,8 +10,6 @@
         .import         screensize
         .importzp       ptr1, ptr2
 
-        .macpack        cpu
-
 .proc   _screensize
 
         sta     ptr2            ; Store the y pointer
@@ -20,7 +18,7 @@
         jsr     screensize      ; Get screensize into X/Y
         tya                     ; Get Y size into A
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         sta     (ptr2)
         txa
         sta     (ptr1)
diff --git a/libsrc/conio/vcprintf.s b/libsrc/conio/vcprintf.s
index 595a2d2c5..aa7b6aa07 100644
--- a/libsrc/conio/vcprintf.s
+++ b/libsrc/conio/vcprintf.s
@@ -7,10 +7,9 @@
         .export         _vcprintf
         .import         pushax, popax, popptr1
         .import         __printf, _cputc
-        .importzp       sp, ptr1, ptr2, ptr3, tmp1
+        .importzp       c_sp, ptr1, ptr2, ptr3, tmp1
 
         .macpack        generic
-        .macpack        cpu
 
 .data
 
@@ -74,7 +73,7 @@ out:    jsr     popax           ; count
 
 ; Loop outputting characters
 
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND, CPU_HAS_BRA8)
 
 @L1:    dec     outdesc+6
         beq     @L4
@@ -138,10 +137,10 @@ _vcprintf:
 ; Get the format parameter and push it again
 
         ldy     #1
-        lda     (sp),y
+        lda     (c_sp),y
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         jsr     pushax
 
 ; Replace the passed format parameter on the stack by &d - this creates
@@ -150,10 +149,10 @@ _vcprintf:
 
         ldy     #2              ; Low byte of d
         lda     #<outdesc
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         lda     #>outdesc
-        sta     (sp),y
+        sta     (c_sp),y
 
 ; Restore ap and call _printf
 
diff --git a/libsrc/creativision/crt0.s b/libsrc/creativision/crt0.s
index 5185ff237..70009e2ba 100644
--- a/libsrc/creativision/crt0.s
+++ b/libsrc/creativision/crt0.s
@@ -40,8 +40,8 @@ entry:
         ; Setup the argument stack ptr
         lda     #<(__ZP_LAST__ + __STACKSIZE__)
         ldx     #>(__ZP_LAST__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1
+        sta     c_sp
+        stx     c_sp+1
 
         ; Call module constructors
         jsr     initlib
diff --git a/libsrc/creativision/sysuname.s b/libsrc/creativision/sysuname.s
index 725cb2a62..43a0c7659 100644
--- a/libsrc/creativision/sysuname.s
+++ b/libsrc/creativision/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/cx16/crt0.s b/libsrc/cx16/crt0.s
index e37a64a7c..5ee81b184 100644
--- a/libsrc/cx16/crt0.s
+++ b/libsrc/cx16/crt0.s
@@ -80,8 +80,8 @@ init:
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Switch to the lower/UPPER PetSCII charset.
 
diff --git a/libsrc/cx16/getdevice.s b/libsrc/cx16/getdevice.s
index 5f2e74af4..70f883db0 100644
--- a/libsrc/cx16/getdevice.s
+++ b/libsrc/cx16/getdevice.s
@@ -56,7 +56,7 @@ next:   inx
 
         lda     STATUS
 
-; Either the Kernal calls above were successfull, or there was
+; Either the Kernal calls above were successful, or there was
 ; already a cmdchannel to the device open -- which is a pretty
 ; good indication of its existence. ;-)
 
diff --git a/libsrc/cx16/mou/cx16-std.s b/libsrc/cx16/mou/cx16-std.s
index f211815de..5bfe27a7d 100644
--- a/libsrc/cx16/mou/cx16-std.s
+++ b/libsrc/cx16/mou/cx16-std.s
@@ -238,11 +238,11 @@ MOVE:   php
         jsr     CMOVEY                  ; Set it
 
         ldy     #$01
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos+1
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     XPos                    ; New X position
         jsr     CMOVEX                  ; Move the cursor
 
diff --git a/libsrc/cx16/sysuname.s b/libsrc/cx16/sysuname.s
index 4aefb7cf5..06f4d7662 100644
--- a/libsrc/cx16/sysuname.s
+++ b/libsrc/cx16/sysuname.s
@@ -24,13 +24,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/cx16/tgi/cx320p1.s b/libsrc/cx16/tgi/cx320p1.s
index 2fcd9adf3..f42d91c33 100644
--- a/libsrc/cx16/tgi/cx320p1.s
+++ b/libsrc/cx16/tgi/cx320p1.s
@@ -91,7 +91,7 @@ Y2              := ptr4
 
 .bss
 
-; The colors are indicies into a TGI palette.  The TGI palette is indicies into
+; The colors are indices into a TGI palette.  The TGI palette is indices into
 ; VERA's palette.  Vera's palette is a table of Red, Green, and Blue levels.
 ; The first 16 RGB elements mimic the Commodore 64's colors.
 
@@ -267,7 +267,7 @@ GETPALETTE:
 ; GETDEFPALETTE: Return the default palette for the driver in .XA. All
 ; drivers should return something reasonable here, even drivers that don't
 ; support palettes, otherwise the caller has no way to determine the colors
-; of the (not changable) palette.
+; of the (not changeable) palette.
 ;
 ; Must set an error code: NO (all drivers must have a default palette)
 
diff --git a/libsrc/cx16/tgi/cx640p1.s b/libsrc/cx16/tgi/cx640p1.s
new file mode 100644
index 000000000..815c4ab67
--- /dev/null
+++ b/libsrc/cx16/tgi/cx640p1.s
@@ -0,0 +1,675 @@
+;
+; Graphics driver for the 640 pixels across, 480 pixels down, 2 color mode
+; on the Commander X16
+;
+; 2024-06-11, Scott Hutter
+; Based on code by Greg King
+;
+
+        .include        "zeropage.inc"
+
+        .include        "tgi-kernel.inc"
+        .include        "tgi-error.inc"
+
+        .include        "cbm_kernal.inc"
+        .include        "cx16.inc"
+
+        .macpack        generic
+        .macpack        module
+
+
+; ------------------------------------------------------------------------
+; Header. Includes jump table and constants.
+
+        module_header   _cx640p1_tgi    ; 640 pixels across, 1 pixel per bit
+
+; First part of the header is a structure that has a signature,
+; and defines the capabilities of the driver.
+
+        .byte   $74, $67, $69           ; ASCII "tgi"
+        .byte   TGI_API_VERSION         ; TGI API version number
+        .addr   $0000                   ; Library reference
+        .word   640                     ; X resolution
+        .word   480                     ; Y resolution
+        .byte   2                       ; Number of drawing colors
+        .byte   0                       ; Number of screens available
+        .byte   8                       ; System font X size
+        .byte   8                       ; System font Y size
+        .word   $0100                   ; Aspect ratio (based on VGA display)
+        .byte   0                       ; TGI driver flags
+
+; Next, comes the jump table. Currently, all entries must be valid,
+; and may point to an RTS for test versions (function not implemented).
+
+        .addr   INSTALL
+        .addr   UNINSTALL
+        .addr   INIT
+        .addr   DONE
+        .addr   GETERROR
+        .addr   CONTROL
+        .addr   CLEAR
+        .addr   SETVIEWPAGE
+        .addr   SETDRAWPAGE
+        .addr   SETCOLOR
+        .addr   SETPALETTE
+        .addr   GETPALETTE
+        .addr   GETDEFPALETTE
+        .addr   SETPIXEL
+        .addr   GETPIXEL
+        .addr   LINE
+        .addr   BAR
+        .addr   TEXTSTYLE
+        .addr   OUTTEXT
+
+
+; ------------------------------------------------------------------------
+; Constant
+
+
+
+; ------------------------------------------------------------------------
+; Data.
+
+; Variables mapped to the zero page segment variables. Some of these are
+; used for passing parameters to the driver.
+
+X1              = ptr1
+Y1              = ptr2
+X2              = ptr3
+Y2              = ptr4
+
+ADDR            = tmp1          ; ADDR+1,2,3
+
+TEMP            = tmp3
+TEMP2           = tmp4          ; HORLINE
+TEMP3           = sreg          ; HORLINE
+
+
+; Absolute variables used in the code
+
+.bss
+
+; The colors are indices into a TGI palette.  The TGI palette is indices into
+; VERA's palette.  Vera's palette is a table of Red, Green, and Blue levels.
+; The first 16 RGB elements mimic the Commodore 64's colors.
+
+SCRBASE:        .res    1           ; High byte of screen base
+BITMASK:        .res    1           ; $00 = clear, $FF = set pixels
+
+defpalette:     .res    2
+palette:        .res    2
+
+color:          .res    1           ; Stroke and fill index
+text_mode:      .res    1           ; Old text mode
+
+tempX:          .res    2
+tempY:          .res    2
+ERR2:           .res    1
+ERR:            .res    1
+SY:             .res    1
+SX:             .res    1
+DY:             .res    1
+DX:             .res    1
+CURRENT_Y:      .res    2
+CURRENT_X:      .res    2
+
+.data
+
+ERROR:          .byte   TGI_ERR_OK  ; Error code
+
+
+; Constants and tables
+
+.rodata
+
+veracolors:
+col_black:  .byte %00000000, %00000000
+col_white:  .byte %11111111, %00001111
+col_red:    .byte %00000000, %00001000
+col_cyan:   .byte %11111110, %00001010
+col_purple: .byte %01001100, %00001100
+col_green:  .byte %11000101, %00000000
+col_blue:   .byte %00001010, %00000000
+col_yellow: .byte %11100111, %00001110
+col_orange: .byte %10000101, %00001101
+col_brown:  .byte %01000000, %00000110
+col_lred:   .byte %01110111, %00001111
+col_gray1:  .byte %00110011, %00000011
+col_gray2:  .byte %01110111, %00000111
+col_lgreen: .byte %11110110, %00001010
+col_lblue:  .byte %10001111, %00000000
+col_gray3:  .byte %10111011, %00001011
+
+; Bit masks for setting pixels
+bitMasks1:
+    .byte %10000000, %01000000, %00100000, %00010000
+    .byte %00001000, %00000100, %00000010, %00000001
+bitMasks2:
+    .byte %01111111, %10111111, %11011111, %11101111
+    .byte %11110111, %11111011, %11111101, %11111110
+
+
+.code
+
+; ------------------------------------------------------------------------
+; INSTALL routine. Is called after the driver is loaded into memory. May
+; initialize anything that has to be done just once. Is probably empty
+; most of the time.
+;
+; Must set an error code: NO
+
+INSTALL:
+; Create the default palette.
+        lda #$00
+        sta defpalette
+        lda #$01
+        sta defpalette+1
+
+        ; Fall through.
+
+; ------------------------------------------------------------------------
+; UNINSTALL routine. Is called before the driver is removed from memory. May
+; clean up anything done by INSTALL, but is probably empty most of the time.
+;
+; Must set an error code: NO
+
+UNINSTALL:
+        rts
+
+; ------------------------------------------------------------------------
+; INIT: Changes an already installed device from text mode to graphics
+; mode.
+; Note that INIT/DONE may be called multiple times while the driver
+; is loaded, while INSTALL is called only once; so, any code that is needed
+; to initiate variables and so on must go here.  Setting the palette is not
+; needed because that is called by the graphics kernel later.
+; The graphics kernel never will call INIT when a graphics mode already is
+; active, so there is no need to protect against that.
+;
+; Must set an error code: YES
+
+INIT:   stz     ERROR           ; #TGI_ERR_OK
+
+; Save the current text mode.
+
+        sec
+        jsr     SCREEN_MODE
+        sta     text_mode
+
+; Switch into (640 x 480 x 2 bpp) graphics mode.
+
+        lda     #%00000000          ; DCSEL = 0, VRAM port 1
+        sta     VERA::CTRL
+        lda     #%00100001          ; Disable sprites, layer 1 enable, VGA
+        sta     VERA::DISP::VIDEO
+        lda     #%00000100          ; Bitmap mode enable
+        sta     VERA::L1::CONFIG
+        lda     #%00000001          ; Tile width 640
+        sta     VERA::L1::TILE_BASE
+        rts
+
+; ------------------------------------------------------------------------
+; DONE: Will be called to switch the graphics device back into text mode.
+; The graphics kernel never will call DONE when no graphics mode is active,
+; so there is no need to protect against that.
+;
+; Must set an error code: NO
+
+DONE:
+        jsr     CINT
+        lda     text_mode
+        clc
+        jmp     SCREEN_MODE
+
+; ------------------------------------------------------------------------
+; GETERROR: Return the error code in .A, and clear it.
+
+GETERROR:
+        lda     ERROR
+        stz     ERROR
+        rts
+
+; ------------------------------------------------------------------------
+; CONTROL: Platform-/driver-specific entry point.
+;
+; Must set an error code: YES
+
+CONTROL:
+        lda     #TGI_ERR_INV_FUNC
+        sta     ERROR
+        rts
+
+; ------------------------------------------------------------------------
+; CLEAR: Clear the screen.
+;
+; Must set an error code: NO
+
+CLEAR:
+        .scope inner
+
+        ; set up DCSEL=2
+        lda     #(2 << 1)
+        sta     VERA::CTRL
+
+        ; set cache writes
+        lda     #$40
+        tsb     VERA::DISP::VIDEO        ; VERA_FX_CTRL when DCSEL=2
+
+        ; set FX cache to all zeroes
+        lda     #(6 << 1)
+        sta     VERA::CTRL
+
+        lda     #$00
+        sta     VERA::DISP::VIDEO
+        sta     VERA::DISP::HSCALE
+        sta     VERA::DISP::VSCALE
+        sta     VERA::DISP::FRAME
+
+        stz     VERA::CTRL
+        ; set address and increment for bitmap area
+        stz     VERA::ADDR
+        stz     VERA::ADDR + 1
+        lda     #$30                    ; increment +4
+        sta     VERA::ADDR + 2
+
+        ldy     #$F0
+@blank_outer:
+        ldx     #$0A
+@blank_loop:
+
+        .repeat 8
+        stz VERA::DATA0
+        .endrep
+
+        dex
+        bne     @blank_loop
+        dey
+        bne     @blank_outer
+
+        ; set up DCSEL=2
+        lda     #(2 << 1)
+        sta     VERA::CTRL
+
+        ; set FX off (cache write bit 1 -> 0)
+        stz     VERA::DISP::VIDEO        ; VERA_FX_CTRL when DCSEL=2
+        stz     VERA::CTRL
+
+        .endscope
+        rts
+
+
+; ------------------------------------------------------------------------
+; SETVIEWPAGE: Set the visible page. Called with the new page in .A (0..n-1).
+; The page number already is checked to be valid by the graphics kernel.
+;
+; Must set an error code: NO (will be called only if page OK)
+
+SETVIEWPAGE:
+
+        ; Fall through.
+
+; ------------------------------------------------------------------------
+; SETDRAWPAGE: Set the drawable page. Called with the new page in .A (0..n-1).
+; The page number already is checked to be valid by the graphics kernel.
+;
+; Must set an error code: NO (will be called only if page OK)
+
+SETDRAWPAGE:
+        rts
+
+; ------------------------------------------------------------------------
+; SETPALETTE: Set the palette (not available with all drivers/hardware).
+; A pointer to the palette is passed in ptr1. Must set an error if palettes
+; are not supported
+;
+; Must set an error code: YES
+
+SETPALETTE:
+        stz     ERROR           ; #TGI_ERR_OK
+        ldy     #$01            ; Palette size of 2 colors
+@L1:    lda     (ptr1),y        ; Copy the palette
+        sta     palette,y
+        dey
+        bpl     @L1
+
+        ; set background color from palette color 0
+        lda     #$00
+        sta     VERA::ADDR
+        lda     #$FA
+        sta     VERA::ADDR+1
+        lda     #$01
+        sta     VERA::ADDR+2    ; write color RAM @ $1FA00
+
+        lda     palette
+        asl
+        tay
+        lda     veracolors,y
+        sta     VERA::DATA0
+
+        inc     VERA::ADDR      ; $1FA01
+
+        lda     palette
+        asl
+        tay
+        iny     ; second byte of color
+        lda     veracolors,y
+        sta     VERA::DATA0
+
+        ; set foreground color from palette color 1
+        inc     VERA::ADDR      ; $1FA02
+
+        lda     palette+1
+        asl
+        tay
+        lda     veracolors,y
+        sta     VERA::DATA0
+
+        inc     VERA::ADDR      ; $1FA03
+
+        lda     palette+1
+        asl
+        tay
+        iny     ; second byte of color
+        lda     veracolors,y
+        sta     VERA::DATA0
+        rts
+
+; ------------------------------------------------------------------------
+; SETCOLOR: Set the drawing color (in .A). The new color already is checked
+; to be in a valid range (0..maxcolor).
+;
+; Must set an error code: NO (will be called only if color OK)
+
+SETCOLOR:
+        tax
+        beq     @L1
+        lda     #$FF
+@L1:    sta     BITMASK
+        stx     color
+        rts
+
+; ------------------------------------------------------------------------
+; GETPALETTE: Return the current palette in .XA. Even drivers that cannot
+; set the palette should return the default palette here, so there's no
+; way for this function to fail.
+;
+; Must set an error code: NO
+
+GETPALETTE:
+        lda     #<palette
+        ldx     #>palette
+        rts
+
+; ------------------------------------------------------------------------
+; GETDEFPALETTE: Return the default palette for the driver in .XA. All
+; drivers should return something reasonable here, even drivers that don't
+; support palettes, otherwise the caller has no way to determine the colors
+; of the (not changeable) palette.
+;
+; Must set an error code: NO (all drivers must have a default palette)
+
+GETDEFPALETTE:
+        lda     #<defpalette
+        ldx     #>defpalette
+        rts
+
+; ------------------------------------------------------------------------
+; SETPIXEL: Draw one pixel at X1/Y1 = ptr1/ptr2 with the current drawing
+; color. The co-ordinates passed to this function never are outside the
+; visible screen area, so there is no need for clipping inside this function.
+;
+; Must set an error code: NO
+
+SETPIXEL:
+        jsr CALC
+
+        stx TEMP
+
+        lda ADDR
+        ldy ADDR+1
+        ldx #$00
+
+        sta VERA::ADDR
+        sty VERA::ADDR + 1
+        stx VERA::ADDR + 2
+
+        ldx TEMP
+
+        lda BITMASK
+        beq @ahead
+
+        ; if BITMASK = $00, white is line color
+        ; Set the bit in the byte at VERA_DATA0
+        lda VERA::DATA0      ; Load the byte at memory address
+        ora bitMasks1,X      ; OR with the bit mask
+        sta VERA::DATA0      ; Store back the modified byte
+        rts
+
+@ahead:
+        ; if BITMASK = $FF, black is line color
+        lda VERA::DATA0      ; Load the byte at memory address
+        and bitMasks2,X      ; OR with the bit mask
+        sta VERA::DATA0      ; Store back the modified byte
+        rts
+
+; ------------------------------------------------------------------------
+; GETPIXEL: Read the color value of a pixel, and return it in .XA. The
+; co-ordinates passed to this function never are outside the visible screen
+; area, so there is no need for clipping inside this function.
+
+GETPIXEL:
+        jsr CALC
+
+        stx TEMP
+
+        lda ADDR
+        ldy ADDR+1
+        ldx #$00
+
+        sta VERA::ADDR
+        sty VERA::ADDR + 1
+        stx VERA::ADDR + 2
+
+        ldx TEMP
+        lda VERA::DATA0      ; Load the byte at memory address
+        and bitMasks1,X
+
+        bne @ahead
+
+        ldx #$00
+        lda #$00
+        rts
+
+@ahead:
+        ldx #$00
+        lda #$01
+        rts
+
+; ------------------------------------------------------------------------
+; BAR: Draw a filled rectangle with the corners X1/Y1, X2/Y2, where
+; X1/Y1 = ptr1/ptr2 and X2/Y2 = ptr3/ptr4, using the current drawing color.
+; Contrary to most other functions, the graphics kernel will sort and clip
+; the co-ordinates before calling the driver; so on entry, the following
+; conditions are valid:
+;       X1 <= X2
+;       Y1 <= Y2
+;       (X1 >= 0) && (X1 < XRES)
+;       (X2 >= 0) && (X2 < XRES)
+;       (Y1 >= 0) && (Y1 < YRES)
+;       (Y2 >= 0) && (Y2 < YRES)
+;
+; Must set an error code: NO
+
+BAR:
+        ; Initialize tempY with Y1
+        lda Y1
+        sta tempY
+        lda Y1+1
+        sta tempY+1
+
+@outer_loop:
+        ; Compare tempY with Y2
+        lda tempY+1
+        cmp Y2+1
+        bcc @outer_continue   ; If tempY high byte < Y2 high byte, continue
+        bne @outer_end        ; If tempY high byte > Y2 high byte, end
+        lda tempY
+        cmp Y2
+        bcc @outer_continue   ; If tempY low byte < Y2 low byte, continue
+        beq @outer_end        ; If tempY low byte = Y2 low byte, end
+
+@outer_continue:
+        ; Initialize tempX with X1
+        lda X1
+        sta tempX
+        lda X1+1
+        sta tempX+1
+
+@inner_loop:
+        ; Compare tempX with X2
+        lda tempX+1
+        cmp X2+1
+        bcc @inner_continue   ; If tempX high byte < X2 high byte, continue
+        bne @inner_end        ; If tempX high byte > X2 high byte, end
+        lda tempX
+        cmp X2
+        bcc @inner_continue   ; If tempX low byte < X2 low byte, continue
+
+@inner_end:
+        ; Increment tempY
+        inc tempY
+        bne @outer_loop       ; If no overflow, continue outer loop
+        inc tempY+1           ; If overflow, increment high byte
+
+@inner_continue:
+        ; Call setpixel(tempX, tempY)
+        lda X1
+        pha
+        lda X1+1
+        pha
+        lda Y1
+        pha
+        lda Y1+1
+        pha
+
+        lda tempX
+        ldx tempX+1
+        sta X1
+        stx X1+1
+
+        lda tempY
+        ldx tempY+1
+        sta Y1
+        stx Y1+1
+
+        jsr SETPIXEL
+
+        pla
+        sta Y1+1
+        pla
+        sta Y1
+        pla
+        sta X1+1
+        pla
+        sta X1
+
+    ; Increment tempX
+        inc tempX
+        bne @inner_loop_check ; If no overflow, continue
+        inc tempX+1           ; If overflow, increment high byte
+
+@inner_loop_check:
+        ; Compare tempX with X2 again after increment
+        lda tempX+1
+        cmp X2+1
+        bcc @inner_continue   ; If tempX high byte < X2 high byte, continue
+        bne @outer_increment  ; If tempX high byte > X2 high byte, increment tempY
+        lda tempX
+        cmp X2
+        bcc @inner_continue   ; If tempX low byte < X2 low byte, continue
+
+@outer_increment:
+        ; Increment tempY
+        inc tempY
+        bne @outer_loop       ; If no overflow, continue outer loop
+        inc tempY+1           ; If overflow, increment high byte
+
+@outer_end:
+        jmp @done
+
+@done:
+        rts
+
+; ------------------------------------------------------------------------
+; TEXTSTYLE: Set the style used when calling OUTTEXT. Text scaling in X and Y
+; directions are passed in .X and .Y, the text direction is passed in .A.
+;
+; Must set an error code: NO
+
+TEXTSTYLE:
+        rts
+
+; ------------------------------------------------------------------------
+; OUTTEXT: Output text at X/Y = ptr1/ptr2 using the current color and the
+; current text style. The text to output is given as a zero-terminated
+; string with address in ptr3.
+;
+; Must set an error code: NO
+
+OUTTEXT:
+        rts
+
+
+; ------------------------------------------------------------------------
+; Calculate all variables to plot the pixel at X1/Y1.
+;------------------------
+;< X1,Y1 - pixel
+;> ADDR - address of card
+;> X - bit number (X1 & 7)
+CALC:
+        lda     Y1+1
+        sta     ADDR+1
+        lda     Y1
+        asl
+        rol     ADDR+1
+        asl
+        rol     ADDR+1          ; Y*4
+        clc
+        adc     Y1
+        sta     ADDR
+        lda     Y1+1
+        adc     ADDR+1
+        sta     ADDR+1          ; Y*4+Y=Y*5
+        lda     ADDR
+        asl
+        rol     ADDR+1
+        asl
+        rol     ADDR+1
+        asl
+        rol     ADDR+1
+        asl
+        rol     ADDR+1
+        sta     ADDR            ; Y*5*16=Y*80
+        lda     X1+1
+        sta     TEMP
+        lda     X1
+        lsr     TEMP
+        ror
+        lsr     TEMP
+        ror
+        lsr     TEMP
+        ror
+        clc
+        adc     ADDR
+        sta     ADDR
+        lda     ADDR+1          ; ADDR = Y*80+x/8
+        adc     TEMP
+        sta     ADDR+1
+        lda     ADDR+1
+        lda     X1
+        and     #7
+        tax
+        rts
+
+
+.include        "../../tgi/tgidrv_line.inc"
diff --git a/libsrc/cx16/videomode.s b/libsrc/cx16/videomode.s
index 998316858..46f461fca 100644
--- a/libsrc/cx16/videomode.s
+++ b/libsrc/cx16/videomode.s
@@ -9,6 +9,13 @@
 ; #define VIDEOMODE_40x15         0x04
 ; #define VIDEOMODE_20x30         0x05
 ; #define VIDEOMODE_20x15         0x06
+; #define VIDEOMODE_22x23         0x07
+; #define VIDEOMODE_64x50         0x08
+; #define VIDEOMODE_64x25         0x09
+; #define VIDEOMODE_32x50         0x0A
+; #define VIDEOMODE_32x25         0x0B
+; #define VIDEOMODE_80COL         VIDEOMODE_80x60
+; #define VIDEOMODE_40COL         VIDEOMODE_40x30
 ; #define VIDEOMODE_320x240       0x80
 ; #define VIDEOMODE_SWAP          (-1)
 ;
diff --git a/libsrc/cx16/waitvsync.s b/libsrc/cx16/waitvsync.s
index d75a7a735..e0d9f9768 100644
--- a/libsrc/cx16/waitvsync.s
+++ b/libsrc/cx16/waitvsync.s
@@ -6,7 +6,7 @@
 ;
 ; VERA's vertical sync causes IRQs which increment the jiffy timer.
 ;
-; Updated by ZeroByteOrg to use Kernal API RDTIM to retreive the TIMER variable
+; Updated by ZeroByteOrg to use Kernal API RDTIM to retrieve the TIMER variable
 ;
 
         .export         _waitvsync
diff --git a/libsrc/dbg/dbgdump.s b/libsrc/dbg/dbgdump.s
index 8ab646d21..335175840 100644
--- a/libsrc/dbg/dbgdump.s
+++ b/libsrc/dbg/dbgdump.s
@@ -1,29 +1,29 @@
 ;
 ; Ullrich von Bassewitz, 11.08.1998
 ;
-; char* __cdecl__ DbgMemDump (unsigend Addr, char* Buf, unsigned char Length);
+; char* __cdecl__ DbgMemDump (unsigned Addr, char* Buf, unsigned char Length);
 ;
 
         .export         _DbgMemDump
         .import         addysp1
         .import         __hextab
-        .importzp       sp, tmp2, tmp3, tmp4, ptr3, ptr4
+        .importzp       c_sp, tmp2, tmp3, tmp4, ptr3, ptr4
 
 _DbgMemDump:
         ldy     #0
-        lda     (sp),y          ; Get length
+        lda     (c_sp),y        ; Get length
         sta     tmp4
         iny
-        lda     (sp),y          ; Get the string buffer
+        lda     (c_sp),y        ; Get the string buffer
         sta     ptr3
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr3+1
         iny
-        lda     (sp),y          ; Get the address
+        lda     (c_sp),y        ; Get the address
         sta     ptr4
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr4+1
         jsr     addysp1         ; Drop the parameters
 
diff --git a/libsrc/dbg/dbgsupp.s b/libsrc/dbg/dbgsupp.s
index b1f122013..ce503bcab 100644
--- a/libsrc/dbg/dbgsupp.s
+++ b/libsrc/dbg/dbgsupp.s
@@ -36,9 +36,9 @@ DbgBreak:
 
         jsr     DbgSwapZP       ; Swap stuff
         lda     #<DbgStack      ; Set new stack
-        sta     sp
+        sta     c_sp
         lda     #>DbgStack
-        sta     sp+1
+        sta     c_sp+1
         jsr     ResetDbgBreaks  ; Reset temporary breakpoints
         jsr     _DbgEntry       ; Call C code
         jsr     SetDbgBreaks    ; Set temporary breakpoints
@@ -61,7 +61,7 @@ DbgStack:
 ; Swap space for the C temporaries
 
 CTemp:
-_DbgCS: .res    2               ; sp
+_DbgCS: .res    2               ; c_sp
 _DbgHI: .res    2               ; sreg
         .res    (zpsavespace-4) ; Other stuff
 
@@ -78,7 +78,7 @@ Swap1:  ldx     CTemp,y
         lda     <__ZP_START__,y
         sta     CTemp,y
         txa
-        sta     sp,y
+        sta     c_sp,y
         dey
         bpl     Swap1
         rts
diff --git a/libsrc/gamate/crt0.s b/libsrc/gamate/crt0.s
index 5a5bb3aa0..67fa8813f 100644
--- a/libsrc/gamate/crt0.s
+++ b/libsrc/gamate/crt0.s
@@ -34,8 +34,8 @@ Start:
         ; Set up the stack
         lda     #<(__RAM_START__+__RAM_SIZE__)
         ldx     #>(__RAM_START__+__RAM_SIZE__)
-        sta     sp
-        stx     sp + 1
+        sta     c_sp
+        stx     c_sp + 1
 
         ; Call module constructors
         jsr     initlib
diff --git a/libsrc/geos-cbm/system/get_ostype.s b/libsrc/geos-cbm/system/get_ostype.s
index 6e6731952..9ba8b7982 100644
--- a/libsrc/geos-cbm/system/get_ostype.s
+++ b/libsrc/geos-cbm/system/get_ostype.s
@@ -82,8 +82,8 @@ tvmode:                         ; PAL/NTSC check here, result in A
         pha
         lda #IO_IN              ; enable access to I/O
         sta CPU_DATA
-        bit rasreg
-        bpl tvmode              ; wait for rasterline  127<x<256
+:       bit rasreg
+        bpl :-                  ; wait for rasterline  127<x<256
         lda #24                 ; (rasterline now >=256!)
 modelp:
         cmp rasreg              ; wait for rasterline = 24 (or 280 on PAL)
diff --git a/libsrc/geos-common/const.inc b/libsrc/geos-common/const.inc
index c0294e01d..ab45a19a2 100644
--- a/libsrc/geos-common/const.inc
+++ b/libsrc/geos-common/const.inc
@@ -1,5 +1,5 @@
 ;
-;GeosConst - various system constans sorted by function
+;GeosConst - various system constants sorted by function
 ;reassembled by Maciej 'YTM/Elysium' Witkowiak
 ;4-2-99, 18-3-99
 
diff --git a/libsrc/geos-common/drivers/geos-stdmou.s b/libsrc/geos-common/drivers/geos-stdmou.s
index 88bbc7df9..aacb2590e 100644
--- a/libsrc/geos-common/drivers/geos-stdmou.s
+++ b/libsrc/geos-common/drivers/geos-stdmou.s
@@ -13,7 +13,7 @@
             .export _mouse_move, _mouse_buttons
 
             .import popsreg, addysp1
-            .importzp sp, sreg, ptr1
+            .importzp c_sp, sreg, ptr1
 
             .include "const.inc"
             .include "jumptab.inc"
@@ -87,22 +87,22 @@ _mouse_box:
 
         sta mouseBottom
 
-        lda (sp),y
+        lda (c_sp),y
         sta mouseRight
         iny
-        lda (sp),y
+        lda (c_sp),y
         sta mouseRight+1        ; maxx
 
         iny
-        lda (sp),y
+        lda (c_sp),y
         sta mouseTop
         iny                     ; Skip high byte
 
         iny
-        lda (sp),y
+        lda (c_sp),y
         sta mouseLeft
         iny
-        lda (sp),y
+        lda (c_sp),y
         sta mouseLeft+1         ; minx
 
         jmp addysp1             ; Drop params, return
diff --git a/libsrc/geos-common/graph/bitotherclip.s b/libsrc/geos-common/graph/bitotherclip.s
index 020139da8..fba00d966 100644
--- a/libsrc/geos-common/graph/bitotherclip.s
+++ b/libsrc/geos-common/graph/bitotherclip.s
@@ -6,7 +6,7 @@
 ; void BitOtherClip     (void *proc1, void* proc2, char skipl, char skipr, int skipy,
 ;                               struct iconpic *myGfx);
 
-; both proc1, proc2 should be: char __fastcall something (void);
+; both proc1, proc2 should be: char foo (void);
 ;       proc1 is called before reading a byte (.A returns next data)
 ;       proc2 is called before reading each byte which is not pattern (code >219)
 
diff --git a/libsrc/geos-common/symbols.txt b/libsrc/geos-common/symbols.txt
index d1893e376..b82954ec6 100644
--- a/libsrc/geos-common/symbols.txt
+++ b/libsrc/geos-common/symbols.txt
@@ -26,7 +26,7 @@ cardDataPntr	$2c	$2c	$60	Word		This is a pointer to the actual card graphics dat
 CPU_DATA	$01	n/a	n/a	Word		Address of 6510 data register that controls the hardware memory ...
 CPU_DDR		$00	n/a	n/a	Byte		Address of 6510 data direction register.
 curDevice	$ba	$ba	n/a	Byte		This holds the current serial device number.
-curDirHead	$8200	$8200	$fa80	256 | 39 Bytes	For CBM, it is the buffer containing header infomation ...
+curDirHead	$8200	$8200	$fa80	256 | 39 Bytes	For CBM, it is the buffer containing header information ...
 curDrive	$8489	$8489	$f60d	Byte		Holds the device number of the currently active disk drive.
 curEnable	n/a	$1300	$0951	Byte		This is an image of the C64 mobenble register.
 curHeight	$29	$29	$021b	Byte		Used to hold the card height in pixels of the current font in ...
@@ -48,7 +48,7 @@ dblClickCount	$8515	$8515	$0258	Byte		Used to determine when an icon is double c
 devTabHi	n/a	n/a	$fae7	4 Bytes		For the Apple, these are the high and low bytes of the four ...
 devTabLo	n/a	n/a	$faeb	4 Bytes		For the Apple, these are the high and low bytes of the four ...
 devUnitTab	n/a	n/a	$faef	4 Bytes		The ProDos unit numbers of the four possible devices are kept ...
-dir2Head	$8900	$8900	n/a	256 Bytes	This is the 2nd directory header block used for larger cpacity ...
+dir2Head	$8900	$8900	n/a	256 Bytes	This is the 2nd directory header block used for larger capacity ...
 dirBlkno	n/a	n/a	$f620	Word		Block number of the key block of the directory containing ...
 dirEntryBuf	$8400	$8400	$fa59	256 | 39 Bytes	Buffer used to build a file's directory entry.
 dirPtr		n/a	n/a	$f622	Word		Pointer into diskBlkBuf for this file's entry.
@@ -74,7 +74,7 @@ fileWritten	$8498	$8498	$f61a	Byte		Flag indicating if a if the currently open f
 firstBoot	$88c5	$88c5	$0281	Byte		This flag is changed from 0 to $FF when the deskTop comes up ...
 fontData	$850c	$850c	n/a(?)	9 Bytes		Buffer for saving the user active font table when going into ...
 fontTable	$26	$26	n/a(?)	8 Bytes		fontTable is a label for the beginning of variables for the ...
-grcntr12	$d016	$d016	n/a	Byte		Graphics control reqister #2.
+grcntr12	$d016	$d016	n/a	Byte		Graphics control register #2.
 grcntrl1	$d011	$d011	n/a	Byte		Graphics control register #1.
 grirq		$d019	$d019	n/a	Byte		Graphics chip interrupt register.
 grirqen		$d01a	$d01a	n/a	Byte		Graphics chip interrupt enable register.
@@ -89,7 +89,7 @@ intBotVector	$849f	$849f	$0204	Word		Vector to routine to call after the operati
 interleave	$848c	$848c	n/a	Byte		Variable used by BlkAlloc routine as the desired interleave when ...
 intSource	n/a	n/a	$02c6	Byte		Byte to indicate where interrupts are coming from on the Apple.
 intTopVector	$849d	$849d	$0202	Word		Vector to routine to call before the operating system interrupt ...
-invertBuffer	n/a	$1ced	n/a	80 Bytes	Buffer area used to speed up the 80 colunn InvertLine routine.
+invertBuffer	n/a	$1ced	n/a	80 Bytes	Buffer area used to speed up the 80 column InvertLine routine.
 irqvec		$0314	$0314	n/a	Word		IRQ vector.
 isGEOS		$848b	$848b	n/a	Byte		Flag to indicate whether the current disk is a GEOS disk.
 keyData		$8504	$8504	$0245	Byte		Holds the ASCII value of the current last key that was pressed.
@@ -152,7 +152,7 @@ msbxpos		$d010	$d010	n/a	Byte		Most significant bits for x positions of sprites.
 msePicPtr	$31	$31	n/a	Word		Pointer to the mouse graphics data.
 nationality	$c010	$c010	$e00d	Byte		Byte to hold nationality of Kernal.
 nmivec		$0318	$0318	n/a	Word		NMI vector.
-noEraseSprites	n/a	n/a	$0240	Byte		Flag to stop routine TempHideMouse fron erasing sprites #2 ...
+noEraseSprites	n/a	n/a	$0240	Byte		Flag to stop routine TempHideMouse from erasing sprites #2 ...
 numDrives	$848d	$848d	$f60e	Byte		Set to number of drives on the system.
 obj0Pointer	$8ff8	$8ff8	n/a	Byte		Pointer to the picture data for sprite 0.
 obj1Pointer	$8ff9	$8ff9	n/a	Byte		Pointer to the picture data for sprite 1.
@@ -169,7 +169,7 @@ PrntDiskName	$8476	$8476	n/a	18 Bytes	Disk name that current printer driver is o
 PrntFileName	$8465	$8465	$08ac	17 | 16 Bytes	Name of the current printer driver.
 ramBase		$88c7	$88c7	n/a	4 Bytes		RAM bank for each disk drive to use if the drive type is either ...
 ramExpSize	$88c3	$88c3	n/a	Byte		Byte for number or RAM banks available in RAM expansion unit.
-random		$850a	$850a	$024c	Word		Variable incremented each interrupt to generate a randon nunber.
+random		$850a	$850a	$024c	Word		Variable incremented each interrupt to generate a randon number.
 rasreg		$d012	$d012	n/a	Byte		Raster register.
 RecoverVector	$84b1	$84b1	$0216	Word		Pointer to routine that is called to recover the background ...
 reqXpos0	n/a	n/a	$0800	Word		This variable corresponds to the Commodore VIC chip register ...
@@ -193,7 +193,7 @@ shiftBuf	n/a	$1b45	$70	7 Bytes		Buffer for shifting/doubling sprites. Located in
 shiftOutBuf	n/a	$1b4c	$78	7 Bytes		Buffer for shifting/doubling/oring sprites. Located in back ...
 sizeFlags	n/a	$1b53	$db1c	Byte		Height of sprite.
 softOnes	n/a	$1c2d	$d000	192 Bytes	Buffer used for putting sprite bitmaps up on screen without ...
-softZeros	n/a	$1b6d	$d0e0	192 Bytes	Buffer used for putting sprite bitnaps up on screen without ...
+softZeros	n/a	$1b6d	$d0e0	192 Bytes	Buffer used for putting sprite bitmaps up on screen without ...
 spr0pic		$8a00	$8a00	n/a	64 Bytes	This is where the graphics data for sprite 0 is kept on ...
 spr1pic		$8a40	$8a40	n/a	64 Bytes	This is where the graphics data for sprite 1 is kept on ...
 spr2pic		$8a80	$8a80	n/a	64 Bytes	This is where the graphics data for sprite 2 is kept on ...
@@ -353,8 +353,8 @@ i_Rectangle		$c19f	$c19f	$fe3c	Inline Rectangle.
 ImprintLine		n/a	n/a	$ff8f	Imprint horizontal line to background buffer.
 ImprintRectangle	$c250	$c250	$fe4e	Imprint rectangular area to background buffer.
 InfoCard		n/a	n/a	$670f	Get I/O card attributes.
-InitCard		n/a	n/a	$6700	Intialize I/O card.
-InitForDialog		n/a	n/a	$ff4a	Internal pre-dialog box intialization.
+InitCard		n/a	n/a	$6700	Initialize I/O card.
+InitForDialog		n/a	n/a	$ff4a	Internal pre-dialog box initialization.
 InitForIO		$c25c	$c25c	n/a	Prepare CBM system for I/O across serial bus.
 InitForPrint		$7900	$7900	$6000	Initialize printer (once per document).
 InitMouse		$fe80	$fe80	$f000	Initialize input device.
diff --git a/libsrc/geos-common/system/crt0.s b/libsrc/geos-common/system/crt0.s
index 47cec74f2..e1751baef 100644
--- a/libsrc/geos-common/system/crt0.s
+++ b/libsrc/geos-common/system/crt0.s
@@ -11,7 +11,7 @@
             .import initlib, donelib
             .import callmain
             .import zerobss
-            .importzp sp
+            .importzp c_sp
 
             .include "jumptab.inc"
             .include "geossym.inc"
@@ -48,8 +48,8 @@
 
         lda #<(__STACKADDR__ + __STACKSIZE__)
         ldx #>(__STACKADDR__ + __STACKSIZE__)
-        sta sp
-        stx sp+1
+        sta c_sp
+        stx c_sp+1
 
 ; Call the module constructors.
 
diff --git a/libsrc/geos-common/system/sysuname.s b/libsrc/geos-common/system/sysuname.s
index 8eac05941..954e5be5e 100644
--- a/libsrc/geos-common/system/sysuname.s
+++ b/libsrc/geos-common/system/sysuname.s
@@ -22,14 +22,14 @@ utsdata:
         .asciiz ""
 
         ; release
-        .byte ((.VERSION >> 8) & $0F) + '0'
-        .byte '.'
-        .byte ((.VERSION >> 4) & $0F) + '0'
-        .byte $00
+        .byte           .string (>.version)
+        .byte           '.'
+        .byte           .string (<.version)
+        .byte           $00
 
         ; version
-        .byte (.VERSION & $0F) + '0'
-        .byte $00
+        .byte           '0'     ; unused
+        .byte           $00
 
         ; machine
         .asciiz "GEOS"
diff --git a/libsrc/kim1/crt0.s b/libsrc/kim1/crt0.s
index 906b3b980..adc934a78 100644
--- a/libsrc/kim1/crt0.s
+++ b/libsrc/kim1/crt0.s
@@ -26,9 +26,9 @@ _init:    cld                          ; Clear decimal mode
 ; Set cc65 argument stack pointer
 
           lda     #<(__RAM_START__ + __RAM_SIZE__)
-          sta     sp
+          sta     c_sp
           lda     #>(__RAM_START__ + __RAM_SIZE__)
-          sta     sp+1
+          sta     c_sp+1
 
 ; Initialize memory storage
 
diff --git a/libsrc/kim1/tapeio.s b/libsrc/kim1/tapeio.s
index 4a16d6b9c..4af2b3aa2 100644
--- a/libsrc/kim1/tapeio.s
+++ b/libsrc/kim1/tapeio.s
@@ -16,7 +16,7 @@
         sta     ID               ; Tape record ID to P1L
         jsr     LOADT            ; Read data from tape
         bcs     error
-        jmp     return0          ; Return 0 if sucessful
+        jmp     return0          ; Return 0 if successful
 error:  jmp     return1          ; or 1 if not
 
 .endproc
@@ -33,7 +33,7 @@ error:  jmp     return1          ; or 1 if not
         ldx     #$00
         jsr     DUMPT            ; Write data to tape
         bcs     error
-        jmp     return0          ; Return 0 if sucessful
+        jmp     return0          ; Return 0 if successful
 error:  jmp     return1          ; or 1 if not
 
 .endproc
diff --git a/libsrc/lynx/bootldr.s b/libsrc/lynx/bootldr.s
index ddc24faed..a0320886f 100644
--- a/libsrc/lynx/bootldr.s
+++ b/libsrc/lynx/bootldr.s
@@ -15,7 +15,7 @@
         .segment "BOOTLDR"
 ;**********************************
 ; Here is the bootloader in plaintext
-; The idea is to make the smalles possible encrypted loader as decryption
+; The idea is to make the smallest possible encrypted loader as decryption
 ; is very slow. The minimum size is 49 bytes plus a zero byte.
 ;**********************************
 ;                  EXE = $fb68
diff --git a/libsrc/lynx/crt0.s b/libsrc/lynx/crt0.s
index 238a2c99d..e1f1c078e 100644
--- a/libsrc/lynx/crt0.s
+++ b/libsrc/lynx/crt0.s
@@ -68,7 +68,7 @@ MikeyInitData:  .byte $9e,$18,$68,$1f,$00,$00,$00,$00,$00,$ff,$1a,$1b,$04,$0d,$2
 
 ; Disable the TX/RX IRQ; set to 8E1.
 
-        lda     #%00011101
+        lda     #PAREN|RESETERR|TXOPEN|PAREVEN  ; #%00011101
         sta     SERCTL
 
 ; Clear all pending interrupts.
@@ -80,8 +80,8 @@ MikeyInitData:  .byte $9e,$18,$68,$1f,$00,$00,$00,$00,$00,$ff,$1a,$1b,$04,$0d,$2
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1
+        sta     c_sp
+        stx     c_sp+1
 
 ; Init Mickey.
 
diff --git a/libsrc/lynx/eeprom66.s b/libsrc/lynx/eeprom66.s
index 6511cf8af..44b365f03 100644
--- a/libsrc/lynx/eeprom66.s
+++ b/libsrc/lynx/eeprom66.s
@@ -40,7 +40,7 @@ EE_C_WRITE      =    $14
 EE_C_READ       =    $18
 EE_C_ERASE      =    $1C
 EE_C_EWEN       =    $13
-EE_C_EWEN2      =    $FF   ;; C0 schould be enough
+EE_C_EWEN2      =    $FF   ;; C0 should be enough
 EE_C_EWDS       =    $10
 EE_C_EWDS2      =    $00
 
diff --git a/libsrc/lynx/eeprom86.s b/libsrc/lynx/eeprom86.s
index 73b342fae..8b829c5e8 100644
--- a/libsrc/lynx/eeprom86.s
+++ b/libsrc/lynx/eeprom86.s
@@ -41,7 +41,7 @@ EE_C_WRITE      =    $14
 EE_C_READ       =    $18
 EE_C_ERASE      =    $1C
 EE_C_EWEN       =    $13
-EE_C_EWEN2      =    $FF   ;; C0 schould be enough
+EE_C_EWEN2      =    $FF   ;; C0 should be enough
 EE_C_EWDS       =    $10
 EE_C_EWDS2      =    $00
 
diff --git a/libsrc/lynx/lseek.s b/libsrc/lynx/lseek.s
index 4b4f94d7c..da0a1922b 100644
--- a/libsrc/lynx/lseek.s
+++ b/libsrc/lynx/lseek.s
@@ -11,14 +11,14 @@
 ;
 ; off_t __fastcall__ lseek(int fd, off_t offset, int whence);
 
-        .importzp       sp, sreg, regsave, regbank, tmp1, ptr1, ptr2
+        .importzp       c_sp, sreg, regsave, regbank, tmp1, ptr1, ptr2
         .macpack        longbranch
         .export         _lseek
         .import         addysp, stax0sp, tosand0ax, pusheax, asreax2
         .import         ldeaxysp, decsp2, pushax, incsp8
         .import         tosandeax,decax1,tosdiveax,axlong,ldaxysp
         .import         lynxskip0, lynxblock,tosasreax
-        .import         __BLOCKSIZE__
+        .import         __BANK0BLOCKSIZE__
         .importzp       _FileCurrBlock
 
 .segment        "CODE"
@@ -32,15 +32,15 @@
         jsr     ldeaxysp
         jsr     pusheax
         ldx     #$00
-        lda     #<(__BLOCKSIZE__/1024 + 9)
+        lda     #<(__BANK0BLOCKSIZE__/1024 + 9)
         jsr     tosasreax
         sta     _FileCurrBlock
         jsr     lynxblock
         ldy     #$05
         jsr     ldeaxysp
         jsr     pusheax
-        lda     #<(__BLOCKSIZE__-1)
-        ldx     #>(__BLOCKSIZE__-1)
+        lda     #<(__BANK0BLOCKSIZE__-1)
+        ldx     #>(__BANK0BLOCKSIZE__-1)
         jsr     axlong
         jsr     tosandeax
         eor     #$FF
diff --git a/libsrc/lynx/lynx-cart.s b/libsrc/lynx/lynx-cart.s
index 94edff677..d1f3e33eb 100644
--- a/libsrc/lynx/lynx-cart.s
+++ b/libsrc/lynx/lynx-cart.s
@@ -17,7 +17,7 @@
         .include "extzp.inc"
         .export  lynxskip0, lynxread0
         .export  lynxblock
-        .import  __BLOCKSIZE__
+        .import  __BANK0BLOCKSIZE__
 
         .code
 
@@ -88,7 +88,7 @@ lynxblock:
         lda __iodat
         sta IODAT
         stz _FileBlockByte
-        lda #<($100-(>__BLOCKSIZE__))
+        lda #<($100-(>__BANK0BLOCKSIZE__))
         sta _FileBlockByte+1
         ply
         plx
diff --git a/libsrc/lynx/ser/lynx-comlynx.s b/libsrc/lynx/ser/lynx-comlynx.s
index 8aa3c838e..c4ae3d5b6 100644
--- a/libsrc/lynx/ser/lynx-comlynx.s
+++ b/libsrc/lynx/ser/lynx-comlynx.s
@@ -73,7 +73,12 @@ SER_UNINSTALL:
 ; Must return an SER_ERR_xx code in a/x.
 
 SER_CLOSE:
-        ; Disable interrupts
+        ; Disable interrupts and stop timer 4 (serial)
+        lda     #TXOPEN|RESETERR
+        sta     SERCTL
+        stz     TIM4CTLA    ; Disable count and no reload
+        stz     SerialStat  ; Reset status
+
         ; Done, return an error code
         lda     #SER_ERR_OK
         .assert SER_ERR_OK = 0, error
@@ -108,17 +113,17 @@ SER_OPEN:
         stz     TxPtrIn
         stz     TxPtrOut
 
-        ; clock = 8 * 15625
-        lda     #%00011000
-        sta     TIM4CTLA
         ldy     #SER_PARAMS::BAUDRATE
         lda     (ptr1),y
 
+        ; Source period is 1 us
+        ldy     #%00011000  ; ENABLE_RELOAD|ENABLE_COUNT|AUD_1
+
         ldx     #1
         cmp     #SER_BAUD_62500
         beq     setbaudrate
 
-        ldx     #2
+        ldx     #3
         cmp     #SER_BAUD_31250
         beq     setbaudrate
 
@@ -134,6 +139,10 @@ SER_OPEN:
         cmp     #SER_BAUD_2400
         beq     setbaudrate
 
+        ldx     #68
+        cmp     #SER_BAUD_1800
+        beq     setbaudrate
+
         ldx     #103
         cmp     #SER_BAUD_1200
         beq     setbaudrate
@@ -142,65 +151,22 @@ SER_OPEN:
         cmp     #SER_BAUD_600
         beq     setbaudrate
 
-        ; clock = 6 * 15625
-        ldx     #%00011010
-        stx     TIM4CTLA
+        ; Source period is 8 us
+        ldy     #%00011011 ; ENABLE_RELOAD|ENABLE_COUNT|AUD_8
 
-        ldx     #12
-        cmp     #SER_BAUD_7200
-        beq     setbaudrate
-
-        ldx     #25
-        cmp     #SER_BAUD_3600
-        beq     setbaudrate
-
-        ldx     #207
-        stx     TIM4BKUP
-
-        ; clock = 4 * 15625
-        ldx     #%00011100
+        ldx     #51
         cmp     #SER_BAUD_300
-        beq     setprescaler
-
-        ; clock = 6 * 15625
-        ldx     #%00011110
-        cmp     #SER_BAUD_150
-        beq     setprescaler
-
-        ; clock = 1 * 15625
-        ldx     #%00011111
-        stx     TIM4CTLA
-        cmp     #SER_BAUD_75
-        beq     baudsuccess
-
-        ldx     #141
-        cmp     #SER_BAUD_110
-        beq     setbaudrate
-
-        ; clock = 2 * 15625
-        ldx     #%00011010
-        stx     TIM4CTLA
-        ldx     #68
-        cmp     #SER_BAUD_1800
-        beq     setbaudrate
-
-        ; clock = 6 * 15625
-        ldx     #%00011110
-        stx     TIM4CTLA
-        ldx     #231
-        cmp     #SER_BAUD_134_5
         beq     setbaudrate
 
         lda     #SER_ERR_BAUD_UNAVAIL
         ldx     #0 ; return value is char
         rts
-setprescaler:
-        stx     TIM4CTLA
-        bra     baudsuccess
+
 setbaudrate:
+        sty     TIM4CTLA
         stx     TIM4BKUP
-baudsuccess:
-        ldx     #TxOpenColl|ParEven
+
+        ldx     #TXOPEN|PAREVEN
         stx     contrl
         ldy     #SER_PARAMS::DATABITS   ; Databits
         lda     (ptr1),y
@@ -218,15 +184,15 @@ baudsuccess:
         beq     checkhs
         cmp     #SER_PAR_SPACE
         bne     @L0
-        ldx     #TxOpenColl
+        ldx     #TXOPEN
         stx     contrl
         bra     checkhs
 @L0:
-        ldx     #TxParEnable|TxOpenColl|ParEven
+        ldx     #PAREN|TXOPEN|PAREVEN
         stx     contrl
         cmp     #SER_PAR_EVEN
         beq     checkhs
-        ldx     #TxParEnable|TxOpenColl
+        ldx     #PAREN|TXOPEN
         stx     contrl
 checkhs:
         ldx     contrl
@@ -234,15 +200,27 @@ checkhs:
         ldy     #SER_PARAMS::HANDSHAKE  ; Handshake
         lda     (ptr1),y
         cmp     #SER_HS_NONE
+        beq     redeye_ok
+        cmp     #SER_HS_SW              ; Software handshake will check for connected redeye
         bne     invparameter
+
+        lda     IODAT
+        and     #NOEXP                  ; Check if redeye bit flag is unset
+        beq     redeye_ok
+        lda     #SER_ERR_NO_DEVICE      ; ComLynx cable is not inserted
+        ldx     #0
+        rts
+
+redeye_ok:
         lda     SERDAT
         lda     contrl
-        ora     #RxIntEnable|ResetErr
+        ora     #RXINTEN|RESETERR       ; Turn on interrupts for receive
         sta     SERCTL
         lda     #SER_ERR_OK
         .assert SER_ERR_OK = 0, error
         tax
         rts
+
 invparameter:
         lda     #SER_ERR_INIT_FAILED
         ldx     #0 ; return value is char
@@ -264,8 +242,8 @@ GetByte:
         ldy     RxPtrOut
         lda     RxBuffer,y
         inc     RxPtrOut
+        sta     (ptr1)
         ldx     #$00
-        sta     (ptr1,x)
         txa                     ; Return code = 0
         rts
 
@@ -279,24 +257,26 @@ SER_PUT:
         ina
         cmp     TxPtrOut
         bne     PutByte
+
         lda     #SER_ERR_OVERFLOW
         ldx     #0 ; return value is char
         rts
+
 PutByte:
         ldy     TxPtrIn
         txa
         sta     TxBuffer,y
         inc     TxPtrIn
 
-        bit     TxDone
-        bmi     @L1
+        bit     TxDone      ; Check bit 7 of TxDone (TXINTEN)
+        bmi     @L1         ; Was TXINTEN already set?
         php
         sei
-        lda     contrl
-        ora     #TxIntEnable|ResetErr
-        sta     SERCTL       ; Allow TX-IRQ to hang RX-IRQ
+        lda     contrl      ; contrl does not include RXINTEN setting
+        ora     #TXINTEN|RESETERR
+        sta     SERCTL      ; Allow TX-IRQ to hang RX-IRQ (no receive while transmitting)
         sta     TxDone
-        plp
+        plp                 ; Restore processor and interrupt enable
 @L1:
         lda     #SER_ERR_OK
         .assert SER_ERR_OK = 0, error
@@ -308,9 +288,9 @@ PutByte:
 ; Must return an SER_ERR_xx code in a/x.
 
 SER_STATUS:
-        ldy     SerialStat
+        lda     SerialStat
+        sta     (ptr1)
         ldx     #$00
-        sta     (ptr1,x)
         txa                     ; Return code = 0
         rts
 
@@ -342,48 +322,56 @@ SER_IRQ:
 @L0:
         bit     TxDone
         bmi     @tx_irq     ; Transmit in progress
-        ldx     SERDAT
-        lda     SERCTL
-        and     #RxParityErr|RxOverrun|RxFrameErr|RxBreak
-        beq     @rx_irq
+
+        ldx     SERDAT      ; Read received data
+        lda     contrl
+        and     #PAREN      ; Parity enabled implies SER_PAR_EVEN or SER_PAR_ODD
+        tay
+        ora     #OVERRUN|FRAMERR|RXBRK
+        and     SERCTL      ; Check presence of relevant error flags in SERCTL
+
+        beq     @rx_irq     ; No errors so far
+
         tsb     SerialStat  ; Save error condition
-        bit     #RxBreak
+        bit     #RXBRK      ; Check for break signal
         beq     @noBreak
+
         stz     TxPtrIn     ; Break received - drop buffers
         stz     TxPtrOut
         stz     RxPtrIn
         stz     RxPtrOut
 @noBreak:
-        lda     contrl
-        ora     #RxIntEnable|ResetErr
-        sta     SERCTL
-        lda     #$10
-        sta     INTRST
-        bra     @IRQexit
+        bra     @exit0
+
 @rx_irq:
+        tya
+        bne     @2          ; Parity was enabled so no marker bit check needed
+
         lda     contrl
-        ora     #RxIntEnable|ResetErr
-        sta     SERCTL
+        eor     SERCTL      ; Should match current parity bit
+        and     #PARBIT     ; Check for mark or space value
+        bne     @exit0
+
+@2:
         txa
         ldx     RxPtrIn
         sta     RxBuffer,x
         txa
         inx
 
-@cont0:
         cpx     RxPtrOut
         beq     @1
         stx     RxPtrIn
-        lda     #SERIAL_INTERRUPT
-        sta     INTRST
         bra     @IRQexit
 
 @1:
         sta     RxPtrIn
         lda     #$80
         tsb     SerialStat
+        bra     @exit0
+
 @tx_irq:
-        ldx     TxPtrOut    ; Has all bytes been sent?
+        ldx     TxPtrOut    ; Have all bytes been sent?
         cpx     TxPtrIn
         beq     @allSent
 
@@ -393,24 +381,24 @@ SER_IRQ:
 
 @exit1:
         lda     contrl
-        ora     #TxIntEnable|ResetErr
+        ora     #TXINTEN|RESETERR
         sta     SERCTL
-        lda     #SERIAL_INTERRUPT
-        sta     INTRST
         bra     @IRQexit
 
 @allSent:
         lda     SERCTL       ; All bytes sent
-        bit     #TxEmpty
+        bit     #TXEMPTY
         beq     @exit1
         bvs     @exit1
         stz     TxDone
+
+@exit0:
         lda     contrl
-        ora     #RxIntEnable|ResetErr
+        ora     #RXINTEN|RESETERR   ; Re-enable receive interrupt
         sta     SERCTL
 
+@IRQexit:
         lda     #SERIAL_INTERRUPT
         sta     INTRST
-@IRQexit:
         clc
         rts
diff --git a/libsrc/lynx/sysuname.s b/libsrc/lynx/sysuname.s
index 879297ea4..3c75fac08 100644
--- a/libsrc/lynx/sysuname.s
+++ b/libsrc/lynx/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/lynx/tgi/lynx-160-102-16.s b/libsrc/lynx/tgi/lynx-160-102-16.s
index c35b6a5aa..00a2059aa 100644
--- a/libsrc/lynx/tgi/lynx-160-102-16.s
+++ b/libsrc/lynx/tgi/lynx-160-102-16.s
@@ -43,7 +43,7 @@ libref: .addr   $0000                   ; Library reference
 ; to an RTS for test versions (function not implemented). A future version may
 ; allow for emulation: In this case the vector will be zero. Emulation means
 ; that the graphics kernel will emulate the function by using lower level
-; primitives - for example ploting a line by using calls to SETPIXEL.
+; primitives - for example plotting a line by using calls to SETPIXEL.
 
         .addr   INSTALL
         .addr   UNINSTALL
@@ -258,7 +258,7 @@ GETERROR:
 ;
 ; The TGI lacks a way to draw sprites. As that functionality is vital to
 ; Lynx games we borrow this CONTROL function to implement the still
-; missing tgi_draw_sprite funtion. To use this in your C-program
+; missing tgi_draw_sprite function. To use this in your C-program
 ; do a #define tgi_draw_sprite(spr) tgi_ioctl(0, spr)
 ;
 ; To do a flip-screen call tgi_ioctl(1, 0)
diff --git a/libsrc/lynx/tgi_colors.s b/libsrc/lynx/tgi_colors.s
index ebc8c2889..6d0ea442a 100644
--- a/libsrc/lynx/tgi_colors.s
+++ b/libsrc/lynx/tgi_colors.s
@@ -1,6 +1,7 @@
 ;
 ; Target-specific black & white values for use by the target-shared TGI kernel
 ;
+; NOTE: These are indices into the default palette
 
         .include        "tgi-kernel.inc"
 
diff --git a/libsrc/lynx/uploader.s b/libsrc/lynx/uploader.s
index f16a1721a..5ce21b489 100644
--- a/libsrc/lynx/uploader.s
+++ b/libsrc/lynx/uploader.s
@@ -33,21 +33,21 @@ loop1:
 cont1:
         jsr     read_byte
         sta     (load_ptr2),y
-        sta     PALETTE         ; feedback ;-)
+        sta     PALETTE + 1         ; feedback ;-)
         iny
         bne     loop1
         inc     load_ptr2+1
         bra     loop1
 
 read_byte:
-        bit     SERCTL
+        bit     SERCTL         ; Check for RXRDY ($40)
         bvc     read_byte
         lda     SERDAT
         rts
 
 _UpLoaderIRQ:
         lda     INTSET
-        and     #$10
+        and     #SERIAL_INTERRUPT
         bne     @L0
         clc
         rts
@@ -69,6 +69,8 @@ again:
 ; last action : clear interrupt
 ;
 exit:
+        lda     #SERIAL_INTERRUPT
+        sta     INTRST
         clc
         rts
 
diff --git a/libsrc/mega65/_scrsize.s b/libsrc/mega65/_scrsize.s
new file mode 100644
index 000000000..3fc955657
--- /dev/null
+++ b/libsrc/mega65/_scrsize.s
@@ -0,0 +1,17 @@
+;
+; Ullrich von Bassewitz, 26.10.2000
+;
+; Screen size variables
+;
+
+        .export         screensize
+        .include        "cbm_kernal.inc"
+
+.proc   screensize
+
+        jsr     SCREEN
+        inx
+        iny
+        rts
+
+.endproc
diff --git a/libsrc/mega65/bordercolor.s b/libsrc/mega65/bordercolor.s
new file mode 100644
index 000000000..2ebf83766
--- /dev/null
+++ b/libsrc/mega65/bordercolor.s
@@ -0,0 +1,17 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; unsigned char __fastcall__ bordercolor (unsigned char color);
+;
+
+
+        .export         _bordercolor
+
+        .include        "mega65.inc"
+
+_bordercolor:
+        ldx     VIC_BORDERCOLOR ; get old value
+        sta     VIC_BORDERCOLOR ; set new value
+        txa
+        rts
+
diff --git a/libsrc/mega65/cgetc.s b/libsrc/mega65/cgetc.s
new file mode 100644
index 000000000..3b2d5934d
--- /dev/null
+++ b/libsrc/mega65/cgetc.s
@@ -0,0 +1,32 @@
+
+
+        .include    "cbm_kernal.inc"
+        .import     cursor
+        .export     _cgetc
+_cgetc:
+
+        lda cursor
+        beq nocursor
+
+        ; enable the cursor
+        clc
+        jsr CURSOR
+
+nocursor:
+        ; wait for a key
+       ; FIXME: is $d610 mega65 specific?
+:
+        lda $d610
+        beq :-
+
+        jsr KBDREAD
+
+        pha
+        ; disable the cursor
+        sec
+        jsr CURSOR
+
+        pla
+        ldx #0
+        rts
+
diff --git a/libsrc/mega65/clrscr.s b/libsrc/mega65/clrscr.s
new file mode 100644
index 000000000..84fef5eac
--- /dev/null
+++ b/libsrc/mega65/clrscr.s
@@ -0,0 +1,15 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; void clrscr (void);
+;
+
+        .export         _clrscr
+
+        .include        "cbm_kernal.inc"
+
+;_clrscr = CLRSCR
+
+_clrscr:
+        lda #$93
+        jmp CHROUT
diff --git a/libsrc/mega65/color.s b/libsrc/mega65/color.s
new file mode 100644
index 000000000..094bf9ed8
--- /dev/null
+++ b/libsrc/mega65/color.s
@@ -0,0 +1,24 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; unsigned char __fastcall__ textcolor (unsigned char color);
+; unsigned char __fastcall__ bgcolor (unsigned char color);
+;
+
+
+        .export         _textcolor, _bgcolor
+
+        .include        "mega65.inc"
+
+_textcolor:
+        ldx     CHARCOLOR       ; get old value
+        sta     CHARCOLOR       ; set new value
+        txa
+        rts
+
+
+_bgcolor:
+        ldx     VIC_BG_COLOR0   ; get old value
+        sta     VIC_BG_COLOR0   ; set new value
+        txa
+        rts
diff --git a/libsrc/mega65/conio.s b/libsrc/mega65/conio.s
new file mode 100644
index 000000000..14052c5a1
--- /dev/null
+++ b/libsrc/mega65/conio.s
@@ -0,0 +1,10 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; Low level stuff for screen output/console input
+;
+
+        .exportzp       CURS_X, CURS_Y
+
+        .include        "mega65.inc"
+
diff --git a/libsrc/mega65/cpeekc.s b/libsrc/mega65/cpeekc.s
new file mode 100644
index 000000000..f75926d3e
--- /dev/null
+++ b/libsrc/mega65/cpeekc.s
@@ -0,0 +1,45 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-22, Greg King
+;
+; char cpeekc (void);
+;
+
+        .include        "mega65.inc"
+
+        .export         _cpeekc
+        .importzp       ptr1
+
+_cpeekc:
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$0800
+        sta     ptr1 + 1
+        lda     SCREEN_PTR
+        sta     ptr1
+
+        ldy     CURS_X
+        lda     (ptr1),y  ; get screen code
+        ldx     #>$0000
+        and     #<~$80          ; remove reverse bit
+
+; Convert the screen code into a PetSCII code.
+; $00 - $1F: +$40
+; $20 - $3F
+; $40 - $5f: +$20
+; $60 - $7F: +$40
+
+        cmp     #$20
+        bcs     @sk1            ;(bge)
+        ora     #$40
+        rts
+
+@sk1:   cmp     #$40
+        bcc     @end            ;(blt)
+        cmp     #$60
+        bcc     @sk2            ;(blt)
+        ;sec
+        adc     #$20 - $01
+@sk2:   ;clc                    ; both above cmp and adc clear carry flag
+        adc     #$20
+@end:   rts
diff --git a/libsrc/mega65/cpeekcolor.s b/libsrc/mega65/cpeekcolor.s
new file mode 100644
index 000000000..45a59f3cb
--- /dev/null
+++ b/libsrc/mega65/cpeekcolor.s
@@ -0,0 +1,25 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-22, Greg King
+;
+; unsigned char cpeekcolor (void);
+;
+
+        .include        "mega65.inc"
+
+        .export         _cpeekcolor
+        .importzp       ptr1
+
+_cpeekcolor:
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$d800
+        sta     ptr1 + 1
+        lda     SCREEN_PTR
+        sta     ptr1
+
+        ldy     CURS_X
+        lda     (ptr1),y
+
+        ldx     #>$0000
+        rts
diff --git a/libsrc/mega65/cpeekrevers.s b/libsrc/mega65/cpeekrevers.s
new file mode 100644
index 000000000..a8e03e91e
--- /dev/null
+++ b/libsrc/mega65/cpeekrevers.s
@@ -0,0 +1,28 @@
+;
+; 2016-02-28, Groepaz
+; 2017-06-15, Greg King
+;
+; unsigned char cpeekrevers (void);
+;
+
+        .include        "mega65.inc"
+
+        .export         _cpeekrevers
+        .importzp       ptr1
+
+_cpeekrevers:
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$0800
+        sta     ptr1 + 1
+        lda     SCREEN_PTR
+        sta     ptr1
+
+        ldy     CURS_X
+        lda     (ptr1),y  ; get screen code
+        and     #$80            ; get reverse bit
+        asl     a
+        tax                     ; ldx #>$0000
+        rol     a               ; return boolean value
+
+        rts
diff --git a/libsrc/mega65/cpeeks.s b/libsrc/mega65/cpeeks.s
new file mode 100644
index 000000000..9c33831f1
--- /dev/null
+++ b/libsrc/mega65/cpeeks.s
@@ -0,0 +1,80 @@
+;
+; 2017-07-05, Greg King
+;
+; void cpeeks (char* s, unsigned length);
+;
+
+        .include "c65.inc"
+
+        .export         _cpeeks
+
+        .import         popax
+        .importzp       ptr1, ptr2, ptr3, tmp1, tmp2
+
+        .macpack        generic
+
+_cpeeks:
+        eor     #<$FFFF         ; counting a word upward is faster
+        sta     ptr3            ; so, we use -(length + 1)
+        txa
+        eor     #>$FFFF
+        sta     ptr3+1
+
+        lda     SCREEN_PTR
+        sta     ptr2
+        lda     SCREEN_PTR+1
+        clc
+        adc     #>$0800
+        sta     ptr2+1
+
+        ldy     CURS_X
+        sty     tmp2
+
+        jsr     popax
+        sta     tmp1            ; (will be a .Y index)
+        stx     ptr1+1
+        ldx     #<$0000
+        stx     ptr1
+        bze     L3              ; branch always
+
+L4:     ldy     tmp2
+        lda     (ptr2),y        ; get char
+        iny
+        bnz     L2
+        inc     ptr2+1
+L2:     sty     tmp2
+        and     #<~$80          ; remove reverse bit
+
+; Convert the screen code into a PetSCII code.
+; $00 - $1F: +$40
+; $20 - $3F
+; $40 - $5f: +$20
+; $60 - $7F: +$40
+
+        cmp     #$20
+        blt     @sk1            ;(bcc)
+        cmp     #$40
+        blt     L5
+        cmp     #$60
+        blt     @sk2            ;(bcc)
+        clc
+@sk1:   adc     #$20
+@sk2:   ;clc                    ; both above cmp and adc clear carry flag
+        adc     #$20
+
+L5:     ldy     tmp1
+        sta     (ptr1),y
+        iny
+        bnz     L1
+        inc     ptr1+1
+L1:     sty     tmp1
+
+L3:     inc     ptr3            ; count length
+        bnz     L4
+        inc     ptr3+1
+        bnz     L4
+
+        txa                     ; terminate the string
+        ldy     tmp1
+        sta     (ptr1),y
+        rts
diff --git a/libsrc/mega65/cputc.s b/libsrc/mega65/cputc.s
new file mode 100644
index 000000000..df44f5bdd
--- /dev/null
+++ b/libsrc/mega65/cputc.s
@@ -0,0 +1,120 @@
+;
+; Ullrich von Bassewitz, 1998-08-06, 2009-09-26
+;
+; void __fastcall__ cputcxy (unsigned char x, unsigned char y, char c);
+; void __fastcall__ cputc (char c);
+;
+
+        .export         _cputcxy, _cputc, cputdirect, putchar
+        .export         newline, plot
+        .import         gotoxy
+        .import         PLOT
+        .importzp       ptr4
+
+        .include        "mega65.inc"
+
+_cputcxy:
+        pha                     ; Save C
+        jsr     gotoxy          ; Set cursor, drop x and y
+        pla                     ; Restore C
+
+; Plot a character - also used as internal function
+
+_cputc: cmp     #$0A            ; CR?
+        bne     L1
+        lda     #0
+        sta     CURS_X
+        beq     plot            ; Recalculate pointers
+
+L1:     cmp     #$0D            ; LF?
+        beq     newline         ; Recalculate pointers
+
+; Printable char of some sort
+
+        cmp     #' '
+        bcc     cputdirect      ; Other control char
+        tay
+        bmi     L10
+        cmp     #$60
+        bcc     L2
+        and     #$DF
+        bne     cputdirect      ; Branch always
+L2:     and     #$3F
+
+cputdirect:
+        jsr     putchar         ; Write the character to the screen
+
+; Advance cursor position
+
+advance:
+        iny
+        cpy     #XSIZE
+        bne     L3
+        jsr     newline         ; new line
+        ldy     #0              ; + cr
+L3:     sty     CURS_X
+        rts
+
+newline:
+        clc
+        lda     #XSIZE
+        adc     SCREEN_PTR
+        sta     SCREEN_PTR
+        bcc     L4
+        inc     SCREEN_PTR+1
+        clc
+L4:     lda     #XSIZE
+        adc     CRAM_PTR
+        sta     CRAM_PTR
+        bcc     L5
+        inc     CRAM_PTR+1
+L5:     inc     CURS_Y
+        rts
+
+; Handle character if high bit set
+
+L10:    and     #$7F
+        cmp     #$7F            ; PI?
+        bne     L11
+        lda     #$5E            ; Load screen code for PI
+L11:    ora     #$40
+        bne     cputdirect
+
+
+
+; Set cursor position, calculate RAM pointers.
+
+plot:   ldy     CURS_X
+        ldx     CURS_Y
+        clc
+        jmp     PLOT            ; Set the new cursor
+
+
+
+; Write one character to the screen without doing anything else, return X
+; position in Y
+
+putchar:
+        ora     RVS             ; Set revers bit
+
+        tay
+        lda     SCREEN_PTR + 1
+        clc
+        adc     #>$0800
+        sta     ptr4 + 1
+        lda     SCREEN_PTR
+        sta     ptr4
+        tya
+
+        ldy     CURS_X
+        sta     (ptr4),y  ; Set char
+
+        lda     ptr4 + 1
+        clc
+        adc     #>$d000
+        sta     ptr4 + 1
+
+        lda     CHARCOLOR
+        sta     (ptr4),y    ; Set color
+
+        rts
diff --git a/libsrc/mega65/crt0.s b/libsrc/mega65/crt0.s
new file mode 100644
index 000000000..c7be6b7ee
--- /dev/null
+++ b/libsrc/mega65/crt0.s
@@ -0,0 +1,123 @@
+;
+; Startup code for cc65 (MEGA65 version)
+;
+
+        .export         _exit
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
+
+        .import         initlib, donelib
+        .import         zerobss, callmain
+        .import         BSOUT
+        .import         __MAIN_START__, __MAIN_SIZE__   ; Linker generated
+        .import         __STACKSIZE__                   ; from configure file
+
+        .include        "zeropage.inc"
+        .include        "mega65.inc"
+
+
+; ------------------------------------------------------------------------
+; Startup code
+
+.segment        "STARTUP"
+
+Start:
+
+; Switch off the BASIC ROM.
+
+; FIXME
+;        lda     $01
+;        sta     mmusave         ; Save the memory configuration
+;        and     #$F8
+;        ora     #$06            ; Enable Kernal+I/O, disable BASIC
+;        sta     $01
+;        sei
+;        lda #%00000000  ; lower offset 15-8
+;        ldx #%00000000  ; map blk3-1 | lower offset 19-6
+;        ldy #%00000000  ; upper offset 15-8
+;        ldz #%00000000  ; map blk7-4 | upper offset 19-6
+;        map
+;        eom
+
+        tsx
+        stx     spsave          ; Save the system stack ptr
+
+; Save space by putting some of the start-up code in the ONCE segment,
+; which can be re-used by the BSS segment, the heap and the C stack.
+
+        jsr     init
+
+; Clear the BSS data.
+
+        jsr     zerobss
+
+; Push the command-line arguments; and, call main().
+
+        jsr     callmain
+
+; Back from main() [this is also the exit() entry]. Run the module destructors.
+
+_exit:  pha                     ; Save the return code on stack
+        jsr     donelib
+
+; Copy back the zero-page stuff.
+
+        ldx     #zpspace-1
+L2:     lda     zpsave,x
+        sta     c_sp,x
+        dex
+        bpl     L2
+
+; Place the program return code into BASIC's status variable.
+
+        pla
+        sta     STATUS
+
+; Restore the system stuff.
+
+        ldx     spsave
+        txs                     ; Restore stack pointer
+
+; Back to BASIC.
+
+        rts
+
+
+; ------------------------------------------------------------------------
+
+.segment        "ONCE"
+
+init:
+
+; Save the zero-page locations that we need.
+
+        ldx     #zpspace-1
+L1:     lda     c_sp,x
+        sta     zpsave,x
+        dex
+        bpl     L1
+
+; Set up the stack.
+
+        lda     #<(__MAIN_START__ + __MAIN_SIZE__)
+        ldx     #>(__MAIN_START__ + __MAIN_SIZE__)
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
+
+; Switch to the second charset.
+
+        lda     #14
+        jsr     BSOUT
+
+; Call the module constructors.
+
+        jmp     initlib
+
+
+; ------------------------------------------------------------------------
+; Data
+
+.segment        "INIT"
+
+mmusave:.res    1
+spsave: .res    1
+zpsave: .res    zpspace
diff --git a/libsrc/mega65/devnum.s b/libsrc/mega65/devnum.s
new file mode 100644
index 000000000..898989766
--- /dev/null
+++ b/libsrc/mega65/devnum.s
@@ -0,0 +1,7 @@
+;
+; Oliver Schmidt, 2010-02-14
+;
+
+        .include        "mega65.inc"
+
+        .exportzp       devnum := DEVNUM
diff --git a/libsrc/mega65/exehdr.s b/libsrc/mega65/exehdr.s
new file mode 100644
index 000000000..645fc12e7
--- /dev/null
+++ b/libsrc/mega65/exehdr.s
@@ -0,0 +1,32 @@
+;
+; Ullrich von Bassewitz, 2010-11-14
+;
+; This module supplies a small BASIC stub program that jumps to the machine
+; language code that follows it using SYS.
+;
+
+        ; The following symbol is used by linker config to force the module
+        ; to get included into the output file
+        .export         __EXEHDR__: absolute = 1
+
+.segment        "EXEHDR"
+
+        .addr   Next
+        .word   .version        ; Line number
+        .byte   $fe, $02, "0:"  ; BANK 0
+        .byte   $9e             ; SYS
+;       .byte   <(((Start / 10000) .mod 10) + '0')
+        .byte   <(((Start /  1000) .mod 10) + '0')
+        .byte   <(((Start /   100) .mod 10) + '0')
+        .byte   <(((Start /    10) .mod 10) + '0')
+        .byte   <(((Start /     1) .mod 10) + '0')
+        .byte   $00             ; End of BASIC line
+Next:   .word   0               ; BASIC end marker
+Start:
+
+; If the start address is larger than 4 digits, the header generated above
+; will not contain the highest digit. Instead of wasting one more digit that
+; is almost never used, check it at link time and generate an error so the
+; user knows something is wrong.
+
+.assert (Start < 10000), error, "Start address too large for generated BASIC stub"
diff --git a/libsrc/mega65/get_tv.s b/libsrc/mega65/get_tv.s
new file mode 100644
index 000000000..eb2dafd1d
--- /dev/null
+++ b/libsrc/mega65/get_tv.s
@@ -0,0 +1,25 @@
+;
+; Ullrich von Bassewitz, 2002-12-03
+;
+; unsigned char get_tv (void);
+; /* Return the video mode the machine is using */
+;
+
+        .include        "get_tv.inc"
+        .include        "mega65.inc"
+
+
+;--------------------------------------------------------------------------
+; _get_tv
+
+.proc   _get_tv
+
+        ldx     #TV::PAL        ; Assume PAL
+        lda     PALFLAG
+        bne     pal
+        dex                     ; NTSC
+pal:    txa
+        ldx     #0
+        rts
+
+.endproc
diff --git a/libsrc/mega65/gettime.s b/libsrc/mega65/gettime.s
new file mode 100644
index 000000000..34c5054d5
--- /dev/null
+++ b/libsrc/mega65/gettime.s
@@ -0,0 +1,83 @@
+;
+; Stefan Haubenthal, 27.7.2009
+; Oliver Schmidt, 14.8.2018
+;
+; int __fastcall__ clock_gettime (clockid_t clk_id, struct timespec *tp);
+;
+
+        .include        "time.inc"
+        .include        "mega65.inc"
+
+        .importzp       sreg, tmp1, tmp2
+        .import         pushax, pusheax, tosmul0ax, steaxspidx, incsp1, return0
+        .import         TM, load_tenth
+
+
+;----------------------------------------------------------------------------
+.code
+
+.proc   _clock_gettime
+
+        jsr     pushax
+        jsr     pushax
+
+        lda     CIA1_TODHR
+        sed
+        tax                     ; Save PM flag
+        and     #%01111111
+        cmp     #$12            ; 12 AM/PM
+        bcc     @L1
+        sbc     #$12
+@L1:    inx                     ; Get PM flag
+        bpl     @L2
+        clc
+        adc     #$12
+@L2:    cld
+        jsr     BCD2dec
+        sta     TM + tm::tm_hour
+        lda     CIA1_TODMIN
+        jsr     BCD2dec
+        sta     TM + tm::tm_min
+        lda     CIA1_TODSEC
+        jsr     BCD2dec
+        sta     TM + tm::tm_sec
+        lda     #<TM
+        ldx     #>TM
+        jsr     _mktime
+
+        ldy     #timespec::tv_sec
+        jsr     steaxspidx      ; Pops address pushed by 2. pushax
+
+        jsr     load_tenth
+        jsr     pusheax
+        lda     CIA1_TOD10
+        ldx     #>$0000
+        jsr     tosmul0ax
+
+        ldy     #timespec::tv_nsec
+        jsr     steaxspidx      ; Pops address pushed by 1. pushax
+
+        jsr     incsp1
+        jmp     return0
+
+.endproc
+
+;----------------------------------------------------------------------------
+; dec = (((BCD>>4)*10) + (BCD&0xf))
+
+.proc   BCD2dec
+
+        tax
+        and     #%00001111
+        sta     tmp1
+        txa
+        and     #%11110000      ; *16
+        lsr                     ; *8
+        sta     tmp2
+        lsr
+        lsr                     ; *2
+        adc     tmp2            ; = *10
+        adc     tmp1
+        rts
+
+.endproc
diff --git a/libsrc/mega65/joy/m65-stdjoy.s b/libsrc/mega65/joy/m65-stdjoy.s
new file mode 100644
index 000000000..d266745d9
--- /dev/null
+++ b/libsrc/mega65/joy/m65-stdjoy.s
@@ -0,0 +1,111 @@
+;
+; Standard joystick driver for the C64. May be used multiple times when linked
+; to the statically application.
+;
+; Ullrich von Bassewitz, 2002-12-20
+;
+
+        .include        "zeropage.inc"
+
+        .include        "joy-kernel.inc"
+        .include        "joy-error.inc"
+        .include        "mega65.inc"
+
+        .macpack        generic
+        .macpack        module
+
+
+; ------------------------------------------------------------------------
+; Header. Includes jump table
+
+        module_header   _mega65_stdjoy_joy
+
+; Driver signature
+
+        .byte   $6A, $6F, $79           ; "joy"
+        .byte   JOY_API_VERSION         ; Driver API version number
+
+; Library reference
+
+        .addr   $0000
+
+; Jump table.
+
+        .addr   INSTALL
+        .addr   UNINSTALL
+        .addr   COUNT
+        .addr   READ
+
+; ------------------------------------------------------------------------
+; Constants
+
+JOY_COUNT       = 2             ; Number of joysticks we support
+
+
+; ------------------------------------------------------------------------
+; Data.
+
+
+.code
+
+; ------------------------------------------------------------------------
+; INSTALL routine. Is called after the driver is loaded into memory. If
+; possible, check if the hardware is present and determine the amount of
+; memory available.
+; Must return an JOY_ERR_xx code in a/x.
+;
+
+INSTALL:
+        lda     #JOY_ERR_OK
+        .assert JOY_ERR_OK = 0, error
+        tax
+
+;       rts                     ; Run into UNINSTALL instead
+
+; ------------------------------------------------------------------------
+; UNINSTALL routine. Is called before the driver is removed from memory.
+; Can do cleanup or whatever. Must not return anything.
+;
+
+UNINSTALL:
+        rts
+
+
+; ------------------------------------------------------------------------
+; COUNT: Return the total number of available joysticks in a/x.
+;
+
+COUNT:
+        lda     #<JOY_COUNT
+        ldx     #>JOY_COUNT
+        rts
+
+; ------------------------------------------------------------------------
+; READ: Read a particular joystick passed in A.
+;
+
+READ:   tax                     ; Joystick number into X
+        bne     joy2
+
+; Read joystick 1
+
+joy1:   lda     #$7F
+        sei
+        sta     CIA1_PRA
+        lda     CIA1_PRB
+        cli
+        jmp     end
+
+; Read joystick 2
+
+joy2:   ldx     #0
+        lda     #$E0
+        ldy     #$FF
+        sei
+        sta     CIA1_DDRA
+        lda     CIA1_PRA
+        sty     CIA1_DDRA
+        cli
+end:    and     #$1F
+        eor     #$1F
+        rts
diff --git a/libsrc/mega65/joy_stat_stddrv.s b/libsrc/mega65/joy_stat_stddrv.s
new file mode 100644
index 000000000..492d84eb0
--- /dev/null
+++ b/libsrc/mega65/joy_stat_stddrv.s
@@ -0,0 +1,14 @@
+;
+; Address of the static standard joystick driver
+;
+; Oliver Schmidt, 2012-11-01
+;
+; const void joy_static_stddrv[];
+;
+
+        .export _joy_static_stddrv
+        .import _mega65_stdjoy_joy
+
+.rodata
+
+_joy_static_stddrv := _mega65_stdjoy_joy
diff --git a/libsrc/mega65/joy_stddrv.s b/libsrc/mega65/joy_stddrv.s
new file mode 100644
index 000000000..97c7c7501
--- /dev/null
+++ b/libsrc/mega65/joy_stddrv.s
@@ -0,0 +1,14 @@
+;
+; Name of the standard joystick driver
+;
+; Ullrich von Bassewitz, 2002-12-21
+;
+; const char joy_stddrv[];
+;
+
+        .export _joy_stddrv
+
+.rodata
+
+_joy_stddrv:    .asciiz "m65-stdjoy.joy"
+
diff --git a/libsrc/mega65/kbhit.s b/libsrc/mega65/kbhit.s
new file mode 100644
index 000000000..683451b03
--- /dev/null
+++ b/libsrc/mega65/kbhit.s
@@ -0,0 +1,14 @@
+
+       ; FIXME: is $d610 mega65 specific?
+       ; FIXME: this should rather use the kernal (with keyboard buffer etc)
+
+        .export _kbhit
+_kbhit:
+        lda $d610
+        beq :+
+
+        lda #1
+:
+        ldx #>$0000
+        rts
+
diff --git a/libsrc/mega65/kernal.s b/libsrc/mega65/kernal.s
new file mode 100644
index 000000000..198e8fbb4
--- /dev/null
+++ b/libsrc/mega65/kernal.s
@@ -0,0 +1,47 @@
+;
+; Ullrich von Bassewitz, 19.11.2002
+;
+; MEGA65 Kernal functions
+;
+
+        .include "cbm_kernal.inc"
+
+        .export         CINT
+        .export         IOINIT
+        .export         RAMTAS
+        .export         RESTOR
+        .export         VECTOR
+        .export         SETMSG
+        .export         SECOND
+        .export         TKSA
+        .export         MEMTOP
+        .export         MEMBOT
+        .export         SCNKEY
+        .export         ACPTR
+        .export         CIOUT
+        .export         UNTLK
+        .export         UNLSN
+        .export         LISTEN
+        .export         TALK
+        .export         READST
+        .export         SETLFS
+        .export         SETNAM
+        .export         OPEN
+        .export         CLOSE
+        .export         CHKIN
+        .export         CKOUT
+        .export         CLRCH
+        .export         BASIN
+        .export         CHRIN
+        .export         BSOUT
+        .export         CHROUT
+        .export         LOAD
+        .export         SAVE
+        .export         SETTIM
+        .export         RDTIM
+        .export         STOP
+        .export         GETIN
+        .export         CLALL
+        .export         SCREEN
+        .export         IOBASE
+        .export         PLOT
diff --git a/libsrc/mega65/libref.s b/libsrc/mega65/libref.s
new file mode 100644
index 000000000..e4afa7eb1
--- /dev/null
+++ b/libsrc/mega65/libref.s
@@ -0,0 +1,8 @@
+;
+; Oliver Schmidt, 2013-05-31
+;
+
+        .export         joy_libref
+        .import         _exit
+
+joy_libref      := _exit
diff --git a/libsrc/mega65/loadaddr.s b/libsrc/mega65/loadaddr.s
new file mode 100644
index 000000000..0675dd67d
--- /dev/null
+++ b/libsrc/mega65/loadaddr.s
@@ -0,0 +1,16 @@
+;
+; Ullrich von Bassewitz, 2010-11-13
+;
+; This module supplies the load address that is expected by Commodore
+; machines in the first two bytes of an excutable disk file.
+;
+
+
+        ; The following symbol is used by linker config to force the module
+        ; to get included into the output file
+        .export         __LOADADDR__: absolute = 1
+
+.segment        "LOADADDR"
+
+        .addr   *+2
+
diff --git a/libsrc/mega65/mainargs.s b/libsrc/mega65/mainargs.s
new file mode 100644
index 000000000..b4063b93c
--- /dev/null
+++ b/libsrc/mega65/mainargs.s
@@ -0,0 +1,137 @@
+; mainargs.s
+;
+; Ullrich von Bassewitz, 2003-03-07
+; Based on code from Stefan A. Haubenthal, <polluks@web.de>
+; 2003-05-18, Greg King
+; 2004-04-28, 2005-02-26, Ullrich von Bassewitz
+;
+; Scan a group of arguments that are in BASIC's input-buffer.
+; Build an array that points to the beginning of each argument.
+; Send, to main(), that array and the count of the arguments.
+;
+; Command-lines look like these lines:
+;
+; run
+; run : rem
+; run:rem arg1 " arg 2 is quoted "  arg3 "" arg5
+;
+; "run" and "rem" are entokenned; the args. are not.  Leading and trailing
+; spaces outside of quotes are ignored.
+;
+; TO-DO:
+; - The "file-name" might be a path-name; don't copy the directory-components.
+; - Add a control-character quoting mechanism.
+
+        .constructor    initmainargs, 24
+        .import         __argc, __argv
+
+        .include        "mega65.inc"
+
+
+MAXARGS  = 10                   ; Maximum number of arguments allowed
+REM      = $8f                  ; BASIC token-code
+NAME_LEN = 16                   ; Maximum length of command-name
+
+; Get possible command-line arguments. Goes into the special ONCE segment,
+; which may be reused after the startup code is run
+
+.segment        "ONCE"
+
+initmainargs:
+
+; Assume that the program was loaded, a moment ago, by the traditional LOAD
+; statement.  Save the "most-recent filename" as argument #0.
+
+        lda     #0              ; The terminating NUL character
+        ldy     FNAM_LEN
+        cpy     #NAME_LEN + 1
+        bcc     L1
+        ldy     #NAME_LEN       ; Limit the length
+        bne     L1              ; Branch always
+L0:     lda     (FNAM),y
+L1:     sta     name,y
+        dey
+        bpl     L0
+        inc     __argc          ; argc always is equal to, at least, 1
+
+; Find the "rem" token.
+
+        ldx     #0
+L2:     lda     BASIC_BUF,x
+        beq     done            ; No "rem," no args.
+        inx
+        cmp     #REM
+        bne     L2
+        ldy     #1 * 2
+
+; Find the next argument
+
+next:   lda     BASIC_BUF,x
+        beq     done            ; End of line reached
+        inx
+        cmp     #' '            ; Skip leading spaces
+        beq     next
+
+; Found start of next argument. We've incremented the pointer in X already, so
+; it points to the second character of the argument. This is useful since we
+; will check now for a quoted argument, in which case we will have to skip this
+; first character.
+
+found:  cmp     #'"'            ; Is the argument quoted?
+        beq     setterm         ; Jump if so
+        dex                     ; Reset pointer to first argument character
+        lda     #' '            ; A space ends the argument
+setterm:sta     term            ; Set end of argument marker
+
+; Now store a pointer to the argument into the next slot. Since the BASIC
+; input buffer is located at the start of a RAM page, no calculations are
+; necessary.
+
+        txa                     ; Get low byte
+        sta     argv,y          ; argv[y]= &arg
+        iny
+        lda     #>BASIC_BUF
+        sta     argv,y
+        iny
+        inc     __argc          ; Found another arg
+
+; Search for the end of the argument
+
+argloop:lda     BASIC_BUF,x
+        beq     done
+        inx
+        cmp     term
+        bne     argloop
+
+; We've found the end of the argument. X points one character behind it, and
+; A contains the terminating character. To make the argument a valid C string,
+; replace the terminating character by a zero.
+
+        lda     #0
+        sta     BASIC_BUF-1,x
+
+; Check if the maximum number of command line arguments is reached. If not,
+; parse the next one.
+
+        lda     __argc          ; Get low byte of argument count
+        cmp     #MAXARGS        ; Maximum number of arguments reached?
+        bcc     next            ; Parse next one if not
+
+; (The last vector in argv[] already is NULL.)
+
+done:   lda     #<argv
+        ldx     #>argv
+        sta     __argv
+        stx     __argv + 1
+        rts
+
+.segment        "INIT"
+
+term:   .res    1
+name:   .res    NAME_LEN + 1
+
+.data
+
+; char* argv[MAXARGS+1]={name};
+argv:   .addr   name
+        .res    MAXARGS * 2
diff --git a/libsrc/mega65/randomize.s b/libsrc/mega65/randomize.s
new file mode 100644
index 000000000..89feebe11
--- /dev/null
+++ b/libsrc/mega65/randomize.s
@@ -0,0 +1,18 @@
+;
+; 2002-11-05, Ullrich von Bassewitz
+; 2015-09-11, Greg King
+;
+; void __randomize (void);
+; /* Initialize the random number generator */
+;
+
+        .export         ___randomize
+        .import         _srand
+
+        .include        "mega65.inc"
+
+___randomize:
+        ldx     VIC_HLINE       ; Use VIC rasterline as high byte
+        lda     TIME+2          ; Use 60HZ clock as low byte
+        jmp     _srand          ; Initialize generator
+
diff --git a/libsrc/mega65/revers.s b/libsrc/mega65/revers.s
new file mode 100644
index 000000000..3dc508f79
--- /dev/null
+++ b/libsrc/mega65/revers.s
@@ -0,0 +1,27 @@
+;
+; Ullrich von Bassewitz, 07.08.1998
+;
+; unsigned char revers (unsigned char onoff);
+;
+
+        .export         _revers
+
+        .include        "mega65.inc"
+
+.proc   _revers
+
+        ldx     #$00            ; Assume revers off
+        tay                     ; Test onoff
+        beq     L1              ; Jump if off
+        ldx     #$80            ; Load on value
+        ldy     #$00            ; Assume old value is zero
+L1:     lda     RVS             ; Load old value
+        stx     RVS             ; Set new value
+        beq     L2              ; Jump if old value zero
+        iny                     ; Make old value = 1
+L2:     ldx     #$00            ; Load high byte of result
+        tya                     ; Load low byte, set CC
+        rts
+
+.endproc
+
diff --git a/libsrc/mega65/settime.s b/libsrc/mega65/settime.s
new file mode 100644
index 000000000..22a17fb61
--- /dev/null
+++ b/libsrc/mega65/settime.s
@@ -0,0 +1,84 @@
+;
+; Oliver Schmidt, 16.8.2018
+;
+; int __fastcall__ clock_settime (clockid_t clk_id, const struct timespec *tp);
+;
+
+        .include        "time.inc"
+        .include        "mega65.inc"
+
+        .importzp       sreg, ptr1
+        .import         pushax, pusheax, ldax0sp, ldeaxidx
+        .import         tosdiveax, incsp3, return0
+        .import         TM, load_tenth
+
+
+;----------------------------------------------------------------------------
+.code
+
+.proc   _clock_settime
+
+        jsr     pushax
+
+        .assert timespec::tv_sec = 0, error
+        jsr     _localtime
+        sta     ptr1
+        stx     ptr1+1
+        ldy     #.sizeof(tm)-1
+@L1:    lda     (ptr1),y
+        sta     TM,y
+        dey
+        bpl     @L1
+
+        lda     TM + tm::tm_hour
+        jsr     dec2BCD
+        tax                     ; Force flags
+        bne     @L2
+        lda     #$92            ; 12 AM
+        bne     @L3
+@L2:    cmp     #$13            ; 1 PM
+        bcc     @L3
+        sed
+        sbc     #$12
+        cld
+        ora     #%10000000
+@L3:    sta     CIA1_TODHR
+        lda     TM + tm::tm_min
+        jsr     dec2BCD
+        sta     CIA1_TODMIN
+        lda     TM + tm::tm_sec
+        jsr     dec2BCD
+        sta     CIA1_TODSEC
+
+        jsr     ldax0sp
+        ldy     #3+timespec::tv_nsec
+        jsr     ldeaxidx
+        jsr     pusheax
+        jsr     load_tenth
+        jsr     tosdiveax
+        sta     CIA1_TOD10
+
+        jsr     incsp3
+        jmp     return0
+
+.endproc
+
+;----------------------------------------------------------------------------
+; Just sum up the value in BCD mode.
+; http://forum.6502.org/viewtopic.php?p=7629#p7629
+
+.proc   dec2BCD
+
+        tax
+        dex
+        bmi     @L9
+        lda     #0
+        clc
+        sed
+@L1:    adc     #1
+        dex
+        bpl     @L1
+        cld
+@L9:    rts
+
+.endproc
diff --git a/libsrc/mega65/status.s b/libsrc/mega65/status.s
new file mode 100644
index 000000000..c6f279230
--- /dev/null
+++ b/libsrc/mega65/status.s
@@ -0,0 +1,5 @@
+;
+; Oliver Schmidt, 2012-09-30
+;
+
+        .exportzp       ST := $90       ; IEC status byte
diff --git a/libsrc/mega65/sysuname.s b/libsrc/mega65/sysuname.s
new file mode 100644
index 000000000..2feab6fb1
--- /dev/null
+++ b/libsrc/mega65/sysuname.s
@@ -0,0 +1,37 @@
+;
+; Ullrich von Bassewitz, 2003-08-12
+;
+; unsigned char __fastcall__ _sysuname (struct utsname* buf);
+;
+
+        .export         __sysuname, utsdata
+
+        .import         utscopy
+
+        __sysuname = utscopy
+
+;--------------------------------------------------------------------------
+; Data. We define a fixed utsname struct here and just copy it.
+
+.rodata
+
+utsdata:
+        ; sysname
+        .asciiz         "cc65"
+
+        ; nodename
+        .asciiz         ""
+
+        ; release
+        .byte           .string (>.version)
+        .byte           '.'
+        .byte           .string (<.version)
+        .byte           $00
+
+        ; version
+        .byte           '0'     ; unused
+        .byte           $00
+
+        ; machine
+        .asciiz         "MEGA65"
+
diff --git a/libsrc/mega65/tmcommon.s b/libsrc/mega65/tmcommon.s
new file mode 100644
index 000000000..52094b68e
--- /dev/null
+++ b/libsrc/mega65/tmcommon.s
@@ -0,0 +1,64 @@
+;
+; Oliver Schmidt, 16.8.2018
+;
+; Common stuff for the clock routines
+;
+
+        .include        "c65.inc"
+        .include        "get_tv.inc"
+
+        .export         TM, load_tenth
+
+        .constructor    inittime
+        .importzp       sreg
+        .import         _get_tv
+
+
+;----------------------------------------------------------------------------
+.code
+
+.proc   load_tenth
+
+        lda     #<(100 * 1000 * 1000 / $10000)
+        ldx     #>(100 * 1000 * 1000 / $10000)
+        sta     sreg
+        stx     sreg+1
+        lda     #<(100 * 1000 * 1000)
+        ldx     #>(100 * 1000 * 1000)
+        rts
+
+.endproc
+
+;----------------------------------------------------------------------------
+; Constructor that writes to the 1/10 sec register of the TOD to kick it
+; into action. If this is not done, the clock hangs. We will read the register
+; and write it again, ignoring a possible change in between.
+.segment "ONCE"
+
+.proc   inittime
+
+        lda     CIA1_TOD10
+        sta     CIA1_TOD10
+        jsr     _get_tv
+        cmp     #TV::PAL
+        bne     @60Hz
+        lda     CIA1_CRA
+        ora     #$80
+        sta     CIA1_CRA
+@60Hz:  rts
+
+.endproc
+
+;----------------------------------------------------------------------------
+; TM struct with date set to 1970-01-01
+.data
+
+TM:     .word           0       ; tm_sec
+        .word           0       ; tm_min
+        .word           0       ; tm_hour
+        .word           1       ; tm_mday
+        .word           0       ; tm_mon
+        .word           70      ; tm_year
+        .word           0       ; tm_wday
+        .word           0       ; tm_yday
+        .word           0       ; tm_isdst
diff --git a/libsrc/nes/color.s b/libsrc/nes/color.s
index e3aef9a28..cd1a950ea 100644
--- a/libsrc/nes/color.s
+++ b/libsrc/nes/color.s
@@ -9,11 +9,11 @@
 
 
         .export         _textcolor, _bgcolor, _bordercolor
-        .import         return0, ppubuf_put
+        .import         return0, return1, ppubuf_put
 
         .include        "nes.inc"
 
-_textcolor      = return0
+_textcolor      = return1
 _bordercolor    = return0
 
 .proc   _bgcolor
diff --git a/libsrc/nes/cpeekc.s b/libsrc/nes/cpeekc.s
new file mode 100644
index 000000000..315a2df5c
--- /dev/null
+++ b/libsrc/nes/cpeekc.s
@@ -0,0 +1,37 @@
+;
+; 2016-02-28, Groepaz
+; 2017-08-17, Greg King
+;
+; char cpeekc (void);
+;
+
+        .export         _cpeekc
+
+        .import         ppubuf_waitempty
+        .forceimport    initconio
+
+        .include        "nes.inc"
+
+
+_cpeekc:
+        ; wait until all console data has been written
+        jsr     ppubuf_waitempty
+
+        ldy     SCREEN_PTR+1
+        lda     SCREEN_PTR
+
+; waiting for vblank is incredibly slow ://
+vwait:
+;       ldx     PPU_STATUS
+;       bpl     vwait
+
+        ldx     #>$0000
+        sty     PPU_VRAM_ADDR2
+        sta     PPU_VRAM_ADDR2
+        lda     PPU_VRAM_IO     ; first read is invalid
+        lda     PPU_VRAM_IO     ; get data
+        stx     PPU_VRAM_ADDR2
+        stx     PPU_VRAM_ADDR2
+
+        and     #<~$80          ; remove reverse bit
+        rts
diff --git a/libsrc/nes/cpeekcolor.s b/libsrc/nes/cpeekcolor.s
new file mode 100644
index 000000000..ed275ec95
--- /dev/null
+++ b/libsrc/nes/cpeekcolor.s
@@ -0,0 +1,8 @@
+;
+; 2017-06-03, Greg King
+;
+; unsigned char cpeekcolor (void);
+;
+
+        .import         return1
+        .export         _cpeekcolor := return1  ; always COLOR_WHITE
diff --git a/libsrc/nes/cpeekrevers.s b/libsrc/nes/cpeekrevers.s
new file mode 100644
index 000000000..8b1542bc0
--- /dev/null
+++ b/libsrc/nes/cpeekrevers.s
@@ -0,0 +1,37 @@
+;
+; 2016-02-28, Groepaz
+; 2017-08-17, Greg King
+;
+; char cpeekrevers (void);
+;
+
+        .export         _cpeekrevers
+
+        .import         ppubuf_waitempty
+        .forceimport    initconio
+
+        .include        "nes.inc"
+
+
+_cpeekrevers:
+        ; wait until all console data has been written
+        jsr     ppubuf_waitempty
+
+        ldy     SCREEN_PTR+1
+        lda     SCREEN_PTR
+
+; waiting for vblank is incredibly slow ://
+vwait:
+;       ldx     PPU_STATUS
+;       bpl     vwait
+
+        ldx     #>$0000
+        sty     PPU_VRAM_ADDR2
+        sta     PPU_VRAM_ADDR2
+        lda     PPU_VRAM_IO     ; first read is invalid
+        lda     PPU_VRAM_IO     ; get data
+        stx     PPU_VRAM_ADDR2
+        stx     PPU_VRAM_ADDR2
+
+        and     #<$80           ; get reverse bit
+        rts
diff --git a/libsrc/nes/crt0.s b/libsrc/nes/crt0.s
index 19e97bb12..dfc26dcde 100644
--- a/libsrc/nes/crt0.s
+++ b/libsrc/nes/crt0.s
@@ -107,8 +107,8 @@ start:
 
         lda     #<(__SRAM_START__ + __SRAM_SIZE__)
         ldx     #>(__SRAM_START__ + __SRAM_SIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Call the module constructors.
 
diff --git a/libsrc/nes/ppubuf.s b/libsrc/nes/ppubuf.s
index f08fc1a71..f3efa4451 100644
--- a/libsrc/nes/ppubuf.s
+++ b/libsrc/nes/ppubuf.s
@@ -32,7 +32,9 @@
 
 .proc   ppubuf_wait
 
-        lda     #$ff            ; (($0100/3)*1)
+; $45 is the largest number that didn't cause glitches, $44 gives a bit more
+; breathing room. see issue #1703
+        lda     #$44
 @wait:  cmp     ringcount
         beq     @wait
         rts
@@ -68,7 +70,7 @@
 
 ; ------------------------------------------------------------------------
 ; Flush PPU-Memory write buffer
-; called from vblank interupt
+; called from vblank interrupt
 
 .proc   ppubuf_flush
 
diff --git a/libsrc/nes/sysuname.s b/libsrc/nes/sysuname.s
index fcab503e1..7e72df358 100644
--- a/libsrc/nes/sysuname.s
+++ b/libsrc/nes/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/none/crt0.s b/libsrc/none/crt0.s
index 596fbcd46..443f453b9 100644
--- a/libsrc/none/crt0.s
+++ b/libsrc/none/crt0.s
@@ -10,8 +10,8 @@
 
        lda #<__STACKSTART__
        ldx #>__STACKSTART__
-       sta sp
-       stx sp+1
+       sta c_sp
+       stx c_sp+1
        jsr zerobss
        jsr initlib
        jsr _main
diff --git a/libsrc/osic1p/cpeekc.s b/libsrc/osic1p/cpeekc.s
new file mode 100644
index 000000000..55a170501
--- /dev/null
+++ b/libsrc/osic1p/cpeekc.s
@@ -0,0 +1,17 @@
+;
+; 2017-06-21, Greg King
+;
+; char cpeekc (void);
+;
+; Get a character from OSI C1P screen RAM.
+;
+        .export         _cpeekc
+
+        .include        "extzp.inc"
+
+
+_cpeekc:
+        ldy     CURS_X
+        lda     (SCREEN_PTR),y
+        ldx     #>$0000
+        rts
diff --git a/libsrc/osic1p/cpeekcolor.s b/libsrc/osic1p/cpeekcolor.s
new file mode 100644
index 000000000..ed275ec95
--- /dev/null
+++ b/libsrc/osic1p/cpeekcolor.s
@@ -0,0 +1,8 @@
+;
+; 2017-06-03, Greg King
+;
+; unsigned char cpeekcolor (void);
+;
+
+        .import         return1
+        .export         _cpeekcolor := return1  ; always COLOR_WHITE
diff --git a/libsrc/osic1p/cpeekrevers.s b/libsrc/osic1p/cpeekrevers.s
new file mode 100644
index 000000000..ab7c68b35
--- /dev/null
+++ b/libsrc/osic1p/cpeekrevers.s
@@ -0,0 +1,9 @@
+;
+; 2017-06-15, Greg King
+;
+; unsigned char cpeekrevers (void);
+;
+; Get a reverse attribute from screen RAM
+;
+        .import         return0
+        .export         _cpeekrevers := return0 ; No attribute
diff --git a/libsrc/osic1p/crt0.s b/libsrc/osic1p/crt0.s
index 56abb7cdb..46d29ed66 100644
--- a/libsrc/osic1p/crt0.s
+++ b/libsrc/osic1p/crt0.s
@@ -34,8 +34,8 @@ _init:    ldx     #$FF          ; Initialize stack pointer to $01FF
 
           lda     #<(__MAIN_START__ + __MAIN_SIZE__  + __STACKSIZE__)
           ldx     #>(__MAIN_START__ + __MAIN_SIZE__  + __STACKSIZE__)
-          sta     sp
-          stx     sp+1
+          sta     c_sp
+          stx     c_sp+1
 
 ; ---------------------------------------------------------------------------
 ; Initialize memory storage
diff --git a/libsrc/pce/_printf.s b/libsrc/pce/_printf.s
index e1d2a1cf4..675076ec6 100644
--- a/libsrc/pce/_printf.s
+++ b/libsrc/pce/_printf.s
@@ -329,22 +329,22 @@ MainLoop:
         jsr     decsp6                  ; 3 args
         ldy     #5
         lda     OutData+1
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     OutData
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FSave+1
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FSave
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FCount+1
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     FCount
-        sta     (sp),y
+        sta     (c_sp),y
         jsr     CallOutFunc             ; Call the output function
 
 ; We're back from out(), or we didn't call it. Check for end of string.
diff --git a/libsrc/pce/cpeekc.s b/libsrc/pce/cpeekc.s
index e144f94ac..326fe5203 100644
--- a/libsrc/pce/cpeekc.s
+++ b/libsrc/pce/cpeekc.s
@@ -14,11 +14,11 @@ _cpeekc:
         st0     #VDC_MARR       ; Memory-Address Read
         ldy     SCREEN_PTR
         ldx     SCREEN_PTR+1
-        sty     VDC_DATA_LO
-        stx     VDC_DATA_HI
+        sty     a:VDC_DATA_LO
+        stx     a:VDC_DATA_HI
 
         st0     #VDC_VRR        ; VRAM Read Register
-        lda     VDC_DATA_LO     ; character
+        lda     a:VDC_DATA_LO   ; character
         and     #<~$80          ; remove reverse bit
         ldx     #0
         rts
diff --git a/libsrc/pce/cpeekcolor.s b/libsrc/pce/cpeekcolor.s
index 8b96d29d4..ecee91ed5 100644
--- a/libsrc/pce/cpeekcolor.s
+++ b/libsrc/pce/cpeekcolor.s
@@ -14,11 +14,11 @@ _cpeekcolor:
         st0     #VDC_MARR       ; Memory-Address Read
         ldy     SCREEN_PTR
         ldx     SCREEN_PTR+1
-        sty     VDC_DATA_LO
-        stx     VDC_DATA_HI
+        sty     a:VDC_DATA_LO
+        stx     a:VDC_DATA_HI
 
         st0     #VDC_VRR        ; VRAM Read Register
-        lda     VDC_DATA_HI
+        lda     a:VDC_DATA_HI
         and     #<~$02
         lsr     a
         lsr     a
diff --git a/libsrc/pce/cpeekrevers.s b/libsrc/pce/cpeekrevers.s
index 3f208fd10..8fa173202 100644
--- a/libsrc/pce/cpeekrevers.s
+++ b/libsrc/pce/cpeekrevers.s
@@ -14,13 +14,14 @@ _cpeekrevers:
         st0     #VDC_MARR       ; Memory-Address Read
         ldy     SCREEN_PTR
         ldx     SCREEN_PTR+1
-        sty     VDC_DATA_LO
-        stx     VDC_DATA_HI
+        sty     a:VDC_DATA_LO
+        stx     a:VDC_DATA_HI
 
         st0     #VDC_VRR        ; VRAM Read Register
-        lda     VDC_DATA_LO     ; character (bit 7 is revers bit)
-        rol     a
-        rol     a
-        and     #1
-        ldx     #0
+
+        lda     a:VDC_DATA_LO   ; character (bit 7 is revers bit)
+        and     #$80            ; get reverse bit
+        asl     a               ; reverse bit to carry, A=0
+        tax                     ; ldx #>$0000
+        rol     a               ; reverse bit from carry
         rts
diff --git a/libsrc/pce/cpeeks.s b/libsrc/pce/cpeeks.s
index fe5e28687..322b9ba30 100644
--- a/libsrc/pce/cpeeks.s
+++ b/libsrc/pce/cpeeks.s
@@ -1,5 +1,6 @@
 ;
 ; 2020-07-14, Groepaz
+; 2020-07-15, Greg King
 ;
 ; void cpeeks (char* s, unsigned length);
 ;
@@ -8,9 +9,7 @@
         .export         _cpeeks
 
         .import         popax
-        .importzp       ptr1, ptr2, tmp1, tmp2
-
-        .macpack        generic
+        .importzp       ptr1, ptr2
 
         .include        "pce.inc"
         .include        "extzp.inc"
@@ -22,35 +21,31 @@ _cpeeks:
         eor     #>$FFFF
         sta     ptr2+1
 
+        st0     #VDC_CR         ; Control Register
+        st2     #>$0088         ; make VRAM address increment by one
+
         st0     #VDC_MARR       ; Memory-Address Read
         ldy     SCREEN_PTR
         ldx     SCREEN_PTR+1
-        sty     VDC_DATA_LO
-        stx     VDC_DATA_HI
+        sty     a:VDC_DATA_LO
+        stx     a:VDC_DATA_HI
 
         st0     #VDC_VRR        ; VRAM Read Register
 
         jsr     popax
-        sta     tmp1            ; (will be a .Y index)
+        tay                     ; low byte of address will be used as index
         stx     ptr1+1
-
         ldx     #<$0000
         stx     ptr1
         beq     L2              ; branch always
 
-L3:     ldy     tmp2
-        lda     VDC_DATA_LO     ; get character
-        bit     VDC_DATA_HI     ; we need to "read" the highbyte to advance the address
-        iny
-        sty     tmp2
+L3:     lda     a:VDC_DATA_LO   ; get character
+        bit     a:VDC_DATA_HI   ; need to read high byte to advance VDC address
         and     #<~$80          ; remove reverse bit
-
-        ldy     tmp1
         sta     (ptr1),y
         iny
-        bne     L1
+        bne     L2
         inc     ptr1+1
-L1:     sty     tmp1
 
 L2:     inc     ptr2            ; count length
         bne     L3
@@ -58,6 +53,5 @@ L2:     inc     ptr2            ; count length
         bne     L3
 
         txa                     ; terminate the string
-        ldy     tmp1
         sta     (ptr1),y
         rts
diff --git a/libsrc/pce/crt0.s b/libsrc/pce/crt0.s
index d6dee3ef4..660faae7f 100644
--- a/libsrc/pce/crt0.s
+++ b/libsrc/pce/crt0.s
@@ -13,7 +13,7 @@
         .import         initlib, donelib
         .import         push0, _main
         .import         IRQStub, __nmi
-        .importzp       sp
+        .importzp       c_sp
 
         ; Linker-generated
         .import         __CARTSIZE__
@@ -86,8 +86,8 @@ start:  sei
         ; Set up the stack
         lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1
+        sta     c_sp
+        stx     c_sp+1
 
         ; Call the module constructors.
         jsr     initlib
diff --git a/libsrc/pce/memcpy.s b/libsrc/pce/memcpy.s
index 98db6a964..7ee33477b 100644
--- a/libsrc/pce/memcpy.s
+++ b/libsrc/pce/memcpy.s
@@ -18,7 +18,7 @@
         .export         memcpy_increment, memcpy_transfer, memcpy_getparams
 
         .import         incsp2, popax, popptr1
-        .importzp       sp, ptr1, ptr2, ptr3
+        .importzp       c_sp, ptr1, ptr2, ptr3
 
 
 ; The structure of the transfer instructions
@@ -86,9 +86,9 @@ memcpy_getparams:
 ; (Direct stack access is six cycles faster [total cycle count].)
 
         iny                             ; (Y=0 by popptr1, need '1' here) save dest
-        lda     (sp),y                  ; get high byte
+        lda     (c_sp),y                ; get high byte
         tax
-        lda     (sp)                    ; get low byte
+        lda     (c_sp)                  ; get low byte
         sta     ptr2
         stx     ptr2+1
         rts                             ; return dest address (for memmove)
diff --git a/libsrc/pce/vga.s b/libsrc/pce/vga.s
index 630fbe8db..067647cb8 100644
--- a/libsrc/pce/vga.s
+++ b/libsrc/pce/vga.s
@@ -3,9 +3,9 @@
 
         .export _pce_font
 
-; The character tiles use only two colors from each pallette.  Color zero
-; comes from pallette zero; color one is different in each pallette.  The
-; color of a character is set by choosing one of the 16 pallettes.
+; The character tiles use only two colors from each palette.  Color zero
+; comes from palette zero; color one is different in each palette.  The
+; color of a character is set by choosing one of the 16 palettes.
 
 .rodata
 
diff --git a/libsrc/pet/cbm_load.c b/libsrc/pet/cbm_load.c
index 1823f6537..2c98d9581 100644
--- a/libsrc/pet/cbm_load.c
+++ b/libsrc/pet/cbm_load.c
@@ -22,14 +22,14 @@ unsigned int __fastcall__ cbm_load (const char* name, unsigned char device, void
     unsigned int size = 0;
 
     if (cbm_open (1, device, CBM_READ, name) != 0) {
-        /* Can't load from a file that can't be openned. */
+        /* Can't load from a file that can't be opened. */
         return 0;
     }
 
     /* Get the file's load address. */
     if (cbm_read (1, &load, sizeof load) != sizeof load) {
         /* Either the file wasn't found, or it was too short.  (Note:
-        ** the computer openned a file even if the drive couldn't open one.)
+        ** the computer opened a file even if the drive couldn't open one.)
         */
         cbm_close (1);
         return 0;
diff --git a/libsrc/pet/crt0.s b/libsrc/pet/crt0.s
index e56a7eca4..e3c6ed4b4 100644
--- a/libsrc/pet/crt0.s
+++ b/libsrc/pet/crt0.s
@@ -23,7 +23,7 @@ Start:
 ; Save the zero-page locations that we need.
 
         ldx     #zpspace-1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -52,9 +52,9 @@ L1:     lda     sp,x
         stx     spsave          ; Save the system stack ptr
 
         lda     MEMSIZE
-        sta     sp
+        sta     c_sp
         lda     MEMSIZE+1
-        sta     sp+1            ; Set argument stack ptr
+        sta     c_sp+1          ; Set argument stack ptr
 
 ; Call the module constructors.
 
@@ -73,7 +73,7 @@ _exit:  pha                     ; Save the return code on stack
 
         ldx     #zpspace-1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
diff --git a/libsrc/pet/sysuname.s b/libsrc/pet/sysuname.s
index 59174d821..ddc7d644f 100644
--- a/libsrc/pet/sysuname.s
+++ b/libsrc/pet/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/pet/waitvsync.s b/libsrc/pet/waitvsync.s
index 39b562e43..d74f76c9f 100644
--- a/libsrc/pet/waitvsync.s
+++ b/libsrc/pet/waitvsync.s
@@ -9,8 +9,7 @@
         .include        "pet.inc"
 
 _waitvsync:
-@l1:
-        lda     VIA_PB
-        and     #%00100000
-        bne     @l1
+        lda     #%00100000
+:       and     VIA_PB
+        bne     :-
         rts
diff --git a/libsrc/plus4/cgetc.s b/libsrc/plus4/cgetc.s
index 62863c06e..8c8bb0082 100644
--- a/libsrc/plus4/cgetc.s
+++ b/libsrc/plus4/cgetc.s
@@ -18,11 +18,16 @@ _cgetc: lda     KEY_COUNT       ; Get number of characters
         ora     FKEY_COUNT      ; Or with number of function key chars
         bne     L2              ; Jump if there are already chars waiting
 
+        lda     #%00100000
+        bit     $FF06
+        bne     L2              ; always disable cursor if in bitmap mode
+
 ; Switch on the cursor if needed
 
         ldy     CURS_X
         lda     (CRAM_PTR),y    ; Get current char
         pha                     ; And save it
+
         lda     CHARCOLOR
         sta     (CRAM_PTR),y
 
diff --git a/libsrc/plus4/crt0.s b/libsrc/plus4/crt0.s
index 6b44a2b7e..a8a5b8e63 100644
--- a/libsrc/plus4/crt0.s
+++ b/libsrc/plus4/crt0.s
@@ -9,8 +9,7 @@
         .import         callirq_y, initlib, donelib
         .import         callmain, zerobss
         .import         __INTERRUPTOR_COUNT__
-        .import         __MAIN_START__, __MAIN_SIZE__   ; Linker generated
-        .import         __STACKSIZE__                   ; Linker generated
+        .import         __HIMEM__                       ; Linker generated
         .importzp       ST
 
         .include        "zeropage.inc"
@@ -34,7 +33,7 @@ Start:
         sei                     ; No interrupts since we're banking out the ROM
         sta     ENABLE_RAM
         ldx     #zpspace-1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -52,19 +51,28 @@ L1:     lda     sp,x
         tsx
         stx     spsave          ; Save system stk ptr
 
-        lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1
+        lda     #<__HIMEM__
+        ldx     #>__HIMEM__
+        sta     c_sp
+        stx     c_sp+1
 
 ; Set up the IRQ vector in the banked RAM; and, switch off the ROM.
 
-        ldx     #<IRQ
-        ldy     #>IRQ
+        lda     #<IRQ
+        ldx     #>IRQ
         sei                     ; No ints, handler not yet in place
         sta     ENABLE_RAM
-        stx     $FFFE           ; Install interrupt handler
-        sty     $FFFF
+        sta     $FFFE           ; Install interrupt handler
+        stx     $FFFF
+        lda     IRQVec
+        ldx     IRQVec+1
+        sta     IRQInd+1
+        stx     IRQInd+2
+        lda     #<IRQStub
+        ldx     #>IRQStub
+        sta     IRQVec
+        stx     IRQVec+1
+
         cli                     ; Allow interrupts
 
 ; Clear the BSS data.
@@ -95,11 +103,18 @@ _exit:  pha                     ; Save the return code
         lda     #0
         sta     irqcount        ; Disable custom IRQ handlers
 
+        sei
+        ldx     IRQInd+1
+        ldy     IRQInd+2
+        stx     IRQVec
+        sty     IRQVec+1
+        cli
+
 ; Copy back the zero-page stuff.
 
         ldx     #zpspace-1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
@@ -122,9 +137,13 @@ L2:     lda     zpsave,x
 ; IRQ handler. The handler in the ROM enables the Kernal, and jumps to
 ; $CE00, where the ROM code checks for a BRK or IRQ, and branches via the
 ; indirect vectors at $314/$316.
-; To make our stub as fast as possible, we skip the whole part of the ROM
-; handler, and jump to the indirect vectors directly. We do also call our
-; own interrupt handlers if we have any; so, they need not use $314.
+;
+; When RAM is banked in, we skip the whole part of the ROM handler, and jump to
+; the indirect vectors directly, after calling our own interrupt handlers.
+;
+; When ROM is banked in, a stub installed in the $314 indirect vector ensures
+; that our interrupt handlers are still called (otherwise, interrupts that are
+; not serviced by the ROM handler may cause a deadlock).
 
 .segment        "LOWCODE"
 
@@ -139,15 +158,6 @@ IRQ:    cld                     ; Just to be sure
         and     #$10            ; Test for BRK bit
         bne     dobreak
 
-; It's an IRQ; and, RAM is enabled. If we have handlers, call them. We will use
-; a flag here instead of loading __INTERRUPTOR_COUNT__ directly, since the
-; condes function is not reentrant. The irqcount flag will be set/reset from
-; the main code, to avoid races.
-
-        ldy     irqcount
-        beq     @L1
-        jsr     callirq_y       ; Call the IRQ functions
-
 ; Since the ROM handler will end with an RTI, we have to fake an IRQ return
 ; on the stack, so that we get control of the CPU after the ROM handler,
 ; and can switch back to RAM.
@@ -161,7 +171,7 @@ IRQ:    cld                     ; Just to be sure
         pha                     ; Push faked X register
         pha                     ; Push faked Y register
         sta     ENABLE_ROM      ; Switch to ROM
-        jmp     (IRQVec)        ; Jump indirect to Kernal IRQ handler
+        jmp     (IRQVec)        ; Jump indirect to IRQ stub
 
 irq_ret:
         sta     ENABLE_RAM      ; Switch back to RAM
@@ -183,6 +193,22 @@ nohandler:
         sta     ENABLE_ROM
         jmp     (BRKVec)        ; Jump indirect to the break vector
 
+
+; IRQ stub installed at $314, called by our handler above if RAM is banked in,
+; or the Kernal IRQ handler if ROM is banked in.
+
+; If we have handlers, call them. We will use a flag here instead of loading
+; __INTERRUPTOR_COUNT__ directly, since the condes function is not reentrant.
+; The irqcount flag will be set/reset from the main code, to avoid races.
+IRQStub:
+        cld                     ; Just to be sure
+        sta     ENABLE_RAM
+        ldy     irqcount
+        beq     @L1
+        jsr     callirq_y       ; Call the IRQ functions
+@L1:    sta     ENABLE_ROM
+        jmp     (IRQInd+1)      ; Jump to the saved IRQ vector
+
 ; ------------------------------------------------------------------------
 ; Data
 
diff --git a/libsrc/plus4/kgetin.s b/libsrc/plus4/kgetin.s
new file mode 100644
index 000000000..e77395b9a
--- /dev/null
+++ b/libsrc/plus4/kgetin.s
@@ -0,0 +1,17 @@
+
+        .export GETIN
+
+.scope  KERNAL
+        .include "cbm_kernal.inc"
+.endscope
+
+        .include "plus4.inc"
+
+.segment "LOWCODE" ; Stay out of ROM area.
+
+.proc   GETIN
+        sta ENABLE_ROM
+        jsr KERNAL::GETIN
+        sta ENABLE_RAM
+        rts
+.endproc
diff --git a/libsrc/plus4/libref.s b/libsrc/plus4/libref.s
index 0bda1e7e8..62c78b8c5 100644
--- a/libsrc/plus4/libref.s
+++ b/libsrc/plus4/libref.s
@@ -2,8 +2,9 @@
 ; Oliver Schmidt, 2013-05-31
 ;
 
-        .export         joy_libref, ser_libref
+        .export         joy_libref, ser_libref, tgi_libref
         .import         _exit
 
 joy_libref      := _exit
 ser_libref      := _exit
+tgi_libref      := _exit
diff --git a/libsrc/plus4/ser/plus4-stdser.s b/libsrc/plus4/ser/plus4-stdser.s
index 77445c7a2..38809d6ab 100644
--- a/libsrc/plus4/ser/plus4-stdser.s
+++ b/libsrc/plus4/ser/plus4-stdser.s
@@ -64,15 +64,15 @@ ACIA_STATUS     := ACIA+1       ; Status register
 ACIA_CMD        := ACIA+2       ; Command register
 ACIA_CTRL       := ACIA+3       ; Control register
 
+RecvHead        := $07D1        ; Head of receive buffer
+RecvTail        := $07D2        ; Tail of receive buffer
+RecvFreeCnt     := $07D3        ; Number of bytes in receive buffer
 ;----------------------------------------------------------------------------
 ;
 ; Global variables
 ;
 
 .bss
-RecvHead:       .res    1       ; Head of receive buffer
-RecvTail:       .res    1       ; Tail of receive buffer
-RecvFreeCnt:    .res    1       ; Number of bytes in receive buffer
 SendHead:       .res    1       ; Head of send buffer
 SendTail:       .res    1       ; Tail of send buffer
 SendFreeCnt:    .res    1       ; Number of bytes in send buffer
@@ -88,7 +88,7 @@ SendBuf:        .res    256
 
 ; Tables used to translate RS232 params into register values
 
-BaudTable:                      ; bit7 = 1 means setting is invalid
+BaudTable:                      ; Bit7 = 1 means setting is invalid
         .byte   $FF             ; SER_BAUD_45_5
         .byte   $01             ; SER_BAUD_50
         .byte   $02             ; SER_BAUD_75
@@ -354,26 +354,27 @@ SER_IOCTL:
 ;
 
 SER_IRQ:
-        lda     ACIA_STATUS     ; Check ACIA status for receive interrupt
-        and     #$08
-        beq     @L9             ; Jump if no ACIA interrupt (carry still clear)
-        lda     ACIA_DATA       ; Get byte from ACIA
-        ldx     RecvFreeCnt     ; Check if we have free space left
-        beq     @L1             ; Jump if no space in receive buffer
-        ldy     RecvTail        ; Load buffer pointer
-        sta     RecvBuf,y       ; Store received byte in buffer
-        inc     RecvTail        ; Increment buffer pointer
-        dec     RecvFreeCnt     ; Decrement free space counter
-        cpx     #33             ; Check for buffer space low
-        bcc     @L1             ; Assert flow control if buffer space low
+        lda     ACIA_STATUS     ; (4)  Check for byte received
+        and     #$08            ; (2)
+        beq     @L9             ; (2*)
+
+        lda     ACIA_DATA       ; (4)  Get byte and put into receive buffer
+        ldy     RecvTail        ; (4)
+        ldx     RecvFreeCnt     ; (4)
+        beq     @L3             ; (2*) Jump if no space in receive buffer
+        sta     RecvBuf,y       ; (5)
+        inc     RecvTail        ; (6)
+        dec     RecvFreeCnt     ; (6)
+        cpx     #33             ; (2)  Check for buffer space low
+        bcc     @L2             ; (2*)
         rts                     ; Return with carry set (interrupt handled)
 
 ; Assert flow control if buffer space too low
 
-@L1:    lda     RtsOff
-        sta     ACIA_CMD
-        sta     Stopped
-        sec                     ; Interrupt handled
+@L2:    lda     RtsOff          ; (3)
+        sta     ACIA_CMD        ; (4)
+        sta     Stopped         ; (3)
+@L3:    sec                     ; Interrupt handled
 @L9:    rts
 
 ;----------------------------------------------------------------------------
diff --git a/libsrc/plus4/sysuname.s b/libsrc/plus4/sysuname.s
index 332daae0d..e75e6cacc 100644
--- a/libsrc/plus4/sysuname.s
+++ b/libsrc/plus4/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/plus4/tgi/ted-hi.s b/libsrc/plus4/tgi/ted-hi.s
new file mode 100644
index 000000000..61dd9c2c4
--- /dev/null
+++ b/libsrc/plus4/tgi/ted-hi.s
@@ -0,0 +1,860 @@
+;
+; Graphics driver for the 320x200x2 mode on Commodore Plus/4 systems.
+;
+; Luminance/Chrominance matrices at $800/$C00, overwriting text-mode character
+; and color data. Bitmap is at $C000-$DF3F. Programs using this driver should
+; either be linked with the option '-D __HIMEM__=0xC000'.
+;
+; Based on the c64-hi TGI driver, which in turn was based on Stephen L. Judd's
+; GRLIB code.
+;
+; 2017-01-13, Greg King
+; 2018-03-13, Sven Klose
+; 2019-10-23, Richard Halkyard
+;
+        .include        "zeropage.inc"
+
+        .include        "tgi-kernel.inc"
+        .include        "tgi-error.inc"
+
+        .include        "cbm_kernal.inc"
+        .include        "plus4.inc"
+
+        .macpack        generic
+        .macpack        module
+
+; ------------------------------------------------------------------------
+; Header. Includes jump table and constants.
+
+        module_header   _ted_hi_tgi
+
+; First part of the header is a structure that has a magic and defines the
+; capabilities of the driver
+
+        .byte   $74, $67, $69           ; "tgi"
+        .byte   TGI_API_VERSION         ; TGI API version number
+        .addr   $0000                   ; Library reference
+        .word   320                     ; X resolution
+        .word   200                     ; Y resolution
+        .byte   2                       ; Number of drawing colors
+        .byte   1                       ; Number of screens available
+        .byte   8                       ; System font X size
+        .byte   8                       ; System font Y size
+        .word   $00D4                   ; Aspect ratio (based on 4/3 display)
+        .byte   0                       ; TGI driver flags
+
+; Next comes the jump table. With the exception of IRQ, all entries must be
+; valid and may point to an RTS for test versions (function not implemented).
+
+        .addr   INSTALL
+        .addr   UNINSTALL
+        .addr   INIT
+        .addr   DONE
+        .addr   GETERROR
+        .addr   CONTROL
+        .addr   CLEAR
+        .addr   SETVIEWPAGE
+        .addr   SETDRAWPAGE
+        .addr   SETCOLOR
+        .addr   SETPALETTE
+        .addr   GETPALETTE
+        .addr   GETDEFPALETTE
+        .addr   SETPIXEL
+        .addr   GETPIXEL
+        .addr   LINE
+        .addr   BAR
+        .addr   TEXTSTYLE
+        .addr   OUTTEXT
+
+; ------------------------------------------------------------------------
+; Data.
+
+; Variables mapped to the zero page segment variables. Some of these are
+; used for passing parameters to the driver.
+
+X1              := ptr1
+Y1              := ptr2
+X2              := ptr3
+Y2              := ptr4
+TEXT            := ptr3
+
+TEMP            := tmp4
+TEMP2           := sreg
+POINT           := regsave
+
+CHUNK           := X2           ; Used in the line routine
+OLDCHUNK        := X2+1         ; Dito
+
+; Absolute variables used in the code
+
+.bss
+
+ERROR:          .res    1       ; Error code
+PALETTE:        .res    2       ; The current palette
+
+BITMASK:        .res    1       ; $00 = clear, $FF = set pixels
+
+; Line routine stuff
+DX:             .res    2
+DY:             .res    2
+
+; BAR variables
+X1SAVE:         .res    2
+Y1SAVE:         .res    2
+X2SAVE:         .res    2
+Y2SAVE:         .res    2
+
+; Text output stuff
+TEXTMAGX:       .res    1
+TEXTMAGY:       .res    1
+TEXTDIR:        .res    1
+
+; Constants and tables
+
+.rodata
+
+DEFPALETTE:     .byte   $00, $71        ; White on black
+PALETTESIZE     = * - DEFPALETTE
+
+BITTAB:         .byte   $80,$40,$20,$10,$08,$04,$02,$01
+BITCHUNK:       .byte   $FF,$7F,$3F,$1F,$0F,$07,$03,$01
+
+CHARROM         := $D000                ; Character rom base address
+
+; The TED uses the CPU's memory configuration to fetch color data! Although
+; we run with ROMs banked out, putting color data in banked RAM (above $8000)
+; will result in color artifacts appearing when we bank ROM back in for
+; interrupts and Kernal calls. Bitmap data is not affected by this limitation,
+; but since there is no way to access RAM under IO (FE00-FF40), we can't put the
+; bitmap at $E000 like we do on the C64, and have to use the next lowest
+; position at $C000.
+
+LBASE           := $0800        ; Luminance memory base address
+VBASE           := $C000        ; Bitmap base address
+
+CBASE           := LBASE + $400 ; Chrominance memory base address (fixed relative to LBASE)
+CHRBASE         := $0800        ; Base address of text mode data
+
+.assert LBASE .mod $0800 = 0, error, "Luma/Chroma memory base address must be a multiple of 2K"
+.assert VBASE .mod $2000 = 0, error, "Bitmap base address must be a multiple of 8K"
+.assert LBASE + $800 < $8000, warning, "Luma/Chroma memory overlaps ROM. This will produce color artifacts."
+.assert VBASE + $2000 < $FE00, error, "Bitmap overlaps IO space"
+
+.code
+
+; ------------------------------------------------------------------------
+; INSTALL routine. Is called after the driver is loaded into memory. May
+; initialize anything that has to be done just once. Is probably empty
+; most of the time.
+;
+; Must set an error code: NO
+;
+
+INSTALL:
+;       rts                     ; Fall through
+
+
+; ------------------------------------------------------------------------
+; UNINSTALL routine. Is called before the driver is removed from memory. May
+; clean up anything done by INSTALL but is probably empty most of the time.
+;
+; Must set an error code: NO
+;
+
+UNINSTALL:
+        rts
+
+
+; ------------------------------------------------------------------------
+; INIT: Changes an already installed device from text mode to graphics
+; mode.
+; Note that INIT/DONE may be called multiple times while the driver
+; is loaded, while INSTALL is only called once, so any code that is needed
+; to initializes variables and so on must go here. Setting palette and
+; clearing the screen is not needed because this is called by the graphics
+; kernel later.
+; The graphics kernel will never call INIT when a graphics mode is already
+; active, so there is no need to protect against that.
+;
+; Must set an error code: YES
+;
+
+INIT:
+
+; Initialize variables
+
+        ldx     #$FF
+        stx     BITMASK
+
+; Switch into graphics mode
+        lda     $FF12           ; Set bitmap address and enable fetch from RAM
+        and     #%00000011
+        ora     #(>VBASE >> 2)
+        sta     $FF12
+
+.if LBASE <> CHRBASE
+        lda     #>LBASE         ; Set color memory address
+        sta     $FF14
+.endif
+
+        lda     $FF06           ; Enable bitmap mode
+        ora     #%00100000
+        sta     $FF06
+
+; Done, reset the error code
+
+        lda     #TGI_ERR_OK
+        sta     ERROR
+        rts
+
+; ------------------------------------------------------------------------
+; DONE: Will be called to switch the graphics device back into text mode.
+; The graphics kernel will never call DONE when no graphics mode is active,
+; so there is no need to protect against that.
+;
+; Must set an error code: NO
+;
+
+DONE:   lda     $FF12
+        ora     #%00000100      ; Fetch from ROM
+        sta     $FF12
+
+.if LBASE <> CHRBASE
+        lda     #>CHRBASE       ; Reset character/color matrix address
+        sta     $FF14
+.else
+        sta     ENABLE_ROM      ; Clear text display since we clobbered it
+        jsr     CLRSCR
+        sta     ENABLE_RAM
+.endif
+
+        lda     $FF06
+        and     #%11011111      ; Exit bitmap mode
+        sta     $FF06
+
+        rts
+
+; ------------------------------------------------------------------------
+; GETERROR: Return the error code in A and clear it.
+
+GETERROR:
+        ldx     #TGI_ERR_OK
+        lda     ERROR
+        stx     ERROR
+        rts
+
+; ------------------------------------------------------------------------
+; CONTROL: Platform/driver specific entry point.
+;
+; Must set an error code: YES
+;
+
+CONTROL:
+        lda     #TGI_ERR_INV_FUNC
+        sta     ERROR
+        rts
+
+; ------------------------------------------------------------------------
+; CLEAR: Clears the screen.
+;
+; Must set an error code: NO
+;
+
+CLEAR:  ldy     #$00
+        tya
+@L1:    sta     VBASE+$0000,y
+        sta     VBASE+$0100,y
+        sta     VBASE+$0200,y
+        sta     VBASE+$0300,y
+        sta     VBASE+$0400,y
+        sta     VBASE+$0500,y
+        sta     VBASE+$0600,y
+        sta     VBASE+$0700,y
+        sta     VBASE+$0800,y
+        sta     VBASE+$0900,y
+        sta     VBASE+$0A00,y
+        sta     VBASE+$0B00,y
+        sta     VBASE+$0C00,y
+        sta     VBASE+$0D00,y
+        sta     VBASE+$0E00,y
+        sta     VBASE+$0F00,y
+        sta     VBASE+$1000,y
+        sta     VBASE+$1100,y
+        sta     VBASE+$1200,y
+        sta     VBASE+$1300,y
+        sta     VBASE+$1400,y
+        sta     VBASE+$1500,y
+        sta     VBASE+$1600,y
+        sta     VBASE+$1700,y
+        sta     VBASE+$1800,y
+        sta     VBASE+$1900,y
+        sta     VBASE+$1A00,y
+        sta     VBASE+$1B00,y
+        sta     VBASE+$1C00,y
+        sta     VBASE+$1D00,y
+        sta     VBASE+$1E00,y
+        sta     VBASE+$1E40,y
+        iny
+        bne     @L1
+        rts
+
+; ------------------------------------------------------------------------
+; SETVIEWPAGE: Set the visible page. Called with the new page in A (0..n).
+; The page number is already checked to be valid by the graphics kernel.
+;
+; Must set an error code: NO (will only be called if page ok)
+;
+
+SETVIEWPAGE:
+;       rts                     ; Fall through
+
+; ------------------------------------------------------------------------
+; SETDRAWPAGE: Set the drawable page. Called with the new page in A (0..n).
+; The page number is already checked to be valid by the graphics kernel.
+;
+; Must set an error code: NO (will only be called if page ok)
+;
+
+SETDRAWPAGE:
+        rts
+
+; ------------------------------------------------------------------------
+; SETCOLOR: Set the drawing color (in A). The new color is already checked
+; to be in a valid range (0..maxcolor-1).
+;
+; Must set an error code: NO (will only be called if color ok)
+;
+
+SETCOLOR:
+        tax
+        beq     @L1
+        lda     #$FF
+@L1:    sta     BITMASK
+        rts
+
+; ------------------------------------------------------------------------
+; SETPALETTE: Set the palette (not available with all drivers/hardware).
+; A pointer to the palette is passed in ptr1. Must set an error if palettes
+; are not supported
+;
+; Must set an error code: YES
+;
+
+SETPALETTE:
+        ldy     #PALETTESIZE - 1
+@L1:    lda     (ptr1),y        ; Copy the palette
+        sta     PALETTE,y
+        dey
+        bpl     @L1
+
+; Get luma values from the high nybble of the palette entries
+        lda     PALETTE+1       ; Foreground luma
+        lsr     a
+        lsr     a
+        lsr     a
+        lsr     a
+        sta     TEMP            ; Foreground -> low nybble
+        lda     PALETTE         ; Background luma
+        and     #$F0
+        ora     TEMP            ; Background -> high nybble
+
+; Initialize the luma map with the new luma values
+        ldy     #0
+@L2:    sta     LBASE+$0000,y
+        sta     LBASE+$0100,y
+        sta     LBASE+$0200,y
+        sta     LBASE+$02e8,y
+        iny
+        bne     @L2
+
+
+; Get chroma values from the low nybble of the palette entries
+        lda     PALETTE+1       ; Foreground chroma
+        and     #$0F
+        asl     a
+        asl     a
+        asl     a
+        asl     a
+        sta     TEMP            ; Foreground -> high nybble
+        lda     PALETTE         ; Background chroma
+        and     #$0F
+        ora     TEMP            ; Background -> low nybble
+
+; Initialize the chroma map with the new chroma values
+        ldy     #0
+@L3:    sta     CBASE+$0000,y
+        sta     CBASE+$0100,y
+        sta     CBASE+$0200,y
+        sta     CBASE+$02e8,y
+        iny
+        bne     @L3
+
+; Done, reset the error code
+        lda     #TGI_ERR_OK
+        sta     ERROR
+        rts
+
+; ------------------------------------------------------------------------
+; GETPALETTE: Return the current palette in A/X. Even drivers that cannot
+; set the palette should return the default palette here, so there's no
+; way for this function to fail.
+;
+; Must set an error code: NO
+;
+
+GETPALETTE:
+        lda     #<PALETTE
+        ldx     #>PALETTE
+        rts
+
+; ------------------------------------------------------------------------
+; GETDEFPALETTE: Return the default palette for the driver in A/X. All
+; drivers should return something reasonable here, even drivers that don't
+; support palettes, otherwise the caller has no way to determine the colors
+; of the (not changeable) palette.
+;
+; Must set an error code: NO (all drivers must have a default palette)
+;
+
+GETDEFPALETTE:
+        lda     #<DEFPALETTE
+        ldx     #>DEFPALETTE
+        rts
+
+; ------------------------------------------------------------------------
+; SETPIXEL: Draw one pixel at X1/Y1 = ptr1/ptr2 with the current drawing
+; color. The coordinates passed to this function are never outside the
+; visible screen area, so there is no need for clipping inside this function.
+;
+; Must set an error code: NO
+;
+
+SETPIXEL:
+        jsr     CALC            ; Calculate coordinates
+
+        lda     (POINT),Y
+        eor     BITMASK
+        and     BITTAB,X
+        eor     (POINT),Y
+        sta     (POINT),Y
+
+@L9:    rts
+
+; ------------------------------------------------------------------------
+; GETPIXEL: Read the color value of a pixel and return it in A/X. The
+; coordinates passed to this function are never outside the visible screen
+; area, so there is no need for clipping inside this function.
+
+
+GETPIXEL:
+        jsr     CALC            ; Calculate coordinates
+
+        lda     (POINT),Y
+        ldy     #$00
+        and     BITTAB,X
+        beq     @L1
+        iny
+
+@L1:
+        tya                     ; Get color value into A
+        ldx     #$00            ; Clear high byte
+        rts
+
+; ------------------------------------------------------------------------
+; LINE: Draw a line from X1/Y1 to X2/Y2, where X1/Y1 = ptr1/ptr2 and
+; X2/Y2 = ptr3/ptr4 using the current drawing color.
+;
+; X1,X2 etc. are set up above (x2=LINNUM in particular)
+; Format is LINE x2,y2,x1,y1
+;
+; Must set an error code: NO
+;
+
+LINE:
+
+@CHECK: lda     X2              ; Make sure x1<x2
+        sec
+        sbc     X1
+        tax
+        lda     X2+1
+        sbc     X1+1
+        bpl     @CONT
+        lda     Y2              ; If not, swap P1 and P2
+        ldy     Y1
+        sta     Y1
+        sty     Y2
+        lda     Y2+1
+        ldy     Y1+1
+        sta     Y1+1
+        sty     Y2+1
+        lda     X1
+        ldy     X2
+        sty     X1
+        sta     X2
+        lda     X2+1
+        ldy     X1+1
+        sta     X1+1
+        sty     X2+1
+        bcc     @CHECK
+
+@CONT:  sta     DX+1
+        stx     DX
+
+        ldx     #$C8            ; INY
+        lda     Y2              ; Calculate dy
+        sec
+        sbc     Y1
+        tay
+        lda     Y2+1
+        sbc     Y1+1
+        bpl     @DYPOS          ; Is y2>=y1?
+        lda     Y1              ; Otherwise dy=y1-y2
+        sec
+        sbc     Y2
+        tay
+        ldx     #$88            ; DEY
+
+@DYPOS: sty     DY              ; 8-bit DY -- FIX ME?
+        stx     YINCDEC
+        stx     XINCDEC
+
+        jsr     CALC            ; Set up .X, .Y, and POINT
+        lda     BITCHUNK,X
+        sta     OLDCHUNK
+        sta     CHUNK
+
+        ldx     DY
+        cpx     DX              ; Who's bigger: dy or dx?
+        bcc     STEPINX         ; If dx, then...
+        lda     DX+1
+        bne     STEPINX
+
+;
+; Big steps in Y
+;
+;   To simplify my life, just use PLOT to plot points.
+;
+;   No more!
+;   Added special plotting routine -- cool!
+;
+;   X is now counter, Y is y-coordinate
+;
+; On entry, X=DY=number of loop iterations, and Y=
+;   Y1 AND #$07
+STEPINY:
+        lda     #00
+        sta     OLDCHUNK        ; So plotting routine will work right
+        lda     CHUNK
+        lsr                     ; Strip the bit
+        eor     CHUNK
+        sta     CHUNK
+        txa
+        beq     YCONT2          ; If dy=0, it's just a point
+@CONT:  lsr                     ; Init counter to dy/2
+;
+; Main loop
+;
+YLOOP:  sta     TEMP
+
+        lda     (POINT),y
+        eor     BITMASK
+        and     CHUNK
+        eor     (POINT),y
+        sta     (POINT),y
+YINCDEC:
+        iny                     ; Advance Y coordinate
+        cpy     #8
+        bcc     @CONT           ; No prob if Y=0..7
+        jsr     FIXY
+@CONT:  lda     TEMP            ; Restore A
+        sec
+        sbc     DX
+        bcc     YFIXX
+YCONT:  dex                     ; X is counter
+        bne     YLOOP
+YCONT2: lda     (POINT),y       ; Plot endpoint
+        eor     BITMASK
+        and     CHUNK
+        eor     (POINT),y
+        sta     (POINT),y
+        rts
+
+YFIXX:                          ; X=x+1
+        adc     DY
+        lsr     CHUNK
+        bne     YCONT           ; If we pass a column boundary...
+        ror     CHUNK           ; Then reset CHUNK to $80
+        sta     TEMP2
+        lda     POINT           ; And add 8 to POINT
+        adc     #8
+        sta     POINT
+        bcc     @CONT
+        inc     POINT+1
+@CONT:  lda     TEMP2
+        dex
+        bne     YLOOP
+        beq     YCONT2
+
+;
+; Big steps in X direction
+;
+; On entry, X=DY=number of loop iterations, and Y=
+;   Y1 AND #$07
+
+.bss
+COUNTHI:
+        .byte   $00             ; Temporary counter, only used once.
+.code
+STEPINX:
+        ldx     DX
+        lda     DX+1
+        sta     COUNTHI
+        cmp     #$80
+        ror                     ; Need bit for initialization
+        sta     Y1              ; High byte of counter
+        txa
+        bne     @CONT           ; Could be $100
+        dec     COUNTHI
+@CONT:  ror
+;
+; Main loop
+;
+XLOOP:  lsr     CHUNK
+        beq     XFIXC           ; If we pass a column boundary...
+XCONT1: sbc     DY
+        bcc     XFIXY           ; Time to step in Y?
+XCONT2: dex
+        bne     XLOOP
+        dec     COUNTHI         ; High bits set?
+        bpl     XLOOP
+
+        lsr     CHUNK           ; Advance to last point
+        jmp     LINEPLOT        ; Plot the last chunk
+;
+; CHUNK has passed a column, so plot and increment pointer
+; and fix up CHUNK, OLDCHUNK.
+;
+XFIXC:  sta     TEMP
+        jsr     LINEPLOT
+        lda     #$FF
+        sta     CHUNK
+        sta     OLDCHUNK
+        lda     POINT
+        clc
+        adc     #8
+        sta     POINT
+        lda     TEMP
+        bcc     XCONT1
+        inc     POINT+1
+        jmp     XCONT1
+;
+; Check to make sure there isn't a high bit, plot chunk,
+; and update Y-coordinate.
+;
+XFIXY:  dec     Y1              ; Maybe high bit set
+        bpl     XCONT2
+        adc     DX
+        sta     TEMP
+        lda     DX+1
+        adc     #$FF            ; Hi byte
+        sta     Y1
+
+        jsr     LINEPLOT        ; Plot chunk
+        lda     CHUNK
+        sta     OLDCHUNK
+
+        lda     TEMP
+XINCDEC:
+        iny                     ; Y-coord
+        cpy     #8              ; 0..7 is ok
+        bcc     XCONT2
+        sta     TEMP
+        jsr     FIXY
+        lda     TEMP
+        jmp     XCONT2
+
+;
+; Subroutine to plot chunks/points (to save a little
+; room, gray hair, etc.)
+;
+LINEPLOT:                       ; Plot the line chunk
+        lda     (POINT),Y
+        eor     BITMASK
+        ora     CHUNK
+        and     OLDCHUNK
+        eor     CHUNK
+        eor     (POINT),Y
+        sta     (POINT),Y
+        rts
+
+;
+; Subroutine to fix up pointer when Y decreases through
+; zero or increases through 7.
+;
+FIXY:   cpy     #255            ; Y=255 or Y=8
+        beq     @DECPTR
+
+@INCPTR:                        ; Add 320 to pointer
+        ldy     #0              ; Y increased through 7
+        lda     POINT
+        adc     #<320
+        sta     POINT
+        lda     POINT+1
+        adc     #>320
+        sta     POINT+1
+        rts
+
+@DECPTR:                        ; Okay, subtract 320 then
+        ldy     #7              ; Y decreased through 0
+        lda     POINT
+        sec
+        sbc     #<320
+        sta     POINT
+        lda     POINT+1
+        sbc     #>320
+        sta     POINT+1
+        rts
+
+; ------------------------------------------------------------------------
+; BAR: Draw a filled rectangle with the corners X1/Y1, X2/Y2, where
+; X1/Y1 = ptr1/ptr2 and X2/Y2 = ptr3/ptr4 using the current drawing color.
+; Contrary to most other functions, the graphics kernel will sort and clip
+; the coordinates before calling the driver, so on entry the following
+; conditions are valid:
+;       X1 <= X2
+;       Y1 <= Y2
+;       (X1 >= 0) && (X1 < XRES)
+;       (X2 >= 0) && (X2 < XRES)
+;       (Y1 >= 0) && (Y1 < YRES)
+;       (Y2 >= 0) && (Y2 < YRES)
+;
+; Must set an error code: NO
+;
+
+; Note: This function needs optimization. It's just a cheap translation of
+; the original C wrapper and could be written much smaller (besides that,
+; calling LINE is not a good idea either).
+
+BAR:    lda     Y2
+        sta     Y2SAVE
+        lda     Y2+1
+        sta     Y2SAVE+1
+
+        lda     X2
+        sta     X2SAVE
+        lda     X2+1
+        sta     X2SAVE+1
+
+        lda     Y1
+        sta     Y1SAVE
+        lda     Y1+1
+        sta     Y1SAVE+1
+
+        lda     X1
+        sta     X1SAVE
+        lda     X1+1
+        sta     X1SAVE+1
+
+@L1:    lda     Y1
+        sta     Y2
+        lda     Y1+1
+        sta     Y2+1
+        jsr     LINE
+
+        lda     Y1SAVE
+        cmp     Y2SAVE
+        bne     @L2
+        lda     Y1SAVE
+        cmp     Y2SAVE
+        beq     @L4
+
+@L2:    inc     Y1SAVE
+        bne     @L3
+        inc     Y1SAVE+1
+
+@L3:    lda     Y1SAVE
+        sta     Y1
+        lda     Y1SAVE+1
+        sta     Y1+1
+
+        lda     X1SAVE
+        sta     X1
+        lda     X1SAVE+1
+        sta     X1+1
+
+        lda     X2SAVE
+        sta     X2
+        lda     X2SAVE+1
+        sta     X2+1
+        jmp     @L1
+
+@L4:    rts
+
+
+; ------------------------------------------------------------------------
+; TEXTSTYLE: Set the style used when calling OUTTEXT. Text scaling in X and Y
+; direction is passend in X/Y, the text direction is passed in A.
+;
+; Must set an error code: NO
+;
+
+TEXTSTYLE:
+        stx     TEXTMAGX
+        sty     TEXTMAGY
+        sta     TEXTDIR
+        rts
+
+
+; ------------------------------------------------------------------------
+; OUTTEXT: Output text at X/Y = ptr1/ptr2 using the current color and the
+; current text style. The text to output is given as a zero terminated
+; string with address in ptr3.
+;
+; Must set an error code: NO
+;
+
+OUTTEXT:
+        rts
+
+; ------------------------------------------------------------------------
+; Calculate all variables to plot the pixel at X1/Y1.
+
+CALC:   lda     Y1
+        sta     TEMP2
+        and     #7
+        tay
+        lda     Y1+1
+        lsr                     ; Neg is possible
+        ror     TEMP2
+        lsr
+        ror     TEMP2
+        lsr
+        ror     TEMP2
+
+        lda     #00
+        sta     POINT
+        lda     TEMP2
+        cmp     #$80
+        ror
+        ror     POINT
+        cmp     #$80
+        ror
+        ror     POINT           ; Row * 64
+        adc     TEMP2           ; + Row * 256
+        clc
+        adc     #>VBASE         ; + Bitmap base
+        sta     POINT+1
+
+        lda     X1
+        tax
+        and     #$F8
+        clc
+        adc     POINT           ; +(X AND #$F8)
+        sta     POINT
+        lda     X1+1
+        adc     POINT+1
+        sta     POINT+1
+        txa
+        and     #7
+        tax
+        rts
diff --git a/libsrc/plus4/tgi_stat_stddrv.s b/libsrc/plus4/tgi_stat_stddrv.s
new file mode 100644
index 000000000..dc918eb8b
--- /dev/null
+++ b/libsrc/plus4/tgi_stat_stddrv.s
@@ -0,0 +1,14 @@
+;
+; Address of the static standard tgi driver
+;
+; Oliver Schmidt, 2012-11-01
+;
+; const void tgi_static_stddrv[];
+;
+
+        .export _tgi_static_stddrv
+        .import _ted_hi_tgi
+
+.rodata
+
+_tgi_static_stddrv := _ted_hi_tgi
diff --git a/libsrc/plus4/tgi_stddrv.s b/libsrc/plus4/tgi_stddrv.s
new file mode 100644
index 000000000..eac16905d
--- /dev/null
+++ b/libsrc/plus4/tgi_stddrv.s
@@ -0,0 +1,13 @@
+;
+; Name of the standard tgi driver
+;
+; Oliver Schmidt, 2011-05-02
+;
+; const char tgi_stddrv[];
+;
+
+        .export _tgi_stddrv
+
+.rodata
+
+_tgi_stddrv:    .asciiz "ted-hi.tgi"
diff --git a/libsrc/rp6502/clock.c b/libsrc/rp6502/clock.c
new file mode 100644
index 000000000..f8756f553
--- /dev/null
+++ b/libsrc/rp6502/clock.c
@@ -0,0 +1,7 @@
+#include <rp6502.h>
+#include <time.h>
+
+clock_t __fastcall__ clock (void)
+{
+    return ria_call_long (RIA_OP_CLOCK);
+}
diff --git a/libsrc/rp6502/crt0.s b/libsrc/rp6502/crt0.s
index 165ecf0a2..32d565fda 100644
--- a/libsrc/rp6502/crt0.s
+++ b/libsrc/rp6502/crt0.s
@@ -24,9 +24,9 @@ _init:
 
 ; Set cc65 argument stack pointer
     lda #<(__RAM_START__ + __RAM_SIZE__)
-    sta sp
+    sta c_sp
     lda #>(__RAM_START__ + __RAM_SIZE__)
-    sta sp+1
+    sta c_sp+1
 
 ; Initialize memory storage
     jsr zerobss   ; Clear BSS segment
diff --git a/libsrc/rp6502/read.c b/libsrc/rp6502/read.c
index eb96f779c..87a9bbf7d 100644
--- a/libsrc/rp6502/read.c
+++ b/libsrc/rp6502/read.c
@@ -5,7 +5,7 @@ int __fastcall__ read (int fildes, void* buf, unsigned count)
 {
     int total = 0;
     while (count) {
-        unsigned blockcount = (count > 256) ? 256 : count;
+        unsigned blockcount = (count > 512) ? 512 : count;
         int bytes_read = read_xstack (&((char*)buf)[total], blockcount, fildes);
         if (bytes_read < 0) {
             return bytes_read;
diff --git a/libsrc/rp6502/ria.s b/libsrc/rp6502/ria.s
index a1b53efb1..78da4daba 100644
--- a/libsrc/rp6502/ria.s
+++ b/libsrc/rp6502/ria.s
@@ -11,7 +11,7 @@
 .export _ria_call_int, _ria_call_long
 .export _ria_call_int_errno, _ria_call_long_errno
 
-.importzp sp, sreg
+.importzp c_sp, sreg
 .import ___mappederrno, incsp1
 
 .code
diff --git a/libsrc/rp6502/sysrename.c b/libsrc/rp6502/sysrename.c
index 96eca24cf..46bdd8b31 100644
--- a/libsrc/rp6502/sysrename.c
+++ b/libsrc/rp6502/sysrename.c
@@ -7,7 +7,7 @@ unsigned char __fastcall__ _sysrename (const char* oldpath, const char* newpath)
     size_t oldpathlen, newpathlen;
     oldpathlen = strlen (oldpath);
     newpathlen = strlen (newpath);
-    if (oldpathlen + newpathlen > 254) {
+    if (oldpathlen + newpathlen > 510) {
         return _mappederrno (EINVAL);
     }
     while (oldpathlen) {
diff --git a/libsrc/rp6502/write.c b/libsrc/rp6502/write.c
index 11241dab5..23877b6e8 100644
--- a/libsrc/rp6502/write.c
+++ b/libsrc/rp6502/write.c
@@ -5,7 +5,7 @@ int __fastcall__ write (int fildes, const void* buf, unsigned count)
 {
     int ax, total = 0;
     while (count) {
-        int blockcount = (count > 256) ? 256 : count;
+        int blockcount = (count > 512) ? 512 : count;
         ax = write_xstack (&((char*)buf)[total], blockcount, fildes);
         if (ax < 0) {
             return ax;
diff --git a/libsrc/rp6502/write_xstack.c b/libsrc/rp6502/write_xstack.c
index b53aa95e7..29285a87e 100644
--- a/libsrc/rp6502/write_xstack.c
+++ b/libsrc/rp6502/write_xstack.c
@@ -1,8 +1,12 @@
 #include <rp6502.h>
+#include <errno.h>
 
 int __fastcall__ write_xstack (const void* buf, unsigned count, int fildes)
 {
     unsigned i;
+    if (count > 512) {
+        return _mappederrno (EINVAL);
+    }
     for (i = count; i;) {
         ria_push_char (((char*)buf)[--i]);
     }
diff --git a/libsrc/rp6502/xreg.s b/libsrc/rp6502/xreg.s
index 40d4a6705..a882ab10f 100644
--- a/libsrc/rp6502/xreg.s
+++ b/libsrc/rp6502/xreg.s
@@ -5,7 +5,7 @@
 ; int __cdecl__ xreg(char device, char channel, unsigned char address, ...);
 
 .export _xreg
-.importzp sp
+.importzp c_sp
 .import addysp, _ria_call_int_errno
 
 .include "rp6502.inc"
@@ -20,12 +20,12 @@
 
 @copy: ; copy stack
     dey
-    lda (sp),y
+    lda (c_sp),y
     sta RIA_XSTACK
     tya
     bne @copy
 
-    ; recover variadic size and move sp
+    ; recover variadic size and move c_sp
     txa
     tay
     jsr addysp
diff --git a/libsrc/rp6502/xregn.c b/libsrc/rp6502/xregn.c
new file mode 100644
index 000000000..ec040be20
--- /dev/null
+++ b/libsrc/rp6502/xregn.c
@@ -0,0 +1,19 @@
+#include <rp6502.h>
+#include <stdarg.h>
+
+int __cdecl__ xregn (char device, char channel, unsigned char address, unsigned count,
+    ...)
+{
+    va_list args;
+    va_start (args, count);
+    RIA.xstack = device;
+    RIA.xstack = channel;
+    RIA.xstack = address;
+    while (count--) {
+        unsigned v = va_arg (args, unsigned);
+        RIA.xstack = v >> 8;
+        RIA.xstack = v;
+    }
+    va_end (args);
+    return ria_call_int_errno (RIA_OP_XREG);
+}
diff --git a/libsrc/runtime/add.s b/libsrc/runtime/add.s
index a4658cc13..b841f829d 100644
--- a/libsrc/runtime/add.s
+++ b/libsrc/runtime/add.s
@@ -9,45 +9,43 @@
 ; called a lot!
 
         .export         tosadda0, tosaddax
-        .importzp       sp, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, tmp1
 
 tosadda0:
         ldx     #0
 tosaddax:
         clc                     ; (2)
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
 
-        adc     (sp)            ; (7)
+        adc     (c_sp)          ; (7)
         tay                     ; (9)
-        inc     sp              ; (14)
+        inc     c_sp            ; (14)
         bne     hiadd           ; (17)
-        inc     sp+1            ; (-1+5)
+        inc     c_sp+1          ; (-1+5)
 hiadd:  txa                     ; (19)
-        adc     (sp)            ; (24)
+        adc     (c_sp)          ; (24)
         tax                     ; (26)
-        inc     sp              ; (31)
+        inc     c_sp            ; (31)
         bne     done            ; (34)
-        inc     sp+1            ; (-1+5)
+        inc     c_sp+1          ; (-1+5)
 done:   tya                     ; (36)
 
 .else
 
         ldy     #0              ; (4)
-        adc     (sp),y          ; (9) lo byte
+        adc     (c_sp),y        ; (9) lo byte
         iny                     ; (11)
         sta     tmp1            ; (14) save it
         txa                     ; (16)
-        adc     (sp),y          ; (21) hi byte
+        adc     (c_sp),y        ; (21) hi byte
         tax                     ; (23)
         clc                     ; (25)
-        lda     sp              ; (28)
+        lda     c_sp            ; (28)
         adc     #2              ; (30)
-        sta     sp              ; (33)
+        sta     c_sp            ; (33)
         bcc     L1              ; (36)
-        inc     sp+1            ; (-1+5)
+        inc     c_sp+1          ; (-1+5)
 L1:     lda     tmp1            ; (39) restore low byte
 
 .endif
diff --git a/libsrc/runtime/addeqsp.s b/libsrc/runtime/addeqsp.s
index 5112d2790..3c098ea5f 100644
--- a/libsrc/runtime/addeqsp.s
+++ b/libsrc/runtime/addeqsp.s
@@ -5,19 +5,19 @@
 ;
 
         .export         addeq0sp, addeqysp
-        .importzp       sp
+        .importzp       c_sp
 
 addeq0sp:
         ldy     #0
 addeqysp:
         clc
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         pha
         iny
         txa
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         tax
         pla
         rts
diff --git a/libsrc/runtime/addysp.s b/libsrc/runtime/addysp.s
index e0e7db1ce..d48e048bb 100644
--- a/libsrc/runtime/addysp.s
+++ b/libsrc/runtime/addysp.s
@@ -5,17 +5,17 @@
 ;
 
         .export         addysp1, addysp
-        .importzp       sp
+        .importzp       c_sp
 
 addysp1:
         iny
 addysp: pha                     ; Save A
         clc
         tya                     ; Get the value
-        adc     sp              ; Add low byte
-        sta     sp              ; Put it back
+        adc     c_sp            ; Add low byte
+        sta     c_sp            ; Put it back
         bcc     @L1             ; If no carry, we're done
-        inc     sp+1            ; Inc high byte
+        inc     c_sp+1          ; Inc high byte
 @L1:    pla                     ; Restore A
         rts
 
diff --git a/libsrc/runtime/and.s b/libsrc/runtime/and.s
index 8c180b580..303d4e010 100644
--- a/libsrc/runtime/and.s
+++ b/libsrc/runtime/and.s
@@ -6,24 +6,22 @@
 
         .export         tosanda0, tosandax
         .import         addysp1
-        .importzp       sp, ptr4
-
-        .macpack        cpu
+        .importzp       c_sp, ptr4
 
 tosanda0:
         ldx     #$00
 tosandax:
-.if (.cpu .bitand CPU_ISET_65SC02)
-        and     (sp)            ; 65SC02 version, saves 2 cycles and 1 byte
+.if .cap(CPU_HAS_ZPIND)
+        and     (c_sp)          ; 65SC02 version, saves 2 cycles and 1 byte
         ldy     #1
 .else
         ldy     #0
-        and     (sp),y
+        and     (c_sp),y
         iny
 .endif
         pha
         txa
-        and     (sp),y
+        and     (c_sp),y
         tax
         pla
         jmp     addysp1         ; drop TOS, set condition codes
diff --git a/libsrc/runtime/aslax7.s b/libsrc/runtime/aslax7.s
new file mode 100644
index 000000000..533ee55e6
--- /dev/null
+++ b/libsrc/runtime/aslax7.s
@@ -0,0 +1,21 @@
+;
+; Miloslaw Smyk, 2024
+;
+; CC65 runtime: Scale the primary register by 128, unsigned
+;
+
+        .export         shlax7, aslax7
+
+aslax7:
+shlax7:                         ; XXXXXXXL AAAAAAAl
+        tay
+        txa
+        lsr                     ; XXXXXXXL -> 0XXXXXXX, L->C
+        tya
+        ror                     ; AAAAAAAl -> LAAAAAAA, l->C
+        tax
+        lda     #$00            ; LAAAAAAA 00000000
+        ror                     ; LAAAAAAA l0000000
+        rts
+
+        ; 10 bytes, 16 cycles + rts
diff --git a/libsrc/runtime/asrax7.s b/libsrc/runtime/asrax7.s
new file mode 100644
index 000000000..3c9cce681
--- /dev/null
+++ b/libsrc/runtime/asrax7.s
@@ -0,0 +1,18 @@
+;
+; Miloslaw Smyk, 2024
+;
+; CC65 runtime: Scale the primary register by 128, signed
+;
+
+        .export         asrax7
+
+asrax7:                         ; HXXXXXXL hAAAAAAl
+        asl                     ;          AAAAAAA0, h->C
+        txa
+        rol                     ;          XXXXXXLh, H->C
+        ldx     #$00            ; 00000000 XXXXXXLh
+        bcc     :+
+        dex                     ; 11111111 XXXXXXLh if C
+:       rts
+
+        ; 12 cycles max, 9 bytes
diff --git a/libsrc/runtime/bpushbsp.s b/libsrc/runtime/bpushbsp.s
index 1c6add4a9..c2cc18cf6 100644
--- a/libsrc/runtime/bpushbsp.s
+++ b/libsrc/runtime/bpushbsp.s
@@ -6,12 +6,12 @@
 
         .export         bpushbsp, bpushbysp
         .import         pusha
-        .importzp       sp
+        .importzp       c_sp
 
 bpushbsp:
         ldy     #0
 bpushbysp:
-        lda     (sp),y
+        lda     (c_sp),y
         jmp     pusha
 
 
diff --git a/libsrc/runtime/callirq.s b/libsrc/runtime/callirq.s
index 74a12c4db..2096e5c3b 100644
--- a/libsrc/runtime/callirq.s
+++ b/libsrc/runtime/callirq.s
@@ -12,7 +12,7 @@
 ;
 ;   2. Reentrancy. The condes routines must use self modyfiying code, which
 ;      means it is not reentrant. An IRQ using condes, that interrupts
-;      another use of condes will cause unpredicatble behaviour. The current
+;      another use of condes will cause unpredictable behaviour. The current
 ;      code avoids this by using locking mechanisms, but it's complex and
 ;      has a size and performance penalty.
 ;
diff --git a/libsrc/runtime/condes.s b/libsrc/runtime/condes.s
index a99b713f5..fc187040e 100644
--- a/libsrc/runtime/condes.s
+++ b/libsrc/runtime/condes.s
@@ -18,8 +18,6 @@
         .import __CONSTRUCTOR_TABLE__, __CONSTRUCTOR_COUNT__
         .import __DESTRUCTOR_TABLE__, __DESTRUCTOR_COUNT__
 
-        .macpack        cpu
-
 ; --------------------------------------------------------------------------
 ; Initialize library modules
 
diff --git a/libsrc/runtime/decsp1.s b/libsrc/runtime/decsp1.s
index 3c673664a..4fd5392bb 100644
--- a/libsrc/runtime/decsp1.s
+++ b/libsrc/runtime/decsp1.s
@@ -5,14 +5,14 @@
 ;
 
         .export         decsp1
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp1
 
-        ldy     sp
+        ldy     c_sp
         bne     @L1
-        dec     sp+1
-@L1:    dec     sp
+        dec     c_sp+1
+@L1:    dec     c_sp
         rts
 
 .endproc
diff --git a/libsrc/runtime/decsp2.s b/libsrc/runtime/decsp2.s
index a3793e778..c6c533d83 100644
--- a/libsrc/runtime/decsp2.s
+++ b/libsrc/runtime/decsp2.s
@@ -5,18 +5,18 @@
 ;
 
         .export         decsp2
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp2
 
-        lda     sp
+        lda     c_sp
         sec
         sbc     #2
-        sta     sp
+        sta     c_sp
         bcc     @L1
         rts
 
-@L1:    dec     sp+1
+@L1:    dec     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/decsp3.s b/libsrc/runtime/decsp3.s
index a3ad7777e..2a2b22a15 100644
--- a/libsrc/runtime/decsp3.s
+++ b/libsrc/runtime/decsp3.s
@@ -5,18 +5,18 @@
 ;
 
         .export         decsp3
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp3
 
-        lda     sp
+        lda     c_sp
         sec
         sbc     #3
-        sta     sp
+        sta     c_sp
         bcc     @L1
         rts
 
-@L1:    dec     sp+1
+@L1:    dec     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/decsp4.s b/libsrc/runtime/decsp4.s
index 5c7e94943..c756473bd 100644
--- a/libsrc/runtime/decsp4.s
+++ b/libsrc/runtime/decsp4.s
@@ -5,18 +5,18 @@
 ;
 
         .export         decsp4
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp4
 
-        lda     sp
+        lda     c_sp
         sec
         sbc     #4
-        sta     sp
+        sta     c_sp
         bcc     @L1
         rts
 
-@L1:    dec     sp+1
+@L1:    dec     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/decsp5.s b/libsrc/runtime/decsp5.s
index 7ff4605cf..71b2fb176 100644
--- a/libsrc/runtime/decsp5.s
+++ b/libsrc/runtime/decsp5.s
@@ -5,18 +5,18 @@
 ;
 
         .export         decsp5
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp5
 
-        lda     sp
+        lda     c_sp
         sec
         sbc     #5
-        sta     sp
+        sta     c_sp
         bcc     @L1
         rts
 
-@L1:    dec     sp+1
+@L1:    dec     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/decsp6.s b/libsrc/runtime/decsp6.s
index 6e55e664d..1d0b93136 100644
--- a/libsrc/runtime/decsp6.s
+++ b/libsrc/runtime/decsp6.s
@@ -5,18 +5,18 @@
 ;
 
         .export         decsp6
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp6
 
-        lda     sp
+        lda     c_sp
         sec
         sbc     #6
-        sta     sp
+        sta     c_sp
         bcc     @L1
         rts
 
-@L1:    dec     sp+1
+@L1:    dec     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/decsp7.s b/libsrc/runtime/decsp7.s
index ee82232f6..1646d9ec9 100644
--- a/libsrc/runtime/decsp7.s
+++ b/libsrc/runtime/decsp7.s
@@ -5,18 +5,18 @@
 ;
 
         .export         decsp7
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp7
 
-        lda     sp
+        lda     c_sp
         sec
         sbc     #7
-        sta     sp
+        sta     c_sp
         bcc     @L1
         rts
 
-@L1:    dec     sp+1
+@L1:    dec     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/decsp8.s b/libsrc/runtime/decsp8.s
index 47d44593e..1726331c5 100644
--- a/libsrc/runtime/decsp8.s
+++ b/libsrc/runtime/decsp8.s
@@ -5,18 +5,18 @@
 ;
 
         .export         decsp8
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   decsp8
 
-        lda     sp
+        lda     c_sp
         sec
         sbc     #8
-        sta     sp
+        sta     c_sp
         bcc     @L1
         rts
 
-@L1:    dec     sp+1
+@L1:    dec     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/enter.s b/libsrc/runtime/enter.s
index c51b4f7bb..454c2a6f9 100644
--- a/libsrc/runtime/enter.s
+++ b/libsrc/runtime/enter.s
@@ -5,14 +5,14 @@
 ;
 
         .export         enter
-        .importzp       sp
+        .importzp       c_sp
 
 enter:  tya                     ; get arg size
-        ldy     sp
+        ldy     c_sp
         bne     L1
-        dec     sp+1
-L1:     dec     sp
+        dec     c_sp+1
+L1:     dec     c_sp
         ldy     #0
-        sta     (sp),y          ; Store the arg count
+        sta     (c_sp),y        ; Store the arg count
         rts
 
diff --git a/libsrc/runtime/eq.s b/libsrc/runtime/eq.s
index c2a537a35..87cf1c085 100644
--- a/libsrc/runtime/eq.s
+++ b/libsrc/runtime/eq.s
@@ -6,7 +6,7 @@
 
         .export         toseq00, toseqa0, toseqax
         .import         tosicmp, booleq
-        .importzp       sp, tmp1
+        .importzp       c_sp, tmp1
 
 toseq00:
         lda     #$00
diff --git a/libsrc/runtime/icmp.s b/libsrc/runtime/icmp.s
index 05c73bd01..eba8ce561 100644
--- a/libsrc/runtime/icmp.s
+++ b/libsrc/runtime/icmp.s
@@ -6,7 +6,7 @@
 ;
 
         .export         tosicmp, tosicmp0
-        .importzp       sp, sreg
+        .importzp       c_sp, sreg
 
 
 tosicmp0:
@@ -17,16 +17,16 @@ tosicmp:
         stx     sreg+1          ; Save ax
 
         ldy     #$00
-        lda     (sp),y          ; Get low byte
+        lda     (c_sp),y        ; Get low byte
         tax
-        inc     sp              ; 5
+        inc     c_sp            ; 5
         bne     @L1             ; 3
-        inc     sp+1            ; (5)
+        inc     c_sp+1          ; (5)
 @L1:
-        lda     (sp),y          ; Get high byte
-        inc     sp              ; 5
+        lda     (c_sp),y        ; Get high byte
+        inc     c_sp            ; 5
         bne     @L2             ; 3
-        inc     sp+1            ; (5)
+        inc     c_sp+1          ; (5)
 
 ; Do the compare.
 
diff --git a/libsrc/runtime/incax1.s b/libsrc/runtime/incax1.s
index 19c1d0c60..bff94b019 100644
--- a/libsrc/runtime/incax1.s
+++ b/libsrc/runtime/incax1.s
@@ -7,11 +7,10 @@
         .export         incax1
 
         .macpack        generic
-        .macpack        cpu
 
 .proc   incax1
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_INA)
         ina                     ; 65C02 version
         bne     @L9
 .else
diff --git a/libsrc/runtime/incsp1.s b/libsrc/runtime/incsp1.s
index 2272e200f..dde6c47b2 100644
--- a/libsrc/runtime/incsp1.s
+++ b/libsrc/runtime/incsp1.s
@@ -5,13 +5,13 @@
 ;
 
         .export         incsp1
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   incsp1
 
-        inc     sp
+        inc     c_sp
         bne     @L1
-        inc     sp+1
+        inc     c_sp+1
 @L1:    rts
 
 .endproc
diff --git a/libsrc/runtime/incsp2.s b/libsrc/runtime/incsp2.s
index 0ed0ffcdf..395ea52cb 100644
--- a/libsrc/runtime/incsp2.s
+++ b/libsrc/runtime/incsp2.s
@@ -5,22 +5,20 @@
 ;               this module also contains the popax function.
 
         .export         popax, incsp2
-        .importzp       sp
-
-        .macpack        cpu
+        .importzp       c_sp
 
 ; Pop a/x from stack. This function will run directly into incsp2
 
 .proc   popax
 
         ldy     #1
-        lda     (sp),y          ; get hi byte
+        lda     (c_sp),y        ; get hi byte
         tax                     ; into x
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)            ; get lo byte
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)          ; get lo byte
 .else
         dey
-        lda     (sp),y          ; get lo byte
+        lda     (c_sp),y        ; get lo byte
 .endif
 
 .endproc
@@ -29,14 +27,14 @@
 
 .proc   incsp2
 
-        inc     sp              ; 5
+        inc     c_sp            ; 5
         beq     @L1             ; 2
-        inc     sp              ; 5
+        inc     c_sp            ; 5
         beq     @L2             ; 2
         rts
 
-@L1:    inc     sp              ; 5
-@L2:    inc     sp+1            ; 5
+@L1:    inc     c_sp            ; 5
+@L2:    inc     c_sp+1          ; 5
         rts
 
 .endproc
diff --git a/libsrc/runtime/ladd.s b/libsrc/runtime/ladd.s
index 23b3436c0..6991e4a7e 100644
--- a/libsrc/runtime/ladd.s
+++ b/libsrc/runtime/ladd.s
@@ -6,9 +6,7 @@
 
         .export         tosadd0ax, tosaddeax
         .import         addysp1
-        .importzp       sp, sreg, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, sreg, tmp1
 
 ; EAX = TOS + EAX
 
@@ -19,25 +17,25 @@ tosadd0ax:
 
 tosaddeax:
         clc
-.if (.cpu .bitand CPU_ISET_65SC02)
-        adc     (sp)            ; 65SC02 version - saves 2 cycles
+.if .cap(CPU_HAS_ZPIND)
+        adc     (c_sp)          ; 65SC02 version - saves 2 cycles
         ldy     #1
 .else
         ldy     #0
-        adc     (sp),y          ; lo byte
+        adc     (c_sp),y        ; lo byte
         iny
 .endif
         sta     tmp1            ; use as temp storage
         txa
-        adc     (sp),y          ; byte 1
+        adc     (c_sp),y        ; byte 1
         tax
         iny
         lda     sreg
-        adc     (sp),y          ; byte 2
+        adc     (c_sp),y        ; byte 2
         sta     sreg
         iny
         lda     sreg+1
-        adc     (sp),y          ; byte 3
+        adc     (c_sp),y        ; byte 3
         sta     sreg+1
         lda     tmp1            ; load byte 0
         jmp     addysp1         ; drop TOS
diff --git a/libsrc/runtime/laddeq.s b/libsrc/runtime/laddeq.s
index 57bec0629..e5afac9cc 100644
--- a/libsrc/runtime/laddeq.s
+++ b/libsrc/runtime/laddeq.s
@@ -11,8 +11,6 @@
         .export         laddeq1, laddeqa, laddeq
         .importzp       sreg, ptr1, tmp1
 
-        .macpack        cpu
-
 laddeq1:
         lda     #$01
 
@@ -24,7 +22,7 @@ laddeqa:
 laddeq: sty     ptr1+1                  ; Store high byte of address
         clc
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         adc     (ptr1)
         sta     (ptr1)
         ldy     #$01                    ; Address byte 1
diff --git a/libsrc/runtime/laddeqsp.s b/libsrc/runtime/laddeqsp.s
index 46c3c1f29..13dbf8112 100644
--- a/libsrc/runtime/laddeqsp.s
+++ b/libsrc/runtime/laddeqsp.s
@@ -5,29 +5,29 @@
 ;
 
         .export         laddeq0sp, laddeqysp
-        .importzp       sp, sreg
+        .importzp       c_sp, sreg
 
 laddeq0sp:
         ldy     #0
 laddeqysp:
         clc
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         pha
         iny
         txa
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         tax
         iny
         lda     sreg
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         sta     sreg
         iny
         lda     sreg+1
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         sta     sreg+1
         pla
         rts
diff --git a/libsrc/runtime/land.s b/libsrc/runtime/land.s
index 8e21ebb60..2ad4ae4d7 100644
--- a/libsrc/runtime/land.s
+++ b/libsrc/runtime/land.s
@@ -7,12 +7,10 @@
 
         .export         tosand0ax, tosandeax
         .import         addysp1
-        .importzp       sp, sreg, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, sreg, tmp1
 
 tosand0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -22,25 +20,25 @@ tosand0ax:
 .endif
 
 tosandeax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        and     (sp)            ; byte 0
+.if .cap(CPU_HAS_ZPIND)
+        and     (c_sp)          ; byte 0
         ldy     #1
 .else
         ldy     #0
-        and     (sp),y          ; byte 0
+        and     (c_sp),y        ; byte 0
         iny
 .endif
         sta     tmp1
         txa
-        and     (sp),y          ; byte 1
+        and     (c_sp),y        ; byte 1
         tax
         iny
         lda     sreg
-        and     (sp),y          ; byte 2
+        and     (c_sp),y        ; byte 2
         sta     sreg
         iny
         lda     sreg+1
-        and     (sp),y          ; byte 3
+        and     (c_sp),y        ; byte 3
         sta     sreg+1
 
         lda     tmp1
diff --git a/libsrc/runtime/lcmp.s b/libsrc/runtime/lcmp.s
index d0ba4d81f..59c02dd56 100644
--- a/libsrc/runtime/lcmp.s
+++ b/libsrc/runtime/lcmp.s
@@ -7,7 +7,7 @@
 
         .export         toslcmp
         .import         incsp4
-        .importzp       sp, sreg, ptr1
+        .importzp       c_sp, sreg, ptr1
 
 
 toslcmp:
@@ -15,23 +15,23 @@ toslcmp:
         stx     ptr1+1          ; EAX now in sreg:ptr1
 
         ldy     #$03
-        lda     (sp),y
+        lda     (c_sp),y
         sec
         sbc     sreg+1
         bne     L4
 
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         cmp     sreg
         bne     L1
 
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         cmp     ptr1+1
         bne     L1
 
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         cmp     ptr1
 
 L1:     php                     ; Save flags
diff --git a/libsrc/runtime/ldau0sp.s b/libsrc/runtime/ldau0sp.s
index a986d52da..5fbde5b62 100644
--- a/libsrc/runtime/ldau0sp.s
+++ b/libsrc/runtime/ldau0sp.s
@@ -5,20 +5,18 @@
 ;
 
         .export         ldau00sp, ldau0ysp
-        .importzp       sp, ptr1
-
-        .macpack        cpu
+        .importzp       c_sp, ptr1
 
 ldau00sp:
         ldy     #1
 ldau0ysp:
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1
         ldx     #0
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         lda     (ptr1)          ; Save one cycle for the C02
 .else
         lda     (ptr1,x)
diff --git a/libsrc/runtime/ldauisp.s b/libsrc/runtime/ldauisp.s
index 54f4d1bd1..957f245be 100644
--- a/libsrc/runtime/ldauisp.s
+++ b/libsrc/runtime/ldauisp.s
@@ -5,15 +5,15 @@
 ;
 
         .export         ldaui0sp, ldauiysp
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
 ldaui0sp:
         ldy     #1
 ldauiysp:
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1
         txa
         tay
diff --git a/libsrc/runtime/ldaxsp.s b/libsrc/runtime/ldaxsp.s
index aa94b43cd..b744ce242 100644
--- a/libsrc/runtime/ldaxsp.s
+++ b/libsrc/runtime/ldaxsp.s
@@ -5,16 +5,16 @@
 ;
 
         .export         ldax0sp, ldaxysp
-        .importzp       sp
+        .importzp       c_sp
 
 ; Beware: The optimizer knows about the value in Y after return!
 
 ldax0sp:
         ldy     #1
 ldaxysp:
-        lda     (sp),y          ; get high byte
+        lda     (c_sp),y        ; get high byte
         tax                     ; and save it
         dey                     ; point to lo byte
-        lda     (sp),y          ; load low byte
+        lda     (c_sp),y        ; load low byte
         rts
 
diff --git a/libsrc/runtime/ldeaxysp.s b/libsrc/runtime/ldeaxysp.s
index 1d65e9c38..b6ce7254f 100644
--- a/libsrc/runtime/ldeaxysp.s
+++ b/libsrc/runtime/ldeaxysp.s
@@ -9,20 +9,20 @@
 
 
         .export         ldeax0sp, ldeaxysp
-        .importzp       sreg, sp
+        .importzp       sreg, c_sp
 
 ldeax0sp:
         ldy     #3
 ldeaxysp:
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg+1
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         tax
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         rts
 
diff --git a/libsrc/runtime/leaaxsp.s b/libsrc/runtime/leaaxsp.s
index 0741170ca..451d7191f 100644
--- a/libsrc/runtime/leaaxsp.s
+++ b/libsrc/runtime/leaaxsp.s
@@ -5,16 +5,16 @@
 ;
 
         .export         leaaxsp, leaa0sp
-        .importzp       sp
+        .importzp       c_sp
 
 leaa0sp:
         ldx     #$00
 leaaxsp:
         clc
-        adc     sp
+        adc     c_sp
         pha
         txa
-        adc     sp+1
+        adc     c_sp+1
         tax
         pla
         rts
diff --git a/libsrc/runtime/leave.s b/libsrc/runtime/leave.s
index 95dcdec9d..afb069b1c 100644
--- a/libsrc/runtime/leave.s
+++ b/libsrc/runtime/leave.s
@@ -12,9 +12,7 @@
         .export         leave00, leave0, leavey00, leavey0, leavey
         .export         leave
         .import         addysp
-        .importzp       sp
-
-        .macpack        cpu
+        .importzp       c_sp
 
 leave00:
         lda     #0
@@ -28,27 +26,27 @@ leavey0:
 leavey:
         jsr     addysp          ; drop stack frame
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
 
 leave:  tay                     ; save A a sec
-        lda     (sp)            ; that's the pushed arg size
+        lda     (c_sp)          ; that's the pushed arg size
         sec                     ; Count the byte, the count's stored in
-        adc     sp
-        sta     sp
+        adc     c_sp
+        sta     c_sp
         bcc     L1
-        inc     sp+1
+        inc     c_sp+1
 L1:     tya                     ; Get return value back
 
 .else
 
 leave:  pha                     ; save A a sec
         ldy     #0
-        lda     (sp),y          ; that's the pushed arg size
+        lda     (c_sp),y        ; that's the pushed arg size
         sec                     ; Count the byte, the count's stored in
-        adc     sp
-        sta     sp
+        adc     c_sp
+        sta     c_sp
         bcc     L1
-        inc     sp+1
+        inc     c_sp+1
 L1:     pla                     ; Get return value back
 
 .endif
diff --git a/libsrc/runtime/lmod.s b/libsrc/runtime/lmod.s
index b8e796dea..1cff216f3 100644
--- a/libsrc/runtime/lmod.s
+++ b/libsrc/runtime/lmod.s
@@ -11,10 +11,8 @@
         .import         poplsargs, udiv32, negeax
         .importzp       sreg, ptr1, ptr2, tmp1, tmp3, tmp4
 
-        .macpack        cpu
-
 tosmod0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
diff --git a/libsrc/runtime/lmul.s b/libsrc/runtime/lmul.s
index 90d5f1e97..7124d6abd 100644
--- a/libsrc/runtime/lmul.s
+++ b/libsrc/runtime/lmul.s
@@ -7,13 +7,11 @@
 
         .export         tosumul0ax, tosumuleax, tosmul0ax, tosmuleax
         .import         addysp1
-        .importzp       sp, sreg, tmp1, tmp2, tmp3, tmp4, ptr1, ptr3, ptr4
-
-        .macpack        cpu
+        .importzp       c_sp, sreg, tmp1, tmp2, tmp3, tmp4, ptr1, ptr3, ptr4
 
 tosmul0ax:
 tosumul0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -26,22 +24,22 @@ tosmuleax:
 tosumuleax:
 mul32:  sta     ptr1
         stx     ptr1+1          ; op2 now in ptr1/sreg
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
         ldy     #1
 .else
         ldy     #0
-        lda     (sp),y
+        lda     (c_sp),y
         iny
 .endif
         sta     ptr3
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr3+1
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr4
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr4+1          ; op1 in pre3/ptr4
         jsr     addysp1         ; Drop TOS
 
diff --git a/libsrc/runtime/lor.s b/libsrc/runtime/lor.s
index f2204b981..fa87aa63d 100644
--- a/libsrc/runtime/lor.s
+++ b/libsrc/runtime/lor.s
@@ -7,12 +7,10 @@
 
         .export         tosor0ax, tosoreax
         .import         addysp1
-        .importzp       sp, sreg, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, sreg, tmp1
 
 tosor0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -22,25 +20,25 @@ tosor0ax:
 .endif
 
 tosoreax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        ora     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        ora     (c_sp)
         ldy     #1
 .else
         ldy     #0
-        ora     (sp),y          ; byte 0
+        ora     (c_sp),y        ; byte 0
         iny
 .endif
         sta     tmp1
         txa
-        ora     (sp),y          ; byte 1
+        ora     (c_sp),y        ; byte 1
         tax
         iny
         lda     sreg
-        ora     (sp),y          ; byte 2
+        ora     (c_sp),y        ; byte 2
         sta     sreg
         iny
         lda     sreg+1
-        ora     (sp),y          ; byte 3
+        ora     (c_sp),y        ; byte 3
         sta     sreg+1
 
         lda     tmp1
diff --git a/libsrc/runtime/lpop.s b/libsrc/runtime/lpop.s
index a90ea5fcb..81dde42d3 100644
--- a/libsrc/runtime/lpop.s
+++ b/libsrc/runtime/lpop.s
@@ -7,24 +7,22 @@
 
         .export         popeax
         .import         incsp4
-        .importzp       sp, sreg
-
-        .macpack        cpu
+        .importzp       c_sp, sreg
 
 popeax: ldy     #3
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg+1
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         tax
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
 .else
         dey
-        lda     (sp),y
+        lda     (c_sp),y
 .endif
         jmp     incsp4
 
diff --git a/libsrc/runtime/lpush.s b/libsrc/runtime/lpush.s
index 0bc67b523..fbc37b78c 100644
--- a/libsrc/runtime/lpush.s
+++ b/libsrc/runtime/lpush.s
@@ -10,15 +10,13 @@
 ;
         .export         pushl0, push0ax, pusheax
         .import         decsp4
-        .importzp       sp, sreg
-
-        .macpack        cpu
+        .importzp       c_sp, sreg
 
 pushl0:
         lda     #0
         tax
 push0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -31,19 +29,19 @@ pusheax:
         jsr     decsp4
         ldy     #3
         lda     sreg+1
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         lda     sreg
-        sta     (sp),y
+        sta     (c_sp),y
         dey
         txa
-        sta     (sp),y
+        sta     (c_sp),y
         pla
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        sta     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        sta     (c_sp)
 .else
         dey
-        sta     (sp),y
+        sta     (c_sp),y
 .endif
         rts
 
diff --git a/libsrc/runtime/lrsub.s b/libsrc/runtime/lrsub.s
index 5e8d0b543..b88d44f1a 100644
--- a/libsrc/runtime/lrsub.s
+++ b/libsrc/runtime/lrsub.s
@@ -10,12 +10,10 @@
 ;
         .export         tosrsub0ax, tosrsubeax
         .import         addysp1
-        .importzp       sp, sreg, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, sreg, tmp1
 
 tosrsub0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -26,25 +24,25 @@ tosrsub0ax:
 
 tosrsubeax:
         sec
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        sbc     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        sbc     (c_sp)
         ldy     #1
 .else
         ldy     #0
-        sbc     (sp),y          ; byte 0
+        sbc     (c_sp),y        ; byte 0
         iny
 .endif
         sta     tmp1            ; use as temp storage
         txa
-        sbc     (sp),y          ; byte 1
+        sbc     (c_sp),y        ; byte 1
         tax
         iny
         lda     sreg
-        sbc     (sp),y          ; byte 2
+        sbc     (c_sp),y        ; byte 2
         sta     sreg
         iny
         lda     sreg+1
-        sbc     (sp),y          ; byte 3
+        sbc     (c_sp),y        ; byte 3
         sta     sreg+1
         lda     tmp1
         jmp     addysp1         ; drop TOS
diff --git a/libsrc/runtime/lshelp.s b/libsrc/runtime/lshelp.s
index 8a2fca139..ce1648d28 100644
--- a/libsrc/runtime/lshelp.s
+++ b/libsrc/runtime/lshelp.s
@@ -39,7 +39,7 @@ poplsargs:
         adc     #$00
         sta     sreg+1
 
-L1:     lda     ptr4+1          ; Is the right operand nagative?
+L1:     lda     ptr4+1          ; Is the right operand negative?
         sta     tmp2            ; Remember the sign for later
         bpl     L2              ; Jump if not
 
diff --git a/libsrc/runtime/lsub.s b/libsrc/runtime/lsub.s
index 4c50ded14..f0d34cd5b 100644
--- a/libsrc/runtime/lsub.s
+++ b/libsrc/runtime/lsub.s
@@ -9,12 +9,10 @@
 ;
         .export         tossub0ax, tossubeax
         .import         addysp1
-        .importzp       sp, sreg
-
-        .macpack        cpu
+        .importzp       c_sp, sreg
 
 tossub0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -26,25 +24,25 @@ tossub0ax:
 tossubeax:
         sec
         eor     #$FF
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        adc     (sp)            ; 65SC02 version - saves 2 cycles
+.if .cap(CPU_HAS_ZPIND)
+        adc     (c_sp)          ; 65SC02 version - saves 2 cycles
         ldy     #1
 .else
         ldy     #0
-        adc     (sp),y          ; lo byte
+        adc     (c_sp),y        ; lo byte
         iny
 .endif
         pha                     ; Save low byte
         txa
         eor     #$FF
-        adc     (sp),y          ; byte 1
+        adc     (c_sp),y        ; byte 1
         tax
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sbc     sreg            ; byte 2
         sta     sreg
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sbc     sreg+1          ; byte 3
         sta     sreg+1
         pla                     ; Restore byte 0
diff --git a/libsrc/runtime/lsubeq.s b/libsrc/runtime/lsubeq.s
index b16ab18e1..d2d4ede7f 100644
--- a/libsrc/runtime/lsubeq.s
+++ b/libsrc/runtime/lsubeq.s
@@ -11,8 +11,6 @@
         .export         lsubeq1, lsubeqa, lsubeq
         .importzp       sreg, ptr1
 
-        .macpack        cpu
-
 lsubeq1:
         lda     #$01
 
@@ -25,7 +23,7 @@ lsubeq: sty     ptr1+1                  ; Store high byte of address
 
         sec
         eor     #$FF
- .if (.cpu .bitand ::CPU_ISET_65SC02)
+ .if .cap(CPU_HAS_ZPIND)
         adc     (ptr1)                  ; Subtract byte 0
         sta     (ptr1)
         ldy     #$01                    ; Address byte 1
diff --git a/libsrc/runtime/lsubeqsp.s b/libsrc/runtime/lsubeqsp.s
index f32930c69..6f8377484 100644
--- a/libsrc/runtime/lsubeqsp.s
+++ b/libsrc/runtime/lsubeqsp.s
@@ -5,31 +5,31 @@
 ;
 
         .export         lsubeq0sp, lsubeqysp
-        .importzp       sp, sreg
+        .importzp       c_sp, sreg
 
 lsubeq0sp:
         ldy     #0
 lsubeqysp:
         sec
         eor     #$FF
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         pha                     ; Save low byte
         iny
         txa
         eor     #$FF
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         tax
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sbc     sreg
-        sta     (sp),y
+        sta     (c_sp),y
         sta     sreg
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sbc     sreg+1
-        sta     (sp),y
+        sta     (c_sp),y
         sta     sreg+1
         pla
         rts
diff --git a/libsrc/runtime/ludiv.s b/libsrc/runtime/ludiv.s
index e2e27371e..53651c789 100644
--- a/libsrc/runtime/ludiv.s
+++ b/libsrc/runtime/ludiv.s
@@ -7,12 +7,10 @@
 
         .export         tosudiv0ax, tosudiveax, getlop, udiv32
         .import         addysp1
-        .importzp       sp, sreg, tmp3, tmp4, ptr1, ptr2, ptr3, ptr4
-
-        .macpack        cpu
+        .importzp       c_sp, sreg, tmp3, tmp4, ptr1, ptr2, ptr3, ptr4
 
 tosudiv0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -22,7 +20,7 @@ tosudiv0ax:
 .endif
 
 tosudiveax:
-        jsr     getlop          ; Get the paramameters
+        jsr     getlop          ; Get the parameters
         jsr     udiv32          ; Do the division
         lda     ptr1            ; Result is in ptr1:sreg
         ldx     ptr1+1
@@ -38,22 +36,22 @@ getlop: sta     ptr3            ; Put right operand in place
         lda     sreg+1
         sta     ptr4+1
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
         ldy     #1
 .else
         ldy     #0              ; Put left operand in place
-        lda     (sp),y
+        lda     (c_sp),y
         iny
 .endif
         sta     ptr1
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg+1
         jmp     addysp1         ; Drop parameters
 
diff --git a/libsrc/runtime/lumod.s b/libsrc/runtime/lumod.s
index 09909c0c9..a43c6d287 100644
--- a/libsrc/runtime/lumod.s
+++ b/libsrc/runtime/lumod.s
@@ -9,10 +9,8 @@
         .import         getlop, udiv32
         .importzp       sreg, tmp3, tmp4, ptr2
 
-        .macpack        cpu
-
 tosumod0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -22,7 +20,7 @@ tosumod0ax:
 .endif
 
 tosumodeax:
-        jsr     getlop          ; Get the paramameters
+        jsr     getlop          ; Get the parameters
         jsr     udiv32          ; Do the division
         lda     tmp3            ; Remainder is in ptr2:tmp3:tmp4
         sta     sreg
diff --git a/libsrc/runtime/lxor.s b/libsrc/runtime/lxor.s
index a92a59959..abf341e63 100644
--- a/libsrc/runtime/lxor.s
+++ b/libsrc/runtime/lxor.s
@@ -7,12 +7,10 @@
 
         .export         tosxor0ax, tosxoreax
         .import         addysp1
-        .importzp       sp, sreg, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, sreg, tmp1
 
 tosxor0ax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     sreg
         stz     sreg+1
 .else
@@ -22,25 +20,25 @@ tosxor0ax:
 .endif
 
 tosxoreax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        eor     (sp)            ; byte 0
+.if .cap(CPU_HAS_ZPIND)
+        eor     (c_sp)          ; byte 0
         ldy     #1
 .else
         ldy     #0
-        eor     (sp),y          ; byte 0
+        eor     (c_sp),y        ; byte 0
         iny
 .endif
         sta     tmp1
         txa
-        eor     (sp),y          ; byte 1
+        eor     (c_sp),y        ; byte 1
         tax
         iny
         lda     sreg
-        eor     (sp),y          ; byte 2
+        eor     (c_sp),y        ; byte 2
         sta     sreg
         iny
         lda     sreg+1
-        eor     (sp),y          ; byte 3
+        eor     (c_sp),y        ; byte 3
         sta     sreg+1
 
         lda     tmp1
diff --git a/libsrc/runtime/or.s b/libsrc/runtime/or.s
index 735f30f61..09aa93e79 100644
--- a/libsrc/runtime/or.s
+++ b/libsrc/runtime/or.s
@@ -7,24 +7,22 @@
 
         .export         tosora0, tosorax
         .import         addysp1
-        .importzp       sp, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, tmp1
 
 tosora0:
         ldx     #$00
 tosorax:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        ora     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        ora     (c_sp)
         ldy     #1
 .else
         ldy     #0
-        ora     (sp),y
+        ora     (c_sp),y
         iny
 .endif
         sta     tmp1
         txa
-        ora     (sp),y
+        ora     (c_sp),y
         tax
         lda     tmp1
         jmp     addysp1         ; drop TOS, set condition codes
diff --git a/libsrc/runtime/popa.s b/libsrc/runtime/popa.s
index bb74df0ca..bc490312e 100644
--- a/libsrc/runtime/popa.s
+++ b/libsrc/runtime/popa.s
@@ -5,23 +5,21 @@
 ;
 
         .export         popa
-        .importzp       sp
-
-        .macpack        cpu
+        .importzp       c_sp
 
 .proc   popa
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
 .else
         ldy     #0              ; (2)
-        lda     (sp),y          ; (7) Read byte
+        lda     (c_sp),y        ; (7) Read byte
 .endif
-        inc     sp              ; (12)
+        inc     c_sp            ; (12)
         beq     @L1             ; (14)
         rts                     ; (20)
 
-@L1:    inc     sp+1
+@L1:    inc     c_sp+1
         rts
 
 .endproc
diff --git a/libsrc/runtime/popptr1.s b/libsrc/runtime/popptr1.s
index 1d04330ab..90dca5e22 100644
--- a/libsrc/runtime/popptr1.s
+++ b/libsrc/runtime/popptr1.s
@@ -6,14 +6,18 @@
 
         .export         popptr1
         .import         incsp2
-        .importzp       sp, ptr1
+        .importzp       c_sp, ptr1
 
 .proc   popptr1                 ; 14 bytes (four usages = at least 2 bytes saved)
         ldy     #1
-        lda     (sp),y          ; get hi byte
+        lda     (c_sp),y        ; get hi byte
         sta     ptr1+1          ; into ptr hi
-        dey                     ; no optimization for 65C02 here to have Y=0 at exit!
-        lda     (sp),y          ; get lo byte
+        dey                     ; dey even for for 65C02 here to have Y=0 at exit!
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)          ; get lo byte
+.else
+        lda     (c_sp),y        ; get lo byte
+.endif
         sta     ptr1            ; to ptr lo
         jmp     incsp2
 .endproc
diff --git a/libsrc/runtime/popsreg.s b/libsrc/runtime/popsreg.s
index 47d67503a..0f6e5701d 100644
--- a/libsrc/runtime/popsreg.s
+++ b/libsrc/runtime/popsreg.s
@@ -6,20 +6,18 @@
 
         .export         popsreg
         .import         incsp2
-        .importzp       sp, sreg
-
-        .macpack        cpu
+        .importzp       c_sp, sreg
 
 popsreg:
         pha                     ; save A
         ldy     #1
-        lda     (sp),y          ; get hi byte
+        lda     (c_sp),y        ; get hi byte
         sta     sreg+1          ; store it
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)            ; get lo byte
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)          ; get lo byte
 .else
         dey
-        lda     (sp),y          ; get lo byte
+        lda     (c_sp),y        ; get lo byte
 .endif
         sta     sreg            ; store it
         pla                     ; get A back
diff --git a/libsrc/runtime/pusha.s b/libsrc/runtime/pusha.s
index 04233282e..6c715afb7 100644
--- a/libsrc/runtime/pusha.s
+++ b/libsrc/runtime/pusha.s
@@ -5,25 +5,23 @@
 ;
 
         .export         pusha0sp, pushaysp, pusha
-        .importzp       sp
-
-        .macpack        cpu
+        .importzp       c_sp
 
 ; Beware: The optimizer knows about this function!
 
 pusha0sp:
         ldy     #$00
 pushaysp:
-        lda     (sp),y
-pusha:  ldy     sp              ; (3)
+        lda     (c_sp),y
+pusha:  ldy     c_sp            ; (3)
         beq     @L1             ; (6)
-        dec     sp              ; (11)
+        dec     c_sp            ; (11)
         ldy     #0              ; (13)
-        sta     (sp),y          ; (19)
+        sta     (c_sp),y        ; (19)
         rts                     ; (25)
 
-@L1:    dec     sp+1            ; (11)
-        dec     sp              ; (16)
-        sta     (sp),y          ; (22)
+@L1:    dec     c_sp+1          ; (11)
+        dec     c_sp            ; (16)
+        sta     (c_sp),y        ; (22)
         rts                     ; (28)
 
diff --git a/libsrc/runtime/pushax.s b/libsrc/runtime/pushax.s
index ac181b994..5177f77b5 100644
--- a/libsrc/runtime/pushax.s
+++ b/libsrc/runtime/pushax.s
@@ -5,7 +5,7 @@
 ;
 
         .export         push0, pusha0, pushax
-        .importzp       sp
+        .importzp       c_sp
 
 push0:  lda     #0
 pusha0: ldx     #0
@@ -18,18 +18,22 @@ pusha0: ldx     #0
 .proc   pushax
 
         pha                     ; (3)
-        lda     sp              ; (6)
+        lda     c_sp            ; (6)
         sec                     ; (8)
         sbc     #2              ; (10)
-        sta     sp              ; (13)
+        sta     c_sp            ; (13)
         bcs     @L1             ; (17)
-        dec     sp+1            ; (+5)
+        dec     c_sp+1          ; (+5)
 @L1:    ldy     #1              ; (19)
         txa                     ; (21)
-        sta     (sp),y          ; (27)
+        sta     (c_sp),y        ; (27)
         pla                     ; (31)
         dey                     ; (33)
-        sta     (sp),y          ; (38)
-        rts                     ; (44)
+.if .cap(CPU_HAS_ZPIND)
+        sta     (c_sp)          ; (37)
+.else
+        sta     (c_sp),y        ; (38)
+.endif
+        rts                     ; (44/43)
 
 .endproc
diff --git a/libsrc/runtime/pushb.s b/libsrc/runtime/pushb.s
index 7507ff21a..02d91b156 100644
--- a/libsrc/runtime/pushb.s
+++ b/libsrc/runtime/pushb.s
@@ -8,8 +8,6 @@
         .import         pushax
         .importzp       ptr1
 
-        .macpack        cpu
-
 pushbidx:
         sty     ptr1
         clc
@@ -19,7 +17,7 @@ pushbidx:
 pushb:  sta     ptr1
         stx     ptr1+1
         ldx     #0              ; Load index/high byte
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         lda     (ptr1)          ; Save one cycle for the C02
 .else
         lda     (ptr1,x)
diff --git a/libsrc/runtime/pushbsp.s b/libsrc/runtime/pushbsp.s
index 0b5cbe854..45ad93b12 100644
--- a/libsrc/runtime/pushbsp.s
+++ b/libsrc/runtime/pushbsp.s
@@ -6,12 +6,12 @@
 
         .export         pushbsp, pushbysp
         .import         pusha0
-        .importzp       sp
+        .importzp       c_sp
 
 pushbsp:
         ldy     #0
 pushbysp:
-        lda     (sp),y          ; get lo byte
+        lda     (c_sp),y        ; get lo byte
         jmp     pusha0          ; promote to unsigned and push
 
 
diff --git a/libsrc/runtime/pushlysp.s b/libsrc/runtime/pushlysp.s
index ca1834265..86bb87dbd 100644
--- a/libsrc/runtime/pushlysp.s
+++ b/libsrc/runtime/pushlysp.s
@@ -7,23 +7,23 @@
 
         .export         pushlysp
         .import         pusheax
-        .importzp       sreg, sp
+        .importzp       sreg, c_sp
 
 .proc   pushlysp
 
         iny
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         iny
         sta     sreg
-        lda     (sp),y
+        lda     (c_sp),y
         sta     sreg+1
         dey
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         dey
         tax
-        lda     (sp),y
+        lda     (c_sp),y
         jmp     pusheax
 
 .endproc
diff --git a/libsrc/runtime/pushptr1.s b/libsrc/runtime/pushptr1.s
new file mode 100644
index 000000000..ca934d6c1
--- /dev/null
+++ b/libsrc/runtime/pushptr1.s
@@ -0,0 +1,14 @@
+;
+; Colin Leroy-Mira, 2024
+;
+; CC65 runtime: Push ptr1 to stack.
+; A/X destroyed (set to ptr1)
+
+        .export         pushptr1
+        .import         pushax
+        .importzp       ptr1
+
+pushptr1:
+        lda     ptr1
+        ldx     ptr1+1
+        jmp     pushax
diff --git a/libsrc/runtime/pushwsp.s b/libsrc/runtime/pushwsp.s
index f5ebe0d7e..31c08d624 100644
--- a/libsrc/runtime/pushwsp.s
+++ b/libsrc/runtime/pushwsp.s
@@ -5,27 +5,27 @@
 ;
 
         .export         pushwysp, pushw0sp
-        .importzp       sp
+        .importzp       c_sp
 
         .macpack        generic
 
 pushw0sp:
         ldy     #3
 pushwysp:
-        lda     sp              ; 3
+        lda     c_sp            ; 3
         sub     #2              ; 4
-        sta     sp              ; 3
+        sta     c_sp            ; 3
         bcs     @L1             ; 3(+1)
-        dec     sp+1            ; (5)
-@L1:    lda     (sp),y          ; 5 =16
+        dec     c_sp+1          ; (5)
+@L1:    lda     (c_sp),y        ; 5 =16
         tax                     ; 2
         dey                     ; 2
-        lda     (sp),y          ; 5
+        lda     (c_sp),y        ; 5
         ldy     #$00            ; 2
-        sta     (sp),y          ; 5
+        sta     (c_sp),y        ; 5
         iny                     ; 2
         txa                     ; 2
-        sta     (sp),y          ; 5
+        sta     (c_sp),y        ; 5
         rts
 
 
diff --git a/libsrc/runtime/regswap.s b/libsrc/runtime/regswap.s
index 689d8d12a..17db9ee27 100644
--- a/libsrc/runtime/regswap.s
+++ b/libsrc/runtime/regswap.s
@@ -5,17 +5,17 @@
 ;
 
         .export         regswap
-        .importzp       sp, regbank, tmp1
+        .importzp       c_sp, regbank, tmp1
 
 .proc   regswap
 
         sta     tmp1                    ; Store count
 @L1:    lda     regbank,x               ; Get old value
         pha                             ; Save it
-        lda     (sp),y                  ; Get stack loc
+        lda     (c_sp),y                ; Get stack loc
         sta     regbank,x               ; Store new value
         pla
-        sta     (sp),y                  ; Store old value
+        sta     (c_sp),y                ; Store old value
         inx
         iny
         dec     tmp1
diff --git a/libsrc/runtime/regswap1.s b/libsrc/runtime/regswap1.s
index 753020acb..22cf170dc 100644
--- a/libsrc/runtime/regswap1.s
+++ b/libsrc/runtime/regswap1.s
@@ -5,16 +5,16 @@
 ;
 
         .export         regswap1
-        .importzp       sp, regbank
+        .importzp       c_sp, regbank
 
 .proc   regswap1
 
         lda     regbank,x               ; Get old value
         pha                             ; Save it
-        lda     (sp),y                  ; Get stack loc
+        lda     (c_sp),y                ; Get stack loc
         sta     regbank,x               ; Store new value
         pla
-        sta     (sp),y                  ; Store old value
+        sta     (c_sp),y                ; Store old value
         rts
 
 .endproc
diff --git a/libsrc/runtime/regswap2.s b/libsrc/runtime/regswap2.s
index df5109dc6..07bc7c196 100644
--- a/libsrc/runtime/regswap2.s
+++ b/libsrc/runtime/regswap2.s
@@ -5,7 +5,7 @@
 ;
 
         .export         regswap2
-        .importzp       sp, regbank
+        .importzp       c_sp, regbank
 
 .proc   regswap2
 
@@ -13,20 +13,20 @@
 
         lda     regbank,x               ; Get old value
         pha                             ; Save it
-        lda     (sp),y                  ; Get stack loc
+        lda     (c_sp),y                ; Get stack loc
         sta     regbank,x               ; Store new value
         pla
-        sta     (sp),y                  ; Store old value
+        sta     (c_sp),y                ; Store old value
 
 ; Second byte
 
         iny
         lda     regbank+1,x             ; Get old value
         pha                             ; Save it
-        lda     (sp),y                  ; Get stack loc
+        lda     (c_sp),y                ; Get stack loc
         sta     regbank+1,x             ; Store new value
         pla
-        sta     (sp),y                  ; Store old value
+        sta     (c_sp),y                ; Store old value
 
         rts
 
diff --git a/libsrc/runtime/returnFFFF.s b/libsrc/runtime/returnFFFF.s
new file mode 100644
index 000000000..41180651b
--- /dev/null
+++ b/libsrc/runtime/returnFFFF.s
@@ -0,0 +1,15 @@
+;
+; Ullrich von Bassewitz, 25.10.2000
+;
+; CC65 runtime: Return -1 in a/x
+;
+
+        .export         returnFFFF
+
+.proc   returnFFFF
+
+        lda     #$FF
+        tax
+        rts
+
+.endproc
diff --git a/libsrc/runtime/rsub.s b/libsrc/runtime/rsub.s
index 69ee6da22..1eedee53e 100644
--- a/libsrc/runtime/rsub.s
+++ b/libsrc/runtime/rsub.s
@@ -7,9 +7,7 @@
 
         .export         tosrsuba0, tosrsubax
         .import         addysp1
-        .importzp       sp, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, tmp1
 
 ;
 ; AX = AX - TOS
@@ -19,17 +17,17 @@ tosrsuba0:
         ldx     #0
 tosrsubax:
         sec
-.if (.cpu .bitand CPU_ISET_65SC02)
-        sbc     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        sbc     (c_sp)
         ldy     #1
 .else
         ldy     #0
-        sbc     (sp),y          ; lo byte
+        sbc     (c_sp),y        ; lo byte
         iny
 .endif
         sta     tmp1            ; save lo byte
         txa
-        sbc     (sp),y          ; hi byte
+        sbc     (c_sp),y        ; hi byte
         tax
         lda     tmp1
         jmp     addysp1         ; drop TOS, set condition codes
diff --git a/libsrc/runtime/shl.s b/libsrc/runtime/shl.s
index c1a4b6ef8..1f11eb5c0 100644
--- a/libsrc/runtime/shl.s
+++ b/libsrc/runtime/shl.s
@@ -15,8 +15,6 @@
         .import          popax
         .importzp        tmp1
 
-        .macpack        cpu
-
 tosshlax:
 tosaslax:
         sta     tmp1            ; Save shift count
@@ -55,7 +53,7 @@ L2:     pla
 
 ; Shift count is exactly 8
 
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_PUSHXY)
 L3:     plx                     ; Low byte from stack into X
         rts                     ; A is already zero
 .else
diff --git a/libsrc/runtime/shrax7.s b/libsrc/runtime/shrax7.s
new file mode 100644
index 000000000..31712ca72
--- /dev/null
+++ b/libsrc/runtime/shrax7.s
@@ -0,0 +1,18 @@
+;
+; Miloslaw Smyk, 2024
+;
+; CC65 runtime: Scale the primary register by 128, unsigned
+;
+
+        .export         shrax7
+
+shrax7:                         ; HXXXXXXL hAAAAAAl
+        asl                     ;          AAAAAAA0, h->C
+        txa
+        rol                     ;          XXXXXXLh, H->C
+        ldx     #$00            ; 00000000 XXXXXXLh
+        bcc     :+
+        inx                     ; 0000000H XXXXXXLh if C
+:       rts
+
+        ; 12 cycles max, 9 bytes
diff --git a/libsrc/runtime/sp-compat.s b/libsrc/runtime/sp-compat.s
new file mode 100644
index 000000000..77972212f
--- /dev/null
+++ b/libsrc/runtime/sp-compat.s
@@ -0,0 +1,19 @@
+;
+; Kugelfuhr, 2025-06-26
+;
+; Add "sp" as an alias for "c_sp" so we don't break old code but emit a
+; linker warning if it is used. Added after renaming "sp" to "c_sp".
+;
+
+; FIXME: there must be a less ugly way to do this
+.ifp4510
+.else
+.ifp45GS02
+.else
+
+.include        "zeropage.inc"
+.export         sp := c_sp
+.assert         0, ldwarning, "Symbol 'sp' is deprecated - please use 'c_sp' instead"
+
+.endif
+.endif
diff --git a/libsrc/runtime/staspidx.s b/libsrc/runtime/staspidx.s
index c8d42f34c..bd9b0c79d 100644
--- a/libsrc/runtime/staspidx.s
+++ b/libsrc/runtime/staspidx.s
@@ -6,17 +6,17 @@
 
         .export         staspidx
         .import         incsp2
-        .importzp       sp, tmp1, ptr1
+        .importzp       c_sp, tmp1, ptr1
 
 .proc   staspidx
 
         pha
         sty     tmp1            ; Save Index
         ldy     #1
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1            ; Pointer now in ptr1
         ldy     tmp1            ; Restore offset
         pla                     ; Restore value
diff --git a/libsrc/runtime/staxsp.s b/libsrc/runtime/staxsp.s
index 599e92a32..15bec22ee 100644
--- a/libsrc/runtime/staxsp.s
+++ b/libsrc/runtime/staxsp.s
@@ -1,20 +1,20 @@
 ;
 ; Ullrich von Bassewitz, 31.08.1998
 ;
-; CC65 runtime: Store ax at (sp),y
+; CC65 runtime: Store ax at (c_sp),y
 ;
 
         .export         staxysp, stax0sp
-        .importzp       sp
+        .importzp       c_sp
 
 stax0sp:
         ldy     #0
 staxysp:
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         pha
         txa
-        sta     (sp),y
+        sta     (c_sp),y
         pla
         rts
 
diff --git a/libsrc/runtime/staxspi.s b/libsrc/runtime/staxspi.s
index 3114f449c..e1542881f 100644
--- a/libsrc/runtime/staxspi.s
+++ b/libsrc/runtime/staxspi.s
@@ -7,22 +7,20 @@
 
         .export         staxspidx
         .import         incsp2
-        .importzp       sp, tmp1, ptr1
-
-        .macpack        cpu
+        .importzp       c_sp, tmp1, ptr1
 
 .proc   staxspidx
 
         sty     tmp1            ; Save Y
         pha                     ; Save A
         ldy     #1
-        lda     (sp),y
+        lda     (c_sp),y
         sta     ptr1+1
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
 .else
         dey
-        lda     (sp),y
+        lda     (c_sp),y
 .endif
         sta     ptr1            ; Address now in ptr1
         ldy     tmp1            ; Restore Y
diff --git a/libsrc/runtime/steaxsp.s b/libsrc/runtime/steaxsp.s
index 6ac3891c9..33dbc04d7 100644
--- a/libsrc/runtime/steaxsp.s
+++ b/libsrc/runtime/steaxsp.s
@@ -1,26 +1,26 @@
 ;
 ; Ullrich von Bassewitz, 31.08.1998
 ;
-; CC65 runtime: Store eax at (sp),y
+; CC65 runtime: Store eax at (c_sp),y
 ;
 
         .export         steaxysp, steax0sp
-        .importzp       sp, sreg
+        .importzp       c_sp, sreg
 
 steax0sp:
         ldy     #0
 steaxysp:
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         pha
         txa
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         lda     sreg
-        sta     (sp),y
+        sta     (c_sp),y
         iny
         lda     sreg+1
-        sta     (sp),y
+        sta     (c_sp),y
         pla
         rts
 
diff --git a/libsrc/runtime/stkchk.s b/libsrc/runtime/stkchk.s
index ceab4c703..f6ab28ea6 100644
--- a/libsrc/runtime/stkchk.s
+++ b/libsrc/runtime/stkchk.s
@@ -17,11 +17,10 @@
         .constructor    initstkchk, 25
         .import         __STACKSIZE__                   ; Linker defined
         .import         pusha0, _exit
-        .importzp       sp
+        .importzp       c_sp
 
         ; Use macros for better readability
         .macpack        generic
-        .macpack        cpu
 
 
 ; ----------------------------------------------------------------------------
@@ -32,14 +31,14 @@
 
 .proc   initstkchk
 
-        lda     sp
+        lda     c_sp
         sta     initialsp
         sub     #<__STACKSIZE__
         sta     lowwater
-        lda     sp+1
+        lda     c_sp+1
         sta     initialsp+1
         sbc     #>__STACKSIZE__
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_INA)
         ina                     ; Add 256 bytes safety area
 .else
         add     #1              ; Add 256 bytes safety area
@@ -70,7 +69,7 @@ cstkchk:
 ; Check the high byte of the software stack
 
 @L0:    lda     lowwater+1
-        cmp     sp+1
+        cmp     c_sp+1
         bcs     @L1
         rts
 
@@ -78,7 +77,7 @@ cstkchk:
 
 @L1:    bne     CStackOverflow
         lda     lowwater
-        cmp     sp
+        cmp     c_sp
         bcs     CStackOverflow
 Done:   rts
 
@@ -87,9 +86,9 @@ Done:   rts
 
 CStackOverflow:
         lda     initialsp
-        sta     sp
+        sta     c_sp
         lda     initialsp+1
-        sta     sp+1
+        sta     c_sp+1
 
 ; Generic abort entry. We should output a diagnostic here, but this is
 ; difficult, since we're operating at a lower level here.
diff --git a/libsrc/runtime/sub.s b/libsrc/runtime/sub.s
index b41df3d91..7129e2147 100644
--- a/libsrc/runtime/sub.s
+++ b/libsrc/runtime/sub.s
@@ -6,9 +6,7 @@
 
         .export         tossuba0, tossubax
         .import         addysp1
-        .importzp       sp
-
-        .macpack        cpu
+        .importzp       c_sp
 
 ; AX = TOS - AX
 
@@ -17,18 +15,18 @@ tossuba0:
 tossubax:
         sec
         eor     #$FF
-.if (.cpu .bitand CPU_ISET_65SC02)
-        adc     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        adc     (c_sp)
         ldy     #1
 .else
         ldy     #0
-        adc     (sp),y          ; Subtract low byte
+        adc     (c_sp),y        ; Subtract low byte
         iny
 .endif
         pha                     ; Save high byte
         txa
         eor     #$FF
-        adc     (sp),y          ; Subtract high byte
+        adc     (c_sp),y        ; Subtract high byte
         tax                     ; High byte into X
         pla                     ; Restore low byte
         jmp     addysp1         ; drop TOS
diff --git a/libsrc/runtime/subeqsp.s b/libsrc/runtime/subeqsp.s
index 24080d97d..880e5f2fc 100644
--- a/libsrc/runtime/subeqsp.s
+++ b/libsrc/runtime/subeqsp.s
@@ -5,21 +5,21 @@
 ;
 
         .export         subeq0sp, subeqysp
-        .importzp       sp
+        .importzp       c_sp
 
 subeq0sp:
         ldy     #0
 subeqysp:
         sec
         eor     #$FF
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         pha                     ; Save low byte
         iny
         txa
         eor     #$FF
-        adc     (sp),y
-        sta     (sp),y
+        adc     (c_sp),y
+        sta     (c_sp),y
         tax
         pla                     ; Restore low byte
         rts
diff --git a/libsrc/runtime/subysp.s b/libsrc/runtime/subysp.s
index 9fae44222..8f5bea806 100644
--- a/libsrc/runtime/subysp.s
+++ b/libsrc/runtime/subysp.s
@@ -6,17 +6,17 @@
 ;
 
         .export         subysp
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   subysp
 
         tya
         eor     #$ff
         sec
-        adc     sp
-        sta     sp
+        adc     c_sp
+        sta     c_sp
         bcs     @L1
-        dec     sp+1
+        dec     c_sp+1
 @L1:    rts
 
 .endproc
diff --git a/libsrc/runtime/swap.s b/libsrc/runtime/swap.s
index 5358e08d3..72adaa90b 100644
--- a/libsrc/runtime/swap.s
+++ b/libsrc/runtime/swap.s
@@ -6,30 +6,28 @@
 ;
 
         .export         swapstk
-        .importzp       sp, ptr4
-
-        .macpack        cpu
+        .importzp       c_sp, ptr4
 
 swapstk:
         sta     ptr4
         stx     ptr4+1
         ldy     #1              ; index
-        lda     (sp),y
+        lda     (c_sp),y
         tax
         lda     ptr4+1
-        sta     (sp),y
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)
+        sta     (c_sp),y
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
         tay
         lda     ptr4
-        sta     (sp)
+        sta     (c_sp)
         tya
 .else
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         pha
         lda     ptr4
-        sta     (sp),y
+        sta     (c_sp),y
         pla
 .endif
         rts                     ; whew!
diff --git a/libsrc/runtime/tosint.s b/libsrc/runtime/tosint.s
index ed32298bd..e879fe11f 100644
--- a/libsrc/runtime/tosint.s
+++ b/libsrc/runtime/tosint.s
@@ -6,27 +6,25 @@
 
         .export         tosint
         .import         incsp2
-        .importzp       sp
-
-        .macpack        cpu
+        .importzp       c_sp
 
 ; Convert TOS from long to int by cutting of the high 16bit
 
 .proc   tosint
 
         pha
-.if (.cpu .bitand ::CPU_ISET_65SC02)
-        lda     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        lda     (c_sp)
 .else
         ldy     #0
-        lda     (sp),y          ; sp+1
+        lda     (c_sp),y        ; c_sp+1
 .endif
         ldy     #2
-        sta     (sp),y
+        sta     (c_sp),y
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         ldy     #3
-        sta     (sp),y
+        sta     (c_sp),y
         pla
         jmp     incsp2          ; Drop 16 bit
 
diff --git a/libsrc/runtime/toslong.s b/libsrc/runtime/toslong.s
index 9065d3e6c..c8b34d8b0 100644
--- a/libsrc/runtime/toslong.s
+++ b/libsrc/runtime/toslong.s
@@ -6,9 +6,7 @@
 
         .export         tosulong, toslong
         .import         decsp2
-        .importzp       sp
-
-        .macpack        cpu
+        .importzp       c_sp
 
 ; Convert TOS from int to long
 
@@ -16,25 +14,25 @@ tosulong:
         pha
         jsr     decsp2          ; Make room
         ldy     #2
-        lda     (sp),y
-.if (.cpu .bitand CPU_ISET_65SC02)
-        sta     (sp)            ; 65C02 version
+        lda     (c_sp),y
+.if .cap(CPU_HAS_ZPIND)
+        sta     (c_sp)          ; 65C02 version
         iny                     ; Y = 3
 .else
         ldy     #0
-        sta     (sp),y
+        sta     (c_sp),y
         ldy     #3
 .endif
-        lda     (sp),y
+        lda     (c_sp),y
 toslong1:
         ldy     #1
-        sta     (sp),y
+        sta     (c_sp),y
         lda     #0              ; Zero extend
 toslong2:
         iny
-        sta     (sp),y
+        sta     (c_sp),y
         iny
-        sta     (sp),y
+        sta     (c_sp),y
         pla
         rts
 
@@ -42,19 +40,19 @@ toslong:
         pha
         jsr     decsp2          ; Make room
         ldy     #2
-        lda     (sp),y
-.if (.cpu .bitand CPU_ISET_65SC02)
-        sta     (sp)            ; 65C02 version
+        lda     (c_sp),y
+.if .cap(CPU_HAS_ZPIND)
+        sta     (c_sp)          ; 65C02 version
         iny                     ; Y = 3
 .else
         ldy     #0
-        sta     (sp),y
+        sta     (c_sp),y
         ldy     #3
 .endif
-        lda     (sp),y
+        lda     (c_sp),y
         bpl     toslong1        ; Jump if positive, high word is zero
         ldy     #1
-        sta     (sp),y
+        sta     (c_sp),y
         lda     #$FF
         bne     toslong2        ; Branch always
 
diff --git a/libsrc/runtime/umul8x16r24.s b/libsrc/runtime/umul8x16r24.s
index 54d730558..115a3e1a4 100644
--- a/libsrc/runtime/umul8x16r24.s
+++ b/libsrc/runtime/umul8x16r24.s
@@ -9,8 +9,6 @@
 
         .include        "zeropage.inc"
 
-        .macpack        cpu
-
 ;---------------------------------------------------------------------------
 ; 8x16 => 24 unsigned multiplication routine. Because the overhead for a
 ; 8x16 => 16 unsigned multiplication routine is small, we will tag it with
@@ -31,7 +29,7 @@ umul8x16r16:
 
 umul8x16r24m:
 umul8x16r16m:
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_STZ)
         stz     ptr1+1
         stz     sreg
 .else
diff --git a/libsrc/runtime/xor.s b/libsrc/runtime/xor.s
index e03922926..1236b2c37 100644
--- a/libsrc/runtime/xor.s
+++ b/libsrc/runtime/xor.s
@@ -7,24 +7,22 @@
 
         .export         tosxora0, tosxorax
         .import         addysp1
-        .importzp       sp, tmp1
-
-        .macpack        cpu
+        .importzp       c_sp, tmp1
 
 tosxora0:
         ldx     #$00
 tosxorax:
-.if (.cpu .bitand CPU_ISET_65SC02)
-        eor     (sp)
+.if .cap(CPU_HAS_ZPIND)
+        eor     (c_sp)
         ldy     #1
 .else
         ldy     #0
-        eor     (sp),y
+        eor     (c_sp),y
         iny
 .endif
         sta     tmp1
         txa
-        eor     (sp),y
+        eor     (c_sp),y
         tax
         lda     tmp1
         jmp     addysp1         ; drop TOS, set condition codes
diff --git a/libsrc/runtime/zeropage.s b/libsrc/runtime/zeropage.s
index 2bbe7ceee..2e2b237f6 100644
--- a/libsrc/runtime/zeropage.s
+++ b/libsrc/runtime/zeropage.s
@@ -10,7 +10,7 @@
 
 .zeropage
 
-sp:             .res    2       ; Stack pointer
+c_sp:           .res    2       ; Stack pointer
 sreg:           .res    2       ; Secondary register/high 16 bit for longs
 regsave:        .res    4       ; Slot to save/restore (E)AX into
 ptr1:           .res    2
diff --git a/libsrc/sim6502/crt0.s b/libsrc/sim6502/crt0.s
index c04a2b8a6..26be7888b 100644
--- a/libsrc/sim6502/crt0.s
+++ b/libsrc/sim6502/crt0.s
@@ -22,8 +22,8 @@ startup:cld
         txs
         lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1
+        sta     c_sp
+        stx     c_sp+1
         jsr     zerobss
         jsr     initlib
         jsr     callmain
diff --git a/libsrc/sim6502/exehdr.s b/libsrc/sim6502/exehdr.s
index 09d099da5..a1b739b5f 100644
--- a/libsrc/sim6502/exehdr.s
+++ b/libsrc/sim6502/exehdr.s
@@ -5,7 +5,7 @@
 ;
 
         .export         __EXEHDR__ : absolute = 1       ; Linker referenced
-        .importzp       sp
+        .importzp       c_sp
         .import         __MAIN_START__
         .import         startup
 
@@ -13,7 +13,15 @@
 
         .byte   $73, $69, $6D, $36, $35        ; 'sim65'
         .byte   2                              ; header version
-        .byte   .defined(__SIM65C02__)         ; CPU type
-        .byte   sp                             ; sp address
+.if (.cpu .bitand ::CPU_ISET_6502X)
+        .byte   2
+.elseif (.cpu .bitand ::CPU_ISET_65C02)
+        .byte   1
+.elseif (.cpu .bitand ::CPU_ISET_6502)
+        .byte   0
+.else
+        .error Unknown CPU type.
+.endif
+        .byte   c_sp                           ; c_sp address
         .addr   __MAIN_START__                 ; load address
         .addr   startup                        ; reset address
diff --git a/libsrc/sim6502/paravirt.s b/libsrc/sim6502/paravirt.s
index 0d8e528b1..b9fc38de5 100644
--- a/libsrc/sim6502/paravirt.s
+++ b/libsrc/sim6502/paravirt.s
@@ -7,11 +7,17 @@
 ; int __fastcall__ write (int fd, const void* buf, unsigned count);
 ;
 
-        .export         exit, args, _open, _close, _read, _write
+        .export         exit, args, _open, _close, _read, _write, _lseek
+        .export         __sysremove, ___osmaperrno
 
+_lseek          := $FFF1
+__sysremove     := $FFF2
+___osmaperrno   := $FFF3
 _open           := $FFF4
 _close          := $FFF5
 _read           := $FFF6
 _write          := $FFF7
 args            := $FFF8
 exit            := $FFF9
+
+                ; $FFFA-FFFF are hardware vectors, extend before not after!
diff --git a/libsrc/supervision/crt0.s b/libsrc/supervision/crt0.s
index fbae1fc46..1cfba1845 100644
--- a/libsrc/supervision/crt0.s
+++ b/libsrc/supervision/crt0.s
@@ -33,8 +33,8 @@ reset:
 
         lda     #<(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
         ldx     #>(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
         jsr     initlib
         jsr     _main
 _exit:  jsr     donelib
diff --git a/libsrc/sym1/crt0.s b/libsrc/sym1/crt0.s
index 5d4e0449b..d20b4cf6c 100644
--- a/libsrc/sym1/crt0.s
+++ b/libsrc/sym1/crt0.s
@@ -33,9 +33,9 @@ _init:    jsr     ACCESS               ; Unlock System RAM
 ; Set cc65 argument stack pointer
 
           lda     #<(__RAM_START__ + __RAM_SIZE__)
-          sta     sp
+          sta     c_sp
           lda     #>(__RAM_START__ + __RAM_SIZE__)
-          sta     sp+1
+          sta     c_sp+1
 
 ; Initialize memory storage
 
diff --git a/libsrc/sym1/tapeio.s b/libsrc/sym1/tapeio.s
index 078ea7abd..f94e1336c 100644
--- a/libsrc/sym1/tapeio.s
+++ b/libsrc/sym1/tapeio.s
@@ -21,7 +21,7 @@
         ldy     #$80
         jsr     LOADT            ; Read data from tape
         bcs     error
-        jmp     return0          ; Return 0 if sucessful
+        jmp     return0          ; Return 0 if successful
 error:  jmp     return1          ; or 1 if not
 
 .endproc
@@ -40,7 +40,7 @@ error:  jmp     return1          ; or 1 if not
         ldy     #$80
         jsr     DUMPT            ; Write data to tape
         bcs     error
-        jmp     return0          ; Return 0 if sucessful
+        jmp     return0          ; Return 0 if successful
 error:  jmp     return1          ; or 1 if not
 
 .endproc
diff --git a/libsrc/telestrat/crt0.s b/libsrc/telestrat/crt0.s
index df75520ce..aa32ed0d0 100644
--- a/libsrc/telestrat/crt0.s
+++ b/libsrc/telestrat/crt0.s
@@ -47,7 +47,7 @@ _exit:  jsr     donelib
 
         ldx     #zpspace - 1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
@@ -64,7 +64,7 @@ L2:     lda     zpsave,x
 ; Save the zero-page area that we're about to use.
 
 init:   ldx     #zpspace - 1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -74,8 +74,8 @@ L1:     lda     sp,x
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Call the module constructors.
 
diff --git a/libsrc/telestrat/open.s b/libsrc/telestrat/open.s
index f59d3d31a..08c572e23 100644
--- a/libsrc/telestrat/open.s
+++ b/libsrc/telestrat/open.s
@@ -2,7 +2,7 @@
 
     .import    addysp,popax
 
-    .importzp  sp,tmp2,tmp3,tmp1
+    .importzp  c_sp,tmp2,tmp3,tmp1
 
 
     .include   "telestrat.inc"
diff --git a/libsrc/telestrat/sysuname.s b/libsrc/telestrat/sysuname.s
index 51af1d8fe..09aaff831 100644
--- a/libsrc/telestrat/sysuname.s
+++ b/libsrc/telestrat/sysuname.s
@@ -23,23 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .if             ((.VERSION >> 4) & $0F) > 9
-        .byte           ((.VERSION >> 4) & $0F) / 10 + '0'
-        .byte           ((.VERSION >> 4) & $0F) .MOD 10 + '0'
-        .else
-        .byte           ((.VERSION >> 4) & $0F) + '0'
-        .endif
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .if             (.VERSION & $0F) > 9
-        .byte           (.VERSION & $0F) / 10 + '0'
-        .byte           (.VERSION & $0F) .MOD 10 + '0'
-        .else
-        .byte           (.VERSION & $0F) + '0'
-        .endif
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/telestrat/wherex.s b/libsrc/telestrat/wherex.s
index 8616003c8..256b967c3 100644
--- a/libsrc/telestrat/wherex.s
+++ b/libsrc/telestrat/wherex.s
@@ -3,7 +3,7 @@
 ;
     .export    _wherex
 
-    .importzp  sp
+    .importzp  c_sp
 
     .include   "telestrat.inc"
 
diff --git a/libsrc/telestrat/write.s b/libsrc/telestrat/write.s
index 37a896696..8509aa159 100644
--- a/libsrc/telestrat/write.s
+++ b/libsrc/telestrat/write.s
@@ -65,7 +65,7 @@ L2:     ldy     #0
         cpx     #$0A            ; check for \n
         bne     L3
         BRK_TELEMON  XWR0       ; macro send char to screen (channel 0 in telemon terms)
-        lda     #$0D            ; return to the beggining of the line
+        lda     #$0D            ; return to the beginning of the line
         BRK_TELEMON  XWR0       ; macro
 
 
diff --git a/libsrc/tgi/tgi-kernel.s b/libsrc/tgi/tgi-kernel.s
index cbd655279..c2d87b002 100644
--- a/libsrc/tgi/tgi-kernel.s
+++ b/libsrc/tgi/tgi-kernel.s
@@ -23,7 +23,7 @@ _tgi_error:         .res    1           ; Last error code
 _tgi_gmode:         .res    1           ; Flag: Graphics mode active
 _tgi_curx:          .res    2           ; Current drawing cursor X
 _tgi_cury:          .res    2           ; Current drawing cursor Y
-_tgi_color:         .res    1           ; Current drawing color
+_tgi_color:         .res    1           ; Current drawing color (palette index)
 _tgi_font:          .res    1           ; Which font to use
 _tgi_textdir:       .res    1           ; Current text direction
 _tgi_vectorfont:    .res    2           ; Pointer to vector font
diff --git a/libsrc/tgi/tgi_clippedline.s b/libsrc/tgi/tgi_clippedline.s
index b0f1dd456..319bb7152 100644
--- a/libsrc/tgi/tgi_clippedline.s
+++ b/libsrc/tgi/tgi_clippedline.s
@@ -188,7 +188,7 @@ tgi_clip_sign:  .res    1
         ldx     tgi_clip_dx+1
         jsr     udiv32by16r16
 
-; Check the sign of the final result and negate it if nessary
+; Check the sign of the final result and negate it if necessary
 
 done:   bit     tmp1
         jmi     negax
@@ -228,7 +228,7 @@ done:   bit     tmp1
         ldx     tgi_clip_dy+1
         jsr     udiv32by16r16
 
-; Check the sign of the final result and negate it if nessary
+; Check the sign of the final result and negate it if necessary
 
         jmp     muldiv_dydx::done
 
@@ -279,7 +279,7 @@ L1:     lda     tgi_clip_o1
 
 ; We must clip. If we haven't already done so, calculate dx/dy.
 
-L2:     lda     tgi_clip_d              ; Deltas alreay calculated?
+L2:     lda     tgi_clip_d              ; Deltas already calculated?
         bne     HaveDeltas              ; Jump if yes
         inc     tgi_clip_d
         jsr     calcdeltas
diff --git a/libsrc/tgi/tgi_getcolor.s b/libsrc/tgi/tgi_getcolor.s
index c1c0022d0..95cf7d553 100644
--- a/libsrc/tgi/tgi_getcolor.s
+++ b/libsrc/tgi/tgi_getcolor.s
@@ -2,7 +2,7 @@
 ; Ullrich von Bassewitz, 22.06.2002
 ;
 ; unsigned char tgi_getcolor (void);
-; /* Return the current drawing color */
+; /* Return the current drawing color (palette index) */
 
 
         .include        "tgi-kernel.inc"
diff --git a/libsrc/tgi/tgi_init.s b/libsrc/tgi/tgi_init.s
index c8fd355d5..79651cbba 100644
--- a/libsrc/tgi/tgi_init.s
+++ b/libsrc/tgi/tgi_init.s
@@ -63,7 +63,7 @@
         lda     #<$100
         ldx     #>$100
         jsr     pushax                  ; Width scale = 1.0
-        jsr     pushax                  ; Heigh scale = 1.0
+        jsr     pushax                  ; Height scale = 1.0
         jsr     pusha                   ; Text direction = TGI_TEXT_HORIZONTAL
         jmp     _tgi_settextstyle       ; A = Font = TGI_FONT_BITMAP
 
diff --git a/libsrc/tgi/tgi_outtextxy.s b/libsrc/tgi/tgi_outtextxy.s
index 3934df871..24183396f 100644
--- a/libsrc/tgi/tgi_outtextxy.s
+++ b/libsrc/tgi/tgi_outtextxy.s
@@ -8,7 +8,7 @@
         .include        "tgi-kernel.inc"
 
         .import         addysp1
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   _tgi_outtextxy
 
@@ -17,16 +17,16 @@
 
         pha                     ;
         ldy     #0
-        lda     (sp),y
+        lda     (c_sp),y
         sta     _tgi_cury
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     _tgi_cury+1
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     _tgi_curx
         iny
-        lda     (sp),y
+        lda     (c_sp),y
         sta     _tgi_curx+1
         pla
         jsr     addysp1         ; Drop arguments from stack
diff --git a/libsrc/tgi/tgi_setcolor.s b/libsrc/tgi/tgi_setcolor.s
index 16f075767..6f3bb1871 100644
--- a/libsrc/tgi/tgi_setcolor.s
+++ b/libsrc/tgi/tgi_setcolor.s
@@ -2,8 +2,8 @@
 ; 2002-06-21, Ullrich von Bassewitz
 ; 2020-06-04, Greg King
 ;
-; void __fastcall__ tgi_setcolor (unsigned char color);
-; /* Set the current drawing color */
+; void __fastcall__ tgi_setcolor (unsigned char color_index);
+; /* Set the current drawing color (palette index) */
 
 
         .include        "tgi-kernel.inc"
diff --git a/libsrc/tgi/tgi_settextstyle.s b/libsrc/tgi/tgi_settextstyle.s
index b62d6904c..bb924c048 100644
--- a/libsrc/tgi/tgi_settextstyle.s
+++ b/libsrc/tgi/tgi_settextstyle.s
@@ -9,8 +9,6 @@
         .import         umul8x16r24
         .import         popa, popax
 
-        .macpack        cpu
-
 ;-----------------------------------------------------------------------------
 ; void __fastcall__ tgi_settextstyle (unsigned width, unsigned height,
 ;                                     unsigned char dir, unsigned char font);
@@ -82,7 +80,7 @@ process_onedim:
 ; Disallowing characters larger than 256 pixels, we just drop the high byte
 ; and remember the low 16 bit as size in 8.8 format.
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_PUSHXY)
         phy                             ; Save Y
         jsr     umul8x16r24
         ply                             ; Restore Y
diff --git a/libsrc/vic20/crt0.s b/libsrc/vic20/crt0.s
index c5486063b..189114f5d 100644
--- a/libsrc/vic20/crt0.s
+++ b/libsrc/vic20/crt0.s
@@ -24,7 +24,7 @@ Start:
 ; Save the zero-page locations that we need.
 
         ldx     #zpspace-1
-L1:     lda     sp,x
+L1:     lda     c_sp,x
         sta     zpsave,x
         dex
         bpl     L1
@@ -45,8 +45,8 @@ L1:     lda     sp,x
 
         lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
         ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
-        sta     sp
-        stx     sp+1            ; Set argument stack ptr
+        sta     c_sp
+        stx     c_sp+1          ; Set argument stack ptr
 
 ; Call the module constructors.
 
@@ -65,7 +65,7 @@ _exit:  pha                     ; Save the return code on stack
 
         ldx     #zpspace-1
 L2:     lda     zpsave,x
-        sta     sp,x
+        sta     c_sp,x
         dex
         bpl     L2
 
diff --git a/libsrc/vic20/joy/vic20-stdjoy.s b/libsrc/vic20/joy/vic20-stdjoy.s
index b3de8766c..22ec0b638 100644
--- a/libsrc/vic20/joy/vic20-stdjoy.s
+++ b/libsrc/vic20/joy/vic20-stdjoy.s
@@ -82,7 +82,7 @@ COUNT:
 
 ; ------------------------------------------------------------------------
 ; READ: Read a particular joystick passed in A.
-; The current implemenation will ignore the joystick number because we do only
+; The current implementation will ignore the joystick number because we do only
 ; have one joystick
 
 READ:   lda     #$7F            ; mask for VIA2 JOYBIT: sw3
diff --git a/libsrc/vic20/sysuname.s b/libsrc/vic20/sysuname.s
index 18d5db9a9..43ee37896 100644
--- a/libsrc/vic20/sysuname.s
+++ b/libsrc/vic20/sysuname.s
@@ -23,13 +23,13 @@ utsdata:
         .asciiz         ""
 
         ; release
-        .byte           ((.VERSION >> 8) & $0F) + '0'
+        .byte           .string (>.version)
         .byte           '.'
-        .byte           ((.VERSION >> 4) & $0F) + '0'
+        .byte           .string (<.version)
         .byte           $00
 
         ; version
-        .byte           (.VERSION & $0F) + '0'
+        .byte           '0'     ; unused
         .byte           $00
 
         ; machine
diff --git a/libsrc/zlib/crc32.s b/libsrc/zlib/crc32.s
index 41b5fe9db..f80b1f437 100644
--- a/libsrc/zlib/crc32.s
+++ b/libsrc/zlib/crc32.s
@@ -1,6 +1,7 @@
 ;
 ; 2001-11-14, Piotr Fusik
 ; 2018-05-20, Christian Kruger
+; 2025-05-14, Piotr Fusik
 ;
 ; unsigned long __fastcall__ crc32 (unsigned long crc,
 ;                                   const unsigned char* buf,
@@ -9,7 +10,7 @@
 
         .export _crc32
 
-        .import         compleax, incsp2, incsp4, popptr1, popeax
+        .import         compleax, incsp4, popptr1, popeax
         .importzp       sreg, ptr1, ptr2, tmp1, tmp2
 
 POLYNOMIAL      =       $EDB88320
@@ -58,15 +59,12 @@ make_table:
         inx
         bne     @L1
         inc     table_initialised
-RET:
         rts
 
 _crc32:
-; ptr2 = (len & 0xff) == 0 ? len : len + 0x100;
-        tay
-        beq     @L1
+; ptr2 = len + 0x100
         inx
-@L1:    sta     ptr2
+        sta     ptr2
         stx     ptr2+1
 ; ptr1 = buf
         jsr     popptr1
@@ -78,20 +76,15 @@ _crc32:
         bne     @dont_make
         jsr     make_table
 @dont_make:
-; eax = crc
-        jsr     popeax
-; if (len == 0) return crc;
-        ldy     ptr2
-        bne     @L2
-        ldy     ptr2+1
-        beq     RET
-@L2:
 ; eax = ~crc
+        jsr     popeax
         jsr     compleax
         stx     tmp2
         ldy     #0
+@L1:    cpy     ptr2
+        beq     @low_end
 ; crc = (crc >> 8) ^ table[(crc & 0xff) ^ *p++];
-@L3:    eor     (ptr1),y
+@L2:    eor     (ptr1),y
         tax
         lda     table_0,x
         eor     tmp2
@@ -106,12 +99,12 @@ _crc32:
         sta     sreg+1
         lda     tmp1
         iny
-        bne     @L4
+        bne     @L1
         inc     ptr1+1
-@L4:    dec     ptr2
-        bne     @L3
+        jmp     @L1
+@low_end:
         dec     ptr2+1
-        bne     @L3
+        bne     @L2
         ldx     tmp2
         jmp     compleax
 
diff --git a/libsrc/zlib/inflatemem.s b/libsrc/zlib/inflatemem.s
index 80c19f223..2f2a1b295 100644
--- a/libsrc/zlib/inflatemem.s
+++ b/libsrc/zlib/inflatemem.s
@@ -12,7 +12,7 @@
         .export         _inflatemem
 
         .import         incsp2
-        .importzp       sp, sreg, ptr1, ptr2, ptr3, ptr4
+        .importzp       c_sp, sreg, ptr1, ptr2, ptr3, ptr4
 
 ; --------------------------------------------------------------------------
 ;
@@ -79,10 +79,10 @@ _inflatemem:
         stx     inputPointer+1
 ; outputPointer = dest
         ldy     #1
-        lda     (sp),y
+        lda     (c_sp),y
         sta     outputPointer+1
         dey
-        lda     (sp),y
+        lda     (c_sp),y
         sta     outputPointer
 
 ;       ldy     #0
@@ -129,11 +129,11 @@ inflate_nextBlock:
         lda     outputPointer
 ;       ldy     #0
 ;       sec
-        sbc     (sp),y
+        sbc     (c_sp),y
         iny
         pha
         lda     outputPointer+1
-        sbc     (sp),y
+        sbc     (c_sp),y
         tax
         pla
 ; pop dest
diff --git a/samples/Makefile b/samples/Makefile
index 0e5292306..3c7c3518a 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 #
 # Makefile for cc65 samples
 #
@@ -41,6 +47,16 @@ else
   LD := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+endif
+
 ifneq ($(filter disk samples.%,$(MAKECMDGOALS)),)
   ifdef CC65_HOME
     TARGET_PATH = $(CC65_HOME)/target
@@ -78,10 +94,12 @@ ifneq ($(filter disk samples.%,$(MAKECMDGOALS)),)
   EMD := $(wildcard $(TARGET_PATH)/$(SYS)/drv/emd/*)
   MOU := $(wildcard $(TARGET_PATH)/$(SYS)/drv/mou/*)
   TGI := $(wildcard $(TARGET_PATH)/$(SYS)/drv/tgi/*)
+  JOY := $(wildcard $(TARGET_PATH)/$(SYS)/drv/joy/*)
 
   EMD := $(addprefix $(SUBST_TARGET_PATH)/$(SYS)/drv/emd/,$(notdir $(filter %.emd,$(EMD))))
   MOU := $(addprefix $(SUBST_TARGET_PATH)/$(SYS)/drv/mou/,$(notdir $(filter %.mou,$(MOU))))
   TGI := $(addprefix $(SUBST_TARGET_PATH)/$(SYS)/drv/tgi/,$(notdir $(filter %.tgi,$(TGI))))
+  JOY := $(addprefix $(SUBST_TARGET_PATH)/$(SYS)/drv/joy/,$(notdir $(filter %.joy,$(JOY))))
 
   # This one comes with the VICE emulator.
   # See http://vice-emu.sourceforge.net/
@@ -99,6 +117,9 @@ DISK_apple2    = samples.dsk
 DISK_apple2enh = samples.dsk
 DISK_atari     = samples.atr
 DISK_atarixl   = samples.atr
+DISK_plus4     = samples.d64
+DISK_c65       = samples.d81
+DISK_mega65    = samples.d81
 
 # --------------------------------------------------------------------------
 # System-dependent settings
@@ -145,8 +166,13 @@ LDFLAGS_tgidemo_atarixl    = --start-addr 0x4000
 
 .o:
 ifeq ($(SYS),vic20)
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -C vic20-32k.cfg -m $@.map $^ $(SYS).lib
+else ifeq ($(SYS),plus4)
+	$(if $(QUIET),echo $(SYS):$@)
+	$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -C plus4-hires.cfg -m $@.map $^ $(SYS).lib
 else
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -t $(SYS) -m $@.map $^ $(SYS).lib
 endif
 
@@ -158,6 +184,11 @@ DIRLIST = tutorial geos atari2600 atari5200 apple2 gamate lynx supervision sym1
 
 # --------------------------------------------------------------------------
 # Lists of executables
+EXELIST_agat =     \
+        ascii      \
+        checkversion \
+        hello      \
+        sieve
 
 EXELIST_apple2 =   \
         ascii      \
@@ -166,6 +197,7 @@ EXELIST_apple2 =   \
         enumdevdir \
         gunzip65   \
         hello      \
+        joydemo    \
         mandelbrot \
         mousedemo  \
         multdemo   \
@@ -199,10 +231,14 @@ EXELIST_atari2600 = \
 EXELIST_atari5200 = \
         notavailable
 
+EXELIST_atari7800 = \
+        notavailable
+
 EXELIST_atmos =    \
         ascii      \
         checkversion \
         hello      \
+        joydemo    \
         mandelbrot \
         sieve      \
         terminal   \
@@ -217,6 +253,7 @@ EXELIST_c64 =      \
         enumdevdir \
         gunzip65   \
         hello      \
+        joydemo    \
         mandelbrot \
         mousedemo  \
         multdemo   \
@@ -226,12 +263,22 @@ EXELIST_c64 =      \
         tinyshell  \
         tgidemo
 
+EXELIST_c65 = \
+        ascii \
+        checkversion \
+        enumdevdir \
+        hello \
+        joydemo    \
+        sieve \
+        tinyshell
+
 EXELIST_c128 =     \
         ascii      \
         checkversion \
         enumdevdir \
         gunzip65   \
         hello      \
+        joydemo    \
         mandelbrot \
         mousedemo  \
         sieve      \
@@ -244,13 +291,15 @@ EXELIST_c16 =      \
         checkversion \
         enumdevdir \
         tinyshell  \
-        hello
+        hello      \
+        joydemo
 
 EXELIST_cbm510 =   \
         ascii      \
         checkversion \
         gunzip65   \
         hello      \
+        joydemo    \
         mousedemo  \
         terminal   \
         tinyshell  \
@@ -275,6 +324,7 @@ EXELIST_cx16 =     \
         enumdevdir \
         gunzip65   \
         hello      \
+        joydemo    \
         mandelbrot \
         mousedemo  \
         sieve      \
@@ -285,9 +335,7 @@ EXELIST_gamate =   \
         hello
 
 EXELIST_geos-cbm = \
-        ascii      \
-        checkversion \
-        diodemo
+        ascii
 
 EXELIST_geos-apple = \
         ascii
@@ -298,20 +346,32 @@ EXELIST_lunix = \
 EXELIST_lynx = \
         notavailable
 
+EXELIST_mega65 = \
+        ascii \
+        checkversion \
+        enumdevdir \
+        hello \
+        joydemo    \
+        sieve \
+        tinyshell
+
 EXELIST_nes = \
-        hello
+        hello      \
+        joydemo
 
 EXELIST_osic1p = \
         notavailable
 
 EXELIST_pce = \
-        hello
+        hello      \
+        joydemo
 
 EXELIST_pet =      \
         ascii      \
         checkversion \
         enumdevdir \
         hello      \
+        joydemo    \
         tinyshell  \
         sieve
 
@@ -321,9 +381,12 @@ EXELIST_plus4 =    \
         enumdevdir \
         gunzip65   \
         hello      \
+        joydemo    \
+        mandelbrot \
         terminal   \
         tinyshell  \
-        sieve
+        sieve      \
+        tgidemo
 
 EXELIST_sim6502 =  \
         checkversion \
@@ -331,6 +394,9 @@ EXELIST_sim6502 =  \
 
 EXELIST_sim65c02 = $(EXELIST_sim6502)
 
+EXELIST_rp6502 = \
+        notavailable
+
 EXELIST_supervision = \
         notavailable
 
@@ -345,6 +411,7 @@ EXELIST_telestrat = \
         checkversion \
         gunzip65    \
         hello       \
+        joydemo    \
         mandelbrot  \
         sieve       \
         tgidemo
@@ -354,6 +421,7 @@ EXELIST_vic20 =    \
         checkversion \
         enumdevdir \
         hello      \
+        joydemo    \
         mandelbrot \
         sieve      \
         tgidemo
@@ -367,7 +435,7 @@ endif
 
 define SUBDIR_recipe
 
-@+$(MAKE) -C $(dir) --no-print-directory $@
+@+$(MAKE) -C $(dir) $(PD) $@ $(PQ)
 
 endef # SUBDIR_recipe
 
@@ -390,30 +458,37 @@ all:
 # --------------------------------------------------------------------------
 # List of every supported platform
 TARGETS :=     \
+  agat         \
   apple2       \
   apple2enh    \
   atari        \
   atarixl      \
   atari2600    \
   atari5200    \
+  atari7800    \
   atmos        \
   bbc          \
   c128         \
   c16          \
   c64          \
+  c65          \
   cbm510       \
   cbm610       \
   creativision \
   cx16         \
   gamate       \
+  geos-apple   \
+  geos-cbm     \
   kim1         \
   lunix        \
   lynx         \
+  mega65       \
   nes          \
   osic1p       \
   pce          \
   pet          \
   plus4        \
+  rp6502       \
   sim6502      \
   sim65c02     \
   supervision  \
@@ -421,19 +496,27 @@ TARGETS :=     \
   telestrat    \
   vic20
 
+
 # --------------------------------------------------------------------------
 # Rule to make the binaries for every platform
 
+define TARGETDIR_recipe
+
+@+$(MAKE) -C $(dir) $(PD) $(PQ)
+
+endef # TARGETDIR_recipe
+
 define TARGET_recipe
 
 @echo making samples for: $(T)
-@$(MAKE) -j2 SYS:=$(T)
-@$(MAKE) --no-print-directory clean SYS:=$(T)
+@$(MAKE) -j2 SYS:=$(T) $(PQ)
+@$(MAKE) $(PD) clean SYS:=$(T) $(PQ)
 
 endef # TARGET_recipe
 
 platforms:
 	$(foreach T,$(TARGETS),$(TARGET_recipe))
+	$(foreach dir,$(DIRLIST),$(TARGETDIR_recipe))
 
 # --------------------------------------------------------------------------
 # Overlay rules. Overlays need special ld65 configuration files.  Also, the
@@ -445,7 +528,15 @@ multdemo: multidemo.o
 ovrldemo: overlaydemo.o
 	$(LD) $(LDFLAGS) -o $@ -C $(SYS)-overlay.cfg -m $@.map $^ $(SYS).lib
 
-OVERLAYLIST := $(foreach I,1 2 3,multdemo.$I ovrldemo.$I)
+OVERLAYLIST :=
+
+ifneq ($(filter ovrldemo,$(EXELIST_$(SYS))),)
+OVERLAYLIST += $(foreach I,1 2 3,ovrldemo.$I)
+endif
+
+ifneq ($(filter multdemo,$(EXELIST_$(SYS))),)
+OVERLAYLIST += $(foreach I,1 2 3,multdemo.$I)
+endif
 
 # --------------------------------------------------------------------------
 # TGI programs on the VIC-20 need a special ld65 configuration file.
@@ -498,7 +589,13 @@ samples.d64: samples
 	@$(C1541) -format "samples,00" d64 $@ >$(NULLDEV)
 	$(foreach file,$(EXELIST_$(SYS)),$(D64_WRITE_PRG_recipe))
 	$(foreach file,$(OVERLAYLIST),$(D64_WRITE_PRG_recipe))
-	$(foreach file,$(EMD) $(MOU) $(TGI),$(D64_WRITE_SEQ_recipe))
+	$(foreach file,$(EMD) $(MOU) $(JOY) $(TGI),$(D64_WRITE_SEQ_recipe))
+
+samples.d81: samples
+	@$(C1541) -format "samples,00" d81 $@ >$(NULLDEV)
+	$(foreach file,$(EXELIST_$(SYS)),$(D64_WRITE_PRG_recipe))
+	$(foreach file,$(OVERLAYLIST),$(D64_WRITE_PRG_recipe))
+	$(foreach file,$(EMD) $(MOU) $(JOY) $(TGI),$(D64_WRITE_SEQ_recipe))
 
 # --------------------------------------------------------------------------
 # Rule to make an Apple II disk with all samples. Needs the AppleCommander
@@ -523,7 +620,7 @@ samples.dsk: samples
 	cp prodos.dsk $@
 	$(foreach file,$(EXELIST_$(SYS)),$(DSK_WRITE_BIN_recipe))
 	$(foreach file,$(OVERLAYLIST),$(DSK_WRITE_REL_recipe))
-	$(foreach file,$(EMD) $(MOU) $(TGI),$(DSK_WRITE_REL_recipe))
+	$(foreach file,$(EMD) $(MOU) $(JOY) $(TGI),$(DSK_WRITE_REL_recipe))
 
 # --------------------------------------------------------------------------
 # Rule to make an Atari disk with all samples. Needs the dir2atr program
@@ -542,7 +639,7 @@ samples.atr: samples
 	cp "dup.sys" atr/dup.sys
 	@$(foreach file,$(EXELIST_$(SYS)),$(ATR_WRITE_recipe))
 	@$(foreach file,$(OVERLAYLIST),$(ATR_WRITE_recipe))
-	@$(foreach file,$(EMD) $(MOU) $(TGI),$(ATR_WRITE_recipe))
+	@$(foreach file,$(EMD) $(MOU) $(JOY) $(TGI),$(ATR_WRITE_recipe))
 	$(DIR2ATR) -d -b MyDos4534 3200 $@ atr
 	@$(RMDIR) atr
 
@@ -562,6 +659,11 @@ install:
 	$(INSTALL) -d $(DESTDIR)$(samplesdir)/cbm
 	$(INSTALL) -d $(DESTDIR)$(samplesdir)/gamate
 	$(INSTALL) -d $(DESTDIR)$(samplesdir)/supervision
+	$(INSTALL) -d $(DESTDIR)$(samplesdir)/disasm
+	$(INSTALL) -d $(DESTDIR)$(samplesdir)/kim1
+	$(INSTALL) -d $(DESTDIR)$(samplesdir)/lynx
+	$(INSTALL) -d $(DESTDIR)$(samplesdir)/sim65
+	$(INSTALL) -d $(DESTDIR)$(samplesdir)/sym1
 	$(INSTALL) -m0644 *.* $(DESTDIR)$(samplesdir)
 	$(INSTALL) -m0644 readme.txt $(DESTDIR)$(samplesdir)
 	$(INSTALL) -m0644 Makefile $(DESTDIR)$(samplesdir)
@@ -573,6 +675,11 @@ install:
 	$(INSTALL) -m0644 cbm/*.* $(DESTDIR)$(samplesdir)/cbm
 	$(INSTALL) -m0644 gamate/*.* $(DESTDIR)$(samplesdir)/gamate
 	$(INSTALL) -m0644 supervision/*.* $(DESTDIR)$(samplesdir)/supervision
+	$(INSTALL) -m0644 disasm/*.* $(DESTDIR)$(samplesdir)/disasm
+	$(INSTALL) -m0644 kim1/*.* $(DESTDIR)$(samplesdir)/kim1
+	$(INSTALL) -m0644 lynx/*.* $(DESTDIR)$(samplesdir)/lynx
+	$(INSTALL) -m0644 sim65/*.* $(DESTDIR)$(samplesdir)/sim65
+	$(INSTALL) -m0644 sym1/*.* $(DESTDIR)$(samplesdir)/sym1
 
 # --------------------------------------------------------------------------
 # Packaging rules
diff --git a/samples/apple2/Makefile b/samples/apple2/Makefile
index 55e84aed6..1f39296de 100644
--- a/samples/apple2/Makefile
+++ b/samples/apple2/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -34,6 +40,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_apple2 = \
         hgrshow \
         hgrtest \
@@ -57,6 +71,7 @@ endif
 disk: hgr.dsk dhgr.dsk
 
 hgr.dsk: hgrshow hgrtest
+	$(if $(QUIET),echo $(SYS):$@)
 	cp prodos.dsk $@
 	java -jar $(AC) -as $@ hgrshow <hgrshow
 	java -jar $(AC) -as $@ hgrtest <hgrtest
@@ -69,12 +84,15 @@ hgr.dsk: hgrshow hgrtest
 	java -jar $(AC) -p  $@ winston.hgr    bin 0x2000 <winston.hgr
 
 hgrshow: hgrshow.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -Oirs -t apple2 --start-addr 0x4000 -m hgrshow.map $^
 
 hgrtest: hgrtest.c werner.s
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -Oirs -t apple2 -C apple2-hgr.cfg -m hgrtest.map $^
 
 dhgr.dsk: dhgrshow
+	$(if $(QUIET),echo $(SYS):$@)
 	cp prodos.dsk $@
 	java -jar $(AC) -as $@ dhgrshow <dhgrshow
 	java -jar $(AC) -p  $@ catface.dhgr  bin 0x2000 <catface.dhgr
@@ -85,6 +103,7 @@ dhgr.dsk: dhgrshow
 	java -jar $(AC) -p  $@ venice.dhgr   bin 0x2000 <venice.dhgr
 
 dhgrshow: dhgrshow.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -Oirs -t apple2enh --start-addr 0x4000 -m dhgrshow.map $^
 
 clean:
diff --git a/samples/atari2600/Makefile b/samples/atari2600/Makefile
index bd2ebc41a..1573425e8 100644
--- a/samples/atari2600/Makefile
+++ b/samples/atari2600/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -33,6 +39,14 @@ else
   SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_atari2600 = \
         hello
 
@@ -52,6 +66,7 @@ else
 endif
 
 hello: hello.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o hello -m hello.map hello.c
 	
 clean:
diff --git a/samples/atari5200/Makefile b/samples/atari5200/Makefile
index 2fbda11d9..4ef0b07e4 100644
--- a/samples/atari5200/Makefile
+++ b/samples/atari5200/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,6 +37,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_atari5200 = \
         hello
 
@@ -50,6 +64,7 @@ else
 endif
 
 hello: hello.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari5200 -o hello hello.c
 	
 clean:
diff --git a/samples/cbm/Makefile b/samples/cbm/Makefile
index 03387a061..e76ea1769 100644
--- a/samples/cbm/Makefile
+++ b/samples/cbm/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -33,6 +39,14 @@ else
   SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 ifneq ($(filter disk samples.%,$(MAKECMDGOALS)),)
   ifdef CC65_HOME
     TARGET_PATH = $(CC65_HOME)/target
@@ -80,17 +94,19 @@ ifneq ($(filter disk samples.%,$(MAKECMDGOALS)),)
   C1541 ?= c1541
 endif
 
-DISK_c64 = samples.d64
+DISK_$(SYS) = samples.d64
 
 EXELIST_c64 = \
         fire \
         plasma \
-        nachtm
+        nachtm \
+        hello
 
 EXELIST_c128 = \
         fire \
         plasma \
-        nachtm
+        nachtm \
+        hello
 
 EXELIST_cbm510 = \
         fire \
@@ -101,16 +117,17 @@ EXELIST_cbm610 = \
         nachtm
 
 EXELIST_plus4 = \
-        plasma
+        plasma \
+        hello
 
 EXELIST_c16 = \
-        notavailable
+        hello
 
 EXELIST_pet = \
         notavailable
 
 EXELIST_vic20 = \
-        notavailable
+        hello
 
 ifneq ($(EXELIST_$(SYS)),)
 samples: $(EXELIST_$(SYS))
@@ -130,11 +147,24 @@ else
 endif
 
 fire: fire.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o fire -m fire.map fire.c
 plasma: plasma.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o plasma -m plasma.map plasma.c
 nachtm: nachtm.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o nachtm -m nachtm.map nachtm.c
+hello: hello-asm.s
+	$(if $(QUIET),echo $(SYS):$@)
+        # Use separate assembler ...
+	$(AS) -t $(SYS) hello-asm.s
+        # ... and linker commands ...
+	$(LD) -C $(SYS)-asm.cfg -o hello -m hello-asm.map -u __EXEHDR__ hello-asm.o $(SYS).lib
+	@$(DEL) hello-asm.o 2>$(NULLDEV)
+        # ... or compile & link utility
+#	$(CL) -C $(SYS)-asm.cfg -o hello -m hello-asm.map -u __EXEHDR__ hello-asm.s
+
 
 # --------------------------------------------------------------------------
 # Rule to make a CBM disk with all samples. Needs the c1541 program that comes
@@ -153,6 +183,7 @@ $(C1541) -attach $@ -write "$(subst ?,$(SPACE),$(file))" $(notdir $(file)),s >$(
 endef # D64_WRITE_SEQ_recipe
 
 samples.d64: samples
+	$(if $(QUIET),echo $(SYS):$@)
 	@$(C1541) -format "samples,00" d64 $@ >$(NULLDEV)
 	$(foreach file,$(EXELIST_$(SYS)),$(D64_WRITE_PRG_recipe))
 #	$(foreach file,$(OVERLAYLIST),$(D64_WRITE_PRG_recipe))
diff --git a/samples/cbm/fire.c b/samples/cbm/fire.c
index 40eff0707..1eae086da 100644
--- a/samples/cbm/fire.c
+++ b/samples/cbm/fire.c
@@ -56,7 +56,7 @@
 
 
 /* Use static local variables for speed */
-#pragma static-locals (1);
+#pragma static-locals (1)
 
 
 
diff --git a/samples/cbm/hello-asm.s b/samples/cbm/hello-asm.s
new file mode 100644
index 000000000..689dcc06b
--- /dev/null
+++ b/samples/cbm/hello-asm.s
@@ -0,0 +1,15 @@
+;
+; Sample assembly program for Commodore machines
+;
+
+        .include "cbm_kernal.inc"
+
+        ldx     #$00
+:       lda     text,x
+        beq     out
+        jsr     CHROUT
+        inx
+        bne     :-
+out:    rts
+
+text:   .asciiz "hello world!"
diff --git a/samples/cbm/plasma.c b/samples/cbm/plasma.c
index f48d6dc77..5c0b901f7 100644
--- a/samples/cbm/plasma.c
+++ b/samples/cbm/plasma.c
@@ -51,7 +51,7 @@
 
 
 /* Use static local variables for speed */
-#pragma static-locals (1);
+#pragma static-locals (1)
 
 
 static const unsigned char sinustable[0x100] = {
diff --git a/samples/checkversion.c b/samples/checkversion.c
index 1d3494a87..d55a72935 100644
--- a/samples/checkversion.c
+++ b/samples/checkversion.c
@@ -4,17 +4,18 @@
  * macro was fixed some time after 2.19 to (VER_MAJOR * 0x100) + VER_MINOR.
  *
  * The following strategy can be used to still compare for less or greater versions,
- * should this really be necessary or wanted - it is not recommended afterall.
+ * should this really be necessary or wanted - it is not recommended after all.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/utsname.h>
 
-#if ((__CC65__ & 0xff00) > 3) || ((__CC65__ & 0x000f) > 0)
+#if ((__CC65__ >> 8) > 3) || ((__CC65__ & 0x000f) > 0)
 /* compiler version is 2.19-git or higher */
 # define VER_MAJOR       ((__CC65__ >> 8) & 0xff)
 # define VER_MINOR       (__CC65__ & 0xff)
-#elif ((__CC65__ & 0xff00) == 3)
+#elif ((__CC65__ >> 8) == 3)
 /* broken values in version 2.16 - 2.19-git before the bug was fixed */
 # define VER_MAJOR       2
 # define VER_MINOR       (((__CC65__ >> 4) & 0x0f) + 16)
@@ -29,12 +30,25 @@
 
 int main(void)
 {
+#if !defined(__SIM6502__) && !defined(__SIM65C02__) && !defined(__AGAT__)
+    struct utsname buf;
+    uname (&buf);
+
+    printf("utsname.sysname: %s\n", buf.sysname);
+    printf("utsname.nodename: %s\n", buf.nodename);
+    printf("utsname.release: %s\n", buf.release);
+    printf("utsname.version: %s\n", buf.version);
+    printf("utsname.machine: %s\n", buf.machine);
+#endif
+
     printf("__CC65__ defined as %04x\n", __CC65__);
     printf("compiler version is %u.%u\n", VER_MAJOR, VER_MINOR);
+#pragma warn (const-comparison, push, off)
     if (__CC65__ == VERSION) {
         printf("__CC65__ is defined correctly as (VER_MAJOR * 0x100) + VER_MINOR\n");
         return EXIT_SUCCESS;
     }
+#pragma warn (const-comparison, pop)
     printf("__CC65__ is incorrectly defined as (VER_MAJOR * 0x100) + (VER_MINOR * 0x10)\n");
     return EXIT_FAILURE;
 }
diff --git a/samples/diodemo.c b/samples/diodemo.c
index 3e52f2fa9..46656246d 100644
--- a/samples/diodemo.c
+++ b/samples/diodemo.c
@@ -30,6 +30,7 @@
 
 
 
+#define DYN_BOX_DRAW
 #include <stddef.h>
 #include <stdlib.h>
 #include <limits.h>
diff --git a/samples/disasm/Makefile b/samples/disasm/Makefile
index f1d93f5da..df883fa7c 100644
--- a/samples/disasm/Makefile
+++ b/samples/disasm/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Sample makefile using a preprocessor against info files
 # and the --sync-lines option
 
@@ -31,6 +37,14 @@ else
   DA := $(if $(wildcard ../../bin/da65*),../../bin/da65,da65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 CPP = cpp
 #CPPFLAGS = -DTEST_ERROR
 
@@ -50,6 +64,7 @@ $(DAIS): fixed.da
 	$(DA) --sync-lines -o $@ -i $< image.bin
 
 image.bin: image.s image.cfg
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t none -C image.cfg -o image.bin image.s
 
 clean:
diff --git a/samples/gamate/Makefile b/samples/gamate/Makefile
index cfb8505cc..4f20f047a 100644
--- a/samples/gamate/Makefile
+++ b/samples/gamate/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,6 +37,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_gamate = \
         nachtm.bin
 
@@ -50,6 +64,7 @@ else
 endif
 
 nachtm.bin: nachtm.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -Os -l nachtm.lst -t gamate -o nachtm.bin nachtm.c
 	../../util/gamate/gamate-fixcart nachtm.bin
 
diff --git a/samples/geos/Makefile b/samples/geos/Makefile
index 03f6b8cdc..0ede7e78c 100644
--- a/samples/geos/Makefile
+++ b/samples/geos/Makefile
@@ -1,18 +1,31 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
 SYS ?= geos-cbm
 
+# Comes with the VICE emulator, see http://vice-emu.sourceforge.net/
+C1541 ?= c1541
+
 # If SYS was given on the commandline, redirect "c64" to "geos-cbm" and
 # "apple2enh" to "geos-apple"
 ifeq ($(origin SYS),command line)
   ifeq ($(SYS),c64)
     override SYS = geos-cbm
-    $(info GEOS: c64 -> geos-cbm)
+    ifneq ($(SILENT),s)
+      $(info GEOS: c64 -> geos-cbm)
+    endif
   endif
   ifeq ($(SYS),apple2enh)
     override SYS = geos-apple
-    $(info GEOS: apple2enh -> geos-apple)
+    ifneq ($(SILENT),s)
+      $(info GEOS: apple2enh -> geos-apple)
+    endif
   endif
 endif
 
@@ -46,6 +59,14 @@ else
   SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 DIRLIST = grc
 
 define SUBDIR_recipe
@@ -82,11 +103,11 @@ samples: $(EXELIST_$(SYS))
 	$(foreach dir,$(DIRLIST),$(SUBDIR_recipe))
 
 define samples-geos
-c1541 -attach $(0).d64 -geoswrite $(1);
+$(C1541) -attach $(0).d64 -geoswrite $(1);
 endef
 
 samples-geos: $(EXELIST_$(SYS))
-	c1541 -format "$@,01" d64 $@.d64
+	$(C1541) -format "$@,01" d64 $@.d64
 	$(foreach tool,$(EXELIST_$(SYS)),$(call samples-geos,$(tool)))
 else
 samples:
@@ -102,39 +123,50 @@ bitmap.c: logo.pcx
 	$(SP) -r logo.pcx -c geos-bitmap -w bitmap.c,ident=bitmap
 
 bitmap-demo.cvt: bitmap.c bitmap-demores.grc bitmap-demo.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m bitmap-demo.map bitmap-demores.grc bitmap-demo.c
-	
+
 filesel.cvt: fileselres.grc filesel.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m filesel.map fileselres.grc filesel.c
 
 geosconio.cvt: geosconiores.grc geosconio.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m geosconio.map geosconiores.grc geosconio.c
 
 geosver.cvt: geosverres.grc geosver.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m geosver.map geosverres.grc geosver.c
 
 getid.cvt: getidres.grc getid.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m getid.map getidres.grc getid.c
 
 hello1.cvt: hello1res.grc hello1.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m hello1.map hello1res.grc hello1.c
 
 hello2.cvt: hello2res.grc hello2.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m hello2.map hello2res.grc hello2.c
 
 overlay-demo.cvt: overlay-demores.grc overlay-demo.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m overlay-demo.map overlay-demores.grc overlay-demo.c
 
 rmvprot.cvt: rmvprotres.grc rmvprot.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m rmvprot.map rmvprotres.grc rmvprot.c
 
 vector-demo.cvt: vector-demores.grc vector-demo.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m vector-demo.map vector-demores.grc vector-demo.c
 
 yesno.cvt: yesnores.grc yesno.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o $@ -m yesno.map yesnores.grc yesno.c
 
-	
+
 clean:
 	@$(DEL) overlay-demores.h 2>$(NULLDEV)
 	@$(DEL) bitmap.c 2>$(NULLDEV)
diff --git a/samples/geos/grc/Makefile b/samples/geos/grc/Makefile
index ef30a6e03..101d501e8 100644
--- a/samples/geos/grc/Makefile
+++ b/samples/geos/grc/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -33,6 +39,14 @@ else
   GRC := $(if $(wildcard ../../../bin/grc65*),../../../bin/grc65,grc65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_geos-cbm = \
 	test.s \
 	vlir.cvt
@@ -50,9 +64,11 @@ samples:
 endif
 
 test.s: test.grc
+	$(if $(QUIET),echo $(SYS):$@)
 	$(GRC) -s test.s test.grc
 
 vlir.cvt: vlir.grc vlir0.s vlir1.s vlir2.s
+	$(if $(QUIET),echo $(SYS):$@)
 # using separate calls here for demonstration purposes:
 	$(GRC) -t $(SYS) -s vlir.s vlir.grc
 	$(AS) -t $(SYS) vlir.s
diff --git a/samples/geos/overlay-demo.c b/samples/geos/overlay-demo.c
index 73ab0e3c0..e3e92e6c2 100644
--- a/samples/geos/overlay-demo.c
+++ b/samples/geos/overlay-demo.c
@@ -27,7 +27,7 @@ void show(char *name)
 ** rather place the all the code of certain source files into the overlay by
 ** compiling them with --code-name OVERLAY1.
 */
-#pragma code-name(push, "OVERLAY1");
+#pragma code-name(push, "OVERLAY1")
 
 void foo(void)
 {
@@ -39,27 +39,27 @@ void foo(void)
     show("One");
 }
 
-#pragma code-name(pop);
+#pragma code-name(pop)
 
 
-#pragma code-name(push, "OVERLAY2");
+#pragma code-name(push, "OVERLAY2")
 
 void bar(void)
 {
     show("Two");
 }
 
-#pragma code-name(pop);
+#pragma code-name(pop)
 
 
-#pragma code-name(push, "OVERLAY3");
+#pragma code-name(push, "OVERLAY3")
 
 void foobar (void)
 {
     show("Three");
 }
 
-#pragma code-name(pop);
+#pragma code-name(pop)
 
 
 void main(int /*argc*/, char *argv[])
diff --git a/samples/getsp.s b/samples/getsp.s
index 9f169dc0b..95db689f4 100644
--- a/samples/getsp.s
+++ b/samples/getsp.s
@@ -1,11 +1,11 @@
 
         .export _getsp
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   _getsp
 
-        ldx     sp+1
-        lda     sp
+        ldx     c_sp+1
+        lda     c_sp
         rts
 
 .endproc
diff --git a/samples/hello.c b/samples/hello.c
index 255dccd00..2eac0d8bb 100644
--- a/samples/hello.c
+++ b/samples/hello.c
@@ -7,6 +7,7 @@
 
 
 
+#define DYN_BOX_DRAW
 #include <stdlib.h>
 #include <string.h>
 #include <conio.h>
diff --git a/samples/joydemo.c b/samples/joydemo.c
new file mode 100644
index 000000000..7375f23d3
--- /dev/null
+++ b/samples/joydemo.c
@@ -0,0 +1,96 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <joystick.h>
+
+/* define 0 to link the standard driver statically */
+/* #define DYN_DRV         0 */
+
+#ifndef DYN_DRV
+#  define DYN_DRV       1
+#endif
+
+#define USECONIO
+
+#ifdef USECONIO
+#include <conio.h>
+#define PRINTF  cprintf
+#define CR "\n\r"
+#else
+#define PRINTF  printf
+#define CR "\n"
+#endif
+
+int main (void)
+{
+    unsigned char num_joy;
+    unsigned char raw_value;
+    unsigned char i;
+#if DYN_DRV
+    unsigned char err;
+#endif
+#ifdef USECONIO
+    unsigned char y;
+    clrscr();
+#endif
+    PRINTF("Driver init..." CR);
+
+#if DYN_DRV
+    /* Load and initialize the standard driver driver */
+    if ((err = joy_load_driver (joy_stddrv))) {
+        PRINTF ("Driver load error (code %d)." CR
+                "Warning: This program needs the JOY" CR
+                "driver on disk!" CR, err);
+        exit (EXIT_FAILURE);
+    }
+    PRINTF("Driver loaded OK" CR);
+#else
+    /* Install the standard driver */
+    joy_install (joy_static_stddrv);
+#endif
+
+    num_joy = joy_count();
+
+    PRINTF("Driver reported %d joysticks." CR "waiting for input..." CR, num_joy);
+
+    /* wait for something to happen on any joystick input */
+    {
+        unsigned char wait = 1;
+        while (wait) {
+            for (i = 0; i < num_joy; ++i) {
+                raw_value = joy_read(i);
+                if (raw_value) {
+                    wait = 0;
+                    break;
+                }
+            }
+        }
+    }
+
+    /* read all joysticks and print the raw value(s) */
+#ifdef USECONIO
+    y = wherey();
+#endif
+    while (1) {
+#ifdef USECONIO
+        gotoxy(0, y);
+#endif
+        for (i = 0; i < num_joy; ++i) {
+            raw_value = joy_read(i);
+            PRINTF("%02x ", raw_value);
+        }
+        PRINTF(CR);
+    }
+
+#if DYN_DRV
+    /* Unload the driver */
+    joy_unload ();
+#else
+    /* Uninstall the driver */
+    joy_uninstall ();
+#endif
+
+    /* Done */
+    PRINTF ("Done" CR);
+    return EXIT_SUCCESS;
+}
diff --git a/samples/kim1/Makefile b/samples/kim1/Makefile
index 74c415fdc..eca7d6524 100644
--- a/samples/kim1/Makefile
+++ b/samples/kim1/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,9 +37,20 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
-EXELIST_kim1 = \
-        kimHello.bin \
-        kimSieve.bin
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
+EXELIST_kim1 = 	\
+		kimHello.bin \
+		kimSieve.bin \
+		kimLife.bin \
+		kimTest.bin \
+		kimGFX.bin
 
 ifneq ($(EXELIST_$(SYS)),)
 samples: $(EXELIST_$(SYS))
@@ -50,13 +67,76 @@ else
 	@echo > $(NULLDEV)
 endif
 
+subs.o: subs.asm
+	$(AS) subs.asm -o subs.o
+
+ramfont.o: ramfont.asm
+	$(AS) ramfont.asm -o ramfont.o
+
+kimLife.bin: kimLife.c
+	$(if $(QUIET),echo $(SYS):$@)
+	$(CL) -t kim1 -C kim1-60k.cfg -Oi -o kimLife.bin kimLife.c
+
+kimTest.bin: kimTest.c
+	$(if $(QUIET),echo $(SYS):$@)
+	$(CL) -t kim1 -C kim1-60k.cfg -Oi -o kimTest.bin kimTest.c
+
+kimGFX.bin: kimGFX.c subs.o ramfont.o
+	$(if $(QUIET),echo $(SYS):$@)
+	$(CL) -t kim1 --listing kimGFX.lst -C kim1-mtuE000.cfg -o kimGFX.bin kimGFX.c subs.o ramfont.o -Ln kimgfx.lbl
+
 kimSieve.bin: kimSieve.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t kim1 -C kim1-60k.cfg -O -o kimSieve.bin kimSieve.c
 
 kimHello.bin: kimHello.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t kim1 -O -o kimHello.bin kimHello.c
 
+# To build an intel-format file for the CORSHAM SD card reader
+
+kimLife.hex: kimLife.bin
+	$(if $(QUIET),echo $(SYS):$@)
+	srec_cat kimLife.bin  -binary -offset 0x2000 -o kimLife.hex  -Intel -address-length=2
+
+kimTest.hex: kimTest.bin
+	$(if $(QUIET),echo $(SYS):$@)
+	srec_cat kimTest.bin  -binary -offset 0x2000 -o kimTest.hex  -Intel -address-length=2
+
+kimGFX.hex: kimGFX.bin ramfont.o
+	$(if $(QUIET),echo $(SYS):$@)
+	srec_cat kimGFX.bin  -binary -offset 0x2000 -o kimGFX.hex  -Intel -address-length=2
+
+# To build a paper tape file for uploading to the KIM-1 via terminal
+
+kimLife.ptp: kimLife.bin
+	$(if $(QUIET),echo $(SYS):$@)
+	srec_cat kimLife.bin -binary -offset 0x2000 -o kimLife.ptp -MOS_Technologies
+
+kimGFX.ptp: kimGFX.bin
+	$(if $(QUIET),echo $(SYS):$@)
+	srec_cat kimGFX.bin -binary -offset 0x2000 -o kimGFX.ptp -MOS_Technologies
+
+kimTest.ptp: kimTest.bin
+	$(if $(QUIET),echo $(SYS):$@)
+	srec_cat kimTest.bin -binary -offset 0x2000 -o kimTest.ptp -MOS_Technologies
+
 clean:
 	@$(DEL) kimSieve.bin 2>$(NULLDEV)
 	@$(DEL) kimHello.bin 2>$(NULLDEV)
+	@$(DEL) kimLife.bin  2>$(NULLDEV)
+	@$(DEL) kimLife.ptp  2>$(NULLDEV)
+	@$(DEL) kimLife.hex  2>$(NULLDEV)
+	@$(DEL) kimTest.bin  2>$(NULLDEV)
+	@$(DEL) kimTest.ptp  2>$(NULLDEV)
+	@$(DEL) kimTest.hex  2>$(NULLDEV)
+	@$(DEL) kimGFX.bin   2>$(NULLDEV)
+	@$(DEL) kimGFX.ptp   2>$(NULLDEV)
+	@$(DEL) kimGFX.hex   2>$(NULLDEV)
+	@$(DEL) kimgfx.lbl   2>$(NULLDEV)
+	@$(DEL) kimGFX.lst   2>$(NULLDEV)
+	@$(DEL) subs.o       2>$(NULLDEV)
+	@$(DEL) ramfont.o    2>$(NULLDEV)
+
+
 
diff --git a/samples/kim1/font.rom b/samples/kim1/font.rom
new file mode 100644
index 000000000..e69de29bb
diff --git a/samples/kim1/kimGFX.c b/samples/kim1/kimGFX.c
new file mode 100644
index 000000000..45daafa1e
--- /dev/null
+++ b/samples/kim1/kimGFX.c
@@ -0,0 +1,290 @@
+// --------------------------------------------------------------------------
+// Simple Graphics Test for KIM-1 with MTU Visible Memory Board
+//
+// Assumes the MTU Visible Memory Board mapped at 0xA000 for 8K of video RAM
+//
+// davepl@davepl.com
+// --------------------------------------------------------------------------
+
+#include <stdio.h>                  // For printf
+#include <stdlib.h>                 // For rand, srand
+#include <string.h>                 // For memcpy
+#include <ctype.h>
+
+typedef unsigned char byte;
+
+extern void ClearScreen(void);      // In subs.asm
+extern void ScrollScreen(void);
+extern void DrawCircle(void);
+extern void SetPixel(void);
+extern void ClearPixel(void);
+extern void DrawChar(void);
+extern void Demo(void);
+extern void __fastcall__ Delay(byte loops);
+extern void __fastcall__ DrawLine(byte bSet);
+extern byte __fastcall__ AscToPet(byte in);
+extern byte __fastcall__ PetToAsc(byte in);
+extern byte __fastcall__ ReverseBits(byte in);
+extern void __fastcall__ CharOut(byte asci_char);
+extern byte __fastcall__ getch();
+extern unsigned char font8x8_basic[256][8];
+
+extern int  x1cord;
+extern int  y1cord;
+extern int  x2cord;
+extern int  y2cord;
+extern int  cursorX;
+extern int  cursorY;
+
+// If in zeropage:
+//
+// #pragma zpsym("x1cord")
+// #pragma zpsym("x2cord")
+// #pragma zpsym("y1cord")
+// #pragma zpsym("y2cord")
+
+// Screen memory is placed at A000-BFFF, 320x200 pixels, mapped right to left within each horizontal byte
+
+byte * screen    = (byte *) 0xA000;
+
+// Cursor position
+
+#define SCREEN_WIDTH      320
+#define SCREEN_HEIGHT     200
+#define CHARWIDTH         8
+#define CHARHEIGHT        8
+#define BYTESPERROW       (SCREEN_WIDTH / 8)
+#define BYTESPERCHARROW   (BYTESPERROW * 8)
+#define CHARSPERROW       (SCREEN_WIDTH / CHARWIDTH)
+#define ROWSPERCOLUMN     (SCREEN_HEIGHT / CHARHEIGHT)
+
+// SETPIXEL
+//
+// 0 <= x < 320
+// 0 <= y < 200
+//
+// Draws a pixel on the screen in white or black at pixel pos x, y
+
+void SETPIXEL(int x, int y, byte b)
+{
+   x1cord = x;
+   y1cord = y;
+
+   if (b)
+      SetPixel();
+   else
+      ClearPixel();
+}
+
+// DRAWPIXEL
+//
+// 0 <= x < 320
+// 0 <= y < 200
+//
+// Turns on a screen pixel at pixel pos x,y
+
+void DRAWPIXEL(int x, int y)
+{
+   x1cord = x;
+   y1cord = y;
+   SetPixel();
+}
+
+int c;
+
+void DrawText(char * psz)
+{
+   while (*psz)
+   {
+      while (cursorX >= CHARSPERROW)
+      {
+         cursorX -= CHARSPERROW;
+         cursorY += 1;
+      }
+
+      // If we've gone off the bottom of the screen, we scroll the screen and back up to the last line again
+
+      if (cursorY >= ROWSPERCOLUMN)
+      {
+         cursorY = ROWSPERCOLUMN - 1;
+         ScrollScreen();
+      }
+
+      // If we output a newline we advanced the cursor down one line and reset it to the left
+
+      if (*psz == 0x0A)
+      {
+         cursorX = 0;
+         cursorY++;
+         psz++;
+      }
+      else
+      {
+         c = *psz;
+
+         __asm__ ("ldx %v", cursorX);
+         __asm__ ("ldy %v", cursorY);
+         __asm__ ("lda %v", c);
+         DrawChar();
+         cursorX++;
+         psz++;
+      }
+   }
+}
+
+void DrawTextAt(int x, int y, char * psz)
+{
+   cursorX = x;
+   cursorY = y;
+   DrawText(psz);
+}
+
+// Something like Bresenham's algorithm for drawing a line
+/*
+void DrawLine(int x0, int y0, int x1, int y1, byte val)
+{
+    int dx = abs(x1 - x0), sx = x0 < x1 ? 1 : -1;
+    int dy = abs(y1 - y0), sy = y0 < y1 ? 1 : -1;
+    int err = (dx > dy ? dx : -dy) / 2, e2;
+
+    while (1)
+    {
+        SETPIXEL(x0, y0, val);
+
+        if (x0 == x1 && y0 == y1)
+            break;
+
+        e2 = err;
+
+        if (e2 > -dx)
+        {
+            err -= dy;
+            x0 += sx;
+        }
+        if (e2 < dy)
+        {
+            err += dx;
+            y0 += sy;
+        }
+    }
+}
+*/
+
+// DrawCircle
+//
+// Draw a circle without sin, cos, or floating point!
+
+void DrawCircleC(int x0, int y0, int radius, byte)
+{
+   x1cord = x0;
+   y1cord = y0;
+   y2cord = radius;
+   DrawCircle();
+}
+
+void DrawLineC(int x1, int y1, int x2, int y2, byte bSet)
+{
+   x1cord = x1;
+   y1cord = y1;
+   x2cord = x2;
+   y2cord = y2;
+   DrawLine(bSet);
+}
+
+// MirrorFont
+//
+// RAM font is backwards left-right relative to the way memory is laid out on the KIM-1, so we swap all the
+// bytes in place by reversing the order of the bits in every byte
+
+void MirrorFont()
+{
+   int c;
+   byte * pb = (byte *) font8x8_basic;
+
+   for (c = 0; c < 128 * 8; c++)
+      pb[c] = ReverseBits(pb[c]);
+}
+
+// DrawScreenMoire
+//
+// Draws a moire pattern on the screen without clearing it first
+
+void DrawMoire(int left, int top, int right, int bottom, byte pixel)
+{
+   int x, y;
+
+   for (x = left; x < right; x += 6)
+      DrawLineC(x, top, right - x + left, bottom, pixel);
+
+   for (y = top; y < bottom; y += 6)
+      DrawLineC(left, y, right, bottom - y + top, pixel);
+}
+
+void DrawScreenMoire(int left, int top, int right, int bottom)
+{
+   int x, y;
+
+   DrawLineC(left, top, right, top, 1);
+   DrawLineC(left, bottom, right, bottom, 1);
+   DrawLineC(left, top, left, bottom, 1);
+   DrawLineC(right, top, right, bottom, 1);
+
+   left++; top++; right--; bottom--;
+
+   for (x = left; x < right; x += 6)
+      DrawLineC(x, top, right - x + left, bottom, 1);
+   for (y = top; y < bottom; y += 6)
+      DrawLineC(left, y, right, bottom - y + top, 1);
+   for (x = left; x < right; x += 6)
+      DrawLineC(x, top, right - x + left, bottom, 0);
+   for (y = top; y < bottom; y += 6)
+      DrawLineC(left, y, right, bottom - y + top, 0);
+
+}
+
+int main (void)
+{
+
+   int i;
+   int c = 0;
+
+   Demo();
+
+   CharOut('R');
+   CharOut('E');
+   CharOut('A');
+   CharOut('D');
+   CharOut('Y');
+   CharOut('.');
+   CharOut('\n');
+
+
+   while(1)
+   {
+      c = toupper(getch());
+      if (c != EOF)
+         CharOut(c);
+   }
+
+   // Clear the screen memory
+   while(1)
+   {
+      Demo();
+      DrawScreenMoire(0,30, 319, 199);
+      Delay(10);
+
+      Demo();
+      for (i = 5; i < 80; i+=5)
+      {
+         DrawCircleC(SCREEN_WIDTH/2, SCREEN_HEIGHT/2 + 20, i, 1);
+         DrawCircleC(SCREEN_WIDTH/4, SCREEN_HEIGHT/2 + 20, i, 1);
+         DrawCircleC(SCREEN_WIDTH*3/4, SCREEN_HEIGHT/2 + 20, i, 1);
+      }
+
+      Delay(10);
+
+   }
+
+   printf("Done, exiting...\r\n");
+   return 0;
+}
diff --git a/samples/kim1/kimLife.c b/samples/kim1/kimLife.c
new file mode 100644
index 000000000..fb1696b9e
--- /dev/null
+++ b/samples/kim1/kimLife.c
@@ -0,0 +1,144 @@
+// --------------------------------------------------------------------------
+// Conway's Game of Life for KIM-1
+//
+// Assumes the MTU Visible Memory Board mapped at 0x8000 for 8K of video RAM
+//
+// Dave Plummer on a rainy Thursday
+//
+// davepl@davepl.com
+// --------------------------------------------------------------------------
+
+#include <stdio.h>                  // For printf
+#include <stdlib.h>                 // For rand, srand
+#include <string.h>                 // For memcpy
+
+typedef unsigned char byte;
+
+// World size
+
+#define WIDTH      320
+#define HEIGHT     200
+#define NUMBITS  64000
+#define NUMBYTES  8000
+#define DENSITY     50
+
+// Screen memory is placed at 8000, our world copy at A000, and they use the same layout so
+// that we can memcpy from one to the other without translating
+
+byte * world     = (byte *) 0x8000;
+byte * new_world = (byte *) 0xA000;
+
+// BITARRAY
+//
+// Access individual bits in a block of memory
+
+// Access to the screen bitmap
+
+byte GETBIT(byte *p, int n)
+{
+   return (p[n >> 3] & (1 << (n & 7))) ? 1 : 0;
+}
+
+void SETBIT(byte *p, int n)
+{
+   p[n >> 3] |=  (1 << (n & 7));
+}
+
+void CLRBIT(byte *p, int n)
+{
+   p[n >> 3] &= ~(1 << (n & 7));
+}
+
+void SETPIXEL(byte * p, int x, int y, byte b)
+{
+   if (b)
+      SETBIT(p, y * WIDTH + x);
+   else
+      CLRBIT(p, y * WIDTH + x);
+}
+
+byte GETPIXEL(byte *p, int x, int y)
+{
+   return GETBIT(p, y * WIDTH + x);
+}
+
+// RandomFillWorld
+//
+// Populates the initial world with random cells
+
+void RandomFillWorld()
+{
+   int x, y;
+
+   // I need a better way to see the RNG or it'll be the same game every time!
+   srand(0);
+   for (x = 0; x < WIDTH; x++)
+   {
+      for (y = 0; y < HEIGHT; y++)
+      {
+         byte b = ((rand() % 100) < DENSITY) ? 1 : 0;
+         SETPIXEL(world, x, y, b);
+      }
+   }
+}
+
+// CountNeighbors
+//
+// Count the number of live cells around the given spot, excluding the actual spot specified
+
+int CountNeighbors(int x, int y)
+{
+   int i, j, nx, ny, count = 0;
+
+   for (j = -1; j <= 1; j++)
+   {
+      for (i = -1; i <= 1; i++)
+      {
+         if (i != 0 || j != 0)
+         {
+            nx = (x + i + WIDTH) % WIDTH;
+            ny = (y + j + HEIGHT) % HEIGHT;
+            count += GETPIXEL(world, nx, ny) ? 1 : 0;
+         }
+      }
+   }
+   return count;
+}
+
+// UpdateWorld
+//
+// Applies the rules of Conway's Game of Life to the cells
+
+void UpdateWorld()
+{
+   int x, y;
+
+   for (y = 0; y < HEIGHT; y++)
+   {
+       for (x = 0; x < WIDTH; x++)
+       {
+         int neighbors = CountNeighbors(x, y);
+         if (GETPIXEL(world, x, y))
+            SETPIXEL(new_world, x, y, (neighbors == 2 || neighbors == 3));
+         else
+            SETPIXEL(new_world, x, y, (neighbors == 3));
+       }
+   }
+}
+
+int main (void)
+{
+   printf("\r\nStarting Conway's Game of Life: Randomizing World...\r\n");
+   RandomFillWorld();
+   printf("World Ready, Running!\r\n");
+
+   for (;;)
+   {
+      UpdateWorld();
+      printf("[");
+      memcpy(world, new_world, NUMBYTES);
+      printf("]");
+   }
+
+   return 0;
+}
diff --git a/samples/kim1/kimTest.c b/samples/kim1/kimTest.c
new file mode 100644
index 000000000..273aeb584
--- /dev/null
+++ b/samples/kim1/kimTest.c
@@ -0,0 +1,262 @@
+// --------------------------------------------------------------------------
+// Diagnostics Test for KIM-1
+//
+// Dave Plummer
+// davepl@davepl.com
+//
+// Memory test examples by Michael Barr
+//
+// --------------------------------------------------------------------------
+
+#include <stdio.h>                  // For printf
+#include <stdlib.h>                 // For rand, srand
+#include <string.h>                 // For memcpy
+
+typedef unsigned char byte;
+
+// RepeatChar
+//
+// Outputs a given character N times
+
+void RepeatChar(char c, size_t count)
+{
+   while (count--)
+      putc(c, stdout);
+}
+
+/**********************************************************************
+ *
+ * Function:    memTestDataBus()
+ *
+ * Description: Test the data bus wiring in a memory region by
+ *              performing a walking 1's test at a fixed address
+ *              within that region.  The address (and hence the
+ *              memory region) is selected by the caller.
+ *
+ * Returns:     0 if the test succeeds.
+ *              A non-zero result is the first pattern that failed.
+ *
+ **********************************************************************/
+
+byte memTestDataBus(volatile byte * address)
+{
+    byte pattern;
+
+    // Perform a walking 1's test at the given address.
+
+    for (pattern = 1; pattern != 0; pattern <<= 1)
+    {
+        // Write the test pattern.
+        *address = pattern;
+
+        // Read it back and check it
+        if (*address != pattern)
+        {
+            printf("\r\nmemTestDataBus: FAILED at %04x with pattern %02x\r\n", address, pattern);
+            return (pattern);
+        }
+    }
+
+    return (0);
+}
+
+/**********************************************************************
+ *
+ * Function:    memTestAddressBus()
+ *
+ * Description: Test the address bus wiring in a memory region by
+ *              performing a walking 1's test on the relevant bits
+ *              of the address and checking for aliasing. This test
+ *              will find single-bit address failures such as stuck
+ *              -high, stuck-low, and shorted pins.  The base address
+ *              and size of the region are selected by the caller.
+ *
+ * Notes:       For best results, the selected base address should
+ *              have enough LSB 0's to guarantee single address bit
+ *              changes.  For example, to test a 64-Kbyte region,
+ *              select a base address on a 64-Kbyte boundary.  Also,
+ *              select the region size as a power-of-two--if at all
+ *              possible.
+ *
+ * Returns:     NULL if the test succeeds.
+ *              A non-zero result is the first address at which an
+ *              aliasing problem was uncovered.  By examining the
+ *              contents of memory, it may be possible to gather
+ *              additional information about the problem.
+ *
+ **********************************************************************/
+
+byte * memTestAddressBus(volatile byte * baseAddress, unsigned long nBytes)
+{
+    unsigned long addressMask = (nBytes/sizeof(byte) - 1);
+    unsigned long offset;
+    unsigned long testOffset;
+
+    byte pattern     = (byte) 0xAAAAAAAA;
+    byte antipattern = (byte) 0x55555555;
+
+
+    //Write the default pattern at each of the power-of-two offsets.
+
+    for (offset = 1; (offset & addressMask) != 0; offset <<= 1)
+    {
+        baseAddress[offset] = pattern;
+    }
+
+    // Check for address bits stuck high.
+
+    testOffset = 0;
+    baseAddress[testOffset] = antipattern;
+
+    for (offset = 1; (offset & addressMask) != 0; offset <<= 1)
+    {
+        if (baseAddress[offset] != pattern)
+        {
+            printf("\r\nmemTestAddressBus: FAILED at %04x with pattern %02x\r\n", baseAddress+offset, pattern);
+            return ((byte *) &baseAddress[offset]);
+        }
+        if (offset % 1024 == 0)
+         printf(".");
+    }
+
+    baseAddress[testOffset] = pattern;
+
+
+    // Check for address bits stuck low or shorted.
+
+    for (testOffset = 1; (testOffset & addressMask) != 0; testOffset <<= 1)
+    {
+        baseAddress[testOffset] = antipattern;
+
+        if (baseAddress[0] != pattern)
+        {
+            return ((byte *) &baseAddress[testOffset]);
+        }
+
+        for (offset = 1; (offset & addressMask) != 0; offset <<= 1)
+        {
+            if ((baseAddress[offset] != pattern) && (offset != testOffset))
+            {
+                printf("\r\nmemTestAddressBus: FAILED at %04x with pattern %02x\r\n", baseAddress+offset, pattern);
+                return ((byte *) &baseAddress[testOffset]);
+            }
+        }
+        baseAddress[testOffset] = pattern;
+    }
+    return (NULL);
+}
+
+/**********************************************************************
+ *
+ * Function:    memTestDevice()
+ *
+ * Description: Test the integrity of a physical memory device by
+ *              performing an increment/decrement test over the
+ *              entire region.  In the process every storage bit
+ *              in the device is tested as a zero and a one.  The
+ *              base address and the size of the region are
+ *              selected by the caller.
+ *
+ * Returns:     NULL if the test succeeds.
+ *
+ *              A non-zero result is the first address at which an
+ *              incorrect value was read back.  By examining the
+ *              contents of memory, it may be possible to gather
+ *              additional information about the problem.
+ *
+ **********************************************************************/
+
+byte * memTestDevice(volatile byte * baseAddress, unsigned long nBytes)
+{
+    unsigned long offset;
+    unsigned long nWords = nBytes / sizeof(byte);
+
+    byte pattern;
+    byte antipattern;
+
+
+   // Fill memory with a known pattern.
+
+   for (pattern = 1, offset = 0; offset < nWords; pattern++, offset++)
+        baseAddress[offset] = pattern;
+
+   // Check each location and invert it for the second pass.
+
+    for (pattern = 1, offset = 0; offset < nWords; pattern++, offset++)
+    {
+        if (offset % 1024 == 0)
+         printf("%04X  ", (int) &baseAddress[offset]);
+
+        if (baseAddress[offset] != pattern)
+        {
+            printf("\r\nmemTestDevice: FAILED at %04x with pattern %02x\r\n", (int) &baseAddress[offset], pattern);
+            return ((byte *) &baseAddress[offset]);
+        }
+
+        antipattern = ~pattern;
+        baseAddress[offset] = antipattern;
+
+    }
+
+    // Check each location for the inverted pattern and zero it.
+
+    for (pattern = 1, offset = 0; offset < nWords; pattern++, offset++)
+    {
+        if (offset % 1024 == 0)
+         printf("%04X  ", (int) &baseAddress[offset]);
+
+        antipattern = ~pattern;
+        if (baseAddress[offset] != antipattern)
+        {
+            printf("\r\nmemTestDevice: FAILED at %04x with antipattern %02x\r\n", (int) &baseAddress[offset], pattern);
+            return ((byte *) &baseAddress[offset]);
+        }
+    }
+
+    return (NULL);
+}
+
+// TestMemory
+//
+// Run all three memory tests
+
+byte TestMemory(byte * startAddress, unsigned long size)
+{
+   if ((memTestDataBus(startAddress) != 0) ||
+       (memTestAddressBus(startAddress, size) != NULL) ||
+       (memTestDevice(startAddress, size) != NULL))
+    {
+        return (-1);
+    }
+    else
+    {
+        return (0);
+    }
+}
+
+int main (void)
+{
+   printf("\r\nTesting KIM-1...\r\n");
+   RepeatChar('-', 39);
+
+   printf("\r\nTesting RIOT RAM: 1780-17BF\r\n");
+   if (TestMemory((byte *)0x1780, 0x17BF - 0x1780))
+      return 0;
+
+   printf("\r\nTesting RIOT RAM: 17C0-17E6\r\n");
+   if (TestMemory((byte *)0x17C0, 0x17E6 - 0x17C0))
+      return 0;
+
+   printf("\r\nTesting Memory: 0400-13FF\r\n");
+   if (TestMemory((byte *)0x0400, 0x13FF - 0x0400))
+      return 0;
+
+   printf("\r\nTesting Memory: 4000-DFFF\r\n");
+   if (TestMemory((byte *)0x4000, 0xDFFF - 0x4000))
+      return 0;
+
+   printf("\r\nPASS!\r\n");
+   return 1;
+}
+
+
diff --git a/samples/kim1/ramfont.asm b/samples/kim1/ramfont.asm
new file mode 100644
index 000000000..ac0b2c9cd
--- /dev/null
+++ b/samples/kim1/ramfont.asm
@@ -0,0 +1,272 @@
+;-----------------------------------------------------------------------------------
+; KIMGFX: Simple pixel graphics for the MOS/Commodore KIM-1
+;-----------------------------------------------------------------------------------
+; (c) Plummer's Software Ltd, 04/25/2023 Created
+;         David Plummer
+;-----------------------------------------------------------------------------------
+;
+; File:     ramfont.s
+;           Magnetic OCR (check number style) Font data
+;
+;-----------------------------------------------------------------------------------
+
+.segment "CODE"
+.export _font8x8_basic
+
+_font8x8_basic:
+    .byte $1c, $22, $4a, $56, $4c, $20, $1e, $00      ; PETSCII code 0
+    .byte $3c, $24, $24, $7e, $62, $62, $62, $00      ; PETSCII code 1
+    .byte $78, $44, $44, $7c, $62, $62, $7e, $00      ; PETSCII code 2
+    .byte $7e, $42, $40, $60, $60, $62, $7e, $00      ; PETSCII code 3
+    .byte $7c, $46, $42, $62, $62, $66, $7c, $00      ; PETSCII code 4
+    .byte $7e, $40, $40, $7c, $60, $60, $7e, $00      ; PETSCII code 5
+    .byte $7e, $40, $40, $7e, $60, $60, $60, $00      ; PETSCII code 6
+    .byte $7e, $42, $40, $6e, $62, $62, $7e, $00      ; PETSCII code 7
+    .byte $42, $42, $42, $7e, $62, $62, $62, $00      ; PETSCII code 8
+    .byte $08, $08, $08, $0c, $0c, $0c, $0c, $00      ; PETSCII code 9
+    .byte $04, $04, $04, $06, $06, $46, $7e, $00      ; PETSCII code 10
+    .byte $42, $44, $48, $7c, $62, $62, $62, $00      ; PETSCII code 11
+    .byte $40, $40, $40, $60, $60, $60, $7e, $00      ; PETSCII code 12
+    .byte $7e, $4a, $4a, $6a, $6a, $6a, $6a, $00      ; PETSCII code 13
+    .byte $7e, $42, $42, $62, $62, $62, $62, $00      ; PETSCII code 14
+    .byte $7e, $46, $42, $42, $42, $42, $7e, $00      ; PETSCII code 15
+    .byte $7e, $42, $42, $7e, $60, $60, $60, $00      ; PETSCII code 16
+    .byte $7e, $42, $42, $42, $4a, $4e, $7e, $00      ; PETSCII code 17
+    .byte $7c, $44, $44, $7c, $62, $62, $62, $00      ; PETSCII code 18
+    .byte $7e, $42, $40, $7e, $06, $46, $7e, $00      ; PETSCII code 19
+    .byte $3e, $10, $10, $18, $18, $18, $18, $00      ; PETSCII code 20
+    .byte $42, $42, $42, $62, $62, $62, $7e, $00      ; PETSCII code 21
+    .byte $62, $62, $62, $66, $24, $24, $3c, $00      ; PETSCII code 22
+    .byte $4a, $4a, $4a, $6a, $6a, $6a, $7e, $00      ; PETSCII code 23
+    .byte $42, $42, $66, $18, $66, $62, $62, $00      ; PETSCII code 24
+    .byte $22, $22, $22, $3e, $18, $18, $18, $00      ; PETSCII code 25
+    .byte $7e, $42, $06, $18, $60, $62, $7e, $00      ; PETSCII code 26
+    .byte $3c, $20, $20, $20, $20, $20, $3c, $00      ; PETSCII code 27
+    .byte $00, $40, $20, $10, $08, $04, $02, $00      ; PETSCII code 28
+    .byte $3c, $04, $04, $04, $04, $04, $3c, $00      ; PETSCII code 29
+    .byte $00, $08, $1c, $2a, $08, $08, $14, $14      ; PETSCII code 30
+    .byte $00, $00, $10, $20, $7f, $20, $10, $00      ; PETSCII code 31
+    .byte $00, $00, $00, $00, $00, $00, $00, $00      ; PETSCII code 32
+    .byte $08, $08, $08, $0c, $0c, $00, $0c, $00      ; PETSCII code 33
+    .byte $6c, $24, $6c, $00, $00, $00, $00, $00      ; PETSCII code 34
+    .byte $24, $24, $7e, $24, $7e, $24, $24, $00      ; PETSCII code 35
+    .byte $08, $3e, $20, $3e, $06, $3e, $08, $00      ; PETSCII code 36
+    .byte $00, $62, $64, $08, $10, $26, $46, $00      ; PETSCII code 37
+    .byte $3c, $20, $24, $7e, $64, $64, $7c, $00      ; PETSCII code 38
+    .byte $1c, $18, $10, $00, $00, $00, $00, $00      ; PETSCII code 39
+    .byte $04, $08, $10, $10, $10, $08, $04, $00      ; PETSCII code 40
+    .byte $20, $10, $08, $08, $08, $10, $20, $00      ; PETSCII code 41
+    .byte $08, $2a, $1c, $3e, $1c, $2a, $08, $00      ; PETSCII code 42
+    .byte $00, $08, $08, $3e, $08, $08, $00, $00      ; PETSCII code 43
+    .byte $00, $00, $00, $00, $00, $18, $18, $08      ; PETSCII code 44
+    .byte $00, $00, $00, $7e, $00, $00, $00, $00      ; PETSCII code 45
+    .byte $00, $00, $00, $00, $00, $18, $18, $00      ; PETSCII code 46
+    .byte $00, $02, $04, $08, $10, $20, $40, $00      ; PETSCII code 47
+    .byte $7e, $62, $52, $4a, $46, $46, $7e, $00      ; PETSCII code 48
+    .byte $18, $08, $08, $18, $18, $1a, $3e, $00      ; PETSCII code 49
+    .byte $7e, $42, $02, $7e, $60, $60, $7e, $00      ; PETSCII code 50
+    .byte $7c, $44, $04, $1e, $06, $46, $7e, $00      ; PETSCII code 51
+    .byte $44, $44, $44, $44, $7e, $0c, $0c, $00      ; PETSCII code 52
+    .byte $7e, $40, $7e, $06, $06, $46, $7e, $00      ; PETSCII code 53
+    .byte $7e, $42, $40, $7e, $46, $46, $7e, $00      ; PETSCII code 54
+    .byte $7e, $02, $02, $06, $06, $06, $06, $00      ; PETSCII code 55
+    .byte $3c, $24, $24, $7e, $46, $46, $7e, $00      ; PETSCII code 56
+    .byte $7e, $42, $42, $7e, $06, $06, $06, $00      ; PETSCII code 57
+    .byte $00, $00, $18, $00, $00, $18, $00, $00      ; PETSCII code 58
+    .byte $00, $00, $18, $00, $00, $18, $18, $08      ; PETSCII code 59
+    .byte $0e, $18, $30, $60, $30, $18, $0e, $00      ; PETSCII code 60
+    .byte $00, $00, $7e, $00, $7e, $00, $00, $00      ; PETSCII code 61
+    .byte $70, $18, $0c, $06, $0c, $18, $70, $00      ; PETSCII code 62
+    .byte $7e, $02, $02, $7e, $60, $00, $60, $00      ; PETSCII code 63
+    .byte $00, $00, $00, $00, $ff, $00, $00, $00      ; PETSCII code 64
+    .byte $08, $1c, $3e, $7f, $7f, $1c, $3e, $00      ; PETSCII code 65
+    .byte $10, $10, $10, $10, $10, $10, $10, $10      ; PETSCII code 66
+    .byte $00, $00, $00, $ff, $00, $00, $00, $00      ; PETSCII code 67
+    .byte $00, $00, $ff, $00, $00, $00, $00, $00      ; PETSCII code 68
+    .byte $00, $ff, $00, $00, $00, $00, $00, $00      ; PETSCII code 69
+    .byte $00, $00, $00, $00, $00, $ff, $00, $00      ; PETSCII code 70
+    .byte $20, $20, $20, $20, $20, $20, $20, $20      ; PETSCII code 71
+    .byte $04, $04, $04, $04, $04, $04, $04, $04      ; PETSCII code 72
+    .byte $00, $00, $00, $00, $e0, $10, $08, $08      ; PETSCII code 73
+    .byte $08, $08, $08, $04, $03, $00, $00, $00      ; PETSCII code 74
+    .byte $08, $08, $08, $10, $e0, $00, $00, $00      ; PETSCII code 75
+    .byte $80, $80, $80, $80, $80, $80, $80, $ff      ; PETSCII code 76
+    .byte $80, $40, $20, $10, $08, $04, $02, $01      ; PETSCII code 77
+    .byte $01, $02, $04, $08, $10, $20, $40, $80      ; PETSCII code 78
+    .byte $ff, $80, $80, $80, $80, $80, $80, $80      ; PETSCII code 79
+    .byte $ff, $01, $01, $01, $01, $01, $01, $01      ; PETSCII code 80
+    .byte $00, $3c, $7e, $7e, $7e, $7e, $3c, $00      ; PETSCII code 81
+    .byte $00, $00, $00, $00, $00, $00, $ff, $00      ; PETSCII code 82
+    .byte $36, $7f, $7f, $7f, $3e, $1c, $08, $00      ; PETSCII code 83
+    .byte $40, $40, $40, $40, $40, $40, $40, $40      ; PETSCII code 84
+    .byte $00, $00, $00, $00, $03, $04, $08, $08      ; PETSCII code 85
+    .byte $81, $42, $24, $18, $18, $24, $42, $81      ; PETSCII code 86
+    .byte $00, $3c, $42, $42, $42, $42, $3c, $00      ; PETSCII code 87
+    .byte $08, $1c, $2a, $77, $2a, $08, $08, $00      ; PETSCII code 88
+    .byte $02, $02, $02, $02, $02, $02, $02, $02      ; PETSCII code 89
+    .byte $08, $1c, $3e, $7f, $3e, $1c, $08, $00      ; PETSCII code 90
+    .byte $08, $08, $08, $08, $ff, $08, $08, $08      ; PETSCII code 91
+    .byte $a0, $50, $a0, $50, $a0, $50, $a0, $50      ; PETSCII code 92
+    .byte $08, $08, $08, $08, $08, $08, $08, $08      ; PETSCII code 93
+    .byte $00, $00, $01, $3e, $54, $14, $14, $00      ; PETSCII code 94
+    .byte $ff, $7f, $3f, $1f, $0f, $07, $03, $01      ; PETSCII code 95
+    .byte $00, $00, $00, $00, $00, $00, $00, $00      ; PETSCII code 96
+    .byte $f0, $f0, $f0, $f0, $f0, $f0, $f0, $f0      ; PETSCII code 97
+    .byte $00, $00, $00, $00, $ff, $ff, $ff, $ff      ; PETSCII code 98
+    .byte $ff, $00, $00, $00, $00, $00, $00, $00      ; PETSCII code 99
+    .byte $00, $00, $00, $00, $00, $00, $00, $ff      ; PETSCII code 100
+    .byte $80, $80, $80, $80, $80, $80, $80, $80      ; PETSCII code 101
+    .byte $aa, $55, $aa, $55, $aa, $55, $aa, $55      ; PETSCII code 102
+    .byte $01, $01, $01, $01, $01, $01, $01, $01      ; PETSCII code 103
+    .byte $00, $00, $00, $00, $aa, $55, $aa, $55      ; PETSCII code 104
+    .byte $ff, $fe, $fc, $f8, $f0, $e0, $c0, $80      ; PETSCII code 105
+    .byte $03, $03, $03, $03, $03, $03, $03, $03      ; PETSCII code 106
+    .byte $08, $08, $08, $08, $0f, $08, $08, $08      ; PETSCII code 107
+    .byte $00, $00, $00, $00, $0f, $0f, $0f, $0f      ; PETSCII code 108
+    .byte $08, $08, $08, $08, $0f, $00, $00, $00      ; PETSCII code 109
+    .byte $00, $00, $00, $00, $f8, $08, $08, $08      ; PETSCII code 110
+    .byte $00, $00, $00, $00, $00, $00, $ff, $ff      ; PETSCII code 111
+    .byte $00, $00, $00, $00, $0f, $08, $08, $08      ; PETSCII code 112
+    .byte $08, $08, $08, $08, $ff, $00, $00, $00      ; PETSCII code 113
+    .byte $00, $00, $00, $00, $ff, $08, $08, $08      ; PETSCII code 114
+    .byte $08, $08, $08, $08, $f8, $08, $08, $08      ; PETSCII code 115
+    .byte $c0, $c0, $c0, $c0, $c0, $c0, $c0, $c0      ; PETSCII code 116
+    .byte $e0, $e0, $e0, $e0, $e0, $e0, $e0, $e0      ; PETSCII code 117
+    .byte $07, $07, $07, $07, $07, $07, $07, $07      ; PETSCII code 118
+    .byte $ff, $ff, $00, $00, $00, $00, $00, $00      ; PETSCII code 119
+    .byte $ff, $ff, $ff, $00, $00, $00, $00, $00      ; PETSCII code 120
+    .byte $00, $00, $00, $00, $00, $ff, $ff, $ff      ; PETSCII code 121
+    .byte $01, $01, $01, $01, $01, $01, $01, $ff      ; PETSCII code 122
+    .byte $00, $00, $00, $00, $f0, $f0, $f0, $f0      ; PETSCII code 123
+    .byte $0f, $0f, $0f, $0f, $00, $00, $00, $00      ; PETSCII code 124
+    .byte $08, $08, $08, $08, $f8, $00, $00, $00      ; PETSCII code 125
+    .byte $f0, $f0, $f0, $f0, $00, $00, $00, $00      ; PETSCII code 126
+    .byte $f0, $f0, $f0, $f0, $0f, $0f, $0f, $0f      ; PETSCII code 127
+    .byte $1c, $22, $4a, $56, $4c, $20, $1e, $00      ; PETSCII code 128
+    .byte $00, $00, $3c, $04, $7c, $64, $7c, $00      ; PETSCII code 129
+    .byte $40, $40, $7e, $42, $62, $62, $7e, $00      ; PETSCII code 130
+    .byte $00, $00, $7e, $42, $60, $62, $7e, $00      ; PETSCII code 131
+    .byte $02, $02, $7e, $42, $62, $62, $7e, $00      ; PETSCII code 132
+    .byte $00, $00, $7e, $42, $7e, $60, $7e, $00      ; PETSCII code 133
+    .byte $1e, $12, $10, $7c, $18, $18, $18, $00      ; PETSCII code 134
+    .byte $00, $00, $7e, $42, $62, $7e, $02, $7e      ; PETSCII code 135
+    .byte $40, $40, $7e, $42, $62, $62, $62, $00      ; PETSCII code 136
+    .byte $18, $00, $10, $10, $18, $18, $18, $00      ; PETSCII code 137
+    .byte $0c, $00, $08, $0c, $0c, $0c, $44, $7c      ; PETSCII code 138
+    .byte $40, $40, $44, $48, $78, $64, $64, $00      ; PETSCII code 139
+    .byte $10, $10, $10, $10, $18, $18, $18, $00      ; PETSCII code 140
+    .byte $00, $00, $7f, $49, $6d, $6d, $6d, $00      ; PETSCII code 141
+    .byte $00, $00, $7e, $42, $62, $62, $62, $00      ; PETSCII code 142
+    .byte $00, $00, $7e, $42, $62, $62, $7e, $00      ; PETSCII code 143
+    .byte $00, $00, $7e, $42, $62, $7e, $40, $40      ; PETSCII code 144
+    .byte $00, $00, $7e, $42, $46, $7e, $02, $02      ; PETSCII code 145
+    .byte $00, $00, $7e, $40, $60, $60, $60, $00      ; PETSCII code 146
+    .byte $00, $00, $7e, $40, $7e, $06, $7e, $00      ; PETSCII code 147
+    .byte $10, $10, $7c, $10, $18, $18, $18, $00      ; PETSCII code 148
+    .byte $00, $00, $42, $42, $62, $62, $7e, $00      ; PETSCII code 149
+    .byte $00, $00, $62, $62, $66, $24, $3c, $00      ; PETSCII code 150
+    .byte $00, $00, $49, $49, $6d, $6d, $7f, $00      ; PETSCII code 151
+    .byte $00, $00, $42, $42, $3c, $62, $62, $00      ; PETSCII code 152
+    .byte $00, $00, $62, $62, $42, $7e, $02, $7e      ; PETSCII code 153
+    .byte $00, $00, $7e, $06, $18, $60, $7e, $00      ; PETSCII code 154
+    .byte $3c, $20, $20, $20, $20, $20, $3c, $00      ; PETSCII code 155
+    .byte $00, $40, $20, $10, $08, $04, $02, $00      ; PETSCII code 156
+    .byte $3c, $04, $04, $04, $04, $04, $3c, $00      ; PETSCII code 157
+    .byte $00, $08, $1c, $2a, $08, $08, $14, $14      ; PETSCII code 158
+    .byte $00, $00, $10, $20, $7f, $20, $10, $00      ; PETSCII code 159
+    .byte $00, $00, $00, $00, $00, $00, $00, $00      ; PETSCII code 160
+    .byte $08, $08, $08, $0c, $0c, $00, $0c, $00      ; PETSCII code 161
+    .byte $6c, $24, $6c, $00, $00, $00, $00, $00      ; PETSCII code 162
+    .byte $24, $24, $7e, $24, $7e, $24, $24, $00      ; PETSCII code 163
+    .byte $08, $3e, $20, $3e, $06, $3e, $08, $00      ; PETSCII code 164
+    .byte $00, $62, $64, $08, $10, $26, $46, $00      ; PETSCII code 165
+    .byte $3c, $20, $24, $7e, $64, $64, $7c, $00      ; PETSCII code 166
+    .byte $1c, $18, $10, $00, $00, $00, $00, $00      ; PETSCII code 167
+    .byte $04, $08, $10, $10, $10, $08, $04, $00      ; PETSCII code 168
+    .byte $20, $10, $08, $08, $08, $10, $20, $00      ; PETSCII code 169
+    .byte $08, $2a, $1c, $3e, $1c, $2a, $08, $00      ; PETSCII code 170
+    .byte $00, $08, $08, $3e, $08, $08, $00, $00      ; PETSCII code 171
+    .byte $00, $00, $00, $00, $00, $18, $18, $08      ; PETSCII code 172
+    .byte $00, $00, $00, $7e, $00, $00, $00, $00      ; PETSCII code 173
+    .byte $00, $00, $00, $00, $00, $18, $18, $00      ; PETSCII code 174
+    .byte $00, $02, $04, $08, $10, $20, $40, $00      ; PETSCII code 175
+    .byte $7e, $62, $52, $4a, $46, $46, $7e, $00      ; PETSCII code 176
+    .byte $38, $08, $08, $18, $18, $1a, $3e, $00      ; PETSCII code 177
+    .byte $7e, $42, $02, $7e, $60, $60, $7e, $00      ; PETSCII code 178
+    .byte $7c, $44, $04, $1e, $06, $46, $7e, $00      ; PETSCII code 179
+    .byte $44, $44, $44, $44, $7e, $0c, $0c, $00      ; PETSCII code 180
+    .byte $7e, $40, $7e, $06, $06, $46, $7e, $00      ; PETSCII code 181
+    .byte $7e, $42, $40, $7e, $46, $46, $7e, $00      ; PETSCII code 182
+    .byte $7e, $02, $02, $06, $06, $06, $06, $00      ; PETSCII code 183
+    .byte $3c, $24, $24, $7e, $46, $46, $7e, $00      ; PETSCII code 184
+    .byte $7e, $42, $42, $7e, $06, $06, $06, $00      ; PETSCII code 185
+    .byte $00, $00, $18, $00, $00, $18, $00, $00      ; PETSCII code 186
+    .byte $00, $00, $18, $00, $00, $18, $18, $08      ; PETSCII code 187
+    .byte $0e, $18, $30, $60, $30, $18, $0e, $00      ; PETSCII code 188
+    .byte $00, $00, $7e, $00, $7e, $00, $00, $00      ; PETSCII code 189
+    .byte $70, $18, $0c, $06, $0c, $18, $70, $00      ; PETSCII code 190
+    .byte $7e, $02, $02, $7e, $60, $00, $60, $00      ; PETSCII code 191
+    .byte $00, $00, $00, $00, $ff, $00, $00, $00      ; PETSCII code 192
+    .byte $3c, $24, $24, $7e, $62, $62, $62, $00      ; PETSCII code 193
+    .byte $78, $44, $44, $7c, $62, $62, $7e, $00      ; PETSCII code 194
+    .byte $7e, $42, $40, $60, $60, $62, $7e, $00      ; PETSCII code 195
+    .byte $7c, $46, $42, $62, $62, $66, $7c, $00      ; PETSCII code 196
+    .byte $7e, $40, $40, $78, $60, $60, $7e, $00      ; PETSCII code 197
+    .byte $7e, $40, $40, $7e, $60, $60, $60, $00      ; PETSCII code 198
+    .byte $7e, $42, $40, $6e, $62, $62, $7e, $00      ; PETSCII code 199
+    .byte $42, $42, $42, $7e, $62, $62, $62, $00      ; PETSCII code 200
+    .byte $08, $08, $08, $0c, $0c, $0c, $0c, $00      ; PETSCII code 201
+    .byte $04, $04, $04, $06, $06, $46, $7e, $00      ; PETSCII code 202
+    .byte $42, $44, $48, $7c, $62, $62, $62, $00      ; PETSCII code 203
+    .byte $40, $40, $40, $60, $60, $60, $7e, $00      ; PETSCII code 204
+    .byte $7e, $4a, $4a, $6a, $6a, $6a, $6a, $00      ; PETSCII code 205
+    .byte $7e, $42, $42, $62, $62, $62, $62, $00      ; PETSCII code 206
+    .byte $7e, $46, $42, $42, $42, $42, $7e, $00      ; PETSCII code 207
+    .byte $7e, $42, $42, $7e, $60, $60, $60, $00      ; PETSCII code 208
+    .byte $7e, $42, $42, $42, $4a, $4e, $7e, $00      ; PETSCII code 209
+    .byte $7c, $44, $44, $7c, $62, $62, $62, $00      ; PETSCII code 210
+    .byte $7e, $42, $40, $7e, $06, $46, $7e, $00      ; PETSCII code 211
+    .byte $3e, $10, $10, $18, $18, $18, $18, $00      ; PETSCII code 212
+    .byte $42, $42, $42, $62, $62, $62, $7e, $00      ; PETSCII code 213
+    .byte $62, $62, $62, $66, $24, $24, $3c, $00      ; PETSCII code 214
+    .byte $4a, $4a, $4a, $6a, $6a, $6a, $7e, $00      ; PETSCII code 215
+    .byte $42, $42, $66, $3c, $66, $62, $62, $00      ; PETSCII code 216
+    .byte $22, $22, $22, $3e, $18, $18, $18, $00      ; PETSCII code 217
+    .byte $7e, $42, $06, $18, $60, $62, $7e, $00      ; PETSCII code 218
+    .byte $08, $08, $08, $08, $ff, $08, $08, $08      ; PETSCII code 219
+    .byte $a0, $50, $a0, $50, $a0, $50, $a0, $50      ; PETSCII code 220
+    .byte $08, $08, $08, $08, $08, $08, $08, $08      ; PETSCII code 221
+    .byte $cc, $cc, $33, $33, $cc, $cc, $33, $33      ; PETSCII code 222
+    .byte $cc, $66, $33, $99, $cc, $66, $33, $99      ; PETSCII code 223
+    .byte $00, $00, $00, $00, $00, $00, $00, $00      ; PETSCII code 224
+    .byte $f0, $f0, $f0, $f0, $f0, $f0, $f0, $f0      ; PETSCII code 225
+    .byte $00, $00, $00, $00, $ff, $ff, $ff, $ff      ; PETSCII code 226
+    .byte $ff, $00, $00, $00, $00, $00, $00, $00      ; PETSCII code 227
+    .byte $00, $00, $00, $00, $00, $00, $00, $ff      ; PETSCII code 228
+    .byte $80, $80, $80, $80, $80, $80, $80, $80      ; PETSCII code 229
+    .byte $aa, $55, $aa, $55, $aa, $55, $aa, $55      ; PETSCII code 230
+    .byte $01, $01, $01, $01, $01, $01, $01, $01      ; PETSCII code 231
+    .byte $00, $00, $00, $00, $aa, $55, $aa, $55      ; PETSCII code 232
+    .byte $99, $33, $66, $cc, $99, $33, $66, $cc      ; PETSCII code 233
+    .byte $03, $03, $03, $03, $03, $03, $03, $03      ; PETSCII code 234
+    .byte $08, $08, $08, $08, $0f, $08, $08, $08      ; PETSCII code 235
+    .byte $00, $00, $00, $00, $0f, $0f, $0f, $0f      ; PETSCII code 236
+    .byte $08, $08, $08, $08, $0f, $00, $00, $00      ; PETSCII code 237
+    .byte $00, $00, $00, $00, $f8, $08, $08, $08      ; PETSCII code 238
+    .byte $00, $00, $00, $00, $00, $00, $ff, $ff      ; PETSCII code 239
+    .byte $00, $00, $00, $00, $0f, $08, $08, $08      ; PETSCII code 240
+    .byte $08, $08, $08, $08, $ff, $00, $00, $00      ; PETSCII code 241
+    .byte $00, $00, $00, $00, $ff, $08, $08, $08      ; PETSCII code 242
+    .byte $08, $08, $08, $08, $f8, $08, $08, $08      ; PETSCII code 243
+    .byte $c0, $c0, $c0, $c0, $c0, $c0, $c0, $c0      ; PETSCII code 244
+    .byte $e0, $e0, $e0, $e0, $e0, $e0, $e0, $e0      ; PETSCII code 245
+    .byte $07, $07, $07, $07, $07, $07, $07, $07      ; PETSCII code 246
+    .byte $ff, $ff, $00, $00, $00, $00, $00, $00      ; PETSCII code 247
+    .byte $ff, $ff, $ff, $00, $00, $00, $00, $00      ; PETSCII code 248
+    .byte $00, $00, $00, $00, $00, $ff, $ff, $ff      ; PETSCII code 249
+    .byte $01, $02, $44, $48, $50, $60, $40, $00      ; PETSCII code 250
+    .byte $00, $00, $00, $00, $f0, $f0, $f0, $f0      ; PETSCII code 251
+    .byte $0f, $0f, $0f, $0f, $00, $00, $00, $00      ; PETSCII code 252
+    .byte $08, $08, $08, $08, $f8, $00, $00, $00      ; PETSCII code 253
+    .byte $f0, $f0, $f0, $f0, $00, $00, $00, $00      ; PETSCII code 254
+    .byte $f0, $f0, $f0, $f0, $0f, $0f, $0f, $0f      ; PETSCII code 255
diff --git a/samples/kim1/subs.asm b/samples/kim1/subs.asm
new file mode 100644
index 000000000..64713a148
--- /dev/null
+++ b/samples/kim1/subs.asm
@@ -0,0 +1,1140 @@
+;-----------------------------------------------------------------------------------
+; KIMGFX: Simple pixel graphics for the MOS/Commodore KIM-1
+;-----------------------------------------------------------------------------------
+; (c) Plummer's Software Ltd, 04/25/2023 Created
+;         David Plummer
+;-----------------------------------------------------------------------------------
+;
+; File:     subs.asm            Assembly language subroutines for KIMGFX
+;
+;-----------------------------------------------------------------------------------
+
+
+.SETCPU "6502"
+
+.export _ClearScreen
+.export _ScrollScreen
+.export _SetPixel
+.export _ClearPixel
+.export _DrawCircle
+.export _DrawLine
+.export _AscToPet
+.export _ReverseBits
+.export _DrawChar
+.export _CharOut
+.export _Demo
+.export _Delay
+.export _getch
+
+
+.import _font8x8_basic
+
+; This is the assumed location of the MTU visible memory board's 8K of memory.  You can adjust this
+; constant to refelct other locations as needed.
+
+SCREEN           = $A000
+
+; Note that even though these constants are defined here and respected, there are still going to be
+; logic assumptions in GetPixelAddress that assume a 320x200 screen.  If you change these, you'll
+; need to adjust GetPixelAddress to match.
+
+SCREEN_WIDTH     = 320
+SCREEN_HEIGHT    = 200
+SCREEN_BYTES     = SCREEN_WIDTH * SCREEN_HEIGHT / 8
+CHARWIDTH        = 8
+CHARHEIGHT       = 8
+BYTESPERROW      = (SCREEN_WIDTH / 8)
+BYTESPERCHARROW  = (BYTESPERROW * 8)
+CHARSPERROW      = (SCREEN_WIDTH / CHARWIDTH)
+ROWSPERCOLUMN    = (SCREEN_HEIGHT / CHARHEIGHT)
+LASTROW          = SCREEN + SCREEN_BYTES - BYTESPERCHARROW
+
+.segment "ZEROPAGE"
+
+btpt:           .res 1
+
+dest:
+dest_lo:        .res 1
+dest_hi:        .res 1
+
+src:
+src_lo:         .res 1
+src_hi:         .res 1
+
+adp1:
+adp1_lo:        .res 1
+adp1_hi:        .res 1
+
+adp2:
+adp2_lo:        .res 1
+adp2_hi:        .res 1
+
+scroll_src:
+scroll_src_lo:  .res 1
+scroll_src_hi:  .res 1
+
+scroll_dest:
+scroll_dest_lo: .res 1
+scroll_dest_hi: .res 1
+
+
+.segment "DATA"
+
+; Arguments for graphics functions
+
+_x1cord:        .res 2
+_x2cord:        .res 2
+_y1cord:        .res 2
+_y2cord:        .res 2
+_cursorX:       .res 1
+_cursorY:       .res 1
+
+; Linedraw
+
+dx:         .res 2
+dy:         .res 2
+e2:         .res 2
+sx:         .res 1
+sy:         .res 1
+dltemp:     .res 2
+pixel:      .res 1
+
+; DrawCircle
+
+xval:           .res 2              ; These could move to zeropage for perf, but presume we
+yval:           .res 2              ;   we want to minimize the amount we grow zero page use
+err:            .res 2
+temp:           .res 2
+tempa:          .res 1
+tempx:          .res 1
+tempy:          .res 1
+temp2:          .res 2
+x0:             .res 2
+y0:             .res 2
+
+; CharOut
+
+tempstr:        .res 2
+
+.export _x1cord                   ; Make sure these show up on the C side as zero page
+.export _x2cord
+.export _y1cord
+.export _y2cord
+.export _cursorX
+.export _cursorY
+
+.segment "CODE"
+
+;-----------------------------------------------------------------------------------
+; GetPixelAddress - Calculate the address of a pixel in the video memory
+;-----------------------------------------------------------------------------------
+; Based on MTU PIXADR code
+;-----------------------------------------------------------------------------------
+; In:       _x1cord         (16-bit)
+;           _y1cord         (16-bit)
+; Out:      adp1            (16-bit) Address of pixel to set
+;-----------------------------------------------------------------------------------
+
+_GetPixelAddress:
+                lda     _x1cord         ; compute bit address first
+                sta     adp1            ; also transfer x1cord to adp1
+                and     #$07            ; + which is simply the low 3 bits of x
+                sta     btpt
+                lda     _x1cord+1       ; finish transferring x1cord to adp1
+                sta     adp1+1
+                lsr     adp1+1          ; double shift adp1 right 3 to get
+                ror     adp1            ; int(xcord/8 )
+                lsr     adp1+1
+                ror     adp1
+                lsr     adp1+1
+                ror     adp1
+                sec                             ; and temporary storage
+                lda     _y1cord
+                sta     adp2
+                sta     temp
+                lda     #0
+                sbc     _y1cord+1
+                sta     adp2+1
+                sta     temp+1
+                asl     adp2            ; compute 40*(y1cord)
+                rol     adp2+1          ;  2*(y1cord)
+                asl     adp2
+                rol     adp2+1          ;  4*(y1cord)
+                lda     adp2            ;  add in temporary save of (y1cord)
+                clc                             ;  to make 5*(y1cord)
+                adc     temp
+                sta     adp2
+                lda     adp2+1
+                adc     temp+1
+                sta     adp2+1          ; 5*(y1cord)
+                asl     adp2            ; 10*(1cord)
+                rol     adp2+1
+                asl     adp2            ; 20#(y1cord)
+                rol     adp2+1
+                asl     adp2            ; 40*(y1cord)
+                rol     adp2+1
+                lda     adp2            ; add in int(x1cord/8) computed earlier
+                clc
+                adc     adp1
+                sta     adp1
+                lda     adp2+1
+                adc     adp1+1
+                adc     #>SCREEN    ; add in vmorg*256
+                sta     adp1+1          ; final result
+                rts                             ; return
+
+;-----------------------------------------------------------------------------------
+; Mask tables for individual pixel subroutines
+;
+; MSKTB1 is a table of 1 bits corresponding to bit numbers
+; MSKTB2 is a table of 0 bits corresponding to bit numbers
+;-----------------------------------------------------------------------------------
+
+msktb1:             .byte       $80,$40,$20,$10,$08,$04,$02,$01
+msktb2:             .byte       $7F,$BF,$DF,$EF,$F7,$FB,$FD,$FE
+
+_Delay:         pha
+                sta temp
+                txa
+                pha
+                tya
+                pha
+
+@loopa:         ldx #$ff
+@loopx:         ldy #$ff
+@loopy:         dey
+                bne @loopy
+                dex
+                bne @loopx
+                dec temp
+                bne @loopa
+
+                pla
+                tay
+                pla
+                tax
+                pla
+                rts
+
+;-----------------------------------------------------------------------------------
+; SetPixel - Set a pixel in the video memory
+;-----------------------------------------------------------------------------------
+; x             - _x1cord (16-bit)
+; y             - _y1cord (16-bit)
+;-----------------------------------------------------------------------------------
+; Mask tables for individual pixel subroutines
+;-----------------------------------------------------------------------------------
+
+_SetPixel:      jsr     _GetPixelAddress
+                ldy     btpt            ; get bit number in y
+                lda     msktb1,y        ; get a byte with that bit =1, others =0
+                ldy     #0
+                ora     (adp1),y        ; combine the bit with the addressed vm
+                sta     (adp1),y        ; byte
+                rts
+
+;-----------------------------------------------------------------------------------
+; ClearPixel - Clears a pixel in the video memory
+;-----------------------------------------------------------------------------------
+; x             - _x1cord (16-bit)
+; y             - _y1cord (16-bit)
+;-----------------------------------------------------------------------------------
+
+_ClearPixel:    jsr     _GetPixelAddress
+                ldy     btpt            ; get bit number in y
+                lda     msktb2,y        ; get a byte with that bit =0, others =1
+                ldy     #0
+                and     (adp1),y        ; remove the bit from the addressed vm
+                sta     (adp1),y        ; byte
+                rts
+
+;-----------------------------------------------------------------------------------
+; ClearScreen - Clears the entire video memory (and thus the screen)
+;-----------------------------------------------------------------------------------
+
+_ClearScreen:
+                lda #$00
+
+                ldx #<SCREEN
+                stx dest_lo
+                ldx #>SCREEN
+                stx dest_hi
+
+                ldy #0
+:               sta (dest), y       ; Loop unwound by a factor of 8, which means our iny before the branchh
+                iny                 ;  will still work as it's on a page crossing boundary.
+                sta (dest), y       ;  This will avoid most of the overhead of the branch.
+                iny
+                sta (dest), y
+                iny
+                sta (dest), y
+                iny
+                sta (dest), y
+                iny
+                sta (dest), y
+                iny
+                sta (dest), y
+                iny
+                sta (dest), y
+                iny
+                bne :-
+
+                inc dest_hi
+                ldx dest_hi
+                cpx #>SCREEN + $20
+                bne :-
+
+                rts
+
+;-----------------------------------------------------------------------------------
+; ScrollScreen - Scrolls the entire video memory (and thus the screen) up one row
+;-----------------------------------------------------------------------------------
+
+BYTES_TO_MOVE      = SCREEN_BYTES - BYTESPERCHARROW
+PAGES_TO_MOVE      = BYTES_TO_MOVE / 256
+
+_ScrollScreen:
+                pha
+                tya
+                pha
+                txa
+                pha
+
+                ; Load the source (A140) and destination (A000) addresses
+                lda #<(SCREEN+BYTESPERCHARROW)
+                sta scroll_src_lo
+                lda #>(SCREEN+BYTESPERCHARROW)
+                sta scroll_src_hi
+                lda #<SCREEN
+                sta scroll_dest_lo
+                lda #>SCREEN
+                sta scroll_dest_hi
+
+                ldx #PAGES_TO_MOVE
+@outerLoop:
+                ldy #0
+@innerLoop:     ;
+                ; I could do this faster in self-modifying code (avoiding the zero page overhead) but then it
+                ; couldn't go into ROM
+
+                lda (scroll_src),y                          ; I've unwound the loop to do 8 bytes at a time.  Since we're doing full pages
+                sta (scroll_dest),y                         ;   as long as we unwind the loop to do 8 bytes at a time, we know we'll still
+                iny                                         ;   do the final increment on a page boundary.
+                lda (scroll_src),y
+                sta (scroll_dest),y
+                iny
+                lda (scroll_src),y
+                sta (scroll_dest),y
+                iny
+                lda (scroll_src),y
+                sta (scroll_dest),y
+                iny
+                lda (scroll_src),y
+                sta (scroll_dest),y
+                iny
+                lda (scroll_src),y
+                sta (scroll_dest),y
+                iny
+                lda (scroll_src),y
+                sta (scroll_dest),y
+                iny
+                lda (scroll_src),y
+                sta (scroll_dest),y
+                iny
+                bne @innerLoop                              ; If Y overflows, it will be 0, so won't branch
+                inc scroll_src_hi
+                inc scroll_dest_hi
+                dex
+                bne @outerLoop
+
+                ; Clear the last line
+                lda #<LASTROW
+                sta scroll_dest_lo
+                lda #>LASTROW
+                sta scroll_dest_hi
+                lda #$00
+                ldy #0
+fullPageLoop:
+                sta (scroll_dest_lo),y
+                iny
+                bne fullPageLoop
+                inc scroll_dest_hi
+partialPageLoop:
+                sta (scroll_dest_lo),y
+                iny
+                cpy #BYTESPERCHARROW - 256         ; Only clear up to the 64th byte (256 + 64 == 320)
+                bne partialPageLoop
+
+                pla
+                tax
+                pla
+                tay
+                pla
+                rts
+
+;-----------------------------------------------------------------------------------
+; DrawCircle    - Draws a circle in video memory of a given radius at a given coord
+;-----------------------------------------------------------------------------------
+; x             - _x1cord (16-bit)
+; y             - _y1cord (16-bit)
+; radius        - _y2cord (16-bit)
+;-----------------------------------------------------------------------------------
+; Implements the midpoint circle algorithm without floating point or trig functions
+;-----------------------------------------------------------------------------------
+;     int x = radius;
+;     int y = 0;
+;     int err = 0;
+;
+;     while (x >= y)
+;     {
+;         SETPIXEL(x0 + x, y0 + y, val);
+;         SETPIXEL(x0 + y, y0 + x, val);
+;         SETPIXEL(x0 - y, y0 + x, val);
+;         SETPIXEL(x0 - x, y0 + y, val);
+;         SETPIXEL(x0 - x, y0 - y, val);
+;         SETPIXEL(x0 - y, y0 - x, val);
+;         SETPIXEL(x0 + y, y0 - x, val);
+;         SETPIXEL(x0 + x, y0 - y, val);
+;
+;         y++;
+;         err += 1 + 2 * y;
+;         if (2 * (err - x) + 1 > 0) {
+;             x--;
+;             err += 1 - 2 * x;
+;         }
+;     }
+;-----------------------------------------------------------------------------------
+
+_DrawCircle:    lda _x1cord                     ; x0 = _x1cord
+                sta x0
+                lda _x1cord+1
+                sta x0+1
+                lda _y1cord                     ; y0 = _y1cord
+                sta y0
+                lda _y1cord+1
+                sta y0+1
+
+                lda _y2cord                     ; x = radius
+                sta xval
+                lda _y2cord+1
+                sta xval+1
+
+                lda #$0                         ; yval = 0;
+                sta yval
+                sta yval+1
+                sta err                         ; err = 0;
+                sta err+1
+circleloop:
+                lda xval+1                      ; if (xval < yval) we're done;
+                sec
+                cmp yval+1
+                bcc doneCircle                  ; if high byteof yval is greater, we can draw
+                bne doCircle                    ; it not greater and not equal, is less, so done
+                lda xval                        ; in other cases we need to compare the LSB next
+                cmp yval
+                bcs doCircle                    ; if it's less, but MSB was equal, we go draw
+
+doneCircle:     rts
+
+doCircle:       lda x0                          ; Draw the first of 8 symmetric quadrant copies
+                clc
+                adc yval
+                sta _x1cord
+                lda x0+1
+                adc yval+1
+                sta _x1cord+1
+                lda y0
+                sec
+                sbc xval
+                sta _y1cord
+                lda y0+1
+                sbc xval+1
+                sta _y1cord+1
+                jsr _SetPixel                    ; SETPIXEL(x0 + y, y0 - x, val);
+
+                lda x0
+                sec
+                sbc yval
+                sta _x1cord
+                lda x0+1
+                sbc yval+1
+                sta _x1cord+1
+                lda y0
+                sec
+                sbc xval
+                sta _y1cord
+                lda y0+1
+                sbc xval+1
+                sta _y1cord+1
+                jsr _SetPixel                    ; SETPIXEL(x0 - y, y0 - x, val);
+
+                lda x0
+                sec
+                sbc xval
+                sta _x1cord
+                lda x0+1
+                sbc xval+1
+                sta _x1cord+1
+                lda y0
+                sec
+                sbc yval
+                sta _y1cord
+                lda y0+1
+                sbc yval+1
+                sta _y1cord+1
+                jsr _SetPixel                    ; SETPIXEL(x0 - x, y0 - y, val);
+
+                lda x0
+                sec
+                sbc xval
+                sta _x1cord
+                lda x0+1
+                sbc xval+1
+                sta _x1cord+1
+                lda y0
+                clc
+                adc yval
+                sta _y1cord
+                lda y0+1
+                adc yval+1
+                sta _y1cord+1
+                jsr _SetPixel                    ; SETPIXEL(x0 - x, y0 + y, val);
+
+                lda x0
+                clc
+                adc yval
+                sta _x1cord
+                lda x0+1
+                adc yval+1
+                sta _x1cord+1
+                lda y0
+                clc
+                adc xval
+                sta _y1cord
+                lda y0+1
+                adc xval+1
+                sta _y1cord+1
+                jsr _SetPixel                    ; SETPIXEL(x0 + y, y0 + x, val);
+
+                lda x0
+                clc
+                adc xval
+                sta _x1cord
+                lda x0+1
+                adc xval+1
+                sta _x1cord+1
+                lda y0
+                clc
+                adc yval
+                sta _y1cord
+                lda y0+1
+                adc yval+1
+                sta _y1cord+1
+                jsr _SetPixel                    ; SETPIXEL(x0 + x, y0 + y, val);
+
+                lda x0
+                clc
+                adc xval
+                sta _x1cord
+                lda x0+1
+                adc xval+1
+                sta _x1cord+1
+                lda y0
+                sec
+                sbc yval
+                sta _y1cord
+                lda y0+1
+                sbc yval+1
+                sta _y1cord+1
+                jsr _SetPixel                    ; SETPIXEL(x0 + x, y0 - y, val);
+
+                lda x0
+                sec
+                sbc yval
+                sta _x1cord
+                lda x0+1
+                sbc yval+1
+                sta _x1cord+1
+                lda y0
+                clc
+                adc xval
+                sta _y1cord
+                lda y0+1
+                adc xval+1
+                sta _y1cord+1
+                jsr _SetPixel                   ; SETPIXEL(x0 - y, y0 + x, val);
+
+                inc yval                        ; yval++;
+                bne :+
+                inc yval+1
+
+:               lda yval                        ; temp = 2 * yval + 1;
+                asl
+                sta temp
+                lda yval+1
+                rol
+                sta temp+1
+                inc temp
+                bne :+
+                inc temp+1
+:
+                lda err                         ; err += temp
+                clc
+                adc temp
+                sta err
+                lda err+1
+                adc temp+1
+                sta err+1
+                                                ; if (2 * (err - xval) + 1 > 0) then dec xval
+                lda err                         ; temp = err-xval
+                sec
+                sbc xval
+                sta temp
+                lda err+1
+                sbc xval+1
+                sta temp+1
+
+                asl temp                        ; temp = 2*(err-xval)+1
+                rol temp+1
+                inc temp
+                bne :+
+                inc temp+1
+:
+                lda temp+1                      ; if (temp > 0) we'll dec xval
+                bmi doneLoop                    ; less than zero, so no dec
+                bne decxval                     ; if not zero, go ahead and dec
+
+                lda temp                        ; MSB is zero so now check the LSB
+                beq doneLoop                    ; both bytes are zero, so no dec
+
+decxval:        lda xval                        ; xval--
+                bne :+
+                dec xval+1
+:               dec xval
+
+updateerr:      lda xval                        ; temp = xval * 2
+                asl
+                sta temp
+                lda xval+1
+                rol
+                sta temp+1
+
+                lda #1                          ; temp2 == 1-temp == 1-(xval*2)
+                sec
+                sbc temp
+                sta temp2
+                lda #0
+                sbc temp+1
+                sta temp2+1
+
+                lda err                         ; err += 1-(xval*2)
+                clc
+                adc temp2
+                sta err
+                lda err+1
+                adc temp2+1
+                sta err+1
+
+doneLoop:       jmp circleloop
+
+;-----------------------------------------------------------------------------------
+; Character set translation tables
+;-----------------------------------------------------------------------------------
+
+ascToPetTable:  .byte $00,$01,$02,$03,$04,$05,$06,$07,$14,$20,$0d,$11,$93,$0a,$0e,$0f
+                .byte $10,$0b,$12,$13,$08,$15,$16,$17,$18,$19,$1a,$1b,$1c,$1d,$1e,$1f
+                .byte $20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$2a,$2b,$2c,$2d,$2e,$2f
+                .byte $30,$31,$32,$33,$34,$35,$36,$37,$38,$39,$3a,$3b,$3c,$3d,$3e,$3f
+                .byte $40,$c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8,$c9,$ca,$cb,$cc,$cd,$ce,$cf
+                .byte $d0,$d1,$d2,$d3,$d4,$d5,$d6,$d7,$d8,$d9,$da,$5b,$5c,$5d,$5e,$5f
+                .byte $c0,$41,$42,$43,$44,$45,$46,$47,$48,$49,$4a,$4b,$4c,$4d,$4e,$4f
+                .byte $50,$51,$52,$53,$54,$55,$56,$57,$58,$59,$5a,$db,$dc,$dd,$de,$df
+                .byte $80,$81,$82,$83,$84,$85,$86,$87,$88,$89,$8a,$8b,$8c,$8d,$8e,$8f
+                .byte $90,$91,$92,$0c,$94,$95,$96,$97,$98,$99,$9a,$9b,$9c,$9d,$9e,$9f
+                .byte $a0,$a1,$a2,$a3,$a4,$a5,$a6,$a7,$a8,$a9,$aa,$ab,$ac,$ad,$ae,$af
+                .byte $b0,$b1,$b2,$b3,$b4,$b5,$b6,$b7,$b8,$b9,$ba,$bb,$bc,$bd,$be,$bf
+                .byte $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,$6a,$6b,$6c,$6d,$6e,$6f
+                .byte $70,$71,$72,$73,$74,$75,$76,$77,$78,$79,$7a,$7b,$7c,$7d,$7e,$7f
+                .byte $e0,$e1,$e2,$e3,$e4,$e5,$e6,$e7,$e8,$e9,$ea,$eb,$ec,$ed,$ee,$ef
+                .byte $f0,$f1,$f2,$f3,$f4,$f5,$f6,$f7,$f8,$f9,$fa,$fb,$fc,$fd,$fe,$ff
+
+; PETSCI to Ascii lookup table - not current used, so commented out, but can be used to map fonts
+;
+;
+ petToAscTable:  .byte $00,$01,$02,$03,$04,$05,$06,$07,$14,$09,$0d,$11,$93,$0a,$0e,$0f
+                 .byte $10,$0b,$12,$13,$08,$15,$16,$17,$18,$19,$1a,$1b,$1c,$1d,$1e,$1f
+                 .byte $20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$2a,$2b,$2c,$2d,$2e,$2f
+                 .byte $30,$31,$32,$33,$34,$35,$36,$37,$38,$39,$3a,$3b,$3c,$3d,$3e,$3f
+                 .byte $40,$61,$62,$63,$64,$65,$66,$67,$68,$69,$6a,$6b,$6c,$6d,$6e,$6f
+                 .byte $70,$71,$72,$73,$74,$75,$76,$77,$78,$79,$7a,$5b,$5c,$5d,$5e,$5f
+                 .byte $c0,$c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8,$c9,$ca,$cb,$cc,$cd,$ce,$cf
+                 .byte $d0,$d1,$d2,$d3,$d4,$d5,$d6,$d7,$d8,$d9,$da,$db,$dc,$dd,$de,$df
+                 .byte $80,$81,$82,$83,$84,$85,$86,$87,$88,$89,$8a,$8b,$8c,$8d,$8e,$8f
+                 .byte $90,$91,$92,$0c,$94,$95,$96,$97,$98,$99,$9a,$9b,$9c,$9d,$9e,$9f
+                 .byte $a0,$a1,$a2,$a3,$a4,$a5,$a6,$a7,$a8,$a9,$aa,$ab,$ac,$ad,$ae,$af
+                 .byte $b0,$b1,$b2,$b3,$b4,$b5,$b6,$b7,$b8,$b9,$ba,$bb,$bc,$bd,$be,$bf
+                 .byte $60,$41,$42,$43,$44,$45,$46,$47,$48,$49,$4a,$4b,$4c,$4d,$4e,$4f
+                 .byte $50,$51,$52,$53,$54,$55,$56,$57,$58,$59,$5a,$7b,$7c,$7d,$7e,$7f
+                 .byte $a0,$a1,$a2,$a3,$a4,$a5,$a6,$a7,$a8,$a9,$aa,$ab,$ac,$ad,$ae,$af
+                 .byte $b0,$b1,$b2,$b3,$b4,$b5,$b6,$b7,$b8,$b9,$ba,$bb,$bc,$bd,$be,$bf
+
+;-----------------------------------------------------------------------------------
+; PetToAsc      - Convert a PETSCII character to ASCII
+;-----------------------------------------------------------------------------------
+; A             - Character to convert
+;-----------------------------------------------------------------------------------
+
+_AscToPet:      tay
+                lda ascToPetTable, y
+                rts
+
+_PetToAsc:      tay
+                lda petToAscTable, Y
+                rts
+
+;-----------------------------------------------------------------------------------
+; ReverseBits   - Reverse the bits in a byte
+;-----------------------------------------------------------------------------------
+; A = octet to be reversed
+;-----------------------------------------------------------------------------------
+
+_ReverseBits:
+                ldx #8           ; set counter to 8 (for 8 bits)
+                lda #0           ; initialize A to 0
+                sta temp         ; clear result byte (accumulator for the reversed octet)
+:               asl              ; shift leftmost bit of input into carry
+                lda temp         ; load the temporary result byte into A
+                ror              ; rotate carry into leftmost bit of result
+                sta temp         ; store the updated result back into memory
+                dex              ; decrement counter
+                bne :-           ; repeat until all bits are processed
+                lda temp         ; load the final reversed byte into A
+                rts              ; return with result in A
+
+;-----------------------------------------------------------------------------------
+; LoadFont      - Makes sure the font data is ready to use.  This usually requires
+;                 reversing the bits so that they match the bit order of the screen
+;-----------------------------------------------------------------------------------
+
+_LoadFont:      ldx #3
+                lda #<_font8x8_basic
+                sta adp1_lo
+                lda #>_font8x8_basic
+                sta adp1_hi
+                ldy #0
+@loop:          lda (adp1), y
+                jsr _ReverseBits
+                sta (adp1), y
+                iny
+                bne @loop
+
+                inc adp1_lo
+                bne :+
+                inc adp1_hi
+:               dex
+                bne @loop
+                rts
+
+ScreenLineAddresses:
+                .word SCREEN +  0 * BYTESPERCHARROW, SCREEN +  1 * BYTESPERCHARROW
+                .word SCREEN +  2 * BYTESPERCHARROW, SCREEN +  3 * BYTESPERCHARROW
+                .word SCREEN +  4 * BYTESPERCHARROW, SCREEN +  5 * BYTESPERCHARROW
+                .word SCREEN +  6 * BYTESPERCHARROW, SCREEN +  7 * BYTESPERCHARROW
+                .word SCREEN +  8 * BYTESPERCHARROW, SCREEN +  9 * BYTESPERCHARROW
+                .word SCREEN + 10 * BYTESPERCHARROW, SCREEN + 11 * BYTESPERCHARROW
+                .word SCREEN + 12 * BYTESPERCHARROW, SCREEN + 13 * BYTESPERCHARROW
+                .word SCREEN + 14 * BYTESPERCHARROW, SCREEN + 15 * BYTESPERCHARROW
+                .word SCREEN + 16 * BYTESPERCHARROW, SCREEN + 17 * BYTESPERCHARROW
+                .word SCREEN + 18 * BYTESPERCHARROW, SCREEN + 19 * BYTESPERCHARROW
+                .word SCREEN + 20 * BYTESPERCHARROW, SCREEN + 21 * BYTESPERCHARROW
+                .word SCREEN + 22 * BYTESPERCHARROW, SCREEN + 23 * BYTESPERCHARROW
+                .word SCREEN + 24 * BYTESPERCHARROW
+                .assert( (* - ScreenLineAddresses) = ROWSPERCOLUMN * 2), error
+
+;-----------------------------------------------------------------------------------
+; DrawChar     - Draws an ASCII character at char location x, y
+;-----------------------------------------------------------------------------------
+; 0 <= x < 40
+; 0 <= y < 25
+; Preserves all registers, but its not very threadsafe or reentrant
+;-----------------------------------------------------------------------------------
+
+_DrawChar:      sty tempy
+                stx tempx
+                sta tempa
+
+                tya                                 ; Get the address in screen memory where this
+                asl                                 ;  character X/Y cursor pos should be drawn
+                tay
+                txa
+                clc
+                adc ScreenLineAddresses, y
+                sta dest_lo
+                lda ScreenLineAddresses+1, y
+                adc #0
+                sta dest_hi
+
+                lda #0                              ; Get the address in font memory where this
+                sta src_hi                          ;  Petscii character lives (after conversion from
+                lda tempa                           ;  ascii)
+
+                sty temp2
+                jsr _AscToPet
+                ldy temp2
+
+                asl
+                rol src_hi
+                asl
+                rol src_hi
+                asl
+                rol src_hi
+                clc
+                adc #<_font8x8_basic                ; Add the base address of the font table to the offset
+                sta src_lo
+                lda src_hi
+                adc #>_font8x8_basic
+                sta src_hi
+
+                ldy #0                              ; opy the character def to the screen, one byte at a time
+                ldx #0
+:               lda (src), y                        ; Copy this byte from the character def to the screen target
+                sta (dest, x)
+                lda dest_lo                         ; Advance to the next "scanline", or pixel row, down
+                clc
+                adc #<BYTESPERROW
+                sta dest_lo
+                lda dest_hi
+                adc #>BYTESPERROW
+                sta dest_hi
+
+                iny
+                cpy #8
+                bne :-
+
+                ldy tempy
+                ldx tempx
+                lda tempa
+                rts
+
+;-----------------------------------------------------------------------------------
+; CursorOn     - Turns on the text cursor and draws it at the current cursor pos
+;-----------------------------------------------------------------------------------
+
+CursorOn:       ldx _cursorX
+                ldy _cursorY
+                lda #'_'
+                jsr _DrawChar
+                rts
+
+CursorOff:      ldx _cursorX
+                ldy _cursorY
+                lda #' '
+                jsr _DrawChar
+                rts
+
+;-----------------------------------------------------------------------------------
+; DrawText     - Draws an ASCII char in A at the current cursor pos, saves all regs
+;-----------------------------------------------------------------------------------
+
+_CharOut:       sta temp
+                lda #0
+                sta temp+1
+                txa
+                pha
+                tya
+                pha
+
+                ldx #<temp
+                ldy #>temp
+                jsr _DrawText
+
+                pla
+                tay
+                pla
+                tax
+                rts
+
+;-----------------------------------------------------------------------------------
+; Backspace    - Erase the current character and move back one position. Does not
+;                move back up to previous line
+;-----------------------------------------------------------------------------------
+
+Backspace:      lda _cursorX
+                beq colzero
+                jsr CursorOff
+                dec _cursorX
+                jsr CursorOn
+colzero:        rts
+
+;-----------------------------------------------------------------------------------
+; DrawText     - Draws an ASCII string at the current cursor position
+;-----------------------------------------------------------------------------------
+; XY           - Pointer to the string to draw, stops on NUL or 255 chars later
+;-----------------------------------------------------------------------------------
+
+_DrawText:      stx adp1_lo
+                sty adp1_hi
+                jsr CursorOff
+
+                ldy #0
+checkHWrap:     lda _cursorX
+                cmp #CHARSPERROW
+                bcc checkVWrap
+                lda #0
+                sta _cursorX
+                inc _cursorY
+
+checkVWrap:     lda _cursorY
+                cmp #ROWSPERCOLUMN
+                bcc loadChar
+                jsr _ScrollScreen
+                lda #ROWSPERCOLUMN-1
+                sta _cursorY
+
+loadChar:       lda (adp1), y
+                beq doneText
+
+                cmp #$0a
+                bne :+
+
+                lda #0                              ; Back to the left edge
+                sta _cursorX
+                inc _cursorY                        ; Advance to the next line
+                iny
+                bne checkHWrap
+
+:               sty temp
+                ldx _cursorX
+                ldy _cursorY
+                jsr _DrawChar
+                ldy temp
+                inc _cursorX
+                iny
+                bne checkHWrap
+
+doneText:       jsr CursorOn
+                rts
+
+demoText1:      .byte "  *** COMMODORE KIM-1 SHELL V0.1 ***", $0A, $0A
+                .byte "   60K RAM SYSTEM.  49152 BYTES FREE.", $0A, $0A, $00
+readyText:      .byte $0A,"READY.", $0A, 00
+
+_Demo:          jsr _ClearScreen
+                lda #0
+                sta _cursorX
+                sta _cursorY
+                ldx #<demoText1
+                ldy #>demoText1
+                jsr _DrawText
+                rts
+
+_Ready:         ldx #<readyText
+                ldy #>readyText
+                jsr _DrawText
+                rts
+
+
+;-----------------------------------------------------------------------------------
+; DrawLine    - Draws a line between two points
+;-----------------------------------------------------------------------------------
+; _x1cord (16-bit)
+; _y1cord ( 8-bit)
+; _x2cord (16-bit)
+; _y2cord ( 8-bit)
+;-----------------------------------------------------------------------------------
+; Implements something like Bresenham's algorithm for drawing a line:
+;-----------------------------------------------------------------------------------
+; void DrawLine(int x0, int y0, int x1, int y1, byte val)
+; {
+;     int dx = abs(_x2cord - _x1cord), sx = _x1cord < _x2cord ? 1 : -1;
+;     int dy = abs(_y2cord - _y1cord), sy = _y1cord < _y2cord ? 1 : -1;
+;     int err = (dx > dy ? dx : -dy) / 2, e2;
+;
+;     while (1)
+;     {
+;         SETPIXEL(_x1cord, _y1cord, val);
+;
+;         if (_x1cord == _x2cord && _y1cord == _y2cord)
+;             break;
+;
+;         e2 = err;
+;
+;         if (e2 > -dx)
+;         {
+;             err -= dy;
+;             _x1cord += sx;
+;         }
+;         if (e2 < dy)
+;         {
+;             err += dx;
+;             _y1cord += sy;
+;         }
+;     }
+; }
+;-----------------------------------------------------------------------------------
+
+_DrawLine:      sta pixel
+
+                ldx #$01                ; positive x-step for now
+                stx sx
+
+                ; Calculate dx = (x2cord - X1cord) and see if its positive or not
+
+                lda _x2cord             ; Calculate dx = (x2cord - X1cord)
+                sec
+                sbc _x1cord
+                sta dx
+                lda _x2cord+1
+                sbc _x1cord+1
+                sta dx+1
+                bpl calcdy              ; dx is positive (dx >= 0), so we're good
+
+                ; dx was negative (dx < 0), so we set sx to -1 and get the absolute
+                ;  value by subtracting the other direction
+
+                ldx #$FF                ; negative x-step
+                stx sx
+                lda _x1cord             ; Calculate dx = (x2cord - X1cord)
+                sec
+                sbc _x2cord
+                sta dx
+                lda _x1cord+1
+                sbc _x2cord+1
+                sta dx+1
+
+                ; Calculate dy = (y2cord - y1cord) and see if its positive or not
+
+calcdy:         ldx #$01                ; positive y-step for now
+                stx sy
+                lda _y2cord
+                sec
+                sbc _y1cord
+                sta dy
+                bcs positivedy          ; If y2cord > y1cord, then dy is positive and we're good
+
+                ; dy was negative (dy < 0), so we set sy to -1 and get the absolute value
+
+                ldx #$FF                ; negative y-step
+                stx sy
+                lda _y1cord
+                sec
+                sbc _y2cord
+                sta dy
+
+                ; Now we have dx and dy, so we can calculate err, but first we need
+                ;  to see if dx > dy or not
+
+positivedy:     lda dx+1                ; Check if dx > dy (both are always positive now)
+                bne dxgt                ; If MSB of dx is greater than zero, then dx > dy since dy is 8-bits
+                lda dy
+                cmp dx
+                bcs dygte
+
+dxgt:           lda dx                  ; We found dx>dy so set err = dx / 2
+                sta err
+                lda dx+1
+                lsr
+                sta err+1               ; err = dx/2
+                ror err
+                jmp loop
+
+dygte:          lda #0                  ; we found dx <= dy so set err = -dy / 2
+                sec
+                sbc dy                  ; else err = -dy / 2
+                ror
+                ora #$80
+                sta err
+                lda #$FF
+                sta err+1
+
+                ; Now we have dx, dy, and err, so we can start drawing pixels
+
+loop:           lda pixel
+                beq clearpixel
+                jsr _SetPixel           ; Plot the current _x1cord, _y1cord
+                jmp next
+clearpixel:     jsr _ClearPixel         ; Clear the current _x1cord, _y1cord
+
+next:           lda _x1cord             ; if (_x1cord == _x2cord && _y1cord == _y2cord) then we rts
+                cmp _x2cord
+                bne noteq
+                lda _y1cord
+                cmp _y2cord
+                bne noteq
+                lda _x1cord+1
+                cmp _x2cord+1
+                bne noteq
+
+                rts
+
+noteq:          lda err                 ; e2 = err
+                sta e2
+                lda err+1
+                sta e2+1
+
+                ; Check the two update conditions for x and y, and update if needed
+
+                lda e2                  ; if (e2 > -dx) is the same as if (e2 + dx > 0), so we test that because its easier
+                clc                     ;    If its true then we dec err and inc _x1cord
+                adc dx
+                sta temp
+                lda e2+1
+                adc dx+1
+                bmi doneupdatex         ; If result is negative, then e2 + dx < 0, so we don't dec err or inc _x1cord
+                bne stepx                ; If MSB is non-zero, then e2 + dx > 0, so we DO dec err and inc _x1cord
+                lda temp                ; If result is zero in MSB, then we check the LSB here
+                beq doneupdatex         ;    If LSB is zero, then we don't dec err or inc _x1cord
+                                        ; We already know e2 + dx > 0, so LSB can't be negative
+stepx:          lda sx
+                bmi decx
+incxval:        inc _x1cord             ; _x1cord += 1 because sx == 1
+                bne updatexerr
+                inc _x1cord+1
+                jmp updatexerr
+
+decx:           lda _x1cord             ; _x1cord += 1 because sx == 1
+                sec
+                sbc #1
+                sta _x1cord
+                lda _x1cord+1
+                sbc #0
+                sta _x1cord+1
+
+updatexerr:     lda err                 ; err -= dy
+                sec
+                sbc dy
+                sta err
+                lda err+1
+                sbc #0
+                sta err+1
+
+doneupdatex:    lda e2+1                ; if (e2 < dy) then we inc err and inc _y1cord
+                bmi updateerry          ; If MSB is negative, then e2 < dy, so we inc err and inc _y1cord
+                bne noupdatey           ; If the MSB of e2 is set and positive, then we know e2 > dy, so we don't inc err or inc _y1cord
+                lda e2
+                sec
+                sbc dy
+                beq noupdatey           ; e2 - dy == 0 so we don't inc err or inc _y1cord
+                bcs noupdatey           ; if e2 was large enough that carry never cleared, then e2 > dy do no update
+
+updateerry:     lda err                 ; err += dx
+                clc
+                adc dx
+                sta err
+                lda err+1
+                adc dx+1
+                sta err+1
+
+stepy:          lda _y1cord
+                clc
+                adc sy
+                sta _y1cord
+
+noupdatey:      jmp loop
+
+_getch:         jsr     $1E5A            ; Get character using Monitor ROM call
+                and     #$7F             ; Clear top bit
+                cmp     #$0D             ; Check for '\r'
+                bne     gotch            ; ...if CR character
+                lda     #$0A             ; Replace with '\n'
+gotch:          rts
diff --git a/samples/lynx/Makefile b/samples/lynx/Makefile
index b4ef64af0..e27d5801a 100644
--- a/samples/lynx/Makefile
+++ b/samples/lynx/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -29,6 +35,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_lynx = \
 	hello.lnx \
 	mandelbrot.lnx \
@@ -53,6 +67,7 @@ endif
 .SUFFIXES: .c .lnx
 
 %.lnx : %.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -Oris -m $*.map -o $@ $<
 
 clean:
diff --git a/samples/lynx/mandelbrot.c b/samples/lynx/mandelbrot.c
index ce49fbf7a..27ac7d340 100644
--- a/samples/lynx/mandelbrot.c
+++ b/samples/lynx/mandelbrot.c
@@ -26,7 +26,7 @@
 #define divfp(_a,_b)    ((((signed long)_a)<<fpshift)/(_b))
 
 /* Use static local variables for speed */
-#pragma static-locals (1);
+#pragma static-locals (1)
 
 
 
diff --git a/samples/mandelbrot.c b/samples/mandelbrot.c
index 519f3d823..f4e7b83a8 100644
--- a/samples/mandelbrot.c
+++ b/samples/mandelbrot.c
@@ -41,7 +41,7 @@
 #endif
 
 /* Use static local variables for speed */
-#pragma static-locals (1);
+#pragma static-locals (1)
 
 
 
diff --git a/samples/multidemo.c b/samples/multidemo.c
index 02bb6fcac..435c1b985 100644
--- a/samples/multidemo.c
+++ b/samples/multidemo.c
@@ -64,34 +64,34 @@ void log (char *msg)
 ** rather place all the code of certain source files into the overlay by
 ** compiling them with --code-name OVERLAY1.
 */
-#pragma code-name (push, "OVERLAY1");
+#pragma code-name (push, "OVERLAY1")
 
 void foo (void)
 {
     log ("Calling main from overlay 1");
 }
 
-#pragma code-name (pop);
+#pragma code-name (pop)
 
 
-#pragma code-name (push, "OVERLAY2");
+#pragma code-name (push, "OVERLAY2")
 
 void bar (void)
 {
     log ("Calling main from overlay 2");
 }
 
-#pragma code-name (pop);
+#pragma code-name (pop)
 
 
-#pragma code-name (push, "OVERLAY3");
+#pragma code-name (push, "OVERLAY3")
 
 void foobar (void)
 {
     log ("Calling main from overlay 3");
 }
 
-#pragma code-name(pop);
+#pragma code-name(pop)
 
 
 unsigned char loademdriver (void)
diff --git a/samples/overlaydemo.c b/samples/overlaydemo.c
index dde6b70ab..a37b06d4f 100644
--- a/samples/overlaydemo.c
+++ b/samples/overlaydemo.c
@@ -39,7 +39,7 @@ void log (char *msg)
 ** rather place all the code of certain source files into the overlay by
 ** compiling them with --code-name OVERLAY1.
 */
-#pragma code-name (push, "OVERLAY1");
+#pragma code-name (push, "OVERLAY1")
 
 void foo (void)
 {
@@ -51,27 +51,27 @@ void foo (void)
     log ("Calling main from overlay 1");
 }
 
-#pragma code-name (pop);
+#pragma code-name (pop)
 
 
-#pragma code-name (push, "OVERLAY2");
+#pragma code-name (push, "OVERLAY2")
 
 void bar (void)
 {
     log ("Calling main from overlay 2");
 }
 
-#pragma code-name (pop);
+#pragma code-name (pop)
 
 
-#pragma code-name (push, "OVERLAY3");
+#pragma code-name (push, "OVERLAY3")
 
 void foobar (void)
 {
     log ("Calling main from overlay 3");
 }
 
-#pragma code-name(pop);
+#pragma code-name(pop)
 
 
 unsigned char loadfile (char *name, void *addr, void *size)
diff --git a/samples/sieve.c b/samples/sieve.c
index 8d0619888..5ffc97b62 100644
--- a/samples/sieve.c
+++ b/samples/sieve.c
@@ -12,7 +12,7 @@
 
 
 /* Workaround missing clock stuff */
-#ifdef __APPLE2__
+#if defined(__APPLE2__) || defined(__AGAT__)
 #  define clock()               0
 #  define CLOCKS_PER_SEC        1
 #endif
@@ -38,7 +38,7 @@ static unsigned char Sieve[COUNT];
 
 
 
-#pragma static-locals(1);
+#pragma static-locals(1)
 
 
 
diff --git a/samples/sim65/Makefile b/samples/sim65/Makefile
new file mode 100644
index 000000000..43783afca
--- /dev/null
+++ b/samples/sim65/Makefile
@@ -0,0 +1,76 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
+
+# Run 'make SYS=<target>'; or, set a SYS env.
+# var. to build for another target system.
+SYS ?= sim6502
+
+# Just the usual way to find out if we're
+# using cmd.exe to execute make rules.
+ifneq ($(shell echo),)
+  CMD_EXE = 1
+endif
+
+ifdef CMD_EXE
+  NULLDEV = nul:
+  DEL = -del /f
+  RMDIR = rmdir /s /q
+else
+  NULLDEV = /dev/null
+  DEL = $(RM)
+  RMDIR = $(RM) -r
+endif
+
+ifdef CC65_HOME
+  AS = $(CC65_HOME)/bin/ca65
+  CC = $(CC65_HOME)/bin/cc65
+  CL = $(CC65_HOME)/bin/cl65
+  LD = $(CC65_HOME)/bin/ld65
+else
+  AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65)
+  CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65)
+  CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+  LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
+EXELIST_sim6502 = \
+        cpumode_example.bin \
+        timer_example.bin \
+        trace_example.bin
+
+ifneq ($(EXELIST_$(SYS)),)
+samples: $(EXELIST_$(SYS))
+else
+samples: notavailable
+endif
+
+# empty target used to skip systems that will not work with any program in this dir
+notavailable:
+ifeq ($(MAKELEVEL),0)
+	@echo "info: sim65 tests not available for" $(SYS)
+else
+# suppress the "nothing to be done for 'samples' message
+	@echo > $(NULLDEV)
+endif
+
+.SUFFIXES:
+.SUFFIXES: .c .bin
+
+%.bin : %.c
+	$(if $(QUIET),echo $(SYS):$@)
+	$(CL) -t $(SYS) -Oris -m $*.map -o $@ $<
+
+clean:
+	@$(DEL) *.o *.map *.bin 2>$(NULLDEV)
diff --git a/samples/sim65/cpumode_example.c b/samples/sim65/cpumode_example.c
new file mode 100644
index 000000000..6cc2d0c16
--- /dev/null
+++ b/samples/sim65/cpumode_example.c
@@ -0,0 +1,104 @@
+/*
+ * Sim65 cpu-mode switching example.
+ *
+ * Description
+ * -----------
+ *
+ * We can inspect and manipulate the CPU model that sim65 emulates at runtime.
+ *
+ * Sim65 always runs in one of three modes:
+ *
+ * - 6502 mode: the 151 documented opcodes are supported; if the processor encounters
+ *              one of the 105 undocumented opcodes, the simulator ends with an
+ *              'illegal opcode' message.
+ * - 65C02 mode: the 105 undocumented opcodes now have well-defined behavior. Some
+ *               do useful things, while all others are now defined as NOPs.
+ * - 6502X mode: the 105 undocumented opcodes don't have documented behavior, but
+ *               they /do/ have behavior on a real 6502. This behavior has been
+ *               figured out, and is deterministic (with minor exceptions).
+ *               In this mode, sim65 mimics the behavior of a real 6502 when
+ *               it encounters an undocumented opcode, rather than terminating.
+ *
+ * In the example below, we first switch to 6502X mode and execute a small
+ * assembly code fragment, then repeat this in 65C02 mode.
+ *
+ * The code fragment is designed to distinguish between a 6502 and a 65C02
+ * processor based on the behavior of the ADC function in decimal mode.
+ *
+ * Important Note:
+ *
+ * When running in a program compiled for the "sim6502" target, it is safe to switch to
+ * 65C02 or 6502X mode, since the runtime library will only use plain 6502 opcodes, and
+ * those work the same in 65C02 and 6502X mode.
+ *
+ * However, when running in a program compiled for the "sim65c02" target, it is NOT safe
+ * to switch to 6502 or 6502X mode, since many routines in the runtime library use
+ * 65C02-specific opcodes, and these will not work as expected when the CPU is switched
+ * to 6502 or 6502X mode. When such an instruction is encountered, the program will
+ * exhibit undefined behavior.
+ *
+ * For this reason, this program will only work when compiled for the "sim6502" target.
+ *
+ * Running the example
+ * -------------------
+ *
+ * cl65 -t sim6502 -O cpumode_example.c -o cpumode_example.prg
+ * sim65 cpumode_example.prg
+ *
+ */
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <sim65.h>
+
+static bool __fastcall__ is_65c02(void)
+{
+    /* This assembly routine loads 0 into AX on a 6502 (also on a 6502 on which decimal
+     * mode is not implemented), and 1 on a 65C02.
+     *
+     * Note: this implementation triggers a "control reaches end of non-void function"
+     * warning that can be safely ignored. While no return statement is present, the
+     * return value is correctly loaded into AX by the assembly code.
+     */
+    __asm__("sed");
+    __asm__("ldx #0");
+    __asm__("txa");
+    __asm__("sbc #155");
+    __asm__("asl");
+    __asm__("rol");
+    __asm__("and #1");
+    __asm__("cld");
+}
+
+int main(void)
+{
+    printf("CPU mode at startup ....... : %u\n", GET_CPU_MODE());
+    printf("Is 65C02? ................. : %s\n", is_65c02() ? "YES" : "NO");
+
+    printf("\n");
+
+    printf("Switching to 6502 mode ....\n");
+    SET_CPU_MODE(SIM65_CPU_MODE_6502);
+    printf("Current CPU mode .......... : %u\n", GET_CPU_MODE());
+    printf("Is 65C02? ................. : %s\n", is_65c02() ? "YES" : "NO");
+
+    printf("\n");
+
+    printf("Switching to 65C02 mode ...\n");
+    SET_CPU_MODE(SIM65_CPU_MODE_65C02);
+    printf("Current CPU mode .......... : %u\n", GET_CPU_MODE());
+    printf("Is 65C02? ................. : %s\n", is_65c02() ? "YES" : "NO");
+
+    printf("\n");
+
+    printf("Switching to 6502X mode ...\n");
+    SET_CPU_MODE(SIM65_CPU_MODE_6502X);
+    printf("Current CPU mode .......... : %u\n", GET_CPU_MODE());
+    printf("Is 65C02? ................. : %s\n", is_65c02() ? "YES" : "NO");
+
+    printf("\n");
+
+    printf("Bye!\n");
+
+    return 0;
+}
diff --git a/samples/sim65/timer_example.c b/samples/sim65/timer_example.c
new file mode 100644
index 000000000..8262bdff8
--- /dev/null
+++ b/samples/sim65/timer_example.c
@@ -0,0 +1,117 @@
+/*
+ * Sim65 timer example.
+ *
+ * Description
+ * -----------
+ *
+ * This example tests the clock cycle counter feature of sim65.
+ *
+ * The function 'timestamp' obtains the lower 32-bits of the clock cycle counter.
+ *
+ * The function 'calc_sum_terms' calculates the sum of a range of integers
+ * starting at zero. It simply iterates over all terms, which means that its
+ * runtime is a linear function of its input value.
+ *
+ * In the main function, we first derive an 'offset' value by getting two timestamp
+ * values, with nothing happening in between. Ideally this should yield a 0 clock
+ * cycle duration, but due to the overhead of calling the 'timestamp' function,
+ * and the 'timestamp' function itself, the difference between these timestamp
+ * will be non-zero. We store this value in the 'overhead' variable, and subtract
+ * this value in later measurements.
+ *
+ * Next, we measure the duration of calling the function 'calc_sum_terms' with two
+ * input values, 0, and 1. The duration includes storing the result in the 'result'
+ * variable.
+ *
+ * Extrapolating from these two measurements, and assuming that the runtime of
+ * calling 'calc_sum_terms' and storing its result scales linearly with its argument,
+ * we can predict the duration of a call to 'calc_sum_terms' with a much larger
+ * argument (max_terms = 10000).
+ *
+ * Finally, we actually measure the duration with max_terms = 10000. If the
+ * duration measured is equal to the predicted value, we exit successfully. If not,
+ * we exit with failure.
+ *
+ * Running the example
+ * -------------------
+ *
+ * cl65 -t sim6502 -O timer_example.c -o timer_example.prg
+ * sim65 timer_example.prg
+ *
+ */
+
+#include <stdio.h>
+#include <sim65.h>
+
+static uint32_t timestamp(void)
+{
+    peripherals.counter.select = COUNTER_SELECT_CLOCKCYCLE_COUNTER;
+    peripherals.counter.latch = 0;
+    return peripherals.counter.value32[0];
+}
+
+static unsigned long calc_sum_terms(unsigned max_term)
+/* A function with a runtime that scales linearly with its argument. */
+{
+    unsigned k;
+    unsigned long sum = 0;
+    for (k = 0; k <= max_term; ++k)
+    {
+        sum += k;
+    }
+    return sum;
+}
+
+int main(void)
+{
+    unsigned max_term;
+    unsigned long result;
+    uint32_t t1, t2, overhead;
+    int32_t d0, d1, duration;
+    int32_t predicted_duration;
+
+    /* Calibration measurement of zero clock cycles, to determine the overhead. */
+
+    overhead = 0;
+    t1 = timestamp();
+    t2 = timestamp() - overhead;
+    overhead = (t2 - t1);
+
+    /* Calculate call duration (including assignment of result) for argument value 0. */
+
+    max_term = 0;
+    t1 = timestamp();
+    result = calc_sum_terms(max_term);
+    t2 = timestamp();
+    d0 = (t2 - t1) - overhead;
+    printf("max_term = %u -> result = %lu; duration = %ld\n", max_term, result, d0);
+
+    /* Calculate call duration (including assignment of result) for argument value 1. */
+
+    max_term = 1;
+    t1 = timestamp();
+    result = calc_sum_terms(max_term);
+    t2 = timestamp();
+    d1 = (t2 - t1) - overhead;
+    printf("max_term = %u -> result = %lu; duration = %ld\n", max_term, result, d1);
+
+    /* Predict runtime for a much bigger argument value, 10000. */
+
+    max_term = 10000;
+    predicted_duration = d0 + max_term * (d1 - d0);
+
+    printf("predicted duration for max_term = %u: %ld\n", max_term, predicted_duration);
+
+    /* Do the actual measurement for max_term = 10000.
+     *  Note: equality between the prediction and the measurement is only achieved if we compile with -O.
+     */
+
+    t1 = timestamp();
+    result = calc_sum_terms(max_term);
+    t2 = timestamp();
+    duration = (t2 - t1) - overhead;
+    printf("max_term = %u -> result = %lu; duration = %ld\n", max_term, result, duration);
+
+
+    return 0;
+}
diff --git a/samples/sim65/trace_example.c b/samples/sim65/trace_example.c
new file mode 100644
index 000000000..ebfd89cb1
--- /dev/null
+++ b/samples/sim65/trace_example.c
@@ -0,0 +1,40 @@
+/*
+ * Sim65 trace functionality example.
+ *
+ * Description
+ * -----------
+ *
+ * The easiest way to use tracing in sim65 is to pass the '--trace' option
+ * to sim65 while starting a program.
+ *
+ * However, it is also possiblke to enable and disable the trace functionality
+ * at runtime, from within the C code itself. This can be useful to produce
+ * runtime traces of small code fragments for debugging purposes.
+ *
+ * In this example, We use the TRACE_ON and TRACE_OFF macros provided in sim65.h
+ * to trace what the CPU is doing during a single statement: the assignment of
+ * a constant to a global variable.
+ *
+ * Running the example
+ * -------------------
+ *
+ * cl65 -t sim6502 -O trace_example.c -o trace_example.prg
+ * sim65 trace_example.prg
+ *
+ * Compiling and running the program like this will produce a trace of six 6502 instructions.
+ * The first four instructions correspond to the 'x = 0x1234' assignment statement.
+ * The last two instructions (ending in a store to address $FFCB) disable the trace facility.
+ *
+ */
+
+#include <sim65.h>
+
+unsigned x;
+
+int main(void)
+{
+    TRACE_ON();
+    x = 0x1234;
+    TRACE_OFF();
+    return 0;
+}
diff --git a/samples/supervision/Makefile b/samples/supervision/Makefile
index 097329384..cae5885ff 100644
--- a/samples/supervision/Makefile
+++ b/samples/supervision/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -33,6 +39,14 @@ else
   SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_supervision = \
         hello
 
@@ -52,6 +66,7 @@ else
 endif
 
 hello: hello.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o hello -m hello.map hello.c
 	
 clean:
diff --git a/samples/sym1/Makefile b/samples/sym1/Makefile
index 281b5bcd0..a5b2e35b5 100644
--- a/samples/sym1/Makefile
+++ b/samples/sym1/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,6 +37,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_sym1 = \
         symHello.bin symTiny.bin symDisplay.bin symIO.bin symNotepad.bin symExtendedMemory.bin
 
@@ -50,21 +64,27 @@ else
 endif
 
 symHello.bin: symHello.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t sym1 -O -o symHello.bin symHello.c
 
 symTiny.bin: symTiny.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t sym1 -O -o symTiny.bin symTiny.c
 
 symDisplay.bin: symDisplay.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t sym1 -O -o symDisplay.bin symDisplay.c
 
 symIO.bin: symIO.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t sym1 -C sym1-32k.cfg -O -o symIO.bin symIO.c
 
 symNotepad.bin: symNotepad.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t sym1 -C sym1-32k.cfg -O -o symNotepad.bin symNotepad.c
 
 symExtendedMemory.bin: symExtendedMemory.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t sym1 -C sym1-32k.cfg -O -o symExtendedMemory.bin symExtendedMemory.c
 
 
diff --git a/samples/sym1/symDisplay.c b/samples/sym1/symDisplay.c
index 43d18f911..0dafab33d 100644
--- a/samples/sym1/symDisplay.c
+++ b/samples/sym1/symDisplay.c
@@ -73,7 +73,7 @@ int main (void) {
 
          displayable = 1;              // Assume character is mapped
 
-         switch ( buffer[l] ) {        // Put the typed charaters
+         switch ( buffer[l] ) {        // Put the typed characters
             case '1':                  // into the display buffer
                DISPLAY.d6 = DISP_1;    // one at a time
                break;
diff --git a/samples/tgidemo.c b/samples/tgidemo.c
index f193a1b83..cdb4c3ad9 100644
--- a/samples/tgidemo.c
+++ b/samples/tgidemo.c
@@ -12,8 +12,10 @@
 #  define DYN_DRV       1
 #endif
 
-#define COLOR_BACK      TGI_COLOR_BLACK
-#define COLOR_FORE      TGI_COLOR_WHITE
+
+/* Color values passed to TGI functions are indices into the default palette. */
+#define COLOR_BACK      0
+#define COLOR_FORE      1
 
 
 /*****************************************************************************/
@@ -65,17 +67,39 @@ static void DoWarning (void)
 #endif
 
 
+/*
+ * Note that everywhere else in the TGI API, colors are referred to via an index
+ * to the current palette.
+ *
+ * TGI_COLOR_ values can be used (ONLY!) for setting the palette, using them
+ * with other TGI functions only works by chance, on some targets.
+ */
+static void DoPalette (int n)
+{
+    static const unsigned char Palette[4][2] = {
+/* FIXME: add some ifdefs with proper values for targets that need it */
+#if !defined(__APPLE2__)
+        { TGI_COLOR_BLACK, TGI_COLOR_BLUE },
+        { TGI_COLOR_WHITE, TGI_COLOR_BLACK },
+        { TGI_COLOR_RED, TGI_COLOR_BLACK },
+#else
+        { TGI_COLOR_WHITE, TGI_COLOR_BLACK },
+        { TGI_COLOR_BLACK, TGI_COLOR_WHITE },
+        { TGI_COLOR_WHITE, TGI_COLOR_BLACK },
+#endif
+    };
+    tgi_setpalette (Palette[n]);
+}
+
 
 static void DoCircles (void)
 {
-    static const unsigned char Palette[2] = { TGI_COLOR_WHITE, TGI_COLOR_BLUE };
     unsigned char I;
     unsigned char Color = COLOR_BACK;
     const unsigned X = MaxX / 2;
     const unsigned Y = MaxY / 2;
     const unsigned Limit = (X < Y) ? Y : X;
 
-    tgi_setpalette (Palette);
     tgi_setcolor (COLOR_FORE);
     tgi_clear ();
     tgi_line (0, 0, MaxX, MaxY);
@@ -87,7 +111,9 @@ static void DoCircles (void)
             tgi_ellipse (X, Y, I, tgi_imulround (I, AspectRatio));
         }
     }
-
+    while (kbhit ()) {
+        cgetc ();
+    }
     cgetc ();
 }
 
@@ -95,11 +121,9 @@ static void DoCircles (void)
 
 static void DoCheckerboard (void)
 {
-    static const unsigned char Palette[2] = { TGI_COLOR_WHITE, TGI_COLOR_BLACK };
     unsigned X, Y;
     unsigned char Color = COLOR_BACK;
 
-    tgi_setpalette (Palette);
     tgi_clear ();
 
     while (1) {
@@ -123,13 +147,11 @@ static void DoCheckerboard (void)
 
 static void DoDiagram (void)
 {
-    static const unsigned char Palette[2] = { TGI_COLOR_WHITE, TGI_COLOR_BLACK };
     int XOrigin, YOrigin;
     int Amp;
     int X, Y;
     unsigned I;
 
-    tgi_setpalette (Palette);
     tgi_setcolor (COLOR_FORE);
     tgi_clear ();
 
@@ -160,6 +182,9 @@ static void DoDiagram (void)
         tgi_lineto (XOrigin + X, YOrigin + Y);
     }
 
+    while (kbhit ()) {
+        cgetc ();
+    }
     cgetc ();
 }
 
@@ -167,11 +192,9 @@ static void DoDiagram (void)
 
 static void DoLines (void)
 {
-    static const unsigned char Palette[2] = { TGI_COLOR_WHITE, TGI_COLOR_BLACK };
     unsigned X;
     const unsigned Min = (MaxX < MaxY) ? MaxX : MaxY;
 
-    tgi_setpalette (Palette);
     tgi_setcolor (COLOR_FORE);
     tgi_clear ();
 
@@ -182,6 +205,9 @@ static void DoLines (void)
         tgi_line (Min, Min, Min-X, 0);
     }
 
+    while (kbhit ()) {
+        cgetc ();
+    }
     cgetc ();
 }
 
@@ -216,10 +242,11 @@ int main (void)
     Border = bordercolor (COLOR_BLACK);
 
     /* Do graphics stuff */
-    DoCircles ();
-    DoCheckerboard ();
-    DoDiagram ();
-    DoLines ();
+
+    /* use default palette */ DoCircles ();
+    DoPalette (0); DoCheckerboard ();
+    DoPalette (1); DoDiagram ();
+    DoPalette (2); DoLines ();
 
 #if DYN_DRV
     /* Unload the driver */
diff --git a/samples/tinyshell.c b/samples/tinyshell.c
index 71e9b56e3..a8d5340d9 100644
--- a/samples/tinyshell.c
+++ b/samples/tinyshell.c
@@ -112,17 +112,17 @@ static void get_command(void)
 #ifdef CHECK_SP
     static char firstcall = 1;
     static unsigned int good_sp;
-    unsigned int sp;
+    unsigned int c_sp;
     if (firstcall)
-        sp = good_sp = getsp();
+        c_sp = good_sp = getsp();
     else
-        sp = getsp();
+        c_sp = getsp();
 
-    if (sp != good_sp) {
-        printf("SP: 0x%04X  ***MISMATCH*** 0x%04X\n", sp, good_sp);
+    if (c_sp != good_sp) {
+        printf("SP: 0x%04X  ***MISMATCH*** 0x%04X\n", c_sp, good_sp);
     }
     else if (verbose)
-        printf("SP: 0x%04X\n", sp);
+        printf("SP: 0x%04X\n", c_sp);
 #endif
 
     arg1 = arg2 = arg3 = NULL;
diff --git a/samples/tutorial/Makefile b/samples/tutorial/Makefile
index eb8627c29..3c3d1edb9 100644
--- a/samples/tutorial/Makefile
+++ b/samples/tutorial/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,12 +37,23 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_atari2600 = \
 	notavailable
 
 EXELIST_atari5200 = \
 	notavailable
 
+EXELIST_atari7800 = \
+	notavailable
+
 EXELIST_bbc = \
 	notavailable
 
@@ -77,9 +94,12 @@ ifndef EXELIST_$(SYS)
 EXELIST_$(SYS) := ${patsubst %.c,%,$(wildcard *.c)}
 endif
 
+all: samples
+
 samples: $(EXELIST_$(SYS))
 
 hello: hello.c text.s
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -o hello hello.c text.s
 
 # empty target used to skip systems that will not work with any program in this dir
diff --git a/src/Makefile b/src/Makefile
index 034a2230f..f652f6925 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,11 @@
-ifneq ($(shell echo),)
-  CMD_EXE = 1
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
 endif
 
-ifneq ($(V),1)
-  Q=@
-else
-  Q=
+ifneq ($(shell echo),)
+  CMD_EXE = 1
 endif
 
 PROGS = ar65     \
@@ -46,6 +46,21 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+    NULLOUT = >$(NULLDEV)
+    NULLERR = 2>$(NULLDEV)
+endif
+
+ifdef QUIET
+    .SILENT:
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+ifndef CMD_EXE
+    CATERR = 2> ../wrk/common/$$@.errlog || (cat ../wrk/common/$$@.errlog && false)
+endif
+endif
+
 CC = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 
@@ -64,7 +79,10 @@ ifndef BUILD_ID
     BUILD_ID := N/A
   endif
 endif
-$(info BUILD_ID: $(BUILD_ID))
+
+ifneq ($(SILENT),s)
+  $(info BUILD_ID: $(BUILD_ID))
+endif
 
 CFLAGS += -MMD -MP -O3 -I common \
           -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
@@ -83,6 +101,13 @@ ifdef CROSS_COMPILE
 endif
 
 all bin: $(PROGS)
+ifeq ($(MAKELEVEL),0)
+ifndef PREFIX
+ifndef DESTDIR
+	$(warning Warning: PREFIX and DESTDIR are empty - make install will not work)
+endif
+endif
+endif
 
 mostlyclean:
 	$(call RMDIR,../wrk)
@@ -155,8 +180,8 @@ $1: ../bin/$1$(EXE_SUFFIX)
 endef # PROG_template
 
 ../wrk/%.o: %.c
-	@echo $<
-	$(Q)$(CC) -c $(CFLAGS) -o $@ $<
+	$(if $(QUIET),echo CC:$@)
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 ../bin:
 	@$(call MKDIR,$@)
@@ -164,8 +189,25 @@ endef # PROG_template
 $(eval $(call OBJS_template,common))
 
 ../wrk/common/common.a: $(common_OBJS)
-	$(AR) r $@ $?
+	$(if $(QUIET),echo AR:$@)
+	$(AR) r $@ $? $(CATERR)
 
 $(foreach prog,$(PROGS),$(eval $(call PROG_template,$(prog))))
 
+
+.PHONY: dbginfo dbgsh test
+
+test: dbginfo dbgsh
+
+$(eval $(call OBJS_template,dbginfo))
+
+dbginfo: $(dbginfo_OBJS)
+
+../wrk/dbgsh$(EXE_SUFFIX): $(dbginfo_OBJS) ../wrk/common/common.a
+	$(if $(QUIET),echo LINK:$@)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+dbgsh: ../wrk/dbgsh$(EXE_SUFFIX)
+
+
 -include $(DEPS)
diff --git a/src/ar65.vcxproj b/src/ar65.vcxproj
index 27d12dadc..0fd788e06 100644
--- a/src/ar65.vcxproj
+++ b/src/ar65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="ar65\add.h" />
     <ClInclude Include="ar65\del.h" />
diff --git a/src/ca65.vcxproj b/src/ca65.vcxproj
index 3cc6019f2..d8fd39303 100644
--- a/src/ca65.vcxproj
+++ b/src/ca65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="ca65\anonname.h" />
     <ClInclude Include="ca65\asserts.h" />
diff --git a/src/ca65/condasm.c b/src/ca65/condasm.c
index 6198f4017..7cd3310b3 100644
--- a/src/ca65/condasm.c
+++ b/src/ca65/condasm.c
@@ -133,24 +133,26 @@ static void SetIfCond (IfDesc* ID, int C)
 
 
 
-static void ElseClause (IfDesc* ID, const char* Directive)
-/* Enter an .ELSE clause */
+static int ElseClause (IfDesc* ID, const char* Directive)
+/* Enter an .ELSE clause. Return true if this was ok, zero on errors. */
 {
     /* Check if we have an open .IF - otherwise .ELSE is not allowed */
     if (ID == 0) {
         Error ("Unexpected %s", Directive);
-        return;
+        return 0;
     }
 
     /* Check for a duplicate else, then remember that we had one */
     if (ID->Flags & ifElse) {
         /* We already had a .ELSE ! */
         Error ("Duplicate .ELSE");
+        return 0;
     }
     ID->Flags |= ifElse;
 
     /* Condition is inverted now */
     ID->Flags ^= ifCond;
+    return 1;
 }
 
 
@@ -226,46 +228,52 @@ void DoConditionals (void)
                 D = GetCurrentIf ();
 
                 /* Allow an .ELSE */
-                ElseClause (D, ".ELSE");
+                if (ElseClause (D, ".ELSE")) {
+                    /* Remember the data for the .ELSE */
+                    if (D) {
+                        ReleaseFullLineInfo (&D->LineInfos);
+                        GetFullLineInfo (&D->LineInfos);
+                        D->Name = ".ELSE";
+                    }
 
-                /* Remember the data for the .ELSE */
-                if (D) {
-                    ReleaseFullLineInfo (&D->LineInfos);
-                    GetFullLineInfo (&D->LineInfos);
-                    D->Name = ".ELSE";
+                    /* Calculate the new overall condition */
+                    CalcOverallIfCond ();
+
+                    /* Skip .ELSE */
+                    NextTok ();
+                    ExpectSep ();
+                } else {
+                    /* Problem with .ELSE, ignore remainder of line */
+                    SkipUntilSep ();
                 }
-
-                /* Calculate the new overall condition */
-                CalcOverallIfCond ();
-
-                /* Skip .ELSE */
-                NextTok ();
-                ExpectSep ();
                 break;
 
             case TOK_ELSEIF:
                 D = GetCurrentIf ();
                 /* Handle as if there was an .ELSE first */
-                ElseClause (D, ".ELSEIF");
+                if (ElseClause (D, ".ELSEIF")) {
+                    /* Calculate the new overall if condition */
+                    CalcOverallIfCond ();
 
-                /* Calculate the new overall if condition */
-                CalcOverallIfCond ();
+                    /* Allocate and prepare a new descriptor */
+                    D = AllocIf (".ELSEIF", 0);
+                    NextTok ();
 
-                /* Allocate and prepare a new descriptor */
-                D = AllocIf (".ELSEIF", 0);
-                NextTok ();
+                    /* Ignore the new condition if we are inside a false .ELSE
+                    ** branch. This way we won't get any errors about undefined
+                    ** symbols or similar...
+                    */
+                    if (IfCond) {
+                        SetIfCond (D, ConstExpression ());
+                        ExpectSep ();
+                    }
 
-                /* Ignore the new condition if we are inside a false .ELSE
-                ** branch. This way we won't get any errors about undefined
-                ** symbols or similar...
-                */
-                if (IfCond) {
-                    SetIfCond (D, ConstExpression ());
-                    ExpectSep ();
+                    /* Get the new overall condition */
+                    CalcOverallIfCond ();
+                } else {
+                    /* Problem with .ELSEIF, ignore remainder of line */
+                    SkipUntilSep ();
                 }
-
-                /* Get the new overall condition */
-                CalcOverallIfCond ();
                 break;
 
             case TOK_ENDIF:
@@ -386,6 +394,16 @@ void DoConditionals (void)
                 CalcOverallIfCond ();
                 break;
 
+            case TOK_IFP02X:
+                D = AllocIf (".IFP02X", 1);
+                NextTok ();
+                if (IfCond) {
+                    SetIfCond (D, GetCPU() == CPU_6502X);
+                }
+                ExpectSep ();
+                CalcOverallIfCond ();
+                break;
+
             case TOK_IFP4510:
                 D = AllocIf (".IFP4510", 1);
                 NextTok ();
@@ -396,6 +414,26 @@ void DoConditionals (void)
                 CalcOverallIfCond ();
                 break;
 
+            case TOK_IFP45GS02:
+                D = AllocIf (".IFP45GS02", 1);
+                NextTok ();
+                if (IfCond) {
+                    SetIfCond (D, GetCPU() == CPU_45GS02);
+                }
+                ExpectSep ();
+                CalcOverallIfCond ();
+                break;
+
+            case TOK_IFP6280:
+                D = AllocIf (".IFP6280", 1);
+                NextTok ();
+                if (IfCond) {
+                    SetIfCond (D, GetCPU() == CPU_HUC6280);
+                }
+                ExpectSep ();
+                CalcOverallIfCond ();
+                break;
+
             case TOK_IFP816:
                 D = AllocIf (".IFP816", 1);
                 NextTok ();
@@ -416,6 +454,16 @@ void DoConditionals (void)
                 CalcOverallIfCond ();
                 break;
 
+            case TOK_IFPCE02:
+                D = AllocIf (".IFPCE02", 1);
+                NextTok ();
+                if (IfCond) {
+                    SetIfCond (D, GetCPU() == CPU_65CE02);
+                }
+                ExpectSep ();
+                CalcOverallIfCond ();
+                break;
+
             case TOK_IFPDTV:
                 D = AllocIf (".IFPDTV", 1);
                 NextTok ();
@@ -426,6 +474,16 @@ void DoConditionals (void)
                 CalcOverallIfCond ();
                 break;
 
+            case TOK_IFPM740:
+                D = AllocIf (".IFPM740", 1);
+                NextTok ();
+                if (IfCond) {
+                    SetIfCond (D, GetCPU() == CPU_M740);
+                }
+                ExpectSep ();
+                CalcOverallIfCond ();
+                break;
+
             case TOK_IFPSC02:
                 D = AllocIf (".IFPSC02", 1);
                 NextTok ();
@@ -436,6 +494,26 @@ void DoConditionals (void)
                 CalcOverallIfCond ();
                 break;
 
+            case TOK_IFPSWEET16:
+                D = AllocIf (".IFPSWEET16", 1);
+                NextTok ();
+                if (IfCond) {
+                    SetIfCond (D, GetCPU() == CPU_SWEET16);
+                }
+                ExpectSep ();
+                CalcOverallIfCond ();
+                break;
+
+            case TOK_IFPWC02:
+                D = AllocIf (".IFPWC02", 1);
+                NextTok ();
+                if (IfCond) {
+                    SetIfCond (D, GetCPU() == CPU_W65C02);
+                }
+                ExpectSep ();
+                CalcOverallIfCond ();
+                break;
+
             case TOK_IFREF:
                 D = AllocIf (".IFREF", 1);
                 NextTok ();
@@ -477,11 +555,18 @@ int CheckConditionals (void)
         case TOK_IFNDEF:
         case TOK_IFNREF:
         case TOK_IFP02:
+        case TOK_IFP02X:
         case TOK_IFP4510:
+        case TOK_IFP45GS02:
+        case TOK_IFP6280:
         case TOK_IFP816:
         case TOK_IFPC02:
+        case TOK_IFPCE02:
         case TOK_IFPDTV:
+        case TOK_IFPM740:
         case TOK_IFPSC02:
+        case TOK_IFPSWEET16:
+        case TOK_IFPWC02:
         case TOK_IFREF:
             DoConditionals ();
             return 1;
diff --git a/src/ca65/ea65.c b/src/ca65/ea65.c
index 5bd2ba82b..898b344ca 100644
--- a/src/ca65/ea65.c
+++ b/src/ca65/ea65.c
@@ -101,6 +101,9 @@ void GetEA (EffAddr* A)
     if (TokIsSep (CurTok.Tok)) {
 
         A->AddrModeSet = AM65_IMPLICIT;
+        if (GetCPU () == CPU_45GS02) {
+            A->AddrModeSet |= AM65_Q;
+        }
 
     } else if (CurTok.Tok == TOK_HASH) {
 
@@ -114,6 +117,11 @@ void GetEA (EffAddr* A)
         NextTok ();
         A->AddrModeSet = AM65_ACCU;
 
+    } else if (CurTok.Tok == TOK_Q) {
+
+        NextTok ();
+        A->AddrModeSet = AM65_Q;
+
     } else if (CurTok.Tok == IndirectEnter) {
 
         /* One of the indirect modes */
@@ -160,8 +168,19 @@ void GetEA (EffAddr* A)
                 }
             } else {
                 /* (adr) */
-                A->AddrModeSet = (CPU == CPU_4510) ? AM65_ABS_IND
-                                                   : AM65_ABS_IND | AM65_ABS_IND_LONG | AM65_DIR_IND;
+                switch (CPU) {
+                    case CPU_4510:
+                        A->AddrModeSet = AM65_ABS_IND;
+                        break;
+
+                    case CPU_45GS02:
+                        A->AddrModeSet = AM65_ABS_IND | AM65_DIR_IND;
+                        break;
+
+                    default:
+                        A->AddrModeSet = AM65_ABS_IND | AM65_ABS_IND_LONG | AM65_DIR_IND;
+                        break;
+                }
             }
         }
 
@@ -175,8 +194,14 @@ void GetEA (EffAddr* A)
         if (CurTok.Tok == TOK_COMMA) {
             /* [dir],y */
             NextTok ();
-            Consume (TOK_Y, "'Y' expected");
-            A->AddrModeSet = AM65_DIR_IND_LONG_Y;
+            if (GetCPU () == CPU_45GS02) {
+                Consume (TOK_Z, "'Z' expected");
+                A->AddrModeSet = AM65_32BIT_BASE_IND_Z;
+            }
+            else {
+                Consume (TOK_Y, "'Y' expected");
+                A->AddrModeSet = AM65_DIR_IND_LONG_Y;
+            }
         } else {
             /* [dir] */
             A->AddrModeSet = AM65_DIR_IND_LONG | AM65_ABS_IND_LONG;
@@ -186,10 +211,11 @@ void GetEA (EffAddr* A)
 
         /* Remaining stuff:
         **
-        ** adr
-        ** adr,x
-        ** adr,y
-        ** adr,s
+        ** addr
+        ** addr, x
+        ** addr, y
+        ** addr, s
+        ** addr, relative addr
         */
         A->Expr = Expression ();
 
@@ -214,7 +240,9 @@ void GetEA (EffAddr* A)
                     break;
 
                 default:
-                    Error ("Syntax error");
+                    /* FIXME: syntax error if not zp, ind */
+                    A->AddrModeSet = AM65_ZP_REL;
+                    break;
 
             }
 
diff --git a/src/ca65/error.c b/src/ca65/error.c
index 7e1457964..78941b5c2 100644
--- a/src/ca65/error.c
+++ b/src/ca65/error.c
@@ -148,7 +148,7 @@ static void AddNotifications (const Collection* LineInfos)
                 break;
 
             case LI_TYPE_MACRO:
-                Msg = "Macro was defined here";
+                Msg = "Expanded from macro here";
                 break;
 
             case LI_TYPE_MACPARAM:
diff --git a/src/ca65/expr.c b/src/ca65/expr.c
index 5dcf5ca71..33984610d 100644
--- a/src/ca65/expr.c
+++ b/src/ca65/expr.c
@@ -37,6 +37,7 @@
 #include <time.h>
 
 /* common */
+#include "capability.h"
 #include "check.h"
 #include "cpu.h"
 #include "exprdefs.h"
@@ -60,6 +61,7 @@
 #include "studyexpr.h"
 #include "symbol.h"
 #include "symtab.h"
+#include "target.h"
 #include "toklist.h"
 #include "ulabel.h"
 #include "macro.h"
@@ -405,6 +407,66 @@ static ExprNode* FuncBlank (void)
 
 
 
+static ExprNode* FuncCapability (void)
+/* Handle the .CAPABILITY builtin function */
+{
+    int Result = 1;
+
+    /* What follows is a comma separated list of identifiers. An empty list is
+    ** not allowed.
+    */
+    while (1) {
+
+        const char* Name;
+        capability_t Cap;
+
+        /* We must have an identifier */
+        if (CurTok.Tok != TOK_IDENT) {
+            Error ("Arguments to .CAPABILITY must be identifiers");
+            /* Skip tokens until closing paren or end of line */
+            while (CurTok.Tok != TOK_RPAREN && !TokIsSep (CurTok.Tok)) {
+                NextTok ();
+            }
+            return GenLiteral0 ();
+        }
+
+        /* Search for the capability that matches this identifier. Ignore case
+        ** on the specified capabilities.
+        */
+        UpcaseSVal ();
+        SB_Terminate (&CurTok.SVal);
+        Name = SB_GetConstBuf (&CurTok.SVal);
+        Cap = FindCapability (Name);
+
+        /* Check if the capability is supported */
+        if (Cap == CAP_INVALID) {
+            Error ("Not a valid capability name: %s", Name);
+            Result = 0;
+        } else {
+            /* The pseudo function result is the logical AND of all capabilities
+            ** given.
+            */
+            if (!CPUHasCap (Cap) && !TargetHasCap (Cap)) {
+                Result = 0;
+            }
+        }
+
+        /* Skip the capability name */
+        NextTok ();
+
+        /* Handle end of list or next capability */
+        if (CurTok.Tok != TOK_COMMA) {
+            break;
+        }
+        NextTok ();
+    }
+
+    /* Done */
+    return GenLiteralExpr (Result);
+}
+
+
+
 static ExprNode* FuncConst (void)
 /* Handle the .CONST builtin function */
 {
@@ -484,9 +546,10 @@ static ExprNode* FuncIsMnemonic (void)
             if (FindMacro (&CurTok.SVal) == 0) {
                 Instr = FindInstruction (&CurTok.SVal);
             }
-        }
-        else {
-            /* Macros and symbols may NOT use the names of instructions, so just check for the instruction */
+        } else {
+            /* Macros and symbols may NOT use the names of instructions, so
+            ** just check for the instruction.
+            */
             Instr = FindInstruction (&CurTok.SVal);
         }
     }
@@ -532,7 +595,7 @@ static ExprNode* DoMatch (enum TC EqualityLevel)
     token_t Term = GetTokListTerm (TOK_COMMA);
     while (CurTok.Tok != Term) {
 
-        /* We may not end-of-line of end-of-file here */
+        /* We may not end-of-line or end-of-file here */
         if (TokIsSep (CurTok.Tok)) {
             Error ("Unexpected end of line");
             return GenLiteral0 ();
@@ -570,7 +633,7 @@ static ExprNode* DoMatch (enum TC EqualityLevel)
     Node = Root;
     while (CurTok.Tok != Term) {
 
-        /* We may not end-of-line of end-of-file here */
+        /* We may not end-of-line or end-of-file here */
         if (TokIsSep (CurTok.Tok)) {
             Error ("Unexpected end of line");
             return GenLiteral0 ();
@@ -1129,6 +1192,10 @@ static ExprNode* Factor (void)
             N = Function (FuncBlank);
             break;
 
+        case TOK_CAP:
+            N = Function (FuncCapability);
+            break;
+
         case TOK_CONST:
             N = Function (FuncConst);
             break;
diff --git a/src/ca65/feature.c b/src/ca65/feature.c
index 9f5ca5876..6a38900b5 100644
--- a/src/ca65/feature.c
+++ b/src/ca65/feature.c
@@ -67,6 +67,7 @@ static const char* const FeatureKeys[FEAT_COUNT] = {
     "bracket_as_indirect",
     "string_escapes",
     "long_jsr_jmp_rts",
+    "line_continuations",
 };
 
 
@@ -121,6 +122,7 @@ void SetFeature (feature_t Feature, unsigned char On)
         case FEAT_BRACKET_AS_INDIRECT:        BracketAsIndirect = On;    break;
         case FEAT_STRING_ESCAPES:             StringEscapes     = On;    break;
         case FEAT_LONG_JSR_JMP_RTS:           LongJsrJmpRts     = On;    break;
+        case FEAT_LINE_CONTINUATIONS:         LineCont          = On;    break;
         default:                                                         break;
     }
 }
diff --git a/src/ca65/feature.h b/src/ca65/feature.h
index 8eeb62e6f..4d307f74d 100644
--- a/src/ca65/feature.h
+++ b/src/ca65/feature.h
@@ -69,6 +69,7 @@ typedef enum {
     FEAT_BRACKET_AS_INDIRECT,
     FEAT_STRING_ESCAPES,
     FEAT_LONG_JSR_JMP_RTS,
+    FEAT_LINE_CONTINUATIONS,
 
     /* Special value: Number of features available */
     FEAT_COUNT
diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index da6bd6e44..d38a42843 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -85,6 +85,12 @@ static void PutBlockTransfer (const InsDesc* Ins);
 static void PutBitBranch (const InsDesc* Ins);
 /* Handle 65C02 branch on bit condition */
 
+static void PutBitBranch_m740 (const InsDesc* Ins);
+/* Handle m740 branch on bit condition */
+
+static void PutLDM_m740 (const InsDesc* Ins);
+/* Handle m740 LDM instruction */
+
 static void PutREP (const InsDesc* Ins);
 /* Emit a REP instruction, track register sizes */
 
@@ -132,6 +138,11 @@ static void PutJSR816 (const InsDesc* Ins);
 ** Allowing the long_jsr_jmp_rts feature to permit a long JSR.
 */
 
+static void PutJSR_m740 (const InsDesc* Ins);
+/* Handle the JSR instruction for the m740
+** Allowing the special page feature.
+*/
+
 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.
@@ -143,6 +154,12 @@ static void PutAll (const InsDesc* Ins);
 static void Put4510 (const InsDesc* Ins);
 /* Handle instructions of 4510 not matching any EATab */
 
+static void Put45GS02 (const InsDesc* Ins);
+/* Handle [adr],z instructions of 45GS02 */
+
+static void Put45GS02_Q (const InsDesc* Ins);
+/* Handle Q instructions of 45GS02 */
+
 static void PutSweet16 (const InsDesc* Ins);
 /* Handle a generic sweet16 instruction */
 
@@ -169,8 +186,10 @@ static const struct {
     unsigned Count;
     InsDesc  Ins[56];
 } InsTab6502 = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTab6502.Ins) / sizeof (InsTab6502.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x080A26C, 0x60, 0, PutAll },
         { "AND",  0x080A26C, 0x20, 0, PutAll },
         { "ASL",  0x000006e, 0x02, 1, PutAll },
@@ -227,6 +246,7 @@ static const struct {
         { "TXA",  0x0000001, 0x8a, 0, PutAll },
         { "TXS",  0x0000001, 0x9a, 0, PutAll },
         { "TYA",  0x0000001, 0x98, 0, PutAll }
+/* END SORTED.SH */
     }
 };
 
@@ -235,8 +255,10 @@ static const struct {
     unsigned Count;
     InsDesc  Ins[75];
 } InsTab6502X = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTab6502X.Ins) / sizeof (InsTab6502X.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x080A26C, 0x60, 0, PutAll },
         { "ALR",  0x0800000, 0x4B, 0, PutAll },         /* X */
         { "ANC",  0x0800000, 0x0B, 0, PutAll },         /* X */
@@ -312,6 +334,7 @@ static const struct {
         { "TXA",  0x0000001, 0x8a, 0, PutAll },
         { "TXS",  0x0000001, 0x9a, 0, PutAll },
         { "TYA",  0x0000001, 0x98, 0, PutAll }
+/* END SORTED.SH */
     }
 };
 
@@ -324,8 +347,10 @@ static const struct {
     unsigned Count;
     InsDesc  Ins[71];
 } InsTab6502DTV = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTab6502DTV.Ins) / sizeof (InsTab6502DTV.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x080A26C, 0x60, 0, PutAll },
         { "ALR",  0x0800000, 0x4B, 0, PutAll },         /* X */
         { "ANC",  0x0800000, 0x0B, 0, PutAll },         /* X */
@@ -397,16 +422,19 @@ static const struct {
         { "TXA",  0x0000001, 0x8a, 0, PutAll },
         { "TXS",  0x0000001, 0x9a, 0, PutAll },
         { "TYA",  0x0000001, 0x98, 0, PutAll }
+/* END SORTED.SH */
     }
 };
 
-/* Instruction table for the 65SC02 */
+/* Instruction table for the 65SC02 (original CMOS) */
 static const struct {
     unsigned Count;
     InsDesc  Ins[66];
 } InsTab65SC02 = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTab65SC02.Ins) / sizeof (InsTab65SC02.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x080A66C, 0x60, 0, PutAll },
         { "AND",  0x080A66C, 0x20, 0, PutAll },
         { "ASL",  0x000006e, 0x02, 1, PutAll },
@@ -473,16 +501,130 @@ static const struct {
         { "TXA",  0x0000001, 0x8a, 0, PutAll },
         { "TXS",  0x0000001, 0x9a, 0, PutAll },
         { "TYA",  0x0000001, 0x98, 0, PutAll }
+/* END SORTED.SH */
     }
 };
 
-/* Instruction table for the 65C02 */
+/* Instruction table for the 65C02 (CMOS with Rockwell extensions) */
+static const struct {
+    unsigned Count;
+    InsDesc  Ins[98];
+} InsTab65C02 = {
+    /* CAUTION: table must be sorted for bsearch */
+    sizeof (InsTab65C02.Ins) / sizeof (InsTab65C02.Ins[0]),
+    {
+/* BEGIN SORTED.SH */
+        { "ADC",  0x080A66C, 0x60, 0, PutAll },
+        { "AND",  0x080A66C, 0x20, 0, PutAll },
+        { "ASL",  0x000006e, 0x02, 1, PutAll },
+        { "BBR0", 0x0000000, 0x0F, 0, PutBitBranch },
+        { "BBR1", 0x0000000, 0x1F, 0, PutBitBranch },
+        { "BBR2", 0x0000000, 0x2F, 0, PutBitBranch },
+        { "BBR3", 0x0000000, 0x3F, 0, PutBitBranch },
+        { "BBR4", 0x0000000, 0x4F, 0, PutBitBranch },
+        { "BBR5", 0x0000000, 0x5F, 0, PutBitBranch },
+        { "BBR6", 0x0000000, 0x6F, 0, PutBitBranch },
+        { "BBR7", 0x0000000, 0x7F, 0, PutBitBranch },
+        { "BBS0", 0x0000000, 0x8F, 0, PutBitBranch },
+        { "BBS1", 0x0000000, 0x9F, 0, PutBitBranch },
+        { "BBS2", 0x0000000, 0xAF, 0, PutBitBranch },
+        { "BBS3", 0x0000000, 0xBF, 0, PutBitBranch },
+        { "BBS4", 0x0000000, 0xCF, 0, PutBitBranch },
+        { "BBS5", 0x0000000, 0xDF, 0, PutBitBranch },
+        { "BBS6", 0x0000000, 0xEF, 0, PutBitBranch },
+        { "BBS7", 0x0000000, 0xFF, 0, PutBitBranch },
+        { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
+        { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
+        { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
+        { "BIT",  0x0A0006C, 0x00, 2, PutAll },
+        { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
+        { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
+        { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
+        { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
+        { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
+        { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
+        { "CLC",  0x0000001, 0x18, 0, PutAll },
+        { "CLD",  0x0000001, 0xd8, 0, PutAll },
+        { "CLI",  0x0000001, 0x58, 0, PutAll },
+        { "CLV",  0x0000001, 0xb8, 0, PutAll },
+        { "CMP",  0x080A66C, 0xc0, 0, PutAll },
+        { "CPX",  0x080000C, 0xe0, 1, PutAll },
+        { "CPY",  0x080000C, 0xc0, 1, PutAll },
+        { "DEA",  0x0000001, 0x00, 3, PutAll },   /* == DEC */
+        { "DEC",  0x000006F, 0x00, 3, PutAll },
+        { "DEX",  0x0000001, 0xca, 0, PutAll },
+        { "DEY",  0x0000001, 0x88, 0, PutAll },
+        { "EOR",  0x080A66C, 0x40, 0, PutAll },
+        { "INA",  0x0000001, 0x00, 4, PutAll },   /* == INC */
+        { "INC",  0x000006f, 0x00, 4, PutAll },
+        { "INX",  0x0000001, 0xe8, 0, PutAll },
+        { "INY",  0x0000001, 0xc8, 0, PutAll },
+        { "JMP",  0x0010808, 0x4c, 6, PutAll },
+        { "JSR",  0x0000008, 0x20, 7, PutAll },
+        { "LDA",  0x080A66C, 0xa0, 0, PutAll },
+        { "LDX",  0x080030C, 0xa2, 1, PutAll },
+        { "LDY",  0x080006C, 0xa0, 1, PutAll },
+        { "LSR",  0x000006F, 0x42, 1, PutAll },
+        { "NOP",  0x0000001, 0xea, 0, PutAll },
+        { "ORA",  0x080A66C, 0x00, 0, PutAll },
+        { "PHA",  0x0000001, 0x48, 0, PutAll },
+        { "PHP",  0x0000001, 0x08, 0, PutAll },
+        { "PHX",  0x0000001, 0xda, 0, PutAll },
+        { "PHY",  0x0000001, 0x5a, 0, PutAll },
+        { "PLA",  0x0000001, 0x68, 0, PutAll },
+        { "PLP",  0x0000001, 0x28, 0, PutAll },
+        { "PLX",  0x0000001, 0xfa, 0, PutAll },
+        { "PLY",  0x0000001, 0x7a, 0, PutAll },
+        { "RMB0", 0x0000004, 0x07, 1, PutAll },
+        { "RMB1", 0x0000004, 0x17, 1, PutAll },
+        { "RMB2", 0x0000004, 0x27, 1, PutAll },
+        { "RMB3", 0x0000004, 0x37, 1, PutAll },
+        { "RMB4", 0x0000004, 0x47, 1, PutAll },
+        { "RMB5", 0x0000004, 0x57, 1, PutAll },
+        { "RMB6", 0x0000004, 0x67, 1, PutAll },
+        { "RMB7", 0x0000004, 0x77, 1, PutAll },
+        { "ROL",  0x000006F, 0x22, 1, PutAll },
+        { "ROR",  0x000006F, 0x62, 1, PutAll },
+        { "RTI",  0x0000001, 0x40, 0, PutAll },
+        { "RTS",  0x0000001, 0x60, 0, PutAll },
+        { "SBC",  0x080A66C, 0xe0, 0, PutAll },
+        { "SEC",  0x0000001, 0x38, 0, PutAll },
+        { "SED",  0x0000001, 0xf8, 0, PutAll },
+        { "SEI",  0x0000001, 0x78, 0, PutAll },
+        { "SMB0", 0x0000004, 0x87, 1, PutAll },
+        { "SMB1", 0x0000004, 0x97, 1, PutAll },
+        { "SMB2", 0x0000004, 0xA7, 1, PutAll },
+        { "SMB3", 0x0000004, 0xB7, 1, PutAll },
+        { "SMB4", 0x0000004, 0xC7, 1, PutAll },
+        { "SMB5", 0x0000004, 0xD7, 1, PutAll },
+        { "SMB6", 0x0000004, 0xE7, 1, PutAll },
+        { "SMB7", 0x0000004, 0xF7, 1, PutAll },
+        { "STA",  0x000A66C, 0x80, 0, PutAll },
+        { "STX",  0x000010c, 0x82, 1, PutAll },
+        { "STY",  0x000002c, 0x80, 1, PutAll },
+        { "STZ",  0x000006c, 0x04, 5, PutAll },
+        { "TAX",  0x0000001, 0xaa, 0, PutAll },
+        { "TAY",  0x0000001, 0xa8, 0, PutAll },
+        { "TRB",  0x000000c, 0x10, 1, PutAll },
+        { "TSB",  0x000000c, 0x00, 1, PutAll },
+        { "TSX",  0x0000001, 0xba, 0, PutAll },
+        { "TXA",  0x0000001, 0x8a, 0, PutAll },
+        { "TXS",  0x0000001, 0x9a, 0, PutAll },
+        { "TYA",  0x0000001, 0x98, 0, PutAll },
+/* END SORTED.SH */
+    }
+};
+
+/* Instruction table for the W65C02 (CMOS with WDC extensions) */
 static const struct {
     unsigned Count;
     InsDesc  Ins[100];
-} InsTab65C02 = {
-    sizeof (InsTab65C02.Ins) / sizeof (InsTab65C02.Ins[0]),
+} InsTabW65C02 = {
+    /* CAUTION: table must be sorted for bsearch */
+    sizeof (InsTabW65C02.Ins) / sizeof (InsTabW65C02.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x080A66C, 0x60, 0, PutAll },
         { "AND",  0x080A66C, 0x20, 0, PutAll },
         { "ASL",  0x000006e, 0x02, 1, PutAll },
@@ -583,6 +725,153 @@ static const struct {
         { "TXS",  0x0000001, 0x9a, 0, PutAll },
         { "TYA",  0x0000001, 0x98, 0, PutAll },
         { "WAI",  0x0000001, 0xcb, 0, PutAll }
+/* END SORTED.SH */
+    }
+};
+
+/* Instruction table for the 65CE02 */
+static const struct {
+    unsigned Count;
+    InsDesc  Ins[133];
+} InsTab65CE02 = {
+    /* CAUTION: table must be sorted for bsearch */
+    sizeof (InsTab65CE02.Ins) / sizeof (InsTab65CE02.Ins[0]),
+    {
+/* BEGIN SORTED.SH */
+        { "ADC",  0x080A66C, 0x60, 0, PutAll },
+        { "AND",  0x080A66C, 0x20, 0, PutAll },
+        { "ASL",  0x000006e, 0x02, 1, PutAll },
+        { "ASR",  0x0000026, 0x43, 0, Put4510 },
+        { "ASW",  0x0000008, 0xcb, 6, PutAll },
+        { "AUG",  0x0000001, 0x5C, 0, PutAll },
+        { "BBR0", 0x0000000, 0x0F, 0, PutBitBranch },
+        { "BBR1", 0x0000000, 0x1F, 0, PutBitBranch },
+        { "BBR2", 0x0000000, 0x2F, 0, PutBitBranch },
+        { "BBR3", 0x0000000, 0x3F, 0, PutBitBranch },
+        { "BBR4", 0x0000000, 0x4F, 0, PutBitBranch },
+        { "BBR5", 0x0000000, 0x5F, 0, PutBitBranch },
+        { "BBR6", 0x0000000, 0x6F, 0, PutBitBranch },
+        { "BBR7", 0x0000000, 0x7F, 0, PutBitBranch },
+        { "BBS0", 0x0000000, 0x8F, 0, PutBitBranch },
+        { "BBS1", 0x0000000, 0x9F, 0, PutBitBranch },
+        { "BBS2", 0x0000000, 0xAF, 0, PutBitBranch },
+        { "BBS3", 0x0000000, 0xBF, 0, PutBitBranch },
+        { "BBS4", 0x0000000, 0xCF, 0, PutBitBranch },
+        { "BBS5", 0x0000000, 0xDF, 0, PutBitBranch },
+        { "BBS6", 0x0000000, 0xEF, 0, PutBitBranch },
+        { "BBS7", 0x0000000, 0xFF, 0, PutBitBranch },
+        { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
+        { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
+        { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
+        { "BIT",  0x0A0006C, 0x00, 2, PutAll },
+        { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
+        { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
+        { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
+        { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
+        { "BRK",  0x0800005, 0x00, 6, PutAll },
+        { "BSR",  0x0040000, 0x63, 0, PutPCRel4510 },
+        { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
+        { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
+        { "CLC",  0x0000001, 0x18, 0, PutAll },
+        { "CLD",  0x0000001, 0xd8, 0, PutAll },
+        { "CLE",  0x0000001, 0x02, 0, PutAll },
+        { "CLI",  0x0000001, 0x58, 0, PutAll },
+        { "CLV",  0x0000001, 0xb8, 0, PutAll },
+        { "CMP",  0x080A66C, 0xc0, 0, PutAll },
+        { "CPX",  0x080000C, 0xe0, 1, PutAll },
+        { "CPY",  0x080000C, 0xc0, 1, PutAll },
+        { "CPZ",  0x080000C, 0xd0, 1, Put4510 },
+        { "DEA",  0x0000001, 0x00, 3, PutAll },   /* == DEC */
+        { "DEC",  0x000006F, 0x00, 3, PutAll },
+        { "DEW",  0x0000004, 0xc3, 9, PutAll },
+        { "DEX",  0x0000001, 0xca, 0, PutAll },
+        { "DEY",  0x0000001, 0x88, 0, PutAll },
+        { "DEZ",  0x0000001, 0x3B, 0, PutAll },
+        { "EOM",  0x0000001, 0xea, 0, PutAll },
+        { "EOR",  0x080A66C, 0x40, 0, PutAll },
+        { "INA",  0x0000001, 0x00, 4, PutAll },   /* == INC */
+        { "INC",  0x000006f, 0x00, 4, PutAll },
+        { "INW",  0x0000004, 0xe3, 9, PutAll },
+        { "INX",  0x0000001, 0xe8, 0, PutAll },
+        { "INY",  0x0000001, 0xc8, 0, PutAll },
+        { "INZ",  0x0000001, 0x1B, 0, PutAll },
+        { "JMP",  0x0010808, 0x4c, 6, PutAll },
+        { "JSR",  0x0010808, 0x20, 7, Put4510 },
+        { "LBCC", 0x0040000, 0x93, 0, PutPCRel4510 },
+        { "LBCS", 0x0040000, 0xb3, 0, PutPCRel4510 },
+        { "LBEQ", 0x0040000, 0xf3, 0, PutPCRel4510 },
+        { "LBMI", 0x0040000, 0x33, 0, PutPCRel4510 },
+        { "LBNE", 0x0040000, 0xd3, 0, PutPCRel4510 },
+        { "LBPL", 0x0040000, 0x13, 0, PutPCRel4510 },
+        { "LBRA", 0x0040000, 0x83, 0, PutPCRel4510 },
+        { "LBVC", 0x0040000, 0x53, 0, PutPCRel4510 },
+        { "LBVS", 0x0040000, 0x73, 0, PutPCRel4510 },
+        { "LDA",  0x090A66C, 0xa0, 0, Put4510 },
+        { "LDX",  0x080030C, 0xa2, 1, PutAll },
+        { "LDY",  0x080006C, 0xa0, 1, PutAll },
+        { "LDZ",  0x0800048, 0xa3, 1, Put4510 },
+        { "LSR",  0x000006F, 0x42, 1, PutAll },
+        { "NEG",  0x0000001, 0x42, 0, PutAll },
+        { "NOP",  0x0000001, 0xea, 0, PutAll }, /* == EOM */
+        { "ORA",  0x080A66C, 0x00, 0, PutAll },
+        { "PHA",  0x0000001, 0x48, 0, PutAll },
+        { "PHD",  0x8000008, 0xf4, 1, PutAll }, /* == PHW */
+        { "PHP",  0x0000001, 0x08, 0, PutAll },
+        { "PHW",  0x8000008, 0xf4, 1, PutAll },
+        { "PHX",  0x0000001, 0xda, 0, PutAll },
+        { "PHY",  0x0000001, 0x5a, 0, PutAll },
+        { "PHZ",  0x0000001, 0xdb, 0, PutAll },
+        { "PLA",  0x0000001, 0x68, 0, PutAll },
+        { "PLP",  0x0000001, 0x28, 0, PutAll },
+        { "PLX",  0x0000001, 0xfa, 0, PutAll },
+        { "PLY",  0x0000001, 0x7a, 0, PutAll },
+        { "PLZ",  0x0000001, 0xfb, 0, PutAll },
+        { "RMB0", 0x0000004, 0x07, 1, PutAll },
+        { "RMB1", 0x0000004, 0x17, 1, PutAll },
+        { "RMB2", 0x0000004, 0x27, 1, PutAll },
+        { "RMB3", 0x0000004, 0x37, 1, PutAll },
+        { "RMB4", 0x0000004, 0x47, 1, PutAll },
+        { "RMB5", 0x0000004, 0x57, 1, PutAll },
+        { "RMB6", 0x0000004, 0x67, 1, PutAll },
+        { "RMB7", 0x0000004, 0x77, 1, PutAll },
+        { "ROL",  0x000006F, 0x22, 1, PutAll },
+        { "ROR",  0x000006F, 0x62, 1, PutAll },
+        { "ROW",  0x0000008, 0xeb, 6, PutAll },
+        { "RTI",  0x0000001, 0x40, 0, PutAll },
+        { "RTN",  0x0800000, 0x62, 1, PutAll },
+        { "RTS",  0x0000001, 0x60, 0, PutAll },
+        { "SBC",  0x080A66C, 0xe0, 0, PutAll },
+        { "SEC",  0x0000001, 0x38, 0, PutAll },
+        { "SED",  0x0000001, 0xf8, 0, PutAll },
+        { "SEE",  0x0000001, 0x03, 0, PutAll },
+        { "SEI",  0x0000001, 0x78, 0, PutAll },
+        { "SMB0", 0x0000004, 0x87, 1, PutAll },
+        { "SMB1", 0x0000004, 0x97, 1, PutAll },
+        { "SMB2", 0x0000004, 0xA7, 1, PutAll },
+        { "SMB3", 0x0000004, 0xB7, 1, PutAll },
+        { "SMB4", 0x0000004, 0xC7, 1, PutAll },
+        { "SMB5", 0x0000004, 0xD7, 1, PutAll },
+        { "SMB6", 0x0000004, 0xE7, 1, PutAll },
+        { "SMB7", 0x0000004, 0xF7, 1, PutAll },
+        { "STA",  0x010A66C, 0x80, 0, Put4510 },
+        { "STX",  0x000030c, 0x82, 1, Put4510 },
+        { "STY",  0x000006c, 0x80, 1, Put4510 },
+        { "STZ",  0x000006c, 0x04, 5, PutAll },
+        { "TAB",  0x0000001, 0x5b, 0, PutAll },
+        { "TAX",  0x0000001, 0xaa, 0, PutAll },
+        { "TAY",  0x0000001, 0xa8, 0, PutAll },
+        { "TAZ",  0x0000001, 0x4b, 0, PutAll },
+        { "TBA",  0x0000001, 0x7b, 0, PutAll },
+        { "TRB",  0x000000c, 0x10, 1, PutAll },
+        { "TSB",  0x000000c, 0x00, 1, PutAll },
+        { "TSX",  0x0000001, 0xba, 0, PutAll },
+        { "TSY",  0x0000001, 0x0b, 0, PutAll },
+        { "TXA",  0x0000001, 0x8a, 0, PutAll },
+        { "TXS",  0x0000001, 0x9a, 0, PutAll },
+        { "TYA",  0x0000001, 0x98, 0, PutAll },
+        { "TYS",  0x0000001, 0x2b, 0, PutAll },
+        { "TZA",  0x0000001, 0x6b, 0, PutAll },
+/* END SORTED.SH */
     }
 };
 
@@ -591,8 +880,10 @@ static const struct {
     unsigned Count;
     InsDesc  Ins[133];
 } InsTab4510 = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTab4510.Ins) / sizeof (InsTab4510.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x080A66C, 0x60, 0, PutAll },
         { "AND",  0x080A66C, 0x20, 0, PutAll },
         { "ASL",  0x000006e, 0x02, 1, PutAll },
@@ -726,16 +1017,183 @@ static const struct {
         { "TYA",  0x0000001, 0x98, 0, PutAll },
         { "TYS",  0x0000001, 0x2b, 0, PutAll },
         { "TZA",  0x0000001, 0x6b, 0, PutAll },
+/* END SORTED.SH */
     }
 };
 
+
+/* Instruction table for the 45GS02 */
+static const struct {
+    unsigned Count;
+    InsDesc  Ins[149];
+} InsTab45GS02 = {
+    /* CAUTION: table must be sorted for bsearch */
+    sizeof (InsTab45GS02.Ins) / sizeof (InsTab45GS02.Ins[0]),
+    {
+/* BEGIN SORTED.SH */
+        { "ADC",  0x4080A66C, 0x60, 0, Put45GS02 },
+        { "ADCQ", 0x0000140C, 0x60, 13, Put45GS02_Q },
+        { "AND",  0x4080A66C, 0x20, 0, Put45GS02 },
+        { "ANDQ", 0x0000140C, 0x20, 13, Put45GS02_Q },
+        { "ASL",  0x0000006e, 0x02, 1, PutAll },
+        { "ASLQ", 0x800000ee, 0x00, 14, Put45GS02_Q },
+        { "ASR",  0x00000026, 0x43, 0, Put4510 },
+        { "ASRQ", 0x80000026, 0x40, 15, Put45GS02_Q },
+        { "ASW",  0x00000008, 0xcb, 6, PutAll },
+        { "BBR0", 0x00000000, 0x0F, 0, PutBitBranch },
+        { "BBR1", 0x00000000, 0x1F, 0, PutBitBranch },
+        { "BBR2", 0x00000000, 0x2F, 0, PutBitBranch },
+        { "BBR3", 0x00000000, 0x3F, 0, PutBitBranch },
+        { "BBR4", 0x00000000, 0x4F, 0, PutBitBranch },
+        { "BBR5", 0x00000000, 0x5F, 0, PutBitBranch },
+        { "BBR6", 0x00000000, 0x6F, 0, PutBitBranch },
+        { "BBR7", 0x00000000, 0x7F, 0, PutBitBranch },
+        { "BBS0", 0x00000000, 0x8F, 0, PutBitBranch },
+        { "BBS1", 0x00000000, 0x9F, 0, PutBitBranch },
+        { "BBS2", 0x00000000, 0xAF, 0, PutBitBranch },
+        { "BBS3", 0x00000000, 0xBF, 0, PutBitBranch },
+        { "BBS4", 0x00000000, 0xCF, 0, PutBitBranch },
+        { "BBS5", 0x00000000, 0xDF, 0, PutBitBranch },
+        { "BBS6", 0x00000000, 0xEF, 0, PutBitBranch },
+        { "BBS7", 0x00000000, 0xFF, 0, PutBitBranch },
+        { "BCC",  0x00020000, 0x90, 0, PutPCRel8 },
+        { "BCS",  0x00020000, 0xb0, 0, PutPCRel8 },
+        { "BEQ",  0x00020000, 0xf0, 0, PutPCRel8 },
+        { "BIT",  0x00A0006C, 0x00, 2, PutAll },
+        { "BITQ", 0x0000000c, 0x20, 15, Put45GS02_Q },
+        { "BMI",  0x00020000, 0x30, 0, PutPCRel8 },
+        { "BNE",  0x00020000, 0xd0, 0, PutPCRel8 },
+        { "BPL",  0x00020000, 0x10, 0, PutPCRel8 },
+        { "BRA",  0x00020000, 0x80, 0, PutPCRel8 },
+        { "BRK",  0x00000001, 0x00, 0, PutAll },
+        { "BSR",  0x00040000, 0x63, 0, PutPCRel4510 },
+        { "BVC",  0x00020000, 0x50, 0, PutPCRel8 },
+        { "BVS",  0x00020000, 0x70, 0, PutPCRel8 },
+        { "CLC",  0x00000001, 0x18, 0, PutAll },
+        { "CLD",  0x00000001, 0xd8, 0, PutAll },
+        { "CLE",  0x00000001, 0x02, 0, PutAll },
+        { "CLI",  0x00000001, 0x58, 0, PutAll },
+        { "CLV",  0x00000001, 0xb8, 0, PutAll },
+        { "CMP",  0x4080A66C, 0xc0, 0, Put45GS02 },
+        { "CMPQ", 0x0000140C, 0xC0, 13, Put45GS02_Q },
+        { "CPX",  0x0080000C, 0xe0, 1, PutAll },
+        { "CPY",  0x0080000C, 0xc0, 1, PutAll },
+        { "CPZ",  0x0080000C, 0xd0, 1, Put4510 },
+        { "DEA",  0x00000001, 0x00, 3, PutAll },   /* == DEC */
+        { "DEC",  0x0000006F, 0x00, 3, PutAll },
+        { "DEQ",  0x800000ee, 0xc0, 14, Put45GS02_Q },
+        { "DEW",  0x00000004, 0xc3, 9, PutAll },
+        { "DEX",  0x00000001, 0xca, 0, PutAll },
+        { "DEY",  0x00000001, 0x88, 0, PutAll },
+        { "DEZ",  0x00000001, 0x3B, 0, PutAll },
+        { "EOM",  0x00000001, 0xea, 0, PutAll },
+        { "EOR",  0x4080A66C, 0x40, 0, Put45GS02 },
+        { "EORQ", 0x0000140C, 0x40, 13, Put45GS02_Q },
+        { "INA",  0x00000001, 0x00, 4, PutAll },   /* == INC */
+        { "INC",  0x0000006f, 0x00, 4, PutAll },
+        { "INQ",  0x800000ee, 0xe0, 14, Put45GS02_Q },
+        { "INW",  0x00000004, 0xe3, 9, PutAll },
+        { "INX",  0x00000001, 0xe8, 0, PutAll },
+        { "INY",  0x00000001, 0xc8, 0, PutAll },
+        { "INZ",  0x00000001, 0x1B, 0, PutAll },
+        { "JMP",  0x00010808, 0x4c, 6, PutAll },
+        { "JSR",  0x00010808, 0x20, 7, Put4510 },
+        { "LBCC", 0x00040000, 0x93, 0, PutPCRel4510 },
+        { "LBCS", 0x00040000, 0xb3, 0, PutPCRel4510 },
+        { "LBEQ", 0x00040000, 0xf3, 0, PutPCRel4510 },
+        { "LBMI", 0x00040000, 0x33, 0, PutPCRel4510 },
+        { "LBNE", 0x00040000, 0xd3, 0, PutPCRel4510 },
+        { "LBPL", 0x00040000, 0x13, 0, PutPCRel4510 },
+        { "LBRA", 0x00040000, 0x83, 0, PutPCRel4510 },
+        { "LBVC", 0x00040000, 0x53, 0, PutPCRel4510 },
+        { "LBVS", 0x00040000, 0x73, 0, PutPCRel4510 },
+        { "LDA",  0x4090A66C, 0xa0, 0, Put45GS02 },
+        { "LDQ",  0x4000140C, 0xa0, 13, Put45GS02_Q },
+        { "LDX",  0x0080030C, 0xa2, 1, PutAll },
+        { "LDY",  0x0080006C, 0xa0, 1, PutAll },
+        { "LDZ",  0x00800048, 0xa3, 1, Put4510 },
+        { "LSR",  0x0000006F, 0x42, 1, PutAll },
+        { "LSRQ", 0x800000ee, 0x40, 14, Put45GS02_Q },
+        { "MAP",  0x00000001, 0x5C, 0, PutAll },
+        { "NEG",  0x00000001, 0x42, 0, PutAll },
+        { "NOP",  0x00000001, 0xea, 0, PutAll }, /* == EOM */
+        { "ORA",  0x4080A66C, 0x00, 0, Put45GS02 },
+        { "ORQ",  0x0000140C, 0x00, 13, Put45GS02_Q },
+        { "PHA",  0x00000001, 0x48, 0, PutAll },
+        { "PHD",  0x08000008, 0xf4, 1, PutAll }, /* == PHW */
+        { "PHP",  0x00000001, 0x08, 0, PutAll },
+        { "PHW",  0x08000008, 0xf4, 1, PutAll },
+        { "PHX",  0x00000001, 0xda, 0, PutAll },
+        { "PHY",  0x00000001, 0x5a, 0, PutAll },
+        { "PHZ",  0x00000001, 0xdb, 0, PutAll },
+        { "PLA",  0x00000001, 0x68, 0, PutAll },
+        { "PLP",  0x00000001, 0x28, 0, PutAll },
+        { "PLX",  0x00000001, 0xfa, 0, PutAll },
+        { "PLY",  0x00000001, 0x7a, 0, PutAll },
+        { "PLZ",  0x00000001, 0xfb, 0, PutAll },
+        { "RMB0", 0x00000004, 0x07, 1, PutAll },
+        { "RMB1", 0x00000004, 0x17, 1, PutAll },
+        { "RMB2", 0x00000004, 0x27, 1, PutAll },
+        { "RMB3", 0x00000004, 0x37, 1, PutAll },
+        { "RMB4", 0x00000004, 0x47, 1, PutAll },
+        { "RMB5", 0x00000004, 0x57, 1, PutAll },
+        { "RMB6", 0x00000004, 0x67, 1, PutAll },
+        { "RMB7", 0x00000004, 0x77, 1, PutAll },
+        { "ROL",  0x0000006F, 0x22, 1, PutAll },
+        { "ROLQ", 0x800000ee, 0x20, 14, Put45GS02_Q },
+        { "ROR",  0x0000006F, 0x62, 1, PutAll },
+        { "RORQ", 0x800000ee, 0x60, 14, Put45GS02_Q },
+        { "ROW",  0x00000008, 0xeb, 6, PutAll },
+        { "RTI",  0x00000001, 0x40, 0, PutAll },
+        { "RTN",  0x00800000, 0x62, 1, PutAll },
+        { "RTS",  0x00000001, 0x60, 0, PutAll },
+        { "SBC",  0x4080A66C, 0xe0, 0, Put45GS02 },
+        { "SBCQ", 0x0000140C, 0xe0, 13, Put45GS02_Q },
+        { "SEC",  0x00000001, 0x38, 0, PutAll },
+        { "SED",  0x00000001, 0xf8, 0, PutAll },
+        { "SEE",  0x00000001, 0x03, 0, PutAll },
+        { "SEI",  0x00000001, 0x78, 0, PutAll },
+        { "SMB0", 0x00000004, 0x87, 1, PutAll },
+        { "SMB1", 0x00000004, 0x97, 1, PutAll },
+        { "SMB2", 0x00000004, 0xA7, 1, PutAll },
+        { "SMB3", 0x00000004, 0xB7, 1, PutAll },
+        { "SMB4", 0x00000004, 0xC7, 1, PutAll },
+        { "SMB5", 0x00000004, 0xD7, 1, PutAll },
+        { "SMB6", 0x00000004, 0xE7, 1, PutAll },
+        { "SMB7", 0x00000004, 0xF7, 1, PutAll },
+        { "STA",  0x4010A66C, 0x80, 0, Put45GS02 },
+        { "STQ",  0x0000140C, 0x80, 13, Put45GS02_Q },
+        { "STX",  0x0000030c, 0x82, 1, Put4510 },
+        { "STY",  0x0000006c, 0x80, 1, Put4510 },
+        { "STZ",  0x0000006c, 0x04, 5, PutAll },
+        { "TAB",  0x00000001, 0x5b, 0, PutAll },
+        { "TAX",  0x00000001, 0xaa, 0, PutAll },
+        { "TAY",  0x00000001, 0xa8, 0, PutAll },
+        { "TAZ",  0x00000001, 0x4b, 0, PutAll },
+        { "TBA",  0x00000001, 0x7b, 0, PutAll },
+        { "TRB",  0x0000000c, 0x10, 1, PutAll },
+        { "TSB",  0x0000000c, 0x00, 1, PutAll },
+        { "TSX",  0x00000001, 0xba, 0, PutAll },
+        { "TSY",  0x00000001, 0x0b, 0, PutAll },
+        { "TXA",  0x00000001, 0x8a, 0, PutAll },
+        { "TXS",  0x00000001, 0x9a, 0, PutAll },
+        { "TYA",  0x00000001, 0x98, 0, PutAll },
+        { "TYS",  0x00000001, 0x2b, 0, PutAll },
+        { "TZA",  0x00000001, 0x6b, 0, PutAll },
+/* END SORTED.SH */
+    }
+};
+
+
 /* Instruction table for the 65816 */
 static const struct {
     unsigned Count;
     InsDesc  Ins[100];
 } InsTab65816 = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTab65816.Ins) / sizeof (InsTab65816.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x0b8f6fc, 0x60, 0, PutAll },
         { "AND",  0x0b8f6fc, 0x20, 0, PutAll },
         { "ASL",  0x000006e, 0x02, 1, PutAll },
@@ -836,6 +1294,7 @@ static const struct {
         { "WDM",  0x0800004, 0x42, 6, PutAll },
         { "XBA",  0x0000001, 0xeb, 0, PutAll },
         { "XCE",  0x0000001, 0xfb, 0, PutAll }
+/* END SORTED.SH */
     }
 };
 
@@ -844,8 +1303,10 @@ static const struct {
     unsigned Count;
     InsDesc  Ins[26];
 } InsTabSweet16 = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTabSweet16.Ins) / sizeof (InsTabSweet16.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADD",  AMSW16_REG,              0xA0, 0, PutSweet16 },
         { "BC",   AMSW16_BRA,              0x03, 0, PutSweet16Branch },
         { "BK",   AMSW16_IMP,              0x0A, 0, PutSweet16 },
@@ -872,6 +1333,7 @@ static const struct {
         { "STD",  AMSW16_IND,              0x70, 0, PutSweet16 },
         { "STP",  AMSW16_IND,              0x90, 0, PutSweet16 },
         { "SUB",  AMSW16_REG,              0xB0, 0, PutSweet16 },
+/* END SORTED.SH */
     }
 };
 
@@ -880,8 +1342,10 @@ static const struct {
     unsigned Count;
     InsDesc  Ins[135];
 } InsTabHuC6280 = {
+    /* CAUTION: table must be sorted for bsearch */
     sizeof (InsTabHuC6280.Ins) / sizeof (InsTabHuC6280.Ins[0]),
     {
+/* BEGIN SORTED.SH */
         { "ADC",  0x080A66C, 0x60, 0, PutAll },
         { "AND",  0x080A66C, 0x20, 0, PutAll },
         { "ASL",  0x000006e, 0x02, 1, PutAll },
@@ -1017,10 +1481,130 @@ static const struct {
         { "TXA",  0x0000001, 0x8a, 0, PutAll },
         { "TXS",  0x0000001, 0x9a, 0, PutAll },
         { "TYA",  0x0000001, 0x98, 0, PutAll }
+/* END SORTED.SH */
     }
 };
 
+/* CAUTION: in the pdf $1a is dec a, and $3a is inc a - if that is really the case,
+ * the table below (and the handler) should be fixed and this notice removed */
 
+/* Instruction table for the m740 CPU */
+static const struct {
+    unsigned Count;
+    InsDesc  Ins[106];
+} InsTabm740 = {
+    sizeof (InsTabm740.Ins) / sizeof (InsTabm740.Ins[0]),
+    {
+/* BEGIN SORTED.SH */
+        { "ADC",  0x0080A26C, 0x60, 0, PutAll },
+        { "AND",  0x0080A26C, 0x20, 0, PutAll },
+        { "ASL",  0x0000006e, 0x02, 1, PutAll },
+        { "BBC0", 0x10000002, 0x13, 10, PutBitBranch_m740 },
+        { "BBC1", 0x10000002, 0x33, 10, PutBitBranch_m740 },
+        { "BBC2", 0x10000002, 0x53, 10, PutBitBranch_m740 },
+        { "BBC3", 0x10000002, 0x73, 10, PutBitBranch_m740 },
+        { "BBC4", 0x10000002, 0x93, 10, PutBitBranch_m740 },
+        { "BBC5", 0x10000002, 0xb3, 10, PutBitBranch_m740 },
+        { "BBC6", 0x10000002, 0xd3, 10, PutBitBranch_m740 },
+        { "BBC7", 0x10000002, 0xf3, 10, PutBitBranch_m740 },
+        { "BBS0", 0x10000002, 0x03, 10, PutBitBranch_m740 },
+        { "BBS1", 0x10000002, 0x23, 10, PutBitBranch_m740 },
+        { "BBS2", 0x10000002, 0x43, 10, PutBitBranch_m740 },
+        { "BBS3", 0x10000002, 0x63, 10, PutBitBranch_m740 },
+        { "BBS4", 0x10000002, 0x83, 10, PutBitBranch_m740 },
+        { "BBS5", 0x10000002, 0xa3, 10, PutBitBranch_m740 },
+        { "BBS6", 0x10000002, 0xc3, 10, PutBitBranch_m740 },
+        { "BBS7", 0x10000002, 0xe3, 10, PutBitBranch_m740 },
+        { "BCC",  0x00020000, 0x90, 0, PutPCRel8 },
+        { "BCS",  0x00020000, 0xb0, 0, PutPCRel8 },
+        { "BEQ",  0x00020000, 0xf0, 0, PutPCRel8 },
+        { "BIT",  0x0000000C, 0x00, 2, PutAll },
+        { "BMI",  0x00020000, 0x30, 0, PutPCRel8 },
+        { "BNE",  0x00020000, 0xd0, 0, PutPCRel8 },
+        { "BPL",  0x00020000, 0x10, 0, PutPCRel8 },
+        { "BRA",  0x00020000, 0x80, 0, PutPCRel8 },
+        { "BRK",  0x00000001, 0x00, 0, PutAll },
+        { "BVC",  0x00020000, 0x50, 0, PutPCRel8 },
+        { "BVS",  0x00020000, 0x70, 0, PutPCRel8 },
+        { "CLB0", 0x00000006, 0x1b, 10, PutAll },
+        { "CLB1", 0x00000006, 0x3b, 10, PutAll },
+        { "CLB2", 0x00000006, 0x5b, 10, PutAll },
+        { "CLB3", 0x00000006, 0x7b, 10, PutAll },
+        { "CLB4", 0x00000006, 0x9b, 10, PutAll },
+        { "CLB5", 0x00000006, 0xbb, 10, PutAll },
+        { "CLB6", 0x00000006, 0xdb, 10, PutAll },
+        { "CLB7", 0x00000006, 0xfb, 10, PutAll },
+        { "CLC",  0x00000001, 0x18, 0, PutAll },
+        { "CLD",  0x00000001, 0xd8, 0, PutAll },
+        { "CLI",  0x00000001, 0x58, 0, PutAll },
+        { "CLT",  0x00000001, 0x12, 0, PutAll },
+        { "CLV",  0x00000001, 0xb8, 0, PutAll },
+        { "CMP",  0x0080A26C, 0xc0, 0, PutAll },
+        { "COM",  0x00000004, 0x44, 1, PutAll },
+        { "CPX",  0x0080000C, 0xe0, 1, PutAll },
+        { "CPY",  0x0080000C, 0xc0, 1, PutAll },
+        { "DEC",  0x0000006F, 0x00, 3, PutAll },
+        { "DEX",  0x00000001, 0xca, 0, PutAll },
+        { "DEY",  0x00000001, 0x88, 0, PutAll },
+        { "EOR",  0x0080A26C, 0x40, 0, PutAll },
+        { "FST",  0x00000001, 0xe2, 0, PutAll },
+        { "INC",  0x0000006f, 0x00, 4, PutAll },
+        { "INX",  0x00000001, 0xe8, 0, PutAll },
+        { "INY",  0x00000001, 0xc8, 0, PutAll },
+        { "JMP",  0x00000C08, 0x00, 12, PutAll },
+        { "JSR",  0x20000408, 0x00, 0, PutJSR_m740 },
+        { "LDA",  0x0080A26C, 0xa0, 0, PutAll },
+        { "LDM",  0x10000000, 0x3c, 0, PutLDM_m740 },
+        { "LDX",  0x0080030C, 0xa2, 1, PutAll },
+        { "LDY",  0x0080006C, 0xa0, 1, PutAll },
+        { "LSR",  0x0000006F, 0x42, 1, PutAll },
+        { "NOP",  0x00000001, 0xea, 0, PutAll },
+        { "ORA",  0x0080A26C, 0x00, 0, PutAll },
+        { "PHA",  0x00000001, 0x48, 0, PutAll },
+        { "PHP",  0x00000001, 0x08, 0, PutAll },
+        { "PLA",  0x00000001, 0x68, 0, PutAll },
+        { "PLP",  0x00000001, 0x28, 0, PutAll },
+        { "RMB0", 0x00000006, 0x1b, 10, PutAll },
+        { "RMB1", 0x00000006, 0x3b, 10, PutAll },
+        { "RMB2", 0x00000006, 0x5b, 10, PutAll },
+        { "RMB3", 0x00000006, 0x7b, 10, PutAll },
+        { "RMB4", 0x00000006, 0x9b, 10, PutAll },
+        { "RMB5", 0x00000006, 0xbb, 10, PutAll },
+        { "RMB6", 0x00000006, 0xdb, 10, PutAll },
+        { "RMB7", 0x00000006, 0xfb, 10, PutAll },
+        { "ROL",  0x0000006F, 0x22, 1, PutAll },
+        { "ROR",  0x0000006F, 0x62, 1, PutAll },
+        { "RRF",  0x00000004, 0x82, 6, PutAll },
+        { "RTI",  0x00000001, 0x40, 0, PutAll },
+        { "RTS",  0x00000001, 0x60, 0, PutAll },
+        { "SBC",  0x0080A26C, 0xe0, 0, PutAll },
+        { "SEB0", 0x00000006, 0x0b, 10, PutAll },
+        { "SEB1", 0x00000006, 0x2b, 10, PutAll },
+        { "SEB2", 0x00000006, 0x4b, 10, PutAll },
+        { "SEB3", 0x00000006, 0x6b, 10, PutAll },
+        { "SEB4", 0x00000006, 0x8b, 10, PutAll },
+        { "SEB5", 0x00000006, 0xab, 10, PutAll },
+        { "SEB6", 0x00000006, 0xcb, 10, PutAll },
+        { "SEB7", 0x00000006, 0xeb, 10, PutAll },
+        { "SEC",  0x00000001, 0x38, 0, PutAll },
+        { "SED",  0x00000001, 0xf8, 0, PutAll },
+        { "SEI",  0x00000001, 0x78, 0, PutAll },
+        { "SET",  0x00000001, 0x32, 0, PutAll },
+        { "SLW",  0x00000001, 0xC2, 0, PutAll },
+        { "STA",  0x0000A26C, 0x80, 0, PutAll },
+        { "STP",  0x00000001, 0x42, 0, PutAll },
+        { "STX",  0x0000010c, 0x82, 1, PutAll },
+        { "STY",  0x0000002c, 0x80, 1, PutAll },
+        { "TAX",  0x00000001, 0xaa, 0, PutAll },
+        { "TAY",  0x00000001, 0xa8, 0, PutAll },
+        { "TST",  0x00000004, 0x64, 1, PutAll },
+        { "TSX",  0x00000001, 0xba, 0, PutAll },
+        { "TXA",  0x00000001, 0x8a, 0, PutAll },
+        { "TXS",  0x00000001, 0x9a, 0, PutAll },
+        { "TYA",  0x00000001, 0x98, 0, PutAll }
+/* END SORTED.SH */
+    }
+};
 
 /* An array with instruction tables */
 static const InsTable* InsTabs[CPU_COUNT] = {
@@ -1028,92 +1612,120 @@ static const InsTable* InsTabs[CPU_COUNT] = {
     (const InsTable*) &InsTab6502,
     (const InsTable*) &InsTab6502X,
     (const InsTable*) &InsTab6502DTV,
-    (const InsTable*) &InsTab65SC02,
-    (const InsTable*) &InsTab65C02,
+    (const InsTable*) &InsTab65SC02,        /* original CMOS */
+    (const InsTable*) &InsTab65C02,         /* CMOS with Rockwell extensions */
     (const InsTable*) &InsTab65816,
     (const InsTable*) &InsTabSweet16,
     (const InsTable*) &InsTabHuC6280,
-    0,                                  /* Mitsubishi 740 */
+    (const InsTable*) &InsTabm740,          /* Mitsubishi 740 */
     (const InsTable*) &InsTab4510,
+    (const InsTable*) &InsTab45GS02,
+    (const InsTable*) &InsTabW65C02,        /* CMOS with WDC extensions */
+    (const InsTable*) &InsTab65CE02,        /* CMOS with CSG extensions */
 };
 const InsTable* InsTab = (const InsTable*) &InsTab6502;
 
 /* Table to build the effective 65xx opcode from a base opcode and an
 ** addressing mode. (The value in the table is ORed with the base opcode)
+** NOTE: each table has one entry per addressing mode!
 */
-static unsigned char EATab[12][AM65I_COUNT] = {
-    {   /* Table 0 */
+static unsigned char EATab[16][AM65I_COUNT] = {
+    {   /* Table 0 (sec, sed, seo, set, slw, sta, stp, tax, tay, tsx, txa, txs, tya) */
         0x00, 0x00, 0x05, 0x0D, 0x0F, 0x15, 0x1D, 0x1F,
         0x00, 0x19, 0x12, 0x00, 0x07, 0x11, 0x17, 0x01,
         0x00, 0x00, 0x00, 0x03, 0x13, 0x09, 0x00, 0x09,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00
     },
-    {   /* Table 1 */
+    {   /* Table 1 (rol, ror, stx, sty, tst, cpx, cpy) */
         0x08, 0x08, 0x04, 0x0C, 0x00, 0x14, 0x1C, 0x00,
         0x14, 0x1C, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x80, 0x00
+        0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 2 */
+    {   /* Table 2 (bit) */
         0x00, 0x00, 0x24, 0x2C, 0x0F, 0x34, 0x3C, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 3 */
+    {   /* Table 3 (dec, dea) */
         0x3A, 0x3A, 0xC6, 0xCE, 0x00, 0xD6, 0xDE, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 4 */
+    {   /* Table 4 (inc) */
         0x1A, 0x1A, 0xE6, 0xEE, 0x00, 0xF6, 0xFE, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 5 */
+    {   /* Table 5 (stz) */
         0x00, 0x00, 0x60, 0x98, 0x00, 0x70, 0x9E, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 6 */
+    {   /* Table 6 (jmp, rrf) */
         0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
         0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x90, 0x00
+        0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 7 (Subroutine opcodes) */
+    {   /* Table 7 (jsr) */
         0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
         0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
     {   /* Table 8 */
         0x00, 0x40, 0x01, 0x41, 0x00, 0x09, 0x49, 0x00,
         0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 9 */
+    {   /* Table 9 (dew, inw) */
         0x00, 0x00, 0x00, 0x10, 0x00, 0x20, 0x30, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
-    {   /* Table 10 (NOPs) */
+    {   /* Table 10 (NOPs, clbX, sebX) */
         0xea, 0x00, 0x04, 0x0c, 0x00, 0x14, 0x1c, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-        0x00, 0x00, 0x00, 0x00
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     },
     {   /* Table 11 (LAX) */
         0x08, 0x08, 0x04, 0x0C, 0x00, 0x14, 0x1C, 0x00,
         0x14, 0x1C, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-        0x00, 0x00, 0x80, 0x00
+        0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
     },
+    {   /* Table 12 (m740: JMP) */
+        0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0xb2, 0x6c, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    },
+    {   /* Table 13 (Q) */
+        0x00, 0x00, 0x05, 0x0D, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x12, 0x00, 0x12, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00
+    },
+    {   /* Table 14 (45GS02: ASLQ) */
+        0x0a, 0x0a, 0x06, 0x0e, 0x00, 0x16, 0x1e, 0x00,
+        0x00, 0x00, 0x12, 0x00, 0x12, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a
+    },
+    {   /* Table 15 (45GS02: ASRQ) */
+        0x03, 0x03, 0x04, 0x0c, 0x00, 0x14, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03
+    }
 };
 
 /* Table to build the effective SWEET16 opcode from a base opcode and an
@@ -1129,6 +1741,7 @@ static unsigned char Sweet16EATab[2][AMSW16I_COUNT] = {
 };
 
 /* Table that encodes the additional bytes for each 65xx instruction */
+/* NOTE: one entry per addressing mode! */
 unsigned char ExtBytes[AM65I_COUNT] = {
     0,          /* Implicit */
     0,          /* Accu */
@@ -1158,6 +1771,10 @@ unsigned char ExtBytes[AM65I_COUNT] = {
     7,          /* Block transfer (HuC6280) */
     2,          /* Absolute Indirect long */
     2,          /* Immidiate word */
+    2,          /* Direct, Relative short */
+    1,          /* Special Page */
+    1,          /* [Direct],z */
+    0,          /* Q */
 };
 
 /* Table that encodes the additional bytes for each SWEET16 instruction */
@@ -1334,6 +1951,20 @@ static void EmitCode (EffAddr* A)
 }
 
 
+static void PutLDM_m740 (const InsDesc* Ins)
+{
+    EffAddr A;
+    /* Evaluate the addressing mode */
+    if (EvalEA (Ins, &A) == 0) {
+        /* An error occurred */
+        return;
+    }
+    Emit0 (Ins->BaseCode);
+    EmitByte (A.Expr);
+    Consume (TOK_HASH, "'#' expected");
+    EmitByte (Expression ());
+}
+
 
 static long PutImmed8 (const InsDesc* Ins)
 /* Parse and emit an immediate 8 bit instruction. Return the value of the
@@ -1454,6 +2085,42 @@ static void PutBitBranch (const InsDesc* Ins)
     EmitSigned (GenBranchExpr (1), 1);
 }
 
+static void PutBitBranch_m740 (const InsDesc* Ins)
+/* Handle m740 branch on bit condition */
+{
+    EffAddr A;
+
+    /* Evaluate the addressing mode used */
+    GetEA(&A);
+
+    /* From the possible addressing modes, remove the ones that are invalid
+    ** for this instruction or CPU.
+    */
+    A.AddrModeSet &= Ins->AddrMode;
+
+    /* Check if we have any adressing modes left */
+    if (A.AddrModeSet == 0) {
+        Error ("Illegal addressing mode");
+        return;
+    }
+    A.AddrMode    = BitFind (A.AddrModeSet);
+
+    A.Opcode = Ins->BaseCode;
+
+    if (A.AddrMode == AM65I_ACCU) {
+        /* Accu */
+        Emit0 (A.Opcode);
+        ConsumeComma ();
+        EmitSigned (GenBranchExpr (2), 1);
+    } else if (A.AddrMode == AM65I_ZP_REL) {
+        /* FIXME: hacky, the comma was already consumed here */
+        A.Opcode += 0x04;
+        /* Zeropage */
+        Emit0 (A.Opcode);
+        EmitByte (A.Expr);
+        EmitSigned (GenBranchExpr (1), 1);
+    }
+}
 
 
 static void PutREP (const InsDesc* Ins)
@@ -1557,7 +2224,6 @@ static void PutTMAn (const InsDesc* Ins)
 ** an immediate argument.
 */
 {
-    /* Emit the TMA opcode itself */
     Emit0 (0x43);
 
     /* Emit the argument, which is the opcode from the table */
@@ -1613,10 +2279,8 @@ static void PutJMP (const InsDesc* Ins)
 */
 {
     EffAddr A;
-
     /* Evaluate the addressing mode used */
     if (EvalEA (Ins, &A)) {
-
         /* Check for indirect addressing */
         if ((A.AddrModeBit & AM65_ABS_IND) && (CPU < CPU_65SC02) && (RelaxChecks == 0)) {
 
@@ -1674,6 +2338,57 @@ static void PutJSR816 (const InsDesc* Ins)
 }
 
 
+static void PutJSR_m740 (const InsDesc* Ins)
+/* Handle a JSR instruction for m740 */
+{
+    EffAddr A;
+
+    /* Evaluate the addressing mode used */
+    GetEA (&A);
+
+    /* From the possible addressing modes, remove the ones that are invalid
+    ** for this instruction or CPU.
+    */
+    A.AddrModeSet &= Ins->AddrMode;
+
+    /* Check if we have any adressing modes left */
+    if (A.AddrModeSet == 0) {
+        Error ("Illegal addressing mode");
+        return;
+    }
+    A.AddrMode    = BitFind (A.AddrModeSet);
+
+    /* Build the opcode */
+    A.Opcode = Ins->BaseCode;
+
+    switch (A.AddrMode) {
+        case AM65I_DIR_IND:
+            A.Opcode = 0x02;
+            Emit1 (A.Opcode, A.Expr);
+            break;
+        case AM65I_ABS:
+            /* If we have an expression and it's const, get it's value */
+            if (A.Expr) {
+                long Val = -1;
+                if (IsConstExpr (A.Expr, &Val)) {
+                    if ((Val & 0xff00) == 0xff00) {
+                        /* direct page */
+                        A.Opcode = 0x22;
+                        Emit0 (A.Opcode);
+                        EmitByte(GenByteExpr(A.Expr));
+                        return;
+                    }
+                }
+            }
+            A.Opcode = 0x20;
+            Emit2 (A.Opcode, A.Expr);
+            break;
+        default:
+            Internal ("Invalid Opcode 0x%02x", A.Opcode);
+    }
+
+}
+
 
 static void PutRTS (const InsDesc* Ins attribute ((unused)))
 /* Handle the RTS instruction for the 816. In smart mode emit a RTL opcode if
@@ -1703,9 +2418,7 @@ static void PutAll (const InsDesc* Ins)
 
 
 
-static void Put4510 (const InsDesc* Ins)
-/* Handle all other instructions, with modifications for 4510 */
-{
+static void Emit4510 (EffAddr* A) {
     /* The 4510 uses all 256 possible opcodes, so the last ones were crammed
     ** in where an opcode was still undefined. As a result, some of those
     ** don't follow any rules for encoding the addressmodes. So the EATab
@@ -1725,25 +2438,91 @@ static void Put4510 (const InsDesc* Ins)
     ** $d0 -> $c2 : CPZ #$00
     ** $fc -> $23 : JSR ($1234,X)
     */
+    switch (A->Opcode) {
+        case 0x47:
+            A->Opcode = 0x44;
+            break;
+        case 0x57:
+            A->Opcode = 0x54;
+            break;
+        case 0x93:
+            A->Opcode = 0x82;
+            break;
+        case 0x9C:
+            A->Opcode = 0x8B;
+            break;
+        case 0x9E:
+            A->Opcode = 0x9B;
+            break;
+        case 0xAF:
+            A->Opcode = 0xAB;
+            break;
+        case 0xBF:
+            A->Opcode = 0xBB;
+            break;
+        case 0xB3:
+            A->Opcode = 0xE2;
+            break;
+        case 0xD0:
+            A->Opcode = 0xC2;
+            break;
+        case 0xFC:
+            A->Opcode = 0x23;
+            break;
+        default: /* Keep opcode as it is */ break;
+    }
+
+    /* No error, output code */
+    EmitCode (A);
+}
+
+
+
+static void Put4510 (const InsDesc* Ins)
+/* Handle all other instructions, with modifications for 4510 */
+{
     EffAddr A;
 
     /* Evaluate the addressing mode used */
     if (EvalEA (Ins, &A)) {
-        switch (A.Opcode) {
-            case 0x47: A.Opcode = 0x44; break;
-            case 0x57: A.Opcode = 0x54; break;
-            case 0x93: A.Opcode = 0x82; break;
-            case 0x9C: A.Opcode = 0x8B; break;
-            case 0x9E: A.Opcode = 0x9B; break;
-            case 0xAF: A.Opcode = 0xAB; break;
-            case 0xBF: A.Opcode = 0xBB; break;
-            case 0xB3: A.Opcode = 0xE2; break;
-            case 0xD0: A.Opcode = 0xC2; break;
-            case 0xFC: A.Opcode = 0x23; break;
-            default: /* Keep opcode as it is */ break;
-        }
+        Emit4510 (&A);
+    }
+}
 
-        /* No error, output code */
+
+
+static void Put45GS02 (const InsDesc* Ins)
+/* Handle all other instructions, with modifications for 45GS02 */
+{
+    EffAddr A;
+
+    if (EvalEA (Ins, &A)) {
+        if (A.AddrModeSet == AM65_32BIT_BASE_IND_Z) {
+            Emit0 (0xEA); /* NOP prefix */
+        }
+        Emit4510 (&A);
+    }
+}
+
+
+
+static void Put45GS02_Q (const InsDesc* Ins)
+{
+    EffAddr A;
+
+    if (EvalEA (Ins, &A)) {
+        Emit0 (0x42);
+        Emit0 (0x42);
+        if ((A.AddrModeBit == AM65_DIR_IND_LONG) ||
+            (A.AddrModeBit == AM65_32BIT_BASE_IND_Z)) {
+            Emit0 (0xEA); /* NOP prefix */
+        }
+        if (A.Opcode == 0xea) {
+            A.Opcode = 0x1a;
+        }
+        else if (A.Opcode == 0xca) {
+            A.Opcode = 0x3a;
+        }
         EmitCode (&A);
     }
 }
diff --git a/src/ca65/instr.h b/src/ca65/instr.h
index fe18d2110..9c91fd0cf 100644
--- a/src/ca65/instr.h
+++ b/src/ca65/instr.h
@@ -58,34 +58,38 @@
 ** When assembling for the 6502 or 65C02, all addressing modes that are not
 ** available on these CPUs are removed before doing any checks.
 */
-#define AM65_IMPLICIT           0x00000003UL
-#define AM65_ACCU               0x00000002UL
-#define AM65_DIR                0x00000004UL
-#define AM65_ABS                0x00000008UL
-#define AM65_ABS_LONG           0x00000010UL
-#define AM65_DIR_X              0x00000020UL
-#define AM65_ABS_X              0x00000040UL
-#define AM65_ABS_LONG_X         0x00000080UL
-#define AM65_DIR_Y              0x00000100UL
-#define AM65_ABS_Y              0x00000200UL
-#define AM65_DIR_IND            0x00000400UL
-#define AM65_ABS_IND            0x00000800UL
-#define AM65_DIR_IND_LONG       0x00001000UL
-#define AM65_DIR_IND_Y          0x00002000UL
-#define AM65_DIR_IND_LONG_Y     0x00004000UL
-#define AM65_DIR_X_IND          0x00008000UL
-#define AM65_ABS_X_IND          0x00010000UL
-#define AM65_REL                0x00020000UL
-#define AM65_REL_LONG           0x00040000UL
-#define AM65_STACK_REL          0x00080000UL
-#define AM65_STACK_REL_IND_Y    0x00100000UL
+#define AM65_IMPLICIT           0x00000003UL /* IMP */
+#define AM65_ACCU               0x00000002UL /* A */
+#define AM65_DIR                0x00000004UL /* ZP */
+#define AM65_ABS                0x00000008UL /* ABS */
+#define AM65_ABS_LONG           0x00000010UL /* adr */
+#define AM65_DIR_X              0x00000020UL /* ZP,X */
+#define AM65_ABS_X              0x00000040UL /* ABS, X */
+#define AM65_ABS_LONG_X         0x00000080UL /* adr,x */
+#define AM65_DIR_Y              0x00000100UL /* ZP, Y */
+#define AM65_ABS_Y              0x00000200UL /* ABS, Y */
+#define AM65_DIR_IND            0x00000400UL /* (ZP) or (ZP),z (4510 / 45GS02) */
+#define AM65_ABS_IND            0x00000800UL /* (ABS) */
+#define AM65_DIR_IND_LONG       0x00001000UL /* [ABS] (65816) */
+#define AM65_DIR_IND_Y          0x00002000UL /* (ZP),y */
+#define AM65_DIR_IND_LONG_Y     0x00004000UL /* [adr],y (not 45GS02) */
+#define AM65_DIR_X_IND          0x00008000UL /* (ZP,x) */
+#define AM65_ABS_X_IND          0x00010000UL /* (ABS,x) */
+#define AM65_REL                0x00020000UL /* REL */
+#define AM65_REL_LONG           0x00040000UL /* LONGREL */
+#define AM65_STACK_REL          0x00080000UL /* adr,s */
+#define AM65_STACK_REL_IND_Y    0x00100000UL /* (rel,s),y */
 #define AM65_IMM_ACCU           0x00200000UL
 #define AM65_IMM_INDEX          0x00400000UL
-#define AM65_IMM_IMPLICIT       0x00800000UL
+#define AM65_IMM_IMPLICIT       0x00800000UL /* IMM */
 #define AM65_BLOCKMOVE          0x01000000UL
 #define AM65_BLOCKXFER          0x02000000UL
-#define AM65_ABS_IND_LONG       0x04000000UL
+#define AM65_ABS_IND_LONG       0x04000000UL /* (adr) [dir] */
 #define AM65_IMM_IMPLICIT_WORD  0x08000000UL /* PHW #$1234 (4510 only) */
+#define AM65_ZP_REL             0x10000000UL /* ZP, REL (m740) */
+#define AM65_SPECIAL_PAGE       0x20000000UL /* $FFxx (m740) */
+#define AM65_32BIT_BASE_IND_Z   0x40000000UL /* LDA [$nn],Z (45GS02 only) */
+#define AM65_Q                  0x80000000UL /* Q (45GS02 only) */
 
 /* Bitmask for all ZP operations that have correspondent ABS ops */
 #define AM65_SET_ZP     (AM65_DIR | AM65_DIR_X | AM65_DIR_Y | AM65_DIR_IND | AM65_DIR_X_IND)
@@ -106,11 +110,39 @@
 #define AM65_ALL_IMM    (AM65_IMM_ACCU | AM65_IMM_INDEX | AM65_IMM_IMPLICIT | AM65_IMM_IMPLICIT_WORD)
 
 /* Bit numbers and count */
-#define AM65I_IMM_ACCU          21
-#define AM65I_IMM_INDEX         22
-#define AM65I_IMM_IMPLICIT      23
-#define AM65I_IMM_IMPLICIT_WORD 27
-#define AM65I_COUNT             28
+#define AM65I_IMPLICIT           0
+#define AM65I_ACCU               1
+#define AM65I_DIR                2
+#define AM65I_ABS                3
+#define AM65I_ABS_LONG           4
+#define AM65I_DIR_X              5
+#define AM65I_ABS_X              6
+#define AM65I_ABS_LONG_X         7
+#define AM65I_DIR_Y              8
+#define AM65I_ABS_Y              9
+#define AM65I_DIR_IND            10
+#define AM65I_ABS_IND            11
+#define AM65I_DIR_IND_LONG       12
+#define AM65I_DIR_IND_Y          13
+#define AM65I_DIR_IND_LONG_Y     14
+#define AM65I_DIR_X_IND          15
+#define AM65I_ABS_X_IND          16
+#define AM65I_REL                17
+#define AM65I_REL_LONG           18
+#define AM65I_STACK_REL          19
+#define AM65I_STACK_REL_IND_Y    20
+#define AM65I_IMM_ACCU           21
+#define AM65I_IMM_INDEX          22
+#define AM65I_IMM_IMPLICIT       23
+#define AM65I_BLOCKMOVE          24
+#define AM65I_BLOCKXFER          25
+#define AM65I_ABS_IND_LONG       26
+#define AM65I_IMM_IMPLICIT_WORD  27
+#define AM65I_ZP_REL             28
+#define AM65I_SPECIAL_PAGE       29
+#define AM65I_32BIT_BASE_IND_Z   30
+#define AM65I_Q                  31
+#define AM65I_COUNT              32
 
 
 
diff --git a/src/ca65/istack.c b/src/ca65/istack.c
index 7a95e7e8c..979c09740 100644
--- a/src/ca65/istack.c
+++ b/src/ca65/istack.c
@@ -156,3 +156,29 @@ void CheckInputStack (void)
         Error ("Open %s", IStack->Desc);
     }
 }
+
+
+
+InputStack RetrieveInputStack (void)
+/* Retrieve the current input stack. This will also clear it. Used when
+** including a file. The current input stack is stored together with the old
+** input file and restored when the file is closed.
+ */
+{
+    /* We do not touch the counter so input sources are counted across
+    ** includes.
+     */
+    InputStack S = IStack;
+    IStack = 0;
+    return S;
+}
+
+
+
+void RestoreInputStack (InputStack S)
+/* Restore an old input stack that was retrieved by RetrieveInputStack(). */
+{
+    CHECK (IStack == 0);
+    IStack = S;
+}
+
diff --git a/src/ca65/istack.h b/src/ca65/istack.h
index aa37bab14..28c413d39 100644
--- a/src/ca65/istack.h
+++ b/src/ca65/istack.h
@@ -38,6 +38,17 @@
 
 
 
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* Opaque pointer to an input stack */
+typedef void* InputStack;
+
+
+
 /*****************************************************************************/
 /*                                   Code                                    */
 /*****************************************************************************/
@@ -63,6 +74,15 @@ void CheckInputStack (void);
 ** stuff on the input stack.
 */
 
+InputStack RetrieveInputStack (void);
+/* Retrieve the current input stack. This will also clear it. Used when
+** including a file. The current input stack is stored together with the old
+** input file and restored when the file is closed.
+ */
+
+void RestoreInputStack (InputStack S);
+/* Restore an old input stack that was retrieved by RetrieveInputStack(). */
+
 
 
 /* End of istack.h */
diff --git a/src/ca65/main.c b/src/ca65/main.c
index 56a52d785..642dcae4b 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -194,6 +194,45 @@ static void CBMSystem (const char* Sys)
 
 
 
+static void DefineCpuSymbols (void)
+/* Define all the symbols to evaluate .cpu. These were previously in cpu.mac. */
+{
+    NewSymbol ("CPU_ISET_NONE", CPU_ISET_NONE);
+    NewSymbol ("CPU_ISET_6502", CPU_ISET_6502);
+    NewSymbol ("CPU_ISET_6502X", CPU_ISET_6502X);
+    NewSymbol ("CPU_ISET_6502DTV", CPU_ISET_6502DTV);
+    NewSymbol ("CPU_ISET_65SC02", CPU_ISET_65SC02);
+    NewSymbol ("CPU_ISET_65C02", CPU_ISET_65C02);
+    NewSymbol ("CPU_ISET_65816", CPU_ISET_65816);
+    NewSymbol ("CPU_ISET_SWEET16", CPU_ISET_SWEET16);
+    NewSymbol ("CPU_ISET_HUC6280", CPU_ISET_HUC6280);
+    NewSymbol ("CPU_ISET_M740", CPU_ISET_M740);
+    NewSymbol ("CPU_ISET_4510", CPU_ISET_4510);
+    NewSymbol ("CPU_ISET_45GS02", CPU_ISET_45GS02);
+    NewSymbol ("CPU_ISET_W65C02", CPU_ISET_W65C02);
+    NewSymbol ("CPU_ISET_65CE02", CPU_ISET_65CE02);
+
+    /* Additional ones from cpu.mac. Not sure how useful they are after the
+    ** changes from #2751.
+    */
+    NewSymbol ("CPU_NONE", CPUIsets[CPU_NONE]);
+    NewSymbol ("CPU_6502", CPUIsets[CPU_6502]);
+    NewSymbol ("CPU_6502X", CPUIsets[CPU_6502X]);
+    NewSymbol ("CPU_6502DTV", CPUIsets[CPU_6502DTV]);
+    NewSymbol ("CPU_65SC02", CPUIsets[CPU_65SC02]);
+    NewSymbol ("CPU_65C02", CPUIsets[CPU_65C02]);
+    NewSymbol ("CPU_65816", CPUIsets[CPU_65816]);
+    NewSymbol ("CPU_SWEET16", CPUIsets[CPU_SWEET16]);
+    NewSymbol ("CPU_HUC6280", CPUIsets[CPU_HUC6280]);
+    NewSymbol ("CPU_M740", CPUIsets[CPU_M740]);
+    NewSymbol ("CPU_4510", CPUIsets[CPU_4510]);
+    NewSymbol ("CPU_45GS02", CPUIsets[CPU_45GS02]);
+    NewSymbol ("CPU_W65C02", CPUIsets[CPU_W65C02]);
+    NewSymbol ("CPU_65CE02", CPUIsets[CPU_65CE02]);
+}
+
+
+
 static void SetSys (const char* Sys)
 /* Define a target system */
 {
@@ -344,6 +383,10 @@ static void SetSys (const char* Sys)
             NewSymbol ("__SYM1__", 1);
             break;
 
+        case TGT_MEGA65:
+            CBMSystem ("__MEGA65__");
+            break;
+
         case TGT_KIM1:
             NewSymbol ("__KIM1__", 1);
             break;
@@ -352,11 +395,18 @@ static void SetSys (const char* Sys)
             NewSymbol ("__RP6502__", 1);
             break;
 
+        case TGT_AGAT:
+            NewSymbol ("__AGAT__", 1);
+            break;
+
         default:
             AbEnd ("Invalid target name: '%s'", Sys);
 
     }
 
+    /* Define the symbols for evaluating .cpu */
+    DefineCpuSymbols ();
+
     /* Initialize the translation tables for the target system */
     TgtTranslateInit ();
 }
@@ -714,6 +764,24 @@ static void OneLine (void)
         NextTok ();
     }
 
+    /* Handle @-style unnamed labels */
+    if (CurTok.Tok == TOK_ULABEL) {
+        if (CurTok.IVal != 0) {
+            Error ("Invalid unnamed label definition");
+        }
+        ULabDef ();
+        NextTok ();
+
+        /* Skip the colon. If NoColonLabels is enabled, allow labels without
+        ** a colon if there is no whitespace before the identifier.
+        */
+        if (CurTok.Tok == TOK_COLON) {
+            NextTok ();
+        } else if (CurTok.WS || !NoColonLabels) {
+            Error ("':' expected");
+        }
+    }
+
     /* If the first token on the line is an identifier, check for a macro or
     ** an instruction.
     */
diff --git a/src/ca65/pseudo.c b/src/ca65/pseudo.c
index 2ce1ae087..301129583 100644
--- a/src/ca65/pseudo.c
+++ b/src/ca65/pseudo.c
@@ -1562,6 +1562,14 @@ static void DoP02 (void)
 
 
 
+static void DoP02X (void)
+/* Switch to 6502X CPU */
+{
+    SetCPU (CPU_6502X);
+}
+
+
+
 static void DoPC02 (void)
 /* Switch to 65C02 CPU */
 {
@@ -1570,10 +1578,18 @@ static void DoPC02 (void)
 
 
 
-static void DoP816 (void)
-/* Switch to 65816 CPU */
+static void DoPWC02 (void)
+/* Switch to W65C02 CPU */
 {
-    SetCPU (CPU_65816);
+    SetCPU (CPU_W65C02);
+}
+
+
+
+static void DoPCE02 (void)
+/* Switch to 65CE02 CPU */
+{
+    SetCPU (CPU_65CE02);
 }
 
 
@@ -1586,6 +1602,30 @@ static void DoP4510 (void)
 
 
 
+static void DoP45GS02 (void)
+/* Switch to 45GS02 CPU */
+{
+    SetCPU (CPU_45GS02);
+}
+
+
+
+static void DoP6280 (void)
+/* Switch to HuC6280 CPU */
+{
+    SetCPU (CPU_HUC6280);
+}
+
+
+
+static void DoP816 (void)
+/* Switch to 65816 CPU */
+{
+    SetCPU (CPU_65816);
+}
+
+
+
 static void DoPDTV (void)
 /* Switch to C64DTV CPU */
 {
@@ -1594,6 +1634,14 @@ static void DoPDTV (void)
 
 
 
+static void DoPM740 (void)
+/* Switch to M740 CPU */
+{
+    SetCPU (CPU_M740);
+}
+
+
+
 static void DoPageLength (void)
 /* Set the page length for the listing */
 {
@@ -1704,6 +1752,14 @@ static void DoPSC02 (void)
 
 
 
+static void DoPSweet16 (void)
+/* Switch to Sweet16 CPU */
+{
+    SetCPU (CPU_SWEET16);
+}
+
+
+
 static void DoPushCharmap (void)
 /* Save the current charmap */
 {
@@ -2057,70 +2113,74 @@ struct CtrlDesc {
     void        (*Handler) (void);      /* Command handler */
 };
 
+/* NOTE: .AND, .BITAND, .BITNOT, .BITOR, .BITXOR, .MOD, .NOT, .OR, .SHL, .SHR
+** and .XOR do NOT go into this table.
+*/
 #define PSEUDO_COUNT    (sizeof (CtrlCmdTab) / sizeof (CtrlCmdTab [0]))
 static CtrlDesc CtrlCmdTab [] = {
-    { ccNone,           DoA16           },
-    { ccNone,           DoA8            },
+    { ccNone,           DoA16           },      /* .A16 */
+    { ccNone,           DoA8            },      /* .A8 */
     { ccNone,           DoAddr          },      /* .ADDR */
     { ccNone,           DoUnexpected    },      /* .ADDRSIZE */
-    { ccNone,           DoAlign         },
-    { ccNone,           DoASCIIZ        },
+    { ccNone,           DoAlign         },      /* .ALIGN */
+    { ccNone,           DoASCIIZ        },      /* .ASCIIZ */
     { ccNone,           DoUnexpected    },      /* .ASIZE */
-    { ccNone,           DoAssert        },
-    { ccNone,           DoAutoImport    },
+    { ccNone,           DoAssert        },      /* .ASSERT */
+    { ccNone,           DoAutoImport    },      /* .AUTOIMPORT */
     { ccNone,           DoUnexpected    },      /* .BANK */
     { ccNone,           DoUnexpected    },      /* .BANKBYTE */
-    { ccNone,           DoBankBytes     },
+    { ccNone,           DoBankBytes     },      /* .BANKBYTES */
     { ccNone,           DoUnexpected    },      /* .BLANK */
-    { ccNone,           DoBss           },
-    { ccNone,           DoByte          },
-    { ccNone,           DoCase          },
-    { ccNone,           DoCharMap       },
-    { ccNone,           DoCode          },
+    { ccNone,           DoBss           },      /* .BSS */
+    { ccNone,           DoByte          },      /* .BYT, .BYTE */
+    { ccNone,           DoUnexpected    },      /* .CAP */
+    { ccNone,           DoCase          },      /* .CASE */
+    { ccNone,           DoCharMap       },      /* .CHARMAP */
+    { ccNone,           DoCode          },      /* .CODE */
     { ccNone,           DoUnexpected,   },      /* .CONCAT */
-    { ccNone,           DoConDes        },
+    { ccNone,           DoConDes        },      /* .CONDES */
     { ccNone,           DoUnexpected    },      /* .CONST */
-    { ccNone,           DoConstructor   },
+    { ccNone,           DoConstructor   },      /* .CONSTRUCTOR */
     { ccNone,           DoUnexpected    },      /* .CPU */
-    { ccNone,           DoData          },
-    { ccNone,           DoDbg,          },
-    { ccNone,           DoDByt          },
-    { ccNone,           DoDebugInfo     },
-    { ccKeepToken,      DoDefine        },
+    { ccNone,           DoData          },      /* .DATA */
+    { ccNone,           DoDbg,          },      /* .DBG */
+    { ccNone,           DoDByt          },      /* .DBYT */
+    { ccNone,           DoDebugInfo     },      /* .DEBUGINFO */
+    { ccKeepToken,      DoDefine        },      /* .DEF, .DEFINE */
     { ccNone,           DoUnexpected    },      /* .DEFINED */
     { ccNone,           DoUnexpected    },      /* .DEFINEDMACRO */
-    { ccNone,           DoDelMac        },
-    { ccNone,           DoDestructor    },
-    { ccNone,           DoDWord         },
+    { ccNone,           DoDelMac        },      /* .DELMAC, .DELMACRO */
+    { ccNone,           DoDestructor    },      /* .DESTRUCTOR */
+    { ccNone,           DoDWord         },      /* .DWORD */
     { ccKeepToken,      DoConditionals  },      /* .ELSE */
     { ccKeepToken,      DoConditionals  },      /* .ELSEIF */
-    { ccKeepToken,      DoEnd           },
+    { ccKeepToken,      DoEnd           },      /* .END */
     { ccNone,           DoUnexpected    },      /* .ENDENUM */
     { ccKeepToken,      DoConditionals  },      /* .ENDIF */
-    { ccNone,           DoUnexpected    },      /* .ENDMACRO */
-    { ccNone,           DoEndProc       },
-    { ccNone,           DoUnexpected    },      /* .ENDREPEAT */
-    { ccNone,           DoEndScope      },
+    { ccNone,           DoUnexpected    },      /* .ENDMAC, .ENDMACRO */
+    { ccNone,           DoEndProc       },      /* .ENDPROC */
+    { ccNone,           DoUnexpected    },      /* .ENDREP, .ENDREPEAT */
+    { ccNone,           DoEndScope      },      /* .ENDSCOPE */
     { ccNone,           DoUnexpected    },      /* .ENDSTRUCT */
     { ccNone,           DoUnexpected    },      /* .ENDUNION */
-    { ccNone,           DoEnum          },
-    { ccNone,           DoError         },
-    { ccNone,           DoExitMacro     },
-    { ccNone,           DoExport        },
-    { ccNone,           DoExportZP      },
-    { ccNone,           DoFarAddr       },
-    { ccNone,           DoFatal         },
-    { ccNone,           DoFeature       },
-    { ccNone,           DoFileOpt       },
-    { ccNone,           DoForceImport   },
+    { ccNone,           DoEnum          },      /* .ENUM */
+    { ccNone,           DoError         },      /* .ERROR */
+    { ccNone,           DoExitMacro     },      /* .EXITMAC, .EXITMACRO */
+    { ccNone,           DoExport        },      /* .EXPORT */
+    { ccNone,           DoExportZP      },      /* .EXPORTZP */
+    { ccNone,           DoFarAddr       },      /* .FARADDR */
+    { ccNone,           DoFatal         },      /* .FATAL */
+    { ccNone,           DoFeature       },      /* .FEATURE */
+    { ccNone,           DoFileOpt       },      /* .FOPT, .FILEOPT */
+    { ccNone,           DoForceImport   },      /* .FORCEIMPORT */
     { ccNone,           DoUnexpected    },      /* .FORCEWORD */
-    { ccNone,           DoGlobal        },
-    { ccNone,           DoGlobalZP      },
+    { ccNone,           DoGlobal        },      /* .GLOBAL */
+    { ccNone,           DoGlobalZP      },      /* .GLOBALZP */
     { ccNone,           DoUnexpected    },      /* .HIBYTE */
-    { ccNone,           DoHiBytes       },
+    { ccNone,           DoHiBytes       },      /* .HIBYTES */
     { ccNone,           DoUnexpected    },      /* .HIWORD */
-    { ccNone,           DoI16           },
-    { ccNone,           DoI8            },
+    { ccNone,           DoI16           },      /* .I16 */
+    { ccNone,           DoI8            },      /* .I8 */
     { ccNone,           DoUnexpected    },      /* .IDENT */
     { ccKeepToken,      DoConditionals  },      /* .IF */
     { ccKeepToken,      DoConditionals  },      /* .IFBLANK */
@@ -2131,81 +2191,95 @@ static CtrlDesc CtrlCmdTab [] = {
     { ccKeepToken,      DoConditionals  },      /* .IFNDEF */
     { ccKeepToken,      DoConditionals  },      /* .IFNREF */
     { ccKeepToken,      DoConditionals  },      /* .IFP02 */
+    { ccKeepToken,      DoConditionals  },      /* .IFP02X */
     { ccKeepToken,      DoConditionals  },      /* .IFP4510 */
+    { ccKeepToken,      DoConditionals  },      /* .IFP45GS02 */
+    { ccKeepToken,      DoConditionals  },      /* .IFP6280 */
     { ccKeepToken,      DoConditionals  },      /* .IFP816 */
     { ccKeepToken,      DoConditionals  },      /* .IFPC02 */
+    { ccKeepToken,      DoConditionals  },      /* .IFPCE02 */
     { ccKeepToken,      DoConditionals  },      /* .IFPDTV */
+    { ccKeepToken,      DoConditionals  },      /* .IFPM740 */
     { ccKeepToken,      DoConditionals  },      /* .IFPSC02 */
+    { ccKeepToken,      DoConditionals  },      /* .IFPSWEET16 */
+    { ccKeepToken,      DoConditionals  },      /* .IFPWC02 */
     { ccKeepToken,      DoConditionals  },      /* .IFREF */
-    { ccNone,           DoImport        },
-    { ccNone,           DoImportZP      },
-    { ccNone,           DoIncBin        },
-    { ccNone,           DoInclude       },
-    { ccNone,           DoInterruptor   },
+    { ccNone,           DoImport        },      /* .IMPORT */
+    { ccNone,           DoImportZP      },      /* .IMPORTZP */
+    { ccNone,           DoIncBin        },      /* .INCBIN */
+    { ccNone,           DoInclude       },      /* .INCLUDE */
+    { ccNone,           DoInterruptor   },      /* .INTERRUPTPOR */
     { ccNone,           DoUnexpected    },      /* .ISIZE */
     { ccNone,           DoUnexpected    },      /* .ISMNEMONIC */
     { ccNone,           DoInvalid       },      /* .LEFT */
-    { ccNone,           DoLineCont      },
-    { ccNone,           DoList          },
-    { ccNone,           DoListBytes     },
-    { ccNone,           DoLiteral       },
+    { ccNone,           DoLineCont      },      /* .LINECONT */
+    { ccNone,           DoList          },      /* .LIST */
+    { ccNone,           DoListBytes     },      /* .LISTBYTES */
+    { ccNone,           DoLiteral       },      /* .LITERAL */
     { ccNone,           DoUnexpected    },      /* .LOBYTE */
-    { ccNone,           DoLoBytes       },
+    { ccNone,           DoLoBytes       },      /* .LOBYTES */
     { ccNone,           DoUnexpected    },      /* .LOCAL */
-    { ccNone,           DoLocalChar     },
+    { ccNone,           DoLocalChar     },      /* .LOCALCHAR */
     { ccNone,           DoUnexpected    },      /* .LOWORD */
-    { ccNone,           DoMacPack       },
-    { ccNone,           DoMacro         },
+    { ccNone,           DoMacPack       },      /* .MACPACK */
+    { ccNone,           DoMacro         },      /* .MAC, .MACRO */
     { ccNone,           DoUnexpected    },      /* .MATCH */
     { ccNone,           DoUnexpected    },      /* .MAX */
     { ccNone,           DoInvalid       },      /* .MID */
     { ccNone,           DoUnexpected    },      /* .MIN */
-    { ccNone,           DoNull          },
-    { ccNone,           DoOrg           },
-    { ccNone,           DoOut           },
-    { ccNone,           DoP02           },
-    { ccNone,           DoP4510         },
-    { ccNone,           DoP816          },
-    { ccNone,           DoPageLength    },
+    { ccNone,           DoNull          },      /* .NULL */
+    { ccNone,           DoOrg           },      /* .ORG */
+    { ccNone,           DoOut           },      /* .OUT */
+    { ccNone,           DoP02           },      /* .P02 */
+    { ccNone,           DoP02X          },      /* .P02X */
+    { ccNone,           DoP4510         },      /* .P4510 */
+    { ccNone,           DoP45GS02       },      /* .P45GS02 */
+    { ccNone,           DoP6280         },      /* .P6280 */
+    { ccNone,           DoP816          },      /* .P816 */
+    { ccNone,           DoPageLength    },      /* .PAGELEN, .PAGELENGTH */
     { ccNone,           DoUnexpected    },      /* .PARAMCOUNT */
-    { ccNone,           DoPC02          },
-    { ccNone,           DoPDTV          },
-    { ccNone,           DoPopCharmap    },
-    { ccNone,           DoPopCPU        },
-    { ccNone,           DoPopSeg        },
-    { ccNone,           DoProc          },
-    { ccNone,           DoPSC02         },
-    { ccNone,           DoPushCharmap   },
-    { ccNone,           DoPushCPU       },
-    { ccNone,           DoPushSeg       },
-    { ccNone,           DoUnexpected    },      /* .REFERENCED */
-    { ccNone,           DoReferTo       },      /* .REFERTO */
-    { ccNone,           DoReloc         },
-    { ccNone,           DoRepeat        },
-    { ccNone,           DoRes           },
+    { ccNone,           DoPC02          },      /* .PC02 */
+    { ccNone,           DoPCE02         },      /* .PCE02 */
+    { ccNone,           DoPDTV          },      /* .PDTV */
+    { ccNone,           DoPM740         },      /* .PM740 */
+    { ccNone,           DoPopCharmap    },      /* .POPCHARMAP */
+    { ccNone,           DoPopCPU        },      /* .POPCPU */
+    { ccNone,           DoPopSeg        },      /* .POPSEG */
+    { ccNone,           DoProc          },      /* .PROC */
+    { ccNone,           DoPSC02         },      /* .PSC02 */
+    { ccNone,           DoPSweet16      },      /* .PSWEET16 */
+    { ccNone,           DoPushCharmap   },      /* .PUSHCHARMAP */
+    { ccNone,           DoPushCPU       },      /* .PUSHCPU */
+    { ccNone,           DoPushSeg       },      /* .PUSHSEG */
+    { ccNone,           DoPWC02         },      /* .PWC02 */
+    { ccNone,           DoUnexpected    },      /* .REF, .REFERENCED */
+    { ccNone,           DoReferTo       },      /* .REFTO, .REFERTO */
+    { ccNone,           DoReloc         },      /* .RELOC */
+    { ccNone,           DoRepeat        },      /* .REPEAT */
+    { ccNone,           DoRes           },      /* .RES */
     { ccNone,           DoInvalid       },      /* .RIGHT */
-    { ccNone,           DoROData        },
-    { ccNone,           DoScope         },
-    { ccNone,           DoSegment       },
+    { ccNone,           DoROData        },      /* .RODATA */
+    { ccNone,           DoScope         },      /* .SCOPE */
+    { ccNone,           DoSegment       },      /* .SEGMENT */
     { ccNone,           DoUnexpected    },      /* .SET */
-    { ccNone,           DoSetCPU        },
+    { ccNone,           DoSetCPU        },      /* .SETCPU */
     { ccNone,           DoUnexpected    },      /* .SIZEOF */
-    { ccNone,           DoSmart         },
+    { ccNone,           DoSmart         },      /* .SMART */
     { ccNone,           DoUnexpected    },      /* .SPRINTF */
     { ccNone,           DoUnexpected    },      /* .STRAT */
     { ccNone,           DoUnexpected    },      /* .STRING */
     { ccNone,           DoUnexpected    },      /* .STRLEN */
-    { ccNone,           DoStruct        },
-    { ccNone,           DoTag           },
+    { ccNone,           DoStruct        },      /* .STRUCT */
+    { ccNone,           DoTag           },      /* .TAG */
     { ccNone,           DoUnexpected    },      /* .TCOUNT */
     { ccNone,           DoUnexpected    },      /* .TIME */
-    { ccKeepToken,      DoUnDef         },
-    { ccNone,           DoUnion         },
+    { ccKeepToken,      DoUnDef         },      /* .UNDEF, .UNDEFINE */
+    { ccNone,           DoUnion         },      /* .UNION */
     { ccNone,           DoUnexpected    },      /* .VERSION */
-    { ccNone,           DoWarning       },
-    { ccNone,           DoWord          },
+    { ccNone,           DoWarning       },      /* .WARNING */
+    { ccNone,           DoWord          },      /* .WORD */
     { ccNone,           DoUnexpected    },      /* .XMATCH */
-    { ccNone,           DoZeropage      },
+    { ccNone,           DoZeropage      },      /* .ZEROPAGE */
 };
 
 
diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index 185100025..a2a72a149 100644
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -46,6 +46,7 @@
 #include "check.h"
 #include "filestat.h"
 #include "fname.h"
+#include "tgttrans.h"
 #include "xmalloc.h"
 
 /* ca65 */
@@ -113,6 +114,7 @@ struct CharSource {
     token_t                     Tok;    /* Last token */
     int                         C;      /* Last character */
     int                         SkipN;  /* For '\r\n' line endings, skip '\n\ if next */
+    InputStack                  IStack; /* Saved input stack */
     const CharSourceFunctions*  Func;   /* Pointer to function table */
     union {
         InputFile               File;   /* File data */
@@ -129,10 +131,12 @@ static int         C            = 0;    /* Current input character */
 int               ForcedEnd     = 0;
 
 /* List of dot keywords with the corresponding tokens */
+/* CAUTION: table must be sorted for bsearch */
 struct DotKeyword {
     const char* Key;                    /* MUST be first field */
     token_t     Tok;
 } DotKeywords [] = {
+/* BEGIN SORTED.SH */
     { ".A16",           TOK_A16                 },
     { ".A8",            TOK_A8                  },
     { ".ADDR",          TOK_ADDR                },
@@ -154,6 +158,8 @@ struct DotKeyword {
     { ".BSS",           TOK_BSS                 },
     { ".BYT",           TOK_BYTE                },
     { ".BYTE",          TOK_BYTE                },
+    { ".CAP",           TOK_CAP                 },
+    { ".CAPABILITY",    TOK_CAP                 },
     { ".CASE",          TOK_CASE                },
     { ".CHARMAP",       TOK_CHARMAP             },
     { ".CODE",          TOK_CODE                },
@@ -217,11 +223,18 @@ struct DotKeyword {
     { ".IFNDEF",        TOK_IFNDEF              },
     { ".IFNREF",        TOK_IFNREF              },
     { ".IFP02",         TOK_IFP02               },
+    { ".IFP02X",        TOK_IFP02X              },
     { ".IFP4510",       TOK_IFP4510             },
+    { ".IFP45GS02",     TOK_IFP45GS02           },
+    { ".IFP6280",       TOK_IFP6280             },
     { ".IFP816",        TOK_IFP816              },
     { ".IFPC02",        TOK_IFPC02              },
+    { ".IFPCE02",       TOK_IFPCE02             },
     { ".IFPDTV",        TOK_IFPDTV              },
+    { ".IFPM740",       TOK_IFPM740             },
     { ".IFPSC02",       TOK_IFPSC02             },
+    { ".IFPSWEET16",    TOK_IFPSWEET16          },
+    { ".IFPWC02",       TOK_IFPWC02             },
     { ".IFREF",         TOK_IFREF               },
     { ".IMPORT",        TOK_IMPORT              },
     { ".IMPORTZP",      TOK_IMPORTZP            },
@@ -255,21 +268,28 @@ struct DotKeyword {
     { ".ORG",           TOK_ORG                 },
     { ".OUT",           TOK_OUT                 },
     { ".P02",           TOK_P02                 },
+    { ".P02X",          TOK_P02X                },
     { ".P4510",         TOK_P4510               },
+    { ".P45GS02",       TOK_P45GS02             },
+    { ".P6280",         TOK_P6280               },
     { ".P816",          TOK_P816                },
     { ".PAGELEN",       TOK_PAGELENGTH          },
     { ".PAGELENGTH",    TOK_PAGELENGTH          },
     { ".PARAMCOUNT",    TOK_PARAMCOUNT          },
     { ".PC02",          TOK_PC02                },
+    { ".PCE02",         TOK_PCE02               },
     { ".PDTV",          TOK_PDTV                },
+    { ".PM740",         TOK_PM740               },
     { ".POPCHARMAP",    TOK_POPCHARMAP          },
     { ".POPCPU",        TOK_POPCPU              },
     { ".POPSEG",        TOK_POPSEG              },
     { ".PROC",          TOK_PROC                },
     { ".PSC02",         TOK_PSC02               },
+    { ".PSWEET16",      TOK_PSWEET16            },
     { ".PUSHCHARMAP",   TOK_PUSHCHARMAP         },
     { ".PUSHCPU",       TOK_PUSHCPU             },
     { ".PUSHSEG",       TOK_PUSHSEG             },
+    { ".PWC02",         TOK_PWC02               },
     { ".REF",           TOK_REFERENCED          },
     { ".REFERENCED",    TOK_REFERENCED          },
     { ".REFERTO",       TOK_REFERTO             },
@@ -304,6 +324,7 @@ struct DotKeyword {
     { ".XMATCH",        TOK_XMATCH              },
     { ".XOR",           TOK_BOOLXOR             },
     { ".ZEROPAGE",      TOK_ZEROPAGE            },
+/* END SORTED.SH */
 };
 
 
@@ -321,6 +342,9 @@ static void UseCharSource (CharSource* S)
     S->Tok      = CurTok.Tok;
     S->C        = C;
 
+    /* Remember the current input stack */
+    S->IStack   = RetrieveInputStack ();
+
     /* Use the new input source */
     S->Next     = Source;
     Source      = S;
@@ -347,7 +371,10 @@ static void DoneCharSource (void)
 
     /* Restore the old token */
     CurTok.Tok = Source->Tok;
-    C   = Source->C;
+    C = Source->C;
+
+    /* Restore the old input source */
+    RestoreInputStack (Source->IStack);
 
     /* Remember the last stacked input source */
     S = Source->Next;
@@ -781,14 +808,33 @@ static void ReadIdent (void)
 static void ReadStringConst (int StringTerm)
 /* Read a string constant into SVal. */
 {
+    int NeedNext;
+
     /* Skip the leading string terminator */
     NextChar ();
 
     /* Read the string */
     while (1) {
+        int Cooked = 1;
+        NeedNext = 1;
+
+        if (StringTerm == 0 && SB_GetLen(&CurTok.SVal) == 1) {
+            if (C == '\'') {
+                break;
+            }
+            else if (MissingCharTerm) {
+               NeedNext = 0;
+               break;
+            }
+            else {
+                Error ("Illegal character constant");
+            }
+        }
+
         if (C == StringTerm) {
             break;
         }
+
         if (C == '\n' || C == EOF) {
             Error ("Newline in string constant");
             break;
@@ -801,20 +847,74 @@ static void ReadStringConst (int StringTerm)
                 case EOF:
                     Error ("Unterminated escape sequence in string constant");
                     break;
-                case '\\':
-                case '\'':
-                case '"':
+                case '?':
+                    C = '\?';
                     break;
-                case 't':
-                    C = '\x09';
+                case 'a':
+                    C = '\a';
+                    break;
+                case 'b':
+                    C = '\b';
+                    break;
+                case 'e':
+                    C = '\x1B'; /* see comments in cc65/scanner.c */
+                    break;
+                case 'f':
+                    C = '\f';
                     break;
                 case 'r':
-                    C = '\x0D';
+                    C = '\r';
                     break;
                 case 'n':
-                    C = '\x0A';
+                    C = '\n';
                     break;
+                case 't':
+                    C = '\t';
+                    break;
+                case 'v':
+                    C = '\v';
+                    break;
+                case '\\':
+                    C = '\\'; /* unnecessary but more readable */
+                    break;
+                case '\'':
+                    C = '\''; /* unnecessary but more readable */
+                    if (StringTerm == 0) {
+                        /* special case used by character constants
+                        ** when LooseStringTerm not set.  this will
+                        ** cause '\' to be a valid character constant
+                        */
+                        C = '\\';
+                        NeedNext = 0;
+                    }
+                    break;
+                case '\"':
+                    C = '\"'; /* unnecessary but more readable */
+                    break;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                    { /* brace needed for scoping */
+                        int Count = 1;
+                        int Final = DigitVal(C);
+                        Cooked = 0;
+                        NextChar ();
+                        while (IsODigit (C) && Count++ < 3) {
+                           Final = (Final << 3) | DigitVal(C);
+                           NextChar();
+                        }
+                        if (C >= 256)
+                            Error ("Octal character constant out of range");
+                    }
+                    break;
+                case 'X':
                 case 'x':
+                    Cooked = 0;
                     NextChar ();
                     if (IsXDigit (C)) {
                         char high_nibble = DigitVal (C) << 4;
@@ -832,14 +932,19 @@ static void ReadStringConst (int StringTerm)
         }
 
         /* Append the char to the string */
-        SB_AppendChar (&CurTok.SVal, C);
+        SB_AppendCharCooked (&CurTok.SVal, C, Cooked);
 
-        /* Skip the character */
-        NextChar ();
+        if (NeedNext) {
+            /* Skip the character */
+            NextChar ();
+            NeedNext = 1;
+        }
     }
 
-    /* Skip the trailing terminator */
-    NextChar ();
+    if (NeedNext) {
+        /* Skip the trailing terminator */
+        NextChar ();
+    }
 
     /* Terminate the string */
     SB_Terminate (&CurTok.SVal);
@@ -1124,17 +1229,33 @@ Again:
     /* Local symbol? */
     if (C == LocalStart) {
 
-        /* Read the identifier. */
-        ReadIdent ();
+        NextChar ();
 
-        /* Start character alone is not enough */
-        if (SB_GetLen (&CurTok.SVal) == 1) {
-            Error ("Invalid cheap local symbol");
-            goto Again;
+        if (IsIdChar (C)) {
+            /* Read a local identifier */
+            CurTok.Tok = TOK_LOCAL_IDENT;
+            SB_AppendChar (&CurTok.SVal, LocalStart);
+            ReadIdent ();
+        } else {
+            /* Read an unnamed label */
+            CurTok.IVal = 0;
+            CurTok.Tok = TOK_ULABEL;
+
+            if (C == '-' || C == '<') {
+                int PrevC = C;
+                do {
+                    --CurTok.IVal;
+                    NextChar ();
+                } while (C == PrevC);
+            } else if (C == '+' || C == '>') {
+                int PrevC = C;
+                do {
+                    ++CurTok.IVal;
+                    NextChar ();
+                } while (C == PrevC);
+            }
         }
 
-        /* A local identifier */
-        CurTok.Tok = TOK_LOCAL_IDENT;
         return;
     }
 
@@ -1170,12 +1291,19 @@ Again:
                         break;
 
                     case 'S':
-                        if ((CPU == CPU_4510) || (CPU == CPU_65816)) {
+                        if ((CPU == CPU_65CE02) || (CPU == CPU_4510) || (CPU == CPU_45GS02) || (CPU == CPU_65816)) {
                             CurTok.Tok = TOK_S;
                             return;
                         }
                         break;
 
+                    case 'Q':
+                        if (CPU == CPU_45GS02) {
+                            CurTok.Tok = TOK_Q;
+                            return;
+                        }
+                        break;
+
                     case 'X':
                         CurTok.Tok = TOK_X;
                         return;
@@ -1190,7 +1318,7 @@ Again:
                             CurTok.Tok = TOK_OVERRIDE_ZP;
                            return;
                         } else {
-                            if (CPU == CPU_4510) {
+                            if ((CPU == CPU_65CE02) || (CPU == CPU_4510) || (CPU == CPU_45GS02)) {
                                 CurTok.Tok = TOK_Z;
                                 return;
                             }
@@ -1202,7 +1330,8 @@ Again:
                 }
                 break;
             case 2:
-                if ((CPU == CPU_4510) &&
+                /* FIXME: make sure we only alias "sp" to "s" when its really needed */
+                if (((CPU == CPU_65CE02) || (CPU == CPU_4510) || (CPU == CPU_45GS02)) &&
                     (toupper (SB_AtUnchecked (&CurTok.SVal, 0)) == 'S') &&
                     (toupper (SB_AtUnchecked (&CurTok.SVal, 1)) == 'P')) {
 
@@ -1314,22 +1443,30 @@ CharAgain:
                     break;
 
                 case '-':
+                case '<':
+                {
+                    int PrevC = C;
                     CurTok.IVal = 0;
                     do {
                         --CurTok.IVal;
                         NextChar ();
-                    } while (C == '-');
+                    } while (C == PrevC);
                     CurTok.Tok = TOK_ULABEL;
                     break;
+                }
 
                 case '+':
+                case '>':
+                {
+                    int PrevC = C;
                     CurTok.IVal = 0;
                     do {
                         ++CurTok.IVal;
                         NextChar ();
-                    } while (C == '+');
+                    } while (C == PrevC);
                     CurTok.Tok = TOK_ULABEL;
                     break;
+                }
 
                 case '=':
                     NextChar ();
@@ -1434,11 +1571,11 @@ CharAgain:
             return;
 
         case '\'':
-            /* Hack: If we allow ' as terminating character for strings, read
-            ** the following stuff as a string, and check for a one character
-            ** string later.
-            */
             if (LooseStringTerm) {
+                /* Hack: If we allow ' as terminating character for strings, read
+                ** the following stuff as a string, and check for a one character
+                ** string later.
+                */
                 ReadStringConst ('\'');
                 if (SB_GetLen (&CurTok.SVal) == 1) {
                     CurTok.IVal = SB_AtUnchecked (&CurTok.SVal, 0);
@@ -1447,22 +1584,16 @@ CharAgain:
                     CurTok.Tok = TOK_STRCON;
                 }
             } else {
-                /* Always a character constant */
-                NextChar ();
-                if (C == EOF || IsControl (C)) {
+                /* Always a character constant
+                ** Hack: Pass 0 to ReadStringConst for special handling.
+                */
+                ReadStringConst(0);
+                if (SB_GetLen(&CurTok.SVal) != 1) {
                     Error ("Illegal character constant");
                     goto CharAgain;
                 }
-                CurTok.IVal = C;
+                CurTok.IVal = SB_AtUnchecked (&CurTok.SVal, 0);
                 CurTok.Tok = TOK_CHARCON;
-                NextChar ();
-                if (C != '\'') {
-                    if (!MissingCharTerm) {
-                        Error ("Illegal character constant");
-                    }
-                } else {
-                    NextChar ();
-                }
             }
             return;
 
@@ -1497,7 +1628,7 @@ CharAgain:
             /* In case of the main file, do not close it, but return EOF. */
             if (Source && Source->Next) {
                 DoneCharSource ();
-                goto Again;
+                goto Restart;
             } else {
                 CurTok.Tok = TOK_EOF;
             }
diff --git a/src/ca65/studyexpr.c b/src/ca65/studyexpr.c
index 40e9b7aab..f4376e221 100644
--- a/src/ca65/studyexpr.c
+++ b/src/ca65/studyexpr.c
@@ -610,12 +610,13 @@ static void StudySymbol (ExprNode* Expr, ExprDesc* D)
                 DumpExpr (Expr, SymResolve);
             }
 
-            /* If the symbol has an explicit address size, use it. This may
-            ** lead to range errors later (maybe even in the linker stage), if
-            ** the user lied about the address size, but for now we trust him.
+            /* If the symbol has an explicit address size that is smaller than
+            ** the one found, use it. This may lead to range errors later
+            ** (maybe even in the linker stage) if the user lied about the
+            ** address size, but for now we trust him.
             */
             AddrSize = GetSymAddrSize (Sym);
-            if (AddrSize != ADDR_SIZE_DEFAULT) {
+            if (AddrSize != ADDR_SIZE_DEFAULT && AddrSize < D->AddrSize) {
                 D->AddrSize = AddrSize;
             }
         }
diff --git a/src/ca65/symentry.c b/src/ca65/symentry.c
index 1048bfbc2..c57fcff2a 100644
--- a/src/ca65/symentry.c
+++ b/src/ca65/symentry.c
@@ -211,6 +211,8 @@ static void SymReplaceExprRefs (SymEntry* S)
 void SymDef (SymEntry* S, ExprNode* Expr, unsigned char AddrSize, unsigned Flags)
 /* Define a new symbol */
 {
+    int Redef = 0;      /* Flag for symbol redefinition */
+
     if (S->Flags & SF_IMPORT) {
         /* Defined symbol is marked as imported external symbol */
         Error ("Symbol '%m%p' is already an import", GetSymName (S));
@@ -238,6 +240,7 @@ void SymDef (SymEntry* S, ExprNode* Expr, unsigned char AddrSize, unsigned Flags
             */
             FreeExpr (S->Expr);
             S->Expr = 0;
+            Redef = 1;
         }
     }
 
@@ -291,8 +294,10 @@ void SymDef (SymEntry* S, ExprNode* Expr, unsigned char AddrSize, unsigned Flags
         }
     }
 
-    /* If this is not a local symbol, remember it as the last global one */
-    if ((S->Flags & SF_LOCAL) == 0) {
+    /* If this is not a local symbol and not a redefinition for a variable
+    ** symbol, remember it as the last global one.
+    */
+    if ((S->Flags & SF_LOCAL) == 0 && !Redef) {
         SymLast = S;
     }
 }
diff --git a/src/ca65/token.h b/src/ca65/token.h
index b8bbb6d6e..b40534d79 100644
--- a/src/ca65/token.h
+++ b/src/ca65/token.h
@@ -68,10 +68,11 @@ typedef enum token_t {
     TOK_Y,              /* Y register */
     TOK_Z,              /* Z register */
     TOK_S,              /* S register */
+    TOK_Q,              /* Q pseudo register */
     TOK_REG,            /* Sweet16 R.. register (in sweet16 mode) */
 
     TOK_ASSIGN,         /* := */
-    TOK_ULABEL,         /* :++ or :-- */
+    TOK_ULABEL,         /* An unnamed label */
 
     TOK_EQ,             /* = */
     TOK_NE,             /* <> */
@@ -136,6 +137,7 @@ typedef enum token_t {
     TOK_BLANK,
     TOK_BSS,
     TOK_BYTE,
+    TOK_CAP,
     TOK_CASE,
     TOK_CHARMAP,
     TOK_CODE,
@@ -193,11 +195,18 @@ typedef enum token_t {
     TOK_IFNDEF,
     TOK_IFNREF,
     TOK_IFP02,
+    TOK_IFP02X,
     TOK_IFP4510,
+    TOK_IFP45GS02,
+    TOK_IFP6280,
     TOK_IFP816,
     TOK_IFPC02,
+    TOK_IFPCE02,
     TOK_IFPDTV,
+    TOK_IFPM740,
     TOK_IFPSC02,
+    TOK_IFPSWEET16,
+    TOK_IFPWC02,
     TOK_IFREF,
     TOK_IMPORT,
     TOK_IMPORTZP,
@@ -226,20 +235,27 @@ typedef enum token_t {
     TOK_ORG,
     TOK_OUT,
     TOK_P02,
+    TOK_P02X,
     TOK_P4510,
+    TOK_P45GS02,
+    TOK_P6280,
     TOK_P816,
     TOK_PAGELENGTH,
     TOK_PARAMCOUNT,
     TOK_PC02,
+    TOK_PCE02,
     TOK_PDTV,
+    TOK_PM740,
     TOK_POPCHARMAP,
     TOK_POPCPU,
     TOK_POPSEG,
     TOK_PROC,
     TOK_PSC02,
+    TOK_PSWEET16,
     TOK_PUSHCHARMAP,
     TOK_PUSHCPU,
     TOK_PUSHSEG,
+    TOK_PWC02,
     TOK_REFERENCED,
     TOK_REFERTO,
     TOK_RELOC,
diff --git a/src/ca65/ulabel.c b/src/ca65/ulabel.c
index 1127c3743..19bec0671 100644
--- a/src/ca65/ulabel.c
+++ b/src/ca65/ulabel.c
@@ -107,8 +107,12 @@ ExprNode* ULabRef (int Which)
     int     Index;
     ULabel* L;
 
-    /* Which can never be 0 */
-    PRECONDITION (Which != 0);
+    /* Which should not be 0 */
+    if (Which == 0) {
+        Error ("Invalid unnamed label reference");
+        /* We must return something valid */
+        return GenCurrentPC();
+    }
 
     /* Get the index of the referenced label */
     if (Which > 0) {
diff --git a/src/cc65.sln b/src/cc65.sln
index 4ae2816ad..8e31ef909 100644
--- a/src/cc65.sln
+++ b/src/cc65.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33829.357
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cc65", "cc65.vcxproj", "{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}"
@@ -66,61 +68,115 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|Win32.Build.0 = Debug|Win32
+		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|x64.ActiveCfg = Debug|x64
+		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Debug|x64.Build.0 = Debug|x64
 		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|Win32.ActiveCfg = Release|Win32
 		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|Win32.Build.0 = Release|Win32
+		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|x64.ActiveCfg = Release|x64
+		{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}.Release|x64.Build.0 = Release|x64
 		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|Win32.Build.0 = Debug|Win32
+		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|x64.ActiveCfg = Debug|x64
+		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Debug|x64.Build.0 = Debug|x64
 		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|Win32.ActiveCfg = Release|Win32
 		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|Win32.Build.0 = Release|Win32
+		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|x64.ActiveCfg = Release|x64
+		{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}.Release|x64.Build.0 = Release|x64
 		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|Win32.Build.0 = Debug|Win32
+		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|x64.ActiveCfg = Debug|x64
+		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Debug|x64.Build.0 = Debug|x64
 		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|Win32.ActiveCfg = Release|Win32
 		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|Win32.Build.0 = Release|Win32
+		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|x64.ActiveCfg = Release|x64
+		{D28CB737-E6CA-49C4-8CE9-FF05F86DD4EC}.Release|x64.Build.0 = Release|x64
 		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|Win32.Build.0 = Debug|Win32
+		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|x64.ActiveCfg = Debug|x64
+		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Debug|x64.Build.0 = Debug|x64
 		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|Win32.ActiveCfg = Release|Win32
 		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|Win32.Build.0 = Release|Win32
+		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|x64.ActiveCfg = Release|x64
+		{5E8C19C6-B167-440C-8BEF-3CBF109CDB49}.Release|x64.Build.0 = Release|x64
 		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|Win32.Build.0 = Debug|Win32
+		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|x64.ActiveCfg = Debug|x64
+		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Debug|x64.Build.0 = Debug|x64
 		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|Win32.ActiveCfg = Release|Win32
 		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|Win32.Build.0 = Release|Win32
+		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|x64.ActiveCfg = Release|x64
+		{26C749A0-814C-47A2-9D36-AE92AE932FE4}.Release|x64.Build.0 = Release|x64
 		{F657912F-050A-488B-B203-50ED5715CDD7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F657912F-050A-488B-B203-50ED5715CDD7}.Debug|Win32.Build.0 = Debug|Win32
+		{F657912F-050A-488B-B203-50ED5715CDD7}.Debug|x64.ActiveCfg = Debug|x64
+		{F657912F-050A-488B-B203-50ED5715CDD7}.Debug|x64.Build.0 = Debug|x64
 		{F657912F-050A-488B-B203-50ED5715CDD7}.Release|Win32.ActiveCfg = Release|Win32
 		{F657912F-050A-488B-B203-50ED5715CDD7}.Release|Win32.Build.0 = Release|Win32
+		{F657912F-050A-488B-B203-50ED5715CDD7}.Release|x64.ActiveCfg = Release|x64
+		{F657912F-050A-488B-B203-50ED5715CDD7}.Release|x64.Build.0 = Release|x64
 		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|Win32.Build.0 = Debug|Win32
+		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|x64.ActiveCfg = Debug|x64
+		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Debug|x64.Build.0 = Debug|x64
 		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|Win32.ActiveCfg = Release|Win32
 		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|Win32.Build.0 = Release|Win32
+		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|x64.ActiveCfg = Release|x64
+		{0BCFB793-2B25-40E2-B265-75848824AC4C}.Release|x64.Build.0 = Release|x64
 		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|Win32.Build.0 = Debug|Win32
+		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|x64.ActiveCfg = Debug|x64
+		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Debug|x64.Build.0 = Debug|x64
 		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|Win32.ActiveCfg = Release|Win32
 		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|Win32.Build.0 = Release|Win32
+		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|x64.ActiveCfg = Release|x64
+		{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}.Release|x64.Build.0 = Release|x64
 		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|Win32.Build.0 = Debug|Win32
+		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|x64.ActiveCfg = Debug|x64
+		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Debug|x64.Build.0 = Debug|x64
 		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|Win32.ActiveCfg = Release|Win32
 		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|Win32.Build.0 = Release|Win32
+		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|x64.ActiveCfg = Release|x64
+		{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}.Release|x64.Build.0 = Release|x64
 		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|Win32.Build.0 = Debug|Win32
+		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|x64.ActiveCfg = Debug|x64
+		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Debug|x64.Build.0 = Debug|x64
 		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|Win32.ActiveCfg = Release|Win32
 		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|Win32.Build.0 = Release|Win32
+		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|x64.ActiveCfg = Release|x64
+		{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}.Release|x64.Build.0 = Release|x64
 		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|Win32.Build.0 = Debug|Win32
+		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|x64.ActiveCfg = Debug|x64
+		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Debug|x64.Build.0 = Debug|x64
 		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|Win32.ActiveCfg = Release|Win32
 		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|Win32.Build.0 = Release|Win32
+		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|x64.ActiveCfg = Release|x64
+		{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}.Release|x64.Build.0 = Release|x64
 		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|Win32.ActiveCfg = Debug|Win32
 		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|Win32.Build.0 = Debug|Win32
+		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|x64.ActiveCfg = Debug|x64
+		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Debug|x64.Build.0 = Debug|x64
 		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|Win32.ActiveCfg = Release|Win32
 		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|Win32.Build.0 = Release|Win32
+		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|x64.ActiveCfg = Release|x64
+		{002A366E-2863-46A8-BDDE-DDF534AAEC73}.Release|x64.Build.0 = Release|x64
 		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|Win32.Build.0 = Debug|Win32
+		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|x64.ActiveCfg = Debug|x64
+		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Debug|x64.Build.0 = Debug|x64
 		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|Win32.ActiveCfg = Release|Win32
 		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|Win32.Build.0 = Release|Win32
+		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|x64.ActiveCfg = Release|x64
+		{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/cc65.vcxproj b/src/cc65.vcxproj
index 6f3f8e4e4..75ee92276 100644
--- a/src/cc65.vcxproj
+++ b/src/cc65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B17EDBD5-DC04-4970-9CBD-56A98B6A3FCA}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="cc65\anonname.h" />
     <ClInclude Include="cc65\asmcode.h" />
@@ -69,6 +102,7 @@
     <ClInclude Include="cc65\coptcmp.h" />
     <ClInclude Include="cc65\coptind.h" />
     <ClInclude Include="cc65\coptjmp.h" />
+    <ClInclude Include="cc65\coptlong.h" />
     <ClInclude Include="cc65\coptmisc.h" />
     <ClInclude Include="cc65\coptptrload.h" />
     <ClInclude Include="cc65\coptptrstore.h" />
@@ -150,6 +184,7 @@
     <ClCompile Include="cc65\coptcmp.c" />
     <ClCompile Include="cc65\coptind.c" />
     <ClCompile Include="cc65\coptjmp.c" />
+    <ClCompile Include="cc65\coptlong.c" />
     <ClCompile Include="cc65\coptmisc.c" />
     <ClCompile Include="cc65\coptptrload.c" />
     <ClCompile Include="cc65\coptptrstore.c" />
diff --git a/src/cc65/asmstmt.c b/src/cc65/asmstmt.c
index 166d05434..8521f0a81 100644
--- a/src/cc65/asmstmt.c
+++ b/src/cc65/asmstmt.c
@@ -80,9 +80,9 @@ static void AsmErrorSkip (void)
 
 
 
-static SymEntry* AsmGetSym (unsigned Arg, unsigned Type)
-/* Find the symbol with the name currently in NextTok. The symbol must be of
-** the given type. On errors, NULL is returned.
+static SymEntry* AsmGetSym (unsigned Arg, int OnStack)
+/* Find the symbol with the name currently in NextTok. The symbol must be on
+** the stack if OnStack is true. On errors, NULL is returned.
 */
 {
     SymEntry* Sym;
@@ -110,8 +110,8 @@ static SymEntry* AsmGetSym (unsigned Arg, unsigned Type)
     /* We found the symbol - skip the name token */
     NextToken ();
 
-    /* Check if we have a global symbol */
-    if ((Sym->Flags & Type) != Type) {
+    /* Check if the symbol is on the stack */
+    if ((Sym->Flags & SC_STORAGEMASK) != SC_AUTO ? OnStack : !OnStack) {
         Error ("Type of argument %u differs from format specifier", Arg);
         AsmErrorSkip ();
         return 0;
@@ -218,23 +218,24 @@ static void ParseGVarArg (StrBuf* T, unsigned Arg)
 */
 {
     /* Parse the symbol name parameter and check the type */
-    SymEntry* Sym = AsmGetSym (Arg, SC_STATIC);
+    SymEntry* Sym = AsmGetSym (Arg, 0);
     if (Sym == 0) {
         /* Some sort of error */
         return;
     }
 
-    /* Check for external linkage */
-    if (Sym->Flags & (SC_EXTERN | SC_STORAGE | SC_FUNC)) {
-        /* External linkage or a function */
+    /* Get the correct asm name */
+    if ((Sym->Flags & SC_TYPEMASK) == SC_FUNC || SymIsGlobal (Sym)) {
+        /* External or internal linkage or a function */
         SB_AppendChar (T, '_');
         SB_AppendStr (T, Sym->Name);
-    } else if (Sym->Flags & SC_REGISTER) {
+    } else if ((Sym->Flags & SC_STORAGEMASK) == SC_REGISTER) {
+        /* Register variable */
         char Buf[32];
         xsprintf (Buf, sizeof (Buf), "regbank+%d", Sym->V.R.RegOffs);
         SB_AppendStr (T, Buf);
     } else {
-        /* Static variable */
+        /* Local static variable */
         SB_AppendStr (T, LocalDataLabelName (Sym->V.L.Label));
     }
 }
@@ -248,7 +249,7 @@ static void ParseLVarArg (StrBuf* T, unsigned Arg)
     char Buf [16];
 
     /* Parse the symbol name parameter and check the type */
-    SymEntry* Sym = AsmGetSym (Arg, SC_AUTO);
+    SymEntry* Sym = AsmGetSym (Arg, 1);
     if (Sym == 0) {
         /* Some sort of error */
         return;
diff --git a/src/cc65/assignment.c b/src/cc65/assignment.c
index e51dde9ab..a66c495da 100644
--- a/src/cc65/assignment.c
+++ b/src/cc65/assignment.c
@@ -104,10 +104,16 @@ static void CopyStruct (ExprDesc* LExpr, ExprDesc* RExpr)
 
     } else {
 
-        /* The rhs cannot happen to be loaded in the primary as it is too big */
+        /* Load the address of rhs into the primary */
         if (!ED_IsLocExpr (RExpr)) {
             ED_AddrExpr (RExpr);
             LoadExpr (CF_NONE, RExpr);
+        } else if (RExpr->IVal != 0) {
+            /* We have an expression in the primary plus a constant
+            ** offset. Adjust the value in the primary accordingly.
+            */
+            g_inc (CF_PTR | CF_CONST, RExpr->IVal);
+            RExpr->IVal = 0;
         }
 
         /* Push the address of the rhs as the source of memcpy */
diff --git a/src/cc65/codeent.c b/src/cc65/codeent.c
index 928815934..a870ee981 100644
--- a/src/cc65/codeent.c
+++ b/src/cc65/codeent.c
@@ -2445,6 +2445,24 @@ static char* RegContentDesc (const RegContents* RC, char* Buf)
         sprintf (B, "Y:%02X ", RC->RegY);
     }
     B += 5;
+    if (RegValIsUnknown (RC->Ptr1Lo)) {
+        strcpy (B, "P1L:XX ");
+    } else {
+        sprintf (B, "P1L:%02X ", RC->Ptr1Lo);
+    }
+    B += 7;
+    if (RegValIsUnknown (RC->Ptr1Hi)) {
+        strcpy (B, "P1H:XX ");
+    } else {
+        sprintf (B, "P1H:%02X ", RC->Ptr1Hi);
+    }
+    B += 7;
+    if (RegValIsUnknown (RC->Tmp1)) {
+        strcpy (B, "T1:XX ");
+    } else {
+        sprintf (B, "T1:%02X ", RC->Tmp1);
+    }
+    B += 6;
     if (PStatesAreUnknown (RC->PFlags, PSTATE_C)) {
         strcpy (B, "~");
     } else {
diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c
index 2721f8e96..04340af67 100644
--- a/src/cc65/codegen.c
+++ b/src/cc65/codegen.c
@@ -200,8 +200,12 @@ void g_preamble (void)
         case CPU_6502DTV:   AddTextLine ("\t.setcpu\t\t\"6502DTV\"");   break;
         case CPU_65SC02:    AddTextLine ("\t.setcpu\t\t\"65SC02\"");    break;
         case CPU_65C02:     AddTextLine ("\t.setcpu\t\t\"65C02\"");     break;
+        case CPU_W65C02:    AddTextLine ("\t.setcpu\t\t\"W65C02\"");    break;
+        case CPU_65CE02:    AddTextLine ("\t.setcpu\t\t\"65CE02\"");    break;
         case CPU_65816:     AddTextLine ("\t.setcpu\t\t\"65816\"");     break;
         case CPU_HUC6280:   AddTextLine ("\t.setcpu\t\t\"HUC6280\"");   break;
+        case CPU_4510:      AddTextLine ("\t.setcpu\t\t\"4510\"");      break;
+        case CPU_45GS02:    AddTextLine ("\t.setcpu\t\t\"45GS02\"");    break;
         default:            Internal ("Unknown CPU: %d", CPU);
     }
 
@@ -218,7 +222,10 @@ void g_preamble (void)
     AddTextLine ("\t.debuginfo\t%s", (DebugInfo != 0)? "on" : "off");
 
     /* Import zero page variables */
-    AddTextLine ("\t.importzp\tsp, sreg, regsave, regbank");
+    AddTextLine ("\t.importzp\t" "c_sp, sreg, regsave, regbank");
+    /* The space above is intentional, to ease replacement of the name of
+    ** the stack pointer.  Don't worry, the preprocessor will concatenate them.
+    */
     AddTextLine ("\t.importzp\ttmp1, tmp2, tmp3, tmp4, ptr1, ptr2, ptr3, ptr4");
 
     /* Define long branch macros */
@@ -507,34 +514,39 @@ void g_enter (unsigned flags, unsigned argsize)
 
 
 
-void g_leave (void)
+void g_leave (int DoCleanup)
 /* Function epilogue */
 {
-    /* How many bytes of locals do we have to drop? */
-    unsigned ToDrop = (unsigned) -StackPtr;
+    /* In the main function in cc65 mode nothing has to be dropped because
+    ** the program is terminated anyway.
+    */
+    if (DoCleanup) {
+        /* How many bytes of locals do we have to drop? */
+        unsigned ToDrop = (unsigned) -StackPtr;
 
-    /* If we didn't have a variable argument list, don't call leave */
-    if (funcargs >= 0) {
+        /* If we didn't have a variable argument list, don't call leave */
+        if (funcargs >= 0) {
 
-        /* Drop stackframe if needed */
-        g_drop (ToDrop + funcargs);
+            /* Drop stackframe if needed */
+            g_drop (ToDrop + funcargs);
 
-    } else if (StackPtr != 0) {
+        } else if (StackPtr != 0) {
+
+            /* We've a stack frame to drop */
+            if (ToDrop > 255) {
+                g_drop (ToDrop);            /* Inlines the code */
+                AddCodeLine ("jsr leave");
+            } else {
+                AddCodeLine ("ldy #$%02X", ToDrop);
+                AddCodeLine ("jsr leavey");
+            }
 
-        /* We've a stack frame to drop */
-        if (ToDrop > 255) {
-            g_drop (ToDrop);            /* Inlines the code */
-            AddCodeLine ("jsr leave");
         } else {
-            AddCodeLine ("ldy #$%02X", ToDrop);
-            AddCodeLine ("jsr leavey");
+
+            /* Nothing to drop */
+            AddCodeLine ("jsr leave");
+
         }
-
-    } else {
-
-        /* Nothing to drop */
-        AddCodeLine ("jsr leave");
-
     }
 
     /* Add the final rts */
@@ -564,11 +576,11 @@ void g_swap_regvars (int StackOffs, int RegOffs, unsigned Bytes)
             AddCodeLine ("ldx #$%02X", RegOffs & 0xFF);
             AddCodeLine ("jsr regswap1");
         } else {
-            AddCodeLine ("lda (sp),y");
+            AddCodeLine ("lda (c_sp),y");
             AddCodeLine ("ldx regbank%+d", RegOffs);
             AddCodeLine ("sta regbank%+d", RegOffs);
             AddCodeLine ("txa");
-            AddCodeLine ("sta (sp),y");
+            AddCodeLine ("sta (c_sp),y");
         }
 
     } else if (Bytes == 2) {
@@ -610,7 +622,7 @@ void g_save_regvars (int RegOffs, unsigned Bytes)
         AddCodeLine ("ldx #$%02X", (unsigned char) Bytes);
         g_defcodelabel (Label);
         AddCodeLine ("lda regbank%+d,x", RegOffs-1);
-        AddCodeLine ("sta (sp),y");
+        AddCodeLine ("sta (c_sp),y");
         AddCodeLine ("dey");
         AddCodeLine ("dex");
         AddCodeLine ("bne %s", LocalLabelName (Label));
@@ -634,28 +646,28 @@ void g_restore_regvars (int StackOffs, int RegOffs, unsigned Bytes)
     if (Bytes == 1) {
 
         AddCodeLine ("ldy #$%02X", StackOffs);
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d", RegOffs);
 
     } else if (Bytes == 2) {
 
         AddCodeLine ("ldy #$%02X", StackOffs);
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d", RegOffs);
         AddCodeLine ("iny");
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d", RegOffs+1);
 
     } else if (Bytes == 3 && IS_Get (&CodeSizeFactor) >= 133) {
 
         AddCodeLine ("ldy #$%02X", StackOffs);
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d", RegOffs);
         AddCodeLine ("iny");
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d", RegOffs+1);
         AddCodeLine ("iny");
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d", RegOffs+2);
 
     } else if (StackOffs <= RegOffs) {
@@ -667,7 +679,7 @@ void g_restore_regvars (int StackOffs, int RegOffs, unsigned Bytes)
         unsigned Label = GetLocalLabel ();
         AddCodeLine ("ldy #$%02X", StackOffs);
         g_defcodelabel (Label);
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d,y", RegOffs - StackOffs);
         AddCodeLine ("iny");
         AddCodeLine ("cpy #$%02X", StackOffs + Bytes);
@@ -683,7 +695,7 @@ void g_restore_regvars (int StackOffs, int RegOffs, unsigned Bytes)
         AddCodeLine ("ldy #$%02X", (unsigned char) (StackOffs + Bytes - 1));
         AddCodeLine ("ldx #$%02X", (unsigned char) (Bytes - 1));
         g_defcodelabel (Label);
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta regbank%+d,x", RegOffs);
         AddCodeLine ("dey");
         AddCodeLine ("dex");
@@ -705,7 +717,6 @@ void g_getimmed (unsigned Flags, uintptr_t Val, long Offs)
 /* Load a constant into the primary register */
 {
     unsigned char B1, B2, B3, B4;
-    unsigned      Done;
 
 
     if ((Flags & CF_CONST) != 0) {
@@ -731,40 +742,15 @@ void g_getimmed (unsigned Flags, uintptr_t Val, long Offs)
                 B3 = (unsigned char) (Val >> 16);
                 B4 = (unsigned char) (Val >> 24);
 
-                /* Remember which bytes are done */
-                Done = 0;
-
-                /* Load the value */
-                AddCodeLine ("ldx #$%02X", B2);
-                Done |= 0x02;
-                if (B2 == B3) {
-                    AddCodeLine ("stx sreg");
-                    Done |= 0x04;
-                }
-                if (B2 == B4) {
-                    AddCodeLine ("stx sreg+1");
-                    Done |= 0x08;
-                }
-                if ((Done & 0x04) == 0 && B1 != B3) {
-                    AddCodeLine ("lda #$%02X", B3);
-                    AddCodeLine ("sta sreg");
-                    Done |= 0x04;
-                }
-                if ((Done & 0x08) == 0 && B1 != B4) {
-                    AddCodeLine ("lda #$%02X", B4);
-                    AddCodeLine ("sta sreg+1");
-                    Done |= 0x08;
-                }
+                /* Load the value. Don't be too smart here and let
+                 * the optimizer do its job.
+                 */
+                AddCodeLine ("lda #$%02X", B4);
+                AddCodeLine ("sta sreg+1");
+                AddCodeLine ("lda #$%02X", B3);
+                AddCodeLine ("sta sreg");
                 AddCodeLine ("lda #$%02X", B1);
-                Done |= 0x01;
-                if ((Done & 0x04) == 0) {
-                    CHECK (B1 == B3);
-                    AddCodeLine ("sta sreg");
-                }
-                if ((Done & 0x08) == 0) {
-                    CHECK (B1 == B4);
-                    AddCodeLine ("sta sreg+1");
-                }
+                AddCodeLine ("ldx #$%02X", B2);
                 break;
 
             default:
@@ -855,11 +841,11 @@ void g_getlocal (unsigned Flags, int Offs)
             CheckLocalOffs (Offs);
             if ((Flags & CF_FORCECHAR) || (Flags & CF_TEST)) {
                 AddCodeLine ("ldy #$%02X", Offs);
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
             } else {
                 AddCodeLine ("ldy #$%02X", Offs);
                 AddCodeLine ("ldx #$00");
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
                 if ((Flags & CF_UNSIGNED) == 0) {
                     unsigned L = GetLocalLabel();
                     AddCodeLine ("bpl %s", LocalLabelName (L));
@@ -873,9 +859,9 @@ void g_getlocal (unsigned Flags, int Offs)
             CheckLocalOffs (Offs + 1);
             AddCodeLine ("ldy #$%02X", (unsigned char) (Offs+1));
             if (Flags & CF_TEST) {
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
                 AddCodeLine ("dey");
-                AddCodeLine ("ora (sp),y");
+                AddCodeLine ("ora (c_sp),y");
             } else {
                 AddCodeLine ("jsr ldaxysp");
             }
@@ -956,7 +942,7 @@ void g_leasp (int Offs)
 {
     unsigned char Lo, Hi;
 
-    /* Calculate the offset relative to sp */
+    /* Calculate the offset relative to c_sp */
     Offs -= StackPtr;
 
     /* Get low and high byte */
@@ -966,17 +952,17 @@ void g_leasp (int Offs)
     /* Generate code */
     if (Lo == 0) {
         if (Hi <= 3) {
-            AddCodeLine ("lda sp");
-            AddCodeLine ("ldx sp+1");
+            AddCodeLine ("lda c_sp");
+            AddCodeLine ("ldx c_sp+1");
             while (Hi--) {
                 AddCodeLine ("inx");
             }
         } else {
-            AddCodeLine ("lda sp+1");
+            AddCodeLine ("lda c_sp+1");
             AddCodeLine ("clc");
             AddCodeLine ("adc #$%02X", Hi);
             AddCodeLine ("tax");
-            AddCodeLine ("lda sp");
+            AddCodeLine ("lda c_sp");
         }
     } else if (Hi == 0) {
         /* 8 bit offset */
@@ -987,8 +973,8 @@ void g_leasp (int Offs)
         } else {
             /* 8 bit offset inlined */
             unsigned L = GetLocalLabel ();
-            AddCodeLine ("lda sp");
-            AddCodeLine ("ldx sp+1");
+            AddCodeLine ("lda c_sp");
+            AddCodeLine ("ldx c_sp+1");
             AddCodeLine ("clc");
             AddCodeLine ("adc #$%02X", Lo);
             AddCodeLine ("bcc %s", LocalLabelName (L));
@@ -1002,11 +988,11 @@ void g_leasp (int Offs)
         AddCodeLine ("jsr leaaxsp");
     } else {
         /* Full 16 bit offset inlined */
-        AddCodeLine ("lda sp");
+        AddCodeLine ("lda c_sp");
         AddCodeLine ("clc");
         AddCodeLine ("adc #$%02X", Lo);
         AddCodeLine ("pha");
-        AddCodeLine ("lda sp+1");
+        AddCodeLine ("lda c_sp+1");
         AddCodeLine ("adc #$%02X", Hi);
         AddCodeLine ("tax");
         AddCodeLine ("pla");
@@ -1022,10 +1008,10 @@ void g_leavariadic (int Offs)
 {
     unsigned ArgSizeOffs;
 
-    /* Calculate the offset relative to sp */
+    /* Calculate the offset relative to c_sp */
     Offs -= StackPtr;
 
-    /* Get the offset of the parameter which is stored at sp+0 on function
+    /* Get the offset of the parameter which is stored at c_sp+0 on function
     ** entry and check if this offset is reachable with a byte offset.
     */
     CHECK (StackPtr <= 0);
@@ -1034,14 +1020,14 @@ void g_leavariadic (int Offs)
 
     /* Get the size of all parameters. */
     AddCodeLine ("ldy #$%02X", ArgSizeOffs);
-    AddCodeLine ("lda (sp),y");
+    AddCodeLine ("lda (c_sp),y");
 
     /* Add the value of the stackpointer */
     if (IS_Get (&CodeSizeFactor) > 250) {
         unsigned L = GetLocalLabel();
-        AddCodeLine ("ldx sp+1");
+        AddCodeLine ("ldx c_sp+1");
         AddCodeLine ("clc");
-        AddCodeLine ("adc sp");
+        AddCodeLine ("adc c_sp");
         AddCodeLine ("bcc %s", LocalLabelName (L));
         AddCodeLine ("inx");
         g_defcodelabel (L);
@@ -1113,14 +1099,14 @@ void g_putlocal (unsigned Flags, int Offs, long Val)
                 AddCodeLine ("lda #$%02X", (unsigned char) Val);
             }
             AddCodeLine ("ldy #$%02X", Offs);
-            AddCodeLine ("sta (sp),y");
+            AddCodeLine ("sta (c_sp),y");
             break;
 
         case CF_INT:
             if (Flags & CF_CONST) {
                 AddCodeLine ("ldy #$%02X", Offs+1);
                 AddCodeLine ("lda #$%02X", (unsigned char) (Val >> 8));
-                AddCodeLine ("sta (sp),y");
+                AddCodeLine ("sta (c_sp),y");
                 if ((Flags & CF_NOKEEP) == 0) {
                     /* Place high byte into X */
                     AddCodeLine ("tax");
@@ -1133,16 +1119,16 @@ void g_putlocal (unsigned Flags, int Offs, long Val)
                     AddCodeLine ("dey");
                     AddCodeLine ("lda #$%02X", (unsigned char) Val);
                 }
-                AddCodeLine ("sta (sp),y");
+                AddCodeLine ("sta (c_sp),y");
             } else {
                 AddCodeLine ("ldy #$%02X", Offs);
                 if ((Flags & CF_NOKEEP) == 0 || IS_Get (&CodeSizeFactor) < 160) {
                     AddCodeLine ("jsr staxysp");
                 } else {
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                     AddCodeLine ("iny");
                     AddCodeLine ("txa");
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                 }
             }
             break;
@@ -1182,12 +1168,12 @@ void g_putind (unsigned Flags, unsigned Offs)
             AddCodeLine ("pha");
         }
         AddCodeLine ("lda #$%02X", Offs & 0xFF);
-        AddCodeLine ("adc (sp),y");
-        AddCodeLine ("sta (sp),y");
+        AddCodeLine ("adc (c_sp),y");
+        AddCodeLine ("sta (c_sp),y");
         AddCodeLine ("iny");
         AddCodeLine ("lda #$%02X", (Offs >> 8) & 0xFF);
-        AddCodeLine ("adc (sp),y");
-        AddCodeLine ("sta (sp),y");
+        AddCodeLine ("adc (c_sp),y");
+        AddCodeLine ("sta (c_sp),y");
         if ((Flags & CF_NOKEEP) == 0) {
             AddCodeLine ("pla");
         }
@@ -1204,8 +1190,8 @@ void g_putind (unsigned Flags, unsigned Offs)
             AddCodeLine ("pha");
         }
         AddCodeLine ("lda #$%02X", (Offs >> 8) & 0xFF);
-        AddCodeLine ("adc (sp),y");
-        AddCodeLine ("sta (sp),y");
+        AddCodeLine ("adc (c_sp),y");
+        AddCodeLine ("sta (c_sp),y");
         if ((Flags & CF_NOKEEP) == 0) {
             AddCodeLine ("pla");
         }
@@ -1510,7 +1496,7 @@ unsigned g_typeadjust (unsigned lhs, unsigned rhs)
     ** both operands are converted to unsigned long int.
     */
     if ((ltype == CF_LONG && rtype == CF_INT && (rhs & CF_UNSIGNED)) ||
-        (rtype == CF_LONG && ltype == CF_INT && (rhs & CF_UNSIGNED))) {
+        (rtype == CF_LONG && ltype == CF_INT && (lhs & CF_UNSIGNED))) {
         /* long can represent all unsigneds, so we are in the first sub-case. */
         return const_flag | CF_LONG;
     }
@@ -1639,7 +1625,7 @@ void g_addlocal (unsigned flags, int offs)
             L = GetLocalLabel();
             AddCodeLine ("ldy #$%02X", NewOff & 0xFF);
             AddCodeLine ("clc");
-            AddCodeLine ("adc (sp),y");
+            AddCodeLine ("adc (c_sp),y");
             AddCodeLine ("bcc %s", LocalLabelName (L));
             AddCodeLine ("inx");
             g_defcodelabel (L);
@@ -1648,11 +1634,11 @@ void g_addlocal (unsigned flags, int offs)
         case CF_INT:
             AddCodeLine ("ldy #$%02X", NewOff & 0xFF);
             AddCodeLine ("clc");
-            AddCodeLine ("adc (sp),y");
+            AddCodeLine ("adc (c_sp),y");
             AddCodeLine ("pha");
             AddCodeLine ("txa");
             AddCodeLine ("iny");
-            AddCodeLine ("adc (sp),y");
+            AddCodeLine ("adc (c_sp),y");
             AddCodeLine ("tax");
             AddCodeLine ("pla");
             break;
@@ -1860,12 +1846,12 @@ void g_addeqlocal (unsigned flags, int Offs, unsigned long val)
                 if (flags & CF_CONST) {
                     AddCodeLine ("clc");
                     AddCodeLine ("lda #$%02X", (int)(val & 0xFF));
-                    AddCodeLine ("adc (sp),y");
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("adc (c_sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                 } else {
                     AddCodeLine ("clc");
-                    AddCodeLine ("adc (sp),y");
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("adc (c_sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                 }
                 if ((flags & CF_UNSIGNED) == 0) {
                     unsigned L = GetLocalLabel();
@@ -1883,16 +1869,16 @@ void g_addeqlocal (unsigned flags, int Offs, unsigned long val)
                 if (IS_Get (&CodeSizeFactor) >= 400) {
                     AddCodeLine ("clc");
                     AddCodeLine ("lda #$%02X", (int)(val & 0xFF));
-                    AddCodeLine ("adc (sp),y");
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("adc (c_sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                     AddCodeLine ("iny");
                     AddCodeLine ("lda #$%02X", (int) ((val >> 8) & 0xFF));
-                    AddCodeLine ("adc (sp),y");
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("adc (c_sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                     if ((flags & CF_NOKEEP) == 0) {
                         AddCodeLine ("tax");
                         AddCodeLine ("dey");
-                        AddCodeLine ("lda (sp),y");
+                        AddCodeLine ("lda (c_sp),y");
                     }
                 } else {
                     g_getimmed (flags, val, 0);
@@ -1944,7 +1930,7 @@ void g_addeqind (unsigned flags, unsigned offs, unsigned long val)
         case CF_INT:
         case CF_LONG:
             AddCodeLine ("jsr pushax");         /* Push the address */
-            push (CF_PTR);                      /* Correct the internal sp */
+            push (CF_PTR);                      /* Correct the internal c_sp */
             g_getind (flags, offs);             /* Fetch the value */
             g_inc (flags, val);                 /* Increment value in primary */
             g_putind (flags, offs);             /* Store the value back */
@@ -2110,15 +2096,15 @@ void g_subeqlocal (unsigned flags, int Offs, unsigned long val)
                 AddCodeLine ("ldy #$%02X", Offs);
                 AddCodeLine ("ldx #$00");
                 if (flags & CF_CONST) {
-                    AddCodeLine ("lda (sp),y");
+                    AddCodeLine ("lda (c_sp),y");
                     AddCodeLine ("sec");
                     AddCodeLine ("sbc #$%02X", (unsigned char)val);
                 } else {
                     AddCodeLine ("eor #$FF");
                     AddCodeLine ("sec");
-                    AddCodeLine ("adc (sp),y");
+                    AddCodeLine ("adc (c_sp),y");
                 }
-                AddCodeLine ("sta (sp),y");
+                AddCodeLine ("sta (c_sp),y");
                 if ((flags & CF_UNSIGNED) == 0) {
                     unsigned L = GetLocalLabel();
                     AddCodeLine ("bpl %s", LocalLabelName (L));
@@ -2178,7 +2164,7 @@ void g_subeqind (unsigned flags, unsigned offs, unsigned long val)
         case CF_INT:
         case CF_LONG:
             AddCodeLine ("jsr pushax");         /* Push the address */
-            push (CF_PTR);                      /* Correct the internal sp */
+            push (CF_PTR);                      /* Correct the internal c_sp */
             g_getind (flags, offs);             /* Fetch the value */
             g_dec (flags, val);                 /* Increment value in primary */
             g_putind (flags, offs);             /* Store the value back */
@@ -2229,10 +2215,10 @@ void g_addaddr_local (unsigned flags attribute ((unused)), int offs)
             /* Label was used above */
             g_defcodelabel (L);
         }
-        AddCodeLine ("adc sp");
+        AddCodeLine ("adc c_sp");
         AddCodeLine ("tay");
         AddCodeLine ("txa");
-        AddCodeLine ("adc sp+1");
+        AddCodeLine ("adc c_sp+1");
         AddCodeLine ("tax");
         AddCodeLine ("tya");
     }
@@ -2533,10 +2519,10 @@ void g_callind (unsigned Flags, unsigned ArgSize, int Offs)
         CheckLocalOffs (Offs);
         AddCodeLine ("pha");
         AddCodeLine ("ldy #$%02X", Offs);
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta jmpvec+1");
         AddCodeLine ("iny");
-        AddCodeLine ("lda (sp),y");
+        AddCodeLine ("lda (c_sp),y");
         AddCodeLine ("sta jmpvec+2");
         AddCodeLine ("pla");
         AddCodeLine ("jsr jmpvec");
@@ -2594,11 +2580,11 @@ void g_lateadjustSP (unsigned label)
     AddCodeLine ("pha");
     AddCodeLine ("lda %s", LocalDataLabelName (label));
     AddCodeLine ("clc");
-    AddCodeLine ("adc sp");
-    AddCodeLine ("sta sp");
+    AddCodeLine ("adc c_sp");
+    AddCodeLine ("sta c_sp");
     AddCodeLine ("lda %s+1", LocalDataLabelName (label));
-    AddCodeLine ("adc sp+1");
-    AddCodeLine ("sta sp+1");
+    AddCodeLine ("adc c_sp+1");
+    AddCodeLine ("sta c_sp+1");
     AddCodeLine ("pla");
 }
 
@@ -2612,11 +2598,11 @@ void g_drop (unsigned Space)
         AddCodeLine ("pha");
         AddCodeLine ("lda #$%02X", (unsigned char) Space);
         AddCodeLine ("clc");
-        AddCodeLine ("adc sp");
-        AddCodeLine ("sta sp");
+        AddCodeLine ("adc c_sp");
+        AddCodeLine ("sta c_sp");
         AddCodeLine ("lda #$%02X", (unsigned char) (Space >> 8));
-        AddCodeLine ("adc sp+1");
-        AddCodeLine ("sta sp+1");
+        AddCodeLine ("adc c_sp+1");
+        AddCodeLine ("sta c_sp+1");
         AddCodeLine ("pla");
     } else if (Space > 8) {
         AddCodeLine ("ldy #$%02X", Space);
@@ -2639,13 +2625,13 @@ void g_space (int Space)
         ** overhead.
         */
         AddCodeLine ("pha");
-        AddCodeLine ("lda sp");
+        AddCodeLine ("lda c_sp");
         AddCodeLine ("sec");
         AddCodeLine ("sbc #$%02X", (unsigned char) Space);
-        AddCodeLine ("sta sp");
-        AddCodeLine ("lda sp+1");
+        AddCodeLine ("sta c_sp");
+        AddCodeLine ("lda c_sp+1");
         AddCodeLine ("sbc #$%02X", (unsigned char) (Space >> 8));
-        AddCodeLine ("sta sp+1");
+        AddCodeLine ("sta c_sp+1");
         AddCodeLine ("pla");
     } else if (Space > 8) {
         AddCodeLine ("ldy #$%02X", Space);
@@ -3286,6 +3272,14 @@ void g_asr (unsigned flags, unsigned long val)
                     }
                     val -= 8;
                 }
+                if (val == 7) {
+                    if (flags & CF_UNSIGNED) {
+                        AddCodeLine ("jsr shrax7");
+                    } else {
+                        AddCodeLine ("jsr asrax7");
+                    }
+                    val = 0;
+                }
                 if (val >= 4) {
                     if (flags & CF_UNSIGNED) {
                         AddCodeLine ("jsr shrax4");
@@ -3428,6 +3422,14 @@ void g_asl (unsigned flags, unsigned long val)
                     AddCodeLine ("lda #$00");
                     val -= 8;
                 }
+                if (val == 7) {
+                    if (flags & CF_UNSIGNED) {
+                        AddCodeLine ("jsr shlax7");
+                    } else {
+                        AddCodeLine ("jsr aslax7");
+                    }
+                    val = 0;
+                }
                 if (val >= 4) {
                     if (flags & CF_UNSIGNED) {
                         AddCodeLine ("jsr shlax4");
@@ -3723,13 +3725,7 @@ void g_dec (unsigned flags, unsigned long val)
             } else {
                 /* Inline the code */
                 if (val < 0x300) {
-                    if ((CPUIsets[CPU] & CPU_ISET_65SC02) != 0 && val == 1) {
-                        unsigned L = GetLocalLabel();
-                        AddCodeLine ("bne %s", LocalLabelName (L));
-                        AddCodeLine ("dex");
-                        g_defcodelabel (L);
-                        AddCodeLine ("dea");
-                    } else if ((val & 0xFF) != 0) {
+                    if ((val & 0xFF) != 0) {
                         unsigned L = GetLocalLabel();
                         AddCodeLine ("sec");
                         AddCodeLine ("sbc #$%02X", (unsigned char) val);
@@ -4595,14 +4591,14 @@ void g_initauto (unsigned Label, unsigned Size)
         AddCodeLine ("ldy #$%02X", Size-1);
         g_defcodelabel (CodeLabel);
         AddCodeLine ("lda %s,y", GetLabelName (CF_STATIC, Label, 0));
-        AddCodeLine ("sta (sp),y");
+        AddCodeLine ("sta (c_sp),y");
         AddCodeLine ("dey");
         AddCodeLine ("bpl %s", LocalLabelName (CodeLabel));
     } else if (Size <= 256) {
         AddCodeLine ("ldy #$00");
         g_defcodelabel (CodeLabel);
         AddCodeLine ("lda %s,y", GetLabelName (CF_STATIC, Label, 0));
-        AddCodeLine ("sta (sp),y");
+        AddCodeLine ("sta (c_sp),y");
         AddCodeLine ("iny");
         AddCmpCodeIfSizeNot256 ("cpy #$%02X", Size);
         AddCodeLine ("bne %s", LocalLabelName (CodeLabel));
diff --git a/src/cc65/codegen.h b/src/cc65/codegen.h
index 8e04b45e4..734c95372 100644
--- a/src/cc65/codegen.h
+++ b/src/cc65/codegen.h
@@ -247,7 +247,7 @@ void g_scale (unsigned flags, long val);
 void g_enter (unsigned flags, unsigned argsize);
 /* Function prologue */
 
-void g_leave (void);
+void g_leave (int DoCleanup);
 /* Function epilogue */
 
 
diff --git a/src/cc65/codeinfo.c b/src/cc65/codeinfo.c
index 88f8a5138..25712d546 100644
--- a/src/cc65/codeinfo.c
+++ b/src/cc65/codeinfo.c
@@ -90,7 +90,9 @@ struct FuncInfo {
 ** routines are marked to use only the A register. The remainder is ignored
 ** anyway.
 */
+/* CAUTION: table must be sorted for bsearch */
 static const FuncInfo FuncInfoTable[] = {
+/* BEGIN SORTED.SH */
     { "addeq0sp",   SLV_TOP | REG_AX,   PSTATE_ALL | REG_AXY                        },
     { "addeqysp",   SLV_IND | REG_AXY,  PSTATE_ALL | REG_AXY                        },
     { "addysp",     REG_SP | REG_Y,     PSTATE_ALL | REG_SP                         },
@@ -99,6 +101,7 @@ static const FuncInfo FuncInfoTable[] = {
     { "aslax2",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "aslax3",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "aslax4",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
+    { "aslax7",     REG_AX,             PSTATE_ALL | REG_AXY                        },
     { "aslaxy",     REG_AXY,            PSTATE_ALL | REG_AXY | REG_TMP1             },
     { "asleax1",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
     { "asleax2",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
@@ -108,6 +111,7 @@ static const FuncInfo FuncInfoTable[] = {
     { "asrax2",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "asrax3",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "asrax4",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
+    { "asrax7",     REG_AX,             PSTATE_ALL | REG_AX                         },
     { "asraxy",     REG_AXY,            PSTATE_ALL | REG_AXY | REG_TMP1             },
     { "asreax1",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
     { "asreax2",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
@@ -188,12 +192,12 @@ static const FuncInfo FuncInfoTable[] = {
     { "ldeaxysp",   SLV_IND | REG_Y,        PSTATE_ALL | REG_EAXY                   },
     { "leaa0sp",    REG_SP | REG_A,         PSTATE_ALL | REG_AX                     },
     { "leaaxsp",    REG_SP | REG_AX,        PSTATE_ALL | REG_AX                     },
-    { "leave00",    REG_SP,                 PSTATE_ALL | REG_SP | REG_AXY           },
-    { "leave0",     REG_SP,                 PSTATE_ALL | REG_SP | REG_XY            },
     { "leave",      REG_SP,                 PSTATE_ALL | REG_SP | REG_Y             },
-    { "leavey00",   REG_SP,                 PSTATE_ALL | REG_SP | REG_AXY           },
-    { "leavey0",    REG_SP,                 PSTATE_ALL | REG_SP | REG_XY            },
+    { "leave0",     REG_SP,                 PSTATE_ALL | REG_SP | REG_XY            },
+    { "leave00",    REG_SP,                 PSTATE_ALL | REG_SP | REG_AXY           },
     { "leavey",     REG_SP | REG_Y,         PSTATE_ALL | REG_SP | REG_Y             },
+    { "leavey0",    REG_SP,                 PSTATE_ALL | REG_SP | REG_XY            },
+    { "leavey00",   REG_SP,                 PSTATE_ALL | REG_SP | REG_AXY           },
     { "lsubeq",     REG_EAXY | REG_PTR1_LO, PSTATE_ALL | REG_EAXY | REG_PTR1_HI     },
     { "lsubeq0sp",  SLV_TOP | REG_EAX,      PSTATE_ALL | REG_EAXY                   },
     { "lsubeq1",    REG_Y | REG_PTR1_LO,    PSTATE_ALL | REG_EAXY | REG_PTR1_HI     },
@@ -245,6 +249,7 @@ static const FuncInfo FuncInfoTable[] = {
     { "shlax2",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "shlax3",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "shlax4",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
+    { "shlax7",     REG_AX,             PSTATE_ALL | REG_AXY                        },
     { "shlaxy",     REG_AXY,            PSTATE_ALL | REG_AXY | REG_TMP1             },
     { "shleax1",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
     { "shleax2",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
@@ -254,6 +259,7 @@ static const FuncInfo FuncInfoTable[] = {
     { "shrax2",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "shrax3",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
     { "shrax4",     REG_AX,             PSTATE_ALL | REG_AX | REG_TMP1              },
+    { "shrax7",     REG_AX,             PSTATE_ALL | REG_AX                         },
     { "shraxy",     REG_AXY,            PSTATE_ALL | REG_AXY | REG_TMP1             },
     { "shreax1",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
     { "shreax2",    REG_EAX,            PSTATE_ALL | REG_EAX | REG_TMP1             },
@@ -372,11 +378,16 @@ static const FuncInfo FuncInfoTable[] = {
     { "tosxoreax",  SLV_TOP | REG_EAX,  PSTATE_ALL | REG_SP | REG_EAXY | REG_TMP1   },
     { "tsteax",     REG_EAX,            PSTATE_ALL | REG_Y                          },
     { "utsteax",    REG_EAX,            PSTATE_ALL | REG_Y                          },
+/* END SORTED.SH */
 };
 #define FuncInfoCount   (sizeof(FuncInfoTable) / sizeof(FuncInfoTable[0]))
 
 /* Table with names of zero page locations used by the compiler */
+/* CAUTION: table must be sorted for bsearch */
 static const ZPInfo ZPInfoTable[] = {
+/* BEGIN SORTED.SH */
+    {   0, "c_sp",      2,  REG_SP_LO,      REG_SP      },
+    {   0, "c_sp+1",    1,  REG_SP_HI,      REG_SP      },
     {   0, "ptr1",      2,  REG_PTR1_LO,    REG_PTR1    },
     {   0, "ptr1+1",    1,  REG_PTR1_HI,    REG_PTR1    },
     {   0, "ptr2",      2,  REG_PTR2_LO,    REG_PTR2    },
@@ -386,14 +397,13 @@ static const ZPInfo ZPInfoTable[] = {
     {   7, "regbank",   6,  REG_NONE,       REG_NONE    },
     {   0, "regsave",   4,  REG_SAVE_LO,    REG_SAVE    },
     {   0, "regsave+1", 3,  REG_SAVE_HI,    REG_SAVE    },
-    {   0, "sp",        2,  REG_SP_LO,      REG_SP      },
-    {   0, "sp+1",      1,  REG_SP_HI,      REG_SP      },
     {   0, "sreg",      2,  REG_SREG_LO,    REG_SREG    },
     {   0, "sreg+1",    1,  REG_SREG_HI,    REG_SREG    },
     {   0, "tmp1",      1,  REG_TMP1,       REG_TMP1    },
     {   0, "tmp2",      1,  REG_NONE,       REG_NONE    },
     {   0, "tmp3",      1,  REG_NONE,       REG_NONE    },
     {   0, "tmp4",      1,  REG_NONE,       REG_NONE    },
+/* END SORTED.SH */
 };
 #define ZPInfoCount     (sizeof(ZPInfoTable) / sizeof(ZPInfoTable[0]))
 
@@ -556,11 +566,8 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
                 *Use = REG_NONE;
             }
 
-            /* Will destroy all registers */
-            *Chg = REG_ALL;
-
-            /* and will destroy all processor flags */
-            *Chg |= PSTATE_ALL;
+            /* Will destroy all registers and processor flags */
+            *Chg = (REG_ALL | PSTATE_ALL);
 
             /* Done */
             return FNCLS_GLOBAL;
@@ -573,8 +580,7 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
         ** are used mostly in inline assembly anyway.
         */
         *Use = REG_ALL;
-        *Chg = REG_ALL;
-        *Chg |= PSTATE_ALL;
+        *Chg = (REG_ALL | PSTATE_ALL);
         return FNCLS_NUMERIC;
 
     } else {
@@ -601,8 +607,7 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
                 fprintf (stderr, "No info about internal function '%s'\n", Name);
             }
             *Use = REG_ALL;
-            *Chg = REG_ALL;
-            *Chg |= PSTATE_ALL;
+            *Chg = (REG_ALL | PSTATE_ALL);
         }
         return FNCLS_BUILTIN;
     }
@@ -611,8 +616,7 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
     ** registers and processor flags are changed
     */
     *Use = REG_EAXY;
-    *Chg = REG_ALL;
-    *Chg |= PSTATE_ALL;
+    *Chg = (REG_ALL | PSTATE_ALL);
 
     return FNCLS_UNKNOWN;
 }
@@ -895,6 +899,14 @@ int RegEAXUsed (struct CodeSeg* S, unsigned Index)
 
 
 
+int LoadFlagsUsed (struct CodeSeg* S, unsigned Index)
+/* Check if one of the flags set by a register load (Z and N) are used. */
+{
+    return (GetRegInfo (S, Index, PSTATE_ZN) & PSTATE_ZN) != 0;
+}
+
+
+
 unsigned GetKnownReg (unsigned Use, const RegContents* RC)
 /* Return the register or zero page location from the set in Use, thats
 ** contents are known. If Use does not contain any register, or if the
diff --git a/src/cc65/codeinfo.h b/src/cc65/codeinfo.h
index 14ef54d8f..d03962343 100644
--- a/src/cc65/codeinfo.h
+++ b/src/cc65/codeinfo.h
@@ -75,8 +75,8 @@ struct RegContents;
 #define REG_SP_HI       0x2000U
 
 /* Defines for some special register usage */
-#define SLV_IND         0x00010000U     /* Accesses (sp),y */
-#define SLV_TOP         0x00020000U     /* Accesses (sp),0 */
+#define SLV_IND         0x00010000U     /* Accesses (c_sp),y */
+#define SLV_TOP         0x00020000U     /* Accesses (c_sp),0 */
 #define SLV_SP65        0x00200000U     /* Accesses 6502 stack pointer */
 #define SLV_PH65        0x00400000U     /* Pushes onto 6502 stack */
 #define SLV_PL65        0x00800000U     /* Pops from 6502 stack */
@@ -122,7 +122,7 @@ struct RegContents;
 typedef struct ZPInfo ZPInfo;
 struct ZPInfo {
     unsigned char  Len;         /* Length of the following string */
-    char           Name[10];    /* Name of zero page symbol */
+    char           Name[64];    /* Name of zero page symbol */
     unsigned char  Size;        /* Maximum buffer size of this register */
     unsigned short ByteUse;     /* Register info for this symbol */
     unsigned short WordUse;     /* Register info for 16 bit access */
@@ -201,6 +201,9 @@ int RegAXUsed (struct CodeSeg* S, unsigned Index);
 int RegEAXUsed (struct CodeSeg* S, unsigned Index);
 /* Check if any of the four bytes in EAX are used. */
 
+int LoadFlagsUsed (struct CodeSeg* S, unsigned Index);
+/* Check if one of the flags set by a register load (Z and N) are used. */
+
 unsigned GetKnownReg (unsigned Use, const struct RegContents* RC);
 /* Return the register or zero page location from the set in Use, thats
 ** contents are known. If Use does not contain any register, or if the
diff --git a/src/cc65/codeopt.c b/src/cc65/codeopt.c
index 3a2c2a35d..988e2d770 100644
--- a/src/cc65/codeopt.c
+++ b/src/cc65/codeopt.c
@@ -57,6 +57,7 @@
 #include "coptcmp.h"
 #include "coptind.h"
 #include "coptjmp.h"
+#include "coptlong.h"
 #include "coptmisc.h"
 #include "coptptrload.h"
 #include "coptptrstore.h"
@@ -101,6 +102,8 @@ struct OptFunc {
 
 
 /* A list of all the function descriptions */
+/* CAUTION: should be sorted by "name" */
+/* BEGIN DECL SORTED_CODEOPT.SH */
 static OptFunc DOpt65C02BitOps  = { Opt65C02BitOps,  "Opt65C02BitOps",   66, 0, 0, 0, 0, 0 };
 static OptFunc DOpt65C02Ind     = { Opt65C02Ind,     "Opt65C02Ind",     100, 0, 0, 0, 0, 0 };
 static OptFunc DOpt65C02Stores  = { Opt65C02Stores,  "Opt65C02Stores",  100, 0, 0, 0, 0, 0 };
@@ -116,6 +119,8 @@ static OptFunc DOptBNegAX1      = { OptBNegAX1,      "OptBNegAX1",      100, 0,
 static OptFunc DOptBNegAX2      = { OptBNegAX2,      "OptBNegAX2",      100, 0, 0, 0, 0, 0 };
 static OptFunc DOptBNegAX3      = { OptBNegAX3,      "OptBNegAX3",      100, 0, 0, 0, 0, 0 };
 static OptFunc DOptBNegAX4      = { OptBNegAX4,      "OptBNegAX4",      100, 0, 0, 0, 0, 0 };
+static OptFunc DOptBinOps1      = { OptBinOps1,      "OptBinOps1",        0, 0, 0, 0, 0, 0 };
+static OptFunc DOptBinOps2      = { OptBinOps2,      "OptBinOps2",        0, 0, 0, 0, 0, 0 };
 static OptFunc DOptBoolCmp      = { OptBoolCmp,      "OptBoolCmp",      100, 0, 0, 0, 0, 0 };
 static OptFunc DOptBoolTrans    = { OptBoolTrans,    "OptBoolTrans",    100, 0, 0, 0, 0, 0 };
 static OptFunc DOptBoolUnary1   = { OptBoolUnary1,   "OptBoolUnary1",    40, 0, 0, 0, 0, 0 };
@@ -128,6 +133,7 @@ static OptFunc DOptCmp2         = { OptCmp2,         "OptCmp2",          85, 0,
 static OptFunc DOptCmp3         = { OptCmp3,         "OptCmp3",          75, 0, 0, 0, 0, 0 };
 static OptFunc DOptCmp4         = { OptCmp4,         "OptCmp4",          75, 0, 0, 0, 0, 0 };
 static OptFunc DOptCmp5         = { OptCmp5,         "OptCmp5",         100, 0, 0, 0, 0, 0 };
+static OptFunc DOptCmp6         = { OptCmp6,         "OptCmp6",          33, 0, 0, 0, 0, 0 };
 static OptFunc DOptCmp7         = { OptCmp7,         "OptCmp7",          85, 0, 0, 0, 0, 0 };
 static OptFunc DOptCmp8         = { OptCmp8,         "OptCmp8",          50, 0, 0, 0, 0, 0 };
 static OptFunc DOptCmp9         = { OptCmp9,         "OptCmp9",          85, 0, 0, 0, 0, 0 };
@@ -150,16 +156,15 @@ static OptFunc DOptJumpTarget3  = { OptJumpTarget3,  "OptJumpTarget3",  100, 0,
 static OptFunc DOptLoad1        = { OptLoad1,        "OptLoad1",        100, 0, 0, 0, 0, 0 };
 static OptFunc DOptLoad2        = { OptLoad2,        "OptLoad2",        200, 0, 0, 0, 0, 0 };
 static OptFunc DOptLoad3        = { OptLoad3,        "OptLoad3",          0, 0, 0, 0, 0, 0 };
+static OptFunc DOptLoadStore1   = { OptLoadStore1,   "OptLoadStore1",     0, 0, 0, 0, 0, 0 };
+static OptFunc DOptLoadStore2   = { OptLoadStore2,   "OptLoadStore2",     0, 0, 0, 0, 0, 0 };
+static OptFunc DOptLoadStoreLoad= { OptLoadStoreLoad,"OptLoadStoreLoad",  0, 0, 0, 0, 0, 0 };
+static OptFunc DOptLongAssign   = { OptLongAssign,   "OptLongAssign",   100, 0, 0, 0, 0, 0 };
+static OptFunc DOptLongCopy     = { OptLongCopy,     "OptLongCopy",     100, 0, 0, 0, 0, 0 };
 static OptFunc DOptNegAX1       = { OptNegAX1,       "OptNegAX1",       165, 0, 0, 0, 0, 0 };
 static OptFunc DOptNegAX2       = { OptNegAX2,       "OptNegAX2",       200, 0, 0, 0, 0, 0 };
 static OptFunc DOptPrecalc      = { OptPrecalc,      "OptPrecalc",      100, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrLoad1     = { OptPtrLoad1,     "OptPtrLoad1",     100, 0, 0, 0, 0, 0 };
-static OptFunc DOptPtrLoad2     = { OptPtrLoad2,     "OptPtrLoad2",     100, 0, 0, 0, 0, 0 };
-static OptFunc DOptPtrLoad3     = { OptPtrLoad3,     "OptPtrLoad3",     100, 0, 0, 0, 0, 0 };
-static OptFunc DOptPtrLoad4     = { OptPtrLoad4,     "OptPtrLoad4",     100, 0, 0, 0, 0, 0 };
-static OptFunc DOptPtrLoad5     = { OptPtrLoad5,     "OptPtrLoad5",      50, 0, 0, 0, 0, 0 };
-static OptFunc DOptPtrLoad6     = { OptPtrLoad6,     "OptPtrLoad6",      60, 0, 0, 0, 0, 0 };
-static OptFunc DOptPtrLoad7     = { OptPtrLoad7,     "OptPtrLoad7",     140, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrLoad11    = { OptPtrLoad11,    "OptPtrLoad11",     92, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrLoad12    = { OptPtrLoad12,    "OptPtrLoad12",     50, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrLoad13    = { OptPtrLoad13,    "OptPtrLoad13",     65, 0, 0, 0, 0, 0 };
@@ -169,6 +174,12 @@ static OptFunc DOptPtrLoad16    = { OptPtrLoad16,    "OptPtrLoad16",    100, 0,
 static OptFunc DOptPtrLoad17    = { OptPtrLoad17,    "OptPtrLoad17",    190, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrLoad18    = { OptPtrLoad18,    "OptPtrLoad18",    100, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrLoad19    = { OptPtrLoad19,    "OptPtrLoad19",     65, 0, 0, 0, 0, 0 };
+static OptFunc DOptPtrLoad2     = { OptPtrLoad2,     "OptPtrLoad2",     100, 0, 0, 0, 0, 0 };
+static OptFunc DOptPtrLoad3     = { OptPtrLoad3,     "OptPtrLoad3",     100, 0, 0, 0, 0, 0 };
+static OptFunc DOptPtrLoad4     = { OptPtrLoad4,     "OptPtrLoad4",     100, 0, 0, 0, 0, 0 };
+static OptFunc DOptPtrLoad5     = { OptPtrLoad5,     "OptPtrLoad5",      50, 0, 0, 0, 0, 0 };
+static OptFunc DOptPtrLoad6     = { OptPtrLoad6,     "OptPtrLoad6",      60, 0, 0, 0, 0, 0 };
+static OptFunc DOptPtrLoad7     = { OptPtrLoad7,     "OptPtrLoad7",     140, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrStore1    = { OptPtrStore1,    "OptPtrStore1",     65, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrStore2    = { OptPtrStore2,    "OptPtrStore2",     65, 0, 0, 0, 0, 0 };
 static OptFunc DOptPtrStore3    = { OptPtrStore3,    "OptPtrStore3",    100, 0, 0, 0, 0, 0 };
@@ -176,6 +187,7 @@ static OptFunc DOptPush1        = { OptPush1,        "OptPush1",         65, 0,
 static OptFunc DOptPush2        = { OptPush2,        "OptPush2",         50, 0, 0, 0, 0, 0 };
 static OptFunc DOptPushPop1     = { OptPushPop1,     "OptPushPop1",       0, 0, 0, 0, 0, 0 };
 static OptFunc DOptPushPop2     = { OptPushPop2,     "OptPushPop2",       0, 0, 0, 0, 0, 0 };
+static OptFunc DOptPushPop3     = { OptPushPop3,     "OptPushPop3",       0, 0, 0, 0, 0, 0 };
 static OptFunc DOptRTS          = { OptRTS,          "OptRTS",          100, 0, 0, 0, 0, 0 };
 static OptFunc DOptRTSJumps1    = { OptRTSJumps1,    "OptRTSJumps1",    100, 0, 0, 0, 0, 0 };
 static OptFunc DOptRTSJumps2    = { OptRTSJumps2,    "OptRTSJumps2",    100, 0, 0, 0, 0, 0 };
@@ -197,7 +209,6 @@ static OptFunc DOptStore3       = { OptStore3,       "OptStore3",       120, 0,
 static OptFunc DOptStore4       = { OptStore4,       "OptStore4",        50, 0, 0, 0, 0, 0 };
 static OptFunc DOptStore5       = { OptStore5,       "OptStore5",       100, 0, 0, 0, 0, 0 };
 static OptFunc DOptStoreLoad    = { OptStoreLoad,    "OptStoreLoad",      0, 0, 0, 0, 0, 0 };
-static OptFunc DOptLoadStoreLoad= { OptLoadStoreLoad,"OptLoadStoreLoad",  0, 0, 0, 0, 0, 0 };
 static OptFunc DOptSub1         = { OptSub1,         "OptSub1",         100, 0, 0, 0, 0, 0 };
 static OptFunc DOptSub2         = { OptSub2,         "OptSub2",         100, 0, 0, 0, 0, 0 };
 static OptFunc DOptSub3         = { OptSub3,         "OptSub3",         100, 0, 0, 0, 0, 0 };
@@ -209,10 +220,13 @@ static OptFunc DOptTransfers3   = { OptTransfers3,   "OptTransfers3",    65, 0,
 static OptFunc DOptTransfers4   = { OptTransfers4,   "OptTransfers4",    65, 0, 0, 0, 0, 0 };
 static OptFunc DOptUnusedLoads  = { OptUnusedLoads,  "OptUnusedLoads",    0, 0, 0, 0, 0, 0 };
 static OptFunc DOptUnusedStores = { OptUnusedStores, "OptUnusedStores",   0, 0, 0, 0, 0, 0 };
+/* END DECL SORTED_CODEOPT.SH */
 
 
 /* Table containing all the steps in alphabetical order */
+/* CAUTION: table must be sorted for bsearch */
 static OptFunc* OptFuncs[] = {
+/* BEGIN SORTED_CODEOPT.SH */
     &DOpt65C02BitOps,
     &DOpt65C02Ind,
     &DOpt65C02Stores,
@@ -228,6 +242,8 @@ static OptFunc* OptFuncs[] = {
     &DOptBNegAX2,
     &DOptBNegAX3,
     &DOptBNegAX4,
+    &DOptBinOps1,
+    &DOptBinOps2,
     &DOptBoolCmp,
     &DOptBoolTrans,
     &DOptBoolUnary1,
@@ -240,6 +256,7 @@ static OptFunc* OptFuncs[] = {
     &DOptCmp3,
     &DOptCmp4,
     &DOptCmp5,
+    &DOptCmp6,
     &DOptCmp7,
     &DOptCmp8,
     &DOptCmp9,
@@ -262,6 +279,11 @@ static OptFunc* OptFuncs[] = {
     &DOptLoad1,
     &DOptLoad2,
     &DOptLoad3,
+    &DOptLoadStore1,
+    &DOptLoadStore2,
+    &DOptLoadStoreLoad,
+    &DOptLongAssign,
+    &DOptLongCopy,
     &DOptNegAX1,
     &DOptNegAX2,
     &DOptPrecalc,
@@ -287,6 +309,8 @@ static OptFunc* OptFuncs[] = {
     &DOptPush1,
     &DOptPush2,
     &DOptPushPop1,
+    &DOptPushPop2,
+    &DOptPushPop3,
     &DOptRTS,
     &DOptRTSJumps1,
     &DOptRTSJumps2,
@@ -308,7 +332,6 @@ static OptFunc* OptFuncs[] = {
     &DOptStore4,
     &DOptStore5,
     &DOptStoreLoad,
-    &DOptLoadStoreLoad,
     &DOptSub1,
     &DOptSub2,
     &DOptSub3,
@@ -320,6 +343,7 @@ static OptFunc* OptFuncs[] = {
     &DOptTransfers4,
     &DOptUnusedLoads,
     &DOptUnusedStores,
+/* END SORTED_CODEOPT.SH */
 };
 #define OPTFUNC_COUNT  (sizeof(OptFuncs) / sizeof(OptFuncs[0]))
 
@@ -632,6 +656,8 @@ static unsigned RunOptGroup1 (CodeSeg* S)
     Changes += RunOptFunc (S, &DOptAdd6, 1);
     Changes += RunOptFunc (S, &DOptSub1, 1);
     Changes += RunOptFunc (S, &DOptSub3, 1);
+    Changes += RunOptFunc (S, &DOptLongAssign, 1);
+    Changes += RunOptFunc (S, &DOptLoadStore2, 1);
     Changes += RunOptFunc (S, &DOptStore4, 1);
     Changes += RunOptFunc (S, &DOptStore5, 1);
     Changes += RunOptFunc (S, &DOptShift1, 1);
@@ -641,6 +667,7 @@ static unsigned RunOptGroup1 (CodeSeg* S)
     Changes += RunOptFunc (S, &DOptStore1, 1);
     Changes += RunOptFunc (S, &DOptStore2, 5);
     Changes += RunOptFunc (S, &DOptStore3, 5);
+    Changes += RunOptFunc (S, &DOptLongCopy, 1);
 
     /* Return the number of changes */
     return Changes;
@@ -704,6 +731,7 @@ static unsigned RunOptGroup3 (CodeSeg* S)
         C += RunOptFunc (S, &DOptCondBranch3, 1);
         C += RunOptFunc (S, &DOptCondBranchC, 1);
         C += RunOptFunc (S, &DOptRTSJumps1, 1);
+        C += RunOptFunc (S, &DOptCmp6, 1);          /* After OptRTSJumps1 */
         C += RunOptFunc (S, &DOptBoolCmp, 1);
         C += RunOptFunc (S, &DOptBoolTrans, 1);
         C += RunOptFunc (S, &DOptBNegA2, 1);        /* After OptCondBranch's */
@@ -723,9 +751,10 @@ static unsigned RunOptGroup3 (CodeSeg* S)
         C += RunOptFunc (S, &DOptJumpTarget3, 1);   /* After OptCondBranches2 */
         C += RunOptFunc (S, &DOptUnusedLoads, 1);
         C += RunOptFunc (S, &DOptUnusedStores, 1);
-        C += RunOptFunc (S, &DOptDupLoads, 1);
         C += RunOptFunc (S, &DOptStoreLoad, 1);
         C += RunOptFunc (S, &DOptLoadStoreLoad, 1);
+        C += RunOptFunc (S, &DOptDupLoads, 1);
+        C += RunOptFunc (S, &DOptLoadStore1, 1);
         C += RunOptFunc (S, &DOptTransfers1, 1);
         C += RunOptFunc (S, &DOptTransfers3, 1);
         C += RunOptFunc (S, &DOptTransfers4, 1);
@@ -733,9 +762,12 @@ static unsigned RunOptGroup3 (CodeSeg* S)
         C += RunOptFunc (S, &DOptStore5, 1);
         C += RunOptFunc (S, &DOptPushPop1, 1);
         C += RunOptFunc (S, &DOptPushPop2, 1);
+        C += RunOptFunc (S, &DOptPushPop3, 1);
         C += RunOptFunc (S, &DOptPrecalc, 1);
         C += RunOptFunc (S, &DOptShiftBack, 1);
         C += RunOptFunc (S, &DOptSignExtended, 1);
+        C += RunOptFunc (S, &DOptBinOps1, 1);
+        C += RunOptFunc (S, &DOptBinOps2, 1);
 
         Changes += C;
 
@@ -796,7 +828,7 @@ static unsigned RunOptGroup5 (CodeSeg* S)
 
 
 static unsigned RunOptGroup6 (CodeSeg* S)
-/* This one is quite special. It tries to replace "lda (sp),y" by "lda (sp,x)".
+/* This one is quite special. It tries to replace "lda (c_sp),y" by "lda (c_sp,x)".
 ** The latter is ony cycle slower, but if we're able to remove the necessary
 ** load of the Y register, because X is zero anyway, we gain 1 cycle and
 ** shorten the code by one (transfer) or two bytes (load). So what we do is
@@ -842,6 +874,7 @@ static unsigned RunOptGroup7 (CodeSeg* S)
         Changes += RunOptFunc (S, &DOptUnusedStores, 1);
         Changes += RunOptFunc (S, &DOptJumpTarget1, 5);
         Changes += RunOptFunc (S, &DOptStore5, 1);
+        Changes += RunOptFunc (S, &DOptTransfers1, 1);
     }
 
     C = RunOptFunc (S, &DOptSize2, 1);
diff --git a/src/cc65/codeoptutil.c b/src/cc65/codeoptutil.c
index 173d5185f..0d3dba95c 100644
--- a/src/cc65/codeoptutil.c
+++ b/src/cc65/codeoptutil.c
@@ -333,14 +333,14 @@ static int Affected (LoadRegInfo* LRI, const CodeEntry* E)
             */
             if (E->AM == AM65_ABS       ||
                 E->AM == AM65_ZP        ||
-                (E->AM == AM65_ZP_INDY && strcmp (E->ArgBase, "sp") == 0)
+                (E->AM == AM65_ZP_INDY && strcmp (E->ArgBase, "c_sp") == 0)
                 ) {
                 if ((LRI->Flags & LI_CHECK_ARG) != 0) {
                     if (AE == 0                             ||
                         (AE->AM != AM65_ABS &&
                          AE->AM != AM65_ZP  &&
                          (AE->AM != AM65_ZP_INDY ||
-                          strcmp (AE->ArgBase, "sp") != 0)) ||
+                          strcmp (AE->ArgBase, "c_sp") != 0)) ||
                          (AE->ArgOff == E->ArgOff &&
                           strcmp (AE->ArgBase, E->ArgBase) == 0)) {
 
@@ -445,7 +445,7 @@ void PrepairLoadRegInfoForArgCheck (CodeSeg* S, LoadRegInfo* LRI, CodeEntry* E)
         /* These insns are replaceable only if they are not modified later */
         LRI->Flags |= LI_CHECK_ARG | LI_CHECK_Y;
     } else if ((E->AM == AM65_ZP_INDY) &&
-                strcmp (E->Arg, "sp") == 0) {
+                strcmp (E->Arg, "c_sp") == 0) {
         /* A load from the stack with known offset is also ok, but in this
         ** case we must reload the index register later. Please note that
         ** a load indirect via other zero page locations is not ok, since
@@ -556,7 +556,7 @@ unsigned int TrackLoads (LoadInfo* LI, CodeSeg* S, int I)
             /* These insns are replaceable only if they are not modified later */
             LRI->Flags |= LI_CHECK_ARG | LI_CHECK_Y;
         } else if (E->AM == AM65_ZP_INDY &&
-                   strcmp (E->Arg, "sp") == 0) {
+                   strcmp (E->Arg, "c_sp") == 0) {
             /* A load from the stack with known offset is also ok, but in this
             ** case we must reload the index register later. Please note that
             ** a load indirect via other zero page locations is not ok, since
@@ -839,7 +839,7 @@ void AdjustStackOffset (StackOpData* D, unsigned Offs)
             if (E->OPC != OP65_JSR) {
                 /* Check against some things that should not happen */
                 CHECK (E->AM == AM65_ZP_INDY && E->RI->In.RegY >= (short) Offs);
-                CHECK (strcmp (E->Arg, "sp") == 0);
+                CHECK (strcmp (E->Arg, "c_sp") == 0);
 
                 /* We need to correct this one */
                 Correction = 2;
@@ -1056,8 +1056,8 @@ void AddOpLow (StackOpData* D, opc_t OPC, LoadInfo* LI)
             InsertEntry (D, X, D->IP++);
 
             if (LI->A.LoadEntry->OPC == OP65_JSR) {
-                /* opc (sp),y */
-                X = NewCodeEntry (OPC, AM65_ZP_INDY, "sp", 0, D->OpEntry->LI);
+                /* opc (c_sp),y */
+                X = NewCodeEntry (OPC, AM65_ZP_INDY, "c_sp", 0, D->OpEntry->LI);
             } else {
                 /* opc src,y */
                 X = NewCodeEntry (OPC, LI->A.LoadEntry->AM, LI->A.LoadEntry->Arg, 0, D->OpEntry->LI);
@@ -1119,8 +1119,8 @@ void AddOpHigh (StackOpData* D, opc_t OPC, LoadInfo* LI, int KeepResult)
             InsertEntry (D, X, D->IP++);
 
             if (LI->X.LoadEntry->OPC == OP65_JSR) {
-                /* opc (sp),y */
-                X = NewCodeEntry (OPC, AM65_ZP_INDY, "sp", 0, D->OpEntry->LI);
+                /* opc (c_sp),y */
+                X = NewCodeEntry (OPC, AM65_ZP_INDY, "c_sp", 0, D->OpEntry->LI);
             } else {
                 /* opc src,y */
                 X = NewCodeEntry (OPC, LI->X.LoadEntry->AM, LI->X.LoadEntry->Arg, 0, D->OpEntry->LI);
@@ -1128,8 +1128,10 @@ void AddOpHigh (StackOpData* D, opc_t OPC, LoadInfo* LI, int KeepResult)
             InsertEntry (D, X, D->IP++);
         }
 
-        /* In both cases, we can remove the load */
-        LI->X.Flags |= LI_REMOVE;
+        /* If this is the right hand side, we can remove the load. */
+        if (LI == &D->Rhs) {
+            LI->X.Flags |= LI_REMOVE;
+        }
 
     } else {
         /* opc zphi */
@@ -1223,6 +1225,12 @@ static int CmpHarmless (const void* Key, const void* Entry)
 }
 
 
+/* CAUTION: table must be sorted for bsearch */
+static const char* const Tab[] = {
+/* BEGIN SORTED.SH */
+    "_abs",
+/* END SORTED.SH */
+};
 
 int HarmlessCall (const CodeEntry* E, int PushedBytes)
 /* Check if this is a call to a harmless subroutine that will not interrupt
@@ -1250,10 +1258,6 @@ int HarmlessCall (const CodeEntry* E, int PushedBytes)
         }
         return 1;
     } else {
-        static const char* const Tab[] = {
-            "_abs",
-        };
-
         void* R = bsearch (E->Arg,
                             Tab,
                             sizeof (Tab) / sizeof (Tab[0]),
@@ -1308,10 +1312,10 @@ const char* GetZPName (unsigned ZPLoc)
         return "save+1";
     }
     if ((ZPLoc & REG_SP_LO) != 0) {
-        return "sp";
+        return "c_sp";
     }
     if ((ZPLoc & REG_SP_HI) != 0) {
-        return "sp+1";
+        return "c_sp+1";
     }
 
     return 0;
diff --git a/src/cc65/codeseg.c b/src/cc65/codeseg.c
index 9f1bf4cc5..f4970b586 100644
--- a/src/cc65/codeseg.c
+++ b/src/cc65/codeseg.c
@@ -1471,7 +1471,7 @@ void CS_Output (CodeSeg* S)
             /* Add line debug info */
             if (DebugInfo) {
                 WriteOutput ("\t.dbg\tline, \"%s\", %u\n",
-                             GetInputName (LI), GetInputLine (LI));
+                             GetActualFileName (LI), GetActualLineNum (LI));
             }
         }
         /* Output the code */
diff --git a/src/cc65/compile.c b/src/cc65/compile.c
index 02d37c53e..9083891aa 100644
--- a/src/cc65/compile.c
+++ b/src/cc65/compile.c
@@ -79,7 +79,6 @@
 static void Parse (void)
 /* Top level parser routine. */
 {
-    int comma;
     SymEntry* Sym;
     FuncDesc* FuncDef = 0;
 
@@ -89,16 +88,18 @@ static void Parse (void)
     /* Fill up the next token with a bogus semicolon and start the tokenizer */
     NextTok.Tok = TOK_SEMI;
     NextToken ();
+    NextToken ();
 
     /* Parse until end of input */
     while (CurTok.Tok != TOK_CEOF) {
 
         DeclSpec        Spec;
+        int             Comma;
         int             NeedClean = 0;
-        unsigned        PrevErrorCount = ErrorCount;
 
         /* Check for empty statements */
         if (CurTok.Tok == TOK_SEMI) {
+            /* TODO: warn on this if we have a pedantic mode */
             NextToken ();
             continue;
         }
@@ -119,16 +120,14 @@ static void Parse (void)
             continue;
         }
 
-        /* Read variable defs and functions */
-        ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_INT, SC_EXTERN | SC_STATIC);
+        /* Read the declaration specifier */
+        ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_INT | TS_FUNCTION_SPEC, SC_NONE);
 
         /* Don't accept illegal storage classes */
-        if ((Spec.StorageClass & SC_TYPEMASK) == 0) {
-            if ((Spec.StorageClass & SC_AUTO) != 0 ||
-                (Spec.StorageClass & SC_REGISTER) != 0) {
-                Error ("Illegal storage class");
-                Spec.StorageClass = SC_EXTERN | SC_STATIC;
-            }
+        if ((Spec.StorageClass & SC_STORAGEMASK) == SC_AUTO ||
+            (Spec.StorageClass & SC_STORAGEMASK) == SC_REGISTER) {
+            Error ("Illegal storage class");
+            Spec.StorageClass &= ~SC_STORAGEMASK;
         }
 
         /* Check if this is only a type declaration */
@@ -138,47 +137,58 @@ static void Parse (void)
             continue;
         }
 
+        /* If we haven't got a type specifier yet, something must be wrong */
+        if ((Spec.Flags & DS_TYPE_MASK) == DS_NONE) {
+            /* Avoid extra errors if it was a failed type specifier */
+            if ((Spec.Flags & DS_EXTRA_TYPE) == 0) {
+                Error ("Declaration specifier expected");
+            }
+            NeedClean = -1;
+            goto EndOfDecl;
+        }
+
         /* Read declarations for this type */
-        Sym = 0;
-        comma = 0;
+        Comma = 0;
         while (1) {
 
             Declarator Decl;
 
+            Sym = 0;
+
             /* Read the next declaration */
-            NeedClean = ParseDecl (&Spec, &Decl, DM_NEED_IDENT);
-            if (Decl.Ident[0] == '\0') {
-                Sym = 0;
-                goto NextDecl;
+            NeedClean = ParseDecl (&Spec, &Decl, DM_IDENT_OR_EMPTY);
+
+            /* Bail out if there are errors */
+            if (NeedClean <= 0) {
+                break;
             }
 
-            /* Check if we must reserve storage for the variable. We do this,
-            **
-            **   - if it is not a typedef or function,
-            **   - if we don't had a storage class given ("int i")
-            **   - if the storage class is explicitly specified as static,
-            **   - or if there is an initialization.
-            **
-            ** This means that "extern int i;" will not get storage allocated.
-            */
-            if ((Decl.StorageClass & SC_FUNC) != SC_FUNC &&
+            /* The symbol is now visible in the file scope */
+            if ((Decl.StorageClass & SC_TYPEMASK) != SC_FUNC &&
                 (Decl.StorageClass & SC_TYPEMASK) != SC_TYPEDEF) {
-                if ((Spec.Flags & DS_DEF_STORAGE) != 0                       ||
-                    (Decl.StorageClass & (SC_EXTERN|SC_STATIC)) == SC_STATIC ||
-                    ((Decl.StorageClass & SC_EXTERN) != 0 &&
+                /* Check if we must reserve storage for the variable. We do this,
+                **
+                **   - if it is not a typedef or function,
+                **   - if we don't had a storage class given ("int i")
+                **   - if the storage class is explicitly specified as static,
+                **   - or if there is an initialization.
+                **
+                ** This means that "extern int i;" will not get storage allocated
+                ** in this translation unit.
+                */
+                if ((Decl.StorageClass & SC_STORAGEMASK) == SC_NONE     ||
+                    (Decl.StorageClass & SC_STORAGEMASK) == SC_STATIC   ||
+                    ((Decl.StorageClass & SC_STORAGEMASK) == SC_EXTERN &&
                      CurTok.Tok == TOK_ASSIGN)) {
-                    /* We will allocate storage */
-                    Decl.StorageClass |= SC_STORAGE;
-                } else {
-                    /* It's a declaration */
-                    Decl.StorageClass |= SC_DECL;
+                    /* We will allocate storage in this translation unit */
+                    Decl.StorageClass |= SC_TU_STORAGE;
                 }
             }
 
             /* If this is a function declarator that is not followed by a comma
             ** or semicolon, it must be followed by a function body.
             */
-            if ((Decl.StorageClass & SC_FUNC) != 0) {
+            if ((Decl.StorageClass & SC_TYPEMASK) == SC_FUNC) {
                 if (CurTok.Tok == TOK_LCURLY) {
                     /* A definition */
                     Decl.StorageClass |= SC_DEF;
@@ -191,12 +201,14 @@ static void Parse (void)
                         FuncDef->Flags = (FuncDef->Flags & ~FD_EMPTY) | FD_VOID_PARAM;
                     }
                 } else {
-                    if (CurTok.Tok != TOK_COMMA && CurTok.Tok != TOK_SEMI) {
-                        Error ("Expected ',' or ';' after top level declarator");
-                    }
-
                     /* Just a declaration */
-                    Decl.StorageClass |= SC_DECL;
+                    FuncDef = GetFuncDesc (Decl.Type);
+                    if ((FuncDef->Flags & (FD_EMPTY | FD_OLDSTYLE)) == FD_OLDSTYLE) {
+                        /* A parameter list without types is only allowed in a
+                        ** function definition.
+                        */
+                        Error ("Parameter names without types in function declaration");
+                    }
                 }
             }
 
@@ -207,7 +219,7 @@ static void Parse (void)
             SymUseAttr (Sym, &Decl);
 
             /* Reserve storage for the variable if we need to */
-            if (Decl.StorageClass & SC_STORAGE) {
+            if (Decl.StorageClass & SC_TU_STORAGE) {
 
                 /* Get the size of the variable */
                 unsigned Size = SizeOf (Decl.Type);
@@ -257,17 +269,19 @@ static void Parse (void)
 
                     /* Parse the initialization */
                     ParseInit (Sym->Type);
+
                 } else {
 
                     /* This is a declaration */
                     if (IsTypeVoid (Decl.Type)) {
                         /* We cannot declare variables of type void */
                         Error ("Illegal type for variable '%s'", Decl.Ident);
-                        Sym->Flags &= ~(SC_STORAGE | SC_DEF);
+                        Sym->Flags |= SC_DEF;
                     } else if (Size == 0 && SymIsDef (Sym) && !IsEmptiableObjectType (Decl.Type)) {
                         /* Size is unknown. Is it an array? */
                         if (!IsTypeArray (Decl.Type)) {
                             Error ("Variable '%s' has unknown size", Decl.Ident);
+                            Sym->Flags |= SC_DEF;
                         }
                     } else {
                         /* Check for enum forward declaration.
@@ -308,72 +322,63 @@ static void Parse (void)
                 }
 
                 /* Make the symbol zeropage according to the segment address size */
-                if ((Sym->Flags & SC_STATIC) != 0) {
-                    if (GetSegAddrSize (GetSegName (CS->CurDSeg)) == ADDR_SIZE_ZP) {
-                        Sym->Flags |= SC_ZEROPAGE;
+                if ((Sym->Flags & SC_TYPEMASK) == SC_NONE) {
+                    if (SymIsGlobal (Sym) ||
+                        (Sym->Flags & SC_STORAGEMASK) == SC_STATIC ||
+                        (Sym->Flags & SC_STORAGEMASK) == SC_REGISTER) {
+                        if (GetSegAddrSize (GetSegName (CS->CurDSeg)) == ADDR_SIZE_ZP) {
+                            Sym->Flags |= SC_ZEROPAGE;
+                        }
                     }
                 }
 
             }
 
-NextDecl:
             /* Check for end of declaration list */
-            if (CurTok.Tok == TOK_COMMA) {
-                NextToken ();
-                comma = 1;
-            } else {
+            if (CurTok.Tok != TOK_COMMA) {
                 break;
             }
+            Comma = 1;
+            Spec.Flags |= DS_NO_EMPTY_DECL;
+            NextToken ();
         }
 
-        /* Function declaration? */
-        if (Sym && IsTypeFunc (Sym->Type)) {
-
-            /* Function */
-            if (CurTok.Tok == TOK_SEMI) {
-                /* Prototype only */
-                NeedClean = 0;
-                NextToken ();
-            } else if (CurTok.Tok == TOK_LCURLY) {
+        /* Finish the declaration */
+        if (Sym && IsTypeFunc (Sym->Type) && CurTok.Tok == TOK_LCURLY) {
+            /* A function definition is not terminated with a semicolon */
+            if (IsTypeFunc (Spec.Type) && TypeCmp (Sym->Type, Spec.Type).C >= TC_EQUAL) {
                 /* ISO C: The type category in a function definition cannot be
                 ** inherited from a typedef.
                 */
-                if (IsTypeFunc (Spec.Type) && TypeCmp (Sym->Type, Spec.Type).C >= TC_EQUAL) {
-                    Error ("Function cannot be defined with a typedef");
-                } else if (comma) {
-                    Error ("';' expected after top level declarator");
-                }
+                Error ("Function cannot be defined with a typedef");
+            } else if (Comma) {
+                /* ISO C: A function definition cannot shall its return type
+                ** specifier with other declarators.
+                */
+                Error ("';' expected after top level declarator");
+            }
 
-                /* Parse the function body anyways */
+            /* Parse the function body anyways */
+            NeedClean = 0;
+            NewFunc (Sym, FuncDef);
+
+            /* Make sure we aren't omitting any work */
+            CheckDeferredOpAllDone ();
+        } else if (NeedClean > 0) {
+            /* Must be followed by a semicolon */
+            if (CurTok.Tok != TOK_SEMI) {
+                Error ("',' or ';' expected after top level declarator");
+                NeedClean = -1;
+            } else {
+                NextToken ();
                 NeedClean = 0;
-                NewFunc (Sym, FuncDef);
-
-                /* Make sure we aren't omitting any work */
-                CheckDeferredOpAllDone ();
             }
-
-        } else {
-
-            if (Sym) {
-                /* Must be followed by a semicolon */
-                if (CurTok.Tok != TOK_SEMI) {
-                    NeedClean = -1;
-                }
-                ConsumeSemi ();
-            }
-
         }
 
+EndOfDecl:
         /* Try some smart error recovery */
-        if (PrevErrorCount != ErrorCount && NeedClean < 0) {
-            /* Some fix point tokens that are used for error recovery */
-            static const token_t TokenList[] = { TOK_SEMI, TOK_RCURLY };
-
-            SmartErrorSkip ();
-            SkipTokens (TokenList, sizeof (TokenList) / sizeof (TokenList[0]));
-            if (CurTok.Tok == TOK_SEMI || CurTok.Tok == TOK_RCURLY) {
-                NextToken ();
-            }
+        if (NeedClean < 0) {
+            SmartErrorSkip (1);
         }
     }
 
@@ -491,6 +496,14 @@ void Compile (const char* FileName)
         while (PreprocessNextLine ())
         { /* Nothing */ }
 
+        /* Output macros if requested by the user */
+        if (DumpPredefMacros) {
+            OutputPredefMacros ();
+        }
+        if (DumpUserMacros) {
+            OutputUserMacros ();
+        }
+
         /* Close the output file */
         CloseOutputFile ();
 
@@ -511,7 +524,10 @@ void Compile (const char* FileName)
         ** global variables.
         */
         for (Entry = GetGlobalSymTab ()->SymHead; Entry; Entry = Entry->NextSym) {
-            if ((Entry->Flags & (SC_STORAGE | SC_DEF | SC_STATIC)) == (SC_STORAGE | SC_STATIC)) {
+            /* Is it a global (with or without static) tentative declaration of
+            ** an uninitialized variable?
+            */
+            if ((Entry->Flags & (SC_TU_STORAGE | SC_DEF)) == SC_TU_STORAGE) {
                 /* Assembly definition of uninitialized global variable */
                 SymEntry* TagSym = GetESUTagSym (Entry->Type);
                 unsigned Size = SizeOf (Entry->Type);
@@ -542,10 +558,20 @@ void Compile (const char* FileName)
                     Entry->Flags |= SC_DEF;
                 } else if (!IsTypeArray (Entry->Type)) {
                     /* Tentative declared variable is still of incomplete type */
-                    Error ("Definition of '%s' has type '%s' that is never completed",
+                    Error ("Definition of '%s' never has its type '%s' completed",
                            Entry->Name,
                            GetFullTypeName (Entry->Type));
                 }
+            } else if (!SymIsDef (Entry) && (Entry->Flags & SC_TYPEMASK) == SC_FUNC) {
+                /* Check for undefined functions */
+                if ((Entry->Flags & SC_STORAGEMASK) == SC_STATIC && SymIsRef (Entry)) {
+                    Warning ("Static function '%s' used but never defined",
+                             Entry->Name);
+                } else if ((Entry->Flags & SC_INLINE) != 0) {
+                    Warning ("Inline function '%s' %s but never defined",
+                             Entry->Name,
+                             SymIsRef (Entry) ? "used" : "declared");
+                }
             }
         }
 
diff --git a/src/cc65/coptadd.c b/src/cc65/coptadd.c
index bc67f7a74..3636e0e20 100644
--- a/src/cc65/coptadd.c
+++ b/src/cc65/coptadd.c
@@ -62,15 +62,15 @@ unsigned OptAdd1 (CodeSeg* S)
 ** and replace it by:
 **
 **      ldy     #xx-1
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #yy-3
 **      clc
-**      adc     (sp),y
+**      adc     (c_sp),y
 **      pha
 **      ldy     #xx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #yy-2
-**      adc     (sp),y
+**      adc     (c_sp),y
 **      tax
 **      pla
 */
@@ -104,8 +104,8 @@ unsigned OptAdd1 (CodeSeg* S)
             /* Correct the stack of the first Y register load */
             CE_SetNumArg (L[0], L[0]->Num - 1);
 
-            /* lda (sp),y */
-            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+            /* lda (c_sp),y */
+            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
             CS_InsertEntry (S, X, I+1);
 
             /* ldy #yy-3 */
@@ -117,8 +117,8 @@ unsigned OptAdd1 (CodeSeg* S)
             X = NewCodeEntry (OP65_CLC, AM65_IMP, 0, 0, L[5]->LI);
             CS_InsertEntry (S, X, I+3);
 
-            /* adc (sp),y */
-            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "sp", 0, L[5]->LI);
+            /* adc (c_sp),y */
+            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "c_sp", 0, L[5]->LI);
             CS_InsertEntry (S, X, I+4);
 
             /* pha */
@@ -130,8 +130,8 @@ unsigned OptAdd1 (CodeSeg* S)
             X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[1]->LI);
             CS_InsertEntry (S, X, I+6);
 
-            /* lda (sp),y */
-            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+            /* lda (c_sp),y */
+            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
             CS_InsertEntry (S, X, I+7);
 
             /* ldy #yy-2 */
@@ -139,8 +139,8 @@ unsigned OptAdd1 (CodeSeg* S)
             X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[4]->LI);
             CS_InsertEntry (S, X, I+8);
 
-            /* adc (sp),y */
-            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "sp", 0, L[5]->LI);
+            /* adc (c_sp),y */
+            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "c_sp", 0, L[5]->LI);
             CS_InsertEntry (S, X, I+9);
 
             /* tax */
@@ -181,16 +181,16 @@ unsigned OptAdd2 (CodeSeg* S)
 ** and replace it by:
 **
 **      ldy     #xx-1
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #yy
 **      clc
-**      adc     (sp),y
-**      sta     (sp),y
+**      adc     (c_sp),y
+**      sta     (c_sp),y
 **      ldy     #xx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #yy+1
-**      adc     (sp),y
-**      sta     (sp),y
+**      adc     (c_sp),y
+**      sta     (c_sp),y
 **
 ** provided that a/x is not used later.
 */
@@ -226,8 +226,8 @@ unsigned OptAdd2 (CodeSeg* S)
             X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[0]->LI);
             CS_InsertEntry (S, X, I+4);
 
-            /* lda     (sp),y */
-            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+            /* lda     (c_sp),y */
+            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
             CS_InsertEntry (S, X, I+5);
 
             /* ldy     #yy */
@@ -238,20 +238,20 @@ unsigned OptAdd2 (CodeSeg* S)
             X = NewCodeEntry (OP65_CLC, AM65_IMP, 0, 0, L[3]->LI);
             CS_InsertEntry (S, X, I+7);
 
-            /* adc     (sp),y */
-            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "sp", 0, L[3]->LI);
+            /* adc     (c_sp),y */
+            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "c_sp", 0, L[3]->LI);
             CS_InsertEntry (S, X, I+8);
 
-            /* sta     (sp),y */
-            X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "sp", 0, L[3]->LI);
+            /* sta     (c_sp),y */
+            X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "c_sp", 0, L[3]->LI);
             CS_InsertEntry (S, X, I+9);
 
             /* ldy     #xx */
             X = NewCodeEntry (OP65_LDY, AM65_IMM, L[0]->Arg, 0, L[0]->LI);
             CS_InsertEntry (S, X, I+10);
 
-            /* lda     (sp),y */
-            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+            /* lda     (c_sp),y */
+            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
             CS_InsertEntry (S, X, I+11);
 
             /* ldy     #yy+1 */
@@ -259,12 +259,12 @@ unsigned OptAdd2 (CodeSeg* S)
             X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[2]->LI);
             CS_InsertEntry (S, X, I+12);
 
-            /* adc     (sp),y */
-            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "sp", 0, L[3]->LI);
+            /* adc     (c_sp),y */
+            X = NewCodeEntry (OP65_ADC, AM65_ZP_INDY, "c_sp", 0, L[3]->LI);
             CS_InsertEntry (S, X, I+13);
 
-            /* sta     (sp),y */
-            X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "sp", 0, L[3]->LI);
+            /* sta     (c_sp),y */
+            X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "c_sp", 0, L[3]->LI);
             CS_InsertEntry (S, X, I+14);
 
             /* Delete the old code */
diff --git a/src/cc65/coptadd.h b/src/cc65/coptadd.h
index e4df3b304..d29783305 100644
--- a/src/cc65/coptadd.h
+++ b/src/cc65/coptadd.h
@@ -55,14 +55,14 @@ unsigned OptAdd1 (CodeSeg* S);
 **      jsr     pushax
 **      ldy     xxx
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      jsr     tosaddax
 **
 ** and replace it by:
 **
 **      ldy     xxx-2
 **      clc
-**      adc     (sp),y
+**      adc     (c_sp),y
 **      bcc     L
 **      inx
 ** L:
@@ -72,26 +72,26 @@ unsigned OptAdd2 (CodeSeg* S);
 /* Search for the sequence
 **
 **      ldy     #xx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      tax
 **      dey
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #$yy
 **      jsr     addeqysp
 **
 ** and replace it by:
 **
 **      ldy     #xx-1
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #yy
 **      clc
-**      adc     (sp),y
-**      sta     (sp),y
+**      adc     (c_sp),y
+**      sta     (c_sp),y
 **      ldy     #xx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #yy+1
-**      adc     (sp),y
-**      sta     (sp),y
+**      adc     (c_sp),y
+**      sta     (c_sp),y
 **
 ** provided that a/x is not used later.
 */
diff --git a/src/cc65/coptbool.c b/src/cc65/coptbool.c
index 3a3b3fa7c..e0a79238e 100644
--- a/src/cc65/coptbool.c
+++ b/src/cc65/coptbool.c
@@ -743,9 +743,9 @@ unsigned OptBNegAX2 (CodeSeg* S)
 ** and replace it by
 **
 **      ldy     #xx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      dey
-**      ora     (sp),y
+**      ora     (c_sp),y
 **      jeq/jne ...
 */
 {
@@ -772,16 +772,16 @@ unsigned OptBNegAX2 (CodeSeg* S)
 
             CodeEntry* X;
 
-            /* lda (sp),y */
-            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+            /* lda (c_sp),y */
+            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
             CS_InsertEntry (S, X, I+1);
 
             /* dey */
             X = NewCodeEntry (OP65_DEY, AM65_IMP, 0, 0, L[1]->LI);
             CS_InsertEntry (S, X, I+2);
 
-            /* ora (sp),y */
-            X = NewCodeEntry (OP65_ORA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+            /* ora (c_sp),y */
+            X = NewCodeEntry (OP65_ORA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
             CS_InsertEntry (S, X, I+3);
 
             /* Invert the branch */
diff --git a/src/cc65/coptcmp.c b/src/cc65/coptcmp.c
index 2970b363b..41245b58d 100644
--- a/src/cc65/coptcmp.c
+++ b/src/cc65/coptcmp.c
@@ -431,22 +431,22 @@ unsigned OptCmp5 (CodeSeg* S)
 
                 /* The value is zero, we may use the simple code version:
                 **      ldy     #o-1
-                **      lda     (sp),y
+                **      lda     (c_sp),y
                 **      ldy     #o
-                **      ora     (sp),y
+                **      ora     (c_sp),y
                 **      jne/jeq ...
                 */
                 sprintf (Buf, "$%02X", (int)(L[0]->Num-1));
                 X = NewCodeEntry (OP65_LDY, AM65_IMM, Buf, 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+1);
 
-                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
                 CS_InsertEntry (S, X, I+2);
 
                 X = NewCodeEntry (OP65_LDY, AM65_IMM, L[0]->Arg, 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+3);
 
-                X = NewCodeEntry (OP65_ORA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+                X = NewCodeEntry (OP65_ORA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
                 CS_InsertEntry (S, X, I+4);
 
                 CS_DelEntries (S, I+5, 3);   /* cpx/bne/cmp */
@@ -461,18 +461,18 @@ unsigned OptCmp5 (CodeSeg* S)
                 ** of the low byte after the first branch if possible:
                 **
                 **      ldy     #o
-                **      lda     (sp),y
+                **      lda     (c_sp),y
                 **      cmp     #a
                 **      bne     L1
                 **      ldy     #o-1
-                **      lda     (sp),y
+                **      lda     (c_sp),y
                 **      cmp     #b
                 **      jne/jeq ...
                 */
                 X = NewCodeEntry (OP65_LDY, AM65_IMM, L[0]->Arg, 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+3);
 
-                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
                 CS_InsertEntry (S, X, I+4);
 
                 X = NewCodeEntry (OP65_CMP, L[2]->AM, L[2]->Arg, 0, L[2]->LI);
@@ -482,7 +482,7 @@ unsigned OptCmp5 (CodeSeg* S)
                 X = NewCodeEntry (OP65_LDY, AM65_IMM, Buf, 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+7);
 
-                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[1]->LI);
+                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[1]->LI);
                 CS_InsertEntry (S, X, I+8);
 
                 CS_DelEntries (S, I, 3);          /* ldy/jsr/cpx */
@@ -503,6 +503,51 @@ unsigned OptCmp5 (CodeSeg* S)
 
 
 
+unsigned OptCmp6 (CodeSeg* S)
+/* Remove compare instructions before an RTS or an subroutine call that doesn't
+** use the flags.
+*/
+{
+    unsigned Changes = 0;
+    unsigned I;
+
+    /* Walk over the entries */
+    I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        CodeEntry* N;
+
+        /* Get next entry */
+        CodeEntry* E = CS_GetEntry (S, I);
+
+        /* Check for a compare followed by something else.
+        ** Note: The test could be improved by checking the flag usage of the
+        ** function explicitly against the flags set by the compare instruction.
+        ** For current code generation this makes no difference, however.
+        */
+        if ((E->Info & OF_CMP) != 0                     &&
+            (N = CS_GetNextEntry (S, I)) != 0           &&
+            (N->OPC == OP65_RTS                 ||  /* Either RTS, or ... */
+             (N->OPC == OP65_JSR            &&      /* ... or JSR ... */
+              N->JumpTo == 0                &&      /* ... to external ... */
+              (N->Use & PSTATE_ALL) == 0    &&      /* ... with no flags used ... */
+              (N->Chg & PSTATE_ALL) == PSTATE_ALL))) {  /* ... but all destroyed */
+
+            /* Found, remove the compare */
+            CS_DelEntry (S, I);
+            ++Changes;
+        }
+
+        /* Next entry */
+        ++I;
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
+
+
+
 unsigned OptCmp7 (CodeSeg* S)
 /* Search for a sequence ldx/txa/branch and remove the txa if A is not
 ** used later.
diff --git a/src/cc65/coptcmp.h b/src/cc65/coptcmp.h
index dd188f7fc..268e55be2 100644
--- a/src/cc65/coptcmp.h
+++ b/src/cc65/coptcmp.h
@@ -113,16 +113,21 @@ unsigned OptCmp5 (CodeSeg* S);
 /* Optimize compares of local variables:
 **
 **      ldy     #o
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      tax
 **      dey
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      cpx     #a
 **      bne     L1
 **      cmp     #b
 **      jne/jeq L2
 */
 
+unsigned OptCmp6 (CodeSeg* S);
+/* Remove compare instructions before an RTS or an exit by jumping to some
+** other function.
+*/
+
 unsigned OptCmp7 (CodeSeg* S);
 /* Search for a sequence ldx/txa/branch and remove the txa if A is not
 ** used later.
diff --git a/src/cc65/coptind.c b/src/cc65/coptind.c
index 9e9985c10..99fc101a9 100644
--- a/src/cc65/coptind.c
+++ b/src/cc65/coptind.c
@@ -151,7 +151,9 @@ static short ZPRegVal (unsigned short Use, const RegContents* RC)
 
 
 unsigned OptUnusedLoads (CodeSeg* S)
-/* Remove loads of registers where the value loaded is not used later. */
+/* Remove loads of or operations with registers where the value loaded or
+** produced is not used later.
+*/
 {
     unsigned Changes = 0;
 
@@ -164,17 +166,24 @@ unsigned OptUnusedLoads (CodeSeg* S)
         /* Get next entry */
         CodeEntry* E = CS_GetEntry (S, I);
 
-        /* Check if it's a register load or transfer insn */
-        if ((E->Info & (OF_LOAD | OF_XFR | OF_REG_INCDEC)) != 0         &&
-            (N = CS_GetNextEntry (S, I)) != 0                           &&
-            !CE_UseLoadFlags (N)) {
+        /* Check if this is one of the instruction we can operate on */
+        int IsOp = (E->Info & (OF_LOAD | OF_XFR | OF_REG_INCDEC)) != 0  ||
+                   E->OPC == OP65_AND                                   ||
+                   E->OPC == OP65_EOR                                   ||
+                   E->OPC == OP65_ORA;
+
+        /* Check for the necessary preconditions */
+        if (IsOp && (N = CS_GetNextEntry (S, I)) != 0 && !LoadFlagsUsed (S, I+1)) {
 
             /* Check which sort of load or transfer it is */
             unsigned R;
             switch (E->OPC) {
+                case OP65_AND:
                 case OP65_DEA:
+                case OP65_EOR:
                 case OP65_INA:
                 case OP65_LDA:
+                case OP65_ORA:
                 case OP65_TXA:
                 case OP65_TYA:  R = REG_A;      break;
                 case OP65_DEX:
@@ -581,6 +590,49 @@ unsigned OptStoreLoad (CodeSeg* S)
 
 
 
+unsigned OptLoadStore1 (CodeSeg* S)
+/* Remove an 8 bit load followed by a store into the same location. */
+{
+    unsigned Changes = 0;
+
+    /* Walk over the entries */
+    unsigned I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        CodeEntry* N;
+
+        /* Get next entry */
+        CodeEntry* E = CS_GetEntry (S, I);
+
+        /* Check if it is a load instruction followed by a store into the
+        ** same address.
+        */
+        if ((E->Info & OF_LOAD) != 0                        &&
+            (N = CS_GetNextEntry (S, I)) != 0               &&
+            !CE_HasLabel (N)                                &&
+            E->AM == N->AM                                  &&
+            ((E->OPC == OP65_LDA && N->OPC == OP65_STA) ||
+             (E->OPC == OP65_LDX && N->OPC == OP65_STX) ||
+             (E->OPC == OP65_LDY && N->OPC == OP65_STY))    &&
+            strcmp (E->Arg, N->Arg) == 0) {
+
+            /* Memory cell has already the correct value, remove the store */
+            CS_DelEntry (S, I+1);
+
+            /* Remember, we had changes */
+            ++Changes;
+        }
+
+        /* Next entry */
+        ++I;
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
+
+
+
 unsigned OptLoadStoreLoad (CodeSeg* S)
 /* Search for the sequence
 **
@@ -617,7 +669,7 @@ unsigned OptLoadStoreLoad (CodeSeg* S)
             strcmp (L[0]->Arg, L[2]->Arg) == 0) {
 
             /* Remove the second load */
-            CS_DelEntries (S, I+2, 1);
+            CS_DelEntry (S, I+2);
 
             /* Remember, we had changes */
             ++Changes;
@@ -1342,6 +1394,97 @@ unsigned OptPushPop2 (CodeSeg* S)
 
 
 
+unsigned OptPushPop3 (CodeSeg* S)
+/* Remove a pha/pla sequence where the contents of A are known */
+{
+    unsigned Changes    = 0;
+    unsigned Pha        = 0;          /* Index of PHA insn */
+    unsigned Pla        = 0;          /* Index of PLA insn */
+    CodeEntry* PhaEntry = 0;          /* Pointer to PHA */
+
+    enum {
+        Searching,
+        FoundPha,
+        FoundPla
+    } State = Searching;
+
+    /* Walk over the entries. Look for a PHA instruction where the contents
+    ** of A is known followed by a PLA later.
+    */
+    unsigned I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        /* Get next entry */
+        CodeEntry* E = CS_GetEntry (S, I);
+
+        /* Get the input registers */
+        const RegInfo* RI = E->RI;
+
+
+        const char* Arg;
+        CodeEntry* X;
+        switch (State) {
+
+            case Searching:
+                if (E->OPC == OP65_PHA && RegValIsKnown (RI->In.RegA)) {
+                    /* Found start of sequence */
+                    Pha = I;
+                    PhaEntry = E;
+                    State = FoundPha;
+                }
+                break;
+
+            case FoundPha:
+                /* Check for several things that abort the sequence:
+                ** - End of the basic block
+                ** - Another PHA or any other stack manipulating instruction
+                ** If we find something that aborts the sequence, start over
+                ** searching for the next PHA.
+                */
+                if (CE_HasLabel (E)) {
+                    /* Switch back to searching at this instruction */
+                    State = Searching;
+                    continue;
+                }
+                if (E->OPC == OP65_PHA) {
+                    /* Start over at this instruction */
+                    State = Searching;
+                    continue;
+                }
+                if (E->OPC == OP65_PHP || E->OPC == OP65_PLP || E->OPC == OP65_TXS) {
+                    /* Start over at the next instruction */
+                    State = Searching;
+                } else if (E->OPC == OP65_PLA) {
+                    /* Switch state. This will also switch to the next insn
+                    ** which is ok.
+                    */
+                    Pla = I;
+                    State = FoundPla;
+                }
+                break;
+
+            case FoundPla:
+                /* We found the sequence we were looking for. Replace it. */
+                Arg = MakeHexArg (PhaEntry->RI->In.RegA);
+                X = NewCodeEntry (OP65_LDA, AM65_IMM, Arg, 0, E->LI);
+                CS_InsertEntry (S, X, Pla + 1);
+                CS_DelEntry (S, Pla);
+                CS_DelEntry (S, Pha);
+                ++Changes;
+                State = Searching;
+                break;
+        }
+
+        /* Next entry */
+        ++I;
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
+
+
+
 unsigned OptPrecalc (CodeSeg* S)
 /* Replace immediate operations with the accu where the current contents are
 ** known by a load of the final value.
diff --git a/src/cc65/coptind.h b/src/cc65/coptind.h
index 6d39ee1f8..e54ba37d2 100644
--- a/src/cc65/coptind.h
+++ b/src/cc65/coptind.h
@@ -50,7 +50,9 @@
 
 
 unsigned OptUnusedLoads (CodeSeg* S);
-/* Remove loads of registers where the value loaded is not used later. */
+/* Remove loads of or operations with registers where the value loaded or
+** produced is not used later.
+*/
 
 unsigned OptUnusedStores (CodeSeg* S);
 /* Remove stores into zero page registers that aren't used later */
@@ -64,6 +66,9 @@ unsigned OptDupLoads (CodeSeg* S);
 unsigned OptStoreLoad (CodeSeg* S);
 /* Remove a store followed by a load from the same location. */
 
+unsigned OptLoadStore1 (CodeSeg* S);
+/* Remove an 8 bit load followed by a store into the same location. */
+
 unsigned OptLoadStoreLoad (CodeSeg* S);
 /* Remove a load, store followed by a reload of the same location. */
 
@@ -91,6 +96,9 @@ unsigned OptPushPop1 (CodeSeg* S);
 unsigned OptPushPop2 (CodeSeg* S);
 /* Remove a PHP/PLP sequence were no processor flags changed inside */
 
+unsigned OptPushPop3 (CodeSeg* S);
+/* Remove a pha/pla sequence where the contents of A are known */
+
 unsigned OptPrecalc (CodeSeg* S);
 /* Replace immediate operations with the accu where the current contents are
 ** known by a load of the final value.
diff --git a/src/cc65/coptlong.c b/src/cc65/coptlong.c
new file mode 100644
index 000000000..23c30875a
--- /dev/null
+++ b/src/cc65/coptlong.c
@@ -0,0 +1,239 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                 coptlong.c                                */
+/*                                                                           */
+/*                       Long integers optimizations                         */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/* (C) 2023, Colin Leroy-Mira <colin@colino.net                              */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+/* common */
+#include "cpu.h"
+
+/* cc65 */
+#include "codeent.h"
+#include "coptind.h"
+#include "codeinfo.h"
+#include "codeopt.h"
+#include "error.h"
+
+
+/*****************************************************************************/
+/*                      Remove unused loads and stores                       */
+/*****************************************************************************/
+
+unsigned OptLongAssign (CodeSeg* S)
+/* Simplify long assignments.
+** Recognize
+**      lda     #IMM      0
+**      sta     sreg+1    1
+**      lda     #IMM      2
+**      sta     sreg      3
+**      lda     #IMM      4
+**      ldx     #IMM      5
+**      sta     YYY       6
+**      stx     YYY+1     7
+**      ldy     sreg      8
+**      sty     YYY+2     9
+**      ldy     sreg+1    10
+**      sty     YYY+3     11
+** and simplify, if not used right after and no branching occurs, to
+**      lda    XXX+3
+**      sta    YYY+3
+**      lda    XXX+2
+**      sta    YYY+2
+**      ldx    XXX
+**      lda    XXX+1
+**      sta    YYY
+**      stx    YYY+1
+*/
+{
+    unsigned Changes = 0;
+
+    /* Walk over the entries */
+    unsigned I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        CodeEntry* L[13];
+
+        /* Get next entry */
+        L[0] = CS_GetEntry (S, I);
+
+        if (CS_GetEntries (S, L+1, I+1, 12)) {
+          CodeEntry* N;
+          if (/* Check the opcode sequence */
+              L[0]->OPC == OP65_LDA                                &&
+              L[1]->OPC == OP65_STA                                &&
+              L[2]->OPC == OP65_LDA                                &&
+              L[3]->OPC == OP65_STA                                &&
+              L[4]->OPC == OP65_LDA                                &&
+              L[5]->OPC == OP65_LDX                                &&
+              L[6]->OPC == OP65_STA                                &&
+              L[7]->OPC == OP65_STX                                &&
+              L[8]->OPC == OP65_LDY                                &&
+              L[9]->OPC == OP65_STY                                &&
+              L[10]->OPC == OP65_LDY                               &&
+              L[11]->OPC == OP65_STY                               &&
+              /* Check the arguments match */
+              L[0]->AM == AM65_IMM                                 &&
+              !strcmp (L[1]->Arg, "sreg+1")                        &&
+              L[2]->AM == AM65_IMM                                 &&
+              !strcmp (L[3]->Arg, "sreg")                          &&
+              L[4]->AM == AM65_IMM                                 &&
+              L[5]->AM == AM65_IMM                                 &&
+              !strncmp(L[7]->Arg, L[6]->Arg, strlen(L[6]->Arg))    &&
+                !strcmp(L[7]->Arg + strlen(L[6]->Arg), "+1")       &&
+              !strcmp (L[8]->Arg, "sreg")                          &&
+              !strncmp(L[9]->Arg, L[6]->Arg, strlen(L[6]->Arg))    &&
+                !strcmp(L[9]->Arg + strlen(L[6]->Arg), "+2")       &&
+              !strcmp (L[10]->Arg, "sreg+1")                       &&
+              !strncmp(L[11]->Arg, L[6]->Arg, strlen(L[6]->Arg))   &&
+                !strcmp(L[11]->Arg + strlen(L[6]->Arg), "+3")      &&
+              /* Check there's nothing more */
+              !RegXUsed (S, I+12)                                  &&
+              !CS_RangeHasLabel(S, I, 12)) {
+
+              N = NewCodeEntry (OP65_STA, L[11]->AM, L[11]->Arg, 0, L[11]->LI);
+              CS_DelEntry (S, I+1);
+              CS_InsertEntry (S, N, I+1);
+
+              N = NewCodeEntry (OP65_STA, L[9]->AM, L[9]->Arg, 0, L[9]->LI);
+              CS_DelEntry (S, I+3);
+              CS_InsertEntry (S, N, I+3);
+
+              CS_DelEntries (S, I+8, 4);
+
+              /* Remember, we had changes */
+              ++Changes;
+          }
+        }
+
+        /* Next entry */
+        ++I;
+
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
+
+unsigned OptLongCopy (CodeSeg* S)
+/* Simplify long copies.
+** Recognize
+**      lda     XXX+3       0
+**      sta     sreg+1      1
+**      lda     XXX+2       2
+**      sta     sreg        3
+**      ldx     XXX+1       4
+**      lda     XXX         5
+**      sta     YYY         6
+**      stx     YYY+1       7
+**      ldy     sreg        8
+**      sty     YYY+2       9
+**      ldy     sreg+1      10
+**      sty     YYY+3       11
+** and simplify, if not used right after and no branching occurs, to
+**      lda    XXX+3
+**      sta    YYY+3
+**      lda    XXX+2
+**      sta    YYY+2
+**      ldx    XXX
+**      lda    XXX+1
+**      sta    YYY
+**      stx    YYY+1
+*/
+{
+    unsigned Changes = 0;
+
+    /* Walk over the entries */
+    unsigned I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        CodeEntry* L[13];
+
+        /* Get next entry */
+        L[0] = CS_GetEntry (S, I);
+
+        if (CS_GetEntries (S, L+1, I+1, 12)) {
+          CodeEntry *N;
+          if (L[0]->OPC == OP65_LDA                                &&
+                !strncmp(L[0]->Arg, L[5]->Arg, strlen(L[5]->Arg))  &&
+                !strcmp(L[0]->Arg + strlen(L[5]->Arg), "+3")       &&
+              L[1]->OPC == OP65_STA                                &&
+                !strcmp (L[1]->Arg, "sreg+1")                      &&
+              L[2]->OPC == OP65_LDA                                &&
+                !strncmp(L[2]->Arg, L[5]->Arg, strlen(L[5]->Arg))  &&
+                !strcmp(L[2]->Arg + strlen(L[5]->Arg), "+2")       &&
+              L[3]->OPC == OP65_STA                                &&
+                !strcmp (L[3]->Arg, "sreg")                        &&
+              L[4]->OPC == OP65_LDX                                &&
+                !strncmp(L[4]->Arg, L[5]->Arg, strlen(L[5]->Arg))  &&
+                !strcmp(L[4]->Arg + strlen(L[5]->Arg), "+1")       &&
+              L[5]->OPC == OP65_LDA                                &&
+              L[6]->OPC == OP65_STA                                &&
+              L[7]->OPC == OP65_STX                                &&
+                !strncmp(L[7]->Arg, L[6]->Arg, strlen(L[6]->Arg))  &&
+                !strcmp(L[7]->Arg + strlen(L[6]->Arg), "+1")       &&
+              L[8]->OPC == OP65_LDY                                &&
+                !strcmp (L[8]->Arg, "sreg")                        &&
+              L[9]->OPC == OP65_STY                                &&
+                !strncmp(L[9]->Arg, L[6]->Arg, strlen(L[6]->Arg))  &&
+                !strcmp(L[9]->Arg + strlen(L[6]->Arg), "+2")       &&
+              L[10]->OPC == OP65_LDY                               &&
+                !strcmp (L[10]->Arg, "sreg+1")                     &&
+              L[11]->OPC == OP65_STY                               &&
+                !strncmp(L[11]->Arg, L[6]->Arg, strlen(L[6]->Arg)) &&
+                !strcmp(L[11]->Arg + strlen(L[6]->Arg), "+3")      &&
+              !RegXUsed (S, I+11)                                  &&
+              !CS_RangeHasLabel(S, I, 12)) {
+
+              N = NewCodeEntry (OP65_STA, L[11]->AM, L[11]->Arg, 0, L[11]->LI);
+              CS_DelEntry (S, I+1);
+              CS_InsertEntry (S, N, I+1);
+
+              N = NewCodeEntry (OP65_STA, L[9]->AM, L[9]->Arg, 0, L[9]->LI);
+              CS_DelEntry (S, I+3);
+              CS_InsertEntry (S, N, I+3);
+
+              CS_DelEntries (S, I+8, 4);
+
+              /* Remember, we had changes */
+              ++Changes;
+          }
+        }
+
+        /* Next entry */
+        ++I;
+
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
diff --git a/libsrc/common/localtime.c b/src/cc65/coptlong.h
similarity index 77%
rename from libsrc/common/localtime.c
rename to src/cc65/coptlong.h
index 48931ea62..c0233c299 100644
--- a/libsrc/common/localtime.c
+++ b/src/cc65/coptlong.h
@@ -1,15 +1,16 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                localtime.c                                */
+/*                                 coptlong.h                                */
 /*                                                                           */
-/*            Convert calendar time into broken down local time              */
+/*                       Long integers optimizations                         */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2002      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/* (C) 2023, Colin Leroy-Mira <colin@colino.net                              */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -33,7 +34,13 @@
 
 
 
-#include <time.h>
+#ifndef COPTLONG_H
+#define COPTLONG_H
+
+
+
+/* cc65 */
+#include "codeseg.h"
 
 
 
@@ -43,18 +50,14 @@
 
 
 
-struct tm* __fastcall__ localtime (const time_t* timep)
-{
-    time_t t;
+unsigned OptLongAssign (CodeSeg* S);
+/* Simplify long assigns. */
 
-    /* Check for a valid time spec */
-    if (timep == 0) {
-        return 0;
-    }
+unsigned OptLongCopy (CodeSeg* S);
+/* Simplify long copy. */
 
-    /* Get the time and correct for the time zone offset */
-    t = *timep + _tz.timezone;
 
-    /* Use gmtime for conversion */
-    return gmtime (&t);
-}
+
+/* End of coptind.h */
+
+#endif
diff --git a/src/cc65/coptmisc.c b/src/cc65/coptmisc.c
index 523fbf17c..a2cda7495 100644
--- a/src/cc65/coptmisc.c
+++ b/src/cc65/coptmisc.c
@@ -492,9 +492,9 @@ unsigned OptGotoSPAdj (CodeSeg* S)
             L[1]->AM == AM65_ABS             &&
             L[2]->OPC == OP65_CLC            &&
             L[3]->OPC == OP65_ADC            &&
-            strcmp (L[3]->Arg, "sp") == 0    &&
+            strcmp (L[3]->Arg, "c_sp") == 0    &&
             L[6]->OPC == OP65_ADC            &&
-            strcmp (L[6]->Arg, "sp+1") == 0  &&
+            strcmp (L[6]->Arg, "c_sp+1") == 0  &&
             L[9]->OPC == OP65_JMP) {
             adjustment = FindSPAdjustment (L[1]->Arg);
 
@@ -582,11 +582,57 @@ unsigned OptGotoSPAdj (CodeSeg* S)
 
 
 /*****************************************************************************/
-/*                         Optimize stack load ops                           */
+/*                       Optimize stack load/store ops                       */
 /*****************************************************************************/
 
 
 
+unsigned OptLoadStore2 (CodeSeg* S)
+/* Remove 16 bit stack loads followed by a store into the same location. */
+{
+    unsigned Changes = 0;
+
+    /* Walk over the entries */
+    unsigned I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        CodeEntry* N;
+
+        /* Get next entry */
+        CodeEntry* E = CS_GetEntry (S, I);
+
+        /* Check if this is a 16 bit load followed by a store into the same
+        ** address.
+        */
+        if (CE_IsCallTo (E, "ldaxysp")          &&  /* Stack load ... */
+            RegValIsKnown (E->RI->In.RegY)      &&  /* ... with known offs */
+            (N = CS_GetNextEntry (S, I)) != 0   &&  /* Next insn ... */
+            !CE_HasLabel (N)                    &&  /* ... without label ... */
+            N->OPC == OP65_LDY                  &&  /* ... is LDY */
+            CE_IsKnownImm (N, E->RI->In.RegY-1) &&  /* Same offset as load */
+            (N = CS_GetNextEntry (S, I+1)) != 0 &&  /* Next insn ... */
+            !CE_HasLabel (N)                    &&  /* ... without label ... */
+            CE_IsCallTo (N, "staxysp")) {           /* ... is store */
+
+            /* Found - remove it. Leave the load in place. If it's unused, it
+            ** will get removed by later steps.
+            */
+            CS_DelEntries (S, I+1, 2);
+
+            /* Remember, we had changes */
+            ++Changes;
+        }
+
+        /* Next entry */
+        ++I;
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
+
+
+
 unsigned OptLoad1 (CodeSeg* S)
 /* Search for a call to ldaxysp where X is not used later and replace it by
 ** a load of just the A register.
@@ -617,7 +663,7 @@ unsigned OptLoad1 (CodeSeg* S)
             CS_InsertEntry (S, X, I+1);
 
             /* Load from stack */
-            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, E->LI);
+            X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, E->LI);
             CS_InsertEntry (S, X, I+2);
 
             /* Now remove the call to the subroutine */
@@ -673,8 +719,8 @@ unsigned OptLoad2 (CodeSeg* S)
                 ** later
                 */
 
-                /* lda (sp),y */
-                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[0]->LI);
+                /* lda (c_sp),y */
+                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+3);
 
                 /* sta abs */
@@ -685,8 +731,8 @@ unsigned OptLoad2 (CodeSeg* S)
                 X = NewCodeEntry (OP65_DEY, AM65_IMP, 0, 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+5);
 
-                /* lda (sp),y */
-                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[0]->LI);
+                /* lda (c_sp),y */
+                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+6);
 
                 /* sta abs */
@@ -700,8 +746,8 @@ unsigned OptLoad2 (CodeSeg* S)
 
                 /* Standard replacement */
 
-                /* lda (sp),y */
-                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[0]->LI);
+                /* lda (c_sp),y */
+                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+1);
 
                 /* tax */
@@ -712,8 +758,8 @@ unsigned OptLoad2 (CodeSeg* S)
                 X = NewCodeEntry (OP65_DEY, AM65_IMP, 0, 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+3);
 
-                /* lda (sp),y */
-                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "sp", 0, L[0]->LI);
+                /* lda (c_sp),y */
+                X = NewCodeEntry (OP65_LDA, AM65_ZP_INDY, "c_sp", 0, L[0]->LI);
                 CS_InsertEntry (S, X, I+4);
 
                 /* Now remove the call to the subroutine */
@@ -733,3 +779,228 @@ unsigned OptLoad2 (CodeSeg* S)
     /* Return the number of changes made */
     return Changes;
 }
+
+
+
+unsigned OptBinOps1 (CodeSeg* S)
+/* Search for an AND/EOR/ORA where the value of A or the operand is known and
+** replace it by something simpler.
+*/
+{
+    unsigned Changes = 0;
+
+    /* Walk over the entries */
+    unsigned I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        /* Get next entry */
+        CodeEntry* E = CS_GetEntry (S, I);
+
+        /* Get a pointer to the input registers of the insn */
+        const RegContents* In  = &E->RI->In;
+
+        /* Check for AND/EOR/ORA and a known value in A */
+        int Delete = 0;
+        CodeEntry* X = 0;
+        switch (E->OPC) {
+
+            case OP65_AND:
+                if (In->RegA == 0x00) {
+                    /* Zero AND anything gives zero. The instruction can be
+                    ** replaced by an immediate load of zero.
+                    */
+                    X = NewCodeEntry (OP65_LDA, AM65_IMM, "$00", 0, E->LI);
+                } else if (In->RegA == 0xFF) {
+                    /* 0xFF AND anything equals the operand. The instruction
+                    ** can be replaced by a simple load of the operand.
+                    */
+                    X = NewCodeEntry (OP65_LDA, E->AM, E->Arg, 0, E->LI);
+                } else if (E->AM == AM65_ZP) {
+                    short Operand = -1;
+                    switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                        case REG_TMP1:      Operand = In->Tmp1;     break;
+                        case REG_PTR1_LO:   Operand = In->Ptr1Lo;   break;
+                        case REG_PTR1_HI:   Operand = In->Ptr1Hi;   break;
+                        case REG_SREG_LO:   Operand = In->SRegLo;   break;
+                        case REG_SREG_HI:   Operand = In->SRegHi;   break;
+                    }
+                    if (Operand == 0x00) {
+                        /* AND with zero gives zero. The instruction can be
+                        ** replaced by an immediate load of zero.
+                        */
+                        X = NewCodeEntry (OP65_LDA, AM65_IMM, "$00", 0, E->LI);
+                    } else if (Operand == 0xFF) {
+                        /* AND with 0xFF is a no-op besides setting the flags.
+                        ** The instruction can be removed if the flags aren't
+                        ** used later.
+                        */
+                        if (!LoadFlagsUsed (S, I+1)) {
+                            Delete = 1;
+                        }
+                    } else if (Operand >= 0) {
+                        /* The instruction can be replaced by an immediate
+                        ** AND.
+                        */
+                        const char* Arg = MakeHexArg (Operand);
+                        X = NewCodeEntry (OP65_AND, AM65_IMM, Arg, 0, E->LI);
+                    }
+                }
+                break;
+
+            case OP65_EOR:
+                if (In->RegA == 0x00) {
+                    /* Zero EOR anything equals the operand. The instruction
+                    ** can be replaced by a simple load.
+                    */
+                    X = NewCodeEntry (OP65_LDA, E->AM, E->Arg, 0, E->LI);
+                } else if (E->AM == AM65_ZP) {
+                    short Operand = -1;
+                    switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                        case REG_TMP1:      Operand = In->Tmp1;     break;
+                        case REG_PTR1_LO:   Operand = In->Ptr1Lo;   break;
+                        case REG_PTR1_HI:   Operand = In->Ptr1Hi;   break;
+                        case REG_SREG_LO:   Operand = In->SRegLo;   break;
+                        case REG_SREG_HI:   Operand = In->SRegHi;   break;
+                    }
+                    if (Operand == 0x00) {
+                        /* EOR with 0x00 is a no-op besides setting the flags.
+                        ** The instruction can be removed if the flags aren't
+                        ** used later.
+                        */
+                        if (!LoadFlagsUsed (S, I+1)) {
+                            Delete = 1;
+                        }
+                    } else if (Operand >= 0) {
+                        /* The instruction can be replaced by an immediate
+                        ** EOR.
+                        */
+                        const char* Arg = MakeHexArg (Operand);
+                        X = NewCodeEntry (OP65_EOR, AM65_IMM, Arg, 0, E->LI);
+                    }
+                }
+                break;
+
+            case OP65_ORA:
+                if (In->RegA == 0x00) {
+                    /* ORA with 0x00 is a no-op. The instruction can be
+                    ** replaced by a simple load.
+                    */
+                    X = NewCodeEntry (OP65_LDA, E->AM, E->Arg, 0, E->LI);
+                } else if (In->RegA == 0xFF) {
+                    /* ORA with 0xFF gives 0xFF. The instruction can be replaced
+                    ** by an immediate load of 0xFF.
+                    */
+                    X = NewCodeEntry (OP65_LDA, AM65_IMM, "$FF", 0, E->LI);
+                } else if (E->AM == AM65_ZP) {
+                    short Operand = -1;
+                    switch (GetKnownReg (E->Use & REG_ZP, In)) {
+                        case REG_TMP1:      Operand = In->Tmp1;     break;
+                        case REG_PTR1_LO:   Operand = In->Ptr1Lo;   break;
+                        case REG_PTR1_HI:   Operand = In->Ptr1Hi;   break;
+                        case REG_SREG_LO:   Operand = In->SRegLo;   break;
+                        case REG_SREG_HI:   Operand = In->SRegHi;   break;
+                    }
+                    if (Operand == 0x00) {
+                        /* ORA with 0x00 is a no-op besides setting the flags.
+                        ** The instruction can be removed if the flags aren't
+                        ** used later.
+                        */
+                        if (!LoadFlagsUsed (S, I+1)) {
+                            Delete = 1;
+                        }
+                    } else if (Operand == 0xFF) {
+                        /* ORA with 0xFF results in 0xFF. The instruction can
+                        ** be replaced by a simple load.
+                        */
+                        X = NewCodeEntry (OP65_LDA, AM65_IMM, "$FF", 0, E->LI);
+                    } else if (Operand >= 0) {
+                        /* The instruction can be replaced by an immediate
+                        ** ORA.
+                        */
+                        const char* Arg = MakeHexArg (Operand);
+                        X = NewCodeEntry (OP65_ORA, AM65_IMM, Arg, 0, E->LI);
+                    }
+                }
+                break;
+
+            default:
+                break;
+
+        }
+
+        /* If we must delete the instruction, do that. If we have a replacement
+        ** entry, place it and remove the old one.
+        */
+        if (X) {
+            CS_InsertEntry (S, X, I+1);
+            Delete = 1;
+        }
+        if (Delete) {
+            CS_DelEntry (S, I);
+            ++Changes;
+        }
+
+        /* Next entry */
+        ++I;
+
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
+
+
+
+unsigned OptBinOps2 (CodeSeg* S)
+/* Search for an AND/EOR/ORA for identical memory locations and replace it
+** by something simpler.
+*/
+{
+    unsigned Changes = 0;
+
+    /* Walk over the entries */
+    unsigned I = 0;
+    while (I < CS_GetEntryCount (S)) {
+
+        CodeEntry* N;
+
+        /* Get next entry */
+        CodeEntry* E = CS_GetEntry (S, I);
+
+        /* Check if this is an 8 bit load followed by a bit operation with the
+        ** same memory cell.
+        */
+        if (E->OPC == OP65_LDA                  &&
+            (N = CS_GetNextEntry (S, I)) != 0   &&  /* Next insn ... */
+            !CE_HasLabel (N)                    &&  /* ... without label ... */
+            (N->OPC == OP65_AND ||                  /* ... is AND/EOR/ORA ... */
+             N->OPC == OP65_EOR ||
+             N->OPC == OP65_ORA)                &&
+            E->AM == N->AM                      && /* ... with same addr mode ... */
+            strcmp (E->Arg, N->Arg) == 0) {        /* ... and same argument */
+
+            /* For an EOR, the result is zero. For the other instructions, the
+            ** result doesn't change so they can be removed.
+            */
+            if (N->OPC == OP65_EOR) {
+                /* Simply insert a load of the now known value. The flags will
+                ** be correct because of the load and the preceeding
+                ** instructions will be removed by later steps.
+                */
+                CodeEntry* X = NewCodeEntry (OP65_LDA, AM65_IMM, "$00", 0, N->LI);
+                CS_InsertEntry (S, X, I+2);
+            } else {
+                CS_DelEntry (S, I+1);
+            }
+
+            /* Remember, we had changes */
+            ++Changes;
+        }
+
+        /* Next entry */
+        ++I;
+    }
+
+    /* Return the number of changes made */
+    return Changes;
+}
diff --git a/src/cc65/coptmisc.h b/src/cc65/coptmisc.h
index 89242351c..aceaa55d3 100644
--- a/src/cc65/coptmisc.h
+++ b/src/cc65/coptmisc.h
@@ -99,6 +99,9 @@ unsigned OptStackPtrOps (CodeSeg* S);
 unsigned OptGotoSPAdj (CodeSeg* S);
 /* Optimize SP adjustment for forward 'goto' */
 
+unsigned OptLoadStore2 (CodeSeg* S);
+/* Remove 16 bit stack loads followed by a store into the same location. */
+
 unsigned OptLoad1 (CodeSeg* S);
 /* Search for a call to ldaxysp where X is not used later and replace it by
 ** a load of just the A register.
@@ -107,6 +110,17 @@ unsigned OptLoad1 (CodeSeg* S);
 unsigned OptLoad2 (CodeSeg* S);
 /* Replace calls to ldaxysp by inline code */
 
+unsigned OptBinOps1 (CodeSeg* S);
+/* Search for an AND/EOR/ORA where the value of A or the operand is known and
+** replace it by something simpler.
+*/
+
+unsigned OptBinOps2 (CodeSeg* S);
+/* Search for an AND/EOR/ORA for identical memory locations and replace it
+** by something simpler.
+*/
+
+
 
 /* End of coptmisc.h */
 
diff --git a/src/cc65/coptptrload.c b/src/cc65/coptptrload.c
index 046e65d79..e28bf5d39 100644
--- a/src/cc65/coptptrload.c
+++ b/src/cc65/coptptrload.c
@@ -359,7 +359,7 @@ unsigned OptPtrLoad4 (CodeSeg* S)
 **      ldx     #>(label+0)
 **      ldy     #$xx
 **      clc
-**      adc     (sp),y
+**      adc     (c_sp),y
 **      bcc     L
 **      inx
 ** L:   ldy     #$00
@@ -368,7 +368,7 @@ unsigned OptPtrLoad4 (CodeSeg* S)
 ** and replace it by:
 **
 **      ldy     #$xx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      tay
 **      ldx     #$00
 **      lda     label,y
@@ -553,7 +553,7 @@ unsigned OptPtrLoad6 (CodeSeg* S)
 **      jsr     pushax
 **      ldy     #xxx
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      jsr     tosaddax
 **      ldy     #$00
 **      jsr     ldauidx
@@ -563,7 +563,7 @@ unsigned OptPtrLoad6 (CodeSeg* S)
 **      sta     ptr1
 **      stx     ptr1+1
 **      ldy     #xxx-2
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      tay
 **      ldx     #$00
 **      lda     (ptr1),y
@@ -613,7 +613,7 @@ unsigned OptPtrLoad6 (CodeSeg* S)
             X = NewCodeEntry (OP65_LDY, AM65_IMM, Arg, 0, L[1]->LI);
             CS_InsertEntry (S, X, I+9);
 
-            /* lda (sp),y */
+            /* lda (c_sp),y */
             X = NewCodeEntry (OP65_LDA, L[3]->AM, L[3]->Arg, 0, L[3]->LI);
             CS_InsertEntry (S, X, I+10);
 
diff --git a/src/cc65/coptptrload.h b/src/cc65/coptptrload.h
index d4e0e2ed4..259d1587b 100644
--- a/src/cc65/coptptrload.h
+++ b/src/cc65/coptptrload.h
@@ -127,7 +127,7 @@ unsigned OptPtrLoad4 (CodeSeg* S);
 **      ldx     #>(label+0)
 **      ldy     #$xx
 **      clc
-**      adc     (sp),y
+**      adc     (c_sp),y
 **      bcc     L
 **      inx
 ** L:   ldy     #$00
@@ -136,7 +136,7 @@ unsigned OptPtrLoad4 (CodeSeg* S);
 ** and replace it by:
 **
 **      ldy     #$xx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      tay
 **      ldx     #$00
 **      lda     label,y
@@ -166,7 +166,7 @@ unsigned OptPtrLoad6 (CodeSeg* S);
 **      jsr     pushax
 **      ldy     xxx
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      jsr     tosaddax
 **      ldy     #$00
 **      jsr     ldauidx
@@ -176,7 +176,7 @@ unsigned OptPtrLoad6 (CodeSeg* S);
 **      sta     ptr1
 **      stx     ptr1+1
 **      ldy     xxx
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      tay
 **      lda     (ptr1),y
 */
diff --git a/src/cc65/coptptrstore.c b/src/cc65/coptptrstore.c
index 11832910f..721775380 100644
--- a/src/cc65/coptptrstore.c
+++ b/src/cc65/coptptrstore.c
@@ -396,7 +396,7 @@ unsigned OptPtrStore2 (CodeSeg* S)
 ** L:   jsr     pushax
 **      ldy     yyy
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #$00
 **      jsr     staspidx
 **
@@ -406,7 +406,7 @@ unsigned OptPtrStore2 (CodeSeg* S)
 **      stx     ptr1+1
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     (ptr1),y
 **
@@ -414,7 +414,7 @@ unsigned OptPtrStore2 (CodeSeg* S)
 **
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     (zp),y
 **
@@ -422,7 +422,7 @@ unsigned OptPtrStore2 (CodeSeg* S)
 **
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     label,y
 **
@@ -430,7 +430,7 @@ unsigned OptPtrStore2 (CodeSeg* S)
 **
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     $xxxx,y
 **
@@ -468,7 +468,7 @@ unsigned OptPtrStore2 (CodeSeg* S)
             L[6]->OPC == OP65_LDX                               &&
             L[7]->OPC == OP65_LDA                               &&
             L[7]->AM == AM65_ZP_INDY                            &&
-            strcmp (L[7]->Arg, "sp") == 0                       &&
+            strcmp (L[7]->Arg, "c_sp") == 0                     &&
             L[8]->OPC == OP65_LDY                               &&
             (L[8]->AM == AM65_ABS                       ||
              L[8]->AM == AM65_ZP                        ||
diff --git a/src/cc65/coptptrstore.h b/src/cc65/coptptrstore.h
index 3f8fc91f9..fd36eddba 100644
--- a/src/cc65/coptptrstore.h
+++ b/src/cc65/coptptrstore.h
@@ -105,7 +105,7 @@ unsigned OptPtrStore2 (CodeSeg* S);
 ** L:   jsr     pushax
 **      ldy     yyy
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     #$00
 **      jsr     staspidx
 **
@@ -115,7 +115,7 @@ unsigned OptPtrStore2 (CodeSeg* S);
 **      stx     ptr1+1
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     (ptr1),y
 **
@@ -123,7 +123,7 @@ unsigned OptPtrStore2 (CodeSeg* S);
 **
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     (zp),y
 **
@@ -131,7 +131,7 @@ unsigned OptPtrStore2 (CodeSeg* S);
 **
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     label,y
 **
@@ -139,7 +139,7 @@ unsigned OptPtrStore2 (CodeSeg* S);
 **
 **      ldy     yyy-2
 **      ldx     #$00
-**      lda     (sp),y
+**      lda     (c_sp),y
 **      ldy     xxx
 **      sta     $xxxx,y
 **
diff --git a/src/cc65/coptstop.c b/src/cc65/coptstop.c
index 7e024ae88..7a9416b51 100644
--- a/src/cc65/coptstop.c
+++ b/src/cc65/coptstop.c
@@ -1292,10 +1292,10 @@ static unsigned Opt_a_tosicmp (StackOpData* D)
                 }
                 InsertEntry (D, X, D->IP++);
 
-                /* cmp src,y OR cmp (sp),y */
+                /* cmp src,y OR cmp (c_sp),y */
                 if (D->Rhs.A.LoadEntry->OPC == OP65_JSR) {
-                    /* opc (sp),y */
-                    X = NewCodeEntry (OP65_CMP, AM65_ZP_INDY, "sp", 0, D->OpEntry->LI);
+                    /* opc (c_sp),y */
+                    X = NewCodeEntry (OP65_CMP, AM65_ZP_INDY, "c_sp", 0, D->OpEntry->LI);
                 } else {
                     /* opc src,y */
                     X = NewCodeEntry (OP65_CMP, D->Rhs.A.LoadEntry->AM, D->Rhs.A.LoadEntry->Arg, 0, D->OpEntry->LI);
@@ -1464,7 +1464,9 @@ static unsigned Opt_a_tosxor (StackOpData* D)
 
 /* The first column of these two tables must be sorted in lexical order */
 
+/* CAUTION: table must be sorted for bsearch */
 static const OptFuncDesc FuncTable[] = {
+/* BEGIN SORTED.SH */
     { "___bzero",   Opt___bzero,   REG_NONE, OP_X_ZERO | OP_A_KNOWN                    },
     { "staspidx",   Opt_staspidx,  REG_NONE, OP_NONE                                   },
     { "staxspidx",  Opt_staxspidx, REG_AX,   OP_NONE                                   },
@@ -1485,10 +1487,13 @@ static const OptFuncDesc FuncTable[] = {
     { "tosuleax",   Opt_tosuleax,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "tosultax",   Opt_tosultax,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "tosxorax",   Opt_tosxorax,  REG_NONE, OP_NONE                                   },
+/* END SORTED.SH */
 };
 
+/* CAUTION: table must be sorted for bsearch */
 static const OptFuncDesc FuncRegATable[] = {
-    { "tosandax",   Opt_a_tosand,  REG_NONE, OP_NONE                                   },
+/* BEGIN SORTED.SH */
+    { "tosandax",   Opt_a_tosand,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "toseqax",    Opt_a_toseq,   REG_NONE, OP_NONE                                   },
     { "tosgeax",    Opt_a_tosuge,  REG_NONE, OP_NONE                                   },
     { "tosgtax",    Opt_a_tosugt,  REG_NONE, OP_NONE                                   },
@@ -1496,13 +1501,14 @@ static const OptFuncDesc FuncRegATable[] = {
     { "tosleax",    Opt_a_tosule,  REG_NONE, OP_NONE                                   },
     { "tosltax",    Opt_a_tosult,  REG_NONE, OP_NONE                                   },
     { "tosneax",    Opt_a_tosne,   REG_NONE, OP_NONE                                   },
-    { "tosorax",    Opt_a_tosor,   REG_NONE, OP_NONE                                   },
+    { "tosorax",    Opt_a_tosor,   REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "tossubax",   Opt_a_tossub,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "tosugeax",   Opt_a_tosuge,  REG_NONE, OP_NONE                                   },
     { "tosugtax",   Opt_a_tosugt,  REG_NONE, OP_NONE                                   },
     { "tosuleax",   Opt_a_tosule,  REG_NONE, OP_NONE                                   },
     { "tosultax",   Opt_a_tosult,  REG_NONE, OP_NONE                                   },
-    { "tosxorax",   Opt_a_tosxor,  REG_NONE, OP_NONE                                   },
+    { "tosxorax",   Opt_a_tosxor,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
+/* END SORTED.SH */
 };
 
 #define FUNC_COUNT(Table) (sizeof(Table) / sizeof(Table[0]))
diff --git a/src/cc65/coptstore.c b/src/cc65/coptstore.c
index b0dfe3b6d..2fc83b5fb 100644
--- a/src/cc65/coptstore.c
+++ b/src/cc65/coptstore.c
@@ -48,7 +48,7 @@
 
 static void InsertStore (CodeSeg* S, unsigned* IP, LineInfo* LI)
 {
-    CodeEntry* X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "sp", 0, LI);
+    CodeEntry* X = NewCodeEntry (OP65_STA, AM65_ZP_INDY, "c_sp", 0, LI);
     CS_InsertEntry (S, X, (*IP)++);
 }
 
diff --git a/src/cc65/datatype.c b/src/cc65/datatype.c
index 81727e491..4d6cb25a5 100644
--- a/src/cc65/datatype.c
+++ b/src/cc65/datatype.c
@@ -216,7 +216,7 @@ unsigned BitSizeOf (const Type* T)
 unsigned SizeOf (const Type* T)
 /* Compute size (in bytes) of object represented by type array */
 {
-    switch (GetUnqualTypeCode (T)) {
+    switch (GetUnderlyingTypeCode (T)) {
 
         case T_VOID:
             /* A void variable is a cc65 extension.
@@ -368,7 +368,7 @@ static unsigned GetMinimalTypeSizeByBitWidth (unsigned BitWidth)
 
 
 
-TypeCode GetUnqualTypeCode (const Type* Type)
+TypeCode GetUnderlyingTypeCode (const Type* Type)
 /* Get the type code of the unqualified underlying type of Type.
 ** Return GetUnqualRawTypeCode (Type) if Type is not scalar.
 */
@@ -497,8 +497,8 @@ Type* NewPointerTo (const Type* T)
 
 
 Type* NewBitFieldOf (const Type* T, unsigned BitOffs, unsigned BitWidth)
-/* Return a type string that is "T : BitWidth" aligned on BitOffs. The type
-** string is allocated on the heap and may be freed after use.
+/* Return a type string that is "unqualified T : BitWidth" aligned on BitOffs.
+** The type string is allocated on the heap and may be freed after use.
 */
 {
     Type* P;
@@ -539,7 +539,7 @@ const Type* AddressOf (const Type* T)
     Type* P = TypeAlloc (Size + 1);
 
     /* Create the return type... */
-    P[0].C = T_PTR | (T[0].C & T_QUAL_ADDRSIZE) | T_QUAL_CONST;
+    P[0].C = T_PTR | (T[0].C & T_QUAL_ADDRSIZE);
     memcpy (P+1, T, Size * sizeof (Type));
 
     /* ...and return it */
@@ -725,7 +725,7 @@ const Type* ArithmeticConvert (const Type* lhst, const Type* rhst)
 const Type* GetSignedType (const Type* T)
 /* Get signed counterpart of the integral type */
 {
-    switch (GetUnqualTypeCode (T) & T_MASK_RANK) {
+    switch (GetUnderlyingTypeCode (T) & T_MASK_RANK) {
         case T_RANK_CHAR:
             return type_schar;
 
@@ -739,7 +739,7 @@ const Type* GetSignedType (const Type* T)
             return type_long;
 
         default:
-            Internal ("Unknown type code: %lX", GetUnqualTypeCode (T));
+            Internal ("Unknown type code: %lX", GetUnderlyingTypeCode (T));
             return T;
     }
 }
@@ -749,7 +749,7 @@ const Type* GetSignedType (const Type* T)
 const Type* GetUnsignedType (const Type* T)
 /* Get unsigned counterpart of the integral type */
 {
-    switch (GetUnqualTypeCode (T) & T_MASK_RANK) {
+    switch (GetUnderlyingTypeCode (T) & T_MASK_RANK) {
         case T_RANK_CHAR:
             return type_uchar;
 
@@ -763,7 +763,7 @@ const Type* GetUnsignedType (const Type* T)
             return type_ulong;
 
         default:
-            Internal ("Unknown type code: %lX", GetUnqualTypeCode (T));
+            Internal ("Unknown type code: %lX", GetUnderlyingTypeCode (T));
             return T;
     }
 }
@@ -989,6 +989,24 @@ int IsIncompleteESUType (const Type* T)
 
 
 
+int IsAnonESUType (const Type* T)
+/* Return true if this is an anonymous ESU type */
+{
+    SymEntry* TagSym = GetESUTagSym (T);
+
+    return TagSym != 0 && SymHasAnonName (TagSym);
+}
+
+
+
+int IsAnonStructClass (const Type* T)
+/* Return true if this is an anonymous struct or union type */
+{
+    return IsClassStruct (T) && IsAnonESUType (T);
+}
+
+
+
 int IsPassByRefType (const Type* T)
 /* Return true if this is a large struct/union type that doesn't fit in the
 ** primary. This returns false for the void value extension type since it is
@@ -1356,6 +1374,65 @@ const char* GetFullTypeName (const Type* T)
 
 
 
+static void GetParameterList (StrBuf* ParamList, StrBuf* Buf, const FuncDesc* D, int Detailed)
+{
+    /* First argument */
+    const SymEntry* Param = D->SymTab->SymHead;
+    unsigned I;
+
+    if ((D->Flags & FD_OLDSTYLE) == 0) {
+        /* ANSI style */
+        for (I = 0; I < D->ParamCount; ++I) {
+            CHECK (Param != 0 && (Param->Flags & SC_PARAM) != 0);
+            if (I > 0) {
+                SB_AppendStr (ParamList, ", ");
+            }
+            if (Detailed) {
+                if (SymIsRegVar (Param)) {
+                    SB_AppendStr (ParamList, "register ");
+                }
+                if (!SymHasAnonName (Param)) {
+                    SB_AppendStr (Buf, Param->Name);
+                }
+            }
+            SB_AppendStr (ParamList, SB_GetConstBuf (GetFullTypeNameBuf (Buf, Param->Type)));
+            SB_Clear (Buf);
+            /* Next argument */
+            Param = Param->NextSym;
+        }
+        if ((D->Flags & FD_VARIADIC) == 0) {
+            if (D->ParamCount == 0 && (D->Flags & FD_EMPTY) == 0) {
+                SB_AppendStr (ParamList, "void");
+            }
+        } else {
+            if (D->ParamCount > 0) {
+                SB_AppendStr (ParamList, ", ...");
+            } else {
+                SB_AppendStr (ParamList, "...");
+            }
+        }
+    } else {
+        /* K&R style */
+        if (Detailed) {
+            for (I = 0; I < D->ParamCount; ++I) {
+                CHECK (Param != 0 && (Param->Flags & SC_PARAM) != 0);
+                if (I > 0) {
+                    SB_AppendStr (ParamList, ", ");
+                }
+                if (!SymHasAnonName (Param)) {
+                    SB_AppendStr (ParamList, Param->Name);
+                }
+                /* Next argument */
+                Param = Param->NextSym;
+            }
+        }
+        SB_Clear (Buf);
+    }
+    SB_Terminate (ParamList);
+}
+
+
+
 static struct StrBuf* GetFullTypeNameWestEast (struct StrBuf* West, struct StrBuf* East, const Type* T)
 /* Return the name string of the given type split into a western part and an
 ** eastern part.
@@ -1395,34 +1472,12 @@ static struct StrBuf* GetFullTypeNameWestEast (struct StrBuf* West, struct StrBu
 
     } else if (IsTypeFunc (T)) {
 
-        FuncDesc* D             = GetFuncDesc (T);
-        struct StrBuf ParamList = AUTO_STRBUF_INITIALIZER;
+        int             QualCount = 0;
+        struct StrBuf   ParamList = AUTO_STRBUF_INITIALIZER;
+        const FuncDesc* D = GetFuncDesc (T);
 
-        /* First argument */
-        SymEntry* Param = D->SymTab->SymHead;
-        unsigned I;
-        for (I = 0; I < D->ParamCount; ++I) {
-            CHECK (Param != 0 && (Param->Flags & SC_PARAM) != 0);
-            if (I > 0) {
-                SB_AppendStr (&ParamList, ", ");
-            }
-            SB_AppendStr (&ParamList, SB_GetConstBuf (GetFullTypeNameBuf (&Buf, Param->Type)));
-            SB_Clear (&Buf);
-            /* Next argument */
-            Param = Param->NextSym;
-        }
-        if ((D->Flags & FD_VARIADIC) == 0) {
-            if (D->ParamCount == 0 && (D->Flags & FD_EMPTY) == 0) {
-                SB_AppendStr (&ParamList, "void");
-            }
-        } else {
-            if (D->ParamCount > 0) {
-                SB_AppendStr (&ParamList, ", ...");
-            } else {
-                SB_AppendStr (&ParamList, "...");
-            }
-        }
-        SB_Terminate (&ParamList);
+        /* Get the parameter list string */
+        GetParameterList (&ParamList, &Buf, D, 0);
 
         /* Join the existing West and East together */
         if (!SB_IsEmpty (East)) {
@@ -1431,13 +1486,27 @@ static struct StrBuf* GetFullTypeNameWestEast (struct StrBuf* West, struct StrBu
             SB_Clear (East);
         }
 
+        /* Add qualifiers */
+        if ((GetQualifier (T) & ~T_QUAL_NEAR) != T_QUAL_NONE) {
+            QualCount = GetQualifierTypeCodeNameBuf (&Buf, T->C, T_QUAL_NEAR);
+            if (QualCount > 0) {
+                SB_AppendChar (&Buf, ' ');
+            }
+        }
+
         if (SB_IsEmpty (West)) {
-            /* Just use the param list */
-            SB_Printf (West, "(%s)", SB_GetConstBuf (&ParamList));
+            /* Use no parentheses */
+            SB_Terminate (&Buf);
+
+            /* Append the param list to the West */
+            SB_Printf (West, "%s(%s)", SB_GetConstBuf (&Buf), SB_GetConstBuf (&ParamList));
         } else {
-            /* Append the param list to the existing West */
-            SB_Printf (&Buf, "(%s)(%s)", SB_GetConstBuf (West), SB_GetConstBuf (&ParamList));
-            SB_Printf (West, "%s", SB_GetConstBuf (&Buf));
+            /* Append the existing West */
+            SB_Append (&Buf, West);
+            SB_Terminate (&Buf);
+
+            /* Append the param list to the West */
+            SB_Printf (West, "(%s)(%s)", SB_GetConstBuf (&Buf), SB_GetConstBuf (&ParamList));
         }
         SB_Done (&ParamList);
 
@@ -1600,37 +1669,8 @@ void PrintFuncSig (FILE* F, const char* Name, const Type* T)
     /* Get the function descriptor used in definition */
     const FuncDesc* D = GetFuncDefinitionDesc (T);
 
-    /* Get the parameter list string. Start from the first parameter */
-    SymEntry* Param = D->SymTab->SymHead;
-    unsigned I;
-    for (I = 0; I < D->ParamCount; ++I) {
-        CHECK (Param != 0 && (Param->Flags & SC_PARAM) != 0);
-        if (I > 0) {
-            SB_AppendStr (&ParamList, ", ");
-        }
-        if (SymIsRegVar (Param)) {
-            SB_AppendStr (&ParamList, "register ");
-        }
-        if (!SymHasAnonName (Param)) {
-            SB_AppendStr (&Buf, Param->Name);
-        }
-        SB_AppendStr (&ParamList, SB_GetConstBuf (GetFullTypeNameBuf (&Buf, Param->Type)));
-        SB_Clear (&Buf);
-        /* Next argument */
-        Param = Param->NextSym;
-    }
-    if ((D->Flags & FD_VARIADIC) == 0) {
-        if (D->ParamCount == 0 && (D->Flags & FD_EMPTY) == 0) {
-            SB_AppendStr (&ParamList, "void");
-        }
-    } else {
-        if (D->ParamCount > 0) {
-            SB_AppendStr (&ParamList, ", ...");
-        } else {
-            SB_AppendStr (&ParamList, "...");
-        }
-    }
-    SB_Terminate (&ParamList);
+    /* Get the parameter list string */
+    GetParameterList (&ParamList, &Buf, D, 1);
 
     /* Get the function qualifiers */
     if (GetQualifierTypeCodeNameBuf (&Buf, T->C, T_QUAL_NONE) > 0) {
@@ -1641,16 +1681,44 @@ void PrintFuncSig (FILE* F, const char* Name, const Type* T)
 
     /* Get the signature string without the return type */
     SB_Printf (&West, "%s%s (%s)", SB_GetConstBuf (&Buf), Name, SB_GetConstBuf (&ParamList));
-    SB_Done (&Buf);
-    SB_Done (&ParamList);
 
     /* Complete with the return type */
     GetFullTypeNameWestEast (&West, &East, GetFuncReturnType (T));
     SB_Append (&West, &East);
+
+    /* Check if the function is defined in K&R style */
+    if ((D->Flags & FD_OLDSTYLE) != 0 && D->ParamCount > 0) {
+        /* First argument */
+        const SymEntry* Param = D->SymTab->SymHead;
+        unsigned I;
+
+        SB_Clear (&ParamList);
+        SB_Clear (&Buf);
+        for (I = 0; I < D->ParamCount; ++I) {
+            CHECK (Param != 0 && (Param->Flags & SC_PARAM) != 0);
+            SB_AppendChar (&ParamList, ' ');
+            if (SymIsRegVar (Param)) {
+                SB_AppendStr (&ParamList, "register ");
+            }
+            if (!SymHasAnonName (Param)) {
+                SB_AppendStr (&Buf, Param->Name);
+            }
+            SB_AppendStr (&ParamList, SB_GetConstBuf (GetFullTypeNameBuf (&Buf, Param->Type)));
+            SB_AppendChar (&ParamList, ';');
+            SB_Clear (&Buf);
+
+            /* Next argument */
+            Param = Param->NextSym;
+        }
+        SB_Append (&West, &ParamList);
+    }
+
     SB_Terminate (&West);
 
     /* Output */
     fprintf (F, "%s", SB_GetConstBuf (&West));
+    SB_Done (&ParamList);
+    SB_Done (&Buf);
     SB_Done (&East);
     SB_Done (&West);
 }
diff --git a/src/cc65/datatype.h b/src/cc65/datatype.h
index 0890c4d12..8446fb914 100644
--- a/src/cc65/datatype.h
+++ b/src/cc65/datatype.h
@@ -328,7 +328,7 @@ INLINE TypeCode GetQualifier (const Type* T)
 #  define GetQualifier(T)       ((T)->C & T_MASK_QUAL)
 #endif
 
-TypeCode GetUnqualTypeCode (const Type* Type);
+TypeCode GetUnderlyingTypeCode (const Type* Type);
 /* Get the type code of the unqualified underlying type of Type.
 ** Return GetUnqualRawTypeCode (Type) if Type is not scalar.
 */
@@ -359,30 +359,30 @@ INLINE TypeCode GetTypeClass (const Type* T)
 INLINE TypeCode GetTypeRank (const Type* T)
 /* Get the type rank of a type */
 {
-    return (GetUnqualTypeCode (T) & T_MASK_RANK);
+    return (GetUnderlyingTypeCode (T) & T_MASK_RANK);
 }
 #else
-#  define GetTypeRank(T)        (GetUnqualTypeCode (T) & T_MASK_RANK)
+#  define GetTypeRank(T)        (GetUnderlyingTypeCode (T) & T_MASK_RANK)
 #endif
 
 #if defined(HAVE_INLINE)
 INLINE TypeCode GetSignedness (const Type* T)
 /* Get the signedness of a type */
 {
-    return (GetUnqualTypeCode (T) & T_MASK_SIGN);
+    return (GetUnderlyingTypeCode (T) & T_MASK_SIGN);
 }
 #else
-#  define GetSignedness(T)      (GetUnqualTypeCode (T) & T_MASK_SIGN)
+#  define GetSignedness(T)      (GetUnderlyingTypeCode (T) & T_MASK_SIGN)
 #endif
 
 #if defined(HAVE_INLINE)
 INLINE TypeCode GetSizeModifier (const Type* T)
 /* Get the size modifier of a type */
 {
-    return (GetUnqualTypeCode (T) & T_MASK_SIZE);
+    return (GetUnderlyingTypeCode (T) & T_MASK_SIZE);
 }
 #else
-#  define GetSizeModifier(T)    (GetUnqualTypeCode (T) & T_MASK_SIZE)
+#  define GetSizeModifier(T)    (GetUnderlyingTypeCode (T) & T_MASK_SIZE)
 #endif
 
 #if defined(HAVE_INLINE)
@@ -435,8 +435,8 @@ Type* NewPointerTo (const Type* T);
 */
 
 Type* NewBitFieldOf (const Type* T, unsigned BitOffs, unsigned BitWidth);
-/* Return a type string that is "T : BitWidth" aligned on BitOffs. The type
-** string is allocated on the heap and may be freed after use.
+/* Return a type string that is "unqualified T : BitWidth" aligned on BitOffs.
+** The type string is allocated on the heap and may be freed after use.
 */
 
 const Type* AddressOf (const Type* T);
@@ -792,6 +792,12 @@ int IsESUType (const Type* T);
 int IsIncompleteESUType (const Type* T);
 /* Return true if this is an incomplete ESU type */
 
+int IsAnonESUType (const Type* T);
+/* Return true if this is an anonymous ESU type */
+
+int IsAnonStructClass (const Type* T);
+/* Return true if this is an anonymous struct or union type */
+
 int IsPassByRefType (const Type* T);
 /* Return true if this is a large struct/union type that doesn't fit in the
 ** primary. This returns false for the void value extension type since it is
diff --git a/src/cc65/declare.c b/src/cc65/declare.c
index 45d031ff2..e9f519ebe 100644
--- a/src/cc65/declare.c
+++ b/src/cc65/declare.c
@@ -61,7 +61,6 @@
 #include "standard.h"
 #include "staticassert.h"
 #include "symtab.h"
-#include "wrappedcall.h"
 #include "typeconv.h"
 
 
@@ -72,111 +71,29 @@
 
 
 
-static void ParseTypeSpec (DeclSpec* Spec, typespec_t TSFlags, int* SignednessSpecified);
-/* Parse a type specifier */
+static SymEntry* ParseEnumSpec (const char* Name, unsigned* DSFlags);
+/* Parse an enum specifier */
+
+static SymEntry* ParseUnionSpec (const char* Name, unsigned* DSFlags);
+/* Parse a union specifier */
+
+static SymEntry* ParseStructSpec (const char* Name, unsigned* DSFlags);
+/* Parse a struct specifier */
 
 
 
 /*****************************************************************************/
-/*                            Internal functions                             */
+/*                         Type specification parser                         */
 /*****************************************************************************/
 
 
 
-static void OpenBrace (Collection* C, token_t Tok)
-/* Consume an opening parenthesis/bracket/curly brace and remember that */
+static void InitDeclSpec (DeclSpec* Spec)
+/* Initialize the DeclSpec struct for use */
 {
-    switch (Tok) {
-        case TOK_LPAREN: Tok = TOK_RPAREN; break;
-        case TOK_LBRACK: Tok = TOK_RBRACK; break;
-        case TOK_LCURLY: Tok = TOK_RCURLY; break;
-        default:         Internal ("Unexpected opening token: %02X", (unsigned)Tok);
-    }
-    CollAppend (C, (void*)Tok);
-    NextToken ();
-}
-
-
-
-static int CloseBrace (Collection* C, token_t Tok)
-/* Consume a closing parenthesis/bracket/curly brace if it is matched with an
-** opening one and return 0, or bail out and return -1 if it is not matched.
-*/
-{
-    if (CollCount (C) > 0) {
-        token_t LastTok = (token_t)CollLast (C);
-        if (LastTok == Tok) {
-            CollPop (C);
-            NextToken ();
-            return 0;
-        }
-    }
-
-    return -1;
-}
-
-
-
-int SmartErrorSkip (void)
-/* Try some smart error recovery. Skip tokens until either a comma or semicolon
-** that is not enclosed in an open parenthesis/bracket/curly brace, or until an
-** unpaired right parenthesis/bracket/curly brace is reached. Return 0 if it is
-** the former case, or -1 if it is the latter case. */
-{
-    Collection C = AUTO_COLLECTION_INITIALIZER;
-    int Res = 0;
-
-    /* Some fix point tokens that are used for error recovery */
-    static const token_t TokenList[] = { TOK_COMMA, TOK_SEMI,
-        TOK_LPAREN, TOK_RPAREN, TOK_LBRACK, TOK_RBRACK, TOK_LCURLY, TOK_RCURLY };
-
-    while (CurTok.Tok != TOK_CEOF) {
-        SkipTokens (TokenList, sizeof (TokenList) / sizeof (TokenList[0]));
-
-        switch (CurTok.Tok) {
-            case TOK_LPAREN:
-            case TOK_LBRACK:
-            case TOK_LCURLY:
-                OpenBrace (&C, CurTok.Tok);
-                break;
-
-            case TOK_RPAREN:
-            case TOK_RBRACK:
-                if (CloseBrace (&C, CurTok.Tok)) {
-                    Res = -1;
-                    goto ExitPoint;
-                }
-                break;
-
-            case TOK_RCURLY:
-                if (CloseBrace (&C, CurTok.Tok)) {
-                    Res = -1;
-                    goto ExitPoint;
-                } else if (CollCount (&C) == 0) {
-                    goto ExitPoint;
-                }
-                break;
-
-            case TOK_COMMA:
-                if (CollCount (&C) == 0) {
-                    goto ExitPoint;
-                }
-                NextToken ();
-                break;
-
-            case TOK_SEMI:
-            case TOK_CEOF:
-                Res = -1;
-                goto ExitPoint;
-
-            default:
-                Internal ("Unexpected token: %02X", (unsigned)CurTok.Tok);
-        }
-    }
-
-ExitPoint:
-    DoneCollection (&C);
-    return Res;
+    Spec->StorageClass  = 0;
+    Spec->Type[0].C     = T_END;
+    Spec->Flags         = 0;
 }
 
 
@@ -190,7 +107,7 @@ static unsigned ParseOneStorageClass (void)
     switch (CurTok.Tok) {
 
         case TOK_EXTERN:
-            StorageClass = SC_EXTERN | SC_STATIC;
+            StorageClass = SC_EXTERN;
             NextToken ();
             break;
 
@@ -200,7 +117,7 @@ static unsigned ParseOneStorageClass (void)
             break;
 
         case TOK_REGISTER:
-            StorageClass = SC_REGISTER | SC_STATIC;
+            StorageClass = SC_REGISTER;
             NextToken ();
             break;
 
@@ -223,9 +140,37 @@ static unsigned ParseOneStorageClass (void)
 
 
 
+static unsigned ParseOneFuncSpec (void)
+/* Parse and return a function specifier */
+{
+    unsigned FuncSpec = 0;
+
+    /* Check the function specifier given */
+    switch (CurTok.Tok) {
+
+        case TOK_INLINE:
+            FuncSpec = SC_INLINE;
+            NextToken ();
+            break;
+
+        case TOK_NORETURN:
+            FuncSpec = SC_NORETURN;
+            NextToken ();
+            break;
+
+        default:
+            break;
+    }
+
+    return FuncSpec;
+}
+
+
+
 static int ParseStorageClass (DeclSpec* Spec)
 /* Parse storage class specifiers. Return true if a specifier is read even if
-** it was duplicated or disallowed. */
+** it was duplicated or disallowed.
+*/
 {
     /* Check the storage class given */
     unsigned StorageClass = ParseOneStorageClass ();
@@ -235,9 +180,9 @@ static int ParseStorageClass (DeclSpec* Spec)
     }
 
     while (StorageClass != 0) {
-        if (Spec->StorageClass == 0) {
-            Spec->StorageClass = StorageClass;
-        } else if (Spec->StorageClass == StorageClass) {
+        if ((Spec->StorageClass & SC_STORAGEMASK) == 0) {
+            Spec->StorageClass |= StorageClass;
+        } else if ((Spec->StorageClass & SC_STORAGEMASK) == StorageClass) {
             Warning ("Duplicate storage class specifier");
         } else {
             Error ("Conflicting storage class specifier");
@@ -250,6 +195,31 @@ static int ParseStorageClass (DeclSpec* Spec)
 
 
 
+static int ParseFuncSpecClass (DeclSpec* Spec)
+/* Parse function specifiers. Return true if a specifier is read even if it
+** was duplicated or disallowed.
+*/
+{
+    /* Check the function specifiers given */
+    unsigned FuncSpec = ParseOneFuncSpec ();
+
+    if (FuncSpec == 0) {
+        return 0;
+    }
+
+    while (FuncSpec != 0) {
+        if ((Spec->StorageClass & FuncSpec) != 0) {
+            Warning ("Duplicate function specifier");
+        }
+        Spec->StorageClass |= FuncSpec;
+        FuncSpec = ParseOneFuncSpec ();
+    }
+
+    return 1;
+}
+
+
+
 static void DuplicateQualifier (const char* Name)
 /* Print an error message */
 {
@@ -402,7 +372,8 @@ static void OptionalSpecifiers (DeclSpec* Spec, TypeCode* Qualifiers, typespec_t
 */
 {
     TypeCode Q = T_QUAL_NONE;
-    int Continue;
+    int HasStorageClass;
+    int HasFuncSpec;
 
     do {
         /* There may be type qualifiers *before* any storage class specifiers */
@@ -410,11 +381,17 @@ static void OptionalSpecifiers (DeclSpec* Spec, TypeCode* Qualifiers, typespec_t
         *Qualifiers |= Q;
 
         /* Parse storage class specifiers anyway then check */
-        Continue = ParseStorageClass (Spec);
-        if (Continue && (TSFlags & (TS_STORAGE_CLASS_SPEC | TS_FUNCTION_SPEC)) == 0) {
+        HasStorageClass = ParseStorageClass (Spec);
+        if (HasStorageClass && (TSFlags & TS_STORAGE_CLASS_SPEC) == 0) {
             Error ("Unexpected storage class specified");
         }
-    } while (Continue || Q != T_QUAL_NONE);
+
+        /* Parse function specifiers anyway then check */
+        HasFuncSpec = ParseFuncSpecClass (Spec);
+        if (HasFuncSpec && (TSFlags & TS_FUNCTION_SPEC) == 0) {
+            Error ("Unexpected function specifiers");
+        }
+    } while (Q != T_QUAL_NONE || HasStorageClass || HasFuncSpec);
 }
 
 
@@ -430,30 +407,1166 @@ static void OptionalInt (void)
 
 
 
-static void OptionalSigned (int* SignednessSpecified)
+static void OptionalSigned (DeclSpec* Spec)
 /* Eat an optional "signed" token */
 {
     if (CurTok.Tok == TOK_SIGNED) {
         /* Skip it */
         NextToken ();
-        if (SignednessSpecified != NULL) {
-            *SignednessSpecified = 1;
+        if (Spec != NULL) {
+            Spec->Flags |= DS_EXPLICIT_SIGNEDNESS;
         }
     }
 }
 
 
 
-static void InitDeclSpec (DeclSpec* Spec)
-/* Initialize the DeclSpec struct for use */
+static void UseDefaultType (DeclSpec* Spec, typespec_t TSFlags)
+/* Use the default type for the type specifier */
 {
-    Spec->StorageClass  = 0;
-    Spec->Type[0].C     = T_END;
-    Spec->Flags         = 0;
+    if ((TSFlags & TS_MASK_DEFAULT_TYPE) == TS_DEFAULT_TYPE_NONE) {
+        Spec->Flags = (Spec->Flags & ~DS_TYPE_MASK) | DS_NONE;
+        Spec->Type[0].C = T_INT;
+        Spec->Type[1].C = T_END;
+    } else {
+        Spec->Flags = (Spec->Flags & ~DS_TYPE_MASK) | DS_DEF_TYPE;
+        Spec->Type[0].C = T_INT;
+        Spec->Type[1].C = T_END;
+    }
 }
 
 
 
+static void ParseTypeSpec (DeclSpec* Spec, typespec_t TSFlags)
+/* Parse a type specifier.  Store whether one of "signed" or "unsigned" was
+** specified, so bit-fields of unspecified signedness can be treated as
+** unsigned; without special handling, it would be treated as signed.
+*/
+{
+    ident       Ident;
+    SymEntry*   TagEntry;
+    TypeCode    Qualifiers = T_QUAL_NONE;
+
+    /* Assume we have an explicitly specified type */
+    Spec->Flags = (Spec->Flags & ~DS_TYPE_MASK) | DS_EXPLICIT_TYPE;
+
+    /* Read storage specifiers and/or type qualifiers if we have any */
+    OptionalSpecifiers (Spec, &Qualifiers, TSFlags);
+
+    /* Look at the data type */
+    switch (CurTok.Tok) {
+
+        case TOK_VOID:
+            NextToken ();
+            Spec->Type[0].C = T_VOID;
+            Spec->Type[0].A.U = 0;
+            Spec->Type[1].C = T_END;
+            break;
+
+        case TOK_CHAR:
+            NextToken ();
+            Spec->Type[0].C = T_CHAR;
+            Spec->Type[1].C = T_END;
+            break;
+
+        case TOK_LONG:
+            NextToken ();
+            if (CurTok.Tok == TOK_UNSIGNED) {
+                Spec->Flags |= DS_EXPLICIT_SIGNEDNESS;
+                NextToken ();
+                OptionalInt ();
+                Spec->Type[0].C = T_ULONG;
+                Spec->Type[1].C = T_END;
+            } else {
+                OptionalSigned (Spec);
+                OptionalInt ();
+                Spec->Type[0].C = T_LONG;
+                Spec->Type[1].C = T_END;
+            }
+            break;
+
+        case TOK_SHORT:
+            NextToken ();
+            if (CurTok.Tok == TOK_UNSIGNED) {
+                Spec->Flags |= DS_EXPLICIT_SIGNEDNESS;
+                NextToken ();
+                OptionalInt ();
+                Spec->Type[0].C = T_USHORT;
+                Spec->Type[1].C = T_END;
+            } else {
+                OptionalSigned (Spec);
+                OptionalInt ();
+                Spec->Type[0].C = T_SHORT;
+                Spec->Type[1].C = T_END;
+            }
+            break;
+
+        case TOK_INT:
+            NextToken ();
+            Spec->Type[0].C = T_INT;
+            Spec->Type[1].C = T_END;
+            break;
+
+        case TOK_SIGNED:
+            Spec->Flags |= DS_EXPLICIT_SIGNEDNESS;
+            NextToken ();
+            switch (CurTok.Tok) {
+
+                case TOK_CHAR:
+                    NextToken ();
+                    Spec->Type[0].C = T_SCHAR;
+                    Spec->Type[1].C = T_END;
+                    break;
+
+                case TOK_SHORT:
+                    NextToken ();
+                    OptionalInt ();
+                    Spec->Type[0].C = T_SHORT;
+                    Spec->Type[1].C = T_END;
+                    break;
+
+                case TOK_LONG:
+                    NextToken ();
+                    OptionalInt ();
+                    Spec->Type[0].C = T_LONG;
+                    Spec->Type[1].C = T_END;
+                    break;
+
+                case TOK_INT:
+                    NextToken ();
+                    /* FALL THROUGH */
+
+                default:
+                    Spec->Type[0].C = T_INT;
+                    Spec->Type[1].C = T_END;
+                    break;
+            }
+            break;
+
+        case TOK_UNSIGNED:
+            Spec->Flags |= DS_EXPLICIT_SIGNEDNESS;
+            NextToken ();
+            switch (CurTok.Tok) {
+
+                case TOK_CHAR:
+                    NextToken ();
+                    Spec->Type[0].C = T_UCHAR;
+                    Spec->Type[1].C = T_END;
+                    break;
+
+                case TOK_SHORT:
+                    NextToken ();
+                    OptionalInt ();
+                    Spec->Type[0].C = T_USHORT;
+                    Spec->Type[1].C = T_END;
+                    break;
+
+                case TOK_LONG:
+                    NextToken ();
+                    OptionalInt ();
+                    Spec->Type[0].C = T_ULONG;
+                    Spec->Type[1].C = T_END;
+                    break;
+
+                case TOK_INT:
+                    NextToken ();
+                    /* FALL THROUGH */
+
+                default:
+                    Spec->Type[0].C = T_UINT;
+                    Spec->Type[1].C = T_END;
+                    break;
+            }
+            break;
+
+        case TOK_FLOAT:
+            NextToken ();
+            Spec->Type[0].C = T_FLOAT;
+            Spec->Type[1].C = T_END;
+            break;
+
+        case TOK_DOUBLE:
+            NextToken ();
+            Spec->Type[0].C = T_DOUBLE;
+            Spec->Type[1].C = T_END;
+            break;
+
+        case TOK_UNION:
+            NextToken ();
+            /* Remember we have an extra type decl */
+            Spec->Flags |= DS_EXTRA_TYPE;
+            /* Check for tag name */
+            if (CurTok.Tok == TOK_IDENT) {
+                strcpy (Ident, CurTok.Ident);
+                NextToken ();
+            } else if (CurTok.Tok == TOK_LCURLY) {
+                AnonName (Ident, "union");
+            } else {
+                Error ("Tag name identifier or '{' expected");
+                UseDefaultType (Spec, TS_DEFAULT_TYPE_NONE);
+                break;
+            }
+            /* Declare the union in the current scope */
+            TagEntry = ParseUnionSpec (Ident, &Spec->Flags);
+            /* Encode the union entry into the type */
+            Spec->Type[0].C = T_UNION;
+            SetESUTagSym (Spec->Type, TagEntry);
+            Spec->Type[1].C = T_END;
+            break;
+
+        case TOK_STRUCT:
+            NextToken ();
+            /* Remember we have an extra type decl */
+            Spec->Flags |= DS_EXTRA_TYPE;
+            /* Check for tag name */
+            if (CurTok.Tok == TOK_IDENT) {
+                strcpy (Ident, CurTok.Ident);
+                NextToken ();
+            } else if (CurTok.Tok == TOK_LCURLY) {
+                AnonName (Ident, "struct");
+            } else {
+                Error ("Tag name identifier or '{' expected");
+                UseDefaultType (Spec, TS_DEFAULT_TYPE_NONE);
+                break;
+            }
+            /* Declare the struct in the current scope */
+            TagEntry = ParseStructSpec (Ident, &Spec->Flags);
+            /* Encode the struct entry into the type */
+            Spec->Type[0].C = T_STRUCT;
+            SetESUTagSym (Spec->Type, TagEntry);
+            Spec->Type[1].C = T_END;
+            break;
+
+        case TOK_ENUM:
+            NextToken ();
+            /* Remember we have an extra type decl */
+            Spec->Flags |= DS_EXTRA_TYPE;
+            /* Check for tag name */
+            if (CurTok.Tok == TOK_IDENT) {
+                strcpy (Ident, CurTok.Ident);
+                NextToken ();
+            } else if (CurTok.Tok == TOK_LCURLY) {
+                AnonName (Ident, "enum");
+            } else {
+                Error ("Tag name identifier or '{' expected");
+                UseDefaultType (Spec, TS_DEFAULT_TYPE_NONE);
+                break;
+            }
+            /* Parse the enum decl */
+            TagEntry = ParseEnumSpec (Ident, &Spec->Flags);
+            /* Encode the enum entry into the type */
+            Spec->Type[0].C |= T_ENUM;
+            SetESUTagSym (Spec->Type, TagEntry);
+            Spec->Type[1].C = T_END;
+            /* The signedness of enums is determined by the type, so say this is specified to avoid
+            ** the int -> unsigned int handling for plain int bit-fields in AddBitField.
+            */
+            Spec->Flags |= DS_EXPLICIT_SIGNEDNESS;
+            break;
+
+        case TOK_IDENT:
+            /* This could be a label */
+            if (NextTok.Tok != TOK_COLON || GetLexicalLevel () == LEX_LEVEL_STRUCT) {
+                TagEntry = FindSym (CurTok.Ident);
+                if (TagEntry && SymIsTypeDef (TagEntry)) {
+                    /* It's a typedef */
+                    NextToken ();
+                    TypeCopy (Spec->Type, TagEntry->Type);
+                    /* If it's a typedef, we should actually use whether the signedness was
+                    ** specified on the typedef, but that information has been lost.  Treat the
+                    ** signedness as being specified to work around the ICE in #1267.
+                    ** Unforunately, this will cause plain int bit-fields defined via typedefs
+                    ** to be treated as signed rather than unsigned.
+                    */
+                    Spec->Flags |= DS_EXPLICIT_SIGNEDNESS;
+                    break;
+                } else if ((TSFlags & TS_MASK_DEFAULT_TYPE) == TS_DEFAULT_TYPE_NONE) {
+                    /* Treat this identifier as an unknown type */
+                    Error ("Unknown type name '%s'", CurTok.Ident);
+                    TypeCopy (Spec->Type, type_int);
+                    NextToken ();
+                    break;
+                }
+            } else {
+                /* This is a label. Use the default type flag to end the loop
+                ** in DeclareLocals. The type code used here doesn't matter as
+                ** long as it has no qualifiers.
+                */
+                UseDefaultType (Spec, TS_DEFAULT_TYPE_INT);
+                break;
+            }
+            /* FALL THROUGH */
+
+        default:
+            UseDefaultType (Spec, TSFlags);
+            break;
+    }
+
+    /* There may also be specifiers/qualifiers *after* the initial type */
+    OptionalSpecifiers (Spec, &Qualifiers, TSFlags);
+    Spec->Type[0].C |= Qualifiers;
+}
+
+
+
+/*****************************************************************************/
+/*                         Enum/struct/union parser                          */
+/*****************************************************************************/
+
+
+
+static SymEntry* ForwardESU (const char* Name, unsigned Flags, unsigned* DSFlags)
+/* Handle an enum, struct or union forward declaration */
+{
+    /* Try to find an enum/struct/union with the given name. If there is none,
+    ** insert a forward declaration into the current lexical level.
+    */
+    SymEntry* TagEntry = FindTagSym (Name);
+    if (TagEntry == 0) {
+        if ((Flags & SC_TYPEMASK) != SC_ENUM) {
+            TagEntry = AddStructSym (Name, Flags, 0, 0, DSFlags);
+        } else {
+            TagEntry = AddEnumSym (Name, Flags, 0, 0, DSFlags);
+        }
+    } else if ((TagEntry->Flags & SC_TYPEMASK) != (Flags & SC_TYPEMASK)) {
+        /* Already defined, but not the same type class */
+        Error ("Symbol '%s' is already different kind", Name);
+    }
+    return TagEntry;
+}
+
+
+
+static const Type* GetEnumeratorType (long Min, unsigned long Max, int Signed)
+/* GitHub #1093 - We use unsigned types to save spaces whenever possible.
+** If both the signed and unsigned integer types of the same minimum size
+** capable of representing all values of the enum, we prefer the unsigned
+** one.
+** Return 0 if impossible to represent Min and Max as the same integer type.
+*/
+{
+    const Type* Underlying = type_int;      /* default type */
+
+    /* Change the underlying type if necessary */
+    if (Min < 0 || Signed) {
+        /* We can't use unsigned types if there are any negative values */
+        if (Max > (unsigned long)INT32_MAX) {
+            /* No way to represent both Min and Max as the same integer type */
+            Underlying = 0;
+        } else if (Min < INT16_MIN || Max > (unsigned long)INT16_MAX) {
+            Underlying = type_long;
+        } else if (Min < INT8_MIN || Max > (unsigned long)INT8_MAX) {
+            Underlying = type_int;
+        } else {
+            Underlying = type_schar;
+        }
+    } else {
+        if (Max > UINT16_MAX) {
+            Underlying = type_ulong;
+        } else if (Max > UINT8_MAX) {
+            Underlying = type_uint;
+        } else {
+            Underlying = type_uchar;
+        }
+    }
+
+    return Underlying;
+}
+
+
+
+static SymEntry* ParseEnumSpec (const char* Name, unsigned* DSFlags)
+/* Parse an enum specifier */
+{
+    SymTable*       FieldTab;
+    long            EnumVal;
+    int             IsSigned;
+    int             IsIncremented;
+    ident           Ident;
+    long            MinConstant = 0;
+    unsigned long   MaxConstant = 0;
+    const Type*     NewType     = 0;        /* new member type */
+    const Type*     MemberType  = type_int; /* default member type */
+    unsigned        Flags       = 0;
+    unsigned        PrevErrorCount = ErrorCount;
+
+
+    if (CurTok.Tok != TOK_LCURLY) {
+        /* Just a forward definition */
+        return ForwardESU (Name, SC_ENUM, DSFlags);
+    }
+
+    /* Add a forward declaration for the enum tag in the current lexical level */
+    AddEnumSym (Name, 0, 0, 0, DSFlags);
+
+    /* Skip the opening curly brace */
+    NextToken ();
+
+    /* Read the enum tags */
+    EnumVal = -1L;
+    while (CurTok.Tok != TOK_RCURLY) {
+
+        /* We expect an identifier */
+        if (CurTok.Tok != TOK_IDENT) {
+            Error ("Identifier expected for enumerator declarator");
+            /* Avoid excessive errors */
+            NextToken ();
+            continue;
+        }
+
+        /* Remember the identifier and skip it */
+        strcpy (Ident, CurTok.Ident);
+        NextToken ();
+
+        /* Check for an assigned value */
+        if (CurTok.Tok == TOK_ASSIGN) {
+
+            NextToken ();
+            ExprDesc Expr = NoCodeConstAbsIntExpr (hie1);
+            EnumVal       = Expr.IVal;
+            MemberType    = Expr.Type;
+            IsSigned      = IsSignSigned (MemberType);
+            IsIncremented = 0;
+
+        } else {
+
+            /* Defaulted with the same signedness as the previous member's */
+            IsSigned = IsSignSigned (MemberType) &&
+                       (unsigned long)EnumVal != GetIntegerTypeMax (MemberType);
+
+            /* Enumerate by adding one to the previous value */
+            EnumVal = (long)(((unsigned long)EnumVal + 1UL) & 0xFFFFFFFFUL);
+
+            if (GetUnqualRawTypeCode (MemberType) == T_ULONG && EnumVal == 0) {
+                /* Error since the new value cannot be represented in the
+                ** largest unsigned integer type supported by cc65 for enum.
+                */
+                Error ("Enumerator '%s' overflows the range of '%s'",
+                       Ident,
+                       GetBasicTypeName (type_ulong));
+            }
+
+            IsIncremented = 1;
+        }
+
+        /* Track down the min/max values and evaluate the type of EnumVal
+        ** using GetEnumeratorType in a tricky way.
+        */
+        if (!IsSigned || EnumVal >= 0) {
+            if ((unsigned long)EnumVal > MaxConstant) {
+                MaxConstant = (unsigned long)EnumVal;
+            }
+            NewType = GetEnumeratorType (0, EnumVal, IsSigned);
+        } else {
+            if (EnumVal < MinConstant) {
+                MinConstant = EnumVal;
+            }
+            NewType = GetEnumeratorType (EnumVal, 0, 1);
+        }
+
+        /* GetEnumeratorType above should never fail, but just in case */
+        if (NewType == 0) {
+            Internal ("Unexpected failure with GetEnumeratorType: %lx", EnumVal);
+            NewType = type_ulong;
+        } else if (SizeOf (NewType) < SizeOf (type_int)) {
+            /* Integer constants are not shorter than int */
+            NewType = type_int;
+        }
+
+        /* Warn if the incremented value exceeds the range of the previous
+        ** type.
+        */
+        if (PrevErrorCount == ErrorCount    &&
+            IsIncremented                   &&
+            (!IsSigned || EnumVal >= 0)     &&
+            NewType->C != GetUnqualRawTypeCode (MemberType)) {
+            /* The possible overflow here can only be when EnumVal > 0 */
+            Warning ("Enumerator '%s' (value = %lu) implies type '%s'",
+                     Ident,
+                     (unsigned long)EnumVal,
+                     GetBasicTypeName (NewType));
+        }
+
+        /* Warn if the value exceeds range of 'int' in standard mode */
+        if (IS_Get (&Standard) != STD_CC65 && NewType->C != T_INT) {
+            if (!IsSigned || EnumVal >= 0) {
+                Warning ("ISO C restricts enumerator values to range of 'int'\n"
+                         "\tEnumerator '%s' (value = %lu) is too large",
+                         Ident,
+                         (unsigned long)EnumVal);
+            } else {
+                Warning ("ISO C restricts enumerator values to range of 'int'\n"
+                         "\tEnumerator '%s' (value = %ld) is too small",
+                         Ident,
+                         EnumVal);
+            }
+        }
+
+        /* Add an entry of the enumerator to the symbol table */
+        AddConstSym (Ident, NewType, SC_DEF | SC_ENUMERATOR, EnumVal);
+
+        /* Use this type for following members */
+        MemberType = NewType;
+
+        /* Check for end of definition */
+        if (CurTok.Tok != TOK_COMMA) {
+            break;
+        }
+        NextToken ();
+    }
+    ConsumeRCurly ();
+
+    /* Check if there have been any members. Error if none */
+    if (NewType == 0) {
+        Error ("Empty enum is invalid");
+    }
+
+    /* This evaluates the underlying type of the whole enum */
+    MemberType = GetEnumeratorType (MinConstant, MaxConstant, 0);
+    if (MemberType == 0) {
+        /* It is very likely that the program is wrong */
+        Error ("Enumeration values cannot be represented all as 'long'\n"
+               "\tMin enumerator value = %ld, Max enumerator value = %lu",
+               MinConstant, MaxConstant);
+
+        /* Avoid more errors */
+        MemberType = type_long;
+    }
+
+    FieldTab = GetSymTab ();
+
+    /* Return a fictitious symbol if errors occurred during parsing */
+    if (PrevErrorCount != ErrorCount) {
+        Flags |= SC_FICTITIOUS;
+    }
+
+    return AddEnumSym (Name, SC_DEF | Flags, MemberType, FieldTab, DSFlags);
+}
+
+
+
+static int ParseFieldWidth (Declarator* D)
+/* Parse an optional field width. Returns -1 if no field width is specified,
+** otherwise the width of the field.
+*/
+{
+    ExprDesc Expr;
+
+    if (CurTok.Tok != TOK_COLON) {
+        /* No bit-field declaration */
+        return -1;
+    }
+
+    if (!IsClassInt (D->Type)) {
+        /* Only integer types may be used for bit-fields */
+        Error ("Bit-field has invalid type '%s', must be integral",
+               GetBasicTypeName (D->Type));
+
+        /* Avoid a diagnostic storm by giving the bit-field the widest valid
+        ** signed type, and continuing to parse.
+        */
+        D->Type[0].C = T_LONG;
+    }
+
+    if (IsTypeEnum (D->Type) && IsIncompleteESUType (D->Type)) {
+        /* If the type is an enum, it must be complete */
+        Error ("Bit-field has incomplete type '%s'",
+               GetFullTypeName (D->Type));
+
+        /* Avoid a diagnostic storm */
+        D->Type[0].C = T_LONG;
+    }
+
+    /* We currently support integral types up to long */
+    if (SizeOf (D->Type) > SizeOf (type_ulong)) {
+        /* Only long-sized or smaller types may be used for bit-fields, for now */
+        Error ("cc65 currently supports only long-sized and smaller bit-field types");
+
+        /* Avoid a diagnostic storm */
+        D->Type[0].C = T_LONG;
+    }
+
+    /* Read the width */
+    NextToken ();
+    Expr = NoCodeConstAbsIntExpr (hie1);
+
+    if (Expr.IVal < 0) {
+        Error ("Negative width in bit-field");
+        return -1;
+    }
+    if (Expr.IVal > (long)(SizeOf (D->Type) * CHAR_BITS)) {
+        Error ("Width of bit-field exceeds its type");
+        return -1;
+    }
+    if (Expr.IVal == 0 && D->Ident[0] != '\0') {
+        Error ("Zero width for named bit-field");
+        return -1;
+    }
+
+    /* Return the field width */
+    return (int) Expr.IVal;
+}
+
+
+
+static unsigned PadWithBitField (unsigned StructSize, unsigned BitOffs)
+/* Pad the current struct with an anonymous bit-field aligned to the next byte.
+** Return how many bits are used to pad.
+*/
+{
+    /* MSVC complains about unary negation of unsigned,
+    ** so it has been rewritten as subtraction.
+    */
+    unsigned PaddingBits = (0 - BitOffs) % CHAR_BITS;
+
+    /* We need an anonymous name */
+    ident Ident;
+    AnonName (Ident, "bit-field");
+
+    /* Add an anonymous bit-field that aligns to the next
+    ** byte.
+    */
+    AddBitField (Ident, type_uchar, StructSize, BitOffs, PaddingBits,
+                 /*SignednessSpecified=*/1);
+
+    return PaddingBits;
+}
+
+
+
+static unsigned AliasAnonStructFields (const Declarator* D, SymEntry* Anon)
+/* Create alias fields from an anon union/struct in the current lexical level.
+** The function returns the count of created aliases.
+*/
+{
+    unsigned Count = 0;
+    SymEntry* Field;
+    SymEntry* Alias;
+
+    /* Get the symbol table containing the fields. If it is empty, there has
+    ** been an error before, so bail out.
+    */
+    SymTable* Tab = GetESUTagSym (D->Type)->V.S.SymTab;
+    if (Tab == 0) {
+        /* Incomplete definition - has been flagged before */
+        return 0;
+    }
+
+    /* Get a pointer to the list of symbols. Then walk the list adding copies
+    ** of the embedded struct to the current level.
+    */
+    Field = Tab->SymHead;
+    while (Field) {
+
+        /* Enter an alias of this symbol */
+        if (!IsAnonName (Field->Name)) {
+            Alias = AddLocalSym (Field->Name, Field->Type, SC_STRUCTFIELD|SC_ALIAS, 0);
+            Alias->V.A.Field = Field;
+            Alias->V.A.Offs  = Anon->V.Offs + Field->V.Offs;
+            ++Count;
+        }
+
+        /* Currently, there can not be any attributes, but if there will be
+        ** some in the future, we want to know this.
+        */
+        CHECK (Field->Attr == 0);
+
+        /* Next entry */
+        Field = Field->NextSym;
+    }
+
+    /* Return the count of created aliases */
+    return Count;
+}
+
+
+
+static SymEntry* ParseUnionSpec (const char* Name, unsigned* DSFlags)
+/* Parse a union specifier */
+{
+
+    unsigned  UnionSize;
+    unsigned  FieldSize;
+    int       FieldWidth;       /* Width in bits, -1 if not a bit-field */
+    SymTable* FieldTab;
+    SymEntry* UnionTagEntry;
+    SymEntry* Field;
+    unsigned  Flags = 0;
+    unsigned  PrevErrorCount = ErrorCount;
+
+
+    if (CurTok.Tok != TOK_LCURLY) {
+        /* Just a forward declaration */
+        return ForwardESU (Name, SC_UNION, DSFlags);
+    }
+
+    /* Add a forward declaration for the union tag in the current lexical level */
+    UnionTagEntry = AddStructSym (Name, SC_UNION, 0, 0, DSFlags);
+
+    UnionTagEntry->V.S.ACount = 0;
+
+    /* Skip the curly brace */
+    NextToken ();
+
+    /* Enter a new lexical level for the struct */
+    EnterStructLevel ();
+
+    /* Parse union fields */
+    UnionSize = 0;
+    while (CurTok.Tok != TOK_RCURLY && CurTok.Tok != TOK_CEOF) {
+
+        /* Get the type of the entry */
+        DeclSpec    Spec;
+        int         NeedClean = 0;
+
+        /* Check for extra semicolons */
+        if (CurTok.Tok == TOK_SEMI) {
+            /* TODO: warn on this if we have a pedantic mode */
+            NextToken ();
+            continue;
+        }
+
+        /* Check for a _Static_assert */
+        if (CurTok.Tok == TOK_STATIC_ASSERT) {
+            ParseStaticAssert ();
+            continue;
+        }
+
+        InitDeclSpec (&Spec);
+        ParseTypeSpec (&Spec, TS_DEFAULT_TYPE_NONE);
+
+        /* Check if this is only a type declaration */
+        if (CurTok.Tok == TOK_SEMI &&
+            !(IS_Get (&Standard) >= STD_CC65 && IsAnonStructClass (Spec.Type))) {
+            CheckEmptyDecl (&Spec);
+            NextToken ();
+            continue;
+        }
+
+        /* If we haven't got a type specifier yet, something must be wrong */
+        if ((Spec.Flags & DS_TYPE_MASK) == DS_NONE) {
+            /* Avoid extra errors if it was a failed type specifier */
+            if ((Spec.Flags & DS_EXTRA_TYPE) == 0) {
+                Error ("Declaration specifier expected");
+            }
+            NeedClean = -1;
+            goto EndOfDecl;
+        }
+
+        /* Allow anonymous bit-fields */
+        Spec.Flags |= DS_ALLOW_BITFIELD;
+
+        /* Read fields with this type */
+        while (1) {
+
+            Declarator Decl;
+
+            /* Get type and name of the struct field */
+            NeedClean = ParseDecl (&Spec, &Decl, DM_IDENT_OR_EMPTY);
+
+            /* Bail out if there are errors */
+            if (NeedClean <= 0) {
+                break;
+            }
+
+            /* Check for a bit-field declaration */
+            FieldWidth = ParseFieldWidth (&Decl);
+
+            /* Check for fields without names */
+            if (Decl.Ident[0] == '\0') {
+                if (FieldWidth < 0) {
+                    /* In cc65 mode, we allow anonymous structs/unions within
+                    ** a union.
+                    */
+                    AnonFieldName (Decl.Ident, GetBasicTypeName (Decl.Type), UnionTagEntry->V.S.ACount);
+
+                    /* Ignore CVR qualifiers */
+                    if (IsQualConst (Decl.Type) || IsQualVolatile (Decl.Type) || IsQualRestrict (Decl.Type)) {
+                        Warning ("Anonymous %s qualifiers are ignored", GetBasicTypeName (Decl.Type));
+                        Decl.Type[0].C &= ~T_QUAL_CVR;
+                    }
+                } else if (FieldWidth > 0) {
+                    /* A bit-field without a name will get an anonymous one */
+                    AnonName (Decl.Ident, "bit-field");
+                }
+            } else if (IsIncompleteType (Decl.Type)) {
+                Error ("Field '%s' has incomplete type '%s'",
+                       Decl.Ident,
+                       GetFullTypeName (Decl.Type));
+            }
+
+            /* Check for const types */
+            if (IsQualConst (Decl.Type)) {
+                Flags |= SC_HAVECONST;
+            }
+
+            /* Ignore zero sized bit fields in a union */
+            if (FieldWidth == 0) {
+                goto NextMember;
+            }
+
+            /* Handle sizes */
+            FieldSize = SizeOf (Decl.Type);
+            if (FieldSize > UnionSize) {
+                UnionSize = FieldSize;
+            }
+
+            /* Add a field entry to the table */
+            if (FieldWidth > 0) {
+                /* For a union, allocate space for the type specified by the
+                ** bit-field.
+                */
+                AddBitField (Decl.Ident, Decl.Type, 0, 0, FieldWidth,
+                             (Spec.Flags & DS_EXPLICIT_SIGNEDNESS) != 0);
+            } else if (Decl.Ident[0] != '\0') {
+                /* Add the new field to the table */
+                Field = AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, 0);
+
+                /* Check the new field for certain kinds of members */
+                if (IsClassStruct (Decl.Type)) {
+                    SymEntry* TagEntry = GetESUTagSym (Decl.Type);
+
+                    /* Alias the fields of the anonymous member on the current level */
+                    if (IsAnonName (Decl.Ident)) {
+                        Field->V.A.ANumber = UnionTagEntry->V.S.ACount++;
+                        AliasAnonStructFields (&Decl, Field);
+                    }
+
+                    /* Check if the field itself has a flexible array member */
+                    if (TagEntry && SymHasFlexibleArrayMember (TagEntry)) {
+                        Field->Flags |= SC_HAVEFAM;
+                        Flags        |= SC_HAVEFAM;
+                    }
+
+                    /* Check if the field itself has a const member */
+                    if (TagEntry && SymHasConstMember (TagEntry)) {
+                        Field->Flags |= SC_HAVECONST;
+                        Flags        |= SC_HAVECONST;
+                    }
+                }
+            }
+
+NextMember:
+            /* Check for end of declaration list */
+            if (CurTok.Tok != TOK_COMMA) {
+                break;
+            }
+            Spec.Flags |= DS_NO_EMPTY_DECL;
+            NextToken ();
+        }
+
+EndOfDecl:
+        if (NeedClean > 0) {
+            /* Must be followed by a semicolon */
+            if (ConsumeSemi ()) {
+                NeedClean = 0;
+            } else {
+                NeedClean = -1;
+            }
+        }
+
+        /* Try some smart error recovery */
+        if (NeedClean < 0) {
+            SmartErrorSkip (1);
+        }
+    }
+
+    /* Skip the closing brace */
+    NextToken ();
+
+    /* Remember the symbol table and leave the struct level */
+    FieldTab = GetFieldSymTab ();
+    LeaveStructLevel ();
+
+    /* Return a fictitious symbol if errors occurred during parsing */
+    if (PrevErrorCount != ErrorCount) {
+        Flags |= SC_FICTITIOUS;
+    }
+
+    /* Make a real entry from the forward decl and return it */
+    return AddStructSym (Name, SC_UNION | SC_DEF | Flags, UnionSize, FieldTab, DSFlags);
+}
+
+
+
+static SymEntry* ParseStructSpec (const char* Name, unsigned* DSFlags)
+/* Parse a struct specifier */
+{
+
+    unsigned  StructSize;
+    int       FlexibleMember;
+    unsigned  BitOffs;          /* Bit offset for bit-fields */
+    int       FieldWidth;       /* Width in bits, -1 if not a bit-field */
+    SymTable* FieldTab;
+    SymEntry* StructTagEntry;
+    SymEntry* Field;
+    unsigned  Flags = 0;
+    unsigned  PrevErrorCount = ErrorCount;
+
+
+    if (CurTok.Tok != TOK_LCURLY) {
+        /* Just a forward declaration */
+        return ForwardESU (Name, SC_STRUCT, DSFlags);
+    }
+
+    /* Add a forward declaration for the struct tag in the current lexical level */
+    StructTagEntry = AddStructSym (Name, SC_STRUCT, 0, 0, DSFlags);
+
+    StructTagEntry->V.S.ACount = 0;
+
+    /* Skip the curly brace */
+    NextToken ();
+
+    /* Enter a new lexical level for the struct */
+    EnterStructLevel ();
+
+    /* Parse struct fields */
+    FlexibleMember = 0;
+    StructSize     = 0;
+    BitOffs        = 0;
+    while (CurTok.Tok != TOK_RCURLY && CurTok.Tok != TOK_CEOF) {
+
+        /* Get the type of the entry */
+        DeclSpec    Spec;
+        int         NeedClean = 0;
+
+        /* Check for extra semicolons */
+        if (CurTok.Tok == TOK_SEMI) {
+            /* TODO: warn on this if we have a pedantic mode */
+            NextToken ();
+            continue;
+        }
+
+        /* Check for a _Static_assert */
+        if (CurTok.Tok == TOK_STATIC_ASSERT) {
+            ParseStaticAssert ();
+            continue;
+        }
+
+        InitDeclSpec (&Spec);
+        ParseTypeSpec (&Spec, TS_DEFAULT_TYPE_NONE);
+
+        /* Check if this is only a type declaration */
+        if (CurTok.Tok == TOK_SEMI &&
+            !(IS_Get (&Standard) >= STD_CC65 && IsAnonStructClass (Spec.Type))) {
+            CheckEmptyDecl (&Spec);
+            NextToken ();
+            continue;
+        }
+
+        /* If we haven't got a type specifier yet, something must be wrong */
+        if ((Spec.Flags & DS_TYPE_MASK) == DS_NONE) {
+            /* Avoid extra errors if it was a failed type specifier */
+            if ((Spec.Flags & DS_EXTRA_TYPE) == 0) {
+                Error ("Declaration specifier expected");
+            }
+            NeedClean = -1;
+            goto EndOfDecl;
+        }
+
+        /* Allow anonymous bit-fields */
+        Spec.Flags |= DS_ALLOW_BITFIELD;
+
+        /* Read fields with this type */
+        while (1) {
+
+            Declarator Decl;
+
+            /* If we had a flexible array member before, no other fields can
+            ** follow.
+            */
+            if (FlexibleMember) {
+                Error ("Flexible array member must be last field");
+                FlexibleMember = 0;     /* Avoid further errors */
+            }
+
+            /* Get type and name of the struct field */
+            NeedClean = ParseDecl (&Spec, &Decl, DM_IDENT_OR_EMPTY);
+
+            /* Bail out if there are errors */
+            if (NeedClean <= 0) {
+                break;
+            }
+
+            /* Check for a bit-field declaration */
+            FieldWidth = ParseFieldWidth (&Decl);
+
+            /* If this is not a bit field, or the bit field is too large for
+            ** the remainder of the allocated unit, or we have a bit field
+            ** with width zero, align the struct to the next member by adding
+            ** a member with an anonymous name.
+            */
+            if (BitOffs > 0) {
+                if (FieldWidth <= 0 ||
+                    (BitOffs + FieldWidth) > CHAR_BITS * SizeOf (Decl.Type)) {
+                    /* Add an anonymous bit-field that aligns to the next
+                    ** byte.
+                    */
+                    unsigned PaddingBits = PadWithBitField (StructSize, BitOffs);
+
+                    /* No bits left */
+                    StructSize += (BitOffs + PaddingBits) / CHAR_BITS;
+                    BitOffs = 0;
+                }
+            }
+
+            /* Check for fields without names */
+            if (Decl.Ident[0] == '\0') {
+                if (FieldWidth < 0) {
+                    /* In cc65 mode, we allow anonymous structs/unions within
+                    ** a struct.
+                    */
+                    AnonFieldName (Decl.Ident, GetBasicTypeName (Decl.Type), StructTagEntry->V.S.ACount);
+
+                    /* Ignore CVR qualifiers */
+                    if (IsQualConst (Decl.Type) || IsQualVolatile (Decl.Type) || IsQualRestrict (Decl.Type)) {
+                        Warning ("Anonymous %s qualifiers are ignored", GetBasicTypeName (Decl.Type));
+                        Decl.Type[0].C &= ~T_QUAL_CVR;
+                    }
+                } else if (FieldWidth > 0) {
+                    /* A bit-field without a name will get an anonymous one */
+                    AnonName (Decl.Ident, "bit-field");
+                }
+            } else {
+                /* Check if this field is a flexible array member, and
+                ** calculate the size of the field.
+                */
+                if (IsTypeArray (Decl.Type) && GetElementCount (Decl.Type) == UNSPECIFIED) {
+                    /* Array with unspecified size */
+                    if (StructSize == 0) {
+                        Error ("Flexible array member cannot be first struct field");
+                    }
+                    FlexibleMember = 1;
+                    Flags |= SC_HAVEFAM;
+
+                    /* Assume zero for size calculations */
+                    SetElementCount (Decl.Type, FLEXIBLE);
+                }
+
+                if (IsIncompleteType (Decl.Type)) {
+                    Error ("Field '%s' has incomplete type '%s'",
+                           Decl.Ident,
+                           GetFullTypeName (Decl.Type));
+                }
+            }
+
+            /* Check for const types */
+            if (IsQualConst (Decl.Type)) {
+                Flags |= SC_HAVECONST;
+            }
+
+            /* Apart from the above, a bit field with width 0 is not processed
+            ** further.
+            */
+            if (FieldWidth == 0) {
+                goto NextMember;
+            }
+
+            /* Add a field entry to the table */
+            if (FieldWidth > 0) {
+                /* Full bytes have already been added to the StructSize,
+                ** which is passed to the offset of AddBitField.  BitOffs
+                ** is always within a char, which simplifies handling the
+                ** bit-field as a char type in expressions.
+                */
+                CHECK (BitOffs < CHAR_BITS);
+                AddBitField (Decl.Ident, Decl.Type, StructSize, BitOffs, FieldWidth,
+                             (Spec.Flags & DS_EXPLICIT_SIGNEDNESS) != 0);
+                BitOffs += FieldWidth;
+                CHECK (BitOffs <= CHAR_BITS * SizeOf (Decl.Type));
+                /* Add any full bytes to the struct size */
+                StructSize += BitOffs / CHAR_BITS;
+                BitOffs %= CHAR_BITS;
+            } else if (Decl.Ident[0] != '\0') {
+                /* Add the new field to the table */
+                Field = AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, StructSize);
+
+                /* Check the new field for certain kinds of members */
+                if (IsClassStruct (Decl.Type)) {
+                    SymEntry* TagEntry = GetESUTagSym (Decl.Type);
+
+                    /* Alias the fields of the anonymous member on the current level */
+                    if (IsAnonName (Decl.Ident)) {
+                        Field->V.A.ANumber = StructTagEntry->V.S.ACount++;
+                        AliasAnonStructFields (&Decl, Field);
+                    }
+
+                    /* Check if the field itself has a flexible array member */
+                    if (TagEntry && SymHasFlexibleArrayMember (TagEntry)) {
+                        Field->Flags |= SC_HAVEFAM;
+                        Flags        |= SC_HAVEFAM;
+                        Error ("Invalid use of struct with flexible array member");
+                    }
+
+                    /* Check if the field itself has a const member */
+                    if (TagEntry && SymHasConstMember (TagEntry)) {
+                        Field->Flags |= SC_HAVECONST;
+                        Flags        |= SC_HAVECONST;
+                    }
+                }
+
+                if (!FlexibleMember) {
+                    StructSize += SizeOf (Decl.Type);
+                }
+            }
+
+NextMember:
+            /* Check for end of declaration list */
+            if (CurTok.Tok != TOK_COMMA) {
+                break;
+            }
+            Spec.Flags |= DS_NO_EMPTY_DECL;
+            NextToken ();
+        }
+
+EndOfDecl:
+        if (NeedClean > 0) {
+            /* Must be followed by a semicolon */
+            if (ConsumeSemi ()) {
+                NeedClean = 0;
+            } else {
+                NeedClean = -1;
+            }
+        }
+
+        /* Try some smart error recovery */
+        if (NeedClean < 0) {
+            SmartErrorSkip (1);
+        }
+    }
+
+    if (BitOffs > 0) {
+        /* If we have bits from bit-fields left, pad the struct to next byte */
+        unsigned PaddingBits = PadWithBitField (StructSize, BitOffs);
+
+        /* No bits left */
+        StructSize += (BitOffs + PaddingBits) / CHAR_BITS;
+    }
+
+    /* Skip the closing brace */
+    NextToken ();
+
+    /* Remember the symbol table and leave the struct level */
+    FieldTab = GetFieldSymTab ();
+    LeaveStructLevel ();
+
+    /* Return a fictitious symbol if errors occurred during parsing */
+    if (PrevErrorCount != ErrorCount) {
+        Flags |= SC_FICTITIOUS;
+    }
+
+    /* Make a real entry from the forward decl and return it */
+    return AddStructSym (Name, SC_STRUCT | SC_DEF | Flags, StructSize, FieldTab, DSFlags);
+}
+
+
+
+/*****************************************************************************/
+/*                             Declarator parser                             */
+/*****************************************************************************/
+
+
+
 static void InitDeclarator (Declarator* D)
 /* Initialize the Declarator struct for use */
 {
@@ -584,6 +1697,31 @@ static void FixQualifiers (Type* DataType)
                 T[0].C |= CodeAddrSizeQualifier ();
             }
 
+        } else {
+
+            /* If we have remaining qualifiers, flag them as invalid */
+            Q = T[0].C;
+
+            if (Q & T_QUAL_NEAR) {
+                Error ("Invalid '__near__' qualifier");
+                Q &= ~T_QUAL_NEAR;
+            }
+            if (Q & T_QUAL_FAR) {
+                Error ("Invalid '__far__' qualifier");
+                Q &= ~T_QUAL_FAR;
+            }
+            if (Q & T_QUAL_FASTCALL) {
+                Error ("Invalid '__fastcall__' qualifier");
+                Q &= ~T_QUAL_FASTCALL;
+            }
+            if (Q & T_QUAL_CDECL) {
+                Error ("Invalid '__cdecl__' qualifier");
+                Q &= ~T_QUAL_CDECL;
+            }
+
+            /* Clear the invalid qualifiers */
+            T[0].C &= Q;
+
         }
         ++T;
     }
@@ -668,1098 +1806,15 @@ static void CheckArrayElementType (const Type* T)
 
 
 
-static SymEntry* ForwardESU (const char* Name, unsigned Flags, unsigned* DSFlags)
-/* Handle an enum, struct or union forward declaration */
-{
-    /* Try to find an enum/struct/union with the given name. If there is none,
-    ** insert a forward declaration into the current lexical level.
-    */
-    SymEntry* TagEntry = FindTagSym (Name);
-    if (TagEntry == 0) {
-        if ((Flags & SC_ESUTYPEMASK) != SC_ENUM) {
-            TagEntry = AddStructSym (Name, Flags, 0, 0, DSFlags);
-        } else {
-            TagEntry = AddEnumSym (Name, Flags, 0, 0, DSFlags);
-        }
-    } else if ((TagEntry->Flags & SC_TYPEMASK) != (Flags & SC_ESUTYPEMASK)) {
-        /* Already defined, but not the same type class */
-        Error ("Symbol '%s' is already different kind", Name);
-    }
-    return TagEntry;
-}
-
-
-
-static const Type* GetEnumeratorType (long Min, unsigned long Max, int Signed)
-/* GitHub #1093 - We use unsigned types to save spaces whenever possible.
-** If both the signed and unsigned integer types of the same minimum size
-** capable of representing all values of the enum, we prefer the unsigned
-** one.
-** Return 0 if impossible to represent Min and Max as the same integer type.
-*/
-{
-    const Type* Underlying = type_int;      /* default type */
-
-    /* Change the underlying type if necessary */
-    if (Min < 0 || Signed) {
-        /* We can't use unsigned types if there are any negative values */
-        if (Max > (unsigned long)INT32_MAX) {
-            /* No way to represent both Min and Max as the same integer type */
-            Underlying = 0;
-        } else if (Min < INT16_MIN || Max > (unsigned long)INT16_MAX) {
-            Underlying = type_long;
-        } else if (Min < INT8_MIN || Max > (unsigned long)INT8_MAX) {
-            Underlying = type_int;
-        } else {
-            Underlying = type_schar;
-        }
-    } else {
-        if (Max > UINT16_MAX) {
-            Underlying = type_ulong;
-        } else if (Max > UINT8_MAX) {
-            Underlying = type_uint;
-        } else {
-            Underlying = type_uchar;
-        }
-    }
-
-    return Underlying;
-}
-
-
-
-static SymEntry* ParseEnumSpec (const char* Name, unsigned* DSFlags)
-/* Process an enum specifier */
-{
-    SymTable*       FieldTab;
-    long            EnumVal;
-    int             IsSigned;
-    int             IsIncremented;
-    ident           Ident;
-    long            MinConstant = 0;
-    unsigned long   MaxConstant = 0;
-    const Type*     NewType     = 0;        /* new member type */
-    const Type*     MemberType  = type_int; /* default member type */
-    unsigned        Flags       = 0;
-    unsigned        PrevErrorCount = ErrorCount;
-
-
-    if (CurTok.Tok != TOK_LCURLY) {
-        /* Just a forward definition */
-        return ForwardESU (Name, SC_ENUM, DSFlags);
-    }
-
-    /* Add a forward declaration for the enum tag in the current lexical level */
-    AddEnumSym (Name, 0, 0, 0, DSFlags);
-
-    /* Skip the opening curly brace */
-    NextToken ();
-
-    /* Read the enum tags */
-    EnumVal = -1L;
-    while (CurTok.Tok != TOK_RCURLY) {
-
-        /* We expect an identifier */
-        if (CurTok.Tok != TOK_IDENT) {
-            Error ("Identifier expected for enumerator declarator");
-            /* Avoid excessive errors */
-            NextToken ();
-            continue;
-        }
-
-        /* Remember the identifier and skip it */
-        strcpy (Ident, CurTok.Ident);
-        NextToken ();
-
-        /* Check for an assigned value */
-        if (CurTok.Tok == TOK_ASSIGN) {
-
-            NextToken ();
-            ExprDesc Expr = NoCodeConstAbsIntExpr (hie1);
-            EnumVal       = Expr.IVal;
-            MemberType    = Expr.Type;
-            IsSigned      = IsSignSigned (MemberType);
-            IsIncremented = 0;
-
-        } else {
-
-            /* Defaulted with the same signedness as the previous member's */
-            IsSigned = IsSignSigned (MemberType) &&
-                       (unsigned long)EnumVal != GetIntegerTypeMax (MemberType);
-
-            /* Enumerate by adding one to the previous value */
-            EnumVal = (long)(((unsigned long)EnumVal + 1UL) & 0xFFFFFFFFUL);
-
-            if (GetUnqualRawTypeCode (MemberType) == T_ULONG && EnumVal == 0) {
-                /* Error since the new value cannot be represented in the
-                ** largest unsigned integer type supported by cc65 for enum.
-                */
-                Error ("Enumerator '%s' overflows the range of '%s'",
-                       Ident,
-                       GetBasicTypeName (type_ulong));
-            }
-
-            IsIncremented = 1;
-        }
-
-        /* Track down the min/max values and evaluate the type of EnumVal
-        ** using GetEnumeratorType in a tricky way.
-        */
-        if (!IsSigned || EnumVal >= 0) {
-            if ((unsigned long)EnumVal > MaxConstant) {
-                MaxConstant = (unsigned long)EnumVal;
-            }
-            NewType = GetEnumeratorType (0, EnumVal, IsSigned);
-        } else {
-            if (EnumVal < MinConstant) {
-                MinConstant = EnumVal;
-            }
-            NewType = GetEnumeratorType (EnumVal, 0, 1);
-        }
-
-        /* GetEnumeratorType above should never fail, but just in case */
-        if (NewType == 0) {
-            Internal ("Unexpected failure with GetEnumeratorType: %lx", EnumVal);
-            NewType = type_ulong;
-        } else if (SizeOf (NewType) < SizeOf (type_int)) {
-            /* Integer constants are not shorter than int */
-            NewType = type_int;
-        }
-
-        /* Warn if the incremented value exceeds the range of the previous
-        ** type.
-        */
-        if (PrevErrorCount == ErrorCount    &&
-            IsIncremented                   &&
-            (!IsSigned || EnumVal >= 0)     &&
-            NewType->C != GetUnqualRawTypeCode (MemberType)) {
-            /* The possible overflow here can only be when EnumVal > 0 */
-            Warning ("Enumerator '%s' (value = %lu) implies type '%s'",
-                     Ident,
-                     (unsigned long)EnumVal,
-                     GetBasicTypeName (NewType));
-        }
-
-        /* Warn if the value exceeds range of 'int' in standard mode */
-        if (IS_Get (&Standard) != STD_CC65 && NewType->C != T_INT) {
-            if (!IsSigned || EnumVal >= 0) {
-                Warning ("ISO C restricts enumerator values to range of 'int'\n"
-                         "\tEnumerator '%s' (value = %lu) is too large",
-                         Ident,
-                         (unsigned long)EnumVal);
-            } else {
-                Warning ("ISO C restricts enumerator values to range of 'int'\n"
-                         "\tEnumerator '%s' (value = %ld) is too small",
-                         Ident,
-                         EnumVal);
-            }
-        }
-
-        /* Add an entry of the enumerator to the symbol table */
-        AddConstSym (Ident, NewType, SC_ENUMERATOR | SC_CONST, EnumVal);
-
-        /* Use this type for following members */
-        MemberType = NewType;
-
-        /* Check for end of definition */
-        if (CurTok.Tok != TOK_COMMA) {
-            break;
-        }
-        NextToken ();
-    }
-    ConsumeRCurly ();
-
-    /* Check if there have been any members. Error if none */
-    if (NewType == 0) {
-        Error ("Empty enum is invalid");
-    }
-
-    /* This evaluates the underlying type of the whole enum */
-    MemberType = GetEnumeratorType (MinConstant, MaxConstant, 0);
-    if (MemberType == 0) {
-        /* It is very likely that the program is wrong */
-        Error ("Enumeration values cannot be represented all as 'long'\n"
-               "\tMin enumerator value = %ld, Max enumerator value = %lu",
-               MinConstant, MaxConstant);
-
-        /* Avoid more errors */
-        MemberType = type_long;
-    }
-
-    FieldTab = GetSymTab ();
-
-    /* Return a fictitious symbol if errors occurred during parsing */
-    if (PrevErrorCount != ErrorCount) {
-        Flags |= SC_FICTITIOUS;
-    }
-
-    return AddEnumSym (Name, SC_DEF | Flags, MemberType, FieldTab, DSFlags);
-}
-
-
-
-static int ParseFieldWidth (Declarator* D)
-/* Parse an optional field width. Returns -1 if no field width is specified,
-** otherwise the width of the field.
-*/
-{
-    if (CurTok.Tok != TOK_COLON) {
-        /* No bit-field declaration */
-        return -1;
-    }
-
-    if (!IsClassInt (D->Type)) {
-        /* Only integer types may be used for bit-fields */
-        Error ("Bit-field has invalid type '%s', must be integral",
-               GetBasicTypeName (D->Type));
-
-        /* Avoid a diagnostic storm by giving the bit-field the widest valid
-        ** signed type, and continuing to parse.
-        */
-        D->Type[0].C = T_INT;
-    }
-
-    /* We currently support integral types up to long */
-    if (SizeOf (D->Type) > SizeOf (type_ulong)) {
-        /* Only long-sized or smaller types may be used for bit-fields, for now */
-        Error ("cc65 currently supports only long-sized and smaller bit-field types");
-
-        /* Avoid a diagnostic storm */
-        D->Type[0].C = T_INT;
-    }
-
-    /* Read the width */
-    NextToken ();
-    ExprDesc Expr = NoCodeConstAbsIntExpr (hie1);
-
-    if (Expr.IVal < 0) {
-        Error ("Negative width in bit-field");
-        return -1;
-    }
-    if (Expr.IVal > (long)(SizeOf (D->Type) * CHAR_BITS)) {
-        Error ("Width of bit-field exceeds its type");
-        return -1;
-    }
-    if (Expr.IVal == 0 && D->Ident[0] != '\0') {
-        Error ("Zero width for named bit-field");
-        return -1;
-    }
-
-    /* Return the field width */
-    return (int) Expr.IVal;
-}
-
-
-
-static unsigned PadWithBitField (unsigned StructSize, unsigned BitOffs)
-/* Pad the current struct with an anonymous bit-field aligned to the next byte.
-** Return how many bits are used to pad.
-*/
-{
-    /* MSVC complains about unary negation of unsigned,
-    ** so it has been rewritten as subtraction.
-    */
-    unsigned PaddingBits = (0 - BitOffs) % CHAR_BITS;
-
-    /* We need an anonymous name */
-    ident Ident;
-    AnonName (Ident, "bit-field");
-
-    /* Add an anonymous bit-field that aligns to the next
-    ** byte.
-    */
-    AddBitField (Ident, type_uchar, StructSize, BitOffs, PaddingBits,
-                 /*SignednessSpecified=*/1);
-
-    return PaddingBits;
-}
-
-
-
-static unsigned AliasAnonStructFields (const Declarator* D, SymEntry* Anon)
-/* Create alias fields from an anon union/struct in the current lexical level.
-** The function returns the count of created aliases.
-*/
-{
-    unsigned Count = 0;
-    SymEntry* Field;
-    SymEntry* Alias;
-
-    /* Get the symbol table containing the fields. If it is empty, there has
-    ** been an error before, so bail out.
-    */
-    SymTable* Tab = GetESUTagSym (D->Type)->V.S.SymTab;
-    if (Tab == 0) {
-        /* Incomplete definition - has been flagged before */
-        return 0;
-    }
-
-    /* Get a pointer to the list of symbols. Then walk the list adding copies
-    ** of the embedded struct to the current level.
-    */
-    Field = Tab->SymHead;
-    while (Field) {
-
-        /* Enter an alias of this symbol */
-        if (!IsAnonName (Field->Name)) {
-            Alias = AddLocalSym (Field->Name, Field->Type, SC_STRUCTFIELD|SC_ALIAS, 0);
-            Alias->V.A.Field = Field;
-            Alias->V.A.Offs  = Anon->V.Offs + Field->V.Offs;
-            ++Count;
-        }
-
-        /* Currently, there can not be any attributes, but if there will be
-        ** some in the future, we want to know this.
-        */
-        CHECK (Field->Attr == 0);
-
-        /* Next entry */
-        Field = Field->NextSym;
-    }
-
-    /* Return the count of created aliases */
-    return Count;
-}
-
-
-
-static SymEntry* ParseUnionSpec (const char* Name, unsigned* DSFlags)
-/* Parse a union specifier */
-{
-
-    unsigned  UnionSize;
-    unsigned  FieldSize;
-    int       FieldWidth;       /* Width in bits, -1 if not a bit-field */
-    SymTable* FieldTab;
-    SymEntry* UnionTagEntry;
-    SymEntry* Field;
-    unsigned  Flags = 0;
-    unsigned  PrevErrorCount = ErrorCount;
-
-
-    if (CurTok.Tok != TOK_LCURLY) {
-        /* Just a forward declaration */
-        return ForwardESU (Name, SC_UNION, DSFlags);
-    }
-
-    /* Add a forward declaration for the union tag in the current lexical level */
-    UnionTagEntry = AddStructSym (Name, SC_UNION, 0, 0, DSFlags);
-
-    UnionTagEntry->V.S.ACount = 0;
-
-    /* Skip the curly brace */
-    NextToken ();
-
-    /* Enter a new lexical level for the struct */
-    EnterStructLevel ();
-
-    /* Parse union fields */
-    UnionSize = 0;
-    while (CurTok.Tok != TOK_RCURLY) {
-
-        /* Get the type of the entry */
-        DeclSpec Spec;
-        int SignednessSpecified = 0;
-
-        /* Check for a _Static_assert */
-        if (CurTok.Tok == TOK_STATIC_ASSERT) {
-            ParseStaticAssert ();
-            continue;
-        }
-
-        InitDeclSpec (&Spec);
-        ParseTypeSpec (&Spec, TS_DEFAULT_TYPE_NONE, &SignednessSpecified);
-
-        /* Read fields with this type */
-        while (1) {
-
-            Declarator Decl;
-
-            /* Get type and name of the struct field */
-            ParseDecl (&Spec, &Decl, DM_ACCEPT_IDENT);
-
-            /* Check for a bit-field declaration */
-            FieldWidth = ParseFieldWidth (&Decl);
-
-            /* Check for fields without names */
-            if (Decl.Ident[0] == '\0') {
-                if (FieldWidth < 0) {
-                    /* In cc65 mode, we allow anonymous structs/unions within
-                    ** a union.
-                    */
-                    SymEntry* TagEntry;
-                    if (IS_Get (&Standard) >= STD_CC65          &&
-                        IsClassStruct (Decl.Type)               &&
-                        (TagEntry = GetESUTagSym (Decl.Type))   &&
-                        SymHasAnonName (TagEntry)) {
-                        /* This is an anonymous struct or union */
-                        AnonFieldName (Decl.Ident, GetBasicTypeName (Decl.Type), UnionTagEntry->V.S.ACount);
-
-                        /* Ignore CVR qualifiers */
-                        if (IsQualConst (Decl.Type) || IsQualVolatile (Decl.Type) || IsQualRestrict (Decl.Type)) {
-                            Warning ("Anonymous %s qualifiers are ignored", GetBasicTypeName (Decl.Type));
-                            Decl.Type[0].C &= ~T_QUAL_CVR;
-                        }
-                    } else {
-                        /* A non bit-field without a name is legal but useless */
-                        Warning ("Declaration does not declare anything");
-
-                        goto NextMember;
-                    }
-                } else if (FieldWidth > 0) {
-                    /* A bit-field without a name will get an anonymous one */
-                    AnonName (Decl.Ident, "bit-field");
-                }
-            } else if (IsIncompleteType (Decl.Type)) {
-                Error ("Field '%s' has incomplete type '%s'",
-                       Decl.Ident,
-                       GetFullTypeName (Decl.Type));
-            }
-
-            /* Check for const types */
-            if (IsQualConst (Decl.Type)) {
-                Flags |= SC_HAVECONST;
-            }
-
-            /* Ignore zero sized bit fields in a union */
-            if (FieldWidth == 0) {
-                goto NextMember;
-            }
-
-            /* Handle sizes */
-            FieldSize = SizeOf (Decl.Type);
-            if (FieldSize > UnionSize) {
-                UnionSize = FieldSize;
-            }
-
-            /* Add a field entry to the table */
-            if (FieldWidth > 0) {
-                /* For a union, allocate space for the type specified by the
-                ** bit-field.
-                */
-                AddBitField (Decl.Ident, Decl.Type, 0, 0, FieldWidth,
-                             SignednessSpecified);
-            } else if (Decl.Ident[0] != '\0') {
-                /* Add the new field to the table */
-                Field = AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, 0);
-
-                /* Check the new field for certain kinds of members */
-                if (IsClassStruct (Decl.Type)) {
-                    SymEntry* TagEntry = GetESUTagSym (Decl.Type);
-
-                    /* Alias the fields of the anonymous member on the current level */
-                    if (IsAnonName (Decl.Ident)) {
-                        Field->V.A.ANumber = UnionTagEntry->V.S.ACount++;
-                        AliasAnonStructFields (&Decl, Field);
-                    }
-
-                    /* Check if the field itself has a flexible array member */
-                    if (TagEntry && SymHasFlexibleArrayMember (TagEntry)) {
-                        Field->Flags |= SC_HAVEFAM;
-                        Flags        |= SC_HAVEFAM;
-                    }
-
-                    /* Check if the field itself has a const member */
-                    if (TagEntry && SymHasConstMember (TagEntry)) {
-                        Field->Flags |= SC_HAVECONST;
-                        Flags        |= SC_HAVECONST;
-                    }
-                }
-            }
-
-NextMember: if (CurTok.Tok != TOK_COMMA) {
-                break;
-            }
-            NextToken ();
-        }
-        ConsumeSemi ();
-    }
-
-    /* Skip the closing brace */
-    NextToken ();
-
-    /* Remember the symbol table and leave the struct level */
-    FieldTab = GetFieldSymTab ();
-    LeaveStructLevel ();
-
-    /* Return a fictitious symbol if errors occurred during parsing */
-    if (PrevErrorCount != ErrorCount) {
-        Flags |= SC_FICTITIOUS;
-    }
-
-    /* Empty union is not supported now */
-    if (UnionSize == 0) {
-        Error ("Empty union type '%s' is not supported", Name);
-    }
-
-    /* Make a real entry from the forward decl and return it */
-    return AddStructSym (Name, SC_UNION | SC_DEF | Flags, UnionSize, FieldTab, DSFlags);
-}
-
-
-
-static SymEntry* ParseStructSpec (const char* Name, unsigned* DSFlags)
-/* Parse a struct specifier */
-{
-
-    unsigned  StructSize;
-    int       FlexibleMember;
-    unsigned  BitOffs;          /* Bit offset for bit-fields */
-    int       FieldWidth;       /* Width in bits, -1 if not a bit-field */
-    SymTable* FieldTab;
-    SymEntry* StructTagEntry;
-    SymEntry* Field;
-    unsigned  Flags = 0;
-    unsigned  PrevErrorCount = ErrorCount;
-
-
-    if (CurTok.Tok != TOK_LCURLY) {
-        /* Just a forward declaration */
-        return ForwardESU (Name, SC_STRUCT, DSFlags);
-    }
-
-    /* Add a forward declaration for the struct tag in the current lexical level */
-    StructTagEntry = AddStructSym (Name, SC_STRUCT, 0, 0, DSFlags);
-
-    StructTagEntry->V.S.ACount = 0;
-
-    /* Skip the curly brace */
-    NextToken ();
-
-    /* Enter a new lexical level for the struct */
-    EnterStructLevel ();
-
-    /* Parse struct fields */
-    FlexibleMember = 0;
-    StructSize     = 0;
-    BitOffs        = 0;
-    while (CurTok.Tok != TOK_RCURLY) {
-
-        /* Get the type of the entry */
-        DeclSpec Spec;
-        int SignednessSpecified = 0;
-
-        /* Check for a _Static_assert */
-        if (CurTok.Tok == TOK_STATIC_ASSERT) {
-            ParseStaticAssert ();
-            continue;
-        }
-
-        InitDeclSpec (&Spec);
-        ParseTypeSpec (&Spec, TS_DEFAULT_TYPE_NONE, &SignednessSpecified);
-
-        /* Read fields with this type */
-        while (1) {
-
-            Declarator Decl;
-
-            /* If we had a flexible array member before, no other fields can
-            ** follow.
-            */
-            if (FlexibleMember) {
-                Error ("Flexible array member must be last field");
-                FlexibleMember = 0;     /* Avoid further errors */
-            }
-
-            /* Get type and name of the struct field */
-            ParseDecl (&Spec, &Decl, DM_ACCEPT_IDENT);
-
-            /* Check for a bit-field declaration */
-            FieldWidth = ParseFieldWidth (&Decl);
-
-            /* If this is not a bit field, or the bit field is too large for
-            ** the remainder of the allocated unit, or we have a bit field
-            ** with width zero, align the struct to the next member by adding
-            ** a member with an anonymous name.
-            */
-            if (BitOffs > 0) {
-                if (FieldWidth <= 0 ||
-                    (BitOffs + FieldWidth) > CHAR_BITS * SizeOf (Decl.Type)) {
-                    /* Add an anonymous bit-field that aligns to the next
-                    ** byte.
-                    */
-                    unsigned PaddingBits = PadWithBitField (StructSize, BitOffs);
-
-                    /* No bits left */
-                    StructSize += (BitOffs + PaddingBits) / CHAR_BITS;
-                    BitOffs = 0;
-                }
-            }
-
-            /* Check for fields without names */
-            if (Decl.Ident[0] == '\0') {
-                if (FieldWidth < 0) {
-                    /* In cc65 mode, we allow anonymous structs/unions within
-                    ** a struct.
-                    */
-                    SymEntry* TagEntry;
-                    if (IS_Get (&Standard) >= STD_CC65          &&
-                        IsClassStruct (Decl.Type)               &&
-                        (TagEntry = GetESUTagSym (Decl.Type))   &&
-                        SymHasAnonName (TagEntry)) {
-                        /* This is an anonymous struct or union */
-                        AnonFieldName (Decl.Ident, GetBasicTypeName (Decl.Type), StructTagEntry->V.S.ACount);
-
-                        /* Ignore CVR qualifiers */
-                        if (IsQualConst (Decl.Type) || IsQualVolatile (Decl.Type) || IsQualRestrict (Decl.Type)) {
-                            Warning ("Anonymous %s qualifiers are ignored", GetBasicTypeName (Decl.Type));
-                            Decl.Type[0].C &= ~T_QUAL_CVR;
-                        }
-                    } else {
-                        /* A non bit-field without a name is legal but useless */
-                        Warning ("Declaration does not declare anything");
-
-                        goto NextMember;
-                    }
-                } else if (FieldWidth > 0) {
-                    /* A bit-field without a name will get an anonymous one */
-                    AnonName (Decl.Ident, "bit-field");
-                }
-            } else {
-                /* Check if this field is a flexible array member, and
-                ** calculate the size of the field.
-                */
-                if (IsTypeArray (Decl.Type) && GetElementCount (Decl.Type) == UNSPECIFIED) {
-                    /* Array with unspecified size */
-                    if (StructSize == 0) {
-                        Error ("Flexible array member cannot be first struct field");
-                    }
-                    FlexibleMember = 1;
-                    Flags |= SC_HAVEFAM;
-
-                    /* Assume zero for size calculations */
-                    SetElementCount (Decl.Type, FLEXIBLE);
-                }
-
-                if (IsIncompleteType (Decl.Type)) {
-                    Error ("Field '%s' has incomplete type '%s'",
-                           Decl.Ident,
-                           GetFullTypeName (Decl.Type));
-                }
-            }
-
-            /* Check for const types */
-            if (IsQualConst (Decl.Type)) {
-                Flags |= SC_HAVECONST;
-            }
-
-            /* Apart from the above, a bit field with width 0 is not processed
-            ** further.
-            */
-            if (FieldWidth == 0) {
-                goto NextMember;
-            }
-
-            /* Add a field entry to the table */
-            if (FieldWidth > 0) {
-                /* Full bytes have already been added to the StructSize,
-                ** which is passed to the offset of AddBitField.  BitOffs
-                ** is always within a char, which simplifies handling the
-                ** bit-field as a char type in expressions.
-                */
-                CHECK (BitOffs < CHAR_BITS);
-                AddBitField (Decl.Ident, Decl.Type, StructSize, BitOffs,
-                             FieldWidth, SignednessSpecified);
-                BitOffs += FieldWidth;
-                CHECK (BitOffs <= CHAR_BITS * SizeOf (Decl.Type));
-                /* Add any full bytes to the struct size */
-                StructSize += BitOffs / CHAR_BITS;
-                BitOffs %= CHAR_BITS;
-            } else if (Decl.Ident[0] != '\0') {
-                /* Add the new field to the table */
-                Field = AddLocalSym (Decl.Ident, Decl.Type, SC_STRUCTFIELD, StructSize);
-
-                /* Check the new field for certain kinds of members */
-                if (IsClassStruct (Decl.Type)) {
-                    SymEntry* TagEntry = GetESUTagSym (Decl.Type);
-
-                    /* Alias the fields of the anonymous member on the current level */
-                    if (IsAnonName (Decl.Ident)) {
-                        Field->V.A.ANumber = StructTagEntry->V.S.ACount++;
-                        AliasAnonStructFields (&Decl, Field);
-                    }
-
-                    /* Check if the field itself has a flexible array member */
-                    if (TagEntry && SymHasFlexibleArrayMember (TagEntry)) {
-                        Field->Flags |= SC_HAVEFAM;
-                        Flags        |= SC_HAVEFAM;
-                        Error ("Invalid use of struct with flexible array member");
-                    }
-
-                    /* Check if the field itself has a const member */
-                    if (TagEntry && SymHasConstMember (TagEntry)) {
-                        Field->Flags |= SC_HAVECONST;
-                        Flags        |= SC_HAVECONST;
-                    }
-                }
-
-                if (!FlexibleMember) {
-                    StructSize += SizeOf (Decl.Type);
-                }
-            }
-
-NextMember: if (CurTok.Tok != TOK_COMMA) {
-                break;
-            }
-            NextToken ();
-        }
-        ConsumeSemi ();
-    }
-
-    if (BitOffs > 0) {
-        /* If we have bits from bit-fields left, pad the struct to next byte */
-        unsigned PaddingBits = PadWithBitField (StructSize, BitOffs);
-
-        /* No bits left */
-        StructSize += (BitOffs + PaddingBits) / CHAR_BITS;
-    }
-
-    /* Skip the closing brace */
-    NextToken ();
-
-    /* Remember the symbol table and leave the struct level */
-    FieldTab = GetFieldSymTab ();
-    LeaveStructLevel ();
-
-    /* Return a fictitious symbol if errors occurred during parsing */
-    if (PrevErrorCount != ErrorCount) {
-        Flags |= SC_FICTITIOUS;
-    }
-
-    /* Empty struct is not supported now */
-    if (StructSize == 0) {
-        Error ("Empty struct type '%s' is not supported", Name);
-    }
-
-    /* Make a real entry from the forward decl and return it */
-    return AddStructSym (Name, SC_STRUCT | SC_DEF | Flags, StructSize, FieldTab, DSFlags);
-}
-
-
-
-static void ParseTypeSpec (DeclSpec* Spec, typespec_t TSFlags, int* SignednessSpecified)
-/* Parse a type specifier.  Store whether one of "signed" or "unsigned" was
-** specified, so bit-fields of unspecified signedness can be treated as
-** unsigned; without special handling, it would be treated as signed.
-*/
-{
-    ident       Ident;
-    SymEntry*   TagEntry;
-    TypeCode    Qualifiers = T_QUAL_NONE;
-
-    if (SignednessSpecified != NULL) {
-        *SignednessSpecified = 0;
-    }
-
-    /* Assume we have an explicit type */
-    Spec->Flags &= ~DS_DEF_TYPE;
-
-    /* Read storage specifiers and/or type qualifiers if we have any */
-    OptionalSpecifiers (Spec, &Qualifiers, TSFlags);
-
-    /* Look at the data type */
-    switch (CurTok.Tok) {
-
-        case TOK_VOID:
-            NextToken ();
-            Spec->Type[0].C = T_VOID;
-            Spec->Type[0].A.U = 0;
-            Spec->Type[1].C = T_END;
-            break;
-
-        case TOK_CHAR:
-            NextToken ();
-            Spec->Type[0].C = T_CHAR;
-            Spec->Type[1].C = T_END;
-            break;
-
-        case TOK_LONG:
-            NextToken ();
-            if (CurTok.Tok == TOK_UNSIGNED) {
-                if (SignednessSpecified != NULL) {
-                    *SignednessSpecified = 1;
-                }
-                NextToken ();
-                OptionalInt ();
-                Spec->Type[0].C = T_ULONG;
-                Spec->Type[1].C = T_END;
-            } else {
-                OptionalSigned (SignednessSpecified);
-                OptionalInt ();
-                Spec->Type[0].C = T_LONG;
-                Spec->Type[1].C = T_END;
-            }
-            break;
-
-        case TOK_SHORT:
-            NextToken ();
-            if (CurTok.Tok == TOK_UNSIGNED) {
-                if (SignednessSpecified != NULL) {
-                    *SignednessSpecified = 1;
-                }
-                NextToken ();
-                OptionalInt ();
-                Spec->Type[0].C = T_USHORT;
-                Spec->Type[1].C = T_END;
-            } else {
-                OptionalSigned (SignednessSpecified);
-                OptionalInt ();
-                Spec->Type[0].C = T_SHORT;
-                Spec->Type[1].C = T_END;
-            }
-            break;
-
-        case TOK_INT:
-            NextToken ();
-            Spec->Type[0].C = T_INT;
-            Spec->Type[1].C = T_END;
-            break;
-
-       case TOK_SIGNED:
-            if (SignednessSpecified != NULL) {
-                *SignednessSpecified = 1;
-            }
-            NextToken ();
-            switch (CurTok.Tok) {
-
-                case TOK_CHAR:
-                    NextToken ();
-                    Spec->Type[0].C = T_SCHAR;
-                    Spec->Type[1].C = T_END;
-                    break;
-
-                case TOK_SHORT:
-                    NextToken ();
-                    OptionalInt ();
-                    Spec->Type[0].C = T_SHORT;
-                    Spec->Type[1].C = T_END;
-                    break;
-
-                case TOK_LONG:
-                    NextToken ();
-                    OptionalInt ();
-                    Spec->Type[0].C = T_LONG;
-                    Spec->Type[1].C = T_END;
-                    break;
-
-                case TOK_INT:
-                    NextToken ();
-                    /* FALL THROUGH */
-
-                default:
-                    Spec->Type[0].C = T_INT;
-                    Spec->Type[1].C = T_END;
-                    break;
-            }
-            break;
-
-        case TOK_UNSIGNED:
-            if (SignednessSpecified != NULL) {
-                *SignednessSpecified = 1;
-            }
-            NextToken ();
-            switch (CurTok.Tok) {
-
-                case TOK_CHAR:
-                    NextToken ();
-                    Spec->Type[0].C = T_UCHAR;
-                    Spec->Type[1].C = T_END;
-                    break;
-
-                case TOK_SHORT:
-                    NextToken ();
-                    OptionalInt ();
-                    Spec->Type[0].C = T_USHORT;
-                    Spec->Type[1].C = T_END;
-                    break;
-
-                case TOK_LONG:
-                    NextToken ();
-                    OptionalInt ();
-                    Spec->Type[0].C = T_ULONG;
-                    Spec->Type[1].C = T_END;
-                    break;
-
-                case TOK_INT:
-                    NextToken ();
-                    /* FALL THROUGH */
-
-                default:
-                    Spec->Type[0].C = T_UINT;
-                    Spec->Type[1].C = T_END;
-                    break;
-            }
-            break;
-
-        case TOK_FLOAT:
-            NextToken ();
-            Spec->Type[0].C = T_FLOAT;
-            Spec->Type[1].C = T_END;
-            break;
-
-        case TOK_DOUBLE:
-            NextToken ();
-            Spec->Type[0].C = T_DOUBLE;
-            Spec->Type[1].C = T_END;
-            break;
-
-        case TOK_UNION:
-            NextToken ();
-            /* */
-            if (CurTok.Tok == TOK_IDENT) {
-                strcpy (Ident, CurTok.Ident);
-                NextToken ();
-            } else {
-                AnonName (Ident, "union");
-            }
-            /* Remember we have an extra type decl */
-            Spec->Flags |= DS_EXTRA_TYPE;
-            /* Declare the union in the current scope */
-            TagEntry = ParseUnionSpec (Ident, &Spec->Flags);
-            /* Encode the union entry into the type */
-            Spec->Type[0].C = T_UNION;
-            SetESUTagSym (Spec->Type, TagEntry);
-            Spec->Type[1].C = T_END;
-            break;
-
-        case TOK_STRUCT:
-            NextToken ();
-            /* */
-            if (CurTok.Tok == TOK_IDENT) {
-                strcpy (Ident, CurTok.Ident);
-                NextToken ();
-            } else {
-                AnonName (Ident, "struct");
-            }
-            /* Remember we have an extra type decl */
-            Spec->Flags |= DS_EXTRA_TYPE;
-            /* Declare the struct in the current scope */
-            TagEntry = ParseStructSpec (Ident, &Spec->Flags);
-            /* Encode the struct entry into the type */
-            Spec->Type[0].C = T_STRUCT;
-            SetESUTagSym (Spec->Type, TagEntry);
-            Spec->Type[1].C = T_END;
-            break;
-
-        case TOK_ENUM:
-            NextToken ();
-            /* Named enum */
-            if (CurTok.Tok == TOK_IDENT) {
-                strcpy (Ident, CurTok.Ident);
-                NextToken ();
-            } else {
-                if (CurTok.Tok != TOK_LCURLY) {
-                    Error ("Identifier expected for enum tag name");
-                }
-                AnonName (Ident, "enum");
-            }
-            /* Remember we have an extra type decl */
-            Spec->Flags |= DS_EXTRA_TYPE;
-            /* Parse the enum decl */
-            TagEntry = ParseEnumSpec (Ident, &Spec->Flags);
-            /* Encode the enum entry into the type */
-            Spec->Type[0].C |= T_ENUM;
-            SetESUTagSym (Spec->Type, TagEntry);
-            Spec->Type[1].C = T_END;
-            /* The signedness of enums is determined by the type, so say this is specified to avoid
-            ** the int -> unsigned int handling for plain int bit-fields in AddBitField.
-            */
-            if (SignednessSpecified) {
-                *SignednessSpecified = 1;
-            }
-            break;
-
-        case TOK_IDENT:
-            /* This could be a label */
-            if (NextTok.Tok != TOK_COLON || GetLexicalLevel () == LEX_LEVEL_STRUCT) {
-                TagEntry = FindSym (CurTok.Ident);
-                if (TagEntry && SymIsTypeDef (TagEntry)) {
-                    /* It's a typedef */
-                    NextToken ();
-                    TypeCopy (Spec->Type, TagEntry->Type);
-                    /* If it's a typedef, we should actually use whether the signedness was
-                    ** specified on the typedef, but that information has been lost.  Treat the
-                    ** signedness as being specified to work around the ICE in #1267.
-                    ** Unforunately, this will cause plain int bit-fields defined via typedefs
-                    ** to be treated as signed rather than unsigned.
-                    */
-                    if (SignednessSpecified) {
-                        *SignednessSpecified = 1;
-                    }
-                    break;
-                } else if ((TSFlags & TS_MASK_DEFAULT_TYPE) == TS_DEFAULT_TYPE_NONE) {
-                    /* Treat this identifier as an unknown type */
-                    Error ("Unknown type name '%s'", CurTok.Ident);
-                    TypeCopy (Spec->Type, type_int);
-                    NextToken ();
-                    break;
-                }
-            } else {
-                /* This is a label. Use the default type flag to end the loop
-                ** in DeclareLocals. The type code used here doesn't matter as
-                ** long as it has no qualifiers.
-                */
-                Spec->Flags |= DS_DEF_TYPE;
-                Spec->Type[0].C = T_INT;
-                Spec->Type[1].C = T_END;
-                break;
-            }
-            /* FALL THROUGH */
-
-        default:
-            if ((TSFlags & TS_MASK_DEFAULT_TYPE) == TS_DEFAULT_TYPE_NONE) {
-                Spec->Flags |= DS_NO_TYPE;
-                Spec->Type[0].C = T_INT;
-                Spec->Type[1].C = T_END;
-            } else {
-                Spec->Flags |= DS_DEF_TYPE;
-                Spec->Type[0].C = T_INT;
-                Spec->Type[1].C = T_END;
-            }
-            break;
-    }
-
-    /* There may also be specifiers/qualifiers *after* the initial type */
-    OptionalSpecifiers (Spec, &Qualifiers, TSFlags);
-    Spec->Type[0].C |= Qualifiers;
-}
-
-
-
-static const Type* ParamTypeCvt (Type* T)
-/* If T is an array or a function, convert it to a pointer else do nothing.
-** Return the resulting type.
-*/
-{
-    Type* Tmp = 0;
-
-    if (IsTypeArray (T)) {
-        Tmp = ArrayToPtr (T);
-    } else if (IsTypeFunc (T)) {
-        Tmp = NewPointerTo (T);
-    }
-
-    if (Tmp != 0) {
-        /* Do several fixes on qualifiers */
-        FixQualifiers (Tmp);
-
-        /* Replace the type */
-        TypeCopy (T, Tmp);
-        TypeFree (Tmp);
-    }
-
-    return T;
-}
-
-
-
 static void ParseOldStyleParamList (FuncDesc* F)
 /* Parse an old-style (K&R) parameter list */
 {
-    unsigned PrevErrorCount = ErrorCount;
+    if (CurTok.Tok == TOK_RPAREN) {
+        return;
+    }
 
     /* Parse params */
-    while (CurTok.Tok != TOK_RPAREN) {
+    while (1) {
 
         /* List of identifiers expected */
         if (CurTok.Tok == TOK_IDENT) {
@@ -1778,28 +1833,35 @@ static void ParseOldStyleParamList (FuncDesc* F)
             Error ("Identifier expected for parameter name");
 
             /* Try some smart error recovery */
-            if (SmartErrorSkip () < 0) {
+            if (SmartErrorSkip (0) < 0) {
                 break;
             }
         }
 
         /* Check for more parameters */
-        if (CurTok.Tok == TOK_COMMA) {
-            NextToken ();
-        } else {
+        if (CurTok.Tok != TOK_COMMA) {
             break;
         }
+        NextToken ();
+
+    }
+}
+
+
+
+static void ParseOldStyleParamDeclList (FuncDesc* F attribute ((unused)))
+/* Parse an old-style (K&R) function declarator declaration list */
+{
+    if (CurTok.Tok == TOK_SEMI) {
+        /* No parameter declaration list */
+        return;
     }
 
-    /* Skip right paren. We must explicitly check for one here, since some of
-    ** the breaks above bail out without checking.
-    */
-    ConsumeRParen ();
-
     /* An optional list of type specifications follows */
-    while (CurTok.Tok != TOK_LCURLY) {
+    while (CurTok.Tok != TOK_LCURLY && CurTok.Tok != TOK_CEOF) {
 
         DeclSpec        Spec;
+        int             NeedClean;
 
         /* Read the declaration specifier */
         ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_NONE, SC_AUTO);
@@ -1807,15 +1869,19 @@ static void ParseOldStyleParamList (FuncDesc* F)
         /* We accept only auto and register as storage class specifiers, but
         ** we ignore all this, since we use auto anyway.
         */
-        if ((Spec.StorageClass & SC_AUTO) == 0 &&
-            (Spec.StorageClass & SC_REGISTER) == 0) {
+        if ((Spec.StorageClass & SC_STORAGEMASK) != SC_AUTO &&
+            (Spec.StorageClass & SC_STORAGEMASK) != SC_REGISTER) {
             Error ("Illegal storage class");
         }
 
-        /* Type must be specified */
-        if ((Spec.Flags & DS_NO_TYPE) != 0) {
-            Error ("Expected declaration specifiers");
-            break;
+        /* If we haven't got a type specifier yet, something must be wrong */
+        if ((Spec.Flags & DS_TYPE_MASK) == DS_NONE) {
+            /* Avoid extra errors if it was a failed type specifier */
+            if ((Spec.Flags & DS_EXTRA_TYPE) == 0) {
+                Error ("Declaration specifier expected");
+            }
+            NeedClean = -1;
+            goto EndOfDecl;
         }
 
         /* Parse a comma separated variable list */
@@ -1824,25 +1890,30 @@ static void ParseOldStyleParamList (FuncDesc* F)
             Declarator Decl;
 
             /* Read the parameter */
-            ParseDecl (&Spec, &Decl, DM_NEED_IDENT);
+            NeedClean = ParseDecl (&Spec, &Decl, DM_IDENT_OR_EMPTY);
+
+            /* Bail out if there are errors */
+            if (NeedClean <= 0) {
+                break;
+            }
 
             /* Warn about new local type declaration */
-            if ((Spec.Flags & DS_NEW_TYPE_DECL) != 0) {
+            if ((Spec.Flags & DS_NEW_TYPE_DECL) != 0 && !IsAnonESUType (Spec.Type)) {
                 Warning ("'%s' will be invisible out of this function",
                          GetFullTypeName (Spec.Type));
             }
 
             if (Decl.Ident[0] != '\0') {
-
                 /* We have a name given. Search for the symbol */
                 SymEntry* Param = FindLocalSym (Decl.Ident);
+
                 if (Param) {
                     /* Check if we already changed the type for this
                     ** parameter.
                     */
                     if (Param->Flags & SC_DEFTYPE) {
                         /* Found it, change the default type to the one given */
-                        SymChangeType (Param, ParamTypeCvt (Decl.Type));
+                        SymChangeType (Param, PtrConversion (Decl.Type));
                         /* Reset the "default type" flag */
                         Param->Flags &= ~SC_DEFTYPE;
                     } else {
@@ -1850,25 +1921,40 @@ static void ParseOldStyleParamList (FuncDesc* F)
                         Error ("Redefinition for parameter '%s'", Param->Name);
                     }
                 } else {
-                    Error ("Unknown identifier: '%s'", Decl.Ident);
+                    Error ("Unknown parameter '%s'", Decl.Ident);
+                }
+
+                /* Initialization is not allowed */
+                if (CurTok.Tok == TOK_ASSIGN) {
+                    Error ("Parameter '%s' cannot be initialized", Decl.Ident);
+
+                    /* Try some smart error recovery */
+                    SmartErrorSkip (0);
                 }
             }
 
-            if (CurTok.Tok == TOK_COMMA) {
-                NextToken ();
-            } else {
+            /* Check for more declarators */
+            if (CurTok.Tok != TOK_COMMA) {
                 break;
             }
+            NextToken ();
 
         }
 
-        /* Variable list must be semicolon terminated */
-        ConsumeSemi ();
-    }
+EndOfDecl:
+        if (NeedClean > 0) {
+            /* Must be followed by a semicolon */
+            if (ConsumeSemi ()) {
+                NeedClean = 0;
+            } else {
+                NeedClean = -1;
+            }
+        }
 
-    if (PrevErrorCount != ErrorCount && CurTok.Tok != TOK_LCURLY) {
         /* Try some smart error recovery */
-        SmartErrorSkip ();
+        if (NeedClean < 0) {
+            SmartErrorSkip (1);
+        }
     }
 }
 
@@ -1877,8 +1963,12 @@ static void ParseOldStyleParamList (FuncDesc* F)
 static void ParseAnsiParamList (FuncDesc* F)
 /* Parse a new-style (ANSI) parameter list */
 {
+    if (CurTok.Tok == TOK_RPAREN) {
+        return;
+    }
+
     /* Parse params */
-    while (CurTok.Tok != TOK_RPAREN) {
+    while (1) {
 
         DeclSpec    Spec;
         Declarator  Decl;
@@ -1896,22 +1986,22 @@ static void ParseAnsiParamList (FuncDesc* F)
         ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_NONE, SC_AUTO);
 
         /* We accept only auto and register as storage class specifiers */
-        if ((Spec.StorageClass & SC_AUTO) == SC_AUTO) {
-            Spec.StorageClass = SC_AUTO | SC_PARAM | SC_DEF;
-        } else if ((Spec.StorageClass & SC_REGISTER) == SC_REGISTER) {
-            Spec.StorageClass = SC_REGISTER | SC_STATIC | SC_PARAM | SC_DEF;
+        if ((Spec.StorageClass & SC_STORAGEMASK) == SC_REGISTER) {
+            Spec.StorageClass = SC_REGISTER | SC_PARAM | SC_DEF;
         } else {
-            Error ("Illegal storage class");
+            if ((Spec.StorageClass & SC_STORAGEMASK) != SC_AUTO) {
+                Error ("Illegal storage class");
+            }
             Spec.StorageClass = SC_AUTO | SC_PARAM | SC_DEF;
         }
 
         /* Type must be specified */
-        if ((Spec.Flags & DS_NO_TYPE) != 0) {
-            Error ("Type specifier missing");
+        if ((Spec.Flags & DS_TYPE_MASK) == DS_NONE) {
+            Error ("Declaration specifier or '...' expected");
         }
 
         /* Warn about new local type declaration */
-        if ((Spec.Flags & DS_NEW_TYPE_DECL) != 0) {
+        if ((Spec.Flags & DS_NEW_TYPE_DECL) != 0 && !IsAnonESUType (Spec.Type)) {
             Warning ("'%s' will be invisible out of this function",
                      GetFullTypeName (Spec.Type));
         }
@@ -1936,7 +2026,7 @@ static void ParseAnsiParamList (FuncDesc* F)
         ParseAttribute (&Decl);
 
         /* Create a symbol table entry */
-        Param = AddLocalSym (Decl.Ident, ParamTypeCvt (Decl.Type), Decl.StorageClass, 0);
+        Param = AddLocalSym (Decl.Ident, PtrConversion (Decl.Type), Decl.StorageClass, 0);
 
         /* Add attributes if we have any */
         SymUseAttr (Param, &Decl);
@@ -1953,42 +2043,30 @@ static void ParseAnsiParamList (FuncDesc* F)
 
         if (PrevErrorCount != ErrorCount) {
             /* Try some smart error recovery */
-            if (SmartErrorSkip () < 0) {
+            if (SmartErrorSkip (0) < 0) {
                 break;
             }
         }
 
-        /* Check for more parameters */
-        if (CurTok.Tok == TOK_COMMA) {
-            NextToken ();
-        } else {
+        /* Check for end of parameter type list */
+        if (CurTok.Tok != TOK_COMMA) {
             break;
         }
+        NextToken ();
     }
-
-    /* Skip right paren. We must explicitly check for one here, since some of
-    ** the breaks above bail out without checking.
-    */
-    ConsumeRParen ();
 }
 
 
 
-static FuncDesc* ParseFuncDecl (void)
-/* Parse the argument list of a function with the enclosing parentheses */
+static void ParseFuncDecl (Declarator* D, declmode_t Mode, TypeCode Qualifiers)
+/* Parse the argument list of a function with the closing parenthesis */
 {
-    SymEntry* WrappedCall;
-    unsigned int WrappedCallData;
-
     /* Create a new function descriptor */
     FuncDesc* F = NewFuncDesc ();
 
     /* Enter a new lexical level */
     EnterFunctionLevel ();
 
-    /* Skip the opening paren */
-    NextToken ();
-
     /* Check for several special parameter lists */
     if (CurTok.Tok == TOK_RPAREN) {
         /* Parameter list is empty (K&R-style) */
@@ -1997,14 +2075,17 @@ static FuncDesc* ParseFuncDecl (void)
         /* Parameter list declared as void */
         NextToken ();
         F->Flags |= FD_VOID_PARAM;
-    } else if (CurTok.Tok == TOK_IDENT &&
+    } else if (Mode != DM_NO_IDENT &&
+               CurTok.Tok == TOK_IDENT &&
                (NextTok.Tok == TOK_COMMA || NextTok.Tok == TOK_RPAREN)) {
         /* If the identifier is a typedef, we have a new-style parameter list;
         ** if it's some other identifier, it's an old-style parameter list.
+        ** Note: Non-empty Old-style (K&R) parameter list is not allowed in
+        ** type names.
         */
         SymEntry* Sym = FindSym (CurTok.Ident);
         if (Sym == 0 || !SymIsTypeDef (Sym)) {
-            /* Old-style (K&R) function. */
+            /* Old-style (K&R) function */
             F->Flags |= FD_OLDSTYLE;
         }
     }
@@ -2018,6 +2099,16 @@ static FuncDesc* ParseFuncDecl (void)
         /* Old-style function */
         ParseOldStyleParamList (F);
     }
+
+    if (!ConsumeRParen ()) {
+        /* Try some smart error recovery */
+        SimpleErrorSkip ();
+        NextToken ();
+    } else if (Mode == DM_IDENT_OR_EMPTY && (F->Flags & FD_OLDSTYLE) != 0) {
+        /* Parameter declaration list is only allowed in function definitions */
+        ParseOldStyleParamDeclList (F);
+    }
+
     PopLexicalLevel ();
 
     /* Remember the last function parameter. We need it later for several
@@ -2025,127 +2116,166 @@ static FuncDesc* ParseFuncDecl (void)
     ** more symbols are added to the table, it is easier if we remember it
     ** now, since it is currently the last entry in the symbol table.
     */
-    F->LastParam = GetSymTab()->SymTail;
+    F->LastParam = GetSymTab ()->SymTail;
+
+    /* Leave the lexical level remembering the symbol tables */
+    RememberFunctionLevel (F);
 
     /* It is allowed to use incomplete types in function prototypes, so we
     ** won't always get to know the parameter sizes here and may do that later.
     */
     F->Flags |= FD_INCOMPLETE_PARAM;
 
-    /* Leave the lexical level remembering the symbol tables */
-    RememberFunctionLevel (F);
-
-    /* Did we have a WrappedCall for this function? */
-    GetWrappedCall((void **) &WrappedCall, &WrappedCallData);
-    if (WrappedCall) {
-        F->WrappedCall = WrappedCall;
-        F->WrappedCallData = WrappedCallData;
+    /* We cannot specify fastcall for variadic functions */
+    if ((F->Flags & FD_VARIADIC) && (Qualifiers & T_QUAL_FASTCALL)) {
+        Error ("Variadic functions cannot be __fastcall__");
+        Qualifiers &= ~T_QUAL_FASTCALL;
     }
 
-    /* Return the function descriptor */
-    return F;
+    /* Add the function type. Be sure to bounds check the type buffer */
+    NeedTypeSpace (D, 1);
+    D->Type[D->Index].C = T_FUNC | Qualifiers;
+    D->Type[D->Index].A.F = F;
+    ++D->Index;
 }
 
 
 
-static declmode_t DirectDecl (const DeclSpec* Spec, Declarator* D, declmode_t Mode)
+static void DirectDecl (DeclSpec* Spec, Declarator* D, TypeCode* RemQ, declmode_t Mode)
 /* Recursively process direct declarators. Build a type array in reverse order. */
 {
     /* Read optional function or pointer qualifiers that modify the identifier
-    ** or token to the right. For convenience, we allow a calling convention
-    ** also for pointers here. If it's a pointer-to-function, the qualifier
-    ** later will be transfered to the function itself. If it's a pointer to
-    ** something else, it will be flagged as an error.
+    ** or token to the right.
     */
-    TypeCode Qualifiers = OptionalQualifiers (T_QUAL_NONE, T_QUAL_ADDRSIZE | T_QUAL_CCONV);
+    TypeCode Qualifiers = *RemQ | OptionalQualifiers (*RemQ, T_QUAL_ADDRSIZE | T_QUAL_CCONV);
 
     /* Pointer to something */
     if (CurTok.Tok == TOK_STAR) {
+        /* Qualifiers on the pointer itself */
+        TypeCode Q = T_QUAL_NONE;
 
         /* Skip the star */
         NextToken ();
 
         /* A pointer type cannot be used as an empty declaration */
-        if (Mode == DM_ACCEPT_IDENT) {
-            Mode = DM_NEED_IDENT;
+        if (Mode == DM_IDENT_OR_EMPTY) {
+            Spec->Flags |= DS_NO_EMPTY_DECL;
         }
 
         /* Allow const, restrict, and volatile qualifiers */
-        Qualifiers |= OptionalQualifiers (Qualifiers, T_QUAL_CVR);
+        Q |= OptionalQualifiers (Qualifiers, T_QUAL_CVR);
 
-        /* Parse the type that the pointer points to */
-        Mode = DirectDecl (Spec, D, Mode);
+        /* For convenience, we allow a calling convention also for pointers
+        ** here. If it's a pointer-to-function, the qualifier later will be
+        ** transfered to the function itself. If it's a pointer to something
+        ** else, it will be flagged as an error.
+        */
+        *RemQ = T_QUAL_NONE;
+
+        /* Parse the type that derives from the pointer */
+        DirectDecl (Spec, D, RemQ, Mode);
 
         /* Add the type */
-        AddTypeCodeToDeclarator (D, T_PTR | Qualifiers);
-        return Mode;
+        AddTypeCodeToDeclarator (D, T_PTR | Q | *RemQ);
+
+        /* Return the calling convention and address size specifiers on the
+        ** pointee type.
+        */
+        *RemQ = Qualifiers;
+        return;
     }
 
     if (CurTok.Tok == TOK_LPAREN) {
-        NextToken ();
+        int       Nested = 0;
+        SymEntry* Entry;
+
         /* An empty declaration cannot contain parentheses where an identifier
         ** would show up if it were a non-empty declaration.
         */
-        if (Mode == DM_ACCEPT_IDENT) {
-            Mode = DM_NEED_IDENT;
+        if (Mode == DM_IDENT_OR_EMPTY) {
+            Spec->Flags |= DS_NO_EMPTY_DECL;
         }
-        Mode = DirectDecl (Spec, D, Mode);
-        ConsumeRParen ();
+
+        /* Skip the opening paren */
+        NextToken ();
+
+        /* We have to disambiguate the meanings of 'type (identifier' when
+        ** the identifier can be a typedef'ed parameter type specifier or
+        ** a declarator enclosed in parentheses in some cases.
+        */
+        if (Mode == DM_IDENT_OR_EMPTY ||                /* If we are in a declaration... */
+            CurTok.Tok == TOK_LPAREN  ||                /* or the next token is one more paren... */
+            CurTok.Tok == TOK_STAR    ||                /* or a '*' ... */
+            (CurTok.Tok == TOK_IDENT &&                 /* or an identifier that... */
+             ((Entry = FindSym (CurTok.Ident)) == 0 ||  /* is not a typedef. */
+              !SymIsTypeDef (Entry)))) {
+            Nested = 1;
+        } else {
+            /* Check for qualifiers */
+            TypeCode Q = OptionalQualifiers (T_QUAL_NONE, T_QUAL_ADDRSIZE | T_QUAL_CCONV);
+
+            if (Q != T_QUAL_NONE) {
+                Qualifiers |= Q;
+                Nested = 1;
+            }
+        }
+
+        if (Nested) {
+            /* Parse the direct declarator in parentheses */
+            DirectDecl (Spec, D, &Qualifiers, Mode);
+            ConsumeRParen ();
+        } else {
+            /* This is a parameter type list in parentheses */
+            ParseFuncDecl (D, Mode, Qualifiers);
+
+            /* Qualifiers now used */
+            Qualifiers = T_QUAL_NONE;
+        }
+
     } else if (CurTok.Tok == TOK_IDENT) {
+        if (Mode == DM_NO_IDENT) {
+            Error ("Unexpected identifier in type name");
+        }
         strcpy (D->Ident, CurTok.Ident);
         NextToken ();
     } else {
         D->Ident[0] = '\0';
-        if (Mode == DM_NEED_IDENT) {
-            Error ("Identifier expected");
+        if (CurTok.Tok != TOK_LBRACK &&
+            ((Spec->Flags & DS_ALLOW_BITFIELD) == 0 || CurTok.Tok != TOK_COLON)) {
+            if ((Spec->Flags & DS_TYPE_MASK) == DS_DEF_TYPE) {
+                Error ("Declaration specifier or identifier expected");
+            } else if ((Spec->Flags & DS_NO_EMPTY_DECL) != 0) {
+                Error ("Identifier expected");
+            }
         }
     }
 
     while (CurTok.Tok == TOK_LBRACK || CurTok.Tok == TOK_LPAREN) {
-        /* An array or function type cannot be used as an empty declaration */
-        if (Mode == DM_ACCEPT_IDENT && D->Ident[0] == '\0') {
-            Mode = DM_NEED_IDENT;
-            Error ("Identifier expected");
-        }
-
         if (CurTok.Tok == TOK_LPAREN) {
+            /* Skip the opening paren */
+            NextToken ();
 
             /* Function declarator */
-            FuncDesc* F;
-            SymEntry* PrevEntry;
-
-            /* Parse the function declarator */
-            F = ParseFuncDecl ();
-
-            /* We cannot specify fastcall for variadic functions */
-            if ((F->Flags & FD_VARIADIC) && (Qualifiers & T_QUAL_FASTCALL)) {
-                Error ("Variadic functions cannot be __fastcall__");
-                Qualifiers &= ~T_QUAL_FASTCALL;
-            }
-
-            /* Was there a previous entry? If so, copy WrappedCall info from it */
-            PrevEntry = FindGlobalSym (D->Ident);
-            if (PrevEntry && PrevEntry->Flags & SC_FUNC) {
-                FuncDesc* D = GetFuncDesc (PrevEntry->Type);
-                if (D->WrappedCall && !F->WrappedCall) {
-                    F->WrappedCall = D->WrappedCall;
-                    F->WrappedCallData = D->WrappedCallData;
-                }
-            }
-
-            /* Add the function type. Be sure to bounds check the type buffer */
-            NeedTypeSpace (D, 1);
-            D->Type[D->Index].C = T_FUNC | Qualifiers;
-            D->Type[D->Index].A.F = F;
-            ++D->Index;
+            ParseFuncDecl (D, Mode, Qualifiers);
 
             /* Qualifiers now used */
             Qualifiers = T_QUAL_NONE;
-
         } else {
             /* Array declarator */
             long Size = UNSPECIFIED;
 
+            /* An array type cannot be used as an empty declaration */
+            if (Mode == DM_IDENT_OR_EMPTY) {
+                Spec->Flags |= DS_NO_EMPTY_DECL;
+                if (D->Ident[0] == '\0') {
+                    if ((Spec->Flags & DS_TYPE_MASK) != DS_NONE) {
+                        Error ("Identifier or ';' expected after declaration specifiers");
+                    } else {
+                        Error ("Identifier expected");
+                    }
+                }
+            }
+
             /* We cannot have any qualifiers for an array */
             if (Qualifiers != T_QUAL_NONE) {
                 Error ("Invalid qualifiers for array");
@@ -2180,21 +2310,7 @@ static declmode_t DirectDecl (const DeclSpec* Spec, Declarator* D, declmode_t Mo
         }
     }
 
-    /* If we have remaining qualifiers, flag them as invalid */
-    if (Qualifiers & T_QUAL_NEAR) {
-        Error ("Invalid '__near__' qualifier");
-    }
-    if (Qualifiers & T_QUAL_FAR) {
-        Error ("Invalid '__far__' qualifier");
-    }
-    if (Qualifiers & T_QUAL_FASTCALL) {
-        Error ("Invalid '__fastcall__' qualifier");
-    }
-    if (Qualifiers & T_QUAL_CDECL) {
-        Error ("Invalid '__cdecl__' qualifier");
-    }
-
-    return Mode;
+    *RemQ = Qualifiers;
 }
 
 
@@ -2206,20 +2322,41 @@ static declmode_t DirectDecl (const DeclSpec* Spec, Declarator* D, declmode_t Mo
 
 
 Type* ParseType (Type* T)
-/* Parse a complete type specification */
+/* Parse a complete type specification in parentheses */
 {
     DeclSpec Spec;
     Declarator Decl;
+    int NeedClean = -1;
+
+    /* Skip the left paren */
+    NextToken ();
 
     /* Get a type without a default */
     InitDeclSpec (&Spec);
-    ParseTypeSpec (&Spec, TS_DEFAULT_TYPE_NONE, NULL);
+    ParseTypeSpec (&Spec, TS_DEFAULT_TYPE_NONE);
 
-    /* Parse additional declarators */
-    ParseDecl (&Spec, &Decl, DM_NO_IDENT);
+    /* Only parse further if there is a type specifier */
+    if ((Spec.Flags & DS_TYPE_MASK) != DS_NONE) {
+        /* Parse additional declarators */
+        NeedClean = ParseDecl (&Spec, &Decl, DM_NO_IDENT);
 
-    /* Copy the type to the target buffer */
-    TypeCopy (T, Decl.Type);
+        /* Copy the type to the target buffer */
+        TypeCopy (T, Decl.Type);
+    } else {
+        /* Fail-safe */
+        TypeCopy (T, type_int);
+    }
+
+    /* Try some smart error recovery */
+    if (NeedClean < 0) {
+        SimpleErrorSkip ();
+    }
+
+    /* Closing paren */
+    if (!ConsumeRParen ()) {
+        SimpleErrorSkip ();
+        NextToken ();
+    }
 
     /* Return a pointer to the target buffer */
     return T;
@@ -2227,27 +2364,47 @@ Type* ParseType (Type* T)
 
 
 
-int ParseDecl (const DeclSpec* Spec, Declarator* D, declmode_t Mode)
+int ParseDecl (DeclSpec* Spec, Declarator* D, declmode_t Mode)
 /* Parse a variable, type or function declarator. Return -1 if this stops at
-** an unpaired right parenthesis/bracket/curly brace.
+** an unpaired right parenthesis/bracket/curly brace. Return 0 if this stops
+** after consuming a semicolon or closing curly brace, or reaching an EOF.
+** Return 1 otherwise.
 */
 {
+    TypeCode Q = T_QUAL_NONE;
+
     /* Used to check if we have any errors during parsing this */
     unsigned PrevErrorCount = ErrorCount;
 
+    /* If there is no explicit type specifier, an optional identifier becomes
+    ** required.
+    */
+    if (Mode == DM_IDENT_OR_EMPTY &&
+        (Spec->Flags & DS_TYPE_MASK) == DS_DEF_TYPE) {
+        Spec->Flags |= DS_NO_EMPTY_DECL;
+    }
+
     /* Initialize the Declarator struct */
     InitDeclarator (D);
 
     /* Get additional derivation of the declarator and the identifier */
-    DirectDecl (Spec, D, Mode);
+    DirectDecl (Spec, D, &Q, Mode);
 
     /* Add the base type */
     NeedTypeSpace (D, TypeLen (Spec->Type) + 1);        /* Bounds check */
     TypeCopy (D->Type + D->Index, Spec->Type);
+    D->Type[D->Index].C |= Q;
 
     /* Use the storage class from the declspec */
     D->StorageClass = Spec->StorageClass;
 
+    /* If we have a function, add a special symbol type */
+    if (Mode != DM_ACCEPT_PARAM_IDENT   &&
+        IsTypeFunc (D->Type)            &&
+        (D->StorageClass & SC_TYPEMASK) == SC_NONE) {
+        D->StorageClass |= SC_FUNC;
+    }
+
     /* Do several fixes on qualifiers */
     FixQualifiers (D->Type);
 
@@ -2262,56 +2419,83 @@ int ParseDecl (const DeclSpec* Spec, Declarator* D, declmode_t Mode)
     /* Parse attributes for this declarator */
     ParseAttribute (D);
 
-    /* If we have a function, add a special storage class */
-    if (IsTypeFunc (D->Type)) {
+    /* Check a few things for the instance (rather than the type) */
+    if (D->Ident[0] != '\0') {
+        /* Check a few pre-C99 things */
+        if ((Spec->Flags & DS_TYPE_MASK) == DS_DEF_TYPE && IsRankInt (Spec->Type)) {
+            /* If the standard was not set explicitly to C89, print a warning
+            ** for typedefs with implicit int type specifier.
+            */
+            if (IS_Get (&Standard) >= STD_C99) {
+                if ((D->StorageClass & SC_TYPEMASK) != SC_TYPEDEF) {
+                    Warning ("Implicit 'int' type specifier is an obsolete feature");
+                } else {
+                    Warning ("Type specifier defaults to 'int' in typedef of '%s'",
+                             D->Ident);
+                    Note ("Implicit 'int' type specifier is an obsolete feature");
+                }
+            }
+        }
 
-        D->StorageClass |= SC_FUNC;
+        /* Check other things depending on the "kind" of the instance */
+        if ((D->StorageClass & SC_TYPEMASK) == SC_FUNC) {
+            /* Special handling for main() */
+            if (strcmp (D->Ident, "main") == 0) {
+                /* main() cannot be a fastcall function */
+                if (IsQualFastcall (D->Type)) {
+                    Error ("'main' cannot be declared __fastcall__");
+                }
 
-    } else if (!IsTypeVoid (D->Type)) {
-        /* Check the size of the generated type */
+                /* main() cannot be an inline function */
+                if ((D->StorageClass & SC_INLINE) == SC_INLINE) {
+                    Error ("'main' cannot be declared inline");
+                    D->StorageClass &= ~SC_INLINE;
+                }
+
+                /* Check return type */
+                if (GetUnqualRawTypeCode (GetFuncReturnType (D->Type)) != T_INT) {
+                    /* If cc65 extensions aren't enabled, don't allow a main function
+                    ** that doesn't return an int.
+                    */
+                    if (IS_Get (&Standard) != STD_CC65) {
+                        Error ("'main' must always return an int");
+                    }
+                }
+            }
+        } else if (Mode != DM_ACCEPT_PARAM_IDENT &&
+                   (D->StorageClass & SC_INLINE) == SC_INLINE) {
+            /* 'inline' is only allowed on functions */
+            Error ("'inline' on non-function declaration");
+            D->StorageClass &= ~SC_INLINE;
+        }
+    }
+
+    /* Check the size of the declared type */
+    if (IsObjectType (D->Type)) {
         unsigned Size = SizeOf (D->Type);
 
         if (Size >= 0x10000) {
             if (D->Ident[0] != '\0') {
-                Error ("Size of '%s' is invalid (0x%06X)", D->Ident, Size);
+                Error ("Size of '%s' is too large (0x%06X)", D->Ident, Size);
             } else {
-                Error ("Invalid size in declaration (0x%06X)", Size);
+                Error ("Size in declaration is too large (0x%06X)", Size);
             }
         }
     }
 
-    /* Check a few pre-C99 things */
-    if (D->Ident[0] != '\0' && (Spec->Flags & DS_DEF_TYPE) != 0) {
-        /* Check and warn about an implicit int return in the function */
-        if (IsTypeFunc (D->Type) && IsRankInt (GetFuncReturnType (D->Type))) {
-            /* Function has an implicit int return. Output a warning if we don't
-            ** have the C89 standard enabled explicitly.
-            */
-            if (IS_Get (&Standard) >= STD_C99) {
-                Warning ("Implicit 'int' return type is an obsolete feature");
-            }
-            GetFuncDesc (D->Type)->Flags |= FD_OLDSTYLE_INTRET;
-        }
-
-        /* For anything that is not a function or typedef, check for an implicit
-        ** int declaration.
-        */
-        if ((D->StorageClass & SC_FUNC) != SC_FUNC &&
-            (D->StorageClass & SC_TYPEMASK) != SC_TYPEDEF) {
-            /* If the standard was not set explicitly to C89, print a warning
-            ** for variables with implicit int type.
-            */
-            if (IS_Get (&Standard) >= STD_C99) {
-                Warning ("Implicit 'int' is an obsolete feature");
-            }
-        }
+    /* An empty declaration must be terminated with a semicolon */
+    if (PrevErrorCount == ErrorCount &&
+        Mode == DM_IDENT_OR_EMPTY &&
+        D->Ident[0] == '\0' &&
+        CurTok.Tok != TOK_SEMI &&
+        ((Spec->Flags & DS_ALLOW_BITFIELD) == 0 || CurTok.Tok != TOK_COLON)) {
+        Error ("Identifier or ';' expected after declaration specifiers");
     }
 
     if (PrevErrorCount != ErrorCount) {
-        if ((Spec->Flags & DS_DEF_TYPE) == 0 && Mode == DM_NEED_IDENT && D->Ident[0] == '\0') {
-            /* Make the declaration fictitious if is is not parsed correctly */
-            D->StorageClass |= SC_FICTITIOUS;
-
+        if ((Spec->Flags & DS_TYPE_MASK) != DS_DEF_TYPE &&
+            (Spec->Flags & DS_NO_EMPTY_DECL) != 0       &&
+            D->Ident[0] == '\0') {
             /* Use a fictitious name for the identifier if it is missing */
             const char* Level = "";
 
@@ -2331,15 +2515,23 @@ int ParseDecl (const DeclSpec* Spec, Declarator* D, declmode_t Mode)
                     break;
             }
             AnonName (D->Ident, Level);
+
+            /* Make the declarator fictitious */
+            D->StorageClass |= SC_FICTITIOUS;
         }
 
         /* Try some smart error recovery */
-        if (CurTok.Tok != TOK_LCURLY || !IsTypeFunc (D->Type)) {
-            return SmartErrorSkip ();
+        if (Mode == DM_NO_IDENT) {
+            return SimpleErrorSkip ();
+        } else if (CurTok.Tok != TOK_LCURLY || !IsTypeFunc (D->Type)) {
+            /* Skip to the end of the whole declaration if it is not part of a
+            ** parameter list.
+            */
+            return SmartErrorSkip (Mode == DM_IDENT_OR_EMPTY);
         }
     }
 
-    return 0;
+    return 1;
 }
 
 
@@ -2354,12 +2546,12 @@ void ParseDeclSpec (DeclSpec* Spec, typespec_t TSFlags, unsigned DefStorage)
     Spec->Flags &= ~DS_DEF_STORAGE;
 
     /* Parse the type specifiers */
-    ParseTypeSpec (Spec, TSFlags | TS_STORAGE_CLASS_SPEC | TS_FUNCTION_SPEC, NULL);
+    ParseTypeSpec (Spec, TSFlags | TS_STORAGE_CLASS_SPEC);
 
     /* If no explicit storage class is given, use the default */
-    if (Spec->StorageClass == 0) {
+    if ((Spec->StorageClass & SC_STORAGEMASK) == 0) {
         Spec->Flags |= DS_DEF_STORAGE;
-        Spec->StorageClass = DefStorage;
+        Spec->StorageClass |= DefStorage;
     }
 }
 
@@ -2371,7 +2563,25 @@ void CheckEmptyDecl (const DeclSpec* Spec)
 ** warning if not.
 */
 {
-    if ((Spec->Flags & DS_EXTRA_TYPE) == 0) {
+    if ((Spec->StorageClass & SC_INLINE) == SC_INLINE) {
+        Error ("'inline' on empty declaration");
+    } else if ((Spec->Flags & DS_TYPE_MASK) == DS_NONE) {
+        /* No declaration at all */
+    } else if ((Spec->Flags & DS_EXTRA_TYPE) == 0) {
+        /* Empty declaration of basic types */
         Warning ("Useless declaration");
+    } else if (IsAnonStructClass (Spec->Type)) {
+        /* This could be that the user made a wrong attempt to declare an
+        ** anonymous struct/union field outside a struct/union.
+        */
+        Warning ("Unnamed %s that defines no instances", GetBasicTypeName (Spec->Type));
+    } else if (GetLexicalLevel () == LEX_LEVEL_STRUCT) {
+        /* This could be that the user made a wrong attempt to declare an
+        ** anonymous struct/union field inside a struct/union. Perhaps just
+        ** paranoid since it is not so uncommon to do forward declarations.
+        */
+        if (!IsTypeEnum (Spec->Type) || ((Spec->Flags & DS_NEW_TYPE_DEF) == 0)) {
+            Warning ("Declaration defines no instances");
+        }
     }
 }
diff --git a/src/cc65/declare.h b/src/cc65/declare.h
index add86594d..4cfc48c68 100644
--- a/src/cc65/declare.h
+++ b/src/cc65/declare.h
@@ -65,18 +65,26 @@ enum typespec_t {
     TS_DEFAULT_TYPE_AUTO    = 0x02,     /* C23 type inference with auto */
 
     /* Whether to allow certain kinds of specifiers */
-    TS_STORAGE_CLASS_SPEC   = 0x04,    /* Allow storage storage class specifiers */
-    TS_FUNCTION_SPEC        = 0x08,    /* Allow function specifiers */
+    TS_STORAGE_CLASS_SPEC   = 0x04,     /* Allow storage class specifiers */
+    TS_FUNCTION_SPEC        = 0x08,     /* Allow function specifiers */
 };
 
 /* Masks for the Flags field in DeclSpec */
+#define DS_NONE                 0x0000U /* Nothing specified or used    */
 #define DS_DEF_STORAGE          0x0001U /* Default storage class used   */
-#define DS_NO_TYPE              0x0002U /* No type explicitly specified */
-#define DS_DEF_TYPE             0x0006U /* Default type used            */
-#define DS_EXTRA_TYPE           0x0008U /* Extra type declared          */
+#define DS_EXPLICIT_TYPE        0x0002U /* Type specified               */
+#define DS_DEF_TYPE             0x0004U /* Implicit type used           */
+#define DS_AUTO_TYPE            0x0006U /* C23 auto type used           */
+#define DS_TYPE_MASK            0x0006U /* Mask for type of spec decl   */
+#define DS_EXTRA_TYPE           0x0008U /* ESU type in declaration      */
 #define DS_NEW_TYPE_DECL        0x0010U /* New type declared            */
 #define DS_NEW_TYPE_DEF         0x0020U /* New type defined             */
 #define DS_NEW_TYPE             (DS_NEW_TYPE_DECL | DS_NEW_TYPE_DEF)
+#define DS_EXPLICIT_SIGNEDNESS  0x0040U /* Signedness specified         */
+#define DS_NO_EMPTY_DECL        0x0100U /* Disallow empty declaration   */
+#define DS_ALLOW_BITFIELD       0x0200U /* Allow anonymous bit-fields   */
+
+
 
 /* Result of ParseDeclSpec */
 typedef struct DeclSpec DeclSpec;
@@ -99,24 +107,22 @@ struct Declarator {
 };
 
 /* Modes for ParseDecl:
-**  - DM_NEED_IDENT means:
-**      we *must* have a type and a variable identifer.
+**  - DM_IDENT_OR_EMPTY means:
+**      we *may* have an identifier, or none. If it is the latter case,
+**      the type specifier must be used for an empty declaration,
+**      or it is an error.
 **  - DM_NO_IDENT means:
 **      we must have a type but no variable identifer
 **      (if there is one, it's not read).
-**  - DM_ACCEPT_IDENT means:
-**      we *may* have an identifier, or none. If it is the latter case,
-**      the type must be used as an empty declaration, or it is an error.
-**      Note: this is used for struct/union members.
-**  - DM_IGNORE_IDENT means:
+**      Note: this is used for type names.
+**  - DM_ACCEPT_PARAM_IDENT means:
 **      we *may* have an identifier. If there is an identifier,
 **      it is read, but it is no error, if there is none.
 **      Note: this is used for function parameter type lists.
 */
 typedef enum {
-    DM_NEED_IDENT,
+    DM_IDENT_OR_EMPTY,
     DM_NO_IDENT,
-    DM_ACCEPT_IDENT,
     DM_ACCEPT_PARAM_IDENT,
 } declmode_t;
 
@@ -128,18 +134,14 @@ typedef enum {
 
 
 
-int SmartErrorSkip (void);
-/* Try some smart error recovery. Skip tokens until either a comma or semicolon
-** that is not enclosed in an open parenthesis/bracket/curly brace, or until an
-** unpaired right parenthesis/bracket/curly brace is reached. Return 0 if it is
-** the former case, or -1 if it is the latter case. */
-
 Type* ParseType (Type* Type);
-/* Parse a complete type specification */
+/* Parse a complete type specification in parentheses */
 
-int ParseDecl (const DeclSpec* Spec, Declarator* D, declmode_t Mode);
+int ParseDecl (DeclSpec* Spec, Declarator* D, declmode_t Mode);
 /* Parse a variable, type or function declarator. Return -1 if this stops at
-** an unpaired right parenthesis/bracket/curly brace.
+** an unpaired right parenthesis/bracket/curly brace. Return 0 if this stops
+** after consuming a semicolon or closing curly brace, or reaching an EOF.
+** Return 1 otherwise.
 */
 
 void ParseDeclSpec (DeclSpec* Spec, typespec_t TSFlags, unsigned DefStorage);
diff --git a/src/cc65/error.c b/src/cc65/error.c
index 2ad7133ed..ae2d6f27d 100644
--- a/src/cc65/error.c
+++ b/src/cc65/error.c
@@ -39,6 +39,7 @@
 
 /* common */
 #include "coll.h"
+#include "debugflag.h"
 #include "print.h"
 #include "strbuf.h"
 
@@ -59,8 +60,10 @@
 
 
 /* Count of errors/warnings */
-unsigned ErrorCount     = 0;
-unsigned WarningCount   = 0;
+unsigned PPErrorCount     = 0;  /* Pre-parser errors */
+unsigned PPWarningCount   = 0;  /* Pre-parser warnings */
+unsigned ErrorCount       = 0;  /* Errors occurred in parser and later translation phases */
+unsigned WarningCount     = 0;  /* Warnings occurred in parser and later translation phases */
 unsigned RecentLineNo     = 0;
 unsigned RecentErrorCount = 0;
 
@@ -118,13 +121,46 @@ Collection DiagnosticStrBufs;
 
 
 
+void PrintFileInclusionInfo (const LineInfo* LI)
+/* Print hierarchy of file inclusion */
+{
+    if (LI->IncFiles != 0) {
+        unsigned FileCount = CollCount (LI->IncFiles);
+        if (FileCount > 0) {
+            const char* Str = "In file included from %s:%u%c\n";
+
+            while (FileCount-- > 0) {
+                LineInfoFile* LIF = CollAtUnchecked (LI->IncFiles, FileCount);
+                char C = FileCount > 0 ? ',' : ':';
+
+                fprintf (stderr, Str, LIF->Name, LIF->LineNum, C);
+                Str = "                 from %s:%u%c\n";
+            }
+        }
+    }
+}
+
+
+
+static LineInfo* GetDiagnosticLI (void)
+/* Get the line info where the diagnostic info refers to */
+{
+    if (CurTok.LI) {
+        return CurTok.LI;
+    } else {
+        return GetCurLineInfo ();
+    }
+}
+
+
+
 static const char* GetDiagnosticFileName (void)
 /* Get the source file name where the diagnostic info refers to */
 {
     if (CurTok.LI) {
-        return GetInputName (CurTok.LI);
+        return GetPresumedFileName (CurTok.LI);
     } else {
-        return GetCurrentFilename ();
+        return GetCurrentFileName ();
     }
 }
 
@@ -134,7 +170,7 @@ static unsigned GetDiagnosticLineNum (void)
 /* Get the source line number where the diagnostic info refers to */
 {
     if (CurTok.LI) {
-        return GetInputLine (CurTok.LI);
+        return GetPresumedLineNum (CurTok.LI);
     } else {
         return GetCurrentLineNum ();
     }
@@ -148,11 +184,15 @@ static unsigned GetDiagnosticLineNum (void)
 
 
 
-void Fatal (const char* Format, ...)
+void Fatal_ (const char *file, int line, const char* Format, ...)
 /* Print a message about a fatal error and die */
 {
     va_list ap;
 
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     fprintf (stderr, "%s:%u: Fatal: ", GetDiagnosticFileName (), GetDiagnosticLineNum ());
 
     va_start (ap, Format);
@@ -168,11 +208,15 @@ void Fatal (const char* Format, ...)
 
 
 
-void Internal (const char* Format, ...)
+void Internal_ (const char *file, int line, const char* Format, ...)
 /* Print a message about an internal compiler error and die */
 {
     va_list ap;
 
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     fprintf (stderr, "%s:%u: Internal compiler error:\n",
              GetDiagnosticFileName (), GetDiagnosticLineNum ());
 
@@ -197,10 +241,18 @@ void Internal (const char* Format, ...)
 
 
 
-static void IntError (const char* Filename, unsigned LineNo, const char* Msg, va_list ap)
+static void IntError (errcat_t EC, LineInfo* LI, const char* Msg, va_list ap)
 /* Print an error message - internal function */
 {
-    fprintf (stderr, "%s:%u: Error: ", Filename, LineNo);
+    unsigned LineNo = GetPresumedLineNum (LI);
+
+    /* Print file inclusion if appropriate */
+    if (HasFileInclusionChanged (LI)) {
+        PrintFileInclusionInfo (LI);
+    }
+    RememberCheckedLI (LI);
+
+    fprintf (stderr, "%s:%u: Error: ", GetPresumedFileName (LI), LineNo);
     vfprintf (stderr, Msg, ap);
     fprintf (stderr, "\n");
 
@@ -208,7 +260,11 @@ static void IntError (const char* Filename, unsigned LineNo, const char* Msg, va
         Print (stderr, 1, "Input: %.*s\n", (int) SB_GetLen (Line), SB_GetConstBuf (Line));
     }
 
-    ++ErrorCount;
+    if (EC != EC_PP) {
+        ++ErrorCount;
+    } else {
+        ++PPErrorCount;
+    }
     if (RecentLineNo != LineNo) {
         RecentLineNo = LineNo;
         RecentErrorCount = 0;
@@ -216,41 +272,56 @@ static void IntError (const char* Filename, unsigned LineNo, const char* Msg, va
         ++RecentErrorCount;
     }
 
-    if (RecentErrorCount > 20 || ErrorCount > 200) {
+    if (RecentErrorCount > 20 || GetTotalErrors () > 200) {
         Fatal ("Too many errors");
     }
 }
 
 
 
-void Error (const char* Format, ...)
-/* Print an error message */
-{
-    va_list ap;
-    va_start (ap, Format);
-    IntError (GetDiagnosticFileName (), GetDiagnosticLineNum (), Format, ap);
-    va_end (ap);
-}
-
-
-
-void LIError (const LineInfo* LI, const char* Format, ...)
+void LIError_ (const char *file, int line, errcat_t EC, LineInfo* LI, const char* Format, ...)
 /* Print an error message with the line info given explicitly */
 {
     va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     va_start (ap, Format);
-    IntError (GetInputName (LI), GetInputLine (LI), Format, ap);
+    IntError (EC, LI, Format, ap);
     va_end (ap);
 }
 
 
 
-void PPError (const char* Format, ...)
+void Error_ (const char *file, int line, const char* Format, ...)
+/* Print an error message */
+{
+    va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
+    va_start (ap, Format);
+    IntError (EC_PARSER, GetDiagnosticLI (), Format, ap);
+    va_end (ap);
+}
+
+
+
+void PPError_ (const char *file, int line, const char* Format, ...)
 /* Print an error message. For use within the preprocessor */
 {
     va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     va_start (ap, Format);
-    IntError (GetCurrentFilename(), GetCurrentLineNum(), Format, ap);
+    IntError (EC_PP, GetCurLineInfo (), Format, ap);
     va_end (ap);
 }
 
@@ -262,63 +333,103 @@ void PPError (const char* Format, ...)
 
 
 
-static void IntWarning (const char* Filename, unsigned LineNo, const char* Msg, va_list ap)
+static void IntWarning (errcat_t EC, LineInfo* LI, const char* Msg, va_list ap)
 /* Print a warning message - internal function */
 {
     if (IS_Get (&WarningsAreErrors)) {
 
         /* Treat the warning as an error */
-        IntError (Filename, LineNo, Msg, ap);
+        IntError (EC, LI, Msg, ap);
 
     } else if (IS_Get (&WarnEnable)) {
 
-        fprintf (stderr, "%s:%u: Warning: ", Filename, LineNo);
+        unsigned LineNo = GetPresumedLineNum (LI);
+
+        /* Print file inclusion if appropriate */
+        if (HasFileInclusionChanged (LI)) {
+            PrintFileInclusionInfo (LI);
+        }
+        RememberCheckedLI (LI);
+
+        fprintf (stderr, "%s:%u: Warning: ", GetPresumedFileName (LI), LineNo);
         vfprintf (stderr, Msg, ap);
         fprintf (stderr, "\n");
 
         if (Line) {
             Print (stderr, 1, "Input: %.*s\n", (int) SB_GetLen (Line), SB_GetConstBuf (Line));
         }
-        ++WarningCount;
+
+        if (EC != EC_PP) {
+            ++WarningCount;
+        } else {
+            ++PPWarningCount;
+        }
 
     }
 }
 
 
 
-void Warning (const char* Format, ...)
-/* Print a warning message */
-{
-    va_list ap;
-    va_start (ap, Format);
-    IntWarning (GetDiagnosticFileName (), GetDiagnosticLineNum (), Format, ap);
-    va_end (ap);
-}
-
-
-
-void LIWarning (const LineInfo* LI, const char* Format, ...)
+void LIWarning_ (const char *file, int line, errcat_t EC, LineInfo* LI, const char* Format, ...)
 /* Print a warning message with the line info given explicitly */
 {
     va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     va_start (ap, Format);
-    IntWarning (GetInputName (LI), GetInputLine (LI), Format, ap);
+    IntWarning (EC, LI, Format, ap);
     va_end (ap);
 }
 
 
 
-void PPWarning (const char* Format, ...)
+void Warning_ (const char *file, int line, const char* Format, ...)
+/* Print a warning message */
+{
+    va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
+    va_start (ap, Format);
+    IntWarning (EC_PARSER, GetDiagnosticLI (), Format, ap);
+    va_end (ap);
+}
+
+
+
+void PPWarning_ (const char *file, int line, const char* Format, ...)
 /* Print a warning message. For use within the preprocessor */
 {
     va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     va_start (ap, Format);
-    IntWarning (GetCurrentFilename(), GetCurrentLineNum(), Format, ap);
+    IntWarning (EC_PP, GetCurLineInfo (), Format, ap);
     va_end (ap);
 }
 
 
 
+void UnreachableCodeWarning (void)
+/* Print a warning about unreachable code at the current location if these
+** warnings are enabled.
+*/
+{
+    if (IS_Get (&WarnUnreachableCode)) {
+        Warning ("Unreachable code");
+    }
+}
+
+
+
 IntStack* FindWarning (const char* Name)
 /* Search for a warning in the WarnMap table and return a pointer to the
 ** intstack that holds its state. Return NULL if there is no such warning.
@@ -354,60 +465,93 @@ void ListWarnings (FILE* F)
 
 
 
-static void IntNote (const char* Filename, unsigned LineNo, const char* Msg, va_list ap)
+static void IntNote (const LineInfo* LI, const char* Msg, va_list ap)
 /* Print a note message - internal function */
 {
-    fprintf (stderr, "%s:%u: Note: ", Filename, LineNo);
+    fprintf (stderr, "%s:%u: Note: ", GetPresumedFileName (LI), GetPresumedLineNum (LI));
     vfprintf (stderr, Msg, ap);
     fprintf (stderr, "\n");
 }
 
 
 
-void Note (const char* Format, ...)
-/* Print a note message */
-{
-    va_list ap;
-    va_start (ap, Format);
-    IntNote (GetDiagnosticFileName (), GetDiagnosticLineNum (), Format, ap);
-    va_end (ap);
-}
-
-
-
-void LINote (const LineInfo* LI, const char* Format, ...)
+void LINote_ (const char *file, int line, const LineInfo* LI, const char* Format, ...)
 /* Print a note message with the line info given explicitly */
 {
     va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     va_start (ap, Format);
-    IntNote (GetInputName (LI), GetInputLine (LI), Format, ap);
+    IntNote (LI, Format, ap);
     va_end (ap);
 }
 
 
 
-void PPNote (const char* Format, ...)
+void Note_ (const char *file, int line, const char* Format, ...)
+/* Print a note message */
+{
+    va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
+    va_start (ap, Format);
+    IntNote (GetDiagnosticLI (), Format, ap);
+    va_end (ap);
+}
+
+
+
+void PPNote_ (const char *file, int line, const char* Format, ...)
 /* Print a note message. For use within the preprocessor */
 {
     va_list ap;
+
+    if (Debug) {
+        fprintf(stderr, "[%s:%d] ", file, line);
+    }
+
     va_start (ap, Format);
-    IntNote (GetCurrentFilename(), GetCurrentLineNum(), Format, ap);
+    IntNote (GetDiagnosticLI (), Format, ap);
     va_end (ap);
 }
 
 
 
 /*****************************************************************************/
-/*                                   Code                                    */
+/*                               Error summary                               */
 /*****************************************************************************/
 
 
 
+unsigned GetTotalErrors (void)
+/* Get total count of errors of all categories */
+{
+    return PPErrorCount + ErrorCount;
+}
+
+
+
+unsigned GetTotalWarnings (void)
+/* Get total count of warnings of all categories */
+{
+    return PPWarningCount + WarningCount;
+}
+
+
+
 void ErrorReport (void)
 /* Report errors (called at end of compile) */
 {
-    unsigned int V = (ErrorCount != 0 ? 0 : 1);
-    Print (stdout, V, "%u errors and %u warnings generated.\n", ErrorCount, WarningCount);
+    unsigned TotalErrors = GetTotalErrors ();
+    unsigned TotalWarnings = GetTotalWarnings ();
+    unsigned int V = (TotalErrors != 0 ? 0 : 1);
+    Print (stdout, V, "%u errors and %u warnings generated.\n", TotalErrors, TotalWarnings);
 }
 
 
@@ -428,23 +572,12 @@ void InitDiagnosticStrBufs (void)
 
 void DoneDiagnosticStrBufs (void)
 /* Done with tracked string buffers used for diagnostics */
-{
-    ClearDiagnosticStrBufs ();
-    DoneCollection (&DiagnosticStrBufs);
-}
-
-
-
-void ClearDiagnosticStrBufs (void)
-/* Free all tracked string buffers */
 {
     unsigned I;
-
     for (I = 0; I < CollCount (&DiagnosticStrBufs); ++I) {
         SB_Done (CollAtUnchecked (&DiagnosticStrBufs, I));
     }
-
-    CollDeleteAll (&DiagnosticStrBufs);
+    DoneCollection (&DiagnosticStrBufs);
 }
 
 
diff --git a/src/cc65/error.h b/src/cc65/error.h
index 83be8c782..0a18d51a4 100644
--- a/src/cc65/error.h
+++ b/src/cc65/error.h
@@ -55,9 +55,20 @@
 
 
 
+/* Error categories */
+typedef enum errcat_t errcat_t;
+enum errcat_t {
+    EC_PP,      /* Pre-parser phases */
+    EC_PARSER,  /* Parser and later phases */
+};
+
+
+
 /* Count of errors/warnings */
-extern unsigned ErrorCount;
-extern unsigned WarningCount;
+extern unsigned PPErrorCount;           /* Pre-parser errors */
+extern unsigned PPWarningCount;         /* Pre-parser warnings */
+extern unsigned ErrorCount;             /* Errors occurred in parser and later translation phases */
+extern unsigned WarningCount;           /* Warnings occurred in parser and later translation phases */
 
 /* Warning and error options */
 extern IntStack WarnEnable;             /* Enable warnings */
@@ -89,30 +100,46 @@ struct StrBuf;
 
 
 
-void Fatal (const char* Format, ...) attribute ((noreturn, format (printf, 1, 2)));
+void PrintFileInclusionInfo (const LineInfo* LI);
+/* Print hierarchy of file inclusion */
+
+void Fatal_ (const char *file, int line, const char* Format, ...) attribute ((noreturn, format (printf, 3, 4)));
+#define Fatal(...) Fatal_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a message about a fatal error and die */
 
-void Internal (const char* Format, ...) attribute ((noreturn, format (printf, 1, 2)));
+void Internal_ (const char *file, int line, const char* Format, ...) attribute ((noreturn, format (printf, 3, 4)));
+#define Internal(...) Internal_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a message about an internal compiler error and die */
 
-void Error (const char* Format, ...) attribute ((format (printf, 1, 2)));
+void Error_ (const char *file, int line, const char* Format, ...) attribute ((format (printf, 3, 4)));
+#define Error(...) Error_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print an error message */
 
-void LIError (const LineInfo* LI, const char* Format, ...) attribute ((format (printf, 2, 3)));
+void LIError_ (const char *file, int line, errcat_t EC, LineInfo* LI, const char* Format, ...) attribute ((format (printf, 5, 6)));
+#define LIError(...) LIError_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print an error message with the line info given explicitly */
 
-void PPError (const char* Format, ...) attribute ((format (printf, 1, 2)));
+void PPError_ (const char *file, int line, const char* Format, ...) attribute ((format (printf, 3, 4)));
+#define PPError(...) PPError_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print an error message. For use within the preprocessor */
 
-void Warning (const char* Format, ...) attribute ((format (printf, 1, 2)));
+void Warning_ (const char *file, int line, const char* Format, ...) attribute ((format (printf, 3, 4)));
+#define Warning(...) Warning_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a warning message */
 
-void LIWarning (const LineInfo* LI, const char* Format, ...) attribute ((format (printf, 2, 3)));
+void LIWarning_ (const char *file, int line, errcat_t EC, LineInfo* LI, const char* Format, ...) attribute ((format (printf, 5, 6)));
+#define LIWarning(...) LIWarning_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a warning message with the line info given explicitly */
 
-void PPWarning (const char* Format, ...) attribute ((format (printf, 1, 2)));
+void PPWarning_ (const char *file, int line, const char* Format, ...) attribute ((format (printf, 3, 4)));
+#define PPWarning(...) PPWarning_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a warning message. For use within the preprocessor */
 
+void UnreachableCodeWarning (void);
+/* Print a warning about unreachable code at the current location if these
+** warnings are enabled.
+*/
+
 IntStack* FindWarning (const char* Name);
 /* Search for a warning in the WarnMap table and return a pointer to the
 ** intstack that holds its state. Return NULL if there is no such warning.
@@ -121,15 +148,24 @@ IntStack* FindWarning (const char* Name);
 void ListWarnings (FILE* F);
 /* Print a list of warning types/names to the given file */
 
-void Note (const char* Format, ...) attribute ((format (printf, 1, 2)));
+void Note_ (const char *file, int line, const char* Format, ...) attribute ((format (printf, 3, 4)));
+#define Note(...) Note_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a note message */
 
-void LINote (const LineInfo* LI, const char* Format, ...) attribute ((format (printf, 2, 3)));
+void LINote_ (const char *file, int line, const LineInfo* LI, const char* Format, ...) attribute ((format (printf, 4, 5)));
+#define LINote(...) LINote_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a note message with the line info given explicitly */
 
-void PPNote (const char* Format, ...) attribute ((format (printf, 1, 2)));
+void PPNote_ (const char *file, int line, const char* Format, ...) attribute ((format (printf, 3, 4)));
+#define PPNote(...) PPNote_(__FILE__, __LINE__, __VA_ARGS__)
 /* Print a note message. For use within the preprocessor */
 
+unsigned GetTotalErrors (void);
+/* Get total count of errors of all categories */
+
+unsigned GetTotalWarnings (void);
+/* Get total count of warnings of all categories */
+
 void ErrorReport (void);
 /* Report errors (called at end of compile) */
 
@@ -139,9 +175,6 @@ void InitDiagnosticStrBufs (void);
 void DoneDiagnosticStrBufs (void);
 /* Done with tracked string buffers used for diagnostics */
 
-void ClearDiagnosticStrBufs (void);
-/* Free all tracked string buffers */
-
 struct StrBuf* NewDiagnosticStrBuf (void);
 /* Get a new tracked string buffer */
 
diff --git a/src/cc65/expr.c b/src/cc65/expr.c
index 6d4b04892..2939ab1cc 100644
--- a/src/cc65/expr.c
+++ b/src/cc65/expr.c
@@ -129,7 +129,7 @@ unsigned CG_TypeOf (const Type* T)
 {
     unsigned CG_Type;
 
-    switch (GetUnqualTypeCode (T)) {
+    switch (GetUnderlyingTypeCode (T)) {
 
         case T_SCHAR:
             return CF_CHAR;
@@ -188,7 +188,7 @@ unsigned CG_TypeOf (const Type* T)
 unsigned CG_CallFlags (const Type* T)
 /* Get the code generator flags for calling the function */
 {
-    if (GetUnqualTypeCode (T) == T_FUNC) {
+    if (GetUnderlyingTypeCode (T) == T_FUNC) {
         return (T->A.F->Flags & FD_VARIADIC) ? 0 : CF_FIXARGC;
     } else {
         Error ("Illegal function type %04lX", T->C);
@@ -291,7 +291,7 @@ static unsigned typeadjust (ExprDesc* lhs, const ExprDesc* rhs, int NoPush)
 void LimitExprValue (ExprDesc* Expr, int WarnOverflow)
 /* Limit the constant value of the expression to the range of its type */
 {
-    switch (GetUnqualTypeCode (Expr->Type)) {
+    switch (GetUnderlyingTypeCode (Expr->Type)) {
         case T_INT:
         case T_SHORT:
             if (WarnOverflow && ((Expr->IVal < -0x8000) || (Expr->IVal > 0x7FFF))) {
@@ -1057,11 +1057,6 @@ static void FunctionCall (ExprDesc* Expr)
 
     /* Special handling for function pointers */
     if (IsFuncPtr) {
-
-        if (Func->WrappedCall) {
-            Warning ("Calling a wrapped function via a pointer, wrapped-call will not be used");
-        }
-
         /* If the function is not a fastcall function, load the pointer to
         ** the function into the primary.
         */
@@ -1110,18 +1105,18 @@ static void FunctionCall (ExprDesc* Expr)
     } else {
 
         /* Normal function */
-        if (Func->WrappedCall) {
+        if (Expr->Sym && Expr->Sym->V.F.WrappedCall) {
             char tmp[64];
             StrBuf S = AUTO_STRBUF_INITIALIZER;
 
-            if (Func->WrappedCallData == WRAPPED_CALL_USE_BANK) {
+            if (Expr->Sym->V.F.WrappedCallData == WRAPPED_CALL_USE_BANK) {
                 /* Store the bank attribute in tmp4 */
                 SB_AppendStr (&S, "ldy #<.bank(_");
                 SB_AppendStr (&S, (const char*) Expr->Name);
                 SB_AppendChar (&S, ')');
             } else {
                 /* Store the WrappedCall data in tmp4 */
-                sprintf(tmp, "ldy #%u", Func->WrappedCallData);
+                sprintf(tmp, "ldy #%u", Expr->Sym->V.F.WrappedCallData);
                 SB_AppendStr (&S, tmp);
             }
             g_asmcode (&S);
@@ -1154,7 +1149,7 @@ static void FunctionCall (ExprDesc* Expr)
 
             SB_Done (&S);
 
-            g_call (CG_CallFlags (Expr->Type), Func->WrappedCall->Name, ArgSize);
+            g_call (CG_CallFlags (Expr->Type), Expr->Sym->V.F.WrappedCall->Name, ArgSize);
         } else {
             g_call (CG_CallFlags (Expr->Type), (const char*) Expr->Name, ArgSize);
         }
@@ -1224,20 +1219,22 @@ static void Primary (ExprDesc* E)
             /* Is the symbol known? */
             if (Sym) {
 
-                /* We found the symbol - skip the name token */
-                NextToken ();
-
                 /* Check for illegal symbol types */
-                CHECK ((Sym->Flags & SC_LABEL) != SC_LABEL);
-                if (Sym->Flags & SC_ESUTYPEMASK) {
+                CHECK ((Sym->Flags & SC_TYPEMASK) != SC_LABEL);
+                if ((Sym->Flags & SC_TYPEMASK) == SC_TYPEDEF) {
                     /* Cannot use type symbols */
                     Error ("Variable identifier expected");
                     /* Assume an int type to make E valid */
                     E->Flags = E_LOC_STACK | E_RTYPE_LVAL;
                     E->Type  = type_int;
+                    /* Skip the erroneous token */
+                    NextToken ();
                     break;
                 }
 
+                /* Skip the name token */
+                NextToken ();
+
                 /* Mark the symbol as referenced */
                 Sym->Flags |= SC_REF;
 
@@ -1249,7 +1246,7 @@ static void Primary (ExprDesc* E)
                     /* Enum or some other numeric constant */
                     E->Flags = E_LOC_NONE | E_RTYPE_RVAL;
                     E->IVal  = Sym->V.ConstVal;
-                } else if ((Sym->Flags & SC_AUTO) == SC_AUTO) {
+                } else if ((Sym->Flags & SC_STORAGEMASK) == SC_AUTO) {
                     /* Local variable. If this is a parameter for a variadic
                     ** function, we have to add some address calculations, and the
                     ** address is not const.
@@ -1263,26 +1260,25 @@ static void Primary (ExprDesc* E)
                         E->Flags = E_LOC_STACK | E_RTYPE_LVAL;
                         E->IVal  = Sym->V.Offs;
                     }
-                } else if ((Sym->Flags & SC_FUNC) == SC_FUNC) {
+                } else if ((Sym->Flags & SC_TYPEMASK) == SC_FUNC) {
                     /* Function */
                     E->Flags = E_LOC_GLOBAL | E_RTYPE_LVAL;
                     E->Name  = (uintptr_t) Sym->Name;
-                } else if ((Sym->Flags & SC_REGISTER) == SC_REGISTER) {
+                } else if ((Sym->Flags & SC_STORAGEMASK) == SC_REGISTER) {
                     /* Register variable, zero page based */
                     E->Flags = E_LOC_REGISTER | E_RTYPE_LVAL;
                     E->Name  = Sym->V.R.RegOffs;
-                } else if ((Sym->Flags & SC_STATIC) == SC_STATIC) {
-                    /* Static variable */
-                    if (Sym->Flags & (SC_EXTERN | SC_STORAGE | SC_DECL)) {
-                        E->Flags = E_LOC_GLOBAL | E_RTYPE_LVAL;
-                        E->Name  = (uintptr_t) Sym->Name;
-                    } else {
-                        E->Flags = E_LOC_STATIC | E_RTYPE_LVAL;
-                        E->Name  = Sym->V.L.Label;
-                    }
-                } else {
+                } else if (SymIsGlobal (Sym)) {
+                    /* Global variable */
+                    E->Flags = E_LOC_GLOBAL | E_RTYPE_LVAL;
+                    E->Name  = (uintptr_t) Sym->Name;
+                } else if ((Sym->Flags & SC_STORAGEMASK) == SC_STATIC) {
                     /* Local static variable */
                     E->Flags = E_LOC_STATIC | E_RTYPE_LVAL;
+                    E->Name  = Sym->V.L.Label;
+                } else {
+                    /* Other */
+                    E->Flags = E_LOC_STATIC | E_RTYPE_LVAL;
                     E->Name  = Sym->V.Offs;
                 }
 
@@ -1292,7 +1288,23 @@ static void Primary (ExprDesc* E)
                 ** rvalue, too, because we cannot store anything in a function.
                 ** So fix the flags depending on the type.
                 */
-                if (IsTypeArray (E->Type) || IsTypeFunc (E->Type)) {
+                if (IsTypeArray (E->Type)) {
+                    ED_AddrExpr (E);
+                } else if (IsTypeFunc (E->Type)) {
+                    /* In cc65 mode we cannot call or take the address of
+                    ** main().
+                    */
+                    if (IS_Get (&Standard) == STD_CC65 &&
+                        strcmp (Sym->Name, "main") == 0) {
+                        /* Adjust the error message depending on a call or an
+                        ** address operation.
+                        */
+                        if (CurTok.Tok == TOK_LPAREN) {
+                            Error ("'main' must not be called recursively");
+                        } else {
+                            Error ("The address of 'main' cannot be taken");
+                        }
+                    }
                     ED_AddrExpr (E);
                 }
 
@@ -1316,7 +1328,7 @@ static void Primary (ExprDesc* E)
                     } else {
                         Warning ("Call to undeclared function '%s'", Ident);
                     }
-                    Sym = AddGlobalSym (Ident, GetImplicitFuncType(), SC_EXTERN | SC_REF | SC_FUNC);
+                    Sym = AddGlobalSym (Ident, GetImplicitFuncType(), SC_REF | SC_FUNC);
                     E->Type  = Sym->Type;
                     E->Flags = E_LOC_GLOBAL | E_RTYPE_RVAL;
                     E->Name  = (uintptr_t) Sym->Name;
@@ -1328,6 +1340,7 @@ static void Primary (ExprDesc* E)
                     E->Type  = type_int;
                 }
 
+                E->Sym = Sym;
             }
             break;
 
@@ -1412,27 +1425,11 @@ static void Primary (ExprDesc* E)
             } else {
                 /* Let's see if this is a C99-style declaration */
                 DeclSpec Spec;
-                ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_INT, SC_AUTO);
+                ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_NONE | TS_FUNCTION_SPEC, SC_AUTO);
 
-                if (Spec.Type->C != T_END) {
-                    /* Recognized but not supported */
+                if ((Spec.Flags & DS_TYPE_MASK) != DS_NONE) {
                     Error ("Mixed declarations and code are not supported in cc65");
-
-                    while (CurTok.Tok != TOK_SEMI) {
-                        Declarator Decl;
-
-                        /* Parse one declaration */
-                        ParseDecl (&Spec, &Decl, DM_ACCEPT_IDENT);
-                        if (CurTok.Tok == TOK_ASSIGN) {
-                            NextToken ();
-                            ParseInit (Decl.Type);
-                        }
-                        if (CurTok.Tok == TOK_COMMA) {
-                            NextToken ();
-                        } else {
-                            break;
-                        }
-                    }
+                    SmartErrorSkip (0);
                 } else {
                     Error ("Expression expected");
                     E->Flags |= E_EVAL_MAYBE_UNUSED;
@@ -2011,7 +2008,7 @@ void hie10 (ExprDesc* Expr)
             if (ED_IsConstAbs (Expr)) {
                 /* Constant numeric expression */
                 Expr->IVal = !Expr->IVal;
-            } else if (ED_IsAddrExpr (Expr)) {
+            } else if (ED_IsEntityAddr (Expr)) {
                 /* Address != NULL, so !Address == 0 */
                 ED_MakeConstBool (Expr, 0);
             } else {
@@ -2089,9 +2086,7 @@ void hie10 (ExprDesc* Expr)
             NextToken ();
             if (TypeSpecAhead ()) {
                 Type T[MAXTYPELEN];
-                NextToken ();
                 Size = ExprCheckedSizeOf (ParseType (T));
-                ConsumeRParen ();
             } else {
                 /* Remember the output queue pointer */
                 CodeMark Mark;
@@ -2467,8 +2462,8 @@ static void hie_compare (const GenDesc* Ops,    /* List of generators */
         }
 
         /* Check for numeric constant operands */
-        if ((ED_IsAddrExpr (Expr) && ED_IsNullPtr (&Expr2)) ||
-            (ED_IsNullPtr (Expr) && ED_IsAddrExpr (&Expr2))) {
+        if ((ED_IsEntityAddr (Expr) && ED_IsNullPtr (&Expr2)) ||
+            (ED_IsNullPtr (Expr) && ED_IsEntityAddr (&Expr2))) {
 
             /* Object addresses are inequal to null pointer */
             Expr->IVal = (Tok != TOK_EQ);
@@ -2499,8 +2494,8 @@ static void hie_compare (const GenDesc* Ops,    /* List of generators */
                 pop (ltype);
             }
 
-        } else if (ED_IsAddrExpr (Expr)     &&
-                   ED_IsAddrExpr (&Expr2)   &&
+        } else if (ED_IsEntityAddr (Expr)   &&
+                   ED_IsEntityAddr (&Expr2) &&
                    Expr->Sym == Expr2.Sym) {
 
             /* Evaluate the result for static addresses */
@@ -3295,7 +3290,7 @@ static void parsesub (ExprDesc* Expr)
             /* The right hand side is constant. Check left hand side. */
             if (ED_IsQuasiConst (Expr)) {
                 /* We can't do all 'ptr1 - ptr2' constantly at the moment */
-                if (Expr->Sym == Expr2.Sym) {
+                if (ED_GetLoc (Expr) == ED_GetLoc (&Expr2) && Expr->Sym == Expr2.Sym) {
                     Expr->IVal = (Expr->IVal - Expr2.IVal) / rscale;
                     /* Get rid of unneeded flags etc. */
                     ED_MakeConstAbsInt (Expr, Expr->IVal);
@@ -3966,10 +3961,10 @@ static void hieQuest (ExprDesc* Expr)
         NextToken ();
 
         /* Parse second expression. Remember for later if it is a NULL pointer
-        ** expression, then load it into the primary.
+        ** constant expression, then load it into the primary.
         */
         ExprWithCheck (hie0, &Expr2);
-        Expr2IsNULL = ED_IsNullPtr (&Expr2);
+        Expr2IsNULL = ED_IsNullPtrConstant (&Expr2);
         if (!IsTypeVoid (Expr2.Type)    &&
             ED_YetToLoad (&Expr2)       &&
             (!ConstantCond || !ED_IsConst (&Expr2))) {
@@ -4013,10 +4008,10 @@ static void hieQuest (ExprDesc* Expr)
         ConsumeColon ();
 
         /* Parse third expression. Remember for later if it is a NULL pointer
-        ** expression, then load it into the primary.
+        ** constant expression, then load it into the primary.
         */
         ExprWithCheck (hieQuest, &Expr3);
-        Expr3IsNULL = ED_IsNullPtr (&Expr3);
+        Expr3IsNULL = ED_IsNullPtrConstant (&Expr3);
         if (!IsTypeVoid (Expr3.Type)    &&
             ED_YetToLoad (&Expr3)       &&
             (!ConstantCond || !ED_IsConst (&Expr3))) {
@@ -4102,9 +4097,10 @@ static void hieQuest (ExprDesc* Expr)
                     /* Avoid further errors */
                     ResultType = NewPointerTo (type_void);
                 } else {
-                    /* Result has the composite type */
+                    /* Result has the properly qualified composite type */
                     ResultType = TypeDup (Expr2.Type);
                     TypeComposition (ResultType, Expr3.Type);
+                    ResultType[1].C |= GetQualifier (Indirect (Expr3.Type));
                 }
             }
         } else if (IsClassPtr (Expr2.Type) && Expr3IsNULL) {
@@ -4326,8 +4322,13 @@ ExprDesc NoCodeConstExpr (void (*Func) (ExprDesc*))
     if (!ED_IsConst (&Expr) || !ED_CodeRangeIsEmpty (&Expr)) {
         Error ("Constant expression expected");
         /* To avoid any compiler errors, make the expression a valid const */
-        Expr.Flags &= E_MASK_RTYPE | E_MASK_KEEP_RESULT;
+        Expr.Flags &= E_MASK_RTYPE | E_MASK_KEEP_MAKE;
         Expr.Flags |= E_LOC_NONE;
+
+        /* Remove any non-constant code generated */
+        if (!ED_CodeRangeIsEmpty (&Expr)) {
+            RemoveCodeRange (&Expr.Start, &Expr.End);
+        }
     }
 
     /* Return by value */
@@ -4352,6 +4353,11 @@ ExprDesc NoCodeConstAbsIntExpr (void (*Func) (ExprDesc*))
         Error ("Constant integer expression expected");
         /* To avoid any compiler errors, make the expression a valid const */
         ED_MakeConstAbsInt (&Expr, 1);
+
+        /* Remove any non-constant code generated */
+        if (!ED_CodeRangeIsEmpty (&Expr)) {
+            RemoveCodeRange (&Expr.Start, &Expr.End);
+        }
     }
 
     /* Return by value */
diff --git a/src/cc65/exprdesc.c b/src/cc65/exprdesc.c
index a1af0bb8b..08be1091d 100644
--- a/src/cc65/exprdesc.c
+++ b/src/cc65/exprdesc.c
@@ -255,7 +255,7 @@ int ED_IsConstTrue (const ExprDesc* Expr)
 {
     /* Non-zero arithmetics and objects addresses are boolean true */
     return (ED_IsConstAbsInt (Expr) && Expr->IVal != 0) ||
-           (ED_IsAddrExpr (Expr));
+           ED_IsEntityAddr (Expr);
 }
 
 
@@ -331,12 +331,41 @@ int ED_IsZPInd (const ExprDesc* Expr)
 
 
 int ED_IsNullPtr (const ExprDesc* Expr)
-/* Return true if the given expression is a NULL pointer constant */
+/* Return true if the given expression is a null pointer.
+** Note: A null pointer constant converted to a pointer type is a null pointer.
+*/
 {
-    return (Expr->Flags & (E_MASK_LOC|E_MASK_RTYPE)) ==
-                               (E_LOC_NONE|E_RTYPE_RVAL) &&
-           Expr->IVal == 0                               &&
-           IsClassInt (Expr->Type);
+    return ED_IsConstAbs (Expr) &&
+           Expr->IVal == 0      &&
+           (IsClassInt (Expr->Type) || IsTypePtr (Expr->Type));
+}
+
+
+
+int ED_IsNullPtrConstant (const ExprDesc* Expr)
+/* Return true if the given expression is a null pointer constant.
+** Note: An integer constant expression with value 0, or such an
+** expression cast to void* is a null pointer constant. However, a
+** null pointer constant converted to a pointer type is just a null
+** pointer, not necessarily a constant in ISO C.
+*/
+{
+    return ED_IsConstAbs (Expr) &&
+           Expr->IVal == 0      &&
+           (IsClassInt (Expr->Type) ||
+            (IsTypePtr (Expr->Type) && IsTypeVoid (Expr->Type + 1) &&
+             GetQualifier (Expr->Type + 1) == T_QUAL_NONE));
+}
+
+
+
+int ED_IsEntityAddr (const ExprDesc* Expr)
+/* Return true if the expression denotes the address of an object or function.
+*/
+{
+    return ED_IsAddrExpr (Expr) &&
+           Expr->Sym != 0       &&
+           (IsClassPtr (Expr->Type) || IsTypeFunc (Expr->Type));
 }
 
 
@@ -418,7 +447,7 @@ ExprDesc* ED_FinalizeRValLoad (ExprDesc* Expr)
 
 
 
-ExprDesc* ED_AddrExpr (ExprDesc* Expr)
+void ED_AddrExpr (ExprDesc* Expr)
 /* Take address of Expr. The result is always an rvalue */
 {
     switch (Expr->Flags & E_MASK_LOC) {
@@ -447,12 +476,11 @@ ExprDesc* ED_AddrExpr (ExprDesc* Expr)
             }
             break;
     }
-    return Expr;
 }
 
 
 
-ExprDesc* ED_IndExpr (ExprDesc* Expr)
+void ED_IndExpr (ExprDesc* Expr)
 /* Dereference Expr */
 {
     switch (Expr->Flags & E_MASK_LOC) {
@@ -486,7 +514,6 @@ ExprDesc* ED_IndExpr (ExprDesc* Expr)
             }
             break;
     }
-    return Expr;
 }
 
 
diff --git a/src/cc65/exprdesc.h b/src/cc65/exprdesc.h
index 93a8604c9..d1ff99445 100644
--- a/src/cc65/exprdesc.h
+++ b/src/cc65/exprdesc.h
@@ -98,7 +98,7 @@ enum {
     E_LOC_NONE          = 0x0000,       /* Pure rvalue with no storage */
     E_LOC_ABS           = 0x0001,       /* Absolute numeric addressed variable */
     E_LOC_GLOBAL        = 0x0002,       /* Global variable */
-    E_LOC_STATIC        = 0x0004,       /* Static variable */
+    E_LOC_STATIC        = 0x0004,       /* Local static variable */
     E_LOC_REGISTER      = 0x0008,       /* Register variable */
     E_LOC_STACK         = 0x0010,       /* Value on the stack */
     E_LOC_PRIMARY       = 0x0020,       /* Temporary in primary register */
@@ -582,7 +582,21 @@ int ED_IsZPInd (const ExprDesc* Expr);
 /* Return true if the expression is located on the zeropage */
 
 int ED_IsNullPtr (const ExprDesc* Expr);
-/* Return true if the given expression is a NULL pointer constant */
+/* Return true if the given expression is a null pointer.
+** Note: A null pointer constant converted to a pointer type is a null pointer.
+*/
+
+int ED_IsNullPtrConstant (const ExprDesc* Expr);
+/* Return true if the given expression is a null pointer constant.
+** Note: An integer constant expression with value 0, or such an
+** expression cast to void* is a null pointer constant. However, a
+** null pointer constant converted to a pointer type is just a null
+** pointer, not necessarily a constant in ISO C.
+*/
+
+int ED_IsEntityAddr (const ExprDesc* Expr);
+/* Return true if the expression denotes the address of an object or function.
+*/
 
 int ED_IsBool (const ExprDesc* Expr);
 /* Return true if the expression can be treated as a boolean, that is, it can
@@ -637,10 +651,10 @@ INLINE void ED_MarkExprAsRVal (ExprDesc* Expr)
 #  define ED_MarkExprAsRVal(Expr)   do { (Expr)->Flags &= ~E_RTYPE_LVAL; } while (0)
 #endif
 
-ExprDesc* ED_AddrExpr (ExprDesc* Expr);
+void ED_AddrExpr (ExprDesc* Expr);
 /* Take address of Expr */
 
-ExprDesc* ED_IndExpr (ExprDesc* Expr);
+void ED_IndExpr (ExprDesc* Expr);
 /* Dereference Expr */
 
 #if defined(HAVE_INLINE)
diff --git a/src/cc65/funcdesc.c b/src/cc65/funcdesc.c
index 2291b35ee..de881167d 100644
--- a/src/cc65/funcdesc.c
+++ b/src/cc65/funcdesc.c
@@ -61,8 +61,6 @@ FuncDesc* NewFuncDesc (void)
     F->ParamSize       = 0;
     F->LastParam       = 0;
     F->FuncDef         = 0;
-    F->WrappedCall     = 0;
-    F->WrappedCallData = 0;
 
     /* Return the new struct */
     return F;
diff --git a/src/cc65/funcdesc.h b/src/cc65/funcdesc.h
index e065c7602..8d21d3080 100644
--- a/src/cc65/funcdesc.h
+++ b/src/cc65/funcdesc.h
@@ -70,8 +70,6 @@ struct FuncDesc {
     unsigned            ParamSize;       /* Size of the parameters            */
     struct SymEntry*    LastParam;       /* Pointer to last parameter         */
     struct FuncDesc*    FuncDef;         /* Descriptor used in definition     */
-    struct SymEntry*    WrappedCall;     /* Pointer to the WrappedCall        */
-    unsigned int        WrappedCallData; /* The WrappedCall's user data       */
 };
 
 
diff --git a/src/cc65/function.c b/src/cc65/function.c
index 4b4060f2a..3123079d3 100644
--- a/src/cc65/function.c
+++ b/src/cc65/function.c
@@ -450,7 +450,6 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
 /* Parse argument declarations and function body. */
 {
     int         ParamComplete;  /* If all paramemters have complete types */
-    int         C99MainFunc = 0;/* Flag for C99 main function returning int */
     SymEntry*   Param;
     const Type* RType;          /* Real type used for struct parameters */
     const Type* ReturnType;     /* Return type */
@@ -513,28 +512,6 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
         /* Mark this as the main function */
         CurrentFunc->Flags |= FF_IS_MAIN;
 
-        /* Main cannot be a fastcall function */
-        if (IsQualFastcall (Func->Type)) {
-            Error ("'main' cannot be declared as __fastcall__");
-        }
-
-        /* Check return type */
-        if (GetUnqualRawTypeCode (ReturnType) == T_INT) {
-            /* Determine if this is a main function in a C99 environment that
-            ** returns an int.
-            */
-            if (IS_Get (&Standard) >= STD_C99) {
-                C99MainFunc = 1;
-            }
-        } else {
-            /* If cc65 extensions aren't enabled, don't allow a main function
-            ** that doesn't return an int.
-            */
-            if (IS_Get (&Standard) != STD_CC65) {
-                Error ("'main' must always return an int");
-            }
-        }
-
         /* Add a forced import of a symbol that is contained in the startup
         ** code. This will force the startup code to be linked in.
         */
@@ -659,7 +636,9 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
         /* If this is the main function in a C99 environment returning an int,
         ** let it always return zero. Otherwise output a warning.
         */
-        if (C99MainFunc) {
+        if (F_IsMainFunc (CurrentFunc) &&
+            IS_Get (&Standard) >= STD_C99 &&
+            GetUnqualRawTypeCode (ReturnType) == T_INT) {
             g_getimmed (CF_INT | CF_CONST, 0, 0);
         } else if (IS_Get (&WarnReturnType)) {
             Warning ("Control reaches end of non-void function [-Wreturn-type]");
@@ -669,11 +648,17 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
     /* Output the function exit code label */
     g_defcodelabel (F_GetRetLab (CurrentFunc));
 
-    /* Restore the register variables */
-    F_RestoreRegVars (CurrentFunc);
+    /* Restore the register variables (not necessary for the main function in
+    ** cc65 mode)
+    */
+    int CleanupOnExit = (IS_Get (&Standard) != STD_CC65) ||
+                        !F_IsMainFunc (CurrentFunc);
+    if (CleanupOnExit) {
+        F_RestoreRegVars (CurrentFunc);
+    }
 
     /* Generate the exit code */
-    g_leave ();
+    g_leave (CleanupOnExit);
 
     /* Emit references to imports/exports */
     EmitExternals ();
@@ -685,9 +670,6 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
     /* Leave the lexical level */
     LeaveFunctionLevel ();
 
-    /* Eat the closing brace */
-    ConsumeRCurly ();
-
     /* Restore the old literal pool, remembering the one for the function */
     Func->V.F.LitPool = PopLiteralPool ();
 
@@ -699,6 +681,12 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
     /* Switch back to the old segments */
     PopSegContext ();
 
+    /* Eat the closing brace after we've done everything with the function
+    ** definition. This way we won't have troubles with pragmas right after
+    ** the closing brace.
+    */
+    ConsumeRCurly();
+
     /* Reset the current function pointer */
     FreeFunction (CurrentFunc);
     CurrentFunc = 0;
diff --git a/src/cc65/global.c b/src/cc65/global.c
index b2c3ef0a0..64278df77 100644
--- a/src/cc65/global.c
+++ b/src/cc65/global.c
@@ -44,12 +44,14 @@
 
 
 unsigned char AddSource         = 0;    /* Add source lines as comments */
+unsigned char AllowNewComments  = 0;    /* Allow new style comments in C89 mode */
 unsigned char AutoCDecl         = 0;    /* Make functions default to __cdecl__ */
 unsigned char DebugInfo         = 0;    /* Add debug info to the obj */
+unsigned char DumpPredefMacros  = 0;    /* Output predefined macros */
+unsigned char DumpUserMacros    = 0;    /* Output user macros */
 unsigned char PreprocessOnly    = 0;    /* Just preprocess the input */
 unsigned char DebugOptOutput    = 0;    /* Output debug stuff */
 unsigned      RegisterSpace     = 6;    /* Space available for register vars */
-unsigned      AllowNewComments  = 0;    /* Allow new style comments in C89 mode */
 
 /* Stackable options */
 IntStack WritableStrings    = INTSTACK(0);  /* Literal strings are r/w */
diff --git a/src/cc65/global.h b/src/cc65/global.h
index ba7105130..c781f6de4 100644
--- a/src/cc65/global.h
+++ b/src/cc65/global.h
@@ -52,12 +52,14 @@
 
 /* Options */
 extern unsigned char    AddSource;              /* Add source lines as comments */
+extern unsigned char    AllowNewComments;       /* Allow new style comments in C89 mode */
 extern unsigned char    AutoCDecl;              /* Make functions default to __cdecl__ */
 extern unsigned char    DebugInfo;              /* Add debug info to the obj */
+extern unsigned char    DumpPredefMacros;       /* Output predefined macros */
+extern unsigned char    DumpUserMacros;         /* Output user macros */
 extern unsigned char    PreprocessOnly;         /* Just preprocess the input */
 extern unsigned char    DebugOptOutput;         /* Output debug stuff */
 extern unsigned         RegisterSpace;          /* Space available for register vars */
-extern unsigned         AllowNewComments;       /* Allow new style comments in C89 mode */
 
 /* Stackable options */
 extern IntStack         WritableStrings;        /* Literal strings are r/w */
diff --git a/src/cc65/goto.c b/src/cc65/goto.c
index 44ae0595e..e96ad6c4c 100644
--- a/src/cc65/goto.c
+++ b/src/cc65/goto.c
@@ -92,7 +92,7 @@ void GotoStatement (void)
 
             /* Find array size */
             if (!IsTypeArray (arr->Type) || SizeOf (arr->Type) == 0 ||
-                !(arr->Flags & SC_STATIC) ||
+                (arr->Flags & SC_STORAGEMASK) != SC_STATIC ||
                 SizeOf (GetElementType(arr->Type)) != 2) {
                 Error ("Expected a static array");
             } else if (GetElementCount (arr->Type) > 127) {
diff --git a/src/cc65/initdata.c b/src/cc65/initdata.c
index e9442737c..addc7421b 100644
--- a/src/cc65/initdata.c
+++ b/src/cc65/initdata.c
@@ -302,6 +302,13 @@ static unsigned ParsePointerInit (const Type* T)
     /* Optional opening brace */
     unsigned BraceCount = OpeningCurlyBraces (0);
 
+    /* We warn if an initializer for a scalar contains braces, because this is
+    ** quite unusual and often a sign for some problem in the input.
+    */
+    if (BraceCount > 0) {
+        Warning ("Braces around scalar initializer");
+    }
+
     /* Expression */
     ExprDesc ED = NoCodeConstExpr (hie1);
     TypeConversion (&ED, T);
@@ -511,18 +518,20 @@ static unsigned ParseStructInit (Type* T, int* Braces, int AllowFlexibleMembers)
         /* This may be an anonymous bit-field, in which case it doesn't
         ** have an initializer.
         */
-        if (SymIsBitField (TagSym) && (IsAnonName (TagSym->Name))) {
-            /* Account for the data and output it if we have at least a full
-            ** byte. We may have more if there was storage unit overlap, for
-            ** example two consecutive 7 bit fields. Those would be packed
-            ** into 2 bytes.
-            */
-            SI.ValBits += TagSym->Type->A.B.Width;
-            CHECK (SI.ValBits <= CHAR_BIT * sizeof(SI.BitVal));
-            /* TODO: Generalize this so any type can be used. */
-            CHECK (SI.ValBits <= LONG_BITS);
-            while (SI.ValBits >= CHAR_BITS) {
-                DefineBitFieldData (&SI);
+        if (SymIsBitField (TagSym) && IsAnonName (TagSym->Name)) {
+            if (!IsTypeUnion (T)) {
+                /* Account for the data and output it if we have at least a full
+                ** byte. We may have more if there was storage unit overlap, for
+                ** example two consecutive 7 bit fields. Those would be packed
+                ** into 2 bytes.
+                */
+                SI.ValBits += TagSym->Type->A.B.Width;
+                CHECK (SI.ValBits <= CHAR_BIT * sizeof(SI.BitVal));
+                /* TODO: Generalize this so any type can be used. */
+                CHECK (SI.ValBits <= LONG_BITS);
+                while (SI.ValBits >= CHAR_BITS) {
+                    DefineBitFieldData (&SI);
+                }
             }
             /* Avoid consuming the comma if any */
             goto NextMember;
@@ -628,15 +637,15 @@ static unsigned ParseStructInit (Type* T, int* Braces, int AllowFlexibleMembers)
         /* Skip the comma next round */
         SkipComma = 1;
 
-NextMember:
-        /* Next member. For unions, only the first one can be initialized */
+        /* For unions, only the first named member can be initialized */
         if (IsTypeUnion (T)) {
-            /* Union */
             TagSym = 0;
-        } else {
-            /* Struct */
-            TagSym = TagSym->NextSym;
+            continue;
         }
+
+NextMember:
+        /* Next member */
+        TagSym = TagSym->NextSym;
     }
 
     if (HasCurly) {
@@ -677,7 +686,7 @@ static unsigned ParseVoidInit (Type* T)
     Size = 0;
     do {
         ExprDesc Expr = NoCodeConstExpr (hie1);
-        switch (GetUnqualTypeCode (&Expr.Type[0])) {
+        switch (GetUnderlyingTypeCode (&Expr.Type[0])) {
 
             case T_SCHAR:
             case T_UCHAR:
@@ -745,7 +754,7 @@ static unsigned ParseVoidInit (Type* T)
 static unsigned ParseInitInternal (Type* T, int *Braces, int AllowFlexibleMembers)
 /* Parse initialization of variables. Return the number of data bytes. */
 {
-    switch (GetUnqualTypeCode (T)) {
+    switch (GetUnderlyingTypeCode (T)) {
 
         case T_SCHAR:
         case T_UCHAR:
diff --git a/src/cc65/input.c b/src/cc65/input.c
index 89c471687..4faf2aa87 100644
--- a/src/cc65/input.c
+++ b/src/cc65/input.c
@@ -40,6 +40,7 @@
 /* common */
 #include "check.h"
 #include "coll.h"
+#include "debugflag.h"
 #include "filestat.h"
 #include "fname.h"
 #include "print.h"
@@ -77,24 +78,14 @@ char NextC = '\0';
 /* Maximum count of nested includes */
 #define MAX_INC_NESTING         16
 
-/* Struct that describes an input file */
-typedef struct IFile IFile;
-struct IFile {
-    unsigned        Index;      /* File index */
-    unsigned        Usage;      /* Usage counter */
-    unsigned long   Size;       /* File size */
-    unsigned long   MTime;      /* Time of last modification */
-    InputType       Type;       /* Type of input file */
-    char            Name[1];    /* Name of file (dynamically allocated) */
-};
-
 /* Struct that describes an active input file */
 typedef struct AFile AFile;
 struct AFile {
-    unsigned    Line;           /* Line number for this file */
+    unsigned    LineNum;        /* Actual line number for this file */
     FILE*       F;              /* Input file stream */
     IFile*      Input;          /* Points to corresponding IFile */
     int         SearchPath;     /* True if we've added a path for this file */
+    unsigned    LineOffs;       /* Offset to presumed line number for this file */
     char*       PName;          /* Presumed name of the file */
     PPIfStack   IfStack;        /* PP #if stack */
     int         MissingNL;      /* Last input line was missing a newline */
@@ -111,6 +102,7 @@ static Collection* CurrentInputStack;
 
 /* Counter for the __COUNTER__ macro */
 static unsigned MainFileCounter;
+LineInfo* PrevDiagnosticLI;
 
 
 
@@ -130,11 +122,13 @@ static IFile* NewIFile (const char* Name, InputType Type)
     IFile* IF = (IFile*) xmalloc (sizeof (IFile) + Len);
 
     /* Initialize the fields */
-    IF->Index = CollCount (&IFiles) + 1;
-    IF->Usage = 0;
-    IF->Size  = 0;
-    IF->MTime = 0;
-    IF->Type  = Type;
+    IF->Index   = CollCount (&IFiles) + 1;
+    IF->Usage   = 0;
+    IF->Size    = 0;
+    IF->MTime   = 0;
+    IF->Type    = Type;
+    IF->GFlags  = IG_NONE;
+    SB_Init (&IF->GuardMacro);
     memcpy (IF->Name, Name, Len+1);
 
     /* Insert the new structure into the IFile collection */
@@ -163,10 +157,11 @@ static AFile* NewAFile (IFile* IF, FILE* F)
     AFile* AF = (AFile*) xmalloc (sizeof (AFile));
 
     /* Initialize the fields */
-    AF->Line  = 0;
-    AF->F     = F;
-    AF->Input = IF;
-    AF->PName = 0;
+    AF->LineNum   = 0;
+    AF->F         = F;
+    AF->Input     = IF;
+    AF->LineOffs  = 0;
+    AF->PName     = 0;
     AF->IfStack.Index = -1;
     AF->MissingNL = 0;
 
@@ -277,7 +272,7 @@ void OpenMainFile (const char* Name)
     SetPPIfStack (&MainFile->IfStack);
 
     /* Begin PP for this file */
-    PreprocessBegin ();
+    PreprocessBegin (IF);
 
     /* Allocate the input line buffer */
     Line = NewStrBuf ();
@@ -285,7 +280,7 @@ void OpenMainFile (const char* Name)
     /* Update the line infos, so we have a valid line info even at start of
     ** the main file before the first line is read.
     */
-    UpdateLineInfo (MainFile->Input, MainFile->Line, Line);
+    UpdateCurrentLineInfo (Line);
 
     /* Initialize the __COUNTER__ counter */
     MainFileCounter = 0;
@@ -315,11 +310,21 @@ void OpenIncludeFile (const char* Name, InputType IT)
     }
 
     /* Search the list of all input files for this file. If we don't find
-    ** it, create a new IFile object.
+    ** it, create a new IFile object. If we do already know the file and it
+    ** has an include guard, check for the include guard before opening the
+    ** file.
     */
     IF = FindFile (N);
     if (IF == 0) {
         IF = NewIFile (N, IT);
+    } else if ((IF->GFlags & IG_ISGUARDED) != 0 &&
+              IsMacro (SB_GetConstBuf (&IF->GuardMacro))) {
+        if (Debug) {
+            printf ("Include guard %s found for \"%s\" - won't include it again\n",
+                    SB_GetConstBuf (&IF->GuardMacro),
+                    Name);
+        }
+        return;
     }
 
     /* We don't need N any longer, since we may now use IF->Name */
@@ -343,7 +348,7 @@ void OpenIncludeFile (const char* Name, InputType IT)
     SetPPIfStack (&AF->IfStack);
 
     /* Begin PP for this file */
-    PreprocessBegin ();
+    PreprocessBegin (IF);
 }
 
 
@@ -353,27 +358,24 @@ void CloseIncludeFile (void)
 ** NULL if this was the main file.
 */
 {
-    AFile* Input;
+    /* Get the currently active input file and remove it from set of active
+    ** files. CollPop will FAIL if the collection is empty so no need to
+    ** check this here.
+    */
+    AFile* Input = CollPop (&AFiles);
 
-    /* Get the number of active input files */
-    unsigned AFileCount = CollCount (&AFiles);
+    /* Determine the file that is active after closing this one. We never
+    ** actually close the main file, since it is needed for errors found after
+    ** compilation is completed.
+    */
+    AFile* NextInput = (CollCount (&AFiles) > 0)? CollLast (&AFiles) : Input;
 
-    /* Must have an input file when called */
-    PRECONDITION (AFileCount > 0);
-
-    /* End preprocessor in this file */
-    PreprocessEnd ();
-
-    /* Get the current active input file */
-    Input = CollLast (&AFiles);
+    /* End preprocessing for the current input file */
+    PreprocessEnd (NextInput->Input);
 
     /* Close the current input file (we're just reading so no error check) */
     fclose (Input->F);
 
-    /* Delete the last active file from the active file collection */
-    --AFileCount;
-    CollDelete (&AFiles, AFileCount);
-
     /* If we had added an extra search path for this AFile, remove it */
     if (Input->SearchPath) {
         PopSearchPath (UsrIncSearchPath);
@@ -382,10 +384,9 @@ void CloseIncludeFile (void)
     /* Delete the active file structure */
     FreeAFile (Input);
 
-    /* Use previous file with PP if it is not the main file */
-    if (AFileCount > 0) {
-        Input = CollLast (&AFiles);
-        SetPPIfStack (&Input->IfStack);
+    /* If we've switched files, use the if stack from the previous file */
+    if (Input != NextInput) {
+        SetPPIfStack (&NextInput->IfStack);
     }
 }
 
@@ -553,7 +554,7 @@ int NextLine (void)
             if (!Input->MissingNL || SB_NotEmpty (Line)) {
 
                 /* Accept files without a newline at the end */
-                ++Input->Line;
+                ++Input->LineNum;
 
                 /* Assume no new line */
                 Input->MissingNL = 1;
@@ -569,7 +570,7 @@ int NextLine (void)
         if (C == '\n') {
 
             /* We got a new line */
-            ++Input->Line;
+            ++Input->LineNum;
 
             /* If the \n is preceeded by a \r, remove the \r, so we can read
             ** DOS/Windows files under *nix.
@@ -605,7 +606,7 @@ int NextLine (void)
     InitLine (Line);
 
     /* Create line information for this line */
-    UpdateLineInfo (Input->Input, Input->Line, Line);
+    UpdateCurrentLineInfo (Line);
 
     /* Done */
     return C != EOF || SB_NotEmpty (Line);
@@ -645,15 +646,145 @@ int PreprocessNextLine (void)
 
 
 
-const char* GetInputFile (const struct IFile* IF)
-/* Return a filename from an IFile struct */
+static LineInfoFile* NewLineInfoFile (const AFile* AF)
+{
+    const char* Name = AF->PName == 0 ? AF->Input->Name : AF->PName;
+    unsigned    Len  = strlen (Name);
+
+    /* Allocate memory for the file info and the file name */
+    LineInfoFile* LIF = xmalloc (sizeof (LineInfoFile) + Len);
+
+    /* Copy info */
+    LIF->InputFile = AF->Input;
+    LIF->LineNum   = AF->LineNum + AF->LineOffs;
+    memcpy (LIF->Name, Name, Len + 1);
+
+    return LIF;
+}
+
+
+
+void GetFileInclusionInfo (struct LineInfo* LI)
+/* Get info about source file inclusion for LineInfo struct */
+{
+    unsigned        FileCount = CollCount (&AFiles);
+
+    CHECK (FileCount > 0);
+
+    /* Get the correct index */
+    --FileCount;
+
+    if (LI->IncFiles != 0) {
+        FreeFileInclusionInfo (LI);
+    }
+    LI->IncFiles = 0;
+
+    if (LI->File != 0) {
+        xfree (LI->File);
+    }
+
+    /* Copy info from the AFile */
+    LI->File = NewLineInfoFile (CollAtUnchecked (&AFiles, FileCount));
+
+    /* Remember the actual line number */
+    LI->ActualLineNum = ((AFile*)CollAtUnchecked (&AFiles, FileCount))->LineNum;
+
+    if (FileCount > 0) {
+        /* The file is included from another */
+
+        /* Always use a new collection */
+        LI->IncFiles = NewCollection ();
+
+        while (FileCount-- > 0) {
+            /* Copy info from the AFile */
+            LineInfoFile* LIF = NewLineInfoFile (CollAtUnchecked (&AFiles, FileCount));
+
+            /* Add this file */
+            CollAppend (LI->IncFiles, LIF);
+        }
+    }
+}
+
+
+
+void FreeFileInclusionInfo (struct LineInfo* LI)
+/* Free info about source file inclusion for LineInfo struct */
+{
+    if (LI->File != 0) {
+        xfree (LI->File);
+        LI->File = 0;
+    }
+
+    if (LI->IncFiles != 0) {
+        unsigned I;
+        for (I = 0; I < CollCount (LI->IncFiles); ++I) {
+            CollAtUnchecked (LI->IncFiles, I);
+        }
+        FreeCollection (LI->IncFiles);
+        LI->IncFiles = 0;
+    }
+}
+
+
+
+static int IsDifferentLineInfoFile (const LineInfoFile* Lhs, const LineInfoFile* Rhs)
+/* Return true if the two files are different */
+{
+    /* If the input files are the same but their presumed names are different,
+    ** we still consider the files same.
+    */
+    return Lhs->InputFile != Rhs->InputFile || Lhs->LineNum != Rhs->LineNum;
+}
+
+
+
+int HasFileInclusionChanged (const struct LineInfo* LI)
+/* Return true if file inclusion has changed from last time */
+{
+    if (LI->File != 0) {
+        LineInfo* PrevLI = GetPrevCheckedLI ();
+
+        if (LI == PrevLI) {
+            return 0;
+        }
+
+        if (PrevLI == 0) {
+            return 1;
+        }
+
+        if (LI->IncFiles != 0) {
+            unsigned I;
+
+            if (PrevLI->IncFiles == 0 ||
+                CollCount (LI->IncFiles) != CollCount (PrevLI->IncFiles)) {
+                return 1;
+            }
+
+            for (I = 0; I < CollCount (LI->IncFiles); ++I) {
+                /* If this refers to a different file, then the inclusion has changed */
+                if (IsDifferentLineInfoFile (CollAtUnchecked (LI->IncFiles, I),
+                                             CollAtUnchecked (PrevLI->IncFiles, I))) {
+                    return 1;
+                }
+            }
+        }
+    }
+
+    /* Unchanged */
+    return 0;
+}
+
+
+
+const char* GetInputFileName (const struct IFile* IF)
+/* Return the name of the file from an IFile struct */
 {
     return IF->Name;
 }
 
 
 
-const char* GetCurrentFilename (void)
+const char* GetCurrentFileName (void)
 /* Return the name of the current input file */
 {
     unsigned AFileCount = CollCount (&AFiles);
@@ -674,7 +805,7 @@ unsigned GetCurrentLineNum (void)
     unsigned AFileCount = CollCount (&AFiles);
     if (AFileCount > 0) {
         const AFile* AF = CollLast (&AFiles);
-        return AF->Line;
+        return AF->LineNum + AF->LineOffs;
     } else {
         /* No open file */
         return 0;
@@ -684,18 +815,18 @@ unsigned GetCurrentLineNum (void)
 
 
 void SetCurrentLineNum (unsigned LineNum)
-/* Set the line number in the current input file */
+/* Set the presumed line number in the current input file */
 {
     unsigned AFileCount = CollCount (&AFiles);
     if (AFileCount > 0) {
         AFile* AF = CollLast (&AFiles);
-        AF->Line = LineNum;
+        AF->LineOffs = LineNum - AF->LineNum;
     }
 }
 
 
 
-void SetCurrentFilename (const char* Name)
+void SetCurrentFileName (const char* Name)
 /* Set the presumed name of the current input file */
 {
     unsigned AFileCount = CollCount (&AFiles);
diff --git a/src/cc65/input.h b/src/cc65/input.h
index 9457bdf9b..5d7d051e8 100644
--- a/src/cc65/input.h
+++ b/src/cc65/input.h
@@ -52,6 +52,10 @@
 
 
 
+/* Forwards */
+struct IFile;
+struct LineInfo;
+
 /* An enum that describes different types of input files. The members are
 ** choosen so that it is possible to combine them to bitsets
 */
@@ -61,8 +65,27 @@ typedef enum {
     IT_USRINC = 0x04,           /* User include file (using "") */
 } InputType;
 
-/* Forward for an IFile structure */
-struct IFile;
+/* A bitmapped set of flags for include guard processing in the preprocessor */
+typedef enum {
+    IG_NONE         = 0x00,
+    IG_NEWFILE      = 0x01,     /* File processing started */
+    IG_ISGUARDED    = 0x02,     /* File contains an include guard */
+    IG_GUARDCLOSED  = 0x04,     /* Include guard was closed */
+    IG_COMPLETE     = IG_ISGUARDED | IG_GUARDCLOSED,
+} GuardFlags;
+
+/* Struct that describes an input file */
+typedef struct IFile IFile;
+struct IFile {
+    unsigned        Index;      /* File index */
+    unsigned        Usage;      /* Usage counter */
+    unsigned long   Size;       /* File size */
+    unsigned long   MTime;      /* Time of last modification */
+    InputType       Type;       /* Type of input file */
+    GuardFlags      GFlags;     /* Flags for include guard processing */
+    StrBuf          GuardMacro; /* Include guard macro name */
+    char            Name[1];    /* Name of file (dynamically allocated) */
+};
 
 /* The current input line */
 extern StrBuf* Line;
@@ -125,10 +148,19 @@ int PreprocessNextLine (void);
 ** main file.
 */
 
-const char* GetInputFile (const struct IFile* IF);
-/* Return a filename from an IFile struct */
+void GetFileInclusionInfo (struct LineInfo* LI);
+/* Get info about source file inclusion for LineInfo struct */
 
-const char* GetCurrentFilename (void);
+void FreeFileInclusionInfo (struct LineInfo* LI);
+/* Free info about source file inclusion for LineInfo struct */
+
+int HasFileInclusionChanged (const struct LineInfo* LI);
+/* Return true if file inclusion has changed from last time */
+
+const char* GetInputFileName (const struct IFile* IF);
+/* Return the name of the file from an IFile struct */
+
+const char* GetCurrentFileName (void);
 /* Return the name of the current input file */
 
 unsigned GetCurrentLineNum (void);
@@ -137,7 +169,7 @@ unsigned GetCurrentLineNum (void);
 void SetCurrentLineNum (unsigned LineNum);
 /* Set the line number in the current input file */
 
-void SetCurrentFilename (const char* Name);
+void SetCurrentFileName (const char* Name);
 /* Set the presumed name of the current input file */
 
 unsigned GetCurrentCounter (void);
diff --git a/src/cc65/lineinfo.c b/src/cc65/lineinfo.c
index f5c2e2689..8639d27e9 100644
--- a/src/cc65/lineinfo.c
+++ b/src/cc65/lineinfo.c
@@ -56,6 +56,9 @@
 /* Global pointer to line information for the current line */
 static LineInfo* CurLineInfo = 0;
 
+/* Global pointer to previously checked line information about file inclusion hierarchy */
+static LineInfo* PrevCheckedLI = 0;
+
 
 
 /*****************************************************************************/
@@ -64,7 +67,7 @@ static LineInfo* CurLineInfo = 0;
 
 
 
-static LineInfo* NewLineInfo (struct IFile* F, unsigned LineNum, const StrBuf* Line)
+static LineInfo* NewLineInfo (const StrBuf* Line)
 /* Create and return a new line info. Ref count will be 1. */
 {
     unsigned    Len;
@@ -87,8 +90,9 @@ static LineInfo* NewLineInfo (struct IFile* F, unsigned LineNum, const StrBuf* L
 
     /* Initialize the fields */
     LI->RefCount  = 1;
-    LI->InputFile = F;
-    LI->LineNum   = LineNum;
+    LI->File      = 0;
+    LI->IncFiles  = 0;
+    GetFileInclusionInfo (LI);
 
     /* Copy the line, replacing tabs by spaces in the given line since tabs
     ** will give rather arbitrary results when used in the output later, and
@@ -117,6 +121,7 @@ static LineInfo* NewLineInfo (struct IFile* F, unsigned LineNum, const StrBuf* L
 static void FreeLineInfo (LineInfo* LI)
 /* Free a LineInfo structure */
 {
+    FreeFileInclusionInfo (LI);
     xfree (LI);
 }
 
@@ -156,8 +161,8 @@ LineInfo* GetCurLineInfo (void)
 
 
 
-void UpdateLineInfo (struct IFile* F, unsigned LineNum, const StrBuf* Line)
-/* Update the line info - called if a new line is read */
+void UpdateCurrentLineInfo (const StrBuf* Line)
+/* Update the current line info - called if a new line is read */
 {
     /* If a current line info exists, release it */
     if (CurLineInfo) {
@@ -172,23 +177,60 @@ void UpdateLineInfo (struct IFile* F, unsigned LineNum, const StrBuf* Line)
     }
 
     /* Create a new line info */
-    CurLineInfo = NewLineInfo (F, LineNum, Line);
+    CurLineInfo = NewLineInfo (Line);
 }
 
 
 
-const char* GetInputName (const LineInfo* LI)
-/* Return the file name from a line info */
+void RememberCheckedLI (LineInfo* LI)
+/* Remember the latest checked line info struct */
+{
+    if (PrevCheckedLI != LI) {
+        if (PrevCheckedLI != 0) {
+            ReleaseLineInfo (PrevCheckedLI);
+        }
+        PrevCheckedLI = UseLineInfo (LI);
+    }
+}
+
+
+
+LineInfo* GetPrevCheckedLI (void)
+/* Get the latest checked line info struct */
+{
+    return PrevCheckedLI;
+}
+
+
+
+const char* GetPresumedFileName (const LineInfo* LI)
+/* Return the presumed file name from a line info */
 {
     PRECONDITION (LI != 0);
-    return GetInputFile (LI->InputFile);
+    return LI->File->Name;
 }
 
 
 
-unsigned GetInputLine (const LineInfo* LI)
-/* Return the line number from a line info */
+unsigned GetPresumedLineNum (const LineInfo* LI)
+/* Return the presumed line number from a line info */
 {
     PRECONDITION (LI != 0);
-    return LI->LineNum;
+    return LI->File->LineNum;
+}
+
+
+
+const char* GetActualFileName (const struct LineInfo* LI)
+/* Return the actual name of the source file from a line info struct */
+{
+    return LI->File != 0 ? GetInputFileName (LI->File->InputFile) : "<out of filescope>";
+}
+
+
+
+unsigned GetActualLineNum (const struct LineInfo* LI)
+/* Return the actual line number of the source file from a line info struct */
+{
+    return LI->ActualLineNum;
 }
diff --git a/src/cc65/lineinfo.h b/src/cc65/lineinfo.h
index f365b4f01..02e77cd9c 100644
--- a/src/cc65/lineinfo.h
+++ b/src/cc65/lineinfo.h
@@ -60,15 +60,24 @@ struct IFile;
 
 
 
+/* Struct that describes an input file for line info */
+typedef struct LineInfoFile LineInfoFile;
+struct LineInfoFile {
+    struct IFile*       InputFile;      /* Points to corresponding IFile */
+    unsigned            LineNum;        /* Presumed line number for this file */
+    char                Name[1];        /* Presumed name of the file */
+};
+
 /* The text for the actual line is allocated at the end of the structure, so
 ** the size of the structure varies.
 */
 typedef struct LineInfo LineInfo;
 struct LineInfo {
-    unsigned        RefCount;             /* Reference counter */
-    struct IFile*   InputFile;            /* Input file for this line */
-    unsigned        LineNum;              /* Line number */
-    char            Line[1];              /* Source code line */
+    unsigned            RefCount;       /* Reference counter */
+    LineInfoFile*       File;           /* Presumed input files for this line */
+    unsigned            ActualLineNum;  /* Actual line number for this file */
+    struct Collection*  IncFiles;       /* Presumed inclusion input files */
+    char                Line[1];        /* Text of source code line */
 };
 
 
@@ -92,14 +101,26 @@ LineInfo* GetCurLineInfo (void);
 ** increased, use UseLineInfo for that purpose.
 */
 
-void UpdateLineInfo (struct IFile* F, unsigned LineNum, const StrBuf* Line);
-/* Update the line info - called if a new line is read */
+void UpdateCurrentLineInfo (const StrBuf* Line);
+/* Update the current line info - called if a new line is read */
 
-const char* GetInputName (const LineInfo* LI);
-/* Return the file name from a line info */
+void RememberCheckedLI (struct LineInfo* LI);
+/* Remember the latest checked line info struct */
 
-unsigned GetInputLine (const LineInfo* LI);
-/* Return the line number from a line info */
+LineInfo* GetPrevCheckedLI (void);
+/* Get the latest checked line info struct */
+
+const char* GetPresumedFileName (const LineInfo* LI);
+/* Return the presumed file name from a line info */
+
+unsigned GetPresumedLineNum (const LineInfo* LI);
+/* Return the presumed line number from a line info */
+
+const char* GetActualFileName (const struct LineInfo* LI);
+/* Return the actual name of the source file from a line info struct */
+
+unsigned GetActualLineNum (const struct LineInfo* LI);
+/* Return the actual line number of the source file from a line info struct */
 
 
 
diff --git a/src/cc65/litpool.c b/src/cc65/litpool.c
index 5433f6d95..6d8827c60 100644
--- a/src/cc65/litpool.c
+++ b/src/cc65/litpool.c
@@ -92,7 +92,7 @@ static Collection       LPStack  = STATIC_COLLECTION_INITIALIZER;
 
 
 
-static Literal* NewLiteral (const void* Buf, unsigned Len)
+static Literal* NewLiteral (const StrBuf* S)
 /* Create a new literal and return it */
 {
     /* Allocate memory */
@@ -103,7 +103,7 @@ static Literal* NewLiteral (const void* Buf, unsigned Len)
     L->RefCount = 0;
     L->Output   = 0;
     SB_Init (&L->Data);
-    SB_AppendBuf (&L->Data, Buf, Len);
+    SB_Append (&L->Data, S);
 
     /* Return the new literal */
     return L;
@@ -162,7 +162,7 @@ void ReleaseLiteral (Literal* L)
 void TranslateLiteral (Literal* L)
 /* Translate a literal into the target charset */
 {
-    TgtTranslateBuf (SB_GetBuf (&L->Data), SB_GetLen (&L->Data));
+    TgtTranslateStrBuf (&L->Data);
 }
 
 
@@ -468,18 +468,18 @@ void OutputGlobalLiteralPool (void)
 Literal* AddLiteral (const char* S)
 /* Add a literal string to the literal pool. Return the literal. */
 {
-    return AddLiteralBuf (S, strlen (S) + 1);
+    StrBuf SB;
+    SB_InitFromString(&SB, S);
+    return AddLiteralStr(&SB);
 }
 
 
 
-Literal* AddLiteralBuf (const void* Buf, unsigned Len)
-/* Add a buffer containing a literal string to the literal pool. Return the
-** literal.
-*/
+Literal* AddLiteralStr (const StrBuf* S)
+/* Add a literal string to the literal pool. Return the literal. */
 {
     /* Create a new literal */
-    Literal* L = NewLiteral (Buf, Len);
+    Literal* L = NewLiteral (S);
 
     /* Add the literal to the correct pool */
     if (IS_Get (&WritableStrings)) {
@@ -491,11 +491,3 @@ Literal* AddLiteralBuf (const void* Buf, unsigned Len)
     /* Return the new literal */
     return L;
 }
-
-
-
-Literal* AddLiteralStr (const StrBuf* S)
-/* Add a literal string to the literal pool. Return the literal. */
-{
-    return AddLiteralBuf (SB_GetConstBuf (S), SB_GetLen (S));
-}
diff --git a/src/cc65/litpool.h b/src/cc65/litpool.h
index 5f444bfb8..959924e94 100644
--- a/src/cc65/litpool.h
+++ b/src/cc65/litpool.h
@@ -125,11 +125,6 @@ void OutputGlobalLiteralPool (void);
 Literal* AddLiteral (const char* S);
 /* Add a literal string to the literal pool. Return the literal. */
 
-Literal* AddLiteralBuf (const void* Buf, unsigned Len);
-/* Add a buffer containing a literal string to the literal pool. Return the
-** literal.
-*/
-
 Literal* AddLiteralStr (const StrBuf* S);
 /* Add a literal string to the literal pool. Return the literal. */
 
diff --git a/src/cc65/locals.c b/src/cc65/locals.c
index 381477faa..08fe83b75 100644
--- a/src/cc65/locals.c
+++ b/src/cc65/locals.c
@@ -111,15 +111,12 @@ static void ParseRegisterDecl (Declarator* Decl, int Reg)
     /* Get the size of the variable */
     unsigned Size = SizeOf (Decl->Type);
 
-    /* Save the current contents of the register variable on stack */
-    F_AllocLocalSpace (CurrentFunc);
-    g_save_regvars (Reg, Size);
-
-    /* Add the symbol to the symbol table. We do that now, because for register
-    ** variables the current stack pointer is implicitly used as location for
-    ** the save area.
+    /* Check if this is the main function and we are in cc65 mode. If so, we
+    ** won't save the old contents of the register variables since in cc65
+    ** mode main() may not be called recursively.
     */
-    Sym = AddLocalSym (Decl->Ident, Decl->Type, Decl->StorageClass, Reg);
+    int SaveRegVars = (IS_Get (&Standard) != STD_CC65) ||
+                      !F_IsMainFunc (CurrentFunc);
 
     /* Check for an optional initialization */
     if (CurTok.Tok == TOK_ASSIGN) {
@@ -127,6 +124,25 @@ static void ParseRegisterDecl (Declarator* Decl, int Reg)
         /* Skip the '=' */
         NextToken ();
 
+        /* If the register variable is initialized, the initialization code may
+        ** access other already declared variables. This means that we have to
+        ** allocate them now.
+        */
+        F_AllocLocalSpace (CurrentFunc);
+
+        /* Save the current contents of the register variable on stack. This is
+        ** not necessary for the main function.
+        */
+        if (SaveRegVars) {
+            g_save_regvars (Reg, Size);
+        }
+
+        /* Add the symbol to the symbol table. We do that now, because for
+        ** register variables the current stack pointer is implicitly used
+        ** as location for the save area (maybe unused in case of main()).
+        */
+        Sym = AddLocalSym (Decl->Ident, Decl->Type, Decl->StorageClass, Reg);
+
         /* Special handling for compound types */
         if (IsCompound) {
 
@@ -173,6 +189,21 @@ static void ParseRegisterDecl (Declarator* Decl, int Reg)
 
         /* Mark the variable as referenced */
         Sym->Flags |= SC_REF;
+    } else {
+
+        /* Save the current contents of the register variable on stack. This is
+        ** not necessary for the main function.
+        */
+        if (SaveRegVars) {
+            F_AllocLocalSpace (CurrentFunc);
+            g_save_regvars (Reg, Size);
+        }
+
+        /* Add the symbol to the symbol table. We do that now, because for
+        ** register variables the current stack pointer is implicitly used
+        ** as location for the save area (maybe unused in case of main()).
+        */
+        Sym = AddLocalSym (Decl->Ident, Decl->Type, Decl->StorageClass, Reg);
     }
 
     /* Cannot allocate a variable of unknown size */
@@ -238,7 +269,7 @@ static void ParseAutoDecl (Declarator* Decl)
                 Sym->V.Offs = F_ReserveLocalSpace (CurrentFunc, Size);
 
                 /* Next, allocate the space on the stack. This means that the
-                ** variable is now located at offset 0 from the current sp.
+                ** variable is now located at offset 0 from the current c_sp.
                 */
                 F_AllocLocalSpace (CurrentFunc);
 
@@ -304,7 +335,7 @@ static void ParseAutoDecl (Declarator* Decl)
 
 
         /* Static local variables. */
-        Decl->StorageClass = (Decl->StorageClass & ~SC_AUTO) | SC_STATIC;
+        Decl->StorageClass = (Decl->StorageClass & ~SC_STORAGEMASK) | SC_STATIC;
 
         /* Generate a label, but don't define it */
         DataLabel = GetLocalDataLabel ();
@@ -441,33 +472,37 @@ static void ParseStaticDecl (Declarator* Decl)
 
 
 
-static void ParseOneDecl (const DeclSpec* Spec)
+static int ParseOneDecl (DeclSpec* Spec)
 /* Parse one variable declarator. */
 {
-    Declarator Decl;            /* Declarator data structure */
+    Declarator  Decl;           /* Declarator data structure */
+    int         NeedClean;
 
 
     /* Read the declarator */
-    ParseDecl (Spec, &Decl, DM_NEED_IDENT);
+    NeedClean = ParseDecl (Spec, &Decl, DM_IDENT_OR_EMPTY);
 
-    /* Check if there are any non-extern storage classes set for function
-    ** declarations. Function can only be declared inside functions with the
-    ** 'extern' storage class specifier or no storage class specifier at all.
+    /* Check if there are explicitly specified non-external storage classes
+    ** for function declarations.
     */
-    if ((Decl.StorageClass & SC_FUNC) == SC_FUNC) {
-
-        /* Check if there are explicitly specified non-external storage classes */
+    if ((Decl.StorageClass & SC_TYPEMASK) == SC_FUNC) {
+        /* Function can only be declared inside functions with the 'extern'
+        ** storage class specifier or no storage class specifier at all.
+        ** Note: this declaration is always checked for compatibility with
+        ** other declarations of the same symbol, but does not necessarily
+        ** make the symbol globally visible. This is tricky.
+        */
         if ((Spec->Flags & DS_DEF_STORAGE) != DS_DEF_STORAGE    &&
-            (Decl.StorageClass & SC_EXTERN) == 0                &&
+            (Decl.StorageClass & SC_STORAGEMASK) != SC_EXTERN   &&
             (Decl.StorageClass & SC_STORAGEMASK) != 0) {
             Error ("Illegal storage class on function");
         }
 
         /* The default storage class could be wrong. Just clear them */
         Decl.StorageClass &= ~SC_STORAGEMASK;
-
-        /* This is always an extern declaration */
-        Decl.StorageClass |= SC_DECL | SC_EXTERN;
+    } else if ((Decl.StorageClass & SC_STORAGEMASK) != SC_EXTERN) {
+        /* If the symbol is not marked as external, it will be defined now */
+        Decl.StorageClass |= SC_DEF;
     }
 
     /* If we don't have a name, this was flagged as an error earlier.
@@ -477,12 +512,6 @@ static void ParseOneDecl (const DeclSpec* Spec)
         AnonName (Decl.Ident, "param");
     }
 
-    /* If the symbol is not marked as external, it will be defined now */
-    if ((Decl.StorageClass & SC_DECL) == 0 &&
-        (Decl.StorageClass & SC_EXTERN) == 0) {
-        Decl.StorageClass |= SC_DEF;
-    }
-
     /* Handle anything that needs storage (no functions, no typdefs) */
     if ((Decl.StorageClass & SC_DEF) == SC_DEF &&
         (Decl.StorageClass & SC_TYPEMASK) != SC_TYPEDEF) {
@@ -491,20 +520,20 @@ static void ParseOneDecl (const DeclSpec* Spec)
         ** convert the declaration to "auto" if this is not possible.
         */
         int Reg = 0;    /* Initialize to avoid gcc complains */
-        if ((Decl.StorageClass & SC_REGISTER) != 0 &&
+        if ((Decl.StorageClass & SC_STORAGEMASK) == SC_REGISTER &&
             (Reg = F_AllocRegVar (CurrentFunc, Decl.Type)) < 0) {
             /* No space for this register variable, convert to auto */
-            Decl.StorageClass = (Decl.StorageClass & ~SC_REGISTER) | SC_AUTO;
+            Decl.StorageClass = (Decl.StorageClass & ~SC_STORAGEMASK) | SC_AUTO;
         }
 
         /* Check the variable type */
-        if ((Decl.StorageClass & SC_REGISTER) == SC_REGISTER) {
+        if ((Decl.StorageClass & SC_STORAGEMASK) == SC_REGISTER) {
             /* Register variable */
             ParseRegisterDecl (&Decl, Reg);
-        } else if ((Decl.StorageClass & SC_AUTO) == SC_AUTO) {
+        } else if ((Decl.StorageClass & SC_STORAGEMASK) == SC_AUTO) {
             /* Auto variable */
             ParseAutoDecl (&Decl);
-        } else if ((Decl.StorageClass & SC_STATIC) == SC_STATIC) {
+        } else if ((Decl.StorageClass & SC_STORAGEMASK) == SC_STATIC) {
             /* Static variable */
             ParseStaticDecl (&Decl);
         } else {
@@ -513,7 +542,7 @@ static void ParseOneDecl (const DeclSpec* Spec)
 
     } else {
 
-        if ((Decl.StorageClass & SC_EXTERN) == SC_EXTERN) {
+        if ((Decl.StorageClass & SC_STORAGEMASK) == SC_EXTERN) {
             /* External identifier - may not get initialized */
             if (CurTok.Tok == TOK_ASSIGN) {
                 Error ("Cannot initialize extern variable '%s'", Decl.Ident);
@@ -523,8 +552,8 @@ static void ParseOneDecl (const DeclSpec* Spec)
             }
         }
 
-        if ((Decl.StorageClass & SC_EXTERN) == SC_EXTERN ||
-            (Decl.StorageClass & SC_FUNC) == SC_FUNC) {
+        if ((Decl.StorageClass & SC_STORAGEMASK) == SC_EXTERN ||
+            (Decl.StorageClass & SC_TYPEMASK) == SC_FUNC) {
             /* Add the global symbol to both of the global and local symbol
             ** tables.
             */
@@ -538,6 +567,8 @@ static void ParseOneDecl (const DeclSpec* Spec)
 
     /* Make sure we aren't missing some work */
     CheckDeferredOpAllDone ();
+
+    return NeedClean;
 }
 
 
@@ -551,17 +582,12 @@ void DeclareLocals (void)
     /* A place to store info about potential initializations of auto variables */
     CollAppend (&CurrentFunc->LocalsBlockStack, 0);
 
-    /* Loop until we don't find any more variables */
+    /* Loop until we don't find any more variables. EOF is handled in the loop
+    ** as well.
+    */
     while (1) {
-
-        /* Check variable declarations. We need to distinguish between a
-        ** default int type and the end of variable declarations. So we
-        ** will do the following: If there is no explicit storage class
-        ** specifier *and* no explicit type given, *and* no type qualifiers
-        ** have been read, it is assumed that we have reached the end of
-        ** declarations.
-        */
         DeclSpec Spec;
+        int      NeedClean;
 
         /* Check for a _Static_assert */
         if (CurTok.Tok == TOK_STATIC_ASSERT) {
@@ -569,10 +595,18 @@ void DeclareLocals (void)
             continue;
         }
 
-        ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_INT, SC_AUTO);
-        if ((Spec.Flags & DS_DEF_STORAGE) != 0 &&       /* No storage spec */
-            (Spec.Flags & DS_DEF_TYPE) != 0    &&       /* No type given */
-            GetQualifier (Spec.Type) == T_QUAL_NONE) {  /* No type qualifier */
+        /* Read the declaration specifier */
+        ParseDeclSpec (&Spec, TS_DEFAULT_TYPE_INT | TS_FUNCTION_SPEC, SC_AUTO);
+
+        /* Check variable declarations. We need distinguish between a default
+        ** int type and the end of variable declarations. So we will do the
+        ** following: If there is no explicit storage class specifier *and* no
+        ** explicit type given, *and* no type qualifiers have been read, it is
+        ** assumed that we have reached the end of declarations.
+        */
+        if ((Spec.Flags & DS_DEF_STORAGE) != 0          &&  /* No storage spec */
+            (Spec.Flags & DS_TYPE_MASK) == DS_DEF_TYPE  &&  /* No type given */
+            GetQualifier (Spec.Type) == T_QUAL_NONE) {      /* No type qualifier */
             break;
         }
 
@@ -584,11 +618,24 @@ void DeclareLocals (void)
             continue;
         }
 
+        /* If we haven't got a type specifier yet, something must be wrong */
+        if ((Spec.Flags & DS_TYPE_MASK) == DS_NONE) {
+            /* Avoid extra errors if it was a failed type specifier */
+            if ((Spec.Flags & DS_EXTRA_TYPE) == 0) {
+                Error ("Declaration specifier expected");
+            }
+            NeedClean = -1;
+            goto EndOfDecl;
+        }
+
         /* Parse a comma separated variable list */
         while (1) {
 
-            /* Parse one declaration */
-            ParseOneDecl (&Spec);
+            /* Parse one declarator */
+            NeedClean = ParseOneDecl (&Spec);
+            if (NeedClean <= 0) {
+                break;
+            }
 
             /* Check if there is more */
             if (CurTok.Tok == TOK_COMMA) {
@@ -600,8 +647,20 @@ void DeclareLocals (void)
             }
         }
 
-        /* A semicolon must follow */
-        ConsumeSemi ();
+        if (NeedClean > 0) {
+            /* Must be followed by a semicolon */
+            if (ConsumeSemi ()) {
+                NeedClean = 0;
+            } else {
+                NeedClean = -1;
+            }
+        }
+
+EndOfDecl:
+        /* Try some smart error recovery */
+        if (NeedClean < 0) {
+            SmartErrorSkip (1);
+        }
     }
 
     /* Be sure to allocate any reserved space for locals */
diff --git a/src/cc65/macrotab.c b/src/cc65/macrotab.c
index 3bfae0811..2817403c1 100644
--- a/src/cc65/macrotab.c
+++ b/src/cc65/macrotab.c
@@ -1,4 +1,4 @@
-/*****************************************************************************/
+
 /*                                                                           */
 /*                                macrotab.h                                 */
 /*                                                                           */
@@ -42,6 +42,7 @@
 
 /* cc65 */
 #include "error.h"
+#include "output.h"
 #include "preproc.h"
 #include "macrotab.h"
 
@@ -60,6 +61,70 @@ static Macro* MacroTab[MACRO_TAB_SIZE];
 /* The undefined macros list head */
 static Macro* UndefinedMacrosListHead;
 
+/* Some defines for better readability when calling OutputMacros() */
+#define USER_MACROS     0
+#define PREDEF_MACROS   1
+#define NAME_ONLY       0
+#define FULL_DEFINITION 1
+
+
+
+/*****************************************************************************/
+/*                                  helpers                                  */
+/*****************************************************************************/
+
+
+
+static void OutputMacro (const Macro* M, int Full)
+/* Output one macro. If Full is true, the replacement is also output. */
+{
+    WriteOutput ("#define %s", M->Name);
+    int ParamCount = M->ParamCount;
+    if (M->ParamCount >= 0) {
+        int I;
+        if (M->Variadic) {
+            CHECK (ParamCount > 0);
+            --ParamCount;
+        }
+        WriteOutput ("(");
+        for (I = 0; I < ParamCount; ++I) {
+            const char* Name = CollConstAt (&M->Params, I);
+            WriteOutput ("%s%s", (I == 0)? "" : ",", Name);
+        }
+        if (M->Variadic) {
+            WriteOutput ("%s...", (ParamCount == 0)? "" : ",");
+        }
+        WriteOutput (")");
+    }
+    WriteOutput (" ");
+    if (Full) {
+        WriteOutput ("%.*s",
+                     SB_GetLen (&M->Replacement),
+                     SB_GetConstBuf (&M->Replacement));
+    }
+    WriteOutput ("\n");
+}
+
+
+
+static void OutputMacros (int Predefined, int Full)
+/* Output macros to the output file depending on the flags given. */
+{
+    /* Note: The Full flag is currently not used by any callers but is left in
+    ** place for possible future changes.
+    */
+    unsigned I;
+    for (I = 0; I < MACRO_TAB_SIZE; ++I) {
+        const Macro* M = MacroTab [I];
+        while (M) {
+            if ((Predefined != 0) == (M->Predefined != 0)) {
+                OutputMacro (M, Full);
+            }
+            M = M->Next;
+        }
+    }
+}
+
 
 
 /*****************************************************************************/
@@ -68,7 +133,7 @@ static Macro* UndefinedMacrosListHead;
 
 
 
-Macro* NewMacro (const char* Name)
+Macro* NewMacro (const char* Name, unsigned char Predefined)
 /* Allocate a macro structure with the given name. The structure is not
 ** inserted into the macro table.
 */
@@ -84,6 +149,7 @@ Macro* NewMacro (const char* Name)
     M->ParamCount   = -1;        /* Flag: Not a function-like macro */
     InitCollection (&M->Params);
     SB_Init (&M->Replacement);
+    M->Predefined   = Predefined;
     M->Variadic     = 0;
     memcpy (M->Name, Name, Len+1);
 
@@ -116,7 +182,7 @@ Macro* CloneMacro (const Macro* M)
 ** Use FreeMacro for that.
 */
 {
-    Macro* New = NewMacro (M->Name);
+    Macro* New = NewMacro (M->Name, M->Predefined);
     unsigned I;
 
     for (I = 0; I < CollCount (&M->Params); ++I) {
@@ -134,7 +200,7 @@ Macro* CloneMacro (const Macro* M)
 
 
 void DefineNumericMacro (const char* Name, long Val)
-/* Define a macro for a numeric constant */
+/* Define a predefined macro for a numeric constant */
 {
     char Buf[64];
 
@@ -148,10 +214,10 @@ void DefineNumericMacro (const char* Name, long Val)
 
 
 void DefineTextMacro (const char* Name, const char* Val)
-/* Define a macro for a textual constant */
+/* Define a predefined macro for a textual constant */
 {
     /* Create a new macro */
-    Macro* M = NewMacro (Name);
+    Macro* M = NewMacro (Name, 1);
 
     /* Set the value as replacement text */
     SB_CopyStr (&M->Replacement, Val);
@@ -350,3 +416,19 @@ void PrintMacroStats (FILE* F)
         }
     }
 }
+
+
+
+void OutputPredefMacros (void)
+/* Output all predefined macros to the output file */
+{
+    OutputMacros (PREDEF_MACROS, FULL_DEFINITION);
+}
+
+
+
+void OutputUserMacros (void)
+/* Output all user defined macros to the output file */
+{
+    OutputMacros (USER_MACROS, FULL_DEFINITION);
+}
diff --git a/src/cc65/macrotab.h b/src/cc65/macrotab.h
index 52b812b2f..00fb1d55a 100644
--- a/src/cc65/macrotab.h
+++ b/src/cc65/macrotab.h
@@ -58,6 +58,7 @@ struct Macro {
     int           ParamCount;   /* Number of parameters, -1 = no parens */
     Collection    Params;       /* Parameter list (char*) */
     StrBuf        Replacement;  /* Replacement text */
+    unsigned char Predefined;   /* True if this is a predefined macro */
     unsigned char Variadic;     /* C99 variadic macro */
     char          Name[1];      /* Name, dynamically allocated */
 };
@@ -70,7 +71,7 @@ struct Macro {
 
 
 
-Macro* NewMacro (const char* Name);
+Macro* NewMacro (const char* Name, unsigned char Predefined);
 /* Allocate a macro structure with the given name. The structure is not
 ** inserted into the macro table.
 */
@@ -87,10 +88,10 @@ Macro* CloneMacro (const Macro* M);
 */
 
 void DefineNumericMacro (const char* Name, long Val);
-/* Define a macro for a numeric constant */
+/* Define a predefined macro for a numeric constant */
 
 void DefineTextMacro (const char* Name, const char* Val);
-/* Define a macro for a textual constant */
+/* Define a predefined macro for a textual constant */
 
 void InsertMacro (Macro* M);
 /* Insert the given macro into the macro table. */
@@ -132,6 +133,12 @@ int MacroCmp (const Macro* M1, const Macro* M2);
 void PrintMacroStats (FILE* F);
 /* Print macro statistics to the given text file. */
 
+void OutputPredefMacros (void);
+/* Output all predefined macros to the output file */
+
+void OutputUserMacros (void);
+/* Output all user defined macros to the output file */
+
 
 
 /* End of macrotab.h */
diff --git a/src/cc65/main.c b/src/cc65/main.c
index bef646cdd..5fc6ea343 100644
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -91,8 +91,10 @@ static void Usage (void)
             "  -Os\t\t\t\tInline some standard functions\n"
             "  -T\t\t\t\tInclude source as comment\n"
             "  -V\t\t\t\tPrint the compiler version number\n"
-            "  -W warning[,...]\t\tSuppress warnings\n"
+            "  -W [-+]warning[,...]\t\tControl warnings ('-' disables, '+' enables)\n"
             "  -d\t\t\t\tDebug mode\n"
+            "  -dM\t\t\t\tOutput all user macros (needs -E)\n"
+            "  -dP\t\t\t\tOutput all predefined macros (needs -E)\n"
             "  -g\t\t\t\tAdd debug info to object file\n"
             "  -h\t\t\t\tHelp (this text)\n"
             "  -j\t\t\t\tDefault characters are signed\n"
@@ -299,6 +301,14 @@ static void SetSys (const char* Sys)
             DefineNumericMacro ("__SYM1__", 1);
             break;
 
+        case TGT_C65:
+            cbmsys ("__C65__");
+            break;
+
+        case TGT_MEGA65:
+            cbmsys ("__MEGA65__");
+            break;
+
         case TGT_KIM1:
             DefineNumericMacro ("__KIM1__", 1);
             break;
@@ -307,6 +317,10 @@ static void SetSys (const char* Sys)
             DefineNumericMacro ("__RP6502__", 1);
             break;
 
+        case TGT_AGAT:
+            DefineNumericMacro ("__AGAT__", 1);
+            break;
+
         default:
             AbEnd ("Unknown target system '%s'", Sys);
     }
@@ -317,6 +331,100 @@ static void SetSys (const char* Sys)
 
 
 
+static void DefineCpuMacros (void)
+/* Define macros for the target CPU */
+{
+    const char* CPUName;
+
+    /* Note: The list of CPUs handled here must match the one checked in
+    ** OptCPU().
+    */
+    switch (CPU) {
+
+        /* The following ones are legal CPUs as far as the assembler is
+        ** concerned but are ruled out earlier in the compiler, so this
+        ** function should never see them.
+        */
+        case CPU_NONE:
+        case CPU_SWEET16:
+        case CPU_M740:
+        case CPU_UNKNOWN:
+            CPUName = (CPU == CPU_UNKNOWN)? "unknown" : CPUNames[CPU];
+            Internal ("Invalid CPU \"%s\"", CPUName);
+            break;
+
+        case CPU_6502:
+            DefineNumericMacro ("__CPU_6502__", 1);
+            break;
+
+        case CPU_6502X:
+            DefineNumericMacro ("__CPU_6502X__", 1);
+            break;
+
+        case CPU_6502DTV:
+            DefineNumericMacro ("__CPU_6502DTV__", 1);
+            break;
+
+        case CPU_65SC02:
+            DefineNumericMacro ("__CPU_65SC02__", 1);
+            break;
+
+        case CPU_65C02:
+            DefineNumericMacro ("__CPU_65C02__", 1);
+            break;
+
+        case CPU_65CE02:
+            DefineNumericMacro ("__CPU_65CE02__", 1);
+            break;
+
+        case CPU_65816:
+            DefineNumericMacro ("__CPU_65816__", 1);
+            break;
+
+        case CPU_W65C02:
+            DefineNumericMacro ("__CPU_W65C02__", 1);
+            break;
+
+        case CPU_HUC6280:
+            DefineNumericMacro ("__CPU_HUC6280__", 1);
+            break;
+
+        case CPU_4510:
+            DefineNumericMacro ("__CPU_4510__", 1);
+            break;
+
+        case CPU_45GS02:
+            DefineNumericMacro ("__CPU_45GS02__", 1);
+            break;
+
+        default:
+            FAIL ("Unexpected value in switch");
+            break;
+    }
+
+    /* Define the macros for instruction sets. We only include the ones for
+    ** the available CPUs.
+    */
+    DefineNumericMacro ("__CPU_ISET_6502__", CPU_ISET_6502);
+    DefineNumericMacro ("__CPU_ISET_6502X__", CPU_ISET_6502X);
+    DefineNumericMacro ("__CPU_ISET_6502DTV__", CPU_ISET_6502DTV);
+    DefineNumericMacro ("__CPU_ISET_65SC02__", CPU_ISET_65SC02);
+    DefineNumericMacro ("__CPU_ISET_65C02__", CPU_ISET_65C02);
+    DefineNumericMacro ("__CPU_ISET_W65C02__", CPU_ISET_W65C02);
+    DefineNumericMacro ("__CPU_ISET_65CE02__", CPU_ISET_65CE02);
+    DefineNumericMacro ("__CPU_ISET_65816__", CPU_ISET_65816);
+    DefineNumericMacro ("__CPU_ISET_HUC6280__", CPU_ISET_HUC6280);
+    DefineNumericMacro ("__CPU_ISET_4510__", CPU_ISET_4510);
+    DefineNumericMacro ("__CPU_ISET_45GS02__", CPU_ISET_45GS02);
+
+    /* Now define the macro that contains the bit set with the available
+    ** cpu instructions.
+    */
+    DefineNumericMacro ("__CPU__", CPUIsets[CPU]);
+}
+
+
+
 static void FileNameOption (const char* Opt, const char* Arg, StrBuf* Name)
 /* Handle an option that remembers a file name for later */
 {
@@ -477,7 +585,9 @@ static void OptCreateFullDep (const char* Opt attribute ((unused)),
 static void OptCPU (const char* Opt, const char* Arg)
 /* Handle the --cpu option */
 {
-    /* Find the CPU from the given name */
+    /* Find the CPU from the given name. We do only accept a certain number
+    ** of CPUs. If the list is changed, be sure to adjust SetCpuMacros().
+    */
     CPU = FindCPU (Arg);
     if (CPU != CPU_6502 && CPU != CPU_6502X && CPU != CPU_65SC02 &&
         CPU != CPU_65C02 && CPU != CPU_65816 && CPU != CPU_HUC6280 &&
@@ -945,7 +1055,25 @@ int main (int argc, char* argv[])
                     break;
 
                 case 'd':
-                    OptDebug (Arg, 0);
+                    P = Arg + 2;
+                    if (*P == '\0') {
+                        OptDebug (Arg, 0);
+                    } else {
+                        while (*P) {
+                            switch (*P) {
+                                case 'M':
+                                    DumpUserMacros = 1;
+                                    break;
+                                case 'P':
+                                    DumpPredefMacros = 1;
+                                    break;
+                                default:
+                                    UnknownOption (Arg);
+                                    break;
+                            }
+                            ++P;
+                        }
+                    }
                     break;
 
                 case 'h':
@@ -1057,13 +1185,20 @@ int main (int argc, char* argv[])
         AbEnd ("No input files");
     }
 
+    /* The options to output macros can only be used with -E */
+    if ((DumpPredefMacros || DumpUserMacros) && !PreprocessOnly) {
+        AbEnd ("Preprocessor macro output can only be used together with -E");
+    }
+
     /* Add the default include search paths. */
     FinishIncludePaths ();
 
     /* Create the output file name if it was not explicitly given */
     MakeDefaultOutputName (InputFile);
 
-    /* If no CPU given, use the default CPU for the target */
+    /* If no CPU given, use the default CPU for the target. Define macros that
+    ** allow to query the CPU.
+    */
     if (CPU == CPU_UNKNOWN) {
         if (Target != TGT_UNKNOWN) {
             CPU = GetTargetProperties (Target)->DefaultCPU;
@@ -1071,6 +1206,7 @@ int main (int argc, char* argv[])
             CPU = CPU_6502;
         }
     }
+    DefineCpuMacros ();
 
     /* If no memory model was given, use the default */
     if (MemoryModel == MMODEL_UNKNOWN) {
@@ -1089,7 +1225,7 @@ int main (int argc, char* argv[])
     Compile (InputFile);
 
     /* Create the output file if we didn't had any errors */
-    if (PreprocessOnly == 0 && (ErrorCount == 0 || Debug)) {
+    if (PreprocessOnly == 0 && (GetTotalErrors () == 0 || Debug)) {
 
         /* Emit literals, do cleanup and optimizations */
         FinishCompile ();
@@ -1115,5 +1251,5 @@ int main (int argc, char* argv[])
     DoneSegAddrSizes ();
 
     /* Return an apropriate exit code */
-    return (ErrorCount > 0)? EXIT_FAILURE : EXIT_SUCCESS;
+    return (GetTotalErrors () > 0)? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/src/cc65/opcodes.c b/src/cc65/opcodes.c
index aeea0297b..49363769e 100644
--- a/src/cc65/opcodes.c
+++ b/src/cc65/opcodes.c
@@ -55,9 +55,12 @@
 
 
 /* Opcode description table */
+/* CAUTION: table must be sorted by mnemonic for bsearch */
 const OPCDesc OPCTable[OP65_COUNT] = {
 
     /* 65XX opcodes */
+
+/* BEGIN SORTED_OPCODES.SH */
     {   OP65_ADC,                               /* opcode */
         "adc",                                  /* mnemonic */
         0,                                      /* size */
@@ -586,6 +589,7 @@ const OPCDesc OPCTable[OP65_COUNT] = {
         REG_Y,                                  /* use */
         REG_A | PSTATE_ZN                       /* chg */
     },
+/* END SORTED_OPCODES.SH */
 };
 
 
diff --git a/src/cc65/ppexpr.c b/src/cc65/ppexpr.c
index 8d8c0b65d..b7382697c 100644
--- a/src/cc65/ppexpr.c
+++ b/src/cc65/ppexpr.c
@@ -55,7 +55,6 @@ static int PPEvaluationFailed  = 0;
 
 
 
-static void PPhie0 (PPExpr* Expr);
 static void PPhie1 (PPExpr* Expr);
 
 
@@ -138,7 +137,7 @@ static void PPhiePrimary (PPExpr* Expr)
             ** recursively.
             */
             NextToken ();
-            PPhie0 (Expr);
+            PPhie1 (Expr);
             ConsumeRParen ();
             break;
 
@@ -263,6 +262,7 @@ void PPhie10 (PPExpr* Expr)
             NextToken ();
             PPhie10 (Expr);
             Expr->IVal = !Expr->IVal;
+            Expr->Flags &= ~PPEXPR_UNSIGNED;    /* Result is signed */
             break;
 
         case TOK_CEOF:
@@ -424,10 +424,10 @@ static void PPhie_compare (const token_t* Ops,    /* List of generators */
                 }
             }
         }
-    }
 
-    /* The result is signed */
-    Expr->Flags &= ~PPEXPR_UNSIGNED;
+        /* The result is signed */
+        Expr->Flags &= ~PPEXPR_UNSIGNED;
+    }
 }
 
 
@@ -711,7 +711,7 @@ static void PPhieQuest (PPExpr* Expr)
 
         /* Parse second expression */
         PPExprInit (&Expr2);
-        PPhie0 (&Expr2);
+        PPhie1 (&Expr2);
 
         /* Skip the colon */
         ConsumeColon ();
@@ -726,7 +726,7 @@ static void PPhieQuest (PPExpr* Expr)
         PPhieQuest (&Expr3);
 
         /* Set the result */
-        Expr->IVal = Expr->IVal ? Expr2.IVal != 0 : Expr3.IVal != 0;
+        Expr->IVal = Expr->IVal ? Expr2.IVal : Expr3.IVal;
 
         /* Restore evaluation as before */
         PPEvaluationEnabled = PPEvaluationEnabledPrev;
@@ -809,23 +809,6 @@ static void PPhie1 (PPExpr* Expr)
 
 
 
-static void PPhie0 (PPExpr* Expr)
-/* Handle the comma "," operator */
-{
-    PPhie1 (Expr);
-
-    while (CurTok.Tok == TOK_COMMA) {
-        /* Skip the comma */
-        NextToken ();
-        /* Reset the expression */
-        PPExprInit (Expr);
-        /* Use the next operand as the value instead */
-        PPhie1 (Expr);
-    }
-}
-
-
-
 void ParsePPExprInLine (PPExpr* Expr)
 /* Parse a line for PP expression */
 {
@@ -836,7 +819,7 @@ void ParsePPExprInLine (PPExpr* Expr)
 
     /* Parse */
     PPExprInit (Expr);
-    PPhie0 (Expr);
+    PPhie1 (Expr);
 
     /* If the evaluation fails, the result is always zero */
     if (PPEvaluationFailed) {
diff --git a/src/cc65/pragma.c b/src/cc65/pragma.c
index db306040d..51f7f3007 100644
--- a/src/cc65/pragma.c
+++ b/src/cc65/pragma.c
@@ -48,6 +48,7 @@
 #include "error.h"
 #include "global.h"
 #include "litpool.h"
+#include "preproc.h"
 #include "scanner.h"
 #include "scanstrbuf.h"
 #include "symtab.h"
@@ -68,70 +69,70 @@ typedef enum {
     PRAGMA_ALIGN,
     PRAGMA_ALLOW_EAGER_INLINE,
     PRAGMA_BSS_NAME,
-    PRAGMA_BSSSEG,                                      /* obsolete */
     PRAGMA_CHARMAP,
     PRAGMA_CHECK_STACK,
-    PRAGMA_CHECKSTACK,                                  /* obsolete */
     PRAGMA_CODE_NAME,
-    PRAGMA_CODESEG,                                     /* obsolete */
     PRAGMA_CODESIZE,
     PRAGMA_DATA_NAME,
-    PRAGMA_DATASEG,                                     /* obsolete */
     PRAGMA_INLINE_STDFUNCS,
     PRAGMA_LOCAL_STRINGS,
     PRAGMA_MESSAGE,
     PRAGMA_OPTIMIZE,
     PRAGMA_REGISTER_VARS,
     PRAGMA_REGVARADDR,
-    PRAGMA_REGVARS,                                     /* obsolete */
     PRAGMA_RODATA_NAME,
-    PRAGMA_RODATASEG,                                   /* obsolete */
     PRAGMA_SIGNED_CHARS,
-    PRAGMA_SIGNEDCHARS,                                 /* obsolete */
     PRAGMA_STATIC_LOCALS,
-    PRAGMA_STATICLOCALS,                                /* obsolete */
     PRAGMA_WARN,
     PRAGMA_WRAPPED_CALL,
     PRAGMA_WRITABLE_STRINGS,
     PRAGMA_ZPSYM,
-    PRAGMA_COUNT
 } pragma_t;
 
 /* Pragma table */
+/* CAUTION: table must be sorted for bsearch */
 static const struct Pragma {
     const char* Key;            /* Keyword */
     pragma_t    Tok;            /* Token */
-} Pragmas[PRAGMA_COUNT] = {
+} Pragmas[] = {
+/* BEGIN SORTED.SH */
     { "align",                  PRAGMA_ALIGN              },
     { "allow-eager-inline",     PRAGMA_ALLOW_EAGER_INLINE },
+    { "allow_eager_inline",     PRAGMA_ALLOW_EAGER_INLINE },
     { "bss-name",               PRAGMA_BSS_NAME           },
-    { "bssseg",                 PRAGMA_BSSSEG             },      /* obsolete */
+    { "bss_name",               PRAGMA_BSS_NAME           },
     { "charmap",                PRAGMA_CHARMAP            },
     { "check-stack",            PRAGMA_CHECK_STACK        },
-    { "checkstack",             PRAGMA_CHECKSTACK         },      /* obsolete */
+    { "check_stack",            PRAGMA_CHECK_STACK        },
     { "code-name",              PRAGMA_CODE_NAME          },
-    { "codeseg",                PRAGMA_CODESEG            },      /* obsolete */
+    { "code_name",              PRAGMA_CODE_NAME          },
     { "codesize",               PRAGMA_CODESIZE           },
     { "data-name",              PRAGMA_DATA_NAME          },
-    { "dataseg",                PRAGMA_DATASEG            },      /* obsolete */
+    { "data_name",              PRAGMA_DATA_NAME          },
     { "inline-stdfuncs",        PRAGMA_INLINE_STDFUNCS    },
+    { "inline_stdfuncs",        PRAGMA_INLINE_STDFUNCS    },
     { "local-strings",          PRAGMA_LOCAL_STRINGS      },
+    { "local_strings",          PRAGMA_LOCAL_STRINGS      },
     { "message",                PRAGMA_MESSAGE            },
     { "optimize",               PRAGMA_OPTIMIZE           },
     { "register-vars",          PRAGMA_REGISTER_VARS      },
+    { "register_vars",          PRAGMA_REGISTER_VARS      },
     { "regvaraddr",             PRAGMA_REGVARADDR         },
-    { "regvars",                PRAGMA_REGVARS            },      /* obsolete */
     { "rodata-name",            PRAGMA_RODATA_NAME        },
-    { "rodataseg",              PRAGMA_RODATASEG          },      /* obsolete */
+    { "rodata_name",            PRAGMA_RODATA_NAME        },
     { "signed-chars",           PRAGMA_SIGNED_CHARS       },
-    { "signedchars",            PRAGMA_SIGNEDCHARS        },      /* obsolete */
+    { "signed_chars",           PRAGMA_SIGNED_CHARS       },
     { "static-locals",          PRAGMA_STATIC_LOCALS      },
-    { "staticlocals",           PRAGMA_STATICLOCALS       },      /* obsolete */
+    { "static_locals",          PRAGMA_STATIC_LOCALS      },
     { "warn",                   PRAGMA_WARN               },
     { "wrapped-call",           PRAGMA_WRAPPED_CALL       },
+    { "wrapped_call",           PRAGMA_WRAPPED_CALL       },
     { "writable-strings",       PRAGMA_WRITABLE_STRINGS   },
+    { "writable_strings",       PRAGMA_WRITABLE_STRINGS   },
     { "zpsym",                  PRAGMA_ZPSYM              },
+/* END SORTED.SH */
 };
+#define PRAGMA_COUNT    (sizeof (Pragmas) / sizeof (Pragmas[0]))
 
 /* Result of ParsePushPop */
 typedef enum {
@@ -402,22 +403,18 @@ static void ApplySegNamePragma (pragma_t Token, int PushPop, const char* Name, u
 
     switch (Token) {
         case PRAGMA_CODE_NAME:
-        case PRAGMA_CODESEG:
             Seg = SEG_CODE;
             break;
 
         case PRAGMA_RODATA_NAME:
-        case PRAGMA_RODATASEG:
             Seg = SEG_RODATA;
             break;
 
         case PRAGMA_DATA_NAME:
-        case PRAGMA_DATASEG:
             Seg = SEG_DATA;
             break;
 
         case PRAGMA_BSS_NAME:
-        case PRAGMA_BSSSEG:
             Seg = SEG_BSS;
             break;
 
@@ -440,12 +437,7 @@ static void ApplySegNamePragma (pragma_t Token, int PushPop, const char* Name, u
         SetSegAddrSize (Name, AddrSize);
     }
 
-    /* BSS variables are output at the end of the compilation.  Don't
-    ** bother to change their segment, now.
-    */
-    if (Seg != SEG_BSS) {
-        g_segname (Seg);
-    }
+    g_segname (Seg);
 }
 
 
@@ -630,7 +622,7 @@ static void WrappedCallPragma (pragma_scope_t Scope, StrBuf* B)
     Entry = FindSym(Name);
 
     /* Check if the name is valid */
-    if (Entry && (Entry->Flags & SC_FUNC) == SC_FUNC) {
+    if (Entry && (Entry->Flags & SC_TYPEMASK) == SC_FUNC) {
 
         PushWrappedCall(Entry, (unsigned int) Val);
         Entry->Flags |= SC_REF;
@@ -875,24 +867,18 @@ static void NoteMessagePragma (const char* Message)
 
 
 
-static void ParsePragmaString (void)
+static void ParsePragmaString (StrBuf* B)
 /* Parse the contents of _Pragma */
 {
     pragma_t Pragma;
     StrBuf   Ident = AUTO_STRBUF_INITIALIZER;
 
-    /* Create a string buffer from the string literal */
-    StrBuf B = AUTO_STRBUF_INITIALIZER;
-
-
-    SB_Append (&B, GetLiteralStrBuf (CurTok.SVal));
-
     /* Skip the string token */
     NextToken ();
 
     /* Get the pragma name from the string */
-    SB_SkipWhite (&B);
-    if (!SB_GetSym (&B, &Ident, "-")) {
+    SB_SkipWhite (B);
+    if (!SB_GetSym (B, &Ident, "-")) {
         Error ("Invalid pragma");
         goto ExitPoint;
     }
@@ -912,143 +898,119 @@ static void ParsePragmaString (void)
     }
 
     /* Check for an open paren */
-    SB_SkipWhite (&B);
-    if (SB_Get (&B) != '(') {
+    SB_SkipWhite (B);
+    if (SB_Get (B) != '(') {
         Error ("'(' expected");
         goto ExitPoint;
     }
 
     /* Skip white space before the argument */
-    SB_SkipWhite (&B);
+    SB_SkipWhite (B);
 
     /* Switch for the different pragmas */
     switch (Pragma) {
 
         case PRAGMA_ALIGN:
             /* TODO: PES_EXPR (PES_DECL) */
-            IntPragma (PES_STMT, Pragma, &B, &DataAlignment, 1, 4096);
+            IntPragma (PES_STMT, Pragma, B, &DataAlignment, 1, 4096);
             break;
 
         case PRAGMA_ALLOW_EAGER_INLINE:
-            FlagPragma (PES_STMT, Pragma, &B, &EagerlyInlineFuncs);
+            FlagPragma (PES_STMT, Pragma, B, &EagerlyInlineFuncs);
             break;
 
-        case PRAGMA_BSSSEG:
-            Warning ("#pragma bssseg is obsolete, please use #pragma bss-name instead");
-            /* FALLTHROUGH */
         case PRAGMA_BSS_NAME:
             /* TODO: PES_STMT or even PES_EXPR (PES_DECL) maybe? */
-            SegNamePragma (PES_FUNC, PRAGMA_BSS_NAME, &B);
+            SegNamePragma (PES_FUNC, PRAGMA_BSS_NAME, B);
             break;
 
         case PRAGMA_CHARMAP:
-            CharMapPragma (PES_IMM, &B);
+            CharMapPragma (PES_IMM, B);
             break;
 
-        case PRAGMA_CHECKSTACK:
-            Warning ("#pragma checkstack is obsolete, please use #pragma check-stack instead");
-            /* FALLTHROUGH */
         case PRAGMA_CHECK_STACK:
             /* TODO: PES_SCOPE maybe? */
-            FlagPragma (PES_FUNC, Pragma, &B, &CheckStack);
+            FlagPragma (PES_FUNC, Pragma, B, &CheckStack);
             break;
 
-        case PRAGMA_CODESEG:
-            Warning ("#pragma codeseg is obsolete, please use #pragma code-name instead");
-            /* FALLTHROUGH */
         case PRAGMA_CODE_NAME:
             /* PES_FUNC is the only sensible option so far */
-            SegNamePragma (PES_FUNC, PRAGMA_CODE_NAME, &B);
+            SegNamePragma (PES_FUNC, PRAGMA_CODE_NAME, B);
             break;
 
         case PRAGMA_CODESIZE:
             /* PES_EXPR would be optimization nightmare */
-            IntPragma (PES_STMT, Pragma, &B, &CodeSizeFactor, 10, 1000);
+            IntPragma (PES_STMT, Pragma, B, &CodeSizeFactor, 10, 1000);
             break;
 
-        case PRAGMA_DATASEG:
-            Warning ("#pragma dataseg is obsolete, please use #pragma data-name instead");
-            /* FALLTHROUGH */
         case PRAGMA_DATA_NAME:
             /* TODO: PES_STMT or even PES_EXPR (PES_DECL) maybe? */
-            SegNamePragma (PES_FUNC, PRAGMA_DATA_NAME, &B);
+            SegNamePragma (PES_FUNC, PRAGMA_DATA_NAME, B);
             break;
 
         case PRAGMA_INLINE_STDFUNCS:
             /* TODO: PES_EXPR maybe? */
-            FlagPragma (PES_STMT, Pragma, &B, &InlineStdFuncs);
+            FlagPragma (PES_STMT, Pragma, B, &InlineStdFuncs);
             break;
 
         case PRAGMA_LOCAL_STRINGS:
             /* TODO: PES_STMT or even PES_EXPR */
-            FlagPragma (PES_FUNC, Pragma, &B, &LocalStrings);
+            FlagPragma (PES_FUNC, Pragma, B, &LocalStrings);
             break;
 
         case PRAGMA_MESSAGE:
             /* PES_IMM is the only sensible option */
-            StringPragma (PES_IMM, &B, NoteMessagePragma);
+            StringPragma (PES_IMM, B, NoteMessagePragma);
             break;
 
         case PRAGMA_OPTIMIZE:
             /* TODO: PES_STMT or even PES_EXPR maybe? */
-            FlagPragma (PES_STMT, Pragma, &B, &Optimize);
+            FlagPragma (PES_STMT, Pragma, B, &Optimize);
             break;
 
         case PRAGMA_REGVARADDR:
             /* TODO: PES_STMT or even PES_EXPR maybe? */
-            FlagPragma (PES_FUNC, Pragma, &B, &AllowRegVarAddr);
+            FlagPragma (PES_FUNC, Pragma, B, &AllowRegVarAddr);
             break;
 
-        case PRAGMA_REGVARS:
-            Warning ("#pragma regvars is obsolete, please use #pragma register-vars instead");
-            /* FALLTHROUGH */
         case PRAGMA_REGISTER_VARS:
             /* TODO: PES_STMT or even PES_EXPR (PES_DECL) maybe? */
-            FlagPragma (PES_FUNC, Pragma, &B, &EnableRegVars);
+            FlagPragma (PES_FUNC, Pragma, B, &EnableRegVars);
             break;
 
-        case PRAGMA_RODATASEG:
-            Warning ("#pragma rodataseg is obsolete, please use #pragma rodata-name instead");
-            /* FALLTHROUGH */
         case PRAGMA_RODATA_NAME:
             /* TODO: PES_STMT or even PES_EXPR maybe? */
-            SegNamePragma (PES_FUNC, PRAGMA_RODATA_NAME, &B);
+            SegNamePragma (PES_FUNC, PRAGMA_RODATA_NAME, B);
             break;
 
-        case PRAGMA_SIGNEDCHARS:
-            Warning ("#pragma signedchars is obsolete, please use #pragma signed-chars instead");
-            /* FALLTHROUGH */
         case PRAGMA_SIGNED_CHARS:
             /* TODO: PES_STMT or even PES_EXPR maybe? */
-            FlagPragma (PES_FUNC, Pragma, &B, &SignedChars);
+            FlagPragma (PES_FUNC, Pragma, B, &SignedChars);
             break;
 
-        case PRAGMA_STATICLOCALS:
-            Warning ("#pragma staticlocals is obsolete, please use #pragma static-locals instead");
-            /* FALLTHROUGH */
         case PRAGMA_STATIC_LOCALS:
             /* TODO: PES_STMT or even PES_EXPR (PES_DECL) maybe? */
-            FlagPragma (PES_FUNC, Pragma, &B, &StaticLocals);
+            FlagPragma (PES_FUNC, Pragma, B, &StaticLocals);
             break;
 
         case PRAGMA_WRAPPED_CALL:
             /* PES_IMM is the only sensible option */
-            WrappedCallPragma (PES_IMM, &B);
+            WrappedCallPragma (PES_IMM, B);
             break;
 
         case PRAGMA_WARN:
             /* PES_IMM is the only sensible option */
-            WarnPragma (PES_IMM, &B);
+            WarnPragma (PES_IMM, B);
             break;
 
         case PRAGMA_WRITABLE_STRINGS:
             /* TODO: PES_STMT or even PES_EXPR maybe? */
-            FlagPragma (PES_FUNC, Pragma, &B, &WritableStrings);
+            FlagPragma (PES_FUNC, Pragma, B, &WritableStrings);
             break;
 
         case PRAGMA_ZPSYM:
             /* PES_IMM is the only sensible option */
-            StringPragma (PES_IMM, &B, MakeZPSym);
+            StringPragma (PES_IMM, B, MakeZPSym);
             break;
 
         default:
@@ -1056,27 +1018,26 @@ static void ParsePragmaString (void)
     }
 
     /* Closing paren expected */
-    SB_SkipWhite (&B);
-    if (SB_Get (&B) != ')') {
+    SB_SkipWhite (B);
+    if (SB_Get (B) != ')') {
         Error ("')' expected");
         goto ExitPoint;
     }
-    SB_SkipWhite (&B);
+    SB_SkipWhite (B);
 
     /* Allow an optional semicolon to be compatible with the old syntax */
-    if (SB_Peek (&B) == ';') {
-        SB_Skip (&B);
-        SB_SkipWhite (&B);
+    if (SB_Peek (B) == ';') {
+        SB_Skip (B);
+        SB_SkipWhite (B);
     }
 
     /* Make sure nothing follows */
-    if (SB_Peek (&B) != '\0') {
+    if (SB_Peek (B) != '\0') {
         Error ("Unexpected input following pragma directive");
     }
 
 ExitPoint:
     /* Release the string buffers */
-    SB_Done (&B);
     SB_Done (&Ident);
 }
 
@@ -1115,8 +1076,24 @@ void ConsumePragma (void)
         */
         PragmaErrorSkip ();
     } else {
+        /* Pragmas that have the C99 _Pragma operator in the source code
+        ** (instead of #pragma that was converted to _Pragma by the
+        ** preprocessor) have the argument not preprocessed. We need to do
+        ** that here, since it may contain comments. Weird but legal C. Pragmas
+        ** that were converted from #pragma are already preprocessed but doing
+        ** it twice won't harm.
+        */
+        StrBuf In  = AUTO_STRBUF_INITIALIZER;
+        StrBuf Out = AUTO_STRBUF_INITIALIZER;
+        SB_Append (&In, GetLiteralStrBuf (CurTok.SVal));
+        TranslationPhase3 (&In, &Out);
+        SB_Done (&In);
+
         /* Parse the pragma */
-        ParsePragmaString ();
+        ParsePragmaString (&Out);
+
+        /* Free the string buffer */
+        SB_Done (&Out);
     }
 
     --InPragmaParser;
diff --git a/src/cc65/preproc.c b/src/cc65/preproc.c
index 0a9b94bf2..bc3b532fa 100644
--- a/src/cc65/preproc.c
+++ b/src/cc65/preproc.c
@@ -93,6 +93,10 @@
 #define IFCOND_SKIP     0x01U
 #define IFCOND_ELSE     0x02U
 #define IFCOND_NEEDTERM 0x04U
+#define IFCOND_ISGUARD  0x08U
+
+/* Current input file */
+static IFile* CurInput = 0;
 
 /* Current PP if stack */
 static PPIfStack* PPStack;
@@ -153,11 +157,6 @@ struct HiddenMacro {
 
 
 
-static void TranslationPhase3 (StrBuf* Source, StrBuf* Target);
-/* Mimic Translation Phase 3. Handle old and new style comments. Collapse
-** non-newline whitespace sequences.
-*/
-
 static void PreprocessDirective (StrBuf* Source, StrBuf* Target, unsigned ModeFlags);
 /* Preprocess a single line. Handle specified tokens and operators, remove
 ** whitespace and comments, then do macro replacement.
@@ -216,10 +215,12 @@ typedef enum {
 
 
 /* Preprocessor directive tokens mapping table */
+/* CAUTION: table must be sorted for bsearch */
 static const struct PPDType {
     const char*     Tok;        /* Token */
     ppdirective_t   Type;       /* Type */
 } PPDTypes[] = {
+/* BEGIN SORTED.SH */
     {   "define",       PPD_DEFINE      },
     {   "elif",         PPD_ELIF        },
     {   "else",         PPD_ELSE        },
@@ -233,6 +234,7 @@ static const struct PPDType {
     {   "pragma",       PPD_PRAGMA      },
     {   "undef",        PPD_UNDEF       },
     {   "warning",      PPD_WARNING     },
+/* END SORTED.SH */
 };
 
 /* Number of preprocessor directive types */
@@ -842,7 +844,7 @@ static void AddPreLine (StrBuf* Str)
             SB_AppendChar (Str, '\n');
         }
         SB_Printf (&Comment, "#line %u \"%s\"\n",
-                   GetCurrentLineNum () - ContinuedLines, GetCurrentFilename ());
+                   GetCurrentLineNum () - ContinuedLines, GetCurrentFileName ());
         SB_Append (Str, &Comment);
     } else {
         /* Output new lines */
@@ -2572,7 +2574,7 @@ static void DoDefine (void)
     CheckForBadIdent (Ident, Std, 0);
 
     /* Create a new macro definition */
-    M = NewMacro (Ident);
+    M = NewMacro (Ident, 0);
 
     /* Check if this is a function-like macro */
     if (CurC == '(') {
@@ -2640,6 +2642,19 @@ static void DoDefine (void)
             goto Error_Handler;
         }
         NextChar ();
+
+    } else {
+
+        /* Object like macro. Check ISO/IEC 9899:1999 (E) 6.10.3p3:
+        ** "There shall be white-space between the identifier and the
+        ** replacement list in the definition of an object-like macro."
+        ** Note: C89 doesn't have this constraint.
+        ** Note: if there is no replacement list, a space is not required.
+        */
+        if (Std == STD_C99 && !IsSpace (CurC) && CurC != 0) {
+            PPWarning ("ISO C99 requires whitespace after the macro name");
+        }
+
     }
 
     /* Remove whitespace and comments from the line, store the preprocessed
@@ -2685,7 +2700,7 @@ Error_Handler:
 
 
 
-static int PushIf (int Skip, int Invert, int Cond)
+static int PushIf (int Skip, int Invert, int Cond, unsigned Flags)
 /* Push a new if level onto the if stack */
 {
     /* Check for an overflow of the if stack */
@@ -2697,10 +2712,10 @@ static int PushIf (int Skip, int Invert, int Cond)
     /* Push the #if condition */
     ++PPStack->Index;
     if (Skip) {
-        PPStack->Stack[PPStack->Index] = IFCOND_SKIP | IFCOND_NEEDTERM;
+        PPStack->Stack[PPStack->Index] = IFCOND_SKIP | IFCOND_NEEDTERM | Flags;
         return 1;
     } else {
-        PPStack->Stack[PPStack->Index] = IFCOND_NONE | IFCOND_NEEDTERM;
+        PPStack->Stack[PPStack->Index] = IFCOND_NONE | IFCOND_NEEDTERM | Flags;
         return (Invert ^ Cond);
     }
 }
@@ -2778,29 +2793,40 @@ static int DoIf (int Skip)
     }
 
     /* Set the #if condition according to the expression result */
-    return PushIf (Skip, 1, Expr.IVal != 0);
+    return PushIf (Skip, 1, Expr.IVal != 0, IFCOND_NONE);
 }
 
 
 
-static int DoIfDef (int skip, int flag)
-/* Process #ifdef if flag == 1, or #ifndef if flag == 0. */
+static int DoIfDef (int Skip, int Flag)
+/* Process #ifdef if Flag == 1, or #ifndef if Flag == 0. */
 {
-    int Value = 0;
+    int IsDef = 0;
+    unsigned GuardFlag = IFCOND_NONE;
 
-    if (!skip) {
+    if (!Skip) {
         ident Ident;
 
         SkipWhitespace (0);
         if (MacName (Ident)) {
             CheckForBadIdent (Ident, IS_Get (&Standard), 0);
-            Value = IsMacro (Ident);
+            IsDef = IsMacro (Ident);
             /* Check for extra tokens */
-            CheckExtraTokens (flag ? "ifdef" : "ifndef");
+            CheckExtraTokens (Flag ? "ifdef" : "ifndef");
+            /* Check if this is an include guard. This is the case if we have
+            ** a #ifndef directive at the start of a new file and the macro
+            ** is not defined. If so, remember it.
+            */
+            if (Flag == 0 && (CurInput->GFlags & IG_NEWFILE) != 0 && !IsDef) {
+                CurInput->GFlags |= IG_ISGUARDED;
+                SB_CopyStr (&CurInput->GuardMacro, Ident);
+                SB_Terminate (&CurInput->GuardMacro);
+                GuardFlag = IFCOND_ISGUARD;
+            }
         }
     }
 
-    return PushIf (skip, flag, Value);
+    return PushIf (Skip, Flag, IsDef, GuardFlag);
 }
 
 
@@ -2812,11 +2838,30 @@ static void DoInclude (void)
     InputType   IT;
     StrBuf      Filename = AUTO_STRBUF_INITIALIZER;
 
-    /* Macro-replace a single line with special support for <filename> */
-    SB_Clear (MLine);
-    PreprocessDirective (Line, MLine, MSM_TOK_HEADER);
+    /* Skip whitespace so the input pointer points to the argument */
+    SkipWhitespace (0);
 
-    /* Read from the processed line */
+    /* We may have three forms of the #include directive:
+    **
+    ** - # include "q-char-sequence" new-line
+    ** - # include <h-char-sequence> new-line
+    ** - # include pp-tokens new-line
+    **
+    ** The former two are processed as is while the latter is preprocessed and
+    ** must then resemble one of the first two forms.
+    */
+    if (CurC == '"' || CurC == '<') {
+        /* Copy the argument part over to MLine */
+        unsigned Start = SB_GetIndex (Line);
+        unsigned Length = SB_GetLen (Line) - Start;
+        SB_Slice (MLine, Line, Start, Length);
+    } else {
+        /* Macro-replace a single line with special support for <filename> */
+        SB_Clear (MLine);
+        PreprocessDirective (Line, MLine, MSM_TOK_HEADER);
+    }
+
+    /* Read from the copied/preprocessed line */
     SB_Reset (MLine);
     MLine = InitLine (MLine);
 
@@ -2894,7 +2939,7 @@ static unsigned GetLineDirectiveNum (void)
 
     /* Ensure the buffer is terminated with a '\0' */
     SB_Terminate (&Buf);
-    if (SkipWhitespace (0) != 0 || CurC == '\0') {
+    if (SB_GetLen (&Buf) > 0) {
         const char* Str = SB_GetConstBuf (&Buf);
         if (Str[0] == '\0') {
             PPWarning ("#line directive interprets number as decimal, not octal");
@@ -2910,9 +2955,10 @@ static unsigned GetLineDirectiveNum (void)
             }
         }
     } else {
-        PPError ("#line directive requires a simple decimal digit sequence");
+        PPError ("#line directive requires a decimal digit sequence");
         ClearLine ();
     }
+    SkipWhitespace (0);
 
     /* Done with the buffer */
     SB_Done (&Buf);
@@ -2943,7 +2989,7 @@ static void DoLine (void)
             StrBuf Filename = AUTO_STRBUF_INITIALIZER;
             if (SB_GetString (Line, &Filename)) {
                 SB_Terminate (&Filename);
-                SetCurrentFilename (SB_GetConstBuf (&Filename));
+                SetCurrentFileName (SB_GetConstBuf (&Filename));
             } else {
                 PPError ("Invalid filename for #line directive");
                 LineNum = 0;
@@ -3034,18 +3080,31 @@ static int ParseDirectives (unsigned ModeFlags)
     int         PPSkip = 0;
     ident       Directive;
 
-    /* Skip white space at the beginning of the first line */
+    /* Skip white space at the beginning of the line */
     int Whitespace = SkipWhitespace (0);
 
     /* Check for stuff to skip */
     while (CurC == '\0' || CurC == '#' || PPSkip) {
 
+        /* If a #ifndef that was assumed to be an include guard was closed
+        ** recently, we may not have anything else following in the file
+        ** besides whitespace otherwise the assumption was false and we don't
+        ** actually have an include guard.
+        */
+        if (CurC != '\0' && (CurInput->GFlags & IG_COMPLETE) == IG_COMPLETE) {
+            CurInput->GFlags &= ~IG_ISGUARDED;
+        }
+
         /* Check for preprocessor lines lines */
         if (CurC == '#') {
+            unsigned IfCond;
+            /* Skip the hash and following white space */
             NextChar ();
             SkipWhitespace (0);
+
             if (CurC == '\0') {
                 /* Ignore the empty preprocessor directive */
+                CurInput->GFlags &= ~IG_NEWFILE;
                 continue;
             }
             if (!IsSym (Directive)) {
@@ -3053,145 +3112,175 @@ static int ParseDirectives (unsigned ModeFlags)
                     PPError ("Preprocessor directive expected");
                 }
                 ClearLine ();
-            } else {
-                switch (FindPPDirectiveType (Directive)) {
+                CurInput->GFlags &= ~IG_NEWFILE;
+                continue;
+            }
+            switch (FindPPDirectiveType (Directive)) {
 
-                    case PPD_DEFINE:
-                        if (!PPSkip) {
-                            DoDefine ();
-                        }
-                        break;
+                case PPD_DEFINE:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (!PPSkip) {
+                        DoDefine ();
+                    }
+                    break;
 
-                    case PPD_ELIF:
-                        if (PPStack->Index >= 0) {
-                            if ((PPStack->Stack[PPStack->Index] & IFCOND_ELSE) == 0) {
-                                /* Handle as #else/#if combination */
-                                if ((PPStack->Stack[PPStack->Index] & IFCOND_SKIP) == 0) {
-                                    PPSkip = !PPSkip;
-                                }
-                                PPStack->Stack[PPStack->Index] |= IFCOND_ELSE;
-                                PPSkip = DoIf (PPSkip);
+                case PPD_ELIF:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (PPStack->Index >= 0) {
+                        unsigned char PPCond = PPStack->Stack[PPStack->Index];
+                        if ((PPCond & IFCOND_ELSE) == 0) {
+                            /* Handle as #else/#if combination */
+                            if ((PPCond & IFCOND_SKIP) == 0) {
+                                PPSkip = !PPSkip;
+                            }
+                            PPStack->Stack[PPStack->Index] |= IFCOND_ELSE;
+                            PPSkip = DoIf (PPSkip);
 
-                                /* #elif doesn't need a terminator */
-                                PPStack->Stack[PPStack->Index] &= ~IFCOND_NEEDTERM;
-                            } else {
-                                PPError ("Duplicate #else/#elif");
+                            /* #elif doesn't need a terminator */
+                            PPStack->Stack[PPStack->Index] &= ~IFCOND_NEEDTERM;
+
+                            /* An include guard cannot have a #elif */
+                            if (PPCond & IFCOND_ISGUARD) {
+                                CurInput->GFlags &= ~IG_ISGUARDED;
                             }
                         } else {
-                            PPError ("Unexpected #elif");
+                            PPError ("Duplicate #else/#elif");
                         }
-                        break;
+                    } else {
+                        PPError ("Unexpected #elif");
+                    }
+                    break;
 
-                    case PPD_ELSE:
-                        if (PPStack->Index >= 0) {
-                            if ((PPStack->Stack[PPStack->Index] & IFCOND_ELSE) == 0) {
-                                if ((PPStack->Stack[PPStack->Index] & IFCOND_SKIP) == 0) {
-                                    PPSkip = !PPSkip;
-                                }
-                                PPStack->Stack[PPStack->Index] |= IFCOND_ELSE;
-
-                                /* Check for extra tokens */
-                                CheckExtraTokens ("else");
-                            } else {
-                                PPError ("Duplicate #else");
+                case PPD_ELSE:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (PPStack->Index >= 0) {
+                        unsigned char PPCond = PPStack->Stack[PPStack->Index];
+                        if ((PPCond & IFCOND_ELSE) == 0) {
+                            if ((PPCond & IFCOND_SKIP) == 0) {
+                                PPSkip = !PPSkip;
                             }
-                        } else {
-                            PPError ("Unexpected '#else'");
-                        }
-                        break;
+                            PPStack->Stack[PPStack->Index] |= IFCOND_ELSE;
 
-                    case PPD_ENDIF:
-                        if (PPStack->Index >= 0) {
-                            /* Remove any clauses on top of stack that do not
-                            ** need a terminating #endif.
-                            */
-                            while (PPStack->Index >= 0 &&
-                                   (PPStack->Stack[PPStack->Index] & IFCOND_NEEDTERM) == 0) {
-                                --PPStack->Index;
+                            /* An include guard cannot have a #else */
+                            if (PPCond & IFCOND_ISGUARD) {
+                                CurInput->GFlags &= ~IG_ISGUARDED;
                             }
 
-                            /* Stack may not be empty here or something is wrong */
-                            CHECK (PPStack->Index >= 0);
-
-                            /* Remove the clause that needs a terminator */
-                            PPSkip = (PPStack->Stack[PPStack->Index--] & IFCOND_SKIP) != 0;
-
                             /* Check for extra tokens */
-                            CheckExtraTokens ("endif");
+                            CheckExtraTokens ("else");
                         } else {
-                            PPError ("Unexpected '#endif'");
+                            PPError ("Duplicate #else");
                         }
-                        break;
+                    } else {
+                        PPError ("Unexpected '#else'");
+                    }
+                    break;
 
-                    case PPD_ERROR:
-                        if (!PPSkip) {
-                            DoError ();
+                case PPD_ENDIF:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (PPStack->Index >= 0) {
+                        /* Remove any clauses on top of stack that do not
+                        ** need a terminating #endif.
+                        */
+                        while (PPStack->Index >= 0 &&
+                               (PPStack->Stack[PPStack->Index] & IFCOND_NEEDTERM) == 0) {
+                            --PPStack->Index;
                         }
-                        break;
 
-                    case PPD_IF:
-                        PPSkip = DoIf (PPSkip);
-                        break;
+                        /* Stack may not be empty here or something is wrong */
+                        CHECK (PPStack->Index >= 0);
 
-                    case PPD_IFDEF:
-                        PPSkip = DoIfDef (PPSkip, 1);
-                        break;
-
-                    case PPD_IFNDEF:
-                        PPSkip = DoIfDef (PPSkip, 0);
-                        break;
-
-                    case PPD_INCLUDE:
-                        if (!PPSkip) {
-                            DoInclude ();
+                        /* Remove the clause that needs a terminator */
+                        IfCond = PPStack->Stack[PPStack->Index--];
+                        PPSkip = (IfCond & IFCOND_SKIP) != 0;
+                        if (IfCond & IFCOND_ISGUARD) {
+                            CurInput->GFlags |= IG_GUARDCLOSED;
                         }
-                        break;
 
-                    case PPD_LINE:
-                        if (!PPSkip) {
-                            DoLine ();
-                        }
-                        break;
+                        /* Check for extra tokens */
+                        CheckExtraTokens ("endif");
+                    } else {
+                        PPError ("Unexpected '#endif'");
+                    }
+                    break;
 
-                    case PPD_PRAGMA:
-                        if (!PPSkip) {
-                            if ((ModeFlags & MSM_IN_ARG_LIST) == 0) {
-                                DoPragma ();
-                                return Whitespace;
-                            } else {
-                                PPError ("Embedded #pragma directive within macro arguments is unsupported");
-                            }
-                        }
-                        break;
+                case PPD_ERROR:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (!PPSkip) {
+                        DoError ();
+                    }
+                    break;
 
-                    case PPD_UNDEF:
-                        if (!PPSkip) {
-                            DoUndef ();
-                        }
-                        break;
+                case PPD_IF:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    PPSkip = DoIf (PPSkip);
+                    break;
 
-                    case PPD_WARNING:
-                        /* #warning is a non standard extension */
-                        if (IS_Get (&Standard) > STD_C99) {
-                            if (!PPSkip) {
-                                DoWarning ();
-                            }
+                case PPD_IFDEF:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    PPSkip = DoIfDef (PPSkip, 1);
+                    break;
+
+                case PPD_IFNDEF:
+                    PPSkip = DoIfDef (PPSkip, 0);
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    break;
+
+                case PPD_INCLUDE:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (!PPSkip) {
+                        DoInclude ();
+                    }
+                    break;
+
+                case PPD_LINE:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (!PPSkip) {
+                        DoLine ();
+                    }
+                    break;
+
+                case PPD_PRAGMA:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (!PPSkip) {
+                        if ((ModeFlags & MSM_IN_ARG_LIST) == 0) {
+                            DoPragma ();
+                            return Whitespace;
                         } else {
-                            if (!PPSkip) {
-                                PPError ("Preprocessor directive expected");
-                            }
-                            ClearLine ();
+                            PPError ("Embedded #pragma directive within macro arguments is unsupported");
                         }
-                        break;
+                    }
+                    break;
 
-                    default:
+                case PPD_UNDEF:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (!PPSkip) {
+                        DoUndef ();
+                    }
+                    break;
+
+                case PPD_WARNING:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    /* #warning is a non standard extension */
+                    if (IS_Get (&Standard) > STD_C99) {
+                        if (!PPSkip) {
+                            DoWarning ();
+                        }
+                    } else {
                         if (!PPSkip) {
                             PPError ("Preprocessor directive expected");
                         }
                         ClearLine ();
-                }
-            }
+                    }
+                    break;
 
+                default:
+                    CurInput->GFlags &= ~IG_NEWFILE;
+                    if (!PPSkip) {
+                        PPError ("Preprocessor directive expected");
+                    }
+                    ClearLine ();
+            }
         }
         if (NextLine () == 0) {
             break;
@@ -3200,6 +3289,15 @@ static int ParseDirectives (unsigned ModeFlags)
         Whitespace = SkipWhitespace (0) || Whitespace;
     }
 
+    /* If a #ifndef that was assumed to be an include guard was closed
+    ** recently, we may not have anything else following in the file
+    ** besides whitespace otherwise the assumption was false and we don't
+    ** actually have an include guard.
+    */
+    if (CurC != '\0' && (CurInput->GFlags & IG_COMPLETE) == IG_COMPLETE) {
+        CurInput->GFlags &= ~IG_ISGUARDED;
+    }
+
     return Whitespace;
 }
 
@@ -3220,7 +3318,7 @@ void HandleSpecialMacro (Macro* M, const char* Name)
     } else if (strcmp (Name, "__FILE__") == 0) {
         /* Replace __FILE__ with the current filename */
         StrBuf B = AUTO_STRBUF_INITIALIZER;
-        SB_InitFromString (&B, GetCurrentFilename ());
+        SB_InitFromString (&B, GetCurrentFileName ());
         SB_Clear (&M->Replacement);
         Stringize (&B, &M->Replacement);
         SB_Done (&B);
@@ -3235,7 +3333,22 @@ void HandleSpecialMacro (Macro* M, const char* Name)
 
 
 
-static void TranslationPhase3 (StrBuf* Source, StrBuf* Target)
+static void PreprocessDirective (StrBuf* Source, StrBuf* Target, unsigned ModeFlags)
+/* Preprocess a single line. Handle specified tokens and operators, remove
+** whitespace and comments, then do macro replacement.
+*/
+{
+    MacroExp    E;
+
+    SkipWhitespace (0);
+    InitMacroExp (&E);
+    ReplaceMacros (Source, Target, &E, ModeFlags | MSM_IN_DIRECTIVE);
+    DoneMacroExp (&E);
+}
+
+
+
+void TranslationPhase3 (StrBuf* Source, StrBuf* Target)
 /* Mimic Translation Phase 3. Handle old and new style comments. Collapse
 ** non-newline whitespace sequences.
 */
@@ -3281,21 +3394,6 @@ static void TranslationPhase3 (StrBuf* Source, StrBuf* Target)
 
 
 
-static void PreprocessDirective (StrBuf* Source, StrBuf* Target, unsigned ModeFlags)
-/* Preprocess a single line. Handle specified tokens and operators, remove
-** whitespace and comments, then do macro replacement.
-*/
-{
-    MacroExp    E;
-
-    SkipWhitespace (0);
-    InitMacroExp (&E);
-    ReplaceMacros (Source, Target, &E, ModeFlags | MSM_IN_DIRECTIVE);
-    DoneMacroExp (&E);
-}
-
-
-
 void Preprocess (void)
 /* Preprocess lines count of which is affected by directives */
 {
@@ -3310,6 +3408,7 @@ void Preprocess (void)
     OLine = PLine;
     ParseDirectives (MSM_MULTILINE);
     OLine = 0;
+    CurInput->GFlags &= ~IG_NEWFILE;
 
     /* Add the source info to preprocessor output if needed */
     AddPreLine (PLine);
@@ -3332,7 +3431,7 @@ void Preprocess (void)
     PLine = InitLine (PLine);
 
     if (Verbosity > 1 && SB_NotEmpty (Line)) {
-        printf ("%s:%u: %.*s\n", GetCurrentFilename (), GetCurrentLineNum (),
+        printf ("%s:%u: %.*s\n", GetCurrentFileName (), GetCurrentLineNum (),
                 (int) SB_GetLen (Line), SB_GetConstBuf (Line));
     }
 
@@ -3378,9 +3477,13 @@ void ContinueLine (void)
 
 
 
-void PreprocessBegin (void)
-/* Initialize preprocessor with current file */
+void PreprocessBegin (IFile* Input)
+/* Initialize the preprocessor for a new input file */
 {
+    /* Remember the new input file and flag it as new */
+    CurInput = Input;
+    CurInput->GFlags |= IG_NEWFILE;
+
     /* Reset #if depth */
     PPStack->Index = -1;
 
@@ -3393,9 +3496,14 @@ void PreprocessBegin (void)
 
 
 
-void PreprocessEnd (void)
-/* Preprocessor done with current file */
+void PreprocessEnd (IFile* Input)
+/* Preprocessor done with current file. The parameter is the file we're
+** switching back to.
+*/
 {
+    /* Switch back to the old input file */
+    CurInput = Input;
+
     /* Check for missing #endif */
     while (PPStack->Index >= 0) {
         if ((PPStack->Stack[PPStack->Index] & IFCOND_NEEDTERM) != 0) {
diff --git a/src/cc65/preproc.h b/src/cc65/preproc.h
index e2a1b073c..c8fc67ddc 100644
--- a/src/cc65/preproc.h
+++ b/src/cc65/preproc.h
@@ -54,6 +54,9 @@ struct PPIfStack {
     int             Index;
 };
 
+/* Forward */
+struct IFile;
+
 
 
 /*****************************************************************************/
@@ -62,29 +65,36 @@ struct PPIfStack {
 
 
 
+void HandleSpecialMacro (Macro* M, const char* Name);
+/* Handle special "magic" macros that may change */
+
+void TranslationPhase3 (StrBuf* Source, StrBuf* Target);
+/* Mimic Translation Phase 3. Handle old and new style comments. Collapse
+** non-newline whitespace sequences.
+*/
+
 void Preprocess (void);
 /* Preprocess a line */
 
-void SetPPIfStack (PPIfStack* Stack);
-/* Specify which PP #if stack to use */
-
-void ContinueLine (void);
-/* Continue the current line ended with a '\\' */
-
-void PreprocessBegin (void);
-/* Initialize preprocessor with current file */
-
-void PreprocessEnd (void);
-/* Preprocessor done with current file */
-
 void InitPreprocess (void);
 /* Init preprocessor */
 
 void DonePreprocess (void);
 /* Done with preprocessor */
 
-void HandleSpecialMacro (Macro* M, const char* Name);
-/* Handle special "magic" macros that may change */
+void SetPPIfStack (PPIfStack* Stack);
+/* Specify which PP #if stack to use */
+
+void ContinueLine (void);
+/* Continue the current line ended with a '\\' */
+
+void PreprocessBegin (struct IFile* Input);
+/* Initialize the preprocessor for a new input file */
+
+void PreprocessEnd (struct IFile* Input);
+/* Preprocessor done with current file. The parameter is the file we're
+** switching back to.
+*/
 
 
 
diff --git a/src/cc65/scanner.c b/src/cc65/scanner.c
index 00dde9e83..dda857f07 100644
--- a/src/cc65/scanner.c
+++ b/src/cc65/scanner.c
@@ -87,11 +87,13 @@ enum {
 };
 
 /* Token table */
+/* CAUTION: table must be sorted for bsearch */
 static const struct Keyword {
     char*           Key;        /* Keyword name */
     unsigned char   Tok;        /* The token */
     unsigned char   Std;        /* Token supported in which standards? */
 } Keywords [] = {
+/* BEGIN SORTED.SH */
     { "_Pragma",        TOK_PRAGMA,     TT_C89 | TT_C99 | TT_CC65  },   /* !! */
     { "_Static_assert", TOK_STATIC_ASSERT,                TT_CC65  },   /* C11 */
     { "__AX__",         TOK_AX,         TT_C89 | TT_C99 | TT_CC65  },
@@ -145,6 +147,7 @@ static const struct Keyword {
     { "void",           TOK_VOID,       TT_C89 | TT_C99 | TT_CC65  },
     { "volatile",       TOK_VOLATILE,   TT_C89 | TT_C99 | TT_CC65  },
     { "while",          TOK_WHILE,      TT_C89 | TT_C99 | TT_CC65  },
+/* END SORTED.SH */
 };
 #define KEY_COUNT       (sizeof (Keywords) / sizeof (Keywords [0]))
 
@@ -163,6 +166,12 @@ static const struct Keyword {
 typedef uint32_t scan_t;
 
 
+/* ParseChar return values */
+typedef struct {
+    int Val;
+    int Cooked;
+} parsedchar_t;
+
 /*****************************************************************************/
 /*                                   code                                    */
 /*****************************************************************************/
@@ -326,13 +335,16 @@ static void SetTok (int tok)
 
 
 
-static int ParseChar (void)
+static parsedchar_t ParseChar (void)
 /* Parse a character token. Converts escape chars into character codes. */
 {
+    parsedchar_t Result;
     int C;
     int HadError;
     int Count;
 
+    Result.Cooked = 1;
+
     /* Check for escape chars */
     if (CurC == '\\') {
         NextChar ();
@@ -346,6 +358,14 @@ static int ParseChar (void)
             case 'b':
                 C = '\b';
                 break;
+            case 'e':
+                if (IS_Get(&Standard) != STD_CC65) {
+                    goto IllegalEscape;
+                }
+                /* we'd like to use \e here, but */
+                /* not all build systems support it */
+                C = '\x1B';
+                break;
             case 'f':
                 C = '\f';
                 break;
@@ -373,6 +393,7 @@ static int ParseChar (void)
             case 'x':
             case 'X':
                 /* Hex character constant */
+                Result.Cooked = 0;
                 if (!IsXDigit (NextC)) {
                     Error ("\\x used with no following hex digits");
                     C = ' ';
@@ -401,6 +422,7 @@ static int ParseChar (void)
             case '6':
             case '7':
                 /* Octal constant */
+                Result.Cooked = 0;
                 Count = 1;
                 C = HexVal (CurC);
                 while (IsODigit (NextC) && Count++ < 3) {
@@ -411,6 +433,7 @@ static int ParseChar (void)
                     Error ("Octal character constant out of range");
                 break;
             default:
+IllegalEscape:
                 C = CurC;
                 Error ("Illegal escaped character: 0x%02X", CurC);
                 break;
@@ -423,7 +446,12 @@ static int ParseChar (void)
     NextChar ();
 
     /* Do correct sign extension */
-    return SignExtendChar (C);
+    Result.Val = SignExtendChar(C);
+    if (Result.Cooked) {
+        Result.Cooked = Result.Val;
+    }
+
+    return Result;
 }
 
 
@@ -431,7 +459,7 @@ static int ParseChar (void)
 static void CharConst (void)
 /* Parse a character constant token */
 {
-    int C;
+    parsedchar_t C;
 
     if (CurC == 'L') {
         /* Wide character constant */
@@ -457,7 +485,8 @@ static void CharConst (void)
     }
 
     /* Translate into target charset */
-    NextTok.IVal = SignExtendChar (C);
+    NextTok.IVal = SignExtendChar (C.Val);
+    NextTok.Cooked = C.Cooked;
 
     /* Character constants have type int */
     NextTok.Type = type_int;
@@ -468,6 +497,9 @@ static void CharConst (void)
 static void StringConst (void)
 /* Parse a quoted string token */
 {
+    /* result from ParseChar */
+    parsedchar_t ParsedChar;
+
     /* String buffer */
     StrBuf S = AUTO_STRBUF_INITIALIZER;
 
@@ -494,7 +526,8 @@ static void StringConst (void)
             Error ("Unexpected newline");
             break;
         }
-        SB_AppendChar (&S, ParseChar ());
+        ParsedChar = ParseChar ();
+        SB_AppendCharCooked(&S, ParsedChar.Val, ParsedChar.Cooked);
     }
 
     /* Skip closing quote char if there was one */
@@ -689,6 +722,7 @@ static void NumericConst (void)
 
         /* Set the value and the token */
         NextTok.IVal = IVal;
+        NextTok.Cooked = 0;
         NextTok.Tok  = TOK_ICONST;
 
     } else {
@@ -805,7 +839,12 @@ static void GetNextInputToken (void)
         if (NextTok.Tok == TOK_SCONST || NextTok.Tok == TOK_WCSCONST) {
             TranslateLiteral (NextTok.SVal);
         } else if (NextTok.Tok == TOK_CCONST || NextTok.Tok == TOK_WCCONST) {
-            NextTok.IVal = SignExtendChar (TgtTranslateChar (NextTok.IVal));
+            if (NextTok.Cooked) {
+                NextTok.IVal = SignExtendChar (TgtTranslateChar (NextTok.IVal));
+            }
+            else {
+                NextTok.IVal = SignExtendChar (NextTok.IVal);
+            }
         }
     }
 
@@ -1235,6 +1274,212 @@ void SkipTokens (const token_t* TokenList, unsigned TokenCount)
 
 
 
+static void OpenBrace (Collection* C, token_t Tok)
+/* Consume an opening parenthesis/bracket/curly brace and remember that */
+{
+    switch (Tok) {
+        case TOK_LPAREN: Tok = TOK_RPAREN; break;
+        case TOK_LBRACK: Tok = TOK_RBRACK; break;
+        case TOK_LCURLY: Tok = TOK_RCURLY; break;
+        default:         Internal ("Unexpected opening token: %02X", (unsigned)Tok);
+    }
+    CollAppend (C, (void*)Tok);
+    NextToken ();
+}
+
+
+
+static void PopBrace (Collection* C)
+/* Close the latest open parenthesis/bracket/curly brace */
+{
+    if (CollCount (C) > 0) {
+        CollPop (C);
+    }
+}
+
+
+
+static int CloseBrace (Collection* C, token_t Tok)
+/* Consume a closing parenthesis/bracket/curly brace if it is matched with an
+** opening one to close and return 0, or bail out and return -1 if it is not
+** matched.
+*/
+{
+    if (CollCount (C) > 0) {
+        token_t LastTok = (token_t)(intptr_t)CollLast (C);
+        if (LastTok == Tok) {
+            CollPop (C);
+            NextToken ();
+            return 0;
+        }
+    }
+
+    return -1;
+}
+
+
+
+int SmartErrorSkip (int TillEnd)
+/* Try some smart error recovery.
+**
+** - If TillEnd == 0:
+**   Skip tokens until a comma or closing curly brace that is not enclosed in
+**   an open parenthesis/bracket/curly brace, or until a semicolon, EOF or
+**   unpaired right parenthesis/bracket/curly brace is reached. The closing
+**   curly brace is consumed in the former case.
+**
+** - If TillEnd != 0:
+**   Skip tokens until a right curly brace or semicolon is reached and consumed
+**   while there are no open parentheses/brackets/curly braces, or until an EOF
+**   is reached anytime. Any open parenthesis/bracket/curly brace is considered
+**   to be closed by consuming a right parenthesis/bracket/curly brace even if
+**   they didn't match.
+**
+** - Return -1:
+**   If this exits at a semicolon or unpaired right parenthesis/bracket/curly
+**   brace while there are still open parentheses/brackets/curly braces.
+**
+** - Return 0:
+**   If this exits as soon as it reaches an EOF;
+**   Or if this exits right after consuming a semicolon or right curly brace
+**   while there are no open parentheses/brackets/curly braces.
+**
+** - Return 1:
+**   If this exits at a non-EOF without consuming it.
+*/
+{
+    Collection C = AUTO_COLLECTION_INITIALIZER;
+    int Res = 0;
+
+    /* Some fix point tokens that are used for error recovery */
+    static const token_t TokenList[] = { TOK_COMMA, TOK_SEMI,
+        TOK_LPAREN, TOK_RPAREN, TOK_LBRACK, TOK_RBRACK, TOK_LCURLY, TOK_RCURLY };
+
+    while (CurTok.Tok != TOK_CEOF) {
+        SkipTokens (TokenList, sizeof (TokenList) / sizeof (TokenList[0]));
+
+        switch (CurTok.Tok) {
+            case TOK_LPAREN:
+            case TOK_LBRACK:
+            case TOK_LCURLY:
+                OpenBrace (&C, CurTok.Tok);
+                break;
+
+            case TOK_RPAREN:
+            case TOK_RBRACK:
+                if (CloseBrace (&C, CurTok.Tok) < 0) {
+                    if (!TillEnd) {
+                        Res = -1;
+                        goto ExitPoint;
+                    }
+                    PopBrace (&C);
+                    NextToken ();
+                }
+                break;
+
+            case TOK_RCURLY:
+                if (CloseBrace (&C, CurTok.Tok) < 0) {
+                    if (!TillEnd) {
+                        Res = -1;
+                        goto ExitPoint;
+                    }
+                    PopBrace (&C);
+                    NextToken ();
+                }
+                if (CollCount (&C) == 0) {
+                    /* We consider this as a terminator as well */
+                    Res = 0;
+                    goto ExitPoint;
+                }
+                break;
+
+            case TOK_COMMA:
+                if (CollCount (&C) == 0 && !TillEnd) {
+                    Res = 1;
+                    goto ExitPoint;
+                }
+                NextToken ();
+                break;
+
+            case TOK_SEMI:
+                if (CollCount (&C) == 0) {
+                    if (TillEnd) {
+                        NextToken ();
+                        Res = 0;
+                    } else {
+                        Res = 1;
+                    }
+                    goto ExitPoint;
+                }
+                NextToken ();
+                break;
+
+            case TOK_CEOF:
+                /* We cannot consume this */
+                Res = 0;
+                goto ExitPoint;
+
+            default:
+                Internal ("Unexpected token: %02X", (unsigned)CurTok.Tok);
+        }
+    }
+
+ExitPoint:
+    DoneCollection (&C);
+    return Res;
+}
+
+
+
+int SimpleErrorSkip (void)
+/* Skip tokens until an EOF or unpaired right parenthesis/bracket/curly brace
+** is reached. Return 0 If this exits at an EOF. Otherwise return -1.
+*/
+{
+    Collection C = AUTO_COLLECTION_INITIALIZER;
+    int Res = 0;
+
+    /* Some fix point tokens that are used for error recovery */
+    static const token_t TokenList[] = {
+        TOK_LPAREN, TOK_RPAREN, TOK_LBRACK, TOK_RBRACK, TOK_LCURLY, TOK_RCURLY };
+
+    while (CurTok.Tok != TOK_CEOF) {
+        SkipTokens (TokenList, sizeof (TokenList) / sizeof (TokenList[0]));
+
+        switch (CurTok.Tok) {
+            case TOK_LPAREN:
+            case TOK_LBRACK:
+            case TOK_LCURLY:
+                OpenBrace (&C, CurTok.Tok);
+                break;
+
+            case TOK_RPAREN:
+            case TOK_RBRACK:
+            case TOK_RCURLY:
+                if (CloseBrace (&C, CurTok.Tok) < 0) {
+                    /* Found a terminator */
+                    Res = -1;
+                    goto ExitPoint;
+                }
+                break;
+
+            case TOK_CEOF:
+                /* We cannot go any farther */
+                Res = 0;
+                goto ExitPoint;
+
+            default:
+                Internal ("Unexpected token: %02X", (unsigned)CurTok.Tok);
+        }
+    }
+
+ExitPoint:
+    DoneCollection (&C);
+    return Res;
+}
+
+
+
 int Consume (token_t Token, const char* ErrorMsg)
 /* Eat token if it is the next in the input stream, otherwise print an error
 ** message. Returns true if the token was found and false otherwise.
diff --git a/src/cc65/scanner.h b/src/cc65/scanner.h
index e6b788660..a8b8a8ab2 100644
--- a/src/cc65/scanner.h
+++ b/src/cc65/scanner.h
@@ -76,6 +76,7 @@ typedef enum token_t {
 
     /* Function specifiers */
     TOK_INLINE,
+    TOK_NORETURN,
     TOK_FASTCALL,
     TOK_CDECL,
 
@@ -212,6 +213,7 @@ typedef struct Token Token;
 struct Token {
     token_t         Tok;        /* The token itself */
     long            IVal;       /* The integer attribute */
+    int             Cooked;     /* The "cooked" flag for char constants */
     Double          FVal;       /* The float attribute */
     struct Literal* SVal;       /* String literal is any */
     ident           Ident;      /* Identifier if IDENT */
@@ -310,6 +312,40 @@ void SkipTokens (const token_t* TokenList, unsigned TokenCount);
 ** This routine is used for error recovery.
 */
 
+int SmartErrorSkip (int TillEnd);
+/* Try some smart error recovery.
+**
+** - If TillEnd == 0:
+**   Skip tokens until a comma or closing curly brace that is not enclosed in
+**   an open parenthesis/bracket/curly brace, or until a semicolon, EOF or
+**   unpaired right parenthesis/bracket/curly brace is reached. The closing
+**   curly brace is consumed in the former case.
+**
+** - If TillEnd != 0:
+**   Skip tokens until a right curly brace or semicolon is reached and consumed
+**   while there are no open parentheses/brackets/curly braces, or until an EOF
+**   is reached anytime. Any open parenthesis/bracket/curly brace is considered
+**   to be closed by consuming a right parenthesis/bracket/curly brace even if
+**   they didn't match.
+**
+** - Return -1:
+**   If this exits at a semicolon or unpaired right parenthesis/bracket/curly
+**   brace while there are still open parentheses/brackets/curly braces.
+**
+** - Return 0:
+**   If this exits as soon as it reaches an EOF;
+**   Or if this exits right after consuming a semicolon or right curly brace
+**   while there are no open parentheses/brackets/curly braces.
+**
+** - Return 1:
+**   If this exits at a non-EOF without consuming it.
+*/
+
+int SimpleErrorSkip (void);
+/* Skip tokens until an EOF or unpaired right parenthesis/bracket/curly brace
+** is reached. Return 0 If this exits at an EOF. Otherwise return -1.
+*/
+
 int Consume (token_t Token, const char* ErrorMsg);
 /* Eat token if it is the next in the input stream, otherwise print an error
 ** message. Returns true if the token was found and false otherwise.
diff --git a/src/cc65/staticassert.c b/src/cc65/staticassert.c
index abb2c57ca..9df9af7da 100644
--- a/src/cc65/staticassert.c
+++ b/src/cc65/staticassert.c
@@ -45,7 +45,7 @@
 
 
 
-void ParseStaticAssert ()
+void ParseStaticAssert (void)
 {
     /*
     ** static_assert-declaration ::=
@@ -53,20 +53,23 @@ void ParseStaticAssert ()
     **     _Static_assert ( constant-expression , string-literal ) ;
     */
     ExprDesc Expr;
-    int failed;
+    unsigned PrevErrorCount = ErrorCount;
+    int      failed = 0;
 
     /* Skip the _Static_assert token itself */
     CHECK (CurTok.Tok == TOK_STATIC_ASSERT);
     NextToken ();
 
     /* We expect an opening paren */
-    if (!ConsumeLParen ()) {
-        return;
+    if (ConsumeLParen ()) {
+        /* Parse assertion condition */
+        Expr = NoCodeConstAbsIntExpr (hie1);
+        failed = !Expr.IVal;
     }
 
-    /* Parse assertion condition */
-    Expr = NoCodeConstAbsIntExpr (hie1);
-    failed = !Expr.IVal;
+    if (PrevErrorCount != ErrorCount) {
+        goto ExitPoint;
+    }
 
     /* If there is a comma, we also have an error message.  The message is optional because we
     ** support the C2X syntax with only an expression.
@@ -84,19 +87,16 @@ void ParseStaticAssert ()
         /* String literal */
         if (CurTok.Tok != TOK_SCONST) {
             Error ("String literal expected for static_assert message");
-            return;
-        }
+        } else {
+            /* Issue an error including the message if the static_assert failed. */
+            if (failed) {
+                Error ("static_assert failed '%s'", GetLiteralStr (CurTok.SVal));
+            }
 
-        /* Issue an error including the message if the static_assert failed. */
-        if (failed) {
-            Error ("static_assert failed '%s'", GetLiteralStr (CurTok.SVal));
-        }
-
-        /* Consume the string constant, now that we don't need it anymore.
-        ** This should never fail since we checked the token type above.
-        */
-        if (!Consume (TOK_SCONST, "String literal expected")) {
-            return;
+            /* Consume the string constant, now that we don't need it anymore.
+            ** This should never fail since we checked the token type above.
+            */
+            Consume (TOK_SCONST, "String literal expected");
         }
     } else {
         /* No message. */
@@ -105,7 +105,24 @@ void ParseStaticAssert ()
         }
     }
 
-    /* Closing paren and semi-colon needed */
-    ConsumeRParen ();
-    ConsumeSemi ();
+    /* The assertion failure error is not a syntax error */
+    if (failed) {
+        ++PrevErrorCount;
+    }
+
+    if (PrevErrorCount == ErrorCount) {
+        /* Closing paren needed */
+        ConsumeRParen ();
+    }
+
+    if (PrevErrorCount == ErrorCount) {
+        /* Must be followed by a semicolon */
+        ConsumeSemi ();
+    }
+
+ExitPoint:
+    /* Try some smart error recovery */
+    if (PrevErrorCount != ErrorCount) {
+        SmartErrorSkip (1);
+    }
 }
diff --git a/src/cc65/stdfunc.c b/src/cc65/stdfunc.c
index 2889a176e..1597380e8 100644
--- a/src/cc65/stdfunc.c
+++ b/src/cc65/stdfunc.c
@@ -78,19 +78,20 @@ static void StdFunc_strlen (FuncDesc*, ExprDesc*);
 
 
 
-/* Table with all known functions and their handlers. Must be sorted
-** alphabetically!
+/* Table with all known functions and their handlers.
+** CAUTION: table must be alphabetically sorted for bsearch
 */
 static struct StdFuncDesc {
     const char*         Name;
     void                (*Handler) (FuncDesc*, ExprDesc*);
 } StdFuncs[] = {
+/* BEGIN SORTED.SH */
     {   "memcpy",       StdFunc_memcpy          },
     {   "memset",       StdFunc_memset          },
     {   "strcmp",       StdFunc_strcmp          },
     {   "strcpy",       StdFunc_strcpy          },
     {   "strlen",       StdFunc_strlen          },
-
+/* END SORTED.SH */
 };
 #define FUNC_COUNT      (sizeof (StdFuncs) / sizeof (StdFuncs[0]))
 
@@ -370,7 +371,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                     AddCodeLine ("ldy #$%02X", (unsigned char) (Offs + Arg3.Expr.IVal - 1));
                     g_defcodelabel (Label);
                     AddCodeLine ("lda %s,y", ED_GetLabelName (&Arg2.Expr, -Offs));
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                     AddCodeLine ("dey");
                     AddCodeLine ("bpl %s", LocalLabelName (Label));
                 } else {
@@ -378,7 +379,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                     AddCodeLine ("ldy #$%02X", (unsigned char) (Offs + Arg3.Expr.IVal - 1));
                     g_defcodelabel (Label);
                     AddCodeLine ("lda %s,x", ED_GetLabelName (&Arg2.Expr, 0));
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                     AddCodeLine ("dey");
                     AddCodeLine ("dex");
                     AddCodeLine ("bpl %s", LocalLabelName (Label));
@@ -390,7 +391,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                     AddCodeLine ("ldy #$%02X", (unsigned char) Offs);
                     g_defcodelabel (Label);
                     AddCodeLine ("lda %s,y", ED_GetLabelName (&Arg2.Expr, -Offs));
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                     AddCodeLine ("iny");
                     AddCmpCodeIfSizeNot256 ("cpy #$%02X", Offs + Arg3.Expr.IVal);
                     AddCodeLine ("bne %s", LocalLabelName (Label));
@@ -399,7 +400,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                     AddCodeLine ("ldy #$%02X", (unsigned char) Offs);
                     g_defcodelabel (Label);
                     AddCodeLine ("lda %s,x", ED_GetLabelName (&Arg2.Expr, 0));
-                    AddCodeLine ("sta (sp),y");
+                    AddCodeLine ("sta (c_sp),y");
                     AddCodeLine ("iny");
                     AddCodeLine ("inx");
                     AddCmpCodeIfSizeNot256 ("cpx #$%02X", Arg3.Expr.IVal);
@@ -447,7 +448,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                 if (Offs == 0) {
                     AddCodeLine ("ldy #$%02X", (unsigned char) (Arg3.Expr.IVal - 1));
                     g_defcodelabel (Label);
-                    AddCodeLine ("lda (sp),y");
+                    AddCodeLine ("lda (c_sp),y");
                     AddCodeLine ("sta %s,y", ED_GetLabelName (&Arg1.Expr, 0));
                     AddCodeLine ("dey");
                     AddCodeLine ("bpl %s", LocalLabelName (Label));
@@ -455,7 +456,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                     AddCodeLine ("ldx #$%02X", (unsigned char) (Arg3.Expr.IVal-1));
                     AddCodeLine ("ldy #$%02X", (unsigned char) (Offs + Arg3.Expr.IVal - 1));
                     g_defcodelabel (Label);
-                    AddCodeLine ("lda (sp),y");
+                    AddCodeLine ("lda (c_sp),y");
                     AddCodeLine ("sta %s,x", ED_GetLabelName (&Arg1.Expr, 0));
                     AddCodeLine ("dey");
                     AddCodeLine ("dex");
@@ -467,7 +468,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                 if (Offs == 0 || AllowOneIndex) {
                     AddCodeLine ("ldy #$%02X", (unsigned char) Offs);
                     g_defcodelabel (Label);
-                    AddCodeLine ("lda (sp),y");
+                    AddCodeLine ("lda (c_sp),y");
                     AddCodeLine ("sta %s,y", ED_GetLabelName (&Arg1.Expr, -Offs));
                     AddCodeLine ("iny");
                     AddCmpCodeIfSizeNot256 ("cpy #$%02X", Offs + Arg3.Expr.IVal);
@@ -476,7 +477,7 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                     AddCodeLine ("ldx #$00");
                     AddCodeLine ("ldy #$%02X", (unsigned char) Offs);
                     g_defcodelabel (Label);
-                    AddCodeLine ("lda (sp),y");
+                    AddCodeLine ("lda (c_sp),y");
                     AddCodeLine ("sta %s,x", ED_GetLabelName (&Arg1.Expr, 0));
                     AddCodeLine ("iny");
                     AddCodeLine ("inx");
@@ -511,14 +512,14 @@ static void StdFunc_memcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             if (Arg3.Expr.IVal <= 129) {
                 AddCodeLine ("ldy #$%02X", (unsigned char) (Arg3.Expr.IVal - 1));
                 g_defcodelabel (Label);
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
                 AddCodeLine ("sta (ptr1),y");
                 AddCodeLine ("dey");
                 AddCodeLine ("bpl %s", LocalLabelName (Label));
             } else {
                 AddCodeLine ("ldy #$00");
                 g_defcodelabel (Label);
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
                 AddCodeLine ("sta (ptr1),y");
                 AddCodeLine ("iny");
                 AddCmpCodeIfSizeNot256 ("cpy #$%02X", Arg3.Expr.IVal);
@@ -702,7 +703,7 @@ static void StdFunc_memset (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             AddCodeLine ("ldy #$%02X", (unsigned char) Offs);
             AddCodeLine ("lda #$%02X", (unsigned char) Arg2.Expr.IVal);
             g_defcodelabel (Label);
-            AddCodeLine ("sta (sp),y");
+            AddCodeLine ("sta (c_sp),y");
             AddCodeLine ("iny");
             AddCmpCodeIfSizeNot256 ("cpy #$%02X", Offs + Arg3.Expr.IVal);
             AddCodeLine ("bne %s", LocalLabelName (Label));
@@ -856,7 +857,7 @@ static void StdFunc_strcmp (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                 /* Generate code */
                 AddCodeLine ("ldy #$%02X", Offs);
                 AddCodeLine ("ldx #$00");
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
             } else if (IsArray && ED_IsLocConst (&Arg1.Expr)) {
                 /* Drop the generated code */
                 RemoveCode (&Arg1.Load);
@@ -1089,14 +1090,14 @@ static void StdFunc_strcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             if (Offs == 0 || AllowOneIndex) {
                 g_defcodelabel (L1);
                 AddCodeLine ("iny");
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
                 AddCodeLine ("sta %s,y", ED_GetLabelName (&Arg1.Expr, -Offs));
             } else {
                 AddCodeLine ("ldx #$FF");
                 g_defcodelabel (L1);
                 AddCodeLine ("iny");
                 AddCodeLine ("inx");
-                AddCodeLine ("lda (sp),y");
+                AddCodeLine ("lda (c_sp),y");
                 AddCodeLine ("sta %s,x", ED_GetLabelName (&Arg1.Expr, 0));
             }
             AddCodeLine ("bne %s", LocalLabelName (L1));
@@ -1137,14 +1138,14 @@ static void StdFunc_strcpy (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
                 g_defcodelabel (L1);
                 AddCodeLine ("iny");
                 AddCodeLine ("lda %s,y", ED_GetLabelName (&Arg2.Expr, -Offs));
-                AddCodeLine ("sta (sp),y");
+                AddCodeLine ("sta (c_sp),y");
             } else {
                 AddCodeLine ("ldx #$FF");
                 g_defcodelabel (L1);
                 AddCodeLine ("iny");
                 AddCodeLine ("inx");
                 AddCodeLine ("lda %s,x", ED_GetLabelName (&Arg2.Expr, 0));
-                AddCodeLine ("sta (sp),y");
+                AddCodeLine ("sta (c_sp),y");
             }
             AddCodeLine ("bne %s", LocalLabelName (L1));
 
@@ -1284,7 +1285,7 @@ static void StdFunc_strlen (FuncDesc* F attribute ((unused)), ExprDesc* Expr)
             g_defcodelabel (L);
             AddCodeLine ("inx");
             AddCodeLine ("iny");
-            AddCodeLine ("lda (sp),y");
+            AddCodeLine ("lda (c_sp),y");
             AddCodeLine ("bne %s", LocalLabelName (L));
             AddCodeLine ("txa");
             AddCodeLine ("ldx #$00");
diff --git a/src/cc65/stmt.c b/src/cc65/stmt.c
index c86f25f8a..e28b844b5 100644
--- a/src/cc65/stmt.c
+++ b/src/cc65/stmt.c
@@ -188,8 +188,8 @@ static int IfStatement (void)
         /* If the if expression was always true, the code in the else branch
         ** is never executed. Output a warning if this is the case.
         */
-        if (TestResult == TESTEXPR_TRUE && IS_Get (&WarnUnreachableCode)) {
-            Warning ("Unreachable code");
+        if (TestResult == TESTEXPR_TRUE) {
+            UnreachableCodeWarning ();
         }
 
         /* Define the target for the first test */
diff --git a/src/cc65/symentry.c b/src/cc65/symentry.c
index 30ebe7dd8..56f6ffbb0 100644
--- a/src/cc65/symentry.c
+++ b/src/cc65/symentry.c
@@ -88,7 +88,7 @@ void FreeSymEntry (SymEntry* E)
     TypeFree (E->Type);
     xfree (E->AsmName);
 
-    if (E->Flags & SC_LABEL) {
+    if ((E->Flags & SC_TYPEMASK) == SC_LABEL) {
         for (i = 0; i < CollCount (E->V.L.DefsOrRefs); i++) {
             xfree (CollAt (E->V.L.DefsOrRefs, i));
         }
@@ -109,21 +109,17 @@ void DumpSymEntry (FILE* F, const SymEntry* E)
         unsigned            Val;
     } SCFlagTable;
 
-    static SCFlagTable ESUTypes[] = {
-        { "SC_TYPEDEF",     SC_TYPEDEF          },
-        { "SC_UNION",       SC_UNION            },
-        { "SC_STRUCT",      SC_STRUCT           },
-        { "SC_ENUM",        SC_ENUM             },
-    };
-
     static SCFlagTable Types[] = {
-        { "SC_BITFIELD",    SC_BITFIELD         },
-        { "SC_STRUCTFIELD", SC_STRUCTFIELD      },
-        { "SC_ENUMERATOR",  SC_ENUMERATOR       },
-        { "SC_CONST",       SC_CONST            },
+        { "SC_NONE",        SC_NONE             },
+        { "SC_STRUCT",      SC_STRUCT           },
+        { "SC_UNION",       SC_UNION            },
+        { "SC_ENUM",        SC_ENUM             },
         { "SC_LABEL",       SC_LABEL            },
-        { "SC_PARAM",       SC_PARAM            },
+        { "SC_BITFIELD",    SC_BITFIELD         },
+        { "SC_TYPEDEF",     SC_TYPEDEF          },
+        { "SC_ENUMERATOR",  SC_ENUMERATOR       },
         { "SC_FUNC",        SC_FUNC             },
+        { "SC_ARRAY",       SC_ARRAY            },
     };
 
     static SCFlagTable Storages[] = {
@@ -131,11 +127,31 @@ void DumpSymEntry (FILE* F, const SymEntry* E)
         { "SC_REGISTER",    SC_REGISTER         },
         { "SC_STATIC",      SC_STATIC           },
         { "SC_EXTERN",      SC_EXTERN           },
-        { "SC_STORAGE",     SC_STORAGE          },
+    };
+
+    static SCFlagTable Properties[] = {
+        { "SC_CONST",       SC_CONST            },
+        { "SC_STRUCTFIELD", SC_STRUCTFIELD      },
+        { "SC_PARAM",       SC_PARAM            },
+        { "SC_DEFTYPE",     SC_DEFTYPE          },
         { "SC_ZEROPAGE",    SC_ZEROPAGE         },
-        { "SC_DECL",        SC_DECL             },
+        { "SC_HAVEALIGN",   SC_HAVEALIGN        },
+        { "SC_HAVEATTR",    SC_HAVEATTR         },
+        { "SC_TU_STORAGE",  SC_TU_STORAGE       },
+        { "SC_ASSIGN_INIT", SC_ASSIGN_INIT      },
+        { "SC_ALIAS",       SC_ALIAS            },
+        { "SC_FICTITIOUS",  SC_FICTITIOUS       },
+        { "SC_HAVEFAM",     SC_HAVEFAM          },
+        { "SC_HAVECONST",   SC_HAVECONST        },
+    };
+
+    static SCFlagTable Status[] = {
         { "SC_DEF",         SC_DEF              },
         { "SC_REF",         SC_REF              },
+        { "SC_GOTO",        SC_GOTO             },
+        { "SC_GOTO_IND",    SC_GOTO_IND         },
+        { "SC_LOCALSCOPE",  SC_LOCALSCOPE       },
+        { "SC_NOINLINEDEF", SC_NOINLINEDEF      },
     };
 
     unsigned I;
@@ -152,28 +168,38 @@ void DumpSymEntry (FILE* F, const SymEntry* E)
     /* Print the flags */
     SymFlags = E->Flags;
     fprintf (F, "    Flags:");
-    /* Enum, struct, union and typedefs */
-    if ((SymFlags & SC_ESUTYPEMASK) != 0) {
-        for (I = 0; I < sizeof (ESUTypes) / sizeof (ESUTypes[0]); ++I) {
-            if ((SymFlags & SC_ESUTYPEMASK) == ESUTypes[I].Val) {
-                SymFlags &= ~SC_ESUTYPEMASK;
-                fprintf (F, " %s", ESUTypes[I].Name);
+    /* Symbol types */
+    if ((SymFlags & SC_TYPEMASK) != 0) {
+        for (I = 0; I < sizeof (Types) / sizeof (Types[0]); ++I) {
+            if ((SymFlags & SC_TYPEMASK) == Types[I].Val) {
+                SymFlags &= ~SC_TYPEMASK;
+                fprintf (F, " %s", Types[I].Name);
                 break;
             }
         }
     }
-    /* Other type flags */
-    for (I = 0; I < sizeof (Types) / sizeof (Types[0]) && SymFlags != 0; ++I) {
-        if ((SymFlags & Types[I].Val) == Types[I].Val) {
-            SymFlags &= ~Types[I].Val;
-            fprintf (F, " %s", Types[I].Name);
+    /* Storage classes */
+    if ((SymFlags & SC_STORAGEMASK) != 0) {
+        for (I = 0; I < sizeof (Storages) / sizeof (Storages[0]); ++I) {
+            if ((SymFlags & SC_STORAGEMASK) == Storages[I].Val) {
+                SymFlags &= ~SC_STORAGEMASK;
+                fprintf (F, " %s", Storages[I].Name);
+                break;
+            }
         }
     }
-    /* Storage flags */
-    for (I = 0; I < sizeof (Storages) / sizeof (Storages[0]) && SymFlags != 0; ++I) {
-        if ((SymFlags & Storages[I].Val) == Storages[I].Val) {
-            SymFlags &= ~Storages[I].Val;
-            fprintf (F, " %s", Storages[I].Name);
+    /* Special property flags */
+    for (I = 0; I < sizeof (Properties) / sizeof (Properties[0]) && SymFlags != 0; ++I) {
+        if ((SymFlags & Properties[I].Val) == Properties[I].Val) {
+            SymFlags &= ~Properties[I].Val;
+            fprintf (F, " %s", Properties[I].Name);
+        }
+    }
+    /* Status flags */
+    for (I = 0; I < sizeof (Status) / sizeof (Status[0]) && SymFlags != 0; ++I) {
+        if ((SymFlags & Status[I].Val) == Status[I].Val) {
+            SymFlags &= ~Status[I].Val;
+            fprintf (F, " %s", Status[I].Name);
         }
     }
     if (SymFlags != 0) {
@@ -199,9 +225,10 @@ int SymIsOutputFunc (const SymEntry* Sym)
     /* Symbol must be a function which is defined and either extern or
     ** static and referenced.
     */
-    return IsTypeFunc (Sym->Type)               &&
-           SymIsDef (Sym)                       &&
-           (Sym->Flags & (SC_REF | SC_EXTERN));
+    return IsTypeFunc (Sym->Type)                       &&
+           SymIsDef (Sym)                               &&
+           ((Sym->Flags & SC_REF) ||
+            (Sym->Flags & SC_STORAGEMASK) != SC_STATIC);
 }
 
 
@@ -272,7 +299,7 @@ void SymCvtRegVarToAuto (SymEntry* Sym)
 /* Convert a register variable to an auto variable */
 {
     /* Change the storage class */
-    Sym->Flags = (Sym->Flags & ~(SC_REGISTER | SC_STATIC | SC_EXTERN)) | SC_AUTO;
+    Sym->Flags = (Sym->Flags & ~SC_STORAGEMASK) | SC_AUTO;
 
     /* Transfer the stack offset from register save area to actual offset */
     Sym->V.Offs = Sym->V.R.SaveOffs;
diff --git a/src/cc65/symentry.h b/src/cc65/symentry.h
index 715c036d6..7871b9ade 100644
--- a/src/cc65/symentry.h
+++ b/src/cc65/symentry.h
@@ -68,47 +68,92 @@ struct CodeEntry;
 
 
 
-/* Storage classes and flags */
+/* Symbol types and flags */
 #define SC_NONE         0x0000U         /* Nothing */
-#define SC_STRUCT       0x0001U         /* Struct */
-#define SC_UNION        0x0002U         /* Union */
-#define SC_ENUM         0x0003U         /* Enum */
-#define SC_TYPEDEF      0x0004U         /* Typedef */
-#define SC_ESUTYPEMASK  0x0007U         /* Mask for above types */
-#define SC_ENUMERATOR   0x0008U         /* An enumerator */
-#define SC_BITFIELD     0x0010U         /* A bit-field inside a struct or union */
-#define SC_TYPEMASK     0x001FU         /* Mask for above types */
 
-#define SC_FUNC         0x0020U         /* A function */
-#define SC_LABEL        0x0040U         /* A goto code label */
-#define SC_CONST        0x0080U         /* A numeric constant with a type */
-#define SC_PARAM        0x0100U         /* A function parameter */
-#define SC_DEFTYPE      0x0200U         /* Parameter has default type (=int, old style) */
-#define SC_STRUCTFIELD  0x0400U         /* Struct or union field */
+/* Types of symbols */
+#define SC_STRUCT       0x0001U         /* Struct tag */
+#define SC_UNION        0x0002U         /* Union tag */
+#define SC_ENUM         0x0003U         /* Enum tag */
+#define SC_LABEL        0x0004U         /* A goto code label */
+#define SC_BITFIELD     0x0005U         /* A bit-field inside a struct or union */
+#define SC_TYPEDEF      0x0006U         /* A typedef */
+#define SC_ENUMERATOR   0x0007U         /* An enumerator */
 
-#define SC_ZEROPAGE     0x0800U         /* Symbol marked as zeropage */
+/* Note: These symbol types might be checked as bit-flags occasionally.
+**       So don't share their unique bits with other symbol types.
+*/
+#define SC_FUNC         0x0008U         /* A function */
+#define SC_ARRAY        0x0010U         /* UNUSED: An array */
+#define SC_TYPEMASK     0x001FU         /* Mask for symbol types all above */
 
-#define SC_DEF          0x1000U         /* Symbol is defined */
-#define SC_REF          0x2000U         /* Symbol is referenced */
-#define SC_DECL         0x4000U         /* Symbol is declared in global scope */
-#define SC_STORAGE      0x8000U         /* Symbol with associated storage */
+/* Additional property of the symbols */
+#define SC_CONST        0x0020U         /* A numeric constant with a type */
+#define SC_STRUCTFIELD  0x0040U         /* A struct or union field */
+#define SC_PARAM        0x0080U         /* A function parameter */
+#define SC_DEFTYPE      0x0100U         /* An old-style parameter with default type (=int) */
 
-#define SC_AUTO         0x010000U       /* Auto variable */
-#define SC_REGISTER     0x020000U       /* Register variable */
-#define SC_STATIC       0x040000U       /* Static - not to be confused with other *_STATIC */
-#define SC_EXTERN       0x080000U       /* Extern linkage */
-#define SC_STORAGEMASK  0x0F0000U       /* Storage type mask */
+/* Address property of the symbol */
+#define SC_ZEROPAGE     0x0200U         /* Symbol marked as on zeropage */
 
-#define SC_HAVEATTR     0x100000U       /* Symbol has attributes */
+/* Additional attributes of the symbol */
+#define SC_HAVEALIGN    0x0400U         /* UNUSED: Symbol has special alignment */
+#define SC_HAVEATTR     0x0800U         /* Symbol has attributes */
 
-#define SC_GOTO         0x200000U
-#define SC_SPADJUSTMENT 0x400000U
-#define SC_GOTO_IND     0x800000U       /* Indirect goto */
+/* Special property of declaration */
+#define SC_TU_STORAGE   0x1000U         /* Symbol has allocated storage in the TU */
+#define SC_ASSIGN_INIT  0x2000U         /* Symbol is to be initialized with assignment code */
 
-#define SC_ALIAS        0x01000000U     /* Alias of global or anonymous field */
-#define SC_FICTITIOUS   0x02000000U     /* Symbol is fictitious (for error recovery) */
-#define SC_HAVEFAM      0x04000000U     /* Type has a Flexible Array Member */
-#define SC_HAVECONST    0x08000000U     /* Type has a const member */
+#define SC_ALIAS        0x4000U         /* Symbol is an alias */
+#define SC_FICTITIOUS   0x8000U         /* Symbol is fictitious (for error recovery) */
+#define SC_HAVEFAM      0x010000U       /* Struct/union has a Flexible Array Member */
+#define SC_HAVECONST    0x020000U       /* Struct/union has a const member */
+
+/* Status of the symbol */
+#define SC_DEF          0x040000U       /* Symbol is defined */
+#define SC_REF          0x080000U       /* Symbol is referenced */
+#define SC_GOTO         0x100000U       /* Symbol is destination of a goto */
+#define SC_GOTO_IND     0x200000U       /* Symbol is destination of an indirect goto */
+#define SC_LOCALSCOPE   0x400000U       /* Symbol is invisible in file scope */
+#define SC_NOINLINEDEF  0x800000U       /* Symbol may never have an inline definition */
+
+/* To figure out the linkage of an object or function symbol Sym:
+** - external linkage:
+**    SymIsGlobal (Sym) && (Sym->Flags & SC_STORAGEMASK) != SC_STATIC
+** - internal linkage:
+**    SymIsGlobal (Sym) && (Sym->Flags & SC_STORAGEMASK) == SC_STATIC
+** - no linkage:
+**    !SymIsGlobal (Sym)
+**
+** To figure out the storage class of a symbol by its SC_ flags:
+**
+** - no explicit storage class specifiers (in file scope):
+**    (flags & SC_STORAGEMASK) == SC_NONE
+** - no explicit storage class specifiers (in block scope):
+**    (flags & SC_STORAGEMASK) == SC_AUTO
+** - extern:
+**    (flags & SC_STORAGEMASK) == SC_EXTERN
+** - static:
+**    (flags & SC_STORAGEMASK) == SC_STATIC
+** - auto:
+**    (flags & SC_STORAGEMASK) == SC_AUTO
+** - register:
+**    (flags & SC_STORAGEMASK) == SC_REGISTER
+** - typedef (per ISO C):
+**    (flags & SC_TYPEMASK) == SC_TYPEDEF
+**
+** Note: SC_TYPEDEF can be also used as a flag.
+*/
+#define SC_AUTO         0x01000000U     /* Auto storage class */
+#define SC_REGISTER     0x02000000U     /* Register storage class */
+#define SC_STATIC       0x03000000U     /* Static storage class */
+#define SC_EXTERN       0x04000000U     /* Extern storage class */
+#define SC_THREAD       0x08000000U     /* UNSUPPORTED: Thread-local storage class */
+#define SC_STORAGEMASK  0x0F000000U     /* Storage type mask */
+
+/* Function specifiers */
+#define SC_INLINE       0x10000000U     /* Inline function */
+#define SC_NORETURN     0x20000000U     /* Noreturn function */
 
 
 
@@ -159,6 +204,8 @@ struct SymEntry {
         struct {
             struct SegContext*  Seg;      /* SegContext for this function */
             struct LiteralPool* LitPool;  /* Literal pool for this function */
+            struct SymEntry*    WrappedCall;        /* Pointer to the WrappedCall */
+            unsigned int        WrappedCallData;    /* The WrappedCall's user data */
         } F;
 
         /* Label name for static symbols */
@@ -212,14 +259,37 @@ void FreeSymEntry (SymEntry* E);
 void DumpSymEntry (FILE* F, const SymEntry* E);
 /* Dump the given symbol table entry to the file in readable form */
 
+int SymIsOutputFunc (const SymEntry* Sym);
+/* Return true if this is a function that must be output */
+
+#if defined(HAVE_INLINE)
+INLINE int SymIsArray (const SymEntry* Sym)
+/* Return true if the given entry is an array entry */
+{
+    return ((Sym->Flags & SC_TYPEMASK) == SC_ARRAY);
+}
+#else
+#  define SymIsArray(Sym)       (((Sym)->Flags & SC_TYPEMASK) == SC_ARRAY)
+#endif
+
 #if defined(HAVE_INLINE)
 INLINE int SymIsBitField (const SymEntry* Sym)
 /* Return true if the given entry is a bit-field entry */
 {
-    return ((Sym->Flags & SC_BITFIELD) == SC_BITFIELD);
+    return ((Sym->Flags & SC_TYPEMASK) == SC_BITFIELD);
 }
 #else
-#  define SymIsBitField(Sym)    (((Sym)->Flags & SC_BITFIELD) == SC_BITFIELD)
+#  define SymIsBitField(Sym)    (((Sym)->Flags & SC_TYPEMASK) == SC_BITFIELD)
+#endif
+
+#if defined(HAVE_INLINE)
+INLINE int SymIsLabel (const SymEntry* Sym)
+/* Return true if the given entry is a label entry */
+{
+    return ((Sym)->Flags & SC_TYPEMASK) == SC_LABEL;
+}
+#else
+#  define SymIsLabel(Sym)       (((Sym)->Flags & SC_TYPEMASK) == SC_LABEL)
 #endif
 
 #if defined(HAVE_INLINE)
@@ -255,17 +325,13 @@ INLINE int SymIsRef (const SymEntry* Sym)
 #if defined(HAVE_INLINE)
 INLINE int SymIsRegVar (const SymEntry* Sym)
 /* Return true if the given entry is a register variable */
-/* ### HACK! Fix the ugly type flags! */
 {
-    return ((Sym->Flags & (SC_REGISTER | SC_TYPEMASK)) == SC_REGISTER);
+    return ((Sym->Flags & (SC_STORAGEMASK | SC_TYPEMASK)) == (SC_REGISTER | SC_NONE));
 }
 #else
-#  define SymIsRegVar(Sym)  (((Sym)->Flags & (SC_REGISTER | SC_TYPEMASK)) == SC_REGISTER)
+#  define SymIsRegVar(Sym)  (((Sym)->Flags & (SC_STORAGEMASK | SC_TYPEMASK)) == (SC_REGISTER | SC_NONE))
 #endif
 
-int SymIsOutputFunc (const SymEntry* Sym);
-/* Return true if this is a function that must be output */
-
 #if defined(HAVE_INLINE)
 INLINE int SymHasFlexibleArrayMember (const SymEntry* Sym)
 /* Return true if the given entry has a flexible array member */
diff --git a/src/cc65/symtab.c b/src/cc65/symtab.c
index d30e591c9..07723699f 100644
--- a/src/cc65/symtab.c
+++ b/src/cc65/symtab.c
@@ -61,6 +61,7 @@
 #include "symentry.h"
 #include "typecmp.h"
 #include "typeconv.h"
+#include "wrappedcall.h"
 #include "symtab.h"
 
 
@@ -164,22 +165,23 @@ static void CheckSymTable (SymTable* Tab)
         /* Ignore typedef entries */
         if (!SymIsTypeDef (Entry)) {
 
-            /* Check if the symbol is one with storage, and it if it was
-            ** defined but not used.
-            */
-            if (((Flags & SC_AUTO) || (Flags & SC_STATIC)) && (Flags & SC_EXTERN) == 0) {
+            /* Check if the symbol has non-external linkage and is defined but not used */
+            if (!SymIsGlobal (Entry) || (Flags & SC_STORAGEMASK) == SC_STATIC) {
                 if (SymIsDef (Entry) && !SymIsRef (Entry) &&
                     !SymHasAttr (Entry, atUnused)) {
                     if (Flags & SC_PARAM) {
-                        if (IS_Get (&WarnUnusedParam)) {
+                        if (IS_Get (&WarnUnusedParam) &&
+                            !IsAnonName (Entry->Name)) {
                             Warning ("Parameter '%s' is never used", Entry->Name);
                         }
-                    } else if (Flags & SC_FUNC) {
+                    } else if ((Flags & SC_TYPEMASK) == SC_FUNC) {
                         if (IS_Get (&WarnUnusedFunc)) {
                             Warning ("Function '%s' is defined but never used", Entry->Name);
                         }
-                    } else {
-                        if (IS_Get (&WarnUnusedVar)) {
+                    } else if ((Flags & SC_TYPEMASK) == SC_NONE) {
+                        if (IS_Get (&WarnUnusedVar) &&
+                            !IsAnonName (Entry->Name) &&
+                            (Flags & SC_CONST) != SC_CONST) {
                             Warning ("Variable '%s' is defined but never used", Entry->Name);
                         }
                     }
@@ -187,7 +189,7 @@ static void CheckSymTable (SymTable* Tab)
             }
 
             /* If the entry is a label, check if it was defined in the function */
-            if (Flags & SC_LABEL) {
+            if ((Flags & SC_TYPEMASK) == SC_LABEL) {
                 if (!SymIsDef (Entry)) {
                     /* Undefined label */
                     Error ("Undefined label: '%s'", Entry->Name);
@@ -556,8 +558,10 @@ static SymEntry* FindSymInTable (const SymTable* T, const char* Name, unsigned H
 
 
 
-static SymEntry* FindSymInTree (const SymTable* Tab, const char* Name)
-/* Find the symbol with the given name in the table tree that starts with T */
+static SymEntry* FindVisibleSymInTree (const SymTable* Tab, const char* Name)
+/* Find the visible symbol with the given name in the table tree that starts
+** with Tab.
+*/
 {
     /* Get the hash over the name */
     unsigned Hash = HashStr (Name);
@@ -573,7 +577,7 @@ static SymEntry* FindSymInTree (const SymTable* Tab, const char* Name)
         }
 
         /* Bail out if we found it */
-        if (E != 0) {
+        if (E != 0 && (Tab != SymTab0 || (E->Flags & SC_LOCALSCOPE) == 0)) {
             return E;
         }
 
@@ -588,9 +592,9 @@ static SymEntry* FindSymInTree (const SymTable* Tab, const char* Name)
 
 
 SymEntry* FindSym (const char* Name)
-/* Find the symbol with the given name */
+/* Find with the given name the symbol visible in the current scope */
 {
-    return FindSymInTree (SymTab, Name);
+    return FindVisibleSymInTree (SymTab, Name);
 }
 
 
@@ -612,9 +616,9 @@ SymEntry* FindLocalSym (const char* Name)
 
 
 SymEntry* FindTagSym (const char* Name)
-/* Find the symbol with the given name in the tag table */
+/* Find with the given name the tag symbol visible in the current scope */
 {
-    return FindSymInTree (TagTab, Name);
+    return FindVisibleSymInTree (TagTab, Name);
 }
 
 
@@ -715,7 +719,7 @@ static int HandleSymRedefinition (SymEntry* Sym, const Type* T, unsigned Flags)
             Sym = 0;
         }
 
-    } else if ((Sym->Flags & SC_FUNC) == SC_FUNC) {
+    } else if ((Sym->Flags & SC_TYPEMASK) == SC_FUNC) {
 
         /* In case of a function, use the new type descriptor, since it
         ** contains pointers to the new symbol tables that are needed if
@@ -740,7 +744,7 @@ static int HandleSymRedefinition (SymEntry* Sym, const Type* T, unsigned Flags)
                     /* Refine the existing composite prototype with this new
                     ** one.
                     */
-                    RefineFuncDesc (Sym->Type, T);
+                    TypeComposition (Sym->Type, T);
                 }
             }
 
@@ -862,7 +866,6 @@ SymEntry* AddEnumSym (const char* Name, unsigned Flags, const Type* Type, SymTab
             } else {
                 TagEntry->V.E.SymTab = Tab;
                 TagEntry->V.E.Type   = Type;
-                TagEntry->Flags     &= ~SC_DECL;
                 TagEntry->Flags     |= SC_DEF;
 
                 /* Remember this is the first definition of this type */
@@ -919,14 +922,8 @@ SymEntry* AddStructSym (const char* Name, unsigned Flags, unsigned Size, SymTabl
     /* SCType must be struct or union */
     PRECONDITION (SCType == SC_STRUCT || SCType == SC_UNION);
 
-    if ((Flags & SC_FICTITIOUS) == 0) {
-        /* Do we have an entry with this name already? */
-        TagEntry = FindSymInTable (CurTagTab, Name, HashStr (Name));
-    } else {
-        /* Add a fictitious symbol in the fail-safe table */
-        TagEntry = 0;
-        CurTagTab = FailSafeTab;
-    }
+    /* Do we have an entry with this name already? */
+    TagEntry = FindSymInTable (CurTagTab, Name, HashStr (Name));
 
     if (TagEntry) {
 
@@ -954,6 +951,21 @@ SymEntry* AddStructSym (const char* Name, unsigned Flags, unsigned Size, SymTabl
                 if (DSFlags != 0) {
                     *DSFlags |= DS_NEW_TYPE_DEF;
                 }
+
+                if ((Flags & SC_FICTITIOUS) == SC_FICTITIOUS) {
+                    /* Add a fictitious symbol in the fail-safe table */
+                    TagEntry = 0;
+                } else if (Size == 0) {
+                    /* Empty struct is not supported now */
+                    if (!IsAnonName (Name)) {
+                        Error ("Empty %s type '%s' is not supported",
+                               SCType == SC_STRUCT ? "struct" : "union", Name);
+                    } else {
+                        Error ("Empty %s type is not supported",
+                               SCType == SC_STRUCT ? "struct" : "union");
+                    }
+                    TagEntry = 0;
+                }
             }
         }
 
@@ -1023,6 +1035,7 @@ SymEntry* AddBitField (const char* Name, const Type* T, unsigned Offs,
         } else {
             Entry->Type = NewBitFieldOf (T, BitOffs, BitWidth);
         }
+        Entry->Type[0].C |= GetQualifier (T) & T_MASK_QUAL;
 
         /* Add the entry to the symbol table */
         AddSymEntry (FieldTab, Entry);
@@ -1042,7 +1055,7 @@ SymEntry* AddConstSym (const char* Name, const Type* T, unsigned Flags, long Val
     SymEntry* Entry = FindSymInTable (SymTab, Name, HashStr (Name));
 
     if (Entry) {
-        if ((Entry->Flags & SC_CONST) != SC_CONST) {
+        if ((Entry->Flags & SC_TYPEMASK) != (Flags & SC_TYPEMASK)) {
             Error ("Symbol '%s' is already different kind", Name);
         } else {
             Error ("Multiple definition for constant '%s'", Name);
@@ -1051,7 +1064,7 @@ SymEntry* AddConstSym (const char* Name, const Type* T, unsigned Flags, long Val
     }
 
     /* Create a new entry */
-    Entry = NewSymEntry (Name, Flags);
+    Entry = NewSymEntry (Name, Flags | SC_CONST);
 
     /* We only have integer constants for now */
     Entry->Type = TypeDup (T);
@@ -1162,7 +1175,7 @@ SymEntry* AddLabelSym (const char* Name, unsigned Flags)
                     /* Optimizer will need the information about the value of SP adjustment
                     ** later, so let's preserve it.
                     */
-                    E = NewSymEntry (LocalDataLabelName (DOR->LateSP_Label), SC_SPADJUSTMENT);
+                    E = NewSymEntry (LocalDataLabelName (DOR->LateSP_Label), 0);
                     E->V.SPAdjustment = StackPtr - DOR->StackPtr;
                     AddSymEntry (SPAdjustTab, E);
                 }
@@ -1231,38 +1244,32 @@ SymEntry* AddLocalSym (const char* Name, const Type* T, unsigned Flags, int Offs
     Entry = FindSymInTable (Tab, Name, HashStr (Name));
 
     if (Entry) {
-        int CheckExtern = 0;
         if ((Flags & SC_STRUCTFIELD) == 0) {
             while (Entry && (Entry->Flags & SC_ALIAS) == SC_ALIAS) {
                 /* Get the aliased entry */
                 Entry = Entry->V.A.Field;
-                /* Check for conflict with local storage class */
-                CheckExtern = 1;
             }
         }
 
         /* We have a symbol with this name already */
         if (HandleSymRedefinition (Entry, T, Flags)) {
             Entry = 0;
-        } else if ((Flags & SC_ESUTYPEMASK) != SC_TYPEDEF) {
+        } else if ((Flags & SC_TYPEMASK) != SC_TYPEDEF) {
             /* Redefinitions are not allowed */
             if (SymIsDef (Entry) && (Flags & SC_DEF) == SC_DEF) {
                 Error ("Multiple definition of '%s'", Entry->Name);
                 Entry = 0;
-            } else if (CheckExtern) {
-                if ((Flags & (SC_AUTO | SC_REGISTER)) != 0) {
-                    Error ("Declaration of '%s' with no linkage follows extern declaration", Name);
-                    Entry = 0;
-                } else if ((Flags & SC_DEF) != 0 && (Flags & SC_EXTERN) == 0) {
-                    /* If a static declaration follows a non-static declaration,
-                    ** then it is an error.
-                    */
-                    Error ("Static declaration of '%s' follows extern declaration", Name);
-                    Entry = 0;
-                }
             } else if ((Flags & SC_STRUCTFIELD) != 0) {
                 Error ("Duplicate member '%s'", Entry->Name);
                 Entry = 0;
+            } else if (Entry->Owner == SymTab0) {
+                if ((Flags & SC_STORAGEMASK) == SC_AUTO ||
+                    (Flags & SC_STORAGEMASK) == SC_REGISTER ||
+                    (Flags & SC_STORAGEMASK) == SC_STATIC) {
+                    Error ("Declaration of '%s' with no linkage follows extern declaration",
+                           Name);
+                    Entry = 0;
+                }
             }
         }
 
@@ -1285,20 +1292,20 @@ SymEntry* AddLocalSym (const char* Name, const Type* T, unsigned Flags, int Offs
         Entry->Type = TypeDup (T);
 
         if ((Flags & SC_STRUCTFIELD) == SC_STRUCTFIELD ||
-            (Flags & SC_ESUTYPEMASK) == SC_TYPEDEF) {
+            (Flags & SC_TYPEMASK) == SC_TYPEDEF) {
             if ((Flags & SC_ALIAS) != SC_ALIAS) {
                 Entry->V.Offs = Offs;
             }
-        } else if ((Flags & SC_AUTO) == SC_AUTO) {
+        } else if ((Flags & SC_STORAGEMASK) == SC_AUTO) {
             Entry->V.Offs = Offs;
-        } else if ((Flags & SC_REGISTER) == SC_REGISTER) {
+        } else if ((Flags & SC_STORAGEMASK) == SC_REGISTER) {
             Entry->V.R.RegOffs  = Offs;
             Entry->V.R.SaveOffs = StackPtr;
-        } else if ((Flags & SC_EXTERN) == SC_EXTERN ||
-                   (Flags & SC_FUNC) == SC_FUNC) {
+        } else if ((Flags & SC_STORAGEMASK) == SC_EXTERN ||
+                   (Flags & SC_TYPEMASK) == SC_FUNC) {
             Entry->V.L.Label = Offs;
             SymSetAsmName (Entry);
-        } else if ((Flags & SC_STATIC) == SC_STATIC) {
+        } else if ((Flags & SC_STORAGEMASK) == SC_STATIC) {
             /* Generate the assembler name from the data label number */
             Entry->V.L.Label = Offs;
             Entry->AsmName = xstrdup (LocalDataLabelName (Entry->V.L.Label));
@@ -1343,49 +1350,70 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
         Entry = FindGlobalSym (Name);
     }
 
+    /* Do we have a symbol with this name already? */
     if (Entry) {
-        /* We have a symbol with this name already */
+        /* Check if the symbol refers to some different type of things */
         if (HandleSymRedefinition (Entry, T, Flags)) {
             Entry = 0;
-        } else if ((Entry->Flags & (SC_AUTO | SC_REGISTER)) != 0) {
-            /* Check for local storage class conflict */
+        } else if (Entry->Owner != SymTab0) {
+            /* The previous declaration has no linkage. The current declaration
+            ** has either external or internal linkage. Either way it is an
+            ** error since the two declarations would be referring to different
+            ** objects with the same identifier.
+            */
             Error ("Extern declaration of '%s' follows declaration with no linkage",
                    Name);
             Entry = 0;
-        } else if ((Flags & SC_ESUTYPEMASK) != SC_TYPEDEF) {
-            /* If a static declaration follows a non-static declaration, then
-            ** the result is undefined.
-            ** Most compilers choose to either give an error at compile time,
-            ** or remove the extern property for a link time error if used.
+        } else if ((Flags & SC_TYPEMASK) != SC_TYPEDEF) {
+            /* If we are adding the symbol in the file scope, it is now
+            ** visible there.
             */
-            if (SymTab == SymTab0           &&
-                (Flags & SC_EXTERN) == 0    &&
-                (Entry->Flags & SC_EXTERN) != 0) {
-                Error ("Static declaration of '%s' follows non-static declaration", Name);
-                Entry = 0;
-            } else if ((Flags & SC_EXTERN) != 0                                     &&
-                       (Entry->Owner == SymTab0 || (Entry->Flags & SC_DEF) != 0)    &&
-                       (Entry->Flags & SC_EXTERN) == 0) {
-                /* It is OK if a global extern declaration follows a global
-                ** non-static declaration, but an error if either of them is
-                ** local, as the two would be referring to different objects.
-                ** It is an error as well if a global non-static declaration
-                ** follows a global static declaration.
+            if (SymTab == SymTab0) {
+                Entry->Flags &= ~SC_LOCALSCOPE;
+            }
+
+            /* The C standard specifies that the result is undefined if the
+            ** same thing has both internal and external linkage. Most
+            ** compilers choose to either give an error at compile time, or
+            ** remove the external linkage for a link time error if used
+            ** outside the current translation unit. We choose to give an
+            ** error at compile time in this case.
+            */
+            if ((Entry->Flags & SC_STORAGEMASK) != SC_STATIC) {
+                /* The previous declaration is a non-static declaration of an
+                ** object or function that has external linkage.
                 */
-                if (Entry->Owner == SymTab0) {
-                    if ((Flags & SC_STORAGE) == 0) {
-                        /* The C standard specifies that a later extern declaration will keep
-                        ** the previously declared internal or external linkage unchanged.
-                        ** Though not required by the standard, we are warning on this case.
-                        */
-                        Flags &= ~SC_EXTERN;
-                        Warning ("Extern declaration of '%s' follows static declaration, linkage unchanged", Name);
-                    } else {
-                        Error ("Non-static declaration of '%s' follows static declaration", Name);
-                        Entry = 0;
-                    }
-                } else {
-                    Error ("Extern declaration of '%s' follows static declaration", Name);
+                if ((Flags & SC_STORAGEMASK) == SC_STATIC) {
+                    /* It is a static declaration of an object or function that
+                    ** has internal linkage. Conflicted wih the previous one.
+                    */
+                    Error ("Static declaration of '%s' follows non-static declaration",
+                           Name);
+                    Entry = 0;
+                }
+            } else if ((Flags & SC_STORAGEMASK) != SC_STATIC) {
+                /* The previous declaration is a static declaration of an
+                ** object or function that has internal linkage.
+                */
+                if ((Flags & SC_STORAGEMASK) == SC_EXTERN ||
+                    (Flags & SC_TYPEMASK) == SC_FUNC) {
+                    /* The C standard specifies that an extern declaration
+                    ** shall keep the previously declared internal linkage
+                    ** unchanged. For a function declaration with no storage
+                    ** class specifiers, it is treated as if with 'extern'.
+                    ** We give a warning although it is not required by the
+                    ** standard.
+                    */
+                    Flags &= ~SC_STORAGEMASK;
+                    Warning ("Extern declaration of '%s' follows static declaration",
+                             Name);
+                } else if ((Flags & SC_STORAGEMASK) == SC_NONE) {
+                    /* It is a non-extern-or-static declaration of an object in
+                    ** file scope that has external linkage. Conflicted wih the
+                    ** previous one.
+                    */
+                    Error ("Non-static declaration of '%s' follows static declaration",
+                           Name);
                     Entry = 0;
                 }
             }
@@ -1403,6 +1431,12 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
     }
 
     if (Entry == 0) {
+        /* Hide the symbol in the file scope if we are declaring it in a
+        ** local scope.
+        */
+        if (Tab == SymTab0 && SymTab != SymTab0) {
+            Flags |= SC_LOCALSCOPE;
+        }
 
         /* Create a new entry */
         Entry = NewSymEntry (Name, Flags);
@@ -1410,17 +1444,34 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
         /* Set the symbol attributes */
         Entry->Type = TypeDup (T);
 
-        /* If this is a function, clear additional fields */
-        if (IsTypeFunc (T)) {
-            Entry->V.F.Seg = 0;
-        }
-
         /* Add the assembler name of the symbol */
         SymSetAsmName (Entry);
 
         /* Add the entry to the symbol table */
         AddSymEntry (Tab, Entry);
+    }
 
+    /* If this is a function, do we wrap calls to it? */
+    if (IsTypeFunc (Entry->Type)) {
+        SymEntry* WrappedCall;
+        unsigned int WrappedCallData;
+
+        /* Always use the latest wrapper data for it */
+        GetWrappedCall ((void**)&WrappedCall, &WrappedCallData);
+        if (WrappedCall) {
+            Entry->V.F.WrappedCall = WrappedCall;
+            Entry->V.F.WrappedCallData = WrappedCallData;
+        }
+
+        /* A files cope function declaration with the 'extern' storage
+        ** class or without the 'inline' specifier ensures that the
+        ** function definition (if any) is a non-inline definition.
+        */
+        if (SymTab == SymTab0 &&
+            ((Flags & SC_STORAGEMASK) == SC_EXTERN ||
+             (Flags & SC_INLINE) == 0)) {
+            Entry->Flags |= SC_NOINLINEDEF;
+        }
     }
 
     /* Add an alias of the global symbol to the local symbol table */
@@ -1475,14 +1526,22 @@ SymTable* GetLabelSymTab (void)
 
 
 
-int SymIsLocal (SymEntry* Sym)
-/* Return true if the symbol is defined in the highest lexical level */
+int SymIsLocal (const SymEntry* Sym)
+/* Return true if the symbol is declared in the highest lexical level */
 {
     return (Sym->Owner == SymTab || Sym->Owner == TagTab);
 }
 
 
 
+int SymIsGlobal (const SymEntry* Sym)
+/* Return true if the symbol is declared in the file scope level */
+{
+    return (Sym->Owner == SymTab0 || Sym->Owner == TagTab0);
+}
+
+
+
 void MakeZPSym (const char* Name)
 /* Mark the given symbol as zero page symbol */
 {
@@ -1542,12 +1601,14 @@ void EmitExternals (void)
     Entry = SymTab->SymHead;
     while (Entry) {
         unsigned Flags = Entry->Flags;
-        if (Flags & SC_EXTERN) {
+        if (Entry->Owner == SymTab0 &&
+            (Flags & SC_STORAGEMASK) != SC_STATIC &&
+            ((Flags & SC_TYPEMASK) == SC_FUNC || (Flags & SC_TYPEMASK) == SC_NONE)) {
             /* Only defined or referenced externs */
             if (SymIsRef (Entry) && !SymIsDef (Entry)) {
                 /* An import */
                 g_defimport (Entry->Name, Flags & SC_ZEROPAGE);
-            } else if (SymIsDef (Entry)) {
+            } else if (SymIsDef (Entry) && ((Flags & SC_NOINLINEDEF) || (Flags & SC_INLINE) == 0)) {
                 /* An export */
                 g_defexport (Entry->Name, Flags & SC_ZEROPAGE);
             }
@@ -1576,18 +1637,18 @@ void EmitDebugInfo (void)
         }
         Sym = SymTab->SymHead;
         while (Sym) {
-            if ((Sym->Flags & (SC_CONST | SC_TYPEMASK)) == 0) {
-                if (Sym->Flags & SC_AUTO) {
+            if ((Sym->Flags & SC_TYPEMASK) == 0) {
+                if ((Sym->Flags & SC_STORAGEMASK) == SC_AUTO) {
                     AddTextLine ("%s, \"%s\", \"00\", auto, %d",
                                  Head, Sym->Name, Sym->V.Offs);
-                } else if (Sym->Flags & SC_REGISTER) {
+                } else if ((Sym->Flags & SC_STORAGEMASK) == SC_REGISTER) {
                     AddTextLine ("%s, \"%s\", \"00\", register, \"regbank\", %d",
                                  Head, Sym->Name, Sym->V.R.RegOffs);
 
                 } else if (SymIsRef (Sym) && !SymIsDef (Sym)) {
                     AddTextLine ("%s, \"%s\", \"00\", %s, \"%s\"",
                                  Head, Sym->Name,
-                                 (Sym->Flags & SC_EXTERN)? "extern" : "static",
+                                 (Sym->Flags & SC_STORAGEMASK) != SC_STATIC ? "extern" : "static",
                                  Sym->AsmName);
                 }
             }
diff --git a/src/cc65/symtab.h b/src/cc65/symtab.h
index 38edddcb0..236bc090a 100644
--- a/src/cc65/symtab.h
+++ b/src/cc65/symtab.h
@@ -142,7 +142,7 @@ void LeaveStructLevel (void);
 
 
 SymEntry* FindSym (const char* Name);
-/* Find the symbol with the given name */
+/* Find with the given name the symbol visible in the current scope */
 
 SymEntry* FindGlobalSym (const char* Name);
 /* Find the symbol with the given name in the global symbol table only */
@@ -151,7 +151,7 @@ SymEntry* FindLocalSym (const char* Name);
 /* Find the symbol with the given name in the current symbol table only */
 
 SymEntry* FindTagSym (const char* Name);
-/* Find the symbol with the given name in the tag table */
+/* Find with the given name the tag symbol visible in the current scope */
 
 SymEntry FindStructField (const Type* TypeArray, const char* Name);
 /* Find a struct/union field in the fields list.
@@ -211,8 +211,11 @@ SymTable* GetFieldSymTab (void);
 SymTable* GetLabelSymTab (void);
 /* Return the label symbol table */
 
-int SymIsLocal (SymEntry* Sym);
-/* Return true if the symbol is defined in the highest lexical level */
+int SymIsLocal (const SymEntry* Sym);
+/* Return true if the symbol is declared in the highest lexical level */
+
+int SymIsGlobal (const SymEntry* Sym);
+/* Return true if the symbol is declared in the file scope level */
 
 void MakeZPSym (const char* Name);
 /* Mark the given symbol as zero page symbol */
diff --git a/src/cc65/testexpr.c b/src/cc65/testexpr.c
index 14160f13f..ced563d01 100644
--- a/src/cc65/testexpr.c
+++ b/src/cc65/testexpr.c
@@ -76,7 +76,7 @@ unsigned Test (unsigned Label, int Invert)
         /* Constant rvalue */
         if (!Invert && Expr.IVal == 0) {
             g_jump (Label);
-            Warning ("Unreachable code");
+            UnreachableCodeWarning ();
         } else if (Invert && Expr.IVal != 0) {
             g_jump (Label);
         }
diff --git a/src/cc65/typecmp.c b/src/cc65/typecmp.c
index bb8bca880..a09c80304 100644
--- a/src/cc65/typecmp.c
+++ b/src/cc65/typecmp.c
@@ -69,6 +69,7 @@ static int EqualFuncParams (const FuncDesc* F1, const FuncDesc* F2)
         /* Get the symbol types */
         const Type* Type1 = Sym1->Type;
         const Type* Type2 = Sym2->Type;
+        typecmp_t   CmpResult;
 
         /* If either of both functions is old style, apply the default
         ** promotions to the parameter type.
@@ -84,9 +85,10 @@ static int EqualFuncParams (const FuncDesc* F1, const FuncDesc* F2)
             }
         }
 
-        /* Compare this field */
-        if (TypeCmp (Type1, Type2).C < TC_EQUAL) {
-            /* Field types not equal */
+        /* Compare types of this parameter */
+        CmpResult = TypeCmp (Type1, Type2);
+        if (CmpResult.C < TC_EQUAL || (CmpResult.F & TCF_MASK_PARAM_DIFF) != 0) {
+            /* The types are not compatible */
             return 0;
         }
 
@@ -257,8 +259,8 @@ static void DoCompare (const Type* lhs, const Type* rhs, typecmp_t* Result)
         }
 
         /* Get the ranks of the left and right hands */
-        LeftRank  = (GetUnqualTypeCode (lhs) & T_MASK_RANK);
-        RightRank = (GetUnqualTypeCode (rhs) & T_MASK_RANK);
+        LeftRank  = (GetUnderlyingTypeCode (lhs) & T_MASK_RANK);
+        RightRank = (GetUnderlyingTypeCode (rhs) & T_MASK_RANK);
 
         /* Bit-fields are considered compatible if they have the same
         ** signedness, bit-offset and bit-width.
@@ -342,10 +344,10 @@ static void DoCompare (const Type* lhs, const Type* rhs, typecmp_t* Result)
             case T_RANK_PTR:
                 ++Result->Indirections;
                 if (Result->Indirections == 1) {
-                    if ((GetUnqualTypeCode (lhs + 1) & T_MASK_RANK) == T_RANK_VOID) {
+                    if ((GetUnderlyingTypeCode (lhs + 1) & T_MASK_RANK) == T_RANK_VOID) {
                         Result->F |= TCF_VOID_PTR_ON_LEFT;
                     }
-                    if ((GetUnqualTypeCode (rhs + 1) & T_MASK_RANK) == T_RANK_VOID) {
+                    if ((GetUnderlyingTypeCode (rhs + 1) & T_MASK_RANK) == T_RANK_VOID) {
                         Result->F |= TCF_VOID_PTR_ON_RIGHT;
                     }
                 } else {
diff --git a/src/cc65/typecmp.h b/src/cc65/typecmp.h
index fa97ca176..43acc7ea5 100644
--- a/src/cc65/typecmp.h
+++ b/src/cc65/typecmp.h
@@ -68,15 +68,17 @@ typedef enum {
     TCF_VOID_PTR_ON_LEFT    = 0x01, /* lhs is a void pointer */
     TCF_VOID_PTR_ON_RIGHT   = 0x02, /* rhs is a void pointer */
     TCF_MASK_VOID_PTR       = TCF_VOID_PTR_ON_LEFT | TCF_VOID_PTR_ON_RIGHT,
-    TCF_QUAL_DIFF           = 0x04, /* CVR qualifiers differ in a way that doesn't matter */
+    TCF_QUAL_DIFF           = 0x04, /* lhs doesn't have all of CVR qualifiers of rhs */
     TCF_QUAL_IMPLICIT       = 0x08, /* CVR qualifiers of lhs are stricter than those of rhs */
-    TCF_PTR_QUAL_DIFF       = 0x10, /* CVR qualifiers of pointers differ */
-    TCF_PTR_QUAL_IMPLICIT   = 0x20, /* CVR qualifiers of pointers are stricter on lhs than those on rhs */
-    TCF_MASK_C_QUAL_DIFF    = 0x3C, /* All C Standard qualifiers */
+    TCF_MASK_CVR_DIFF       = 0x0C, /* All CVR qualifiers */
+    TCF_PTR_QUAL_DIFF       = 0x10, /* lhs pointee doesn't have all of CVR qualifiers of rhs pointee */
+    TCF_PTR_QUAL_IMPLICIT   = 0x20, /* CVR qualifiers of pointees are stricter on lhs than those on rhs */
+    TCF_MASK_PTR_QUAL_DIFF  = 0x30, /* All CVR qualifiers of pointees */
     TCF_ADDRSIZE_QUAL_DIFF  = 0x40, /* Address size qualifiers differ */
     TCF_CCONV_QUAL_DIFF     = 0x80, /* Function calling conventions differ. Unused now */
     TCF_INCOMPATIBLE_QUAL   = TCF_ADDRSIZE_QUAL_DIFF | TCF_CCONV_QUAL_DIFF,
-    TCF_MASK_QUAL           = TCF_MASK_C_QUAL_DIFF | TCF_INCOMPATIBLE_QUAL,
+    TCF_MASK_PARAM_DIFF     = TCF_MASK_PTR_QUAL_DIFF | TCF_INCOMPATIBLE_QUAL,
+    TCF_MASK_QUAL           = TCF_MASK_CVR_DIFF | TCF_MASK_PTR_QUAL_DIFF | TCF_INCOMPATIBLE_QUAL,
 } typecmpflag_t;
 
 typedef struct {
diff --git a/src/cc65/typeconv.c b/src/cc65/typeconv.c
index e5b054148..6e9fad69a 100644
--- a/src/cc65/typeconv.c
+++ b/src/cc65/typeconv.c
@@ -321,15 +321,9 @@ void TypeCast (ExprDesc* Expr)
 {
     Type    NewType[MAXTYPELEN];
 
-    /* Skip the left paren */
-    NextToken ();
-
-    /* Read the type */
+    /* Read the type enclosed in parentheses */
     ParseType (NewType);
 
-    /* Closing paren */
-    ConsumeRParen ();
-
     /* Read the expression we have to cast */
     hie10 (Expr);
 
@@ -433,10 +427,6 @@ void TypeComposition (Type* lhs, const Type* rhs)
 ** type or this fails with a critical check.
 */
 {
-    FuncDesc*   F1;
-    FuncDesc*   F2;
-    long LeftCount, RightCount;
-
     /* Compose two types */
     while (lhs->C != T_END) {
 
@@ -446,13 +436,13 @@ void TypeComposition (Type* lhs, const Type* rhs)
         }
 
         /* Check for sanity */
-        CHECK (GetUnqualTypeCode (lhs) == GetUnqualTypeCode (rhs));
+        CHECK (GetUnderlyingTypeCode (lhs) == GetUnderlyingTypeCode (rhs));
 
         /* Check for special type elements */
         if (IsTypeFunc (lhs)) {
             /* Compose the function descriptors */
-            F1 = GetFuncDesc (lhs);
-            F2 = GetFuncDesc (rhs);
+            FuncDesc* F1 = GetFuncDesc (lhs);
+            FuncDesc* F2 = GetFuncDesc (rhs);
 
             /* If F1 has an empty parameter list (which does also mean, it is
             ** not a function definition, because the flag is reset in this
@@ -476,8 +466,8 @@ void TypeComposition (Type* lhs, const Type* rhs)
             }
         } else if (IsTypeArray (lhs)) {
             /* Check member count */
-            LeftCount  = GetElementCount (lhs);
-            RightCount = GetElementCount (rhs);
+            long LeftCount  = GetElementCount (lhs);
+            long RightCount = GetElementCount (rhs);
 
             /* Set composite type if it is requested */
             if (LeftCount != UNSPECIFIED) {
@@ -485,41 +475,10 @@ void TypeComposition (Type* lhs, const Type* rhs)
             } else if (RightCount != UNSPECIFIED) {
                 SetElementCount (lhs, RightCount);
             }
-        } else {
-            /* Combine the qualifiers */
-            if (IsClassPtr (lhs)) {
-                ++lhs;
-                ++rhs;
-                lhs->C |= GetQualifier (rhs);
-            }
         }
 
         /* Next type string element */
         ++lhs;
         ++rhs;
     }
-
-    return;
-}
-
-
-
-FuncDesc* RefineFuncDesc (Type* OldType, const Type* NewType)
-/* Refine the existing function descriptor with a new one */
-{
-    FuncDesc* Old = GetFuncDesc (OldType);
-    FuncDesc* New = GetFuncDesc (NewType);
-
-    CHECK (Old != 0 && New != 0);
-
-    if ((New->Flags & FD_EMPTY) == 0) {
-        if ((Old->Flags & FD_EMPTY) == 0) {
-            TypeComposition (OldType, NewType);
-        } else {
-            TypeCopy (OldType, NewType);
-            Old->Flags &= ~FD_EMPTY;
-        }
-    }
-
-    return Old;
 }
diff --git a/src/cc65/typeconv.h b/src/cc65/typeconv.h
index 839c5e43e..1d79a446c 100644
--- a/src/cc65/typeconv.h
+++ b/src/cc65/typeconv.h
@@ -63,9 +63,6 @@ void TypeComposition (Type* lhs, const Type* rhs);
 ** type or this fails with a critical check.
 */
 
-FuncDesc* RefineFuncDesc (Type* OldType, const Type* NewType);
-/* Refine the existing function descriptor with a new one */
-
 
 
 /* End of typeconv.h */
diff --git a/src/chrcvt65.vcxproj b/src/chrcvt65.vcxproj
index 1e5c753b5..d44380c4e 100644
--- a/src/chrcvt65.vcxproj
+++ b/src/chrcvt65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1C7A3FEF-DD0B-4B10-BC33-C3BE29BF67CC}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="chrcvt65\error.c" />
     <ClCompile Include="chrcvt65\main.c" />
diff --git a/src/cl65.vcxproj b/src/cl65.vcxproj
index 67b7eb087..688926557 100644
--- a/src/cl65.vcxproj
+++ b/src/cl65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F657912F-050A-488B-B203-50ED5715CDD7}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="cl65\error.c" />
     <ClCompile Include="cl65\global.c" />
diff --git a/src/cl65/main.c b/src/cl65/main.c
index 553fb9ca6..6f2fe03df 100644
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -122,6 +122,11 @@ static int DoAssemble   = 1;
 /* The name of the output file, NULL if none given */
 static const char* OutputName = 0;
 
+/* The path part of the output file, NULL if none given
+** or the OutputName is just a filename with no path
+** information. */
+static char *OutputDirectory = 0;
+
 /* The name of the linker configuration file if given */
 static const char* LinkerConfig = 0;
 
@@ -378,6 +383,14 @@ static void CmdSetOutput (CmdDesc* Cmd, const char* File)
 
 
 
+static void CmdSetAsmOutput (CmdDesc* Cmd, const char* File)
+/* Set the output asm file in a command desc for grc65 */
+{
+    CmdAddArg2 (Cmd, "-s", File);
+}
+
+
+
 static void CmdSetTarget (CmdDesc* Cmd, target_t Target)
 /* Set the output file in a command desc */
 {
@@ -526,12 +539,15 @@ static void Link (void)
 
 
 
-static void AssembleFile (const char* File, unsigned ArgCount)
+static void AssembleFile (const char* File, const char* TmpFile, unsigned ArgCount)
 /* Common routine to assemble a file. Will be called by Assemble() and
 ** AssembleIntermediate(). Adds options common for both routines and
 ** assembles the file. Will remove excess arguments after assembly.
 */
 {
+    /* ObjName may be used for temporary or real filename */
+    char *ObjName;
+
     /* Set the target system */
     CmdSetTarget (&CA65, Target);
 
@@ -541,7 +557,12 @@ static void AssembleFile (const char* File, unsigned ArgCount)
         ** to the file list of the linker. The name of the output
         ** file is that of the input file with ".s" replaced by ".o".
         */
-        char* ObjName = MakeFilename (File, ".o");
+        if (TmpFile) {
+            ObjName = MakeFilename (TmpFile, ".o");
+        } else {
+            ObjName = MakeTmpFilename (OutputDirectory, File, ".o");
+        }
+        CmdSetOutput (&CA65, ObjName);
         CmdAddFile (&LD65, ObjName);
         /* This is just a temporary file, schedule it for removal */
         CmdAddFile (&RM, ObjName);
@@ -550,11 +571,15 @@ static void AssembleFile (const char* File, unsigned ArgCount)
         /* This is the final step. If an output name is given, set it */
         if (OutputName) {
             CmdSetOutput (&CA65, OutputName);
+        } else {
+            ObjName = MakeFilename (File, ".o");
+            CmdSetOutput (&CA65, ObjName);
+            xfree (ObjName);
         }
     }
 
     /* Add the file as argument for the assembler */
-    CmdAddArg (&CA65, File);
+    CmdAddArg (&CA65, TmpFile ? TmpFile : File);
 
     /* Add a NULL pointer to terminate the argument list */
     CmdAddArg (&CA65, 0);
@@ -568,7 +593,7 @@ static void AssembleFile (const char* File, unsigned ArgCount)
 
 
 
-static void AssembleIntermediate (const char* SourceFile)
+static void AssembleIntermediate (const char* SourceFile, const char* TmpFile)
 /* Assemble an intermediate file which was generated by a previous processing
 ** step with SourceFile as input. The -dep options won't be added and
 ** the intermediate assembler file is removed after assembly.
@@ -578,18 +603,20 @@ static void AssembleIntermediate (const char* SourceFile)
     ** name. It's the same name with the extension replaced by ".s"
     */
     char* AsmName = MakeFilename (SourceFile, ".s");
+    char* AsmTmpName = TmpFile ? MakeFilename(TmpFile, ".s") : NULL;
 
     /* Assemble the intermediate assembler file */
-    AssembleFile (AsmName, CA65.ArgCount);
+    AssembleFile (AsmName, AsmTmpName, CA65.ArgCount);
 
     /* Remove the input file */
-    if (remove (AsmName) < 0) {
+    if (remove (AsmTmpName ? AsmTmpName : AsmName) < 0) {
         Warning ("Cannot remove temporary file '%s': %s",
-                 AsmName, strerror (errno));
+                 AsmTmpName ? AsmTmpName : AsmName, strerror (errno));
     }
 
     /* Free the assembler file name which was allocated from the heap */
     xfree (AsmName);
+    xfree (AsmTmpName);
 }
 
 
@@ -612,7 +639,7 @@ static void Assemble (const char* File)
     }
 
     /* Use the common routine */
-    AssembleFile (File, ArgCount);
+    AssembleFile (File, NULL, ArgCount);
 }
 
 
@@ -620,6 +647,9 @@ static void Assemble (const char* File)
 static void Compile (const char* File)
 /* Compile the given file */
 {
+    /* A temporary file name passed to the assembler */
+    char *TmpFile = NULL;
+
     /* Remember the current compiler argument count */
     unsigned ArgCount = CC65.ArgCount;
 
@@ -657,6 +687,12 @@ static void Compile (const char* File)
     /* Add the file as argument for the compiler */
     CmdAddArg (&CC65, File);
 
+    if (DoAssemble) {
+        /* set a temporary output file name */
+        TmpFile = MakeTmpFilename(OutputDirectory, File, ".s");
+        CmdSetOutput (&CC65, TmpFile);
+    }
+
     /* Add a NULL pointer to terminate the argument list */
     CmdAddArg (&CC65, 0);
 
@@ -671,7 +707,10 @@ static void Compile (const char* File)
     */
     if (DoAssemble) {
         /* Assemble the intermediate file and remove it */
-        AssembleIntermediate (File);
+        AssembleIntermediate (File, TmpFile);
+        if (TmpFile) {
+            xfree(TmpFile);
+        }
     }
 }
 
@@ -680,6 +719,9 @@ static void Compile (const char* File)
 static void CompileRes (const char* File)
 /* Compile the given geos resource file */
 {
+    /* tmp Asm file name, if needed */
+    char* AsmName = NULL;
+
     /* Remember the current assembler argument count */
     unsigned ArgCount = GRC.ArgCount;
 
@@ -688,6 +730,14 @@ static void CompileRes (const char* File)
     */
     CmdSetTarget (&GRC, Target);
 
+    /* Changes to output file name must come
+    ** BEFORE adding the file
+    */
+    if (DoAssemble && DoLink) {
+        AsmName = MakeTmpFilename(OutputDirectory, File, ".s");
+        CmdSetAsmOutput(&GRC, AsmName);
+    }
+
     /* Add the file as argument for the resource compiler */
     CmdAddArg (&GRC, File);
 
@@ -705,7 +755,10 @@ static void CompileRes (const char* File)
     */
     if (DoAssemble) {
         /* Assemble the intermediate file and remove it */
-        AssembleIntermediate (File);
+        AssembleIntermediate (File, AsmName);
+        if (AsmName) {
+            xfree(AsmName);
+        }
     }
 }
 
@@ -741,7 +794,7 @@ static void ConvertO65 (const char* File)
     */
     if (DoAssemble) {
         /* Assemble the intermediate file and remove it */
-        AssembleIntermediate (File);
+        AssembleIntermediate (File, NULL);
     }
 }
 
@@ -1305,6 +1358,9 @@ static void OptStaticLocals (const char* Opt attribute ((unused)),
 static void OptTarget (const char* Opt attribute ((unused)), const char* Arg)
 /* Set the target system */
 {
+    if (FirstInput) {
+        Error ("Target must be specified before input files");
+    }
     Target = FindTarget (Arg);
     if (Target == TGT_UNKNOWN) {
         Error ("No such target system: '%s'", Arg);
@@ -1572,6 +1628,7 @@ int main (int argc, char* argv [])
                 case 'o':
                     /* Name the output file */
                     OutputName = GetArg (&I, 2);
+                    OutputDirectory = GetFileDirectory(OutputName);
                     break;
 
                 case 'r':
@@ -1610,7 +1667,7 @@ int main (int argc, char* argv [])
             }
 
             /* Determine the file type by the extension */
-            switch (GetFileType (Arg)) {
+            switch (GetTypeOfFile (Arg)) {
 
                 case FILETYPE_C:
                     /* Compile the file */
@@ -1658,10 +1715,17 @@ int main (int argc, char* argv [])
 
     /* Link the given files if requested and if we have any */
     if (DoLink && LD65.FileCount > 0) {
+        /*
+        ** Link() may not return if there's an error, so we install
+        ** RemoveTempFiles() as an atexit() handler.
+        */
+        atexit (RemoveTempFiles);
         Link ();
     }
 
-    RemoveTempFiles ();
+    if (OutputDirectory != NULL) {
+      xfree(OutputDirectory);
+    }
 
     /* Return an apropriate exit code */
     return EXIT_SUCCESS;
diff --git a/src/co65.vcxproj b/src/co65.vcxproj
index 9f5959d89..fa6a1e315 100644
--- a/src/co65.vcxproj
+++ b/src/co65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F5DB5D1A-05BC-48FE-B346-4E96DD522AA2}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,14 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +71,14 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="co65\convert.c" />
     <ClCompile Include="co65\error.c" />
diff --git a/src/common.vcxproj b/src/common.vcxproj
index df99fc4a9..251ea3aeb 100644
--- a/src/common.vcxproj
+++ b/src/common.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{71DC1F68-BFC4-478C-8655-C8E9C9654D2B}</ProjectGuid>
@@ -22,16 +30,25 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -39,11 +56,23 @@
       <PreprocessorDefinitions>_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="common\abend.h" />
     <ClInclude Include="common\addrsize.h" />
@@ -51,6 +80,7 @@
     <ClInclude Include="common\assertion.h" />
     <ClInclude Include="common\attrib.h" />
     <ClInclude Include="common\bitops.h" />
+    <ClInclude Include="common\capability.h" />
     <ClInclude Include="common\cddefs.h" />
     <ClInclude Include="common\chartype.h" />
     <ClInclude Include="common\check.h" />
@@ -104,6 +134,7 @@
     <ClCompile Include="common\alignment.c" />
     <ClCompile Include="common\assertion.c" />
     <ClCompile Include="common\bitops.c" />
+    <ClCompile Include="common\capability.c" />
     <ClCompile Include="common\chartype.c" />
     <ClCompile Include="common\check.c" />
     <ClCompile Include="common\cmdline.c" />
@@ -142,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/libsrc/apple2/opendir.c b/src/common/capability.c
similarity index 61%
rename from libsrc/apple2/opendir.c
rename to src/common/capability.c
index 1144d8511..19c3ed838 100644
--- a/libsrc/apple2/opendir.c
+++ b/src/common/capability.c
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                opendir.h                                  */
+/*                               capability.c                                */
 /*                                                                           */
-/*                             Open a directory                              */
+/*                     Handle CPU or target capabilities                     */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2005  Oliver Schmidt, <ol.sc@web.de>                                  */
+/* (C) 2026,     Kugelfuhr                                                   */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -30,14 +30,10 @@
 
 
 
-#include <stddef.h>
 #include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <dirent.h>
-#include "dir.h"
+
+/* ca65 */
+#include "capability.h"
 
 
 
@@ -47,7 +43,23 @@
 
 
 
-extern char _cwd[FILENAME_MAX];
+/* List of dot keywords with the corresponding ids. */
+/* CAUTION: table must be sorted for bsearch. */
+struct Capability {
+    const char*         Key;
+    capability_t        Cap;
+} Capabilities [] = {
+/* BEGIN SORTED.SH */
+    { "CPU_HAS_BITIMM",         CAP_CPU_HAS_BITIMM      },
+    { "CPU_HAS_BRA8",           CAP_CPU_HAS_BRA8        },
+    { "CPU_HAS_INA",            CAP_CPU_HAS_INA         },
+    { "CPU_HAS_PUSHXY",         CAP_CPU_HAS_PUSHXY      },
+    { "CPU_HAS_STZ",            CAP_CPU_HAS_STZ         },
+    { "CPU_HAS_ZPIND",          CAP_CPU_HAS_ZPIND       },
+/* END SORTED.SH */
+};
+#define CAP_TABLE_SIZE (sizeof (Capabilities) / sizeof (Capabilities [0]))
+
 
 
 
@@ -57,56 +69,23 @@ extern char _cwd[FILENAME_MAX];
 
 
 
-DIR* __fastcall__ opendir (register const char* name)
+static int CmpCapability (const void* K1, const void* K2)
+/* Compare function for the capability search */
 {
-    register DIR* dir;
-
-    /* Alloc DIR */
-    if ((dir = malloc (sizeof (*dir))) == NULL) {
-
-        /* May not have been done by malloc() */
-        _directerrno (ENOMEM);
-
-        /* Return failure */
-        return NULL;
-    }
-
-    /* Interpret dot as current working directory */
-    if (*name == '.') {
-        name = _cwd;
-    }
-
-    /* Open directory file */
-    if ((dir->fd = open (name, O_RDONLY)) != -1) {
-
-        /* Read directory key block */
-        if (read (dir->fd,
-                  dir->block.bytes,
-                  sizeof (dir->block)) == sizeof (dir->block)) {
-
-            /* Get directory entry infos from directory header */
-            dir->entry_length      = dir->block.bytes[0x23];
-            dir->entries_per_block = dir->block.bytes[0x24];
-
-            /* Skip directory header entry */
-            dir->current_entry = 1;
-
-            /* Return success */
-            return dir;
-        }
-
-        /* EOF: Most probably no directory file at all */
-        if (_oserror == 0) {
-            _directerrno (EINVAL);
-        }
-
-        /* Cleanup directory file */
-        close (dir->fd);
-    }
-
-    /* Cleanup DIR */
-    free (dir);
-
-    /* Return failure */
-    return NULL;
+    return strcmp (((struct Capability*)K1)->Key, ((struct Capability*)K2)->Key);
+}
+
+
+
+capability_t FindCapability (const char* Name)
+/* Find the capability with the given name. Returns CAP_INVALID if there is no
+** capability with the given name and a capability code >= 0 instead. The
+** capability name is expected in upper case.
+*/
+{
+    const struct Capability K = { Name, 0 };
+    const struct Capability* C = bsearch (&K, Capabilities, CAP_TABLE_SIZE,
+                                          sizeof (Capabilities [0]),
+                                          CmpCapability);
+    return (C == 0)? CAP_INVALID : C->Cap;
 }
diff --git a/libsrc/common/gmtime.c b/src/common/capability.h
similarity index 64%
rename from libsrc/common/gmtime.c
rename to src/common/capability.h
index 85e9de3d0..b0332c72e 100644
--- a/libsrc/common/gmtime.c
+++ b/src/common/capability.h
@@ -1,15 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                 gmtime.c                                  */
+/*                               capability.h                                */
 /*                                                                           */
-/*            Convert calendar time into broken down time in UTC             */
+/*                     Handle CPU or target capabilities                     */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2002      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2026,     Kugelfuhr                                                   */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -33,7 +30,33 @@
 
 
 
-#include <time.h>
+#ifndef CAPABILITY_H
+#define CAPABILITY_H
+
+
+
+/* common */
+#include "strbuf.h"
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* Numeric codes for capabilities */
+enum capability_t {
+    CAP_INVALID             = -1,
+    CAP_CPU_HAS_BRA8        =  0,   /* CPU has a BRA 8-bit instruction */
+    CAP_CPU_HAS_INA         =  1,   /* CPU has DEA/INA */
+    CAP_CPU_HAS_PUSHXY      =  2,   /* CPU has PHX/PHY/PLX/PLY */
+    CAP_CPU_HAS_ZPIND       =  3,   /* CPU has "(zp)" mode (no offset) */
+    CAP_CPU_HAS_STZ         =  4,   /* CPU has "store zero" (!) instruction */
+    CAP_CPU_HAS_BITIMM      =  5,   /* CPU has "bit #imm" instruction */
+};
+typedef enum capability_t capability_t;
 
 
 
@@ -43,31 +66,14 @@
 
 
 
-struct tm* __fastcall__ gmtime (const time_t* timep)
-{
-    static struct tm timebuf;
-    time_t t;
+capability_t FindCapability (const char* Name);
+/* Find the capability with the given name. Returns CAP_INVALID if there is no
+** capability with the given name and a capability code >= 0 instead. The
+** capability name is expected in upper case.
+*/
 
-    /* Check the argument */
-    if (timep == 0 || (long) (t = *timep) < 0) {
-        /* Invalid arg */
-        return 0;
-    }
 
-    /* Since our ints are just 16 bits, split the given time into seconds,
-    ** hours and days. Each of the values will fit in a 16 bit variable.
-    ** The mktime routine will then do the rest.
-    */
-    timebuf.tm_sec  = t % 3600;
-    timebuf.tm_min  = 0;
-    timebuf.tm_hour = (t / 3600) % 24;
-    timebuf.tm_mday = (t / (3600UL * 24UL)) + 1;
-    timebuf.tm_mon  = 0;
-    timebuf.tm_year = 70;       /* Base value is 1/1/1970 */
 
-    /* Call mktime to do the final conversion */
-    mktime (&timebuf);
+/* End of capability.h */
 
-    /* Return the result */
-    return &timebuf;
-}
+#endif
diff --git a/src/common/cpu.c b/src/common/cpu.c
index b55a5ab00..8e9ff827a 100644
--- a/src/common/cpu.c
+++ b/src/common/cpu.c
@@ -33,6 +33,8 @@
 
 
 
+#include <stdint.h>
+
 /* common */
 #include "addrsize.h"
 #include "check.h"
@@ -56,28 +58,126 @@ const char* CPUNames[CPU_COUNT] = {
     "6502",
     "6502X",
     "6502DTV",
-    "65SC02",
-    "65C02",
+    "65SC02",   /* the original CMOS instruction set */
+    "65C02",    /* CMOS with Rockwell extensions */
     "65816",
     "sweet16",
     "huc6280",
     "m740",
     "4510",
+    "45GS02",
+    "W65C02",   /* CMOS with WDC extensions */
+    "65CE02",   /* CMOS with CSG extensions */
 };
 
-/* Tables with CPU instruction sets */
+/* Tables with CPU instruction sets
+ * NOTE: make sure to only combine the instruction sets that are 100% compatible
+ */
 const unsigned CPUIsets[CPU_COUNT] = {
+    /* CPU_NONE */
     CPU_ISET_NONE,
+    /* CPU_6502 */
     CPU_ISET_6502,
-    CPU_ISET_6502 | CPU_ISET_6502X,
-    CPU_ISET_6502 | CPU_ISET_6502DTV,
-    CPU_ISET_6502 | CPU_ISET_65SC02,
-    CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02,
-    CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02 | CPU_ISET_65816,
+    /* CPU_6502X */
+    CPU_ISET_6502X   | CPU_ISET_6502,
+    /* CPU_6502DTV */
+    CPU_ISET_6502DTV | CPU_ISET_6502,
+    /* CPU_65SC02 */
+    CPU_ISET_65SC02  | CPU_ISET_6502,
+    /* CPU_65C02 */
+    CPU_ISET_65C02   | CPU_ISET_6502 | CPU_ISET_65SC02,
+    /* CPU_65816. 65816 has wai/stp and NO bit manipulation. */
+    CPU_ISET_65816   | CPU_ISET_6502 | CPU_ISET_65SC02,
+    /* CPU_SWEET16 */
     CPU_ISET_SWEET16,
-    CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02 | CPU_ISET_HUC6280,
-    CPU_ISET_6502 | CPU_ISET_M740,
-    CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02 | CPU_ISET_4510,
+    /* CPU_HUC6280 */
+    CPU_ISET_HUC6280 | CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02,
+    /* CPU_M740 */
+    CPU_ISET_M740    | CPU_ISET_6502,
+    /* CPU_4510. 4510 does NOT have indirect-zp (without z), so we can not use 65SC02 */
+    CPU_ISET_4510    | CPU_ISET_6502                   | CPU_ISET_65C02 | CPU_ISET_65CE02,
+    /* CPU_45GS02 */
+    CPU_ISET_45GS02  | CPU_ISET_6502                   | CPU_ISET_65C02 | CPU_ISET_65CE02 | CPU_ISET_4510,
+    /* CPU_W65C02 */
+    CPU_ISET_W65C02  | CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02,
+    /* CPU_65CE02 */
+    CPU_ISET_65CE02  | CPU_ISET_6502                   | CPU_ISET_65C02,
+};
+
+/* Defines for capabilities. Currently the entries are uint32_ts but the table
+** is deliberately hidden from the outside so it can be extended to 64 bit or
+** even more.
+*/
+#define CAP_BIT(Cap)    (UINT32_C (1) << (Cap))
+#define CAP_NONE        UINT32_C (0)
+#define CAP_6502        CAP_NONE
+#define CAP_6502X       CAP_NONE
+#define CAP_6502DTV     CAP_NONE
+#define CAP_65SC02                              \
+    (CAP_BIT (CAP_CPU_HAS_BITIMM)       |       \
+     CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY)       |       \
+     CAP_BIT (CAP_CPU_HAS_ZPIND)        |       \
+     CAP_BIT (CAP_CPU_HAS_STZ))
+#define CAP_65C02                               \
+    (CAP_BIT (CAP_CPU_HAS_BITIMM)       |       \
+     CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY)       |       \
+     CAP_BIT (CAP_CPU_HAS_ZPIND)        |       \
+     CAP_BIT (CAP_CPU_HAS_STZ))
+#define CAP_65816                               \
+    (CAP_BIT (CAP_CPU_HAS_BITIMM)       |       \
+     CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY)       |       \
+     CAP_BIT (CAP_CPU_HAS_ZPIND)        |       \
+     CAP_BIT (CAP_CPU_HAS_STZ))
+#define CAP_SWEET16     CAP_NONE
+#define CAP_HUC6280                             \
+    (CAP_BIT (CAP_CPU_HAS_BITIMM)       |       \
+     CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY)       |       \
+     CAP_BIT (CAP_CPU_HAS_ZPIND)        |       \
+     CAP_BIT (CAP_CPU_HAS_STZ))
+#define CAP_M740                                \
+    (CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA))
+#define CAP_4510                                \
+    (CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY))
+#define CAP_45GS02                              \
+    (CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY))
+#define CAP_W65C02                              \
+    (CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY))
+#define CAP_65CE02                              \
+    (CAP_BIT (CAP_CPU_HAS_BRA8)         |       \
+     CAP_BIT (CAP_CPU_HAS_INA)          |       \
+     CAP_BIT (CAP_CPU_HAS_PUSHXY))
+
+/* Table containing one capability entry per CPU */
+static const uint32_t CPUCaps[CPU_COUNT] = {
+    CAP_NONE,                   /* CPU_NONE */
+    CAP_6502,                   /* CPU_6502 */
+    CAP_6502X,                  /* CPU_6502X */
+    CAP_6502DTV,                /* CPU_6502DTV */
+    CAP_65SC02,                 /* CPU_65SC02 */
+    CAP_65C02,                  /* CPU_65C02 */
+    CAP_65816,                  /* CPU_65816 */
+    CAP_SWEET16,                /* CPU_SWEET16 */
+    CAP_HUC6280,                /* CPU_HUC6280 */
+    CAP_M740,                   /* CPU_M740 */
+    CAP_4510,                   /* CPU_4510 */
+    CAP_45GS02,                 /* CPU_45GS02 */
+    CAP_W65C02,                 /* CPU_W65C02 */
+    CAP_65CE02,                 /* CPU_65CE02 */
 };
 
 
@@ -138,3 +238,12 @@ cpu_t FindCPU (const char* Name)
     /* Not found */
     return CPU_UNKNOWN;
 }
+
+
+
+int CPUHasCap (capability_t Cap)
+/* Check if the current CPU has the given capability */
+{
+    PRECONDITION (CPU >= 0 && CPU < CPU_COUNT);
+    return (CPUCaps[CPU] & CAP_BIT (Cap)) != 0;
+}
diff --git a/src/common/cpu.h b/src/common/cpu.h
index 2e75feaaf..bc6260371 100644
--- a/src/common/cpu.h
+++ b/src/common/cpu.h
@@ -38,6 +38,11 @@
 
 
 
+/* common */
+#include "capability.h"
+
+
+
 /*****************************************************************************/
 /*                                   Data                                    */
 /*****************************************************************************/
@@ -47,17 +52,20 @@
 /* CPUs */
 typedef enum {
     CPU_UNKNOWN = -1,           /* Not specified or invalid target */
-    CPU_NONE,                   /* No CPU - for assembler */
+    CPU_NONE = 0,               /* No CPU - for assembler */
     CPU_6502,
     CPU_6502X,                  /* "Extended", that is: with illegal opcodes */
     CPU_6502DTV,                /* CPU_6502 + DTV extra and illegal opcodes */
-    CPU_65SC02,
-    CPU_65C02,
+    CPU_65SC02,                 /* the original CMOS instruction set */
+    CPU_65C02,                  /* CMOS with Rockwell extensions */
     CPU_65816,
     CPU_SWEET16,
     CPU_HUC6280,                /* Used in PC engine */
     CPU_M740,                   /* Mitsubishi 740 series MCUs */
     CPU_4510,                   /* CPU of C65 */
+    CPU_45GS02,                 /* CPU of MEGA65 */
+    CPU_W65C02,                 /* CMOS with WDC extensions */
+    CPU_65CE02,                 /* CMOS with CSG extensions */
     CPU_COUNT                   /* Number of different CPUs */
 } cpu_t;
 
@@ -74,6 +82,9 @@ enum {
     CPU_ISET_HUC6280    = 1 << CPU_HUC6280,
     CPU_ISET_M740       = 1 << CPU_M740,
     CPU_ISET_4510       = 1 << CPU_4510,
+    CPU_ISET_45GS02     = 1 << CPU_45GS02,
+    CPU_ISET_W65C02     = 1 << CPU_W65C02,
+    CPU_ISET_65CE02     = 1 << CPU_65CE02
 };
 
 /* CPU used */
@@ -101,6 +112,9 @@ cpu_t FindCPU (const char* Name);
 ** the given name is no valid target.
 */
 
+int CPUHasCap (capability_t Cap);
+/* Check if the current CPU has the given capability */
+
 
 
 /* End of cpu.h */
diff --git a/src/common/filetype.c b/src/common/filetype.c
index a5bac640d..074f8800a 100644
--- a/src/common/filetype.c
+++ b/src/common/filetype.c
@@ -48,8 +48,10 @@
 
 
 
+/* CAUTION: table must be sorted for bsearch */
 static const FileId TypeTable[] = {
     /* Upper case stuff for obsolete operating systems */
+/* BEGIN SORTED.SH */
     {   "A",    FILETYPE_LIB    },
     {   "A65",  FILETYPE_ASM    },
     {   "ASM",  FILETYPE_ASM    },
@@ -65,7 +67,6 @@ static const FileId TypeTable[] = {
     {   "S",    FILETYPE_ASM    },
     {   "SER",  FILETYPE_O65    },
     {   "TGI",  FILETYPE_O65    },
-
     {   "a",    FILETYPE_LIB    },
     {   "a65",  FILETYPE_ASM    },
     {   "asm",  FILETYPE_ASM    },
@@ -81,6 +82,7 @@ static const FileId TypeTable[] = {
     {   "s",    FILETYPE_ASM    },
     {   "ser",  FILETYPE_O65    },
     {   "tgi",  FILETYPE_O65    },
+/* END SORTED.SH */
 };
 
 #define FILETYPE_COUNT (sizeof (TypeTable) / sizeof (TypeTable[0]))
@@ -92,8 +94,7 @@ static const FileId TypeTable[] = {
 /*****************************************************************************/
 
 
-
-FILETYPE GetFileType (const char* Name)
+FILETYPE GetTypeOfFile (const char* Name)
 /* Determine the type of the given file by looking at the name. If the file
 ** type could not be determined, the function returns FILETYPE_UNKOWN.
 */
diff --git a/src/common/filetype.h b/src/common/filetype.h
index f4beae73a..0738078ba 100644
--- a/src/common/filetype.h
+++ b/src/common/filetype.h
@@ -63,7 +63,7 @@ typedef enum {
 
 
 
-FILETYPE GetFileType (const char* Name);
+FILETYPE GetTypeOfFile (const char* Name);
 /* Determine the type of the given file by looking at the name. If the file
 ** type could not be determined, the function returns FILETYPE_UNKOWN.
 */
diff --git a/src/common/fname.c b/src/common/fname.c
index 4e4f7c7fa..10d38f38a 100644
--- a/src/common/fname.c
+++ b/src/common/fname.c
@@ -33,7 +33,17 @@
 
 
 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <time.h>
+
+#if defined(_MSC_VER)
+#  include <process.h>
+#else
+#  include <unistd.h>
+#endif
 
 #include "xmalloc.h"
 #include "fname.h"
@@ -92,7 +102,28 @@ const char* FindName (const char* Path)
     return Path + Len;
 }
 
+char *GetFileDirectory (const char* File)
+/* Return a copy of the path part of a File, or NULL if there is none. */
+{
+    char *Out, *P;
 
+    if (File == NULL) {
+        return NULL;
+    }
+
+    Out = xmalloc (strlen (File) + 1);
+    strcpy(Out, File);
+
+    P = (char *)FindName (Out);
+    if (P == Out) {
+        /* This is a simple filename. */
+        xfree (Out);
+        return NULL;
+    }
+    *P = '\0';
+
+    return Out;
+}
 
 char* MakeFilename (const char* Origin, const char* Ext)
 /* Make a new file name from Origin and Ext. If Origin has an extension, it
@@ -115,3 +146,32 @@ char* MakeFilename (const char* Origin, const char* Ext)
     }
     return Out;
 }
+
+
+
+char* MakeTmpFilename (const char *Directory, const char *Origin, const char* Ext)
+/* Make a new temporary file name from Origin and Ext.
+** The result is placed in a malloc'ed buffer and returned.
+*/
+{
+    char* Out;
+    size_t Len = 0;
+    static unsigned int Counter = 0;
+
+    /* Allocate enough for the directory, ... */
+    if (Directory != NULL) {
+      Len = strlen (Directory);
+    }
+
+    /* ... plus the the original name, the maximum length of the PID, the
+     * maximum length of the counter, the extension, and the terminator.
+     */
+    Len += strlen (Origin) + (strlen (".2147483648") * 2) + strlen (Ext) + 1;
+    Out = xmalloc (Len);
+
+    snprintf (Out, Len, "%s%s.%u.%u%s", (Directory != NULL ? Directory : ""),
+                                     FindName(Origin), getpid(), Counter, Ext);
+    Counter++;
+
+    return Out;
+}
diff --git a/src/common/fname.h b/src/common/fname.h
index 1b94d270c..ede34152d 100644
--- a/src/common/fname.h
+++ b/src/common/fname.h
@@ -52,6 +52,9 @@ const char* FindName (const char* Path);
 ** the file, the function returns Path as name.
 */
 
+char *GetFileDirectory (const char* File);
+/* Return a copy of the path part of a File, or NULL if there is none. */
+
 char* MakeFilename (const char* Origin, const char* Ext);
 /* Make a new file name from Origin and Ext. If Origin has an extension, it
 ** is removed and Ext is appended. If Origin has no extension, Ext is simply
@@ -59,6 +62,13 @@ char* MakeFilename (const char* Origin, const char* Ext);
 ** The function may be used to create "foo.o" from "foo.s".
 */
 
+char* MakeTmpFilename (const char *Directory, const char *Origin, const char* Ext);
+/* Make a new temporary file name from Directory, Origin, and Ext.
+** A temporary path is generated from the Directory,
+** the Origin filename, the compiler's PID and the Extension.
+** The result is placed in a malloc'ed buffer and returned.
+*/
+
 
 
 /* End of fname.h */
diff --git a/src/common/strbuf.c b/src/common/strbuf.c
index 79419f1c4..c5b27ee63 100644
--- a/src/common/strbuf.c
+++ b/src/common/strbuf.c
@@ -82,6 +82,7 @@ StrBuf* SB_InitFromString (StrBuf* B, const char* S)
     B->Len       = strlen (S);
     B->Index     = 0;
     B->Buf       = (char*) S;
+    B->Cooked    = (char*) S;
     return B;
 }
 
@@ -92,6 +93,7 @@ void SB_Done (StrBuf* B)
 {
     if (B->Allocated) {
         xfree (B->Buf);
+        xfree (B->Cooked);
     }
 }
 
@@ -146,10 +148,12 @@ void SB_Realloc (StrBuf* B, unsigned NewSize)
     */
     if (B->Allocated) {
         /* Just reallocate the block */
-        B->Buf   = xrealloc (B->Buf, NewAllocated);
+        B->Buf    = xrealloc (B->Buf, NewAllocated);
+        B->Cooked = xrealloc (B->Cooked, NewAllocated);
     } else {
         /* Allocate a new block and copy */
-        B->Buf   = memcpy (xmalloc (NewAllocated), B->Buf, B->Len);
+        B->Buf    = memcpy (xmalloc (NewAllocated), B->Buf, B->Len);
+        B->Cooked = memcpy (xmalloc (NewAllocated), B->Cooked, B->Len);
     }
 
     /* Remember the new block size */
@@ -178,10 +182,12 @@ static void SB_CheapRealloc (StrBuf* B, unsigned NewSize)
     /* Free the old buffer if there is one */
     if (B->Allocated) {
         xfree (B->Buf);
+        xfree (B->Cooked);
     }
 
     /* Allocate a fresh block */
-    B->Buf = xmalloc (NewAllocated);
+    B->Buf    = xmalloc (NewAllocated);
+    B->Cooked = xmalloc (NewAllocated);
 
     /* Remember the new block size */
     B->Allocated = NewAllocated;
@@ -222,6 +228,7 @@ void SB_Terminate (StrBuf* B)
         SB_Realloc (B, NewLen);
     }
     B->Buf[B->Len] = '\0';
+    B->Cooked[B->Len] = '\0';
 }
 
 
@@ -234,6 +241,22 @@ void SB_CopyBuf (StrBuf* Target, const char* Buf, unsigned Size)
             SB_CheapRealloc (Target, Size);
         }
         memcpy (Target->Buf, Buf, Size);
+        memcpy (Target->Cooked, Buf, Size); /* nothing raw */
+    }
+    Target->Len = Size;
+}
+
+
+
+void SB_CopyBufCooked (StrBuf* Target, const char* Buf, const char* Cooked, unsigned Size)
+/* Copy Buf and Cooked to Target, discarding the old contents of Target */
+{
+    if (Size) {
+        if (Target->Allocated < Size) {
+            SB_CheapRealloc (Target, Size);
+        }
+        memcpy (Target->Buf, Buf, Size);
+        memcpy (Target->Cooked, Cooked, Size);
     }
     Target->Len = Size;
 }
@@ -254,7 +277,7 @@ void SB_CopyStr (StrBuf* Target, const char* S)
 void SB_Copy (StrBuf* Target, const StrBuf* Source)
 /* Copy Source to Target, discarding the old contents of Target */
 {
-    SB_CopyBuf (Target, Source->Buf, Source->Len);
+    SB_CopyBufCooked (Target, Source->Buf, Source->Cooked, Source->Len);
     Target->Index = Source->Index;
 }
 #endif
@@ -269,6 +292,21 @@ void SB_AppendChar (StrBuf* B, int C)
         SB_Realloc (B, NewLen);
     }
     B->Buf[B->Len] = (char) C;
+    B->Cooked[B->Len] = (char) C;
+    B->Len = NewLen;
+}
+
+
+
+void SB_AppendCharCooked (StrBuf* B, int C, int Cooked)
+/* Append a character to a string buffer */
+{
+    unsigned NewLen = B->Len + 1;
+    if (NewLen > B->Allocated) {
+        SB_Realloc (B, NewLen);
+    }
+    B->Buf[B->Len] = (char) C;
+    B->Cooked[B->Len] = (char) (Cooked ? C : 0);
     B->Len = NewLen;
 }
 
@@ -282,6 +320,7 @@ void SB_AppendBuf (StrBuf* B, const char* S, unsigned Size)
         SB_Realloc (B, NewLen);
     }
     memcpy (B->Buf + B->Len, S, Size);
+    memcpy (B->Cooked + B->Len, S, Size);
     B->Len = NewLen;
 }
 
@@ -301,7 +340,13 @@ void SB_AppendStr (StrBuf* B, const char* S)
 void SB_Append (StrBuf* Target, const StrBuf* Source)
 /* Append the contents of Source to Target */
 {
-    SB_AppendBuf (Target, Source->Buf, Source->Len);
+    unsigned NewLen = Target->Len + Source->Len;
+    if (NewLen > Target->Allocated) {
+        SB_Realloc (Target, NewLen);
+    }
+    memcpy (Target->Buf + Target->Len, Source->Buf, Source->Len);
+    memcpy (Target->Cooked + Target->Len, Source->Cooked, Source->Len);
+    Target->Len = NewLen;
 }
 #endif
 
diff --git a/src/common/strbuf.h b/src/common/strbuf.h
index e0602a6c8..372b1be0b 100644
--- a/src/common/strbuf.h
+++ b/src/common/strbuf.h
@@ -53,10 +53,17 @@
 /*****************************************************************************/
 
 
+/* We want to track whether a character is "raw" or not. */
+/* "raw" characters should NOT be translated when translating a string. */
+/* We do this by keeping a second array parallel to "Buf" called "Cooked". */
+/* Think of "cooked" as the inverse of "raw". */
+/* If Cooked[n] is 0, then the character is raw and should not be translated. */
+/* This was done to keep LIT_STR_BUFFER sane. */
 
 typedef struct StrBuf StrBuf;
 struct StrBuf {
     char*       Buf;                    /* Pointer to buffer */
+    char*       Cooked;                 /* Pointer to cooked buffer */
     unsigned    Len;                    /* Length of the string */
     unsigned    Index;                  /* Used for reading (Get and friends) */
     unsigned    Allocated;              /* Size of allocated memory */
@@ -66,13 +73,13 @@ struct StrBuf {
 extern const StrBuf EmptyStrBuf;
 
 /* Initializer for static string bufs */
-#define STATIC_STRBUF_INITIALIZER       { 0, 0, 0, 0 }
+#define STATIC_STRBUF_INITIALIZER       { 0, 0, 0, 0, 0 }
 
 /* Initializer for auto string bufs */
-#define AUTO_STRBUF_INITIALIZER         { 0, 0, 0, 0 }
+#define AUTO_STRBUF_INITIALIZER         { 0, 0, 0, 0, 0 }
 
 /* Initialize with a string literal (beware: evaluates str twice!) */
-#define LIT_STRBUF_INITIALIZER(str)     { (char*)str, sizeof(str)-1, 0, 0 }
+#define LIT_STRBUF_INITIALIZER(str)     { (char*)str, (char *)str, sizeof(str)-1, 0, 0 }
 
 
 
@@ -164,6 +171,16 @@ INLINE char* SB_GetBuf (StrBuf* B)
 #  define SB_GetBuf(B)     (B)->Buf
 #endif
 
+#if defined(HAVE_INLINE)
+INLINE char* SB_GetCooked (StrBuf* B)
+/* Return a cooked pointer */
+{
+    return B->Cooked;
+}
+#else
+#  define SB_GetCooked(B)     (B)->Cooked
+#endif
+
 #if defined(HAVE_INLINE)
 INLINE char SB_At (const StrBuf* B, unsigned Index)
 /* Get a character from the buffer */
@@ -310,6 +327,9 @@ void SB_Terminate (StrBuf* B);
 void SB_CopyBuf (StrBuf* Target, const char* Buf, unsigned Size);
 /* Copy Buf to Target, discarding the old contents of Target */
 
+void SB_CopyBufCooked (StrBuf* Target, const char* Buf, const char *Cooked, unsigned Size);
+/* Copy Buf and Cooked to Target, discarding the old contents of Target */
+
 #if defined(HAVE_INLINE)
 INLINE void SB_CopyStr (StrBuf* Target, const char* S)
 /* Copy S to Target, discarding the old contents of Target */
@@ -325,7 +345,7 @@ void SB_CopyStr (StrBuf* Target, const char* S);
 INLINE void SB_Copy (StrBuf* Target, const StrBuf* Source)
 /* Copy Source to Target, discarding the old contents of Target */
 {
-    SB_CopyBuf (Target, Source->Buf, Source->Len);
+    SB_CopyBufCooked (Target, Source->Buf, Source->Cooked, Source->Len);
     Target->Index = Source->Index;
 }
 #else
@@ -336,6 +356,9 @@ void SB_Copy (StrBuf* Target, const StrBuf* Source);
 void SB_AppendChar (StrBuf* B, int C);
 /* Append a character to a string buffer */
 
+void SB_AppendCharCooked (StrBuf* B, int C, int Cooked);
+/* Append a character to a string buffer, raw if Cooked == 0 */
+
 void SB_AppendBuf (StrBuf* B, const char* S, unsigned Size);
 /* Append a character buffer to the end of the string buffer */
 
@@ -354,7 +377,13 @@ void SB_AppendStr (StrBuf* B, const char* S);
 INLINE void SB_Append (StrBuf* Target, const StrBuf* Source)
 /* Append the contents of Source to Target */
 {
-    SB_AppendBuf (Target, Source->Buf, Source->Len);
+    unsigned NewLen = Target->Len + Source->Len;
+    if (NewLen > Target->Allocated) {
+        SB_Realloc (Target, NewLen);
+    }
+    memcpy (Target->Buf + Target->Len, Source->Buf, Source->Len);
+    memcpy (Target->Cooked + Target->Len, Source->Cooked, Source->Len);
+    Target->Len = NewLen;
 }
 #else
 void SB_Append (StrBuf* Target, const StrBuf* Source);
diff --git a/src/common/target.c b/src/common/target.c
index b50478e16..bb67ddf9a 100644
--- a/src/common/target.c
+++ b/src/common/target.c
@@ -37,6 +37,7 @@
 #include <string.h>
 
 /* common */
+#include "attrib.h"
 #include "chartype.h"
 #include "check.h"
 #include "target.h"
@@ -129,7 +130,25 @@ static const unsigned char CTPET[256] = {
     0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
 };
 
-
+/* Translation table KOI8-R -> Agat-9 */
+static unsigned char CTAgat[256] = {
+    0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+    0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+    0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+    0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+    0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+    0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+    0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+    0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0xA0,
+    0x1B,0x5C,0x10,0x12,0x1D,0x1F,0x13,0x1C,0x11,0x1E,0x14,0xA0,0x02,0x5F,0xA0,0xA0,
+    0xA0,0xA0,0xA0,0xA0,0xA0,0x9E,0x04,0xA0,0x3C,0x3E,0xA0,0xA0,0x30,0x32,0xA0,0x2F,
+    0xA0,0xA0,0xA0,0x0F,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,
+    0xA0,0xA0,0xA0,0x9F,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,
+    0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+    0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+    0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+    0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
+};
 
 /* One entry in the target map */
 typedef struct TargetEntry TargetEntry;
@@ -138,10 +157,13 @@ struct TargetEntry {
     target_t    Id;                     /* Target ID */
 };
 
-/* Table that maps target names to IDs. Sorted alphabetically for bsearch().
+/* Table that maps target names to IDs.
 ** Allows multiple entries for one target ID (target name aliases).
+** CAUTION: must be alphabetically for bsearch().
 */
 static const TargetEntry TargetMap[] = {
+/* BEGIN SORTED.SH */
+    {   "agat",         TGT_AGAT         },
     {   "apple2",       TGT_APPLE2       },
     {   "apple2enh",    TGT_APPLE2ENH    },
     {   "atari",        TGT_ATARI        },
@@ -166,6 +188,7 @@ static const TargetEntry TargetMap[] = {
     {   "kim1",         TGT_KIM1         },
     {   "lunix",        TGT_LUNIX        },
     {   "lynx",         TGT_LYNX         },
+    {   "mega65",       TGT_MEGA65,      },
     {   "module",       TGT_MODULE       },
     {   "nes",          TGT_NES          },
     {   "none",         TGT_NONE         },
@@ -180,6 +203,7 @@ static const TargetEntry TargetMap[] = {
     {   "sym1",         TGT_SYM1         },
     {   "telestrat",    TGT_TELESTRAT    },
     {   "vic20",        TGT_VIC20        },
+/* END SORTED.SH */
 };
 #define MAP_ENTRY_COUNT         (sizeof (TargetMap) / sizeof (TargetMap[0]))
 
@@ -221,8 +245,10 @@ static const TargetProperties PropertyTable[TGT_COUNT] = {
     { "c65",            CPU_4510,       BINFMT_BINARY,      CTPET   },
     { "cx16",           CPU_65C02,      BINFMT_BINARY,      CTPET   },
     { "sym1",           CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "mega65",         CPU_45GS02,     BINFMT_BINARY,      CTPET   },
     { "kim1",           CPU_6502,       BINFMT_BINARY,      CTNone  },
-    { "rp6502",         CPU_65C02,      BINFMT_BINARY,      CTNone  },
+    { "rp6502",         CPU_W65C02,     BINFMT_BINARY,      CTNone  },
+    { "agat",           CPU_6502,       BINFMT_BINARY,      CTAgat  },
 };
 
 /* Target system */
@@ -277,3 +303,12 @@ const char* GetTargetName (target_t Target)
     /* Return the array entry */
     return GetTargetProperties (Target)->Name;
 }
+
+
+
+int TargetHasCap (capability_t Cap attribute((unused)))
+/* Check if the current target has the given capability */
+{
+    /* Currently unused */
+    return 0;
+}
diff --git a/src/common/target.h b/src/common/target.h
index 730b8211e..1dfa66ac7 100644
--- a/src/common/target.h
+++ b/src/common/target.h
@@ -39,6 +39,7 @@
 
 
 /* common */
+#include "capability.h"
 #include "cpu.h"
 
 
@@ -87,8 +88,10 @@ typedef enum {
     TGT_C65,
     TGT_CX16,
     TGT_SYM1,
+    TGT_MEGA65,
     TGT_KIM1,
     TGT_RP6502,
+    TGT_AGAT,
     TGT_COUNT                   /* Number of target systems */
 } target_t;
 
@@ -129,6 +132,9 @@ const TargetProperties* GetTargetProperties (target_t Target);
 const char* GetTargetName (target_t Target);
 /* Return the name of a target */
 
+int TargetHasCap (capability_t Cap);
+/* Check if the current target has the given capability */
+
 
 
 /* End of target.h */
diff --git a/src/common/tgttrans.c b/src/common/tgttrans.c
index 3310eab81..3ac41f09e 100644
--- a/src/common/tgttrans.c
+++ b/src/common/tgttrans.c
@@ -121,7 +121,19 @@ void TgtTranslateStrBuf (StrBuf* Buf)
 ** system character set.
 */
 {
-    TgtTranslateBuf (SB_GetBuf (Buf), SB_GetLen (Buf));
+    unsigned char* B = (unsigned char*)SB_GetBuf(Buf);
+    unsigned char* Cooked = (unsigned char*)SB_GetCooked(Buf);
+    unsigned Len = SB_GetLen(Buf);
+
+    /* Translate */
+    while (Len--) {
+        if (*Cooked) {
+            *B = Tab[*B];
+        }
+        /* else { *B = *B; } */
+        ++B;
+        ++Cooked;
+    }
 }
 
 
@@ -129,7 +141,7 @@ void TgtTranslateStrBuf (StrBuf* Buf)
 void TgtTranslateSet (unsigned Index, unsigned char C)
 /* Set the translation code for the given character */
 {
-    CHECK (Index < sizeof (Tab));
+    CHECK (Index < (sizeof (Tab) / sizeof(Tab[0])));
     Tab[Index] = C;
 }
 
diff --git a/src/common/xsprintf.c b/src/common/xsprintf.c
index 556e4f359..aa3183752 100644
--- a/src/common/xsprintf.c
+++ b/src/common/xsprintf.c
@@ -352,8 +352,8 @@ static void StoreOffset (PrintfCtrl* P)
 /* Store the current output offset (%n format spec) */
 {
     switch (P->LengthMod) {
-        case lmChar:     *va_arg (P->ap, int*)       = P->BufFill; break;
-        case lmShort:    *va_arg (P->ap, int*)       = P->BufFill; break;
+        case lmChar:     *va_arg (P->ap, char*)      = (char)P->BufFill; break;
+        case lmShort:    *va_arg (P->ap, short*)     = (short)P->BufFill; break;
         case lmInt:      *va_arg (P->ap, int*)       = P->BufFill; break;
         case lmLong:     *va_arg (P->ap, long*)      = P->BufFill; break;
         case lmIntMax:   *va_arg (P->ap, intmax_t*)  = P->BufFill; break;
diff --git a/src/da65.vcxproj b/src/da65.vcxproj
index a40daf1d6..65dc3fccf 100644
--- a/src/da65.vcxproj
+++ b/src/da65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0BCFB793-2B25-40E2-B265-75848824AC4C}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="da65\asminc.c" />
     <ClCompile Include="da65\attrtab.c" />
@@ -61,12 +94,15 @@
     <ClCompile Include="da65\labels.c" />
     <ClCompile Include="da65\main.c" />
     <ClCompile Include="da65\opc4510.c" />
+    <ClCompile Include="da65\opc45GS02.c" />
     <ClCompile Include="da65\opc6502.c" />
     <ClCompile Include="da65\opc6502x.c" />
     <ClCompile Include="da65\opc6502dtv.c" />
     <ClCompile Include="da65\opc65816.c" />
     <ClCompile Include="da65\opc65c02.c" />
     <ClCompile Include="da65\opc65sc02.c" />
+    <ClCompile Include="da65\opc65ce02.c" />
+    <ClCompile Include="da65\opcw65c02.c" />
     <ClCompile Include="da65\opchuc6280.c" />
     <ClCompile Include="da65\opcm740.c" />
     <ClCompile Include="da65\opctable.c" />
@@ -86,6 +122,7 @@
     <ClInclude Include="da65\infofile.h" />
     <ClInclude Include="da65\labels.h" />
     <ClInclude Include="da65\opc4510.h" />
+    <ClInclude Include="da65\opc45GS02.h" />
     <ClInclude Include="da65\opc6502.h" />
     <ClInclude Include="da65\opc6502x.h" />
     <ClInclude Include="da65\opc6502dtv.h" />
@@ -103,4 +140,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/da65/attrtab.c b/src/da65/attrtab.c
index b70e017a1..1ba694038 100644
--- a/src/da65/attrtab.c
+++ b/src/da65/attrtab.c
@@ -33,6 +33,11 @@
 
 
 
+#include <inttypes.h>
+
+/* common */
+#include "xmalloc.h"
+
 /* da65 */
 #include "cpu.h"
 #include "error.h"
@@ -46,14 +51,78 @@
 
 
 
-/* Attribute table */
-static unsigned short AttrTab[0x10000];
+/* Attribute structure how it is found in the attribute table */
+typedef struct Attribute Attribute;
+struct Attribute {
+    struct Attribute*   Next;           /* Next entry in linked list */
+    uint32_t            Addr;           /* The full address */
+    attr_t              Attr;           /* Actual attribute */
+};
 
-/* 65816 attribute table */
-#define MAX_LONG_ATTRS 256
-static unsigned short LongAttrVal[MAX_LONG_ATTRS];
-static unsigned LongAttrAddr[MAX_LONG_ATTRS];
-static unsigned LongAttrsUsed;
+/* Attributes use a hash table and a linear list for collision resolution. The
+** hash function is easy and effective. It evaluates just the lower bits of
+** the address.
+*/
+#define ATTR_HASH_SIZE          8192u   /* Must be power of two */
+static Attribute* AttributeTab[ATTR_HASH_SIZE];
+
+
+
+/*****************************************************************************/
+/*                             struct Attribute                              */
+/*****************************************************************************/
+
+
+
+static Attribute* NewAttribute (uint32_t Addr, attr_t Attr)
+/* Create a new attribute structure and return it */
+{
+    /* Create a new attribute */
+    Attribute* A = xmalloc (sizeof (Attribute));
+
+    /* Fill in the data */
+    A->Next = 0;
+    A->Addr = Addr;
+    A->Attr = Attr;
+
+    /* Return the attribute just created */
+    return A;
+}
+
+
+
+static uint32_t GetAttributeHash (uint32_t Addr)
+/* Get the hash for an attribute at the given address */
+{
+    return (Addr & (ATTR_HASH_SIZE - 1));
+}
+
+
+
+static Attribute* FindAttribute (uint32_t Addr)
+/* Search for an attribute for the given address and return it. Returns NULL
+** if no attribute exists for the address.
+*/
+{
+    Attribute* A = AttributeTab[GetAttributeHash (Addr)];
+    while (A) {
+        if (A->Addr == Addr) {
+            break;
+        }
+        A = A->Next;
+    }
+    return A;
+}
+
+
+
+static void InsertAttribute (Attribute* A)
+/* Insert an attribute into the hash table */
+{
+    uint32_t Hash = GetAttributeHash (A->Addr);
+    A->Next = AttributeTab[Hash];
+    AttributeTab[Hash] = A;
+}
 
 
 
@@ -63,51 +132,43 @@ static unsigned LongAttrsUsed;
 
 
 
-void AddrCheck (unsigned Addr)
+void AddrCheck (uint32_t Addr)
 /* Check if the given address has a valid range */
 {
     if (Addr >= 0x10000 && CPU != CPU_65816) {
-        Error ("Address out of range: %08X", Addr);
+        Error ("Address out of range: $%04" PRIX32, Addr);
     }
 }
 
 
-unsigned char IsLongAddr (unsigned Addr)
-/* Is it 24-bit? */
-{
-    return Addr >= 0x10000 && CPU == CPU_65816;
-}
 
-
-
-attr_t GetAttr (unsigned Addr)
+attr_t GetAttr (uint32_t Addr)
 /* Return the attribute for the given address */
 {
+    /* As a small optimization we cache the last used attribute so when the
+    ** function is called several times with the same address we do already
+    ** know it.
+    */
+    static const Attribute* A = 0;
+    if (A != 0 && A->Addr == Addr) {
+        return A->Attr;
+    }
+
     /* Check the given address */
     AddrCheck (Addr);
 
-    if (IsLongAddr (Addr)) {
-        unsigned i;
-        for (i = 0; i < LongAttrsUsed; i++) {
-            if (LongAttrAddr[i] == Addr) {
-                return LongAttrVal[i];
-            }
-        }
-
-        return 0;
-    }
-
     /* Return the attribute */
-    return AttrTab[Addr];
+    A = FindAttribute (Addr);
+    return A? A->Attr : atDefault;
 }
 
 
 
-int SegmentDefined (unsigned Start, unsigned End)
+int SegmentDefined (uint32_t Start, uint32_t End)
 /* Return true if the atSegment bit is set somewhere in the given range */
 {
     while (Start <= End) {
-        if (AttrTab[Start++] & atSegment) {
+        if (GetAttr (Start++) & atSegment) {
             return 1;
         }
     }
@@ -116,7 +177,7 @@ int SegmentDefined (unsigned Start, unsigned End)
 
 
 
-int IsSegmentEnd (unsigned Addr)
+int IsSegmentEnd (uint32_t Addr)
 /* Return true if a segment ends at the given address */
 {
     return (GetAttr (Addr) & atSegmentEnd) != 0x0000;
@@ -124,7 +185,7 @@ int IsSegmentEnd (unsigned Addr)
 
 
 
-int IsSegmentStart (unsigned Addr)
+int IsSegmentStart (uint32_t Addr)
 /* Return true if a segment starts at the given address */
 {
     return (GetAttr (Addr) & atSegmentStart) != 0x0000;
@@ -146,17 +207,16 @@ unsigned GetGranularity (attr_t Style)
         case atAddrTab:  return 2;
         case atRtsTab:   return 2;
         case atTextTab:  return 1;
-
-        case atSkip:
+        case atSkip:     return 1;
         default:
-            Internal ("GetGraularity called for style = %d", Style);
+            Internal ("GetGranularity called for style = %d", Style);
             return 0;
     }
 }
 
 
 
-void MarkRange (unsigned Start, unsigned End, attr_t Attr)
+void MarkRange (uint32_t Start, uint32_t End, attr_t Attr)
 /* Mark a range with the given attribute */
 {
     /* Do it easy here... */
@@ -167,53 +227,33 @@ void MarkRange (unsigned Start, unsigned End, attr_t Attr)
 
 
 
-void MarkAddr (unsigned Addr, attr_t Attr)
+void MarkAddr (uint32_t Addr, attr_t Attr)
 /* Mark an address with an attribute */
 {
     /* Check the given address */
     AddrCheck (Addr);
 
-    if (IsLongAddr (Addr)) {
-        unsigned i;
-        for (i = 0; i < LongAttrsUsed; i++) {
-            if (LongAttrAddr[i] == Addr) {
-
-                /* We must not have more than one style bit */
-                if (Attr & atStyleMask) {
-                    if (LongAttrVal[i] & atStyleMask) {
-                        Error ("Duplicate style for long address %06X", Addr);
-                    }
-                }
-                LongAttrVal[i] |= Attr;
-
-                return;
-            }
-        }
-
-        if (LongAttrsUsed >= MAX_LONG_ATTRS) {
-            Error ("Too many long addresses");
-        }
-        LongAttrVal[LongAttrsUsed] |= Attr;
-        LongAttrAddr[LongAttrsUsed] = Addr;
-        LongAttrsUsed++;
-
-        return;
-    }
+    /* Get an existing attribute entry */
+    Attribute* A = FindAttribute (Addr);
 
     /* We must not have more than one style bit */
-    if (Attr & atStyleMask) {
-        if (AttrTab[Addr] & atStyleMask) {
-            Error ("Duplicate style for address %04X", Addr);
+    if (A != 0 && (Attr & atStyleMask) != 0) {
+        if ((A->Attr & atStyleMask) != 0) {
+            Error ("Duplicate style for address %04" PRIX32, Addr);
         }
     }
 
     /* Set the style */
-    AttrTab[Addr] |= Attr;
+    if (A) {
+        A->Attr |= Attr;
+    } else {
+        InsertAttribute (NewAttribute (Addr, Attr));
+    }
 }
 
 
 
-attr_t GetStyleAttr (unsigned Addr)
+attr_t GetStyleAttr (uint32_t Addr)
 /* Return the style attribute for the given address */
 {
     /* Check the given address */
@@ -225,7 +265,7 @@ attr_t GetStyleAttr (unsigned Addr)
 
 
 
-attr_t GetLabelAttr (unsigned Addr)
+attr_t GetLabelAttr (uint32_t Addr)
 /* Return the label attribute for the given address */
 {
     /* Check the given address */
diff --git a/src/da65/attrtab.h b/src/da65/attrtab.h
index 4a0ea8225..ec44fd3b3 100644
--- a/src/da65/attrtab.h
+++ b/src/da65/attrtab.h
@@ -38,6 +38,10 @@
 
 
 
+#include <stdint.h>
+
+
+
 /*****************************************************************************/
 /*                                   Data                                    */
 /*****************************************************************************/
@@ -95,37 +99,37 @@ typedef enum attr_t {
 
 
 
-void AddrCheck (unsigned Addr);
+void AddrCheck (uint32_t Addr);
 /* Check if the given address has a valid range */
 
-unsigned char IsLongAddr (unsigned Addr);
+unsigned char IsLongAddr (uint32_t Addr);
 /* Check if the given address is 24-bit */
 
-attr_t GetAttr (unsigned Addr);
+attr_t GetAttr (uint32_t Addr);
 /* Return the attribute for the given address */
 
-int SegmentDefined (unsigned Start, unsigned End);
+int SegmentDefined (uint32_t Start, unsigned End);
 /* Return true if the atSegment bit is set somewhere in the given range */
 
-int IsSegmentEnd (unsigned Addr);
+int IsSegmentEnd (uint32_t Addr);
 /* Return true if a segment ends at the given address */
 
-int IsSegmentStart (unsigned Addr);
+int IsSegmentStart (uint32_t Addr);
 /* Return true if a segment starts at the given address */
 
 unsigned GetGranularity (attr_t Style);
 /* Get the granularity for the given style */
 
-void MarkRange (unsigned Start, unsigned End, attr_t Attr);
+void MarkRange (uint32_t Start, uint32_t End, attr_t Attr);
 /* Mark a range with the given attribute */
 
-void MarkAddr (unsigned Addr, attr_t Attr);
+void MarkAddr (uint32_t Addr, attr_t Attr);
 /* Mark an address with an attribute */
 
-attr_t GetStyleAttr (unsigned Addr);
+attr_t GetStyleAttr (uint32_t Addr);
 /* Return the style attribute for the given address */
 
-attr_t GetLabelAttr (unsigned Addr);
+attr_t GetLabelAttr (uint32_t Addr);
 /* Return the label attribute for the given address */
 
 
diff --git a/src/da65/code.c b/src/da65/code.c
index a162e6482..6045e83c5 100644
--- a/src/da65/code.c
+++ b/src/da65/code.c
@@ -53,10 +53,10 @@
 
 
 
-unsigned char CodeBuf [0x10000];        /* Code buffer */
-unsigned long CodeStart;                /* Start address */
-unsigned long CodeEnd;                  /* End address */
-unsigned long PC;                       /* Current PC */
+uint8_t CodeBuf[0x10000];               /* Code buffer */
+uint32_t CodeStart;                     /* Start address */
+uint32_t CodeEnd;                       /* End address */
+uint32_t PC;                            /* Current PC */
 
 
 
@@ -117,12 +117,13 @@ void LoadCode (void)
     ** 0x10000 - Size. This is a reasonable default assuming that the file
     ** is a ROM that contains the hardware vectors at $FFFA.
     */
-    if (StartAddr < 0) {
+    if (!HaveStartAddr) {
         if (Size > 0x10000) {
             StartAddr = 0;
         } else {
             StartAddr = 0x10000 - Size;
         }
+        HaveStartAddr = 1;
     }
 
     /* Calculate the maximum code size */
@@ -155,7 +156,7 @@ void LoadCode (void)
 
 
 
-unsigned char GetCodeByte (unsigned Addr)
+uint8_t GetCodeByte (uint32_t Addr)
 /* Get a byte from the given address */
 {
     PRECONDITION (Addr <= CodeEnd);
@@ -164,48 +165,48 @@ unsigned char GetCodeByte (unsigned Addr)
 
 
 
-unsigned GetCodeDByte (unsigned Addr)
+uint16_t GetCodeDByte (uint32_t Addr)
 /* Get a dbyte from the given address */
 {
-    unsigned Lo = GetCodeByte (Addr);
-    unsigned Hi = GetCodeByte (Addr+1);
+    uint16_t Lo = GetCodeByte (Addr);
+    uint16_t Hi = GetCodeByte (Addr+1);
     return (Lo <<8) | Hi;
 }
 
 
 
-unsigned GetCodeWord (unsigned Addr)
+uint16_t GetCodeWord (uint32_t Addr)
 /* Get a word from the given address */
 {
-    unsigned Lo = GetCodeByte (Addr);
-    unsigned Hi = GetCodeByte (Addr+1);
+    uint16_t Lo = GetCodeByte (Addr);
+    uint16_t Hi = GetCodeByte (Addr+1);
     return Lo | (Hi << 8);
 }
 
 
 
-unsigned long GetCodeDWord (unsigned Addr)
+uint32_t GetCodeDWord (uint32_t Addr)
 /* Get a dword from the given address */
 {
-    unsigned long Lo = GetCodeWord (Addr);
-    unsigned long Hi = GetCodeWord (Addr+2);
+    uint32_t Lo = GetCodeWord (Addr);
+    uint32_t Hi = GetCodeWord (Addr+2);
     return Lo | (Hi << 16);
 }
 
 
 
-unsigned GetCodeLongAddr (unsigned Addr)
+uint32_t GetCodeLongAddr (uint32_t Addr)
 /* Get a word from the given address */
 {
-    unsigned Lo = GetCodeByte (Addr);
-    unsigned Mid = GetCodeByte (Addr+1);
-    unsigned Hi = GetCodeByte (Addr+2);
+    uint32_t Lo = GetCodeByte (Addr);
+    uint32_t Mid = GetCodeByte (Addr+1);
+    uint32_t Hi = GetCodeByte (Addr+2);
     return Lo | (Mid << 8) | (Hi << 16);
 }
 
 
 
-unsigned GetRemainingBytes (void)
+uint32_t GetRemainingBytes (void)
 /* Return the number of remaining code bytes */
 {
     if (CodeEnd >= PC) {
diff --git a/src/da65/code.h b/src/da65/code.h
index aa3c6a290..1a4cce2c8 100644
--- a/src/da65/code.h
+++ b/src/da65/code.h
@@ -38,16 +38,20 @@
 
 
 
+#include <stdint.h>
+
+
+
 /*****************************************************************************/
 /*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-extern unsigned char CodeBuf [0x10000];         /* Code buffer */
-extern unsigned long CodeStart;                 /* Start address */
-extern unsigned long CodeEnd;                   /* End address */
-extern unsigned long PC;                        /* Current PC */
+extern uint8_t CodeBuf[0x10000];        /* Code buffer */
+extern uint32_t CodeStart;              /* Start address */
+extern uint32_t CodeEnd;                /* End address */
+extern uint32_t PC;                     /* Current PC */
 
 
 
@@ -60,22 +64,22 @@ extern unsigned long PC;                        /* Current PC */
 void LoadCode (void);
 /* Load the code from the given file */
 
-unsigned char GetCodeByte (unsigned Addr);
+uint8_t GetCodeByte (uint32_t Addr);
 /* Get a byte from the given address */
 
-unsigned GetCodeDByte (unsigned Addr);
+uint16_t GetCodeDByte (uint32_t Addr);
 /* Get a dbyte from the given address */
 
-unsigned GetCodeWord (unsigned Addr);
+uint16_t GetCodeWord (uint32_t Addr);
 /* Get a word from the given address */
 
-unsigned long GetCodeDWord (unsigned Addr);
+uint32_t GetCodeDWord (uint32_t Addr);
 /* Get a dword from the given address */
 
-unsigned GetCodeLongAddr (unsigned Addr);
+uint32_t GetCodeLongAddr (uint32_t Addr);
 /* Get a 24-bit address from the given address */
 
-unsigned GetRemainingBytes (void);
+uint32_t GetRemainingBytes (void);
 /* Return the number of remaining code bytes */
 
 int CodeLeft (void);
diff --git a/src/da65/comments.c b/src/da65/comments.c
index f136ae3d2..f1295d486 100644
--- a/src/da65/comments.c
+++ b/src/da65/comments.c
@@ -33,6 +33,9 @@
 
 
 
+#include <inttypes.h>
+#include <string.h>
+
 /* common */
 #include "xmalloc.h"
 
@@ -49,13 +52,82 @@
 
 
 
-/* Comment table */
-static const char* CommentTab[0x10000];
+/* Comment structure how it is found in the comment table */
+typedef struct Comment Comment;
+struct Comment {
+    struct Comment*     Next;           /* Next entry in linked list */
+    uint32_t            Addr;           /* The full address */
+    char                Text[1];        /* Text, dynamically allocated */
+};
 
-#define MAX_LONG_COMMENTS 256
-static const char* LongCommentVal[MAX_LONG_COMMENTS];
-static unsigned LongCommentAddr[MAX_LONG_COMMENTS];
-static unsigned LongCommentsUsed;
+/* Comments use a hash table and a linear list for collision resolution. The
+** hash function is easy and effective. It evaluates just the lower bits of
+** the address. Since we don't expect many comments, we can keep the table
+** small.
+*/
+#define COMMENT_HASH_SIZE       256u    /* Must be power of two */
+static Comment* CommentTab[COMMENT_HASH_SIZE];
+
+
+
+/*****************************************************************************/
+/*                              struct Comment                               */
+/*****************************************************************************/
+
+
+
+static Comment* NewComment (uint32_t Addr, const char* Text)
+/* Create a new comment structure and return it */
+{
+    /* Get the length of the text */
+    unsigned Len = strlen (Text);
+
+    /* Create a new comment */
+    Comment* C = xmalloc (sizeof (Comment) + Len);
+
+    /* Fill in the data */
+    C->Next = 0;
+    C->Addr = Addr;
+    memcpy (C->Text, Text, Len + 1);
+
+    /* Return the comment just created */
+    return C;
+}
+
+
+
+static uint32_t GetCommentHash (uint32_t Addr)
+/* Get the hash for a comment at the given address */
+{
+    return (Addr & (COMMENT_HASH_SIZE - 1));
+}
+
+
+
+static Comment* FindComment (uint32_t Addr)
+/* Search for a comment for the given address and return it. Returns NULL if
+** no comment exists for the address.
+*/
+{
+    Comment* C = CommentTab[GetCommentHash (Addr)];
+    while (C) {
+        if (C->Addr == Addr) {
+            break;
+        }
+        C = C->Next;
+    }
+    return C;
+}
+
+
+
+static void InsertComment (Comment* C)
+/* Insert a comment into the hash table */
+{
+    uint32_t Hash = GetCommentHash (C->Addr);
+    C->Next = CommentTab[Hash];
+    CommentTab[Hash] = C;
+}
 
 
 
@@ -65,62 +137,30 @@ static unsigned LongCommentsUsed;
 
 
 
-static unsigned FindLongIndex (unsigned Addr)
-{
-    unsigned i;
-    for (i = 0; i < LongCommentsUsed; i++) {
-        if (LongCommentAddr[i] == Addr) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-
-
-void SetComment (unsigned Addr, const char* Comment)
+void SetComment (uint32_t Addr, const char* Text)
 /* Set a comment for the given address */
 {
     /* Check the given address */
     AddrCheck (Addr);
 
-    if (IsLongAddr (Addr)) {
-        if (FindLongIndex (Addr)) {
-            Warning ("Duplicate comment for address $%06X", Addr);
-        } else {
-            if (LongCommentsUsed >= MAX_LONG_COMMENTS) {
-                Error("Too many long-address comments");
-            }
-            LongCommentVal[LongCommentsUsed] = xstrdup (Comment);
-            LongCommentAddr[LongCommentsUsed] = Addr;
-            LongCommentsUsed++;
-        }
+    /* If we do already have a comment, warn and ignore the new one */
+    Comment* C = FindComment (Addr);
+    if (C) {
+        Warning ("Duplicate comment for address $%04" PRIX32, Addr);
     } else {
-        /* If we do already have a comment, warn and ignore the new one */
-        if (CommentTab[Addr]) {
-            Warning ("Duplicate comment for address $%04X", Addr);
-        } else {
-            CommentTab[Addr] = xstrdup (Comment);
-        }
+        InsertComment (NewComment (Addr, Text));
     }
 }
 
 
 
-const char* GetComment (unsigned Addr)
+const char* GetComment (uint32_t Addr)
 /* Return the comment for an address */
 {
     /* Check the given address */
     AddrCheck (Addr);
 
-    if (IsLongAddr (Addr)) {
-        const unsigned i = FindLongIndex (Addr);
-        if (i < LongCommentsUsed) {
-            return LongCommentVal[i];
-        }
-        return NULL;
-    }
-
-    /* Return the label if any */
-    return CommentTab[Addr];
+    /* Check for a comment and return it */
+    const Comment* C = FindComment (Addr);
+    return C? C->Text : 0;
 }
diff --git a/src/da65/comments.h b/src/da65/comments.h
index 1d95111a9..dfa1654ab 100644
--- a/src/da65/comments.h
+++ b/src/da65/comments.h
@@ -38,6 +38,9 @@
 
 
 
+#include <stdint.h>
+
+/* da65 */
 #include "attrtab.h"
 
 
@@ -48,10 +51,10 @@
 
 
 
-void SetComment (unsigned Addr, const char* Comment);
+void SetComment (uint32_t Addr, const char* Text);
 /* Set a comment for the given address */
 
-const char* GetComment (unsigned Addr);
+const char* GetComment (uint32_t Addr);
 /* Return the comment for an address */
 
 
diff --git a/src/da65/data.c b/src/da65/data.c
index f85cd327d..c359e5684 100644
--- a/src/da65/data.c
+++ b/src/da65/data.c
@@ -50,20 +50,20 @@
 
 
 
-static unsigned GetSpan (attr_t Style)
+static uint32_t GetSpan (attr_t Style)
 /* Get the number of bytes for a given style */
 {
     /* Get the number of bytes still available */
-    unsigned RemainingBytes = GetRemainingBytes ();
+    uint32_t RemainingBytes = GetRemainingBytes ();
 
     /* Count how many bytes are available. This number is limited by the
     ** number of remaining bytes, a label, a segment change, or the end of
     ** the given Style attribute.
     */
-    unsigned Count = 1;
+    uint32_t Count = 1;
     while (Count < RemainingBytes) {
         attr_t Attr;
-        if (MustDefLabel(PC+Count)) {
+        if (MustDefLabel (PC+Count)) {
             break;
         }
         Attr = GetAttr (PC+Count);
@@ -85,10 +85,10 @@ static unsigned GetSpan (attr_t Style)
 static unsigned DoTable (attr_t Style, unsigned MemberSize, void (*TableFunc) (unsigned))
 /* Output a table of bytes */
 {
-    unsigned BytesLeft;
+    uint32_t BytesLeft;
 
     /* Count how many bytes may be output. */
-    unsigned Count = GetSpan (Style);
+    uint32_t Count = GetSpan (Style);
 
     /* If the count is less than the member size, print a row of Count data
     ** bytes. We assume here that there is no member with a size that is less
@@ -108,7 +108,7 @@ static unsigned DoTable (attr_t Style, unsigned MemberSize, void (*TableFunc) (u
     while (BytesLeft > 0) {
 
         /* Calculate the number of bytes for the next line */
-        unsigned Chunk = (BytesLeft > BytesPerLine)? BytesPerLine : BytesLeft;
+        uint32_t Chunk = (BytesLeft > BytesPerLine)? BytesPerLine : BytesLeft;
 
         /* Output a line with these bytes */
         TableFunc (Chunk);
@@ -119,7 +119,7 @@ static unsigned DoTable (attr_t Style, unsigned MemberSize, void (*TableFunc) (u
     }
 
     /* If the next line is not the same style, add a separator */
-    if (CodeLeft() && GetStyleAttr (PC) != Style) {
+    if (CodeLeft () && GetStyleAttr (PC) != Style) {
         SeparatorLine ();
     }
 
@@ -129,7 +129,7 @@ static unsigned DoTable (attr_t Style, unsigned MemberSize, void (*TableFunc) (u
 
 
 
-unsigned ByteTable (void)
+uint32_t ByteTable (void)
 /* Output a table of bytes */
 {
     /* Call the low level function */
@@ -138,7 +138,7 @@ unsigned ByteTable (void)
 
 
 
-unsigned DByteTable (void)
+uint32_t DByteTable (void)
 /* Output a table of dbytes */
 {
     /* Call the low level function */
@@ -147,7 +147,7 @@ unsigned DByteTable (void)
 
 
 
-unsigned WordTable (void)
+uint32_t WordTable (void)
 /* Output a table of words */
 {
     /* Call the low level function */
@@ -156,7 +156,7 @@ unsigned WordTable (void)
 
 
 
-unsigned DWordTable (void)
+uint32_t DWordTable (void)
 /* Output a table of double words */
 {
     /* Call the low level function */
@@ -165,18 +165,18 @@ unsigned DWordTable (void)
 
 
 
-unsigned AddrTable (void)
+uint32_t AddrTable (void)
 /* Output a table of addresses */
 {
-    unsigned long BytesLeft = GetRemainingBytes ();
-    unsigned long Start = PC;
+    uint32_t BytesLeft = GetRemainingBytes ();
+    uint32_t Start = PC;
 
     /* Loop while table bytes left and we don't need to create a label at the
     ** current position.
     */
     while (BytesLeft && GetStyleAttr (PC) == atAddrTab) {
 
-        unsigned Addr;
+        uint32_t Addr;
 
         /* If just one byte is left, define it and bail out */
         if (BytesLeft == 1 || GetStyleAttr (PC+1) != atAddrTab) {
@@ -221,7 +221,7 @@ unsigned AddrTable (void)
     }
 
     /* If the next line is not an address table line, add a separator */
-    if (CodeLeft() && GetStyleAttr (PC) != atAddrTab) {
+    if (CodeLeft () && GetStyleAttr (PC) != atAddrTab) {
         SeparatorLine ();
     }
 
@@ -231,18 +231,18 @@ unsigned AddrTable (void)
 
 
 
-unsigned RtsTable (void)
+uint32_t RtsTable (void)
 /* Output a table of RTS addresses (address - 1) */
 {
-    unsigned long BytesLeft = GetRemainingBytes ();
-    unsigned long Start = PC;
+    uint32_t BytesLeft = GetRemainingBytes ();
+    uint32_t Start = PC;
 
     /* Loop while table bytes left and we don't need to create a label at the
     ** current position.
     */
     while (BytesLeft && GetStyleAttr (PC) == atRtsTab) {
 
-        unsigned Addr;
+        uint32_t Addr;
 
         /* If just one byte is left, define it and bail out */
         if (BytesLeft == 1 || GetStyleAttr (PC+1) != atRtsTab) {
@@ -287,7 +287,7 @@ unsigned RtsTable (void)
     }
 
     /* If the next line is not a return address table line, add a separator */
-    if (CodeLeft() && GetStyleAttr (PC) != atRtsTab) {
+    if (CodeLeft () && GetStyleAttr (PC) != atRtsTab) {
         SeparatorLine ();
     }
 
@@ -297,14 +297,14 @@ unsigned RtsTable (void)
 
 
 
-unsigned TextTable (void)
+uint32_t TextTable (void)
 /* Output a table of text messages */
 {
     /* Count how many bytes may be output. */
-    unsigned ByteCount = GetSpan (atTextTab);
+    uint32_t ByteCount = GetSpan (atTextTab);
 
     /* Output as many data bytes lines as needed. */
-    unsigned BytesLeft = ByteCount;
+    uint32_t BytesLeft = ByteCount;
     while (BytesLeft > 0) {
 
         unsigned I;
@@ -312,7 +312,7 @@ unsigned TextTable (void)
         /* Count the number of characters that can be output as such */
         unsigned Count = 0;
         while (Count < BytesLeft && Count < BytesPerLine*4-1) {
-            unsigned char C = GetCodeByte (PC + Count);
+            uint8_t C = GetCodeByte (PC + Count);
             if (C >= 0x20 && C <= 0x7E && C != '\"') {
                 ++Count;
             } else {
@@ -348,7 +348,7 @@ unsigned TextTable (void)
         /* Count the number of bytes that must be output as bytes */
         Count = 0;
         while (Count < BytesLeft && Count < BytesPerLine) {
-            unsigned char C = GetCodeByte (PC + Count);
+            uint8_t C = GetCodeByte (PC + Count);
             if (C < 0x20 || C > 0x7E || C == '\"') {
                 ++Count;
             } else {
@@ -366,7 +366,7 @@ unsigned TextTable (void)
     }
 
     /* If the next line is not a byte table line, add a separator */
-    if (CodeLeft() && GetStyleAttr (PC) != atTextTab) {
+    if (CodeLeft () && GetStyleAttr (PC) != atTextTab) {
         SeparatorLine ();
     }
 
diff --git a/src/da65/data.h b/src/da65/data.h
index 4cec14a03..d9885b780 100644
--- a/src/da65/data.h
+++ b/src/da65/data.h
@@ -44,25 +44,25 @@
 
 
 
-unsigned ByteTable (void);
+uint32_t ByteTable (void);
 /* Output a table of bytes */
 
-unsigned DByteTable (void);
+uint32_t DByteTable (void);
 /* Output a table of dbytes */
 
-unsigned WordTable (void);
+uint32_t WordTable (void);
 /* Output a table of words */
 
-unsigned DWordTable (void);
+uint32_t DWordTable (void);
 /* Output a table of double words */
 
-unsigned AddrTable (void);
+uint32_t AddrTable (void);
 /* Output a table of addresses */
 
-unsigned RtsTable (void);
+uint32_t RtsTable (void);
 /* Output a table of RTS addresses (address - 1) */
 
-unsigned TextTable (void);
+uint32_t TextTable (void);
 /* Output a table of text messages */
 
 
diff --git a/src/da65/global.c b/src/da65/global.c
index e258aecdd..74f70b6fd 100644
--- a/src/da65/global.c
+++ b/src/da65/global.c
@@ -54,11 +54,12 @@ const char CfgExt[]           = ".cfg"; /* Config file extension */
 /* Flags and other command line stuff */
 unsigned char DebugInfo       = 0;      /* Add debug info to the object file */
 unsigned char FormFeeds       = 0;      /* Add form feeds to the output? */
+unsigned char MultiPass       = 0;      /* Run several passes to resolve labels */
 unsigned char UseHexOffs      = 0;      /* Use hexadecimal label offsets */
-unsigned char PassCount       = 2;      /* How many passed do we do? */
 signed char   NewlineAfterJMP = -1;     /* Add a newline after a JMP insn? */
 signed char   NewlineAfterRTS = -1;     /* Add a newline after a RTS insn? */
-long          StartAddr       = -1L;    /* Start/load address of the program */
+unsigned char HaveStartAddr   = 0;      /* Flag for start address given */
+uint32_t      StartAddr       = 0;      /* Start/load address of the program */
 unsigned char SyncLines       = 0;      /* Accept line markers in the info file */
 long          InputOffs       = -1L;    /* Offset into input file */
 long          InputSize       = -1L;    /* Number of bytes to read from input */
diff --git a/src/da65/global.h b/src/da65/global.h
index c85c7a79e..8e3fe90ee 100644
--- a/src/da65/global.h
+++ b/src/da65/global.h
@@ -38,6 +38,10 @@
 
 
 
+#include <stdint.h>
+
+
+
 /*****************************************************************************/
 /*                                   Data                                    */
 /*****************************************************************************/
@@ -55,16 +59,19 @@ extern const char       CfgExt[];       /* Config file extension */
 /* Flags and other command line stuff */
 extern unsigned char    DebugInfo;      /* Add debug info to the object file */
 extern unsigned char    FormFeeds;      /* Add form feeds to the output? */
+extern unsigned char    MultiPass;      /* Run several passes to resolve labels */
 extern unsigned char    UseHexOffs;     /* Use hexadecimal label offsets */
-extern unsigned char    PassCount;      /* How many passed do we do? */
 extern signed char      NewlineAfterJMP;/* Add a newline after a JMP insn? */
 extern signed char      NewlineAfterRTS;/* Add a newline after a RTS insn? */
-extern long             StartAddr;      /* Start/load address of the program */
+extern unsigned char    HaveStartAddr;  /* Flag for start address given */
+extern uint32_t         StartAddr;      /* Start/load address of the program */
 extern unsigned char    SyncLines;      /* Accept line markers in the info file */
 extern long             InputOffs;      /* Offset into input file */
 extern long             InputSize;      /* Number of bytes to read from input */
 
 /* Stuff needed by many routines */
+#define PASS_PREP       1               /* Preparation pass */
+#define PASS_FINAL      2               /* Final pass generating output */
 extern unsigned         Pass;           /* Disassembler pass */
 extern char             Now[128];       /* Current time as string */
 
diff --git a/src/da65/handler.c b/src/da65/handler.c
index 79b3192de..1624e6fd4 100644
--- a/src/da65/handler.c
+++ b/src/da65/handler.c
@@ -33,6 +33,7 @@
 
 
 
+#include <inttypes.h>
 #include <stdarg.h>
 
 /* common */
@@ -47,6 +48,7 @@
 #include "handler.h"
 #include "labels.h"
 #include "opctable.h"
+#include "opc45GS02.h"
 #include "output.h"
 
 
@@ -94,7 +96,7 @@ static void OneLine (const OpcDesc* D, const char* Arg, ...)
 
 
 
-static const char* GetAbsOverride (unsigned Flags, unsigned Addr)
+static const char* GetAbsOverride (unsigned Flags, uint32_t Addr)
 /* If the instruction requires an abs override modifier, return the necessary
 ** string, otherwise return the empty string.
 */
@@ -110,7 +112,7 @@ static const char* GetAbsOverride (unsigned Flags, unsigned Addr)
 
 
 
-static const char* GetAddrArg (unsigned Flags, unsigned Addr)
+static const char* GetAddrArg (unsigned Flags, uint32_t Addr)
 /* Return an address argument - a label if we have one, or the address itself */
 {
     const char* Label = 0;
@@ -122,11 +124,9 @@ static const char* GetAddrArg (unsigned Flags, unsigned Addr)
     } else {
         static char Buf [32];
         if (Addr < 0x100) {
-            xsprintf (Buf, sizeof (Buf), "$%02X", Addr);
-        } else if (Addr < 0x10000) {
-            xsprintf (Buf, sizeof (Buf), "$%04X", Addr);
+            xsprintf (Buf, sizeof (Buf), "$%02" PRIX32, Addr);
         } else {
-            xsprintf (Buf, sizeof (Buf), "$%06X", Addr);
+            xsprintf (Buf, sizeof (Buf), "$%04" PRIX32, Addr);
         }
         return Buf;
     }
@@ -134,7 +134,7 @@ static const char* GetAddrArg (unsigned Flags, unsigned Addr)
 
 
 
-static void GenerateLabel (unsigned Flags, unsigned Addr)
+static void GenerateLabel (unsigned Flags, uint32_t Addr)
 /* Generate a label in pass one if requested */
 {
     /* Generate labels in pass #1, and only if we don't have a label already */
@@ -226,9 +226,85 @@ void OH_Implicit (const OpcDesc* D)
 
 
 
+void OH_Implicit_ea_45GS02 (const OpcDesc* D)
+/* handle disassembling EOM prefixed opcodes, $ea $xx */
+{
+    /* Get byte after EOM */
+    unsigned opc = GetCodeByte (PC+1);
+    static const char *mnemonics[8] = {
+        "ora", "and", "eor", "adc", "sta", "lda", "cmp", "sbc"
+    };
+
+    if ((opc & 0x1f) == 0x12) {
+        unsigned zp = GetCodeByte (PC+2);
+
+        Indent (MCol);
+        Output ("%s", mnemonics[(opc >> 5) & 7]);
+
+        Indent (ACol);
+        Output ("[$%02X],z", zp);
+
+        /* Add the code stuff as comment */
+        LineComment (PC, 3);
+
+        /* End the line */
+        LineFeed ();
+    } else {
+        OH_Implicit (D);
+    }
+}
+
+
+
+void OH_Implicit_42_45GS02 (const OpcDesc* D)
+/* handle disassembling NEG NEG prefixed opcodes, $42 42 ($ea) $xx */
+{
+    /* Get bytes after NEG */
+    unsigned n1 = GetCodeByte (PC+1);
+    unsigned opc = GetCodeByte (PC+2);
+    /* NEG:NEG:NOP (42 42 ea) prefix */
+    static const char *mnemonics[8] = {
+        "orq", "andq", "eorq", "adcq", "stq", "ldq", "cmpq", "sbcq"
+    };
+
+    if (n1 == 0x42) {
+        /* detected 0x42 0x42 */
+        if (opc == 0xea) {
+            /* detected 0x42 0x42 0xea */
+            unsigned opc = GetCodeByte (PC+3);
+            if ((opc & 0x1f) == 0x12) {
+                unsigned zp = GetCodeByte (PC+4);
+
+                Indent (MCol);
+                Output ("%s", mnemonics[(opc >> 5) & 7]);
+
+                Indent (ACol);
+                Output ("[$%02X]", zp); /* with or without ,z ? */
+
+                /* Add the code stuff as comment */
+                LineComment (PC, 5);
+
+                /* End the line */
+                LineFeed ();
+                return;
+            }
+        } else {
+            /* use another table for these */
+            const OpcDesc* NewDesc = &OpcTable_45GS02_extended[opc];
+            NewDesc->Handler (NewDesc);
+            return;
+        }
+    }
+
+    /* no prefix detected */
+    OH_Implicit (D);
+}
+
+
+
 void OH_Immediate (const OpcDesc* D)
 {
-    OneLine (D, "#$%02X", GetCodeByte (PC+1));
+    OneLine (D, "#$%02" PRIX8, GetCodeByte (PC+1));
 }
 
 
@@ -236,9 +312,9 @@ void OH_Immediate (const OpcDesc* D)
 void OH_Immediate65816M (const OpcDesc* D)
 {
     if (GetAttr (PC) & atMem16) {
-        OneLine (D, "#$%04X", GetCodeWord (PC+1));
+        OneLine (D, "#$%04" PRIX16, GetCodeWord (PC+1));
     } else {
-        OneLine (D, "#$%02X", GetCodeByte (PC+1));
+        OneLine (D, "#$%02" PRIX8, GetCodeByte (PC+1));
     }
 }
 
@@ -247,9 +323,9 @@ void OH_Immediate65816M (const OpcDesc* D)
 void OH_Immediate65816X (const OpcDesc* D)
 {
     if (GetAttr (PC) & atIdx16) {
-        OneLine (D, "#$%04X", GetCodeWord (PC+1));
+        OneLine (D, "#$%04" PRIX16, GetCodeWord (PC+1));
     } else {
-        OneLine (D, "#$%02X", GetCodeByte (PC+1));
+        OneLine (D, "#$%02" PRIX8, GetCodeByte (PC+1));
     }
 }
 
@@ -257,7 +333,7 @@ void OH_Immediate65816X (const OpcDesc* D)
 
 void OH_ImmediateWord (const OpcDesc* D)
 {
-    OneLine (D, "#$%04X", GetCodeWord (PC+1));
+    OneLine (D, "#$%04" PRIX16, GetCodeWord (PC+1));
 }
 
 
@@ -265,7 +341,21 @@ void OH_ImmediateWord (const OpcDesc* D)
 void OH_Direct (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
+
+    /* Generate a label in pass 1 */
+    GenerateLabel (D->Flags, Addr);
+
+    /* Output the line */
+    OneLine (D, "%s", GetAddrArg (D->Flags, Addr));
+}
+
+
+
+void OH_Direct_Q (const OpcDesc* D)
+{
+    /* Get the operand */
+    unsigned Addr = GetCodeByte (PC+3);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -279,7 +369,21 @@ void OH_Direct (const OpcDesc* D)
 void OH_DirectX (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
+
+    /* Generate a label in pass 1 */
+    GenerateLabel (D->Flags, Addr);
+
+    /* Output the line */
+    OneLine (D, "%s,x", GetAddrArg (D->Flags, Addr));
+}
+
+
+
+void OH_DirectX_Q (const OpcDesc* D)
+{
+    /* Get the operand */
+    unsigned Addr = GetCodeByte (PC+3);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -293,7 +397,7 @@ void OH_DirectX (const OpcDesc* D)
 void OH_DirectY (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -307,7 +411,21 @@ void OH_DirectY (const OpcDesc* D)
 void OH_Absolute (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeWord (PC+1);
+    uint32_t Addr = GetCodeWord (PC+1);
+
+    /* Generate a label in pass 1 */
+    GenerateLabel (D->Flags, Addr);
+
+    /* Output the line */
+    OneLine (D, "%s%s", GetAbsOverride (D->Flags, Addr), GetAddrArg (D->Flags, Addr));
+}
+
+
+
+void OH_Absolute_Q (const OpcDesc* D)
+{
+    /* Get the operand */
+    unsigned Addr = GetCodeWord (PC+3);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -321,7 +439,21 @@ void OH_Absolute (const OpcDesc* D)
 void OH_AbsoluteX (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeWord (PC+1);
+    uint32_t Addr = GetCodeWord (PC+1);
+
+    /* Generate a label in pass 1 */
+    GenerateLabel (D->Flags, Addr);
+
+    /* Output the line */
+    OneLine (D, "%s%s,x", GetAbsOverride (D->Flags, Addr), GetAddrArg (D->Flags, Addr));
+}
+
+
+
+void OH_AbsoluteX_Q (const OpcDesc* D)
+{
+    /* Get the operand */
+    unsigned Addr = GetCodeWord (PC+3);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -335,7 +467,7 @@ void OH_AbsoluteX (const OpcDesc* D)
 void OH_AbsoluteY (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeWord (PC+1);
+    uint32_t Addr = GetCodeWord (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -349,7 +481,7 @@ void OH_AbsoluteY (const OpcDesc* D)
 void OH_AbsoluteLong (const OpcDesc* D attribute ((unused)))
 {
     /* Get the operand */
-    unsigned Addr = GetCodeLongAddr (PC+1);
+    uint32_t Addr = GetCodeLongAddr (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -363,7 +495,7 @@ void OH_AbsoluteLong (const OpcDesc* D attribute ((unused)))
 void OH_AbsoluteLongX (const OpcDesc* D attribute ((unused)))
 {
     /* Get the operand */
-    unsigned Addr = GetCodeLongAddr (PC+1);
+    uint32_t Addr = GetCodeLongAddr (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -380,17 +512,17 @@ void OH_Relative (const OpcDesc* D)
     signed char Offs = GetCodeByte (PC+1);
 
     /* Calculate the target address */
-    unsigned Addr = (((int) PC+2) + Offs) & 0xFFFF;
+    uint32_t Addr = (((int) PC+2) + Offs) & 0xFFFF;
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
 
     /* Output the line */
-    if (HaveLabel(Addr)) {
+    if (HaveLabel (Addr)) {
         OneLine (D, "%s", GetAddrArg (D->Flags, Addr));
     } else {
         /* No label -- make a relative address expression */
-        OneLine (D, "* + (%d)", (int) Offs + 2);
+        OneLine (D, "*%+d", (int) Offs + 2);
     }
 }
 
@@ -402,7 +534,7 @@ void OH_RelativeLong (const OpcDesc* D attribute ((unused)))
     signed short Offs = GetCodeWord (PC+1);
 
     /* Calculate the target address */
-    unsigned Addr = (((int) PC+3) + Offs) & 0xFFFF;
+    uint32_t Addr = (((int) PC+3) + Offs) & 0xFFFF;
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -419,7 +551,7 @@ void OH_RelativeLong4510 (const OpcDesc* D attribute ((unused)))
     signed short Offs = GetCodeWord (PC+1);
 
     /* Calculate the target address */
-    unsigned Addr = (((int) PC+2) + Offs) & 0xFFFF;
+    uint32_t Addr = (((int) PC+2) + Offs) & 0xFFFF;
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -433,7 +565,7 @@ void OH_RelativeLong4510 (const OpcDesc* D attribute ((unused)))
 void OH_DirectIndirect (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -447,7 +579,7 @@ void OH_DirectIndirect (const OpcDesc* D)
 void OH_DirectIndirectY (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -461,7 +593,21 @@ void OH_DirectIndirectY (const OpcDesc* D)
 void OH_DirectIndirectZ (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
+
+    /* Generate a label in pass 1 */
+    GenerateLabel (D->Flags, Addr);
+
+    /* Output the line */
+    OneLine (D, "(%s),z", GetAddrArg (D->Flags, Addr));
+}
+
+
+
+void OH_DirectIndirectZ_Q (const OpcDesc* D)
+{
+    /* Get the operand */
+    unsigned Addr = GetCodeByte (PC+3);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -475,7 +621,7 @@ void OH_DirectIndirectZ (const OpcDesc* D)
 void OH_DirectXIndirect (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -489,7 +635,7 @@ void OH_DirectXIndirect (const OpcDesc* D)
 void OH_AbsoluteIndirect (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeWord (PC+1);
+    uint32_t Addr = GetCodeWord (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -505,11 +651,11 @@ void OH_BitBranch (const OpcDesc* D)
     char* BranchLabel;
 
     /* Get the operands */
-    unsigned char TestAddr   = GetCodeByte (PC+1);
-    signed char   BranchOffs = GetCodeByte (PC+2);
+    uint32_t TestAddr = GetCodeByte (PC+1);
+    int8_t BranchOffs = GetCodeByte (PC+2);
 
     /* Calculate the target address for the branch */
-    unsigned BranchAddr = (((int) PC+3) + BranchOffs) & 0xFFFF;
+    uint32_t BranchAddr = (((int) PC+3) + BranchOffs) & 0xFFFF;
 
     /* Generate labels in pass 1. The bit branch codes are special in that
     ** they don't really match the remainder of the 6502 instruction set (they
@@ -533,10 +679,32 @@ void OH_BitBranch (const OpcDesc* D)
 
 
 
+void OH_BitBranch_m740 (const OpcDesc* D)
+/* <bit> zp, rel
+** NOTE: currently <bit> is part of the instruction
+*/
+{
+    /* unsigned Bit = GetCodeByte (PC) >> 5; */
+    uint32_t Addr     = GetCodeByte (PC+1);
+    int8_t BranchOffs = (int8_t) GetCodeByte (PC+2);
+
+    /* Calculate the target address for the branch */
+    uint32_t BranchAddr = (((int) PC+3) + BranchOffs) & 0xFFFF;
+
+    /* Generate a label in pass 1 */
+    GenerateLabel (D->Flags, Addr);
+    GenerateLabel (flLabel, BranchAddr);
+
+    /* Output the line */
+    OneLine (D, "%s, %s", GetAddrArg (D->Flags, Addr), GetAddrArg (flLabel, BranchAddr));
+}
+
+
+
 void OH_ImmediateDirect (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+2);
+    uint32_t Addr = GetCodeByte (PC+2);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -550,7 +718,7 @@ void OH_ImmediateDirect (const OpcDesc* D)
 void OH_ImmediateDirectX (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+2);
+    uint32_t Addr = GetCodeByte (PC+2);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -564,7 +732,7 @@ void OH_ImmediateDirectX (const OpcDesc* D)
 void OH_ImmediateAbsolute (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeWord (PC+2);
+    uint32_t Addr = GetCodeWord (PC+2);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -578,7 +746,7 @@ void OH_ImmediateAbsolute (const OpcDesc* D)
 void OH_ImmediateAbsoluteX (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeWord (PC+2);
+    uint32_t Addr = GetCodeWord (PC+2);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -623,7 +791,7 @@ void OH_StackRelativeIndirectY4510 (const OpcDesc* D attribute ((unused)))
 void OH_DirectIndirectLong (const OpcDesc* D attribute ((unused)))
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -637,7 +805,7 @@ void OH_DirectIndirectLong (const OpcDesc* D attribute ((unused)))
 void OH_DirectIndirectLongY (const OpcDesc* D attribute ((unused)))
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -653,9 +821,9 @@ void OH_BlockMove (const OpcDesc* D)
     char* DstLabel;
 
     /* Get source operand */
-    unsigned Src = GetCodeWord (PC+1);
+    uint32_t Src = GetCodeWord (PC+1);
     /* Get destination operand */
-    unsigned Dst = GetCodeWord (PC+3);
+    uint32_t Dst = GetCodeWord (PC+3);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Src);
@@ -668,7 +836,7 @@ void OH_BlockMove (const OpcDesc* D)
     DstLabel = xstrdup (GetAddrArg (D->Flags, Dst));
 
     /* Output the line */
-    OneLine (D, "%s%s,%s%s,$%04X",
+    OneLine (D, "%s%s,%s%s,$%04" PRIX16,
              GetAbsOverride (D->Flags, Src), GetAddrArg (D->Flags, Src),
              GetAbsOverride (D->Flags, Dst), DstLabel,
              GetCodeWord (PC+5));
@@ -681,12 +849,12 @@ void OH_BlockMove (const OpcDesc* D)
 void OH_BlockMove65816 (const OpcDesc* D)
 {
     /* Get source operand */
-    unsigned Src = GetCodeByte (PC+2);
+    uint8_t Src = GetCodeByte (PC+2);
     /* Get destination operand */
-    unsigned Dst = GetCodeByte (PC+1);
+    uint8_t Dst = GetCodeByte (PC+1);
 
     /* Output the line */
-    OneLine (D, "#$%02X, #$%02X", Src, Dst);
+    OneLine (D, "#$%02" PRIX8 ", #$%02" PRIX8, Src, Dst);
 }
 
 
@@ -694,7 +862,7 @@ void OH_BlockMove65816 (const OpcDesc* D)
 void OH_AbsoluteXIndirect (const OpcDesc* D attribute ((unused)))
 {
     /* Get the operand */
-    unsigned Addr = GetCodeWord (PC+1);
+    uint32_t Addr = GetCodeWord (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -708,7 +876,7 @@ void OH_AbsoluteXIndirect (const OpcDesc* D attribute ((unused)))
 void OH_DirectImmediate (const OpcDesc* D)
 {
     /* Get the operand */
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
@@ -720,42 +888,46 @@ void OH_DirectImmediate (const OpcDesc* D)
 
 
 void OH_ZeroPageBit (const OpcDesc* D)
+/* <bit> zp
+** NOTE: currently <bit> is part of the instruction
+*/
 {
-    unsigned Bit = GetCodeByte (PC) >> 5;
-    unsigned Addr = GetCodeByte (PC+1);
+    uint32_t Addr = GetCodeByte (PC+1);
 
     /* Generate a label in pass 1 */
     GenerateLabel (D->Flags, Addr);
 
     /* Output the line */
-    OneLine (D, "%01X,%s", Bit, GetAddrArg (D->Flags, Addr));
+    OneLine (D, "%s", GetAddrArg (D->Flags, Addr));
 }
 
 
 
 void OH_AccumulatorBit (const OpcDesc* D)
+/* <bit> A
+** NOTE: currently <bit> is part of the instruction
+*/
 {
-    unsigned Bit = GetCodeByte (PC) >> 5;
-
     /* Output the line */
-    OneLine (D, "%01X,a", Bit);
+    OneLine (D, "a");
 }
 
 
-
 void OH_AccumulatorBitBranch (const OpcDesc* D)
+/* <bit> A, rel
+** NOTE: currently <bit> is part of the instruction
+*/
 {
-    unsigned Bit = GetCodeByte (PC) >> 5;
-    signed char BranchOffs = GetCodeByte (PC+1);
+    int8_t BranchOffs = GetCodeByte (PC+1);
 
     /* Calculate the target address for the branch */
-    unsigned BranchAddr = (((int) PC+3) + BranchOffs) & 0xFFFF;
+    uint32_t BranchAddr = (((int) PC+3) + BranchOffs) & 0xFFFF;
 
     /* Generate labels in pass 1 */
     GenerateLabel (flLabel, BranchAddr);
 
     /* Output the line */
-    OneLine (D, "%01X,a,%s", Bit, GetAddrArg (flLabel, BranchAddr));
+    OneLine (D, "a, %s", GetAddrArg (flLabel, BranchAddr));
 }
 
 
@@ -770,17 +942,16 @@ void OH_JmpDirectIndirect (const OpcDesc* D)
 }
 
 
-
 void OH_SpecialPage (const OpcDesc* D)
+/* m740 "special page" address mode */
 {
-  /* Get the operand */
-  unsigned Addr = 0xFF00 + GetCodeByte (PC+1);
+    /* Get the operand */
+    uint32_t Addr = 0xFF00 + GetCodeByte (PC+1);
 
-  /* Generate a label in pass 1 */
-  GenerateLabel (D->Flags, Addr);
+    /* Generate a label in pass 1 */
+    GenerateLabel (D->Flags, Addr);
 
-  /* OneLine (D, "$FF%02X", (CodeByte (PC+1)); */
-  OneLine (D, "%s", GetAddrArg (D->Flags, Addr));
+    OneLine (D, "%s", GetAddrArg (D->Flags, Addr));
 }
 
 
@@ -791,7 +962,7 @@ void OH_Rts (const OpcDesc* D)
     if (NewlineAfterRTS) {
         LineFeed ();
     }
-    SeparatorLine();
+    SeparatorLine ();
 }
 
 
@@ -834,16 +1005,13 @@ void OH_JsrAbsolute (const OpcDesc* D)
     unsigned ParamSize = SubroutineParamSize[GetCodeWord (PC+1)];
     OH_Absolute (D);
     if (ParamSize > 0) {
-        unsigned RemainingBytes;
-        unsigned BytesLeft;
+        uint32_t RemainingBytes;
+        uint32_t BytesLeft;
         PC += D->Size;
         RemainingBytes = GetRemainingBytes ();
-        if (RemainingBytes < ParamSize) {
-            ParamSize = RemainingBytes;
-        }
-        BytesLeft = ParamSize;
+        BytesLeft = (RemainingBytes < ParamSize)? RemainingBytes : ParamSize;
         while (BytesLeft > 0) {
-            unsigned Chunk = (BytesLeft > BytesPerLine) ? BytesPerLine : BytesLeft;
+            uint32_t Chunk = (BytesLeft > BytesPerLine) ? BytesPerLine : BytesLeft;
             DataByteLine (Chunk);
             BytesLeft -= Chunk;
             PC        += Chunk;
@@ -854,7 +1022,7 @@ void OH_JsrAbsolute (const OpcDesc* D)
 
 
 
-void SetSubroutineParamSize (unsigned Addr, unsigned Size)
+void SetSubroutineParamSize (uint32_t Addr, unsigned Size)
 {
     SubroutineParamSize[Addr] = Size;
 }
diff --git a/src/da65/handler.h b/src/da65/handler.h
index ee9b18bbc..91c1562cd 100644
--- a/src/da65/handler.h
+++ b/src/da65/handler.h
@@ -38,6 +38,8 @@
 
 
 
+#include <stdint.h>
+
 /* common */
 #include "attrib.h"
 
@@ -78,6 +80,7 @@ void OH_DirectXIndirect (const OpcDesc*);
 void OH_AbsoluteIndirect (const OpcDesc*);
 
 void OH_BitBranch (const OpcDesc*);
+void OH_BitBranch_m740 (const OpcDesc*);
 
 void OH_ImmediateDirect (const OpcDesc*);
 void OH_ImmediateDirectX (const OpcDesc*);
@@ -102,6 +105,15 @@ void OH_AccumulatorBitBranch (const OpcDesc*);
 void OH_JmpDirectIndirect (const OpcDesc* D);
 void OH_SpecialPage (const OpcDesc*);
 
+/* 45GS02 */
+void OH_Direct_Q (const OpcDesc*);
+void OH_DirectIndirectZ_Q (const OpcDesc* D);
+void OH_Absolute_Q (const OpcDesc* D);
+void OH_AbsoluteX_Q (const OpcDesc* D);
+void OH_DirectX_Q (const OpcDesc* D);
+void OH_Implicit_ea_45GS02 (const OpcDesc* D);
+void OH_Implicit_42_45GS02 (const OpcDesc* D);
+
 /* Handlers for special instructions */
 void OH_Rts (const OpcDesc*);
 void OH_JmpAbsolute (const OpcDesc*);
@@ -109,7 +121,7 @@ void OH_JmpAbsoluteIndirect (const OpcDesc* D);
 void OH_JmpAbsoluteXIndirect (const OpcDesc* D);
 void OH_JsrAbsolute (const OpcDesc*);
 
-void SetSubroutineParamSize (unsigned Addr, unsigned Size);
+void SetSubroutineParamSize (uint32_t Addr, unsigned Size);
 
 
 /* End of handler.h */
diff --git a/src/da65/infofile.c b/src/da65/infofile.c
index fbf367cc9..bfbd3eb66 100644
--- a/src/da65/infofile.c
+++ b/src/da65/infofile.c
@@ -219,7 +219,7 @@ static void GlobalSection (void)
             case INFOTOK_ARGUMENT_COLUMN:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (MIN_ACOL, MAX_ACOL);
+                InfoRangeCheck ("ARGUMENTCOLUMN", MIN_ACOL, MAX_ACOL);
                 ACol = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -227,7 +227,7 @@ static void GlobalSection (void)
             case INFOTOK_COMMENT_COLUMN:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (MIN_CCOL, MAX_CCOL);
+                InfoRangeCheck ("COMMENTCOLUMN", MIN_CCOL, MAX_CCOL);
                 CCol = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -235,7 +235,7 @@ static void GlobalSection (void)
             case INFOTOK_COMMENTS:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (MIN_COMMENTS, MAX_COMMENTS);
+                InfoRangeCheck ("COMMENTS", MIN_COMMENTS, MAX_COMMENTS);
                 Comments = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -281,7 +281,7 @@ static void GlobalSection (void)
             case INFOTOK_INPUTSIZE:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (1, 0x10000);
+                InfoRangeCheck ("INPUTSIZE", 1, 0x10000);
                 InputSize = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -289,7 +289,7 @@ static void GlobalSection (void)
             case INFOTOK_LABELBREAK:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (0, UCHAR_MAX);
+                InfoRangeCheck ("LABELBREAK", 0, UCHAR_MAX);
                 LBreak = (unsigned char) InfoIVal;
                 InfoNextTok ();
                 break;
@@ -297,7 +297,7 @@ static void GlobalSection (void)
             case INFOTOK_MNEMONIC_COLUMN:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (MIN_MCOL, MAX_MCOL);
+                InfoRangeCheck ("MNEMONICCOLUMN", MIN_MCOL, MAX_MCOL);
                 MCol = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -336,7 +336,7 @@ static void GlobalSection (void)
                 InfoNextTok ();
                 InfoAssureInt ();
                 if (InfoIVal != 0) {
-                    InfoRangeCheck (MIN_PAGE_LEN, MAX_PAGE_LEN);
+                    InfoRangeCheck ("PAGELENGTH", MIN_PAGE_LEN, MAX_PAGE_LEN);
                 }
                 PageLength = InfoIVal;
                 InfoNextTok ();
@@ -345,15 +345,16 @@ static void GlobalSection (void)
             case INFOTOK_STARTADDR:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (0x0000, 0xFFFF);
+                InfoRangeCheck ("STARTADDR", 0x0000, 0xFFFF);
                 StartAddr = InfoIVal;
+                HaveStartAddr = 1;
                 InfoNextTok ();
                 break;
 
             case INFOTOK_TEXT_COLUMN:
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (MIN_TCOL, MAX_TCOL);
+                InfoRangeCheck ("TEXTCOLUMN", MIN_TCOL, MAX_TCOL);
                 TCol = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -413,7 +414,7 @@ static void LabelSection (void)
                     InfoError ("Value already given");
                 }
                 InfoAssureInt ();
-                InfoRangeCheck (0, 0xFFFF);
+                InfoRangeCheck ("ADDR", 0, 0xFFFF);
                 Value = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -447,7 +448,7 @@ static void LabelSection (void)
                     InfoError ("Size already given");
                 }
                 InfoAssureInt ();
-                InfoRangeCheck (1, 0x10000);
+                InfoRangeCheck ("SIZE", 1, 0x10000);
                 Size = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -458,7 +459,7 @@ static void LabelSection (void)
                     InfoError ("ParamSize already given");
                 }
                 InfoAssureInt ();
-                InfoRangeCheck (1, 0x10000);
+                InfoRangeCheck ("PARAMSIZE", 1, 0x10000);
                 ParamSize = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -554,13 +555,13 @@ static void RangeSection (void)
         tComment  = 0x10,
         tAddrMode = 0x20,
         tUnit     = 0x40,
-        tNeeded = (tStart | tEnd | tType)
+        tNeeded   = (tStart | tEnd | tType)
     };
     unsigned Attributes = tNone;
 
     /* Locals - initialize to avoid gcc warnings */
-    unsigned Start      = 0;
-    unsigned End        = 0;
+    uint32_t Start      = 0;
+    uint32_t End        = 0;
     unsigned char Type  = 0;
     unsigned AddrMode   = 0;
     char* Name          = 0;
@@ -599,17 +600,18 @@ static void RangeSection (void)
             case INFOTOK_END:
                 AddAttr ("END", &Attributes, tEnd);
                 InfoNextTok ();
-
                 if (InfoTok == INFOTOK_OFFSET_INTCON) {
-                    InfoRangeCheck (0x0000, 0xFFFF);
-                    if (!(Attributes & tStart))
+                    InfoRangeCheck ("END", 0x0000, 0xFFFF);
+                    if ((Attributes & tStart) == 0) {
                         InfoError ("When using End with an offset, Start must be specified before");
+                    }
                     End = Start + InfoIVal - 1;
-                    if (End > 0xFFFF)
+                    if (End > 0xFFFF) {
                         InfoError ("Range error");
+                    }
                 } else {
                     InfoAssureInt ();
-                    InfoRangeCheck (0x0000, 0xFFFF);
+                    InfoRangeCheck ("END", 0x0000, 0xFFFF);
                     End = InfoIVal;
                 }
                 InfoNextTok ();
@@ -631,7 +633,7 @@ static void RangeSection (void)
                 AddAttr ("START", &Attributes, tStart);
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (0x0000, 0xFFFF);
+                InfoRangeCheck ("START", 0x0000, 0xFFFF);
                 Start = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -664,7 +666,7 @@ static void RangeSection (void)
                 if (InfoSVal[1] == '\0') {
                     InfoError ("AddrMode must be two characters long");
                 }
-                if (tolower(InfoSVal[0]) == 'm') {
+                if (tolower (InfoSVal[0]) == 'm') {
                     if (InfoSVal[0] == 'm') {
                         AddrMode = atMem16;
                     } else {
@@ -673,7 +675,7 @@ static void RangeSection (void)
                 } else {
                     InfoError ("AddrMode syntax: mx");
                 }
-                if (tolower(InfoSVal[1]) == 'x') {
+                if (tolower (InfoSVal[1]) == 'x') {
                     if (InfoSVal[1] == 'x') {
                         AddrMode |= atIdx16;
                     } else {
@@ -689,7 +691,7 @@ static void RangeSection (void)
                 AddAttr ("UNIT", &Attributes, tUnit);
                 InfoNextTok ();
                 InfoAssureInt ();
-                InfoRangeCheck (0x0002, 0xFFFF);
+                InfoRangeCheck ("UNIT", 0x0002, 0xFFFF);
                 Unit = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -733,7 +735,7 @@ static void RangeSection (void)
     if (Attributes & tUnit) {
         unsigned i;
         for (i = Start; i < End; i += Unit) {
-            MarkAddr(i, atTableUnit);
+            MarkAddr (i, atTableUnit);
         }
     }
 
@@ -807,7 +809,7 @@ static void SegmentSection (void)
                     InfoError ("Value already given");
                 }
                 InfoAssureInt ();
-                InfoRangeCheck (0, 0xFFFF);
+                InfoRangeCheck ("END", 0, 0xFFFF);
                 End = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -828,7 +830,7 @@ static void SegmentSection (void)
                     InfoError ("Value already given");
                 }
                 InfoAssureInt ();
-                InfoRangeCheck (0, 0xFFFF);
+                InfoRangeCheck ("START", 0, 0xFFFF);
                 Start = InfoIVal;
                 InfoNextTok ();
                 break;
@@ -926,7 +928,7 @@ void ReadInfoFile (void)
 /* Read the info file */
 {
     /* Check if we have a info file given */
-    if (InfoAvail()) {
+    if (InfoAvail ()) {
         /* Open the config file */
         InfoOpenInput ();
 
diff --git a/src/da65/labels.c b/src/da65/labels.c
index 4cae0316a..a2c027705 100644
--- a/src/da65/labels.c
+++ b/src/da65/labels.c
@@ -33,15 +33,17 @@
 
 
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
 
 /* common */
+#include "coll.h"
+#include "strbuf.h"
 #include "xmalloc.h"
 #include "xsprintf.h"
 
 /* da65 */
-#include "attrtab.h"
 #include "code.h"
 #include "comments.h"
 #include "error.h"
@@ -57,14 +59,85 @@
 
 
 
-/* Symbol table */
-static const char* SymTab[0x10000];
+/* Label structure how it is found in the label table */
+typedef struct Label Label;
+struct Label {
+    struct Label*       Next;           /* Next entry in linked list */
+    uint32_t            Addr;           /* The full address */
+    char                Name[1];        /* Symbol name, dynamically allocated */
+};
 
-/* 65816 symbol table */
-#define MAX_LONG_LABELS 256
-static const char* LongSymVal[MAX_LONG_LABELS];
-static unsigned LongSymAddr[MAX_LONG_LABELS];
-static unsigned LongLabelsUsed;
+/* Labels use a hash table and a linear list for collision resolution. The
+** hash function is easy and effective. It evaluates just the lower bits of
+** the address.
+*/
+#define LABEL_HASH_SIZE         4096u   /* Must be power of two */
+static Label* LabelTab[LABEL_HASH_SIZE];
+
+/* Total number of labels */
+static unsigned long LabelCount = 0;
+
+
+
+/*****************************************************************************/
+/*                               struct Label                                */
+/*****************************************************************************/
+
+
+
+static Label* NewLabel (uint32_t Addr, const char* Name)
+/* Create a new label structure and return it */
+{
+    /* Get the length of the name */
+    unsigned Len = strlen (Name);
+
+    /* Create a new label */
+    Label* L = xmalloc (sizeof (Label) + Len);
+
+    /* Fill in the data */
+    L->Next = 0;
+    L->Addr = Addr;
+    memcpy (L->Name, Name, Len + 1);
+
+    /* Return the label just created */
+    return L;
+}
+
+
+
+static uint32_t GetLabelHash (uint32_t Addr)
+/* Get the hash for a label at the given address */
+{
+    return (Addr & (LABEL_HASH_SIZE - 1));
+}
+
+
+
+static Label* FindLabel (uint32_t Addr)
+/* Search for a label for the given address and return it. Returns NULL if
+** no label exists for the address.
+*/
+{
+    Label* L = LabelTab[GetLabelHash (Addr)];
+    while (L) {
+        if (L->Addr == Addr) {
+            break;
+        }
+        L = L->Next;
+    }
+    return L;
+}
+
+
+
+static void InsertLabel (Label* L)
+/* Insert a label into the tables */
+{
+    /* Insert into hash table */
+    uint32_t Hash = GetLabelHash (L->Addr);
+    L->Next = LabelTab[Hash];
+    LabelTab[Hash] = L;
+}
 
 
 
@@ -74,34 +147,19 @@ static unsigned LongLabelsUsed;
 
 
 
-static const char* MakeLabelName (unsigned Addr)
+static const char* MakeLabelName (uint32_t Addr)
 /* Make the default label name from the given address and return it in a
 ** static buffer.
 */
 {
     static char LabelBuf [32];
-    xsprintf (LabelBuf, sizeof (LabelBuf),
-              IsLongAddr (Addr) ? "L%06X" : "L%04X", Addr);
+    xsprintf (LabelBuf, sizeof (LabelBuf), "L%04" PRIX32, Addr);
     return LabelBuf;
 }
 
 
 
-static unsigned FindLongIndex (unsigned Addr)
-{
-    unsigned i;
-    for (i = 0; i < LongLabelsUsed; i++) {
-        if (LongSymAddr[i] == Addr) {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-
-
-static void AddLabel (unsigned Addr, attr_t Attr, const char* Name)
+static void AddLabel (uint32_t Addr, attr_t Attr, const char* Name)
 /* Add a label */
 {
     /* Get an existing label attribute */
@@ -109,52 +167,37 @@ static void AddLabel (unsigned Addr, attr_t Attr, const char* Name)
 
     /* Must not have two symbols for one address */
     if (ExistingAttr != atNoLabel) {
-        /* Allow redefinition if identical. Beware: Unnamed labels don't
-        ** have a name (you guessed that, didn't you?).
+        /* Allow redefinition if identical. Beware: Unnamed labels do not
+        ** have an entry in the label table.
         */
-        if (IsLongAddr (Addr)) {
-            const unsigned i = FindLongIndex (Addr);
-            if (ExistingAttr == Attr &&
-                ((Name == 0 && LongSymVal[i] == 0) ||
-                 (Name != 0 && LongSymVal[i] != 0 &&
-                 strcmp (LongSymVal[i], Name) == 0))) {
-                return;
-            }
-            Error ("Duplicate label for address $%06X (%s): '%s'", Addr,
-                   LongSymVal[i] == 0 ? "<unnamed label>" : LongSymVal[i],
-                   Name == 0 ? "<unnamed label>" : Name);
-        } else {
-            if (ExistingAttr == Attr &&
-                ((Name == 0 && SymTab[Addr] == 0) ||
-                 (Name != 0 && SymTab[Addr] != 0 &&
-                 strcmp (SymTab[Addr], Name) == 0))) {
-                return;
-            }
-            Error ("Duplicate label for address $%04X (%s): '%s'", Addr,
-                   SymTab[Addr] == 0 ? "<unnamed label>" : SymTab[Addr],
-                   Name == 0 ? "<unnamed label>" : Name);
+        Label* L = FindLabel (Addr);
+        if (ExistingAttr == Attr &&
+            ((Name == 0 && L == 0) ||
+             (Name != 0 && L != 0 && strcmp (Name, L->Name) == 0))) {
+            return;
         }
+        Error ("Duplicate label for address $%04X (%s): '%s'", Addr,
+               L? L->Name : "<unnamed label>",
+               Name? Name : "<unnamed label>");
     }
 
-    /* Create a new label (xstrdup will return NULL if input NULL) */
-    if (IsLongAddr (Addr)) {
-        if (LongLabelsUsed >= MAX_LONG_LABELS) {
-            Error ("Too many long labels");
-        }
-        LongSymAddr[LongLabelsUsed] = Addr;
-        LongSymVal[LongLabelsUsed] = xstrdup (Name);
-        LongLabelsUsed++;
-    } else {
-        SymTab[Addr] = xstrdup (Name);
+    /* If this is not an unnamed label, create a new label entry and
+    ** insert it.
+    */
+    if (Name != 0) {
+        InsertLabel (NewLabel (Addr, Name));
     }
 
     /* Remember the attribute */
     MarkAddr (Addr, Attr);
+
+    /* Count labels */
+    ++LabelCount;
 }
 
 
 
-void AddIntLabel (unsigned Addr)
+void AddIntLabel (uint32_t Addr)
 /* Add an internal label using the address to generate the name. */
 {
     AddLabel (Addr, atIntLabel, MakeLabelName (Addr));
@@ -162,7 +205,7 @@ void AddIntLabel (unsigned Addr)
 
 
 
-void AddExtLabel (unsigned Addr, const char* Name)
+void AddExtLabel (uint32_t Addr, const char* Name)
 /* Add an external label */
 {
     AddLabel (Addr, atExtLabel, Name);
@@ -170,7 +213,7 @@ void AddExtLabel (unsigned Addr, const char* Name)
 
 
 
-void AddUnnamedLabel (unsigned Addr)
+void AddUnnamedLabel (uint32_t Addr)
 /* Add an unnamed label */
 {
     AddLabel (Addr, atUnnamedLabel, 0);
@@ -178,11 +221,27 @@ void AddUnnamedLabel (unsigned Addr)
 
 
 
-void AddDepLabel (unsigned Addr, attr_t Attr, const char* BaseName, unsigned Offs)
+void AddDepLabel (uint32_t Addr, attr_t Attr, const char* BaseName, unsigned Offs)
 /* Add a dependent label at the given address using "basename+Offs" as the new
 ** name.
 */
 {
+    /* Create the new name in the buffer */
+    StrBuf Name = AUTO_STRBUF_INITIALIZER;
+    if (UseHexOffs) {
+        SB_Printf (&Name, "%s+$%02X", BaseName, Offs);
+    } else {
+        SB_Printf (&Name, "%s+%u", BaseName, Offs);
+    }
+
+    /* Define the labels */
+    AddLabel (Addr, Attr | atDepLabel, SB_GetConstBuf (&Name));
+
+    /* Free the name buffer */
+    SB_Done (&Name);
+
+
+
     /* Allocate memory for the dependent label name */
     unsigned NameLen = strlen (BaseName);
     char*    DepName = xmalloc (NameLen + 7);   /* "+$ABCD\0" */
@@ -203,7 +262,7 @@ void AddDepLabel (unsigned Addr, attr_t Attr, const char* BaseName, unsigned Off
 
 
 
-static void AddLabelRange (unsigned Addr, attr_t Attr,
+static void AddLabelRange (uint32_t Addr, attr_t Attr,
                            const char* Name, unsigned Count)
 /* Add a label for a range. The first entry gets the label "Name" while the
 ** others get "Name+offs".
@@ -241,7 +300,7 @@ static void AddLabelRange (unsigned Addr, attr_t Attr,
 
 
 
-void AddIntLabelRange (unsigned Addr, const char* Name, unsigned Count)
+void AddIntLabelRange (uint32_t Addr, const char* Name, unsigned Count)
 /* Add an internal label for a range. The first entry gets the label "Name"
 ** while the others get "Name+offs".
 */
@@ -252,7 +311,7 @@ void AddIntLabelRange (unsigned Addr, const char* Name, unsigned Count)
 
 
 
-void AddExtLabelRange (unsigned Addr, const char* Name, unsigned Count)
+void AddExtLabelRange (uint32_t Addr, const char* Name, unsigned Count)
 /* Add an external label for a range. The first entry gets the label "Name"
 ** while the others get "Name+offs".
 */
@@ -263,7 +322,7 @@ void AddExtLabelRange (unsigned Addr, const char* Name, unsigned Count)
 
 
 
-int HaveLabel (unsigned Addr)
+int HaveLabel (uint32_t Addr)
 /* Check if there is a label for the given address */
 {
     /* Check for a label */
@@ -272,7 +331,7 @@ int HaveLabel (unsigned Addr)
 
 
 
-int MustDefLabel (unsigned Addr)
+int MustDefLabel (uint32_t Addr)
 /* Return true if we must define a label for this address, that is, if there
 ** is a label at this address, and it is an external or internal label.
 */
@@ -286,7 +345,7 @@ int MustDefLabel (unsigned Addr)
 
 
 
-const char* GetLabelName (unsigned Addr)
+const char* GetLabelName (uint32_t Addr)
 /* Return the label name for an address */
 {
     /* Get the label attribute */
@@ -297,19 +356,16 @@ const char* GetLabelName (unsigned Addr)
     */
     if (A == atUnnamedLabel) {
         return "";
-    } else if (IsLongAddr (Addr)) {
-        /* Return the label if any */
-        const unsigned i = FindLongIndex (Addr);
-        return i < LongLabelsUsed ? LongSymVal[i] : NULL;
     } else {
         /* Return the label if any */
-        return SymTab[Addr];
+        const Label* L = FindLabel (Addr);
+        return L? L->Name : 0;
     }
 }
 
 
 
-const char* GetLabel (unsigned Addr, unsigned RefFrom)
+const char* GetLabel (uint32_t Addr, uint32_t RefFrom)
 /* Return the label name for an address, as it is used in a label reference.
 ** RefFrom is the address the label is referenced from. This is needed in case
 ** of unnamed labels, to determine the name.
@@ -339,7 +395,7 @@ const char* GetLabel (unsigned Addr, unsigned RefFrom)
         */
         if (Addr <= RefFrom) {
             /* Search backwards */
-            unsigned I = RefFrom;
+            uint32_t I = RefFrom;
             while (Addr < I) {
                 --I;
                 A = GetLabelAttr (I);
@@ -357,7 +413,7 @@ const char* GetLabel (unsigned Addr, unsigned RefFrom)
 
         } else {
             /* Search forwards */
-            unsigned I = RefFrom;
+            uint32_t I = RefFrom;
             while (Addr > I) {
                 ++I;
                 A = GetLabelAttr (I);
@@ -373,26 +429,22 @@ const char* GetLabel (unsigned Addr, unsigned RefFrom)
             /* Return the label name */
             return FwdLabels[Count-1];
         }
-
-    } else if (IsLongAddr (Addr)) {
-        /* Return the label if any */
-        const unsigned i = FindLongIndex (Addr);
-        return i < LongLabelsUsed ? LongSymVal[i] : NULL;
     } else {
         /* Return the label if any */
-        return SymTab[Addr];
+        const Label* L = FindLabel (Addr);
+        return L? L->Name : 0;
     }
 }
 
 
 
-void ForwardLabel (unsigned Offs)
+void ForwardLabel (uint32_t Offs)
 /* If necessary, output a forward label, one that is within the next few
 ** bytes and is therefore output as "label = * + x".
 */
 {
     /* Calculate the actual address */
-    unsigned long Addr = PC + Offs;
+    uint32_t Addr = PC + Offs;
 
     /* Get the type of the label */
     attr_t A = GetLabelAttr (Addr);
@@ -406,7 +458,7 @@ void ForwardLabel (unsigned Offs)
     ** an error.
     */
     if (A == atUnnamedLabel) {
-        Error ("Cannot define unnamed label at address $%04lX", Addr);
+        Error ("Cannot define unnamed label at address $%04" PRIX32, Addr);
     }
 
     /* Output the label */
@@ -415,24 +467,33 @@ void ForwardLabel (unsigned Offs)
 
 
 
-static void DefOutOfRangeLabel (unsigned long Addr)
+static int CompareLabels (void* Data attribute ((unused)),
+                          const void* L1, const void* L2)
+/* Compare functions for sorting the out-of-range labels */
+{
+    if (((const Label*) L1)->Addr < ((const Label*) L2)->Addr) {
+        return -1;
+    } else if (((const Label*) L1)->Addr > ((const Label*) L2)->Addr) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+
+
+static void DefOutOfRangeLabel (const Label* L)
 /* Define one label that is outside code range. */
 {
-    switch (GetLabelAttr (Addr)) {
+    switch (GetLabelAttr (L->Addr)) {
 
         case atIntLabel:
         case atExtLabel:
-            if (IsLongAddr (Addr)) {
-                const unsigned i = FindLongIndex (Addr);
-                DefConst (i < LongLabelsUsed ? LongSymVal[i] : NULL,
-                          GetComment (Addr), Addr);
-            } else {
-                DefConst (SymTab[Addr], GetComment (Addr), Addr);
-            }
+            DefConst (L->Name, GetComment (L->Addr), L->Addr);
             break;
 
         case atUnnamedLabel:
-            Error ("Cannot define unnamed label at address $%04lX", Addr);
+            Error ("Cannot define unnamed label at address $%04" PRIX32, L->Addr);
             break;
 
         default:
@@ -446,34 +507,48 @@ static void DefOutOfRangeLabel (unsigned long Addr)
 void DefOutOfRangeLabels (void)
 /* Output any labels that are out of the loaded code range */
 {
-    unsigned long Addr;
-    unsigned i;
+    unsigned I;
 
-    SeparatorLine ();
+    /* This requires somewhat more effort since the labels output should be
+    ** sorted by address for better readability. This is not directly
+    ** possible when using a hash table, so an intermediate data structure
+    ** is required. It is not possible to collect out-of-range labels while
+    ** generating them, since they may come from an info file and are added
+    ** while no input file was read. Which means it cannot be determined at
+    ** that point if they're out-of-range or not.
+    */
+    Collection Labels = AUTO_COLLECTION_INITIALIZER;
+    CollGrow (&Labels, 128);
 
-    /* Low range */
-    Addr = 0;
-    while (Addr < CodeStart) {
-        DefOutOfRangeLabel (Addr++);
-    }
-
-    /* Skip areas in code range */
-    while (Addr <= CodeEnd) {
-        if (GetStyleAttr (Addr) == atSkip) {
-            DefOutOfRangeLabel (Addr);
+    /* Walk over the hash and copy all out-of-range labels */
+    for (I = 0; I < LABEL_HASH_SIZE; ++I) {
+        Label* L = LabelTab[I];
+        while (L) {
+            if (L->Addr < CodeStart || L->Addr > CodeEnd) {
+                CollAppend (&Labels, L);
+            }
+            L = L->Next;
         }
-        ++Addr;
     }
 
-    /* High range */
-    while (Addr < 0x10000) {
-        DefOutOfRangeLabel (Addr++);
-    }
-
-    /* 65816 long range */
-    for (i = 0; i < LongLabelsUsed; i++) {
-        DefOutOfRangeLabel (LongSymAddr[i]);
-    }
+    /* Sort the out-of-range labels by address */
+    CollSort (&Labels, CompareLabels, 0);
 
+    /* Output the labels */
     SeparatorLine ();
+    for (I = 0; I < CollCount (&Labels); ++I) {
+        DefOutOfRangeLabel (CollConstAt (&Labels, I));
+    }
+    SeparatorLine ();
+
+    /* Free allocated storage */
+    DoneCollection (&Labels);
+}
+
+
+
+unsigned long GetLabelCount (void)
+/* Return the total number of labels defined so far */
+{
+    return LabelCount;
 }
diff --git a/src/da65/labels.h b/src/da65/labels.h
index c4b52774a..923a4bd43 100644
--- a/src/da65/labels.h
+++ b/src/da65/labels.h
@@ -38,6 +38,9 @@
 
 
 
+#include <stdint.h>
+
+/* da65 */
 #include "attrtab.h"
 
 
@@ -48,42 +51,42 @@
 
 
 
-void AddIntLabel (unsigned Addr);
+void AddIntLabel (uint32_t Addr);
 /* Add an internal label using the address to generate the name. */
 
-void AddExtLabel (unsigned Addr, const char* Name);
+void AddExtLabel (uint32_t Addr, const char* Name);
 /* Add an external label */
 
-void AddUnnamedLabel (unsigned Addr);
+void AddUnnamedLabel (uint32_t Addr);
 /* Add an unnamed label */
 
-void AddDepLabel (unsigned Addr, attr_t Attr, const char* BaseName, unsigned Offs);
+void AddDepLabel (uint32_t Addr, attr_t Attr, const char* BaseName, unsigned Offs);
 /* Add a dependent label at the given address using "base name+Offs" as the new
 ** name.
 */
 
-void AddIntLabelRange (unsigned Addr, const char* Name, unsigned Count);
+void AddIntLabelRange (uint32_t Addr, const char* Name, unsigned Count);
 /* Add an internal label for a range. The first entry gets the label "Name"
 ** while the others get "Name+offs".
 */
 
-void AddExtLabelRange (unsigned Addr, const char* Name, unsigned Count);
+void AddExtLabelRange (uint32_t Addr, const char* Name, unsigned Count);
 /* Add an external label for a range. The first entry gets the label "Name"
 ** while the others get "Name+offs".
 */
 
-int HaveLabel (unsigned Addr);
+int HaveLabel (uint32_t Addr);
 /* Check if there is a label for the given address */
 
-int MustDefLabel (unsigned Addr);
+int MustDefLabel (uint32_t Addr);
 /* Return true if we must define a label for this address, that is, if there
 ** is a label at this address, and it is an external or internal label.
 */
 
-const char* GetLabelName (unsigned Addr);
+const char* GetLabelName (uint32_t Addr);
 /* Return the label name for an address */
 
-const char* GetLabel (unsigned Addr, unsigned RefFrom);
+const char* GetLabel (uint32_t Addr, uint32_t RefFrom);
 /* Return the label name for an address, as it is used in a label reference.
 ** RefFrom is the address the label is referenced from. This is needed in case
 ** of unnamed labels, to determine the name.
@@ -97,6 +100,9 @@ void ForwardLabel (unsigned Offs);
 void DefOutOfRangeLabels (void);
 /* Output any labels that are out of the loaded code range */
 
+unsigned long GetLabelCount (void);
+/* Return the total number of labels defined so far */
+
 
 
 /* End of labels.h */
diff --git a/src/da65/main.c b/src/da65/main.c
index 67a01dc3b..03dbcaccf 100644
--- a/src/da65/main.c
+++ b/src/da65/main.c
@@ -42,8 +42,10 @@
 
 /* common */
 #include "abend.h"
+#include "check.h"
 #include "cmdline.h"
 #include "cpu.h"
+#include "debugflag.h"
 #include "fname.h"
 #include "print.h"
 #include "version.h"
@@ -59,6 +61,7 @@
 #include "infofile.h"
 #include "labels.h"
 #include "opctable.h"
+#include "opc45GS02.h"
 #include "output.h"
 #include "scanner.h"
 #include "segment.h"
@@ -78,9 +81,11 @@ static void Usage (void)
 {
     printf ("Usage: %s [options] [inputfile]\n"
             "Short options:\n"
+            "  -d\t\t\tDebug mode\n"
             "  -g\t\t\tAdd debug info to object file\n"
             "  -h\t\t\tHelp (this text)\n"
             "  -i name\t\tSpecify an info file\n"
+            "  -m\t\t\tRun multiple passes to resolve labels\n"
             "  -o name\t\tName the output file\n"
             "  -v\t\t\tIncrease verbosity\n"
             "  -F\t\t\tAdd formfeeds to the output\n"
@@ -93,6 +98,7 @@ static void Usage (void)
             "  --comment-column n\tSpecify comment start column\n"
             "  --comments n\t\tSet the comment level for the output\n"
             "  --cpu type\t\tSet cpu type\n"
+            "  --debug\t\tDebug mode\n"
             "  --debug-info\t\tAdd debug info to object file\n"
             "  --formfeeds\t\tAdd formfeeds to the output\n"
             "  --help\t\tHelp (this text)\n"
@@ -100,6 +106,7 @@ static void Usage (void)
             "  --info name\t\tSpecify an info file\n"
             "  --label-break n\tAdd newline if label exceeds length n\n"
             "  --mnemonic-column n\tSpecify mnemonic start column\n"
+            "  --multi-pass\t\tRun multiple passes to resolve labels\n"
             "  --pagelength n\tSet the page length for the listing\n"
             "  --start-addr addr\tSet the start/load address\n"
             "  --sync-lines\t\tAccept line markers in the info file\n"
@@ -222,6 +229,15 @@ static void OptCPU (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
+static void OptDebug (const char* Opt attribute ((unused)),
+                      const char* Arg attribute ((unused)))
+/* Disassembler debug mode */
+{
+    ++Debug;
+}
+
+
+
 static void OptDebugInfo (const char* Opt attribute ((unused)),
                           const char* Arg attribute ((unused)))
 /* Add debug info to the object file */
@@ -297,6 +313,15 @@ static void OptMnemonicColumn (const char* Opt, const char* Arg)
 
 
 
+static void OptMultiPass (const char* Opt attribute ((unused)),
+                         const char* Arg attribute ((unused)))
+/* Handle the --multi-pass option */
+{
+    MultiPass = 1;
+}
+
+
+
 static void OptPageLength (const char* Opt attribute ((unused)), const char* Arg)
 /* Handle the --pagelength option */
 {
@@ -312,7 +337,8 @@ static void OptPageLength (const char* Opt attribute ((unused)), const char* Arg
 static void OptStartAddr (const char* Opt, const char* Arg)
 /* Set the default start address */
 {
-    StartAddr = CvtNumber (Opt, Arg);
+    StartAddr = (uint32_t) CvtNumber (Opt, Arg);
+    HaveStartAddr = 1;
 }
 
 
@@ -355,7 +381,52 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print the disassembler version */
 {
     fprintf (stderr, "%s V%s\n", ProgName, GetVersionAsString ());
-    exit(EXIT_SUCCESS);
+    exit (EXIT_SUCCESS);
+}
+
+
+
+static unsigned HandleChangedLength(const OpcDesc* D, unsigned PC)
+/* Instructions that have flSizeChanges set may use a different size than what
+** the table says. This function adjusts the PC accordingly, so after this only
+** the size from the table needs to be added to make up for the correct value
+*/
+{
+    if (D->Flags & flSizeChanges) {
+        if (CPU == CPU_45GS02) {
+            if (D->Handler == OH_Implicit_42_45GS02) {
+                if (GetCodeByte (PC+1) == 0x42) {
+                    /* NEG:NEG prefix (0x42 0x42) */
+                    unsigned opc = GetCodeByte (PC+2);
+                    if (opc == 0xea) {
+                        /* 42 42 ea */
+                        if ((GetCodeByte (PC+3) & 0x1f) == 0x12) {
+                            PC += 4;
+                        }
+                    } else {
+                        /* 42 42 xx */
+                        const OpcDesc* ED = &OpcTable_45GS02_extended[opc];
+                        if (ED->Handler != OH_Illegal) {
+                            PC += (ED->Size - 1);
+                        }
+                    }
+                }
+            } else if (D->Handler == OH_Implicit_ea_45GS02) {
+                /* NOP prefix (0xea) */
+                if ((GetCodeByte (PC+1) & 0x1f) == 0x12) {
+                    PC += 2;
+                }
+            }
+        } else if (CPU == CPU_65816) {
+            if ((D->Handler == OH_Immediate65816M &&
+                GetAttr (PC) & atMem16) ||
+                (D->Handler == OH_Immediate65816X &&
+                GetAttr (PC) & atIdx16)) {
+                PC++;
+            }
+        }
+    }
+    return PC;
 }
 
 
@@ -363,11 +434,11 @@ static void OptVersion (const char* Opt attribute ((unused)),
 static void OneOpcode (unsigned RemainingBytes)
 /* Disassemble one opcode */
 {
-    unsigned I;
-    unsigned OldPC = PC;
+    uint32_t I;
+    uint32_t OldPC = PC;
 
     /* Get the opcode from the current address */
-    unsigned char OPC = GetCodeByte (PC);
+    uint8_t OPC = GetCodeByte (PC);
 
     /* Get the opcode description for the opcode byte */
     const OpcDesc* D = &OpcTable[OPC];
@@ -435,6 +506,7 @@ static void OneOpcode (unsigned RemainingBytes)
                 ++PC;
             } else {
                 D->Handler (D);
+                PC = HandleChangedLength (D, PC);
                 PC += D->Size;
             }
             break;
@@ -449,11 +521,11 @@ static void OneOpcode (unsigned RemainingBytes)
                     if (PrevAddrMode != AddrMode) {
                         if ((PrevAddrMode & atMem8) != (AddrMode & atMem8) ||
                             (PrevAddrMode & atMem16) != (AddrMode & atMem16)) {
-                            OutputMFlag(!!(AddrMode & atMem8));
+                            OutputMFlag (!!(AddrMode & atMem8));
                         }
                         if ((PrevAddrMode & atIdx8) != (AddrMode & atIdx8) ||
                             (PrevAddrMode & atIdx16) != (AddrMode & atIdx16)) {
-                            OutputXFlag(!!(AddrMode & atIdx8));
+                            OutputXFlag (!!(AddrMode & atIdx8));
                         }
 
                         PrevAddrMode = AddrMode;
@@ -466,14 +538,8 @@ static void OneOpcode (unsigned RemainingBytes)
                 }
                 /* Output the insn */
                 D->Handler (D);
-                if (CPU == CPU_65816 && (D->Flags & flSizeChanges)) {
-                    if ((D->Handler == OH_Immediate65816M &&
-                        GetAttr (PC) & atMem16) ||
-                        (D->Handler == OH_Immediate65816X &&
-                        GetAttr (PC) & atIdx16)) {
-                        PC++;
-                    }
-                }
+
+                PC = HandleChangedLength (D, PC);
                 PC += D->Size;
                 break;
             }
@@ -533,12 +599,12 @@ static void OneOpcode (unsigned RemainingBytes)
 static void OnePass (void)
 /* Make one pass through the code */
 {
-    unsigned Count;
+    uint32_t Count;
 
     PrevAddrMode = 0;
 
     /* Disassemble until nothing left */
-    while ((Count = GetRemainingBytes()) > 0) {
+    while ((Count = GetRemainingBytes ()) > 0) {
         OneOpcode (Count);
     }
 }
@@ -548,15 +614,37 @@ static void OnePass (void)
 static void Disassemble (void)
 /* Disassemble the code */
 {
-    /* Pass 1 */
-    Pass = 1;
+    /* Preparation pass */
+    Pass = PASS_PREP;
     OnePass ();
 
+    /* If the --multi-pass option is given, repeat this pass until we have no
+    ** new labels.
+    */
+    if (MultiPass) {
+        unsigned long LabelCount = GetLabelCount ();
+        unsigned Passes = 1;
+        while (1) {
+            unsigned long NewLabelCount;
+            ResetCode ();
+            OnePass ();
+            CHECK(++Passes <= 4096);            /* Safety measure */
+            NewLabelCount = GetLabelCount ();
+            if (NewLabelCount <= LabelCount) {
+                break;
+            }
+            LabelCount = NewLabelCount;
+        }
+        if (Debug) {
+            printf ("Run %u preparation passes to resolve labels\n", Passes);
+        }
+    }
+
     Output ("---------------------------");
     LineFeed ();
 
-    /* Pass 2 */
-    Pass = 2;
+    /* Final pass */
+    Pass = PASS_FINAL;
     ResetCode ();
     OutputSettings ();
     DefOutOfRangeLabels ();
@@ -575,6 +663,7 @@ int main (int argc, char* argv [])
         { "--comment-column",   1,      OptCommentColumn        },
         { "--comments",         1,      OptComments             },
         { "--cpu",              1,      OptCPU                  },
+        { "--debug",            0,      OptDebug                },
         { "--debug-info",       0,      OptDebugInfo            },
         { "--formfeeds",        0,      OptFormFeeds            },
         { "--help",             0,      OptHelp                 },
@@ -582,6 +671,7 @@ int main (int argc, char* argv [])
         { "--info",             1,      OptInfo                 },
         { "--label-break",      1,      OptLabelBreak           },
         { "--mnemonic-column",  1,      OptMnemonicColumn       },
+        { "--multi-pass",       0,      OptMultiPass            },
         { "--pagelength",       1,      OptPageLength           },
         { "--start-addr",       1,      OptStartAddr            },
         { "--sync-lines",       0,      OptSyncLines            },
@@ -611,6 +701,14 @@ int main (int argc, char* argv [])
                     LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
                     break;
 
+                case 'd':
+                    if (Arg[2] == '\0') {
+                        OptDebug (Arg, 0);
+                    } else {
+                        UnknownOption (Arg);
+                    }
+                    break;
+
                 case 'g':
                     OptDebugInfo (Arg, 0);
                     break;
@@ -623,6 +721,10 @@ int main (int argc, char* argv [])
                     OptInfo (Arg, GetArg (&I, 2));
                     break;
 
+                case 'm':
+                    OptMultiPass (Arg, 0);
+                    break;
+
                 case 'o':
                     OutFile = GetArg (&I, 2);
                     break;
diff --git a/src/da65/opc45GS02.c b/src/da65/opc45GS02.c
new file mode 100644
index 000000000..21650f53d
--- /dev/null
+++ b/src/da65/opc45GS02.c
@@ -0,0 +1,565 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                               opc45GS02.c                                 */
+/*                                                                           */
+/*                      45GS10 opcode description table                      */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+/* da65 */
+#include "handler.h"
+#include "opc45GS02.h"
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* Descriptions for all compound instructions with NEG:NEG prefix (0x42 0x42) */
+const OpcDesc OpcTable_45GS02_extended[256] = {
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $00 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $01 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $02 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $03 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $04 */
+    {   "orq",  2+2,  flUseLabel,               OH_Direct_Q                  }, /* $05 */
+    {   "aslq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $06 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $07 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $08 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $09 */
+    {   "aslq", 1+2,  flNone,                   OH_Accumulator               }, /* $0a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $0b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $0c */
+    {   "orq",  3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $0d */
+    {   "aslq", 3+2,  flUseLabel,               OH_Absolute_Q                }, /* $0e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $0f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $10 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $11 */
+    {   "orq",  2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $12 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $13 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $14 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $15 */
+    {   "aslq", 2+2,  flUseLabel,               OH_DirectX_Q                 }, /* $16 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $17 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $18 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $19 */
+    {   "inq",  1+2,  flNone,                   OH_Accumulator               }, /* $1a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $1b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $1c */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $1d */
+    {   "aslq", 3+2,  flUseLabel|flAbsOverride, OH_AbsoluteX_Q               }, /* $1e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $1f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $20 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $21 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $22 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $23 */
+    {   "bitq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $24 */
+    {   "andq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $25 */
+    {   "rolq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $26 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $27 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $28 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $29 */
+    {   "rolq", 1+2,  flNone,                   OH_Accumulator               }, /* $2a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $2b */
+    {   "bitq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $2c */
+    {   "andq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $2d */
+    {   "rolq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $2e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $2f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $30 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $31 */
+    {   "andq", 2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $32 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $33 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $34 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $35 */
+    {   "rolq", 2+2,  flUseLabel,               OH_DirectX_Q                 }, /* $36 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $37 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $38 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $39 */
+    {   "deq",  1+2,  flNone,                   OH_Accumulator               }, /* $3a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $3b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $3c */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $3d */
+    {   "rolq", 3+2,  flUseLabel|flAbsOverride, OH_AbsoluteX_Q               }, /* $3e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $3f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $40 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $41 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $42 */
+    {   "asrq", 1+2,  flNone,                   OH_Accumulator               }, /* $43 */
+    {   "asrq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $44 */
+    {   "eorq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $45 */
+    {   "lsrq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $46 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $47 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $48 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $49 */
+    {   "lsrq", 1+2,  flNone,                   OH_Accumulator               }, /* $4a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $4b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $4c */
+    {   "eorq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $4d */
+    {   "lsrq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $4e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $4f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $50 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $51 */
+    {   "eorq", 2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $52 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $53 */
+    {   "asrq", 2+2,  flUseLabel,               OH_DirectX_Q                 }, /* $54 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $55 */
+    {   "lsrq", 2+2,  flUseLabel,               OH_DirectX_Q                 }, /* $56 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $57 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $58 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $59 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $5a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $5b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $5c */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $5d */
+    {   "lsrq", 3+2,  flUseLabel|flAbsOverride, OH_AbsoluteX_Q               }, /* $5e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $5f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $60 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $61 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $62 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $63 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $64 */
+    {   "adcq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $65 */
+    {   "rorq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $66 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $67 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $68 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $69 */
+    {   "rorq", 1+2,  flNone,                   OH_Accumulator               }, /* $6a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $6b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $6c */
+    {   "adcq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $6d */
+    {   "rorq", 3+2,  flUseLabel,               OH_Absolute_Q                }, /* $6e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $6f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $70 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $71 */
+    {   "adcq", 2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $72 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $73 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $74 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $75 */
+    {   "rorq", 2+2,  flUseLabel,               OH_DirectX_Q                 }, /* $76 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $77 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $78 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $79 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $7a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $7b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $7c */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $7d */
+    {   "rorq", 3+2,  flUseLabel|flAbsOverride, OH_AbsoluteX_Q               }, /* $7e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $7f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $80 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $81 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $82 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $83 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $84 */
+    {   "stq",  2+2,  flUseLabel,               OH_Direct_Q                  }, /* $85 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $86 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $87 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $88 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $89 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $8a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $8b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $8c */
+    {   "stq",  3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $8d */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $8e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $8f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $90 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $91 */
+    {   "stq",  2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $92 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $93 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $94 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $95 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $96 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $97 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $98 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $99 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $9a */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $9b */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $9c */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $9d */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $9e */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $9f */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a0 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a1 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a2 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a3 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a4 */
+    {   "ldq",  2+2,  flUseLabel,               OH_Direct_Q                  }, /* $a5 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a6 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a7 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a8 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $a9 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $aa */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ab */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ac */
+    {   "ldq",  3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $ad */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ae */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $af */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b0 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b1 */
+    {   "ldq",  2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $b2 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b3 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b4 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b5 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b6 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b7 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b8 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $b9 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ba */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $bb */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $bc */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $bd */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $be */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $bf */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c0 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c1 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c2 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c3 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c4 */
+    {   "cmpq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $c5 */
+    {   "deq",  2+2,  flUseLabel,               OH_Direct_Q                  }, /* $c6 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c7 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c8 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $c9 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ca */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $cb */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $cc */
+    {   "cmpq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $cd */
+    {   "deq",  3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $ce */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $cf */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d0 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d1 */
+    {   "cmpq", 2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $d2 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d3 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d4 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d5 */
+    {   "deq",  2+2,  flUseLabel,               OH_DirectX_Q                 }, /* $d6 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d7 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d8 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $d9 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $da */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $db */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $dc */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $dd */
+    {   "deq",  3+2,  flUseLabel|flAbsOverride, OH_AbsoluteX_Q               }, /* $de */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $df */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e0 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e1 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e2 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e3 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e4 */
+    {   "sbcq", 2+2,  flUseLabel,               OH_Direct_Q                  }, /* $e5 */
+    {   "inq",  2+2,  flUseLabel,               OH_Direct_Q                  }, /* $e6 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e7 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e8 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $e9 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ea */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $eb */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ec */
+    {   "sbcq", 3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $ed */
+    {   "inq",  3+2,  flUseLabel|flAbsOverride, OH_Absolute_Q                }, /* $ee */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ef */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f0 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f1 */
+    {   "sbcq", 2+2,  flUseLabel,               OH_DirectIndirectZ_Q         }, /* $f2 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f3 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f4 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f5 */
+    {   "inq",  2+2,  flUseLabel,               OH_DirectX_Q                 }, /* $f6 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f7 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f8 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $f9 */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $fa */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $fb */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $fc */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $fd */
+    {   "inq",  3+2,  flUseLabel|flAbsOverride, OH_AbsoluteX_Q               }, /* $fe */
+    {   "",     1+2,  flIllegal,                OH_Illegal,                  }, /* $ff */
+};
+
+const OpcDesc OpcTable_45GS02[256] = {
+    {   "brk",  1,  flNone,                   OH_Implicit                  }, /* $00 */
+    {   "ora",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $01 */
+    {   "cle",  1,  flNone,                   OH_Implicit                  }, /* $02 */
+    {   "see",  1,  flNone,                   OH_Implicit                  }, /* $03 */
+    {   "tsb",  2,  flUseLabel,               OH_Direct                    }, /* $04 */
+    {   "ora",  2,  flUseLabel,               OH_Direct                    }, /* $05 */
+    {   "asl",  2,  flUseLabel,               OH_Direct                    }, /* $06 */
+    {   "rmb0", 2,  flUseLabel,               OH_Direct                    }, /* $07 */
+    {   "php",  1,  flNone,                   OH_Implicit                  }, /* $08 */
+    {   "ora",  2,  flNone,                   OH_Immediate                 }, /* $09 */
+    {   "asl",  1,  flNone,                   OH_Accumulator               }, /* $0a */
+    {   "tsy",  1,  flNone,                   OH_Implicit                  }, /* $0b */
+    {   "tsb",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $0c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $0d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $0e */
+    {   "bbr0", 3,  flUseLabel,               OH_BitBranch                 }, /* $0f */
+    {   "bpl",  2,  flLabel,                  OH_Relative                  }, /* $10 */
+    {   "ora",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $11 */
+    {   "ora",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $12 */
+    {   "lbpl", 3,  flLabel,                  OH_RelativeLong4510          }, /* $13 */
+    {   "trb",  2,  flUseLabel,               OH_Direct                    }, /* $14 */
+    {   "ora",  2,  flUseLabel,               OH_DirectX                   }, /* $15 */
+    {   "asl",  2,  flUseLabel,               OH_DirectX                   }, /* $16 */
+    {   "rmb1", 2,  flUseLabel,               OH_Direct                    }, /* $17 */
+    {   "clc",  1,  flNone,                   OH_Implicit                  }, /* $18 */
+    {   "ora",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $19 */
+    {   "inc",  1,  flNone,                   OH_Accumulator               }, /* $1a */
+    {   "inz",  1,  flNone,                   OH_Implicit                  }, /* $1b */
+    {   "trb",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $1c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $1d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $1e */
+    {   "bbr1", 3,  flUseLabel,               OH_BitBranch                 }, /* $1f */
+    {   "jsr",  3,  flLabel,                  OH_Absolute                  }, /* $20 */
+    {   "and",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $21 */
+    {   "jsr",  3,  flLabel,                  OH_JmpAbsoluteIndirect       }, /* $22 */
+    {   "jsr",  3,  flLabel,                  OH_JmpAbsoluteXIndirect      }, /* $23 */
+    {   "bit",  2,  flUseLabel,               OH_Direct                    }, /* $24 */
+    {   "and",  2,  flUseLabel,               OH_Direct                    }, /* $25 */
+    {   "rol",  2,  flUseLabel,               OH_Direct                    }, /* $26 */
+    {   "rmb2", 2,  flUseLabel,               OH_Direct                    }, /* $27 */
+    {   "plp",  1,  flNone,                   OH_Implicit                  }, /* $28 */
+    {   "and",  2,  flNone,                   OH_Immediate                 }, /* $29 */
+    {   "rol",  1,  flNone,                   OH_Accumulator               }, /* $2a */
+    {   "tys",  1,  flNone,                   OH_Implicit                  }, /* $2b */
+    {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $2c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $2d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $2e */
+    {   "bbr2", 3,  flUseLabel,               OH_BitBranch                 }, /* $2f */
+    {   "bmi",  2,  flLabel,                  OH_Relative                  }, /* $30 */
+    {   "and",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $31 */
+    {   "and",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $32 */
+    {   "lbmi", 3,  flLabel,                  OH_RelativeLong4510          }, /* $33 */
+    {   "bit",  2,  flUseLabel,               OH_DirectX                   }, /* $34 */
+    {   "and",  2,  flUseLabel,               OH_DirectX                   }, /* $35 */
+    {   "rol",  2,  flUseLabel,               OH_DirectX                   }, /* $36 */
+    {   "rmb3", 2,  flUseLabel,               OH_Direct                    }, /* $37 */
+    {   "sec",  1,  flNone,                   OH_Implicit                  }, /* $38 */
+    {   "and",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $39 */
+    {   "dec",  1,  flNone,                   OH_Accumulator               }, /* $3a */
+    {   "dez",  1,  flNone,                   OH_Implicit                  }, /* $3b */
+    {   "bit",  3,  flUseLabel,               OH_AbsoluteX                 }, /* $3c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $3d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $3e */
+    {   "bbr3", 3,  flUseLabel,               OH_BitBranch                 }, /* $3f */
+    {   "rti",  1,  flNone,                   OH_Rts                       }, /* $40 */
+    {   "eor",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $41 */
+    {   "neg",  1,  flSizeChanges,            OH_Implicit_42_45GS02        }, /* $42 */
+    {   "asr",  1,  flNone,                   OH_Accumulator               }, /* $43 */
+    {   "asr",  2,  flUseLabel,               OH_Direct                    }, /* $44 */
+    {   "eor",  2,  flUseLabel,               OH_Direct                    }, /* $45 */
+    {   "lsr",  2,  flUseLabel,               OH_Direct                    }, /* $46 */
+    {   "rmb4", 2,  flUseLabel,               OH_Direct                    }, /* $47 */
+    {   "pha",  1,  flNone,                   OH_Implicit                  }, /* $48 */
+    {   "eor",  2,  flNone,                   OH_Immediate                 }, /* $49 */
+    {   "lsr",  1,  flNone,                   OH_Accumulator               }, /* $4a */
+    {   "taz",  1,  flNone,                   OH_Implicit                  }, /* $4b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsolute               }, /* $4c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $4d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $4e */
+    {   "bbr4", 3,  flUseLabel,               OH_BitBranch                 }, /* $4f */
+    {   "bvc",  2,  flLabel,                  OH_Relative                  }, /* $50 */
+    {   "eor",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $51 */
+    {   "eor",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $52 */
+    {   "lbvc", 3,  flLabel,                  OH_RelativeLong4510          }, /* $53 */
+    {   "asr",  2,  flUseLabel,               OH_DirectX                   }, /* $54 */
+    {   "eor",  2,  flUseLabel,               OH_DirectX                   }, /* $55 */
+    {   "lsr",  2,  flUseLabel,               OH_DirectX                   }, /* $56 */
+    {   "rmb5", 2,  flUseLabel,               OH_Direct                    }, /* $57 */
+    {   "cli",  1,  flNone,                   OH_Implicit                  }, /* $58 */
+    {   "eor",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $59 */
+    {   "phy",  1,  flNone,                   OH_Implicit                  }, /* $5a */
+    {   "tab",  1,  flNone,                   OH_Implicit                  }, /* $5b */
+    {   "map",  1,  flNone,                   OH_Implicit                  }, /* $5c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $5d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $5e */
+    {   "bbr5", 3,  flUseLabel,               OH_BitBranch                 }, /* $5f */
+    {   "rts",  1,  flNone,                   OH_Rts                       }, /* $60 */
+    {   "adc",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $61 */
+    {   "rtn",  2,  flNone,                   OH_Immediate                 }, /* $62 */
+    {   "bsr",  3,  flLabel,                  OH_RelativeLong4510          }, /* $63 */
+    {   "stz",  2,  flUseLabel,               OH_Direct                    }, /* $64 */
+    {   "adc",  2,  flUseLabel,               OH_Direct                    }, /* $65 */
+    {   "ror",  2,  flUseLabel,               OH_Direct                    }, /* $66 */
+    {   "rmb6", 2,  flUseLabel,               OH_Direct,                   }, /* $67 */
+    {   "pla",  1,  flNone,                   OH_Implicit                  }, /* $68 */
+    {   "adc",  2,  flNone,                   OH_Immediate                 }, /* $69 */
+    {   "ror",  1,  flNone,                   OH_Accumulator               }, /* $6a */
+    {   "tza",  1,  flNone,                   OH_Implicit                  }, /* $6b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect       }, /* $6c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $6d */
+    {   "ror",  3,  flUseLabel,               OH_Absolute                  }, /* $6e */
+    {   "bbr6", 3,  flUseLabel,               OH_BitBranch                 }, /* $6f */
+    {   "bvs",  2,  flLabel,                  OH_Relative                  }, /* $70 */
+    {   "adc",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $71 */
+    {   "adc",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $72 */
+    {   "lbvs", 3,  flLabel,                  OH_RelativeLong4510          }, /* $73 */
+    {   "stz",  2,  flUseLabel,               OH_DirectX                   }, /* $74 */
+    {   "adc",  2,  flUseLabel,               OH_DirectX                   }, /* $75 */
+    {   "ror",  2,  flUseLabel,               OH_DirectX                   }, /* $76 */
+    {   "rmb7", 2,  flUseLabel,               OH_Direct                    }, /* $77 */
+    {   "sei",  1,  flNone,                   OH_Implicit                  }, /* $78 */
+    {   "adc",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $79 */
+    {   "ply",  1,  flNone,                   OH_Implicit                  }, /* $7a */
+    {   "tba",  1,  flNone,                   OH_Implicit                  }, /* $7b */
+    {   "jmp",  3,  flLabel,                  OH_AbsoluteXIndirect         }, /* $7c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $7d */
+    {   "ror",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $7e */
+    {   "bbr7", 3,  flUseLabel,               OH_BitBranch                 }, /* $7f */
+    {   "bra",  2,  flLabel,                  OH_Relative                  }, /* $80 */
+    {   "sta",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $81 */
+    {   "sta",  2,  flNone,                   OH_StackRelativeIndirectY4510}, /* $82 */
+    {   "lbra", 3,  flLabel,                  OH_RelativeLong4510          }, /* $83 */
+    {   "sty",  2,  flUseLabel,               OH_Direct                    }, /* $84 */
+    {   "sta",  2,  flUseLabel,               OH_Direct                    }, /* $85 */
+    {   "stx",  2,  flUseLabel,               OH_Direct                    }, /* $86 */
+    {   "smb0", 2,  flUseLabel,               OH_Direct                    }, /* $87 */
+    {   "dey",  1,  flNone,                   OH_Implicit                  }, /* $88 */
+    {   "bit",  2,  flNone,                   OH_Immediate                 }, /* $89 */
+    {   "txa",  1,  flNone,                   OH_Implicit                  }, /* $8a */
+    {   "sty",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $8b */
+    {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $8c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $8d */
+    {   "stx",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $8e */
+    {   "bbs0", 3,  flUseLabel,               OH_BitBranch                 }, /* $8f */
+    {   "bcc",  2,  flLabel,                  OH_Relative                  }, /* $90 */
+    {   "sta",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $91 */
+    {   "sta",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $92 */
+    {   "lbcc", 3,  flLabel,                  OH_RelativeLong4510          }, /* $93 */
+    {   "sty",  2,  flUseLabel,               OH_DirectX                   }, /* $94 */
+    {   "sta",  2,  flUseLabel,               OH_DirectX                   }, /* $95 */
+    {   "stx",  2,  flUseLabel,               OH_DirectY                   }, /* $96 */
+    {   "smb1", 2,  flUseLabel,               OH_Direct                    }, /* $97 */
+    {   "tya",  1,  flNone,                   OH_Implicit                  }, /* $98 */
+    {   "sta",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $99 */
+    {   "txs",  1,  flNone,                   OH_Implicit                  }, /* $9a */
+    {   "stx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY                 }, /* $9b */
+    {   "stz",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $9c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $9d */
+    {   "stz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $9e */
+    {   "bbs1", 3,  flUseLabel,               OH_BitBranch                 }, /* $9f */
+    {   "ldy",  2,  flNone,                   OH_Immediate                 }, /* $a0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $a1 */
+    {   "ldx",  2,  flNone,                   OH_Immediate                 }, /* $a2 */
+    {   "ldz",  2,  flNone,                   OH_Immediate                 }, /* $a3 */
+    {   "ldy",  2,  flUseLabel,               OH_Direct                    }, /* $a4 */
+    {   "lda",  2,  flUseLabel,               OH_Direct                    }, /* $a5 */
+    {   "ldx",  2,  flUseLabel,               OH_Direct                    }, /* $a6 */
+    {   "smb2", 2,  flUseLabel,               OH_Direct                    }, /* $a7 */
+    {   "tay",  1,  flNone,                   OH_Implicit                  }, /* $a8 */
+    {   "lda",  2,  flNone,                   OH_Immediate                 }, /* $a9 */
+    {   "tax",  1,  flNone,                   OH_Implicit                  }, /* $aa */
+    {   "ldz",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ab */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ac */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ad */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ae */
+    {   "bbs2", 3,  flUseLabel,               OH_BitBranch                 }, /* $af */
+    {   "bcs",  2,  flLabel,                  OH_Relative                  }, /* $b0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $b1 */
+    {   "lda",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $b2 */
+    {   "lbcs", 3,  flLabel,                  OH_RelativeLong4510          }, /* $b3 */
+    {   "ldy",  2,  flUseLabel,               OH_DirectX                   }, /* $b4 */
+    {   "lda",  2,  flUseLabel,               OH_DirectX                   }, /* $b5 */
+    {   "ldx",  2,  flUseLabel,               OH_DirectY                   }, /* $b6 */
+    {   "smb3", 2,  flUseLabel,               OH_Direct                    }, /* $b7 */
+    {   "clv",  1,  flNone,                   OH_Implicit                  }, /* $b8 */
+    {   "lda",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $b9 */
+    {   "tsx",  1,  flNone,                   OH_Implicit                  }, /* $ba */
+    {   "ldz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $bb */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $bc */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $bd */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY                 }, /* $be */
+    {   "bbs3", 3,  flUseLabel,               OH_BitBranch                 }, /* $bf */
+    {   "cpy",  2,  flNone,                   OH_Immediate                 }, /* $c0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $c1 */
+    {   "cpz",  2,  flNone,                   OH_Immediate                 }, /* $c2 */
+    {   "dew",  2,  flUseLabel,               OH_Direct                    }, /* $c3 */
+    {   "cpy",  2,  flUseLabel,               OH_Direct                    }, /* $c4 */
+    {   "cmp",  2,  flUseLabel,               OH_Direct                    }, /* $c5 */
+    {   "dec",  2,  flUseLabel,               OH_Direct                    }, /* $c6 */
+    {   "smb4", 2,  flUseLabel,               OH_Direct                    }, /* $c7 */
+    {   "iny",  1,  flNone,                   OH_Implicit                  }, /* $c8 */
+    {   "cmp",  2,  flNone,                   OH_Immediate                 }, /* $c9 */
+    {   "dex",  1,  flNone,                   OH_Implicit                  }, /* $ca */
+    {   "asw",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $cb */
+    {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $cc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $cd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ce */
+    {   "bbs4", 3,  flUseLabel,               OH_BitBranch                 }, /* $cf */
+    {   "bne",  2,  flLabel,                  OH_Relative                  }, /* $d0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $d1 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $d2 */
+    {   "lbne", 3,  flLabel,                  OH_RelativeLong4510          }, /* $d3 */
+    {   "cpz",  2,  flUseLabel,               OH_Direct                    }, /* $d4 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectX                   }, /* $d5 */
+    {   "dec",  2,  flUseLabel,               OH_DirectX                   }, /* $d6 */
+    {   "smb5", 2,  flUseLabel,               OH_Direct                    }, /* $d7 */
+    {   "cld",  1,  flNone,                   OH_Implicit                  }, /* $d8 */
+    {   "cmp",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $d9 */
+    {   "phx",  1,  flNone,                   OH_Implicit                  }, /* $da */
+    {   "phz",  1,  flNone,                   OH_Implicit                  }, /* $db */
+    {   "cpz",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $dc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $dd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $de */
+    {   "bbs5", 3,  flUseLabel,               OH_BitBranch                 }, /* $df */
+    {   "cpx",  2,  flNone,                   OH_Immediate                 }, /* $e0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $e1 */
+    {   "lda",  2,  flNone,                   OH_StackRelativeIndirectY4510}, /* $e2 */
+    {   "inw",  2,  flUseLabel,               OH_Direct                    }, /* $e3 */
+    {   "cpx",  2,  flUseLabel,               OH_Direct                    }, /* $e4 */
+    {   "sbc",  2,  flUseLabel,               OH_Direct                    }, /* $e5 */
+    {   "inc",  2,  flUseLabel,               OH_Direct                    }, /* $e6 */
+    {   "smb6", 2,  flUseLabel,               OH_Direct                    }, /* $e7 */
+    {   "inx",  1,  flNone,                   OH_Implicit                  }, /* $e8 */
+    {   "sbc",  2,  flNone,                   OH_Immediate                 }, /* $e9 */
+    {   "eom",  1,  flSizeChanges,            OH_Implicit_ea_45GS02        }, /* $ea */
+    {   "row",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $eb */
+    {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ec */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ed */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ee */
+    {   "bbs6", 3,  flUseLabel,               OH_BitBranch                 }, /* $ef */
+    {   "beq",  2,  flLabel,                  OH_Relative                  }, /* $f0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $f1 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $f2 */
+    {   "lbeq", 3,  flLabel,                  OH_RelativeLong4510          }, /* $f3 */
+    {   "phw",  3,  flNone,                   OH_ImmediateWord             }, /* $f4 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectX                   }, /* $f5 */
+    {   "inc",  2,  flUseLabel,               OH_DirectX                   }, /* $f6 */
+    {   "smb7", 2,  flUseLabel,               OH_Direct                    }, /* $f7 */
+    {   "sed",  1,  flNone,                   OH_Implicit                  }, /* $f8 */
+    {   "sbc",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $f9 */
+    {   "plx",  1,  flNone,                   OH_Implicit                  }, /* $fa */
+    {   "plz",  1,  flNone,                   OH_Implicit                  }, /* $fb */
+    {   "phw",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $fc */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $fd */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $fe */
+    {   "bbs7", 3,  flUseLabel,               OH_BitBranch                 }, /* $ff */
+};
diff --git a/libsrc/common/asctime.c b/src/da65/opc45GS02.h
similarity index 72%
rename from libsrc/common/asctime.c
rename to src/da65/opc45GS02.h
index b46f29128..624e4bbd9 100644
--- a/libsrc/common/asctime.c
+++ b/src/da65/opc45GS02.h
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                   asctime.c                               */
+/*                               opc45GS02.h                                 */
 /*                                                                           */
-/*                 Convert a broken down time into a string                  */
+/*                      45GS10 opcode description table                      */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2002      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2003      Ullrich von Bassewitz                                       */
+/*               Roemerstrasse 52                                            */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -33,27 +33,26 @@
 
 
 
-#include <stdio.h>
-#include <time.h>
+#ifndef OPC45GS02_H
+#define OPC45GS02_H
+
+
+
+#include "opcdesc.h"
 
 
 
 /*****************************************************************************/
-/*                                   Code                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
-/*
-    CAUTION: we need to reserve enough space to be able to hold the maximum
-    length string:
 
-     1234567890123456789012345678901234567
-    "Wednesday September ..1 00:00:00 1970"
-*/
 
-char* __fastcall__ asctime (const struct tm* timep)
-{
-    static char buf[38];
+/* Descriptions for all opcodes */
+extern const OpcDesc OpcTable_45GS02[256];
+extern const OpcDesc OpcTable_45GS02_extended[256];
 
-    /* Format into given buffer and return the result */
-    return strftime (buf, sizeof (buf), "%c\n", timep)? buf : 0;
-}
+
+/* End of opc45GS02.h */
+
+#endif
diff --git a/src/da65/opc6502x.c b/src/da65/opc6502x.c
index 3bdc8a549..c5fb5888c 100644
--- a/src/da65/opc6502x.c
+++ b/src/da65/opc6502x.c
@@ -188,7 +188,7 @@ const OpcDesc OpcTable_6502X[256] = {
     {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
     {   "nop",  2,  flNone,                   OH_Immediate             }, /* $89 */
     {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
-    {   "xaa",  2,  flNone,                   OH_Immediate             }, /* $8b */
+    {   "ane",  2,  flNone,                   OH_Immediate             }, /* $8b */
     {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8d */
     {   "stx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8e */
@@ -196,7 +196,7 @@ const OpcDesc OpcTable_6502X[256] = {
     {   "bcc",  2,  flLabel,                  OH_Relative              }, /* $90 */
     {   "sta",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $91 */
     {   "jam",  1,  flNone,                   OH_Implicit              }, /* $92 */
-    {   "ahx",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $93 */
+    {   "sha",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $93 */
     {   "sty",  2,  flUseLabel,               OH_DirectX               }, /* $94 */
     {   "sta",  2,  flUseLabel,               OH_DirectX               }, /* $95 */
     {   "stx",  2,  flUseLabel,               OH_DirectY               }, /* $96 */
@@ -208,7 +208,7 @@ const OpcDesc OpcTable_6502X[256] = {
     {   "shy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9c */
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "shx",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9e */
-    {   "ahx",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9f */
+    {   "sha",  3,  flUseLabel,               OH_AbsoluteY             }, /* $9f */
     {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
     {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
diff --git a/src/da65/opc65c02.c b/src/da65/opc65c02.c
index b69558f2a..88c8c8dec 100644
--- a/src/da65/opc65c02.c
+++ b/src/da65/opc65c02.c
@@ -250,7 +250,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
     {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
     {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
-    {   "wai",  1,  flNone,                   OH_Implicit              }, /* $cb */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $cb */
     {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ce */
@@ -266,7 +266,7 @@ const OpcDesc OpcTable_65C02[256] = {
     {   "cld",  1,  flNone,                   OH_Implicit              }, /* $d8 */
     {   "cmp",  3,  flUseLabel,               OH_AbsoluteY             }, /* $d9 */
     {   "phx",  1,  flNone,                   OH_Implicit              }, /* $da */
-    {   "stp",  1,  flNone,                   OH_Implicit              }, /* $db */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $db */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $dc */
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
diff --git a/src/da65/opc65ce02.c b/src/da65/opc65ce02.c
new file mode 100644
index 000000000..093e79a9e
--- /dev/null
+++ b/src/da65/opc65ce02.c
@@ -0,0 +1,306 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                               opc65CE02.c                                 */
+/*                                                                           */
+/*                      65CE02 opcode description table                      */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+/* da65 */
+#include "handler.h"
+#include "opc65ce02.h"
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* Descriptions for all opcodes */
+const OpcDesc OpcTable_65CE02[256] = {
+    {   "brk",  1,  flNone,                   OH_Implicit                  }, /* $00 */
+    {   "ora",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $01 */
+    {   "cle",  1,  flNone,                   OH_Implicit                  }, /* $02 */
+    {   "see",  1,  flNone,                   OH_Implicit                  }, /* $03 */
+    {   "tsb",  2,  flUseLabel,               OH_Direct                    }, /* $04 */
+    {   "ora",  2,  flUseLabel,               OH_Direct                    }, /* $05 */
+    {   "asl",  2,  flUseLabel,               OH_Direct                    }, /* $06 */
+    {   "rmb0", 2,  flUseLabel,               OH_Direct                    }, /* $07 */
+    {   "php",  1,  flNone,                   OH_Implicit                  }, /* $08 */
+    {   "ora",  2,  flNone,                   OH_Immediate                 }, /* $09 */
+    {   "asl",  1,  flNone,                   OH_Accumulator               }, /* $0a */
+    {   "tsy",  1,  flNone,                   OH_Implicit                  }, /* $0b */
+    {   "tsb",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $0c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $0d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $0e */
+    {   "bbr0", 3,  flUseLabel,               OH_BitBranch                 }, /* $0f */
+    {   "bpl",  2,  flLabel,                  OH_Relative                  }, /* $10 */
+    {   "ora",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $11 */
+    {   "ora",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $12 */
+    {   "lbpl", 3,  flLabel,                  OH_RelativeLong4510          }, /* $13 */
+    {   "trb",  2,  flUseLabel,               OH_Direct                    }, /* $14 */
+    {   "ora",  2,  flUseLabel,               OH_DirectX                   }, /* $15 */
+    {   "asl",  2,  flUseLabel,               OH_DirectX                   }, /* $16 */
+    {   "rmb1", 2,  flUseLabel,               OH_Direct                    }, /* $17 */
+    {   "clc",  1,  flNone,                   OH_Implicit                  }, /* $18 */
+    {   "ora",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $19 */
+    {   "inc",  1,  flNone,                   OH_Accumulator               }, /* $1a */
+    {   "inz",  1,  flNone,                   OH_Implicit                  }, /* $1b */
+    {   "trb",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $1c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $1d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $1e */
+    {   "bbr1", 3,  flUseLabel,               OH_BitBranch                 }, /* $1f */
+    {   "jsr",  3,  flLabel,                  OH_Absolute                  }, /* $20 */
+    {   "and",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $21 */
+    {   "jsr",  3,  flLabel,                  OH_JmpAbsoluteIndirect       }, /* $22 */
+    {   "jsr",  3,  flLabel,                  OH_JmpAbsoluteXIndirect      }, /* $23 */
+    {   "bit",  2,  flUseLabel,               OH_Direct                    }, /* $24 */
+    {   "and",  2,  flUseLabel,               OH_Direct                    }, /* $25 */
+    {   "rol",  2,  flUseLabel,               OH_Direct                    }, /* $26 */
+    {   "rmb2", 2,  flUseLabel,               OH_Direct                    }, /* $27 */
+    {   "plp",  1,  flNone,                   OH_Implicit                  }, /* $28 */
+    {   "and",  2,  flNone,                   OH_Immediate                 }, /* $29 */
+    {   "rol",  1,  flNone,                   OH_Accumulator               }, /* $2a */
+    {   "tys",  1,  flNone,                   OH_Implicit                  }, /* $2b */
+    {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $2c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $2d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $2e */
+    {   "bbr2", 3,  flUseLabel,               OH_BitBranch                 }, /* $2f */
+    {   "bmi",  2,  flLabel,                  OH_Relative                  }, /* $30 */
+    {   "and",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $31 */
+    {   "and",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $32 */
+    {   "lbmi", 3,  flLabel,                  OH_RelativeLong4510          }, /* $33 */
+    {   "bit",  2,  flUseLabel,               OH_DirectX                   }, /* $34 */
+    {   "and",  2,  flUseLabel,               OH_DirectX                   }, /* $35 */
+    {   "rol",  2,  flUseLabel,               OH_DirectX                   }, /* $36 */
+    {   "rmb3", 2,  flUseLabel,               OH_Direct                    }, /* $37 */
+    {   "sec",  1,  flNone,                   OH_Implicit                  }, /* $38 */
+    {   "and",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $39 */
+    {   "dec",  1,  flNone,                   OH_Accumulator               }, /* $3a */
+    {   "dez",  1,  flNone,                   OH_Implicit                  }, /* $3b */
+    {   "bit",  3,  flUseLabel,               OH_AbsoluteX                 }, /* $3c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $3d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $3e */
+    {   "bbr3", 3,  flUseLabel,               OH_BitBranch                 }, /* $3f */
+    {   "rti",  1,  flNone,                   OH_Rts                       }, /* $40 */
+    {   "eor",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $41 */
+    {   "neg",  1,  flNone,                   OH_Implicit                  }, /* $42 */
+    {   "asr",  1,  flNone,                   OH_Accumulator               }, /* $43 */
+    {   "asr",  2,  flUseLabel,               OH_Direct                    }, /* $44 */
+    {   "eor",  2,  flUseLabel,               OH_Direct                    }, /* $45 */
+    {   "lsr",  2,  flUseLabel,               OH_Direct                    }, /* $46 */
+    {   "rmb4", 2,  flUseLabel,               OH_Direct                    }, /* $47 */
+    {   "pha",  1,  flNone,                   OH_Implicit                  }, /* $48 */
+    {   "eor",  2,  flNone,                   OH_Immediate                 }, /* $49 */
+    {   "lsr",  1,  flNone,                   OH_Accumulator               }, /* $4a */
+    {   "taz",  1,  flNone,                   OH_Implicit                  }, /* $4b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsolute               }, /* $4c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $4d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $4e */
+    {   "bbr4", 3,  flUseLabel,               OH_BitBranch                 }, /* $4f */
+    {   "bvc",  2,  flLabel,                  OH_Relative                  }, /* $50 */
+    {   "eor",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $51 */
+    {   "eor",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $52 */
+    {   "lbvc", 3,  flLabel,                  OH_RelativeLong4510          }, /* $53 */
+    {   "asr",  2,  flUseLabel,               OH_DirectX                   }, /* $54 */
+    {   "eor",  2,  flUseLabel,               OH_DirectX                   }, /* $55 */
+    {   "lsr",  2,  flUseLabel,               OH_DirectX                   }, /* $56 */
+    {   "rmb5", 2,  flUseLabel,               OH_Direct                    }, /* $57 */
+    {   "cli",  1,  flNone,                   OH_Implicit                  }, /* $58 */
+    {   "eor",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $59 */
+    {   "phy",  1,  flNone,                   OH_Implicit                  }, /* $5a */
+    {   "tab",  1,  flNone,                   OH_Implicit                  }, /* $5b */
+    {   "aug",  1,  flNone,                   OH_Implicit                  }, /* $5c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $5d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $5e */
+    {   "bbr5", 3,  flUseLabel,               OH_BitBranch                 }, /* $5f */
+    {   "rts",  1,  flNone,                   OH_Rts                       }, /* $60 */
+    {   "adc",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $61 */
+    {   "rtn",  2,  flNone,                   OH_Immediate                 }, /* $62 */
+    {   "bsr",  3,  flLabel,                  OH_RelativeLong4510          }, /* $63 */
+    {   "stz",  2,  flUseLabel,               OH_Direct                    }, /* $64 */
+    {   "adc",  2,  flUseLabel,               OH_Direct                    }, /* $65 */
+    {   "ror",  2,  flUseLabel,               OH_Direct                    }, /* $66 */
+    {   "rmb6", 2,  flUseLabel,               OH_Direct,                   }, /* $67 */
+    {   "pla",  1,  flNone,                   OH_Implicit                  }, /* $68 */
+    {   "adc",  2,  flNone,                   OH_Immediate                 }, /* $69 */
+    {   "ror",  1,  flNone,                   OH_Accumulator               }, /* $6a */
+    {   "tza",  1,  flNone,                   OH_Implicit                  }, /* $6b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect       }, /* $6c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $6d */
+    {   "ror",  3,  flUseLabel,               OH_Absolute                  }, /* $6e */
+    {   "bbr6", 3,  flUseLabel,               OH_BitBranch                 }, /* $6f */
+    {   "bvs",  2,  flLabel,                  OH_Relative                  }, /* $70 */
+    {   "adc",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $71 */
+    {   "adc",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $72 */
+    {   "lbvs", 3,  flLabel,                  OH_RelativeLong4510          }, /* $73 */
+    {   "stz",  2,  flUseLabel,               OH_DirectX                   }, /* $74 */
+    {   "adc",  2,  flUseLabel,               OH_DirectX                   }, /* $75 */
+    {   "ror",  2,  flUseLabel,               OH_DirectX                   }, /* $76 */
+    {   "rmb7", 2,  flUseLabel,               OH_Direct                    }, /* $77 */
+    {   "sei",  1,  flNone,                   OH_Implicit                  }, /* $78 */
+    {   "adc",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $79 */
+    {   "ply",  1,  flNone,                   OH_Implicit                  }, /* $7a */
+    {   "tba",  1,  flNone,                   OH_Implicit                  }, /* $7b */
+    {   "jmp",  3,  flLabel,                  OH_AbsoluteXIndirect         }, /* $7c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $7d */
+    {   "ror",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $7e */
+    {   "bbr7", 3,  flUseLabel,               OH_BitBranch                 }, /* $7f */
+    {   "bra",  2,  flLabel,                  OH_Relative                  }, /* $80 */
+    {   "sta",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $81 */
+    {   "sta",  2,  flNone,                   OH_StackRelativeIndirectY4510}, /* $82 */
+    {   "lbra", 3,  flLabel,                  OH_RelativeLong4510          }, /* $83 */
+    {   "sty",  2,  flUseLabel,               OH_Direct                    }, /* $84 */
+    {   "sta",  2,  flUseLabel,               OH_Direct                    }, /* $85 */
+    {   "stx",  2,  flUseLabel,               OH_Direct                    }, /* $86 */
+    {   "smb0", 2,  flUseLabel,               OH_Direct                    }, /* $87 */
+    {   "dey",  1,  flNone,                   OH_Implicit                  }, /* $88 */
+    {   "bit",  2,  flNone,                   OH_Immediate                 }, /* $89 */
+    {   "txa",  1,  flNone,                   OH_Implicit                  }, /* $8a */
+    {   "sty",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $8b */
+    {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $8c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $8d */
+    {   "stx",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $8e */
+    {   "bbs0", 3,  flUseLabel,               OH_BitBranch                 }, /* $8f */
+    {   "bcc",  2,  flLabel,                  OH_Relative                  }, /* $90 */
+    {   "sta",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $91 */
+    {   "sta",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $92 */
+    {   "lbcc", 3,  flLabel,                  OH_RelativeLong4510          }, /* $93 */
+    {   "sty",  2,  flUseLabel,               OH_DirectX                   }, /* $94 */
+    {   "sta",  2,  flUseLabel,               OH_DirectX                   }, /* $95 */
+    {   "stx",  2,  flUseLabel,               OH_DirectY                   }, /* $96 */
+    {   "smb1", 2,  flUseLabel,               OH_Direct                    }, /* $97 */
+    {   "tya",  1,  flNone,                   OH_Implicit                  }, /* $98 */
+    {   "sta",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $99 */
+    {   "txs",  1,  flNone,                   OH_Implicit                  }, /* $9a */
+    {   "stx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY                 }, /* $9b */
+    {   "stz",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $9c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $9d */
+    {   "stz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $9e */
+    {   "bbs1", 3,  flUseLabel,               OH_BitBranch                 }, /* $9f */
+    {   "ldy",  2,  flNone,                   OH_Immediate                 }, /* $a0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $a1 */
+    {   "ldx",  2,  flNone,                   OH_Immediate                 }, /* $a2 */
+    {   "ldz",  2,  flNone,                   OH_Immediate                 }, /* $a3 */
+    {   "ldy",  2,  flUseLabel,               OH_Direct                    }, /* $a4 */
+    {   "lda",  2,  flUseLabel,               OH_Direct                    }, /* $a5 */
+    {   "ldx",  2,  flUseLabel,               OH_Direct                    }, /* $a6 */
+    {   "smb2", 2,  flUseLabel,               OH_Direct                    }, /* $a7 */
+    {   "tay",  1,  flNone,                   OH_Implicit                  }, /* $a8 */
+    {   "lda",  2,  flNone,                   OH_Immediate                 }, /* $a9 */
+    {   "tax",  1,  flNone,                   OH_Implicit                  }, /* $aa */
+    {   "ldz",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ab */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ac */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ad */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ae */
+    {   "bbs2", 3,  flUseLabel,               OH_BitBranch                 }, /* $af */
+    {   "bcs",  2,  flLabel,                  OH_Relative                  }, /* $b0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $b1 */
+    {   "lda",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $b2 */
+    {   "lbcs", 3,  flLabel,                  OH_RelativeLong4510          }, /* $b3 */
+    {   "ldy",  2,  flUseLabel,               OH_DirectX                   }, /* $b4 */
+    {   "lda",  2,  flUseLabel,               OH_DirectX                   }, /* $b5 */
+    {   "ldx",  2,  flUseLabel,               OH_DirectY                   }, /* $b6 */
+    {   "smb3", 2,  flUseLabel,               OH_Direct                    }, /* $b7 */
+    {   "clv",  1,  flNone,                   OH_Implicit                  }, /* $b8 */
+    {   "lda",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $b9 */
+    {   "tsx",  1,  flNone,                   OH_Implicit                  }, /* $ba */
+    {   "ldz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $bb */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $bc */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $bd */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY                 }, /* $be */
+    {   "bbs3", 3,  flUseLabel,               OH_BitBranch                 }, /* $bf */
+    {   "cpy",  2,  flNone,                   OH_Immediate                 }, /* $c0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $c1 */
+    {   "cpz",  2,  flNone,                   OH_Immediate                 }, /* $c2 */
+    {   "dew",  2,  flUseLabel,               OH_Direct                    }, /* $c3 */
+    {   "cpy",  2,  flUseLabel,               OH_Direct                    }, /* $c4 */
+    {   "cmp",  2,  flUseLabel,               OH_Direct                    }, /* $c5 */
+    {   "dec",  2,  flUseLabel,               OH_Direct                    }, /* $c6 */
+    {   "smb4", 2,  flUseLabel,               OH_Direct                    }, /* $c7 */
+    {   "iny",  1,  flNone,                   OH_Implicit                  }, /* $c8 */
+    {   "cmp",  2,  flNone,                   OH_Immediate                 }, /* $c9 */
+    {   "dex",  1,  flNone,                   OH_Implicit                  }, /* $ca */
+    {   "asw",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $cb */
+    {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $cc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $cd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ce */
+    {   "bbs4", 3,  flUseLabel,               OH_BitBranch                 }, /* $cf */
+    {   "bne",  2,  flLabel,                  OH_Relative                  }, /* $d0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $d1 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $d2 */
+    {   "lbne", 3,  flLabel,                  OH_RelativeLong4510          }, /* $d3 */
+    {   "cpz",  2,  flUseLabel,               OH_Direct                    }, /* $d4 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectX                   }, /* $d5 */
+    {   "dec",  2,  flUseLabel,               OH_DirectX                   }, /* $d6 */
+    {   "smb5", 2,  flUseLabel,               OH_Direct                    }, /* $d7 */
+    {   "cld",  1,  flNone,                   OH_Implicit                  }, /* $d8 */
+    {   "cmp",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $d9 */
+    {   "phx",  1,  flNone,                   OH_Implicit                  }, /* $da */
+    {   "phz",  1,  flNone,                   OH_Implicit                  }, /* $db */
+    {   "cpz",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $dc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $dd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $de */
+    {   "bbs5", 3,  flUseLabel,               OH_BitBranch                 }, /* $df */
+    {   "cpx",  2,  flNone,                   OH_Immediate                 }, /* $e0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect           }, /* $e1 */
+    {   "lda",  2,  flNone,                   OH_StackRelativeIndirectY4510}, /* $e2 */
+    {   "inw",  2,  flUseLabel,               OH_Direct                    }, /* $e3 */
+    {   "cpx",  2,  flUseLabel,               OH_Direct                    }, /* $e4 */
+    {   "sbc",  2,  flUseLabel,               OH_Direct                    }, /* $e5 */
+    {   "inc",  2,  flUseLabel,               OH_Direct                    }, /* $e6 */
+    {   "smb6", 2,  flUseLabel,               OH_Direct                    }, /* $e7 */
+    {   "inx",  1,  flNone,                   OH_Implicit                  }, /* $e8 */
+    {   "sbc",  2,  flNone,                   OH_Immediate                 }, /* $e9 */
+    {   "eom",  1,  flNone,                   OH_Implicit                  }, /* $ea */
+    {   "row",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $eb */
+    {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ec */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ed */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $ee */
+    {   "bbs6", 3,  flUseLabel,               OH_BitBranch                 }, /* $ef */
+    {   "beq",  2,  flLabel,                  OH_Relative                  }, /* $f0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectIndirectY           }, /* $f1 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectIndirectZ           }, /* $f2 */
+    {   "lbeq", 3,  flLabel,                  OH_RelativeLong4510          }, /* $f3 */
+    {   "phw",  3,  flNone,                   OH_ImmediateWord             }, /* $f4 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectX                   }, /* $f5 */
+    {   "inc",  2,  flUseLabel,               OH_DirectX                   }, /* $f6 */
+    {   "smb7", 2,  flUseLabel,               OH_Direct                    }, /* $f7 */
+    {   "sed",  1,  flNone,                   OH_Implicit                  }, /* $f8 */
+    {   "sbc",  3,  flUseLabel,               OH_AbsoluteY                 }, /* $f9 */
+    {   "plx",  1,  flNone,                   OH_Implicit                  }, /* $fa */
+    {   "plz",  1,  flNone,                   OH_Implicit                  }, /* $fb */
+    {   "phw",  3,  flUseLabel|flAbsOverride, OH_Absolute                  }, /* $fc */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $fd */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX                 }, /* $fe */
+    {   "bbs7", 3,  flUseLabel,               OH_BitBranch                 }, /* $ff */
+};
diff --git a/libsrc/apple2/dir.h b/src/da65/opc65ce02.h
similarity index 79%
rename from libsrc/apple2/dir.h
rename to src/da65/opc65ce02.h
index 369080c47..e3987dbcd 100644
--- a/libsrc/apple2/dir.h
+++ b/src/da65/opc65ce02.h
@@ -1,12 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                    dir.h                                  */
+/*                               opc65CE02.h                                 */
 /*                                                                           */
-/*                       Apple ][ system specific DIR                        */
+/*                      65CE02 opcode description table                      */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2005  Oliver Schmidt, <ol.sc@web.de>                                  */
+/* (C) 2003      Ullrich von Bassewitz                                       */
+/*               Roemerstrasse 52                                            */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -30,8 +33,12 @@
 
 
 
-#ifndef _DIR_H
-#define _DIR_H
+#ifndef OPC65CE02_H
+#define OPC65CE02_H
+
+
+
+#include "opcdesc.h"
 
 
 
@@ -41,22 +48,11 @@
 
 
 
-struct DIR {
-    int           fd;
-    unsigned char entry_length;
-    unsigned char entries_per_block;
-    unsigned char current_entry;
-    union {
-        unsigned char bytes[512];
-        struct {
-            unsigned      prev_block;
-            unsigned      next_block;
-            unsigned char entries[1];
-        } content;
-    } block;
-};
+/* Descriptions for all opcodes */
+extern const OpcDesc OpcTable_65CE02[256];
 
 
 
-/* End of dir.h */
+/* End of opc65CE02.h */
+
 #endif
diff --git a/src/da65/opcm740.c b/src/da65/opcm740.c
index 67a36b48c..6d12a7d37 100644
--- a/src/da65/opcm740.c
+++ b/src/da65/opcm740.c
@@ -44,264 +44,265 @@
 /*                                   Data                                    */
 /*****************************************************************************/
 
-
+/* CAUTION: in the pdf $1a is dec, and $3a is inc - if that is really the case,
+ * the table below should be fixed and this notice removed */
 
 /* Descriptions for all opcodes */
 const OpcDesc OpcTable_M740[256] = {
     {   "brk",  1,  flNone,                   OH_Implicit              }, /* $00 */
     {   "ora",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $01 */
     {   "jsr",  2,  flLabel,                  OH_JmpDirectIndirect     }, /* $02 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $03 */
+    {   "bbs0", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $03 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $04 */
     {   "ora",  2,  flUseLabel,               OH_Direct                }, /* $05 */
     {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $07 */
+    {   "bbs0", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $07 */
     {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
     {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
     {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $0b */
+    {   "seb0", 1,  flNone,                   OH_AccumulatorBit        }, /* $0b */
     {   "",     1,  flIllegal,                OH_Illegal,              }, /* $0c */
     {   "ora",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0d */
     {   "asl",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0e */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $0f */
+    {   "seb0", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $0f */
     {   "bpl",  2,  flLabel,                  OH_Relative              }, /* $10 */
     {   "ora",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $11 */
     {   "clt",  1,  flNone,                   OH_Implicit              }, /* $12 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $13 */
+    {   "bbc0", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $13 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $14 */
     {   "ora",  2,  flUseLabel,               OH_DirectX               }, /* $15 */
     {   "asl",  2,  flUseLabel,               OH_DirectX               }, /* $16 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $17 */
+    {   "bbc0", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $17 */
     {   "clc",  1,  flNone,                   OH_Implicit              }, /* $18 */
     {   "ora",  3,  flUseLabel,               OH_AbsoluteY             }, /* $19 */
-    {   "dec",  1,  flNone,                   OH_Accumulator           }, /* $1a */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $1b */
+    {   "inc",  1,  flNone,                   OH_Accumulator           }, /* $1a */
+    {   "clb0", 1,  flNone,                   OH_AccumulatorBit        }, /* $1b */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $1c */
     {   "ora",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1d */
     {   "asl",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1e */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $1f */
+    {   "clb0", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $1f */
     {   "jsr",  3,  flLabel,                  OH_Absolute              }, /* $20 */
     {   "and",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $21 */
     {   "jsr",  2,  flLabel,                  OH_SpecialPage           }, /* $22 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $23 */
+    {   "bbs1", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $23 */
     {   "bit",  2,  flUseLabel,               OH_Direct                }, /* $24 */
     {   "and",  2,  flUseLabel,               OH_Direct                }, /* $25 */
     {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $27 */
+    {   "bbs1", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $27 */
     {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
     {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
     {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $2b */
+    {   "seb1", 1,  flNone,                   OH_AccumulatorBit        }, /* $2b */
     {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
     {   "and",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2d */
     {   "rol",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2e */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $2f */
+    {   "seb1", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $2f */
     {   "bmi",  2,  flLabel,                  OH_Relative              }, /* $30 */
     {   "and",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $31 */
     {   "set",  1,  flNone,                   OH_Implicit              }, /* $32 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $33 */
+    {   "bbc1", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $33 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $34 */
     {   "and",  2,  flUseLabel,               OH_DirectX               }, /* $35 */
     {   "rol",  2,  flUseLabel,               OH_DirectX               }, /* $36 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $37 */
+    {   "bbc1", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $37 */
     {   "sec",  1,  flNone,                   OH_Implicit              }, /* $38 */
     {   "and",  3,  flUseLabel,               OH_AbsoluteY             }, /* $39 */
-    {   "inc",  1,  flNone,                   OH_Accumulator           }, /* $3a */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $3b */
+    {   "dec",  1,  flNone,                   OH_Accumulator           }, /* $3a */
+    {   "clb1", 1,  flNone,                   OH_AccumulatorBit        }, /* $3b */
     {   "ldm",  3,  flLabel,                  OH_DirectImmediate       }, /* $3c */
     {   "and",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3d */
     {   "rol",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3e */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $3f */
+    {   "clb1", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $3f */
     {   "rti",  1,  flNone,                   OH_Rts                   }, /* $40 */
     {   "eor",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $41 */
     {   "stp",  1,  flNone,                   OH_Implicit              }, /* $42 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $43 */
+    {   "bbs2", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $43 */
     {   "com",  2,  flUseLabel,               OH_Direct                }, /* $44 */
     {   "eor",  2,  flUseLabel,               OH_Direct                }, /* $45 */
     {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $47 */
+    {   "bbs2", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $47 */
     {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
     {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
     {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $4b */
+    {   "seb2", 1,  flNone,                   OH_AccumulatorBit        }, /* $4b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
     {   "eor",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $4d */
     {   "lsr",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $4e */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $4f */
+    {   "seb2", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $4f */
     {   "bvc",  2,  flLabel,                  OH_Relative              }, /* $50 */
     {   "eor",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $51 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $52 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $53 */
+    {   "bbc2", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $53 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $54 */
     {   "eor",  2,  flUseLabel,               OH_DirectX               }, /* $55 */
     {   "lsr",  2,  flUseLabel,               OH_DirectX               }, /* $56 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $57 */
+    {   "bbc2", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $57 */
     {   "cli",  1,  flNone,                   OH_Implicit              }, /* $58 */
     {   "eor",  3,  flUseLabel,               OH_AbsoluteY             }, /* $59 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $5a */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $5b */
+    {   "clb2", 1,  flNone,                   OH_AccumulatorBit        }, /* $5b */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $5c */
     {   "eor",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5d */
     {   "lsr",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5e */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $5f */
+    {   "clb2", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $5f */
     {   "rts",  1,  flNone,                   OH_Rts                   }, /* $60 */
     {   "adc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $61 */
-    {   "mul",  2,  flUseLabel,               OH_DirectX               }, /* $62 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $63 */
+    {   "",     1,  flIllegal,                OH_Illegal               }, /* $62 */
+    {   "bbs3", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $63 */
     {   "tst",  2,  flUseLabel,               OH_Direct                }, /* $64 */
     {   "adc",  2,  flUseLabel,               OH_Direct                }, /* $65 */
     {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $67 */
+    {   "bbs3", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $67 */
     {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
     {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
     {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $6b */
+    {   "seb3", 1,  flNone,                   OH_AccumulatorBit        }, /* $6b */
     {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
     {   "adc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $6d */
     {   "ror",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $6e */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $6f */
+    {   "seb3", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $6f */
     {   "bvs",  2,  flLabel,                  OH_Relative              }, /* $70 */
     {   "adc",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $71 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $72 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $73 */
+    {   "bbc3", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $73 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $74 */
     {   "adc",  2,  flUseLabel,               OH_DirectX               }, /* $75 */
     {   "ror",  2,  flUseLabel,               OH_DirectX               }, /* $76 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $77 */
+    {   "bbc3", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $77 */
     {   "sei",  1,  flNone,                   OH_Implicit              }, /* $78 */
     {   "adc",  3,  flUseLabel,               OH_AbsoluteY             }, /* $79 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $7a */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $7b */
+    {   "clb3", 1,  flNone,                   OH_AccumulatorBit        }, /* $7b */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $7c */
     {   "adc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7d */
     {   "ror",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7e */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $7f */
+    {   "clb3", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $7f */
     {   "bra",  2,  flLabel,                  OH_Relative              }, /* $80 */
     {   "sta",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $81 */
     {   "rrf",  2,  flLabel,                  OH_Direct                }, /* $82 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $83 */
+    {   "bbs4", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $83 */
     {   "sty",  2,  flUseLabel,               OH_Direct                }, /* $84 */
     {   "sta",  2,  flUseLabel,               OH_Direct                }, /* $85 */
     {   "stx",  2,  flUseLabel,               OH_Direct                }, /* $86 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $87 */
+    {   "bbs4", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $87 */
     {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $89 */
     {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $8b */
+    {   "seb4", 1,  flNone,                   OH_AccumulatorBit        }, /* $8b */
     {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8d */
     {   "stx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8e */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $8f */
+    {   "seb4", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $8f */
     {   "bcc",  2,  flLabel,                  OH_Relative              }, /* $90 */
     {   "sta",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $91 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $92 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $93 */
+    {   "bbc4", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $93 */
     {   "sty",  2,  flUseLabel,               OH_DirectX               }, /* $94 */
     {   "sta",  2,  flUseLabel,               OH_DirectX               }, /* $95 */
     {   "stx",  2,  flUseLabel,               OH_DirectY               }, /* $96 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $97 */
+    {   "bbc4", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $97 */
     {   "tya",  1,  flNone,                   OH_Implicit              }, /* $98 */
     {   "sta",  3,  flUseLabel,               OH_AbsoluteY             }, /* $99 */
     {   "txs",  1,  flNone,                   OH_Implicit              }, /* $9a */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $9b */
+    {   "clb4", 1,  flNone,                   OH_AccumulatorBit        }, /* $9b */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $9c */
     {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $9e */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $9f */
+    {   "clb4", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $9f */
     {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
     {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
     {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $a3 */
+    {   "bbs5", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $a3 */
     {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
     {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
     {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $a7 */
+    {   "bbs5", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $a7 */
     {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
     {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
     {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $ab */
+    {   "seb5", 1,  flNone,                   OH_AccumulatorBit        }, /* $ab */
     {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
     {   "lda",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ad */
     {   "ldx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ae */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $af */
+    {   "seb5", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $af */
     {   "bcs",  2,  flLabel,                  OH_Relative              }, /* $b0 */
     {   "lda",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $b1 */
     {   "jmp",  2,  flLabel,                  OH_JmpDirectIndirect     }, /* $b2 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $b3 */
+    {   "bbc5", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $b3 */
     {   "ldy",  2,  flUseLabel,               OH_DirectX               }, /* $b4 */
     {   "lda",  2,  flUseLabel,               OH_DirectX               }, /* $b5 */
     {   "ldx",  2,  flUseLabel,               OH_DirectY               }, /* $b6 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $b7 */
+    {   "bbc5", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $b7 */
     {   "clv",  1,  flNone,                   OH_Implicit              }, /* $b8 */
     {   "lda",  3,  flUseLabel,               OH_AbsoluteY             }, /* $b9 */
     {   "tsx",  1,  flNone,                   OH_Implicit              }, /* $ba */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $bb */
+    {   "clb5", 1,  flNone,                   OH_AccumulatorBit        }, /* $bb */
     {   "ldy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bc */
     {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
     {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $bf */
+    {   "clb5", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $bf */
     {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
     {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
-    {   "wit",  1,  flNone,                   OH_Implicit,             }, /* $c2 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $c3 */
+    {   "slw",  1,  flNone,                   OH_Implicit,             }, /* $c2 */
+    {   "bbs6", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $c3 */
     {   "cpy",  2,  flUseLabel,               OH_Direct                }, /* $c4 */
     {   "cmp",  2,  flUseLabel,               OH_Direct                }, /* $c5 */
     {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $c7 */
+    {   "bbs6", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $c7 */
     {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
     {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
     {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $cb */
+    {   "seb6", 1,  flNone,                   OH_AccumulatorBit        }, /* $cb */
     {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ce */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $cf */
+    {   "seb6", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $cf */
     {   "bne",  2,  flLabel,                  OH_Relative              }, /* $d0 */
     {   "cmp",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $d1 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $d2 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $d3 */
+    {   "bbc6", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $d3 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $d4 */
     {   "cmp",  2,  flUseLabel,               OH_DirectX               }, /* $d5 */
     {   "dec",  2,  flUseLabel,               OH_DirectX               }, /* $d6 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $d7 */
+    {   "bbc6", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $d7 */
     {   "cld",  1,  flNone,                   OH_Implicit              }, /* $d8 */
     {   "cmp",  3,  flUseLabel,               OH_AbsoluteY             }, /* $d9 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $da */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $db */
+    {   "clb6", 1,  flNone,                   OH_AccumulatorBit        }, /* $db */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $dc */
     {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
     {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $df */
+    {   "clb6", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $df */
     {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
     {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
-    {   "div",  2,  flUseLabel,               OH_DirectX               }, /* $e2 */
-    {   "bbs",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $e3 */
+    {   "fst",  1,  flNone,                   OH_Implicit              }, /* $e2 */
+    {   "bbs7", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $e3 */
     {   "cpx",  2,  flUseLabel,               OH_Direct                }, /* $e4 */
     {   "sbc",  2,  flUseLabel,               OH_Direct                }, /* $e5 */
     {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
-    {   "bbs",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $e7 */
+    {   "bbs7", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $e7 */
     {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
     {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
     {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
-    {   "seb",  1,  flNone,                   OH_AccumulatorBit        }, /* $eb */
+    {   "seb7", 1,  flNone,                   OH_AccumulatorBit        }, /* $eb */
     {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
     {   "sbc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ed */
     {   "inc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ee */
-    {   "seb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $ef */
+    {   "seb7", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $ef */
     {   "beq",  2,  flLabel,                  OH_Relative              }, /* $f0 */
     {   "sbc",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $f1 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $f2 */
-    {   "bbc",  2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $f3 */
+    {   "bbc7", 2,  flUseLabel,               OH_AccumulatorBitBranch  }, /* $f3 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $f4 */
     {   "sbc",  2,  flUseLabel,               OH_DirectX               }, /* $f5 */
     {   "inc",  2,  flUseLabel,               OH_DirectX               }, /* $f6 */
-    {   "bbc",  3,  flUseLabel,               OH_ZeroPageBit           }, /* $f7 */
+    {   "bbc7", 3,  flUseLabel,               OH_BitBranch_m740        }, /* $f7 */
     {   "sed",  1,  flNone,                   OH_Implicit              }, /* $f8 */
     {   "sbc",  3,  flUseLabel,               OH_AbsoluteY             }, /* $f9 */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $fa */
-    {   "clb",  1,  flNone,                   OH_AccumulatorBit        }, /* $fb */
+    {   "clb7", 1,  flNone,                   OH_AccumulatorBit        }, /* $fb */
     {   "",     1,  flIllegal,                OH_Illegal               }, /* $fc */
     {   "sbc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $fd */
     {   "inc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $fe */
-    {   "clb",  2,  flUseLabel,               OH_ZeroPageBit           }, /* $ff */
+    {   "clb7", 2,  flUseLabel,               OH_ZeroPageBit           }, /* $ff */
 };
diff --git a/src/da65/opctable.c b/src/da65/opctable.c
index d9068d253..de90dd83a 100644
--- a/src/da65/opctable.c
+++ b/src/da65/opctable.c
@@ -36,12 +36,15 @@
 /* da65 */
 #include "error.h"
 #include "opc4510.h"
+#include "opc45GS02.h"
 #include "opc6502.h"
 #include "opc6502x.h"
 #include "opc6502dtv.h"
 #include "opc65816.h"
 #include "opc65c02.h"
 #include "opc65sc02.h"
+#include "opcw65c02.h"
+#include "opc65ce02.h"
 #include "opchuc6280.h"
 #include "opcm740.h"
 #include "opctable.h"
@@ -74,10 +77,13 @@ void SetOpcTable (cpu_t CPU)
         case CPU_6502DTV: OpcTable = OpcTable_6502DTV;  break;
         case CPU_65SC02:  OpcTable = OpcTable_65SC02;   break;
         case CPU_65C02:   OpcTable = OpcTable_65C02;    break;
+        case CPU_W65C02:  OpcTable = OpcTable_W65C02;   break;
+        case CPU_65CE02:  OpcTable = OpcTable_65CE02;   break;
         case CPU_65816:   OpcTable = OpcTable_65816;    break;
         case CPU_HUC6280: OpcTable = OpcTable_HuC6280;  break;
         case CPU_M740:    OpcTable = OpcTable_M740;     break;
         case CPU_4510:    OpcTable = OpcTable_4510;     break;
+        case CPU_45GS02:  OpcTable = OpcTable_45GS02;   break;
         default:          Error ("Unsupported CPU");
     }
 }
diff --git a/src/da65/opcw65c02.c b/src/da65/opcw65c02.c
new file mode 100644
index 000000000..2c48e1019
--- /dev/null
+++ b/src/da65/opcw65c02.c
@@ -0,0 +1,306 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                opcw65c02.c                                */
+/*                                                                           */
+/*                      W65C02 opcode description table                      */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+/* da65 */
+#include "handler.h"
+#include "opcw65c02.h"
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* Descriptions for all opcodes */
+const OpcDesc OpcTable_W65C02[256] = {
+    {   "brk",  1,  flNone,                   OH_Implicit              }, /* $00 */
+    {   "ora",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $01 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $02 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $03 */
+    {   "tsb",  2,  flUseLabel,               OH_Direct                }, /* $04 */
+    {   "ora",  2,  flUseLabel,               OH_Direct                }, /* $05 */
+    {   "asl",  2,  flUseLabel,               OH_Direct                }, /* $06 */
+    {   "rmb0", 2,  flUseLabel,               OH_Direct,               }, /* $07 */
+    {   "php",  1,  flNone,                   OH_Implicit              }, /* $08 */
+    {   "ora",  2,  flNone,                   OH_Immediate             }, /* $09 */
+    {   "asl",  1,  flNone,                   OH_Accumulator           }, /* $0a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $0b */
+    {   "tsb",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $0e */
+    {   "bbr0", 3,  flUseLabel,               OH_BitBranch             }, /* $0f */
+    {   "bpl",  2,  flLabel,                  OH_Relative              }, /* $10 */
+    {   "ora",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $11 */
+    {   "ora",  2,  flUseLabel,               OH_DirectIndirect        }, /* $12 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $13 */
+    {   "trb",  2,  flUseLabel,               OH_Direct                }, /* $14 */
+    {   "ora",  2,  flUseLabel,               OH_DirectX               }, /* $15 */
+    {   "asl",  2,  flUseLabel,               OH_DirectX               }, /* $16 */
+    {   "rmb1", 2,  flUseLabel,               OH_Direct,               }, /* $17 */
+    {   "clc",  1,  flNone,                   OH_Implicit              }, /* $18 */
+    {   "ora",  3,  flUseLabel,               OH_AbsoluteY             }, /* $19 */
+    {   "inc",  1,  flNone,                   OH_Accumulator           }, /* $1a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $1b */
+    {   "trb",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $1c */
+    {   "ora",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1d */
+    {   "asl",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $1e */
+    {   "bbr1", 3,  flUseLabel,               OH_BitBranch             }, /* $1f */
+    {   "jsr",  3,  flLabel,                  OH_JsrAbsolute           }, /* $20 */
+    {   "and",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $21 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $22 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $23 */
+    {   "bit",  2,  flUseLabel,               OH_Direct                }, /* $24 */
+    {   "and",  2,  flUseLabel,               OH_Direct                }, /* $25 */
+    {   "rol",  2,  flUseLabel,               OH_Direct                }, /* $26 */
+    {   "rmb2", 2,  flUseLabel,               OH_Direct,               }, /* $27 */
+    {   "plp",  1,  flNone,                   OH_Implicit              }, /* $28 */
+    {   "and",  2,  flNone,                   OH_Immediate             }, /* $29 */
+    {   "rol",  1,  flNone,                   OH_Accumulator           }, /* $2a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $2b */
+    {   "bit",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $2e */
+    {   "bbr2", 3,  flUseLabel,               OH_BitBranch             }, /* $2f */
+    {   "bmi",  2,  flLabel,                  OH_Relative              }, /* $30 */
+    {   "and",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $31 */
+    {   "and",  2,  flUseLabel,               OH_DirectIndirect,       }, /* $32 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $33 */
+    {   "bit",  2,  flUseLabel,               OH_DirectX               }, /* $34 */
+    {   "and",  2,  flUseLabel,               OH_DirectX               }, /* $35 */
+    {   "rol",  2,  flUseLabel,               OH_DirectX               }, /* $36 */
+    {   "rmb3", 2,  flUseLabel,               OH_Direct,               }, /* $37 */
+    {   "sec",  1,  flNone,                   OH_Implicit              }, /* $38 */
+    {   "and",  3,  flUseLabel,               OH_AbsoluteY             }, /* $39 */
+    {   "dec",  1,  flNone,                   OH_Accumulator           }, /* $3a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $3b */
+    {   "bit",  3,  flUseLabel,               OH_AbsoluteX             }, /* $3c */
+    {   "and",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3d */
+    {   "rol",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $3e */
+    {   "bbr3", 3,  flUseLabel,               OH_BitBranch             }, /* $3f */
+    {   "rti",  1,  flNone,                   OH_Rts                   }, /* $40 */
+    {   "eor",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $41 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $42 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $43 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $44 */
+    {   "eor",  2,  flUseLabel,               OH_Direct                }, /* $45 */
+    {   "lsr",  2,  flUseLabel,               OH_Direct                }, /* $46 */
+    {   "rmb4", 2,  flUseLabel,               OH_Direct,               }, /* $47 */
+    {   "pha",  1,  flNone,                   OH_Implicit              }, /* $48 */
+    {   "eor",  2,  flNone,                   OH_Immediate             }, /* $49 */
+    {   "lsr",  1,  flNone,                   OH_Accumulator           }, /* $4a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $4b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsolute           }, /* $4c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $4d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $4e */
+    {   "bbr4", 3,  flUseLabel,               OH_BitBranch             }, /* $4f */
+    {   "bvc",  2,  flLabel,                  OH_Relative              }, /* $50 */
+    {   "eor",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $51 */
+    {   "eor",  2,  flUseLabel,               OH_DirectIndirect        }, /* $52 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $53 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $54 */
+    {   "eor",  2,  flUseLabel,               OH_DirectX               }, /* $55 */
+    {   "lsr",  2,  flUseLabel,               OH_DirectX               }, /* $56 */
+    {   "rmb5", 2,  flUseLabel,               OH_Direct,               }, /* $57 */
+    {   "cli",  1,  flNone,                   OH_Implicit              }, /* $58 */
+    {   "eor",  3,  flUseLabel,               OH_AbsoluteY             }, /* $59 */
+    {   "phy",  1,  flNone,                   OH_Implicit              }, /* $5a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $5b */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $5c */
+    {   "eor",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5d */
+    {   "lsr",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $5e */
+    {   "bbr5", 3,  flUseLabel,               OH_BitBranch             }, /* $5f */
+    {   "rts",  1,  flNone,                   OH_Rts                   }, /* $60 */
+    {   "adc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $61 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $62 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $63 */
+    {   "stz",  2,  flUseLabel,               OH_Direct                }, /* $64 */
+    {   "adc",  2,  flUseLabel,               OH_Direct                }, /* $65 */
+    {   "ror",  2,  flUseLabel,               OH_Direct                }, /* $66 */
+    {   "rmb6", 2,  flUseLabel,               OH_Direct,               }, /* $67 */
+    {   "pla",  1,  flNone,                   OH_Implicit              }, /* $68 */
+    {   "adc",  2,  flNone,                   OH_Immediate             }, /* $69 */
+    {   "ror",  1,  flNone,                   OH_Accumulator           }, /* $6a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $6b */
+    {   "jmp",  3,  flLabel,                  OH_JmpAbsoluteIndirect   }, /* $6c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $6d */
+    {   "ror",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $6e */
+    {   "bbr6", 3,  flUseLabel,               OH_BitBranch             }, /* $6f */
+    {   "bvs",  2,  flLabel,                  OH_Relative              }, /* $70 */
+    {   "adc",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $71 */
+    {   "adc",  2,  flUseLabel,               OH_DirectIndirect,       }, /* $72 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $73 */
+    {   "stz",  2,  flUseLabel,               OH_DirectX               }, /* $74 */
+    {   "adc",  2,  flUseLabel,               OH_DirectX               }, /* $75 */
+    {   "ror",  2,  flUseLabel,               OH_DirectX               }, /* $76 */
+    {   "rmb7", 2,  flUseLabel,               OH_Direct,               }, /* $77 */
+    {   "sei",  1,  flNone,                   OH_Implicit              }, /* $78 */
+    {   "adc",  3,  flUseLabel,               OH_AbsoluteY             }, /* $79 */
+    {   "ply",  1,  flNone,                   OH_Implicit              }, /* $7a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $7b */
+    {   "jmp",  3,  flLabel,                  OH_AbsoluteXIndirect     }, /* $7c */
+    {   "adc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7d */
+    {   "ror",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $7e */
+    {   "bbr7", 3,  flUseLabel,               OH_BitBranch             }, /* $7f */
+    {   "bra",  2,  flLabel,                  OH_Relative              }, /* $80 */
+    {   "sta",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $81 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $82 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $83 */
+    {   "sty",  2,  flUseLabel,               OH_Direct                }, /* $84 */
+    {   "sta",  2,  flUseLabel,               OH_Direct                }, /* $85 */
+    {   "stx",  2,  flUseLabel,               OH_Direct                }, /* $86 */
+    {   "smb0", 2,  flUseLabel,               OH_Direct,               }, /* $87 */
+    {   "dey",  1,  flNone,                   OH_Implicit              }, /* $88 */
+    {   "bit",  2,  flNone,                   OH_Immediate             }, /* $89 */
+    {   "txa",  1,  flNone,                   OH_Implicit              }, /* $8a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $8b */
+    {   "sty",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8d */
+    {   "stx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $8e */
+    {   "bbs0", 3,  flUseLabel,               OH_BitBranch             }, /* $8f */
+    {   "bcc",  2,  flLabel,                  OH_Relative              }, /* $90 */
+    {   "sta",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $91 */
+    {   "sta",  2,  flUseLabel,               OH_DirectIndirect        }, /* $92 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $93 */
+    {   "sty",  2,  flUseLabel,               OH_DirectX               }, /* $94 */
+    {   "sta",  2,  flUseLabel,               OH_DirectX               }, /* $95 */
+    {   "stx",  2,  flUseLabel,               OH_DirectY               }, /* $96 */
+    {   "smb1", 2,  flUseLabel,               OH_Direct,               }, /* $97 */
+    {   "tya",  1,  flNone,                   OH_Implicit              }, /* $98 */
+    {   "sta",  3,  flUseLabel,               OH_AbsoluteY             }, /* $99 */
+    {   "txs",  1,  flNone,                   OH_Implicit              }, /* $9a */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $9b */
+    {   "stz",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $9c */
+    {   "sta",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9d */
+    {   "stz",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $9e */
+    {   "bbs1", 3,  flUseLabel,               OH_BitBranch             }, /* $9f */
+    {   "ldy",  2,  flNone,                   OH_Immediate             }, /* $a0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $a1 */
+    {   "ldx",  2,  flNone,                   OH_Immediate             }, /* $a2 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $a3 */
+    {   "ldy",  2,  flUseLabel,               OH_Direct                }, /* $a4 */
+    {   "lda",  2,  flUseLabel,               OH_Direct                }, /* $a5 */
+    {   "ldx",  2,  flUseLabel,               OH_Direct                }, /* $a6 */
+    {   "smb2", 2,  flUseLabel,               OH_Direct,               }, /* $a7 */
+    {   "tay",  1,  flNone,                   OH_Implicit              }, /* $a8 */
+    {   "lda",  2,  flNone,                   OH_Immediate             }, /* $a9 */
+    {   "tax",  1,  flNone,                   OH_Implicit              }, /* $aa */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $ab */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ac */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ad */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ae */
+    {   "bbs2", 3,  flUseLabel,               OH_BitBranch             }, /* $af */
+    {   "bcs",  2,  flLabel,                  OH_Relative              }, /* $b0 */
+    {   "lda",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $b1 */
+    {   "lda",  2,  flUseLabel,               OH_DirectIndirect        }, /* $b2 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $b3 */
+    {   "ldy",  2,  flUseLabel,               OH_DirectX               }, /* $b4 */
+    {   "lda",  2,  flUseLabel,               OH_DirectX               }, /* $b5 */
+    {   "ldx",  2,  flUseLabel,               OH_DirectY               }, /* $b6 */
+    {   "smb3", 2,  flUseLabel,               OH_Direct,               }, /* $b7 */
+    {   "clv",  1,  flNone,                   OH_Implicit              }, /* $b8 */
+    {   "lda",  3,  flUseLabel,               OH_AbsoluteY             }, /* $b9 */
+    {   "tsx",  1,  flNone,                   OH_Implicit              }, /* $ba */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $bb */
+    {   "ldy",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bc */
+    {   "lda",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $bd */
+    {   "ldx",  3,  flUseLabel|flAbsOverride, OH_AbsoluteY             }, /* $be */
+    {   "bbs3", 3,  flUseLabel,               OH_BitBranch             }, /* $bf */
+    {   "cpy",  2,  flNone,                   OH_Immediate             }, /* $c0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $c1 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c2 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $c3 */
+    {   "cpy",  2,  flUseLabel,               OH_Direct                }, /* $c4 */
+    {   "cmp",  2,  flUseLabel,               OH_Direct                }, /* $c5 */
+    {   "dec",  2,  flUseLabel,               OH_Direct                }, /* $c6 */
+    {   "smb4", 2,  flUseLabel,               OH_Direct,               }, /* $c7 */
+    {   "iny",  1,  flNone,                   OH_Implicit              }, /* $c8 */
+    {   "cmp",  2,  flNone,                   OH_Immediate             }, /* $c9 */
+    {   "dex",  1,  flNone,                   OH_Implicit              }, /* $ca */
+    {   "wai",  1,  flNone,                   OH_Implicit              }, /* $cb */
+    {   "cpy",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $cd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ce */
+    {   "bbs4", 3,  flUseLabel,               OH_BitBranch             }, /* $cf */
+    {   "bne",  2,  flLabel,                  OH_Relative              }, /* $d0 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $d1 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectIndirect        }, /* $d2 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $d3 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $d4 */
+    {   "cmp",  2,  flUseLabel,               OH_DirectX               }, /* $d5 */
+    {   "dec",  2,  flUseLabel,               OH_DirectX               }, /* $d6 */
+    {   "smb5", 2,  flUseLabel,               OH_Direct,               }, /* $d7 */
+    {   "cld",  1,  flNone,                   OH_Implicit              }, /* $d8 */
+    {   "cmp",  3,  flUseLabel,               OH_AbsoluteY             }, /* $d9 */
+    {   "phx",  1,  flNone,                   OH_Implicit              }, /* $da */
+    {   "stp",  1,  flNone,                   OH_Implicit              }, /* $db */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $dc */
+    {   "cmp",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $dd */
+    {   "dec",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $de */
+    {   "bbs5", 3,  flUseLabel,               OH_BitBranch             }, /* $df */
+    {   "cpx",  2,  flNone,                   OH_Immediate             }, /* $e0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectXIndirect       }, /* $e1 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e2 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $e3 */
+    {   "cpx",  2,  flUseLabel,               OH_Direct                }, /* $e4 */
+    {   "sbc",  2,  flUseLabel,               OH_Direct                }, /* $e5 */
+    {   "inc",  2,  flUseLabel,               OH_Direct                }, /* $e6 */
+    {   "smb6", 2,  flUseLabel,               OH_Direct,               }, /* $e7 */
+    {   "inx",  1,  flNone,                   OH_Implicit              }, /* $e8 */
+    {   "sbc",  2,  flNone,                   OH_Immediate             }, /* $e9 */
+    {   "nop",  1,  flNone,                   OH_Implicit              }, /* $ea */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $eb */
+    {   "cpx",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ec */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ed */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_Absolute              }, /* $ee */
+    {   "bbs6", 3,  flUseLabel,               OH_BitBranch             }, /* $ef */
+    {   "beq",  2,  flLabel,                  OH_Relative              }, /* $f0 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectIndirectY       }, /* $f1 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectIndirect        }, /* $f2 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $f3 */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $f4 */
+    {   "sbc",  2,  flUseLabel,               OH_DirectX               }, /* $f5 */
+    {   "inc",  2,  flUseLabel,               OH_DirectX               }, /* $f6 */
+    {   "smb7", 2,  flUseLabel,               OH_Direct,               }, /* $f7 */
+    {   "sed",  1,  flNone,                   OH_Implicit              }, /* $f8 */
+    {   "sbc",  3,  flUseLabel,               OH_AbsoluteY             }, /* $f9 */
+    {   "plx",  1,  flNone,                   OH_Implicit              }, /* $fa */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $fb */
+    {   "",     1,  flIllegal,                OH_Illegal,              }, /* $fc */
+    {   "sbc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $fd */
+    {   "inc",  3,  flUseLabel|flAbsOverride, OH_AbsoluteX             }, /* $fe */
+    {   "bbs7", 3,  flUseLabel,               OH_BitBranch             }, /* $ff */
+};
diff --git a/libsrc/apple2/closedir.c b/src/da65/opcw65c02.h
similarity index 77%
rename from libsrc/apple2/closedir.c
rename to src/da65/opcw65c02.h
index d37d15bba..0805ce5dd 100644
--- a/libsrc/apple2/closedir.c
+++ b/src/da65/opcw65c02.h
@@ -1,12 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                closedir.c                                 */
+/*                                opcw65c02.h                                */
 /*                                                                           */
-/*                             Close a directory                             */
+/*                      W65C02 opcode description table                      */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2005  Oliver Schmidt, <ol.sc@web.de>                                  */
+/* (C) 2003      Ullrich von Bassewitz                                       */
+/*               Roemerstrasse 52                                            */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -30,28 +33,26 @@
 
 
 
-#include <stdlib.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include "dir.h"
+#ifndef OPCW65C02_H
+#define OPCW65C02_H
+
+
+
+#include "opcdesc.h"
 
 
 
 /*****************************************************************************/
-/*                                   Code                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-int __fastcall__ closedir (DIR* dir)
-{
-    int result;
+/* Descriptions for all opcodes */
+extern const OpcDesc OpcTable_W65C02[256];
 
-    /* Cleanup directory file */
-    result = close (dir->fd);
 
-    /* Cleanup DIR */
-    free (dir);
 
-    return result;
-}
+/* End of opcw65c02.h */
+
+#endif
diff --git a/src/da65/output.c b/src/da65/output.c
index 8e786e130..13cb3e127 100644
--- a/src/da65/output.c
+++ b/src/da65/output.c
@@ -33,6 +33,7 @@
 
 
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -123,7 +124,7 @@ void CloseOutput (void)
 void Output (const char* Format, ...)
 /* Write to the output file */
 {
-    if (Pass == PassCount) {
+    if (Pass == PASS_FINAL) {
         va_list ap;
         va_start (ap, Format);
         Col += vfprintf (F, Format, ap);
@@ -136,7 +137,7 @@ void Output (const char* Format, ...)
 void Indent (unsigned N)
 /* Make sure the current line column is at position N (zero based) */
 {
-    if (Pass == PassCount) {
+    if (Pass == PASS_FINAL) {
         while (Col < N) {
             fputc (' ', F);
             ++Col;
@@ -149,7 +150,7 @@ void Indent (unsigned N)
 void LineFeed (void)
 /* Add a linefeed to the output file */
 {
-    if (Pass == PassCount) {
+    if (Pass == PASS_FINAL) {
         fputc ('\n', F);
         if (PageLength > 0 && ++Line >= PageLength) {
             if (FormFeeds) {
@@ -184,7 +185,7 @@ void DefForward (const char* Name, const char* Comment, unsigned Offs)
 ** current PC.
 */
 {
-    if (Pass == PassCount) {
+    if (Pass == PASS_FINAL) {
         /* Flush existing output if necessary */
         if (Col > 1) {
             LineFeed ();
@@ -208,13 +209,13 @@ void DefForward (const char* Name, const char* Comment, unsigned Offs)
 
 
 
-void DefConst (const char* Name, const char* Comment, unsigned Addr)
+void DefConst (const char* Name, const char* Comment, uint32_t Addr)
 /* Define an address constant */
 {
-    if (Pass == PassCount) {
+    if (Pass == PASS_FINAL) {
         Output ("%s", Name);
         Indent (ACol);
-        Output (":= $%04X", Addr);
+        Output (":= $%04" PRIX32, Addr);
         if (Comment) {
             Indent (CCol);
             Output ("; %s", Comment);
@@ -225,19 +226,19 @@ void DefConst (const char* Name, const char* Comment, unsigned Addr)
 
 
 
-void DataByteLine (unsigned ByteCount)
+void DataByteLine (uint32_t ByteCount)
 /* Output a line with bytes */
 {
-    unsigned I;
+    uint32_t I;
 
     Indent (MCol);
     Output (".byte");
     Indent (ACol);
     for (I = 0; I < ByteCount; ++I) {
         if (I > 0) {
-            Output (",$%02X", CodeBuf[PC+I]);
+            Output (",$%02" PRIX8, CodeBuf[PC+I]);
         } else {
-            Output ("$%02X", CodeBuf[PC+I]);
+            Output ("$%02" PRIX8, CodeBuf[PC+I]);
         }
     }
     LineComment (PC, ByteCount);
@@ -246,19 +247,19 @@ void DataByteLine (unsigned ByteCount)
 
 
 
-void DataDByteLine (unsigned ByteCount)
+void DataDByteLine (uint32_t ByteCount)
 /* Output a line with dbytes */
 {
-    unsigned I;
+    uint32_t I;
 
     Indent (MCol);
     Output (".dbyt");
     Indent (ACol);
     for (I = 0; I < ByteCount; I += 2) {
         if (I > 0) {
-            Output (",$%04X", GetCodeDByte (PC+I));
+            Output (",$%04" PRIX16, GetCodeDByte (PC+I));
         } else {
-            Output ("$%04X", GetCodeDByte (PC+I));
+            Output ("$%04" PRIX16, GetCodeDByte (PC+I));
         }
     }
     LineComment (PC, ByteCount);
@@ -267,19 +268,19 @@ void DataDByteLine (unsigned ByteCount)
 
 
 
-void DataWordLine (unsigned ByteCount)
+void DataWordLine (uint32_t ByteCount)
 /* Output a line with words */
 {
-    unsigned I;
+    uint32_t I;
 
     Indent (MCol);
     Output (".word");
     Indent (ACol);
     for (I = 0; I < ByteCount; I += 2) {
         if (I > 0) {
-            Output (",$%04X", GetCodeWord (PC+I));
+            Output (",$%04" PRIX16, GetCodeWord (PC+I));
         } else {
-            Output ("$%04X", GetCodeWord (PC+I));
+            Output ("$%04" PRIX16, GetCodeWord (PC+I));
         }
     }
     LineComment (PC, ByteCount);
@@ -288,19 +289,19 @@ void DataWordLine (unsigned ByteCount)
 
 
 
-void DataDWordLine (unsigned ByteCount)
+void DataDWordLine (uint32_t ByteCount)
 /* Output a line with dwords */
 {
-    unsigned I;
+    uint32_t I;
 
     Indent (MCol);
     Output (".dword");
     Indent (ACol);
     for (I = 0; I < ByteCount; I += 4) {
         if (I > 0) {
-            Output (",$%08lX", GetCodeDWord (PC+I));
+            Output (",$%08" PRIX32, GetCodeDWord (PC+I));
         } else {
-            Output ("$%08lX", GetCodeDWord (PC+I));
+            Output ("$%08" PRIX32, GetCodeDWord (PC+I));
         }
     }
     LineComment (PC, ByteCount);
@@ -312,7 +313,7 @@ void DataDWordLine (unsigned ByteCount)
 void SeparatorLine (void)
 /* Print a separator line */
 {
-    if (Pass == PassCount && Comments >= 1) {
+    if (Pass == PASS_FINAL && Comments >= 1) {
         Output ("; ----------------------------------------------------------------------------");
         LineFeed ();
     }
@@ -323,7 +324,7 @@ void SeparatorLine (void)
 void StartSegment (const char* Name, unsigned AddrSize)
 /* Start a segment */
 {
-    if (Pass == PassCount) {
+    if (Pass == PASS_FINAL) {
         LineFeed ();
         Output (".segment");
         Indent (ACol);
@@ -367,17 +368,17 @@ void LineComment (unsigned PC, unsigned Count)
 {
     unsigned I;
 
-    if (Pass == PassCount && Comments >= 2) {
+    if (Pass == PASS_FINAL && Comments >= 2) {
         Indent (CCol);
         Output ("; %04X", PC);
         if (Comments >= 3) {
             for (I = 0; I < Count; ++I) {
-                Output (" %02X", CodeBuf [PC+I]);
+                Output (" %02" PRIX8, CodeBuf [PC+I]);
             }
             if (Comments >= 4) {
                 Indent (TCol);
                 for (I = 0; I < Count; ++I) {
-                    unsigned char C = CodeBuf [PC+I];
+                    uint8_t C = CodeBuf [PC+I];
                     if (!isprint (C)) {
                         C = '.';
                     }
diff --git a/src/da65/output.h b/src/da65/output.h
index bc20aace0..7370e0786 100644
--- a/src/da65/output.h
+++ b/src/da65/output.h
@@ -72,22 +72,22 @@ void DefForward (const char* Name, const char* Comment, unsigned Offs);
 ** current PC.
 */
 
-void DefConst (const char* Name, const char* Comment, unsigned Addr);
+void DefConst (const char* Name, const char* Comment, uint32_t Addr);
 /* Define an address constant */
 
 void OneDataByte (void);
 /* Output a .byte line with the current code byte */
 
-void DataByteLine (unsigned ByteCount);
+void DataByteLine (uint32_t ByteCount);
 /* Output a line with bytes */
 
-void DataDByteLine (unsigned ByteCount);
+void DataDByteLine (uint32_t ByteCount);
 /* Output a line with dbytes */
 
-void DataWordLine (unsigned ByteCount);
+void DataWordLine (uint32_t ByteCount);
 /* Output a line with words */
 
-void DataDWordLine (unsigned ByteCount);
+void DataDWordLine (uint32_t ByteCount);
 /* Output a line with dwords */
 
 void SeparatorLine (void);
diff --git a/src/da65/scanner.c b/src/da65/scanner.c
index d0301c08a..22319aba3 100644
--- a/src/da65/scanner.c
+++ b/src/da65/scanner.c
@@ -600,11 +600,11 @@ void InfoAssureIdent (void)
 
 
 
-void InfoRangeCheck (long Lo, long Hi)
+void InfoRangeCheck (const char* Attr, long Lo, long Hi)
 /* Check the range of InfoIVal */
 {
     if (InfoIVal < Lo || InfoIVal > Hi) {
-        InfoError ("Range error");
+        InfoError ("Range error for attribute %s", Attr);
     }
 }
 
@@ -671,8 +671,8 @@ void InfoSetName (const char* Name)
 /* Set a name for a config file */
 {
     InfoFile = Name;
-    xfree(InputSrcName);
-    InputSrcName = xstrdup(Name);
+    xfree (InputSrcName);
+    InputSrcName = xstrdup (Name);
 }
 
 
diff --git a/src/da65/scanner.h b/src/da65/scanner.h
index ce76d4a98..e34aecb4f 100644
--- a/src/da65/scanner.h
+++ b/src/da65/scanner.h
@@ -191,7 +191,7 @@ void InfoAssureChar (void);
 void InfoAssureIdent (void);
 /* Make sure the next token is an identifier */
 
-void InfoRangeCheck (long Lo, long Hi);
+void InfoRangeCheck (const char* Attr, long Lo, long Hi);
 /* Check the range of InfoIVal */
 
 void InfoSpecialToken (const IdentTok* Table, unsigned Size, const char* Name);
diff --git a/src/da65/segment.c b/src/da65/segment.c
index 12d4cf656..1a0b3b062 100644
--- a/src/da65/segment.c
+++ b/src/da65/segment.c
@@ -58,7 +58,7 @@
 typedef struct Segment Segment;
 struct Segment {
     Segment*            NextStart;      /* Pointer to next segment */
-    unsigned long       Start;
+    uint32_t            Start;
     unsigned            AddrSize;
     char                Name[1];        /* Name, dynamically allocated */
 };
@@ -76,7 +76,7 @@ static Segment* StartTab[HASH_SIZE];    /* Table containing segment starts */
 
 
 
-void AddAbsSegment (unsigned Start, unsigned End, const char* Name)
+void AddAbsSegment (uint32_t Start, uint32_t End, const char* Name)
 /* Add an absolute segment to the segment table */
 {
     /* Get the length of the name */
@@ -104,7 +104,7 @@ void AddAbsSegment (unsigned Start, unsigned End, const char* Name)
 
 
 
-char* GetSegmentStartName (unsigned Addr)
+char* GetSegmentStartName (uint32_t Addr)
 /* Return the name of the segment which starts at the given address */
 {
     Segment* S = StartTab[Addr % HASH_SIZE];
@@ -122,7 +122,7 @@ char* GetSegmentStartName (unsigned Addr)
 
 
 
-unsigned GetSegmentAddrSize (unsigned Addr)
+unsigned GetSegmentAddrSize (uint32_t Addr)
 /* Return the address size of the segment which starts at the given address */
 {
     Segment* S = StartTab[Addr % HASH_SIZE];
diff --git a/src/da65/segment.h b/src/da65/segment.h
index b1423bb41..5da30fda3 100644
--- a/src/da65/segment.h
+++ b/src/da65/segment.h
@@ -44,13 +44,13 @@
 
 
 
-void AddAbsSegment (unsigned Start, unsigned End, const char* Name);
+void AddAbsSegment (uint32_t Start, uint32_t End, const char* Name);
 /* Add an absolute segment to the segment table */
 
-char* GetSegmentStartName (unsigned Addr);
+char* GetSegmentStartName (uint32_t Addr);
 /* Return the name of the segment which starts at the given address */
 
-unsigned GetSegmentAddrSize (unsigned Addr);
+unsigned GetSegmentAddrSize (uint32_t Addr);
 /* Return the address size of the segment which starts at the given address */
 
 
diff --git a/src/dbginfo/dbginfo.c b/src/dbginfo/dbginfo.c
index fee41012c..896043cb6 100644
--- a/src/dbginfo/dbginfo.c
+++ b/src/dbginfo/dbginfo.c
@@ -127,6 +127,7 @@ typedef enum {
     TOK_ABSOLUTE = TOK_FIRST_KEYWORD,   /* ABSOLUTE keyword */
     TOK_ADDRSIZE,                       /* ADDRSIZE keyword */
     TOK_AUTO,                           /* AUTO keyword */
+    TOK_BANK,                           /* BANK keyword */
     TOK_COUNT,                          /* COUNT keyword */
     TOK_CSYM,                           /* CSYM keyword */
     TOK_DEF,                            /* DEF keyword */
@@ -347,6 +348,7 @@ struct SegInfo {
     cc65_size           Size;           /* Size of segment */
     char*               OutputName;     /* Name of output file */
     unsigned long       OutputOffs;     /* Offset in output file */
+    unsigned            Bank;           /* Bank number of memory area */
     char                Name[1];        /* Name of segment */
 };
 
@@ -1618,7 +1620,8 @@ static int CompareScopeInfoByName (const void* L, const void* R)
 
 static SegInfo* NewSegInfo (const StrBuf* Name, unsigned Id,
                             cc65_addr Start, cc65_addr Size,
-                            const StrBuf* OutputName, unsigned long OutputOffs)
+                            const StrBuf* OutputName, unsigned long OutputOffs,
+                            unsigned Bank)
 /* Create a new SegInfo struct and return it */
 {
     /* Allocate memory */
@@ -1628,6 +1631,7 @@ static SegInfo* NewSegInfo (const StrBuf* Name, unsigned Id,
     S->Id         = Id;
     S->Start      = Start;
     S->Size       = Size;
+    S->Bank       = Bank;
     if (SB_GetLen (OutputName) > 0) {
         /* Output file given */
         S->OutputName = SB_StrDup (OutputName);
@@ -1676,6 +1680,7 @@ static void CopySegInfo (cc65_segmentdata* D, const SegInfo* S)
     D->segment_size  = S->Size;
     D->output_name   = S->OutputName;
     D->output_offs   = S->OutputOffs;
+    D->segment_bank  = S->Bank;
 }
 
 
@@ -2518,6 +2523,7 @@ static void NextChar (InputData* D)
 
 
 
+/* CAUTION: table must be sorted for bsearch */
 static void NextToken (InputData* D)
 /* Read the next token from the input stream */
 {
@@ -2525,9 +2531,11 @@ static void NextToken (InputData* D)
         const char      Keyword[12];
         Token           Tok;
     } KeywordTable[] = {
+/* BEGIN SORTED.SH */
         { "abs",        TOK_ABSOLUTE    },
         { "addrsize",   TOK_ADDRSIZE    },
         { "auto",       TOK_AUTO        },
+        { "bank",       TOK_BANK        },
         { "count",      TOK_COUNT       },
         { "csym",       TOK_CSYM        },
         { "def",        TOK_DEF         },
@@ -2572,6 +2580,7 @@ static void NextToken (InputData* D)
         { "var",        TOK_VAR         },
         { "version",    TOK_VERSION     },
         { "zp",         TOK_ZEROPAGE    },
+/* END SORTED.SH */
     };
 
 
@@ -3838,6 +3847,7 @@ static void ParseSegment (InputData* D)
     StrBuf          Name = STRBUF_INITIALIZER;
     StrBuf          OutputName = STRBUF_INITIALIZER;
     unsigned long   OutputOffs = 0;
+    unsigned        Bank = 0;
     SegInfo*        S;
     enum {
         ibNone      = 0x000,
@@ -3850,6 +3860,7 @@ static void ParseSegment (InputData* D)
         ibSize      = 0x020,
         ibStart     = 0x040,
         ibType      = 0x080,
+        ibBank      = 0x100,
 
         ibRequired  = ibId | ibName | ibStart | ibSize | ibAddrSize | ibType,
     } InfoBits = ibNone;
@@ -3863,10 +3874,11 @@ static void ParseSegment (InputData* D)
         Token Tok;
 
         /* Something we know? */
-        if (D->Tok != TOK_ADDRSIZE      && D->Tok != TOK_ID         &&
-            D->Tok != TOK_NAME          && D->Tok != TOK_OUTPUTNAME &&
-            D->Tok != TOK_OUTPUTOFFS    && D->Tok != TOK_SIZE       &&
-            D->Tok != TOK_START         && D->Tok != TOK_TYPE) {
+        if (D->Tok != TOK_ADDRSIZE      && D->Tok != TOK_BANK       &&
+            D->Tok != TOK_ID            && D->Tok != TOK_NAME       &&
+            D->Tok != TOK_OUTPUTNAME    && D->Tok != TOK_OUTPUTOFFS &&
+            D->Tok != TOK_SIZE          && D->Tok != TOK_START      &&
+            D->Tok != TOK_TYPE) {
 
             /* Try smart error recovery */
             if (D->Tok == TOK_IDENT || TokenIsKeyword (D->Tok)) {
@@ -3892,6 +3904,15 @@ static void ParseSegment (InputData* D)
                 InfoBits |= ibAddrSize;
                 break;
 
+            case TOK_BANK:
+                if (!IntConstFollows (D)) {
+                    goto ErrorExit;
+                }
+                Bank = D->IVal;
+                InfoBits |= ibBank;
+                NextToken (D);
+                break;
+
             case TOK_ID:
                 if (!IntConstFollows (D)) {
                     goto ErrorExit;
@@ -3992,7 +4013,7 @@ static void ParseSegment (InputData* D)
     }
 
     /* Create the segment info and remember it */
-    S = NewSegInfo (&Name, Id, Start, Size, &OutputName, OutputOffs);
+    S = NewSegInfo (&Name, Id, Start, Size, &OutputName, OutputOffs, Bank);
     CollReplaceExpand (&D->Info->SegInfoById, S, Id);
     CollAppend (&D->Info->SegInfoByName, S);
 
diff --git a/src/dbginfo/dbginfo.h b/src/dbginfo/dbginfo.h
index 95aae837c..07914f238 100644
--- a/src/dbginfo/dbginfo.h
+++ b/src/dbginfo/dbginfo.h
@@ -521,6 +521,7 @@ struct cc65_segmentdata {
     cc65_size           segment_size;   /* Size of segment */
     const char*         output_name;    /* Output file this seg was written to */
     unsigned long       output_offs;    /* Offset of this seg in output file */
+    unsigned            segment_bank;
 };
 
 typedef struct cc65_segmentinfo cc65_segmentinfo;
diff --git a/src/dbginfo/dbgsh.c b/src/dbginfo/dbgsh.c
index ba5d83849..e848c47cd 100644
--- a/src/dbginfo/dbgsh.c
+++ b/src/dbginfo/dbgsh.c
@@ -458,7 +458,7 @@ static unsigned FindIdType (const char* TypeName)
         {   "segment",  SegmentId       },
         {   "source",   SourceId        },
         {   "src",      SourceId        },
-        {   "sp",       SpanId          },
+        {   "c_sp",     SpanId          },
         {   "span",     SpanId          },
         {   "sym",      SymbolId        },
         {   "symbol",   SymbolId        },
@@ -721,7 +721,7 @@ static void PrintSegmentHeader (void)
 /* Output a header for a list of segments */
 {
     /* Header */
-    PrintLine ("  id    name            address  size   output file     offs");
+    PrintLine ("  id    name            address  size   output file     offs   bank");
     PrintSeparator ();
 }
 
@@ -741,6 +741,7 @@ static void PrintSegments (const cc65_segmentinfo* S)
         PrintSize (D->segment_size, 7);
         Print ("%-16s", D->output_name? D->output_name : "");
         PrintSize (D->output_offs, 6);
+        PrintId (D->segment_bank, 8);
         NewLine ();
     }
 }
diff --git a/src/grc65.vcxproj b/src/grc65.vcxproj
index fbd44fa3e..742003899 100644
--- a/src/grc65.vcxproj
+++ b/src/grc65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E0FD0AB3-3BEE-496F-8108-A8E0F8933F39}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="grc65\main.c" />
   </ItemGroup>
diff --git a/src/grc65/main.c b/src/grc65/main.c
index 7d31bfc52..5ef9e9645 100644
--- a/src/grc65/main.c
+++ b/src/grc65/main.c
@@ -231,9 +231,11 @@ static int findToken (const char * const *tokenTbl, const char *token)
     /* takes as input table of tokens and token, returns position in table or -1 if not found */
     int i;
 
-    for (i = 0; tokenTbl[i][0]; i++) {
-        if (strcmp (tokenTbl[i], token) == 0) {
-            return i;
+    if (token != NULL) {
+        for (i = 0; tokenTbl[i][0]; i++) {
+            if (strcmp (tokenTbl[i], token) == 0) {
+                return i;
+            }
         }
     }
 
diff --git a/src/ld65.vcxproj b/src/ld65.vcxproj
index 9e4b08621..e2f06b198 100644
--- a/src/ld65.vcxproj
+++ b/src/ld65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{26C749A0-814C-47A2-9D36-AE92AE932FE4}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -38,6 +53,19 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
+      <MapFileName>ld65.map</MapFileName>
+      <MapExports>true</MapExports>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <MapFileName>ld65.map</MapFileName>
+      <MapExports>true</MapExports>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -48,6 +76,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="ld65\asserts.h" />
     <ClInclude Include="ld65\bin.h" />
@@ -118,4 +155,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/ld65/config.c b/src/ld65/config.c
index 6c1f6ad4c..cb55fae69 100644
--- a/src/ld65/config.c
+++ b/src/ld65/config.c
@@ -889,6 +889,7 @@ static void ParseO65 (void)
         CfgOptionalAssign ();
 
         /* Check which attribute was given */
+        CfgSymbol* Sym;
         switch (AttrTok) {
 
             case CFGTOK_EXPORT:
@@ -896,8 +897,11 @@ static void ParseO65 (void)
                 AttrFlags |= atExport;
                 /* We expect an identifier */
                 CfgAssureIdent ();
-                /* Remember it as an export for later */
-                NewCfgSymbol (CfgSymO65Export, GetStrBufId (&CfgSVal));
+                /* Remember it as an export for later. We do not support o65
+                 * output for the 65816, so the address size is always 16 bit.
+                 */
+                Sym = NewCfgSymbol (CfgSymO65Export, GetStrBufId (&CfgSVal));
+                Sym->AddrSize = ADDR_SIZE_ABS;
                 /* Eat the identifier token */
                 CfgNextTok ();
                 break;
@@ -907,8 +911,11 @@ static void ParseO65 (void)
                 AttrFlags |= atImport;
                 /* We expect an identifier */
                 CfgAssureIdent ();
-                /* Remember it as an import for later */
-                NewCfgSymbol (CfgSymO65Import, GetStrBufId (&CfgSVal));
+                /* Remember it as an import for later. We do not support o65
+                 * output for the 65816, so the address size is always 16 bit.
+                 */
+                Sym = NewCfgSymbol (CfgSymO65Import, GetStrBufId (&CfgSVal));
+                Sym->AddrSize = ADDR_SIZE_ABS;
                 /* Eat the identifier token */
                 CfgNextTok ();
                 break;
@@ -2100,7 +2107,9 @@ unsigned CfgProcess (void)
                             FillLevel - M->Size, (FillLevel - M->Size == 1) ? "" : "s");
             }
             if (FillLevel > M->FillLevel) {
-                /* Regular segments increase FillLevel. Overwrite segments may increase but not decrease FillLevel. */
+                /* Regular segments increase FillLevel. Overwrite segments may
+                ** increase but not decrease FillLevel.
+                */
                 FillAdded = FillLevel - M->FillLevel;
                 M->FillLevel = FillLevel;
             }
@@ -2120,15 +2129,18 @@ unsigned CfgProcess (void)
             /* Calculate the new address */
             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.
-            ** An OVERWRITE segment will only increase the size if it overlapped some of the fill area.
+            /* If this segment will go out to the file, or its place 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)) {
-                M->F->Size += (!(S->Flags & SF_OVERWRITE)) ?
-                    (Addr - StartAddr) :
-                    FillAdded;
+                if ((S->Flags & SF_OVERWRITE) == 0) {
+                    M->F->Size += Addr - StartAddr;
+                } else {
+                    M->F->Size += FillAdded;
+                }
             }
         }
 
@@ -2166,7 +2178,7 @@ unsigned CfgProcess (void)
         ** area, account for that in the file size.
         */
         if ((M->Flags & MF_OVERFLOW) == 0 && (M->Flags & MF_FILL) != 0) {
-            M->F->Size += (M->Size - M->FillLevel);
+            M->F->Size = M->FileOffs + M->Size;
         }
     }
 
diff --git a/src/ld65/dbgsyms.c b/src/ld65/dbgsyms.c
index 955f0f76d..082954b07 100644
--- a/src/ld65/dbgsyms.c
+++ b/src/ld65/dbgsyms.c
@@ -532,7 +532,7 @@ void PrintDbgSymLabels (FILE* F)
             if (GetDbgSym (D, Val) == 0) {
 
                 /* Emit the VICE label line */
-                fprintf (F, "al %06lX .%s\n", Val, GetString (D->Name));
+                PrintLabelLine (F, D->Name, Val);
 
                 /* Insert the symbol into the table */
                 InsertDbgSym (D, Val);
diff --git a/src/ld65/exports.c b/src/ld65/exports.c
index 9149f54d1..f457b5490 100644
--- a/src/ld65/exports.c
+++ b/src/ld65/exports.c
@@ -39,6 +39,7 @@
 
 /* common */
 #include "addrsize.h"
+#include "chartype.h"
 #include "check.h"
 #include "hashfunc.h"
 #include "lidefs.h"
@@ -808,6 +809,15 @@ static int CmpExpName (const void* K1, const void* K2)
 
 
 
+static int CmpExpValue (const void* K1, const void* K2)
+/* Compare function for qsort */
+{
+    long Diff = GetExportVal (*(Export**)K1) - GetExportVal (*(Export**)K2);
+    return Diff < 0? -1 : Diff > 0? 1 : 0;
+}
+
+
+
 static void CreateExportPool (void)
 /* Create an array with pointer to all exports */
 {
@@ -880,19 +890,25 @@ static char GetAddrSizeCode (unsigned char AddrSize)
 
 
 
-void PrintExportMapByName (FILE* F)
-/* Print an export map, sorted by symbol name, to the given file */
+static void PrintExportMap (Export** Pool, unsigned Count, FILE* F)
+/* Print an export map to the given file */
 {
     unsigned I;
-    unsigned Count;
 
     /* Print all exports */
-    Count = 0;
-    for (I = 0; I < ExpCount; ++I) {
-        const Export* E = ExpPool [I];
+    unsigned Col = 0;
+    for (I = 0; I < Count; ++I) {
+        const Export* E = Pool [I];
 
-        /* Print unreferenced symbols only if explictly requested */
-        if (VerboseMap || E->ImpCount > 0 || SYM_IS_CONDES (E->Type)) {
+        /* Print unreferenced symbols only if explictly requested. If Expr is
+        ** NULL, the export is undefined. This happens for imports that don't
+        ** have a matching export, but if we have one of those, we don't come
+        ** here. It does also happen for imports that where satisfied from
+        ** elsewhere, like o65 imports defined in the linker config.
+        ** So ignore exports here that have an invalid Expr.
+        */
+        if (E->Expr != 0 &&
+            (VerboseMap || E->ImpCount > 0 || SYM_IS_CONDES (E->Type))) {
             fprintf (F,
                      "%-25s %06lX %c%c%c%c   ",
                      GetString (E->Name),
@@ -901,8 +917,8 @@ void PrintExportMapByName (FILE* F)
                      SYM_IS_LABEL (E->Type)? 'L' : 'E',
                      GetAddrSizeCode ((unsigned char) E->AddrSize),
                      SYM_IS_CONDES (E->Type)? 'I' : ' ');
-            if (++Count == 2) {
-                Count = 0;
+            if (++Col == 2) {
+                Col = 0;
                 fprintf (F, "\n");
             }
         }
@@ -912,13 +928,10 @@ void PrintExportMapByName (FILE* F)
 
 
 
-static int CmpExpValue (const void* I1, const void* I2)
-/* Compare function for qsort */
+void PrintExportMapByName (FILE* F)
+/* Print an export map, sorted by symbol name, to the given file */
 {
-    long V1 = GetExportVal (ExpPool [*(unsigned *)I1]);
-    long V2 = GetExportVal (ExpPool [*(unsigned *)I2]);
-
-    return V1 < V2 ? -1 : V1 == V2 ? 0 : 1;
+    PrintExportMap (ExpPool, ExpCount, F);
 }
 
 
@@ -926,43 +939,16 @@ static int CmpExpValue (const void* I1, const void* I2)
 void PrintExportMapByValue (FILE* F)
 /* Print an export map, sorted by symbol value, to the given file */
 {
-    unsigned I;
-    unsigned Count;
-    unsigned *ExpValXlat;
+    /* Create a new pool that is sorted by value */
+    Export** Pool = xmalloc (ExpCount * sizeof (Export*));
+    memcpy (Pool, ExpPool, ExpCount * sizeof (Export*));
+    qsort (Pool, ExpCount, sizeof (Export*), CmpExpValue);
 
-    /* Create a translation table where the symbols are sorted by value. */
-    ExpValXlat = xmalloc (ExpCount * sizeof (unsigned));
-    for (I = 0; I < ExpCount; ++I) {
-        /* Initialize table with current sort order.  */
-        ExpValXlat [I] = I;
-    }
+    /* Print the exports */
+    PrintExportMap (Pool, ExpCount, F);
 
-    /* Sort them by value */
-    qsort (ExpValXlat, ExpCount, sizeof (unsigned), CmpExpValue);
-
-    /* Print all exports */
-    Count = 0;
-    for (I = 0; I < ExpCount; ++I) {
-        const Export* E = ExpPool [ExpValXlat [I]];
-
-        /* Print unreferenced symbols only if explictly requested */
-        if (VerboseMap || E->ImpCount > 0 || SYM_IS_CONDES (E->Type)) {
-            fprintf (F,
-                     "%-25s %06lX %c%c%c%c   ",
-                     GetString (E->Name),
-                     GetExportVal (E),
-                     E->ImpCount? 'R' : ' ',
-                     SYM_IS_LABEL (E->Type)? 'L' : 'E',
-                     GetAddrSizeCode ((unsigned char) E->AddrSize),
-                     SYM_IS_CONDES (E->Type)? 'I' : ' ');
-            if (++Count == 2) {
-                Count = 0;
-                fprintf (F, "\n");
-            }
-        }
-    }
-    fprintf (F, "\n");
-    xfree (ExpValXlat);
+    /* Free the allocated buffer */
+    xfree (Pool);
 }
 
 
@@ -1021,6 +1007,36 @@ void PrintImportMap (FILE* F)
 
 
 
+void PrintLabelLine (FILE* F, unsigned NameId, long Val)
+/* Output one label into a vice label file doing some cleanup on the name. */
+{
+    /* Get the name */
+    const char* N = GetString (NameId);
+
+    /* Cleanup the name. It might be generated by the assembler when creating
+    ** internally used labels. Such names contain invalid characters to avoid
+    ** clashes with user input and cannot be read by VICE.
+    */
+    fprintf (F, "al %06lX .", Val);
+    if (IsAlpha (*N) || *N == '@' || *N == '?' || *N == '_') {
+        putc (*N, F);
+    } else {
+        putc ('_', F);
+    }
+    ++N;
+    while (*N) {
+        if (IsAlpha (*N) || IsDigit (*N) || *N == '_') {
+            putc (*N, F);
+        } else {
+            putc ('_', F);
+        }
+        ++N;
+    }
+    putc ('\n', F);
+}
+
+
+
 void PrintExportLabels (FILE* F)
 /* Print the exports in a VICE label file */
 {
@@ -1029,7 +1045,8 @@ void PrintExportLabels (FILE* F)
     /* Print all exports */
     for (I = 0; I < ExpCount; ++I) {
         const Export* E = ExpPool [I];
-        fprintf (F, "al %06lX .%s\n", GetExportVal (E), GetString (E->Name));
+        PrintLabelLine (F, E->Name, GetExportVal (E));
+
     }
 }
 
diff --git a/src/ld65/exports.h b/src/ld65/exports.h
index d69e6d7ad..cc7870bc5 100644
--- a/src/ld65/exports.h
+++ b/src/ld65/exports.h
@@ -195,6 +195,9 @@ void PrintExportMapByValue (FILE* F);
 void PrintImportMap (FILE* F);
 /* Print an import map to the given file */
 
+void PrintLabelLine (FILE* F, unsigned NameId, long Val);
+/* Output one label into a vice label file doing some cleanup on the name. */
+
 void PrintExportLabels (FILE* F);
 /* Print the exports in a VICE label file */
 
diff --git a/src/ld65/main.c b/src/ld65/main.c
index 70e9c84d1..5632f4961 100644
--- a/src/ld65/main.c
+++ b/src/ld65/main.c
@@ -189,7 +189,7 @@ static void LinkFile (const char* Name, FILETYPE Type)
 
     /* If we don't know the file type, determine it from the extension */
     if (Type == FILETYPE_UNKNOWN) {
-        Type = GetFileType (Name);
+        Type = GetTypeOfFile (Name);
     }
 
     /* For known file types, search the file in the directory list */
diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index 255b8ccd1..35d178774 100644
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -638,6 +638,13 @@ void PrintDbgSegments (FILE* F)
             fprintf (F, ",oname=\"%s\",ooffs=%lu",
                      S->OutputName, S->OutputOffs);
         }
+        if (S->MemArea) {
+            if (S->MemArea->BankExpr) {
+                if (IsConstExpr (S->MemArea->BankExpr)) {
+                    fprintf (F, ",bank=%lu", GetExprVal(S->MemArea->BankExpr));
+                }
+            }
+        }
         fputc ('\n', F);
     }
 }
diff --git a/src/od65.vcxproj b/src/od65.vcxproj
index 1a1527067..409b5038e 100644
--- a/src/od65.vcxproj
+++ b/src/od65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FF8576C2-1253-44FE-A51B-D9AE35F3CEAD}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="od65\dump.c" />
     <ClCompile Include="od65\error.c" />
diff --git a/src/sim65.vcxproj b/src/sim65.vcxproj
index 97fc3855a..f1fe6bdd2 100644
--- a/src/sim65.vcxproj
+++ b/src/sim65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{002A366E-2863-46A8-BDDE-DDF534AAEC73}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,11 +72,22 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="sim65\6502.h" />
     <ClInclude Include="sim65\error.h" />
     <ClInclude Include="sim65\memory.h" />
     <ClInclude Include="sim65\paravirt.h" />
+    <ClInclude Include="sim65\peripherals.h" />
+    <ClInclude Include="sim65\trace.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="sim65\6502.c" />
@@ -60,8 +95,10 @@
     <ClCompile Include="sim65\main.c" />
     <ClCompile Include="sim65\memory.c" />
     <ClCompile Include="sim65\paravirt.c" />
+    <ClCompile Include="sim65\peripherals.c" />
+    <ClCompile Include="sim65\trace.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/sim65/6502.c b/src/sim65/6502.c
index 9d2c93da8..a9aa299ff 100644
--- a/src/sim65/6502.c
+++ b/src/sim65/6502.c
@@ -11,7 +11,13 @@
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
 /*                                                                           */
-/* Mar-2017, Christian Krueger, added support for 65SC02                     */
+/* Mar-2017, Christian Krueger, added support for 65SC02.                    */
+/* Dec-2023, Carlo Bramini, rewritten for better maintenance and added       */
+/*           support for undocumented opcodes for 6502.                      */
+/* Dec-2024, Sidney Cadot, fixed 65C02 ADC/SBC (decimal mode); implemented   */
+/*           65C02 missing instructions; fixed 6502X illegal instructions;   */
+/*           fixed cycle count for all 6502(X) / 65C02 opcodes;              */
+/*           achieved full 65x02 test-suite compliance.                      */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
 /* warranty.  In no event will the authors be held liable for any damages    */
@@ -33,18 +39,350 @@
 /*****************************************************************************/
 
 /* Known bugs and limitations of the 65C02 simulation:
- * support currently only on the level of 65SC02:
-   BBRx, BBSx, RMBx, SMBx, WAI, and STP are unsupported
- * BCD flag handling equals 6502 (unchecked if bug is simulated or wrong for
-   6502)
-*/
+ * the WAI ($CB) and STP ($DB) instructions are unsupported.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "memory.h"
+#include "peripherals.h"
 #include "error.h"
-#include "6502.h"
 #include "paravirt.h"
+#include "trace.h"
+
+#include "6502.h"
+
+/*
+
+ 6502 opcode map:
+
+    x0   x1   x2   x3   x4   x5   x6   x7   x8   x9   xA   xB   xC   xD   xE   xF
+0x  BRK  ORA  ---  SLO  NOP  ORA  ASL  SLO  PHP  ORA  ASL  ANC  NOP  ORA  ASL  SLO
+         inx       inx  zp   zp   zp   zp        imm  acc  imm  abs  abs  abs  abs
+
+1x  BPL  ORA  ---  SLO  NOP  ORA  ASL  SLO  CLC  ORA  NOP  SLO  NOP  ORA  ASL  SLO
+    rel  iny       iny  zpx  zpx  zpx  zpy       aby       aby  abx  abx  abx  abx
+
+2x  JSR  AND  ---  RLA  BIT  AND  ROL  RLA  PLP  AND  ROL  ANC  BIT  AND  ROL  RLA
+    abs  inx       inx  zp   zp   zp   zp        imm  acc  imm  abs  abs  abs  abs
+
+3x  BMI  AND  ---  RLA  NOP  AND  ROL  RLA  SEC  AND  NOP  RLA  NOP  AND  ROL  RLA
+    rel  iny       iny  zpx  zpx  zpx  zpy       aby       aby  abx  abx  abx  abx
+
+4x  RTI  EOR  ---  SRE  NOP  EOR  LSR  SRE  PHA  EOR  LSR  ASR  JMP  EOR  LSR  SRE
+         inx       inx  zp   zp   zp   zp        imm  acc  imm  abs  abs  abs  abs
+
+5x  BVC  EOR  ---  SRE  NOP  EOR  LSR  SRE  CLI  EOR  NOP  SRE  NOP  EOR  LSR  SRE
+    rel  iny       iny  zpx  zpx  zpx  zpx       aby       aby  abx  abx  abx  abx
+
+6x  RTS  ADC  ---  RRA  NOP  ADC  ROR  RRA  PLA  ADC  ROR  ARR  JMP  ADC  ROR  RRA
+         inx       inx  zp   zp   zp   zp        imm  acc  imm  ind  abs  abs  abs
+
+7x  BVS  ADC  ---  RRA  NOP  ADC  ROR  RRA  SEI  ADC  NOP  RRA  NOP  ADC  ROR  RRA
+    rel  iny       iny  zpx  zpx  zpx  zpx       aby       aby  abx  abx  abx  abx
+
+8x  NOP  STA  NOP  SAX  STY  STA  STX  SAX  DEY  NOP  TXA  ANE  STY  STA  STX  SAX
+    imm  inx  imm  inx  zp   zp   zp   zp        imm       imm  abs  abs  abs  abs
+
+9x  BCC  STA  ---  SHA  STY  STA  STX  SAX  TYA  STA  TXS  TAS  SHY  STA  SHX  SHA
+    rel  iny       iny  zpx  zpx  zpy  zpy       aby       aby  abx  abx  aby  aby
+
+Ax  LDY  LDA  LDX  LAX  LDY  LDA  LDX  LAX  TAY  LDA  TAX  LXA  LDY  LDA  LDX  LAX
+    imm  inx  imm  inx  zp   zp   zp   zp        imm       imm  abs  abs  abs  abs
+
+Bx  BCS  LDA  ---  LAX  LDY  LDA  LDX  LAX  CLV  LDA  TSX  LAS  LDY  LDA  LDX  LAX
+    rel  iny       iny  zpx  zpx  zpy  zpy       aby       aby  abx  abx  aby  aby
+
+Cx  CPY  CMP  NOP  DCP  CPY  CMP  DEC  DCP  INY  CMP  DEX  SBX  CPY  CMP  DEC  DCP
+    imm  inx  imm  inx  zp   zp   zp   zp        imm       imm  abs  abs  abs  abs
+
+Dx  BNE  CMP  ---  DCP  NOP  CMP  DEC  DCP  CLD  CMP  NOP  DCP  NOP  CMP  DEC  DCP
+    rel  iny       iny  zpx  zpx  zpx  zpx       aby  zpx  aby  abx  abx  abx  abx
+
+Ex  CPX  SBC  NOP  ISC  CPX  SBC  INC  ISC  INX  SBC  NOP  SBC  CPX  SBC  INC  ISC
+    imm  inx  imm  inx  zp   zp   zp   zp        imm       imm  abs  abs  abs  abs
+
+Fx  BEQ  SBC  ---  ISC  NOP  SBC  INC  ISC  SED  SBC  NOP  ISC  NOP  SBC  INC  ISC
+    rel  iny       iny  zpx  zpx  zpx  zpx       aby  zpx  aby  abx  abx  abx  abx
+
+--- = CPU JAM/HALT
+
+*/
+
+/*
+
+65xx ILLEGAL INSTRUCTIONS
 
 
+* SLO: shift left the contents of a memory location and then OR the result with
+       the accumulator.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+SLO abs      |   0Fh  |  6     |
+SLO abs,X    |   1Fh  |  7     |
+SLO abs,Y    |   1Bh  |  7     |
+SLO zp       |   07h  |  5     |
+SLO zp,X     |   17h  |  6     |
+SLO (zp,X)   |   03h  |  8     |
+SLO (zp),Y   |   13h  |  8     |
+-------------+--------+--------+
+
+
+* RLA: rotate left the contents of a memory location and then AND the result with
+       the accumulator.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+RLA abs      |   2Fh  |  6     |
+RLA abs,X    |   3Fh  |  7     |
+RLA abs,Y    |   3Bh  |  7     |
+RLA zp       |   27h  |  5     |
+RLA zp,X     |   37h  |  6     |
+RLA (zp,X)   |   23h  |  8     |
+RLA (zp),Y   |   33h  |  8     |
+-------------+--------+--------+
+
+
+* SRE: shift right the contents of a memory location and then X-OR the result
+       with the accumulator.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+SRE abs      |   4Fh  |  6     |
+SRE abs,X    |   5Fh  |  7     |
+SRE abs,Y    |   5Bh  |  7     |
+SRE zp       |   47h  |  5     |
+SRE zp,X     |   57h  |  6     |
+SRE (zp,X)   |   43h  |  8     |
+SRE (zp),Y   |   53h  |  8     |
+-------------+--------+--------+
+
+
+* RRA: rotate right the contents of a memory location and then adds with carry
+       the result with the accumulator.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X X . . . X X
+RRA abs      |   6Fh  |  6     |
+RRA abs,X    |   7Fh  |  7     |
+RRA abs,Y    |   7Bh  |  7     |
+RRA zp       |   67h  |  5     |
+RRA zp,X     |   77h  |  6     |
+RRA (zp,X)   |   63h  |  8     |
+RRA (zp),Y   |   73h  |  8     |
+-------------+--------+--------+
+
+
+* SAX: calculate AND between the A and X registers (without changing the
+       contents of the registers) and stores the result in memory.
+       Flags into P register are not modified.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  . . . . . . .
+SAX abs      |   8Fh  |  4     |
+SAX zp       |   87h  |  3     |
+SAX zp,Y     |   97h  |  4     |
+SAX (zp,X)   |   83h  |  6     |
+-------------+--------+--------+
+
+
+* LAX: loads both the accumulator and the X register with the content of a memory
+       location.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X .
+LAX abs      |   AFh  |  4     |
+LAX abs,Y    |   BFh  |  4*    |    * = adds +1 if page cross is detected.
+LAX zp       |   A7h  |  3     |
+LAX zp,Y     |   B7h  |  4     |
+LAX (zp,X)   |   A3h  |  6     |
+LAX (zp),Y   |   B3h  |  5*    |
+-------------+--------+--------+
+
+
+* DCP: decrements the contents of a memory location and then compares the result
+       with the accumulator.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+DCP abs      |   CFh  |  6     |
+DCP abs,X    |   DFh  |  7     |
+DCP abs,Y    |   DBh  |  7     |
+DCP zp       |   C7h  |  5     |
+DCP zp,X     |   D7h  |  6     |
+DCP (zp,X)   |   C3h  |  8     |
+DCP (zp),Y   |   D3h  |  8     |
+-------------+--------+--------+
+
+
+* ISC: increments the contents of a memory location and then subtract with carry
+       the result from the accumulator.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X X . . . X X
+ISC abs      |   EFh  |  6     |
+ISC abs,X    |   FFh  |  7     |
+ISC abs,Y    |   FBh  |  7     |
+ISC zp       |   E7h  |  5     |
+ISC zp,X     |   F7h  |  6     |
+ISC (zp,X)   |   E3h  |  8     |
+ISC (zp),Y   |   F3h  |  8     |
+-------------+--------+--------+
+
+
+* ASR: calculates the AND between the accumulator and an immediate value and then
+       shift right the result.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+ASR #imm     |   4Bh  |  2     |
+-------------+--------+--------+
+
+
+* ARR: calculates the AND between the accumulator and an immediate value and then
+       rotate right the result.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+ARR #imm     |   6Bh  |  2     |
+-------------+--------+--------+
+
+
+* ANE: calculates the OR of the accumulator with an unstable constant, then it does
+       an AND with the X register and an immediate value.
+       The unstable constant varies with temperature, the production batch and
+       maybe other factors. Experimental measures assume its value to 0xEF.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X .
+ANE #imm     |   8Bh  |  2     |
+-------------+--------+--------+
+
+
+* LXA: calculates the OR of the accumulator with an unstable constant, then it does
+       an AND with an immediate value. The result is copied into the X register and
+       the accumulator.
+       The unstable constant varies with temperature, the production batch and
+       maybe other factors. Experimental measures assume its value to 0xEE.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X .
+LXA #imm     |   ABh  |  2     |
+-------------+--------+--------+
+
+
+* SBX: calculates the AND of the accumulator with the X register and the subtracts
+       an immediate value.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+SBX #imm     |   CBh  |  2     |
+-------------+--------+--------+
+
+
+* NOP: No-Operation.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  . . . . . . .
+NOP          |   1Ah  |  2     |
+NOP          |   3Ah  |  2     |    * = adds +1 if page cross is detected.
+NOP          |   5Ah  |  2     |
+NOP          |   7Ah  |  2     |
+NOP          |   DAh  |  2     |
+NOP          |   FAh  |  2     |
+NOP #imm     |   80h  |  2     |
+NOP #imm     |   82h  |  2     |
+NOP #imm     |   89h  |  2     |
+NOP #imm     |   C2h  |  2     |
+NOP #imm     |   E2h  |  2     |
+NOP zp       |   04h  |  3     |
+NOP zp,x     |   14h  |  4     |
+NOP zp,x     |   34h  |  4     |
+NOP zp       |   44h  |  3     |
+NOP zp,x     |   54h  |  4     |
+NOP zp       |   64h  |  3     |
+NOP zp,x     |   74h  |  4     |
+NOP zp,x     |   D4h  |  4     |
+NOP zp,x     |   F4h  |  4     |
+NOP abs      |   0Ch  |  4     |
+NOP abs,x    |   1Ch  |  4*    |
+NOP abs,x    |   3Ch  |  4*    |
+NOP abs,x    |   5Ch  |  4*    |
+NOP abs,x    |   7Ch  |  4*    |
+NOP abs,x    |   DCh  |  4*    |
+NOP abs,x    |   FCh  |  4*    |
+-------------+--------+--------+
+
+
+* TAS: calculates the AND of the accumulator with the X register and stores the result
+       into the stack pointer. Then, it calculates the AND of the result with the
+       high byte of the memory pointer plus 1 and it stores the final result in memory.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  . . . . . . .
+TAS abs,y    |   9Bh  |  5     |
+-------------+--------+--------+
+
+
+* SHY: calculates the AND of the Y register with the high byte of the memory pointer
+       plus 1 and it stores the final result in memory.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  . . . . . . .
+SHY abs,x    |   9Ch  |  5     |
+-------------+--------+--------+
+
+
+* SHX: calculates the AND of the X register with the high byte of the memory pointer
+       plus 1 and it stores the final result in memory.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  . . . . . . .
+SHX abs,y    |   9Eh  |  5     |
+-------------+--------+--------+
+
+
+* SHA: calculates the AND of the accumulator with the X register with the high byte
+       of the memory pointer plus 1 and it stores the final result in memory.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  . . . . . . .
+SHX abs,y    |   9Fh  |  5     |
+SHX (zp),y   |   93h  |  6     |
+-------------+--------+--------+
+
+
+* ANC: calculates the AND of the accumulator with an immediate value and then
+       updates the status of N and Z bits of the status register.
+       The N flag is also copied into the Carry flag.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X X
+ANC #imm     |   0Bh  |  2     |
+ANC #imm     |   2Bh  |  2     |
+-------------+--------+--------+
+
+
+* LAS: calculates the AND of a memory location with the contents of the
+stack pointer register and it stores the result in the accumulator, the X
+register, and the stack pointer.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X . . . . X .
+LAS abs,y    |   BBh  |  4*    |
+-------------+--------+--------+    * = adds +1 if page cross is detected.
+
+
+* SBC: alias of the official SBC opcode.
+
+Address mode | opcode | cycles |            N V B D I Z C
+-------------+--------+--------+    FLAGS:  X X . . . X X
+SBC #imm     |   EBh  |  2     |
+-------------+--------+--------+
+
+*/
 
 /*****************************************************************************/
 /*                                   Data                                    */
@@ -59,16 +397,17 @@ CPUType CPU;
 typedef void (*OPFunc) (void);
 
 /* The CPU registers */
-static CPURegs Regs;
+CPURegs Regs;
 
 /* Cycles for the current insn */
 static unsigned Cycles;
 
 /* NMI request active */
-static unsigned HaveNMIRequest;
+static bool HaveNMIRequest;
 
 /* IRQ request active */
-static unsigned HaveIRQRequest;
+static bool HaveIRQRequest;
+
 
 
 /*****************************************************************************/
@@ -100,7 +439,6 @@ static unsigned HaveIRQRequest;
 */
 #define TEST_ZF(v)      SET_ZF (((v) & 0xFF) == 0)
 #define TEST_SF(v)      SET_SF (((v) & 0x80) != 0)
-#define TEST_CF(v)      SET_CF (((v) & 0xFF00) != 0)
 
 /* Program counter halves */
 #define PCL             (Regs.PC & 0xFF)
@@ -113,238 +451,711 @@ static unsigned HaveIRQRequest;
 /* Test for page cross */
 #define PAGE_CROSS(addr,offs)   ((((addr) & 0xFF) + offs) >= 0x100)
 
-/* #imm */
-#define AC_OP_IMM(op)                                           \
-    Cycles = 2;                                                 \
-    Regs.AC = Regs.AC op MemReadByte (Regs.PC+1);               \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
-    Regs.PC += 2
+/* Address operators */
 
 /* zp */
-#define AC_OP_ZP(op)                                            \
-    Cycles = 3;                                                 \
-    Regs.AC = Regs.AC op MemReadByte (MemReadByte (Regs.PC+1)); \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+#define ADR_ZP(ad)                                              \
+    ad = MemReadByte (Regs.PC+1);                               \
     Regs.PC += 2
 
 /* zp,x */
-#define AC_OP_ZPX(op)                                           \
-    unsigned char ZPAddr;                                       \
-    Cycles = 4;                                                 \
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;                 \
-    Regs.AC = Regs.AC op MemReadByte (ZPAddr);                  \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+#define ADR_ZPX(ad)                                             \
+    ad = (MemReadByte (Regs.PC+1) + Regs.XR) & 0xFF;            \
     Regs.PC += 2
 
 /* zp,y */
-#define AC_OP_ZPY(op)                                           \
-    unsigned char ZPAddr;                                       \
-    Cycles = 4;                                                 \
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.YR;                 \
-    Regs.AC = Regs.AC op MemReadByte (ZPAddr);                  \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+#define ADR_ZPY(ad)                                             \
+    ad = (MemReadByte (Regs.PC+1) + Regs.YR) & 0xFF;            \
     Regs.PC += 2
 
 /* abs */
-#define AC_OP_ABS(op)                                           \
-    unsigned Addr;                                              \
-    Cycles = 4;                                                 \
-    Addr = MemReadWord (Regs.PC+1);                             \
-    Regs.AC = Regs.AC op MemReadByte (Addr);                    \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+#define ADR_ABS(ad)                                             \
+    ad = MemReadWord (Regs.PC+1);                               \
     Regs.PC += 3
 
 /* abs,x */
-#define AC_OP_ABSX(op)                                          \
-    unsigned Addr;                                              \
-    Cycles = 4;                                                 \
-    Addr = MemReadWord (Regs.PC+1);                             \
-    if (PAGE_CROSS (Addr, Regs.XR)) {                           \
+#define ADR_ABSX(ad)                                            \
+    ad = MemReadWord (Regs.PC+1);                               \
+    if (PAGE_CROSS (ad, Regs.XR)) {                             \
         ++Cycles;                                               \
     }                                                           \
-    Regs.AC = Regs.AC op MemReadByte (Addr + Regs.XR);          \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+    ad += Regs.XR;                                              \
     Regs.PC += 3
 
 /* abs,y */
-#define AC_OP_ABSY(op)                                          \
-    unsigned Addr;                                              \
-    Cycles = 4;                                                 \
-    Addr = MemReadWord (Regs.PC+1);                             \
-    if (PAGE_CROSS (Addr, Regs.YR)) {                           \
+#define ADR_ABSY(ad)                                            \
+    ad = MemReadWord (Regs.PC+1);                               \
+    if (PAGE_CROSS (ad, Regs.YR)) {                             \
         ++Cycles;                                               \
     }                                                           \
-    Regs.AC = Regs.AC op MemReadByte (Addr + Regs.YR);          \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+    ad += Regs.YR;                                              \
     Regs.PC += 3
 
 /* (zp,x) */
-#define AC_OP_ZPXIND(op)                                        \
-    unsigned char ZPAddr;                                       \
-    unsigned Addr;                                              \
-    Cycles = 6;                                                 \
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;                 \
-    Addr = MemReadZPWord (ZPAddr);                              \
-    Regs.AC = Regs.AC op MemReadByte (Addr);                    \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+#define ADR_ZPXIND(ad)                                          \
+    ad = (MemReadByte (Regs.PC+1) + Regs.XR) & 0xFF;            \
+    ad = MemReadZPWord (ad);                                    \
     Regs.PC += 2
 
 /* (zp),y */
-#define AC_OP_ZPINDY(op)                                        \
-    unsigned char ZPAddr;                                       \
-    unsigned Addr;                                              \
-    Cycles = 5;                                                 \
-    ZPAddr = MemReadByte (Regs.PC+1);                           \
-    Addr = MemReadZPWord (ZPAddr);                              \
-    if (PAGE_CROSS (Addr, Regs.YR)) {                           \
+#define ADR_ZPINDY(ad)                                          \
+    ad = MemReadZPWord (MemReadByte (Regs.PC+1));               \
+    if (PAGE_CROSS (ad, Regs.YR)) {                             \
         ++Cycles;                                               \
     }                                                           \
-    Addr += Regs.YR;                                            \
-    Regs.AC = Regs.AC op MemReadByte (Addr);                    \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+    ad += Regs.YR;                                              \
     Regs.PC += 2
 
 /* (zp) */
-#define AC_OP_ZPIND(op)                                         \
-    unsigned char ZPAddr;                                       \
-    unsigned Addr;                                              \
-    Cycles = 5;                                                 \
-    ZPAddr = MemReadByte (Regs.PC+1);                           \
-    Addr = MemReadZPWord (ZPAddr);                              \
-    Regs.AC = Regs.AC op MemReadByte (Addr);                    \
-    TEST_ZF (Regs.AC);                                          \
-    TEST_SF (Regs.AC);                                          \
+#define ADR_ZPIND(ad)                                           \
+    ad = MemReadZPWord (MemReadByte (Regs.PC+1));               \
     Regs.PC += 2
 
-/* ADC */
-#define ADC(v)                                                  \
+/* Address operators (no penalty on page cross) */
+
+/* abs,x - no penalty */
+#define ADR_ABSX_NP(ad)                                         \
+    ad = MemReadWord (Regs.PC+1);                               \
+    ad += Regs.XR;                                              \
+    Regs.PC += 3
+
+/* abs,y - no penalty */
+#define ADR_ABSY_NP(ad)                                         \
+    ad = MemReadWord (Regs.PC+1);                               \
+    ad += Regs.YR;                                              \
+    Regs.PC += 3
+
+/* (zp),y - no penalty */
+#define ADR_ZPINDY_NP(ad)                                       \
+    ad = MemReadZPWord (MemReadByte (Regs.PC+1));               \
+    ad += Regs.YR;                                              \
+    Regs.PC += 2
+
+
+
+/* Memory operators */
+
+/* #imm */
+#define MEM_AD_OP_IMM(op)                                       \
+    op = MemReadByte (Regs.PC+1);                               \
+    Regs.PC += 2
+
+/* zp / zp,x / zp,y / abs / abs,x / abs,y / (zp,x) / (zp),y / (zp) */
+#define MEM_AD_OP(mode, ad, op)                                 \
+    ADR_##mode(ad);                                             \
+    op = MemReadByte (ad)
+
+/* ALU opcode helpers */
+
+/* Execution cycles for ALU opcodes */
+#define ALU_CY_ZP       3
+#define ALU_CY_ZPX      4
+#define ALU_CY_ZPY      4
+#define ALU_CY_ABS      4
+#define ALU_CY_ABSX     4
+#define ALU_CY_ABSY     4
+#define ALU_CY_ZPXIND   6
+#define ALU_CY_ZPINDY   5
+#define ALU_CY_ZPIND    5
+
+/* #imm */
+#define ALU_OP_IMM(op)                                          \
+    uint8_t immediate;                                          \
+    MEM_AD_OP_IMM(immediate);                                   \
+    Cycles = 2;                                                 \
+    op (immediate)
+
+/* zp / zp,x / zp,y / abs / abs,x / abs,y / (zp,x) / (zp),y / (zp) */
+#define ALU_OP(mode, op)                                        \
+    unsigned address, operand;                                  \
+    Cycles = ALU_CY_##mode;                                     \
+    MEM_AD_OP (mode, address, operand);                         \
+    op (operand)
+
+/* Store opcode helpers */
+
+/* Execution cycles for store opcodes */
+#define STO_CY_ZP       3
+#define STO_CY_ZPX      4
+#define STO_CY_ZPY      4
+#define STO_CY_ABS      4
+#define STO_CY_ABSX     5
+#define STO_CY_ABSY     5
+#define STO_CY_ZPXIND   6
+#define STO_CY_ZPINDY   6
+#define STO_CY_ZPIND    5
+
+#define STO_CY_ABSX_NP    STO_CY_ABSX
+#define STO_CY_ABSY_NP    STO_CY_ABSY
+#define STO_CY_ZPINDY_NP  STO_CY_ZPINDY
+
+/* zp / zp,x / zp,y / abs / abs,x / abs,y / (zp,x) / (zp),y / (zp) */
+#define STO_OP(mode, op)                                        \
+    unsigned address;                                           \
+    Cycles = STO_CY_##mode;                                     \
+    ADR_##mode (address);                                       \
+    MemWriteByte(address, op)
+
+/* Read-Modify-Write opcode helpers */
+
+/* Execution cycles for R-M-W opcodes */
+#define RMW_CY_ZP       5
+#define RMW_CY_ZPX      6
+#define RMW_CY_ABS      6
+#define RMW_CY_ABSX     7
+#define RMW_CY_ABSY     7
+#define RMW_CY_ZPXIND   8
+#define RMW_CY_ZPINDY   8
+
+#define RMW_CY_ABSX_NP      RMW_CY_ABSX
+#define RMW_CY_ABSY_NP      RMW_CY_ABSY
+#define RMW_CY_ZPINDY_NP    RMW_CY_ZPINDY
+
+/* zp / zp,x / zp,y / abs / abs,x / abs,y / (zp,x) / (zp),y / (zp) */
+#define MEM_OP(mode, op)                                        \
+    unsigned address, operand;                                  \
+    Cycles = RMW_CY_##mode;                                     \
+    MEM_AD_OP (mode, address, operand);                         \
+    op (operand);                                               \
+    MemWriteByte (address, (unsigned char)operand)
+
+/* 2 x Read-Modify-Write opcode helpers (illegal opcodes) */
+
+/* Execution cycles for 2 x R-M-W opcodes */
+#define RMW2_CY_ZP          5
+#define RMW2_CY_ZPX         6
+#define RMW2_CY_ABS         6
+#define RMW2_CY_ABSX        7
+#define RMW2_CY_ABSY        7
+#define RMW2_CY_ZPXIND      8
+#define RMW2_CY_ZPINDY      8
+
+#define RMW2_CY_ZPINDY_NP   RMW2_CY_ZPINDY
+#define RMW2_CY_ABSY_NP     RMW2_CY_ABSY
+#define RMW2_CY_ABSX_NP     RMW2_CY_ABSX
+
+/* zp / zp,x / zp,y / abs / abs,x / abs,y / (zp,x) / (zp),y */
+#define ILLx2_OP(mode, op)                                      \
+    unsigned address;                                           \
+    unsigned operand;                                           \
+    Cycles = RMW2_CY_##mode;                                    \
+    MEM_AD_OP (mode, address, operand);                         \
+    op (operand);                                               \
+    MemWriteByte (address, (unsigned char)operand)
+
+/* AC opcode helpers */
+
+/* #imm */
+#define AC_OP_IMM(op)                                           \
+    unsigned char immediate;                                    \
+    MEM_AD_OP_IMM(immediate);                                   \
+    Cycles = 2;                                                 \
+    Regs.AC = Regs.AC op immediate;                             \
+    TEST_ZF (Regs.AC);                                          \
+    TEST_SF (Regs.AC)
+
+/* zp / zp,x / zp,y / abs / abs,x / abs,y / (zp,x) / (zp),y / (zp) */
+#define AC_OP(mode, op)                                         \
+    unsigned address;                                           \
+    unsigned operand;                                           \
+    Cycles = ALU_CY_##mode;                                     \
+    MEM_AD_OP(mode, address, operand);                          \
+    Regs.AC = Regs.AC op operand;                               \
+    TEST_ZF (Regs.AC);                                          \
+    TEST_SF (Regs.AC)
+
+
+/* ADC, binary mode (6502 and 65C02) */
+#define ADC_BINARY_MODE(v)                                      \
     do {                                                        \
-        unsigned old = Regs.AC;                                 \
-        unsigned rhs = (v & 0xFF);                              \
-        if (GET_DF ()) {                                        \
-            unsigned lo;                                        \
-            int res;                                            \
-            lo = (old & 0x0F) + (rhs & 0x0F) + GET_CF ();       \
-            if (lo >= 0x0A) {                                   \
-                lo = ((lo + 0x06) & 0x0F) + 0x10;               \
-            }                                                   \
-            Regs.AC = (old & 0xF0) + (rhs & 0xF0) + lo;         \
-            res = (signed char)(old & 0xF0) +                   \
-                  (signed char)(rhs & 0xF0) +                   \
-                  (signed char)lo;                              \
-            TEST_ZF (old + rhs + GET_CF ());                    \
-            TEST_SF (Regs.AC);                                  \
-            if (Regs.AC >= 0xA0) {                              \
-                Regs.AC += 0x60;                                \
-            }                                                   \
-            TEST_CF (Regs.AC);                                  \
-            SET_OF ((res < -128) || (res > 127));               \
-            if (CPU != CPU_6502) {                              \
-                ++Cycles;                                       \
-            }                                                   \
+        const uint8_t op = v;                                   \
+        const uint8_t OldAC = Regs.AC;                          \
+        bool carry = GET_CF();                                  \
+        Regs.AC = OldAC + op + carry;                           \
+        const bool NV = Regs.AC >= 0x80;                        \
+        carry = OldAC + op + carry >= 0x100;                    \
+        SET_SF(NV);                                             \
+        SET_OF(((OldAC >= 0x80) ^ NV) & ((op >= 0x80) ^ NV));   \
+        SET_ZF(Regs.AC == 0);                                   \
+        SET_CF(carry);                                          \
+    } while (0)
+
+/* ADC, decimal mode (6502 behavior) */
+#define ADC_DECIMAL_MODE_6502(v)                                \
+    do {                                                        \
+        const uint8_t op = v;                                   \
+        const uint8_t OldAC = Regs.AC;                          \
+        bool carry = GET_CF();                                  \
+        const uint8_t binary_result = OldAC + op + carry;       \
+        uint8_t low_nibble = (OldAC & 15) + (op & 15) + carry;  \
+        if ((carry = low_nibble > 9))                           \
+            low_nibble = (low_nibble - 10) & 15;                \
+        uint8_t high_nibble = (OldAC >> 4) + (op >> 4) + carry; \
+        const bool NV = (high_nibble & 8) != 0;                 \
+        if ((carry = high_nibble > 9))                          \
+            high_nibble = (high_nibble - 10) & 15;              \
+        Regs.AC = (high_nibble << 4) | low_nibble;              \
+        SET_SF(NV);                                             \
+        SET_OF(((OldAC >= 0x80) ^ NV) & ((op >= 0x80) ^ NV));   \
+        SET_ZF(binary_result == 0);                             \
+        SET_CF(carry);                                          \
+    } while (0)
+
+/* ADC, decimal mode (65C02 behavior) */
+#define ADC_DECIMAL_MODE_65C02(v)                               \
+    do {                                                        \
+        const uint8_t op = v;                                   \
+        const uint8_t OldAC = Regs.AC;                          \
+        const bool OldCF = GET_CF();                            \
+        bool carry = OldCF;                                     \
+        uint8_t low_nibble = (OldAC & 15) + (op & 15) + carry;  \
+        if ((carry = low_nibble > 9))                           \
+            low_nibble = (low_nibble - 10) & 15;                \
+        uint8_t high_nibble = (OldAC >> 4) + (op >> 4) + carry; \
+        const bool PrematureSF = (high_nibble & 8) != 0;        \
+        if ((carry = high_nibble > 9))                          \
+            high_nibble = (high_nibble - 10) & 15;              \
+        Regs.AC = (high_nibble << 4) | low_nibble;              \
+        const bool NewZF = Regs.AC == 0;                        \
+        const bool NewSF = Regs.AC >= 0x80;                     \
+        const bool NewOF = ((OldAC >= 0x80) ^ PrematureSF) &    \
+                           ((op    >= 0x80) ^ PrematureSF);     \
+        SET_SF(NewSF);                                          \
+        SET_OF(NewOF);                                          \
+        SET_ZF(NewZF);                                          \
+        SET_CF(carry);                                          \
+        ++Cycles;                                               \
+    } while (0)
+
+/* ADC, 6502 version */
+#define ADC_6502(v)                                             \
+    do {                                                        \
+        if (GET_DF()) {                                         \
+            ADC_DECIMAL_MODE_6502(v);                           \
         } else {                                                \
-            Regs.AC += rhs + GET_CF ();                         \
-            TEST_ZF (Regs.AC);                                  \
-            TEST_SF (Regs.AC);                                  \
-            TEST_CF (Regs.AC);                                  \
-            SET_OF (!((old ^ rhs) & 0x80) &&                    \
-                    ((old ^ Regs.AC) & 0x80));                  \
-            Regs.AC &= 0xFF;                                    \
+            ADC_BINARY_MODE(v);                                 \
+        }                                                       \
+    } while (0)
+
+/* ADC, 65C02 version */
+#define ADC_65C02(v)                                            \
+    do {                                                        \
+        if (GET_DF()) {                                         \
+            ADC_DECIMAL_MODE_65C02(v);                          \
+        } else {                                                \
+            ADC_BINARY_MODE(v);                                 \
         }                                                       \
     } while (0)
 
 /* branches */
 #define BRANCH(cond)                                            \
-    Cycles = 2;                                                 \
-    if (cond) {                                                 \
-        signed char Offs;                                       \
-        unsigned char OldPCH;                                   \
-        ++Cycles;                                               \
-        Offs = (signed char) MemReadByte (Regs.PC+1);           \
-        OldPCH = PCH;                                           \
-        Regs.PC += 2 + (int) Offs;                              \
-        if (PCH != OldPCH) {                                    \
+    do {                                                        \
+        Cycles = 2;                                             \
+        if (cond) {                                             \
+            int8_t Offs;                                        \
+            uint8_t OldPCH;                                     \
             ++Cycles;                                           \
+            Offs = MemReadByte (Regs.PC+1);                     \
+            Regs.PC += 2;                                       \
+            OldPCH = PCH;                                       \
+            Regs.PC = (Regs.PC + (int) Offs) & 0xFFFF;          \
+            if (PCH != OldPCH) {                                \
+                ++Cycles;                                       \
+            }                                                   \
+        } else {                                                \
+            Regs.PC += 2;                                       \
         }                                                       \
-    } else {                                                    \
-        Regs.PC += 2;                                           \
-    }
+    } while (0)
 
 /* compares */
-#define CMP(v1, v2)                                             \
+#define COMPARE(v1, v2)                                         \
     do {                                                        \
         unsigned Result = v1 - v2;                              \
-        TEST_ZF (Result & 0xFF);                                \
+        TEST_ZF (Result);                                       \
         TEST_SF (Result);                                       \
         SET_CF (Result <= 0xFF);                                \
     } while (0)
 
+#define CPX(operand)                                            \
+    COMPARE (Regs.XR, operand)
+
+#define CPY(operand)                                            \
+    COMPARE (Regs.YR, operand)
+
+#define CMP(operand)                                            \
+    COMPARE (Regs.AC, operand)
 
 /* ROL */
 #define ROL(Val)                                                \
-    Val <<= 1;                                                  \
-    if (GET_CF ()) {                                            \
-        Val |= 0x01;                                            \
-    }                                                           \
-    TEST_ZF (Val);                                              \
-    TEST_SF (Val);                                              \
-    TEST_CF (Val)
+    do {                                                        \
+        const bool ShiftOut = (Val & 0x80) != 0;                \
+        Val <<= 1;                                              \
+        if (GET_CF ()) {                                        \
+            Val |= 0x01;                                        \
+        }                                                       \
+        TEST_ZF (Val);                                          \
+        TEST_SF (Val);                                          \
+        SET_CF (ShiftOut);                                      \
+    } while (0)
 
 /* ROR */
 #define ROR(Val)                                                \
-    if (GET_CF ()) {                                            \
-        Val |= 0x100;                                           \
-    }                                                           \
+    do {                                                        \
+        const bool ShiftOut = (Val & 0x01) != 0;                \
+        Val >>= 1;                                              \
+        if (GET_CF ()) {                                        \
+            Val |= 0x80;                                        \
+        }                                                       \
+        TEST_ZF (Val);                                          \
+        TEST_SF (Val);                                          \
+        SET_CF (ShiftOut);                                      \
+    } while (0)
+
+/* ASL */
+#define ASL(Val)                                                \
+    SET_CF (Val & 0x80);                                        \
+    Val = (Val << 1) & 0xFF;                                    \
+    TEST_ZF (Val);                                              \
+    TEST_SF (Val)
+
+/* LSR */
+#define LSR(Val)                                                \
     SET_CF (Val & 0x01);                                        \
     Val >>= 1;                                                  \
     TEST_ZF (Val);                                              \
     TEST_SF (Val)
 
-/* SBC */
-#define SBC(v)                                                  \
+/* INC */
+#define INC(Val)                                                \
+    Val = (Val + 1) & 0xFF;                                     \
+    TEST_ZF (Val);                                              \
+    TEST_SF (Val)
+
+/* DEC */
+#define DEC(Val)                                                \
+    Val = (Val - 1) & 0xFF;                                     \
+    TEST_ZF (Val);                                              \
+    TEST_SF (Val)
+
+/* SLO */
+#define SLO(Val)                                                \
+    Val <<= 1;                                                  \
+    SET_CF (Val & 0x100);                                       \
+    Regs.AC |= Val;                                             \
+    Regs.AC &= 0xFF;                                            \
+    TEST_ZF (Regs.AC);                                          \
+    TEST_SF (Regs.AC)
+
+/* RLA */
+#define RLA(Val)                                                \
+    Val <<= 1;                                                  \
+    if (GET_CF ()) {                                            \
+        Val |= 0x01;                                            \
+    }                                                           \
+    SET_CF (Val & 0x100);                                       \
+    Regs.AC &= Val;                                             \
+    TEST_ZF (Regs.AC);                                          \
+    TEST_SF (Regs.AC)
+
+/* SRE */
+#define SRE(Val)                                                \
+    SET_CF (Val & 0x01);                                        \
+    Val >>= 1;                                                  \
+    Regs.AC ^= Val;                                             \
+    TEST_ZF (Regs.AC);                                          \
+    TEST_SF (Regs.AC)
+
+/* RRA */
+#define RRA(Val)                                                \
+    if (GET_CF ()) {                                            \
+        Val |= 0x100;                                           \
+    }                                                           \
+    SET_CF (Val & 0x01);                                        \
+    Val >>= 1;                                                  \
+    ADC_6502 (Val)
+
+/* BIT */
+#define BIT(Val)                                                \
+    SET_SF (Val & 0x80);                                        \
+    SET_OF (Val & 0x40);                                        \
+    SET_ZF ((Val & Regs.AC) == 0)
+
+/* BITIMM */
+/* The BIT instruction with immediate mode addressing only sets
+   the zero flag; the sign and overflow flags are not changed. */
+#define BITIMM(Val)                                             \
+    SET_ZF ((Val & Regs.AC) == 0)
+
+/* LDA */
+#define LDA(Val)                                                \
+    Regs.AC = Val;                                              \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+/* LDX */
+#define LDX(Val)                                                \
+    Regs.XR = Val;                                              \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+/* LDY */
+#define LDY(Val)                                                \
+    Regs.YR = Val;                                              \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+/* LAX */
+#define LAX(Val)                                                \
+    Regs.AC = Val;                                              \
+    Regs.XR = Val;                                              \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+/* TSB */
+#define TSB(Val)                                                \
+    SET_ZF ((Val & Regs.AC) == 0);                              \
+    Val |= Regs.AC
+
+/* TRB */
+#define TRB(Val)                                                \
+    SET_ZF ((Val & Regs.AC) == 0);                              \
+    Val &= ~Regs.AC
+
+/* DCP */
+#define DCP(Val)                                                \
+    Val = (Val - 1) & 0xFF;                                     \
+    COMPARE (Regs.AC, Val)
+
+/* ISC */
+#define ISC(Val)                                                \
+    Val = (Val + 1) & 0xFF;                                     \
+    SBC_6502(Val)
+
+/* ASR */
+#define ASR(Val)                                                \
+    Regs.AC &= Val;                                             \
+    LSR(Regs.AC)
+
+/* ARR */
+#define ARR(Val)                                                \
     do {                                                        \
-        unsigned old = Regs.AC;                                 \
-        unsigned rhs = (v & 0xFF);                              \
+        unsigned tmp = Regs.AC & Val;                           \
+        Val = tmp >> 1;                                         \
+        if (GET_CF ()) {                                        \
+            Val |= 0x80;                                        \
+        }                                                       \
         if (GET_DF ()) {                                        \
-            unsigned lo;                                        \
-            int res;                                            \
-            lo = (old & 0x0F) - (rhs & 0x0F) + GET_CF () - 1;   \
-            if (lo & 0x80) {                                    \
-                lo = ((lo - 0x06) & 0x0F) - 0x10;               \
+            SET_SF (GET_CF ());                                 \
+            TEST_ZF (Val);                                      \
+            SET_OF ((Val ^ tmp) & 0x40);                        \
+            if (((tmp & 0x0f) + (tmp & 0x01)) > 0x05) {         \
+                Val = (Val & 0xf0) | ((Val + 0x06) & 0x0f);     \
             }                                                   \
-            Regs.AC = (old & 0xF0) - (rhs & 0xF0) + lo;         \
-            if (Regs.AC & 0x80) {                               \
-                Regs.AC -= 0x60;                                \
+            if (((tmp & 0xf0) + (tmp & 0x10)) > 0x50) {         \
+                Val = (Val & 0x0f) | ((Val + 0x60) & 0xf0);     \
+                SET_CF(1);                                      \
+            } else {                                            \
+                SET_CF(0);                                      \
             }                                                   \
-            res = Regs.AC - rhs + (!GET_CF ());                 \
-            TEST_ZF (res);                                      \
-            TEST_SF (res);                                      \
-            SET_CF (res <= 0xFF);                               \
-            SET_OF (((old^rhs) & (old^res) & 0x80));            \
-            if (CPU != CPU_6502) {                              \
+            if (CPU == CPU_65C02) {                             \
                 ++Cycles;                                       \
             }                                                   \
         } else {                                                \
-            Regs.AC -= rhs + (!GET_CF ());                      \
-            TEST_ZF (Regs.AC);                                  \
-            TEST_SF (Regs.AC);                                  \
-            SET_CF (Regs.AC <= 0xFF);                           \
-            SET_OF (((old^rhs) & (old^Regs.AC) & 0x80));        \
-            Regs.AC &= 0xFF;                                    \
+            TEST_SF (Val);                                      \
+            TEST_ZF (Val);                                      \
+            SET_CF (Val & 0x40);                                \
+            SET_OF ((Val & 0x40) ^ ((Val & 0x20) << 1));        \
+        }                                                       \
+        Regs.AC = Val;                                          \
+    } while (0)
+
+/* ANE */
+/* An "unstable" illegal opcode that depends on a "constant" value that isn't
+ * really constant. It varies between machines, with temperature, and so on.
+ * Original sim65 behavior was to use the constant 0xEF here. To get behavior
+ * in line with the 65x02 testsuite, we now use the value 0xEE instead,
+ * which is also a reasonable choice that can be observed in practice.
+ */
+#define ANE(Val)                                                \
+    Val = (Regs.AC | 0xEE) & Regs.XR & Val;                     \
+    Regs.AC = Val;                                              \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+/* LXA */
+#define LXA(Val)                                                \
+    Val = (Regs.AC | 0xEE) & Val;                               \
+    Regs.AC = Val;                                              \
+    Regs.XR = Val;                                              \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+/* SBX */
+#define SBX(Val)                                                \
+    do {                                                        \
+        unsigned tmp = (Regs.AC & Regs.XR) - (Val);             \
+        SET_CF (tmp < 0x100);                                   \
+        tmp &= 0xFF;                                            \
+        Regs.XR = tmp;                                          \
+        TEST_SF (tmp);                                          \
+        TEST_ZF (tmp);                                          \
+    } while (0)
+
+/* NOP */
+#define NOP(Val)                                                \
+    (void)Val
+
+/* TAS */
+#define TAS(Val)                                                \
+    Val = Regs.AC & Regs.XR;                                    \
+    Regs.SP = Val;                                              \
+    Val &= (address >> 8) + 1
+
+/* SHA */
+#define SHA(Val)                                                \
+    Val = Regs.AC & Regs.XR & ((address >> 8) + 1)
+
+/* ANC */
+#define ANC(Val)                                                \
+    Val = Regs.AC & Val;                                        \
+    Regs.AC = Val;                                              \
+    SET_CF (Val & 0x80);                                        \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+
+/* LAS */
+#define LAS(Val)                                                \
+    Val = Regs.SP & Val;                                        \
+    Regs.AC = Val;                                              \
+    Regs.XR = Val;                                              \
+    Regs.SP = Val;                                              \
+    TEST_SF (Val);                                              \
+    TEST_ZF (Val)
+
+/* SBC, binary mode (6502 and 65C02) */
+#define SBC_BINARY_MODE(v)                                      \
+    do {                                                        \
+        const uint8_t op = v;                                   \
+        const uint8_t OldAC = Regs.AC;                          \
+        const bool borrow = !GET_CF();                          \
+        Regs.AC = OldAC - op - borrow;                          \
+        const bool NV = Regs.AC >= 0x80;                        \
+        SET_SF(NV);                                             \
+        SET_OF(((OldAC >= 0x80) ^ NV) & ((op < 0x80) ^ NV));    \
+        SET_ZF(Regs.AC == 0);                                   \
+        SET_CF(OldAC >= op + borrow);                           \
+    } while (0)
+
+/* SBC, decimal mode (6502 behavior) */
+#define SBC_DECIMAL_MODE_6502(v)                                \
+    do {                                                        \
+        const uint8_t op = v;                                   \
+        const uint8_t OldAC = Regs.AC;                          \
+        bool borrow = !GET_CF();                                \
+        const uint8_t binary_result = OldAC - op - borrow;      \
+        const bool NV = binary_result >= 0x80;                  \
+        uint8_t low_nibble = (OldAC & 15) - (op & 15) - borrow; \
+        if ((borrow = low_nibble >= 0x80))                      \
+            low_nibble = (low_nibble + 10) & 15;                \
+        uint8_t high_nibble = (OldAC >> 4) - (op >> 4) - borrow;\
+        if ((borrow = high_nibble >= 0x80))                     \
+            high_nibble = (high_nibble + 10) & 15;              \
+        Regs.AC = (high_nibble << 4) | low_nibble;              \
+        SET_SF(NV);                                             \
+        SET_OF(((OldAC >= 0x80) ^ NV) & ((op < 0x80) ^ NV));    \
+        SET_ZF(binary_result == 0);                             \
+        SET_CF(!borrow);                                        \
+    } while (0)
+
+/* SBC, decimal mode (65C02 behavior) */
+#define SBC_DECIMAL_MODE_65C02(v)                               \
+    do {                                                        \
+        const uint8_t op = v;                                   \
+        const uint8_t OldAC = Regs.AC;                          \
+        bool borrow = !GET_CF();                                \
+        uint8_t low_nibble = (OldAC & 15) - (op & 15) - borrow; \
+        if ((borrow = low_nibble >= 0x80))                      \
+            low_nibble += 10;                                   \
+        const bool low_nibble_still_negative =                  \
+            (low_nibble >= 0x80);                               \
+        low_nibble &= 15;                                       \
+        uint8_t high_nibble = (OldAC >> 4) - (op >> 4) - borrow;\
+        const bool PN = (high_nibble & 8) != 0;                 \
+        if ((borrow = high_nibble >= 0x80))                     \
+            high_nibble += 10;                                  \
+        high_nibble -= low_nibble_still_negative;               \
+        high_nibble &= 15;                                      \
+        Regs.AC = (high_nibble << 4) | low_nibble;              \
+        SET_SF(Regs.AC >= 0x80);                                \
+        SET_OF(((OldAC >= 0x80) ^ PN) & ((op < 0x80) ^ PN));    \
+        SET_ZF(Regs.AC == 0x00);                                \
+        SET_CF(!borrow);                                        \
+        ++Cycles;                                               \
+    } while (0)
+
+/* SBC, 6502 version */
+#define SBC_6502(v)                                             \
+    do {                                                        \
+        if (GET_DF()) {                                         \
+            SBC_DECIMAL_MODE_6502(v);                           \
+        } else {                                                \
+            SBC_BINARY_MODE(v);                                 \
+        }                                                       \
+    } while (0)
+
+/* SBC, 65C02 version */
+#define SBC_65C02(v)                                            \
+    do {                                                        \
+        if (GET_DF()) {                                         \
+            SBC_DECIMAL_MODE_65C02(v);                          \
+        } else {                                                \
+            SBC_BINARY_MODE(v);                                 \
         }                                                       \
     } while (0)
 
 
 
+/* Set/reset a specific bit in a zero-page byte. This macro
+ * macro is used to implement the 65C02 RMBx and SMBx instructions.
+ */
+#define ZP_BITOP(bitnr, bitval)                                 \
+    do {                                                        \
+        const uint8_t zp_address = MemReadByte (Regs.PC + 1);   \
+        uint8_t zp_value = MemReadByte (zp_address);            \
+        if (bitval) {                                           \
+            zp_value |= (1 << bitnr);                           \
+        } else {                                                \
+            zp_value &= ~(1 << bitnr);                          \
+        }                                                       \
+        MemWriteByte (zp_address, zp_value);                    \
+        Regs.PC += 2;                                           \
+        Cycles = 5;                                             \
+    } while (0)
+
+/* Branch depending on the state of a specific bit of a zero page
+ * address. This macro is used to implement the 65C02 BBRx and
+ * BBSx instructions.
+ */
+#define ZP_BIT_BRANCH(bitnr, bitval)                            \
+    do {                                                        \
+        const uint8_t zp_address = MemReadByte (Regs.PC + 1);   \
+        const uint8_t zp_value = MemReadByte (zp_address);      \
+        const int8_t displacement = MemReadByte (Regs.PC + 2);  \
+        if (((zp_value & (1 << bitnr)) != 0) == bitval) {       \
+            Regs.PC += 3;                                       \
+            uint8_t OldPCH = PCH;                               \
+            Regs.PC += displacement;                            \
+            Cycles = 6;                                         \
+            if (PCH != OldPCH) {                                \
+                Cycles += 1;                                    \
+            }                                                   \
+        } else {                                                \
+            Regs.PC += 3;                                       \
+            Cycles = 5;                                         \
+        }                                                       \
+    } while (0)
+
 /*****************************************************************************/
 /*                         Opcode handling functions                         */
 /*****************************************************************************/
@@ -368,7 +1179,7 @@ static void OPC_6502_00 (void)
     PUSH (PCL);
     PUSH (Regs.SR);
     SET_IF (1);
-    if (CPU != CPU_6502)
+    if (CPU == CPU_65C02)
     {
         SET_DF (0);
     }
@@ -380,22 +1191,35 @@ static void OPC_6502_00 (void)
 static void OPC_6502_01 (void)
 /* Opcode $01: ORA (ind,x) */
 {
-    AC_OP_ZPXIND (|);
+    AC_OP (ZPXIND, |);
 }
 
 
 
-static void OPC_65SC02_04 (void)
+static void OPC_6502X_03 (void)
+/* Opcode $03: SLO (zp,x) */
+{
+    ILLx2_OP (ZPXIND, SLO);
+}
+
+
+
+/* Aliases of opcode $04 */
+#define OPC_6502X_44 OPC_6502X_04
+#define OPC_6502X_64 OPC_6502X_04
+
+static void OPC_6502X_04 (void)
+/* Opcode $04: NOP zp */
+{
+    ALU_OP (ZP, NOP);
+}
+
+
+
+static void OPC_65C02_04 (void)
 /* Opcode $04: TSB zp */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr);
-    SET_ZF ((Val & Regs.AC) == 0);
-    MemWriteByte (ZPAddr, (unsigned char)(Val | Regs.AC));
-    Regs.PC += 2;
+    MEM_OP (ZP, TSB);
 }
 
 
@@ -403,7 +1227,7 @@ static void OPC_65SC02_04 (void)
 static void OPC_6502_05 (void)
 /* Opcode $05: ORA zp */
 {
-    AC_OP_ZP (|);
+    AC_OP (ZP, |);
 }
 
 
@@ -411,16 +1235,23 @@ static void OPC_6502_05 (void)
 static void OPC_6502_06 (void)
 /* Opcode $06: ASL zp */
 {
-    unsigned char ZPAddr;
-    unsigned Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr) << 1;
-    MemWriteByte (ZPAddr, (unsigned char) Val);
-    TEST_ZF (Val & 0xFF);
-    TEST_SF (Val);
-    SET_CF (Val & 0x100);
-    Regs.PC += 2;
+    MEM_OP (ZP, ASL);
+}
+
+
+
+static void OPC_6502X_07 (void)
+/* Opcode $07: SLO zp */
+{
+    ILLx2_OP (ZP, SLO);
+}
+
+
+
+static void OPC_65C02_07 (void)
+/* Opcode $07: RMB0 zp */
+{
+    ZP_BITOP(0, 0);
 }
 
 
@@ -447,27 +1278,35 @@ static void OPC_6502_0A (void)
 /* Opcode $0A: ASL a */
 {
     Cycles = 2;
-    Regs.AC <<= 1;
-    TEST_ZF (Regs.AC & 0xFF);
-    TEST_SF (Regs.AC);
-    SET_CF (Regs.AC & 0x100);
-    Regs.AC &= 0xFF;
+    ASL(Regs.AC);
     Regs.PC += 1;
 }
 
 
 
-static void OPC_65SC02_0C (void)
+/* Aliases of opcode $0B */
+#define OPC_6502X_2B OPC_6502X_0B
+
+static void OPC_6502X_0B (void)
+/* Opcode $0B: ANC #imm */
+{
+    ALU_OP_IMM (ANC);
+}
+
+
+
+static void OPC_6502X_0C (void)
+/* Opcode $0C: NOP abs */
+{
+    ALU_OP (ABS, NOP);
+}
+
+
+
+static void OPC_65C02_0C (void)
 /* Opcode $0C: TSB abs */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val = MemReadByte (Addr);
-    SET_ZF ((Val & Regs.AC) == 0);
-    MemWriteByte (Addr, (unsigned char) (Val | Regs.AC));
-    Regs.PC += 3;
+    MEM_OP (ABS, TSB);
 }
 
 
@@ -475,24 +1314,31 @@ static void OPC_65SC02_0C (void)
 static void OPC_6502_0D (void)
 /* Opcode $0D: ORA abs */
 {
-    AC_OP_ABS (|);
+    AC_OP (ABS, |);
 }
 
 
 
 static void OPC_6502_0E (void)
-/* Opcode $0E: ALS abs */
+/* Opcode $0E: ASL abs */
 {
-    unsigned Addr;
-    unsigned Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val = MemReadByte (Addr) << 1;
-    MemWriteByte (Addr, (unsigned char) Val);
-    TEST_ZF (Val & 0xFF);
-    TEST_SF (Val);
-    SET_CF (Val & 0x100);
-    Regs.PC += 3;
+    MEM_OP (ABS, ASL);
+}
+
+
+
+static void OPC_6502X_0F (void)
+/* Opcode $0F: SLO abs */
+{
+    ILLx2_OP (ABS, SLO);
+}
+
+
+
+static void OPC_65C02_0F (void)
+/* Opcode $0F: BBR0 zp, rel */
+{
+    ZP_BIT_BRANCH (0, 0);
 }
 
 
@@ -508,30 +1354,46 @@ static void OPC_6502_10 (void)
 static void OPC_6502_11 (void)
 /* Opcode $11: ORA (zp),y */
 {
-    AC_OP_ZPINDY (|);
+    AC_OP (ZPINDY, |);
 }
 
 
 
-static void OPC_65SC02_12 (void)
+static void OPC_65C02_12 (void)
 /* Opcode $12: ORA (zp) */
 {
-    AC_OP_ZPIND (|);
+    AC_OP (ZPIND, |);
 }
 
 
 
-static void OPC_65SC02_14 (void)
+static void OPC_6502X_13 (void)
+/* Opcode $03: SLO (zp),y */
+{
+    ILLx2_OP (ZPINDY_NP, SLO);
+}
+
+
+
+/* Aliases of opcode $14 */
+#define OPC_6502X_34 OPC_6502X_14
+#define OPC_6502X_54 OPC_6502X_14
+#define OPC_6502X_74 OPC_6502X_14
+#define OPC_6502X_D4 OPC_6502X_14
+#define OPC_6502X_F4 OPC_6502X_14
+
+static void OPC_6502X_14 (void)
+/* Opcode $04: NOP zp,x */
+{
+    ALU_OP (ZPX, NOP);
+}
+
+
+
+static void OPC_65C02_14 (void)
 /* Opcode $14: TRB zp */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr);
-    SET_ZF ((Val & Regs.AC) == 0);
-    MemWriteByte (ZPAddr, (unsigned char)(Val & ~Regs.AC));
-    Regs.PC += 2;
+    MEM_OP (ZP, TRB);
 }
 
 
@@ -539,7 +1401,7 @@ static void OPC_65SC02_14 (void)
 static void OPC_6502_15 (void)
 /* Opcode $15: ORA zp,x */
 {
-   AC_OP_ZPX (|);
+   AC_OP (ZPX, |);
 }
 
 
@@ -547,16 +1409,23 @@ static void OPC_6502_15 (void)
 static void OPC_6502_16 (void)
 /* Opcode $16: ASL zp,x */
 {
-    unsigned char ZPAddr;
-    unsigned Val;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (ZPAddr) << 1;
-    MemWriteByte (ZPAddr, (unsigned char) Val);
-    TEST_ZF (Val & 0xFF);
-    TEST_SF (Val);
-    SET_CF (Val & 0x100);
-    Regs.PC += 2;
+    MEM_OP (ZPX, ASL);
+}
+
+
+
+static void OPC_6502X_17 (void)
+/* Opcode $17: SLO zp,x */
+{
+    ILLx2_OP (ZPX, SLO);
+}
+
+
+
+static void OPC_65C02_17 (void)
+/* Opcode $17: RMB1 zp */
+{
+    ZP_BITOP(1, 0);
 }
 
 
@@ -574,34 +1443,48 @@ static void OPC_6502_18 (void)
 static void OPC_6502_19 (void)
 /* Opcode $19: ORA abs,y */
 {
-    AC_OP_ABSY (|);
+    AC_OP (ABSY, |);
 }
 
 
 
-static void OPC_65SC02_1A (void)
+static void OPC_65C02_1A (void)
 /* Opcode $1A: INC a */
 {
     Cycles = 2;
-    Regs.AC = (Regs.AC + 1) & 0xFF;
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
+    INC(Regs.AC);
     Regs.PC += 1;
 }
 
 
 
-static void OPC_65SC02_1C (void)
+static void OPC_6502X_1B (void)
+/* Opcode $1B: SLO abs,y */
+{
+    ILLx2_OP (ABSY_NP, SLO);
+}
+
+
+
+/* Aliases of opcode $1C */
+#define OPC_6502X_3C OPC_6502X_1C
+#define OPC_6502X_5C OPC_6502X_1C
+#define OPC_6502X_7C OPC_6502X_1C
+#define OPC_6502X_DC OPC_6502X_1C
+#define OPC_6502X_FC OPC_6502X_1C
+
+static void OPC_6502X_1C (void)
+/* Opcode $1C: NOP abs,x */
+{
+    ALU_OP (ABSX, NOP);
+}
+
+
+
+static void OPC_65C02_1C (void)
 /* Opcode $1C: TRB abs */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val = MemReadByte (Addr);
-    SET_ZF ((Val & Regs.AC) == 0);
-    MemWriteByte (Addr, (unsigned char) (Val & ~Regs.AC));
-    Regs.PC += 3;
+    MEM_OP (ABS, TRB);
 }
 
 
@@ -609,7 +1492,7 @@ static void OPC_65SC02_1C (void)
 static void OPC_6502_1D (void)
 /* Opcode $1D: ORA abs,x */
 {
-    AC_OP_ABSX (|);
+    AC_OP (ABSX, |);
 }
 
 
@@ -617,18 +1500,32 @@ static void OPC_6502_1D (void)
 static void OPC_6502_1E (void)
 /* Opcode $1E: ASL abs,x */
 {
-    unsigned Addr;
-    unsigned Val;
-    Cycles = 7;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    if (CPU != CPU_6502 && !PAGE_CROSS (Addr, Regs.XR))
-        --Cycles;
-    Val = MemReadByte (Addr) << 1;
-    MemWriteByte (Addr, (unsigned char) Val);
-    TEST_ZF (Val & 0xFF);
-    TEST_SF (Val);
-    SET_CF (Val & 0x100);
-    Regs.PC += 3;
+    MEM_OP (ABSX_NP, ASL);
+}
+
+
+
+static void OPC_65C02_1E (void)
+/* Opcode $1E: ASL abs,x */
+{
+    MEM_OP (ABSX, ASL);
+    --Cycles;
+}
+
+
+
+static void OPC_6502X_1F (void)
+/* Opcode $1F: SLO abs,x */
+{
+    ILLx2_OP (ABSX_NP, SLO);
+}
+
+
+
+static void OPC_65C02_1F (void)
+/* Opcode $1F: BBR1 zp, rel */
+{
+    ZP_BIT_BRANCH (1, 0);
 }
 
 
@@ -636,13 +1533,35 @@ static void OPC_6502_1E (void)
 static void OPC_6502_20 (void)
 /* Opcode $20: JSR */
 {
-    unsigned Addr;
+    /* The obvious way to implement JSR for the 6502 is to (a) read the target address,
+     * and then (b) push the return address minus one. Or do (b) first, then (a).
+     *
+     * However, there is a non-obvious case where this conflicts with the actual order
+     * of operations that the 6502 does, which is:
+     *
+     * (a) Load the LSB of the target address.
+     * (b) Push the MSB of the return address, minus one.
+     * (c) Push the LSB of the return address, minus one.
+     * (d) Load the MSB of the target address.
+     *
+     * This can make a difference in a pretty esoteric case, if the JSR target is located,
+     * wholly or in part, inside the stack page (!). This won't happen in normal code
+     * but it can happen in specifically constructed examples.
+     *
+     * To deal with this, we load the LSB and MSB of the target address separately,
+     * with the pushing of the return address sandwiched in between, to mimic
+     * the order of the bus operations on a real 6502.
+     */
+
     Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Regs.PC += 2;
+    Regs.PC += 1;
+    uint8_t AddrLo = MemReadByte(Regs.PC);
+    Regs.PC += 1;
     PUSH (PCH);
     PUSH (PCL);
-    Regs.PC = Addr;
+    uint8_t AddrHi = MemReadByte(Regs.PC);
+
+    Regs.PC = AddrLo + (AddrHi << 8);
 
     ParaVirtHooks (&Regs);
 }
@@ -652,23 +1571,23 @@ static void OPC_6502_20 (void)
 static void OPC_6502_21 (void)
 /* Opcode $21: AND (zp,x) */
 {
-    AC_OP_ZPXIND (&);
+    AC_OP (ZPXIND, &);
+}
+
+
+
+static void OPC_6502X_23 (void)
+/* Opcode $23: RLA (zp,x) */
+{
+    ILLx2_OP (ZPXIND, RLA);
 }
 
 
 
 static void OPC_6502_24 (void)
-/* Opcode $24: BIT zp */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr);
-    SET_SF (Val & 0x80);
-    SET_OF (Val & 0x40);
-    SET_ZF ((Val & Regs.AC) == 0);
-    Regs.PC += 2;
+/* Opcode $24: BIT zp */
+    ALU_OP (ZP, BIT);
 }
 
 
@@ -676,7 +1595,7 @@ static void OPC_6502_24 (void)
 static void OPC_6502_25 (void)
 /* Opcode $25: AND zp */
 {
-    AC_OP_ZP (&);
+    AC_OP (ZP, &);
 }
 
 
@@ -684,14 +1603,23 @@ static void OPC_6502_25 (void)
 static void OPC_6502_26 (void)
 /* Opcode $26: ROL zp */
 {
-    unsigned char ZPAddr;
-    unsigned Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr);
-    ROL (Val);
-    MemWriteByte (ZPAddr, Val);
-    Regs.PC += 2;
+    MEM_OP (ZP, ROL);
+}
+
+
+
+static void OPC_6502X_27 (void)
+/* Opcode $27: RLA zp */
+{
+    ILLx2_OP (ZP, RLA);
+}
+
+
+
+static void OPC_65C02_27 (void)
+/* Opcode $27: RMB2 zp */
+{
+    ZP_BITOP(2, 0);
 }
 
 
@@ -730,15 +1658,7 @@ static void OPC_6502_2A (void)
 static void OPC_6502_2C (void)
 /* Opcode $2C: BIT abs */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    Val = MemReadByte (Addr);
-    SET_SF (Val & 0x80);
-    SET_OF (Val & 0x40);
-    SET_ZF ((Val & Regs.AC) == 0);
-    Regs.PC += 3;
+    ALU_OP (ABS, BIT);
 }
 
 
@@ -746,7 +1666,7 @@ static void OPC_6502_2C (void)
 static void OPC_6502_2D (void)
 /* Opcode $2D: AND abs */
 {
-    AC_OP_ABS (&);
+    AC_OP (ABS, &);
 }
 
 
@@ -754,14 +1674,23 @@ static void OPC_6502_2D (void)
 static void OPC_6502_2E (void)
 /* Opcode $2E: ROL abs */
 {
-    unsigned Addr;
-    unsigned Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val = MemReadByte (Addr);
-    ROL (Val);
-    MemWriteByte (Addr, Val);
-    Regs.PC += 3;
+    MEM_OP (ABS, ROL);
+}
+
+
+
+static void OPC_6502X_2F (void)
+/* Opcode $2F: RLA abs */
+{
+    ILLx2_OP (ABS, RLA);
+}
+
+
+
+static void OPC_65C02_2F (void)
+/* Opcode $2F: BBR2 zp, rel */
+{
+    ZP_BIT_BRANCH (2, 0);
 }
 
 
@@ -777,31 +1706,31 @@ static void OPC_6502_30 (void)
 static void OPC_6502_31 (void)
 /* Opcode $31: AND (zp),y */
 {
-    AC_OP_ZPINDY (&);
+    AC_OP (ZPINDY, &);
 }
 
 
 
-static void OPC_65SC02_32 (void)
+static void OPC_65C02_32 (void)
 /* Opcode $32: AND (zp) */
 {
-    AC_OP_ZPIND (&);
+    AC_OP (ZPIND, &);
 }
 
 
 
-static void OPC_65SC02_34 (void)
+static void OPC_6502X_33 (void)
+/* Opcode $33: RLA (zp),y */
+{
+    ILLx2_OP (ZPINDY_NP, RLA);
+}
+
+
+
+static void OPC_65C02_34 (void)
 /* Opcode $34: BIT zp,x */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (ZPAddr);
-    SET_SF (Val & 0x80);
-    SET_OF (Val & 0x40);
-    SET_ZF ((Val & Regs.AC) == 0);
-    Regs.PC += 2;
+    ALU_OP (ZPX, BIT);
 }
 
 
@@ -809,7 +1738,7 @@ static void OPC_65SC02_34 (void)
 static void OPC_6502_35 (void)
 /* Opcode $35: AND zp,x */
 {
-    AC_OP_ZPX (&);
+    AC_OP (ZPX, &);
 }
 
 
@@ -817,14 +1746,23 @@ static void OPC_6502_35 (void)
 static void OPC_6502_36 (void)
 /* Opcode $36: ROL zp,x */
 {
-    unsigned char ZPAddr;
-    unsigned Val;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (ZPAddr);
-    ROL (Val);
-    MemWriteByte (ZPAddr, Val);
-    Regs.PC += 2;
+    MEM_OP (ZPX, ROL);
+}
+
+
+
+static void OPC_6502X_37 (void)
+/* Opcode $37: RLA zp,x */
+{
+    ILLx2_OP (ZPX, RLA);
+}
+
+
+
+static void OPC_65C02_37 (void)
+/* Opcode $37: RMB3 zp */
+{
+    ZP_BITOP(3, 0);
 }
 
 
@@ -842,37 +1780,33 @@ static void OPC_6502_38 (void)
 static void OPC_6502_39 (void)
 /* Opcode $39: AND abs,y */
 {
-    AC_OP_ABSY (&);
+    AC_OP (ABSY, &);
 }
 
 
 
-static void OPC_65SC02_3A (void)
+static void OPC_65C02_3A (void)
 /* Opcode $3A: DEC a */
 {
     Cycles = 2;
-    Regs.AC = (Regs.AC - 1) & 0xFF;
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
+    DEC (Regs.AC);
     Regs.PC += 1;
 }
 
 
 
-static void OPC_65SC02_3C (void)
+static void OPC_6502X_3B (void)
+/* Opcode $3B: RLA abs,y */
+{
+    ILLx2_OP (ABSY_NP, RLA);
+}
+
+
+
+static void OPC_65C02_3C (void)
 /* Opcode $3C: BIT abs,x */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.XR))
-        ++Cycles;
-    Val  = MemReadByte (Addr + Regs.XR);
-    SET_SF (Val & 0x80);
-    SET_OF (Val & 0x40);
-    SET_ZF ((Val & Regs.AC) == 0);
-    Regs.PC += 3;
+    ALU_OP (ABSX, BIT);
 }
 
 
@@ -880,7 +1814,7 @@ static void OPC_65SC02_3C (void)
 static void OPC_6502_3D (void)
 /* Opcode $3D: AND abs,x */
 {
-    AC_OP_ABSX (&);
+    AC_OP (ABSX, &);
 }
 
 
@@ -888,16 +1822,32 @@ static void OPC_6502_3D (void)
 static void OPC_6502_3E (void)
 /* Opcode $3E: ROL abs,x */
 {
-    unsigned Addr;
-    unsigned Val;
-    Cycles = 7;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    if (CPU != CPU_6502 && !PAGE_CROSS (Addr, Regs.XR))
-        --Cycles;
-    Val = MemReadByte (Addr);
-    ROL (Val);
-    MemWriteByte (Addr, Val);
-    Regs.PC += 2;
+    MEM_OP (ABSX_NP, ROL);
+}
+
+
+
+static void OPC_65C02_3E (void)
+/* Opcode $3E: ROL abs,x */
+{
+    MEM_OP (ABSX, ROL);
+    --Cycles;
+}
+
+
+
+static void OPC_6502X_3F (void)
+/* Opcode $3F: RLA abs,x */
+{
+    ILLx2_OP (ABSX_NP, RLA);
+}
+
+
+
+static void OPC_65C02_3F (void)
+/* Opcode $3F: BBR3 zp, rel */
+{
+    ZP_BIT_BRANCH (3, 0);
 }
 
 
@@ -918,16 +1868,15 @@ static void OPC_6502_40 (void)
 static void OPC_6502_41 (void)
 /* Opcode $41: EOR (zp,x) */
 {
-    AC_OP_ZPXIND (^);
+    AC_OP (ZPXIND, ^);
 }
 
 
 
-static void OPC_65C02_44 (void)
-/* Opcode $44: 'zp' 3 cycle NOP */
+static void OPC_6502X_43 (void)
+/* Opcode $43: SRE (zp,x) */
 {
-    Cycles = 3;
-    Regs.PC += 2;
+    ILLx2_OP (ZPXIND, SRE);
 }
 
 
@@ -935,7 +1884,7 @@ static void OPC_65C02_44 (void)
 static void OPC_6502_45 (void)
 /* Opcode $45: EOR zp */
 {
-    AC_OP_ZP (^);
+    AC_OP (ZP, ^);
 }
 
 
@@ -943,17 +1892,23 @@ static void OPC_6502_45 (void)
 static void OPC_6502_46 (void)
 /* Opcode $46: LSR zp */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr);
-    SET_CF (Val & 0x01);
-    Val >>= 1;
-    MemWriteByte (ZPAddr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 2;
+    MEM_OP (ZP, LSR);
+}
+
+
+
+static void OPC_6502X_47 (void)
+/* Opcode $47: SRE zp */
+{
+    ILLx2_OP (ZP, SRE);
+}
+
+
+
+static void OPC_65C02_47 (void)
+/* Opcode $47: RMB4 zp */
+{
+    ZP_BITOP(4, 0);
 }
 
 
@@ -980,15 +1935,20 @@ static void OPC_6502_4A (void)
 /* Opcode $4A: LSR a */
 {
     Cycles = 2;
-    SET_CF (Regs.AC & 0x01);
-    Regs.AC >>= 1;
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
+    LSR (Regs.AC);
     Regs.PC += 1;
 }
 
 
 
+static void OPC_6502X_4B (void)
+/* Opcode $4B: ASR imm */
+{
+    ALU_OP_IMM (ASR);
+}
+
+
+
 static void OPC_6502_4C (void)
 /* Opcode $4C: JMP abs */
 {
@@ -1003,7 +1963,7 @@ static void OPC_6502_4C (void)
 static void OPC_6502_4D (void)
 /* Opcode $4D: EOR abs */
 {
-    AC_OP_ABS (^);
+    AC_OP (ABS, ^);
 }
 
 
@@ -1011,17 +1971,23 @@ static void OPC_6502_4D (void)
 static void OPC_6502_4E (void)
 /* Opcode $4E: LSR abs */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val = MemReadByte (Addr);
-    SET_CF (Val & 0x01);
-    Val >>= 1;
-    MemWriteByte (Addr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 3;
+    MEM_OP (ABS, LSR);
+}
+
+
+
+static void OPC_6502X_4F (void)
+/* Opcode $4F: SRE abs */
+{
+    ILLx2_OP (ABS, SRE);
+}
+
+
+
+static void OPC_65C02_4F (void)
+/* Opcode $4F: BBR4 zp, rel */
+{
+    ZP_BIT_BRANCH (4, 0);
 }
 
 
@@ -1037,15 +2003,23 @@ static void OPC_6502_50 (void)
 static void OPC_6502_51 (void)
 /* Opcode $51: EOR (zp),y */
 {
-    AC_OP_ZPINDY (^);
+    AC_OP (ZPINDY, ^);
 }
 
 
 
-static void OPC_65SC02_52 (void)
+static void OPC_65C02_52 (void)
 /* Opcode $52: EOR (zp) */
 {
-    AC_OP_ZPIND (^);
+    AC_OP (ZPIND, ^);
+}
+
+
+
+static void OPC_6502X_53 (void)
+/* Opcode $43: SRE (zp),y */
+{
+    ILLx2_OP (ZPINDY_NP, SRE);
 }
 
 
@@ -1053,7 +2027,7 @@ static void OPC_65SC02_52 (void)
 static void OPC_6502_55 (void)
 /* Opcode $55: EOR zp,x */
 {
-    AC_OP_ZPX (^);
+    AC_OP (ZPX, ^);
 }
 
 
@@ -1061,17 +2035,23 @@ static void OPC_6502_55 (void)
 static void OPC_6502_56 (void)
 /* Opcode $56: LSR zp,x */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (ZPAddr);
-    SET_CF (Val & 0x01);
-    Val >>= 1;
-    MemWriteByte (ZPAddr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 2;
+    MEM_OP (ZPX, LSR);
+}
+
+
+
+static void OPC_6502X_57 (void)
+/* Opcode $57: SRE zp,x */
+{
+    ILLx2_OP (ZPX, SRE);
+}
+
+
+
+static void OPC_65C02_57 (void)
+/* Opcode $57: RMB5 zp */
+{
+    ZP_BITOP(5, 0);
 }
 
 
@@ -1089,12 +2069,12 @@ static void OPC_6502_58 (void)
 static void OPC_6502_59 (void)
 /* Opcode $59: EOR abs,y */
 {
-    AC_OP_ABSY (^);
+    AC_OP (ABSY, ^);
 }
 
 
 
-static void OPC_65SC02_5A (void)
+static void OPC_65C02_5A (void)
 /* Opcode $5A: PHY */
 {
     Cycles = 3;
@@ -1104,9 +2084,25 @@ static void OPC_65SC02_5A (void)
 
 
 
+static void OPC_6502X_5B (void)
+/* Opcode $5B: SRE abs,y */
+{
+    ILLx2_OP (ABSY_NP, SRE);
+}
+
+
+
 static void OPC_65C02_5C (void)
 /* Opcode $5C: 'Absolute' 8 cycle NOP */
 {
+    /* This instruction takes 8 cycles, as per the following sources:
+     *
+     * - http://www.6502.org/tutorials/65c02opcodes.html
+     * - Tests on a WDC 65C02 in hardware.
+     *
+     * The 65x02 testsuite however claims that this instruction takes 4 cycles.
+     * See issue: https://github.com/SingleStepTests/65x02/issues/12
+     */
     Cycles = 8;
     Regs.PC += 3;
 }
@@ -1116,7 +2112,7 @@ static void OPC_65C02_5C (void)
 static void OPC_6502_5D (void)
 /* Opcode $5D: EOR abs,x */
 {
-    AC_OP_ABSX (^);
+    AC_OP (ABSX, ^);
 }
 
 
@@ -1124,19 +2120,32 @@ static void OPC_6502_5D (void)
 static void OPC_6502_5E (void)
 /* Opcode $5E: LSR abs,x */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 7;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    if (CPU != CPU_6502 && !PAGE_CROSS (Addr, Regs.XR))
-        --Cycles;
-    Val = MemReadByte (Addr);
-    SET_CF (Val & 0x01);
-    Val >>= 1;
-    MemWriteByte (Addr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 3;
+    MEM_OP (ABSX_NP, LSR);
+}
+
+
+
+static void OPC_65C02_5E (void)
+/* Opcode $5E: LSR abs,x */
+{
+    MEM_OP (ABSX, LSR);
+    --Cycles;
+}
+
+
+
+static void OPC_6502X_5F (void)
+/* Opcode $5F: SRE abs,x */
+{
+    ILLx2_OP (ABSX_NP, SRE);
+}
+
+
+
+static void OPC_65C02_5F (void)
+/* Opcode $5F: BBR5 zp, rel */
+{
+    ZP_BIT_BRANCH (5, 0);
 }
 
 
@@ -1155,25 +2164,31 @@ static void OPC_6502_60 (void)
 static void OPC_6502_61 (void)
 /* Opcode $61: ADC (zp,x) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Addr = MemReadZPWord (ZPAddr);
-    ADC (MemReadByte (Addr));
-    Regs.PC += 2;
+    ALU_OP (ZPXIND, ADC_6502);
 }
 
 
 
-static void OPC_65SC02_64 (void)
+static void OPC_65C02_61 (void)
+/* Opcode $61: ADC (zp,x) */
+{
+    ALU_OP (ZPXIND, ADC_65C02);
+}
+
+
+
+static void OPC_6502X_63 (void)
+/* Opcode $63: RRA (zp,x) */
+{
+    ILLx2_OP (ZPXIND, RRA);
+}
+
+
+
+static void OPC_65C02_64 (void)
 /* Opcode $64: STZ zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    MemWriteByte (ZPAddr, 0);
-    Regs.PC += 2;
+    STO_OP (ZP, 0);
 }
 
 
@@ -1181,11 +2196,15 @@ static void OPC_65SC02_64 (void)
 static void OPC_6502_65 (void)
 /* Opcode $65: ADC zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    ADC (MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZP, ADC_6502);
+}
+
+
+
+static void OPC_65C02_65 (void)
+/* Opcode $65: ADC zp */
+{
+    ALU_OP (ZP, ADC_65C02);
 }
 
 
@@ -1193,14 +2212,23 @@ static void OPC_6502_65 (void)
 static void OPC_6502_66 (void)
 /* Opcode $66: ROR zp */
 {
-    unsigned char ZPAddr;
-    unsigned Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr);
-    ROR (Val);
-    MemWriteByte (ZPAddr, Val);
-    Regs.PC += 2;
+    MEM_OP (ZP, ROR);
+}
+
+
+
+static void OPC_6502X_67 (void)
+/* Opcode $67: RRA zp */
+{
+    ILLx2_OP (ZP, RRA);
+}
+
+
+
+static void OPC_65C02_67 (void)
+/* Opcode $67: RMB6 zp */
+{
+    ZP_BITOP(6, 0);
 }
 
 
@@ -1220,9 +2248,15 @@ static void OPC_6502_68 (void)
 static void OPC_6502_69 (void)
 /* Opcode $69: ADC #imm */
 {
-    Cycles = 2;
-    ADC (MemReadByte (Regs.PC+1));
-    Regs.PC += 2;
+    ALU_OP_IMM (ADC_6502);
+}
+
+
+
+static void OPC_65C02_69 (void)
+/* Opcode $69: ADC #imm */
+{
+    ALU_OP_IMM (ADC_65C02);
 }
 
 
@@ -1237,6 +2271,14 @@ static void OPC_6502_6A (void)
 
 
 
+static void OPC_6502X_6B (void)
+/* Opcode $6B: ARR imm */
+{
+    ALU_OP_IMM (ARR);
+}
+
+
+
 static void OPC_6502_6C (void)
 /* Opcode $6C: JMP (ind) */
 {
@@ -1244,25 +2286,17 @@ static void OPC_6502_6C (void)
     PC = Regs.PC;
     Lo = MemReadWord (PC+1);
 
-    if (CPU == CPU_6502)
-    {
-         /* Emulate the 6502 bug */
-        Cycles = 5;
-        Regs.PC = MemReadByte (Lo);
-        Hi = (Lo & 0xFF00) | ((Lo + 1) & 0xFF);
-        Regs.PC |= (MemReadByte (Hi) << 8);
+    /* Emulate the buggy 6502 behavior */
+    Cycles = 5;
+    Regs.PC = MemReadByte (Lo);
+    Hi = (Lo & 0xFF00) | ((Lo + 1) & 0xFF);
+    Regs.PC |= (MemReadByte (Hi) << 8);
 
-        /* Output a warning if the bug is triggered */
-        if (Hi != Lo + 1)
-        {
-            Warning ("6502 indirect jump bug triggered at $%04X, ind addr = $%04X",
-                     PC, Lo);
-        }
-    }
-    else
+    /* Output a warning if the bug is triggered */
+    if (Hi != Lo + 1)
     {
-        Cycles = 6;
-        Regs.PC = MemReadWord(Lo);
+        Warning ("6502 indirect jump bug triggered at $%04X, ind addr = $%04X",
+                    PC, Lo);
     }
 
     ParaVirtHooks (&Regs);
@@ -1273,8 +2307,8 @@ static void OPC_6502_6C (void)
 static void OPC_65C02_6C (void)
 /* Opcode $6C: JMP (ind) */
 {
-    /* 6502 bug fixed here */
-    Cycles = 5;
+    /* The 6502 bug is fixed on the 65C02, at the cost of an extra cycle. */
+    Cycles = 6;
     Regs.PC = MemReadWord (MemReadWord (Regs.PC+1));
 
     ParaVirtHooks (&Regs);
@@ -1285,11 +2319,15 @@ static void OPC_65C02_6C (void)
 static void OPC_6502_6D (void)
 /* Opcode $6D: ADC abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr   = MemReadWord (Regs.PC+1);
-    ADC (MemReadByte (Addr));
-    Regs.PC += 3;
+    ALU_OP (ABS, ADC_6502);
+}
+
+
+
+static void OPC_65C02_6D (void)
+/* Opcode $6D: ADC abs */
+{
+    ALU_OP (ABS, ADC_65C02);
 }
 
 
@@ -1297,14 +2335,23 @@ static void OPC_6502_6D (void)
 static void OPC_6502_6E (void)
 /* Opcode $6E: ROR abs */
 {
-    unsigned Addr;
-    unsigned Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val  = MemReadByte (Addr);
-    ROR (Val);
-    MemWriteByte (Addr, Val);
-    Regs.PC += 3;
+    MEM_OP (ABS, ROR);
+}
+
+
+
+static void OPC_6502X_6F (void)
+/* Opcode $6F: RRA abs */
+{
+    ILLx2_OP (ABS, RRA);
+}
+
+
+
+static void OPC_65C02_6F (void)
+/* Opcode $6F: BBR6 zp, rel */
+{
+    ZP_BIT_BRANCH (6, 0);
 }
 
 
@@ -1320,42 +2367,39 @@ static void OPC_6502_70 (void)
 static void OPC_6502_71 (void)
 /* Opcode $71: ADC (zp),y */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr   = MemReadZPWord (ZPAddr);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    ADC (MemReadByte (Addr + Regs.YR));
-    Regs.PC += 2;
+    ALU_OP (ZPINDY, ADC_6502);
 }
 
 
 
-static void OPC_65SC02_72 (void)
+static void OPC_65C02_71 (void)
+/* Opcode $71: ADC (zp),y */
+{
+    ALU_OP (ZPINDY, ADC_65C02);
+}
+
+
+
+static void OPC_65C02_72 (void)
 /* Opcode $72: ADC (zp) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr   = MemReadZPWord (ZPAddr);
-    ADC (MemReadByte (Addr));
-    Regs.PC += 2;
+    ALU_OP (ZPIND, ADC_65C02);
 }
 
 
 
-static void OPC_65SC02_74 (void)
+static void OPC_6502X_73 (void)
+/* Opcode $73: RRA (zp),y */
+{
+    ILLx2_OP (ZPINDY_NP, RRA);
+}
+
+
+
+static void OPC_65C02_74 (void)
 /* Opcode $74: STZ zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    MemWriteByte (ZPAddr, 0);
-    Regs.PC += 2;
+    STO_OP (ZPX, 0);
 }
 
 
@@ -1363,11 +2407,15 @@ static void OPC_65SC02_74 (void)
 static void OPC_6502_75 (void)
 /* Opcode $75: ADC zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    ADC (MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZPX, ADC_6502);
+}
+
+
+
+static void OPC_65C02_75 (void)
+/* Opcode $75: ADC zp,x */
+{
+    ALU_OP (ZPX, ADC_65C02);
 }
 
 
@@ -1375,14 +2423,23 @@ static void OPC_6502_75 (void)
 static void OPC_6502_76 (void)
 /* Opcode $76: ROR zp,x */
 {
-    unsigned char ZPAddr;
-    unsigned Val;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (ZPAddr);
-    ROR (Val);
-    MemWriteByte (ZPAddr, Val);
-    Regs.PC += 2;
+    MEM_OP (ZPX, ROR);
+}
+
+
+
+static void OPC_6502X_77 (void)
+/* Opcode $77: RRA zp,x */
+{
+    ILLx2_OP (ZPX, RRA);
+}
+
+
+
+static void OPC_65C02_77 (void)
+/* Opcode $77: RMB7 zp */
+{
+    ZP_BITOP(7, 0);
 }
 
 
@@ -1400,19 +2457,20 @@ static void OPC_6502_78 (void)
 static void OPC_6502_79 (void)
 /* Opcode $79: ADC abs,y */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    ADC (MemReadByte (Addr + Regs.YR));
-    Regs.PC += 3;
+    ALU_OP (ABSY, ADC_6502);
 }
 
 
 
-static void OPC_65SC02_7A (void)
+static void OPC_65C02_79 (void)
+/* Opcode $79: ADC abs,y */
+{
+    ALU_OP (ABSY, ADC_65C02);
+}
+
+
+
+static void OPC_65C02_7A (void)
 /* Opcode $7A: PLY */
 {
     Cycles = 4;
@@ -1424,7 +2482,15 @@ static void OPC_65SC02_7A (void)
 
 
 
-static void OPC_65SC02_7C (void)
+static void OPC_6502X_7B (void)
+/* Opcode $7B: RRA abs,y */
+{
+    ILLx2_OP (ABSY_NP, RRA);
+}
+
+
+
+static void OPC_65C02_7C (void)
 /* Opcode $7C: JMP (ind,X) */
 {
     unsigned PC, Adr;
@@ -1441,14 +2507,15 @@ static void OPC_65SC02_7C (void)
 static void OPC_6502_7D (void)
 /* Opcode $7D: ADC abs,x */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.XR)) {
-        ++Cycles;
-    }
-    ADC (MemReadByte (Addr + Regs.XR));
-    Regs.PC += 3;
+    ALU_OP (ABSX, ADC_6502);
+}
+
+
+
+static void OPC_65C02_7D (void)
+/* Opcode $7D: ADC abs,x */
+{
+    ALU_OP (ABSX, ADC_65C02);
 }
 
 
@@ -1456,21 +2523,51 @@ static void OPC_6502_7D (void)
 static void OPC_6502_7E (void)
 /* Opcode $7E: ROR abs,x */
 {
-    unsigned Addr;
-    unsigned Val;
-    Cycles = 7;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    if (CPU != CPU_6502 && !PAGE_CROSS (Addr, Regs.XR))
-        --Cycles;
-    Val = MemReadByte (Addr);
-    ROR (Val);
-    MemWriteByte (Addr, Val);
-    Regs.PC += 3;
+    MEM_OP (ABSX_NP, ROR);
 }
 
 
 
-static void OPC_65SC02_80 (void)
+static void OPC_65C02_7E (void)
+/* Opcode $7E: ROR abs,x */
+{
+    MEM_OP (ABSX, ROR);
+    --Cycles;
+}
+
+
+
+static void OPC_6502X_7F (void)
+/* Opcode $7F: RRA abs,x */
+{
+    ILLx2_OP (ABSX_NP, RRA);
+}
+
+
+
+static void OPC_65C02_7F (void)
+/* Opcode $7F: BBR7 zp, rel */
+{
+    ZP_BIT_BRANCH (7, 0);
+}
+
+
+
+/* Aliases of opcode $80 */
+#define OPC_6502X_82 OPC_6502X_80
+#define OPC_6502X_C2 OPC_6502X_80
+#define OPC_6502X_E2 OPC_6502X_80
+#define OPC_6502X_89 OPC_6502X_80
+
+static void OPC_6502X_80 (void)
+/* Opcode $80: NOP imm */
+{
+    ALU_OP_IMM (NOP);
+}
+
+
+
+static void OPC_65C02_80 (void)
 /* Opcode $80: BRA */
 {
     BRANCH (1);
@@ -1481,13 +2578,15 @@ static void OPC_65SC02_80 (void)
 static void OPC_6502_81 (void)
 /* Opcode $81: STA (zp,x) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Addr = MemReadZPWord (ZPAddr);
-    MemWriteByte (Addr, Regs.AC);
-    Regs.PC += 2;
+    STO_OP (ZPXIND, Regs.AC);
+}
+
+
+
+static void OPC_6502X_83 (void)
+/* Opcode $83: SAX (zp,x) */
+{
+    STO_OP (ZPXIND, Regs.AC & Regs.XR);
 }
 
 
@@ -1495,11 +2594,7 @@ static void OPC_6502_81 (void)
 static void OPC_6502_84 (void)
 /* Opcode $84: STY zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    MemWriteByte (ZPAddr, Regs.YR);
-    Regs.PC += 2;
+    STO_OP (ZP, Regs.YR);
 }
 
 
@@ -1507,11 +2602,7 @@ static void OPC_6502_84 (void)
 static void OPC_6502_85 (void)
 /* Opcode $85: STA zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    MemWriteByte (ZPAddr, Regs.AC);
-    Regs.PC += 2;
+    STO_OP (ZP, Regs.AC);
 }
 
 
@@ -1519,11 +2610,23 @@ static void OPC_6502_85 (void)
 static void OPC_6502_86 (void)
 /* Opcode $86: STX zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    MemWriteByte (ZPAddr, Regs.XR);
-    Regs.PC += 2;
+    STO_OP (ZP, Regs.XR);
+}
+
+
+
+static void OPC_6502X_87 (void)
+/* Opcode $87: SAX zp */
+{
+    STO_OP (ZP, Regs.AC & Regs.XR);
+}
+
+
+
+static void OPC_65C02_87 (void)
+/* Opcode $87: SMB0 zp */
+{
+    ZP_BITOP(0, 1);
 }
 
 
@@ -1532,24 +2635,18 @@ static void OPC_6502_88 (void)
 /* Opcode $88: DEY */
 {
     Cycles = 2;
-    Regs.YR = (Regs.YR - 1) & 0xFF;
-    TEST_ZF (Regs.YR);
-    TEST_SF (Regs.YR);
+    DEC (Regs.YR);
     Regs.PC += 1;
 }
 
 
 
-static void OPC_65SC02_89 (void)
+static void OPC_65C02_89 (void)
 /* Opcode $89: BIT #imm */
 {
-    unsigned char Val;
-    Cycles = 2;
-    Val = MemReadByte (Regs.PC+1);
-    SET_SF (Val & 0x80);
-    SET_OF (Val & 0x40);
-    SET_ZF ((Val & Regs.AC) == 0);
-    Regs.PC += 2;
+    /* Note: BIT #imm behaves differently from BIT with other addressing modes,
+     * hence the different 'op' argument to the macro. */
+    ALU_OP_IMM (BITIMM);
 }
 
 
@@ -1566,14 +2663,18 @@ static void OPC_6502_8A (void)
 
 
 
+static void OPC_6502X_8B (void)
+/* Opcode $8B: ANE imm */
+{
+    ALU_OP_IMM (ANE);
+}
+
+
+
 static void OPC_6502_8C (void)
 /* Opcode $8C: STY abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    MemWriteByte (Addr, Regs.YR);
-    Regs.PC += 3;
+    STO_OP (ABS, Regs.YR);
 }
 
 
@@ -1581,11 +2682,7 @@ static void OPC_6502_8C (void)
 static void OPC_6502_8D (void)
 /* Opcode $8D: STA abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    MemWriteByte (Addr, Regs.AC);
-    Regs.PC += 3;
+    STO_OP (ABS, Regs.AC);
 }
 
 
@@ -1593,11 +2690,23 @@ static void OPC_6502_8D (void)
 static void OPC_6502_8E (void)
 /* Opcode $8E: STX abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    MemWriteByte (Addr, Regs.XR);
-    Regs.PC += 3;
+    STO_OP (ABS, Regs.XR);
+}
+
+
+
+static void OPC_6502X_8F (void)
+/* Opcode $8F: SAX abs */
+{
+    STO_OP (ABS, Regs.AC & Regs.XR);
+}
+
+
+
+static void OPC_65C02_8F (void)
+/* Opcode $8F: BBS0 zp, rel */
+{
+    ZP_BIT_BRANCH (0, 1);
 }
 
 
@@ -1613,27 +2722,36 @@ static void OPC_6502_90 (void)
 static void OPC_6502_91 (void)
 /* Opcode $91: sta (zp),y */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadZPWord (ZPAddr) + Regs.YR;
-    MemWriteByte (Addr, Regs.AC);
-    Regs.PC += 2;
+    STO_OP (ZPINDY_NP, Regs.AC);
 }
 
 
 
-static void OPC_65SC02_92 (void)
+static void OPC_65C02_92 (void)
 /* Opcode $92: sta (zp) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadZPWord (ZPAddr);
-    MemWriteByte (Addr, Regs.AC);
-    Regs.PC += 2;
+    STO_OP (ZPIND, Regs.AC);
+}
+
+
+
+static void OPC_6502X_93 (void)
+/* Opcode $93: SHA (zp),y */
+{
+    ++Regs.PC;
+    uint8_t zp_ptr_lo = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t zp_ptr_hi = zp_ptr_lo + 1;
+    uint8_t baselo = MemReadByte(zp_ptr_lo);
+    uint8_t basehi = MemReadByte(zp_ptr_hi);
+    uint8_t basehi_incremented = basehi + 1;
+    uint8_t write_value = Regs.AC & Regs.XR & basehi_incremented;
+    uint8_t write_address_lo = (baselo + Regs.YR);
+    bool pagecross = (baselo + Regs.YR) > 0xff;
+    uint8_t write_address_hi = pagecross ? write_value : basehi;
+    uint16_t write_address = write_address_lo + (write_address_hi << 8);
+    MemWriteByte(write_address, write_value);
+    Cycles=6;
 }
 
 
@@ -1641,11 +2759,7 @@ static void OPC_65SC02_92 (void)
 static void OPC_6502_94 (void)
 /* Opcode $94: STY zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    MemWriteByte (ZPAddr, Regs.YR);
-    Regs.PC += 2;
+    STO_OP (ZPX, Regs.YR);
 }
 
 
@@ -1653,11 +2767,7 @@ static void OPC_6502_94 (void)
 static void OPC_6502_95 (void)
 /* Opcode $95: STA zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    MemWriteByte (ZPAddr, Regs.AC);
-    Regs.PC += 2;
+    STO_OP (ZPX, Regs.AC);
 }
 
 
@@ -1665,11 +2775,23 @@ static void OPC_6502_95 (void)
 static void OPC_6502_96 (void)
 /* Opcode $96: stx zp,y */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.YR;
-    MemWriteByte (ZPAddr, Regs.XR);
-    Regs.PC += 2;
+    STO_OP (ZPY, Regs.XR);
+}
+
+
+
+static void OPC_6502X_97 (void)
+/* Opcode $97: SAX zp,y */
+{
+    STO_OP (ZPY, Regs.AC & Regs.XR);
+}
+
+
+
+static void OPC_65C02_97 (void)
+/* Opcode $97: SMB1 zp */
+{
+    ZP_BITOP(1, 1);
 }
 
 
@@ -1689,11 +2811,7 @@ static void OPC_6502_98 (void)
 static void OPC_6502_99 (void)
 /* Opcode $99: STA abs,y */
 {
-    unsigned Addr;
-    Cycles = 5;
-    Addr = MemReadWord (Regs.PC+1) + Regs.YR;
-    MemWriteByte (Addr, Regs.AC);
-    Regs.PC += 3;
+    STO_OP (ABSY_NP, Regs.AC);
 }
 
 
@@ -1708,14 +2826,51 @@ static void OPC_6502_9A (void)
 
 
 
-static void OPC_65SC02_9C (void)
+static void OPC_6502X_9B (void)
+/* Opcode $9B: TAS abs,y */
+{
+    ++Regs.PC;
+    uint8_t baselo = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi_incremented = basehi + 1;
+    uint8_t write_value = Regs.AC & Regs.XR & basehi_incremented;
+    uint8_t write_address_lo = (baselo + Regs.YR);
+    bool pagecross = (baselo + Regs.YR) > 0xff;
+    uint8_t write_address_hi = pagecross ? write_value : basehi;
+    uint16_t write_address = write_address_lo + (write_address_hi << 8);
+    MemWriteByte(write_address, write_value);
+    Regs.SP = Regs.AC & Regs.XR;
+    Cycles=5;
+}
+
+
+
+static void OPC_6502X_9C (void)
+/* Opcode $9D: SHY abs,x */
+{
+    ++Regs.PC;
+    uint8_t baselo = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi_incremented = basehi + 1;
+    uint8_t write_value = Regs.YR & basehi_incremented;
+    uint8_t write_address_lo = (baselo + Regs.XR);
+    bool pagecross = (baselo + Regs.XR) > 0xff;
+    uint8_t write_address_hi = pagecross ? write_value : basehi;
+    uint16_t write_address = write_address_lo + (write_address_hi << 8);
+    MemWriteByte(write_address, write_value);
+    Cycles=5;
+}
+
+
+
+static void OPC_65C02_9C (void)
 /* Opcode $9C: STZ abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    MemWriteByte (Addr, 0);
-    Regs.PC += 3;
+    STO_OP (ABS, 0);
 }
 
 
@@ -1723,23 +2878,63 @@ static void OPC_65SC02_9C (void)
 static void OPC_6502_9D (void)
 /* Opcode $9D: STA abs,x */
 {
-    unsigned Addr;
-    Cycles = 5;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    MemWriteByte (Addr, Regs.AC);
-    Regs.PC += 3;
+    STO_OP (ABSX_NP, Regs.AC);
 }
 
 
 
-static void OPC_65SC02_9E (void)
+static void OPC_6502X_9E (void)
+/* Opcode $9E: SHX abs,x */
+{
+    ++Regs.PC;
+    uint8_t baselo = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi_incremented = basehi + 1;
+    uint8_t write_value = Regs.XR & basehi_incremented;
+    uint8_t write_address_lo = (baselo + Regs.YR);
+    bool pagecross = (baselo + Regs.YR) > 0xff;
+    uint8_t write_address_hi = pagecross ? write_value : basehi;
+    uint16_t write_address = write_address_lo + (write_address_hi << 8);
+    MemWriteByte(write_address, write_value);
+    Cycles=5;
+}
+
+
+
+static void OPC_65C02_9E (void)
 /* Opcode $9E: STZ abs,x */
 {
-    unsigned Addr;
-    Cycles = 5;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    MemWriteByte (Addr, 0);
-    Regs.PC += 3;
+    STO_OP (ABSX_NP, 0);
+}
+
+
+
+static void OPC_6502X_9F (void)
+/* Opcode $9F: SHA abs,y */
+{
+    ++Regs.PC;
+    uint8_t baselo = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi = MemReadByte(Regs.PC);
+    ++Regs.PC;
+    uint8_t basehi_incremented = basehi + 1;
+    uint8_t write_value = Regs.AC & Regs.XR & basehi_incremented;
+    uint8_t write_address_lo = (baselo + Regs.YR);
+    bool pagecross = (baselo + Regs.YR) > 0xff;
+    uint8_t write_address_hi = pagecross ? write_value : basehi;
+    uint16_t write_address = write_address_lo + (write_address_hi << 8);
+    MemWriteByte(write_address, write_value);
+    Cycles=5;
+}
+
+
+
+static void OPC_65C02_9F (void)
+/* Opcode $9F: BBS1 zp, rel */
+{
+    ZP_BIT_BRANCH (1, 1);
 }
 
 
@@ -1747,11 +2942,7 @@ static void OPC_65SC02_9E (void)
 static void OPC_6502_A0 (void)
 /* Opcode $A0: LDY #imm */
 {
-    Cycles = 2;
-    Regs.YR = MemReadByte (Regs.PC+1);
-    TEST_ZF (Regs.YR);
-    TEST_SF (Regs.YR);
-    Regs.PC += 2;
+    ALU_OP_IMM (LDY);
 }
 
 
@@ -1759,15 +2950,7 @@ static void OPC_6502_A0 (void)
 static void OPC_6502_A1 (void)
 /* Opcode $A1: LDA (zp,x) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Addr = MemReadZPWord (ZPAddr);
-    Regs.AC = MemReadByte (Addr);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 2;
+    ALU_OP (ZPXIND, LDA);
 }
 
 
@@ -1775,11 +2958,15 @@ static void OPC_6502_A1 (void)
 static void OPC_6502_A2 (void)
 /* Opcode $A2: LDX #imm */
 {
-    Cycles = 2;
-    Regs.XR = MemReadByte (Regs.PC+1);
-    TEST_ZF (Regs.XR);
-    TEST_SF (Regs.XR);
-    Regs.PC += 2;
+    ALU_OP_IMM (LDX);
+}
+
+
+
+static void OPC_6502X_A3 (void)
+/* Opcode $A3: LAX (zp,x) */
+{
+    ALU_OP (ZPXIND, LAX);
 }
 
 
@@ -1787,13 +2974,7 @@ static void OPC_6502_A2 (void)
 static void OPC_6502_A4 (void)
 /* Opcode $A4: LDY zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Regs.YR = MemReadByte (ZPAddr);
-    TEST_ZF (Regs.YR);
-    TEST_SF (Regs.YR);
-    Regs.PC += 2;
+    ALU_OP (ZP, LDY);
 }
 
 
@@ -1801,13 +2982,7 @@ static void OPC_6502_A4 (void)
 static void OPC_6502_A5 (void)
 /* Opcode $A5: LDA zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Regs.AC = MemReadByte (ZPAddr);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 2;
+    ALU_OP (ZP, LDA);
 }
 
 
@@ -1815,13 +2990,23 @@ static void OPC_6502_A5 (void)
 static void OPC_6502_A6 (void)
 /* Opcode $A6: LDX zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Regs.XR = MemReadByte (ZPAddr);
-    TEST_ZF (Regs.XR);
-    TEST_SF (Regs.XR);
-    Regs.PC += 2;
+    ALU_OP (ZP, LDX);
+}
+
+
+
+static void OPC_6502X_A7 (void)
+/* Opcode $A7: LAX zp */
+{
+    ALU_OP (ZP, LAX);
+}
+
+
+
+static void OPC_65C02_A7 (void)
+/* Opcode $A7: SMB2 zp */
+{
+    ZP_BITOP(2, 1);
 }
 
 
@@ -1841,11 +3026,7 @@ static void OPC_6502_A8 (void)
 static void OPC_6502_A9 (void)
 /* Opcode $A9: LDA #imm */
 {
-    Cycles = 2;
-    Regs.AC = MemReadByte (Regs.PC+1);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 2;
+    ALU_OP_IMM (LDA);
 }
 
 
@@ -1862,16 +3043,18 @@ static void OPC_6502_AA (void)
 
 
 
+static void OPC_6502X_AB (void)
+/* Opcode $AB: LXA imm */
+{
+    ALU_OP_IMM (LXA);
+}
+
+
+
 static void OPC_6502_AC (void)
 /* Opcode $Regs.AC: LDY abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    Regs.YR = MemReadByte (Addr);
-    TEST_ZF (Regs.YR);
-    TEST_SF (Regs.YR);
-    Regs.PC += 3;
+    ALU_OP (ABS, LDY);
 }
 
 
@@ -1879,13 +3062,7 @@ static void OPC_6502_AC (void)
 static void OPC_6502_AD (void)
 /* Opcode $AD: LDA abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    Regs.AC = MemReadByte (Addr);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 3;
+    ALU_OP (ABS, LDA);
 }
 
 
@@ -1893,13 +3070,23 @@ static void OPC_6502_AD (void)
 static void OPC_6502_AE (void)
 /* Opcode $AE: LDX abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    Regs.XR = MemReadByte (Addr);
-    TEST_ZF (Regs.XR);
-    TEST_SF (Regs.XR);
-    Regs.PC += 3;
+    ALU_OP (ABS, LDX);
+}
+
+
+
+static void OPC_6502X_AF (void)
+/* Opcode $AF: LAX abs */
+{
+    ALU_OP (ABS, LAX);
+}
+
+
+
+static void OPC_65C02_AF (void)
+/* Opcode $AF: BBS2 zp, rel */
+{
+    ZP_BIT_BRANCH (2, 1);
 }
 
 
@@ -1915,34 +3102,23 @@ static void OPC_6502_B0 (void)
 static void OPC_6502_B1 (void)
 /* Opcode $B1: LDA (zp),y */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadZPWord (ZPAddr);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    Regs.AC = MemReadByte (Addr + Regs.YR);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 2;
+    ALU_OP (ZPINDY, LDA);
 }
 
 
 
-static void OPC_65SC02_B2 (void)
+static void OPC_65C02_B2 (void)
 /* Opcode $B2: LDA (zp) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadZPWord (ZPAddr);
-    Regs.AC = MemReadByte (Addr);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 2;
+    ALU_OP (ZPIND, LDA);
+}
+
+
+
+static void OPC_6502X_B3 (void)
+/* Opcode $B3: LAX (zp),y */
+{
+    ALU_OP (ZPINDY, LAX);
 }
 
 
@@ -1950,13 +3126,7 @@ static void OPC_65SC02_B2 (void)
 static void OPC_6502_B4 (void)
 /* Opcode $B4: LDY zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Regs.YR = MemReadByte (ZPAddr);
-    TEST_ZF (Regs.YR);
-    TEST_SF (Regs.YR);
-    Regs.PC += 2;
+    ALU_OP (ZPX, LDY);
 }
 
 
@@ -1964,13 +3134,7 @@ static void OPC_6502_B4 (void)
 static void OPC_6502_B5 (void)
 /* Opcode $B5: LDA zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Regs.AC = MemReadByte (ZPAddr);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 2;
+    ALU_OP (ZPX, LDA);
 }
 
 
@@ -1978,13 +3142,23 @@ static void OPC_6502_B5 (void)
 static void OPC_6502_B6 (void)
 /* Opcode $B6: LDX zp,y */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.YR;
-    Regs.XR = MemReadByte (ZPAddr);
-    TEST_ZF (Regs.XR);
-    TEST_SF (Regs.XR);
-    Regs.PC += 2;
+    ALU_OP (ZPY, LDX);
+}
+
+
+
+static void OPC_6502X_B7 (void)
+/* Opcode $B7: LAX zp,y */
+{
+    ALU_OP (ZPY, LAX);
+}
+
+
+
+static void OPC_65C02_B7 (void)
+/* Opcode $B7: SMB3 zp */
+{
+    ZP_BITOP(3, 1);
 }
 
 
@@ -2002,16 +3176,7 @@ static void OPC_6502_B8 (void)
 static void OPC_6502_B9 (void)
 /* Opcode $B9: LDA abs,y */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    Regs.AC = MemReadByte (Addr + Regs.YR);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 3;
+    ALU_OP (ABSY, LDA);
 }
 
 
@@ -2028,19 +3193,18 @@ static void OPC_6502_BA (void)
 
 
 
+static void OPC_6502X_BB (void)
+/* Opcode $BB: LAS abs,y */
+{
+    ALU_OP (ABSY, LAS);
+}
+
+
+
 static void OPC_6502_BC (void)
 /* Opcode $BC: LDY abs,x */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.XR)) {
-        ++Cycles;
-    }
-    Regs.YR = MemReadByte (Addr + Regs.XR);
-    TEST_ZF (Regs.YR);
-    TEST_SF (Regs.YR);
-    Regs.PC += 3;
+    ALU_OP (ABSX, LDY);
 }
 
 
@@ -2048,16 +3212,7 @@ static void OPC_6502_BC (void)
 static void OPC_6502_BD (void)
 /* Opcode $BD: LDA abs,x */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.XR)) {
-        ++Cycles;
-    }
-    Regs.AC = MemReadByte (Addr + Regs.XR);
-    TEST_ZF (Regs.AC);
-    TEST_SF (Regs.AC);
-    Regs.PC += 3;
+    ALU_OP (ABSX, LDA);
 }
 
 
@@ -2065,16 +3220,23 @@ static void OPC_6502_BD (void)
 static void OPC_6502_BE (void)
 /* Opcode $BE: LDX abs,y */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    Regs.XR = MemReadByte (Addr + Regs.YR);
-    TEST_ZF (Regs.XR);
-    TEST_SF (Regs.XR);
-    Regs.PC += 3;
+    ALU_OP (ABSY, LDX);
+}
+
+
+
+static void OPC_6502X_BF (void)
+/* Opcode $BF: LAX abs,y */
+{
+    ALU_OP (ABSY, LAX);
+}
+
+
+
+static void OPC_65C02_BF (void)
+/* Opcode $BF: BBS3 zp, rel */
+{
+    ZP_BIT_BRANCH (3, 1);
 }
 
 
@@ -2082,9 +3244,7 @@ static void OPC_6502_BE (void)
 static void OPC_6502_C0 (void)
 /* Opcode $C0: CPY #imm */
 {
-    Cycles = 2;
-    CMP (Regs.YR, MemReadByte (Regs.PC+1));
-    Regs.PC += 2;
+    ALU_OP_IMM (CPY);
 }
 
 
@@ -2092,13 +3252,15 @@ static void OPC_6502_C0 (void)
 static void OPC_6502_C1 (void)
 /* Opcode $C1: CMP (zp,x) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Addr = MemReadZPWord (ZPAddr);
-    CMP (Regs.AC, MemReadByte (Addr));
-    Regs.PC += 2;
+    ALU_OP (ZPXIND, CMP);
+}
+
+
+
+static void OPC_6502X_C3 (void)
+/* Opcode $C3: DCP (zp,x) */
+{
+    MEM_OP (ZPXIND, DCP);
 }
 
 
@@ -2106,11 +3268,7 @@ static void OPC_6502_C1 (void)
 static void OPC_6502_C4 (void)
 /* Opcode $C4: CPY zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    CMP (Regs.YR, MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZP, CPY);
 }
 
 
@@ -2118,11 +3276,7 @@ static void OPC_6502_C4 (void)
 static void OPC_6502_C5 (void)
 /* Opcode $C5: CMP zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    CMP (Regs.AC, MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZP, CMP);
 }
 
 
@@ -2130,15 +3284,23 @@ static void OPC_6502_C5 (void)
 static void OPC_6502_C6 (void)
 /* Opcode $C6: DEC zp */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr) - 1;
-    MemWriteByte (ZPAddr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 2;
+    MEM_OP (ZP, DEC);
+}
+
+
+
+static void OPC_6502X_C7 (void)
+/* Opcode $C7: DCP zp */
+{
+    MEM_OP (ZP, DCP);
+}
+
+
+
+static void OPC_65C02_C7 (void)
+/* Opcode $C7: SMB4 zp */
+{
+    ZP_BITOP(4, 1);
 }
 
 
@@ -2147,9 +3309,7 @@ static void OPC_6502_C8 (void)
 /* Opcode $C8: INY */
 {
     Cycles = 2;
-    Regs.YR = (Regs.YR + 1) & 0xFF;
-    TEST_ZF (Regs.YR);
-    TEST_SF (Regs.YR);
+    INC(Regs.YR);
     Regs.PC += 1;
 }
 
@@ -2158,9 +3318,7 @@ static void OPC_6502_C8 (void)
 static void OPC_6502_C9 (void)
 /* Opcode $C9: CMP #imm */
 {
-    Cycles = 2;
-    CMP (Regs.AC, MemReadByte (Regs.PC+1));
-    Regs.PC += 2;
+    ALU_OP_IMM (CMP);
 }
 
 
@@ -2169,22 +3327,24 @@ static void OPC_6502_CA (void)
 /* Opcode $CA: DEX */
 {
     Cycles = 2;
-    Regs.XR = (Regs.XR - 1) & 0xFF;
-    TEST_ZF (Regs.XR);
-    TEST_SF (Regs.XR);
+    DEC (Regs.XR);
     Regs.PC += 1;
 }
 
 
 
+static void OPC_6502X_CB (void)
+/* Opcode $CB: SBX imm */
+{
+    ALU_OP_IMM (SBX);
+}
+
+
+
 static void OPC_6502_CC (void)
 /* Opcode $CC: CPY abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    CMP (Regs.YR, MemReadByte (Addr));
-    Regs.PC += 3;
+    ALU_OP (ABS, CPY);
 }
 
 
@@ -2192,11 +3352,7 @@ static void OPC_6502_CC (void)
 static void OPC_6502_CD (void)
 /* Opcode $CD: CMP abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    CMP (Regs.AC, MemReadByte (Addr));
-    Regs.PC += 3;
+    ALU_OP (ABS, CMP);
 }
 
 
@@ -2204,15 +3360,23 @@ static void OPC_6502_CD (void)
 static void OPC_6502_CE (void)
 /* Opcode $CE: DEC abs */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val  = MemReadByte (Addr) - 1;
-    MemWriteByte (Addr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 3;
+    MEM_OP (ABS, DEC);
+}
+
+
+
+static void OPC_6502X_CF (void)
+/* Opcode $CF: DCP abs */
+{
+    MEM_OP (ABS, DCP);
+}
+
+
+
+static void OPC_65C02_CF (void)
+/* Opcode $CF: BBS4 zp, rel */
+{
+    ZP_BIT_BRANCH (4, 1);
 }
 
 
@@ -2228,30 +3392,23 @@ static void OPC_6502_D0 (void)
 static void OPC_6502_D1 (void)
 /* Opcode $D1: CMP (zp),y */
 {
-    unsigned ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadWord (ZPAddr);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    CMP (Regs.AC, MemReadByte (Addr + Regs.YR));
-    Regs.PC += 2;
+    ALU_OP (ZPINDY, CMP);
 }
 
 
 
-static void OPC_65SC02_D2 (void)
+static void OPC_65C02_D2 (void)
 /* Opcode $D2: CMP (zp) */
 {
-    unsigned ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadWord (ZPAddr);
-    CMP (Regs.AC, MemReadByte (Addr));
-    Regs.PC += 2;
+    ALU_OP (ZPIND, CMP);
+}
+
+
+
+static void OPC_6502X_D3 (void)
+/* Opcode $D3: DCP (zp),y */
+{
+    MEM_OP (ZPINDY_NP, DCP);
 }
 
 
@@ -2259,11 +3416,7 @@ static void OPC_65SC02_D2 (void)
 static void OPC_6502_D5 (void)
 /* Opcode $D5: CMP zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    CMP (Regs.AC, MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZPX, CMP);
 }
 
 
@@ -2271,15 +3424,23 @@ static void OPC_6502_D5 (void)
 static void OPC_6502_D6 (void)
 /* Opcode $D6: DEC zp,x */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (ZPAddr) - 1;
-    MemWriteByte (ZPAddr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 2;
+    MEM_OP (ZPX, DEC);
+}
+
+
+
+static void OPC_6502X_D7 (void)
+/* Opcode $D7: DCP zp,x */
+{
+    MEM_OP (ZPX, DCP);
+}
+
+
+
+static void OPC_65C02_D7 (void)
+/* Opcode $D7: SMB5 zp */
+{
+    ZP_BITOP(5, 1);
 }
 
 
@@ -2297,19 +3458,12 @@ static void OPC_6502_D8 (void)
 static void OPC_6502_D9 (void)
 /* Opcode $D9: CMP abs,y */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    CMP (Regs.AC, MemReadByte (Addr + Regs.YR));
-    Regs.PC += 3;
+    ALU_OP (ABSY, CMP);
 }
 
 
 
-static void OPC_65SC02_DA (void)
+static void OPC_65C02_DA (void)
 /* Opcode $DA: PHX */
 {
     Cycles = 3;
@@ -2319,17 +3473,18 @@ static void OPC_65SC02_DA (void)
 
 
 
+static void OPC_6502X_DB (void)
+/* Opcode $DB: DCP abs,y */
+{
+    MEM_OP (ABSY_NP, DCP);
+}
+
+
+
 static void OPC_6502_DD (void)
 /* Opcode $DD: CMP abs,x */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.XR)) {
-        ++Cycles;
-    }
-    CMP (Regs.AC, MemReadByte (Addr + Regs.XR));
-    Regs.PC += 3;
+    ALU_OP (ABSX, CMP);
 }
 
 
@@ -2337,15 +3492,23 @@ static void OPC_6502_DD (void)
 static void OPC_6502_DE (void)
 /* Opcode $DE: DEC abs,x */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 7;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (Addr) - 1;
-    MemWriteByte (Addr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 3;
+    MEM_OP (ABSX_NP, DEC);
+}
+
+
+
+static void OPC_6502X_DF (void)
+/* Opcode $DF: DCP abs,x */
+{
+    MEM_OP (ABSX_NP, DCP);
+}
+
+
+
+static void OPC_65C02_DF (void)
+/* Opcode $DF: BBS5 zp, rel */
+{
+    ZP_BIT_BRANCH (5, 1);
 }
 
 
@@ -2353,9 +3516,7 @@ static void OPC_6502_DE (void)
 static void OPC_6502_E0 (void)
 /* Opcode $E0: CPX #imm */
 {
-    Cycles = 2;
-    CMP (Regs.XR, MemReadByte (Regs.PC+1));
-    Regs.PC += 2;
+    ALU_OP_IMM (CPX);
 }
 
 
@@ -2363,13 +3524,23 @@ static void OPC_6502_E0 (void)
 static void OPC_6502_E1 (void)
 /* Opcode $E1: SBC (zp,x) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Addr = MemReadZPWord (ZPAddr);
-    SBC (MemReadByte (Addr));
-    Regs.PC += 2;
+    ALU_OP (ZPXIND, SBC_6502);
+}
+
+
+
+static void OPC_65C02_E1 (void)
+/* Opcode $E1: SBC (zp,x) */
+{
+    ALU_OP (ZPXIND, SBC_65C02);
+}
+
+
+
+static void OPC_6502X_E3 (void)
+/* Opcode $E3: ISC (zp,x) */
+{
+    MEM_OP (ZPXIND, ISC);
 }
 
 
@@ -2377,11 +3548,7 @@ static void OPC_6502_E1 (void)
 static void OPC_6502_E4 (void)
 /* Opcode $E4: CPX zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    CMP (Regs.XR, MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZP, CPX);
 }
 
 
@@ -2389,11 +3556,15 @@ static void OPC_6502_E4 (void)
 static void OPC_6502_E5 (void)
 /* Opcode $E5: SBC zp */
 {
-    unsigned char ZPAddr;
-    Cycles = 3;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    SBC (MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZP, SBC_6502);
+}
+
+
+
+static void OPC_65C02_E5 (void)
+/* Opcode $E5: SBC zp */
+{
+    ALU_OP (ZP, SBC_65C02);
 }
 
 
@@ -2401,15 +3572,23 @@ static void OPC_6502_E5 (void)
 static void OPC_6502_E6 (void)
 /* Opcode $E6: INC zp */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Val = MemReadByte (ZPAddr) + 1;
-    MemWriteByte (ZPAddr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 2;
+    MEM_OP (ZP, INC);
+}
+
+
+
+static void OPC_6502X_E7 (void)
+/* Opcode $E7: ISC zp */
+{
+    MEM_OP (ZP, ISC);
+}
+
+
+
+static void OPC_65C02_E7 (void)
+/* Opcode $E7: SMB6 zp */
+{
+    ZP_BITOP(6, 1);
 }
 
 
@@ -2418,24 +3597,37 @@ static void OPC_6502_E8 (void)
 /* Opcode $E8: INX */
 {
     Cycles = 2;
-    Regs.XR = (Regs.XR + 1) & 0xFF;
-    TEST_ZF (Regs.XR);
-    TEST_SF (Regs.XR);
+    INC (Regs.XR);
     Regs.PC += 1;
 }
 
 
 
+/* Aliases of opcode $E9 */
+#define OPC_6502X_EB OPC_6502_E9
+
 static void OPC_6502_E9 (void)
 /* Opcode $E9: SBC #imm */
 {
-    Cycles = 2;
-    SBC (MemReadByte (Regs.PC+1));
-    Regs.PC += 2;
+    ALU_OP_IMM (SBC_6502);
 }
 
 
 
+static void OPC_65C02_E9 (void)
+/* Opcode $E9: SBC #imm */
+{
+    ALU_OP_IMM (SBC_65C02);
+}
+
+/* Aliases of opcode $EA */
+#define OPC_6502X_1A OPC_6502_EA
+#define OPC_6502X_3A OPC_6502_EA
+#define OPC_6502X_5A OPC_6502_EA
+#define OPC_6502X_7A OPC_6502_EA
+#define OPC_6502X_DA OPC_6502_EA
+#define OPC_6502X_FA OPC_6502_EA
+
 static void OPC_6502_EA (void)
 /* Opcode $EA: NOP */
 {
@@ -2485,11 +3677,7 @@ static void OPC_65C02_NOP34 (void)
 static void OPC_6502_EC (void)
 /* Opcode $EC: CPX abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr   = MemReadWord (Regs.PC+1);
-    CMP (Regs.XR, MemReadByte (Addr));
-    Regs.PC += 3;
+    ALU_OP (ABS, CPX);
 }
 
 
@@ -2497,27 +3685,38 @@ static void OPC_6502_EC (void)
 static void OPC_6502_ED (void)
 /* Opcode $ED: SBC abs */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    SBC (MemReadByte (Addr));
-    Regs.PC += 3;
+    ALU_OP (ABS, SBC_6502);
 }
 
 
 
+static void OPC_65C02_ED (void)
+/* Opcode $ED: SBC abs */
+{
+    ALU_OP (ABS, SBC_65C02);
+}
+
+
 static void OPC_6502_EE (void)
 /* Opcode $EE: INC abs */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 6;
-    Addr = MemReadWord (Regs.PC+1);
-    Val = MemReadByte (Addr) + 1;
-    MemWriteByte (Addr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 3;
+    MEM_OP (ABS, INC);
+}
+
+
+
+static void OPC_6502X_EF (void)
+/* Opcode $EF: ISC abs */
+{
+    MEM_OP (ABS, ISC);
+}
+
+
+
+static void OPC_65C02_EF (void)
+/* Opcode $EF: BBS6 zp, rel */
+{
+    ZP_BIT_BRANCH (6, 1);
 }
 
 
@@ -2533,30 +3732,31 @@ static void OPC_6502_F0 (void)
 static void OPC_6502_F1 (void)
 /* Opcode $F1: SBC (zp),y */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadZPWord (ZPAddr);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    SBC (MemReadByte (Addr + Regs.YR));
-    Regs.PC += 2;
+    ALU_OP (ZPINDY, SBC_6502);
 }
 
 
 
-static void OPC_65SC02_F2 (void)
+static void OPC_65C02_F1 (void)
+/* Opcode $F1: SBC (zp),y */
+{
+    ALU_OP (ZPINDY, SBC_65C02);
+}
+
+
+
+static void OPC_65C02_F2 (void)
 /* Opcode $F2: SBC (zp) */
 {
-    unsigned char ZPAddr;
-    unsigned Addr;
-    Cycles = 5;
-    ZPAddr = MemReadByte (Regs.PC+1);
-    Addr = MemReadZPWord (ZPAddr);
-    SBC (MemReadByte (Addr));
-    Regs.PC += 2;
+    ALU_OP (ZPIND, SBC_65C02);
+}
+
+
+
+static void OPC_6502X_F3 (void)
+/* Opcode $F3: ISC (zp),y */
+{
+    MEM_OP (ZPINDY_NP, ISC);
 }
 
 
@@ -2564,11 +3764,15 @@ static void OPC_65SC02_F2 (void)
 static void OPC_6502_F5 (void)
 /* Opcode $F5: SBC zp,x */
 {
-    unsigned char ZPAddr;
-    Cycles = 4;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    SBC (MemReadByte (ZPAddr));
-    Regs.PC += 2;
+    ALU_OP (ZPX, SBC_6502);
+}
+
+
+
+static void OPC_65C02_F5 (void)
+/* Opcode $F5: SBC zp,x */
+{
+    ALU_OP (ZPX, SBC_65C02);
 }
 
 
@@ -2576,15 +3780,23 @@ static void OPC_6502_F5 (void)
 static void OPC_6502_F6 (void)
 /* Opcode $F6: INC zp,x */
 {
-    unsigned char ZPAddr;
-    unsigned char Val;
-    Cycles = 6;
-    ZPAddr = MemReadByte (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (ZPAddr) + 1;
-    MemWriteByte (ZPAddr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 2;
+    MEM_OP (ZPX, INC);
+}
+
+
+
+static void OPC_6502X_F7 (void)
+/* Opcode $F7: ISC zp,x */
+{
+    MEM_OP (ZPX, ISC);
+}
+
+
+
+static void OPC_65C02_F7 (void)
+/* Opcode $F7: SMB7 zp */
+{
+    ZP_BITOP(7, 1);
 }
 
 
@@ -2602,19 +3814,20 @@ static void OPC_6502_F8 (void)
 static void OPC_6502_F9 (void)
 /* Opcode $F9: SBC abs,y */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.YR)) {
-        ++Cycles;
-    }
-    SBC (MemReadByte (Addr + Regs.YR));
-    Regs.PC += 3;
+    ALU_OP (ABSY, SBC_6502);
 }
 
 
 
-static void OPC_65SC02_FA (void)
+static void OPC_65C02_F9 (void)
+/* Opcode $F9: SBC abs,y */
+{
+    ALU_OP (ABSY, SBC_65C02);
+}
+
+
+
+static void OPC_65C02_FA (void)
 /* Opcode $7A: PLX */
 {
     Cycles = 4;
@@ -2626,17 +3839,26 @@ static void OPC_65SC02_FA (void)
 
 
 
+static void OPC_6502X_FB (void)
+/* Opcode $FB: ISC abs,y */
+{
+    MEM_OP (ABSY_NP, ISC);
+}
+
+
+
 static void OPC_6502_FD (void)
 /* Opcode $FD: SBC abs,x */
 {
-    unsigned Addr;
-    Cycles = 4;
-    Addr = MemReadWord (Regs.PC+1);
-    if (PAGE_CROSS (Addr, Regs.XR)) {
-        ++Cycles;
-    }
-    SBC (MemReadByte (Addr + Regs.XR));
-    Regs.PC += 3;
+    ALU_OP (ABSX, SBC_6502);
+}
+
+
+
+static void OPC_65C02_FD (void)
+/* Opcode $FD: SBC abs,x */
+{
+    ALU_OP (ABSX, SBC_65C02);
 }
 
 
@@ -2644,15 +3866,23 @@ static void OPC_6502_FD (void)
 static void OPC_6502_FE (void)
 /* Opcode $FE: INC abs,x */
 {
-    unsigned Addr;
-    unsigned char Val;
-    Cycles = 7;
-    Addr = MemReadWord (Regs.PC+1) + Regs.XR;
-    Val = MemReadByte (Addr) + 1;
-    MemWriteByte (Addr, Val);
-    TEST_ZF (Val);
-    TEST_SF (Val);
-    Regs.PC += 3;
+    MEM_OP (ABSX_NP, INC);
+}
+
+
+
+static void OPC_6502X_FF (void)
+/* Opcode $FF: ISC abs,x */
+{
+    MEM_OP (ABSX_NP, ISC);
+}
+
+
+
+static void OPC_65C02_FF (void)
+/* Opcode $FF: BBS7 zp, rel */
+{
+    ZP_BIT_BRANCH (7, 1);
 }
 
 
@@ -2925,40 +4155,302 @@ static const OPFunc OP6502Table[256] = {
 
 
 
+/* Opcode handler table for the 6502X */
+static const OPFunc OP6502XTable[256] = {
+    OPC_6502_00,
+    OPC_6502_01,
+    OPC_Illegal,
+    OPC_6502X_03,
+    OPC_6502X_04,
+    OPC_6502_05,
+    OPC_6502_06,
+    OPC_6502X_07,
+    OPC_6502_08,
+    OPC_6502_09,
+    OPC_6502_0A,
+    OPC_6502X_0B,
+    OPC_6502X_0C,
+    OPC_6502_0D,
+    OPC_6502_0E,
+    OPC_6502X_0F,
+    OPC_6502_10,
+    OPC_6502_11,
+    OPC_Illegal,
+    OPC_6502X_13,
+    OPC_6502X_14,
+    OPC_6502_15,
+    OPC_6502_16,
+    OPC_6502X_17,
+    OPC_6502_18,
+    OPC_6502_19,
+    OPC_6502X_1A,
+    OPC_6502X_1B,
+    OPC_6502X_1C,
+    OPC_6502_1D,
+    OPC_6502_1E,
+    OPC_6502X_1F,
+    OPC_6502_20,
+    OPC_6502_21,
+    OPC_Illegal,
+    OPC_6502X_23,
+    OPC_6502_24,
+    OPC_6502_25,
+    OPC_6502_26,
+    OPC_6502X_27,
+    OPC_6502_28,
+    OPC_6502_29,
+    OPC_6502_2A,
+    OPC_6502X_2B,
+    OPC_6502_2C,
+    OPC_6502_2D,
+    OPC_6502_2E,
+    OPC_6502X_2F,
+    OPC_6502_30,
+    OPC_6502_31,
+    OPC_Illegal,
+    OPC_6502X_33,
+    OPC_6502X_34,
+    OPC_6502_35,
+    OPC_6502_36,
+    OPC_6502X_37,
+    OPC_6502_38,
+    OPC_6502_39,
+    OPC_6502X_3A,
+    OPC_6502X_3B,
+    OPC_6502X_3C,
+    OPC_6502_3D,
+    OPC_6502_3E,
+    OPC_6502X_3F,
+    OPC_6502_40,
+    OPC_6502_41,
+    OPC_Illegal,
+    OPC_6502X_43,
+    OPC_6502X_44,
+    OPC_6502_45,
+    OPC_6502_46,
+    OPC_6502X_47,
+    OPC_6502_48,
+    OPC_6502_49,
+    OPC_6502_4A,
+    OPC_6502X_4B,
+    OPC_6502_4C,
+    OPC_6502_4D,
+    OPC_6502_4E,
+    OPC_6502X_4F,
+    OPC_6502_50,
+    OPC_6502_51,
+    OPC_Illegal,
+    OPC_6502X_53,
+    OPC_6502X_54,
+    OPC_6502_55,
+    OPC_6502_56,
+    OPC_6502X_57,
+    OPC_6502_58,
+    OPC_6502_59,
+    OPC_6502X_5A,
+    OPC_6502X_5B,
+    OPC_6502X_5C,
+    OPC_6502_5D,
+    OPC_6502_5E,
+    OPC_6502X_5F,
+    OPC_6502_60,
+    OPC_6502_61,
+    OPC_Illegal,
+    OPC_6502X_63,
+    OPC_6502X_64,
+    OPC_6502_65,
+    OPC_6502_66,
+    OPC_6502X_67,
+    OPC_6502_68,
+    OPC_6502_69,
+    OPC_6502_6A,
+    OPC_6502X_6B,
+    OPC_6502_6C,
+    OPC_6502_6D,
+    OPC_6502_6E,
+    OPC_6502X_6F,
+    OPC_6502_70,
+    OPC_6502_71,
+    OPC_Illegal,
+    OPC_6502X_73,
+    OPC_6502X_74,
+    OPC_6502_75,
+    OPC_6502_76,
+    OPC_6502X_77,
+    OPC_6502_78,
+    OPC_6502_79,
+    OPC_6502X_7A,
+    OPC_6502X_7B,
+    OPC_6502X_7C,
+    OPC_6502_7D,
+    OPC_6502_7E,
+    OPC_6502X_7F,
+    OPC_6502X_80,
+    OPC_6502_81,
+    OPC_6502X_82,
+    OPC_6502X_83,
+    OPC_6502_84,
+    OPC_6502_85,
+    OPC_6502_86,
+    OPC_6502X_87,
+    OPC_6502_88,
+    OPC_6502X_89,
+    OPC_6502_8A,
+    OPC_6502X_8B,
+    OPC_6502_8C,
+    OPC_6502_8D,
+    OPC_6502_8E,
+    OPC_6502X_8F,
+    OPC_6502_90,
+    OPC_6502_91,
+    OPC_Illegal,
+    OPC_6502X_93,
+    OPC_6502_94,
+    OPC_6502_95,
+    OPC_6502_96,
+    OPC_6502X_97,
+    OPC_6502_98,
+    OPC_6502_99,
+    OPC_6502_9A,
+    OPC_6502X_9B,
+    OPC_6502X_9C,
+    OPC_6502_9D,
+    OPC_6502X_9E,
+    OPC_6502X_9F,
+    OPC_6502_A0,
+    OPC_6502_A1,
+    OPC_6502_A2,
+    OPC_6502X_A3,
+    OPC_6502_A4,
+    OPC_6502_A5,
+    OPC_6502_A6,
+    OPC_6502X_A7,
+    OPC_6502_A8,
+    OPC_6502_A9,
+    OPC_6502_AA,
+    OPC_6502X_AB,
+    OPC_6502_AC,
+    OPC_6502_AD,
+    OPC_6502_AE,
+    OPC_6502X_AF,
+    OPC_6502_B0,
+    OPC_6502_B1,
+    OPC_Illegal,
+    OPC_6502X_B3,
+    OPC_6502_B4,
+    OPC_6502_B5,
+    OPC_6502_B6,
+    OPC_6502X_B7,
+    OPC_6502_B8,
+    OPC_6502_B9,
+    OPC_6502_BA,
+    OPC_6502X_BB,
+    OPC_6502_BC,
+    OPC_6502_BD,
+    OPC_6502_BE,
+    OPC_6502X_BF,
+    OPC_6502_C0,
+    OPC_6502_C1,
+    OPC_6502X_C2,
+    OPC_6502X_C3,
+    OPC_6502_C4,
+    OPC_6502_C5,
+    OPC_6502_C6,
+    OPC_6502X_C7,
+    OPC_6502_C8,
+    OPC_6502_C9,
+    OPC_6502_CA,
+    OPC_6502X_CB,
+    OPC_6502_CC,
+    OPC_6502_CD,
+    OPC_6502_CE,
+    OPC_6502X_CF,
+    OPC_6502_D0,
+    OPC_6502_D1,
+    OPC_Illegal,
+    OPC_6502X_D3,
+    OPC_6502X_D4,
+    OPC_6502_D5,
+    OPC_6502_D6,
+    OPC_6502X_D7,
+    OPC_6502_D8,
+    OPC_6502_D9,
+    OPC_6502X_DA,
+    OPC_6502X_DB,
+    OPC_6502X_DC,
+    OPC_6502_DD,
+    OPC_6502_DE,
+    OPC_6502X_DF,
+    OPC_6502_E0,
+    OPC_6502_E1,
+    OPC_6502X_E2,
+    OPC_6502X_E3,
+    OPC_6502_E4,
+    OPC_6502_E5,
+    OPC_6502_E6,
+    OPC_6502X_E7,
+    OPC_6502_E8,
+    OPC_6502_E9,
+    OPC_6502_EA,
+    OPC_6502X_EB,
+    OPC_6502_EC,
+    OPC_6502_ED,
+    OPC_6502_EE,
+    OPC_6502X_EF,
+    OPC_6502_F0,
+    OPC_6502_F1,
+    OPC_Illegal,
+    OPC_6502X_F3,
+    OPC_6502X_F4,
+    OPC_6502_F5,
+    OPC_6502_F6,
+    OPC_6502X_F7,
+    OPC_6502_F8,
+    OPC_6502_F9,
+    OPC_6502X_FA,
+    OPC_6502X_FB,
+    OPC_6502X_FC,
+    OPC_6502_FD,
+    OPC_6502_FE,
+    OPC_6502X_FF
+};
+
+
+
 /* Opcode handler table for the 65C02 */
 static const OPFunc OP65C02Table[256] = {
     OPC_6502_00,
     OPC_6502_01,
     OPC_65C02_NOP22,    // $02
     OPC_65C02_NOP11,    // $03
-    OPC_65SC02_04,
+    OPC_65C02_04,
     OPC_6502_05,
     OPC_6502_06,
-    OPC_Illegal,        // $07: RMB0 currently unsupported
+    OPC_65C02_07,
     OPC_6502_08,
     OPC_6502_09,
     OPC_6502_0A,
     OPC_65C02_NOP11,    // $0B
-    OPC_65SC02_0C,
+    OPC_65C02_0C,
     OPC_6502_0D,
     OPC_6502_0E,
-    OPC_Illegal,        // $0F: BBR0 currently unsupported
+    OPC_65C02_0F,
     OPC_6502_10,
     OPC_6502_11,
-    OPC_65SC02_12,
+    OPC_65C02_12,
     OPC_65C02_NOP11,    // $13
-    OPC_65SC02_14,
+    OPC_65C02_14,
     OPC_6502_15,
     OPC_6502_16,
-    OPC_Illegal,        // $17: RMB1 currently unsupported
+    OPC_65C02_17,
     OPC_6502_18,
     OPC_6502_19,
-    OPC_65SC02_1A,
+    OPC_65C02_1A,
     OPC_65C02_NOP11,    // $1B
-    OPC_65SC02_1C,
+    OPC_65C02_1C,
     OPC_6502_1D,
-    OPC_6502_1E,
-    OPC_Illegal,        // $1F: BBR1 currently unsupported
+    OPC_65C02_1E,
+    OPC_65C02_1F,
     OPC_6502_20,
     OPC_6502_21,
     OPC_65C02_NOP22,    // $22
@@ -2966,7 +4458,7 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_24,
     OPC_6502_25,
     OPC_6502_26,
-    OPC_Illegal,        // $27: RMB2 currently unsupported
+    OPC_65C02_27,
     OPC_6502_28,
     OPC_6502_29,
     OPC_6502_2A,
@@ -2974,31 +4466,31 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_2C,
     OPC_6502_2D,
     OPC_6502_2E,
-    OPC_Illegal,        // $2F: BBR2 currently unsupported
+    OPC_65C02_2F,
     OPC_6502_30,
     OPC_6502_31,
-    OPC_65SC02_32,
+    OPC_65C02_32,
     OPC_65C02_NOP11,    // $33
-    OPC_65SC02_34,
+    OPC_65C02_34,
     OPC_6502_35,
     OPC_6502_36,
-    OPC_Illegal,        // $37: RMB3 currently unsupported
+    OPC_65C02_37,
     OPC_6502_38,
     OPC_6502_39,
-    OPC_65SC02_3A,
+    OPC_65C02_3A,
     OPC_65C02_NOP11,    // $3B
-    OPC_65SC02_3C,
+    OPC_65C02_3C,
     OPC_6502_3D,
-    OPC_6502_3E,
-    OPC_Illegal,        // $3F: BBR3 currently unsupported
+    OPC_65C02_3E,
+    OPC_65C02_3F,
     OPC_6502_40,
     OPC_6502_41,
     OPC_65C02_NOP22,    // $42
     OPC_65C02_NOP11,    // $43
-    OPC_65C02_44,       // $44
+    OPC_6502X_44,       // $44
     OPC_6502_45,
     OPC_6502_46,
-    OPC_Illegal,        // $47: RMB4 currently unsupported
+    OPC_65C02_47,
     OPC_6502_48,
     OPC_6502_49,
     OPC_6502_4A,
@@ -3006,87 +4498,87 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_4C,
     OPC_6502_4D,
     OPC_6502_4E,
-    OPC_Illegal,        // $4F: BBR4 currently unsupported
+    OPC_65C02_4F,
     OPC_6502_50,
     OPC_6502_51,
-    OPC_65SC02_52,
+    OPC_65C02_52,
     OPC_65C02_NOP11,    // $53
     OPC_65C02_NOP24,    // $54
     OPC_6502_55,
     OPC_6502_56,
-    OPC_Illegal,        // $57: RMB5 currently unsupported
+    OPC_65C02_57,
     OPC_6502_58,
     OPC_6502_59,
-    OPC_65SC02_5A,
+    OPC_65C02_5A,
     OPC_65C02_NOP11,    // $5B
     OPC_65C02_5C,
     OPC_6502_5D,
-    OPC_6502_5E,
-    OPC_Illegal,        // $5F: BBR5 currently unsupported
+    OPC_65C02_5E,
+    OPC_65C02_5F,
     OPC_6502_60,
-    OPC_6502_61,
+    OPC_65C02_61,
     OPC_65C02_NOP22,    // $62
     OPC_65C02_NOP11,    // $63
-    OPC_65SC02_64,
-    OPC_6502_65,
+    OPC_65C02_64,
+    OPC_65C02_65,
     OPC_6502_66,
-    OPC_Illegal,        // $67: RMB6 currently unsupported
+    OPC_65C02_67,
     OPC_6502_68,
-    OPC_6502_69,
+    OPC_65C02_69,
     OPC_6502_6A,
     OPC_65C02_NOP11,    // $6B
     OPC_65C02_6C,
-    OPC_6502_6D,
+    OPC_65C02_6D,
     OPC_6502_6E,
-    OPC_Illegal,        // $6F: BBR6 currently unsupported
+    OPC_65C02_6F,
     OPC_6502_70,
-    OPC_6502_71,
-    OPC_65SC02_72,
+    OPC_65C02_71,
+    OPC_65C02_72,
     OPC_65C02_NOP11,    // $73
-    OPC_65SC02_74,
-    OPC_6502_75,
+    OPC_65C02_74,
+    OPC_65C02_75,
     OPC_6502_76,
-    OPC_Illegal,        // $77: RMB7 currently unsupported
+    OPC_65C02_77,
     OPC_6502_78,
-    OPC_6502_79,
-    OPC_65SC02_7A,
+    OPC_65C02_79,
+    OPC_65C02_7A,
     OPC_65C02_NOP11,    // $7B
-    OPC_65SC02_7C,
-    OPC_6502_7D,
-    OPC_6502_7E,
-    OPC_Illegal,        // $7F: BBR7 currently unsupported
-    OPC_65SC02_80,
+    OPC_65C02_7C,
+    OPC_65C02_7D,
+    OPC_65C02_7E,
+    OPC_65C02_7F,
+    OPC_65C02_80,
     OPC_6502_81,
     OPC_65C02_NOP22,    // $82
     OPC_65C02_NOP11,    // $83
     OPC_6502_84,
     OPC_6502_85,
     OPC_6502_86,
-    OPC_Illegal,        // $87: SMB0 currently unsupported
+    OPC_65C02_87,
     OPC_6502_88,
-    OPC_65SC02_89,
+    OPC_65C02_89,
     OPC_6502_8A,
     OPC_65C02_NOP11,    // $8B
     OPC_6502_8C,
     OPC_6502_8D,
     OPC_6502_8E,
-    OPC_Illegal,        // $8F: BBS0 currently unsupported
+    OPC_65C02_8F,
     OPC_6502_90,
     OPC_6502_91,
-    OPC_65SC02_92,
+    OPC_65C02_92,
     OPC_65C02_NOP11,    // $93
     OPC_6502_94,
     OPC_6502_95,
     OPC_6502_96,
-    OPC_Illegal,        // $97: SMB1 currently unsupported
+    OPC_65C02_97,
     OPC_6502_98,
     OPC_6502_99,
     OPC_6502_9A,
     OPC_65C02_NOP11,    // $9B
-    OPC_65SC02_9C,
+    OPC_65C02_9C,
     OPC_6502_9D,
-    OPC_65SC02_9E,
-    OPC_Illegal,        // $9F: BBS1 currently unsupported
+    OPC_65C02_9E,
+    OPC_65C02_9F,
     OPC_6502_A0,
     OPC_6502_A1,
     OPC_6502_A2,
@@ -3094,7 +4586,7 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_A4,
     OPC_6502_A5,
     OPC_6502_A6,
-    OPC_Illegal,        // $A7: SMB2 currently unsupported
+    OPC_65C02_A7,
     OPC_6502_A8,
     OPC_6502_A9,
     OPC_6502_AA,
@@ -3102,15 +4594,15 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_AC,
     OPC_6502_AD,
     OPC_6502_AE,
-    OPC_Illegal,        // $AF: BBS2 currently unsupported
+    OPC_65C02_AF,
     OPC_6502_B0,
     OPC_6502_B1,
-    OPC_65SC02_B2,
+    OPC_65C02_B2,
     OPC_65C02_NOP11,    // $B3
     OPC_6502_B4,
     OPC_6502_B5,
     OPC_6502_B6,
-    OPC_Illegal,        // $B7: SMB3 currently unsupported
+    OPC_65C02_B7,
     OPC_6502_B8,
     OPC_6502_B9,
     OPC_6502_BA,
@@ -3118,7 +4610,7 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_BC,
     OPC_6502_BD,
     OPC_6502_BE,
-    OPC_Illegal,        // $BF: BBS3 currently unsupported
+    OPC_65C02_BF,
     OPC_6502_C0,
     OPC_6502_C1,
     OPC_65C02_NOP22,    // $C2
@@ -3126,7 +4618,7 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_C4,
     OPC_6502_C5,
     OPC_6502_C6,
-    OPC_Illegal,        // $C7: SMB4 currently unsupported
+    OPC_65C02_C7,
     OPC_6502_C8,
     OPC_6502_C9,
     OPC_6502_CA,
@@ -3134,61 +4626,65 @@ static const OPFunc OP65C02Table[256] = {
     OPC_6502_CC,
     OPC_6502_CD,
     OPC_6502_CE,
-    OPC_Illegal,        // $CF: BBS4 currently unsupported
+    OPC_65C02_CF,
     OPC_6502_D0,
     OPC_6502_D1,
-    OPC_65SC02_D2,
+    OPC_65C02_D2,
     OPC_65C02_NOP11,    // $D3
     OPC_65C02_NOP24,    // $D4
     OPC_6502_D5,
     OPC_6502_D6,
-    OPC_Illegal,        // $D7: SMB5 currently unsupported
+    OPC_65C02_D7,
     OPC_6502_D8,
     OPC_6502_D9,
-    OPC_65SC02_DA,
+    OPC_65C02_DA,
     OPC_Illegal,        // $DB: STP currently unsupported
     OPC_65C02_NOP34,    // $DC
     OPC_6502_DD,
     OPC_6502_DE,
-    OPC_Illegal,        // $DF: BBS5 currently unsupported
+    OPC_65C02_DF,
     OPC_6502_E0,
-    OPC_6502_E1,
+    OPC_65C02_E1,
     OPC_65C02_NOP22,    // $E2
     OPC_65C02_NOP11,    // $E3
     OPC_6502_E4,
-    OPC_6502_E5,
+    OPC_65C02_E5,
     OPC_6502_E6,
-    OPC_Illegal,        // $E7: SMB6 currently unsupported
+    OPC_65C02_E7,
     OPC_6502_E8,
-    OPC_6502_E9,
+    OPC_65C02_E9,
     OPC_6502_EA,
     OPC_65C02_NOP11,    // $EB
     OPC_6502_EC,
-    OPC_6502_ED,
+    OPC_65C02_ED,
     OPC_6502_EE,
-    OPC_Illegal,        // $EF: BBS6 currently unsupported
+    OPC_65C02_EF,
     OPC_6502_F0,
-    OPC_6502_F1,
-    OPC_65SC02_F2,
+    OPC_65C02_F1,
+    OPC_65C02_F2,
     OPC_65C02_NOP11,    // $F3
     OPC_65C02_NOP24,    // $F4
-    OPC_6502_F5,
+    OPC_65C02_F5,
     OPC_6502_F6,
-    OPC_Illegal,        // $F7: SMB7 currently unsupported
+    OPC_65C02_F7,
     OPC_6502_F8,
-    OPC_6502_F9,
-    OPC_65SC02_FA,
+    OPC_65C02_F9,
+    OPC_65C02_FA,
     OPC_65C02_NOP11,    // $FB
     OPC_65C02_NOP34,    // $FC
-    OPC_6502_FD,
+    OPC_65C02_FD,
     OPC_6502_FE,
-    OPC_Illegal,        // $FF: BBS7 currently unsupported
+    OPC_65C02_FF
 };
 
 
 
 /* Tables with opcode handlers */
-static const OPFunc* Handlers[2] = {OP6502Table, OP65C02Table};
+static const OPFunc* Handlers[3] = {
+    OP6502Table,
+    OP65C02Table,
+    OP6502XTable
+};
 
 
 
@@ -3202,7 +4698,7 @@ void IRQRequest (void)
 /* Generate an IRQ */
 {
     /* Remember the request */
-    HaveIRQRequest = 1;
+    HaveIRQRequest = true;
 }
 
 
@@ -3211,7 +4707,7 @@ void NMIRequest (void)
 /* Generate an NMI */
 {
     /* Remember the request */
-    HaveNMIRequest = 1;
+    HaveNMIRequest = true;
 }
 
 
@@ -3220,8 +4716,8 @@ void Reset (void)
 /* Generate a CPU RESET */
 {
     /* Reset the CPU */
-    HaveIRQRequest = 0;
-    HaveNMIRequest = 0;
+    HaveIRQRequest = false;
+    HaveNMIRequest = false;
 
     /* Bits 5 and 4 aren't used, and always are 1! */
     Regs.SR = 0x30;
@@ -3236,12 +4732,18 @@ unsigned ExecuteInsn (void)
     /* If we have an NMI request, handle it */
     if (HaveNMIRequest) {
 
-        HaveNMIRequest = 0;
+        if (TraceMode != TRACE_DISABLED) {
+            PrintTraceNMI ();
+        }
+
+        HaveNMIRequest = false;
+        Peripherals.Counter.NmiEvents += 1;
+
         PUSH (PCH);
         PUSH (PCL);
         PUSH (Regs.SR & ~BF);
         SET_IF (1);
-        if (CPU != CPU_6502)
+        if (CPU == CPU_65C02)
         {
             SET_DF (0);
         }
@@ -3250,12 +4752,18 @@ unsigned ExecuteInsn (void)
 
     } else if (HaveIRQRequest && GET_IF () == 0) {
 
-        HaveIRQRequest = 0;
+        if (TraceMode != TRACE_DISABLED) {
+            PrintTraceIRQ ();
+        }
+
+        HaveIRQRequest = false;
+        Peripherals.Counter.IrqEvents += 1;
+
         PUSH (PCH);
         PUSH (PCL);
         PUSH (Regs.SR & ~BF);
         SET_IF (1);
-        if (CPU != CPU_6502)
+        if (CPU == CPU_65C02)
         {
             SET_DF (0);
         }
@@ -3265,12 +4773,23 @@ unsigned ExecuteInsn (void)
     } else {
 
         /* Normal instruction - read the next opcode */
-        unsigned char OPC = MemReadByte (Regs.PC);
+        uint8_t OPC = MemReadByte (Regs.PC);
 
-        /* Execute it */
+        /* Print a trace line, if trace mode is enabled. */
+        if (TraceMode != TRACE_DISABLED) {
+            PrintTraceInstruction ();
+        }
+
+        /* Increment the instruction counter by one. */
+        Peripherals.Counter.CpuInstructions += 1;
+
+        /* Execute the instruction. The handler sets the 'Cycles' variable. */
         Handlers[CPU][OPC] ();
     }
 
-    /* Return the number of clock cycles needed by this insn */
+    /* Increment the 64-bit clock cycle counter with the cycle count for the instruction that we just executed. */
+    Peripherals.Counter.ClockCycles += Cycles;
+
+    /* Return the number of clock cycles needed by this instruction */
     return Cycles;
 }
diff --git a/src/sim65/6502.h b/src/sim65/6502.h
index 39b995793..d715f3288 100644
--- a/src/sim65/6502.h
+++ b/src/sim65/6502.h
@@ -37,6 +37,8 @@
 #define _6502_H
 
 
+#include <stdint.h>
+
 
 /*****************************************************************************/
 /*                                   Data                                    */
@@ -46,8 +48,9 @@
 
 /* Supported CPUs */
 typedef enum CPUType {
-    CPU_6502,
-    CPU_65C02
+    CPU_6502  = 0,
+    CPU_65C02 = 1,
+    CPU_6502X = 2
 } CPUType;
 
 /* Current CPU */
@@ -56,15 +59,17 @@ extern CPUType CPU;
 /* 6502 CPU registers */
 typedef struct CPURegs CPURegs;
 struct CPURegs {
-    unsigned    AC;             /* Accumulator */
-    unsigned    XR;             /* X register */
-    unsigned    YR;             /* Y register */
-    unsigned    ZR;             /* Z register */
-    unsigned    SR;             /* Status register */
-    unsigned    SP;             /* Stackpointer */
-    unsigned    PC;             /* Program counter */
+    uint8_t     AC;             /* Accumulator */
+    uint8_t     XR;             /* X register */
+    uint8_t     YR;             /* Y register */
+    uint8_t     SR;             /* Status register */
+    uint8_t     SP;             /* Stackpointer */
+    uint16_t    PC;             /* Program counter */
 };
 
+/* Current CPU registers */
+extern CPURegs Regs;
+
 /* Status register bits */
 #define CF      0x01            /* Carry flag */
 #define ZF      0x02            /* Zero flag */
diff --git a/src/sim65/error.c b/src/sim65/error.c
index fc24ca006..af8e88413 100644
--- a/src/sim65/error.c
+++ b/src/sim65/error.c
@@ -36,9 +36,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <inttypes.h>
 
 #include "error.h"
-
+#include "peripherals.h"
 
 
 /*****************************************************************************/
@@ -50,9 +51,6 @@
 /* flag to print cycles at program termination */
 int PrintCycles = 0;
 
-/* cycles are counted by main.c */
-extern unsigned long long TotalCycles;
-
 
 
 /*****************************************************************************/
@@ -120,7 +118,7 @@ void SimExit (int Code)
 /* Exit the simulation with an exit code */
 {
     if (PrintCycles) {
-        fprintf (stdout, "%llu cycles\n", TotalCycles);
+        fprintf (stdout, "%" PRIu64 " cycles\n", Peripherals.Counter.ClockCycles);
     }
     exit (Code);
 }
diff --git a/src/sim65/main.c b/src/sim65/main.c
index 3c7cdc157..3cc9581b5 100644
--- a/src/sim65/main.c
+++ b/src/sim65/main.c
@@ -35,6 +35,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <errno.h>
 
 /* common */
@@ -47,7 +48,9 @@
 #include "6502.h"
 #include "error.h"
 #include "memory.h"
+#include "peripherals.h"
 #include "paravirt.h"
+#include "trace.h"
 
 
 
@@ -60,8 +63,8 @@
 /* Name of program file */
 const char* ProgramFile;
 
-/* count of total cycles executed */
-unsigned long long TotalCycles = 0;
+/* Set to True if CPU mode override is in effect. If set, the CPU is not read from the program file. */
+static bool CPUOverrideActive = false;
 
 /* exit simulator after MaxCycles Cccles */
 unsigned long long MaxCycles = 0;
@@ -97,6 +100,8 @@ static void Usage (void)
             "Long options:\n"
             "  --help\t\tHelp (this text)\n"
             "  --cycles\t\tPrint amount of executed CPU cycles\n"
+            "  --cpu <type>\t\tOverride CPU type (6502, 65C02, 6502X)\n"
+            "  --trace\t\tEnable CPU trace\n"
             "  --verbose\t\tIncrease verbosity\n"
             "  --version\t\tPrint the simulator version number\n",
             ProgName);
@@ -114,6 +119,35 @@ static void OptHelp (const char* Opt attribute ((unused)),
 
 
 
+static void OptCPU (const char* Opt, const char* Arg)
+/* Set CPU type */
+{
+    /* Don't use FindCPU here. Enum constants would clash. */
+    if (strcmp(Arg, "6502") == 0) {
+        CPU = CPU_6502;
+        CPUOverrideActive = true;
+    } else if (strcmp(Arg, "65C02") == 0 || strcmp(Arg, "65c02") == 0) {
+        CPU = CPU_65C02;
+        CPUOverrideActive = true;
+    } else if (strcmp(Arg, "6502X") == 0 || strcmp(Arg, "6502x") == 0) {
+        CPU = CPU_6502X;
+        CPUOverrideActive = true;
+    } else {
+        AbEnd ("Invalid argument for %s: '%s'", Opt, Arg);
+    }
+}
+
+
+
+static void OptTrace (const char* Opt attribute ((unused)),
+                      const char* Arg attribute ((unused)))
+/* Enable trace mode */
+{
+    TraceMode = TRACE_ENABLE_FULL; /* Enable full trace mode. */
+}
+
+
+
 static void OptVerbose (const char* Opt attribute ((unused)),
                         const char* Arg attribute ((unused)))
 /* Increase verbosity */
@@ -137,16 +171,20 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print the simulator version */
 {
     fprintf (stderr, "%s V%s\n", ProgName, GetVersionAsString ());
-    exit(EXIT_SUCCESS);
+    exit (EXIT_SUCCESS);
 }
 
+
+
 static void OptQuitXIns (const char* Opt attribute ((unused)),
-                        const char* Arg attribute ((unused)))
-/* quit after MaxCycles cycles */
+                        const char* Arg)
+/* Quit after MaxCycles cycles */
 {
     MaxCycles = strtoull(Arg, NULL, 0);
 }
 
+
+
 static unsigned char ReadProgramFile (void)
 /* Load program into memory */
 {
@@ -175,15 +213,24 @@ static unsigned char ReadProgramFile (void)
         Error ("'%s': Invalid header version.", ProgramFile);
     }
 
-    /* Get the CPU type from the file header */
+    /* Get the CPU type from the file header.
+     * Use it to set the CPU type, unless CPUOverrideActive is set.
+     */
     if ((Val = fgetc(F)) != EOF) {
-        if (Val != CPU_6502 && Val != CPU_65C02) {
-            Error ("'%s': Invalid CPU type", ProgramFile);
+        if (!CPUOverrideActive) {
+            switch (Val) {
+            case CPU_6502:
+            case CPU_65C02:
+            case CPU_6502X:
+                CPU = Val;
+                break;
+            default:
+                Error ("'%s': Invalid CPU type", ProgramFile);
+            }
         }
-        CPU = Val;
     }
 
-    /* Get the address of sp from the file header */
+    /* Get the address of c_sp from the file header */
     if ((Val = fgetc(F)) != EOF) {
         SPAddr = Val;
     }
@@ -234,16 +281,22 @@ int main (int argc, char* argv[])
 {
     /* Program long options */
     static const LongOpt OptTab[] = {
-        { "--help",             0,      OptHelp                 },
-        { "--cycles",           0,      OptCycles               },
-        { "--verbose",          0,      OptVerbose              },
-        { "--version",          0,      OptVersion              },
+        { "--help",             0,      OptHelp      },
+        { "--cycles",           0,      OptCycles    },
+        { "--cpu",              1,      OptCPU       },
+        { "--trace",            0,      OptTrace     },
+        { "--verbose",          0,      OptVerbose   },
+        { "--version",          0,      OptVersion   },
     };
 
     unsigned I;
     unsigned char SPAddr;
     unsigned int Cycles;
 
+    /* Set reasonable defaults. */
+    CPU = CPU_6502;
+    TraceMode = TRACE_DISABLED; /* Disabled by default */
+
     /* Initialize the cmdline module */
     InitCmdLine (&argc, &argv, "sim65");
 
@@ -298,21 +351,34 @@ int main (int argc, char* argv[])
     }
 
     /* Do we have a program file? */
-    if (ProgramFile == 0) {
+    if (ProgramFile == NULL) {
         AbEnd ("No program file");
     }
 
+    /* Reset memory */
     MemInit ();
 
+    /* Reset peripherals. */
+    PeripheralsInit ();
+
+    /* Read program file into memory.
+     * This also sets the CPU type, unless a CPU override is in effect.
+     */
     SPAddr = ReadProgramFile ();
+
+    /* Initialize the paravirtualization subsystem. It requires the stack pointer address, to be able to
+     * simulate 6502 subroutine calls.
+     */
+
+    TraceInit(SPAddr);
     ParaVirtInit (I, SPAddr);
 
+    /* Reset the CPU */
     Reset ();
 
     RemainCycles = MaxCycles;
     while (1) {
         Cycles = ExecuteInsn ();
-        TotalCycles += Cycles;
         if (MaxCycles) {
             if (Cycles > RemainCycles) {
                 ErrorCode (SIM65_ERROR_TIMEOUT, "Maximum number of cycles reached.");
diff --git a/src/sim65/memory.c b/src/sim65/memory.c
index 68e7bb93b..c80bf0f93 100644
--- a/src/sim65/memory.c
+++ b/src/sim65/memory.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include "memory.h"
-
+#include "peripherals.h"
 
 
 /*****************************************************************************/
@@ -45,8 +45,8 @@
 
 
 
-/* THE memory */
-unsigned char Mem[0x10000];
+/* The memory */
+uint8_t Mem[0x10000];
 
 
 
@@ -56,15 +56,22 @@ unsigned char Mem[0x10000];
 
 
 
-void MemWriteByte (unsigned Addr, unsigned char Val)
+void MemWriteByte (uint16_t Addr, uint8_t Val)
 /* Write a byte to a memory location */
 {
-    Mem[Addr] = Val;
+    if ((PERIPHERALS_APERTURE_BASE_ADDRESS <= Addr) && (Addr <= PERIPHERALS_APERTURE_LAST_ADDRESS))
+    {
+        /* Defer the the memory-mapped peripherals handler for this write. */
+        PeripheralsWriteByte (Addr - PERIPHERALS_APERTURE_BASE_ADDRESS, Val);
+    } else {
+        /* Write to the Mem array. */
+        Mem[Addr] = Val;
+    }
 }
 
 
 
-void MemWriteWord (unsigned Addr, unsigned Val)
+void MemWriteWord (uint16_t Addr, uint16_t Val)
 /* Write a word to a memory location */
 {
     MemWriteByte (Addr, Val & 0xFF);
@@ -73,22 +80,37 @@ void MemWriteWord (unsigned Addr, unsigned Val)
 
 
 
-unsigned MemReadWord (unsigned Addr)
+uint8_t MemReadByte (uint16_t Addr)
+/* Read a byte from a memory location */
+{
+    if ((PERIPHERALS_APERTURE_BASE_ADDRESS <= Addr) && (Addr <= PERIPHERALS_APERTURE_LAST_ADDRESS))
+    {
+        /* Defer the the memory-mapped peripherals handler for this read. */
+        return PeripheralsReadByte (Addr - PERIPHERALS_APERTURE_BASE_ADDRESS);
+    } else {
+        /* Read from the Mem array. */
+        return Mem[Addr];
+    }
+}
+
+
+
+uint16_t MemReadWord (uint16_t Addr)
 /* Read a word from a memory location */
 {
-    unsigned W = MemReadByte (Addr++);
+    uint8_t W = MemReadByte (Addr++);
     return (W | (MemReadByte (Addr) << 8));
 }
 
 
 
-unsigned MemReadZPWord (unsigned char Addr)
+uint16_t MemReadZPWord (uint8_t Addr)
 /* Read a word from the zero page. This function differs from MemReadWord in that
 ** the read will always be in the zero page, even in case of an address
 ** overflow.
 */
 {
-    unsigned W = MemReadByte (Addr++);
+    uint8_t W = MemReadByte (Addr++);
     return (W | (MemReadByte (Addr) << 8));
 }
 
diff --git a/src/sim65/memory.h b/src/sim65/memory.h
index cef786aaa..b70c5bd05 100644
--- a/src/sim65/memory.h
+++ b/src/sim65/memory.h
@@ -36,9 +36,9 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "inline.h"
+#include <stdint.h>
 
-extern unsigned char Mem[0x10000];
+extern uint8_t Mem[0x10000];
 
 /*****************************************************************************/
 /*                                   Code                                    */
@@ -46,26 +46,19 @@ extern unsigned char Mem[0x10000];
 
 
 
-void MemWriteByte (unsigned Addr, unsigned char Val);
+void MemWriteByte (uint16_t Addr, uint8_t Val);
 /* Write a byte to a memory location */
 
-void MemWriteWord (unsigned Addr, unsigned Val);
+void MemWriteWord (uint16_t Addr, uint16_t Val);
 /* Write a word to a memory location */
 
-#if defined(HAVE_INLINE)
-INLINE unsigned char MemReadByte (unsigned Addr)
+uint8_t MemReadByte (uint16_t Addr);
 /* Read a byte from a memory location */
-{
-    return Mem[Addr];
-}
-#else
-#define MemReadByte(Addr) Mem[Addr]
-#endif
 
-unsigned MemReadWord (unsigned Addr);
+uint16_t MemReadWord (uint16_t Addr);
 /* Read a word from a memory location */
 
-unsigned MemReadZPWord (unsigned char Addr);
+uint16_t MemReadZPWord (uint8_t Addr);
 /* Read a word from the zero page. This function differs from MemReadWord in that
 ** the read will always be in the zero page, even in case of an address
 ** overflow.
diff --git a/src/sim65/paravirt.c b/src/sim65/paravirt.c
index 2e52d6e7e..4e68a3f0e 100644
--- a/src/sim65/paravirt.c
+++ b/src/sim65/paravirt.c
@@ -159,11 +159,35 @@ static void PVArgs (CPURegs* Regs)
     SetAX (Regs, ArgC);
 }
 
+/* Match between standard POSIX whence and cc65 whence. */
+static unsigned SEEK_MODE_MATCH[3] = {
+  SEEK_CUR,
+  SEEK_END,
+  SEEK_SET
+};
+
+static void PVLseek (CPURegs* Regs)
+{
+    unsigned RetVal;
+
+    unsigned Whence = GetAX (Regs);
+    unsigned Offset = PopParam (4);
+    unsigned FD     = PopParam (2);
+
+    Print (stderr, 2, "PVLseek ($%04X, $%08X, $%04X (%d))\n",
+           FD, Offset, Whence, SEEK_MODE_MATCH[Whence]);
+
+    RetVal = lseek(FD, (off_t)Offset, SEEK_MODE_MATCH[Whence]);
+    Print (stderr, 2, "PVLseek returned %04X\n", RetVal);
+
+    SetAX (Regs, RetVal);
+}
+
 
 
 static void PVOpen (CPURegs* Regs)
 {
-    char Path[PVOPEN_PATH_SIZE];
+    char Path[PV_PATH_SIZE];
     int OFlag = O_INITIAL;
     int OMode = 0;
     unsigned RetVal, I = 0;
@@ -184,7 +208,7 @@ static void PVOpen (CPURegs* Regs)
             break;
         }
         ++I;
-        if (I >= PVOPEN_PATH_SIZE) {
+        if (I >= PV_PATH_SIZE) {
             Error("PVOpen path too long at address $%04X",Name);
         }
     }
@@ -253,6 +277,35 @@ static void PVClose (CPURegs* Regs)
 
 
 
+static void PVSysRemove (CPURegs* Regs)
+{
+    char Path[PV_PATH_SIZE];
+    unsigned RetVal, I = 0;
+
+    unsigned Name  = GetAX (Regs);
+
+    Print (stderr, 2, "PVSysRemove ($%04X)\n", Name);
+
+    do {
+        if (!(Path[I] = MemReadByte ((Name + I) & 0xFFFF))) {
+            break;
+        }
+        ++I;
+        if (I >= PV_PATH_SIZE) {
+            Error("PVSysRemove path too long at address $%04X", Name);
+        }
+    }
+    while (1);
+
+    Print (stderr, 2, "PVSysRemove (\"%s\")\n", Path);
+
+    RetVal = remove (Path);
+
+    SetAX (Regs, RetVal);
+}
+
+
+
 static void PVRead (CPURegs* Regs)
 {
     unsigned char* Data;
@@ -305,7 +358,18 @@ static void PVWrite (CPURegs* Regs)
 
 
 
+static void PVOSMapErrno (CPURegs* Regs)
+{
+    unsigned err = GetAX(Regs);
+    SetAX (Regs, err != 0 ? -1 : 0);
+}
+
+
+
 static const PVFunc Hooks[] = {
+    PVLseek,
+    PVSysRemove,
+    PVOSMapErrno,
     PVOpen,
     PVClose,
     PVRead,
diff --git a/src/sim65/paravirt.h b/src/sim65/paravirt.h
index 3badb50ea..83c7127a0 100644
--- a/src/sim65/paravirt.h
+++ b/src/sim65/paravirt.h
@@ -32,11 +32,12 @@
 /*****************************************************************************/
 
 
-
 #ifndef PARAVIRT_H
 #define PARAVIRT_H
 
 
+#include "6502.h"
+
 
 /*****************************************************************************/
 /*                                   Data                                    */
@@ -44,11 +45,11 @@
 
 
 
-#define PARAVIRT_BASE        0xFFF4
+#define PARAVIRT_BASE        0xFFF1
 /* Lowest address used by a paravirtualization hook */
 
-#define PVOPEN_PATH_SIZE       1024
-/* Maximum path size supported by PVOpen */
+#define PV_PATH_SIZE         1024
+/* Maximum path size supported by PVOpen/PVSysRemove */
 
 
 
diff --git a/src/sim65/peripherals.c b/src/sim65/peripherals.c
new file mode 100644
index 000000000..1d7ff6bdb
--- /dev/null
+++ b/src/sim65/peripherals.c
@@ -0,0 +1,250 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                             peripherals.c                                 */
+/*                                                                           */
+/*         Memory-mapped peripheral subsystem for the 6502 simulator         */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2024-2025, Sidney Cadot                                               */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+#include <stdbool.h>
+#include <time.h>
+#if defined(__MINGW64__) || defined(__MINGW32__)
+/* For gettimeofday() */
+#include <sys/time.h>
+#endif
+
+
+#include "peripherals.h"
+#include "trace.h"
+#include "6502.h"
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* The system-wide state of the peripherals */
+Sim65Peripherals Peripherals;
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+static bool GetWallclockTime (struct timespec * ts)
+/* Get the wallclock time with nanosecond resolution. */
+{
+    /* Note: the 'struct timespec' type is available on all compilers we want to support. */
+
+    bool time_valid;
+
+#if defined(__MINGW64__)
+    /* When using the MinGW64 compiler, neither timespec_get() nor clock_gettime()
+     * are available; using either of them makes the Linux PR build workflow build fail.
+     * The gettimeofday() function does work, so use that; its microsecond resolution
+     * is fine for most applications.
+     */
+    struct timeval tv;
+    time_valid = (gettimeofday(&tv, NULL) == 0);
+    if (time_valid) {
+        ts->tv_sec = tv.tv_sec;
+        ts->tv_nsec = tv.tv_usec * 1000;
+    }
+#elif defined(__MINGW32__)
+    /* Note: we test for MinGW32 after the test for MinGW64, as the __MINGW32__ symbol is also
+     * defined in MinGW64. This allows us to distinguish MinGW32 and MinGW64 build.
+     *
+     * When using the MinGW32 compiler, neither timespec_get() nor clock_gettime()
+     * are available; using either of them makes the Linux snapshot workflow build fail.
+     * The gettimeofday() function does work, so use that; its microsecond resolution
+     * is fine for most applications.
+     */
+    struct timeval tv;
+    time_valid = (gettimeofday(&tv, NULL) == 0);
+    if (time_valid) {
+        ts->tv_sec = tv.tv_sec;
+        ts->tv_nsec = tv.tv_usec * 1000;
+    }
+#elif defined(_MSC_VER)
+    /* Using the Microsoft C++ compiler.
+     * clock_gettime() is not available; use timespec_get() instead.
+     */
+    time_valid = timespec_get(ts, TIME_UTC) == TIME_UTC;
+#else
+    /* On all other compilers, assume that clock_gettime() is available.
+     * This is true on Linux and MacOS, at least.
+     */
+    time_valid = clock_gettime(CLOCK_REALTIME, ts) == 0;
+#endif
+
+    return time_valid;
+}
+
+
+
+void PeripheralsWriteByte (uint8_t Addr, uint8_t Val)
+/* Write a byte to a memory location in the peripherals address aperture. */
+{
+    switch (Addr) {
+
+        /* Handle writes to the Counter peripheral. */
+
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_LATCH: {
+
+            /* A write to the "latch" register performs a simultaneous latch of all registers. */
+
+            /* Latch the current wallclock time before doing anything else. */
+
+            struct timespec ts;
+            bool time_valid = GetWallclockTime (&ts);
+
+            if (time_valid) {
+                /* Wallclock time: number of nanoseconds since 1-1-1970. */
+                Peripherals.Counter.LatchedWallclockTime = 1000000000 * (uint64_t)ts.tv_sec + ts.tv_nsec;
+                /* Wallclock time, split: high word is number of seconds since 1-1-1970,
+                 * low word is number of nanoseconds since the start of that second. */
+                Peripherals.Counter.LatchedWallclockTimeSplit = (uint64_t)ts.tv_sec << 32 | ts.tv_nsec;
+            } else {
+                /* Unable to get time. Report max uint64 value for both fields. */
+                Peripherals.Counter.LatchedWallclockTime = -1;
+                Peripherals.Counter.LatchedWallclockTimeSplit = -1;
+            }
+
+            /* Latch the counters that reflect the state of the processor. */
+            Peripherals.Counter.LatchedClockCycles = Peripherals.Counter.ClockCycles;
+            Peripherals.Counter.LatchedCpuInstructions = Peripherals.Counter.CpuInstructions;
+            Peripherals.Counter.LatchedIrqEvents = Peripherals.Counter.IrqEvents;
+            Peripherals.Counter.LatchedNmiEvents = Peripherals.Counter.NmiEvents;
+            break;
+        }
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_SELECT: {
+            /* Set the value of the visibility-selection register. */
+            Peripherals.Counter.LatchedValueSelected = Val;
+            break;
+        }
+
+        /* Handle writes to the SimControl peripheral. */
+
+        case PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_CPUMODE: {
+            if (Val == CPU_6502 || Val == CPU_65C02 || Val == CPU_6502X) {
+                CPU = Val;
+            }
+            break;
+        }
+
+        case PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_TRACEMODE: {
+            TraceMode = Val;
+            break;
+        }
+
+        /* Handle writes to unused and read-only peripheral addresses. */
+
+        default: {
+            /* No action. */
+        }
+    }
+}
+
+
+
+uint8_t PeripheralsReadByte (uint8_t Addr)
+/* Read a byte from a memory location in the peripherals address aperture. */
+{
+    switch (Addr) {
+
+        /* Handle reads from the Counter peripheral. */
+
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_SELECT: {
+            return Peripherals.Counter.LatchedValueSelected;
+        }
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 0:
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 1:
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 2:
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 3:
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 4:
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 5:
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 6:
+        case PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE + 7: {
+            /* Read from any of the eight counter bytes.
+             * The first byte is the 64 bit value's LSB, the seventh byte is its MSB.
+             */
+            unsigned SelectedByteIndex = Addr - PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE; /* 0 .. 7 */
+            uint64_t Value;
+            switch (Peripherals.Counter.LatchedValueSelected) {
+                case PERIPHERALS_COUNTER_SELECT_CLOCKCYCLE_COUNTER: Value = Peripherals.Counter.LatchedClockCycles; break;
+                case PERIPHERALS_COUNTER_SELECT_INSTRUCTION_COUNTER: Value = Peripherals.Counter.LatchedCpuInstructions; break;
+                case PERIPHERALS_COUNTER_SELECT_IRQ_COUNTER: Value = Peripherals.Counter.LatchedIrqEvents; break;
+                case PERIPHERALS_COUNTER_SELECT_NMI_COUNTER: Value = Peripherals.Counter.LatchedNmiEvents; break;
+                case PERIPHERALS_COUNTER_SELECT_WALLCLOCK_TIME: Value = Peripherals.Counter.LatchedWallclockTime; break;
+                case PERIPHERALS_COUNTER_SELECT_WALLCLOCK_TIME_SPLIT: Value = Peripherals.Counter.LatchedWallclockTimeSplit; break;
+                default: Value = 0; /* Reading from a non-existent latch register will yield 0. */
+            }
+            /* Return the desired byte of the latched counter; 0==LSB, 7==MSB. */
+            return (uint8_t)(Value >> (SelectedByteIndex * 8));
+        }
+
+        /* Handle reads from the SimControl peripheral. */
+
+        case PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_CPUMODE: {
+            return CPU;
+        }
+
+        case PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_TRACEMODE: {
+            return TraceMode;
+        }
+
+        /* Handle reads from unused peripheral and write-only addresses. */
+
+        default: {
+            /* Return zero value. */
+            return 0;
+        }
+    }
+}
+
+
+
+void PeripheralsInit (void)
+/* Initialize the peripherals. */
+{
+    /* Initialize the Counter peripheral */
+
+    Peripherals.Counter.ClockCycles = 0;
+    Peripherals.Counter.CpuInstructions = 0;
+    Peripherals.Counter.IrqEvents = 0;
+    Peripherals.Counter.NmiEvents = 0;
+
+    Peripherals.Counter.LatchedClockCycles = 0;
+    Peripherals.Counter.LatchedCpuInstructions = 0;
+    Peripherals.Counter.LatchedIrqEvents = 0;
+    Peripherals.Counter.LatchedNmiEvents = 0;
+    Peripherals.Counter.LatchedWallclockTime = 0;
+    Peripherals.Counter.LatchedWallclockTimeSplit = 0;
+
+    Peripherals.Counter.LatchedValueSelected = 0;
+}
diff --git a/src/sim65/peripherals.h b/src/sim65/peripherals.h
new file mode 100644
index 000000000..dc86e6c6e
--- /dev/null
+++ b/src/sim65/peripherals.h
@@ -0,0 +1,125 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                             peripherals.h                                 */
+/*                                                                           */
+/*        Memory-mapped peripheral subsystem for the 6502 simulator          */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2024-2025, Sidney Cadot                                               */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef PERIPHERALS_H
+#define PERIPHERALS_H
+
+#include <stdint.h>
+
+/* The memory range where the memory-mapped peripherals can be accessed. */
+
+#define PERIPHERALS_APERTURE_BASE_ADDRESS  0xffc0
+#define PERIPHERALS_APERTURE_LAST_ADDRESS  0xffcb
+
+/* Declarations for the COUNTER peripheral */
+
+#define PERIPHERALS_COUNTER_ADDRESS_OFFSET_LATCH   0x00
+#define PERIPHERALS_COUNTER_ADDRESS_OFFSET_SELECT  0x01
+#define PERIPHERALS_COUNTER_ADDRESS_OFFSET_VALUE   0x02
+
+#define PERIPHERALS_COUNTER_LATCH   (PERIPHERALS_APERTURE_BASE_ADDRESS + PERIPHERALS_ADDRESS_OFFSET_COUNTER_LATCH)
+#define PERIPHERALS_COUNTER_SELECT  (PERIPHERALS_APERTURE_BASE_ADDRESS + PERIPHERALS_ADDRESS_OFFSET_COUNTER_SELECT)
+#define PERIPHERALS_COUNTER_VALUE   (PERIPHERALS_APERTURE_BASE_ADDRESS + PERIPHERALS_ADDRESS_OFFSET_COUNTER)
+
+#define PERIPHERALS_COUNTER_SELECT_CLOCKCYCLE_COUNTER    0x00
+#define PERIPHERALS_COUNTER_SELECT_INSTRUCTION_COUNTER   0x01
+#define PERIPHERALS_COUNTER_SELECT_IRQ_COUNTER           0x02
+#define PERIPHERALS_COUNTER_SELECT_NMI_COUNTER           0x03
+#define PERIPHERALS_COUNTER_SELECT_WALLCLOCK_TIME        0x80
+#define PERIPHERALS_COUNTER_SELECT_WALLCLOCK_TIME_SPLIT  0x81
+
+typedef struct {
+    /* The invisible counters that keep processor state. */
+    uint64_t ClockCycles;
+    uint64_t CpuInstructions;
+    uint64_t IrqEvents;
+    uint64_t NmiEvents;
+    /* The 'latched_...' fields below hold values that are sampled upon a write
+     * to the PERIPHERALS_COUNTER_LATCH address.
+     * One of these will be visible (read only) through an eight-byte aperture.
+     * The purpose of these latched registers is to read 64-bit values one byte
+     * at a time, without having to worry that their content will change along
+     * the way.
+     */
+    uint64_t LatchedClockCycles;
+    uint64_t LatchedCpuInstructions;
+    uint64_t LatchedIrqEvents;
+    uint64_t LatchedNmiEvents;
+    uint64_t LatchedWallclockTime;
+    uint64_t LatchedWallclockTimeSplit;
+    /* Select which of the six latched registers will be visible.
+     * This is a single byte, read/write register, accessible via address
+     * PERIPHERALS_COUNTER_SELECT. If a non-existent latch register is selected,
+     * the PERIPHERALS_COUNTER_VALUE will be zero.
+     */
+    uint8_t LatchedValueSelected;
+} CounterPeripheral;
+
+/* Declarations for the SIMCONTROL peripheral. */
+
+#define PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_CPUMODE   0x0A
+#define PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_TRACEMODE 0x0B
+
+#define PERIPHERALS_SIMCONTROL_CPUMODE   (PERIPHERALS_APERTURE_BASE_ADDRESS + PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_CPUMODE)
+#define PERIPHERALS_SIMCONTROL_TRACEMODE (PERIPHERALS_APERTURE_BASE_ADDRESS + PERIPHERALS_SIMCONTROL_ADDRESS_OFFSET_TRACEMODE)
+
+/* Declare the 'Sim65Peripherals' type and its single instance 'Peripherals'. */
+
+typedef struct {
+    /* State of the peripherals available in sim65. */
+    CounterPeripheral Counter;
+} Sim65Peripherals;
+
+extern Sim65Peripherals Peripherals;
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+void PeripheralsWriteByte (uint8_t Addr, uint8_t Val);
+/* Write a byte to a memory location in the peripheral address aperture. */
+
+
+uint8_t PeripheralsReadByte (uint8_t Addr);
+/* Read a byte from a memory location in the peripheral address aperture. */
+
+
+void PeripheralsInit (void);
+/* Initialize the peripherals. */
+
+
+
+/* End of peripherals.h */
+
+#endif
diff --git a/src/sim65/trace.c b/src/sim65/trace.c
new file mode 100644
index 000000000..ef1edd0bf
--- /dev/null
+++ b/src/sim65/trace.c
@@ -0,0 +1,1157 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                 trace.c                                   */
+/*                                                                           */
+/*             Instruction tracing functionality sim65 6502 simulator        */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2025, Sidney Cadot                                                    */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
+#include "6502.h"
+#include "memory.h"
+#include "trace.h"
+#include "peripherals.h"
+
+/* Current Trace Mode. Tracing is off by default, and needs to be explicitly enabled. */
+uint8_t TraceMode = TRACE_DISABLED;
+
+/* CC65 stack pointer */
+uint8_t StackPointerZPageAddress;
+
+/* 6502, 65C02 addressing modes. */
+typedef enum {
+    ILLEGAL,
+    IMPLIED,
+    ACCUMULATOR,
+    IMMEDIATE,
+    REL,
+    ZP,
+    ZP_X,
+    ZP_Y,
+    ZP_IND,
+    ZP_X_IND,
+    ZP_IND_Y,
+    ZP_REL,
+    ABS,
+    ABS_X,
+    ABS_Y,
+    ABS_IND,
+    ABS_X_IND
+} AddressingMode;
+
+/* Info for a specific opcode and addressing mode, for a specific CPU type. */
+typedef struct {
+    const char * mnemonic;
+    AddressingMode adrmode;
+} InstructionInfo;
+
+/* Information for standard 6502 opcodes. */
+static InstructionInfo II_6502[256] = {
+    { "brk"  , IMPLIED     }, /* 0x00 to 0x0f */
+    { "ora"  , ZP_X_IND    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "ora"  , ZP          },
+    { "asl"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "php"  , IMPLIED     },
+    { "ora"  , IMMEDIATE   },
+    { "asl"  , ACCUMULATOR },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "ora"  , ABS         },
+    { "asl"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "bpl"  , REL         }, /* 0x10 to 0x1f */
+    { "ora"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "ora"  , ZP_X        },
+    { "asl"  , ZP_X        },
+    { "???"  , ILLEGAL     },
+    { "clc"  , IMPLIED     },
+    { "ora"  , ABS_Y       },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "ora"  , ABS_X       },
+    { "asl"  , ABS_X       },
+    { "???"  , ILLEGAL     },
+
+    { "jsr"  , ABS         }, /* 0x20 to 0x2f */
+    { "and"  , ZP_X_IND    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "bit"  , ZP          },
+    { "and"  , ZP          },
+    { "rol"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "plp"  , IMPLIED     },
+    { "and"  , IMMEDIATE   },
+    { "rol"  , ACCUMULATOR },
+    { "???"  , ILLEGAL     },
+    { "bit"  , ABS         },
+    { "and"  , ABS         },
+    { "rol"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "bmi"  , REL         }, /* 0x30 to 0x3f */
+    { "and"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "and"  , ZP_X        },
+    { "rol"  , ZP_X        },
+    { "???"  , ILLEGAL     },
+    { "sec"  , IMPLIED     },
+    { "and"  , ABS_Y       },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "and"  , ABS_X       },
+    { "rol"  , ABS_X       },
+    { "???"  , ILLEGAL     },
+
+    { "rti"  , IMPLIED     }, /* 0x40 to 0x4f */
+    { "eor"  , ZP_X_IND    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "eor"  , ZP          },
+    { "lsr"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "pha"  , IMPLIED     },
+    { "eor"  , IMMEDIATE   },
+    { "lsr"  , ACCUMULATOR },
+    { "???"  , ILLEGAL     },
+    { "jmp"  , ABS         },
+    { "eor"  , ABS         },
+    { "lsr"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "bvc"  , REL         }, /* 0x50 to 0x5f */
+    { "eor"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "eor"  , ZP_X        },
+    { "lsr"  , ZP_X        },
+    { "???"  , ILLEGAL     },
+    { "cli"  , IMPLIED     },
+    { "eor"  , ABS_Y       },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "eor"  , ABS_X       },
+    { "lsr"  , ABS_X       },
+    { "???"  , ILLEGAL     },
+
+    { "rts"  , IMPLIED     }, /* 0x60 to 0x6f */
+    { "adc"  , ZP_X_IND    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "adc"  , ZP          },
+    { "ror"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "pla"  , IMPLIED     },
+    { "adc"  , IMMEDIATE   },
+    { "ror"  , ACCUMULATOR },
+    { "???"  , ILLEGAL     },
+    { "jmp"  , ABS_IND     },
+    { "adc"  , ABS         },
+    { "ror"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "bvs"  , REL         }, /* 0x70 to 0x7f */
+    { "adc"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "adc"  , ZP_X        },
+    { "ror"  , ZP_X        },
+    { "???"  , ILLEGAL     },
+    { "sei"  , IMPLIED     },
+    { "adc"  , ABS_Y       },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "adc"  , ABS_X       },
+    { "ror"  , ABS_X       },
+    { "???"  , ILLEGAL     },
+
+    { "???"  , ILLEGAL     }, /* 0x80 to 0x8f */
+    { "sta"  , ZP_X_IND    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "sty"  , ZP          },
+    { "sta"  , ZP          },
+    { "stx"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "dey"  , IMPLIED     },
+    { "???"  , ILLEGAL     },
+    { "txa"  , IMPLIED     },
+    { "???"  , ILLEGAL     },
+    { "sty"  , ABS         },
+    { "sta"  , ABS         },
+    { "stx"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "bcc"  , REL         }, /* 0x90 to 0x9f */
+    { "sta"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "sty"  , ZP_X        },
+    { "sta"  , ZP_X        },
+    { "stx"  , ZP_Y        },
+    { "???"  , ILLEGAL     },
+    { "tya"  , IMPLIED     },
+    { "sta"  , ABS_Y       },
+    { "txs"  , IMPLIED     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "sta"  , ABS_X       },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+
+    { "ldy"  , IMMEDIATE   }, /* 0xa0 to 0xaf */
+    { "lda"  , ZP_X_IND    },
+    { "ldx"  , IMMEDIATE   },
+    { "???"  , ILLEGAL     },
+    { "ldy"  , ZP          },
+    { "lda"  , ZP          },
+    { "ldx"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "tay"  , IMPLIED     },
+    { "lda"  , IMMEDIATE   },
+    { "tax"  , IMPLIED     },
+    { "???"  , ILLEGAL     },
+    { "ldy"  , ABS         },
+    { "lda"  , ABS         },
+    { "ldx"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "bcs"  , REL         }, /* 0xb0 to 0xbf */
+    { "lda"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "ldy"  , ZP_X        },
+    { "lda"  , ZP_X        },
+    { "ldx"  , ZP_Y        },
+    { "???"  , ILLEGAL     },
+    { "clv"  , IMPLIED     },
+    { "lda"  , ABS_Y       },
+    { "tsx"  , IMPLIED     },
+    { "???"  , ILLEGAL     },
+    { "ldy"  , ABS_X       },
+    { "lda"  , ABS_X       },
+    { "ldx"  , ABS_Y       },
+    { "???"  , ILLEGAL     },
+
+    { "cpy"  , IMMEDIATE   }, /* 0xc0 to 0xcf */
+    { "cmp"  , ZP_X_IND    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "cpy"  , ZP          },
+    { "cmp"  , ZP          },
+    { "dec"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "iny"  , IMPLIED     },
+    { "cmp"  , IMMEDIATE   },
+    { "dex"  , IMPLIED     },
+    { "???"  , ILLEGAL     },
+    { "cpy"  , ABS         },
+    { "cmp"  , ABS         },
+    { "dec"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "bne"  , REL         }, /* 0xd0 to 0xdf */
+    { "cmp"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "cmp"  , ZP_X        },
+    { "dec"  , ZP_X        },
+    { "???"  , ILLEGAL     },
+    { "cld"  , IMPLIED     },
+    { "cmp"  , ABS_Y       },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "cmp"  , ABS_X       },
+    { "dec"  , ABS_X       },
+    { "???"  , ILLEGAL     },
+
+    { "cpx"  , IMMEDIATE   }, /* 0xe0 to 0xef */
+    { "sbc"  , ZP_X_IND    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "cpx"  , ZP          },
+    { "sbc"  , ZP          },
+    { "inc"  , ZP          },
+    { "???"  , ILLEGAL     },
+    { "inx"  , IMPLIED     },
+    { "sbc"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "???"  , ILLEGAL     },
+    { "cpx"  , ABS         },
+    { "sbc"  , ABS         },
+    { "inc"  , ABS         },
+    { "???"  , ILLEGAL     },
+
+    { "beq"  , REL         }, /* 0xf0 to 0xff */
+    { "sbc"  , ZP_IND_Y    },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "sbc"  , ZP_X        },
+    { "inc"  , ZP_X        },
+    { "???"  , ILLEGAL     },
+    { "sed"  , IMPLIED     },
+    { "sbc"  , ABS_Y       },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "???"  , ILLEGAL     },
+    { "sbc"  , ABS_X       },
+    { "inc"  , ABS_X       },
+    { "???"  , ILLEGAL     }
+};
+
+/* Information for 65C02 opcodes. */
+static InstructionInfo II_65C02[256] = {
+    { "brk"  , IMPLIED     }, /* 0x00 to 0x0f */
+    { "ora"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "tsb"  , ZP          },
+    { "ora"  , ZP          },
+    { "asl"  , ZP          },
+    { "rmb0" , ZP          },
+    { "php"  , IMPLIED     },
+    { "ora"  , IMMEDIATE   },
+    { "asl"  , ACCUMULATOR },
+    { "nop"  , IMPLIED     },
+    { "tsb"  , ABS         },
+    { "ora"  , ABS         },
+    { "asl"  , ABS         },
+    { "bbr0" , ZP_REL      },
+
+    { "bpl"  , REL         }, /* 0x10 to 0x1f */
+    { "ora"  , ZP_IND_Y    },
+    { "ora"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "trb"  , ZP          },
+    { "ora"  , ZP_X        },
+    { "asl"  , ZP_X        },
+    { "rmb1" , ZP          },
+    { "clc"  , IMPLIED     },
+    { "ora"  , ABS_Y       },
+    { "inc"  , ACCUMULATOR },
+    { "nop"  , IMPLIED     },
+    { "trb"  , ABS         },
+    { "ora"  , ABS_X       },
+    { "asl"  , ABS_X       },
+    { "bbr1" , ZP_REL      },
+
+    { "jsr"  , ABS         }, /* 0x20 to 0x2f */
+    { "and"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "bit"  , ZP          },
+    { "and"  , ZP          },
+    { "rol"  , ZP          },
+    { "rmb2" , ZP          },
+    { "plp"  , IMPLIED     },
+    { "and"  , IMMEDIATE   },
+    { "rol"  , ACCUMULATOR },
+    { "nop"  , IMPLIED     },
+    { "bit"  , ABS         },
+    { "and"  , ABS         },
+    { "rol"  , ABS         },
+    { "bbr2" , ZP_REL      },
+
+    { "bmi"  , REL         }, /* 0x30 to 0x3f */
+    { "and"  , ZP_IND_Y    },
+    { "and"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "bit"  , ZP_X        },
+    { "and"  , ZP_X        },
+    { "rol"  , ZP_X        },
+    { "rmb3" , ZP          },
+    { "sec"  , IMPLIED     },
+    { "and"  , ABS_Y       },
+    { "dec"  , ACCUMULATOR },
+    { "nop"  , IMPLIED     },
+    { "bit"  , ABS_X       },
+    { "and"  , ABS_X       },
+    { "rol"  , ABS_X       },
+    { "bbr3" , ZP_REL      },
+
+    { "rti"  , IMPLIED     }, /* 0x40 to 0x4f */
+    { "eor"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "nop"  , ILLEGAL     },
+    { "nop"  , ZP          },
+    { "eor"  , ZP          },
+    { "lsr"  , ZP          },
+    { "rmb4" , ZP          },
+    { "pha"  , IMPLIED     },
+    { "eor"  , IMMEDIATE   },
+    { "lsr"  , ACCUMULATOR },
+    { "nop"  , IMPLIED     },
+    { "jmp"  , ABS         },
+    { "eor"  , ABS         },
+    { "lsr"  , ABS         },
+    { "bbr4" , ZP_REL      },
+
+    { "bvc"  , REL         }, /* 0x50 to 0x5f */
+    { "eor"  , ZP_IND_Y    },
+    { "eor"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "nop"  , ZP_X        },
+    { "eor"  , ZP_X        },
+    { "lsr"  , ZP_X        },
+    { "rmb5" , ZP          },
+    { "cli"  , IMPLIED     },
+    { "eor"  , ABS_Y       },
+    { "phy"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "nop"  , ABS         },
+    { "eor"  , ABS_X       },
+    { "lsr"  , ABS_X       },
+    { "bbr5" , ZP_REL      },
+
+    { "rts"  , IMPLIED     }, /* 0x60 to 0x6f */
+    { "adc"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "stz"  , ZP          },
+    { "adc"  , ZP          },
+    { "ror"  , ZP          },
+    { "rmb6" , ZP          },
+    { "pla"  , IMPLIED     },
+    { "adc"  , IMMEDIATE   },
+    { "ror"  , ACCUMULATOR },
+    { "nop"  , IMPLIED     },
+    { "jmp"  , ABS_IND     },
+    { "adc"  , ABS         },
+    { "ror"  , ABS         },
+    { "bbr6" , ZP_REL      },
+
+    { "bvs"  , REL         }, /* 0x70 to 0x7f */
+    { "adc"  , ZP_IND_Y    },
+    { "adc"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "stz"  , ZP_X        },
+    { "adc"  , ZP_X        },
+    { "ror"  , ZP_X        },
+    { "rmb7" , ZP          },
+    { "sei"  , IMPLIED     },
+    { "adc"  , ABS_Y       },
+    { "ply"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "jmp"  , ABS_X_IND   },
+    { "adc"  , ABS_X       },
+    { "ror"  , ABS_X       },
+    { "bbr7" , ZP_REL      },
+
+    { "bra"  , REL         }, /* 0x80 to 0x8f */
+    { "sta"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "sty"  , ZP          },
+    { "sta"  , ZP          },
+    { "stx"  , ZP          },
+    { "smb0" , ZP          },
+    { "dey"  , IMPLIED     },
+    { "bit"  , IMMEDIATE   },
+    { "txa"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "sty"  , ABS         },
+    { "sta"  , ABS         },
+    { "stx"  , ABS         },
+    { "bbs0" , ZP_REL      },
+
+    { "bcc"  , REL         }, /* 0x90 to 0x9f */
+    { "sta"  , ZP_IND_Y    },
+    { "sta"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "sty"  , ZP_X        },
+    { "sta"  , ZP_X        },
+    { "stx"  , ZP_Y        },
+    { "smb1" , ZP          },
+    { "tya"  , IMPLIED     },
+    { "sta"  , ABS_Y       },
+    { "txs"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "stz"  , ABS         },
+    { "sta"  , ABS_X       },
+    { "stz"  , ABS_X       },
+    { "bbs1" , ZP_REL      },
+
+    { "ldy"  , IMMEDIATE   }, /* 0xa0 to 0xaf */
+    { "lda"  , ZP_X_IND    },
+    { "ldx"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "ldy"  , ZP          },
+    { "lda"  , ZP          },
+    { "ldx"  , ZP          },
+    { "smb2" , ZP          },
+    { "tay"  , IMPLIED     },
+    { "lda"  , IMMEDIATE   },
+    { "tax"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "ldy"  , ABS         },
+    { "lda"  , ABS         },
+    { "ldx"  , ABS         },
+    { "bbs2" , ZP_REL      },
+
+    { "bcs"  , REL         }, /* 0xb0 to 0xbf */
+    { "lda"  , ZP_IND_Y    },
+    { "lda"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "ldy"  , ZP_X        },
+    { "lda"  , ZP_X        },
+    { "ldx"  , ZP_Y        },
+    { "smb3" , ZP          },
+    { "clv"  , IMPLIED     },
+    { "lda"  , ABS_Y       },
+    { "tsx"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "ldy"  , ABS_X       },
+    { "lda"  , ABS_X       },
+    { "ldx"  , ABS_Y       },
+    { "bbs3" , ZP_REL      },
+
+    { "cpy"  , IMMEDIATE   }, /* 0xc0 to 0xcf */
+    { "cmp"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "cpy"  , ZP          },
+    { "cmp"  , ZP          },
+    { "dec"  , ZP          },
+    { "smb4" , ZP          },
+    { "iny"  , IMPLIED     },
+    { "cmp"  , IMMEDIATE   },
+    { "dex"  , IMPLIED     },
+    { "wai"  , IMPLIED     },
+    { "cpy"  , ABS         },
+    { "cmp"  , ABS         },
+    { "dec"  , ABS         },
+    { "bbs4" , ZP_REL      },
+
+    { "bne"  , REL         }, /* 0xd0 to 0xdf */
+    { "cmp"  , ZP_IND_Y    },
+    { "cmp"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "nop"  , ZP_X        },
+    { "cmp"  , ZP_X        },
+    { "dec"  , ZP_X        },
+    { "smb5" , ZP          },
+    { "cld"  , IMPLIED     },
+    { "cmp"  , ABS_Y       },
+    { "phx"  , IMPLIED     },
+    { "stp"  , IMPLIED     },
+    { "nop"  , ABS         },
+    { "cmp"  , ABS_X       },
+    { "dec"  , ABS_X       },
+    { "bbs5" , ZP_REL      },
+
+    { "cpx"  , IMMEDIATE   }, /* 0xe0 to 0xef */
+    { "sbc"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "cpx"  , ZP          },
+    { "sbc"  , ZP          },
+    { "inc"  , ZP          },
+    { "smb6" , ZP          },
+    { "inx"  , IMPLIED     },
+    { "sbc"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "cpx"  , ABS         },
+    { "sbc"  , ABS         },
+    { "inc"  , ABS         },
+    { "bbs6" , ZP_REL      },
+
+    { "beq"  , REL         }, /* 0xf0 to 0xff */
+    { "sbc"  , ZP_IND_Y    },
+    { "sbc"  , ZP_IND      },
+    { "nop"  , IMPLIED     },
+    { "nop"  , ZP_X        },
+    { "sbc"  , ZP_X        },
+    { "inc"  , ZP_X        },
+    { "smb7" , ZP          },
+    { "sed"  , IMPLIED     },
+    { "sbc"  , ABS_Y       },
+    { "plx"  , IMPLIED     },
+    { "nop"  , IMPLIED     },
+    { "nop"  , ABS         },
+    { "sbc"  , ABS_X       },
+    { "inc"  , ABS_X       },
+    { "bbs7" , ZP_REL      }
+};
+
+/* Information for 6502X (6502 with undocumented instructions) opcodes. */
+static InstructionInfo II_6502X[256] = {
+    { "brk"  , IMPLIED     }, /* 0x00 to 0x0f */
+    { "ora"  , ZP_X_IND    },
+    { "jam"  , IMPLIED     },
+    { "slo"  , ZP_X_IND    },
+    { "nop"  , ZP          },
+    { "ora"  , ZP          },
+    { "asl"  , ZP          },
+    { "slo"  , ZP          },
+    { "php"  , IMPLIED     },
+    { "ora"  , IMMEDIATE   },
+    { "asl"  , ACCUMULATOR },
+    { "anc"  , IMMEDIATE   },
+    { "nop"  , ABS         },
+    { "ora"  , ABS         },
+    { "asl"  , ABS         },
+    { "slo"  , ABS         },
+
+    { "bpl"  , REL         }, /* 0x10 to 0x1f */
+    { "ora"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "slo"  , ZP_IND_Y    },
+    { "nop"  , ZP_X        },
+    { "ora"  , ZP_X        },
+    { "asl"  , ZP_X        },
+    { "slo"  , ZP          },
+    { "clc"  , IMPLIED     },
+    { "ora"  , ABS_Y       },
+    { "nop"  , IMPLIED     },
+    { "slo"  , ABS_Y       },
+    { "*nop" , ABS_X       },
+    { "ora"  , ABS_X       },
+    { "asl"  , ABS_X       },
+    { "slo"  , ABS_X       },
+
+    { "jsr"  , ABS         }, /* 0x20 to 0x2f */
+    { "and"  , ZP_X_IND    },
+    { "jam"  , IMPLIED     },
+    { "rla"  , ZP_X_IND    },
+    { "bit"  , ZP          },
+    { "and"  , ZP          },
+    { "rol"  , ZP          },
+    { "rla"  , ZP          },
+    { "plp"  , IMPLIED     },
+    { "and"  , IMMEDIATE   },
+    { "rol"  , ACCUMULATOR },
+    { "anc"  , IMMEDIATE   },
+    { "bit"  , ABS         },
+    { "and"  , ABS         },
+    { "rol"  , ABS         },
+    { "rla"  , ABS         },
+
+    { "bmi"  , REL         }, /* 0x30 to 0x3f */
+    { "and"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "rla"  , ZP_IND_Y    },
+    { "nop"  , ZP_X        },
+    { "and"  , ZP_X        },
+    { "rol"  , ZP_X        },
+    { "rla"  , ZP_X        },
+    { "sec"  , IMPLIED     },
+    { "and"  , ABS_Y       },
+    { "nop"  , IMPLIED     },
+    { "rla"  , ABS_Y       },
+    { "nop"  , ABS_X       },
+    { "and"  , ABS_X       },
+    { "rol"  , ABS_X       },
+    { "rla"  , ABS_X       },
+
+    { "rti"  , IMPLIED     }, /* 0x40 to 0x4f */
+    { "eor"  , ZP_X_IND    },
+    { "jam"  , IMPLIED     },
+    { "sre"  , ZP_X_IND    },
+    { "nop"  , ZP          },
+    { "eor"  , ZP          },
+    { "lsr"  , ZP          },
+    { "sre"  , ZP          },
+    { "pha"  , IMPLIED     },
+    { "eor"  , IMMEDIATE   },
+    { "lsr"  , ACCUMULATOR },
+    { "alr"  , IMMEDIATE   },
+    { "jmp"  , ABS         },
+    { "eor"  , ABS         },
+    { "lsr"  , ABS         },
+    { "sre"  , ABS         },
+
+    { "bvc"  , REL         }, /* 0x50 to 0x5f */
+    { "eor"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "sre"  , ZP_IND_Y    },
+    { "nop"  , ZP_X        },
+    { "eor"  , ZP_X        },
+    { "lsr"  , ZP_X        },
+    { "sre"  , ZP_X        },
+    { "cli"  , IMPLIED     },
+    { "eor"  , ABS_Y       },
+    { "nop"  , IMPLIED     },
+    { "sre"  , ABS_Y       },
+    { "nop"  , ABS_X       },
+    { "eor"  , ABS_X       },
+    { "lsr"  , ABS_X       },
+    { "sre"  , ABS_X       },
+
+    { "rts"  , IMPLIED     }, /* 0x60 to 0x6f */
+    { "adc"  , ZP_X_IND    },
+    { "jam"  , IMPLIED     },
+    { "rra"  , ZP_X_IND    },
+    { "nop"  , ZP          },
+    { "adc"  , ZP          },
+    { "ror"  , ZP          },
+    { "rra"  , ZP          },
+    { "pla"  , IMPLIED     },
+    { "adc"  , IMMEDIATE   },
+    { "ror"  , ACCUMULATOR },
+    { "arr"  , IMMEDIATE   },
+    { "jmp"  , ABS_IND     },
+    { "adc"  , ABS         },
+    { "ror"  , ABS         },
+    { "rra"  , ABS         },
+
+    { "bvs"  , REL         }, /* 0x70 to 0x7f */
+    { "adc"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "sre"  , ZP_IND_Y    },
+    { "nop"  , ZP_X        },
+    { "adc"  , ZP_X        },
+    { "ror"  , ZP_X        },
+    { "rra"  , ZP_X        },
+    { "sei"  , IMPLIED     },
+    { "adc"  , ABS_Y       },
+    { "nop"  , IMPLIED     },
+    { "rra"  , ABS_Y       },
+    { "nop"  , ABS_X       },
+    { "adc"  , ABS_X       },
+    { "ror"  , ABS_X       },
+    { "rra"  , ABS_X       },
+
+    { "nop"  , IMMEDIATE   }, /* 0x80 to 0x8f */
+    { "sta"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "sax"  , ZP_X_IND    },
+    { "sty"  , ZP          },
+    { "sta"  , ZP          },
+    { "stx"  , ZP          },
+    { "sax"  , ZP          },
+    { "dey"  , IMPLIED     },
+    { "nop"  , IMMEDIATE   },
+    { "txa"  , IMPLIED     },
+    { "ane"  , IMMEDIATE   },
+    { "sty"  , ABS         },
+    { "sta"  , ABS         },
+    { "stx"  , ABS         },
+    { "sax"  , ABS         },
+
+    { "bcc"  , REL         }, /* 0x90 to 0x9f */
+    { "sta"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "sha"  , ZP_IND_Y    },
+    { "sty"  , ZP_X        },
+    { "sta"  , ZP_X        },
+    { "stx"  , ZP_Y        },
+    { "sax"  , ZP_Y        },
+    { "tya"  , IMPLIED     },
+    { "sta"  , ABS_Y       },
+    { "txs"  , IMPLIED     },
+    { "tas"  , ABS_Y       },
+    { "shy"  , ABS_X       },
+    { "sta"  , ABS_X       },
+    { "shx"  , ABS_Y       },
+    { "sha"  , ABS_Y       },
+
+    { "ldy"  , IMMEDIATE   }, /* 0xa0 to 0xaf */
+    { "lda"  , ZP_X_IND    },
+    { "ldx"  , IMMEDIATE   },
+    { "lax"  , ZP_X_IND    },
+    { "ldy"  , ZP          },
+    { "lda"  , ZP          },
+    { "ldx"  , ZP          },
+    { "lax"  , ZP          },
+    { "tay"  , IMPLIED     },
+    { "lda"  , IMMEDIATE   },
+    { "tax"  , IMPLIED     },
+    { "lax"  , IMMEDIATE   },
+    { "ldy"  , ABS         },
+    { "lda"  , ABS         },
+    { "ldx"  , ABS         },
+    { "lax"  , ABS         },
+
+    { "bcs"  , REL         }, /* 0xb0 to 0xbf */
+    { "lda"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "lax"  , ZP_IND_Y    },
+    { "ldy"  , ZP_X        },
+    { "lda"  , ZP_X        },
+    { "ldx"  , ZP_Y        },
+    { "lax"  , ZP_Y        },
+    { "clv"  , IMPLIED     },
+    { "lda"  , ABS_Y       },
+    { "tsx"  , IMPLIED     },
+    { "las"  , ABS_Y       },
+    { "ldy"  , ABS_X       },
+    { "lda"  , ABS_X       },
+    { "ldx"  , ABS_Y       },
+    { "lax"  , ABS_Y       },
+
+    { "cpy"  , IMMEDIATE   }, /* 0xc0 to 0xcf */
+    { "cmp"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "dcp"  , ZP_X_IND    },
+    { "cpy"  , ZP          },
+    { "cmp"  , ZP          },
+    { "dec"  , ZP          },
+    { "dcp"  , ZP          },
+    { "iny"  , IMPLIED     },
+    { "cmp"  , IMMEDIATE   },
+    { "dex"  , IMPLIED     },
+    { "sbx"  , IMMEDIATE   },
+    { "cpy"  , ABS         },
+    { "cmp"  , ABS         },
+    { "dec"  , ABS         },
+    { "dcp"  , ABS         },
+
+    { "bne"  , REL         }, /* 0xd0 to 0xdf */
+    { "cmp"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "dcp"  , ZP_IND_Y    },
+    { "nop"  , ZP_X        },
+    { "cmp"  , ZP_X        },
+    { "dec"  , ZP_X        },
+    { "dcp"  , ZP_X        },
+    { "cld"  , IMPLIED     },
+    { "cmp"  , ABS_Y       },
+    { "nop"  , IMPLIED     },
+    { "dcp"  , ABS_Y       },
+    { "nop"  , ABS_X       },
+    { "cmp"  , ABS_X       },
+    { "dec"  , ABS_X       },
+    { "dcp"  , ABS_X       },
+
+    { "cpx"  , IMMEDIATE   }, /* 0xe0 to 0xef */
+    { "sbc"  , ZP_X_IND    },
+    { "nop"  , IMMEDIATE   },
+    { "isc"  , ZP_X_IND    },
+    { "cpx"  , ZP          },
+    { "sbc"  , ZP          },
+    { "inc"  , ZP          },
+    { "isc"  , ZP          },
+    { "inx"  , IMPLIED     },
+    { "sbc"  , IMMEDIATE   },
+    { "nop"  , IMPLIED     },
+    { "sbc"  , IMMEDIATE   },
+    { "cpx"  , ABS         },
+    { "sbc"  , ABS         },
+    { "inc"  , ABS         },
+    { "isc"  , ABS         },
+
+    { "beq"  , REL         }, /* 0xf0 to 0xff */
+    { "sbc"  , ZP_IND_Y    },
+    { "jam"  , IMPLIED     },
+    { "isc"  , ZP_IND_Y    },
+    { "nop"  , ZP_X        },
+    { "sbc"  , ZP_X        },
+    { "inc"  , ZP_X        },
+    { "isc"  , ZP_X        },
+    { "sed"  , IMPLIED     },
+    { "sbc"  , ABS_Y       },
+    { "nop"  , IMPLIED     },
+    { "isc"  , ABS_Y       },
+    { "nop"  , ABS_X       },
+    { "sbc"  , ABS_X       },
+    { "inc"  , ABS_X       },
+    { "isc"  , ABS_X       }
+};
+
+static InstructionInfo * II[3] = { II_6502, II_65C02, II_6502X };
+
+static unsigned GetInstructionLength (uint8_t opcode)
+/* Get the number of bytes in the full instruction. Depends on the addressing mode. */
+{
+    switch (II[CPU][opcode].adrmode) {
+        case ILLEGAL:
+        case IMPLIED:
+        case ACCUMULATOR:
+            return 1;
+        case IMMEDIATE:
+        case REL:
+        case ZP:
+        case ZP_X:
+        case ZP_Y:
+        case ZP_IND:
+        case ZP_X_IND:
+        case ZP_IND_Y:
+            return 2;
+        case ZP_REL:
+        case ABS:
+        case ABS_X:
+        case ABS_Y:
+        case ABS_IND:
+        case ABS_X_IND:
+            return 3;
+    }
+
+    /* We should never get here. */
+    return -1;
+}
+
+
+
+static char * PrintAssemblyInstruction (char * ptr)
+/* Print assembly instruction: mnemonic and addres-mode specific operand(s). */
+{
+    uint8_t opcode;
+
+    /* Print the instruction starting at the current program counter. */
+
+    opcode = MemReadByte (Regs.PC);
+
+    ptr += sprintf (ptr, "%-4s ", II[CPU][opcode].mnemonic);
+
+    switch (II[CPU][opcode].adrmode) {
+        case IMPLIED:
+        case ILLEGAL:
+            break;
+        case ACCUMULATOR:
+            ptr += sprintf (ptr, "A");
+            break;
+        case IMMEDIATE:
+            ptr += sprintf (ptr, "#$%02X", MemReadByte (Regs.PC + 1));
+            break;
+        case REL:
+            ptr += sprintf (ptr, "$%04X", Regs.PC + 2 + (int8_t)MemReadByte (Regs.PC + 1));
+            break;
+        case ZP:
+            ptr += sprintf (ptr, "$%02X", MemReadByte (Regs.PC + 1));
+            break;
+        case ZP_X:
+            ptr += sprintf (ptr, "$%02X,X", MemReadByte (Regs.PC + 1));
+            break;
+        case ZP_Y:
+            ptr += sprintf (ptr, "$%02X,Y", MemReadByte (Regs.PC + 1));
+            break;
+        case ZP_IND:
+            ptr += sprintf (ptr, "($%02X)", MemReadByte (Regs.PC + 1));
+            break;
+        case ZP_X_IND:
+            ptr += sprintf (ptr, "($%02X,X)", MemReadByte (Regs.PC + 1));
+            break;
+        case ZP_IND_Y:
+            ptr += sprintf (ptr, "($%02X),Y", MemReadByte (Regs.PC + 1));
+            break;
+        case ZP_REL:
+            ptr += sprintf (ptr, "$%02X,$%04X", MemReadByte (Regs.PC + 1), Regs.PC + 3 + (int8_t)MemReadByte (Regs.PC + 2));
+            break;
+        case ABS:
+            ptr += sprintf (ptr, "$%04X", MemReadWord (Regs.PC + 1));
+            break;
+        case ABS_IND:
+            ptr += sprintf (ptr, "($%04X)", MemReadWord (Regs.PC + 1));
+            break;
+        case ABS_X:
+            ptr += sprintf (ptr, "$%04X,X", MemReadWord (Regs.PC + 1));
+            break;
+        case ABS_X_IND:
+            ptr += sprintf (ptr, "($%04X,X)", MemReadWord (Regs.PC + 1));
+            break;
+        case ABS_Y:
+            ptr += sprintf (ptr, "$%04X,Y", MemReadWord (Regs.PC + 1));
+            break;
+    }
+
+    return ptr;
+}
+
+
+
+static void PrintTraceInstructionOrInterrupt (const char * InterruptType)
+{
+    char traceline[200];
+    char * traceline_ptr = traceline;
+    uint8_t opcode;
+    unsigned k, num_bytes;
+
+    if (TraceMode & TRACE_FIELD_INSTR_COUNTER) {
+
+        if (traceline_ptr != traceline) {
+            /* Print field separator. */
+            traceline_ptr += sprintf (traceline_ptr, "  ");
+        }
+
+        traceline_ptr += sprintf (traceline_ptr, "%12" PRIu64, Peripherals.Counter.CpuInstructions);
+    }
+
+    if (TraceMode & TRACE_FIELD_CLOCK_COUNTER) {
+
+        if (traceline_ptr != traceline) {
+            /* Print field separator. */
+            traceline_ptr += sprintf (traceline_ptr, "  ");
+        }
+
+        traceline_ptr += sprintf (traceline_ptr, "%12" PRIu64, Peripherals.Counter.ClockCycles);
+    }
+
+    if (TraceMode & TRACE_FIELD_PC) {
+
+        if (traceline_ptr != traceline) {
+            /* Print field separator. */
+            traceline_ptr += sprintf (traceline_ptr, "  ");
+        }
+
+        traceline_ptr += sprintf (traceline_ptr, "%04X", Regs.PC);
+    }
+
+    if (TraceMode & TRACE_FIELD_INSTR_BYTES) {
+
+        if (traceline_ptr != traceline) {
+            /* Print field separator. */
+            traceline_ptr += sprintf (traceline_ptr, "  ");
+        }
+
+        if (InterruptType == NULL)
+        {
+            /* Get the opcode */
+            opcode = MemReadByte (Regs.PC);
+
+            /* How many bytes are in the full instruction? 1, 2 or 3. */
+            num_bytes = GetInstructionLength (opcode);
+        } else {
+            num_bytes = 0; /* Consider interrupts as instructions that are inserted into the instruction stream. */
+        }
+
+        /* Print 0 to 3 bytes for the interrupt/instruction. */
+        for (k = 0; k < 3; ++k) {
+            if (k != 0) {
+                *traceline_ptr++ = ' ';
+            }
+            if (k < num_bytes) {
+                traceline_ptr += sprintf (traceline_ptr, "%02X", MemReadByte (Regs.PC + k));
+            } else {
+                traceline_ptr += sprintf (traceline_ptr, "  ");
+            }
+        }
+    }
+
+    if (TraceMode & TRACE_FIELD_INSTR_ASSEMBLY) {
+
+        if (traceline_ptr != traceline) {
+            /* Print field separator. */
+            traceline_ptr += sprintf (traceline_ptr, "  ");
+        }
+
+        char * save_ptr = traceline_ptr;
+
+        if (InterruptType == NULL) {
+            traceline_ptr = PrintAssemblyInstruction (traceline_ptr);
+        } else {
+            /* Print interrupt message. */
+            traceline_ptr += sprintf (traceline_ptr, "*** %s ***", InterruptType);
+        }
+
+        /* Fill out the field to 16 characters */
+        num_bytes = (unsigned)(traceline_ptr - save_ptr);
+        if (num_bytes < 16) {
+            traceline_ptr += sprintf (traceline_ptr, "%*s", 16 - num_bytes, "");
+        }
+    }
+
+    if (TraceMode & TRACE_FIELD_CPU_REGISTERS) {
+
+        if (traceline_ptr != traceline) {
+            /* Print field separator. */
+            traceline_ptr += sprintf (traceline_ptr, "  ");
+        }
+
+        traceline_ptr += sprintf (traceline_ptr,
+            "A=%02X X=%02X Y=%02X S=%02X Flags=%c%c%c%c%c%c",
+            Regs.AC,
+            Regs.XR,
+            Regs.YR,
+            Regs.SP,
+            (Regs.SR & SF) ? 'N' : 'n',
+            (Regs.SR & OF) ? 'V' : 'v',
+            (Regs.SR & DF) ? 'D' : 'd',
+            (Regs.SR & IF) ? 'I' : 'i',
+            (Regs.SR & ZF) ? 'Z' : 'z',
+            (Regs.SR & CF) ? 'C' : 'c'
+        );
+    }
+
+    if (TraceMode & TRACE_FIELD_CC65_SP) {
+
+        if (traceline_ptr != traceline) {
+            /* Print field separator. */
+            traceline_ptr += sprintf (traceline_ptr, "  ");
+        }
+
+        traceline_ptr += sprintf (traceline_ptr,
+            "  SP=%04X",
+            MemReadZPWord (StackPointerZPageAddress)
+        );
+    }
+
+    if (traceline_ptr != traceline) {
+        puts (traceline);
+    }
+}
+
+
+
+void TraceInit (uint8_t SPAddr)
+{
+    StackPointerZPageAddress = SPAddr;
+}
+
+
+
+void PrintTraceNMI (void)
+{
+    PrintTraceInstructionOrInterrupt("NMI");
+}
+
+
+
+void PrintTraceIRQ (void)
+{
+    PrintTraceInstructionOrInterrupt("IRQ");
+}
+
+
+
+void PrintTraceInstruction (void)
+{
+    PrintTraceInstructionOrInterrupt(NULL);
+}
diff --git a/src/sim65/trace.h b/src/sim65/trace.h
new file mode 100644
index 000000000..f982460d2
--- /dev/null
+++ b/src/sim65/trace.h
@@ -0,0 +1,89 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                 trace.h                                   */
+/*                                                                           */
+/*             Instruction tracing functionality sim65 6502 simulator        */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2025, Sidney Cadot                                                    */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+#ifndef TRACE_H
+#define TRACE_H
+
+
+#include <stdint.h>
+
+
+#include "6502.h"
+
+/* The trace mode is a bitfield that determines how trace lines are displayed.
+ *
+ * The value zero indicates that tracing is disabled (the default).
+ *
+ * In case TraceMode is not equal to zero, the value is interpreted as a bitfield:
+ *
+ * Bit    Bit value     Enables
+ * ---    -----------   -------------------------------
+ *  6      0x40 ( 64)   Print the instruction counter.
+ *  5      0x20 ( 32)   Print the clock cycle counter.
+ *  4      0x10 ( 16)   Print the PC (program counter).
+ *  3      0x08 (  8)   Print the instruction bytes.
+ *  2      0x04 (  4)   Print the instruction assembly.
+ *  1      0x02 (  2)   Print the CPU registers.
+ *  0      0x01 (  1)   Print the CC65 stack pointer.
+ *
+ */
+
+#define TRACE_FIELD_INSTR_COUNTER   0x40
+#define TRACE_FIELD_CLOCK_COUNTER   0x20
+#define TRACE_FIELD_PC              0x10
+#define TRACE_FIELD_INSTR_BYTES     0x08
+#define TRACE_FIELD_INSTR_ASSEMBLY  0x04
+#define TRACE_FIELD_CPU_REGISTERS   0x02
+#define TRACE_FIELD_CC65_SP         0x01
+
+#define TRACE_DISABLED              0x00
+#define TRACE_ENABLE_FULL           0x7f
+
+/* Currently active tracing mode. */
+extern uint8_t TraceMode;
+
+void TraceInit (uint8_t SPAddr);
+/* Initialize the trace subsystem. */
+
+void PrintTraceNMI(void);
+/* Print trace line for an NMI interrupt. */
+
+void PrintTraceIRQ(void);
+/* Print trace line for an IRQ interrupt. */
+
+void PrintTraceInstruction (void);
+/* Print trace line for the instruction at the currrent program counter. */
+
+
+
+/* End of trace.h */
+
+#endif
diff --git a/src/sp65.vcxproj b/src/sp65.vcxproj
index a9f0919a3..21816ee2b 100644
--- a/src/sp65.vcxproj
+++ b/src/sp65.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4388D1AF-C7EA-4AD4-8E80-CA1FB7BF76BF}</ProjectGuid>
@@ -21,15 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -40,6 +55,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -48,6 +72,15 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="sp65\asm.c" />
     <ClCompile Include="sp65\attr.c" />
@@ -99,4 +132,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/sp65/convert.c b/src/sp65/convert.c
index a9047ffb0..3ffdbab7d 100644
--- a/src/sp65/convert.c
+++ b/src/sp65/convert.c
@@ -61,14 +61,17 @@ struct ConverterMapEntry {
     StrBuf*             (*ConvertFunc) (const Bitmap*, const Collection*);
 };
 
-/* Converter table, alphabetically sorted */
+/* Converter table */
+/* CAUTION: table must be alphabetically sorted for bsearch */
 static const ConverterMapEntry ConverterMap[] = {
+/* BEGIN SORTED.SH */
     {   "geos-bitmap",          GenGeosBitmap   },
     {   "geos-icon",            GenGeosIcon     },
     {   "koala",                GenKoala        },
     {   "lynx-sprite",          GenLynxSprite   },
     {   "raw",                  GenRaw          },
     {   "vic2-sprite",          GenVic2Sprite   },
+/* END SORTED.SH */
 };
 
 
diff --git a/src/sp65/input.c b/src/sp65/input.c
index f1df247ae..ac3aeaf99 100644
--- a/src/sp65/input.c
+++ b/src/sp65/input.c
@@ -69,12 +69,14 @@ static InputFormatDesc InputFormatTable[ifCount] = {
     {   ReadPCXFile     },
 };
 
-/* Table that maps extensions to input formats. Must be sorted alphabetically */
+/* Table that maps extensions to input formats. */
+/* CAUTION: table must be alphabetically sorted for bsearch */
 static const FileId FormatTable[] = {
     /* Upper case stuff for obsolete operating systems */
+/* BEGIN SORTED.SH */
     {   "PCX",  ifPCX           },
-
     {   "pcx",  ifPCX           },
+/* END SORTED.SH */
 };
 
 
diff --git a/src/sp65/output.c b/src/sp65/output.c
index c12d1f612..0c8fa59a7 100644
--- a/src/sp65/output.c
+++ b/src/sp65/output.c
@@ -78,22 +78,24 @@ static OutputFormatDesc OutputFormatTable[ofCount] = {
     {   WriteCFile      },
 };
 
-/* Table that maps extensions to Output formats. Must be sorted alphabetically */
+/* Table that maps extensions to Output formats. */
+/* CAUTION: table must be alphabetically sorted for bsearch */
 static const FileId FormatTable[] = {
     /* Upper case stuff for obsolete operating systems */
+/* BEGIN SORTED.SH */
     {   "A",    ofAsm           },
     {   "ASM",  ofAsm           },
     {   "BIN",  ofBin           },
     {   "C",    ofC             },
     {   "INC",  ofAsm           },
     {   "S",    ofAsm           },
-
     {   "a",    ofAsm           },
     {   "asm",  ofAsm           },
     {   "bin",  ofBin           },
     {   "c",    ofC             },
     {   "inc",  ofAsm           },
     {   "s",    ofAsm           },
+/* END SORTED.SH */
 };
 
 
diff --git a/src/sp65/palconv.c b/src/sp65/palconv.c
index e92f3c22e..42adb1b33 100644
--- a/src/sp65/palconv.c
+++ b/src/sp65/palconv.c
@@ -56,9 +56,12 @@ struct PaletteMapEntry {
     StrBuf*             (*PaletteFunc) (const Bitmap*, const Collection*);
 };
 
-/* Converter table, alphabetically sorted */
+/* Converter table */
+/* CAUTION: table must be alphabetically sorted for bsearch */
 static const PaletteMapEntry PaletteMap[] = {
+/* BEGIN SORTED.SH */
     {   "lynx-palette",         GenLynxPalette  },
+/* END SORTED.SH */
 };
 
 
diff --git a/targettest/Makefile b/targettest/Makefile
index 4d989d0df..2b9732c67 100644
--- a/targettest/Makefile
+++ b/targettest/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 #
 # Makefile for cc65 testcode
 #
@@ -41,6 +47,19 @@ else
   LD := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+ifndef CMD_EXE
+  CATERR = 2> $$@.errlog || (cat $$@.errlog && false)
+endif
+endif
+
 ifneq ($(filter disk testcode.%,$(MAKECMDGOALS)),)
   ifdef CC65_HOME
     TARGET_PATH = $(CC65_HOME)/target
@@ -114,11 +133,13 @@ DISK_atarixl   = testcode.atr
 %: %.s
 
 .c.o:
-	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $<
-	$(AS) $(<:.c=.s)
+	$(if $(QUIET),echo $(SYS):$*.c)
+	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $< $(CATERR)
+	$(AS) $(<:.c=.s) $(CATERR)
 
 .s.o:
-	$(AS) $(ASFLAGS) -t $(SYS) $<
+	$(if $(QUIET),echo $(SYS):$*.s)
+	$(AS) $(ASFLAGS) -t $(SYS) $< $(CATERR)
 
 .PRECIOUS: %.o
 
@@ -540,12 +561,13 @@ EXELIST_sym1 = \
 	strnlen \
 	strqtok-test
 
-# omitted: clock-test cpeek-test conio deb dir-test em-test exec-test1 exec-test2
+# omitted: clock-test cpeek-test deb dir-test em-test exec-test1 exec-test2
 # fileio-test ft mouse-test posixio-test rename-test seek ser-test
 EXELIST_atmos = \
 	minimal \
 	arg-test \
 	clock \
+	conio \
 	cprintf \
 	cursor \
 	div-test \
@@ -601,6 +623,64 @@ EXELIST_cx16 = \
 	strqtok-test \
 	uname-test
 
+# omitted: deb em-test joy-test mouse-test ser-test seek
+EXELIST_c65 = \
+    arg-test \
+    clock \
+    clock-test \
+    conio \
+    cpeek-test \
+    cprintf \
+    cursor \
+    dir-test \
+    div-test \
+    exec-test1 \
+    exec-test2 \
+    fileio-test \
+    ft \
+    getopt-test \
+    heaptest \
+    moddiv-test \
+    mul-test \
+    posixio-test \
+    rename-test \
+    scanf-test \
+    strdup-test \
+    strnlen \
+    stroserror-test \
+    strqtok-test \
+    uname-test \
+    minimal
+
+# omitted: deb em-test joy-test mouse-test ser-test seek
+EXELIST_mega65 = \
+    arg-test \
+    clock \
+    clock-test \
+    conio \
+    cpeek-test \
+    cprintf \
+    cursor \
+    dir-test \
+    div-test \
+    exec-test1 \
+    exec-test2 \
+    fileio-test \
+    ft \
+    getopt-test \
+    heaptest \
+    moddiv-test \
+    mul-test \
+    posixio-test \
+    rename-test \
+    scanf-test \
+    strdup-test \
+    strnlen \
+    stroserror-test \
+    strqtok-test \
+    uname-test \
+    minimal
+
 # omitted: arg-test clock-test clock cpeek-test cprintf cursor deb dir-test div-test
 # em-test exec-test1 exec-test2 fileio-test ft getopt-test heaptest joy-test moddiv-test
 # mouse-test mul-test posixio-test rename-test scanf-test seek ser-test strdup-test
@@ -623,6 +703,7 @@ EXELIST_pce = \
 # stroserror-test strqtok-test uname-test
 EXELIST_osic1p = \
 	minimal \
+	conio \
 	cursor \
 	mul-test
 
@@ -713,7 +794,7 @@ endif
 
 define SUBDIR_recipe
 
-@+$(MAKE) -C $(dir) --no-print-directory $@
+@+$(MAKE) -C $(dir) $(PD) $@ $(PQ)
 
 endef # SUBDIR_recipe
 
@@ -748,6 +829,7 @@ TARGETS :=     \
   c128         \
   c16          \
   c64          \
+  c65          \
   cbm510       \
   cbm610       \
   creativision \
@@ -756,6 +838,7 @@ TARGETS :=     \
   kim1		   \
   lunix        \
   lynx         \
+  mega65       \
   nes          \
   osic1p       \
   pce          \
@@ -771,25 +854,34 @@ TARGETS :=     \
 # --------------------------------------------------------------------------
 # Rule to make the binaries for every platform
 
+define TARGETDIR_recipe
+
+@+$(MAKE) -C $(dir) $(PD) $(PQ)
+
+endef # TARGETDIR_recipe
+
 define TARGET_recipe
 
 @echo making targettest for: $(T)
 @$(MAKE) -j2 SYS:=$(T)
-@$(MAKE) --no-print-directory clean SYS:=$(T)
+@$(MAKE) $(PD) clean SYS:=$(T)
 
 endef # TARGET_recipe
 
 platforms:
 	$(foreach T,$(TARGETS),$(TARGET_recipe))
+	$(foreach dir,$(DIRLIST),$(TARGETDIR_recipe))
 
 # --------------------------------------------------------------------------
 # some programs link against getsp.o
 
 mouse-test: mouse-test.o getsp.o
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS) -t $(SYS) -o $@ $^ $(SYS).lib
 
 ifneq ($(SYS),vic20)
 ft: ft.o getsp.o
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS) -t $(SYS) -o $@ $^ $(SYS).lib
 endif
 
@@ -797,6 +889,7 @@ endif
 
 ifeq ($(SYS),vic20)
 ft:  ft.o getsp.o
+	$(if $(QUIET),echo $(SYS):$@)
 	$(LD) $(LDFLAGS) -o $@ -C vic20-32k.cfg -m $@.map $^ $(SYS).lib
 endif
 
diff --git a/targettest/accelerator/Makefile b/targettest/accelerator/Makefile
index dd5011459..a8d26e368 100644
--- a/targettest/accelerator/Makefile
+++ b/targettest/accelerator/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
 SYS ?= c64
@@ -30,6 +36,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_c64 = \
 	c64-scpu-test.prg \
 	c64dtv-test.prg \
@@ -58,27 +72,35 @@ else
 endif
 
 c64-scpu-test.prg: c64-c128-scpu-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c64 c64-c128-scpu-test.c -o c64-scpu-test.prg
 
 c128-scpu-test.prg: c64-c128-scpu-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c128 c64-c128-scpu-test.c -o c128-scpu-test.prg
 
 c64dtv-test.prg: c64dtv-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c64 c64dtv-test.c -o c64dtv-test.prg
 
 c64-test.prg: c64-c128-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c64 c64-c128-test.c -o c64-test.prg
 
 c128-test.prg: c64-c128-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c128 c64-c128-test.c -o c128-test.prg
 
 chameleon-test.prg: chameleon-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c64 chameleon-test.c -o chameleon-test.prg
 
 c65-test.prg: c65-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c64 c65-test.c -o c65-test.prg
 
 turbomaster-test.prg: turbomaster-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t c64 turbomaster-test.c -o turbomaster-test.prg
 
 clean:
diff --git a/targettest/atari/Makefile b/targettest/atari/Makefile
index d5b4d9593..099dd291c 100644
--- a/targettest/atari/Makefile
+++ b/targettest/atari/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,6 +37,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_atari = \
         charmapping.xex \
         defdev.xex \
@@ -58,24 +72,33 @@ else
 endif
 
 charmapping.xex: charmapping.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -o charmapping.xex charmapping.c
 defdev.xex: defdev.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -o defdev.xex defdev.c
 displaylist.xex: displaylist.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -o displaylist.xex displaylist.c
 mem.xex: mem.c ../getsp.s
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -o mem.xex mem.c ../getsp.s
 multi.xex: multi-xex.s multi-xex.cfg
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -C multi-xex.cfg multi-xex.s -o multi.xex
 ostype.xex: ostype.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -o ostype.xex ostype.c
 scrcode.com: scrcode.s
+	$(if $(QUIET),echo $(SYS):$@)
 #	ca65 -t atari -o scrcode.o scrcode.s
 #	ld65 -C atari-asm.cfg -o scrcode.com scrcode.o
 	$(CL) -t atari -C atari-asm.cfg -o scrcode.com scrcode.s
 sys.xex: sys.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -o sys.xex sys.c
 sound.xex: sound.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t atari -o sound.xex sound.c
 clean:
 	@$(DEL) charmapping.xex 2>$(NULLDEV)
diff --git a/targettest/atari/mem.c b/targettest/atari/mem.c
index bc70aded6..459c472ec 100644
--- a/targettest/atari/mem.c
+++ b/targettest/atari/mem.c
@@ -21,6 +21,8 @@ unsigned int *MEMTOP = (unsigned int *)741;
 unsigned int *MEMLO = (unsigned int *)743;
 void *allocmem;
 
+void code(void) { }
+
 int main(void)
 {
   allocmem = malloc(257);
@@ -35,11 +37,11 @@ int main(void)
   printf("  MEMLO  = $%04X (%u)\n", *MEMLO, *MEMLO);
 
   printf("  ----------------------\n");
-  printf("  main:            $%04X  (code)\n", &main);
+  printf("  code:            $%04X  (code)\n", &code);
   printf("  data:            $%04X  (data)\n", &data);
   printf("  _dos_type:       $%04X  (bss)\n", &_dos_type);
   printf("  allocmem:        $%04X  (dyn. data)\n", allocmem);
-  printf("  sp:              $%04X  (stack ptr)\n", getsp());
+  printf("  c_sp:            $%04X  (stack ptr)\n", getsp());
 
   if (allocmem) free(allocmem);
   if (doesclrscrafterexit()) cgetc();
diff --git a/targettest/cbm/Makefile b/targettest/cbm/Makefile
index c3171b13e..6359a154a 100644
--- a/targettest/cbm/Makefile
+++ b/targettest/cbm/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
 SYS ?= c64
@@ -34,6 +40,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_c64 = \
         petscii.prg \
         cbmdir-test.prg \
@@ -67,12 +81,14 @@ endif
 
 ifeq ($(SYS),c64)
 petscii.prg: petscii.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t $(SYS) -O -o petscii.prg petscii.c
 else
 petscii.prg:
 endif
 
 cbmdir-test.prg: cbmdir-test.c
+	$(if $(QUIET),echo $(SYS):$@)
 ifeq ($(SYS),vic20)
 	$(CL) -t $(SYS) -C vic20-32k.cfg -Oris -o $@ $<
 else
@@ -80,6 +96,7 @@ else
 endif
 
 cbmread.prg: cbmread.c
+	$(if $(QUIET),echo $(SYS):$@)
 ifeq ($(SYS),vic20)
 	$(CL) -t $(SYS) -C vic20-32k.cfg -Oris -o $@ $<
 else
diff --git a/targettest/conio.c b/targettest/conio.c
index efe82d7c6..09b4a9e44 100644
--- a/targettest/conio.c
+++ b/targettest/conio.c
@@ -9,21 +9,44 @@
  *
  */
 
+/* Box drawing characters are usually constant expressions. However, there
+ * are scenarios where this is not the case. To ensure compatibility with
+ * code that assumes they are constant expressions, the scenarios in question
+ * must be explicitly enabled by defining DYN_BOX_DRAW. Currently, the only
+ * such scenario is the apple2 target. There, DYN_BOX_DRAW can be used to
+ * enable the use of MouseText characters on exactly those machines that
+ * support them.
+ */
+#define DYN_BOX_DRAW
 
 #include <conio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <joystick.h>
 
-#if defined(__GAMATE__)
+#if defined(__GAMATE__) || defined(__OSIC1P__)
 /* there is not enough screen space to show all 256 characters at the bottom */
 #define NUMCHARS        128
-#define NUMCOLS           4
 #else
 #define NUMCHARS        256
+#endif
+
+#if defined(__GAMATE__)
+#define NUMCOLS           4
+#else
 #define NUMCOLS          16
 #endif
 
+#if defined(__ATMOS__)
+// FIXME: those should be defined elsewhere?
+#define CH_HLINE '-'
+#define CH_VLINE '!'
+#endif
+
+#if defined(DYN_BOX_DRAW)
+static char grid[5][5];
+#else
+
 static char grid[5][5] = {
     {CH_ULCORNER, CH_HLINE, CH_TTEE,  CH_HLINE, CH_URCORNER},
     {CH_VLINE,    ' ',      CH_VLINE, ' ',      CH_VLINE   },
@@ -31,6 +54,136 @@ static char grid[5][5] = {
     {CH_VLINE,    ' ',      CH_VLINE, ' ',      CH_VLINE   },
     {CH_LLCORNER, CH_HLINE, CH_BTEE,  CH_HLINE, CH_LRCORNER}
 };
+#endif
+
+#if defined(DYN_BOX_DRAW)
+static void init_grid(void)
+{
+        /* Programmatically fill the array with extern chars
+         * instead of constants. */
+        grid[0][0] = CH_ULCORNER;
+        grid[2][0] = CH_LTEE;
+        grid[4][0] = CH_LLCORNER;
+
+        grid[0][2] = CH_TTEE;
+        grid[2][2] = CH_CROSS;
+        grid[4][2] = CH_BTEE;
+
+        grid[0][4] = CH_URCORNER;
+        grid[2][4] = CH_RTEE;
+        grid[4][4] = CH_LRCORNER;
+
+        grid[1][1] = grid[1][3] =
+        grid[3][1] = grid[3][3] = ' ';
+
+        grid[1][0] = grid[1][2] = grid[1][4] =
+        grid[3][0] = grid[3][2] = grid[3][4] = CH_VLINE;
+        grid[0][1] = grid[0][3] =
+        grid[2][1] = grid[2][3] =
+        grid[4][1] = grid[4][3] = CH_HLINE;
+}
+#endif
+
+#define LINE_COLORTEST  3
+#define LINE_PEEKTEST   11
+
+void colortest(void)
+{
+    unsigned int i, j;
+    cputsxy(0, 2, "Colors:" );
+    for (i = 0; i < 3; ++i) {
+            gotoxy(i, LINE_COLORTEST + i);
+            for (j = 0; j < NUMCOLS; ++j) {
+                    (void)textcolor(j);
+                    cputc('X');
+            }
+    }
+}
+
+void peektest(void)
+{
+    int j;
+    char buf[NUMCOLS];
+    char cbuf[NUMCOLS];
+    char rbuf[NUMCOLS];
+
+    gotoxy(0, LINE_PEEKTEST);
+    for (j = 0; j < NUMCOLS; ++j) {
+        (void)textcolor(j);
+        revers((j >> 1)&1);
+        cputc('a' + j);
+        buf[j] ='#';
+        cbuf[j] = 1;
+        rbuf[j] = 0;
+    }
+    for (j = 0; j < NUMCOLS; ++j) {
+        gotoxy(j, LINE_PEEKTEST);
+// TODO: cpeekc() implementation missing for those:
+#if !defined(__TELESTRAT__)
+        buf[j] = cpeekc();
+#endif
+// TODO: cpeekcolor() implementation missing for those:
+#if !defined(__TELESTRAT__)
+        cbuf[j] = cpeekcolor();
+#endif
+// TODO: cpeekrevers() implementation missing for those:
+#if !defined(__TELESTRAT__)
+        rbuf[j] = cpeekrevers();
+#endif
+    }
+    gotoxy(0, (LINE_PEEKTEST+1));
+    for (j = 0; j < NUMCOLS; ++j) {
+        (void)textcolor(cbuf[j]);
+        revers(rbuf[j]);
+        cputc(buf[j]);
+    }
+// TODO: cpeeks() implementation missing for those:
+#if !defined(__APPLE2__) && \
+    !defined(__APPLE2ENH__) && \
+    !defined(__ATARI__) && \
+    !defined(__CX16__) && \
+    !defined(__NES__) && \
+    !defined(__TELESTRAT__) && \
+    !defined(__OSIC1P__)
+    gotoxy(0, LINE_PEEKTEST);
+    cpeeks(buf, NUMCOLS);
+    (void)textcolor(1);
+    revers(0);
+    gotoxy(20, LINE_PEEKTEST);
+    for (j = 0; j < NUMCOLS; ++j) {
+        cputc(buf[j]);
+    }
+#endif
+}
+
+void allchars(int xsize, int ysize)
+{
+    int i;
+        gotoxy(0, ysize - 2 - ((NUMCHARS + (xsize-1)) / xsize));
+        // one line with 0123..pattern
+        revers(1);
+        for (i = 0; i < xsize; ++i) {
+                cputc('0' + i % 10);
+        }
+        revers(0);
+        for (i = 0; i < NUMCHARS; ++i) {
+            if ((i != '\n') && (i != '\r')) {
+                    cputc(i);
+            } else {
+                    cputc(' ');
+            }
+        }
+        // fill last line of the block with '#'
+        while(wherex() > 0) {
+                cputc('#');
+        }
+        // one more line with 0123..pattern
+        revers(1);
+        for (i = 0; i < xsize; ++i) {
+                cputc('0' + i % 10);
+        }
+        revers(0);
+}
 
 void main(void)
 {
@@ -41,6 +194,11 @@ void main(void)
 
         joy_install(joy_static_stddrv);
 #endif
+
+#if defined(DYN_BOX_DRAW)
+        init_grid();
+#endif
+
         clrscr();
         screensize(&xsize, &ysize);
         cputs("cc65 conio test\n\r");
@@ -52,16 +210,13 @@ void main(void)
         (void)bordercolor(bcol);
         (void)bgcolor(bgcol);
 
-        cputsxy(0, 2, "Colors:" );
-        for (i = 0; i < 3; ++i) {
-                gotoxy(i, 3 + i);
-                for (j = 0; j < NUMCOLS; ++j) {
-                        (void)textcolor(j);
-                        cputc('X');
-                }
-        }
-        (void)textcolor(tcol);
+        colortest();
+        peektest();
 
+        (void)textcolor(tcol);
+        revers(0);
+
+        gotoxy(4,5);
         cprintf("\n\n\r Screensize: %ux%u", xsize, ysize);
 
         chlinexy(0, 6, xsize);
@@ -80,27 +235,7 @@ void main(void)
                 }
         }
 
-        gotoxy(0, ysize - 2 - ((NUMCHARS + xsize) / xsize));
-        revers(1);
-        for (i = 0; i < xsize; ++i) {
-                cputc('0' + i % 10);
-        }
-        revers(0);
-        for (i = 0; i < NUMCHARS; ++i) {
-            if ((i != '\n') && (i != '\r')) {
-                    cputc(i);
-            } else {
-                    cputc(' ');
-            }
-        }
-        while(wherex() > 0) {
-                cputc('#');
-        }
-        revers(1);
-        for (i = 0; i < xsize; ++i) {
-                cputc('0' + i % 10);
-        }
-        revers(0);
+        allchars(xsize, ysize);
 
         cursor(1);
         for (;;) {
diff --git a/targettest/cpeek-test.c b/targettest/cpeek-test.c
index 4c1aadcb2..6f6556935 100644
--- a/targettest/cpeek-test.c
+++ b/targettest/cpeek-test.c
@@ -24,6 +24,10 @@
 #  define SCREEN_RAM ((unsigned char*)0x8000)
 #elif defined(__VIC20__)
 #  define SCREEN_RAM ((unsigned char*)0x1000)
+#elif defined(__C65__)
+#  define SCREEN_RAM ((unsigned char*)0x0800)
+#elif defined(__MEGA65__)
+#  define SCREEN_RAM ((unsigned char*)0x0800)
 #else
 #  error This program cannot test that target.
 #  define SCREEN_RAM ((unsigned char*)0)
diff --git a/targettest/ft.c b/targettest/ft.c
index 3dfa0e37b..a28795f2b 100644
--- a/targettest/ft.c
+++ b/targettest/ft.c
@@ -10,7 +10,7 @@
 ** got one from argv). I then opens the file,
 ** reads the first 16 bytes and displays them
 ** (as hex values).
-** The values of sp (cc65 runtime stack pointer)
+** The values of c_sp (cc65 runtime stack pointer)
 ** are displayed at some places. The displayed
 ** value should always be the same.
 */
@@ -64,16 +64,16 @@ int main(int argc,char **argv)
     }
     printf("using filename \"%s\"\n",filename);
     csp = getsp();
-    printf("now opening file... sp = %d\n",csp);
+    printf("now opening file... c_sp = %d\n",csp);
     fd = open(filename,O_RDONLY);
     csp = getsp();
     if (fd == -1) {
         char x1 = _oserror;
-        printf("open failed: os: %d,\n\terrno: %d, sp = %d\n",x1,errno,csp);
+        printf("open failed: os: %d,\n\terrno: %d, c_sp = %d\n",x1,errno,csp);
         cgetc();
         return(0);
     }
-    printf("open success -- handle = $%x, sp = %d\n",fd,csp);
+    printf("open success -- handle = $%x, c_sp = %d\n",fd,csp);
 #ifdef __ATARI__
     printf("fd_index:\n ");
     for (i=0; i<12; i++) printf("%02X ",__fd_index[i]);
@@ -88,7 +88,7 @@ int main(int argc,char **argv)
     lr = read(fd,buf,16);  /* read first 16 bytes */
     csp = getsp();
     if (lr == -1) {
-        printf("read failed: %d (sp = %d)\n",errno,csp);
+        printf("read failed: %d (c_sp = %d)\n",errno,csp);
         cgetc();
         return(0);
     }
@@ -99,7 +99,7 @@ int main(int argc,char **argv)
         return(0);
     }
     csp = getsp();
-    printf("\n\nThe data read: (%d bytes, sp = %d)\n",lr,csp);
+    printf("\n\nThe data read: (%d bytes, c_sp = %d)\n",lr,csp);
     for (i=0; i<lr; i++) {
         printf("%02X ",buf[i]);
         if (!((i+1) & 7)) printf("\n");
diff --git a/targettest/gamate/Makefile b/targettest/gamate/Makefile
index e2b060406..21fd039ec 100644
--- a/targettest/gamate/Makefile
+++ b/targettest/gamate/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,6 +37,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 EXELIST_gamate = \
         audiotest.bin lcdtest.bin ctest.bin
 
@@ -50,10 +64,13 @@ else
 endif
 
 audiotest.bin: audiotest.s
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -l audiotest.lst -t gamate -o audiotest.bin audiotest.s
 lcdtest.bin: lcdtest.s
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -l lcdtest.lst -t gamate -o lcdtest.bin lcdtest.s
 ctest.bin: ctest.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -l ctest.lst -t gamate -o ctest.bin ctest.c
 
 clean:
diff --git a/targettest/getsp.s b/targettest/getsp.s
index 9f169dc0b..95db689f4 100644
--- a/targettest/getsp.s
+++ b/targettest/getsp.s
@@ -1,11 +1,11 @@
 
         .export _getsp
-        .importzp       sp
+        .importzp       c_sp
 
 .proc   _getsp
 
-        ldx     sp+1
-        lda     sp
+        ldx     c_sp+1
+        lda     c_sp
         rts
 
 .endproc
diff --git a/targettest/pce/Makefile b/targettest/pce/Makefile
index 89abca6b6..53516d55d 100644
--- a/targettest/pce/Makefile
+++ b/targettest/pce/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 
 # Run 'make SYS=<target>'; or, set a SYS env.
 # var. to build for another target system.
@@ -31,6 +37,14 @@ else
   LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
+
 .PHONY: all clean test
 
 # Size of cartridge to generate.
@@ -65,8 +79,11 @@ else
 endif
 
 %.bin: %.c
+	$(if $(QUIET),echo $(SYS):$@)
 	$(CL) -t pce $< -Wl -D__CARTSIZE__=${CARTSIZE} -m $*.map -o $@
+ifndef QUIET
 	@echo "use 'make conio.pce' to produce a .pce file using dd"
+endif
 
 %.pce: %.bin
 	dd if=$< bs=8K skip=${COUNT} > $@
diff --git a/targettest/pce/conio.c b/targettest/pce/conio.c
index 55f828f26..819e601be 100644
--- a/targettest/pce/conio.c
+++ b/targettest/pce/conio.c
@@ -11,6 +11,8 @@ static char hex[16] = { "0123456789abcdef" };
 static char charbuf[0x20];
 static char colbuf[0x20];
 
+void func(void) { }
+
 void main(void)
 {
         int stackvar = 42;
@@ -65,7 +67,7 @@ void main(void)
                         p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]
                 );
         }
-        memcpy(p, main, i = 0);     /* test that a zero length doesn't copy 64K */
+        memcpy(p, func, i = 0);     /* test that a zero length doesn't copy 64K */
 
         gotoxy(0,ysize - 1);
         for (i = 0; i < xsize; ++i) {
diff --git a/targettest/scanf-test.c b/targettest/scanf-test.c
index f17b62294..e0ab95756 100644
--- a/targettest/scanf-test.c
+++ b/targettest/scanf-test.c
@@ -159,12 +159,14 @@ static void Pause(void) {
 #endif
         }
 
+static void Nil() { }
+
 int main(void) {
         long n0;
         unsigned t;
         int c, n1 = 12345, n2, n3;
         char s1[80], s2[80];
-        void *p1 = main, *p2 = main, *p3 = main, *p4 = main;
+        void *p1 = Nil, *p2 = Nil, *p3 = Nil, *p4 = Nil;
 
 #ifndef USE_STDIO
         clrscr();
diff --git a/test/Makefile b/test/Makefile
index 22e425c9c..b647dbe33 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # top-level Makefile for the regression tests
 
 ifneq ($(shell echo),)
@@ -10,31 +16,50 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+endif
+
 WORKDIR = ../testwrk
 
-.PHONY: test continue mostlyclean clean
+.PHONY: test continue mostlyclean clean success_message
 
-test: mostlyclean continue
+test:
+	@$(MAKE) mostlyclean
+	@$(MAKE) continue
 
 continue:
-	@$(MAKE) -C asm all
-	@$(MAKE) -C dasm all
-	@$(MAKE) -C val all
-	@$(MAKE) -C ref all
-	@$(MAKE) -C err all
-	@$(MAKE) -C standard all
-	@$(MAKE) -C misc all
-	@$(MAKE) -C todo all
+	@$(MAKE) $(PD) -C asm all $(PQ)
+	@$(MAKE) $(PD) -C dasm all $(PQ)
+	@$(MAKE) $(PD) -C val all $(PQ)
+	@$(MAKE) $(PD) -C ref all $(PQ)
+	@$(MAKE) $(PD) -C err all $(PQ)
+	@$(MAKE) $(PD) -C standard all $(PQ)
+	@$(MAKE) $(PD) -C standard_err all $(PQ)
+	@$(MAKE) $(PD) -C misc all $(PQ)
+	@$(MAKE) $(PD) -C todo all $(PQ)
+	@$(MAKE) success_message
+
+success_message:
+	$(info ###################################)
+	$(info ### validation suite successful ###)
+	$(info ###################################)
 
 mostlyclean:
-	@$(MAKE) -C asm clean
-	@$(MAKE) -C dasm clean
-	@$(MAKE) -C val clean
-	@$(MAKE) -C ref clean
-	@$(MAKE) -C err clean
-	@$(MAKE) -C standard clean
-	@$(MAKE) -C misc clean
-	@$(MAKE) -C todo clean
+	@$(MAKE) $(PD) -C asm clean $(PQ)
+	@$(MAKE) $(PD) -C dasm clean $(PQ)
+	@$(MAKE) $(PD) -C val clean $(PQ)
+	@$(MAKE) $(PD) -C ref clean $(PQ)
+	@$(MAKE) $(PD) -C err clean $(PQ)
+	@$(MAKE) $(PD) -C standard clean $(PQ)
+	@$(MAKE) $(PD) -C standard_err clean $(PQ)
+	@$(MAKE) $(PD) -C misc clean $(PQ)
+	@$(MAKE) $(PD) -C todo clean $(PQ)
 
 clean: mostlyclean
 	@$(call RMDIR,$(WORKDIR))
diff --git a/test/asm/Makefile b/test/asm/Makefile
index dea53f6b2..8d959ecae 100644
--- a/test/asm/Makefile
+++ b/test/asm/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # top-level Makefile for the regression tests
 
 ifneq ($(shell echo),)
@@ -10,25 +16,36 @@ else
   RMDIR = $(RM) -r $1
 endif
 
-WORKDIR = ../testwrk/asm
+ifeq ($(SILENT),s)
+    QUIET := 1
+endif
 
-SUBDIRS = cpudetect opcodes listing val err misc
+ifdef QUIET
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+endif
+
+WORKDIR = ../testwrk/asm
 
 .PHONY: all continue mostlyclean clean
 
 all: mostlyclean continue
 
-define CALL_template
+continue: mostlyclean
+	@$(MAKE) $(PD) -C cpudetect all $(PQ)
+	@$(MAKE) $(PD) -C opcodes all $(PQ)
+	@$(MAKE) $(PD) -C listing all $(PQ)
+	@$(MAKE) $(PD) -C val all $(PQ)
+	@$(MAKE) $(PD) -C err all $(PQ)
+	@$(MAKE) $(PD) -C misc all $(PQ)
 
-continue::
-	@$(MAKE) -C $1 all
-
-mostlyclean::
-	@$(MAKE) -C $1 clean
-
-endef
-
-$(foreach subdir,$(SUBDIRS),$(eval $(call CALL_template,$(subdir))))
+mostlyclean:
+	@$(MAKE) $(PD) -C cpudetect clean $(PQ)
+	@$(MAKE) $(PD) -C opcodes clean $(PQ)
+	@$(MAKE) $(PD) -C listing clean $(PQ)
+	@$(MAKE) $(PD) -C val clean $(PQ)
+	@$(MAKE) $(PD) -C err clean $(PQ)
+	@$(MAKE) $(PD) -C misc clean $(PQ)
 
 clean: mostlyclean
 	@$(call RMDIR,$(WORKDIR))
diff --git a/test/asm/cpudetect/4510-cpudetect.ref b/test/asm/cpudetect/4510-cpudetect.ref
index 515557c85..5eba7ec5a 100644
Binary files a/test/asm/cpudetect/4510-cpudetect.ref and b/test/asm/cpudetect/4510-cpudetect.ref differ
diff --git a/test/asm/cpudetect/45GS02-cpudetect.ref b/test/asm/cpudetect/45GS02-cpudetect.ref
new file mode 100644
index 000000000..3936f2902
Binary files /dev/null and b/test/asm/cpudetect/45GS02-cpudetect.ref differ
diff --git a/test/asm/cpudetect/6502x-cpudetect.ref b/test/asm/cpudetect/6502x-cpudetect.ref
index 3434ecbea..9e7abe573 100644
Binary files a/test/asm/cpudetect/6502x-cpudetect.ref and b/test/asm/cpudetect/6502x-cpudetect.ref differ
diff --git a/test/asm/cpudetect/65816-cpudetect.ref b/test/asm/cpudetect/65816-cpudetect.ref
index 4f6e767b0..e614b34c9 100644
Binary files a/test/asm/cpudetect/65816-cpudetect.ref and b/test/asm/cpudetect/65816-cpudetect.ref differ
diff --git a/test/asm/cpudetect/65ce02-cpudetect.ref b/test/asm/cpudetect/65ce02-cpudetect.ref
new file mode 100644
index 000000000..eca5a2b2a
Binary files /dev/null and b/test/asm/cpudetect/65ce02-cpudetect.ref differ
diff --git a/test/asm/cpudetect/Makefile b/test/asm/cpudetect/Makefile
index ffddb1ad8..27724b9f9 100644
--- a/test/asm/cpudetect/Makefile
+++ b/test/asm/cpudetect/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the assembler regression tests
 
 ifneq ($(shell echo),)
@@ -14,8 +20,17 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
+  NULLOUT = >$(NULLDEV)
+  NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 CA65 := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65)
@@ -46,8 +61,8 @@ define CPUDETECT_template
 
 $(WORKDIR)/$1-cpudetect.bin: cpudetect.s $1-cpudetect.ref $(ISEQUAL)
 	$(if $(QUIET),echo asm/$1-cpudetect.bin)
-	$(CA65) -t none --cpu $1 -l $$(@:.bin=.lst) -o $$(@:.bin=.o) $$<
-	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib
+	$(CA65) -t none --cpu $1 -l $$(@:.bin=.lst) -o $$(@:.bin=.o) $$< $(CATERR)
+	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib $(CATERR)
 	$(ISEQUAL) $1-cpudetect.ref $$@
 
 endef # CPUDETECT_template
@@ -55,7 +70,7 @@ endef # CPUDETECT_template
 $(foreach cpu,$(CPUDETECT_CPUS),$(eval $(call CPUDETECT_template,$(cpu))))
 
 $(WORKDIR)/%.o: %.s | $(WORKDIR)
-	$(CA65) -l $(@:.o=.lst) -o $@ $<
+	$(CA65) -l $(@:.o=.lst) -o $@ $< $(NULLOUT) $(CATERR)
 
 clean:
 	@$(call RMDIR,$(WORKDIR))
diff --git a/test/asm/cpudetect/allinst.inc b/test/asm/cpudetect/allinst.inc
new file mode 100644
index 000000000..2ba44ff83
--- /dev/null
+++ b/test/asm/cpudetect/allinst.inc
@@ -0,0 +1,1009 @@
+
+    ; just emit to bss for now, this way the output wont get checked, which is
+    ; fine - we only want to see if the assembler accepts all the opcodes it
+    ; should accept for the current CPU mode
+    .bss
+
+.if (.cpu .bitand CPU_ISET_6502)
+    .scope
+    ; regular basic 6502 (legal) instruction set
+LABEL0:
+    brk             ; $00
+    ora ($12,x)     ; $01
+    ora $12         ; $05
+    asl $12         ; $06
+    php             ; $08
+    ora #$12        ; $09
+    asl a           ; $0a
+    ora $1234       ; $0d
+    asl $1234       ; $0e
+    bpl LABEL0      ; $10
+    ora ($12),y     ; $11
+    ora $12,x       ; $15
+    asl $12,x       ; $16
+    clc             ; $18
+    ora $1234,y     ; $19
+    ora $1234,x     ; $1d
+    asl $1234,x     ; $1e
+    jsr $1234       ; $20
+    and ($12,x)     ; $21
+    bit $12         ; $24
+    and $12         ; $25
+    rol $12         ; $26
+    plp             ; $28
+    and #$12        ; $29
+    rol a           ; $2a
+    bit $1234       ; $2c
+    and $1234       ; $2d
+    rol $1234       ; $2e
+    bmi LABEL       ; $30
+    and ($12),y     ; $31
+    and $12,x       ; $35
+    rol $12,x       ; $36
+    sec             ; $38
+    and $1234,y     ; $39
+    and $1234,x     ; $3d
+    rol $1234,x     ; $3e
+    rti             ; $40
+    eor ($12,x)     ; $41
+    eor $12         ; $45
+    lsr $12         ; $46
+    pha             ; $48
+    eor #$12        ; $49
+    lsr a           ; $4a
+    jmp $1234       ; $4c
+    eor $1234       ; $4d
+    lsr $1234       ; $4e
+    bvc LABEL       ; $50
+    eor ($12),y     ; $51
+    eor $12,x       ; $55
+    lsr $12,x       ; $56
+    cli             ; $58
+    eor $1234,y     ; $59
+    eor $1234,x     ; $5d
+    lsr $1234,x     ; $5e
+    rts             ; $60
+    adc ($12,x)     ; $61
+    adc $12         ; $65
+    ror $12         ; $66
+    pla             ; $68
+    adc #$12        ; $69
+    ror a           ; $6a
+    jmp ($1234)     ; $6c
+    adc $1234       ; $6d
+    ror $1234       ; $6e
+    bvs LABEL       ; $70
+    adc ($12),y     ; $71
+    adc $12,x       ; $75
+    ror $12,x       ; $76
+    sei             ; $78
+    adc $1234,y     ; $79
+    adc $1234,x     ; $7d
+    ror $1234,x     ; $7e
+LABEL:
+    sta ($12,x)     ; $81
+    sty $12         ; $84
+    sta $12         ; $85
+    stx $12         ; $86
+    dey             ; $88
+    txa             ; $8a
+    sty $1234       ; $8c
+    sta $1234       ; $8d
+    stx $1234       ; $8e
+    bcc LABEL       ; $90
+    sta ($12),y     ; $91
+    sty $12,x       ; $94
+    sta $12,x       ; $95
+    stx $12,y       ; $96
+    tya             ; $98
+    sta $1234,y     ; $99
+    txs             ; $9a
+    sta $1234,x     ; $9d
+    ldy #$12        ; $a0
+    lda ($12,x)     ; $a1
+    ldx #$12        ; $a2
+    ldy $12         ; $a4
+    lda $12         ; $a5
+    ldx $12         ; $a6
+    tay             ; $a8
+    lda #$12        ; $a9
+    tax             ; $aa
+    ldy $1234       ; $ac
+    lda $1234       ; $ad
+    ldx $1234       ; $ae
+    bcs LABEL       ; $b0
+    lda ($12),y     ; $b1
+    ldy $12,x       ; $b4
+    lda $12,x       ; $b5
+    ldx $12,y       ; $b6
+    clv             ; $b8
+    lda $1234,y     ; $b9
+    tsx             ; $ba
+    ldy $1234,x     ; $bc
+    lda $1234,x     ; $bd
+    ldx $1234,y     ; $be
+    cpy #$12        ; $c0
+    cmp ($12,x)     ; $c1
+    cpy $12         ; $c4
+    cmp $12         ; $c5
+    dec $12         ; $c6
+    iny             ; $c8
+    cmp #$12        ; $c9
+    dex             ; $ca
+    cpy $1234       ; $cc
+    cmp $1234       ; $cd
+    dec $1234       ; $ce
+    bne LABEL       ; $d0
+    cmp ($12),y     ; $d1
+    cmp $12,x       ; $d5
+    dec $12,x       ; $d6
+    cld             ; $d8
+    cmp $1234,y     ; $d9
+    cmp $1234,x     ; $dd
+    dec $1234,x     ; $de
+    cpx #$12        ; $e0
+    sbc ($12,x)     ; $e1
+    cpx $12         ; $e4
+    sbc $12         ; $e5
+    inc $12         ; $e6
+    inx             ; $e8
+    sbc #$12        ; $e9
+    nop             ; $ea
+    cpx $1234       ; $ec
+    sbc $1234       ; $ed
+    inc $1234       ; $ee
+    beq LABEL1      ; $f0
+    sbc ($12),y     ; $f1
+    sbc $12,x       ; $f5
+    inc $12,x       ; $f6
+    sed             ; $f8
+    sbc $1234,y     ; $f9
+    sbc $1234,x     ; $fd
+    inc $1234,x     ; $fe
+LABEL1:
+    .endscope
+.endif
+
+
+.if (.cpu .bitand CPU_ISET_6502X)
+    .scope
+    ; all "undocumented" 6502 instructions (aka "unintended opcodes")
+    jam             ; $02
+    slo ($12,x)     ; $03
+    nop $12         ; $04
+    slo $12         ; $07
+    anc #$12        ; $0b
+    nop $1234       ; $0c
+    slo $1234       ; $0f
+    jam             ; $12
+    slo ($12),y     ; $13
+    nop $12,x       ; $14
+    slo $12,y       ; $17
+    nop             ; $1a
+    slo $1234,y     ; $1b
+    nop $1234,x     ; $1c
+    slo $1234,x     ; $1f
+    jam             ; $22
+    rla ($12,x)     ; $23
+    rla $12         ; $27
+    anc #$12        ; $2b
+    rla $1234       ; $2f
+    jam             ; $32
+    rla ($12),y     ; $33
+    nop $12,x       ; $34
+    rla $12,y       ; $37
+    nop             ; $3a
+    rla $1234,y     ; $3b
+    nop $1234,x     ; $3c
+    rla $1234,x     ; $3f
+    jam             ; $42
+    sre ($12,x)     ; $43
+    nop $12         ; $44
+    sre $12         ; $47
+    alr #$12        ; $4b
+    sre $1234       ; $4f
+    jam             ; $52
+    sre ($12),y     ; $53
+    nop $12,x       ; $54
+    sre $12,y       ; $57
+    nop             ; $5a
+    sre $1234,y     ; $5b
+    nop $1234,x     ; $5c
+    sre $1234,x     ; $5f
+    jam             ; $62
+    rra ($12,x)     ; $63
+    nop $12         ; $64
+    rra $12         ; $67
+    arr #$12        ; $6b
+    rra $1234       ; $6f
+    jam             ; $72
+    rra ($12),y     ; $73
+    nop $12,x       ; $74
+    rra $12,y       ; $77
+    nop             ; $7a
+    rra $1234,y     ; $7b
+    nop $1234,x     ; $7c
+    rra $1234,x     ; $7f
+    nop #$12        ; $80
+    nop #$12        ; $82
+    sax ($12,x)     ; $83
+    sax $12         ; $87
+    nop #$12        ; $89
+    ane #$12        ; $8b
+    sax $1234       ; $8f
+    jam             ; $92
+    sha ($12),y     ; $93
+    sax $12,y       ; $97
+    tas $1234,y     ; $9b
+    shy $1234,x     ; $9c
+    shx $1234,y     ; $9e
+    sha $1234,y     ; $9f
+    lax ($12,x)     ; $a3
+    lax $12         ; $a7
+    lax #$12        ; $ab
+    lax $1234       ; $af
+    jam             ; $b2
+    lax ($12),y     ; $b3
+    lax $12,y       ; $b7
+    las $1234,y     ; $bb
+    lax $1234,y     ; $bf
+    nop #$12        ; $c2
+    dcp ($12,x)     ; $c3
+    dcp $12         ; $c7
+    axs #$12        ; $cb
+    dcp $1234       ; $cf
+    jam             ; $d2
+    dcp ($12),y     ; $d3
+    nop $12,x       ; $d4
+    dcp $12,y       ; $d7
+    nop             ; $da
+    dcp $1234,y     ; $db
+    nop $1234,x     ; $dc
+    dcp $1234,x     ; $df
+    nop #$12        ; $e2
+    isc ($12,x)     ; $e3
+    isc $12         ; $e7
+    sbc #$12        ; $eb
+    isc $1234       ; $ef
+    jam             ; $f2
+    isc ($12),y     ; $f3
+    nop $12,x       ; $f4
+    isc $12,y       ; $f7
+    nop             ; $fa
+    isc $1234,y     ; $fb
+    nop $1234,x     ; $fc
+    isc $1234,x     ; $ff
+    .endscope
+.endif
+
+
+.if (.cpu .bitand CPU_ISET_6502DTV)
+    .scope
+LABEL:
+    ; opcodes added over 6502 (these are JAM on 6502)
+    bra LABEL       ; $12
+    sac #$12        ; $32
+    sir #$12        ; $42
+
+    ; opcodes added over 6502, which work the same as the "illegal" opcodes on 6502
+    nop $12         ; $04
+    nop $1234       ; $0c
+    nop $12,x       ; $14
+    nop             ; $1a
+    nop $1234,x     ; $1c
+    nop $12,x       ; $34
+    nop             ; $3a
+    nop $1234,x     ; $3c
+    nop $12         ; $44
+    nop $12,x       ; $54
+    nop             ; $5a
+    nop $1234,x     ; $5c
+    nop $12         ; $64
+    nop $12,x       ; $74
+    nop             ; $7a
+    nop $1234,x     ; $7c
+    nop #$12        ; $80
+    nop #$12        ; $82
+    nop #$12        ; $89
+    nop #$12        ; $c2
+    nop $12,x       ; $d4
+    nop             ; $da
+    nop $1234,x     ; $dc
+    nop #$12        ; $e2
+    nop $12,x       ; $f4
+    nop             ; $fa
+    nop $1234,x     ; $fc
+
+    anc #$12        ; $0b
+    anc #$12        ; $2b
+
+    rla ($12,x)     ; $23
+    rla $12         ; $27
+    rla $1234       ; $2f
+    rla ($12),y     ; $33
+    rla $12,y       ; $37
+    rla $1234,y     ; $3b
+    rla $1234,x     ; $3f
+
+    lax ($12,x)     ; $a3
+    lax $12         ; $a7
+    lax #$12        ; $ab
+    lax $1234       ; $af
+    lax ($12),y     ; $b3
+    lax $12,y       ; $b7
+    lax $1234,y     ; $bf
+
+    las $1234,y     ; $bb
+
+    alr #$12        ; $4b
+
+    arr #$12        ; $6b
+
+    rra ($12,x)     ; $63
+    rra $12         ; $67
+    rra $1234       ; $6f
+    rra ($12),y     ; $73
+    rra $12,y       ; $77
+    rra $1234,y     ; $7b
+    rra $1234,x     ; $7f
+
+    shy $1234,x     ; $9c
+    shx $1234,y     ; $9e
+
+    axs #$12        ; $cb
+
+    sbc #$12        ; $eb
+
+    .endscope
+.endif
+
+;------------------------------------------------------------------------------
+; The 65sc02 is the original CMOS re-design of the 6502.
+;
+;      65SC02           65ce02
+;
+; $04  tsb zp
+; $0c  tsb abs16
+; $12  ora (zp)         (-> ora (zp), z)
+; $14  trb zp
+; $1a  inc
+; $1c  trb abs16
+; $32  and (zp)         (-> and (zp), z)
+; $34  bit zp, x
+; $3a  dec
+; $3c  bit abs16, x
+; $52  eor (zp)         (-> eor (zp), z)
+; $5a  phy
+; $64  stz zp           (store z, not 0)
+; $72  adc (zp)         (-> adc (zp), z)
+; $74  stz zp, x        (store z, not 0)
+; $7a  ply
+; $7c  jmp (abs16, x)
+; $80  bra rel8
+; $89  bit #imm8
+; $92  sta (zp)         (-> sta (zp), z)
+; $9c  stz abs16        (store z, not 0)
+; $9e  stz abs16, x     (store z, not 0)
+; $b2  lda (zp)         (-> lda (zp), z)
+; $d2  cmp (zp)         (-> cmp (zp), z)
+; $da  phx
+; $f2  sbc (zp)         (-> sbc (zp), z)
+; $fa  plx
+
+.if (.cpu .bitand CPU_ISET_65SC02)
+    .scope
+    ; 65c02 instruction set adds some extra legal instructions to 6502
+    tsb $12         ; $04
+    tsb $1234       ; $0c
+    ora ($12)       ; $12  FIXME: not working with 4510:ora (zp), z
+    trb $12         ; $14
+    inc a           ; $1a
+    trb $1234       ; $1c
+    and ($12)       ; $32  FIXME: not working with 4510:and (zp), z
+    bit $12,x       ; $34
+    dec a           ; $3a
+    bit $1234,x     ; $3c
+    eor ($12)       ; $52  FIXME: not working with 4510:eor (zp), z
+    phy             ; $5a
+    stz $12         ; $64
+    adc ($12)       ; $72  FIXME: not working with 4510:adc (zp), z
+    stz $12,x       ; $74
+    ply             ; $7a
+    jmp ($1234)     ; $7c
+LABEL:
+    bra LABEL       ; $80
+    bit #$12        ; $89
+    sta ($12)       ; $92  FIXME: not working with 4510:sta (zp), z
+    stz $1234       ; $9c
+    stz $1234,x     ; $9e
+    lda ($12)       ; $b2  FIXME: not working with 4510:lda (zp), z
+    cmp ($12)       ; $d2  FIXME: not working with 4510:cmp (zp), z
+    phx             ; $da
+    sbc ($12)       ; $f2  FIXME: not working with 4510:sbc (zp), z
+    plx             ; $fa
+    .endscope
+.endif
+
+
+; The R65C02 is a superset of the 65C02. It adds bit manipulation instructions:
+.if (.cpu .bitand CPU_ISET_65C02)
+
+    ; R65C02 instruction set adds some extra legal instructions to 65C02
+    rmb0 $12            ; $07
+    bbr0 $12, LABEL3    ; $0f
+    rmb1 $12            ; $17
+    bbr1 $12, LABEL3    ; $1f
+    rmb2 $12            ; $27
+    bbr2 $12, LABEL3    ; $2f
+    rmb3 $12            ; $37
+    bbr3 $12, LABEL3    ; $3f
+    rmb4 $12            ; $47
+    bbr4 $12, LABEL3    ; $4f
+    rmb5 $12            ; $57
+    bbr5 $12, LABEL3    ; $5f
+    rmb6 $12            ; $67
+    bbr6 $12, LABEL3    ; $6f
+    rmb7 $12            ; $77
+    bbr7 $12, LABEL3    ; $7f
+LABEL3:
+    smb0 $12            ; $87
+    bbs0 $12, LABEL3    ; $8f
+    smb1 $12            ; $97
+    bbs1 $12, LABEL3    ; $9f
+    smb2 $12            ; $a7
+    bbs2 $12, LABEL3    ; $af
+    smb3 $12            ; $b7
+    bbs3 $12, LABEL3    ; $bf
+    smb4 $12            ; $c7
+    bbs4 $12, LABEL3    ; $cf
+    smb5 $12            ; $d7
+    bbs5 $12, LABEL3    ; $df
+    smb6 $12            ; $e7
+    bbs6 $12, LABEL3    ; $ef
+    smb7 $12            ; $f7
+    bbs7 $12, LABEL3    ; $ff
+
+.endif
+
+
+; The W65C02 is a superset of the R65C02. It only adds two instructions:
+.if (.cpu .bitand CPU_ISET_W65C02)
+    wai             ; $cb
+    stp             ; $db
+.endif
+
+
+; The 65CE02 is another superset of the R65C02. It has several improvements:
+.if (.cpu .bitand CPU_ISET_65CE02)
+    .scope
+
+    ; 65CE02 adds the following:
+    cle                         ; $02
+    see                         ; $03
+    tsy                         ; $0b
+    ora ($12), z                ; $12    (ora (zp) on 65C02)
+    lbpl $1234                  ; $13
+    inz                         ; $1b
+    jsr ($1234)                 ; $22
+    jsr ($1234,x)               ; $23
+    tys                         ; $2b
+    and ($12), z                ; $32    (and (zp) on 65C02)
+    lbmi $1234                  ; $33
+    dez                         ; $3b
+    neg                         ; $42
+    asr a                       ; $43
+    asr $12                     ; $44
+    taz                         ; $4b
+    lbvc $1234                  ; $53
+    asr $12,x                   ; $54
+    tab                         ; $5b
+    ;aug                        ; $5c FIXME: implement in assembler
+    rtn #$12                    ; $62
+    bsr $1234                   ; $63
+    stz $12                     ; $64    (stores 0 on 65C02)
+    tza                         ; $6b
+    adc ($12), z                ; $72    (adc (zp) on 65C02)
+    lbvs $1234                  ; $73
+    stz $12, x                  ; $74    (stores 0 on 65C02)
+    tba                         ; $7b
+    sta ($12,s),y               ; $82
+    lbra $1234                  ; $83
+    sty $1234,x                 ; $8b
+    lbcc $1234                  ; $93
+    sta ($12), z                ; $92    (sta (zp) on 65C02)
+    stx $1234,y                 ; $9b
+    stz $1234                   ; $9c    (stores 0 on 65C02)
+    ldz #$12                    ; $a3
+    ldz $1234                   ; $ab
+    lda ($12), z                ; $b2    (lda (zp) on 65C02)
+    lbcs $1234                  ; $b3
+    ldz $1234,x                 ; $bb
+    cpz #$12                    ; $c2
+    dew $12                     ; $c3
+    cmp ($12), z                ; $d2    (cmp ($12) on 65C02)
+    lbne $1234                  ; $d3
+    cpz $12                     ; $d4
+    cpz $1234                   ; $dc
+    lda ($12,s),y               ; $e2
+    inw $12                     ; $e3
+    row $1234                   ; $eb
+    sbc ($12), z                ; $f2    (sbc (zp) on 65C02)
+    lbeq $1234                  ; $f3
+    phw #$1234                  ; $f4
+    plz                         ; $fb
+    phw $1234                   ; $fc
+
+    .endscope
+.endif
+
+
+; The 4510 is a superset of the 65CE02. Opcode 5c (originally a "4-byte NOP
+; reserved for future expansion") has been changed to the "map" instruction,
+; now using implied addressing.
+;
+; $5c  map
+; $cb  asw abs
+; $db  phz
+
+.if (.cpu .bitand CPU_ISET_4510)
+    .scope
+
+    ; added to 65CE02
+    map                         ; $5c   ("4-byte NOP reserved for future expansion" on 65CE02)
+    eom                         ; $ea   "end of mapping" - but really just a NOP
+
+    .endscope
+.endif
+
+
+; The 45GS02 instruction set extends the 4510 instruction set using prefix bytes.
+; Therefore, the "normal" opcode table is the same as for the 4510 cpu
+
+.if (.cpu .bitand CPU_ISET_45GS02)
+    .scope
+
+    orq $12          ; $42 $42 $05
+    aslq $12         ; $42 $42 $06
+    aslq             ; $42 $42 $0a
+    orq $1234        ; $42 $42 $0d
+    aslq $1234       ; $42 $42 $0e
+    orq ($12)        ; $42 $42 $12
+    aslq $12,x       ; $42 $42 $16
+    inq              ; $42 $42 $1a
+    aslq $1234,x     ; $42 $42 $1e
+    bitq $12         ; $42 $42 $24
+    andq $12         ; $42 $42 $25
+    rolq $12         ; $42 $42 $26
+    rolq             ; $42 $42 $2a
+    bitq $1234       ; $42 $42 $2c
+    andq $1234       ; $42 $42 $2d
+    rolq $1234       ; $42 $42 $2e
+    andq ($12)       ; $42 $42 $32
+    rolq $12, x      ; $42 $42 $36
+    deq              ; $42 $42 $3a
+    rolq $1234, x    ; $42 $42 $3e
+    asrq             ; $42 $42 $43
+    asrq $12         ; $42 $42 $44
+    eorq $12         ; $42 $42 $45
+    lsrq $12         ; $42 $42 $46
+    lsrq             ; $42 $42 $4a
+    eorq $1234       ; $42 $42 $4d
+    lsrq $1234       ; $42 $42 $4e
+    eorq ($12)       ; $42 $42 $52
+    asrq $12, x      ; $42 $42 $54
+    lsrq $12, x      ; $42 $42 $56
+    lsrq $1234, x    ; $42 $42 $5e
+    adcq $12         ; $42 $42 $65
+    rorq $12         ; $42 $42 $66
+    rorq             ; $42 $42 $6a
+    adcq $1234       ; $42 $42 $6d
+    rorq $1234       ; $42 $42 $6e
+    adcq ($12)       ; $42 $42 $72
+    rorq $12, x      ; $42 $42 $76
+    rorq $1234, x    ; $42 $42 $7e
+    stq $12          ; $42 $42 $85
+    stq $1234        ; $42 $42 $8d
+    stq ($12)        ; $42 $42 $92
+    ldq $12          ; $42 $42 $a5
+    ldq $1234        ; $42 $42 $ad
+    ldq ($12), z     ; $42 $42 $b2
+    cmpq $12         ; $42 $42 $c5
+    deq $12          ; $42 $42 $c6
+    cmpq $1234       ; $42 $42 $cd
+    deq $1234        ; $42 $42 $ce
+    cmpq ($12)       ; $42 $42 $d2
+    deq $12, x       ; $42 $42 $d6
+    deq $1234, x     ; $42 $42 $de
+    sbcq $12         ; $42 $42 $e5
+    inq $12          ; $42 $42 $e6
+    sbcq $1234       ; $42 $42 $ed
+    inq $1234        ; $42 $42 $ee
+    sbcq ($12)       ; $42 $42 $f2
+    inq $12, x       ; $42 $42 $f6
+    inq $1234, x     ; $42 $42 $fe
+
+    ora [$12], z     ; $ea $12
+    and [$12], z     ; $ea $32
+    eor [$12], z     ; $ea $52
+    adc [$12], z     ; $ea $72
+    sta [$12], z     ; $ea $92
+    lda [$12], z     ; $ea $b2
+    cmp [$12], z     ; $ea $d2
+    sbc [$12], z     ; $ea $f2
+
+    orq [$12]        ; $42 $42 $ea $12
+    andq [$12]       ; $42 $42 $ea $32
+    eorq [$12]       ; $42 $42 $ea $52
+    adcq [$12]       ; $42 $42 $ea $72
+    stq [$12]        ; $42 $42 $ea $92
+    ldq [$12], z     ; $42 $42 $ea $b2
+    cmpq [$12]       ; $42 $42 $ea $d2
+    sbcq [$12]       ; $42 $42 $ea $f2
+
+    .endscope
+.endif
+
+
+; The HUC6280 is a superset of the R65C02. It adds some other instructions:
+
+.if (.cpu .bitand CPU_ISET_HUC6280)
+    .scope
+
+    ; added to R65C02
+    sxy                         ; $02
+    st0 #$12                    ; $03
+    st1 #$12                    ; $13
+    sax                         ; $22
+    st2 #$12                    ; $23
+    say                         ; $42
+    tma #$10                    ; $43
+    bsr LABEL                   ; $44
+    tam #$12                    ; $53
+    csl                         ; $54
+    cla                         ; $62
+    tii $1234, $5678, $9abc     ; $73
+LABEL:
+    clx                         ; $82
+    tst #$12, $34               ; $83
+    clx                         ; $82
+    tst #$12, $34               ; $83
+    tst #$12, $3456             ; $93
+    tst #$12, $34, x            ; $a3
+    tst #$12, $3456, x          ; $b3
+    cly                         ; $c2
+    tdd $1234, $5678, $9abc     ; $c3
+    tin $1234, $5678, $9abc     ; $d3
+    csh                         ; $d4
+    tia $1234, $5678, $9abc     ; $e3
+    tai $1234, $5678, $9abc     ; $f3
+    set                         ; $f4
+
+    .endscope
+.endif
+
+
+.if (.cpu .bitand CPU_ISET_M740)
+    .scope
+    ; Mitsubishi M740 - adds new instructions to 65SC02 (but also removes some)
+
+    jsr ($12)           ; $02
+    bbs0 a, LABEL       ; $03
+    bbs0 $12, LABEL     ; $07
+    seb0 a              ; $0b
+    seb0 $12            ; $0f
+    bbc0 a, LABEL       ; $13
+    bbc0 $12, LABEL     ; $17
+    clb0 a              ; $1b
+    clb0 $12            ; $1f
+    jsr $ff12           ; $22
+    bbs1 a, LABEL       ; $23
+    bbs1 $12, LABEL     ; $27
+    seb1 a              ; $2b
+    seb1 $12            ; $2f
+    bbc1 a, LABEL       ; $33
+    bbc1 $12, LABEL     ; $37
+    clb1 a              ; $3b
+    clb1 $12            ; $3f
+    stp                 ; $42
+    bbs2 a, LABEL       ; $43
+    com $12             ; $44
+    bbs2 $12, LABEL     ; $47
+    seb2 a              ; $4b
+    seb2 $12            ; $4f
+    bbc2 a, LABEL       ; $53
+    bbc2 $12, LABEL     ; $57
+    clb2 a              ; $5b
+    clb2 $12            ; $5f
+    bbs3 a, LABEL       ; $63
+    bbs3 $12, LABEL     ; $67
+    seb3 a              ; $6b
+    seb3 $12            ; $6f
+    bbc3 a, LABEL       ; $73
+    bbc3 $12, LABEL     ; $77
+    clb3 a              ; $7b
+    clb3 $12            ; $7f
+LABEL:
+    rrf $12             ; $82
+    bbs4 a, LABEL       ; $83
+    bbs4 $12, LABEL     ; $87
+    seb4 a              ; $8b
+    seb4 $12            ; $8f
+    bbc4 a, LABEL       ; $93
+    bbc4 $12, LABEL     ; $97
+    clb4 a              ; $9b
+    clb4 $12            ; $9f
+    bbs5 a, LABEL       ; $a3
+    bbs5 $12, LABEL     ; $a7
+    seb5 a              ; $ab
+    seb5 $12            ; $af
+    bbc5 a, LABEL       ; $b3
+    bbc5 $12, LABEL     ; $b7
+    clb5 a              ; $bb
+    clb5 $12            ; $bf
+    slw                 ; $c2
+    bbs6 a, LABEL       ; $c3
+    bbs6 $12, LABEL     ; $c7
+    seb6 a              ; $cb
+    seb6 $12            ; $cf
+    bbc6 a, LABEL       ; $d3
+    bbc6 $12, LABEL     ; $d7
+    clb6 a              ; $db
+    clb6 $12            ; $df
+    fst                 ; $e2
+    bbs7 a, LABEL       ; $e3
+    bbs7 $12, LABEL     ; $e7
+    seb7 a              ; $eb
+    seb7 $12            ; $ef
+    bbc7 a, LABEL       ; $f3
+    bbc7 $12, LABEL     ; $f7
+    clb7 a              ; $fb
+    clb7 $12            ; $ff
+
+    ; replaced from 65SC02
+    clt                 ; $12
+    set                 ; $32
+    ldm $12, #$34       ; $3c
+    tst $12             ; $64
+
+    ; removed from 65SC02 (replaced by new)
+    ; ora ($12)         ; $12
+    ; and ($12)         ; $32
+    ; bit $1234,x       ; $3c
+    ; stz $12           ; $64
+
+    ; removed from 65SC02
+    ; tsb $12           ; $04
+    ; tsb $1234         ; $0c
+    ; trb $12           ; $14
+    ; trb $1234         ; $1c
+    ; bit $12,y         ; $34
+    ; eor ($12)         ; $52
+    ; phy               ; $5a
+    ; adc ($12)         ; $72
+    ; stz $12,y         ; $74
+    ; ply               ; $7a
+    ; jmp ($1234)       ; $7c
+    ; bit #$12          ; $89
+    ; sta ($12)         ; $92
+    ; stz $1234         ; $9c
+    ; stz $1234,x       ; $9e
+    ; cmp ($12)         ; $d2
+    ; phx               ; $da
+    ; sbc ($12)         ; $f2
+    ; plx               ; $fa
+
+    .endscope
+.endif
+
+.if (.cpu .bitand CPU_ISET_65816)
+
+    .smart  -                       ; Stop being smart
+
+    .A8 ; akku 8 bit
+    .I8 ; index registers 8 bit
+
+    .scope
+    cop $12             ; $02  coprocessor operation
+    ora $12, s          ; $03
+    ora [$12]           ; $07
+    phd                 ; $0b  push direct page register
+    ora $123456         ; $0f
+    ora ($12, s), y     ; $13
+    ora [$12], y        ; $17
+    tcs                 ; $1b  transfer C to stack pointer
+    ora $123456, x      ; $1f
+    jsl $123456         ; $22
+    and $12, s          ; $23
+    and [$12]           ; $27
+    pld                 ; $2b  pull direct page register
+    and $123456         ; $2f
+    and ($12, s), y     ; $33
+    and [$12], y        ; $37
+    tsc                 ; $3b  transfer stack pointer to C
+    and $123456, x      ; $3f
+    wdm $12             ; $42  (reserved for future expansion)
+    eor $12, s          ; $43
+    mvp $1234, $5678    ; $44
+    eor [$12]           ; $47
+    phk                 ; $4b  push program bank register
+    eor $123456         ; $4f
+    eor ($12, s), y     ; $53
+    mvn $1234, $5678    ; $54
+    eor [$12], y        ; $57
+    tcd                 ; $5b  transfer C to direct page register
+    jml $123456         ; $5c
+    eor $123456, x      ; $5f
+    per LABEL           ; $62  push effective relative address
+    adc $12, s          ; $63
+    adc [$12]           ; $67
+    rtl                 ; $6b  return long (fetches 24-bit address from stack)
+    adc $123456         ; $6f
+    adc ($12, s), y     ; $73
+    adc [$12], y        ; $77
+    tdc                 ; $7b  transfer direct page register to C
+    adc $123456, x      ; $7f
+LABEL:
+    brl LABEL           ; $82  branch long (16-bit offset)
+    sta $12, s          ; $83
+    sta [$12]           ; $87
+    phb                 ; $8b  push data bank register
+    sta $123456         ; $8f
+    sta ($12, s), y     ; $93
+    sta [$12], y        ; $97
+    txy                 ; $9b  transfer X to Y
+    sta $123456, x      ; $9f
+    lda $12, s          ; $a3
+    lda [$12]           ; $a7
+    plb                 ; $ab  pull data bank register
+    lda $123456         ; $af
+    lda ($12, s), y     ; $b3
+    lda [$12], y        ; $b7
+    tyx                 ; $bb  transfer Y to X
+    lda $123456, x      ; $bf
+    rep #$12            ; $c2  clear bits in status register
+    cmp $12, s          ; $c3
+    cmp [$12]           ; $c7
+    wai                 ; $cb  wait for interrupt
+    cmp $123456         ; $cf
+    cmp ($12, s), y     ; $d3
+    pei ($12)           ; $d4  push effective indirect address
+    cmp [$12], y        ; $d7
+    stp                 ; $db  wait for reset
+    jmp [$1234]         ; $dc
+    cmp $123456, x      ; $df
+    sep #$12            ; $e2  set bits in status register
+    sbc $12, s          ; $e3
+    sbc [$12]           ; $e7
+    xba                 ; $eb  exchange high and low bytes of accumulator
+    sbc $123456         ; $ef
+    sbc ($12, s), y     ; $f3
+    pea $1234           ; $f4  push effective absolute address
+    sbc [$12], y        ; $f7
+    xce                 ; $fb  exchange Carry and Emulation bits
+    jsr ($1234, x)      ; $fc
+    sbc $123456, x      ; $ff
+    .endscope
+
+    .A16 ; akku 16 bit
+    .I16 ; index registers 16 bit
+
+    .scope
+    cop $12             ; $02  coprocessor operation
+    ora $12, s          ; $03
+    ora [$12]           ; $07
+    phd                 ; $0b  push direct page register
+    ora $123456         ; $0f
+    ora ($12, s), y     ; $13
+    ora [$12], y        ; $17
+    tcs                 ; $1b  transfer C to stack pointer
+    ora $123456, x      ; $1f
+    jsl $123456         ; $22
+    and $12, s          ; $23
+    and [$12]           ; $27
+    pld                 ; $2b  pull direct page register
+    and $123456         ; $2f
+    and ($12, s), y     ; $33
+    and [$12], y        ; $37
+    tsc                 ; $3b  transfer stack pointer to C
+    and $123456, x      ; $3f
+    wdm $12             ; $42  (reserved for future expansion)
+    eor $12, s          ; $43
+    mvp $1234, $5678    ; $44
+    eor [$12]           ; $47
+    phk                 ; $4b  push program bank register
+    eor $123456         ; $4f
+    eor ($12, s), y     ; $53
+    mvn $1234, $5678    ; $54
+    eor [$12], y        ; $57
+    tcd                 ; $5b  transfer C to direct page register
+    jml $123456         ; $5c
+    eor $123456, x      ; $5f
+    per LABEL           ; $62  push effective relative address
+    adc $12, s          ; $63
+    adc [$12]           ; $67
+    rtl                 ; $6b  return long (fetches 24-bit address from stack)
+    adc $123456         ; $6f
+    adc ($12, s), y     ; $73
+    adc [$12], y        ; $77
+    tdc                 ; $7b  transfer direct page register to C
+    adc $123456, x      ; $7f
+LABEL:
+    brl LABEL           ; $82  branch long (16-bit offset)
+    sta $12, s          ; $83
+    sta [$12]           ; $87
+    phb                 ; $8b  push data bank register
+    sta $123456         ; $8f
+    sta ($12, s), y     ; $93
+    sta [$12], y        ; $97
+    txy                 ; $9b  transfer X to Y
+    sta $123456, x      ; $9f
+    lda $12, s          ; $a3
+    lda [$12]           ; $a7
+    plb                 ; $ab  pull data bank register
+    lda $123456         ; $af
+    lda ($12, s), y     ; $b3
+    lda [$12], y        ; $b7
+    tyx                 ; $bb  transfer Y to X
+    lda $123456, x      ; $bf
+    rep #$12            ; $c2  clear bits in status register
+    cmp $12, s          ; $c3
+    cmp [$12]           ; $c7
+    wai                 ; $cb  wait for interrupt
+    cmp $123456         ; $cf
+    cmp ($12, s), y     ; $d3
+    pei ($12)           ; $d4  push effective indirect address
+    cmp [$12], y        ; $d7
+    stp                 ; $db  wait for reset
+    jmp [$1234]         ; $dc
+    cmp $123456, x      ; $df
+    sep #$12            ; $e2  set bits in status register
+    sbc $12, s          ; $e3
+    sbc [$12]           ; $e7
+    xba                 ; $eb  exchange high and low bytes of accumulator
+    sbc $123456         ; $ef
+    sbc ($12, s), y     ; $f3
+    pea $1234           ; $f4  push effective absolute address
+    sbc [$12], y        ; $f7
+    xce                 ; $fb  exchange Carry and Emulation bits
+    jsr ($1234, x)      ; $fc
+    sbc $123456, x      ; $ff
+    .endscope
+
+.endif
+
+.if (.cpu .bitand CPU_ISET_SWEET16)
+
+    RTN                 ; $00      Return to 6502 code.
+    BR   LABEL          ; $01 ea   Unconditional Branch.
+    BNC  LABEL          ; $02 ea   Branch if Carry=0.
+    BC   LABEL          ; $03 ea   Branch if Carry=1.
+    BP   LABEL          ; $04 ea   Branch if last result positive.
+    BM   LABEL          ; $0S ea   Branch if last result negative.
+    BZ   LABEL          ; $06 ea   Branch if last result zero.
+    BNZ  LABEL          ; $07 ea   Branch if last result non-zero.
+    BM1  LABEL          ; $08 ea   Branch if last result = -1.
+    BNM1 LABEL          ; $09 ea   Branch if last result not -1.
+    BK                  ; $0A      Execute 6502 BRK instruction.
+    RS                  ; $0B      Return from SWEET-16 subroutine.
+    BS   LABEL          ; $0C ea   Call SWEET-16 subroutine.
+LABEL:
+
+.repeat 16, count
+    SET  count,$1234    ; $1n lo hi  Rn <-- value.
+    LD   count          ; $2n        R0 <-- (Rn).
+    ST   count          ; $3n        Rn <-- (R0).
+    LD   @count         ; $4n        MA = (Rn), ROL <-- (MA), Rn <-- MA+1, R0H <-- 0.
+    ST   @count         ; $5n        MA = (Rn), MA <-- (R0L), Rn <-- MA+1.
+    LDD  @count         ; $6n        MA = (Rn), R0 <-- (MA, MA+1), Rn <-- MA+2.
+    STD  @count         ; $7n        MA = (Rn), MA,MA+l <-- (R0), Rn <-- MA+2.
+    POP  @count         ; $8n        MA = (Rn)-1, R0L <-- (MA), R0H <-- 0, Rn <-- MA.
+    STP  @count         ; $9n        MA <-- (Rn)-1, (MA) <-- R0L, Rn <-- MA.
+    ADD  count          ; $An        R0 <-- (R0) + (Rn).
+    SUB  count          ; $Bn        R0 <-- (R0) - (Rn).
+    POPD @count         ; $Cn        MA = (Rn)-2, MA,MA+l <-- R0, Rn <-- MA.
+    CPR  count          ; $Dn        R13 <-- (R0) - (Rn), R14 <-- status flags.
+    INR  count          ; $En        Rn <-- (Rn) + 1.
+    DCR  count          ; $Fn        Rn <-- (Rn) - 1.
+.endrepeat
+
+.endif
diff --git a/test/asm/cpudetect/cpudetect.s b/test/asm/cpudetect/cpudetect.s
index 7b2363b7f..3022038a2 100644
--- a/test/asm/cpudetect/cpudetect.s
+++ b/test/asm/cpudetect/cpudetect.s
@@ -8,6 +8,15 @@
    lda #$ea
 .endif
 
+.ifp02x
+   lax #$ea
+.endif
+
+.ifp6280
+   sax
+   cla
+.endif
+
 .ifpsc02
    jmp ($1234,x)
 .endif
@@ -16,18 +25,39 @@
    rmb0 $12
 .endif
 
-.ifp816
-   xba
+.ifpwc02
+   wai
+   stp
+.endif
+
+.ifpce02
+   ldz #$12
 .endif
 
 .ifp4510
    taz
 .endif
 
+.ifp45GS02
+   orq $1234
+.endif
+
 .ifpdtv
    sac #$00
 .endif
 
+.ifpm740
+   jsr $ff12
+.endif
+
+.ifp816
+   xba
+.endif
+
+.ifpsweet16
+   bk
+.endif
+
 
 ; step 2: check for bitwise compatibility of instructions sets
 ;         (made verbose for better reading with hexdump/hd(1))
@@ -44,6 +74,10 @@
    .byte 0,"CPU_ISET_6502X"
 .endif
 
+.if (.cpu .bitand CPU_ISET_6502DTV)
+   .byte 0,"CPU_ISET_6502DTV"
+.endif
+
 .if (.cpu .bitand CPU_ISET_65SC02)
    .byte 0,"CPU_ISET_65SC02"
 .endif
@@ -52,6 +86,30 @@
    .byte 0,"CPU_ISET_65C02"
 .endif
 
+.if (.cpu .bitand CPU_ISET_W65C02)
+   .byte 0,"CPU_ISET_W65C02"
+.endif
+
+.if (.cpu .bitand CPU_ISET_65CE02)
+   .byte 0,"CPU_ISET_65CE02"
+.endif
+
+.if (.cpu .bitand CPU_ISET_4510)
+   .byte 0,"CPU_ISET_4510"
+.endif
+
+.if (.cpu .bitand CPU_ISET_45GS02)
+   .byte 0,"CPU_ISET_45GS02"
+.endif
+
+.if (.cpu .bitand CPU_ISET_HUC6280)
+   .byte 0,"CPU_ISET_HUC6280"
+.endif
+
+.if (.cpu .bitand CPU_ISET_M740)
+   .byte 0,"CPU_ISET_M740"
+.endif
+
 .if (.cpu .bitand CPU_ISET_65816)
    .byte 0,"CPU_ISET_65816"
 .endif
@@ -60,15 +118,22 @@
    .byte 0,"CPU_ISET_SWEET16"
 .endif
 
-.if (.cpu .bitand CPU_ISET_HUC6280)
-   .byte 0,"CPU_ISET_HUC6280"
-.endif
 
-.if (.cpu .bitand CPU_ISET_4510)
-   .byte 0,"CPU_ISET_4510"
-.endif
+.include "allinst.inc"
 
-.if (.cpu .bitand CPU_ISET_6502DTV)
-   .byte 0,"CPU_ISET_6502DTV"
-.endif
 
+; step 3: switch through all supported cpus to verify the pseudo-op is there
+
+.p02
+.p02X
+.psc02
+.pc02
+.pwc02
+.pce02
+.p4510
+.p45GS02
+.pdtv
+.p6280
+.pm740
+.p816
+.psweet16
diff --git a/test/asm/cpudetect/huc6280-cpudetect.ref b/test/asm/cpudetect/huc6280-cpudetect.ref
index 646e0f48c..6ae287fdf 100644
Binary files a/test/asm/cpudetect/huc6280-cpudetect.ref and b/test/asm/cpudetect/huc6280-cpudetect.ref differ
diff --git a/test/asm/cpudetect/m740-cpudetect.ref b/test/asm/cpudetect/m740-cpudetect.ref
new file mode 100644
index 000000000..7788f3ed9
Binary files /dev/null and b/test/asm/cpudetect/m740-cpudetect.ref differ
diff --git a/test/asm/cpudetect/sweet16-cpudetect.ref b/test/asm/cpudetect/sweet16-cpudetect.ref
new file mode 100644
index 000000000..98d33127a
Binary files /dev/null and b/test/asm/cpudetect/sweet16-cpudetect.ref differ
diff --git a/test/asm/cpudetect/w65c02-cpudetect.ref b/test/asm/cpudetect/w65c02-cpudetect.ref
new file mode 100644
index 000000000..094210464
Binary files /dev/null and b/test/asm/cpudetect/w65c02-cpudetect.ref differ
diff --git a/test/asm/err/Makefile b/test/asm/err/Makefile
index 6d2430d34..9b6bc7fa9 100644
--- a/test/asm/err/Makefile
+++ b/test/asm/err/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the tests that MUST NOT compile
 
 ifneq ($(shell echo),)
@@ -18,9 +24,17 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
+  NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 CA65 := $(if $(wildcard ../../../bin/ca65*),..$S..$S..$Sbin$Sca65,ca65)
diff --git a/test/asm/err/bug505.s b/test/asm/err/bug505.s
new file mode 100644
index 000000000..8cb0e2f18
--- /dev/null
+++ b/test/asm/err/bug505.s
@@ -0,0 +1,28 @@
+; Test for #505 taken from the issue
+; Redefining a variable symbol "reopens" the old name space for cheap locals
+; Behavior should be: First definition of a variable symbol opens a new
+; scope for cheap locals, redefinitions of the same symbols do not.
+
+;this starts a new scope for cheap local lables
+SomeSymbol .set 4
+
+        jmp @CheapLocal1
+
+@CheapLocal0:
+
+        .byte $8b
+
+CheapLocalScopeBreaker0:
+
+CheapLocalScopeBreaker1:
+
+CheapLocalScopeBreaker2:
+
+CheapLocalScopeBreaker3:
+
+;this continues the same cheap scope as before, regardless of the many global labels in between
+SomeSymbol .set 5
+
+@CheapLocal1:
+
+        lda @CheapLocal0
diff --git a/test/asm/listing/060-ulabel.s b/test/asm/listing/060-ulabel.s
new file mode 100644
index 000000000..f2e66da87
--- /dev/null
+++ b/test/asm/listing/060-ulabel.s
@@ -0,0 +1,25 @@
+; Test new-style (@:) and legacy-style (:) unnamed labels.
+; Make sure that they have identical behavior.
+
+.ORG $0000
+
+@:  nop
+:   nop
+.ASSERT @<< = $0000, error
+.ASSERT @-- = $0000, error
+.ASSERT :<< = $0000, error
+.ASSERT :-- = $0000, error
+.ASSERT @< = $0001, error
+.ASSERT @- = $0001, error
+.ASSERT :< = $0001, error
+.ASSERT :- = $0001, error
+.ASSERT @> = $0002, error
+.ASSERT @+ = $0002, error
+.ASSERT :> = $0002, error
+.ASSERT :+ = $0002, error
+.ASSERT @>> = $0003, error
+.ASSERT @++ = $0003, error
+.ASSERT :>> = $0003, error
+.ASSERT :++ = $0003, error
+@:  nop
+:   nop
diff --git a/test/asm/listing/070-include-macro.inc b/test/asm/listing/070-include-macro.inc
new file mode 100644
index 000000000..0152a7965
--- /dev/null
+++ b/test/asm/listing/070-include-macro.inc
@@ -0,0 +1 @@
+foo:
diff --git a/test/asm/listing/070-include-macro.s b/test/asm/listing/070-include-macro.s
new file mode 100644
index 000000000..aad55cb52
--- /dev/null
+++ b/test/asm/listing/070-include-macro.s
@@ -0,0 +1,13 @@
+.macro IncludeFile FilePath
+    .proc bar
+        .include FilePath
+    .endproc
+.endmacro
+
+IncludeFile "070-include-macro.inc"
+
+.ifdef bar::foo
+    .out "bar::foo is defined"
+.else
+    .out "bar::foo is undefined"
+.endif
diff --git a/test/asm/listing/070-include-repeat.inc b/test/asm/listing/070-include-repeat.inc
new file mode 100644
index 000000000..0eb22a710
--- /dev/null
+++ b/test/asm/listing/070-include-repeat.inc
@@ -0,0 +1 @@
+.out "include file"
diff --git a/test/asm/listing/070-include-repeat.s b/test/asm/listing/070-include-repeat.s
new file mode 100644
index 000000000..20170255f
--- /dev/null
+++ b/test/asm/listing/070-include-repeat.s
@@ -0,0 +1,4 @@
+.repeat 3
+    .include "070-include-repeat.inc"
+    .out "main file"
+.endrepeat
diff --git a/test/asm/listing/080-sp-compat.s b/test/asm/listing/080-sp-compat.s
new file mode 100644
index 000000000..54c48e8c3
--- /dev/null
+++ b/test/asm/listing/080-sp-compat.s
@@ -0,0 +1,16 @@
+.include "zeropage.inc"
+
+; FIXME: there must be a less ugly way to do this
+.ifp4510
+.else
+.ifp45GS02
+.else
+
+.proc   _func
+        ldy     #0
+        lda     (sp),y
+        rts
+.endproc
+
+.endif
+.endif
diff --git a/test/asm/listing/110-capabilities.s b/test/asm/listing/110-capabilities.s
new file mode 100644
index 000000000..e3e306ca7
--- /dev/null
+++ b/test/asm/listing/110-capabilities.s
@@ -0,0 +1,39 @@
+
+; Error: Arguments to .CAPABILITY must be identifiers
+.if .cap()
+.endif
+
+; Error: Arguments to .CAPABILITY must be identifiers
+; Error: ')' expected
+.if .cap(
+.endif
+
+; Error: Not a valid capability name: CPU_HAS_BR
+.if .cap(cpu_has_br)
+.endif
+
+; Error: ')' expected
+; Error: Unexpected trailing garbage characters
+.if .cap(cpu_has_bra8 cpu_has_bra8)
+.endif
+
+; Ok
+.if .cap(cpu_has_bra8, CPU_HAS_PUSHXY, CPU_HAS_STZ, CPU_HAS_INA)
+.endif
+
+.setcpu "65SC02"
+.if !.cap(cpu_has_bra8)
+.error "Assembler says 65SC02 has no 8 bit bra"
+.endif
+.if !.cap(cpu_has_PUSHXY)
+.error "Assembler says 65SC02 has no phx"
+.endif
+.if !.cap(cpu_has_STZ)
+.error "Assembler says 65SC02 has no stz"
+.endif
+.if !.cap(cpu_has_INA)
+.error "Assembler says 65SC02 has no ina"
+.endif
+
+
+
diff --git a/test/asm/listing/Makefile b/test/asm/listing/Makefile
index 23aa3969c..202a44011 100644
--- a/test/asm/listing/Makefile
+++ b/test/asm/listing/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the assembler regression tests
 
 ifneq ($(shell echo),)
@@ -11,6 +17,7 @@ ifdef CMD_EXE
   RMDIR = -rmdir /q /s $(subst /,\,$1)
   TRUE = exit 0
   CAT = type $(subst /,\,$1)
+  NULLDEV = nul:
 else
   S = /
   EXE =
@@ -18,10 +25,20 @@ else
   RMDIR = $(RM) -r $1
   TRUE = true
   CAT = cat $1
+  NULLDEV = /dev/null
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
 endif
 
 ifdef QUIET
-#  .SILENT:
+  .SILENT:
+  NULLOUT = >$(NULLDEV)
+  NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 CA65 := $(if $(wildcard ../../../bin/ca65*),..$S..$S..$Sbin$Sca65,ca65)
@@ -76,48 +93,52 @@ endif
 endif
 
 ifneq ($(wildcard ref/$1.err-ref),)
-	$(ISEQUAL) ref/$1.err-ref $$(@:.bin=.err)
+	$(ISEQUAL) ref/$1.err-ref $$(@:.bin=.err) $(NULLERR)
 else
-	$(ISEQUAL) --empty $$(@:.bin=.err)
+	$(ISEQUAL) --empty $$(@:.bin=.err) $(NULLERR)
 endif
 
 ifneq ($(wildcard ref/$1.err2-ref),)
-	$(ISEQUAL) ref/$1.err2-ref $$(@:.bin=.err2)
+	$(ISEQUAL) ref/$1.err2-ref $$(@:.bin=.err2) $(NULLERR)
 else
-	$(ISEQUAL) --empty $$(@:.bin=.err2)
+	$(ISEQUAL) --empty $$(@:.bin=.err2) $(NULLERR)
 endif
 
 ifneq ($(wildcard ref/$1.bin-ref),)
-	$(ISEQUAL) --binary ref/$1.bin-ref $$@
+	$(ISEQUAL) --binary ref/$1.bin-ref $$@ $(NULLERR)
 endif
 
 #	rem $(indfo $(CAT) $(subst /,$$S,$$$(@:.bin=.ld65-err)))
 
 ifneq ($(wildcard ref/$1.ld65err-ref),)
+ifndef QUIET
 	@echo $(CAT) $$(@:.bin=.ld65-err)
 # FIXME: somehow this refuses to work in cmd.exe
 ifndef CMD_EXE
 	$(call CAT,$$(@:.bin=.ld65-err))
 	-diff -u ref/$1.ld65err-ref $$(@:.bin=.ld65-err)
 endif
-	$(ISEQUAL) --wildcards ref/$1.ld65err-ref $$(@:.bin=.ld65-err)
+endif
+	$(ISEQUAL) --wildcards ref/$1.ld65err-ref $$(@:.bin=.ld65-err) $(NULLERR)
 else
 ifneq ($(wildcard $(WORKDIR)/$1.ld65-err),)
-	$(ISEQUAL) --empty $$(@:.bin=.ld65-err)
+	$(ISEQUAL) --empty $$(@:.bin=.ld65-err) $(NULLERR)
 endif
 endif
 
 ifneq ($(wildcard ref/$1.ld65err2-ref),)
+ifndef QUIET
 	@echo $(CAT) $$(@:.bin=.ld65-err2)
 # FIXME: somehow this refuses to work in cmd.exe
 ifndef CMD_EXE
 	$(call CAT,$$(@:.bin=.ld65-err2))
 	-diff -u ref/$1.ld65err2-ref $$(@:.bin=.ld65-err2)
 endif
-	$(ISEQUAL) --wildcards ref/$1.ld65err2-ref $$(@:.bin=.ld65-err2)
+endif
+	$(ISEQUAL) --wildcards ref/$1.ld65err2-ref $$(@:.bin=.ld65-err2) $(NULLERR)
 else
 ifneq ($(wildcard $(WORKDIR)/$1.ld65-err2),)
-	$(ISEQUAL) --empty $$(@:.bin=.ld65-err2)
+	$(ISEQUAL) --empty $$(@:.bin=.ld65-err2) $(NULLERR)
 endif
 endif
 
@@ -143,37 +164,37 @@ endif
 endif
 
 ifneq ($(wildcard ref/$1.err-ref),)
-	$(ISEQUAL) ref/$1.err-ref $$(@:.bin=.list-err)
+	$(ISEQUAL) ref/$1.err-ref $$(@:.bin=.list-err) $(NULLERR)
 else
-	$(ISEQUAL) --empty $$(@:.bin=.list-err)
+	$(ISEQUAL) --empty $$(@:.bin=.list-err) $(NULLERR)
 endif
 
 ifneq ($(wildcard ref/$1.ld65err-ref),)
-	$(ISEQUAL) --wildcards ref/$1.ld65err-ref $$(@:.bin=.list-ld65-err)
+	$(ISEQUAL) --wildcards ref/$1.ld65err-ref $$(@:.bin=.list-ld65-err) $(NULLERR)
 else
 ifneq ($(wildcard $(WORKDIR)/$1.list-ld65-err),)
-	$(ISEQUAL) --empty $$(@:.bin=.list-ld65-err)
+	$(ISEQUAL) --empty $$(@:.bin=.list-ld65-err) $(NULLERR)
 endif
 endif
 
 ifneq ($(wildcard ref/$1.err2-ref),)
-	$(ISEQUAL) ref/$1.err2-ref $$(@:.bin=.list-err2)
+	$(ISEQUAL) ref/$1.err2-ref $$(@:.bin=.list-err2) $(NULLERR)
 else
-	$(ISEQUAL) --empty $$(@:.bin=.list-err2)
+	$(ISEQUAL) --empty $$(@:.bin=.list-err2) $(NULLERR)
 endif
 
 ifneq ($(wildcard ref/$1.ld65err2-ref),)
-	$(ISEQUAL) --wildcards ref/$1.ld65err2-ref $$(@:.bin=.list-ld65-err2)
+	$(ISEQUAL) --wildcards ref/$1.ld65err2-ref $$(@:.bin=.list-ld65-err2) $(NULLERR)
 else
 ifneq ($(wildcard $(WORKDIR)/$1.list-ld65-err2),)
-	$(ISEQUAL) --empty $$(@:.bin=.list-ld65-err2)
+	$(ISEQUAL) --empty $$(@:.bin=.list-ld65-err2) $(NULLERR)
 endif
 endif
 
 #	check if the result bin is the same as without listing file
 ifeq ($(wildcard control/$1.err),)
 ifeq ($(wildcard control/$1.err2),)
-	$(ISEQUAL) $$@ $$(@:.bin=.list-bin)
+	$(ISEQUAL) $$@ $$(@:.bin=.list-bin) $(NULLERR)
 endif
 endif
 
@@ -181,7 +202,7 @@ ifneq ($(wildcard ref/$1.list-ref),)
 #	we have a reference file, compare that, too
 
 #	remove first line which contains a version number
-	$(ISEQUAL) --skip=1 ref/$1.list-ref $$(@:.bin=.list-lst)
+	$(ISEQUAL) --skip=1 ref/$1.list-ref $$(@:.bin=.list-lst) $(NULLERR)
 endif
 
 endef # LISTING_template
diff --git a/test/asm/listing/control/110-capabilities.err b/test/asm/listing/control/110-capabilities.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/asm/listing/ref/010-paramcount.err2-ref b/test/asm/listing/ref/010-paramcount.err2-ref
index 304c9de61..fee657dbf 100644
--- a/test/asm/listing/ref/010-paramcount.err2-ref
+++ b/test/asm/listing/ref/010-paramcount.err2-ref
@@ -1,9 +1,9 @@
 010-paramcount.s:18: Warning: User warning: r1 is blank!
-010-paramcount.s:14: Note: Macro was defined here
-010-paramcount.s:8: Note: Macro was defined here
+010-paramcount.s:14: Note: Expanded from macro here
+010-paramcount.s:8: Note: Expanded from macro here
 010-paramcount.s:19: Warning: User warning: r1 is blank!
-010-paramcount.s:14: Note: Macro was defined here
-010-paramcount.s:8: Note: Macro was defined here
+010-paramcount.s:14: Note: Expanded from macro here
+010-paramcount.s:8: Note: Expanded from macro here
 010-paramcount.s:20: Warning: User warning: r1 is blank!
-010-paramcount.s:14: Note: Macro was defined here
-010-paramcount.s:8: Note: Macro was defined here
+010-paramcount.s:14: Note: Expanded from macro here
+010-paramcount.s:8: Note: Expanded from macro here
diff --git a/test/asm/listing/ref/070-include-macro.err-ref b/test/asm/listing/ref/070-include-macro.err-ref
new file mode 100644
index 000000000..5faf98c4b
--- /dev/null
+++ b/test/asm/listing/ref/070-include-macro.err-ref
@@ -0,0 +1 @@
+bar::foo is defined
diff --git a/test/asm/listing/ref/070-include-repeat.err-ref b/test/asm/listing/ref/070-include-repeat.err-ref
new file mode 100644
index 000000000..d42e70ee7
--- /dev/null
+++ b/test/asm/listing/ref/070-include-repeat.err-ref
@@ -0,0 +1,6 @@
+include file
+main file
+include file
+main file
+include file
+main file
diff --git a/test/asm/listing/ref/080-sp-compat.ld65err2-ref b/test/asm/listing/ref/080-sp-compat.ld65err2-ref
new file mode 100644
index 000000000..78935d2b3
--- /dev/null
+++ b/test/asm/listing/ref/080-sp-compat.ld65err2-ref
@@ -0,0 +1 @@
+ld65: Warning: runtime/sp-compat.s:16: Symbol 'sp' is deprecated - please use 'c_sp' instead
diff --git a/test/asm/listing/ref/110-capabilities.err2-ref b/test/asm/listing/ref/110-capabilities.err2-ref
new file mode 100644
index 000000000..e00e60e17
--- /dev/null
+++ b/test/asm/listing/ref/110-capabilities.err2-ref
@@ -0,0 +1,6 @@
+110-capabilities.s:3: Error: Arguments to .CAPABILITY must be identifiers
+110-capabilities.s:8: Error: Arguments to .CAPABILITY must be identifiers
+110-capabilities.s:8: Error: ')' expected
+110-capabilities.s:12: Error: Not a valid capability name: CPU_HAS_BR
+110-capabilities.s:17: Error: ')' expected
+110-capabilities.s:17: Error: Unexpected trailing garbage characters
diff --git a/test/asm/misc/Makefile b/test/asm/misc/Makefile
index 5a9d4f3ef..713d57812 100644
--- a/test/asm/misc/Makefile
+++ b/test/asm/misc/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the remaining asm tests that need special care in one way or another
 
 ifneq ($(shell echo),)
@@ -20,10 +26,17 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 SIM65FLAGS = -x 200000000
diff --git a/test/asm/opcodes/45GS02-opcodes.ref b/test/asm/opcodes/45GS02-opcodes.ref
new file mode 100644
index 000000000..a4a78d46c
Binary files /dev/null and b/test/asm/opcodes/45GS02-opcodes.ref differ
diff --git a/test/asm/opcodes/45GS02-opcodes.s b/test/asm/opcodes/45GS02-opcodes.s
new file mode 100644
index 000000000..6d42b80c4
--- /dev/null
+++ b/test/asm/opcodes/45GS02-opcodes.s
@@ -0,0 +1,377 @@
+.setcpu "45GS02"
+
+   brk
+   ora ($05,x)
+   cle
+   see
+   tsb $02
+   ora $02
+   asl $02
+   rmb0 $02
+   php
+   ora #$01
+   asl
+   tsy
+   tsb $1234
+   ora $1234
+   asl $1234
+   bbr0 $02,*+$34
+
+   bpl *+$32
+   ora ($06),y
+   ora ($07),z
+   lbpl *+$3133 ; bpl *+$3133
+   trb $02
+   ora $03,x
+   asl $03,x
+   rmb1 $02
+   clc
+   ora $1456,y
+   inc
+   inz
+   trb $1234
+   ora $1345,x
+   asl $1345,x
+   bbr1 $02,*+$34
+
+   jsr $1234
+   and ($05,x)
+   jsr ($2345)
+   jsr ($2456,x)
+   bit $02
+   and $02
+   rol $02
+   rmb2 $02
+   plp
+   and #$01
+   rol
+   tys
+   bit $1234
+   and $1234
+   rol $1234
+   bbr2 $02,*+$34
+
+   bmi *+$32
+   and ($06),y
+   and ($07),z
+   lbmi *+$3133 ; bmi *+$3133
+   bit $03,x
+   and $03,x
+   rol $03,x
+   rmb3 $02
+   sec
+   and $1456,y
+   dec
+   dez
+   bit $1345,x
+   and $1345,x
+   rol $1345,x
+   bbr3 $02,*+$34
+
+   rti
+   eor ($05,x)
+   neg
+   asr
+   asr $02
+   eor $02
+   lsr $02
+   rmb4 $02
+   pha
+   eor #$01
+   lsr
+   taz
+   jmp $1234
+   eor $1234
+   lsr $1234
+   bbr4 $02,*+$34
+
+   bvc *+$32
+   eor ($06),y
+   eor ($07),z
+   lbvc *+$3133 ; bvc *+$3133
+   asr $03,x
+   eor $03,x
+   lsr $03,x
+   rmb5 $02
+   cli
+   eor $1456,y
+   phy
+   tab
+   map
+   eor $1345,x
+   lsr $1345,x
+   bbr5 $02,*+$34
+
+   rts
+   adc ($05,x)
+   rtn #$09
+   bsr *+$3133
+   stz $02
+   adc $02
+   ror $02
+   rmb6 $02
+   pla
+   adc #$01
+   ror
+   tza
+   jmp ($2345)
+   adc $1234
+   ror $1234
+   bbr6 $02,*+$34
+
+   bvs *+$32
+   adc ($06),y
+   adc ($07),z
+   lbvs *+$3133 ; bvs *+$3133
+   stz $03,x
+   adc $03,x
+   ror $03,x
+   rmb7 $02
+   sei
+   adc $1456,y
+   ply
+   tba
+   jmp ($2456,x)
+   adc $1345,x
+   ror $1345,x
+   bbr7 $02,*+$34
+
+   bra *+$32
+   sta ($05,x)
+   sta ($0f,s),y
+   sta ($0f,sp),y
+   lbra *+$3133 ; bra *+$3133
+   sty $02
+   sta $02
+   stx $02
+   smb0 $02
+   dey
+   bit #$01
+   txa
+   sty $1345,x
+   sty $1234
+   sta $1234
+   stx $1234
+   bbs0 $02,*+$34
+
+   bcc *+$32
+   sta ($06),y
+   sta ($07),z
+   lbcc *+$3133 ; bcc *+$3133
+   sty $03,x
+   sta $03,x
+   stx $04,y
+   smb1 $02
+   tya
+   sta $1456,y
+   txs
+   stx $1456,y
+   stz $1234
+   sta $1345,x
+   stz $1345,x
+   bbs1 $02,*+$34
+
+   ldy #$01
+   lda ($05,x)
+   ldx #$01
+   ldz #$01
+   ldy $02
+   lda $02
+   ldx $02
+   smb2 $02
+   tay
+   lda #$01
+   tax
+   ldz $1234
+   ldy $1234
+   lda $1234
+   ldx $1234
+   bbs2 $02,*+$34
+
+   bcs *+$32
+   lda ($06),y
+   lda ($07),z
+   lbcs *+$3133 ; bcs *+$3133
+   ldy $03,x
+   lda $03,x
+   ldx $04,y
+   smb3 $02
+   clv
+   lda $1456,y
+   tsx
+   ldz $1345,x
+   ldy $1345,x
+   lda $1345,x
+   ldx $1456,y
+   bbs3 $02,*+$34
+
+   cpy #$01
+   cmp ($05,x)
+   cpz #$01
+   dew $02
+   cpy $02
+   cmp $02
+   dec $02
+   smb4 $02
+   iny
+   cmp #$01
+   dex
+   asw $1234
+   cpy $1234
+   cmp $1234
+   dec $1234
+   bbs4 $02,*+$34
+
+   bne *+$32
+   cmp ($06),y
+   cmp ($07),z
+   lbne *+$3133 ; bne *+$3133
+   cpz $02
+   cmp $03,x
+   dec $03,x
+   smb5 $02
+   cld
+   cmp $1456,y
+   phx
+   phz
+   cpz $1234
+   cmp $1345,x
+   dec $1345,x
+   bbs5 $02,*+$34
+
+   cpx #$01
+   sbc ($05,x)
+   lda ($0f,s),y
+   lda ($0f,sp),y
+   inw $02
+   cpx $02
+   sbc $02
+   inc $02
+   smb6 $02
+   inx
+   sbc #$01
+   eom
+   nop
+   row $1234
+   cpx $1234
+   sbc $1234
+   inc $1234
+   bbs6 $02,*+$34
+
+   beq *+$32
+   sbc ($06),y
+   sbc ($07),z
+   lbeq *+$3133 ; beq *+$3133
+   phd #$089a
+   phw #$089a
+   sbc $03,x
+   inc $03,x
+   smb7 $02
+   sed
+   sbc $1456,y
+   plx
+   plz
+   phd $1234
+   phw $1234
+   sbc $1345,x
+   inc $1345,x
+   bbs7 $02,*+$34
+
+   adc [$12],z
+
+   adcq $12
+   adcq $3456
+   adcq ($78)
+   adcq [$9a]
+
+   and [$12],z
+
+   andq $12
+   andq $3456
+   andq ($78)
+   andq [$9a]
+
+   aslq $12
+   aslq
+   aslq $3456
+   aslq $78,x
+   aslq $9abc,x
+
+   asrq
+   asrq $12
+   asrq $34,x
+
+   bitq $12
+   bitq $3456
+
+   cmp [$12],z
+
+   cmpq $12
+   cmpq $3456
+   cmpq ($78)
+   cmpq [$9a]
+
+   deq
+   deq $12
+   deq $3456
+   deq $78,x
+   deq $9abc,x
+
+   eor [$12],z
+
+   eorq $12
+   eorq $3456
+   eorq ($78)
+   eorq [$9a]
+
+   inq
+   inq $12
+   inq $3456
+   inq $78,x
+   inq $9abc,x
+
+   lda [$12],z
+
+   ldq $12
+   ldq $3456
+   ldq ($78),z
+   ldq [$9a],z
+
+   lsrq $12
+   lsrq
+   lsrq $3456
+   lsrq $78,x
+   lsrq $9abc,x
+
+   ora [$12],z
+
+   orq $12
+   orq $3456
+   orq ($78)
+   orq [$9a]
+
+   rolq $12
+   rolq
+   rolq $3456
+   rolq $78,x
+   rolq $9abc,x
+
+   rorq $12
+   rorq
+   rorq $3456
+   rorq $78,x
+   rorq $9abc,x
+
+   sbc [$12],z
+
+   sbcq $12
+   sbcq $3456
+   sbcq ($78)
+   sbcq [$9a]
+
+   sta [$12],z      ; EA 92 12
+
+   stq $12
+   stq $3456
+   stq ($78)
+   stq [$9a]
diff --git a/test/asm/opcodes/65ce02-opcodes.ref b/test/asm/opcodes/65ce02-opcodes.ref
new file mode 100644
index 000000000..b65b12e61
Binary files /dev/null and b/test/asm/opcodes/65ce02-opcodes.ref differ
diff --git a/test/asm/opcodes/65ce02-opcodes.s b/test/asm/opcodes/65ce02-opcodes.s
new file mode 100644
index 000000000..ecdd7d747
--- /dev/null
+++ b/test/asm/opcodes/65ce02-opcodes.s
@@ -0,0 +1,278 @@
+.setcpu "65CE02"
+
+   brk
+   ora ($05,x)
+   cle
+   see
+   tsb $02
+   ora $02
+   asl $02
+   rmb0 $02
+   php
+   ora #$01
+   asl
+   tsy
+   tsb $1234
+   ora $1234
+   asl $1234
+   bbr0 $02,*+$34
+
+   bpl *+$32
+   ora ($06),y
+   ora ($07),z
+   lbpl *+$3133 ; bpl *+$3133
+   trb $02
+   ora $03,x
+   asl $03,x
+   rmb1 $02
+   clc
+   ora $1456,y
+   inc
+   inz
+   trb $1234
+   ora $1345,x
+   asl $1345,x
+   bbr1 $02,*+$34
+
+   jsr $1234
+   and ($05,x)
+   jsr ($2345)
+   jsr ($2456,x)
+   bit $02
+   and $02
+   rol $02
+   rmb2 $02
+   plp
+   and #$01
+   rol
+   tys
+   bit $1234
+   and $1234
+   rol $1234
+   bbr2 $02,*+$34
+
+   bmi *+$32
+   and ($06),y
+   and ($07),z
+   lbmi *+$3133 ; bmi *+$3133
+   bit $03,x
+   and $03,x
+   rol $03,x
+   rmb3 $02
+   sec
+   and $1456,y
+   dec
+   dez
+   bit $1345,x
+   and $1345,x
+   rol $1345,x
+   bbr3 $02,*+$34
+
+   rti
+   eor ($05,x)
+   neg
+   asr
+   asr $02
+   eor $02
+   lsr $02
+   rmb4 $02
+   pha
+   eor #$01
+   lsr
+   taz
+   jmp $1234
+   eor $1234
+   lsr $1234
+   bbr4 $02,*+$34
+
+   bvc *+$32
+   eor ($06),y
+   eor ($07),z
+   lbvc *+$3133 ; bvc *+$3133
+   asr $03,x
+   eor $03,x
+   lsr $03,x
+   rmb5 $02
+   cli
+   eor $1456,y
+   phy
+   tab
+   aug
+   eor $1345,x
+   lsr $1345,x
+   bbr5 $02,*+$34
+
+   rts
+   adc ($05,x)
+   rtn #$09
+   bsr *+$3133
+   stz $02
+   adc $02
+   ror $02
+   rmb6 $02
+   pla
+   adc #$01
+   ror
+   tza
+   jmp ($2345)
+   adc $1234
+   ror $1234
+   bbr6 $02,*+$34
+
+   bvs *+$32
+   adc ($06),y
+   adc ($07),z
+   lbvs *+$3133 ; bvs *+$3133
+   stz $03,x
+   adc $03,x
+   ror $03,x
+   rmb7 $02
+   sei
+   adc $1456,y
+   ply
+   tba
+   jmp ($2456,x)
+   adc $1345,x
+   ror $1345,x
+   bbr7 $02,*+$34
+
+   bra *+$32
+   sta ($05,x)
+   sta ($0f,s),y
+   sta ($0f,sp),y
+   lbra *+$3133 ; bra *+$3133
+   sty $02
+   sta $02
+   stx $02
+   smb0 $02
+   dey
+   bit #$01
+   txa
+   sty $1345,x
+   sty $1234
+   sta $1234
+   stx $1234
+   bbs0 $02,*+$34
+
+   bcc *+$32
+   sta ($06),y
+   sta ($07),z
+   lbcc *+$3133 ; bcc *+$3133
+   sty $03,x
+   sta $03,x
+   stx $04,y
+   smb1 $02
+   tya
+   sta $1456,y
+   txs
+   stx $1456,y
+   stz $1234
+   sta $1345,x
+   stz $1345,x
+   bbs1 $02,*+$34
+
+   ldy #$01
+   lda ($05,x)
+   ldx #$01
+   ldz #$01
+   ldy $02
+   lda $02
+   ldx $02
+   smb2 $02
+   tay
+   lda #$01
+   tax
+   ldz $1234
+   ldy $1234
+   lda $1234
+   ldx $1234
+   bbs2 $02,*+$34
+
+   bcs *+$32
+   lda ($06),y
+   lda ($07),z
+   lbcs *+$3133 ; bcs *+$3133
+   ldy $03,x
+   lda $03,x
+   ldx $04,y
+   smb3 $02
+   clv
+   lda $1456,y
+   tsx
+   ldz $1345,x
+   ldy $1345,x
+   lda $1345,x
+   ldx $1456,y
+   bbs3 $02,*+$34
+
+   cpy #$01
+   cmp ($05,x)
+   cpz #$01
+   dew $02
+   cpy $02
+   cmp $02
+   dec $02
+   smb4 $02
+   iny
+   cmp #$01
+   dex
+   asw $1234
+   cpy $1234
+   cmp $1234
+   dec $1234
+   bbs4 $02,*+$34
+
+   bne *+$32
+   cmp ($06),y
+   cmp ($07),z
+   lbne *+$3133 ; bne *+$3133
+   cpz $02
+   cmp $03,x
+   dec $03,x
+   smb5 $02
+   cld
+   cmp $1456,y
+   phx
+   phz
+   cpz $1234
+   cmp $1345,x
+   dec $1345,x
+   bbs5 $02,*+$34
+
+   cpx #$01
+   sbc ($05,x)
+   lda ($0f,s),y
+   lda ($0f,sp),y
+   inw $02
+   cpx $02
+   sbc $02
+   inc $02
+   smb6 $02
+   inx
+   sbc #$01
+   eom
+   nop
+   row $1234
+   cpx $1234
+   sbc $1234
+   inc $1234
+   bbs6 $02,*+$34
+
+   beq *+$32
+   sbc ($06),y
+   sbc ($07),z
+   lbeq *+$3133 ; beq *+$3133
+   phd #$089a
+   phw #$089a
+   sbc $03,x
+   inc $03,x
+   smb7 $02
+   sed
+   sbc $1456,y
+   plx
+   plz
+   phd $1234
+   phw $1234
+   sbc $1345,x
+   inc $1345,x
+   bbs7 $02,*+$34
diff --git a/test/asm/opcodes/Makefile b/test/asm/opcodes/Makefile
index 00be96d91..e9978ee95 100644
--- a/test/asm/opcodes/Makefile
+++ b/test/asm/opcodes/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the assembler regression tests
 
 ifneq ($(shell echo),)
@@ -14,8 +20,17 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
+  NULLOUT = >$(NULLDEV)
+  NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 CA65 := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65)
diff --git a/test/asm/opcodes/m740-opcodes.ref b/test/asm/opcodes/m740-opcodes.ref
new file mode 100644
index 000000000..b3cffc9b6
Binary files /dev/null and b/test/asm/opcodes/m740-opcodes.ref differ
diff --git a/test/asm/opcodes/m740-opcodes.s b/test/asm/opcodes/m740-opcodes.s
index df6d71488..e4f8562cc 100644
--- a/test/asm/opcodes/m740-opcodes.s
+++ b/test/asm/opcodes/m740-opcodes.s
@@ -1,260 +1,565 @@
-.setcpu "65C02"
-; copy of 65c02, comments note changes to the m740 according to
-; http://documentation.renesas.com/doc/products/mpumcu/rej09b0322_740sm.pdf
+; da65 V2.19 - Git 89651fd8b
+; Created:    2025-06-16 20:10:42
+; Input file: testfile
+; Page:       1
 
-   brk
-   ora     ($12,x)
-   .byte   $02,$00,$00 ; jsr zp,ind
-   .byte   $03,$00,$00 ; bbs 0,a
-   tsb     $12         ; .byte $04
-   ora     $12
-   asl     $12
-   rmb0    $12         ; bbs 0,zp
-   php
-   ora     #$12
-   asl     a
-   .byte   $0B,$00,$00 ; seb 0,a
-   tsb     $3456       ; .byte $0c
-   ora     $3456
-   asl     $3456
-   bbr0    $12,*+122   ; seb 0,zp
-   bpl     *+122
-   ora     ($12),y
-   ora     ($12)       ; clt
-   .byte   $13,$00,$00 ; bbc 0,a
-   trb     $12         ; .byte $14
-   ora     $12,x
-   asl     $12,x
-   rmb1    $12         ; bbc 0,zp
-   clc
-   ora     $3456,y
-   inc     a
-   .byte   $1B,$00,$00 ; clb 0,a
-   trb     $3456       ; .byte $1c
-   ora     $3456,x
-   asl     $3456,x
-   bbr1    $12,*+122   ; clb 0,zp
-   jsr     $3456
-   and     ($12,x)
-   .byte   $22,$00,$00 ; jsr sp
-   .byte   $23,$00,$00 ; bbs 1,a
-   bit     $12
-   and     $12
-   rol     $12
-   rmb2    $12         ; bbs 1,zp
-   plp
-   and     #$12
-   rol     a
-   .byte   $2B,$00,$00 ; seb 1,a
-   bit     $3456
-   and     $3456
-   rol     $3456
-   bbr2    $12,*+122   ; seb 1,zp
-   bmi     *+122
-   and     ($12),y
-   and     ($12)       ; set
-   .byte   $33,$00,$00 ; bbc 1,a
-   bit     $12,x       ; .byte $34
-   and     $12,x
-   rol     $12,x
-   rmb3    $12         ; bbc 1,zp
-   sec
-   and     $3456,y
-   dec     a
-   .byte   $3B,$00,$00 ; clb 1,a
-   bit     $3456,x     ; ldm zp
-   and     $3456,x
-   rol     $3456,x
-   bbr3    $12,*+122   ; clb 1,zp
-   rti
-   eor     ($12,x)
-   .byte   $42,$00,$00 ; stp
-   .byte   $43,$00,$00 ; bbs 2,a
-   .byte   $44,$00,$00 ; com zp
-   eor     $12
-   lsr     $12
-   rmb4    $12         ; bbs 2,zp
-   pha
-   eor     #$12
-   lsr     a
-   .byte   $4B,$00,$00 ; seb 2,a
-   jmp     $3456
-   eor     $3456
-   lsr     $3456
-   bbr4    $12,*+122   ; seb 2,zp
-   bvc     *+122
-   eor     ($12),y
-   eor     ($12)       ; .byte $52
-   .byte   $53,$00,$00 ; bbc 2,a
-   .byte   $54,$00,$00
-   eor     $12,x
-   lsr     $12,x
-   rmb5    $12         ; bbc 2,zp
-   cli
-   eor     $3456,y
-   phy
-   .byte   $5B,$00,$00 ; clb 2,a
-   .byte   $5C,$00,$00
-   eor     $3456,x
-   lsr     $3456,x
-   bbr5    $12,*+122   ; clb 2,zp
-   rts
-   adc     ($12,x)
-   .byte   $62,$00,$00 ; mul zp,x
-   .byte   $63,$00,$00 ; bbs 3,a
-   stz     $12         ; tst zp
-   adc     $12
-   ror     $12
-   rmb6    $12         ; bbs 3,zp
-   pla
-   adc     #$12
-   ror     a
-   .byte   $6B,$00,$00 ; seb 3,a
-   jmp     ($3456)
-   adc     $3456
-   ror     $3456
-   bbr6    $12,*+122   ; seb 3,zp
-   bvs     *+122
-   adc     ($12),y
-   adc     ($12)       ; .byte $72
-   .byte   $73,$00,$00 ; bbc 3,a
-   stz     $12,x       ; .byte $74
-   adc     $12,x
-   ror     $12,x
-   rmb7    $12         ; bbc 3,zp
-   sei
-   adc     $3456,y
-   ply
-   .byte   $7B,$00,$00 ; clb 3,a
-   jmp     ($3456,x)   ; .byte $7c
-   adc     $3456,x
-   ror     $3456,x
-   bbr7    $12,*+122   ; clb 3,zp
-   bra     *+122
-   sta     ($12,x)
-   .byte   $82,$00,$00 ; rrf zp
-   .byte   $83,$00,$00 ; bbs 4,a
-   sty     $12
-   sta     $12
-   stx     $12
-   smb0    $12         ; bbs 4,zp
-   dey
-   bit     #$12
-   txa
-   .byte   $8B,$00,$00 ; seb 4,a
-   sty     $3456
-   sta     $3456
-   stx     $3456
-   bbs0    $12,*+122   ; seb 4,zp
-   bcc     *+122
-   sta     ($12),y
-   sta     ($12)       ; .byte $92
-   .byte   $93,$00,$00 ; bbc 4,a
-   sty     $12,x
-   sta     $12,x
-   stx     $12,y
-   smb1    $12         ; bbc 4,zp
-   tya
-   sta     $3456,y
-   txs
-   .byte   $9B,$00,$00 ; clb 4,a
-   stz     $3456       ; .byte $9c
-   sta     $3456,x
-   stz     $3456,x     ; .byte $9e
-   bbs1    $12,*+122   ; clb 4,zp
-   ldy     #$12
-   lda     ($12,x)
-   ldx     #$12
-   .byte   $A3,$00,$00 ; bbs 5,a
-   ldy     $12
-   lda     $12
-   ldx     $12
-   smb2    $12         ; bbs 5,zp
-   tay
-   lda     #$12
-   tax
-   .byte   $AB,$00,$00 ; seb 5,a
-   ldy     $3456
-   lda     $3456
-   ldx     $3456
-   bbs2    $12,*+122   ; seb 5,zp
-   bcs     *+122
-   lda     ($12),y
-   lda     ($12)       ; .byte $b2
-   .byte   $B3,$00,$00 ; bbc 5,a
-   ldy     $12,x
-   lda     $12,x
-   ldx     $12,y
-   smb3    $12         ; bbc 5,zp
-   clv
-   lda     $3456,y
-   tsx
-   .byte   $BB,$00,$00 ; clb 5,a
-   ldy     $3456,x
-   lda     $3456,x
-   ldx     $3456,y
-   bbs3    $12,*+122   ; clb 5,zp
-   cpy     #$12
-   cmp     ($12,x)
-   .byte   $C2,$00,$00 ; wit
-   .byte   $C3,$00,$00 ; bbs 6,a
-   cpy     $12
-   cmp     $12
-   dec     $12
-   smb4    $12         ; bbs 6,zp
-   iny
-   cmp     #$12
-   dex
-   .byte   $CB,$00,$00 ; seb 6,a
-   cpy     $3456
-   cmp     $3456
-   dec     $3456
-   bbs4    $12,*+122   ; seb 6,zp
-   bne     *+122
-   cmp     ($12),y
-   cmp     ($12)       ; .byte $d2
-   .byte   $D3,$00,$00 ; bbc 6,a
-   .byte   $D4,$00,$00
-   cmp     $12,x
-   dec     $12,x
-   smb5    $12         ; bbc 6,zp
-   cld
-   cmp     $3456,y
-   phx
-   .byte   $DB,$00,$00 ; clb 6,a
-   .byte   $DC,$00,$00
-   cmp     $3456,x
-   dec     $3456,x
-   bbs5    $12,*+122   ; clb 6,zp
-   cpx     #$12
-   sbc     ($12,x)
-   .byte   $E2,$00,$00 ; div zp,x
-   .byte   $E3,$00,$00 ; bbs 7,a
-   cpx     $12
-   sbc     $12
-   inc     $12
-   smb6    $12         ; bbs 7,zp
-   inx
-   sbc     #$12
-   nop
-   .byte   $EB,$00,$00 ; seb 7,a
-   cpx     $3456
-   sbc     $3456
-   inc     $3456
-   bbs6    $12,*+122   ; seb 7,zp
-   beq     *+122
-   sbc     ($12),y
-   sbc     ($12)       ; .byte $f2
-   .byte   $F3,$00,$00 ; bbc 7,a
-   .byte   $F4,$00,$00
-   sbc     $12,x
-   inc     $12,x
-   smb7    $12         ; bbc 7,zp
-   sed
-   sbc     $3456,y
-   plx
-   .byte   $FB,$00,$00 ; clb 7,a
-   .byte   $FC,$00,$00
-   sbc     $3456,x
-   inc     $3456,x
-   bbs7    $12,*+122   ; clb 7,zp
+
+        .setcpu "m740"
+
+L000C           := $000C
+L040C           := $040C
+LFF0C           := $FF0C
+        brk
+        .byte   $0C
+        .byte   $04
+        ora     (L000C,x)
+        .byte   $04
+        jsr     (L000C)
+
+        .byte   $04
+        bbs0    a, L8018
+        .byte   $04
+        .byte   $04
+        .byte   $0C
+        .byte   $04
+        ora     L000C
+        .byte   $04
+        asl     L000C
+        .byte   $04
+        bbs0    L000C, L801C
+L8018:  php
+        .byte   $0C
+        .byte   $04
+        .byte   $09
+L801C:  .byte   $0C
+        .byte   $04
+        asl     a
+        .byte   $0C
+        .byte   $04
+        seb0    a
+        .byte   $0C
+        .byte   $04
+        .byte   $0C
+        .byte   $0C
+        .byte   $04
+        ora     L040C
+        asl     L040C
+        seb0    L000C
+        .byte   $04
+        bpl     L803E
+        .byte   $04
+        ora     (L000C),y
+        .byte   $04
+        clt
+        .byte   $0C
+        .byte   $04
+        bbc0    a, L8048
+        .byte   $04
+        .byte   $14
+        .byte   $0C
+L803E:  .byte   $04
+        ora     L000C,x
+        .byte   $04
+        asl     L000C,x
+        .byte   $04
+        bbc0    L000C, L804C
+L8048:  clc
+        .byte   $0C
+        .byte   $04
+        .byte   $19
+L804C:  .byte   $0C
+        .byte   $04
+        inc     a
+        .byte   $0C
+        .byte   $04
+        clb0    a
+        .byte   $0C
+        .byte   $04
+        .byte   $1C
+        .byte   $0C
+        .byte   $04
+        ora     L040C,x
+        asl     L040C,x
+        clb0    L000C
+        .byte   $04
+        jsr     L040C
+        and     (L000C,x)
+        .byte   $04
+        jsr     LFF0C
+        .byte   $04
+        bbs1    a, L8078
+        .byte   $04
+        bit     L000C
+        .byte   $04
+        and     L000C
+        .byte   $04
+        rol     L000C
+        .byte   $04
+        bbs1    L000C, L807C
+L8078:  plp
+        .byte   $0C
+        .byte   $04
+        .byte   $29
+L807C:  .byte   $0C
+        .byte   $04
+        rol     a
+        .byte   $0C
+        .byte   $04
+        seb1    a
+        .byte   $0C
+        .byte   $04
+        bit     L040C
+        and     L040C
+        rol     L040C
+        seb1    L000C
+        .byte   $04
+        bmi     L809E
+        .byte   $04
+        and     (L000C),y
+        .byte   $04
+        set
+        .byte   $0C
+        .byte   $04
+        bbc1    a, L80A8
+        .byte   $04
+        .byte   $34
+        .byte   $0C
+L809E:  .byte   $04
+        and     L000C,x
+        .byte   $04
+        rol     L000C,x
+        .byte   $04
+        bbc1    L000C, L80AC
+L80A8:  sec
+        .byte   $0C
+        .byte   $04
+        .byte   $39
+L80AC:  .byte   $0C
+        .byte   $04
+        dec     a
+        .byte   $0C
+        .byte   $04
+        clb1    a
+        .byte   $0C
+        .byte   $04
+        ldm     L000C, #$04
+        and     L040C,x
+        rol     L040C,x
+        clb1    L000C
+        .byte   $04
+        rti
+
+        .byte   $0C
+        .byte   $04
+        eor     (L000C,x)
+        .byte   $04
+        stp
+        .byte   $0C
+        .byte   $04
+        bbs2    a, L80D8
+        .byte   $04
+        com     L000C
+        .byte   $04
+        eor     L000C
+        .byte   $04
+        lsr     L000C
+        .byte   $04
+        bbs2    L000C, L80DC
+L80D8:  pha
+        .byte   $0C
+        .byte   $04
+        .byte   $49
+L80DC:  .byte   $0C
+        .byte   $04
+        lsr     a
+        .byte   $0C
+        .byte   $04
+        seb2    a
+        .byte   $0C
+        .byte   $04
+        jmp     L040C
+
+        eor     L040C
+        lsr     L040C
+        seb2    L000C
+        .byte   $04
+        bvc     L80FE
+        .byte   $04
+        eor     (L000C),y
+        .byte   $04
+        .byte   $52
+        .byte   $0C
+        .byte   $04
+        bbc2    a, L8108
+        .byte   $04
+        .byte   $54
+        .byte   $0C
+L80FE:  .byte   $04
+        eor     L000C,x
+        .byte   $04
+        lsr     L000C,x
+        .byte   $04
+        bbc2    L000C, L810C
+L8108:  cli
+        .byte   $0C
+        .byte   $04
+        .byte   $59
+L810C:  .byte   $0C
+        .byte   $04
+        .byte   $5A
+        .byte   $0C
+        .byte   $04
+        clb2    a
+        .byte   $0C
+        .byte   $04
+        .byte   $5C
+        .byte   $0C
+        .byte   $04
+        eor     L040C,x
+        lsr     L040C,x
+        clb2    L000C
+        .byte   $04
+        rts
+
+        .byte   $0C
+        .byte   $04
+        adc     (L000C,x)
+        .byte   $04
+        .byte   $62
+        .byte   $0C
+        .byte   $04
+        bbs3    a, L8138
+        .byte   $04
+        tst     L000C
+        .byte   $04
+        adc     L000C
+        .byte   $04
+        ror     L000C
+        .byte   $04
+        bbs3    L000C, L813C
+L8138:  pla
+        .byte   $0C
+        .byte   $04
+        .byte   $69
+L813C:  .byte   $0C
+        .byte   $04
+        ror     a
+        .byte   $0C
+        .byte   $04
+        seb3    a
+        .byte   $0C
+        .byte   $04
+        jmp     (L040C)
+
+        adc     L040C
+        ror     L040C
+        seb3    L000C
+        .byte   $04
+        bvs     L815E
+        .byte   $04
+        adc     (L000C),y
+        .byte   $04
+        .byte   $72
+        .byte   $0C
+        .byte   $04
+        bbc3    a, L8168
+        .byte   $04
+        .byte   $74
+        .byte   $0C
+L815E:  .byte   $04
+        adc     L000C,x
+        .byte   $04
+        ror     L000C,x
+        .byte   $04
+        bbc3    L000C, L816C
+L8168:  sei
+        .byte   $0C
+        .byte   $04
+        .byte   $79
+L816C:  .byte   $0C
+        .byte   $04
+        .byte   $7A
+        .byte   $0C
+        .byte   $04
+        clb3    a
+        .byte   $0C
+        .byte   $04
+        .byte   $7C
+        .byte   $0C
+        .byte   $04
+        adc     L040C,x
+        ror     L040C,x
+        clb3    L000C
+        .byte   $04
+        bra     L818E
+        .byte   $04
+        sta     (L000C,x)
+        .byte   $04
+        rrf     L000C
+        .byte   $04
+        bbs4    a, L8198
+        .byte   $04
+        sty     L000C
+L818E:  .byte   $04
+        sta     L000C
+        .byte   $04
+        stx     L000C
+        .byte   $04
+        bbs4    L000C, L819C
+L8198:  dey
+        .byte   $0C
+        .byte   $04
+        .byte   $89
+L819C:  .byte   $0C
+        .byte   $04
+        txa
+        .byte   $0C
+        .byte   $04
+        seb4    a
+        .byte   $0C
+        .byte   $04
+        sty     L040C
+        sta     L040C
+        stx     L040C
+        seb4    L000C
+        .byte   $04
+        bcc     L81BE
+        .byte   $04
+        sta     (L000C),y
+        .byte   $04
+        .byte   $92
+        .byte   $0C
+        .byte   $04
+        bbc4    a, L81C8
+        .byte   $04
+        sty     L000C,x
+L81BE:  .byte   $04
+        sta     L000C,x
+        .byte   $04
+        stx     L000C,y
+        .byte   $04
+        bbc4    L000C, L81CC
+L81C8:  tya
+        .byte   $0C
+        .byte   $04
+        .byte   $99
+L81CC:  .byte   $0C
+        .byte   $04
+        txs
+        .byte   $0C
+        .byte   $04
+        clb4    a
+        .byte   $0C
+        .byte   $04
+        .byte   $9C
+        .byte   $0C
+        .byte   $04
+        sta     L040C,x
+        .byte   $9E
+        .byte   $0C
+        .byte   $04
+        clb4    L000C
+        .byte   $04
+        ldy     #$0C
+        .byte   $04
+        lda     (L000C,x)
+        .byte   $04
+        ldx     #$0C
+        .byte   $04
+        bbs5    a, L81F8
+        .byte   $04
+        ldy     L000C
+        .byte   $04
+        lda     L000C
+        .byte   $04
+        ldx     L000C
+        .byte   $04
+        bbs5    L000C, L81FC
+L81F8:  tay
+        .byte   $0C
+        .byte   $04
+        .byte   $A9
+L81FC:  .byte   $0C
+        .byte   $04
+        tax
+        .byte   $0C
+        .byte   $04
+        seb5    a
+        .byte   $0C
+        .byte   $04
+        ldy     L040C
+        lda     L040C
+        ldx     L040C
+        seb5    L000C
+        .byte   $04
+        bcs     L821E
+        .byte   $04
+        lda     (L000C),y
+        .byte   $04
+        jmp     (L000C)
+
+        .byte   $04
+        bbc5    a, L8228
+        .byte   $04
+        ldy     L000C,x
+L821E:  .byte   $04
+        lda     L000C,x
+        .byte   $04
+        ldx     L000C,y
+        .byte   $04
+        bbc5    L000C, L822C
+L8228:  clv
+        .byte   $0C
+        .byte   $04
+        .byte   $B9
+L822C:  .byte   $0C
+        .byte   $04
+        tsx
+        .byte   $0C
+        .byte   $04
+        clb5    a
+        .byte   $0C
+        .byte   $04
+        ldy     L040C,x
+        lda     L040C,x
+        ldx     L040C,y
+        clb5    L000C
+        .byte   $04
+        cpy     #$0C
+        .byte   $04
+        cmp     (L000C,x)
+        .byte   $04
+        slw
+        .byte   $0C
+        .byte   $04
+        bbs6    a, L8258
+        .byte   $04
+        cpy     L000C
+        .byte   $04
+        cmp     L000C
+        .byte   $04
+        dec     L000C
+        .byte   $04
+        bbs6    L000C, L825C
+L8258:  iny
+        .byte   $0C
+        .byte   $04
+        .byte   $C9
+L825C:  .byte   $0C
+        .byte   $04
+        dex
+        .byte   $0C
+        .byte   $04
+        seb6    a
+        .byte   $0C
+        .byte   $04
+        cpy     L040C
+        cmp     L040C
+        dec     L040C
+        seb6    L000C
+        .byte   $04
+        bne     L827E
+        .byte   $04
+        cmp     (L000C),y
+        .byte   $04
+        .byte   $D2
+        .byte   $0C
+        .byte   $04
+        bbc6    a, L8288
+        .byte   $04
+        .byte   $D4
+        .byte   $0C
+L827E:  .byte   $04
+        cmp     L000C,x
+        .byte   $04
+        dec     L000C,x
+        .byte   $04
+        bbc6    L000C, L828C
+L8288:  cld
+        .byte   $0C
+        .byte   $04
+        .byte   $D9
+L828C:  .byte   $0C
+        .byte   $04
+        .byte   $DA
+        .byte   $0C
+        .byte   $04
+        clb6    a
+        .byte   $0C
+        .byte   $04
+        .byte   $DC
+        .byte   $0C
+        .byte   $04
+        cmp     L040C,x
+        dec     L040C,x
+        clb6    L000C
+        .byte   $04
+        cpx     #$0C
+        .byte   $04
+        sbc     (L000C,x)
+        .byte   $04
+        fst
+        .byte   $0C
+        .byte   $04
+        bbs7    a, L82B8
+        .byte   $04
+        cpx     L000C
+        .byte   $04
+        sbc     L000C
+        .byte   $04
+        inc     L000C
+        .byte   $04
+        bbs7    L000C, L82BC
+L82B8:  inx
+        .byte   $0C
+        .byte   $04
+        .byte   $E9
+L82BC:  .byte   $0C
+        .byte   $04
+        nop
+        .byte   $0C
+        .byte   $04
+        seb7    a
+        .byte   $0C
+        .byte   $04
+        cpx     L040C
+        sbc     L040C
+        inc     L040C
+        seb7    L000C
+        .byte   $04
+        beq     L82DE
+        .byte   $04
+        sbc     (L000C),y
+        .byte   $04
+        .byte   $F2
+        .byte   $0C
+        .byte   $04
+        bbc7    a, L82E8
+        .byte   $04
+        .byte   $F4
+        .byte   $0C
+L82DE:  .byte   $04
+        sbc     L000C,x
+        .byte   $04
+        inc     L000C,x
+        .byte   $04
+        bbc7    L000C, L82EC
+L82E8:  sed
+        .byte   $0C
+        .byte   $04
+        .byte   $F9
+L82EC:  .byte   $0C
+        .byte   $04
+        .byte   $FA
+        .byte   $0C
+        .byte   $04
+        clb7    a
+        .byte   $0C
+        .byte   $04
+        .byte   $FC
+        .byte   $0C
+        .byte   $04
+        sbc     L040C,x
+        inc     L040C,x
+        clb7    L000C
+        .byte   $04
diff --git a/test/asm/opcodes/sweet16-opcodes.ref b/test/asm/opcodes/sweet16-opcodes.ref
new file mode 100644
index 000000000..af128b55f
Binary files /dev/null and b/test/asm/opcodes/sweet16-opcodes.ref differ
diff --git a/test/asm/opcodes/sweet16-opcodes.s b/test/asm/opcodes/sweet16-opcodes.s
new file mode 100644
index 000000000..f283c6093
--- /dev/null
+++ b/test/asm/opcodes/sweet16-opcodes.s
@@ -0,0 +1,34 @@
+.setcpu "SWEET16"
+
+    RTN                 ; $00      Return to 6502 code.
+    BR   LABEL          ; $01 ea   Unconditional Branch.
+    BNC  LABEL          ; $02 ea   Branch if Carry=0.
+    BC   LABEL          ; $03 ea   Branch if Carry=1.
+    BP   LABEL          ; $04 ea   Branch if last result positive.
+    BM   LABEL          ; $0S ea   Branch if last result negative.
+    BZ   LABEL          ; $06 ea   Branch if last result zero.
+    BNZ  LABEL          ; $07 ea   Branch if last result non-zero.
+    BM1  LABEL          ; $08 ea   Branch if last result = -1.
+    BNM1 LABEL          ; $09 ea   Branch if last result not -1.
+    BK                  ; $0A      Execute 6502 BRK instruction.
+    RS                  ; $0B      Return from SWEET-16 subroutine.
+    BS   LABEL          ; $0C ea   Call SWEET-16 subroutine.
+LABEL:
+
+.repeat 16, count
+    SET  count,$1234    ; $1n lo hi  Rn <-- value.
+    LD   count          ; $2n        R0 <-- (Rn).
+    ST   count          ; $3n        Rn <-- (R0).
+    LD   @count         ; $4n        MA = (Rn), ROL <-- (MA), Rn <-- MA+1, R0H <-- 0.
+    ST   @count         ; $5n        MA = (Rn), MA <-- (R0L), Rn <-- MA+1.
+    LDD  @count         ; $6n        MA = (Rn), R0 <-- (MA, MA+1), Rn <-- MA+2.
+    STD  @count         ; $7n        MA = (Rn), MA,MA+l <-- (R0), Rn <-- MA+2.
+    POP  @count         ; $8n        MA = (Rn)-1, R0L <-- (MA), R0H <-- 0, Rn <-- MA.
+    STP  @count         ; $9n        MA <-- (Rn)-1, (MA) <-- R0L, Rn <-- MA.
+    ADD  count          ; $An        R0 <-- (R0) + (Rn).
+    SUB  count          ; $Bn        R0 <-- (R0) - (Rn).
+    POPD @count         ; $Cn        MA = (Rn)-2, MA,MA+l <-- R0, Rn <-- MA.
+    CPR  count          ; $Dn        R13 <-- (R0) - (Rn), R14 <-- status flags.
+    INR  count          ; $En        Rn <-- (Rn) + 1.
+    DCR  count          ; $Fn        Rn <-- (Rn) - 1.
+.endrepeat
diff --git a/test/asm/opcodes/w65c02-opcodes.ref b/test/asm/opcodes/w65c02-opcodes.ref
new file mode 100644
index 000000000..2d44045cb
Binary files /dev/null and b/test/asm/opcodes/w65c02-opcodes.ref differ
diff --git a/test/asm/opcodes/w65c02-opcodes.s b/test/asm/opcodes/w65c02-opcodes.s
new file mode 100644
index 000000000..0fe741518
--- /dev/null
+++ b/test/asm/opcodes/w65c02-opcodes.s
@@ -0,0 +1,258 @@
+.setcpu "W65C02"
+
+   brk
+   ora     ($12,x)
+   .byte   $02
+   .byte   $03
+   tsb     $12
+   ora     $12
+   asl     $12
+   rmb0    $12
+   php
+   ora     #$12
+   asl     a
+   .byte   $0B
+   tsb     $3456
+   ora     $3456
+   asl     $3456
+   bbr0    $12,*+122
+   bpl     *+122
+   ora     ($12),y
+   ora     ($12)
+   .byte   $13
+   trb     $12
+   ora     $12,x
+   asl     $12,x
+   rmb1    $12
+   clc
+   ora     $3456,y
+   inc     a
+   .byte   $1B
+   trb     $3456
+   ora     $3456,x
+   asl     $3456,x
+   bbr1    $12,*+122
+   jsr     $3456
+   and     ($12,x)
+   .byte   $22
+   .byte   $23
+   bit     $12
+   and     $12
+   rol     $12
+   rmb2    $12
+   plp
+   and     #$12
+   rol     a
+   .byte   $2B
+   bit     $3456
+   and     $3456
+   rol     $3456
+   bbr2    $12,*+122
+   bmi     *+122
+   and     ($12),y
+   and     ($12)
+   .byte   $33
+   bit     $12,x
+   and     $12,x
+   rol     $12,x
+   rmb3    $12
+   sec
+   and     $3456,y
+   dec     a
+   .byte   $3B
+   bit     $3456,x
+   and     $3456,x
+   rol     $3456,x
+   bbr3    $12,*+122
+   rti
+   eor     ($12,x)
+   .byte   $42
+   .byte   $43
+   .byte   $44
+   eor     $12
+   lsr     $12
+   rmb4    $12
+   pha
+   eor     #$12
+   lsr     a
+   .byte   $4B
+   jmp     $3456
+   eor     $3456
+   lsr     $3456
+   bbr4    $12,*+122
+   bvc     *+122
+   eor     ($12),y
+   eor     ($12)
+   .byte   $53
+   .byte   $54
+   eor     $12,x
+   lsr     $12,x
+   rmb5    $12
+   cli
+   eor     $3456,y
+   phy
+   .byte   $5B
+   .byte   $5C
+   eor     $3456,x
+   lsr     $3456,x
+   bbr5    $12,*+122
+   rts
+   adc     ($12,x)
+   .byte   $62
+   .byte   $63
+   stz     $12
+   adc     $12
+   ror     $12
+   rmb6    $12
+   pla
+   adc     #$12
+   ror     a
+   .byte   $6B
+   jmp     ($3456)
+   adc     $3456
+   ror     $3456
+   bbr6    $12,*+122
+   bvs     *+122
+   adc     ($12),y
+   adc     ($12)
+   .byte   $73
+   stz     $12,x
+   adc     $12,x
+   ror     $12,x
+   rmb7    $12
+   sei
+   adc     $3456,y
+   ply
+   .byte   $7B
+   jmp     ($3456,x)
+   adc     $3456,x
+   ror     $3456,x
+   bbr7    $12,*+122
+   bra     *+122
+   sta     ($12,x)
+   .byte   $82
+   .byte   $83
+   sty     $12
+   sta     $12
+   stx     $12
+   smb0    $12
+   dey
+   bit     #$12
+   txa
+   .byte   $8B
+   sty     $3456
+   sta     $3456
+   stx     $3456
+   bbs0    $12,*+122
+   bcc     *+122
+   sta     ($12),y
+   sta     ($12)
+   .byte   $93
+   sty     $12,x
+   sta     $12,x
+   stx     $12,y
+   smb1    $12
+   tya
+   sta     $3456,y
+   txs
+   .byte   $9B
+   stz     $3456
+   sta     $3456,x
+   stz     $3456,x
+   bbs1    $12,*+122
+   ldy     #$12
+   lda     ($12,x)
+   ldx     #$12
+   .byte   $A3
+   ldy     $12
+   lda     $12
+   ldx     $12
+   smb2    $12
+   tay
+   lda     #$12
+   tax
+   .byte   $AB
+   ldy     $3456
+   lda     $3456
+   ldx     $3456
+   bbs2    $12,*+122
+   bcs     *+122
+   lda     ($12),y
+   lda     ($12)
+   .byte   $B3
+   ldy     $12,x
+   lda     $12,x
+   ldx     $12,y
+   smb3    $12
+   clv
+   lda     $3456,y
+   tsx
+   .byte   $BB
+   ldy     $3456,x
+   lda     $3456,x
+   ldx     $3456,y
+   bbs3    $12,*+122
+   cpy     #$12
+   cmp     ($12,x)
+   .byte   $C2
+   .byte   $C3
+   cpy     $12
+   cmp     $12
+   dec     $12
+   smb4    $12
+   iny
+   cmp     #$12
+   dex
+   wai
+   cpy     $3456
+   cmp     $3456
+   dec     $3456
+   bbs4    $12,*+122
+   bne     *+122
+   cmp     ($12),y
+   cmp     ($12)
+   .byte   $D3
+   .byte   $D4
+   cmp     $12,x
+   dec     $12,x
+   smb5    $12
+   cld
+   cmp     $3456,y
+   phx
+   stp
+   .byte   $DC
+   cmp     $3456,x
+   dec     $3456,x
+   bbs5    $12,*+122
+   cpx     #$12
+   sbc     ($12,x)
+   .byte   $E2
+   .byte   $E3
+   cpx     $12
+   sbc     $12
+   inc     $12
+   smb6    $12
+   inx
+   sbc     #$12
+   nop
+   .byte   $EB
+   cpx     $3456
+   sbc     $3456
+   inc     $3456
+   bbs6    $12,*+122
+   beq     *+122
+   sbc     ($12),y
+   sbc     ($12)
+   .byte   $F3
+   .byte   $F4
+   sbc     $12,x
+   inc     $12,x
+   smb7    $12
+   sed
+   sbc     $3456,y
+   plx
+   .byte   $FB
+   .byte   $FC
+   sbc     $3456,x
+   inc     $3456,x
+   bbs7    $12,*+122
diff --git a/test/asm/val/Makefile b/test/asm/val/Makefile
index 54b1100ec..41df980a9 100644
--- a/test/asm/val/Makefile
+++ b/test/asm/val/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the regression tests that return an error code on failure
 
 ifneq ($(shell echo),)
@@ -16,6 +22,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
@@ -45,8 +55,8 @@ define PRG_template
 
 $(WORKDIR)/%.$1.prg: %.s | $(WORKDIR)
 	$(if $(QUIET),echo asm/val/$$*.$1.prg)
-	$(CA65) -t sim$1 -o $$(@:.prg=.o) $$< $(NULLERR)
-	$(LD65) -C sim6502-asmtest.cfg -o $$@ $$(@:.prg=.o) sim$1.lib $(NULLERR)
+	$(CA65) -t sim$1 -o $$(@:.prg=.o) $$< $(NULLOUT) $(NULLERR)
+	$(LD65) -C sim6502-asmtest.cfg -o $$@ $$(@:.prg=.o) sim$1.lib $(NULLOUT) $(NULLERR)
 	$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 
 endef # PRG_template
diff --git a/test/asm/val/ismnemonic.s b/test/asm/val/ismnemonic.s
index 2d131e7a9..831a8a3c7 100644
--- a/test/asm/val/ismnemonic.s
+++ b/test/asm/val/ismnemonic.s
@@ -8,7 +8,10 @@
 ;    "6502DTV"
 ;    "65SC02"
 ;    "65C02"
+;    "65CE02"
+;    "W65C02"
 ;    "4510"
+;    "45GS02"
 ;    "huc6280"
 ;    "65816"
 ;    "sweet16"
@@ -415,6 +418,107 @@ test_Ismnemonic smb5
 test_Ismnemonic smb6
 test_Ismnemonic smb7
 test_Ismnemonic sta
+test_Ismnemonic stx
+test_Ismnemonic sty
+test_Ismnemonic stz
+test_Ismnemonic tax
+test_Ismnemonic tay
+test_Ismnemonic trb
+test_Ismnemonic tsb
+test_Ismnemonic tsx
+test_Ismnemonic txa
+test_Ismnemonic txs
+test_Ismnemonic tya
+
+
+.setcpu "W65C02"
+test_Ismnemonic adc
+test_Ismnemonic and
+test_Ismnemonic asl
+test_Ismnemonic bbr0
+test_Ismnemonic bbr1
+test_Ismnemonic bbr2
+test_Ismnemonic bbr3
+test_Ismnemonic bbr4
+test_Ismnemonic bbr5
+test_Ismnemonic bbr6
+test_Ismnemonic bbr7
+test_Ismnemonic bbs0
+test_Ismnemonic bbs1
+test_Ismnemonic bbs2
+test_Ismnemonic bbs3
+test_Ismnemonic bbs4
+test_Ismnemonic bbs5
+test_Ismnemonic bbs6
+test_Ismnemonic bbs7
+test_Ismnemonic bcc
+test_Ismnemonic bcs
+test_Ismnemonic beq
+test_Ismnemonic bit
+test_Ismnemonic bmi
+test_Ismnemonic bne
+test_Ismnemonic bpl
+test_Ismnemonic bra
+test_Ismnemonic brk
+test_Ismnemonic bvc
+test_Ismnemonic bvs
+test_Ismnemonic clc
+test_Ismnemonic cld
+test_Ismnemonic cli
+test_Ismnemonic clv
+test_Ismnemonic cmp
+test_Ismnemonic cpx
+test_Ismnemonic cpy
+test_Ismnemonic dea
+test_Ismnemonic dec
+test_Ismnemonic dex
+test_Ismnemonic dey
+test_Ismnemonic eor
+test_Ismnemonic ina
+test_Ismnemonic inc
+test_Ismnemonic inx
+test_Ismnemonic iny
+test_Ismnemonic jmp
+test_Ismnemonic jsr
+test_Ismnemonic lda
+test_Ismnemonic ldx
+test_Ismnemonic ldy
+test_Ismnemonic lsr
+test_Ismnemonic nop
+test_Ismnemonic ora
+test_Ismnemonic pha
+test_Ismnemonic php
+test_Ismnemonic phx
+test_Ismnemonic phy
+test_Ismnemonic pla
+test_Ismnemonic plp
+test_Ismnemonic plx
+test_Ismnemonic ply
+test_Ismnemonic rmb0
+test_Ismnemonic rmb1
+test_Ismnemonic rmb2
+test_Ismnemonic rmb3
+test_Ismnemonic rmb4
+test_Ismnemonic rmb5
+test_Ismnemonic rmb6
+test_Ismnemonic rmb7
+test_Ismnemonic rol
+test_Ismnemonic ror
+test_Ismnemonic rti
+test_Ismnemonic rts
+test_Ismnemonic sbc
+test_Ismnemonic sec
+test_Ismnemonic sed
+test_Ismnemonic sei
+test_Ismnemonic smb0
+test_Ismnemonic smb1
+test_Ismnemonic smb2
+test_Ismnemonic smb3
+test_Ismnemonic smb4
+test_Ismnemonic smb5
+test_Ismnemonic smb6
+test_Ismnemonic smb7
+test_Ismnemonic sta
 test_Ismnemonic stp
 test_Ismnemonic stx
 test_Ismnemonic sty
@@ -429,6 +533,141 @@ test_Ismnemonic txs
 test_Ismnemonic tya
 test_Ismnemonic wai
 
+.setcpu "65CE02"
+test_Ismnemonic adc
+test_Ismnemonic and
+test_Ismnemonic asl
+test_Ismnemonic asr
+test_Ismnemonic asw
+test_Ismnemonic aug
+test_Ismnemonic bbr0
+test_Ismnemonic bbr1
+test_Ismnemonic bbr2
+test_Ismnemonic bbr3
+test_Ismnemonic bbr4
+test_Ismnemonic bbr5
+test_Ismnemonic bbr6
+test_Ismnemonic bbr7
+test_Ismnemonic bbs0
+test_Ismnemonic bbs1
+test_Ismnemonic bbs2
+test_Ismnemonic bbs3
+test_Ismnemonic bbs4
+test_Ismnemonic bbs5
+test_Ismnemonic bbs6
+test_Ismnemonic bbs7
+test_Ismnemonic bcc
+test_Ismnemonic bcs
+test_Ismnemonic beq
+test_Ismnemonic bit
+test_Ismnemonic bmi
+test_Ismnemonic bne
+test_Ismnemonic bpl
+test_Ismnemonic bra
+test_Ismnemonic brk
+test_Ismnemonic bsr
+test_Ismnemonic bvc
+test_Ismnemonic bvs
+test_Ismnemonic clc
+test_Ismnemonic cld
+test_Ismnemonic cle
+test_Ismnemonic cli
+test_Ismnemonic clv
+test_Ismnemonic cmp
+test_Ismnemonic cpx
+test_Ismnemonic cpy
+test_Ismnemonic cpz
+test_Ismnemonic dea
+test_Ismnemonic dec
+test_Ismnemonic dew
+test_Ismnemonic dex
+test_Ismnemonic dey
+test_Ismnemonic dez
+test_Ismnemonic eom
+test_Ismnemonic eor
+test_Ismnemonic ina
+test_Ismnemonic inc
+test_Ismnemonic inw
+test_Ismnemonic inx
+test_Ismnemonic iny
+test_Ismnemonic inz
+test_Ismnemonic jmp
+test_Ismnemonic jsr
+test_Ismnemonic lbcc
+test_Ismnemonic lbcs
+test_Ismnemonic lbeq
+test_Ismnemonic lbmi
+test_Ismnemonic lbne
+test_Ismnemonic lbpl
+test_Ismnemonic lbra
+test_Ismnemonic lbvc
+test_Ismnemonic lbvs
+test_Ismnemonic lda
+test_Ismnemonic ldx
+test_Ismnemonic ldy
+test_Ismnemonic ldz
+test_Ismnemonic lsr
+test_Ismnemonic neg
+test_Ismnemonic nop
+test_Ismnemonic ora
+test_Ismnemonic pha
+test_Ismnemonic phd
+test_Ismnemonic php
+test_Ismnemonic phw
+test_Ismnemonic phx
+test_Ismnemonic phy
+test_Ismnemonic phz
+test_Ismnemonic pla
+test_Ismnemonic plp
+test_Ismnemonic plx
+test_Ismnemonic ply
+test_Ismnemonic plz
+test_Ismnemonic rmb0
+test_Ismnemonic rmb1
+test_Ismnemonic rmb2
+test_Ismnemonic rmb3
+test_Ismnemonic rmb4
+test_Ismnemonic rmb5
+test_Ismnemonic rmb6
+test_Ismnemonic rmb7
+test_Ismnemonic rol
+test_Ismnemonic ror
+test_Ismnemonic row
+test_Ismnemonic rti
+test_Ismnemonic rtn
+test_Ismnemonic rts
+test_Ismnemonic sbc
+test_Ismnemonic sec
+test_Ismnemonic sed
+test_Ismnemonic see
+test_Ismnemonic sei
+test_Ismnemonic smb0
+test_Ismnemonic smb1
+test_Ismnemonic smb2
+test_Ismnemonic smb3
+test_Ismnemonic smb4
+test_Ismnemonic smb5
+test_Ismnemonic smb6
+test_Ismnemonic smb7
+test_Ismnemonic sta
+test_Ismnemonic stx
+test_Ismnemonic sty
+test_Ismnemonic stz
+test_Ismnemonic tab
+test_Ismnemonic tax
+test_Ismnemonic tay
+test_Ismnemonic taz
+test_Ismnemonic tba
+test_Ismnemonic trb
+test_Ismnemonic tsb
+test_Ismnemonic tsx
+test_Ismnemonic tsy
+test_Ismnemonic txa
+test_Ismnemonic txs
+test_Ismnemonic tya
+test_Ismnemonic tys
+test_Ismnemonic tza
+
 .setcpu "4510"
 test_Ismnemonic adc
 test_Ismnemonic and
@@ -564,6 +803,159 @@ test_Ismnemonic tya
 test_Ismnemonic tys
 test_Ismnemonic tza
 
+.setcpu "45GS02"
+test_Ismnemonic adc
+test_Ismnemonic and
+test_Ismnemonic asl
+test_Ismnemonic asr
+test_Ismnemonic asw
+test_Ismnemonic bbr0
+test_Ismnemonic bbr1
+test_Ismnemonic bbr2
+test_Ismnemonic bbr3
+test_Ismnemonic bbr4
+test_Ismnemonic bbr5
+test_Ismnemonic bbr6
+test_Ismnemonic bbr7
+test_Ismnemonic bbs0
+test_Ismnemonic bbs1
+test_Ismnemonic bbs2
+test_Ismnemonic bbs3
+test_Ismnemonic bbs4
+test_Ismnemonic bbs5
+test_Ismnemonic bbs6
+test_Ismnemonic bbs7
+test_Ismnemonic bcc
+test_Ismnemonic bcs
+test_Ismnemonic beq
+test_Ismnemonic bit
+test_Ismnemonic bmi
+test_Ismnemonic bne
+test_Ismnemonic bpl
+test_Ismnemonic bra
+test_Ismnemonic brk
+test_Ismnemonic bsr
+test_Ismnemonic bvc
+test_Ismnemonic bvs
+test_Ismnemonic clc
+test_Ismnemonic cld
+test_Ismnemonic cle
+test_Ismnemonic cli
+test_Ismnemonic clv
+test_Ismnemonic cmp
+test_Ismnemonic cpx
+test_Ismnemonic cpy
+test_Ismnemonic cpz
+test_Ismnemonic dea
+test_Ismnemonic dec
+test_Ismnemonic dew
+test_Ismnemonic dex
+test_Ismnemonic dey
+test_Ismnemonic dez
+test_Ismnemonic eom
+test_Ismnemonic eor
+test_Ismnemonic ina
+test_Ismnemonic inc
+test_Ismnemonic inw
+test_Ismnemonic inx
+test_Ismnemonic iny
+test_Ismnemonic inz
+test_Ismnemonic jmp
+test_Ismnemonic jsr
+test_Ismnemonic lbcc
+test_Ismnemonic lbcs
+test_Ismnemonic lbeq
+test_Ismnemonic lbmi
+test_Ismnemonic lbne
+test_Ismnemonic lbpl
+test_Ismnemonic lbra
+test_Ismnemonic lbvc
+test_Ismnemonic lbvs
+test_Ismnemonic lda
+test_Ismnemonic ldx
+test_Ismnemonic ldy
+test_Ismnemonic ldz
+test_Ismnemonic lsr
+test_Ismnemonic map
+test_Ismnemonic neg
+test_Ismnemonic nop
+test_Ismnemonic ora
+test_Ismnemonic pha
+test_Ismnemonic phd
+test_Ismnemonic php
+test_Ismnemonic phw
+test_Ismnemonic phx
+test_Ismnemonic phy
+test_Ismnemonic phz
+test_Ismnemonic pla
+test_Ismnemonic plp
+test_Ismnemonic plx
+test_Ismnemonic ply
+test_Ismnemonic plz
+test_Ismnemonic rmb0
+test_Ismnemonic rmb1
+test_Ismnemonic rmb2
+test_Ismnemonic rmb3
+test_Ismnemonic rmb4
+test_Ismnemonic rmb5
+test_Ismnemonic rmb6
+test_Ismnemonic rmb7
+test_Ismnemonic rol
+test_Ismnemonic ror
+test_Ismnemonic row
+test_Ismnemonic rti
+test_Ismnemonic rtn
+test_Ismnemonic rts
+test_Ismnemonic sbc
+test_Ismnemonic sec
+test_Ismnemonic sed
+test_Ismnemonic see
+test_Ismnemonic sei
+test_Ismnemonic smb0
+test_Ismnemonic smb1
+test_Ismnemonic smb2
+test_Ismnemonic smb3
+test_Ismnemonic smb4
+test_Ismnemonic smb5
+test_Ismnemonic smb6
+test_Ismnemonic smb7
+test_Ismnemonic sta
+test_Ismnemonic stx
+test_Ismnemonic sty
+test_Ismnemonic stz
+test_Ismnemonic tab
+test_Ismnemonic tax
+test_Ismnemonic tay
+test_Ismnemonic taz
+test_Ismnemonic tba
+test_Ismnemonic trb
+test_Ismnemonic tsb
+test_Ismnemonic tsx
+test_Ismnemonic tsy
+test_Ismnemonic txa
+test_Ismnemonic txs
+test_Ismnemonic tya
+test_Ismnemonic tys
+test_Ismnemonic tza
+
+test_Ismnemonic adcq
+test_Ismnemonic andq
+test_Ismnemonic aslq
+test_Ismnemonic asrq
+test_Ismnemonic bitq
+test_Ismnemonic cmpq
+test_Ismnemonic deq
+test_Ismnemonic eorq
+test_Ismnemonic inq
+test_Ismnemonic ldq
+test_Ismnemonic lsrq
+test_Ismnemonic orq
+test_Ismnemonic sbcq
+test_Ismnemonic stq
+test_Ismnemonic rolq
+test_Ismnemonic rorq
+
+
 .setcpu "HuC6280"
 test_Ismnemonic adc
 test_Ismnemonic and
diff --git a/test/asm/val/struct.s b/test/asm/val/struct.s
new file mode 100644
index 000000000..b6ef6f45d
--- /dev/null
+++ b/test/asm/val/struct.s
@@ -0,0 +1,222 @@
+; test .struct and .union features
+
+.code
+
+; exit with 0
+.export _main
+_main:
+    lda #0
+    tax
+    rts
+
+; test storage allocator sizes and offsets
+
+.struct Storage
+    mb1 .byte
+    mb5 .byte 5
+    mr1 .res 1
+    mr5 .res 5
+    mdb1 .dbyt
+    mdb5 .dbyt 5
+    mw1 .word
+    mw5 .word 5
+    ma1 .addr
+    ma5 .addr 5
+    mf1 .faraddr
+    mf5 .faraddr 5
+    mdw1 .dword
+    mdw5 .dword 5
+.endstruct
+
+.assert .sizeof(Storage::mb1)  =  1, error, ".struct .byte member has unexpected .sizeof"
+.assert .sizeof(Storage::mb5)  =  5, error, ".struct .byte 5 member has unexpected .sizeof"
+.assert .sizeof(Storage::mr1)  =  1, error, ".struct .res 1 member has unexpected .sizeof"
+.assert .sizeof(Storage::mr5)  =  5, error, ".struct .res 5 member has unexpected .sizeof"
+.assert .sizeof(Storage::mdb1) =  2, error, ".struct .dbyt member has unexpected .sizeof"
+.assert .sizeof(Storage::mdb5) = 10, error, ".struct .dbyt 5 member has unexpected .sizeof"
+.assert .sizeof(Storage::mw1)  =  2, error, ".struct .word member has unexpected .sizeof"
+.assert .sizeof(Storage::mw5)  = 10, error, ".struct .word 5 member has unexpected .sizeof"
+.assert .sizeof(Storage::ma1)  =  2, error, ".struct .addr member has unexpected .sizeof"
+.assert .sizeof(Storage::ma5)  = 10, error, ".struct .addr 5 member has unexpected .sizeof"
+.assert .sizeof(Storage::mf1)  =  3, error, ".struct .faraddr member has unexpected .sizeof"
+.assert .sizeof(Storage::mf5)  = 15, error, ".struct .faraddr 5 member has unexpected .sizeof"
+.assert .sizeof(Storage::mdw1) =  4, error, ".struct .dword member has unexpected .sizeof"
+.assert .sizeof(Storage::mdw5) = 20, error, ".struct .dword 5 member has unexpected .sizeof"
+
+.assert Storage::mb1  = 0, error, ".struct storage offset is incorrect"
+.assert Storage::mb5  = Storage::mb1  + .sizeof(Storage::mb1),  error, ".struct storage offset is incorrect"
+.assert Storage::mr1  = Storage::mb5  + .sizeof(Storage::mb5),  error, ".struct storage offset is incorrect"
+.assert Storage::mr5  = Storage::mr1  + .sizeof(Storage::mr1),  error, ".struct storage offset is incorrect"
+.assert Storage::mdb1 = Storage::mr5  + .sizeof(Storage::mr5),  error, ".struct storage offset is incorrect"
+.assert Storage::mdb5 = Storage::mdb1 + .sizeof(Storage::mdb1), error, ".struct storage offset is incorrect"
+.assert Storage::mw1  = Storage::mdb5 + .sizeof(Storage::mdb5), error, ".struct storage offset is incorrect"
+.assert Storage::mw5  = Storage::mw1  + .sizeof(Storage::mw1),  error, ".struct storage offset is incorrect"
+.assert Storage::ma1  = Storage::mw5  + .sizeof(Storage::mw5),  error, ".struct storage offset is incorrect"
+.assert Storage::ma5  = Storage::ma1  + .sizeof(Storage::ma1),  error, ".struct storage offset is incorrect"
+.assert Storage::mf1  = Storage::ma5  + .sizeof(Storage::ma5),  error, ".struct storage offset is incorrect"
+.assert Storage::mf5  = Storage::mf1  + .sizeof(Storage::mf1),  error, ".struct storage offset is incorrect"
+.assert Storage::mdw1 = Storage::mf5  + .sizeof(Storage::mf5),  error, ".struct storage offset is incorrect"
+.assert Storage::mdw5 = Storage::mdw1 + .sizeof(Storage::mdw1), error, ".struct storage offset is incorrect"
+.assert .sizeof(Storage) = Storage::mdw5 + .sizeof(Storage::mdw5), error, ".struct has unexpected .sizeof"
+
+; test union offset and size
+
+.union UStorage
+    mb1 .byte
+    mb5 .byte 5
+    mr1 .res 1
+    mr5 .res 5
+    mdb1 .dbyt
+    mdb5 .dbyt 5
+    mw1 .word
+    mw5 .word 5
+    ma1 .addr
+    ma5 .addr 5
+    mf1 .faraddr
+    mf5 .faraddr 5
+    mdw1 .dword
+    mdw5 .dword 5
+.endunion
+
+.assert .sizeof(UStorage::mb1)  =  1, error, ".union .byte member has unexpected .sizeof"
+.assert .sizeof(UStorage::mb5)  =  5, error, ".union .byte 5 member has unexpected .sizeof"
+.assert .sizeof(UStorage::mr1)  =  1, error, ".union .res 1 member has unexpected .sizeof"
+.assert .sizeof(UStorage::mr5)  =  5, error, ".union .res 5 member has unexpected .sizeof"
+.assert .sizeof(UStorage::mdb1) =  2, error, ".union .dbyt member has unexpected .sizeof"
+.assert .sizeof(UStorage::mdb5) = 10, error, ".union .dbyt 5 member has unexpected .sizeof"
+.assert .sizeof(UStorage::mw1)  =  2, error, ".union .word member has unexpected .sizeof"
+.assert .sizeof(UStorage::mw5)  = 10, error, ".union .word 5 member has unexpected .sizeof"
+.assert .sizeof(UStorage::ma1)  =  2, error, ".union .addr member has unexpected .sizeof"
+.assert .sizeof(UStorage::ma5)  = 10, error, ".union .addr 5 member has unexpected .sizeof"
+.assert .sizeof(UStorage::mf1)  =  3, error, ".union .faraddr member has unexpected .sizeof"
+.assert .sizeof(UStorage::mf5)  = 15, error, ".union .faraddr 5 member has unexpected .sizeof"
+.assert .sizeof(UStorage::mdw1) =  4, error, ".union .dword member has unexpected .sizeof"
+.assert .sizeof(UStorage::mdw5) = 20, error, ".union .dword 5 member has unexpected .sizeof"
+.assert .sizeof(UStorage) = 20, error, ".union has unexpected .sizeof"
+
+.assert UStorage::mb1  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mb5  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mr1  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mr5  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mdb1 = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mdb5 = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mw1  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mw5  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::ma1  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::ma5  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mf1  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mf5  = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mdw1 = 0, error, ".union storage offset is incorrect"
+.assert UStorage::mdw5 = 0, error, ".union storage offset is incorrect"
+
+; test tag
+
+storage: .tag Storage
+.assert (*-storage)=.sizeof(Storage), error, ".tag reserved size incorrect"
+
+; test nested structures
+
+.struct Point
+    xc .word
+    yc .word
+.endstruct
+
+.struct Nested
+    pad .res 13
+    tag .tag Point
+    ch .struct Child
+        ca .word ; offset = 0
+        gch .struct Grandchild
+            gca .word ; offset = 0
+            gcb .byte
+        .endstruct
+        cb .byte
+    .endstruct
+    anon .struct
+        aa .dword ; offset = Nested::anon (anonymous .struct)
+        ab .dword
+    .endstruct
+    chu .union Chunion
+        ua .byte ; offset = 0
+        ub .dword
+    .endunion
+    chanon .union
+        uc .byte ; offset = Nested::chanon
+        ud .dword
+    .endunion
+    last .byte
+.endstruct
+
+.assert Nested::pad                    = 0, error, "Nested .struct has unexpected starting offset"
+.assert Nested::Child::ca              = 0, error, "Nested .struct has unexpected starting offset"
+.assert Nested::Child::Grandchild::gca = 0, error, "Nested .struct has unexpected starting offset"
+
+.assert .sizeof(Nested::tag) = .sizeof(Point), error, ".tag in .struct has unexpected .sizeof"
+.assert .sizeof(Nested::Child::Grandchild) = 2 + 1, error, "Nested .struct has unexpected .sizeof"
+.assert .sizeof(Nested::Child) = 2 + 1 + .sizeof(Nested::Child::Grandchild), error, "Nested .struct has unpexpected .sizeof"
+.assert .sizeof(Nested::ch) = .sizeof(Nested::Child), error, "Nested .struct has unexpected member .sizeof"
+.assert .sizeof(Nested::Child::gch) = .sizeof(Nested::Child::Grandchild), error, "Nested .struct has unexpected member .sizeof"
+.assert .sizeof(Nested::anon) = 8, error, "Nested anonymous member .struct has unexpected .sizeof"
+.assert .sizeof(Nested::aa) = 4, error, "Nested anonymous .struct member has unexpected .sizeof"
+.assert .sizeof(Nested::ab) = 4, error, "Nested anonymous .struct member has unexpected .sizeof"
+.assert .sizeof(Nested::Chunion) = 4, error, "Nested .union has unexpected .sizeof"
+.assert .sizeof(Nested::chu) = .sizeof(Nested::Chunion), error, "Nested member .union has unexpected .sizeof"
+.assert .sizeof(Nested::chanon) = 4, error, "Nested anonymous member .union as unexpected .sizeof"
+
+.assert Nested::tag    = Nested::pad + .sizeof(Nested::pad),     error, ".tag within .struct has unexpected offset"
+.assert Nested::ch     = Nested::tag + .sizeof(Nested::tag),     error,  "Nested .struct has unexpected offset"
+.assert Nested::anon   = Nested::ch + .sizeof(Nested::ch),       error, "Nested anonymous member .struct has unexpected offset"
+.assert Nested::aa     = Nested::anon,                           error, "Nested anonymous .struct member has unexpected offset"
+.assert Nested::ab     = Nested::aa + .sizeof(Nested::aa),       error, "Nested anonymous .struct member has unexpected offset"
+.assert Nested::chu    = Nested::ab + .sizeof(Nested::ab),       error, "Nested member .union has unexpected offset"
+.assert Nested::chanon = Nested::chu + .sizeof(Nested::Chunion), error, "Nested anonymous member .union has unexpected offset"
+.assert Nested::uc     = Nested::chanon,                         error, "Nested anonymous .union member has unexpected offset"
+.assert Nested::ud     = Nested::chanon,                         error, "Nested anonymous .union member has unexpected offset"
+.assert Nested::last   = Nested::ud + .sizeof(Nested::ud),       error, ".struct member has unexpected offset after anonymous nested .struct"
+
+; test .org
+
+start:
+
+.struct OrgStruct
+    ma .byte
+    mb .byte
+    .org $1234
+    mc .byte
+    md .byte
+    .struct Nested
+        me .byte
+        .org $5678
+        mf .byte
+        mg .byte
+    .endstruct
+    mh .byte
+.endstruct
+
+.assert start <> (OrgStruct::mh+1), error, "Fatal test error: accidental code position conflict, move OrgStruct .org to another arbitrary address."
+.assert * = start, error, ".org within .struct does not return to previous location at .endstruct"
+.assert OrgStruct::ma = 0, error, ".struct with .org has unexpected offset"
+.assert OrgStruct::mb = 1, error, ".struct with .org has unexpected offset"
+.assert OrgStruct::mc = $1234, error, ".struct with .org has unexpected offset"
+.assert OrgStruct::md = $1235, error, ".struct with .org has unexpected offset"
+.assert OrgStruct::Nested::me = 0, error, "Nested .struct with .org has unexpected offset"
+.assert OrgStruct::Nested::mf = $5678, error, "Nested .struct with .org has unexpected offset"
+.assert OrgStruct::Nested::mg = $5679, error, "Nested .struct with .org has unexpected offset"
+.assert OrgStruct::mh = $1239, error, ".struct with .org has unexpected offset"
+.assert .sizeof(OrgStruct) = 8, error, ".struct with .org has unexpected .sizeof"
+
+.union OrgUnion
+    ma .byte
+    mb .word
+    .org $1234
+    mc .byte
+    md .word
+.endunion
+
+.assert start <> OrgUnion::md, error, "Fatal test error: accidental code position conflict, move OrgUnion .org to another arbitrary address."
+.assert * = start, error, ".org within .union does not return to previous location at .endunion"
+.assert OrgUnion::ma = 0, error, ".union with .org has unexpected offset"
+.assert OrgUnion::mb = 0, error, ".union with .org has unexpected offset"
+.assert OrgUnion::mc = $1234, error, ".union with .org has unexpected offset"
+.assert OrgUnion::md = $1234, error, ".union with .org has unexpected offset"
+.assert .sizeof(OrgUnion) = 2, error, ".union with .org has unexpected .sizeof"
diff --git a/test/dasm/45GS02-disass.s b/test/dasm/45GS02-disass.s
new file mode 100644
index 000000000..1ed174a2f
--- /dev/null
+++ b/test/dasm/45GS02-disass.s
@@ -0,0 +1,381 @@
+.setcpu "45GS02"
+
+ZP = $12
+ABS = $1234
+
+   brk
+   ora ($05,x)
+   cle
+   see
+   tsb $02
+   ora $02
+   asl $02
+   rmb0 $02
+   php
+   ora #$01
+   asl
+   tsy
+   tsb $1234
+   ora $1234
+   asl $1234
+   bbr0 $02, L0
+L0:
+   bpl L0
+   ora ($06),y
+   ora ($07),z
+   lbpl *+$3133 ; bpl *+$3133
+   trb $02
+   ora $03,x
+   asl $03,x
+   rmb1 $02
+   clc
+   ora $1456,y
+   inc
+   inz
+   trb $1234
+   ora $1345,x
+   asl $1345,x
+   bbr1 $02,L1
+L1:
+   jsr $1234
+   and ($05,x)
+   jsr ($2345)
+   jsr ($2456,x)
+   bit $02
+   and $02
+   rol $02
+   rmb2 $02
+   plp
+   and #$01
+   rol
+   tys
+   bit $1234
+   and $1234
+   rol $1234
+   bbr2 $02,L2
+L2:
+   bmi L2
+   and ($06),y
+   and ($07),z
+   lbmi *+$3133 ; bmi *+$3133
+   bit $03,x
+   and $03,x
+   rol $03,x
+   rmb3 $02
+   sec
+   and $1456,y
+   dec
+   dez
+   bit $1345,x
+   and $1345,x
+   rol $1345,x
+   bbr3 $02,L3
+L3:
+   rti
+   eor ($05,x)
+   neg
+   asr
+   asr $02
+   eor $02
+   lsr $02
+   rmb4 $02
+   pha
+   eor #$01
+   lsr
+   taz
+   jmp $1234
+   eor $1234
+   lsr $1234
+   bbr4 $02,L4
+L4:
+   bvc L4
+   eor ($06),y
+   eor ($07),z
+   lbvc *+$3133 ; bvc *+$3133
+   asr $03,x
+   eor $03,x
+   lsr $03,x
+   rmb5 $02
+   cli
+   eor $1456,y
+   phy
+   tab
+   map
+   eor $1345,x
+   lsr $1345,x
+   bbr5 $02,L5
+L5:
+   rts
+   adc ($05,x)
+   rtn #$09
+   bsr *+$3133
+   stz $02
+   adc $02
+   ror $02
+   rmb6 $02
+   pla
+   adc #$01
+   ror
+   tza
+   jmp ($2345)
+   adc $1234
+   ror $1234
+   bbr6 $02,L6
+L6:
+   bvs L6
+   adc ($06),y
+   adc ($07),z
+   lbvs *+$3133 ; bvs *+$3133
+   stz $03,x
+   adc $03,x
+   ror $03,x
+   rmb7 $02
+   sei
+   adc $1456,y
+   ply
+   tba
+   jmp ($2456,x)
+   adc $1345,x
+   ror $1345,x
+   bbr7 $02,L7
+L7:
+   bra L7
+   sta ($05,x)
+   sta ($0f,s),y
+   sta ($0f,sp),y
+   lbra *+$3133 ; bra *+$3133
+   sty $02
+   sta $02
+   stx $02
+   smb0 $02
+   dey
+   bit #$01
+   txa
+   sty $1345,x
+   sty $1234
+   sta $1234
+   stx $1234
+   bbs0 $02,L8
+L8:
+   bcc L8
+   sta ($06),y
+   sta ($07),z
+   lbcc *+$3133 ; bcc *+$3133
+   sty $03,x
+   sta $03,x
+   stx $04,y
+   smb1 $02
+   tya
+   sta $1456,y
+   txs
+   stx $1456,y
+   stz $1234
+   sta $1345,x
+   stz $1345,x
+   bbs1 $02,L9
+L9:
+   ldy #$01
+   lda ($05,x)
+   ldx #$01
+   ldz #$01
+   ldy $02
+   lda $02
+   ldx $02
+   smb2 $02
+   tay
+   lda #$01
+   tax
+   ldz $1234
+   ldy $1234
+   lda $1234
+   ldx $1234
+   bbs2 $02,L10
+L10:
+   bcs L10
+   lda ($06),y
+   lda ($07),z
+   lbcs *+$3133 ; bcs *+$3133
+   ldy $03,x
+   lda $03,x
+   ldx $04,y
+   smb3 $02
+   clv
+   lda $1456,y
+   tsx
+   ldz $1345,x
+   ldy $1345,x
+   lda $1345,x
+   ldx $1456,y
+   bbs3 $02,L11
+L11:
+   cpy #$01
+   cmp ($05,x)
+   cpz #$01
+   dew $02
+   cpy $02
+   cmp $02
+   dec $02
+   smb4 $02
+   iny
+   cmp #$01
+   dex
+   asw $1234
+   cpy $1234
+   cmp $1234
+   dec $1234
+   bbs4 $02,L12
+L12:
+   bne L12
+   cmp ($06),y
+   cmp ($07),z
+   lbne *+$3133 ; bne *+$3133
+   cpz $02
+   cmp $03,x
+   dec $03,x
+   smb5 $02
+   cld
+   cmp $1456,y
+   phx
+   phz
+   cpz $1234
+   cmp $1345,x
+   dec $1345,x
+   bbs5 $02,L13
+L13:
+   cpx #$01
+   sbc ($05,x)
+   lda ($0f,s),y
+   lda ($0f,sp),y
+   inw $02
+   cpx $02
+   sbc $02
+   inc $02
+   smb6 $02
+   inx
+   sbc #$01
+   eom
+   nop
+   row $1234
+   cpx $1234
+   sbc $1234
+   inc $1234
+   bbs6 $02,L14
+L14:
+   beq L14
+   sbc ($06),y
+   sbc ($07),z
+   lbeq *+$3133 ; beq *+$3133
+   phd #$089a
+   phw #$089a
+   sbc $03,x
+   inc $03,x
+   smb7 $02
+   sed
+   sbc $1456,y
+   plx
+   plz
+   phd $1234
+   phw $1234
+   sbc $1345,x
+   inc $1345,x
+   bbs7 $02,L15
+L15:
+
+   adc [$12],z
+
+   adcq $12
+   adcq $3456
+   adcq ($78)
+   adcq [$9a]
+
+   and [$12],z
+
+   andq $12
+   andq $3456
+   andq ($78)
+   andq [$9a]
+
+   aslq $12
+   aslq
+   aslq $3456
+   aslq $78,x
+   aslq $9abc,x
+
+   asrq
+   asrq $12
+   asrq $34,x
+
+   bitq $12
+   bitq $3456
+
+   cmp [$12],z
+
+   cmpq $12
+   cmpq $3456
+   cmpq ($78)
+   cmpq [$9a]
+
+   deq
+   deq $12
+   deq $3456
+   deq $78,x
+   deq $9abc,x
+
+   eor [$12],z
+
+   eorq $12
+   eorq $3456
+   eorq ($78)
+   eorq [$9a]
+
+   inq
+   inq $12
+   inq $3456
+   inq $78,x
+   inq $9abc,x
+
+   lda [$12],z
+
+   ldq $12
+   ldq $3456
+   ldq ($78),z
+   ldq [$9a],z
+
+   lsrq $12
+   lsrq
+   lsrq $3456
+   lsrq $78,x
+   lsrq $9abc,x
+
+   ora [$12],z
+
+   orq $12
+   orq $3456
+   orq ($78)
+   orq [$9a]
+
+   rolq $12
+   rolq
+   rolq $3456
+   rolq $78,x
+   rolq $9abc,x
+
+   rorq $12
+   rorq
+   rorq $3456
+   rorq $78,x
+   rorq $9abc,x
+
+   sbc [$12],z
+
+   sbcq $12
+   sbcq $3456
+   sbcq ($78)
+   sbcq [$9a]
+
+   sta [$12],z      ; EA 92 12
+
+   stq $12
+   stq $3456
+   stq ($78)
+   stq [$9a]
diff --git a/test/dasm/6502-disass.s b/test/dasm/6502-disass.s
new file mode 100644
index 000000000..794eead76
--- /dev/null
+++ b/test/dasm/6502-disass.s
@@ -0,0 +1,8 @@
+
+    .setcpu "6502"
+
+    .repeat 256, cnt
+
+    .byte 0 + cnt, $02, $ea, $00
+
+    .endrepeat
diff --git a/test/dasm/6502DTV-disass.s b/test/dasm/6502DTV-disass.s
new file mode 100644
index 000000000..5254923c5
--- /dev/null
+++ b/test/dasm/6502DTV-disass.s
@@ -0,0 +1,188 @@
+.setcpu "6502DTV"
+
+   brk
+   ora     ($12,x)
+   nop     $12
+   ora     $12
+   asl     $12
+   php
+   ora     #$12
+   asl     a
+   anc     #$12
+   nop     $3456
+   ora     $3456
+   asl     $3456
+   bpl     *+2
+   ora     ($12),y
+   bra     *+2
+   nop     $12,x
+   ora     $12,x
+   asl     $12,x
+   clc
+   ora     $3456,y
+   nop     $3456,x
+   ora     $3456,x
+   asl     $3456,x
+   jsr     $3456
+   and     ($12,x)
+   rla     ($12,x)
+   bit     $12
+   and     $12
+   rol     $12
+   rla     $12
+   plp
+   and     #$12
+   rol     a
+   bit     $3456
+   and     $3456
+   rol     $3456
+   rla     $3456
+   bmi     *+2
+   and     ($12),y
+   sac     #$12
+   rla     ($12),y
+   and     $12,x
+   rol     $12,x
+   rla     $12,x
+   sec
+   and     $3456,y
+   rla     $3456,y
+   and     $3456,x
+   rol     $3456,x
+   rla     $3456,x
+   rti
+   eor     ($12,x)
+   sir     #$12
+   eor     $12
+   lsr     $12
+   pha
+   eor     #$12
+   lsr     a
+   alr     #$12
+   jmp     $3456
+   eor     $3456
+   lsr     $3456
+   bvc     *+2
+   eor     ($12),y
+   eor     $12,x
+   lsr     $12,x
+   cli
+   eor     $3456,x
+   lsr     $3456,x
+   rts
+   adc     ($12,x)
+   rra     ($12,x)
+   adc     $12
+   ror     $12
+   rra     $12
+   pla
+   adc     #$12
+   ror     a
+   arr     #$12
+   jmp     ($3456)
+   adc     $3456
+   ror     $3456
+   rra     $3456
+   bvs     *+2
+   adc     ($12),y
+   rra     ($12),y
+   adc     $12,x
+   ror     $12,x
+   rra     $12,x
+   sei
+   adc     $3456,y
+   rra     $3456,y
+   adc     $3456,x
+   ror     $3456,x
+   rra     $3456,x
+   nop     #$12
+   sta     ($12,x)
+   sty     $12
+   sta     $12
+   stx     $12
+   dey
+   txa
+   sty     $3456
+   sta     $3456
+   stx     $3456
+   bcc     *+2
+   sta     ($12),y
+   sty     $12,x
+   sta     $12,x
+   stx     $12,y
+   tya
+   sta     $3456,y
+   txs
+   shy     $3456,x
+   sta     $3456,x
+   shx     $3456,y
+   ldy     #$12
+   lda     ($12,x)
+   ldx     #$12
+   lax     ($12,x)
+   ldy     $12
+   lda     $12
+   ldx     $12
+   lax     $12
+   tay
+   lda     #$12
+   tax
+   lax     #$12
+   ldy     $3456
+   lda     $3456
+   ldx     $3456
+   lax     $3456
+   bcs     *+2
+   lda     ($12),y
+   lax     ($12),y
+   ldy     $12,x
+   lda     $12,x
+   ldx     $12,y
+   lax     $12,y
+   clv
+   lda     $3456,y
+   tsx
+   las     $3456,y
+   ldy     $3456,x
+   lda     $3456,x
+   ldx     $3456,y
+   lax     $3456,y
+   cpy     #$12
+   cmp     ($12,x)
+   cpy     $12
+   cmp     $12
+   dec     $12
+   iny
+   cmp     #$12
+   dex
+   axs     #$12
+   cpy     $3456
+   cmp     $3456
+   dec     $3456
+   bne     *+2
+   cmp     ($12),y
+   cmp     $12,x
+   dec     $12,x
+   cld
+   cmp     $3456,y
+   cmp     $3456,x
+   dec     $3456,x
+   cpx     #$12
+   sbc     ($12,x)
+   cpx     $12
+   sbc     $12
+   inc     $12
+   inx
+   sbc     #$12
+   nop
+   cpx     $3456
+   sbc     $3456
+   inc     $3456
+   beq     *+2
+   sbc     ($12),y
+   sbc     $12,x
+   inc     $12,x
+   sed
+   sbc     $3456,y
+   sbc     $3456,x
+   inc     $3456,x
diff --git a/test/dasm/6502X-disass.s b/test/dasm/6502X-disass.s
new file mode 100644
index 000000000..f102144c4
--- /dev/null
+++ b/test/dasm/6502X-disass.s
@@ -0,0 +1,30 @@
+
+    .setcpu "6502X"
+
+    .repeat 256, cnt
+
+    ; generate a pattern with all opcodes. however, for the full cycle to work,
+    ; we must take care of the "duplicate" opcodes, ie use only the favourite one.
+    .if ((cnt & $0f) = $02)
+    .byte $02   ; all JAM
+    .elseif ((cnt & $1f) = $1a)
+    .byte $ea   ; all NOP
+    .elseif (cnt = $2b)
+    .byte $0b   ; both ANC #imm
+    .elseif (cnt = $89)
+    .byte $80   ; both NOP #imm
+    .elseif (cnt = $eb)
+    .byte $e9   ; both SBC #imm
+    .elseif (cnt = $34) || (cnt = $54) ||  (cnt = $74) ||  (cnt = $d4) || (cnt = $f4)
+    .byte $14   ; all NOP zp, x
+    .elseif (cnt = $3c) || (cnt = $5c) ||  (cnt = $7c) ||  (cnt = $dc) || (cnt = $fc)
+    .byte $1c   ; all NOP abs, x
+    .elseif (cnt = $44) || (cnt = $64)
+    .byte $04   ; all NOP zp
+    .else
+    .byte cnt
+    .endif
+
+    .byte $02, $ea, $00
+
+    .endrepeat
diff --git a/test/dasm/65C02-disass.s b/test/dasm/65C02-disass.s
new file mode 100644
index 000000000..0613921d5
--- /dev/null
+++ b/test/dasm/65C02-disass.s
@@ -0,0 +1,214 @@
+.setcpu "65C02"
+
+   brk
+   ora     ($12,x)
+   tsb     $12
+   ora     $12
+   asl     $12
+   rmb0    $12
+   php
+   ora     #$12
+   asl     a
+   tsb     $3456
+   ora     $3456
+   asl     $3456
+   bbr0    $12,*+2
+   bpl     *+2
+   ora     ($12),y
+   ora     ($12)
+   trb     $12
+   ora     $12,x
+   asl     $12,x
+   rmb1    $12
+   clc
+   ora     $3456,y
+   inc     a
+   trb     $3456
+   ora     $3456,x
+   asl     $3456,x
+   bbr1    $12,*+2
+   jsr     $3456
+   and     ($12,x)
+   bit     $12
+   and     $12
+   rol     $12
+   rmb2    $12
+   plp
+   and     #$12
+   rol     a
+   bit     $3456
+   and     $3456
+   rol     $3456
+   bbr2    $12,*+2
+   bmi     *+2
+   and     ($12),y
+   and     ($12)
+   bit     $12,x
+   and     $12,x
+   rol     $12,x
+   rmb3    $12
+   sec
+   and     $3456,y
+   dec     a
+   bit     $3456,x
+   and     $3456,x
+   rol     $3456,x
+   bbr3    $12,*+2
+   rti
+   eor     ($12,x)
+   eor     $12
+   lsr     $12
+   rmb4    $12
+   pha
+   eor     #$12
+   lsr     a
+   jmp     $3456
+   eor     $3456
+   lsr     $3456
+   bbr4    $12,*+2
+   bvc     *+2
+   eor     ($12),y
+   eor     ($12)
+   eor     $12,x
+   lsr     $12,x
+   rmb5    $12
+   cli
+   eor     $3456,y
+   phy
+   eor     $3456,x
+   lsr     $3456,x
+   bbr5    $12,*+2
+   rts
+   adc     ($12,x)
+   stz     $12
+   adc     $12
+   ror     $12
+   rmb6    $12
+   pla
+   adc     #$12
+   ror     a
+   jmp     ($3456)
+   adc     $3456
+   ror     $3456
+   bbr6    $12,*+2
+   bvs     *+2
+   adc     ($12),y
+   adc     ($12)
+   stz     $12,x
+   adc     $12,x
+   ror     $12,x
+   rmb7    $12
+   sei
+   adc     $3456,y
+   ply
+   jmp     ($3456,x)
+   adc     $3456,x
+   ror     $3456,x
+   bbr7    $12,*+2
+   bra     *+2
+   sta     ($12,x)
+   sty     $12
+   sta     $12
+   stx     $12
+   smb0    $12
+   dey
+   bit     #$12
+   txa
+   sty     $3456
+   sta     $3456
+   stx     $3456
+   bbs0    $12,*+2
+   bcc     *+2
+   sta     ($12),y
+   sta     ($12)
+   sty     $12,x
+   sta     $12,x
+   stx     $12,y
+   smb1    $12
+   tya
+   sta     $3456,y
+   txs
+   stz     $3456
+   sta     $3456,x
+   stz     $3456,x
+   bbs1    $12,*+2
+   ldy     #$12
+   lda     ($12,x)
+   ldx     #$12
+   ldy     $12
+   lda     $12
+   ldx     $12
+   smb2    $12
+   tay
+   lda     #$12
+   tax
+   ldy     $3456
+   lda     $3456
+   ldx     $3456
+   bbs2    $12,*+2
+   bcs     *+2
+   lda     ($12),y
+   lda     ($12)
+   ldy     $12,x
+   lda     $12,x
+   ldx     $12,y
+   smb3    $12
+   clv
+   lda     $3456,y
+   tsx
+   ldy     $3456,x
+   lda     $3456,x
+   ldx     $3456,y
+   bbs3    $12,*+2
+   cpy     #$12
+   cmp     ($12,x)
+   cpy     $12
+   cmp     $12
+   dec     $12
+   smb4    $12
+   iny
+   cmp     #$12
+   dex
+   cpy     $3456
+   cmp     $3456
+   dec     $3456
+   bbs4    $12,*+2
+   bne     *+2
+   cmp     ($12),y
+   cmp     ($12)
+   cmp     $12,x
+   dec     $12,x
+   smb5    $12
+   cld
+   cmp     $3456,y
+   phx
+   cmp     $3456,x
+   dec     $3456,x
+   bbs5    $12,*+2
+   cpx     #$12
+   sbc     ($12,x)
+   cpx     $12
+   sbc     $12
+   inc     $12
+   smb6    $12
+   inx
+   sbc     #$12
+   nop
+   cpx     $3456
+   sbc     $3456
+   inc     $3456
+   bbs6    $12,*+2
+   beq     *+2
+   sbc     ($12),y
+   sbc     ($12)
+   sbc     $12,x
+   inc     $12,x
+   smb7    $12
+   sed
+   sbc     $3456,y
+   plx
+   sbc     $3456,x
+   inc     $3456,x
+L0:
+   bbs7    $12,L0
+   nop
diff --git a/test/dasm/65SC02-disass.s b/test/dasm/65SC02-disass.s
new file mode 100644
index 000000000..46e96aaf9
--- /dev/null
+++ b/test/dasm/65SC02-disass.s
@@ -0,0 +1,181 @@
+.setcpu "65SC02"
+
+   brk
+   ora     ($12,x)
+   tsb     $12
+   ora     $12
+   asl     $12
+   php
+   ora     #$12
+   asl     a
+   tsb     $3456
+   ora     $3456
+   asl     $3456
+   bpl     *+2
+   ora     ($12),y
+   ora     ($12)
+   trb     $12
+   ora     $12,x
+   asl     $12,x
+   clc
+   ora     $3456,y
+   inc     a
+   trb     $3456
+   ora     $3456,x
+   asl     $3456,x
+   jsr     $3456
+   and     ($12,x)
+   bit     $12
+   and     $12
+   rol     $12
+   plp
+   and     #$12
+   rol     a
+   bit     $3456
+   and     $3456
+   rol     $3456
+   bmi     *+2
+   and     ($12),y
+   and     ($12)
+   bit     $12,x
+   and     $12,x
+   rol     $12,x
+   sec
+   and     $3456,y
+   dec     a
+   bit     $3456,x
+   and     $3456,x
+   rol     $3456,x
+   rti
+   eor     ($12,x)
+   eor     $12
+   lsr     $12
+   pha
+   eor     #$12
+   lsr     a
+   jmp     $3456
+   eor     $3456
+   lsr     $3456
+   bvc     *+2
+   eor     ($12),y
+   eor     ($12)
+   eor     $12,x
+   lsr     $12,x
+   cli
+   eor     $3456,y
+   phy
+   eor     $3456,x
+   lsr     $3456,x
+   rts
+   adc     ($12,x)
+   stz     $12
+   adc     $12
+   ror     $12
+   pla
+   adc     #$12
+   ror     a
+   jmp     ($3456)
+   adc     $3456
+   ror     $3456
+   bvs     *+2
+   adc     ($12),y
+   adc     ($12)
+   stz     $12,x
+   adc     $12,x
+   ror     $12,x
+   sei
+   adc     $3456,y
+   ply
+   jmp     ($3456,x)
+   adc     $3456,x
+   ror     $3456,x
+   bra     *+2
+   sta     ($12,x)
+   sty     $12
+   sta     $12
+   stx     $12
+   dey
+   bit     #$12
+   txa
+   sty     $3456
+   sta     $3456
+   stx     $3456
+   bcc     *+2
+   sta     ($12),y
+   sta     ($12)
+   sty     $12,x
+   sta     $12,x
+   stx     $12,y
+   tya
+   sta     $3456,y
+   txs
+   stz     $3456
+   sta     $3456,x
+   stz     $3456,x
+   ldy     #$12
+   lda     ($12,x)
+   ldx     #$12
+   ldy     $12
+   lda     $12
+   ldx     $12
+   tay
+   lda     #$12
+   tax
+   ldy     $3456
+   lda     $3456
+   ldx     $3456
+   bcs     *+2
+   lda     ($12),y
+   lda     ($12)
+   ldy     $12,x
+   lda     $12,x
+   ldx     $12,y
+   clv
+   lda     $3456,y
+   tsx
+   ldy     $3456,x
+   lda     $3456,x
+   ldx     $3456,y
+   cpy     #$12
+   cmp     ($12,x)
+   cpy     $12
+   cmp     $12
+   dec     $12
+   iny
+   cmp     #$12
+   dex
+   cpy     $3456
+   cmp     $3456
+   dec     $3456
+   bne     *+2
+   cmp     ($12),y
+   cmp     ($12)
+   cmp     $12,x
+   dec     $12,x
+   cld
+   cmp     $3456,y
+   phx
+   cmp     $3456,x
+   dec     $3456,x
+   cpx     #$12
+   sbc     ($12,x)
+   cpx     $12
+   sbc     $12
+   inc     $12
+   inx
+   sbc     #$12
+   nop
+   cpx     $3456
+   sbc     $3456
+   inc     $3456
+   beq     *+2
+   sbc     ($12),y
+   sbc     ($12)
+   sbc     $12,x
+   inc     $12,x
+   sed
+   sbc     $3456,y
+   plx
+   sbc     $3456,x
+   inc     $3456,x
+
diff --git a/test/dasm/Makefile b/test/dasm/Makefile
index e84560ad2..b86a75416 100644
--- a/test/dasm/Makefile
+++ b/test/dasm/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the disassembler regression tests
 
 ifneq ($(shell echo),)
@@ -8,14 +14,25 @@ ifdef CMD_EXE
   EXE = .exe
   MKDIR = mkdir $(subst /,\,$1)
   RMDIR = -rmdir /q /s $(subst /,\,$1)
+  NULLDEV = nul:
 else
   EXE =
   MKDIR = mkdir -p $1
   RMDIR = $(RM) -r $1
+  NULLDEV = /dev/null
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
 endif
 
 ifdef QUIET
   .SILENT:
+  NULLOUT = >$(NULLDEV)
+  NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
diff --git a/test/dasm/huc6280-disass.s b/test/dasm/huc6280-disass.s
new file mode 100644
index 000000000..4ae7b067d
--- /dev/null
+++ b/test/dasm/huc6280-disass.s
@@ -0,0 +1,250 @@
+.setcpu "huc6280"
+
+   brk
+   ora     ($12,x)
+   sxy
+   st0     #$12
+   tsb     $12
+   ora     $12
+   asl     $12
+   rmb0    $12
+   php
+   ora     #$12
+   asl     a
+   tsb     $3456
+   ora     $3456
+   asl     $3456
+   bbr0    $12,L0
+L0:
+   bpl     *+2
+   ora     ($12),y
+   ora     ($12)
+   st1     #$12
+   trb     $12
+   ora     $12,x
+   asl     $12,x
+   rmb1    $12
+   clc
+   ora     $3456,y
+   inc     a
+   trb     $3456
+   ora     $3456,x
+   asl     $3456,x
+   bbr1    $12,L1
+L1:
+   jsr     $3456
+   and     ($12,x)
+   sax
+   st2     #$12
+   bit     $12
+   and     $12
+   rol     $12
+   rmb2    $12
+   plp
+   and     #$12
+   rol     a
+   bit     $3456
+   and     $3456
+   rol     $3456
+   bbr2    $12,L2
+L2:
+   bmi     *+2
+   and     ($12),y
+   and     ($12)
+   bit     $12,x
+   and     $12,x
+   rol     $12,x
+   rmb3    $12
+   sec
+   and     $3456,y
+   dec     a
+   bit     $3456,x
+   and     $3456,x
+   rol     $3456,x
+   bbr3    $12,L3
+L3:
+   rti
+   eor     ($12,x)
+   say
+   tma     #$02
+   bsr     *+2
+   eor     $12
+   lsr     $12
+   rmb4    $12
+   pha
+   eor     #$12
+   lsr     a
+   jmp     $3456
+   eor     $3456
+   lsr     $3456
+   bbr4    $12,L4
+L4:
+   bvc     *+2
+   eor     ($12),y
+   eor     ($12)
+   tam     #$12
+   csl
+   eor     $12,x
+   lsr     $12,x
+   rmb5    $12
+   cli
+   eor     $3456,y
+   phy
+   eor     $3456,x
+   lsr     $3456,x
+   bbr5    $12,L5
+L5:
+   rts
+   adc     ($12,x)
+   cla
+   stz     $12
+   adc     $12
+   ror     $12
+   rmb6    $12
+   pla
+   adc     #$12
+   ror     a
+   jmp     ($3456)
+   adc     $3456
+   ror     $3456
+   bbr6    $12,L6
+L6:
+   bvs     *+2
+   adc     ($12),y
+   adc     ($12)
+   tii     $3333,$7373,$1111
+   stz     $12,x
+   adc     $12,x
+   ror     $12,x
+   rmb7    $12
+   sei
+   adc     $3456,y
+   ply
+   jmp     ($3456,x)
+   adc     $3456,x
+   ror     $3456,x
+   bbr7    $12,L7
+L7:
+   bra     *+2
+   sta     ($12,x)
+   clx
+   tst     #$12,$EA
+   sty     $12
+   sta     $12
+   stx     $12
+   smb0    $12
+   dey
+   bit     #$12
+   txa
+   sty     $3456
+   sta     $3456
+   stx     $3456
+   bbs0    $12,LS0
+LS0:
+   bcc     *+2
+   sta     ($12),y
+   sta     ($12)
+   tst     #$12,$EAEA
+   sty     $12,x
+   sta     $12,x
+   stx     $12,y
+   smb1    $12
+   tya
+   sta     $3456,y
+   txs
+   stz     $3456
+   sta     $3456,x
+   stz     $3456,x
+   bbs1    $12,LS1
+LS1:
+   ldy     #$12
+   lda     ($12,x)
+   ldx     #$12
+   tst     #$12,$EA,x
+   ldy     $12
+   lda     $12
+   ldx     $12
+   smb2    $12
+   tay
+   lda     #$12
+   tax
+   ldy     $3456
+   lda     $3456
+   ldx     $3456
+   bbs2    $12,LS2
+LS2:
+   bcs     *+2
+   lda     ($12),y
+   lda     ($12)
+   tst     #$12,$EAEA,x
+   ldy     $12,x
+   lda     $12,x
+   ldx     $12,y
+   smb3    $12
+   clv
+   lda     $3456,y
+   tsx
+   ldy     $3456,x
+   lda     $3456,x
+   ldx     $3456,y
+   bbs3    $12,LS3
+LS3:
+   cpy     #$12
+   cmp     ($12,x)
+   cly
+   tdd     $3333,$C3C3,$1111
+   cpy     $12
+   cmp     $12
+   dec     $12
+   smb4    $12
+   iny
+   cmp     #$12
+   dex
+   cpy     $3456
+   cmp     $3456
+   dec     $3456
+   bbs4    $12,LS4
+LS4:
+   bne     *+2
+   cmp     ($12),y
+   cmp     ($12)
+   tin     $3333,$D3D3,$1111
+   cmp     $12,x
+   dec     $12,x
+   smb5    $12
+   cld
+   cmp     $3456,y
+   phx
+   cmp     $3456,x
+   dec     $3456,x
+   bbs5    $12,LS5
+LS5:
+   cpx     #$12
+   sbc     ($12,x)
+   tia     $3333,$E3E3,$1111
+   cpx     $12
+   sbc     $12
+   inc     $12
+   smb6    $12
+   inx
+   sbc     #$12
+   nop
+   cpx     $3456
+   sbc     $3456
+   inc     $3456
+   bbs6    $12,LS6
+LS6:
+   beq     *+2
+   sbc     ($12),y
+   sbc     ($12)
+   tai     $3333,$F3F3,$1111
+   sbc     $12,x
+   inc     $12,x
+   smb7    $12
+   sed
+   sbc     $3456,y
+   plx
+   sbc     $3456,x
+   inc     $3456,x
+LS7:
+   bbs7    $12,LS7
diff --git a/test/dasm/m740-disass.s b/test/dasm/m740-disass.s
new file mode 100644
index 000000000..ea0f19f8d
--- /dev/null
+++ b/test/dasm/m740-disass.s
@@ -0,0 +1,8 @@
+
+    .setcpu "M740"
+
+    .repeat 256, cnt
+
+    .byte 0 + cnt, $12, $02, $ea
+
+    .endrepeat
diff --git a/test/dasm/readme.txt b/test/dasm/readme.txt
new file mode 100644
index 000000000..9e001ec8c
--- /dev/null
+++ b/test/dasm/readme.txt
@@ -0,0 +1,9 @@
+
+Per CPU, a test binary is produced (using the assembler), which should contain
+all possible instructions. That file is then disassembled, and assembled again,
+and finally the resulting binary compared with the binary produced in the first
+step.
+
+Given that we assume the assembler works (this is tested in other/previous
+tests), this proves that the disassembler works, and can produce output that the
+assembler will understand - and produce an identical binary from.
diff --git a/test/err/Makefile b/test/err/Makefile
index 1273bbb2c..60780d27b 100644
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the tests that MUST NOT compile
 
 ifneq ($(shell echo),)
@@ -18,10 +24,19 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
+  NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
 endif
+endif
+
 
 CC65 := $(if $(wildcard ../../bin/cc65*),..$S..$Sbin$Scc65,cc65)
 
@@ -39,7 +54,7 @@ $(WORKDIR):
 
 $(WORKDIR)/%.s: %.c | $(WORKDIR)
 	$(if $(QUIET),echo err/$*.s)
-	$(NOT) $(CC65) -o $@ $< $(NULLERR)
+	$(NOT) $(CC65) -o $@ $< $(NULLOUT) $(CATERR)
 
 clean:
 	@$(call RMDIR,$(WORKDIR))
diff --git a/test/err/bug2018-bitfield.c b/test/err/bug2018-bitfield.c
new file mode 100644
index 000000000..ea2928659
--- /dev/null
+++ b/test/err/bug2018-bitfield.c
@@ -0,0 +1,14 @@
+/* Bug #2018 - Compiler has problems with const struct fields */
+
+typedef union U {
+    int a : 16;
+    const int b : 16;
+} U;
+
+int main(void)
+{
+    U x = { 42 };
+    x.b = 0;
+
+    return 0;
+}
diff --git a/test/err/bug2285-composite-type.c b/test/err/bug2285-composite-type.c
new file mode 100644
index 000000000..18a7b80a5
--- /dev/null
+++ b/test/err/bug2285-composite-type.c
@@ -0,0 +1,5 @@
+/* Bug #2285 - Regression in type composition */
+
+void foo();              /* OK */
+void foo(int (*)(int));  /* OK */
+void foo(int (*)(long)); /* WRONG: Should be an error */
diff --git a/test/err/bug2286-param-qualifier.c b/test/err/bug2286-param-qualifier.c
new file mode 100644
index 000000000..a014d0a0c
--- /dev/null
+++ b/test/err/bug2286-param-qualifier.c
@@ -0,0 +1,4 @@
+/* Bug #2286 - Qualifiers of pointees of function parameters ignored for type compatibility check */
+
+void woo(int* p);
+void woo(const int* p); /* WRONG: Should be an error */
diff --git a/test/err/bug2301-trailing-coma-1.c b/test/err/bug2301-trailing-coma-1.c
new file mode 100644
index 000000000..66cd4fae3
--- /dev/null
+++ b/test/err/bug2301-trailing-coma-1.c
@@ -0,0 +1,3 @@
+/* Bug #2301 - Function parameter list with an extra trailing comma should not compile */
+
+int foo(int a,); /* Should fail */
diff --git a/test/err/bug2301-trailing-coma-2.c b/test/err/bug2301-trailing-coma-2.c
new file mode 100644
index 000000000..40ca3d0ca
--- /dev/null
+++ b/test/err/bug2301-trailing-coma-2.c
@@ -0,0 +1,6 @@
+/* Bug #2301 - Function parameter list with an extra trailing comma should not compile */
+
+int bar(a,) int a;  /* Should fail */
+{
+    return a;
+}
diff --git a/test/err/bug2303.c b/test/err/bug2303.c
new file mode 100644
index 000000000..609725ad8
--- /dev/null
+++ b/test/err/bug2303.c
@@ -0,0 +1 @@
+int f(a); /* Should be an error */
diff --git a/test/err/bug2304-var-use.c b/test/err/bug2304-var-use.c
new file mode 100644
index 000000000..8a88405e2
--- /dev/null
+++ b/test/err/bug2304-var-use.c
@@ -0,0 +1,15 @@
+/* Bug 2304 - Visibility of objects/functions undeclared in file scope but 'extern'-declared in unrelated block scopes */
+
+void f1(void)
+{
+    extern int a;
+}
+
+/* 'a' is still invisible in the file scope */
+
+int main(void)
+{
+    return a * 0;   /* Usage of 'a' should be an error */
+}
+
+int a = 42;
diff --git a/test/err/bug2312-pperror-only.c b/test/err/bug2312-pperror-only.c
new file mode 100644
index 000000000..bdec33956
--- /dev/null
+++ b/test/err/bug2312-pperror-only.c
@@ -0,0 +1,8 @@
+/* Bug #2312 */
+
+#error "Compiler should exit with failure"
+
+int main(void)
+{
+    return 0;
+}
diff --git a/test/err/bug2523.c b/test/err/bug2523.c
new file mode 100644
index 000000000..7ab798557
--- /dev/null
+++ b/test/err/bug2523.c
@@ -0,0 +1,3 @@
+#if (1, 0) < 0
+#error
+#endif
diff --git a/test/err/type-name-extra-identifier.c b/test/err/type-name-extra-identifier.c
new file mode 100644
index 000000000..72de4778d
--- /dev/null
+++ b/test/err/type-name-extra-identifier.c
@@ -0,0 +1,25 @@
+/*
+  Copyright 2023 The cc65 Authors
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Test of type name with extra identifier
+*/
+
+int a = sizeof (int b);
diff --git a/test/misc/Makefile b/test/misc/Makefile
index c708b160b..6a5611c68 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the remaining tests that need special care in one way or another
 
 ifneq ($(shell echo),)
@@ -20,10 +26,17 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 SIM65FLAGS = -x 200000000
@@ -58,29 +71,11 @@ $(ISEQUAL): ../isequal.c | $(WORKDIR)
 
 define PRG_template
 
-# should compile, but gives an error
-$(WORKDIR)/int-static-1888.$1.$2.prg: int-static-1888.c | $(WORKDIR)
-	@echo "FIXME: " $$@ "currently does not compile."
-	$(if $(QUIET),echo misc/int-static-1888.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
-
-# should compile, but gives an error
-$(WORKDIR)/bug760.$1.$2.prg: bug760.c | $(WORKDIR)
-	@echo "FIXME: " $$@ "currently does not compile."
-	$(if $(QUIET),echo misc/bug760.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
-
-# should compile, but gives an error
-$(WORKDIR)/bug1437.$1.$2.prg: bug1437.c | $(WORKDIR)
-	@echo "FIXME: " $$@ "currently does not compile."
-	$(if $(QUIET),echo misc/bug1437.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
-
 # should compile, but gives an error
 $(WORKDIR)/bug1209-ind-goto-rev.$1.$2.prg: bug1209-ind-goto-rev.c | $(WORKDIR)
 	@echo "FIXME: " $$@ "currently does not compile."
 	$(if $(QUIET),echo misc/bug1209-ind-goto-rev.$1.$2.prg)
-	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
+	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
 	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
 	$(NOT) $(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
 
@@ -88,7 +83,7 @@ $(WORKDIR)/bug1209-ind-goto-rev.$1.$2.prg: bug1209-ind-goto-rev.c | $(WORKDIR)
 $(WORKDIR)/bug1209-ind-goto-rev-2.$1.$2.prg: bug1209-ind-goto-rev-2.c | $(WORKDIR)
 	@echo "FIXME: " $$@ "currently does not compile."
 	$(if $(QUIET),echo misc/bug1209-ind-goto-rev-2.$1.$2.prg)
-	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
+	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
 	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
 	$(NOT) $(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
 
@@ -96,7 +91,7 @@ $(WORKDIR)/bug1209-ind-goto-rev-2.$1.$2.prg: bug1209-ind-goto-rev-2.c | $(WORKDI
 $(WORKDIR)/bug1209-ind-goto-rev-3.$1.$2.prg: bug1209-ind-goto-rev-3.c | $(WORKDIR)
 	@echo "FIXME: " $$@ "currently does not compile."
 	$(if $(QUIET),echo misc/bug1209-ind-goto-rev-3.$1.$2.prg)
-	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
+	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
 	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
 	$(NOT) $(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
 
@@ -104,38 +99,40 @@ $(WORKDIR)/bug1209-ind-goto-rev-3.$1.$2.prg: bug1209-ind-goto-rev-3.c | $(WORKDI
 $(WORKDIR)/pptest2.$1.$2.prg: pptest2.c | $(WORKDIR)
 	@echo "FIXME: " $$@ "currently does not compile."
 	$(if $(QUIET),echo misc/pptest2.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
-
-# should compile, but gives an error
-$(WORKDIR)/bug1263.$1.$2.prg: bug1263.c | $(WORKDIR)
-	@echo "FIXME: " $$@ "currently does not compile."
-	$(if $(QUIET),echo misc/bug1263.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
-
-# should compile, but gives an error
-$(WORKDIR)/bug1357.$1.$2.prg: bug1357.c | $(WORKDIR)
-	@echo "FIXME: " $$@ "currently does not compile."
-	$(if $(QUIET),echo misc/bug1357.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLOUT) $(CATERR)
 
 # should compile, but compiler exits with internal error
 $(WORKDIR)/bug1211-ice-move-refs-2.$1.$2.prg: bug1211-ice-move-refs-2.c | $(WORKDIR)
 	@echo "FIXME: " $$@ "currently does not compile."
 	$(if $(QUIET),echo misc/bug1211-ice-move-refs-2.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLOUT) $(CATERR)
 
 # this one requires --std=c89, it fails with --std=c99
 $(WORKDIR)/bug1265.$1.$2.prg: bug1265.c | $(WORKDIR)
 	$(if $(QUIET),echo misc/bug1265.$1.$2.prg)
-	$(CC65) --standard c89 -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
+	$(CC65) --standard c89 -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
 	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
 	$(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
 	$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) $(NULLERR)
 
+# should not compile, but gives different diagnostics in C99 mode than in others
+$(WORKDIR)/bug2515.$1.$2.prg: bug2515.c $(ISEQUAL) | $(WORKDIR)
+	$(if $(QUIET),echo misc/bug2515.$1.$2.prg)
+	$(NOT) $(CC65) --standard c99 -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) 2>$(WORKDIR)/bug2515.$1.$2.out
+	$(ISEQUAL) $(WORKDIR)/bug2515.$1.$2.out bug2515.c99.ref
+	$(NOT) $(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) 2>$(WORKDIR)/bug2515.$1.$2.out
+	$(ISEQUAL) $(WORKDIR)/bug2515.$1.$2.out bug2515.ref
+
+# should not issue any warnings in C99 mode
+$(WORKDIR)/bug2637.$1.$2.prg: bug2637.c $(ISEQUAL) | $(WORKDIR)
+	$(if $(QUIET),echo misc/bug2637.$1.$2.prg)
+	$(CC65) --standard c99 -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) 2>$(WORKDIR)/bug2637.$1.$2.out
+	$(ISEQUAL) $(WORKDIR)/bug2637.$1.$2.out bug2637.ref
+
 # this one requires -Werror
 $(WORKDIR)/bug1768.$1.$2.prg: bug1768.c | $(WORKDIR)
 	$(if $(QUIET),echo misc/bug1768.$1.$2.prg)
-	$(CC65) -Werror -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
+	$(CC65) -Werror -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
 	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
 	$(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
 	$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) $(NULLERR)
@@ -143,16 +140,21 @@ $(WORKDIR)/bug1768.$1.$2.prg: bug1768.c | $(WORKDIR)
 # should compile, but then hangs in an endless loop
 $(WORKDIR)/endless.$1.$2.prg: endless.c | $(WORKDIR)
 	$(if $(QUIET),echo misc/endless.$1.$2.prg)
-	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
+	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
 	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
 	$(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
 	$(NOT) $(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) $(NULLERR)
 
 # these need reference data that can't be generated by a host-compiled program,
 # in a useful way
+$(WORKDIR)/bug2655.$1.$2.prg: bug2655.c $(ISEQUAL) | $(WORKDIR)
+	$(if $(QUIET),echo misc/bug2655.$1.$2.prg)
+	$(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLOUT) 2>$(WORKDIR)/bug2655.$1.$2.out
+	$(ISEQUAL) $(WORKDIR)/bug2655.$1.$2.out bug2655.ref
+
 $(WORKDIR)/limits.$1.$2.prg: limits.c $(ISEQUAL) | $(WORKDIR)
 	$(if $(QUIET),echo misc/limits.$1.$2.prg)
-	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
+	$(CC65) -t sim$2 -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
 	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
 	$(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
 	$(SIM65) $(SIM65FLAGS) $$@ > $(WORKDIR)/limits.$1.$2.out
@@ -160,18 +162,24 @@ $(WORKDIR)/limits.$1.$2.prg: limits.c $(ISEQUAL) | $(WORKDIR)
 
 $(WORKDIR)/goto.$1.$2.prg: goto.c $(ISEQUAL) | $(WORKDIR)
 	$(if $(QUIET),echo misc/goto.$1.$2.prg)
-	$(CC65) -t sim$2 -$1 -o $$@ $$< 2>$(WORKDIR)/goto.$1.$2.out
+	$(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLOUT) 2>$(WORKDIR)/goto.$1.$2.out
 	$(ISEQUAL) $(WORKDIR)/goto.$1.$2.out goto.ref
 
+# this one requires failure with --std=c89, it fails with --std=cc65 due to
+# stricter checks
+$(WORKDIR)/bug2304-implicit-func.$1.$2.prg: bug2304-implicit-func.c | $(WORKDIR)
+	$(if $(QUIET),echo misc/bug2304-implicit-func.$1.$2.prg)
+	$(NOT) $(CC65) --standard c89 -t sim$2 -$1 -o $$@ $$< $(NULLOUT) $(CATERR)
+
 # should not compile until 3-byte struct by value tests are re-enabled
 $(WORKDIR)/struct-by-value.$1.$2.prg: struct-by-value.c | $(WORKDIR)
 	$(if $(QUIET),echo misc/struct-by-value.$1.$2.prg)
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLOUT) $(CATERR)
 
 # the rest are tests that fail currently for one reason or another
 $(WORKDIR)/sitest.$1.$2.prg: sitest.c | $(WORKDIR)
 	@echo "FIXME: " $$@ "currently does not compile."
-	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+	$(NOT) $(CC65) -t sim$2 -$1 -o $$@ $$< $(NULLOUT) $(CATERR)
 #	$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 
 endef # PRG_template
diff --git a/test/misc/bug2304-implicit-func.c b/test/misc/bug2304-implicit-func.c
new file mode 100644
index 000000000..f6b7450ff
--- /dev/null
+++ b/test/misc/bug2304-implicit-func.c
@@ -0,0 +1,21 @@
+/* Bug 2304 - Visibility of objects/functions undeclared in file scope but 'extern'-declared in unrelated block scopes */
+
+/* This one should fail even in C89 */
+
+void f1(void)
+{
+    extern unsigned int f();
+}
+
+/* 'f' is still invisible in the file scope */
+
+int main(void)
+{
+    f();        /* Should be a conflict since the implicit function type is incompatible */
+    return 0;
+}
+
+unsigned int f()
+{
+    return 42;
+}
diff --git a/test/misc/bug2515.c b/test/misc/bug2515.c
new file mode 100644
index 000000000..62ee52a25
--- /dev/null
+++ b/test/misc/bug2515.c
@@ -0,0 +1,4 @@
+
+#line 13"x"
+#define X"y"
+int main() { foo; }
diff --git a/test/misc/bug2515.c99.ref b/test/misc/bug2515.c99.ref
new file mode 100644
index 000000000..f6cf2fcea
--- /dev/null
+++ b/test/misc/bug2515.c99.ref
@@ -0,0 +1,2 @@
+x:13: Warning: ISO C99 requires whitespace after the macro name
+x:14: Error: Undeclared identifier 'foo'
diff --git a/test/misc/bug2515.ref b/test/misc/bug2515.ref
new file mode 100644
index 000000000..affbaebb9
--- /dev/null
+++ b/test/misc/bug2515.ref
@@ -0,0 +1 @@
+x:14: Error: Undeclared identifier 'foo'
diff --git a/test/misc/bug2637.c b/test/misc/bug2637.c
new file mode 100644
index 000000000..f6b716465
--- /dev/null
+++ b/test/misc/bug2637.c
@@ -0,0 +1,15 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+// compile with --standard c99
+int main()
+{
+    return 0;
+}
diff --git a/test/misc/bug2637.ref b/test/misc/bug2637.ref
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/misc/bug2655.c b/test/misc/bug2655.c
new file mode 100644
index 000000000..e0b1c939c
--- /dev/null
+++ b/test/misc/bug2655.c
@@ -0,0 +1,18 @@
+void f1(void)
+{
+    if (1) {
+        f1();
+    } else {
+        f1();
+    }
+}
+
+void f2(void)
+{
+    if (0) {
+        f2();
+    } else {
+        f2();
+    }
+}
+
diff --git a/test/misc/bug2655.ref b/test/misc/bug2655.ref
new file mode 100644
index 000000000..99e2d6698
--- /dev/null
+++ b/test/misc/bug2655.ref
@@ -0,0 +1,2 @@
+bug2655.c:5: Warning: Unreachable code
+bug2655.c:12: Warning: Unreachable code
diff --git a/test/readme.txt b/test/readme.txt
index d3f17148e..0aa8799b9 100644
--- a/test/readme.txt
+++ b/test/readme.txt
@@ -12,6 +12,8 @@ compiler is working as expected (when the tests behave as described):
 /val  - The bulk of tests are contained here, individual tests should exit with
         an exit code of EXIT_SUCCESS when they pass, or EXIT_FAILURE on error.
 
+/err  - contains tests that MUST NOT compile
+
 /standard - like the tests in /val, the tests must exit with EXIT_SUCCESS on
         success. Unlike the tests in /val these are not compiled for every
         combination of optimizer options, but instead always with -Osir and then
@@ -19,6 +21,10 @@ compiler is working as expected (when the tests behave as described):
         to check for regressions in standard conformance of the compiler and the
         library.
 
+/standard_err - like the tests in /err, these tests MUST NOT compile, and like
+        the tests in /standard, these are compiled -Osir and then for each
+        supported C-Standard.
+
 /ref  - These tests produce output that must be compared with reference output.
         Normally the reference output is produced by compiling the program on the
         host (using gcc mostly) and then running them on the host. Tests should
@@ -43,8 +49,6 @@ compiler is working as expected (when the tests behave as described):
         only ever use this as a last resort when something can not be tested by
         other means.
 
-/err  - contains tests that MUST NOT compile
-
 
 /todo and /misc generally contain the tests that fail because of known bugs:
 
diff --git a/test/ref/Makefile b/test/ref/Makefile
index abd3e9bc0..4269c3879 100644
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the regression tests that generate output which has to be
 # compared with reference output
 
@@ -21,9 +27,17 @@ else
   COPY = cp $1 $2
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
+  NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 SIM65FLAGS = -x 200000000
@@ -39,8 +53,18 @@ OPTIONS = g O Os Osi Osir Osr Oi Oir Or
 
 ISEQUAL = ..$S..$Stestwrk$Sisequal$(EXE)
 
+# NOTE: the current test bench may include K&R style C, C89 style C, C99 - and
+#       even things from later standards. Technically C99 removed certain C89
+#       constructs - However, so far GCC would still compile them and issue a
+#       warning (instead of an error). Now, GCC 14 will be more strict about this,
+#       and by default make those things an error instead. We use -std=gnu17 here
+#       so we can still build the references with a modern compiler, and don't
+#       have to deal with special-casing individual tests that use constructs
+#       from those old standards. Should this become a problem in the future, we
+#       will have to change that, and create said special cases here.
+#       see discussion in https://github.com/cc65/cc65/issues/2277
 CC = gcc
-CFLAGS = -O2 -Wall -W -Wextra -funsigned-char -fwrapv -fno-strict-overflow
+CFLAGS = -std=gnu17 -O2 -Wall -W -Wextra -funsigned-char -fwrapv -fno-strict-overflow -Wno-error=implicit-int -Wno-error=int-conversion
 
 .PHONY: all clean
 
@@ -53,7 +77,9 @@ CUSTOMSOURCES = \
 # exact error output is required
 ERRORSOURCES = \
 	custom-reference-error.c \
-	bug1889-missing-identifier.c
+	inline-error.c \
+	bug1889-missing-identifier.c \
+	bug2312-preprocessor-error.c
 
 SOURCES := $(filter-out $(CUSTOMSOURCES) $(ERRORSOURCES),$(wildcard *.c))
 
diff --git a/test/ref/bug1889-missing-identifier.c b/test/ref/bug1889-missing-identifier.c
index d9cf4aa52..a8140565f 100644
--- a/test/ref/bug1889-missing-identifier.c
+++ b/test/ref/bug1889-missing-identifier.c
@@ -3,6 +3,8 @@
 int enum { a } x;
 inline enum { b };
 
+_Static_assert();
+
 int main(void)
 {
     return 0;
diff --git a/test/ref/bug1889-missing-identifier.cref b/test/ref/bug1889-missing-identifier.cref
index 534c6aaba..70c485fab 100644
--- a/test/ref/bug1889-missing-identifier.cref
+++ b/test/ref/bug1889-missing-identifier.cref
@@ -1,3 +1,4 @@
-bug1889-missing-identifier.c:3: Error: Identifier expected
-bug1889-missing-identifier.c:3: Error: ';' expected
-bug1889-missing-identifier.c:4: Error: Identifier expected
+bug1889-missing-identifier.c:3: Error: Identifier or ';' expected after declaration specifiers
+bug1889-missing-identifier.c:3: Warning: Implicit 'int' type specifier is an obsolete feature
+bug1889-missing-identifier.c:4: Error: 'inline' on empty declaration
+bug1889-missing-identifier.c:6: Error: Expression expected
diff --git a/test/ref/bug2134.c b/test/ref/bug2134.c
new file mode 100644
index 000000000..9dd1e5c55
--- /dev/null
+++ b/test/ref/bug2134.c
@@ -0,0 +1,3 @@
+int i = { 0 };
+char* p = { 0 };
+int main() { return 0; }
diff --git a/test/ref/bug2134.cref b/test/ref/bug2134.cref
new file mode 100644
index 000000000..72bbbad04
--- /dev/null
+++ b/test/ref/bug2134.cref
@@ -0,0 +1,2 @@
+bug2134.c:1: Warning: Braces around scalar initializer
+bug2134.c:2: Warning: Braces around scalar initializer
diff --git a/test/ref/bug2312-preprocessor-error.c b/test/ref/bug2312-preprocessor-error.c
new file mode 100644
index 000000000..b7872f514
--- /dev/null
+++ b/test/ref/bug2312-preprocessor-error.c
@@ -0,0 +1,8 @@
+/* Bug #2312 - Error recovery from preprocessor errors at the end of a declaration */
+
+typedef int A;  /* ';' consumption triggers PP below */
+
+#define         /* PP error during ';' consumption */
+
+A   f(void);    /* Should be OK */
+int A(void);    /* Should be an error */
diff --git a/test/ref/bug2312-preprocessor-error.cref b/test/ref/bug2312-preprocessor-error.cref
new file mode 100644
index 000000000..680950fd6
--- /dev/null
+++ b/test/ref/bug2312-preprocessor-error.cref
@@ -0,0 +1,2 @@
+bug2312-preprocessor-error.c:5: Error: Missing macro name
+bug2312-preprocessor-error.c:8: Error: Redefinition of typedef 'A' as different kind of symbol
diff --git a/test/ref/custom-reference-error.c b/test/ref/custom-reference-error.c
index 857145fc0..455e0276d 100644
--- a/test/ref/custom-reference-error.c
+++ b/test/ref/custom-reference-error.c
@@ -13,9 +13,14 @@
     and then "make" again to confirm
 */
 
-short main(int argc, char* argv[])
+typedef short return_t;
+#error This is an/* produce an error */error
+
+return_t main(int argc, char* argv[])
 {
     printf("%02x", 0x42); /* produce an error */
     n = 0;                /* produce an error */
     /* produce a warning */
 }
+int b = 0;
+int arr[b]; /* produce an error */
diff --git a/test/ref/custom-reference-error.cref b/test/ref/custom-reference-error.cref
index 728cc0e15..9ffa581cd 100644
--- a/test/ref/custom-reference-error.cref
+++ b/test/ref/custom-reference-error.cref
@@ -1,5 +1,7 @@
-custom-reference-error.c:18: Error: Call to undeclared function 'printf'
-custom-reference-error.c:19: Error: Undeclared identifier 'n'
-custom-reference-error.c:21: Warning: Control reaches end of non-void function [-Wreturn-type]
-custom-reference-error.c:21: Warning: Parameter 'argc' is never used
-custom-reference-error.c:21: Warning: Parameter 'argv' is never used
+custom-reference-error.c:17: Error: #error: This is an error
+custom-reference-error.c:21: Error: Call to undeclared function 'printf'
+custom-reference-error.c:22: Error: Undeclared identifier 'n'
+custom-reference-error.c:24: Warning: Control reaches end of non-void function [-Wreturn-type]
+custom-reference-error.c:24: Warning: Parameter 'argc' is never used
+custom-reference-error.c:24: Warning: Parameter 'argv' is never used
+custom-reference-error.c:26: Error: Constant integer expression expected
diff --git a/test/ref/inline-error.c b/test/ref/inline-error.c
new file mode 100644
index 000000000..2dad41b6d
--- /dev/null
+++ b/test/ref/inline-error.c
@@ -0,0 +1,38 @@
+/* C99 inline in declarations */
+
+inline typedef int;                 /* Error */
+static inline int;                  /* Error */
+inline static int a1;               /* Error */
+int inline (*fp1)(void);            /* Error */
+typedef inline int f1_t(void);      /* Error */
+inline int f1a(void);               /* OK here warning later */
+inline extern int f1b(void);        /* OK here warning later */
+extern inline int f1b(void);        /* Same as above */
+inline static int f1c(void);        /* OK here warning later */
+static inline int f1c(void);        /* Same as above */
+
+void foo(inline int x);             /* Error */
+int a = sizeof (inline int);        /* TODO: better error message */
+int b = sizeof (inline int (int));  /* TODO: better error message */
+
+inline int main(void)               /* Error */
+{
+    inline typedef int;             /* Error */
+    static inline int;              /* Error */
+    extern inline int a2;           /* Error */
+    int inline (*fp2)(void);        /* Error */
+    typedef inline int f2_t(void);  /* Error */
+    inline int f2a(void);           /* OK here warning later */
+    inline extern int f2b(void);    /* OK here warning later */
+    extern inline int f2b(void);    /* Same as above */
+
+    f1a();                          /* Still imported */
+    f1b();                          /* Still imported */
+    f1c();                          /* Not imported */
+    f2a();                          /* Still imported */
+    f2b();                          /* Still imported */
+}
+
+inline int main(void);              /* Error */
+
+/* Warning: non-external inline functions declared but undefined in TU */
diff --git a/test/ref/inline-error.cref b/test/ref/inline-error.cref
new file mode 100644
index 000000000..4ce1d7073
--- /dev/null
+++ b/test/ref/inline-error.cref
@@ -0,0 +1,21 @@
+inline-error.c:3: Error: 'inline' on empty declaration
+inline-error.c:4: Error: 'inline' on empty declaration
+inline-error.c:5: Error: 'inline' on non-function declaration
+inline-error.c:6: Error: 'inline' on non-function declaration
+inline-error.c:7: Error: 'inline' on non-function declaration
+inline-error.c:14: Error: Unexpected function specifiers
+inline-error.c:15: Error: Mixed declarations and code are not supported in cc65
+inline-error.c:16: Error: Mixed declarations and code are not supported in cc65
+inline-error.c:19: Error: 'main' cannot be declared inline
+inline-error.c:20: Error: 'inline' on empty declaration
+inline-error.c:21: Error: 'inline' on empty declaration
+inline-error.c:22: Error: 'inline' on non-function declaration
+inline-error.c:23: Error: 'inline' on non-function declaration
+inline-error.c:24: Error: 'inline' on non-function declaration
+inline-error.c:34: Warning: Variable 'fp2' is defined but never used
+inline-error.c:36: Error: 'main' cannot be declared inline
+inline-error.c:39: Warning: Inline function 'f1a' used but never defined
+inline-error.c:39: Warning: Inline function 'f1b' used but never defined
+inline-error.c:39: Warning: Static function 'f1c' used but never defined
+inline-error.c:39: Warning: Inline function 'f2a' used but never defined
+inline-error.c:39: Warning: Inline function 'f2b' used but never defined
diff --git a/test/ref/test_fgets.c b/test/ref/test_fgets.c
new file mode 100644
index 000000000..0529b1651
--- /dev/null
+++ b/test/ref/test_fgets.c
@@ -0,0 +1,67 @@
+/*
+  !!DESCRIPTION!! fgets test
+  !!LICENCE!!     Public domain
+*/
+
+#include "common.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+FILE *in, *out;
+char buf[32];
+
+#define INFILE   "cf.in"
+
+int main(int argc,char **argv)
+{
+    static char outfile_path[FILENAME_MAX+1];
+
+    sprintf(outfile_path, "%s.test.out", argv[0]);
+
+    out = fopen(outfile_path, "wb");
+    if (out == NULL) {
+        return EXIT_FAILURE;
+    }
+    if (fgets(buf, sizeof(buf), out) != NULL) {
+      printf("Error, could fgets with write-only file\n");
+      return 1;
+    }
+    if (!ferror(out)) {
+      printf("Error: file pointer should be in error state\n");
+    }
+    fclose(out);
+    unlink(outfile_path);
+
+    in = fopen(INFILE, "rb");
+    if (in == NULL) {
+        return EXIT_FAILURE;
+    }
+
+    if (fgets(NULL, 0, in) != NULL) {
+      printf("Error, could fgets with zero size\n");
+      return 1;
+    }
+
+    /* Test ungetc while we're at it */
+    buf[0] = fgetc(in);
+    ungetc(buf[0], in);
+
+
+    while (fgets(buf, sizeof(buf), in) != NULL)
+    {
+        printf("%s",buf);
+    }
+
+    if (!feof(in))
+    {
+        printf("We should have EOF!\n");
+    }
+
+    fclose(in);
+    return 0;
+}
diff --git a/test/ref/test_fputc.c b/test/ref/test_fputc.c
new file mode 100644
index 000000000..a19aeafaf
--- /dev/null
+++ b/test/ref/test_fputc.c
@@ -0,0 +1,39 @@
+/*
+  !!DESCRIPTION!! fgets test
+  !!LICENCE!!     Public domain
+*/
+
+#include "common.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+FILE *in, *out;
+int c, err;
+
+#define INFILE   "cf.in"
+
+int main(int argc,char **argv)
+{
+    in = fopen(INFILE, "rb");
+    if (in == NULL) {
+        return EXIT_FAILURE;
+    }
+
+    if (fputc(c, in) != EOF) {
+      printf("Error: can fputc to a file opened for reading\n");
+      return EXIT_FAILURE;
+    }
+    clearerr(in);
+
+    while ((c = fgetc(in)) != EOF) {
+      fputc(c, stdout);
+    }
+
+    fclose(in);
+    return 0;
+}
diff --git a/test/ref/test_fputs.c b/test/ref/test_fputs.c
new file mode 100644
index 000000000..ad0552317
--- /dev/null
+++ b/test/ref/test_fputs.c
@@ -0,0 +1,40 @@
+/*
+  !!DESCRIPTION!! fgets test
+  !!LICENCE!!     Public domain
+*/
+
+#include "common.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+FILE *in, *out;
+char buf[512], err;
+
+#define INFILE   "cf.in"
+
+int main(int argc,char **argv)
+{
+    in = fopen(INFILE, "rb");
+    if (in == NULL) {
+        return EXIT_FAILURE;
+    }
+
+    strcpy(buf, "test");
+    if (fputs(buf, in) != EOF) {
+      printf("Error: can fputs to a file opened for reading\n");
+      return EXIT_FAILURE;
+    }
+    clearerr(in);
+
+    while (fgets(buf, 512, in) != NULL) {
+      fputs(buf, stdout);
+    }
+
+    fclose(in);
+    return 0;
+}
diff --git a/test/ref/test_fread.c b/test/ref/test_fread.c
new file mode 100644
index 000000000..99411ab28
--- /dev/null
+++ b/test/ref/test_fread.c
@@ -0,0 +1,72 @@
+/*
+  !!DESCRIPTION!! fread test
+  !!LICENCE!!     Public domain
+*/
+
+#include "common.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+FILE *in, *out;
+char buf[32];
+
+#define INFILE   "cf.in"
+
+int main(int argc,char **argv)
+{
+    static char outfile_path[FILENAME_MAX+1];
+    static int r;
+
+    sprintf(outfile_path, "%s.test.out", argv[0]);
+
+    out = fopen(outfile_path, "wb");
+    if (out == NULL) {
+        return EXIT_FAILURE;
+    }
+    if (fread(buf, 1, sizeof(buf), out) != NULL) {
+      printf("Error, could fread with write-only file\n");
+      return 1;
+    }
+    if (!ferror(out)) {
+      printf("Error: file pointer should be in error state\n");
+    }
+    fclose(out);
+    unlink(outfile_path);
+
+    in = fopen(INFILE, "rb");
+    if (in == NULL) {
+        return EXIT_FAILURE;
+    }
+
+    /* Test that ungetc doesn't break fread */
+    buf[0] = fgetc(in);
+    ungetc(buf[0], in);
+
+    r = fread(buf, 1, sizeof(buf), out);
+
+    if (r == 0) {
+      printf("Error: could not start reading.\n");
+      return EXIT_FAILURE;
+    }
+    fwrite(buf, 1, r, stdout);
+
+    /* Finish reading file. */
+    while ((r = fread(buf, 1, sizeof(buf), out)) != 0)
+    {
+        fwrite(buf, 1, r, stdout);
+    }
+
+    if (!feof(in))
+    {
+        printf("We should have EOF!\n");
+        return EXIT_FAILURE;
+    }
+
+    fclose(in);
+    return 0;
+}
diff --git a/test/ref/test_fseek.c b/test/ref/test_fseek.c
new file mode 100644
index 000000000..157d0bdf0
--- /dev/null
+++ b/test/ref/test_fseek.c
@@ -0,0 +1,73 @@
+/*
+  !!DESCRIPTION!! fseek test
+  !!LICENCE!!     Public domain
+*/
+
+#include "common.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+FILE *in;
+char bufA[32];
+char bufB[32];
+
+#define INFILE   "cf.in"
+
+int main(int argc,char **argv)
+{
+    static int r;
+
+    in = fopen(INFILE, "rb");
+    if (in == NULL) {
+        return EXIT_FAILURE;
+    }
+
+    r = fread(bufA, 1, sizeof(bufA), in);
+
+    if (r == 0) {
+      printf("Error: could not read.\n");
+      return EXIT_FAILURE;
+    }
+    fwrite(bufA, 1, r, stdout);
+
+    /* Test SEEK_SET */
+    fseek(in, 0, SEEK_SET);
+    r = fread(bufB, 1, sizeof(bufB), in);
+
+    if (r == 0) {
+      printf("Error: could not re-read after SEEK_SET.\n");
+      return EXIT_FAILURE;
+    }
+    fwrite(bufB, 1, r, stdout);
+
+    if (memcmp(bufA, bufB, sizeof(bufA))) {
+      printf("reads differ.\n");
+      return EXIT_FAILURE;
+    }
+
+    /* Test SEEK_CUR */
+    fseek(in, 0, SEEK_SET);
+    fseek(in, 1, SEEK_CUR);
+    r = fread(bufB, 1, sizeof(bufB), in);
+
+    if (r == 0) {
+      printf("Error: could not re-read after SEEK_CUR.\n");
+      return EXIT_FAILURE;
+    }
+    fwrite(bufB, 1, r, stdout);
+
+    if (memcmp(bufA+1, bufB, sizeof(bufA)-1)) {
+      printf("reads differ.\n");
+      return EXIT_FAILURE;
+    }
+
+
+    fclose(in);
+
+    return 0;
+}
diff --git a/test/ref/test_gets.c b/test/ref/test_gets.c
new file mode 100644
index 000000000..003da5569
--- /dev/null
+++ b/test/ref/test_gets.c
@@ -0,0 +1,44 @@
+/*
+  !!DESCRIPTION!! gets test
+  !!LICENCE!!     Public domain
+*/
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <ctype.h>
+
+char buf[512];
+
+#define INFILE   "cf.in"
+
+#ifndef __CC65__
+/* Force declaration on host compiler, as gets() is deprecated for
+ * being dangerous as hell */
+char *gets (char *__s);
+#endif
+
+#ifdef NO_OLD_FUNC_DECL
+int main(int argc,char **argv)
+#else
+main(argc, argv)
+int argc;
+char *argv[];
+#endif
+{
+    /* Fake stdin with the reference file */
+    if (freopen(INFILE, "rb", stdin) == NULL) {
+        return EXIT_FAILURE;
+    }
+
+    while (gets(buf) != NULL)
+    {
+        printf("%s",buf);
+    }
+
+    fclose(stdin);
+    return 0;
+}
diff --git a/test/ref/test_rewind.c b/test/ref/test_rewind.c
new file mode 100644
index 000000000..d1b361983
--- /dev/null
+++ b/test/ref/test_rewind.c
@@ -0,0 +1,56 @@
+/*
+  !!DESCRIPTION!! rewind test
+  !!LICENCE!!     Public domain
+*/
+
+#include "common.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+FILE *in;
+char bufA[32];
+char bufB[32];
+
+#define INFILE   "cf.in"
+
+int main(int argc,char **argv)
+{
+    static int r;
+
+    in = fopen(INFILE, "rb");
+    if (in == NULL) {
+        return EXIT_FAILURE;
+    }
+
+    r = fread(bufA, 1, sizeof(bufA), in);
+
+    if (r == 0) {
+      printf("Error: could not read.\n");
+      return EXIT_FAILURE;
+    }
+    fwrite(bufA, 1, r, stdout);
+
+    rewind(in);
+    printf("rewind.\n");
+    r = fread(bufB, 1, sizeof(bufB), in);
+
+    if (r == 0) {
+      printf("Error: could not re-read.\n");
+      return EXIT_FAILURE;
+    }
+    fwrite(bufB, 1, r, stdout);
+
+    fclose(in);
+
+    if (memcmp(bufA, bufB, sizeof(bufA))) {
+      printf("reads differ.\n");
+      return EXIT_FAILURE;
+    }
+
+    return 0;
+}
diff --git a/test/standard/Makefile b/test/standard/Makefile
index bf513c84e..903b34221 100644
--- a/test/standard/Makefile
+++ b/test/standard/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the regression tests that return an error code on failure
 
 ifneq ($(shell echo),)
@@ -16,10 +22,17 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 SIM65FLAGS = -x 4000000000 -c
diff --git a/test/standard/issue2607_cc65.c b/test/standard/issue2607_cc65.c
new file mode 100644
index 000000000..82ff9d1aa
--- /dev/null
+++ b/test/standard/issue2607_cc65.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+/* this should succeed on all three standards
+ * yet use only \e on CC65
+ */
+int main(void) {
+
+#if __CC65_STD__ == __CC65_STD_CC65__
+    printf("\e");
+#endif
+
+    return EXIT_SUCCESS;
+}
diff --git a/test/standard/null.c b/test/standard/null.c
new file mode 100644
index 000000000..cd4bd0a44
--- /dev/null
+++ b/test/standard/null.c
@@ -0,0 +1,162 @@
+
+
+/* test headers which should define NULL */
+
+#include <locale.h>
+#ifndef NULL
+#error "NULL should be defined in locale.h"
+#endif
+#undef NULL
+
+#include <stdlib.h>
+#ifndef NULL
+#error "NULL should be defined in stdlib.h"
+#endif
+#undef NULL
+
+#include <string.h>
+#ifndef NULL
+#error "NULL should be defined in string.h"
+#endif
+#undef NULL
+
+#include <stddef.h>
+#ifndef NULL
+#error "NULL should be defined in stddef.h"
+#endif
+#undef NULL
+
+#include <stdio.h>
+#ifndef NULL
+#error "NULL should be defined in stdio.h"
+#endif
+#undef NULL
+
+#include <time.h>
+#ifndef NULL
+#error "NULL should be defined in time.h"
+#endif
+#undef NULL
+
+/* does not exist in cc65 (yet)
+#include <wchar.h>
+#ifndef NULL
+#error "NULL should be defined in wchar.h"
+#endif */
+#undef NULL
+
+
+/* test headers which should NOT define NULL */
+
+#include <assert.h>
+#ifdef NULL
+#error "NULL should NOT be defined in assert.h"
+#undef NULL
+#endif
+
+/* does not exist in cc65 (yet)
+#include <complex.h>
+#ifdef NULL
+#error "NULL should NOT be defined in complex.h"
+#undef NULL
+#endif */
+
+#include <ctype.h>
+#ifdef NULL
+#error "NULL should NOT be defined in ctype.h"
+#undef NULL
+#endif
+
+#include <errno.h>
+#ifdef NULL
+#error "NULL should NOT be defined in errno.h"
+#undef NULL
+#endif
+
+/* does not exist in cc65 (yet)
+#include <fenv.h>
+#ifdef NULL
+#error "NULL should NOT be defined in fenv.h"
+#undef NULL
+#endif */
+
+/* does not exist in cc65 (yet)
+#include <float.h>
+#ifdef NULL
+#error "NULL should NOT be defined in float.h"
+#undef NULL
+#endif */
+
+#include <inttypes.h>
+#ifdef NULL
+#error "NULL should NOT be defined in inttypes.h"
+#undef NULL
+#endif
+
+#include <iso646.h>
+#ifdef NULL
+#error "NULL should NOT be defined in iso646.h"
+#undef NULL
+#endif
+
+#include <limits.h>
+#ifdef NULL
+#error "NULL should NOT be defined in limits.h"
+#undef NULL
+#endif
+
+/* does not exist in cc65 (yet)
+#include <math.h>
+#ifdef NULL
+#error "NULL should NOT be defined in math.h"
+#undef NULL
+#endif */
+
+#include <setjmp.h>
+#ifdef NULL
+#error "NULL should NOT be defined in setjmp.h"
+#undef NULL
+#endif
+
+#include <signal.h>
+#ifdef NULL
+#error "NULL should NOT be defined in signal.h"
+#undef NULL
+#endif
+
+#include <stdarg.h>
+#ifdef NULL
+#error "NULL should NOT be defined in stdarg.h"
+#undef NULL
+#endif
+
+#include <stdbool.h>
+#ifdef NULL
+#error "NULL should NOT be defined in stdbool.h"
+#undef NULL
+#endif
+
+#include <stdint.h>
+#ifdef NULL
+#error "NULL should NOT be defined in stdint.h"
+#undef NULL
+#endif
+
+/* does not exist in cc65 (yet)
+#include <tgmath.h>
+#ifdef NULL
+#error "NULL should NOT be defined in tgmath.h"
+#undef NULL
+#endif */
+
+/* does not exist in cc65 (yet)
+#include <wctype.h>
+#ifdef NULL
+#error "NULL should NOT be defined in wctype.h"
+#undef NULL
+#endif */
+
+int main(void)
+{
+    return 0;
+}
diff --git a/test/standard/stdint.c b/test/standard/stdint.c
new file mode 100644
index 000000000..29b48346a
--- /dev/null
+++ b/test/standard/stdint.c
@@ -0,0 +1,167 @@
+/* Test definitions from stdint.h */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <signal.h>
+
+/* All macros from stdint.h must be evaluatable by the preprocessor */
+#if INT8_MIN
+#endif
+#if INT8_MAX
+#endif
+#if INT16_MIN
+#endif
+#if INT16_MAX
+#endif
+#if INT32_MIN
+#endif
+#if INT32_MAX
+#endif
+#if UINT8_MAX
+#endif
+#if UINT16_MAX
+#endif
+#if UINT32_MAX
+#endif
+#if INT_LEAST8_MIN
+#endif
+#if INT_LEAST8_MAX
+#endif
+#if INT_LEAST16_MIN
+#endif
+#if INT_LEAST16_MAX
+#endif
+#if INT_LEAST32_MIN
+#endif
+#if INT_LEAST32_MAX
+#endif
+#if UINT_LEAST8_MAX
+#endif
+#if UINT_LEAST16_MAX
+#endif
+#if UINT_LEAST32_MAX
+#endif
+#if INT_FAST8_MIN
+#endif
+#if INT_FAST8_MAX
+#endif
+#if INT_FAST16_MIN
+#endif
+#if INT_FAST16_MAX
+#endif
+#if INT_FAST32_MIN
+#endif
+#if INT_FAST32_MAX
+#endif
+#if UINT_FAST8_MAX
+#endif
+#if UINT_FAST16_MAX
+#endif
+#if UINT_FAST32_MAX
+#endif
+#if INTPTR_MIN
+#endif
+#if INTPTR_MAX
+#endif
+#if UINTPTR_MAX
+#endif
+#if INTMAX_MIN
+#endif
+#if INTMAX_MAX
+#endif
+#if UINTMAX_MAX
+#endif
+#if PTRDIFF_MIN
+#endif
+#if PTRDIFF_MAX
+#endif
+#if SIG_ATOMIC_MIN
+#endif
+#if SIG_ATOMIC_MAX
+#endif
+#if SIZE_MAX
+#endif
+
+#define SMIN(type)      ((type)(1L << (sizeof(type) * CHAR_BIT - 1)))
+#define SMAX(type)      ((type)(~SMIN(type)))
+#define UMAX(type)      ((type)(~(type)0))
+
+#define SMIN_CHECK(type, val)                                           \
+    if (SMIN(type) != val) {                                            \
+        ++failures;                                                     \
+        printf("Mismatch for %s, minimum (%ld) is not %s (%ld)\n",      \
+               #type, (long)SMIN(type), #val, (long)val);               \
+    }
+#define SMAX_CHECK(type, val)                                           \
+    if (SMAX(type) != val) {                                            \
+        ++failures;                                                     \
+        printf("Mismatch for %s, maximum (%ld) is not %s (%ld)\n",      \
+               #type, (long)SMAX(type), #val, (long)val);               \
+    }
+#define UMAX_CHECK(type, val)                                           \
+    if (UMAX(type) != val) {                                            \
+        ++failures;                                                     \
+        printf("Mismatch for %s, maximum (%lu) is not %s (%lu)\n",      \
+               #type, (unsigned long)UMAX(type), #val,                  \
+               (unsigned long)val);                                     \
+    }
+
+static unsigned failures = 0;
+
+int main()
+{
+    SMIN_CHECK(int8_t, INT8_MIN);
+    SMAX_CHECK(int8_t, INT8_MAX);
+    SMIN_CHECK(int16_t, INT16_MIN);
+    SMAX_CHECK(int16_t, INT16_MAX);
+    SMIN_CHECK(int32_t, INT32_MIN);
+    SMAX_CHECK(int32_t, INT32_MAX);
+    UMAX_CHECK(uint8_t, UINT8_MAX);
+    UMAX_CHECK(uint16_t, UINT16_MAX);
+    UMAX_CHECK(uint32_t, UINT32_MAX);
+
+    SMIN_CHECK(int_least8_t, INT_LEAST8_MIN);
+    SMAX_CHECK(int_least8_t, INT_LEAST8_MAX);
+    SMIN_CHECK(int_least16_t, INT_LEAST16_MIN);
+    SMAX_CHECK(int_least16_t, INT_LEAST16_MAX);
+    SMIN_CHECK(int_least32_t, INT_LEAST32_MIN);
+    SMAX_CHECK(int_least32_t, INT_LEAST32_MAX);
+    UMAX_CHECK(uint_least8_t, UINT_LEAST8_MAX);
+    UMAX_CHECK(uint_least16_t, UINT_LEAST16_MAX);
+    UMAX_CHECK(uint_least32_t, UINT_LEAST32_MAX);
+
+    SMIN_CHECK(int_fast8_t, INT_FAST8_MIN);
+    SMAX_CHECK(int_fast8_t, INT_FAST8_MAX);
+    SMIN_CHECK(int_fast16_t, INT_FAST16_MIN);
+    SMAX_CHECK(int_fast16_t, INT_FAST16_MAX);
+    SMIN_CHECK(int_fast32_t, INT_FAST32_MIN);
+    SMAX_CHECK(int_fast32_t, INT_FAST32_MAX);
+    UMAX_CHECK(uint_fast8_t, UINT_FAST8_MAX);
+    UMAX_CHECK(uint_fast16_t, UINT_FAST16_MAX);
+    UMAX_CHECK(uint_fast32_t, UINT_FAST32_MAX);
+
+    SMIN_CHECK(intptr_t, INTPTR_MIN);
+    SMAX_CHECK(intptr_t, INTPTR_MAX);
+    UMAX_CHECK(uintptr_t, UINTPTR_MAX);
+
+    SMIN_CHECK(intmax_t, INTMAX_MIN);
+    SMAX_CHECK(intmax_t, INTMAX_MAX);
+    UMAX_CHECK(uintmax_t, UINTMAX_MAX);
+
+    SMIN_CHECK(ptrdiff_t, PTRDIFF_MIN);
+    SMAX_CHECK(ptrdiff_t, PTRDIFF_MAX);
+
+#if SIG_ATOMIC_MIN < 0
+    SMIN_CHECK(sig_atomic_t, SIG_ATOMIC_MIN);
+    SMAX_CHECK(sig_atomic_t, SIG_ATOMIC_MAX);
+#else
+    UMAX_CHECK(sig_atomic_t, SIG_ATOMIC_MAX);
+#endif
+
+    UMAX_CHECK(size_t, SIZE_MAX);
+
+    return failures;
+}
diff --git a/test/standard_err/Makefile b/test/standard_err/Makefile
new file mode 100644
index 000000000..989d26d6f
--- /dev/null
+++ b/test/standard_err/Makefile
@@ -0,0 +1,70 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
+# Makefile for the tests that MUST NOT compile
+
+ifneq ($(shell echo),)
+  CMD_EXE = 1
+endif
+
+ifdef CMD_EXE
+  S = $(subst /,\,/)
+  NOT = - # Hack
+  NULLDEV = nul:
+  MKDIR = mkdir $(subst /,\,$1)
+  RMDIR = -rmdir /s /q $(subst /,\,$1)
+else
+  S = /
+  NOT = !
+  NULLDEV = /dev/null
+  MKDIR = mkdir -p $1
+  RMDIR = $(RM) -r $1
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+  .SILENT:
+  NULLOUT = >$(NULLDEV)
+  NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
+endif
+
+
+CC65 := $(if $(wildcard ../../bin/cc65*),..$S..$Sbin$Scc65,cc65)
+
+WORKDIR = ../../testwrk/standard_err
+
+OPTIONS = c89 c99 cc65
+
+.PHONY: all clean
+
+SOURCES := $(wildcard *.c)
+TESTS  = $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).6502.prg))
+
+all: $(TESTS)
+
+$(WORKDIR):
+	$(call MKDIR,$(WORKDIR))
+
+define PRG_template
+
+$(WORKDIR)/%.$1.$2.prg: %.c | $(WORKDIR)
+	$(if $(QUIET),echo standard_err/$$*.$1.$2.prg)
+	$(NOT) $(CC65) -t sim$2 $$(CC65FLAGS) -Osir --add-source --standard $1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
+
+endef # PRG_template
+
+$(foreach option,$(OPTIONS),$(eval $(call PRG_template,$(option),6502)))
+
+#$(foreach option,$(OPTIONS),$(eval $(call PRG_template,$(option),65c02)))
+
+clean:
+	@$(call RMDIR,$(WORKDIR))
diff --git a/test/standard_err/issue2607_not_cc65.c b/test/standard_err/issue2607_not_cc65.c
new file mode 100644
index 000000000..5e56df557
--- /dev/null
+++ b/test/standard_err/issue2607_not_cc65.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+/* this should fail on all three standards
+ */
+int main(void) {
+
+#if __CC65_STD__ != __CC65_STD_CC65__
+    printf("\e");
+#else
+#error "this needs to error on CC65 to make it through validation"
+#endif
+    return EXIT_SUCCESS;
+}
diff --git a/test/todo/Makefile b/test/todo/Makefile
index 062b899ce..efaca3a25 100644
--- a/test/todo/Makefile
+++ b/test/todo/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the currently failing regression tests that return an error code on failure
 
 ifneq ($(shell echo),)
@@ -18,11 +24,19 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
 endif
+endif
+
 
 SIM65FLAGS = -x 200000000
 
diff --git a/test/todo/bug2172_invalid_code.c b/test/todo/bug2172_invalid_code.c
new file mode 100644
index 000000000..74522c029
--- /dev/null
+++ b/test/todo/bug2172_invalid_code.c
@@ -0,0 +1,56 @@
+
+// bug #2172 - Invalid code generated for switch statement
+
+#include <stdlib.h>
+#include <stdio.h>
+
+// cc65 -o bug2172.s -Cl -Oirs -T -t c64 bug2172.c
+int func(int expr)
+{
+    switch (expr) {
+        int i;
+        case 0:
+            i = 17;
+            return i;
+        default:
+            i = 16;
+            return i;
+    }
+}
+
+int err = 0;
+
+int main(void)
+{
+    int i = 0;
+    int n = 42;
+    for (i = -3; i < 0; i++) {
+        n = func(i);
+        if ((i < -3) || (i >= 0)) {
+            goto stackerr;
+        }
+        printf("i:%d expect:16 got:%d\n", i, n);
+        if (n != 16) {
+            err++;
+        }
+    }
+    n = func(0);
+    printf("i:%d expect:17 got:%d\n", 0, n);
+    if (n != 17) {
+        err++;
+    }
+    for (i = 1; i < 4; i++) {
+        n = func(i);
+        if ((i < 1) || (i >= 4)) {
+            goto stackerr;
+        }
+        printf("i:%d expect:16 got:%d\n", i, n);
+        if (n != 16) {
+            err++;
+        }
+    }
+    return err;
+stackerr:
+    fputs("stack messed up?\n", stdout);
+    return -1;
+}
diff --git a/test/todo/bug2172b_invalid_code.c b/test/todo/bug2172b_invalid_code.c
new file mode 100644
index 000000000..13d983123
--- /dev/null
+++ b/test/todo/bug2172b_invalid_code.c
@@ -0,0 +1,51 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+
+/* Just some arbitrary code, more fun with goto */
+int func(int m)
+{
+    long x = -42;               /* sp: -4 */
+    switch (x) {
+        /* return 0; // C99 only */
+        int i = 42;             /* sp: -6 */
+L0:
+        --i;
+default:
+        if (i != 0) {
+            long j = 13;        /* sp: -10 */
+            goto L1;
+L1:
+case 0x7FFF01:
+            m--;
+case 0x7EFF0001:
+case 0x7FFF0001:
+            i++;
+        }                       /* sp: -6 */
+case 0x7FFF00:
+case 0x7FFF0000:
+        break;
+        goto L0;
+        {
+            int skipped = 42;   /* sp: -8 */
+case 0x7EFF00:
+case 0x7EFF0000:
+            ++skipped;
+        }                       /* sp: -6 */
+    }                           /* sp: -4 */
+
+    return m;
+}
+
+int err = 0;
+
+int main(void)
+{
+    int n = 42;
+    n = func(7);
+    if (n != 7) {
+        err++;
+    }
+    printf("n:%d\n", n);
+    return err;
+}
diff --git a/test/val/Makefile b/test/val/Makefile
index 56d8e5ff9..13b4ca4bd 100644
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 # Makefile for the regression tests that return an error code on failure
 
 ifneq ($(shell echo),)
@@ -15,13 +21,20 @@ else
   NULLDEV = /dev/null
   MKDIR = mkdir -p $1
   RMDIR = $(RM) -r $1
-  CATRES = || (cat $(WORKDIR)/$$@.out && false)
+  CATRES = > $(WORKDIR)/$$@.out 2> $(WORKDIR)/$$@.out || (cat $(WORKDIR)/$$@.out && false)
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
 endif
 
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
   NULLERR = 2>$(NULLDEV)
+ifndef CMD_EXE
+  CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false)
+endif
 endif
 
 SIM65FLAGS = -x 4000000000 -c
@@ -50,10 +63,10 @@ define PRG_template
 
 $(WORKDIR)/%.$1.$2.prg: %.c | $(WORKDIR)
 	$(if $(QUIET),echo val/$$*.$1.$2.prg)
-	$(CC65) -t sim$2 $$(CC65FLAGS) --add-source -$1 -o $$(@:.prg=.s) $$< $(NULLERR)
-	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLERR)
-	$(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLERR)
-	$(SIM65) $(SIM65FLAGS) $$@ > $(WORKDIR)/$$@.out $(CATRES)
+	$(CC65) -t sim$2 $$(CC65FLAGS) --add-source -$1 -o $$(@:.prg=.s) $$< $(NULLOUT) $(CATERR)
+	$(CA65) -t sim$2 -o $$(@:.prg=.o) $$(@:.prg=.s) $(NULLOUT) $(CATERR)
+	$(LD65) -t sim$2 -o $$@ $$(@:.prg=.o) sim$2.lib $(NULLOUT) $(CATERR)
+	$(SIM65) $(SIM65FLAGS) $$@ $(CATRES)
 
 endef # PRG_template
 
diff --git a/test/val/and-eor-ora-optimizations.c b/test/val/and-eor-ora-optimizations.c
new file mode 100644
index 000000000..6b5aba68c
--- /dev/null
+++ b/test/val/and-eor-ora-optimizations.c
@@ -0,0 +1,86 @@
+/* Test some new optimization passes */
+
+#include <stdio.h>
+
+static unsigned failures = 0;
+
+int func0()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (a & 0x00FF) & (b & 0xFF00);
+}
+
+int func1()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (0x00FF & a) & (0xFF00 & b);
+}
+
+int func2()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (a | 0x00FF) & (b | 0xFF00);
+}
+
+int func3()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (0x00FF | a) & (0xFF00 | b);
+}
+
+int func4()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (a | 0x00FF) | (b | 0xFF00);
+}
+
+int func5()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (0x00FF | a) | (0xFF00 | b);
+}
+
+int func6()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (a ^ 0x00FF) & (b & 0xFF00);
+}
+
+int func7()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (0x00FF ^ a) & (0xFF00 & b);
+}
+
+int func8()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (a | 0x00FF) | (b ^ 0xFF00);
+}
+
+int func9()
+{
+    unsigned a = 0x1234, b = 0x55AA;
+    return (0x00FF | a) | (0xFF00 ^ b);
+}
+
+void onetest(unsigned count, int (*f1)(void), int (*f2)(void), int result)
+{
+    int r1 = f1();
+    int r2 = f2();
+    if (r1 != result || r2 != result) {
+        printf("Test %u failed! Expected 0x%04X but got 0x%04X/0x%04X\n",
+               count, result, r1, r2);
+        ++failures;
+    }
+}
+
+int main()
+{
+    onetest(1, func0, func1, 0x0000);
+    onetest(2, func2, func3, 0x12AA);
+    onetest(3, func4, func5, 0xFFFF);
+    onetest(4, func6, func7, 0x1000);
+    onetest(5, func8, func9, 0xBAFF);
+    return failures;
+}
diff --git a/test/val/bitfield-union.c b/test/val/bitfield-union.c
index 1fd201456..4c01d2183 100644
--- a/test/val/bitfield-union.c
+++ b/test/val/bitfield-union.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2020 The cc65 Authors
+  Copyright 2020-2023 The cc65 Authors
 
   This software is provided 'as-is', without any express or implied
   warranty. In no event will the authors be held liable for any damages
@@ -25,6 +25,7 @@
 #include <stdio.h>
 
 typedef union {
+     const unsigned int : 1;
      unsigned int bf;
 
      struct {
@@ -38,8 +39,12 @@ static unsigned char failures = 0;
 
 int main (void)
 {
-     bitfield_t bitfield = {0};
+     bitfield_t bitfield = { 42 };
 
+     printf ("Bitfield: %u\n", bitfield.bf);
+     if (bitfield.bf != 42) failures++;
+
+     bitfield.bf ^= 42;
      printf ("Bitfield: %u\n", bitfield.bf);
      if (bitfield.bf != 0) failures++;
 
diff --git a/test/val/bug1178-struct-copy.c b/test/val/bug1178-struct-copy.c
index 7fb7e7803..322002c02 100644
--- a/test/val/bug1178-struct-copy.c
+++ b/test/val/bug1178-struct-copy.c
@@ -62,7 +62,7 @@ void dotest2(void)
 
     StructArray2[0] = test2;
 
-    printf ("test2: %d, %d, %d, %d, %d\n",
+    printf ("test2: %d, %d, %d, %d\n",
             (int)StructArray2[0].a, (int)StructArray2[0].b,
             (int)StructArray2[0].c, (int)StructArray2[0].d);
     if ((StructArray2[0].a != 42) ||
diff --git a/test/val/bug1652-optimizer.c b/test/val/bug1652-optimizer.c
index 7926ef770..97d0c5e4d 100644
--- a/test/val/bug1652-optimizer.c
+++ b/test/val/bug1652-optimizer.c
@@ -10,9 +10,9 @@ before:
         jsr     pusha
         ldy     #$01
         ldx     #$00
-        lda     (sp),y
+        lda     (c_sp),y
         beq     L0005
-        lda     (sp,x)
+        lda     (c_sp,x)
         beq     L0005
         txa
         jmp     incsp2          ; <--
@@ -24,9 +24,9 @@ after:
         jsr     pusha
         ldy     #$01
         ldx     #$00
-        lda     (sp),y
+        lda     (c_sp),y
         beq     L0004
-        lda     (sp,x)
+        lda     (c_sp,x)
         beq     L0004
         txa
         jmp     L0001            ; <--
diff --git a/test/val/bug2151.c b/test/val/bug2151.c
index 25f145506..1277961ef 100644
--- a/test/val/bug2151.c
+++ b/test/val/bug2151.c
@@ -47,10 +47,11 @@ _Pragma _Pragma (
 #pragma bss-name("BSS")
 {
     extern int y;
-#pragma bss-name("BSS2")
+#pragma bss-name("BSS") // used to be BSS2, but fix for #2608 means
+                        // that now causes ld65 to fail, so we use BSS instead
     static
 #pragma zpsym ("y")
-    int x; // TODO: currently in "BSS", but supposed to be in "BSS2"?
+    int x;
     x = 0;
 
     if (memcmp(str, "aBC", 3))
diff --git a/test/val/bug2231.c b/test/val/bug2231.c
new file mode 100644
index 000000000..96a856a8d
--- /dev/null
+++ b/test/val/bug2231.c
@@ -0,0 +1,10 @@
+_Pragma("message/*Comment1*/ ( /*Comment2*/\"test message\" /*Comment3*/)")
+/* We have no pragma without parenthesis but if there would be one, the
+** following should also work:
+*/
+/* _Pragma("once// Comment") */
+
+int main(void)
+{
+    return 0;
+}
diff --git a/test/val/bug2302.c b/test/val/bug2302.c
new file mode 100644
index 000000000..3ca8a5572
--- /dev/null
+++ b/test/val/bug2302.c
@@ -0,0 +1,32 @@
+/* Bug #2302 - Parameters of function types not parsed correctly */
+
+#include <stdio.h>
+
+typedef int A;
+int zoo(A ());                  /* OK: int zoo(int (*)()) */
+int zoo(A (()));                /* OK: int zoo(int ((*)())) aka. int zoo(int (*)()) */
+int zoo(A (A));                 /* OK: int zoo(int (*)(int)) */
+int zoo(A ((A)));               /* OK: int zoo(int ((*)(int))) aka. int zoo(int (*)(int)) */
+int zoo(A A(A));                /* OK: int zoo(int (*A)(int)) */
+int zoo(A (*)(A));              /* OK: int zoo(int (*)(int)) */
+int zoo(A (*A)(A));             /* OK: int zoo(int (*A)(int)) */
+int zoo(A ((*A))(A));           /* OK: int zoo(int (*A)(int)) */
+int zoo(A ((((*((fp))))(A A)))) /* OK: int zoo(int (*fp)(int A)) */
+{
+    return fp(42);
+}
+
+int bar(int a)
+{
+    return a ^ 42;
+}
+
+int main(void)
+{
+    int a = zoo((int (*)())bar);
+    if (a != 0)
+    {
+        printf("failed: a = %d\n", a);
+    }
+    return a;
+}
diff --git a/test/val/bug2327-cconv-type.c b/test/val/bug2327-cconv-type.c
new file mode 100644
index 000000000..678727278
--- /dev/null
+++ b/test/val/bug2327-cconv-type.c
@@ -0,0 +1,111 @@
+/* Bug #2327 - Calling conventions and address size specifiers of functions in type names and parameter types are not parsed correctly */
+
+#include <stdint.h>
+#include <stdio.h>
+
+unsigned failures;
+int need_header = 1;
+const char* test_header;
+
+/* Helpers */
+void set_header(const char* name)
+{
+    if (need_header == 0)
+    {
+        printf("\n");
+    }
+    test_header = name;
+    need_header = 1;
+}
+
+void print_header(void)
+{
+    if (need_header)
+    {
+        need_header = 0;
+        printf("<%s test>\n", test_header);
+    }
+}
+
+#define CHECK(R, E) \
+    do { \
+        if ((R) != (E)) { \
+            ++failures; \
+            print_header(); \
+            printf("    fail: %s = %d\n", #R, (R)); \
+        } \
+    } while (0);
+
+#define CHECK_RV()  CHECK(rv, 42)
+#define CHECK_SP()  CHECK(x - (intptr_t)&x, 0)
+
+#define FUNC_QUAL __cdecl__ __near__
+
+typedef int hoo_t(int __far__ __cdecl__ ());
+typedef int hoo_t(int __far__ (__cdecl__)());       /* Question: should this be rejected? */
+typedef int hoo_t(int __far__ (__cdecl__ ()));
+typedef int hoo_t(int __far__ (__cdecl__ *)());
+typedef int hoo_t(int __far__ (__cdecl__ (*)()));
+typedef int hoo_t(int __far__ ((__cdecl__ *)()));
+
+typedef int hoo_t(int __cdecl__ __far__ ());
+typedef int hoo_t(int (__cdecl__ __far__)());       /* Question: should this be rejected? */
+typedef int hoo_t(int (__cdecl__ __far__ ()));
+typedef int hoo_t(int (__cdecl__ __far__ *)());
+typedef int hoo_t(int (__cdecl__ (__far__ *)()));
+typedef int hoo_t(int ((__cdecl__ __far__ *)()));
+
+typedef int (FUNC_QUAL foo_t)(int, int);
+typedef int (FUNC_QUAL *pfoo_t)(int, int);
+
+int FUNC_QUAL foo(int a, int b)
+{
+    return a * b;
+}
+
+int (FUNC_QUAL * const pfoo)() = (int (FUNC_QUAL *)())foo;
+
+/* Incompatible and not working for cc65 if used as-is */
+int (*qfoo)(int, ...) = foo;
+
+int main(void)
+{
+    int rv;
+    intptr_t x;
+
+    set_header("init");
+    x = (intptr_t)&x;
+    CHECK_SP()
+
+    set_header("foo");
+    rv = foo((int8_t)-3, (int32_t)-14);
+    CHECK_RV()
+    CHECK_SP()
+
+    set_header("pfoo");
+#if 0
+    /* This would fail */
+    rv = pfoo((int8_t)-6, (int32_t)-7);
+#else
+    rv = ((pfoo_t)pfoo)((int8_t)-6, (int32_t)-7);
+#endif
+    CHECK_RV()
+    CHECK_SP()
+
+    set_header("qfoo");
+#if 0
+    /* This would fail */
+    rv = (qfoo)((int32_t)-6, (int8_t)-7);
+#else
+    rv = ((foo_t *)qfoo)((int32_t)-6, (int8_t)-7);
+#endif
+    CHECK_RV()
+    CHECK_SP()
+
+    if (failures > 0)
+    {
+        printf("\nfailures: %u\n", failures);
+    }
+
+    return failures;
+}
diff --git a/test/val/bug2357.c b/test/val/bug2357.c
new file mode 100644
index 000000000..a0cff0d19
--- /dev/null
+++ b/test/val/bug2357.c
@@ -0,0 +1,38 @@
+/* bug #2357 - Compiler produces invalid code after d8a3938
+*/
+
+unsigned long test;
+
+unsigned long longarray[7];
+
+void jsr_threebytes(void) {
+
+}
+
+/* having replaced two sty $zp with two sta $abs, but forgetting
+ * to update the instruction size, coptlong.c could cause a build
+ * error "Error: Range error (131 not in [-128..127])" if the
+ * computed codesize was under 126, but the real codesize was above
+ * 127.
+ * This tests verifies that the bug is fixed.
+ */
+unsigned char __fastcall__ foo (unsigned char res)
+{
+    if (res == 0) {
+      longarray[1]=test; /* 24 bytes  - but the compiler thought 22 */
+      longarray[2]=test; /* 48 bytes  - but 44 */
+      longarray[3]=test; /* 72 bytes  - 66 */
+      longarray[4]=test; /* 96 bytes  - 88 */
+      longarray[6]=test; /* 120 bytes - 110 */
+      jsr_threebytes();  /* 123       - 113 */
+      jsr_threebytes();  /* 126       - 116 */
+      jsr_threebytes();  /* 129       - 119 */
+    }
+    return 0;
+}
+
+int main (void)
+{
+    foo(42);
+    return 0;
+}
diff --git a/test/val/bug2395.c b/test/val/bug2395.c
new file mode 100644
index 000000000..07c5cd7c5
--- /dev/null
+++ b/test/val/bug2395.c
@@ -0,0 +1,44 @@
+
+/* bug #2395: Bitwise operators with a boolean expression fail when optimized */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+unsigned char a, b;
+unsigned char c = 199;
+unsigned char d = 100;
+
+int main(void) {
+    int fails = 0;
+
+    a = c ^ (d != 0);
+    b = c ^ 1;
+
+    printf("%u ^ (%u != 0) => %u\n", c, d, a);
+    if (a != b) {
+      printf("XOR error: a %d instead of %d\n", a, b);
+      fails++;
+    }
+
+    a = c | (d != 0);
+    b = c | 1;
+
+    printf("%u | (%u != 0) => %u\n", c, d, a);
+    if (a != b) {
+      printf("OR error: a %d instead of %d\n", a, b);
+      fails++;
+    }
+
+    a = c & (d != 0);
+    b = c & 1;
+
+    printf("%u & (%u != 0) => %u\n", c, d, a);
+    if (a != b) {
+      printf("AND error: a %d instead of %d\n", a, b);
+      fails++;
+    }
+    printf("%d errors\n", fails);
+
+    return fails;
+}
diff --git a/test/val/bug2458.c b/test/val/bug2458.c
new file mode 100644
index 000000000..1494a7946
--- /dev/null
+++ b/test/val/bug2458.c
@@ -0,0 +1,10 @@
+#define str(arg) #arg
+#include str(bug2458.h)         /* Ok, macro replacement */
+
+#define string foo
+#include <string.h>             /* Ok, no macro replacement */
+
+int main()
+{
+    return 0;
+}
diff --git a/test/val/bug2458.h b/test/val/bug2458.h
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/val/bug2458.h
@@ -0,0 +1 @@
+
diff --git a/test/val/bug2461.c b/test/val/bug2461.c
new file mode 100644
index 000000000..e8340b224
--- /dev/null
+++ b/test/val/bug2461.c
@@ -0,0 +1,67 @@
+/* related to bug #2461 */
+
+/* Note: The values for MASK1, MASK2, the return values of GarbleAX and the 
+ * arguments for CALC() are carefully chosen to elicit the bug.
+ */
+
+#include <stdio.h>
+
+#define MASK1           0x000FU
+#define MASK2           0x00FFU
+#define CALC(num, op)   (((num) & (~MASK1)) op ((num) & MASK2))
+
+static unsigned Failures = 0;
+static unsigned TestCount = 0;
+
+unsigned GarbleAX(void)
+{
+    static const unsigned Garbage[] = {
+        0x1234, 0x0000, 0x1234, 0x1234
+    };
+    return Garbage[TestCount - 1];
+}
+
+unsigned WrongAdd(unsigned num)
+{
+    unsigned ret=GarbleAX();
+    return CALC(num, +);
+}
+
+unsigned WrongAnd(unsigned num)
+{
+    unsigned ret=GarbleAX();
+    return CALC(num, &);
+}
+
+unsigned WrongOr(unsigned num)
+{
+    unsigned ret=GarbleAX();
+    return CALC(num, |);
+}
+
+unsigned WrongXor(unsigned num)
+{
+    unsigned ret=GarbleAX();
+    return CALC(num, ^);
+}
+
+void Test(unsigned (*F)(unsigned), unsigned Num, unsigned Ref)
+{
+    unsigned Res;
+    ++TestCount;
+    Res = F(Num);
+    if (Res != Ref) {
+        printf("Test %u failed: got %04X, expected %04X\n", TestCount, Res, Ref);
+        ++Failures;
+    }
+}
+
+int main(void)
+{
+    Test(WrongAdd, 0x4715, CALC(0x4715, +));
+    Test(WrongAnd, 0x4715, CALC(0x4715, &));
+    Test(WrongOr,  0x4715, CALC(0x4715, |));
+    Test(WrongXor, 0x4715, CALC(0x4715, ^));
+    printf("Failures: %u\n", Failures);
+    return Failures;
+}
diff --git a/test/val/bug2520.c b/test/val/bug2520.c
new file mode 100644
index 000000000..7a216df4d
--- /dev/null
+++ b/test/val/bug2520.c
@@ -0,0 +1,4 @@
+#if (1 ? 2 : 0) != 2
+#error
+#endif
+int main() { return 0; }
diff --git a/test/val/bug2523.c b/test/val/bug2523.c
new file mode 100644
index 000000000..8db72d055
--- /dev/null
+++ b/test/val/bug2523.c
@@ -0,0 +1,29 @@
+#if (0u - 1) < 0
+#error
+#endif
+
+#if !1u - 1 > 0
+#error
+#endif
+
+#if (1 & 1u) - 2 < 0
+#error
+#endif
+
+#if (1 | 1u) - 2 < 0
+#error
+#endif
+
+#if (1 ^ 1u) - 2 < 0
+#error
+#endif
+
+#if (1u >> 1) - 2 < 0
+#error
+#endif
+
+#if (0u << 1) - 1 < 0
+#error
+#endif
+
+int main() { return 0; }
diff --git a/test/val/bug2566.c b/test/val/bug2566.c
new file mode 100644
index 000000000..29292c3dd
--- /dev/null
+++ b/test/val/bug2566.c
@@ -0,0 +1,49 @@
+
+/* Regression test for https://github.com/cc65/cc65/issues/2566
+ *
+ * The issue was introduced in an innocious-looking commit back in 2020:
+ *
+ * https://github.com/cc65/cc65/commit/c3a6b399456937093eda9994f19b7f722731528d
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+typedef struct {
+    unsigned long Field1;
+    unsigned long Field2;
+} RecordType;
+
+typedef struct {
+    char dummy; // -- Offsets the Rec field by 1 byte.
+    RecordType Rec;
+} StructTypeA;
+
+typedef struct {
+    RecordType Rec;
+} StructTypeB;
+
+int main(void)
+{
+    StructTypeA A, *Aptr;
+    StructTypeB B;
+    bool ok;
+
+    A.Rec.Field1 = 0x11111111;
+    A.Rec.Field2 = 0x22222222;
+
+    Aptr = &A;
+    B.Rec = Aptr->Rec;
+
+    /* These print statements give some clues as to what's going on. */
+    /*
+    printf("A.Rec: %lx, %lx\n", A.Rec.Field1, A.Rec.Field2);
+    printf("B.Rec: %lx, %lx\n", B.Rec.Field1, B.Rec.Field2);
+    */
+
+    ok = (A.Rec.Field1 == B.Rec.Field1 && A.Rec.Field2 == B.Rec.Field2);
+
+    return ok ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/test/val/bug2608.c b/test/val/bug2608.c
new file mode 100644
index 000000000..c0685d28c
--- /dev/null
+++ b/test/val/bug2608.c
@@ -0,0 +1,40 @@
+
+/* bug #2608: "zp_bss" is placed in BSS and NOT placed in ZEROPAGE as expected. */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+int err = 0;
+
+int is_zeropage(void *p)
+{
+    if (/*(p >= ((void*)0)) &&*/
+        (p <= ((void*)0xff))) {
+        return 1;
+    }
+    return 0;
+}
+
+void foo(void) {
+#pragma bss-name(push,"ZEROPAGE")
+#pragma data-name(push,"ZEROPAGE")
+    static int zp_data = 5;
+    static char zp_bss;
+#pragma bss-name(pop)
+#pragma data-name(pop)
+    printf("zp_data at 0x%04x (%szp)\n", &zp_data, is_zeropage(&zp_data) ? "" : "NOT ");
+    printf("zp_bss  at 0x%04x (%szp)\n", &zp_bss, is_zeropage(&zp_bss) ? "" : "NOT ");
+    if (!is_zeropage(&zp_data)) {
+        err++;
+    }
+    if (!is_zeropage(&zp_bss)) {
+        err++;
+    }
+}
+
+int main(void)
+{
+    foo();
+    printf("errors: %d\n", err);
+    return err;
+}
diff --git a/test/val/bug2609.c b/test/val/bug2609.c
new file mode 100644
index 000000000..418673e98
--- /dev/null
+++ b/test/val/bug2609.c
@@ -0,0 +1,72 @@
+/* Bug #2609 - charmap translation violates C specification 6.4.4.4 Character constant */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#pragma charmap (0x07, 0x62) /* map \a to b */
+static_assert('\a' == 0x62);
+static_assert('\07' == 0x07);
+static_assert('\x07' == 0x07);
+
+#pragma charmap (0x07, 0x63) /* map \a to c */
+static_assert('\a' == 0x63);
+static_assert('\07' == 0x07);
+static_assert('\x07' == 0x07);
+
+#pragma charmap (0x07, 0x07) /* map \a back to x07 */
+static_assert('\a' == 0x07);
+static_assert('\07' == 0x07);
+static_assert('\x07' == 0x07);
+
+#pragma charmap (0x07, 0x61) /* map \a to a */
+
+char *s = "\07\a\x07";
+char t[] = { 7, 0x61, 7, 0 };
+
+static_assert('\a' == 0x61);
+static_assert('\07' == 0x07);
+static_assert('\x07' == 0x07);
+
+char c_back_a = '\a';
+char c_hex_07 = '\x07';
+char c_oct_07 = '\07';
+int  i_back_a = '\a';
+int  i_hex_07 = '\x07';
+int  i_oct_07 = '\07';
+
+#define TEST(a,b) \
+    if (a != b) { printf("\n\n !FAIL! %s = %04x not %04x\n\n", #a, a, b); return EXIT_FAILURE; }
+
+int main (void) {
+    int i;
+
+    TEST(c_back_a, 0x61)
+    TEST(c_hex_07, 0x07)
+    TEST(c_oct_07, 07)
+
+    TEST(i_back_a, 0x61)
+    TEST(i_hex_07, 0x07)
+    TEST(i_oct_07, 07)
+
+    assert('\a' == 0x61);
+    assert('\07' == 0x07);
+    assert('\x07' == 0x07);
+
+    if (strcmp(s,t) || s[0] == s[1]) {
+        printf("\n\n !FAIL! strcmp\n");
+	for (i = 0; i < 4; i++) {
+            printf("%02x ", s[i]);
+	}
+	printf("\n");
+	for (i = 0; i < 4; i++) {
+            printf("%02x ", t[i]);
+	}
+	printf("\n");
+	printf("\n");
+	return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+}
diff --git a/test/val/bug2610.c b/test/val/bug2610.c
new file mode 100644
index 000000000..75169b81d
--- /dev/null
+++ b/test/val/bug2610.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#if '\x0A' != 0x0A
+#error "Suspicious character set translation"
+#endif
+int main()
+{
+    char c = '\x0A';
+    if (c == 0x0A) {
+        printf("Ok\n");
+        return 0;
+    } else {
+        printf("Failed\n");
+        return 1;
+    }
+}
diff --git a/test/val/cq85.c b/test/val/cq85.c
index 81a99c960..ce836b649 100644
--- a/test/val/cq85.c
+++ b/test/val/cq85.c
@@ -62,7 +62,7 @@ int s85(struct defs *pd0){
      struct tnode *right;
    };
 
-   struct tnode s1, s2, *sp;
+   struct tnode s1, s2, *c_sp;
 
    struct{
      char cdummy;
diff --git a/test/val/inline-func.c b/test/val/inline-func.c
new file mode 100644
index 000000000..b9e127aae
--- /dev/null
+++ b/test/val/inline-func.c
@@ -0,0 +1,20 @@
+/* C99 inline */
+
+#include <stdlib.h>
+
+inline static int f(int x, ...)
+{
+    return x * 2;
+}
+
+extern inline int g(int x);
+
+int main(void)
+{
+    return f(g(7)) == 42 ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+int g(int x)
+{
+    return x * 3;
+}
diff --git a/test/val/lib_common_gmtime_localtime.c b/test/val/lib_common_gmtime_localtime.c
new file mode 100644
index 000000000..f0d9a8332
--- /dev/null
+++ b/test/val/lib_common_gmtime_localtime.c
@@ -0,0 +1,110 @@
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+int fails = 0;
+
+typedef struct _test_data {
+  time_t t;
+  char *gmt;
+  char *local;
+} test_data;
+
+/* Test data generated using glibc 2.37 */
+test_data data[] = {
+  /* First year */
+  {0x00000000, "Thu Jan  1 00:00:00 1970\n", "Thu Jan  1 01:00:00 1970\n"},
+  {0x004e7970, "Sun Mar  1 12:34:56 1970\n", "Sun Mar  1 13:34:56 1970\n"},
+  {0x01e1337f, "Thu Dec 31 23:59:59 1970\n", "Fri Jan  1 00:59:59 1971\n"},
+
+  /* First leap year */
+  {0x03c26700, "Sat Jan  1 00:00:00 1972\n", "Sat Jan  1 01:00:00 1972\n"},
+  {0x03c8fe7f, "Wed Jan  5 23:59:59 1972\n", "Thu Jan  6 00:59:59 1972\n"},
+  {0x041180ff, "Tue Feb 29 23:59:59 1972\n", "Wed Mar  1 00:59:59 1972\n"},
+  {0x04118100, "Wed Mar  1 00:00:00 1972\n", "Wed Mar  1 01:00:00 1972\n"},
+  {0x05a4ebff, "Sun Dec 31 23:59:59 1972\n", "Mon Jan  1 00:59:59 1973\n"},
+
+  /* A non-leap year */
+  {0x63b0cd00, "Sun Jan  1 00:00:00 2023\n", "Sun Jan  1 01:00:00 2023\n"},
+  {0x63fe957f, "Tue Feb 28 23:59:59 2023\n", "Wed Mar  1 00:59:59 2023\n"},
+  {0x63fe9580, "Wed Mar  1 00:00:00 2023\n", "Wed Mar  1 01:00:00 2023\n"},
+  {0x656d4ec0, "Mon Dec  4 04:00:00 2023\n", "Mon Dec  4 05:00:00 2023\n"},
+  {0x6592007f, "Sun Dec 31 23:59:59 2023\n", "Mon Jan  1 00:59:59 2024\n"},
+
+  /* Another leap year */
+  {0x65920080, "Mon Jan  1 00:00:00 2024\n", "Mon Jan  1 01:00:00 2024\n"},
+  {0x65e11a7f, "Thu Feb 29 23:59:59 2024\n", "Fri Mar  1 00:59:59 2024\n"},
+  {0x65e11a80, "Fri Mar  1 00:00:00 2024\n", "Fri Mar  1 01:00:00 2024\n"},
+  {0x6774857f, "Tue Dec 31 23:59:59 2024\n", "Wed Jan  1 00:59:59 2025\n"},
+
+  /* End of century */
+  {0xf48656ff, "Thu Dec 31 23:59:59 2099\n", "Fri Jan  1 00:59:59 2100\n"},
+
+  /* A non-leap year for exceptional reasons */
+  {0xf4865700, "Fri Jan  1 00:00:00 2100\n", "Fri Jan  1 01:00:00 2100\n"},
+  {0xf4d41f7f, "Sun Feb 28 23:59:59 2100\n", "Mon Mar  1 00:59:59 2100\n"},
+  {0xf4d41f80, "Mon Mar  1 00:00:00 2100\n", "Mon Mar  1 01:00:00 2100\n"},
+  {0xf4fceff0, "Wed Mar 31 23:00:00 2100\n", "Thu Apr  1 00:00:00 2100\n"},
+  {0xf6678a7f, "Fri Dec 31 23:59:59 2100\n", "Sat Jan  1 00:59:59 2101\n"},
+
+  /* First post-2100 leap year */
+  {0xfc0b2500, "Tue Jan  1 00:00:00 2104\n", "Tue Jan  1 01:00:00 2104\n"},
+  {0xfc5a3eff, "Fri Feb 29 23:59:59 2104\n", "Sat Mar  1 00:59:59 2104\n"},
+  {0xfc5a3f00, "Sat Mar  1 00:00:00 2104\n", "Sat Mar  1 01:00:00 2104\n"},
+  {0xfcaa9c70, "Wed Apr 30 23:00:00 2104\n", "Thu May  1 00:00:00 2104\n"},
+
+  /* End of epoch */
+  {0xfdedaa00, "Thu Jan  1 00:00:00 2105\n", "Thu Jan  1 01:00:00 2105\n"},
+  {0xffffffff, "Sun Feb  7 06:28:15 2106\n", "Thu Jan  1 00:59:59 1970\n"}
+};
+
+int main (void)
+{
+    int i;
+    struct tm *tm;
+    char *str;
+
+    tm = gmtime(NULL);
+    if (tm != NULL) {
+      printf("gmtime should return NULL with a NULL parameter\n");
+      fails++;
+    }
+
+    tm = localtime(NULL);
+    if (tm != NULL) {
+      printf("localtime should return NULL with a NULL parameter\n");
+      fails++;
+    }
+
+    /* Verify conversion both ways */
+    for (i = 0; ; i++) {
+      time_t t = data[i].t;
+
+      tm = gmtime(&t);
+      str = asctime(tm);
+      if (strcmp(data[i].gmt, str)) {
+        printf("0x%lx: gmtime: unexpected result: expected %s, got %s\n", t, data[i].gmt, str);
+        fails++;
+      }
+      
+      _tz.timezone = 0;
+      tm = localtime(&t);
+      str = asctime(tm);
+      if (strcmp(data[i].gmt, str)) {
+        printf("0x%lx: localtime (UTC+0): unexpected result: expected %s, got %s\n", t, data[i].gmt, str);
+        fails++;
+      }
+
+      _tz.timezone = 3600;
+      tm = localtime(&t);
+      str = asctime(tm);
+      if (strcmp(data[i].local, str)) {
+        printf("0x%lx: localtime (UTC+1): unexpected result: expected %s, got %s\n", t, data[i].local, str);
+        fails++;
+      }
+
+      if (t == 0xFFFFFFFF)
+        break;
+    }
+    return fails;
+}
diff --git a/test/val/lib_common_malloc.c b/test/val/lib_common_malloc.c
new file mode 100644
index 000000000..5c68dc39a
--- /dev/null
+++ b/test/val/lib_common_malloc.c
@@ -0,0 +1,34 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include "unittest.h"
+
+TEST
+{
+    char *buf, *buf2;
+    unsigned int i;
+
+    buf = malloc(0);
+    ASSERT_IsTrue (buf == NULL, "malloc (0) returned something");
+
+    for (i = 1; i < 10; i++) {
+      buf = malloc(i);
+      ASSERT_IsTrue (buf != NULL, "small returned nothing");
+    }
+
+    buf = malloc(4096);
+    ASSERT_IsTrue (buf != NULL, "malloc (4096) returned nothing");
+
+    buf = malloc(61000UL);
+    ASSERT_IsTrue (buf == NULL, "malloc (61000) returned something");
+
+    for (i = 65535UL; i > _heapmaxavail(); i--) {
+      buf = malloc(i);
+      ASSERT_IsTrue (buf == NULL, "malloc returned something but shouldn't have");
+    }
+
+    buf = malloc(i);
+    ASSERT_IsTrue (buf != NULL, "malloc returned nothing but should have");
+    ASSERT_IsTrue(_heapmaxavail() == 0, "heapmaxavail should be 0");
+}
+ENDTEST
diff --git a/test/val/lib_common_mktime.c b/test/val/lib_common_mktime.c
new file mode 100644
index 000000000..6cabef2be
--- /dev/null
+++ b/test/val/lib_common_mktime.c
@@ -0,0 +1,106 @@
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+int fails = 0;
+
+typedef struct _test_data {
+  time_t t;
+  struct tm tm;
+  char *str;
+} test_data;
+
+/* Test data generated using glibc 2.37 */
+test_data data[] = {
+  /* First year */
+  {0x00000000, {0, 0, 0, 1, 0, 70, 0, 4}, "Thu Jan  1 00:00:00 1970\n"},
+  {0x004e7970, {56, 34, 12, 1, 2, 70, 59, 0}, "Sun Mar  1 12:34:56 1970\n"},
+  {0x01e1337f, {59, 59, 23, 31, 11, 70, 364, 4}, "Thu Dec 31 23:59:59 1970\n"},
+
+  /* First leap year */
+  {0x03c26700, {0, 0, 0, 1, 0, 72, 0, 6}, "Sat Jan  1 00:00:00 1972\n"},
+  {0x03c8fe7f, {59, 59, 23, 5, 0, 72, 4, 3}, "Wed Jan  5 23:59:59 1972\n"},
+  {0x041180ff, {59, 59, 23, 29, 1, 72, 59, 2}, "Tue Feb 29 23:59:59 1972\n"},
+  {0x04118100, {0, 0, 0, 1, 2, 72, 60, 3}, "Wed Mar  1 00:00:00 1972\n"},
+  {0x05a4ebff, {59, 59, 23, 31, 11, 72, 365, 0}, "Sun Dec 31 23:59:59 1972\n"},
+
+  /* A non-leap year */
+  {0x63b0cd00, {0, 0, 0, 1, 0, 123, 0, 0}, "Sun Jan  1 00:00:00 2023\n"},
+  {0x63fe957f, {59, 59, 23, 28, 1, 123, 58, 2}, "Tue Feb 28 23:59:59 2023\n"},
+  {0x63fe9580, {0, 0, 0, 1, 2, 123, 59, 3}, "Wed Mar  1 00:00:00 2023\n"},
+  {0x656d4ec0, {0, 0, 4, 4, 11, 123, 337, 1}, "Mon Dec  4 04:00:00 2023\n"},
+  {0x6592007f, {59, 59, 23, 31, 11, 123, 364, 0}, "Sun Dec 31 23:59:59 2023\n"},
+
+  /* Another leap year */
+  {0x65920080, {0, 0, 0, 1, 0, 124, 0, 1}, "Mon Jan  1 00:00:00 2024\n"},
+  {0x65e11a7f, {59, 59, 23, 29, 1, 124, 59, 4}, "Thu Feb 29 23:59:59 2024\n"},
+  {0x65e11a80, {0, 0, 0, 1, 2, 124, 60, 5}, "Fri Mar  1 00:00:00 2024\n"},
+  {0x6774857f, {59, 59, 23, 31, 11, 124, 365, 2}, "Tue Dec 31 23:59:59 2024\n"},
+
+  /* End of century */
+  {0xf48656ff, {59, 59, 23, 31, 11, 199, 364, 4}, "Thu Dec 31 23:59:59 2099\n"},
+
+  /* A non-leap year for exceptional reasons */
+  {0xf4865700, {0, 0, 0, 1, 0, 200, 0, 5}, "Fri Jan  1 00:00:00 2100\n"},
+  {0xf4d41f7f, {59, 59, 23, 28, 1, 200, 58, 0}, "Sun Feb 28 23:59:59 2100\n"},
+  {0xf4d41f80, {0, 0, 0, 1, 2, 200, 59, 1}, "Mon Mar  1 00:00:00 2100\n"},
+  {0xf4fceff0, {0, 0, 23, 31, 2, 200, 89, 3}, "Wed Mar 31 23:00:00 2100\n"},
+  {0xf6678a7f, {59, 59, 23, 31, 11, 200, 364, 5}, "Fri Dec 31 23:59:59 2100\n"},
+
+  /* First post-2100 leap year */
+  {0xfc0b2500, {0, 0, 0, 1, 0, 204, 0, 2}, "Tue Jan  1 00:00:00 2104\n"},
+  {0xfc5a3eff, {59, 59, 23, 29, 1, 204, 59, 5}, "Fri Feb 29 23:59:59 2104\n"},
+  {0xfc5a3f00, {0, 0, 0, 1, 2, 204, 60, 6}, "Sat Mar  1 00:00:00 2104\n"},
+  {0xfcaa9c70, {0, 0, 23, 30, 3, 204, 120, 3}, "Wed Apr 30 23:00:00 2104\n"},
+
+  /* End of epoch */
+  {0xfdedaa00, {0, 0, 0, 1, 0, 205, 0, 4}, "Thu Jan  1 00:00:00 2105\n"},
+  {0xffffffff, {15, 28, 6, 7, 1, 206, 37, 0}, "Sun Feb  7 06:28:15 2106\n"}
+};
+
+static int compare_tm(time_t t, struct tm *tm, struct tm *ref) {
+  if (memcmp(tm, ref, sizeof(tm))) {
+    printf("0x%lx: unexpected tm from gmtime: "
+           "expected {%u, %u, %u, %u, %u, %u, %u, %u}, "
+           "got {%u, %u, %u, %u, %u, %u, %u, %u}\n",
+           t,
+           ref->tm_sec, ref->tm_min, ref->tm_hour, ref->tm_mday, ref->tm_mon, ref->tm_year, ref->tm_yday, ref->tm_wday,
+           tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_yday, tm->tm_wday);
+    return 1;
+  }
+  return 0;
+}
+
+int main (void)
+{
+    int i;
+
+    if (mktime(NULL) != (time_t)-1) {
+      printf("mktime should return -1 with a NULL parameter\n");
+      fails++;
+    }
+
+    /* Verify conversion both ways */
+    for (i = 0; ; i++) {
+      time_t t = data[i].t;
+      time_t r;
+      struct tm *tm = gmtime(&t);
+      r = mktime(tm);
+
+      if (t != r) {
+        printf("unexpected timestamp from mktime: expected 0x%lx, got 0x%lx\n", t, r);
+        fails++;
+      }
+      if (compare_tm(t, tm, &data[i].tm)) {
+        fails++;
+      }
+      if (strcmp(data[i].str, ctime(&t))) {
+        printf("0x%lx: unexpected ctime result: expected %s, got %s", t, data[i].str, ctime(&t));
+        fails++;
+      }
+
+      if (t == 0xFFFFFFFF)
+        break;
+    }
+    return fails;
+}
diff --git a/test/val/lib_common_pmemalign.c b/test/val/lib_common_pmemalign.c
new file mode 100644
index 000000000..0e9e5f52f
--- /dev/null
+++ b/test/val/lib_common_pmemalign.c
@@ -0,0 +1,31 @@
+#include <errno.h>
+#include <stdlib.h>
+#include "unittest.h"
+
+TEST
+{
+    void *buf;
+    int r;
+
+    r = posix_memalign(&buf, 123, 1024);
+    ASSERT_IsTrue(r == EINVAL, "posix_memalign did not return EINVAL with wrong alignment");
+    ASSERT_IsTrue(buf == NULL, "posix_memalign did not set buf to NULL with wrong alignment");
+
+    r = posix_memalign(&buf, 0, 1024);
+    ASSERT_IsTrue(r == EINVAL, "posix_memalign did not return EINVAL with 0 alignment");
+    ASSERT_IsTrue(buf == NULL, "posix_memalign did not set buf to NULL with 0 alignment");
+
+    r = posix_memalign(&buf, 256, 0);
+    ASSERT_IsTrue(r == EINVAL, "posix_memalign did not return EINVAL with 0 size");
+    ASSERT_IsTrue(buf == NULL, "posix_memalign did not set buf to NULL with 0 size");
+
+    r = posix_memalign(&buf, 256, 32768U);
+    ASSERT_IsTrue(r == 0, "posix_memalign did not return 0 on correct call");
+    ASSERT_IsTrue(buf != NULL, "posix_memalign left buf set to NULL on correct call");
+    ASSERT_IsTrue(((unsigned int)buf & 0x00FF) == 0x00, "posix_memalign did not align memory");
+
+    r = posix_memalign(&buf, 256, 32768U);
+    ASSERT_IsTrue(r == ENOMEM, "posix_memalign did not return ENOMEM when no memory is available");
+    ASSERT_IsTrue(buf == NULL, "posix_memalign did not set buf to NULL when no memory is available");
+}
+ENDTEST
diff --git a/test/val/lib_common_realloc.c b/test/val/lib_common_realloc.c
new file mode 100644
index 000000000..d1e4fa3eb
--- /dev/null
+++ b/test/val/lib_common_realloc.c
@@ -0,0 +1,81 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include "unittest.h"
+
+TEST
+{
+    char *buf, *buf2;
+    unsigned int i;
+
+    buf = realloc(NULL, 0);
+    ASSERT_IsTrue (buf == NULL, "realloc (NULL, 0) returned something");
+
+    for (i = 1; i < 10; i++) {
+      buf2 = realloc(buf, i);
+      ASSERT_IsTrue (buf2 != NULL, "small realloc returned nothing");
+      if (i > 1) {
+        ASSERT_IsTrue (buf2 == buf, "buf shouldn't have moved");
+      }
+      buf = buf2;
+    }
+
+    buf = realloc(NULL, 15);
+    ASSERT_IsTrue (buf != NULL, "realloc (NULL, 15) returned nothing");
+
+    buf = realloc(buf, 0);
+    ASSERT_IsTrue (buf == NULL, "realloc (buf, 0) returned something");
+
+    buf = realloc(buf, 32);
+    memset(buf, 'a', 32);
+    for (i = 0; i < 32; i++) {
+      ASSERT_IsTrue(buf[i] == 'a', "wrong contents in buf");
+    }
+
+    /* Now realloc larger, while there's nothing else in the heap */
+    buf = realloc(buf, 64);
+    memset(buf+32, 'b', 32);
+    for (i = 0; i < 32; i++) {
+      ASSERT_IsTrue(buf[i] == 'a', "wrong contents in start of buf");
+    }
+    for (i = 32; i < 64; i++) {
+      ASSERT_IsTrue(buf[i] == 'b', "wrong contents in end of buf");
+    }
+
+    /* Now realloc smaller, while there's nothing else in the heap */
+    buf = realloc(buf, 40);
+    for (i = 0; i < 32; i++) {
+      ASSERT_IsTrue(buf[i] == 'a', "wrong contents in start of buf");
+    }
+    for (i = 32; i < 40; i++) {
+      ASSERT_IsTrue(buf[i] == 'b', "wrong contents in end of buf");
+    }
+
+    /* Allocate something else, so next realloc has to change block */
+    malloc(50);
+
+    /* Now realloc larger, with something else in the heap */
+    buf = realloc(buf, 128);
+    for (i = 0; i < 32; i++) {
+      ASSERT_IsTrue(buf[i] == 'a', "wrong contents in start of buf");
+    }
+    for (i = 32; i < 40; i++) {
+      ASSERT_IsTrue(buf[i] == 'b', "wrong contents in end of buf");
+    }
+
+    for (i = 129; i < 8192; i++) {
+      buf = realloc(buf, i);
+      ASSERT_IsTrue(buf != NULL, "realloc failed");
+    }
+
+    malloc(4096);
+
+    buf2 = realloc(buf, 58000UL);
+    ASSERT_IsTrue (buf2 == NULL, "realloc (buf, 58000) returned something");
+
+    for (i = 65535UL; i > 65527UL; i--) {
+      buf2 = realloc(buf, i);
+      ASSERT_IsTrue (buf2 == NULL, "realloc returned something but shouldn't have");
+    }
+}
+ENDTEST
diff --git a/test/val/lib_common_strdup.c b/test/val/lib_common_strdup.c
new file mode 100644
index 000000000..748317017
--- /dev/null
+++ b/test/val/lib_common_strdup.c
@@ -0,0 +1,60 @@
+#include <string.h>
+#include "unittest.h"
+
+#define SHORT_STR "abcdefghijklmnopqrstuvwxyz"
+
+#define MID_STR_LEN 700 /* Two pages and something */
+#define LONG_STR_LEN 40000UL /* Two long to duplicate */
+TEST
+{
+    char *dst;
+    char *src;
+    int i;
+
+    dst = strdup("");
+    ASSERT_IsTrue(dst != NULL, "strdup returned NULL")
+    ASSERT_IsTrue(!strcmp(dst, ""), "strings differ");
+    free(dst);
+
+    dst = strdup(SHORT_STR);
+    ASSERT_IsTrue(dst != NULL, "strdup returned NULL");
+    ASSERT_IsTrue(strlen(dst) == strlen(SHORT_STR), "string lengths differ");
+    ASSERT_IsTrue(!strcmp(dst, SHORT_STR), "strings differ");
+    free(dst);
+    
+    src = malloc(MID_STR_LEN+1);
+    ASSERT_IsTrue(src != NULL, "Could not allocate source string");
+    memset(src, 'a', MID_STR_LEN-1);
+    src[MID_STR_LEN] = '\0';
+
+    dst = strdup(src);
+    ASSERT_IsTrue(dst != NULL, "strdup returned NULL");
+    printf("strlens %zu %zu\n", strlen(src), strlen(dst));
+    ASSERT_IsTrue(strlen(dst) == strlen(src), "string lengths differ");
+    ASSERT_IsTrue(!strcmp(dst, src), "strings differ");
+    free(dst);
+    free(src);
+
+    src = malloc(LONG_STR_LEN+1);
+    ASSERT_IsTrue(src != NULL, "Could not allocate source string");
+    memset(src, 'a', LONG_STR_LEN-1);
+    src[LONG_STR_LEN] = '\0';
+
+    dst = strdup(src);
+    ASSERT_IsTrue(dst == NULL, "strdup did not return NULL");
+    free(src);
+
+    for (i = 254; i < 258; i++) {
+      src = malloc(i+1);
+      memset(src, 'a', i-1);
+      src[i] = '\0';
+
+      dst = strdup(src);
+      ASSERT_IsTrue(dst != NULL, "strdup returned NULL");
+      ASSERT_IsTrue(strlen(dst) == strlen(src), "string lengths differ");
+      ASSERT_IsTrue(!strcmp(dst, src), "strings differ");
+      free (dst);
+      free(src);
+    }
+}
+ENDTEST
diff --git a/test/val/lib_runtime_aslax7.c b/test/val/lib_runtime_aslax7.c
new file mode 100644
index 000000000..7e3b4796a
--- /dev/null
+++ b/test/val/lib_runtime_aslax7.c
@@ -0,0 +1,44 @@
+/*
+  !!DESCRIPTION!! A small test for aslax7.
+  !!ORIGIN!!
+  !!LICENCE!!
+  !!AUTHOR!!
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+
+int main (void)
+{
+    signed int ai = -32768, ti, refi;
+    signed char ac = -128, tc, refc;
+
+    do {
+      refi = ai << 4;
+      refi = refi << 3;
+
+      ti   = ai << 7;
+
+      if (ti != refi) {
+        printf("wrong result on int %d << 7: %04X, expected %04X\n", ai, ti, refi);
+        return 1;
+      }
+    } while (++ai != -32768);
+
+    do {
+      refc = ac << 4;
+      refc = refc << 3;
+
+      tc   = ac << 7;
+
+      if (tc != refc) {
+        printf("wrong result on char %d << 7: %04X, expected %04X\n", ac, tc, refc);
+        return 1;
+      }
+    } while (++ac != -128);
+
+    return 0;
+}
diff --git a/test/val/lib_runtime_asrax7.c b/test/val/lib_runtime_asrax7.c
new file mode 100644
index 000000000..3cdf2aab8
--- /dev/null
+++ b/test/val/lib_runtime_asrax7.c
@@ -0,0 +1,44 @@
+/*
+  !!DESCRIPTION!! A small test for asrax7.
+  !!ORIGIN!!
+  !!LICENCE!!
+  !!AUTHOR!!
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+
+int main (void)
+{
+    signed int ai = -32768, ti, refi;
+    signed char ac = -128, tc, refc;
+
+    do {
+      refi = ai >> 4;
+      refi = refi >> 3;
+
+      ti   = ai >> 7;
+
+      if (ti != refi) {
+        printf("wrong result on int %d >> 7: %04X, expected %04X\n", ai, ti, refi);
+        return 1;
+      }
+    } while (++ai != -32768);
+
+    do {
+      refc = ac >> 4;
+      refc = refc >> 3;
+
+      tc   = ac >> 7;
+
+      if (tc != refc) {
+        printf("wrong result on char %d >> 7: %04X, expected %04X\n", ac, tc, refc);
+        return 1;
+      }
+    } while (++ac != -128);
+
+    return 0;
+}
diff --git a/test/val/lib_runtime_shlax7.c b/test/val/lib_runtime_shlax7.c
new file mode 100644
index 000000000..d2073ca3a
--- /dev/null
+++ b/test/val/lib_runtime_shlax7.c
@@ -0,0 +1,44 @@
+/*
+  !!DESCRIPTION!! A small test for shlax7.
+  !!ORIGIN!!
+  !!LICENCE!!
+  !!AUTHOR!!
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+
+int main (void)
+{
+    unsigned int ai = 0, ti, refi;
+    unsigned char ac = 0, tc, refc;
+
+    do {
+      refi = ai << 4;
+      refi = refi << 3;
+
+      ti   = ai << 7;
+
+      if (ti != refi) {
+        printf("wrong result on int %u << 7: %04X, expected %04X\n", ai, ti, refi);
+        return 1;
+      }
+    } while (++ai != 0);
+
+    do {
+      refc = ac << 4;
+      refc = refc << 3;
+
+      tc   = ac << 7;
+
+      if (tc != refc) {
+        printf("wrong result on char %u << 7: %04X, expected %04X\n", ac, tc, refc);
+        return 1;
+      }
+    } while (++ac != 0);
+
+    return 0;
+}
diff --git a/test/val/lib_runtime_shrax7.c b/test/val/lib_runtime_shrax7.c
new file mode 100644
index 000000000..d3bc0db73
--- /dev/null
+++ b/test/val/lib_runtime_shrax7.c
@@ -0,0 +1,44 @@
+/*
+  !!DESCRIPTION!! A small test for shrax7.
+  !!ORIGIN!!
+  !!LICENCE!!
+  !!AUTHOR!!
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+
+int main (void)
+{
+    unsigned int ai = 0, ti, refi;
+    unsigned char ac = 0, tc, refc;
+
+    do {
+      refi = ai >> 4;
+      refi = refi >> 3;
+
+      ti   = ai >> 7;
+
+      if (ti != refi) {
+        printf("wrong result on int %d >> 7: %04X, expected %04X\n", ai, ti, refi);
+        return 1;
+      }
+    } while (++ai != 0);
+
+    do {
+      refc = ac >> 4;
+      refc = refc >> 3;
+
+      tc   = ac >> 7;
+
+      if (tc != refc) {
+        printf("wrong result on char %d >> 7: %04X, expected %04X\n", ac, tc, refc);
+        return 1;
+      }
+    } while (++ac != 0);
+
+    return 0;
+}
diff --git a/test/val/long.c b/test/val/long.c
new file mode 100644
index 000000000..076483c9b
--- /dev/null
+++ b/test/val/long.c
@@ -0,0 +1,41 @@
+#include <stdint.h>
+#include <stdio.h>
+
+int res = 0;
+
+int main(void)
+{
+    long a, b;
+
+    a = 0x12345678L;
+
+    /* Test assignment */
+    b = a;
+    if (b != a) {
+      res++;
+    }
+
+    /* Test increment */
+    b++;
+    if (b != 0x12345679L) {
+      res++;
+    }
+
+    /* Test decrement */
+    b--;
+    if (b != 0x12345678L) {
+      res++;
+    }
+
+    /* Test pre-decrement with test */
+    if (--b != 0x12345677L) {
+      res++;
+    }
+
+    a = --b;
+    if (a != 0x12345676L) {
+      res++;
+    }
+
+    return res;
+}
diff --git a/test/val/lzsa1.c b/test/val/lzsa1.c
new file mode 100644
index 000000000..9e627295a
--- /dev/null
+++ b/test/val/lzsa1.c
@@ -0,0 +1,478 @@
+/*
+  !!DESCRIPTION!! lzsa1 decompression
+  !!ORIGIN!!      cc65 regression tests
+  !!LICENCE!!     BSD 2-clause
+  !!AUTHOR!!      Colin Leroy-Mira
+*/
+
+#include <zlib.h>
+#include <stdio.h>
+#include <lzsa.h>
+
+/* The sample data is the original lz4.h, compressed with:
+ * lzsa -r -f 1 lz4.h lz4.lzsa1
+ *
+ * We reused lz4.h from the LZ4 test to have a matching adler32 sum.
+ */
+static const unsigned char compressed[] = {
+  0x71, 0x22, 0x2f, 0x2a, 0x0a, 0x20, 0x20, 0x20, 0x4c, 0x5a, 0x34, 0x20, 0x2d, 0x20, 0x46, 0x61,
+  0x73, 0x74, 0x20, 0x4c, 0x5a, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f,
+  0x6e, 0x20, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0xd9, 0x71, 0x04, 0x48, 0x65,
+  0x61, 0x64, 0x65, 0x72, 0x20, 0x46, 0x69, 0x6c, 0x65, 0xf1, 0x70, 0x16, 0x43, 0x6f, 0x70, 0x79,
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x43, 0x29, 0x20, 0x32, 0x30, 0x31, 0x31, 0x2d, 0x32,
+  0x30, 0x31, 0x35, 0x2c, 0x20, 0x59, 0x61, 0x6e, 0x6e, 0xe2, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2e,
+  0x0a, 0xd6, 0x73, 0x2a, 0x42, 0x53, 0x44, 0x20, 0x32, 0x2d, 0x43, 0x6c, 0x61, 0x75, 0x73, 0x65,
+  0x20, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, 0x28, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f,
+  0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
+  0x6f, 0x72, 0x67, 0x2f, 0x6c, 0xdd, 0x64, 0x73, 0x2f, 0x62, 0x73, 0x64, 0x2d, 0xf3, 0x52, 0x2e,
+  0x70, 0x68, 0x70, 0x29, 0xb2, 0x72, 0x04, 0x52, 0x65, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62,
+  0x75, 0x74, 0x5d, 0x31, 0x6e, 0x64, 0x20, 0xa8, 0x33, 0x69, 0x6e, 0x20, 0xbd, 0x02, 0xee, 0x70,
+  0x08, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x73, 0x2c, 0x20, 0x77,
+  0x3d, 0x32, 0x20, 0x6f, 0x72, 0xf8, 0x31, 0x6f, 0x75, 0x74, 0xba, 0x71, 0x01, 0x6d, 0x6f, 0x64,
+  0x69, 0x66, 0x69, 0x63, 0x61, 0xbc, 0x70, 0x0f, 0x2c, 0x20, 0x61, 0x72, 0x65, 0x20, 0x70, 0x65,
+  0x72, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0xf7, 0x40,
+  0x74, 0x68, 0x61, 0x74, 0xfb, 0x30, 0x65, 0x20, 0x66, 0x32, 0xd0, 0x6f, 0x77, 0x69, 0x6e, 0x67,
+  0xe2, 0xfe, 0x31, 0x6e, 0x64, 0x69, 0xcb, 0x11, 0x73, 0xcb, 0x02, 0xb6, 0x30, 0x65, 0x74, 0x3a,
+  0x67, 0x03, 0xff, 0x1c, 0x2a, 0x61, 0x44, 0x73, 0x20, 0x6f, 0x66, 0x68, 0x00, 0xc5, 0xd0, 0x64,
+  0x65, 0x20, 0x6d, 0x75, 0x9a, 0xfe, 0x62, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, 0xa6, 0x40, 0x61,
+  0x62, 0x6f, 0x76, 0xe5, 0x84, 0xb4, 0xfe, 0x02, 0x65, 0x30, 0x6e, 0x6f, 0x74, 0x0c, 0x10, 0x2c,
+  0xe1, 0x40, 0x69, 0x73, 0x20, 0x6c, 0xb3, 0x00, 0xbc, 0x0a, 0x88, 0x2c, 0x6e, 0x64, 0x6b, 0x00,
+  0x8e, 0x7f, 0x01, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x72, 0x2e, 0x77, 0x08, 0xa9, 0x69, 0x6e,
+  0xea, 0xfe, 0x05, 0x77, 0x00, 0x14, 0x46, 0x64, 0x75, 0x63, 0x65, 0x74, 0x01, 0x2d, 0x07, 0x71,
+  0x0f, 0x74, 0x2b, 0x01, 0xb6, 0x04, 0x1a, 0xf5, 0x02, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e,
+  0x74, 0x61, 0x4d, 0xfe, 0x50, 0x2f, 0x6f, 0x72, 0x20, 0x6f, 0xe6, 0xf6, 0x04, 0x72, 0x20, 0x6d,
+  0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x73, 0x89, 0xfe, 0x83, 0x51, 0xfe, 0x22, 0x74, 0x68,
+  0x75, 0x09, 0x3c, 0x83, 0xb2, 0xfd, 0x71, 0x3c, 0x54, 0x48, 0x49, 0x53, 0x20, 0x53, 0x4f, 0x46,
+  0x54, 0x57, 0x41, 0x52, 0x45, 0x20, 0x49, 0x53, 0x20, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x44, 0x45,
+  0x44, 0x20, 0x42, 0x59, 0x20, 0x54, 0x48, 0x45, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52, 0x49, 0x47,
+  0x48, 0x54, 0x20, 0x48, 0x4f, 0x4c, 0x44, 0x45, 0x52, 0x53, 0x20, 0x41, 0x4e, 0x44, 0x20, 0x43,
+  0x4f, 0x4e, 0x54, 0x52, 0x49, 0x42, 0x55, 0x54, 0x4f, 0x52, 0x53, 0xb9, 0x30, 0x22, 0x41, 0x53,
+  0xc3, 0x12, 0x22, 0xe4, 0x70, 0x0d, 0x41, 0x4e, 0x59, 0x20, 0x45, 0x58, 0x50, 0x52, 0x45, 0x53,
+  0x53, 0x20, 0x4f, 0x52, 0x20, 0x49, 0x4d, 0x50, 0x4c, 0x49, 0xb0, 0x00, 0x9f, 0x70, 0x0d, 0x52,
+  0x41, 0x4e, 0x54, 0x49, 0x45, 0x53, 0x2c, 0x20, 0x49, 0x4e, 0x43, 0x4c, 0x55, 0x44, 0x49, 0x4e,
+  0x47, 0x2c, 0x20, 0xbc, 0xc2, 0x20, 0x4e, 0x4f, 0x54, 0xc6, 0xfc, 0x40, 0x49, 0x4d, 0x49, 0x54,
+  0xd6, 0x32, 0x54, 0x4f, 0x2c, 0x85, 0x0e, 0xc6, 0x00, 0xb0, 0x72, 0x0a, 0x46, 0x20, 0x4d, 0x45,
+  0x52, 0x43, 0x48, 0x41, 0x4e, 0x54, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x8d, 0x41, 0x46,
+  0x49, 0x54, 0x4e, 0x91, 0x31, 0x46, 0x4f, 0x52, 0xb7, 0x71, 0x0e, 0x41, 0x20, 0x50, 0x41, 0x52,
+  0x54, 0x49, 0x43, 0x55, 0x4c, 0x41, 0x52, 0x20, 0x50, 0x55, 0x52, 0x50, 0x4f, 0x53, 0x45, 0x20,
+  0x20, 0x70, 0x04, 0x44, 0x49, 0x53, 0x43, 0x4c, 0x41, 0x49, 0x4d, 0x45, 0x44, 0x2e, 0x7c, 0x00,
+  0x88, 0x7a, 0x05, 0x20, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x20, 0x53, 0x48, 0x41, 0x4c, 0x4c, 0x11,
+  0x02, 0x6f, 0x50, 0x4f, 0x57, 0x4e, 0x45, 0x52, 0x3c, 0x0a, 0x11, 0x30, 0x20, 0x42, 0x45, 0x56,
+  0x41, 0x41, 0x42, 0x4c, 0x45, 0x91, 0x02, 0x12, 0x61, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x29,
+  0x07, 0xf6, 0x40, 0x43, 0x49, 0x44, 0x45, 0x5b, 0x21, 0x4c, 0x2c, 0xb7, 0x50, 0x53, 0x50, 0x45,
+  0x43, 0x49, 0xf4, 0x60, 0x20, 0x45, 0x58, 0x45, 0x4d, 0x50, 0x6a, 0x24, 0x59, 0x2c, 0xa9, 0x40,
+  0x53, 0x45, 0x51, 0x55, 0xd8, 0x00, 0xe3, 0x60, 0x20, 0x44, 0x41, 0x4d, 0x41, 0x47, 0x1c, 0x9f,
+  0x28, 0xe2, 0xfe, 0x0f, 0x81, 0x5b, 0xfe, 0x51, 0x43, 0x55, 0x52, 0x45, 0x4d, 0x44, 0xf2, 0x0b,
+  0x4f, 0x46, 0x20, 0x53, 0x55, 0x42, 0x53, 0x54, 0x49, 0x54, 0x55, 0x54, 0x45, 0x20, 0x47, 0x4f,
+  0x4f, 0x44, 0x89, 0xfe, 0xf2, 0x06, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x53, 0x3b, 0x20,
+  0x4c, 0x4f, 0x53, 0xc7, 0xfe, 0x32, 0x55, 0x53, 0x45, 0x73, 0x41, 0x44, 0x41, 0x54, 0x41, 0x81,
+  0x01, 0xba, 0x51, 0x46, 0x49, 0x54, 0x53, 0x3b, 0xf4, 0xc2, 0x42, 0x55, 0x53, 0x49, 0xbd, 0xfe,
+  0x70, 0x0d, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x52, 0x55, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x29, 0x20,
+  0x48, 0x4f, 0x57, 0x45, 0x56, 0x45, 0x56, 0x10, 0x41, 0xc2, 0x92, 0x44, 0x94, 0xfe, 0x21, 0x4f,
+  0x4e, 0x0c, 0x83, 0xc4, 0xfd, 0x41, 0x45, 0x4f, 0x52, 0x59, 0xa5, 0xa4, 0x4c, 0x49, 0x72, 0xfe,
+  0x50, 0x2c, 0x20, 0x57, 0x48, 0x45, 0xe8, 0x10, 0x52, 0xb8, 0x83, 0xca, 0xfe, 0x91, 0x41, 0xf1,
+  0xfe, 0x69, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0xd9, 0x20, 0x4f, 0x52, 0x37, 0x11, 0x52, 0x27,
+  0x08, 0x10, 0x71, 0x04, 0x20, 0x4e, 0x45, 0x47, 0x4c, 0x49, 0x47, 0x45, 0x4e, 0x43, 0x45, 0xdf,
+  0x11, 0x4f, 0xb7, 0xd0, 0x57, 0x49, 0x53, 0x45, 0x29, 0x43, 0xfe, 0x21, 0x49, 0x53, 0xdf, 0x12,
+  0x49, 0x83, 0x30, 0x20, 0x57, 0x41, 0x89, 0x11, 0x55, 0x04, 0x01, 0x7b, 0x01, 0x26, 0x82, 0x51,
+  0xfe, 0x9b, 0x46, 0x31, 0xfd, 0x92, 0x2c, 0x22, 0xfe, 0x70, 0x01, 0x20, 0x49, 0x46, 0x20, 0x41,
+  0x44, 0x56, 0x49, 0x40, 0x05, 0xd0, 0x53, 0x50, 0x4f, 0x53, 0x53, 0x49, 0x76, 0x83, 0xc1, 0xfe,
+  0xa4, 0x43, 0x48, 0x82, 0xfe, 0x83, 0xeb, 0xfc, 0xf1, 0x00, 0x59, 0x6f, 0x75, 0x20, 0x63, 0x61,
+  0x6e, 0x65, 0xfc, 0xc3, 0x74, 0x61, 0x63, 0x74, 0x31, 0xfc, 0xe0, 0x75, 0x74, 0x68, 0x6f, 0x72,
+  0x20, 0x3d, 0xfb, 0x11, 0x3a, 0xdd, 0x91, 0x2d, 0x18, 0xfa, 0x84, 0x74, 0xfb, 0x81, 0x07, 0xfc,
+  0xd0, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0xf2, 0xfb, 0xa1, 0x3a, 0x20, 0x76, 0xfa, 0x77, 0x14, 0x73,
+  0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x43, 0x79,
+  0x61, 0x6e, 0x34, 0x39, 0x37, 0x33, 0x2f, 0x6c, 0x7a, 0x34, 0xc3, 0xe1, 0x70, 0x75, 0x62, 0x6c,
+  0x69, 0x63, 0xc0, 0xfb, 0x29, 0x75, 0x6d, 0xc8, 0x72, 0x05, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x2e,
+  0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0xc1, 0x02, 0xde, 0x32, 0x2f, 0x23, 0x21, 0xf8, 0x01, 0xbc,
+  0x71, 0x20, 0x63, 0x0a, 0x2a, 0x2f, 0x0a, 0x23, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x20, 0x6f,
+  0x6e, 0x63, 0x65, 0x0a, 0x0a, 0x23, 0x69, 0x66, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64,
+  0x20, 0x28, 0x5f, 0x5f, 0x63, 0x70, 0x6c, 0x75, 0x73, 0xfc, 0xf1, 0x10, 0x29, 0x0a, 0x65, 0x78,
+  0x74, 0x65, 0x72, 0x6e, 0x20, 0x22, 0x43, 0x22, 0x20, 0x7b, 0x0a, 0x23, 0x65, 0x6e, 0x64, 0x69,
+  0x66, 0x0a, 0x0a, 0x55, 0xf9, 0x20, 0x2a, 0x20, 0xb5, 0xa5, 0x2e, 0x68, 0xd6, 0xfb, 0xfa, 0x00,
+  0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0xf9, 0xc2, 0x66, 0x75, 0x6e, 0x63, 0x65, 0xfb,
+  0x92, 0x2c, 0x64, 0xfb, 0x50, 0x67, 0x69, 0x76, 0x65, 0x73, 0xeb, 0xf2, 0x02, 0x6c, 0x6c, 0x20,
+  0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0xde, 0xfe, 0x61, 0x72, 0x6f, 0x6c, 0x20, 0x74, 0x6f, 0xb9,
+  0xc3, 0x67, 0x72, 0x61, 0x6d, 0xc9, 0xfa, 0xe0, 0x2a, 0x20, 0x49, 0x66, 0x20, 0x79, 0xb9, 0xfe,
+  0x41, 0x6e, 0x65, 0x65, 0x64, 0xe2, 0xf1, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0xa6,
+  0xf9, 0x00, 0x71, 0x30, 0x2d, 0x6f, 0x70, 0xf2, 0x36, 0x62, 0x6c, 0x65, 0x92, 0x00, 0xda, 0x60,
+  0x64, 0x61, 0x74, 0x61, 0x20, 0x28, 0xf3, 0x20, 0x70, 0x65, 0x8b, 0xa2, 0x6e, 0x67, 0xdb, 0xfe,
+  0x10, 0x66, 0xad, 0x21, 0x65, 0x20, 0xed, 0x86, 0x9f, 0xf9, 0x20, 0x29, 0x2c, 0xa0, 0x01, 0x70,
+  0x82, 0x5c, 0xfe, 0xa3, 0x6c, 0x65, 0x60, 0xfe, 0xc1, 0x6c, 0x69, 0x62, 0x72, 0x71, 0xfa, 0x10,
+  0x68, 0xe7, 0x10, 0x6c, 0x99, 0xf1, 0x0e, 0x74, 0x73, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x6d, 0x65,
+  0x6d, 0x6f, 0x72, 0x79, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x24, 0xf9, 0x01, 0x0a,
+  0x02, 0xaa, 0x20, 0x2e, 0x68, 0x73, 0xe1, 0x73, 0x74, 0x65, 0x61, 0x64, 0x2e, 0xb0, 0xfe, 0x3f,
+  0x0a, 0x2f, 0x2a, 0xff, 0x13, 0xf1, 0x00, 0x0a, 0x2a, 0x20, 0x20, 0x56, 0x65, 0x72, 0xe0, 0xfe,
+  0x1f, 0x0a, 0xce, 0x14, 0xb3, 0x2f, 0x0a, 0x23, 0x65, 0xfe, 0x01, 0x2e, 0xd0, 0x5f, 0x56, 0x45,
+  0x52, 0x53, 0xa4, 0xfc, 0xe1, 0x5f, 0x4d, 0x41, 0x4a, 0x4f, 0x52, 0xa3, 0xf9, 0x11, 0x31, 0xfb,
+  0xa1, 0x2f, 0x2a, 0xf7, 0xfd, 0x60, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x04, 0x83, 0xd9, 0xfe,
+  0xa1, 0x66, 0x61, 0x17, 0xf9, 0x00, 0x2e, 0x5f, 0x67, 0x65, 0x73, 0x20, 0x20, 0xb8, 0x06, 0x23,
+  0x49, 0x4e, 0xb8, 0x18, 0x37, 0xb8, 0x75, 0x02, 0x6e, 0x65, 0x77, 0x20, 0x28, 0x6e, 0x6f, 0x6e,
+  0x2d, 0xaf, 0x19, 0x29, 0xae, 0xe0, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x8b, 0xf9, 0x2f, 0x65,
+  0x73, 0xaa, 0x06, 0x7b, 0x00, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, 0x62, 0x20, 0x74, 0x77,
+  0xb3, 0xa0, 0x73, 0x2c, 0x03, 0xfe, 0x60, 0x67, 0x2d, 0x66, 0x69, 0x78, 0x65, 0xf5, 0x00, 0xea,
+  0xf1, 0x00, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6e, 0xf9, 0x0f, 0xb2, 0x06, 0xc0, 0x4e,
+  0x55, 0x4d, 0x42, 0xec, 0xfb, 0x1f, 0x28, 0x00, 0x00, 0x41, 0x2a, 0x31, 0x30, 0x30, 0xfc, 0x2f,
+  0x20, 0x2b, 0x2b, 0x01, 0x06, 0xe7, 0x0e, 0x68, 0x20, 0x29, 0x0a, 0x31, 0x02, 0xe7, 0x93, 0x76,
+  0x75, 0xfe, 0xff, 0x07, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x28, 0x76, 0x6f, 0x69, 0x64,
+  0x29, 0x3b, 0x33, 0xfe, 0x1b, 0xb1, 0x54, 0x75, 0x6e, 0x8e, 0xfe, 0xa1, 0x70, 0x61, 0xeb, 0xfd,
+  0xbf, 0x74, 0x65, 0x72, 0x2a, 0xfe, 0x16, 0x83, 0xbb, 0xfc, 0x02, 0x7b, 0xb0, 0x4d, 0x45, 0x4d,
+  0xf6, 0xfa, 0xb0, 0x5f, 0x55, 0x53, 0xbd, 0xfb, 0x21, 0x20, 0x3a, 0xea, 0x92, 0x4d, 0x88, 0xfd,
+  0xe2, 0x20, 0x75, 0x73, 0x61, 0x67, 0x65, 0xdd, 0xf7, 0x71, 0x25, 0x75, 0x6c, 0x61, 0x20, 0x3a,
+  0x20, 0x4e, 0x2d, 0x3e, 0x32, 0x5e, 0x4e, 0x20, 0x42, 0x79, 0x74, 0x65, 0x73, 0x20, 0x28, 0x65,
+  0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x20, 0x3a, 0x20, 0x31, 0x30, 0x20, 0x2d, 0x3e, 0x20,
+  0x31, 0x4b, 0x42, 0x3b, 0x20, 0x31, 0x32, 0xf5, 0x40, 0x34, 0x4b, 0x42, 0x20, 0xf4, 0x11, 0x36,
+  0xf4, 0x21, 0x36, 0x34, 0xe8, 0x13, 0x32, 0xdd, 0x10, 0x4d, 0xf5, 0xd2, 0x65, 0x74, 0x63, 0x2e,
+  0x29, 0x9a, 0xfc, 0x61, 0x6e, 0x63, 0x72, 0x65, 0x61, 0x73, 0x40, 0x19, 0x6d, 0x8e, 0xa1, 0x69,
+  0x6d, 0x2a, 0xfc, 0xaa, 0x65, 0x73, 0x32, 0xfc, 0x91, 0x72, 0xc1, 0xfc, 0x93, 0x0a, 0x33, 0xf7,
+  0x4b, 0x75, 0x63, 0x65, 0x64, 0xcd, 0x34, 0x63, 0x61, 0x6e, 0xc9, 0x82, 0x90, 0xfc, 0xe0, 0x65,
+  0x64, 0x2c, 0x20, 0x64, 0x75, 0x35, 0xf7, 0x10, 0x6f, 0xe6, 0xd0, 0x63, 0x68, 0x65, 0x20, 0x65,
+  0x0f, 0xfc, 0x21, 0x63, 0x74, 0xc1, 0x70, 0x05, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20,
+  0x76, 0x61, 0x6c, 0x75, 0x95, 0x51, 0x73, 0x20, 0x31, 0x34, 0x2c, 0x1c, 0x00, 0x52, 0xa0, 0x4b,
+  0x42, 0xe0, 0xf5, 0xe0, 0x68, 0x69, 0x63, 0x68, 0x20, 0x6e, 0x16, 0xf7, 0xe1, 0x6c, 0x79, 0x20,
+  0x66, 0x69, 0x74, 0xd3, 0xf6, 0x20, 0x74, 0x6f, 0x55, 0x73, 0x03, 0x74, 0x65, 0x6c, 0x20, 0x78,
+  0x38, 0x36, 0x20, 0x4c, 0x31, 0xad, 0x99, 0x0a, 0xd1, 0xfd, 0x8e, 0xb9, 0xfe, 0xbf, 0x31, 0x34,
+  0x0a, 0x39, 0xfe, 0x1b, 0xa1, 0x53, 0x69, 0xb4, 0xfe, 0xa5, 0x20, 0x46, 0x4d, 0xfb, 0x8f, 0x39,
+  0xfe, 0x17, 0x86, 0xb5, 0xfd, 0x85, 0xd4, 0xfe, 0x23, 0x5f, 0x64, 0x1f, 0x20, 0x28, 0x63, 0xb9,
+  0x91, 0x74, 0x7f, 0xfc, 0xa4, 0x72, 0x2a, 0x15, 0xfa, 0x14, 0x2c, 0xf2, 0x51, 0x64, 0x65, 0x73,
+  0x74, 0x2c, 0x28, 0x04, 0xe8, 0x43, 0x53, 0x69, 0x7a, 0x65, 0xf0, 0x40, 0x6d, 0x61, 0x78, 0x44,
+  0xe3, 0x01, 0xef, 0x26, 0x29, 0x3b, 0xa5, 0x26, 0x64, 0x65, 0xa3, 0x5f, 0x73, 0x61, 0x66, 0x65,
+  0x20, 0xa5, 0x12, 0x88, 0xe4, 0xfa, 0x0c, 0xa1, 0x0b, 0xe7, 0x83, 0x11, 0xfd, 0x1f, 0x0a, 0x3e,
+  0x03, 0x93, 0x29, 0x52, 0xf9, 0x25, 0x20, 0x43, 0xce, 0x37, 0x73, 0x20, 0x27, 0x4e, 0xb2, 0x27,
+  0x20, 0x62, 0x77, 0xfd, 0xc4, 0x66, 0x72, 0x6f, 0x6d, 0x2e, 0xfa, 0x05, 0xe1, 0x11, 0x27, 0xc9,
+  0x83, 0x47, 0xfe, 0xb0, 0x61, 0x6c, 0x72, 0xdc, 0xfa, 0x10, 0x79, 0xf8, 0xc1, 0x6c, 0x6f, 0x63,
+  0x61, 0x2d, 0xf4, 0x11, 0x27, 0x5c, 0x14, 0x27, 0xce, 0x82, 0x6c, 0xf4, 0x00, 0xb3, 0x28, 0x20,
+  0x27, 0x05, 0x2a, 0x27, 0x2e, 0x89, 0xb1, 0x69, 0x6f, 0x6e, 0xd8, 0xfd, 0xa0, 0x67, 0x75, 0x9c,
+  0xfc, 0xa4, 0x6e, 0x74, 0xed, 0xf9, 0x41, 0x73, 0x75, 0x63, 0x63, 0xf5, 0x2b, 0x69, 0x66, 0xc5,
+  0xba, 0x20, 0x3e, 0x3d, 0x71, 0xfe, 0x67, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x28, 0x4a, 0x13, 0x29,
+  0xa4, 0x20, 0x49, 0x74, 0x6e, 0x60, 0x73, 0x6f, 0x20, 0x72, 0x75, 0x6e, 0x3e, 0xa0, 0x61, 0x73,
+  0x46, 0xfc, 0x20, 0x2c, 0x20, 0xf0, 0xb0, 0x69, 0x74, 0x27, 0xb6, 0xf4, 0xa1, 0x20, 0x72, 0xda,
+  0xfe, 0xb1, 0x6d, 0x65, 0x6e, 0xfd, 0xf4, 0xb1, 0x73, 0x65, 0x74, 0xaf, 0xf9, 0x04, 0xc8, 0x91,
+  0x66, 0x9c, 0xf4, 0x86, 0x25, 0xf9, 0x81, 0x08, 0xfd, 0xa7, 0x6e, 0x6f, 0x93, 0xfe, 0x86, 0xff,
+  0xfe, 0x04, 0x03, 0xc1, 0x20, 0x6d, 0x6f, 0x72, 0xa2, 0xf9, 0x2a, 0x6d, 0x69, 0x06, 0xc2, 0x64,
+  0x67, 0x65, 0x74, 0xb2, 0xf6, 0x8a, 0x9e, 0xfc, 0xc0, 0x73, 0x74, 0x6f, 0x70, 0xad, 0xfa, 0x10,
+  0x69, 0x87, 0xc0, 0x64, 0x69, 0x61, 0x74, 0xff, 0xfc, 0x92, 0x2a, 0xc6, 0xf8, 0x0b, 0x8e, 0x00,
+  0xd2, 0xb1, 0x75, 0x6c, 0x74, 0xef, 0xfe, 0x43, 0x7a, 0x65, 0x72, 0x6f, 0x6a, 0x11, 0x41, 0x4c,
+  0x81, 0xeb, 0xfd, 0xd0, 0x65, 0x71, 0x75, 0x65, 0x6e, 0xf2, 0xfd, 0x04, 0x95, 0x82, 0x9e, 0xf8,
+  0x22, 0x65, 0x6e, 0xd2, 0xa2, 0x6e, 0x6f, 0x8c, 0xfc, 0x23, 0x69, 0x64, 0xcd, 0x47, 0x54, 0x68,
+  0x69, 0x73, 0xab, 0xc0, 0x6e, 0x65, 0x76, 0x65, 0x6c, 0xf2, 0xa1, 0x72, 0x69, 0x2f, 0xfe, 0xc0,
+  0x6f, 0x75, 0x74, 0x73, 0x2d, 0xf8, 0x8b, 0x57, 0xfe, 0x10, 0x2c, 0xbf, 0xa1, 0x72, 0x20, 0x34,
+  0xfe, 0x05, 0xe0, 0x05, 0x14, 0x03, 0xde, 0x88, 0x10, 0xf3, 0x88, 0x2a, 0xfd, 0x90, 0x20, 0x63,
+  0xfb, 0xb0, 0x4d, 0x61, 0x78, 0x52, 0xfe, 0xc0, 0x70, 0x70, 0x6f, 0x72, 0xfc, 0xfe, 0x86, 0x09,
+  0xfc, 0x83, 0x4d, 0xfc, 0x75, 0x07, 0x41, 0x58, 0x5f, 0x49, 0x4e, 0x50, 0x55, 0x54, 0x5f, 0x56,
+  0x41, 0x4c, 0x55, 0x45, 0xbf, 0x89, 0xf9, 0xfc, 0xa3, 0x20, 0x3a, 0xcd, 0xf7, 0xa1, 0x6f, 0x72,
+  0x9c, 0xfa, 0xc3, 0x74, 0x69, 0x61, 0x6c, 0xd0, 0xfd, 0x24, 0x6f, 0x66, 0x89, 0x05, 0x59, 0x92,
+  0x28, 0xc6, 0xfb, 0x83, 0xb4, 0xf2, 0xaf, 0x62, 0x65, 0x88, 0xfd, 0x00, 0x16, 0x29, 0xa2, 0xc0,
+  0x72, 0x65, 0x74, 0x75, 0x2c, 0xf7, 0x92, 0x3a, 0xa8, 0xfe, 0x93, 0x6e, 0x05, 0xfa, 0xa4, 0x6f,
+  0x66, 0x32, 0xfd, 0xa1, 0x77, 0x72, 0x87, 0xf1, 0x92, 0x6e, 0x40, 0xfe, 0x0d, 0x9e, 0xb0, 0x6e,
+  0x65, 0x63, 0x55, 0xfe, 0xb0, 0x61, 0x72, 0x69, 0x65, 0xfb, 0x21, 0x3c, 0x3d, 0x5a, 0x52, 0x4f,
+  0x75, 0x74, 0x70, 0x75, 0x58, 0x00, 0xa1, 0x09, 0xff, 0x01, 0x50, 0xcb, 0x30, 0x20, 0x69, 0x66,
+  0xef, 0xf6, 0xef, 0x61, 0x69, 0x6c, 0x73, 0x0a, 0x0a, 0x2d, 0xfc, 0x01, 0x85, 0x95, 0xfc, 0x88,
+  0x4a, 0xfc, 0x04, 0x03, 0x22, 0x69, 0x73, 0x59, 0x00, 0xeb, 0xc1, 0x63, 0x69, 0x73, 0x65, 0xf4,
+  0xfe, 0x86, 0xff, 0xfe, 0x01, 0xe7, 0x08, 0xcf, 0x83, 0x7e, 0xf6, 0xa6, 0x2e, 0x0a, 0xbf, 0xfe,
+  0x0f, 0xb4, 0x05, 0x06, 0xc1, 0x01, 0x2a, 0xa2, 0x69, 0x6e, 0xf8, 0xf1, 0x86, 0x1b, 0xfe, 0x8f,
+  0xbb, 0xfe, 0x0d, 0xaf, 0x2e, 0x0a, 0xbf, 0xfe, 0x0f, 0x18, 0x64, 0x88, 0x82, 0xba, 0xfe, 0x0f,
+  0x98, 0x01, 0x8e, 0xb5, 0xfe, 0x0e, 0x50, 0x8e, 0xaf, 0xfe, 0x1f, 0x49, 0x50, 0x02, 0x85, 0x28,
+  0xfd, 0xc0, 0x6c, 0x61, 0x72, 0x67, 0x9c, 0xf9, 0x62, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x2c, 0x7e,
+  0x91, 0x64, 0x2b, 0xf9, 0xc2, 0x77, 0x69, 0x6c, 0x6c, 0xaa, 0xfc, 0x82, 0xba, 0xfc, 0x92, 0x6f,
+  0x54, 0xfe, 0x00, 0xf5, 0xe3, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0xfc, 0xef, 0x5d, 0x28, 0x3c,
+  0x30, 0x29, 0x2e, 0x96, 0x01, 0x28, 0x85, 0x62, 0xf4, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
+  0x97, 0xe1, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x07, 0xf9, 0xa1, 0x61, 0x6c, 0x6c, 0xf8, 0xba,
+  0x65, 0x64, 0x2c, 0x66, 0xfc, 0x07, 0x91, 0x06, 0x7e, 0x01, 0x88, 0x85, 0xd2, 0xfe, 0x50, 0x61,
+  0x20, 0x6e, 0x65, 0x67, 0x43, 0xa4, 0x76, 0x65, 0x3d, 0xfc, 0x09, 0x89, 0x8e, 0x6f, 0xfc, 0x92,
+  0x69, 0x7c, 0xf0, 0x04, 0x8f, 0xb1, 0x61, 0x67, 0x61, 0x94, 0xf5, 0x86, 0xcd, 0xfa, 0xc0, 0x76,
+  0x65, 0x72, 0x66, 0x1d, 0xf0, 0xe0, 0x20, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0xdd, 0xf8, 0x81, 0x23,
+  0xfa, 0x31, 0x63, 0x6c, 0x75, 0x8e, 0x01, 0x63, 0xe3, 0x69, 0x63, 0x69, 0x6f, 0x75, 0x73, 0xee,
+  0xf4, 0x7d, 0x00, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x1d, 0x9f, 0x74, 0x0e, 0xfc, 0x03,
+  0x84, 0xdd, 0xfe, 0x8e, 0x0e, 0xfc, 0x07, 0xdf, 0x27, 0x69, 0x6e, 0xe0, 0x81, 0x08, 0xf5, 0x8f,
+  0x9b, 0xf8, 0x1c, 0xd0, 0x41, 0x64, 0x76, 0x61, 0x6e, 0xc5, 0xf7, 0x87, 0x99, 0xf8, 0x8f, 0xfc,
+  0xf4, 0x1e, 0x8c, 0xca, 0xfb, 0x45, 0x53, 0x49, 0x5a, 0x45, 0x2c, 0x52, 0x30, 0x78, 0x37, 0x45,
+  0x30, 0xff, 0x83, 0x8d, 0xf5, 0xf4, 0x06, 0x32, 0x20, 0x31, 0x31, 0x33, 0x20, 0x39, 0x32, 0x39,
+  0x20, 0x32, 0x31, 0x36, 0x64, 0xfd, 0x0c, 0xb7, 0xb2, 0x43, 0x4f, 0x4d, 0x97, 0xef, 0xf1, 0x01,
+  0x42, 0x4f, 0x55, 0x4e, 0x44, 0x28, 0x69, 0x73, 0x8a, 0xfd, 0xc0, 0x20, 0x20, 0x28, 0x28, 0xec,
+  0xf9, 0x65, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x29, 0xec, 0x27, 0x3e, 0x20, 0xec, 0x0f, 0x7e, 0x01,
+  0x65, 0x3f, 0x20, 0x30, 0x20, 0x3a, 0x20, 0xd3, 0x34, 0x2b, 0x20, 0x28, 0xf5, 0x41, 0x2f, 0x32,
+  0x35, 0x35, 0xf0, 0xb2, 0x31, 0x36, 0x29, 0x9b, 0xf8, 0x8e, 0x68, 0xf9, 0x86, 0x09, 0xfc, 0x95,
+  0x50, 0xba, 0xf2, 0xb1, 0x74, 0x68, 0x65, 0xf3, 0xfc, 0xc2, 0x69, 0x6d, 0x75, 0x6d, 0x58, 0xfc,
+  0x82, 0x08, 0xed, 0x01, 0x53, 0x8a, 0xb7, 0xfb, 0xb5, 0x6d, 0x61, 0x79, 0x54, 0xfe, 0x91, 0x69,
+  0xa6, 0xfd, 0xc1, 0x22, 0x77, 0x6f, 0x72, 0xef, 0xf7, 0xe0, 0x61, 0x73, 0x65, 0x22, 0x20, 0x73,
+  0x5b, 0xec, 0xe2, 0x61, 0x72, 0x69, 0x6f, 0x20, 0x28, 0x52, 0xfe, 0x83, 0xf8, 0xfd, 0x89, 0x5b,
+  0xf9, 0xef, 0x69, 0x62, 0x6c, 0x65, 0x29, 0x0a, 0x8c, 0xfd, 0x05, 0xa3, 0x69, 0x6d, 0x6b, 0xfc,
+  0xe1, 0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x67, 0xf6, 0x83, 0x17, 0xf6, 0x85, 0xfb, 0xfb, 0x02,
+  0xd6, 0xe1, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x7b, 0xf5, 0x8f, 0x6c, 0xfc, 0x01, 0x97, 0x73,
+  0x9a, 0xf8, 0xdf, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x95, 0xfe, 0x01, 0x10, 0x29, 0x94, 0x82, 0x80,
+  0xf8, 0x86, 0x97, 0xed, 0x01, 0x97, 0x02, 0x5f, 0x22, 0x69, 0x6c, 0xb3, 0xc0, 0x2d, 0x74, 0x69,
+  0x6d, 0x2e, 0xfc, 0x81, 0xd2, 0xf9, 0x03, 0xa3, 0x6f, 0x28, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x74,
+  0x00, 0x02, 0xc7, 0x83, 0xf5, 0xf4, 0x05, 0x8a, 0xb4, 0x4e, 0x6f, 0x74, 0xc8, 0xfe, 0x8f, 0x2a,
+  0xf7, 0x05, 0x04, 0xed, 0x85, 0x07, 0xf8, 0xd2, 0x20, 0x77, 0x68, 0x65, 0x6e, 0xa2, 0xfb, 0x09,
+  0x3d, 0x00, 0x5d, 0x8f, 0xb4, 0xf7, 0x05, 0xaa, 0x72, 0x63, 0x60, 0xfb, 0x83, 0xeb, 0xfc, 0x85,
+  0x12, 0xf9, 0x9f, 0x6d, 0x12, 0xf9, 0x05, 0x8e, 0xca, 0xfd, 0x8e, 0x71, 0xf9, 0x85, 0x08, 0xfe,
+  0x84, 0x26, 0xfe, 0x02, 0x7b, 0x8f, 0x21, 0xfe, 0x09, 0x8f, 0x90, 0xf9, 0x01, 0x43, 0x2c, 0x20,
+  0x69, 0x66, 0x72, 0x06, 0x3e, 0xb4, 0x74, 0x6f, 0x6f, 0xe2, 0xfa, 0x3f, 0x28, 0x20, 0x3e, 0x7a,
+  0x01, 0xc3, 0x29, 0x0a, 0x2a, 0x2f, 0x3d, 0xf5, 0x0e, 0x18, 0x00, 0xea, 0x03, 0x25, 0x8f, 0xd9,
+  0xf5, 0x06, 0xb7, 0x66, 0x61, 0x73, 0xdc, 0xf5, 0x91, 0x53, 0x96, 0xf0, 0xaf, 0x61, 0x73, 0x8d,
+  0xfe, 0x05, 0x81, 0x0a, 0xf2, 0x92, 0x74, 0x4a, 0xfe, 0xa2, 0x77, 0x73, 0x42, 0xf6, 0xc2, 0x65,
+  0x6c, 0x65, 0x63, 0x74, 0xfa, 0x40, 0x22, 0x61, 0x63, 0x63, 0xf3, 0x92, 0x72, 0x33, 0xfe, 0xd0,
+  0x22, 0x20, 0x66, 0x61, 0x63, 0xf6, 0xee, 0x85, 0x5d, 0xf7, 0x13, 0x65, 0x44, 0x92, 0x72, 0xbc,
+  0xee, 0x09, 0xd7, 0x83, 0xa7, 0xfe, 0x83, 0x80, 0xfa, 0x01, 0x79, 0x03, 0xdd, 0x87, 0xdc, 0xe8,
+  0x05, 0x90, 0xa3, 0x73, 0x6f, 0x21, 0xf0, 0x00, 0x73, 0x03, 0xdd, 0x89, 0xb9, 0xfc, 0x84, 0xf6,
+  0xf5, 0x83, 0x0e, 0xf6, 0xa0, 0x74, 0x72, 0xae, 0xe8, 0x50, 0x2d, 0x6f, 0x66, 0x66, 0x2e, 0xee,
+  0x82, 0x31, 0xf3, 0xb2, 0x62, 0x65, 0x20, 0xd6, 0xfb, 0xd4, 0x74, 0x75, 0x6e, 0x65, 0x64, 0x47,
+  0xe9, 0xc2, 0x65, 0x61, 0x63, 0x68, 0x85, 0xf5, 0x01, 0xbe, 0x23, 0x76, 0x65, 0x79, 0x83, 0x3b,
+  0xfd, 0x82, 0x82, 0xfa, 0x91, 0x72, 0x7e, 0xf9, 0x80, 0xc2, 0xfc, 0x42, 0x2b, 0x7e, 0x33, 0x25,
+  0x18, 0xa5, 0x70, 0x65, 0xcb, 0xf8, 0x2f, 0x41, 0x6e, 0x3e, 0x00, 0x82, 0x79, 0xf8, 0xb6, 0x22,
+  0x31, 0x22, 0x66, 0xf8, 0x84, 0xbb, 0xfe, 0x40, 0x72, 0x65, 0x67, 0x75, 0x06, 0x8f, 0xb3, 0xfe,
+  0x05, 0x02, 0xb1, 0x11, 0x56, 0xc1, 0x91, 0x73, 0xc4, 0xf8, 0x93, 0x30, 0x87, 0xf9, 0x92, 0x62,
+  0xb6, 0xed, 0xb1, 0x6c, 0x61, 0x63, 0xf6, 0xf7, 0xd0, 0x79, 0x20, 0x41, 0x43, 0x43, 0x13, 0xf1,
+  0xb1, 0x52, 0x41, 0x54, 0x08, 0xf1, 0xf2, 0x05, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x20,
+  0x28, 0x73, 0x65, 0x65, 0x48, 0xee, 0xa4, 0x63, 0x29, 0x15, 0xf8, 0x82, 0x7f, 0xf2, 0x95, 0x2e,
+  0xfb, 0xfd, 0x8e, 0x21, 0xfe, 0x9f, 0x20, 0x3a, 0xf3, 0x2a, 0x06, 0xef, 0x0a, 0x07, 0xbf, 0x29,
+  0x3b, 0x0a, 0xb5, 0xfd, 0x04, 0xe0, 0x5f, 0x65, 0x78, 0x74, 0x53, 0x74, 0x9a, 0xf7, 0x8a, 0xac,
+  0xfd, 0x8f, 0xae, 0xed, 0x03, 0xb1, 0x2c, 0x20, 0x6a, 0x5e, 0xf7, 0xa3, 0x75, 0x73, 0x9c, 0xf8,
+  0x93, 0x20, 0x5a, 0xed, 0xb6, 0x61, 0x6c, 0x6c, 0x98, 0xf3, 0x87, 0x60, 0xf1, 0xd2, 0x73, 0x70,
+  0x61, 0x63, 0x65, 0x74, 0xfe, 0x3b, 0x74, 0x6f, 0x72, 0xb1, 0x11, 0x73, 0x92, 0x83, 0x62, 0xfe,
+  0xa3, 0x55, 0x73, 0xed, 0xf9, 0x81, 0xc8, 0xfc, 0x24, 0x6f, 0x66, 0x79, 0x01, 0xca, 0x60, 0x6b,
+  0x6e, 0x6f, 0x77, 0x20, 0x68, 0xfc, 0x44, 0x6d, 0x75, 0x63, 0x68, 0xac, 0x85, 0xe0, 0xf6, 0x07,
+  0x93, 0x83, 0x33, 0xf4, 0x36, 0x61, 0x6e, 0x64, 0xed, 0x40, 0x20, 0x69, 0x74, 0x20, 0x9d, 0xa3,
+  0x38, 0x2d, 0x86, 0xf9, 0x91, 0x62, 0xad, 0xfc, 0xb1, 0x61, 0x72, 0x69, 0xcc, 0xfa, 0x03, 0x49,
+  0x12, 0x6d, 0xd6, 0x01, 0x9b, 0x41, 0x79, 0x70, 0x69, 0x63, 0x44, 0x96, 0x29, 0x09, 0xfd, 0xa4,
+  0x6e, 0x2c, 0xe7, 0xfa, 0x02, 0xb9, 0xc1, 0x61, 0x73, 0x20, 0x27, 0x66, 0xef, 0x13, 0x2a, 0x4f,
+  0x10, 0x27, 0x69, 0x8f, 0xea, 0xfe, 0x03, 0x85, 0x39, 0xfe, 0x0e, 0x37, 0x01, 0xc3, 0x84, 0xb1,
+  0xf1, 0x8f, 0x8a, 0xfe, 0x08, 0x28, 0x20, 0x28, 0x9c, 0xaf, 0x2c, 0x20, 0x08, 0xfe, 0x0e, 0x86,
+  0xe2, 0xfb, 0x8f, 0x09, 0xfe, 0x2a, 0x13, 0x64, 0xd1, 0x87, 0x0e, 0xfe, 0xa1, 0x52, 0x65, 0x6e,
+  0xee, 0x93, 0x65, 0x4b, 0xfc, 0xd0, 0x6f, 0x67, 0x69, 0x63, 0x2c, 0x34, 0xfd, 0x05, 0x13, 0x83,
+  0x12, 0xfe, 0x92, 0x73, 0x76, 0xfe, 0x82, 0x2a, 0xf9, 0x01, 0xf3, 0xa3, 0x70, 0x6f, 0x2f, 0xf9,
+  0x82, 0x79, 0xf1, 0x8d, 0x6d, 0xf3, 0x8f, 0x79, 0xf1, 0x09, 0x8b, 0x24, 0xf4, 0x87, 0x79, 0xf1,
+  0x91, 0x74, 0x8f, 0xfb, 0x99, 0x74, 0x76, 0xf1, 0x8e, 0xd8, 0xf8, 0xa1, 0x65, 0x69, 0xd2, 0xe6,
+  0x06, 0x6a, 0x84, 0x4a, 0xf8, 0xd6, 0x65, 0x6e, 0x74, 0x69, 0x72, 0xeb, 0xf2, 0x86, 0x85, 0xf2,
+  0x02, 0x81, 0x05, 0x9a, 0xa2, 0x69, 0x66, 0x9f, 0xf1, 0x8b, 0x50, 0xf5, 0x94, 0x0a, 0x41, 0xfa,
+  0xc9, 0x66, 0x69, 0x6c, 0x6c, 0xe3, 0xf0, 0x04, 0x9d, 0xa1, 0x6c, 0x65, 0xf6, 0xf1, 0x82, 0x81,
+  0xfb, 0x0f, 0x03, 0x15, 0x87, 0x13, 0xf6, 0x97, 0x2a, 0x66, 0xfc, 0xd5, 0x50, 0x74, 0x72, 0x20,
+  0x3a, 0xd6, 0xfb, 0x84, 0x8d, 0xe4, 0x83, 0xb6, 0xf0, 0xc1, 0x69, 0x6e, 0x64, 0x69, 0x4e, 0xfd,
+  0x83, 0x1a, 0xfd, 0xb5, 0x61, 0x6e, 0x79, 0xf6, 0xf2, 0x00, 0x1b, 0x92, 0x65, 0x0e, 0xf2, 0x0b,
+  0xa1, 0x00, 0xcc, 0x08, 0x54, 0x08, 0x92, 0x0e, 0xff, 0xb7, 0x4e, 0x65, 0x77, 0xfe, 0xf8, 0x8c,
+  0x0e, 0xf4, 0xa4, 0x6f, 0x6c, 0xe2, 0xf8, 0x9f, 0x2e, 0xf7, 0xf8, 0x00, 0xaf, 0x4e, 0x62, 0x73,
+  0xf2, 0x01, 0x8f, 0x7a, 0xf2, 0x06, 0x86, 0x4f, 0xfe, 0x8f, 0x79, 0xf2, 0x1c, 0x88, 0x0d, 0xfb,
+  0x8e, 0x70, 0xfd, 0x8f, 0x9e, 0xee, 0x14, 0xaa, 0x2a, 0x20, 0xa2, 0xfe, 0x02, 0xec, 0x0c, 0x72,
+  0x89, 0x0b, 0xfd, 0xaf, 0x64, 0x65, 0xc7, 0xf8, 0x04, 0xd0, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x44,
+  0xfb, 0x8a, 0x5c, 0xf2, 0x06, 0xea, 0x85, 0x00, 0xf0, 0xb1, 0x72, 0x65, 0x66, 0x42, 0xfb, 0xa7,
+  0x75, 0x6e, 0xa3, 0xf2, 0x82, 0x4f, 0xfd, 0x8f, 0x70, 0xf2, 0x0f, 0x87, 0x3f, 0xfe, 0x88, 0x2a,
+  0xf3, 0x86, 0x79, 0xf2, 0xa4, 0x69, 0x6e, 0x05, 0xe4, 0xd3, 0x77, 0x6f, 0x72, 0x64, 0x73, 0xb0,
+  0xf8, 0x0c, 0x9e, 0x9f, 0x29, 0xe2, 0xf2, 0x73, 0x9e, 0x44, 0x98, 0xf5, 0x8f, 0x5b, 0xf1, 0x09,
+  0x42, 0x20, 0x49, 0x74, 0x73, 0x44, 0x07, 0xdc, 0xc3, 0x20, 0x6d, 0x69, 0x6e, 0xa3, 0xf6, 0xb5,
+  0x66, 0x20, 0x27, 0x8d, 0xfe, 0x88, 0x3a, 0xed, 0x03, 0x91, 0x91, 0x6e, 0xc6, 0xf5, 0x9c, 0x3a,
+  0x11, 0xfc, 0xa1, 0x66, 0x75, 0xa8, 0xf9, 0x84, 0xa6, 0xe7, 0x84, 0xfe, 0xf9, 0x89, 0x30, 0xfa,
+  0x91, 0x66, 0x65, 0xef, 0x91, 0x72, 0x6c, 0xe7, 0x00, 0xd9, 0x03, 0x05, 0x8d, 0x67, 0xe7, 0x0a,
+  0x33, 0xa2, 0x49, 0x74, 0x02, 0xf5, 0xc7, 0x20, 0x62, 0x69, 0x74, 0x44, 0xf7, 0xbf, 0x61, 0x6e,
+  0x20, 0xe9, 0xef, 0x03, 0x0a, 0xc6, 0xb1, 0x48, 0x6f, 0x77, 0xe0, 0xfa, 0x91, 0x2c, 0xeb, 0xf9,
+  0xb2, 0x64, 0x6f, 0x65, 0x04, 0xf1, 0x86, 0xd7, 0xf9, 0xb3, 0x61, 0x6e, 0x79, 0xcd, 0xf1, 0x02,
+  0x4a, 0x86, 0xcc, 0xf1, 0x92, 0x69, 0x7a, 0xfb, 0xa2, 0x69, 0x6f, 0xe2, 0xf8, 0x84, 0x08, 0xfc,
+  0x04, 0x6a, 0x85, 0x42, 0xfe, 0x96, 0x28, 0xcc, 0xf1, 0x83, 0x2e, 0xfa, 0x0b, 0x8b, 0x91, 0x55,
+  0x71, 0xfa, 0x8b, 0xd8, 0xf3, 0x50, 0x6e, 0x20, 0x74, 0x72, 0x75, 0x47, 0x90, 0x64, 0x3d, 0xfb,
+  0xd2, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x42, 0xe8, 0x20, 0x6f, 0x6e, 0x9f, 0x12, 0x28, 0xa7, 0xa3,
+  0x74, 0x6f, 0x1b, 0xfe, 0x82, 0xb3, 0xfd, 0x85, 0xdd, 0xeb, 0x15, 0x61, 0xca, 0x84, 0xc3, 0xfd,
+  0x9a, 0x29, 0x50, 0xf9, 0xaf, 0x64, 0x65, 0x87, 0xf7, 0x20, 0x86, 0xc4, 0xfc, 0x8a, 0x5e, 0xf5,
+  0x8e, 0xba, 0xfe, 0x94, 0x5f, 0xc7, 0xed, 0x83, 0x8d, 0xfc, 0x8e, 0x31, 0xfa, 0x07, 0xd2, 0xae,
+  0x20, 0x61, 0xb1, 0xee, 0x87, 0xe7, 0xf9, 0x8b, 0x62, 0xef, 0x91, 0x27, 0x34, 0xe4, 0x81, 0x48,
+  0xe4, 0x01, 0xbd, 0x8a, 0x09, 0xeb, 0x8e, 0x0c, 0xef, 0x8f, 0x96, 0xf9, 0x06, 0x8c, 0x0c, 0xef,
+  0x89, 0x91, 0xf9, 0x89, 0xc8, 0xfc, 0x92, 0x74, 0x9b, 0xfd, 0xa5, 0x74, 0x6f, 0xc4, 0xfc, 0x89,
+  0xf3, 0xf8, 0xa5, 0x6f, 0x70, 0xb2, 0xf5, 0x52, 0x61, 0x73, 0x20, 0x73, 0x6f, 0xf8, 0x85, 0x3d,
+  0xf9, 0x87, 0x65, 0xed, 0x30, 0x27, 0x20, 0x68, 0xe9, 0xe1, 0x62, 0x65, 0x65, 0x6e, 0x20, 0x72,
+  0x3f, 0xf5, 0x85, 0x51, 0xf7, 0x91, 0x72, 0x37, 0xe8, 0x00, 0xb9, 0x08, 0xab, 0x02, 0x8f, 0xbf,
+  0x69, 0x6d, 0x65, 0x18, 0xee, 0x15, 0xb4, 0x64, 0x65, 0x64, 0xa9, 0xdf, 0x8f, 0x1b, 0xee, 0x2e,
+  0x92, 0x4e, 0x86, 0xfc, 0x82, 0x97, 0xfd, 0x04, 0x96, 0x85, 0x7c, 0xf4, 0x1f, 0x3c, 0x2f, 0x02,
+  0xef, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0xff, 0xec, 0x03, 0x87, 0x83, 0xfd, 0x01, 0xc2, 0x91,
+  0x73, 0x99, 0xf6, 0xac, 0x65, 0x72, 0xb2, 0xfb, 0xe5, 0x41, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x80,
+  0xe3, 0x8e, 0x07, 0xf9, 0x35, 0x65, 0x72, 0x65, 0x21, 0x8f, 0xe4, 0xed, 0x81, 0x8f, 0x45, 0xee,
+  0x05, 0x9c, 0x66, 0x42, 0xee, 0x01, 0xa0, 0x02, 0xd5, 0x8d, 0x3c, 0xee, 0xab, 0x6f, 0x66, 0x39,
+  0xee, 0x83, 0x6f, 0xfb, 0x88, 0x9b, 0xf9, 0x8e, 0x87, 0xed, 0x8f, 0xab, 0xed, 0x04, 0x86, 0xbd,
+  0xf8, 0x8f, 0x8d, 0xfc, 0x09, 0x8f, 0x55, 0xe7, 0x28, 0x89, 0x0c, 0xfe, 0x8f, 0x3f, 0xe7, 0x0d,
+  0x8a, 0x7b, 0xed, 0x8f, 0x0d, 0xe6, 0x19, 0x82, 0x42, 0xfe, 0xb9, 0x69, 0x6e, 0x67, 0x97, 0xe7,
+  0x8f, 0x65, 0xed, 0x02, 0x8f, 0x5c, 0xed, 0x22, 0xe1, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x9e,
+  0xf0, 0xc0, 0x5f, 0x55, 0x36, 0x34, 0xee, 0xed, 0xed, 0x31, 0x20, 0x3c, 0x3c, 0x20, 0x28, 0x58,
+  0xe5, 0xb1, 0x2d, 0x33, 0x29, 0xdf, 0xed, 0x2f, 0x34, 0x29, 0xc3, 0x01, 0x86, 0x23, 0xed, 0x1f,
+  0x28, 0xaf, 0x01, 0xa3, 0x2a, 0x20, 0x1f, 0xf4, 0x30, 0x28, 0x6c, 0x6f, 0x3f, 0x01, 0xfb, 0xa8,
+  0x29, 0x29, 0xad, 0xe3, 0x83, 0x66, 0xfd, 0x92, 0x5f, 0x8f, 0xe4, 0xa1, 0x69, 0x6e, 0x6e, 0xfd,
+  0x83, 0x66, 0xfc, 0x00, 0xe8, 0xd2, 0x75, 0x63, 0x74, 0x75, 0x72, 0xef, 0xf2, 0xa1, 0x74, 0x72,
+  0xae, 0xee, 0x83, 0x86, 0xf9, 0x84, 0x34, 0xfd, 0x12, 0x2e, 0xcf, 0x91, 0x6d, 0x42, 0xef, 0xb1,
+  0x61, 0x6e, 0x74, 0x71, 0xf7, 0xb2, 0x6e, 0x69, 0x74, 0x6a, 0xfc, 0x07, 0xc5, 0x86, 0x26, 0xf5,
+  0x93, 0x62, 0xd1, 0xfd, 0xd2, 0x66, 0x69, 0x72, 0x73, 0x74, 0xe4, 0xe0, 0x10, 0x21, 0xc2, 0x85,
+  0xbc, 0xf8, 0xaa, 0x6f, 0x6e, 0x73, 0xf2, 0x60, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0xed, 0x38,
+  0x74, 0x68, 0x65, 0xb5, 0x93, 0x69, 0x18, 0xe0, 0xb2, 0x61, 0x72, 0x65, 0x88, 0xf3, 0x83, 0xf8,
+  0xf2, 0xd4, 0x20, 0x6c, 0x69, 0x6e, 0x6b, 0x3d, 0xe0, 0x00, 0xae, 0x86, 0x84, 0xfc, 0x06, 0xd4,
+  0x84, 0x07, 0xf2, 0xe1, 0x6c, 0x69, 0x62, 0x6c, 0x7a, 0x34, 0x0d, 0xfb, 0xda, 0x61, 0x20, 0x44,
+  0x4c, 0x4c, 0x59, 0xe0, 0x51, 0x62, 0x65, 0x6c, 0x6f, 0x77, 0x56, 0x03, 0x94, 0x82, 0xcb, 0xec,
+  0xe6, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x49, 0xe0, 0x82, 0xbf, 0xe3, 0xc0, 0x74, 0x79, 0x70,
+  0x65, 0x86, 0xfe, 0x04, 0x6d, 0xb6, 0x20, 0x7b, 0x20, 0xb0, 0xfe, 0xa1, 0x20, 0x74, 0x9d, 0xdf,
+  0x9f, 0x5b, 0x84, 0xfe, 0x00, 0xca, 0x5d, 0x3b, 0x20, 0x7d, 0x9b, 0xfe, 0xa8, 0x3b, 0x0a, 0x86,
+  0xfe, 0xd3, 0x72, 0x65, 0x73, 0x65, 0x74, 0xa5, 0xfd, 0x01, 0xed, 0x8e, 0xc2, 0xf8, 0x83, 0x8e,
+  0xf4, 0x91, 0x69, 0x04, 0xef, 0x87, 0xe1, 0xfe, 0x0a, 0xb1, 0x87, 0xe1, 0xfe, 0x02, 0x5e, 0x81,
+  0x6a, 0xf2, 0x0d, 0xa6, 0x29, 0x20, 0x28, 0xcf, 0x94, 0x2a, 0x43, 0xfe, 0x4a, 0x50, 0x74, 0x72,
+  0x29, 0x74, 0x81, 0x22, 0xe2, 0x23, 0x74, 0x65, 0xcd, 0x82, 0x7e, 0xfb, 0x05, 0x8e, 0x82, 0x67,
+  0xd8, 0x02, 0x79, 0x51, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0xf1, 0x0f, 0x7d, 0x05, 0x05, 0xb5, 0x35,
+  0x66, 0x72, 0x65, 0xb7, 0xa2, 0x72, 0x65, 0x99, 0xfe, 0x91, 0x73, 0xda, 0xde, 0x84, 0xf1, 0xf6,
+  0x83, 0x4c, 0xde, 0x81, 0xf7, 0xf9, 0x84, 0xe2, 0xfd, 0x91, 0x78, 0x63, 0xd9, 0x83, 0x69, 0xfe,
+  0xa3, 0x20, 0x28, 0x58, 0xfe, 0x9a, 0x29, 0x60, 0xfe, 0x20, 0x74, 0x68, 0x32, 0x86, 0x6d, 0xfe,
+  0xc5, 0x72, 0x61, 0x74, 0x68, 0xf9, 0xf6, 0xa5, 0x74, 0x68, 0xf4, 0xfd, 0x04, 0x7a, 0x02, 0xa3,
+  0xc2, 0x54, 0x68, 0x65, 0x79, 0x05, 0xfe, 0x92, 0x6d, 0x8d, 0xfd, 0xb3, 0x75, 0x74, 0x75, 0x57,
+  0xfb, 0xa1, 0x6f, 0x66, 0xe7, 0xfb, 0x82, 0xe5, 0xec, 0x02, 0x8e, 0x83, 0x0f, 0xdf, 0x01, 0xf4,
+  0x0c, 0x2f, 0x00, 0x1a, 0x83, 0x0e, 0xfe, 0x09, 0xe9, 0x8f, 0xd9, 0xfe, 0x00, 0x89, 0xd4, 0xf0,
+  0x06, 0xff, 0x86, 0xfe, 0xfe, 0x8f, 0x82, 0xfe, 0x1b, 0xff, 0x01, 0x6c, 0x6f, 0x61, 0x64, 0x44,
+  0x69, 0x63, 0x74, 0xf9, 0xfd, 0x07, 0x01, 0xdf, 0x25, 0x20, 0x61, 0x13, 0x22, 0x64, 0x69, 0xe7,
+  0xb2, 0x61, 0x72, 0x79, 0xbe, 0xf7, 0x02, 0x41, 0x88, 0x6b, 0xfc, 0x92, 0x41, 0x21, 0xf6, 0xa6,
+  0x65, 0x76, 0x7a, 0xfa, 0x86, 0x34, 0xf2, 0xd1, 0x66, 0x6f, 0x72, 0x67, 0x6f, 0xd9, 0xf2, 0x93,
+  0x2c, 0x8b, 0xfc, 0x17, 0x27, 0xb6, 0x13, 0x27, 0xdb, 0xd1, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x48,
+  0xf6, 0x89, 0x51, 0xfe, 0xb3, 0x4c, 0x6f, 0x61, 0x79, 0xf9, 0x86, 0xf0, 0xe5, 0xc3, 0x30, 0x20,
+  0x69, 0x73, 0x5c, 0xec, 0x22, 0x65, 0x64, 0xdd, 0x94, 0x52, 0x00, 0xf8, 0x09, 0x64, 0x94, 0x73,
+  0x74, 0xfa, 0x83, 0xd4, 0xf8, 0x8e, 0x1c, 0xf8, 0xd0, 0x36, 0x34, 0x20, 0x4b, 0x42, 0xa3, 0xdf,
+  0x83, 0xe5, 0xf9, 0x8a, 0xf8, 0xfe, 0x8f, 0xc9, 0xfe, 0x07, 0x8a, 0x93, 0xef, 0x08, 0x94, 0x82,
+  0x0d, 0xfa, 0x01, 0xf0, 0x88, 0x7e, 0xeb, 0x02, 0x46, 0x8e, 0x3c, 0xef, 0x81, 0x8c, 0xfd, 0xb1,
+  0x69, 0x6e, 0x75, 0x52, 0xfd, 0x86, 0x33, 0xfa, 0x84, 0x9b, 0xdb, 0x86, 0x52, 0xfb, 0xe3, 0x27,
+  0x73, 0x72, 0x63, 0x27, 0x2c, 0xc5, 0xfb, 0x82, 0xbf, 0xfe, 0x82, 0x6a, 0xf5, 0x86, 0xac, 0xfe,
+  0xae, 0x6c, 0x79, 0xb6, 0xf7, 0x49, 0x73, 0x20, 0x61, 0x73, 0x05, 0xa6, 0x74, 0x6f, 0x1d, 0xdf,
+  0x8e, 0xe7, 0xde, 0x83, 0xfe, 0xfc, 0x88, 0xc7, 0xfa, 0x99, 0x50, 0x54, 0xfe, 0x06, 0xb0, 0x91,
+  0x72, 0x21, 0xec, 0xb4, 0x73, 0x75, 0x6d, 0x3c, 0xe1, 0x94, 0x74, 0x3d, 0xfe, 0x01, 0xb4, 0x00,
+  0x5c, 0x83, 0xbf, 0xd4, 0x95, 0x6e, 0x5b, 0xf4, 0x83, 0xb0, 0xfa, 0xdf, 0x27, 0x64, 0x73, 0x74,
+  0x27, 0x0c, 0xf3, 0x0f, 0x84, 0xca, 0xda, 0x82, 0xdf, 0xf8, 0x83, 0x3c, 0xf1, 0x8f, 0x43, 0xe9,
+  0x0c, 0xbf, 0x2c, 0x20, 0x63, 0xa2, 0xe0, 0x11, 0x82, 0xbb, 0xf7, 0x89, 0xdc, 0xe0, 0x05, 0x99,
+  0x33, 0x6e, 0x6f, 0x74, 0xe4, 0xad, 0x69, 0x66, 0x7b, 0xda, 0x85, 0xed, 0xe0, 0xa3, 0x66, 0x69,
+  0x04, 0xef, 0x0a, 0x3f, 0x84, 0xc1, 0xfd, 0x8e, 0x0a, 0xe1, 0x02, 0xb3, 0x89, 0x1c, 0xe1, 0xb1,
+  0x74, 0x75, 0x72, 0x2d, 0xd5, 0x85, 0x1c, 0xe1, 0x8d, 0x60, 0xeb, 0x8e, 0x06, 0xfe, 0x8f, 0xa3,
+  0xfd, 0x15, 0x00, 0x01, 0x86, 0x81, 0xf7, 0x86, 0x42, 0xeb, 0xab, 0x72, 0x63, 0x9f, 0xf7, 0x8f,
+  0x3d, 0xed, 0x09, 0x89, 0x9d, 0xf8, 0xb5, 0x61, 0x76, 0x65, 0x21, 0xfc, 0xaf, 0x49, 0x66, 0xb8,
+  0xfd, 0x04, 0x88, 0x03, 0xfe, 0x84, 0x55, 0xe3, 0x8b, 0x98, 0xfe, 0x85, 0x66, 0xfc, 0xd2, 0x61,
+  0x76, 0x61, 0x69, 0x6c, 0x2e, 0xd9, 0xa8, 0x61, 0x74, 0xa9, 0xfa, 0x95, 0x20, 0x1b, 0xe7, 0x01,
+  0x9c, 0x01, 0x90, 0x95, 0x20, 0xac, 0xfe, 0x10, 0x61, 0xf1, 0x81, 0xb1, 0xfe, 0x82, 0x10, 0xea,
+  0x22, 0x20, 0x28, 0x23, 0x02, 0xed, 0x92, 0x42, 0x99, 0xfe, 0x81, 0x22, 0xdc, 0x84, 0xad, 0xf4,
+  0x82, 0xcc, 0xf8, 0xd6, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0xb2, 0xd8, 0x81, 0x9b, 0xf8, 0x8a, 0x66,
+  0xfc, 0xd0, 0x28, 0x29, 0x20, 0x61, 0x66, 0x22, 0xfe, 0xa1, 0x77, 0x61, 0xfb, 0xef, 0x87, 0x8d,
+  0xf8, 0x8a, 0x6c, 0xfb, 0xa8, 0x73, 0x20, 0x67, 0xdf, 0x31, 0x20, 0x75, 0x73, 0x51, 0xb3, 0x2c,
+  0x20, 0x79, 0x13, 0xd7, 0x87, 0xc2, 0xf5, 0x02, 0xa2, 0x8f, 0x57, 0xfe, 0x09, 0xa9, 0x28, 0x29,
+  0xa6, 0xfb, 0x02, 0x2a, 0x9d, 0x64, 0xa0, 0xfb, 0x8f, 0xa1, 0xfb, 0x07, 0x87, 0xf3, 0xfb, 0x95,
+  0x2c, 0x26, 0xee, 0x83, 0x33, 0xe2, 0x8a, 0xde, 0xfd, 0x01, 0xac, 0x8f, 0x8f, 0xfb, 0x0d, 0x8d,
+  0xcf, 0xfe, 0x86, 0x95, 0xfb, 0x89, 0x49, 0xee, 0x8f, 0xac, 0xf5, 0x2b, 0xbf, 0x44, 0x65, 0x63,
+  0xaa, 0xf5, 0x32, 0x00, 0x29, 0x8f, 0xe5, 0xf5, 0x01, 0xe6, 0x44, 0x45, 0x43, 0x4f, 0x44, 0x45,
+  0xf3, 0xf5, 0x2f, 0x20, 0x34, 0xdc, 0x07, 0x87, 0xbb, 0xf5, 0x0d, 0xc2, 0x8e, 0xb5, 0xf5, 0x86,
+  0x1d, 0xe3, 0x99, 0x20, 0xac, 0xf5, 0x8e, 0xdf, 0xf6, 0x0a, 0xda, 0x8e, 0xd6, 0xf6, 0x0e, 0x9f,
+  0x8e, 0xd0, 0xf6, 0x92, 0x44, 0xa7, 0xf2, 0xb3, 0x5f, 0x74, 0x3b, 0x51, 0xf5, 0x0e, 0xe6, 0x8f,
+  0x4b, 0xf5, 0x24, 0x8f, 0x57, 0xf5, 0x09, 0x84, 0xd8, 0xe7, 0x03, 0x97, 0x38, 0x65, 0x74, 0x53,
+  0x94, 0x93, 0x20, 0x22, 0xe3, 0x00, 0xea, 0xaf, 0x28, 0x29, 0x31, 0xf5, 0x04, 0x8f, 0x27, 0xf7,
+  0x12, 0x85, 0x28, 0xf7, 0xe4, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0xef, 0xd8, 0xaf, 0x6f, 0x66,
+  0x82, 0xf5, 0x03, 0x83, 0x67, 0xf5, 0x8f, 0x2d, 0xf7, 0x26, 0x8e, 0xd4, 0xfe, 0x87, 0xda, 0xe3,
+  0x25, 0x74, 0x68, 0xbc, 0x9b, 0x2e, 0x01, 0xf6, 0x09, 0x10, 0x8f, 0xfb, 0xf5, 0x0e, 0x0e, 0x9f,
+  0x8f, 0xf5, 0xf5, 0x05, 0x0a, 0xab, 0x8f, 0xef, 0xf5, 0x06, 0x2f, 0x2f, 0x0a, 0xb2, 0x00, 0x0f,
+  0x67, 0x05, 0x8a, 0x5d, 0xe7, 0x0c, 0xff, 0x0f, 0x8c, 0x04, 0x1f, 0x28, 0xa4, 0x01, 0x08, 0x42,
+  0x89, 0x55, 0xfa, 0x8e, 0x0a, 0xfe, 0x8f, 0x68, 0xf4, 0x09, 0x03, 0x13, 0x83, 0x05, 0xe9, 0x83,
+  0x18, 0xe9, 0x83, 0x81, 0xda, 0x86, 0x5e, 0xfb, 0x84, 0xc3, 0xf6, 0xcf, 0x53, 0x65, 0x74, 0x74,
+  0xc3, 0xf6, 0x08, 0xd5, 0x20, 0x28, 0x73, 0x61, 0x6d, 0x0c, 0xd7, 0x83, 0x30, 0xe4, 0x00, 0x7d,
+  0x9b, 0x29, 0xac, 0xf6, 0x91, 0x31, 0x43, 0xfb, 0xbf, 0x4f, 0x4b, 0x2c, 0x3a, 0xfb, 0x07, 0x2f,
+  0x65, 0x74, 0x0e, 0x10, 0x0d, 0xec, 0x8f, 0xb5, 0xf6, 0x1b, 0x96, 0x2a, 0x6b, 0xfa, 0x88, 0xe6,
+  0xec, 0x00, 0x56, 0x86, 0x5d, 0xef, 0x86, 0x3e, 0xd2, 0x04, 0x26, 0x8b, 0xd7, 0xed, 0x01, 0x0a,
+  0xd0, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0xc7, 0xd6, 0x85, 0x1f, 0xf7, 0xd5, 0x69, 0x6e, 0x20, 0x22,
+  0x73, 0xfc, 0xfa, 0x91, 0x22, 0x91, 0xeb, 0x84, 0xb5, 0xed, 0x96, 0x50, 0xe1, 0xf8, 0x03, 0xa2,
+  0x87, 0x9c, 0xf6, 0x91, 0x2a, 0x2c, 0xf7, 0x9f, 0x2a, 0xf6, 0xf8, 0x03, 0xb4, 0x74, 0x68, 0x65,
+  0xf6, 0xf8, 0x86, 0x95, 0xec, 0x85, 0x65, 0xfe, 0xba, 0x68, 0x65, 0x79, 0x58, 0xee, 0xc0, 0x20,
+  0x28, 0x75, 0x70, 0x4f, 0xfe, 0x86, 0x80, 0xf5, 0xa4, 0x20, 0x20, 0x49, 0xfc, 0x88, 0xb8, 0xfc,
+  0x10, 0x72, 0x2d, 0x84, 0x78, 0xf7, 0x97, 0x73, 0xda, 0xdb, 0x8c, 0xa5, 0xf6, 0x84, 0x22, 0xe6,
+  0x84, 0xf0, 0xfe, 0xd2, 0x2d, 0x20, 0x45, 0x78, 0x61, 0x48, 0xf1, 0xb4, 0x73, 0x61, 0x6d, 0xc6,
+  0xda, 0x5a, 0x61, 0x73, 0x20, 0x65, 0x6e, 0xc4, 0x83, 0xe3, 0xe1, 0x03, 0xdd, 0xb1, 0x75, 0x70,
+  0x64, 0xa5, 0xfc, 0x20, 0x72, 0x75, 0x3d, 0x12, 0x28, 0x1d, 0x89, 0xd4, 0xe9, 0x22, 0x61, 0x74,
+  0xda, 0x06, 0x31, 0x11, 0x73, 0x55, 0x03, 0x53, 0x83, 0x70, 0xe2, 0x01, 0x51, 0x83, 0x28, 0xe1,
+  0x07, 0x5f, 0x16, 0x26, 0x90, 0x07, 0x3d, 0x84, 0xe0, 0xec, 0xb2, 0x68, 0x61, 0x76, 0x06, 0xea,
+  0x02, 0x66, 0x89, 0xf9, 0xdb, 0xc3, 0x76, 0x65, 0x72, 0x79, 0x03, 0xed, 0xb1, 0x20, 0x6f, 0x6e,
+  0xb7, 0xf8, 0xa4, 0x20, 0x3c, 0xe4, 0xfe, 0x14, 0x2e, 0x27, 0x95, 0x4c, 0xa6, 0xe0, 0x00, 0xb9,
+  0x0e, 0x30, 0xab, 0x62, 0x79, 0xcd, 0xe8, 0x41, 0x6d, 0x61, 0x78, 0x42, 0x34, 0xb3, 0x53, 0x69,
+  0x7a, 0x50, 0xfb, 0x89, 0xca, 0xe8, 0x1b, 0x20, 0xe1, 0xb2, 0x69, 0x73, 0x20, 0xb3, 0xd4, 0x87,
+  0x9b, 0xcb, 0xb1, 0x64, 0x65, 0x70, 0xb5, 0xd6, 0xb3, 0x6e, 0x74, 0x2e, 0x92, 0xe0, 0x8e, 0x1b,
+  0xdd, 0xb3, 0x79, 0x6f, 0x75, 0x57, 0xe9, 0x99, 0x64, 0x24, 0xe3, 0x86, 0x15, 0xf7, 0x00, 0x66,
+  0x85, 0x9d, 0xfd, 0x9f, 0x2e, 0xd0, 0xfe, 0x04, 0xa7, 0x65, 0x6e, 0xab, 0xec, 0x8d, 0x26, 0xfe,
+  0xc0, 0x73, 0x20, 0x64, 0x6f, 0x85, 0xf6, 0x86, 0x00, 0xf7, 0x82, 0xe9, 0xeb, 0xc0, 0x79, 0x6e,
+  0x63, 0x68, 0x47, 0xe9, 0xa3, 0x69, 0x7a, 0xf3, 0xea, 0x84, 0x42, 0xe2, 0x8f, 0x97, 0xfe, 0x20,
+  0x8f, 0x9c, 0xfe, 0x0c, 0xe1, 0x5f, 0x41, 0x74, 0x20, 0x6c, 0x65, 0x01, 0xf7, 0x03, 0xe7, 0xc4,
+  0x20, 0x2b, 0x20, 0x38, 0x26, 0xf7, 0x9a, 0x2b, 0xcb, 0xfe, 0x0f, 0x29, 0x7f, 0x97, 0x6c, 0xe2,
+  0xfd, 0x0d, 0x87, 0x03, 0x54, 0xb2, 0x57, 0x68, 0x65, 0xa3, 0xeb, 0x83, 0x36, 0xf0, 0x8c, 0x74,
+  0xc8, 0x01, 0x68, 0x86, 0x63, 0xe3, 0x93, 0x2c, 0x45, 0xf5, 0x92, 0x74, 0x32, 0xde, 0xa2, 0x73,
+  0x74, 0x70, 0xd1, 0x33, 0x20, 0x6f, 0x66, 0xa9, 0x84, 0xdc, 0xf4, 0x89, 0x2a, 0xf5, 0x04, 0x99,
+  0x86, 0xad, 0xe0, 0x86, 0x5f, 0xe3, 0x84, 0x04, 0xfc, 0x91, 0x69, 0x51, 0xeb, 0x83, 0xc7, 0xf5,
+  0x8f, 0x26, 0xf8, 0x08, 0xaf, 0x28, 0x29, 0x62, 0xeb, 0x09, 0x85, 0xca, 0xf3, 0x8f, 0xab, 0xfa,
+  0x17, 0x8f, 0x90, 0xd2, 0x3b, 0x8f, 0x0d, 0xe7, 0x06, 0x0f, 0x6a, 0x3a, 0x8e, 0xde, 0xe6, 0x89,
+  0x72, 0xe3, 0x85, 0x79, 0xd8, 0x8f, 0x18, 0xfa, 0x02, 0xc2, 0x3a, 0x0a, 0x2a, 0x5f, 0xab, 0xfe,
+  0x81, 0xe8, 0xf3, 0x8f, 0xe9, 0xf9, 0x10, 0xc9, 0x77, 0x6f, 0x72, 0x6b, 0x46, 0xdd, 0x01, 0xd2,
+  0x83, 0xba, 0xe6, 0x95, 0x62, 0xf3, 0xe7, 0xaf, 0x6f, 0x66, 0x60, 0xfe, 0x04, 0x84, 0x58, 0xc7,
+  0x82, 0x52, 0xdd, 0x8d, 0xf1, 0xfe, 0x98, 0x78, 0xd1, 0xf3, 0x05, 0x7f, 0x95, 0x79, 0xda, 0xeb,
+  0xd0, 0x6e, 0x64, 0x2d, 0x61, 0x6c, 0x8f, 0xfc, 0x12, 0x2e, 0xea, 0x89, 0x24, 0xf3, 0xb3, 0x6e,
+  0x6f, 0x72, 0x80, 0xfa, 0x8f, 0x34, 0xf7, 0x0f, 0x9f, 0x2e, 0xe2, 0xfd, 0x09, 0x07, 0x00, 0x8f,
+  0x97, 0xd0, 0x3b, 0x8e, 0x65, 0xf8, 0x81, 0x89, 0xde, 0xa7, 0x72, 0x74, 0x66, 0xf8, 0x8f, 0xe2,
+  0xfd, 0x0c, 0x06, 0x6a, 0x8f, 0xe5, 0xe4, 0x1d, 0x0f, 0x85, 0x1a, 0x8f, 0x32, 0xd6, 0x1c, 0xc0,
+  0x4f, 0x62, 0x73, 0x6f, 0x63, 0xdf, 0x8f, 0xcb, 0xce, 0x22, 0x91, 0x2f, 0xf9, 0xcd, 0x00, 0x24,
+  0x82, 0x2a, 0xfc, 0xb1, 0x57, 0x61, 0x72, 0xbd, 0xcc, 0x23, 0x73, 0x20, 0xe7, 0x96, 0x53, 0x25,
+  0xe6, 0x45, 0x73, 0x65, 0x20, 0x77, 0xe4, 0xb1, 0x6d, 0x65, 0x73, 0xa9, 0xf4, 0x93, 0x73, 0x33,
+  0xe2, 0xc0, 0x70, 0x72, 0x6f, 0x62, 0x9f, 0xf9, 0x81, 0xdd, 0xfb, 0x83, 0xf1, 0xfb, 0x84, 0xde,
+  0xc9, 0xb7, 0x6c, 0x6c, 0x79, 0xec, 0xde, 0xa1, 0x74, 0x6f, 0x4e, 0xc5, 0x12, 0x61, 0xf5, 0x13,
+  0x68, 0xd3, 0x83, 0x58, 0xf8, 0x65, 0x2d, 0x57, 0x6e, 0x6f, 0x2d, 0x64, 0x80, 0x10, 0x64, 0xf5,
+  0xb3, 0x63, 0x6c, 0x61, 0x1d, 0xf0, 0x83, 0x32, 0xe2, 0xc3, 0x67, 0x63, 0x63, 0x0a, 0xc4, 0xdf,
+  0xb0, 0x5f, 0x43, 0x52, 0xd8, 0xd8, 0x91, 0x45, 0xd1, 0xc6, 0xc0, 0x5f, 0x4e, 0x4f, 0x5f, 0xe8,
+  0xc7, 0xd1, 0x4e, 0x49, 0x4e, 0x47, 0x53, 0x18, 0xf7, 0xe9, 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c,
+  0x81, 0xd7, 0x98, 0x2e, 0x02, 0xc8, 0x83, 0x84, 0xd9, 0x88, 0x6b, 0xf2, 0xb0, 0x44, 0x45, 0x50,
+  0x23, 0xc6, 0x35, 0x41, 0x54, 0x45, 0xbb, 0x81, 0x6b, 0xda, 0xe2, 0x42, 0x4c, 0x4f, 0x43, 0x4b,
+  0x2e, 0x69, 0xd5, 0x30, 0x69, 0x66, 0x6e, 0xd2, 0x0f, 0xd5, 0x0d, 0x34, 0x0a, 0x23, 0x20, 0xac,
+  0x0f, 0xd7, 0x1c, 0xb5, 0x47, 0x43, 0x43, 0xfc, 0xca, 0x81, 0x20, 0xc8, 0xe0, 0x47, 0x4e, 0x55,
+  0x43, 0x5f, 0x5f, 0x73, 0xf5, 0x83, 0xde, 0xca, 0x03, 0xef, 0x83, 0xca, 0xca, 0x31, 0x5f, 0x5f,
+  0x29, 0xc4, 0x4d, 0x69, 0x66, 0x20, 0x28, 0xc7, 0xd0, 0x3e, 0x3d, 0x20, 0x34, 0x30, 0x30, 0xd5,
+  0xa5, 0x7c, 0x7c, 0xd4, 0xc7, 0x81, 0xd5, 0xc7, 0x44, 0x6c, 0x61, 0x6e, 0x67, 0xcb, 0x0f, 0x64,
+  0x04, 0xa4, 0x44, 0x28, 0x44, 0xfe, 0x10, 0x29, 0x97, 0xa3, 0x61, 0x74, 0xbe, 0xc3, 0xd7, 0x65,
+  0x5f, 0x5f, 0x28, 0x28, 0x7d, 0xfe, 0x06, 0xdd, 0x12, 0x29, 0xb7, 0x2f, 0x65, 0x6c, 0x80, 0x05,
+  0x3f, 0x33, 0x30, 0x31, 0x96, 0x2d, 0x07, 0x9f, 0x07, 0x3b, 0x22, 0x4d, 0x53, 0x9b, 0x0f, 0xa6,
+  0x16, 0x81, 0xd1, 0xfd, 0x81, 0xf4, 0xdf, 0x0f, 0x40, 0x01, 0x05, 0xa2, 0x23, 0x73, 0x65, 0xb4,
+  0x84, 0x9b, 0xc6, 0x04, 0xe2, 0xa4, 0x28, 0x22, 0x59, 0xfe, 0xb7, 0x3a, 0x20, 0x59, 0x23, 0xc7,
+  0x87, 0xd3, 0xf6, 0x0c, 0x8c, 0x83, 0xcb, 0xc8, 0xb4, 0x68, 0x69, 0x73, 0xe8, 0xd4, 0x3f, 0x65,
+  0x72, 0x22, 0x5d, 0x12, 0x02, 0x7d, 0x82, 0x57, 0xc6, 0x84, 0x50, 0xc6, 0xbf, 0x20, 0x2f, 0x2a,
+  0xd2, 0xfd, 0x0d, 0x93, 0x20, 0x3f, 0xc7, 0x85, 0x2e, 0xfc, 0x8f, 0x8c, 0xd8, 0x04, 0x84, 0x60,
+  0xfc, 0x83, 0xf4, 0xf9, 0x07, 0xea, 0x83, 0x50, 0xc0, 0xc5, 0x6c, 0x61, 0x6e, 0x6e, 0x2c, 0xeb,
+  0xb5, 0x61, 0x72, 0x74, 0x4f, 0xc6, 0x88, 0x3f, 0xfc, 0x90, 0x62, 0xbd, 0xde, 0xe0, 0x31, 0x33,
+  0x31, 0x20, 0x61, 0x70, 0x43, 0xfc, 0xb2, 0x78, 0x69, 0x6d, 0xb9, 0xed, 0x8f, 0x28, 0xec, 0x02,
+  0x8b, 0x02, 0xf2, 0x8f, 0x7f, 0xd7, 0x1e, 0x8f, 0x19, 0xd9, 0x02, 0x84, 0x81, 0xcc, 0x82, 0xb4,
+  0xe3, 0x8f, 0x2e, 0xd7, 0x28, 0x03, 0xc1, 0x0f, 0x9c, 0x06, 0x81, 0xa7, 0xfb, 0x82, 0xb9, 0xd8,
+  0x0b, 0x41, 0x8f, 0xab, 0xd8, 0x26, 0x0f, 0x35, 0x13, 0x07, 0x8b, 0x0f, 0x99, 0x26, 0x0f, 0x1f,
+  0x18, 0x87, 0x63, 0xf7, 0x0d, 0x1f, 0x8f, 0xb0, 0xe6, 0x00, 0x86, 0x84, 0xea, 0x0f, 0x0f, 0x3e,
+  0x06, 0x7b, 0x0f, 0x89, 0x0c, 0x8f, 0xff, 0xfe, 0x32, 0x8b, 0xf0, 0xfc, 0xaf, 0x64, 0x65, 0xee,
+  0xfc, 0x18, 0xd2, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0xe9, 0xfc, 0x89, 0x41, 0xd8, 0x87, 0xd4, 0xfb,
+  0x81, 0x2d, 0xf5, 0x83, 0x93, 0xf1, 0xa2, 0x6e, 0x6f, 0xc1, 0xec, 0xc2, 0x65, 0x72, 0x20, 0x62,
+  0xeb, 0xe4, 0xb8, 0x64, 0x2e, 0x0a, 0x15, 0xf7, 0x82, 0x33, 0xe6, 0x87, 0xe0, 0xd0, 0x81, 0x05,
+  0xf5, 0x86, 0xdb, 0xd0, 0xb2, 0x61, 0x74, 0x69, 0x7d, 0xc4, 0x94, 0x79, 0xb1, 0xbc, 0xc5, 0x6c,
+  0x64, 0x65, 0x72, 0xbd, 0xc2, 0x96, 0x73, 0x1f, 0xf2, 0xb7, 0x5a, 0x34, 0x5f, 0xd0, 0xd9, 0x8c,
+  0x9d, 0xd3, 0x8f, 0x9d, 0xf7, 0x02, 0x0f, 0xc8, 0x03, 0x00, 0xf5, 0x81, 0xfd, 0xd4, 0x97, 0x6e,
+  0xe3, 0xfe, 0x0e, 0xb6, 0x8e, 0xbd, 0xf6, 0x81, 0x6a, 0xd9, 0x8c, 0xea, 0xfe, 0x82, 0xab, 0xdf,
+  0x91, 0x6f, 0xb3, 0xeb, 0x85, 0xdf, 0xf3, 0x95, 0x77, 0x62, 0xf8, 0xa3, 0x64, 0x3b, 0x29, 0xd9,
+  0x81, 0xfd, 0xfa, 0x82, 0x56, 0xf8, 0x02, 0x06, 0x85, 0xe5, 0xe1, 0xa1, 0x72, 0x65, 0x2a, 0xf8,
+  0x82, 0xd3, 0xfa, 0x02, 0xe3, 0xa6, 0x2e, 0x0a, 0xbd, 0xda, 0xa1, 0x68, 0x69, 0x94, 0xd2, 0x89,
+  0x54, 0xc8, 0x85, 0xd9, 0xdc, 0x83, 0xe8, 0xf3, 0x83, 0xbc, 0xf7, 0x08, 0x86, 0x83, 0x85, 0xfe,
+  0xa1, 0x69, 0x67, 0x66, 0xfb, 0x01, 0xd5, 0x81, 0x8e, 0xef, 0xa2, 0x74, 0x61, 0x0a, 0xc1, 0xb5,
+  0x6f, 0x6e, 0x65, 0x31, 0xfe, 0x00, 0xec, 0x8c, 0xc4, 0xfe, 0x8f, 0x8e, 0xf6, 0x15, 0x88, 0xc1,
+  0xfd, 0x07, 0xb5, 0x8f, 0xb1, 0xfe, 0x0f, 0x0f, 0xa3, 0x14, 0xaf, 0x69, 0x73, 0x56, 0xfd, 0x06,
+  0x8c, 0x43, 0xfa, 0x85, 0x6a, 0xdd, 0x8a, 0x58, 0xf4, 0x92, 0x3b, 0x30, 0xeb, 0x34, 0x6e, 0x65,
+  0x77, 0xe3, 0x8b, 0xdc, 0xc1, 0x94, 0x77, 0x35, 0xf2, 0x86, 0xc5, 0xf6, 0x01, 0xad, 0x8c, 0xa3,
+  0xf9, 0x11, 0x22, 0xbf, 0x8e, 0xd3, 0xe2, 0x95, 0x29, 0xb3, 0xe0, 0xb2, 0x22, 0x29, 0x20, 0x7e,
+  0xfb, 0x07, 0xdd, 0x85, 0x6a, 0xe7, 0x83, 0x98, 0xfc, 0x84, 0x69, 0xe7, 0x1f, 0x3b, 0xa9, 0x20,
+  0x82, 0xee, 0xeb, 0x88, 0x2e, 0xd3, 0x03, 0xdd, 0x87, 0x28, 0xd3, 0x0f, 0xac, 0x04, 0x89, 0xcf,
+  0xe0, 0x0e, 0xad, 0x03, 0xac, 0x07, 0xdd, 0x08, 0xad, 0x8b, 0xb8, 0xfa, 0x0f, 0x3f, 0x15, 0x8a,
+  0x8b, 0xe7, 0x0b, 0x96, 0x23, 0x20, 0x20, 0xbb, 0x03, 0xdd, 0x57, 0x6c, 0x69, 0x64, 0x65, 0x49,
+  0xb2, 0x8a, 0x4a, 0xfa, 0xaf, 0x29, 0x3b, 0x3a, 0xfe, 0x05, 0x8f, 0x89, 0xf2, 0x01, 0x8f, 0x60,
+  0xfe, 0x05, 0x8f, 0x33, 0xf3, 0x08, 0x0e, 0x67, 0x8f, 0x05, 0xf3, 0x05, 0x82, 0xae, 0xf9, 0xb0,
+  0x50, 0x72, 0x65, 0x61, 0xc0, 0xdf, 0x36, 0x34, 0x6b, 0x20, 0x28, 0xc5, 0xe4, 0x06, 0x8f, 0x05,
+  0xf3, 0x0e, 0x85, 0x02, 0xd5, 0x0f, 0x5a, 0x0e, 0x8e, 0x23, 0xf3, 0x0e, 0x5a, 0x0f, 0xd2, 0x02,
+  0x0f, 0x5a, 0x1c, 0x8e, 0xfc, 0xf0, 0x8f, 0x11, 0xbd, 0x0a, 0x95, 0x7d, 0x1c, 0xbd, 0x0f, 0x00,
+  0xee, 0x00, 0x00,
+};
+
+static unsigned char buf[18830];
+
+int main() {
+
+        unsigned long cksum = adler32(0, NULL, 0);
+
+        decompress_lzsa1(compressed, buf);
+        cksum = adler32(cksum, buf, 18830);
+
+        return cksum == 0xf748269d ? 0 : 1;
+}
diff --git a/test/val/lzsa2.c b/test/val/lzsa2.c
new file mode 100644
index 000000000..5babbb38c
--- /dev/null
+++ b/test/val/lzsa2.c
@@ -0,0 +1,438 @@
+/*
+  !!DESCRIPTION!! lzsa2 decompression
+  !!ORIGIN!!      cc65 regression tests
+  !!LICENCE!!     BSD 2-clause
+  !!AUTHOR!!      Colin Leroy-Mira
+*/
+
+#include <zlib.h>
+#include <stdio.h>
+#include <lzsa.h>
+
+/* The sample data is the original lz4.h, compressed with:
+ * lzsa -r -f 1 lz4.h lz4.lzsa1
+ *
+ * We reused lz4.h from the LZ4 test to have a matching adler32 sum.
+ */
+static const unsigned char compressed[] = {
+  0x19, 0xda, 0x2f, 0x2a, 0x0a, 0x20, 0x20, 0x20, 0x4c, 0x5a, 0x34, 0x20, 0x2d, 0x20, 0x46, 0x61, 
+  0x73, 0x74, 0x5a, 0xf8, 0x04, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 
+  0x6e, 0x20, 0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0xd9, 0x1a, 0x48, 0x65, 0x61, 
+  0x64, 0x65, 0x72, 0x20, 0x46, 0x69, 0x6c, 0x65, 0x81, 0x38, 0x43, 0x6f, 0x70, 0x79, 0x2a, 0x19, 
+  0x67, 0x68, 0x74, 0x20, 0x28, 0x43, 0x29, 0x20, 0x32, 0x30, 0x31, 0x31, 0x2d, 0xd4, 0x39, 0x35, 
+  0x2c, 0x20, 0x59, 0x61, 0x6e, 0x6e, 0x13, 0x5a, 0x6c, 0x6c, 0x65, 0x74, 0x2e, 0x0a, 0xd6, 0x38, 
+  0x00, 0x42, 0x53, 0x44, 0x39, 0xac, 0x2d, 0x43, 0x6c, 0x61, 0x75, 0x73, 0x65, 0x20, 0x4c, 0x69, 
+  0x63, 0x65, 0x6e, 0x18, 0x6f, 0x28, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x48, 0x2e, 
+  0xb6, 0x01, 0x60, 0x38, 0x6f, 0x75, 0x72, 0x3a, 0x00, 0x5c, 0x13, 0x72, 0x67, 0x2f, 0x6c, 0xdd, 
+  0x1d, 0x73, 0x2f, 0x62, 0x73, 0x64, 0x2d, 0x92, 0x5b, 0x2e, 0x70, 0x68, 0x70, 0x29, 0xb2, 0x5b, 
+  0x80, 0x52, 0x65, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x5d, 0x5a, 0x6e, 0x64, 
+  0x20, 0xa8, 0x08, 0x69, 0xa7, 0x44, 0xbd, 0x23, 0x08, 0x62, 0x89, 0x59, 0x61, 0x72, 0x79, 0x20, 
+  0x66, 0x6f, 0x72, 0x6d, 0x73, 0x2c, 0x20, 0x77, 0x3d, 0x08, 0x20, 0xac, 0x23, 0x48, 0x6f, 0xc9, 
+  0x42, 0xba, 0xf0, 0x6d, 0x6f, 0x48, 0x66, 0x75, 0x4a, 0x61, 0xbc, 0x50, 0x2c, 0x20, 0xd4, 0xf8, 
+  0x10, 0x65, 0x20, 0x70, 0x65, 0x20, 0x48, 0x74, 0xa2, 0x20, 0xb2, 0x19, 0x72, 0x6f, 0x76, 0x69, 
+  0x64, 0xb0, 0x30, 0x74, 0x68, 0x01, 0xd2, 0x20, 0x49, 0x66, 0x32, 0x50, 0x6f, 0x77, 0x9d, 0x69, 
+  0x67, 0xe2, 0x48, 0x6e, 0x81, 0x42, 0xcb, 0xea, 0x73, 0x43, 0xb6, 0x40, 0x19, 0xe9, 0x3a, 0x04, 
+  0xf6, 0x4f, 0x2a, 0x61, 0x48, 0x73, 0x89, 0x4e, 0x66, 0x68, 0x48, 0x63, 0x8d, 0x00, 0xd2, 0x71, 
+  0x6d, 0x75, 0x9a, 0x68, 0x72, 0xe6, 0x48, 0x61, 0x50, 0x43, 0xa6, 0x50, 0x61, 0x62, 0x94, 0x01, 
+  0x65, 0xb4, 0x43, 0x65, 0x79, 0x00, 0x6e, 0x6f, 0x74, 0xdc, 0x09, 0x2c, 0x48, 0x69, 0xc1, 0x49, 
+  0x6c, 0x14, 0x41, 0xbc, 0x47, 0x88, 0x4b, 0x20, 0x47, 0x6b, 0x6f, 0x61, 0xef, 0x50, 0x63, 0x6c, 
+  0xae, 0x48, 0x6d, 0x3e, 0x4f, 0x2e, 0x77, 0x02, 0x77, 0x69, 0x6e, 0xea, 0x3f, 0x46, 0x77, 0x41, 
+  0x14, 0x51, 0x64, 0x75, 0x63, 0x46, 0x74, 0x63, 0x25, 0xee, 0x63, 0x47, 0x74, 0x25, 0x62, 0x99, 
+  0x45, 0x1a, 0x38, 0x17, 0x64, 0x6f, 0x63, 0x75, 0x48, 0x6e, 0x0a, 0x66, 0x4d, 0x69, 0x2f, 0x72, 
+  0x29, 0x6f, 0x3d, 0x20, 0x28, 0x6d, 0x6d, 0x20, 0x7f, 0x10, 0x69, 0x61, 0x6c, 0x73, 0x89, 0x64, 
+  0x51, 0x00, 0x13, 0x43, 0x75, 0x67, 0x14, 0x84, 0xfb, 0xb2, 0x39, 0x54, 0x48, 0x49, 0x53, 0x20, 
+  0x53, 0x4f, 0x46, 0x54, 0x57, 0x41, 0x52, 0x45, 0x20, 0xa8, 0x19, 0x50, 0x52, 0x4f, 0x56, 0x49, 
+  0x44, 0x45, 0x44, 0x20, 0x42, 0x59, 0x16, 0x00, 0x38, 0xa4, 0x43, 0x4f, 0x50, 0x59, 0x52, 0x49, 
+  0x47, 0x48, 0x54, 0x20, 0x48, 0x4f, 0x4c, 0x39, 0x35, 0x52, 0x53, 0x20, 0x41, 0x4e, 0x44, 0xf0, 
+  0x4e, 0x54, 0x18, 0x17, 0x42, 0x55, 0x54, 0x4f, 0x42, 0xb9, 0x59, 0x02, 0x22, 0x41, 0x53, 0xc3, 
+  0x2a, 0x22, 0x21, 0x06, 0x40, 0xc6, 0x50, 0x45, 0x58, 0xb8, 0x30, 0x45, 0x53, 0x00, 0x04, 0x00, 
+  0x59, 0x12, 0x4d, 0x50, 0x4c, 0x49, 0xb0, 0x41, 0x9f, 0x08, 0x52, 0x10, 0x54, 0x49, 0x46, 0x28, 
+  0x2c, 0x38, 0x2d, 0x4e, 0x43, 0x4c, 0x55, 0x44, 0x08, 0x47, 0xa1, 0x41, 0xbc, 0xbb, 0x20, 0x4e, 
+  0x4f, 0x54, 0xfa, 0xc6, 0x40, 0xd5, 0x51, 0x49, 0x54, 0xd6, 0x40, 0xab, 0x4a, 0x2c, 0x85, 0x47, 
+  0xc6, 0x48, 0x20, 0x57, 0x50, 0x20, 0x4d, 0x7c, 0x11, 0x43, 0x48, 0x80, 0x38, 0x41, 0x42, 0x49, 
+  0x1b, 0x53, 0x54, 0x59, 0x71, 0x08, 0x46, 0x4a, 0x4e, 0x91, 0x48, 0x46, 0x71, 0x42, 0x2b, 0xf8, 
+  0x7a, 0x41, 0x20, 0x50, 0x41, 0x52, 0x54, 0x49, 0x43, 0x55, 0x4c, 0x00, 0x5a, 0x46, 0x55, 0x52, 
+  0x50, 0x4f, 0x53, 0x45, 0x20, 0x20, 0x48, 0x44, 0x5c, 0x28, 0x43, 0x50, 0x49, 0x4d, 0x21, 0x49, 
+  0x2e, 0x7c, 0x41, 0x88, 0x40, 0x57, 0x50, 0x56, 0x45, 0xb5, 0x50, 0x20, 0x53, 0xaf, 0x57, 0x4c, 
+  0x4c, 0x11, 0x44, 0x43, 0x6f, 0x50, 0x4f, 0x57, 0xaa, 0x49, 0x52, 0x3c, 0x47, 0x11, 0x60, 0xe7, 
+  0x49, 0x45, 0x56, 0x40, 0x82, 0x52, 0x4c, 0x45, 0x91, 0x43, 0x12, 0x50, 0x44, 0x49, 0x13, 0x52, 
+  0x43, 0x54, 0x29, 0x27, 0xb1, 0x69, 0x43, 0xbb, 0x41, 0x5b, 0x72, 0x4c, 0x2c, 0x9a, 0x30, 0x53, 
+  0x50, 0x0a, 0x29, 0x49, 0x61, 0xe8, 0x68, 0x45, 0xf1, 0x41, 0x6a, 0x55, 0x59, 0x2c, 0xa9, 0x40, 
+  0x67, 0x51, 0x51, 0x55, 0x7e, 0x01, 0x13, 0x59, 0x20, 0x44, 0x41, 0x4d, 0x41, 0x47, 0x1c, 0x6f, 
+  0x28, 0xe2, 0xf2, 0x09, 0x62, 0x5b, 0x50, 0x43, 0x55, 0x8c, 0x49, 0x4d, 0x44, 0x62, 0xed, 0x18, 
+  0x53, 0x55, 0x42, 0x53, 0x54, 0x10, 0x08, 0x55, 0x7b, 0x26, 0x20, 0x47, 0x4f, 0x4f, 0x44, 0x89, 
+  0x68, 0x53, 0x55, 0x68, 0x56, 0xfe, 0x60, 0x93, 0x48, 0x3b, 0x53, 0x73, 0x4f, 0x53, 0xc7, 0x08, 
+  0x55, 0x43, 0x73, 0x70, 0x44, 0x41, 0xc4, 0x42, 0x81, 0x62, 0x15, 0x61, 0xc7, 0x32, 0x53, 0x3b, 
+  0xa1, 0x28, 0x42, 0x6b, 0x49, 0xbd, 0x20, 0xd4, 0x70, 0x54, 0x45, 0x57, 0xf0, 0x55, 0x50, 0x40, 
+  0x63, 0x69, 0x29, 0x0c, 0x69, 0x57, 0xde, 0x61, 0xff, 0x49, 0x41, 0xc2, 0x6b, 0x44, 0x05, 0x00, 
+  0x62, 0x1e, 0x84, 0xf4, 0xc4, 0x50, 0x45, 0x4f, 0x36, 0x62, 0x6c, 0x75, 0x4c, 0x49, 0x72, 0x60, 
+  0x47, 0xe8, 0x57, 0x20, 0x61, 0xca, 0xf4, 0x49, 0x4e, 0x6a, 0x41, 0xe7, 0x28, 0x53, 0xc0, 0xe8, 
+  0x49, 0x47, 0xd9, 0x44, 0x02, 0x61, 0xb3, 0x62, 0x09, 0x47, 0x10, 0x20, 0x68, 0x20, 0x3b, 0x08, 
+  0x47, 0x30, 0x47, 0x45, 0x8c, 0x4a, 0x45, 0x3d, 0x4a, 0x4f, 0xb7, 0x70, 0x57, 0x49, 0x44, 0x69, 
+  0x29, 0x43, 0x00, 0x42, 0xdf, 0x4b, 0x49, 0x83, 0x81, 0xff, 0xb4, 0x41, 0x89, 0x4a, 0x55, 0x04, 
+  0x62, 0x4b, 0x42, 0x26, 0x63, 0x51, 0x8f, 0x46, 0x31, 0x5e, 0x6b, 0x2c, 0x22, 0x40, 0xcc, 0xe8, 
+  0x46, 0x51, 0x44, 0x56, 0xb9, 0x4e, 0x44, 0xd0, 0x69, 0x50, 0xee, 0x4c, 0x49, 0x4f, 0x64, 0xc1, 
+  0x75, 0x43, 0x48, 0x82, 0xa4, 0x9d, 0x9a, 0x4e, 0x59, 0x6f, 0x75, 0x20, 0x63, 0x61, 0x6e, 0x61, 
+  0x80, 0xed, 0xa5, 0xf4, 0x63, 0x74, 0x28, 0x75, 0xa1, 0xfe, 0x99, 0x81, 0x3d, 0x4a, 0x3a, 0x94, 
+  0xaa, 0x2d, 0xee, 0x18, 0xa6, 0xdc, 0xf9, 0x5e, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 
+  0xb2, 0x3a, 0x20, 0x76, 0xa9, 0x73, 0xee, 0x75, 0xa9, 0x67, 0xe1, 0x99, 0x0d, 0x75, 0x62, 0x2e, 
+  0xff, 0x5f, 0xa1, 0x2f, 0x43, 0x79, 0x61, 0x6e, 0x34, 0x39, 0x37, 0x33, 0x2f, 0x6c, 0x7a, 0x34, 
+  0xc3, 0x28, 0x70, 0x1e, 0xa1, 0x64, 0xa2, 0xe3, 0xaa, 0x57, 0x75, 0x6d, 0xc8, 0x48, 0x72, 0xab, 
+  0x00, 0xb4, 0x5b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0xc1, 0x43, 0xde, 0x3b, 0x0c, 0x2f, 
+  0x23, 0x21, 0x42, 0xbc, 0xb8, 0xae, 0x63, 0x0a, 0x2a, 0x2f, 0x0a, 0x23, 0x70, 0x72, 0x61, 0x67, 
+  0x6d, 0x61, 0x20, 0x8e, 0xf9, 0xa5, 0x63, 0x65, 0x0a, 0x0a, 0x23, 0x69, 0x66, 0x20, 0x64, 0x65, 
+  0x66, 0x69, 0x6e, 0x3a, 0x28, 0x5f, 0x5f, 0x63, 0x70, 0x6c, 0x75, 0x73, 0xe1, 0x99, 0x29, 0x0a, 
+  0x65, 0x78, 0xe8, 0xed, 0xb9, 0x6e, 0x20, 0x22, 0x43, 0x22, 0x20, 0x7b, 0x0a, 0x23, 0x65, 0x6e, 
+  0xed, 0x56, 0x92, 0x0a, 0x0a, 0x55, 0x51, 0x2a, 0x20, 0xb5, 0xb6, 0x2e, 0x68, 0xe4, 0x5f, 0x9f, 
+  0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0xd4, 0x4e, 0x50, 0x66, 0x75, 0xa3, 0xa3, 0xed, 0x61, 
+  0x8b, 0x2c, 0xf8, 0x40, 0x2d, 0x08, 0x76, 0x35, 0x01, 0x7b, 0x60, 0x6c, 0x6c, 0x20, 0x62, 0x75, 
+  0x66, 0x66, 0x65, 0x72, 0xde, 0xf8, 0x72, 0x6f, 0x6c, 0x4a, 0x6f, 0xb9, 0x48, 0x67, 0x6e, 0xac, 
+  0x6d, 0xe1, 0xc9, 0x68, 0x2a, 0x8a, 0x40, 0x70, 0x69, 0x79, 0xb9, 0x40, 0x70, 0x32, 0x65, 0x64, 
+  0x30, 0x67, 0x65, 0xb1, 0x20, 0x8a, 0x74, 0xd0, 0xa6, 0x41, 0x71, 0x39, 0x2d, 0x6f, 0x70, 0x90, 
+  0x40, 0x01, 0x4f, 0x65, 0x92, 0x41, 0x49, 0x08, 0x64, 0x09, 0x48, 0x61, 0x44, 0x01, 0x20, 0x26, 
+  0x41, 0x8b, 0x73, 0x6e, 0x67, 0x9e, 0x49, 0x66, 0xad, 0x12, 0x65, 0x20, 0x87, 0xd0, 0x9f, 0x51, 
+  0x29, 0x2c, 0xa0, 0x42, 0x70, 0x63, 0x5c, 0x74, 0x6c, 0x65, 0x60, 0x60, 0xb5, 0x92, 0x62, 0x72, 
+  0xd3, 0x5b, 0x09, 0x68, 0x41, 0xa8, 0x91, 0x69, 0x74, 0xdd, 0xd3, 0x91, 0x77, 0x6e, 0xb0, 0x69, 
+  0x6d, 0x69, 0x48, 0x2c, 0x62, 0x20, 0x6d, 0x48, 0x61, 0x9b, 0x82, 0x24, 0x42, 0x0a, 0x43, 0xaa, 
+  0x51, 0x2e, 0x68, 0x73, 0xb1, 0x73, 0x74, 0xdf, 0x78, 0x69, 0x2e, 0xb0, 0x62, 0xec, 0x07, 0xff, 
+  0x0d, 0x70, 0x0a, 0x2a, 0x01, 0x48, 0x56, 0x42, 0x62, 0xe0, 0x4f, 0x0a, 0xce, 0x0d, 0x62, 0x54, 
+  0x64, 0x65, 0x42, 0x2e, 0xb1, 0x5f, 0x56, 0xef, 0xbc, 0xa1, 0xa4, 0x99, 0x1f, 0x5f, 0x4d, 0x41, 
+  0x4a, 0x1c, 0x01, 0xfd, 0x0a, 0x31, 0xb2, 0x2f, 0x2a, 0xdd, 0xa1, 0x50, 0x20, 0x62, 0x01, 0x51, 
+  0x61, 0x6b, 0x04, 0x64, 0xd9, 0x92, 0x66, 0x61, 0x17, 0x41, 0x2e, 0x69, 0x67, 0x62, 0x4f, 0x20, 
+  0xb8, 0xf2, 0x00, 0xf4, 0x49, 0x4e, 0xef, 0x37, 0x80, 0xf3, 0xf9, 0xe8, 0x77, 0x68, 0x6e, 0xd4, 
+  0x4e, 0x2d, 0xaf, 0x4f, 0x29, 0xae, 0x70, 0x61, 0x70, 0x84, 0xb1, 0x69, 0x6c, 0xde, 0x87, 0x61, 
+  0x0b, 0x47, 0x62, 0xff, 0x45, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, 0xf1, 0x74, 0x77, 0x71, 
+  0x73, 0x2c, 0x03, 0x50, 0x67, 0x2d, 0xce, 0x11, 0x78, 0x65, 0xa5, 0x21, 0x9a, 0x4d, 0x64, 0x65, 
+  0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6e, 0x47, 0xb2, 0xf1, 0x00, 0x99, 0x4e, 0x55, 0x4d, 0x42, 0xe9, 
+  0xba, 0x4f, 0x28, 0x00, 0x3a, 0x1e, 0x2a, 0x31, 0x30, 0x30, 0x57, 0x20, 0x2b, 0x2b, 0xa3, 0x04, 
+  0x47, 0x68, 0xb3, 0x51, 0x29, 0x0a, 0x31, 0x03, 0x6c, 0x76, 0x75, 0x7f, 0xbf, 0x4e, 0x75, 0x6d, 
+  0x62, 0x65, 0x72, 0x20, 0x28, 0x76, 0x6f, 0x69, 0x64, 0x29, 0x3b, 0x33, 0x15, 0x7a, 0x0f, 0x54, 
+  0x75, 0x6e, 0x8e, 0x92, 0x70, 0x61, 0xeb, 0x61, 0x8a, 0x67, 0x2a, 0xff, 0x10, 0xa4, 0xbb, 0x63, 
+  0x2c, 0xb8, 0x0e, 0x4d, 0x45, 0x4d, 0xbc, 0xf0, 0x59, 0x5f, 0xa1, 0xe5, 0x3f, 0x32, 0x20, 0x3a, 
+  0x8b, 0x4d, 0xfc, 0x88, 0xa1, 0xb4, 0x68, 0x61, 0x44, 0xa3, 0xcd, 0xc7, 0x79, 0x75, 0x6c, 0x61, 
+  0x20, 0x3a, 0x20, 0x4e, 0x2d, 0x3e, 0x32, 0x5e, 0x4e, 0x20, 0x42, 0x79, 0x74, 0x2e, 0x99, 0x2f, 
+  0x28, 0x65, 0x78, 0x61, 0x6d, 0x67, 0x09, 0x73, 0x32, 0x68, 0x31, 0xfe, 0x00, 0x20, 0xd0, 0x18, 
+  0x4b, 0x42, 0x3b, 0xaa, 0xea, 0x32, 0xe8, 0x34, 0x29, 0x20, 0xea, 0x36, 0x32, 0x36, 0x34, 0x42, 
+  0x4c, 0x32, 0xdd, 0xe9, 0x4d, 0xbb, 0x65, 0x74, 0x63, 0x2e, 0x29, 0xff, 0x9a, 0x91, 0x6e, 0x63, 
+  0xce, 0xea, 0x73, 0x4f, 0x6d, 0x8e, 0x3c, 0xb2, 0x69, 0x6d, 0x89, 0x97, 0x65, 0x73, 0xb4, 0x80, 
+  0xaa, 0x72, 0xcc, 0x60, 0xab, 0x0a, 0xaa, 0x82, 0xc4, 0x5a, 0x4f, 0x64, 0xcd, 0xa2, 0xff, 0xb3, 
+  0x45, 0xc9, 0xa3, 0x90, 0x00, 0x0c, 0x60, 0x18, 0x91, 0x64, 0x75, 0x35, 0x29, 0x6f, 0x3c, 0x89, 
+  0x63, 0x8a, 0xa9, 0x65, 0xfa, 0x0f, 0x52, 0x63, 0x74, 0x24, 0x08, 0x44, 0x59, 0x5c, 0x61, 0x75, 
+  0x6c, 0x74, 0x20, 0x76, 0x61, 0x6c, 0xdf, 0xa1, 0xa9, 0x5a, 0x0b, 0x31, 0x34, 0x2c, 0x1c, 0x41, 
+  0x52, 0x91, 0x4b, 0x42, 0xe0, 0x50, 0x68, 0x69, 0xd0, 0x91, 0x20, 0x6e, 0xbb, 0x66, 0x89, 0x6c, 
+  0xcc, 0xa2, 0xf7, 0x77, 0x61, 0x54, 0x49, 0x6f, 0x55, 0x08, 0x74, 0x5c, 0x4f, 0x20, 0x78, 0x38, 
+  0x36, 0x20, 0x4c, 0x31, 0xad, 0x8f, 0x0a, 0x2d, 0x28, 0x67, 0xb9, 0x41, 0xab, 0x6f, 0x0a, 0x39, 
+  0xfe, 0x15, 0x72, 0x53, 0x69, 0xb4, 0x96, 0x20, 0x46, 0x4d, 0x67, 0x39, 0xff, 0x11, 0x87, 0xb5, 
+  0x0f, 0x66, 0xd4, 0x54, 0x5f, 0x64, 0x1f, 0x51, 0x28, 0x63, 0xb9, 0xaa, 0x74, 0x7f, 0xb5, 0x72, 
+  0x2a, 0xb9, 0xf1, 0x2d, 0x2c, 0xa1, 0xe4, 0xd1, 0x52, 0x74, 0x2c, 0x28, 0x25, 0x40, 0x83, 0x34, 
+  0x7a, 0x65, 0x81, 0x19, 0x6d, 0x61, 0x78, 0x44, 0x17, 0x02, 0x56, 0x29, 0x3b, 0xa5, 0x41, 0xae, 
+  0x47, 0xa3, 0x0f, 0x60, 0x93, 0xe8, 0x66, 0x47, 0xa5, 0x0c, 0xa7, 0xe2, 0xe4, 0x47, 0xa1, 0x63, 
+  0x07, 0x5f, 0x84, 0x11, 0x4f, 0x0a, 0x3e, 0xcd, 0x8c, 0x29, 0x52, 0x56, 0x20, 0x43, 0xce, 0x60, 
+  0x53, 0x4f, 0x27, 0x4e, 0x10, 0x9b, 0x27, 0x20, 0x62, 0xf0, 0x77, 0x10, 0x66, 0x72, 0xa5, 0xe0, 
+  0x2e, 0x06, 0x4a, 0x27, 0xc9, 0x64, 0x47, 0x91, 0x61, 0x6c, 0xec, 0x6b, 0x31, 0x64, 0x79, 0x81, 
+  0xdb, 0xe0, 0xaa, 0x61, 0x2d, 0x4a, 0x27, 0x01, 0x4d, 0x27, 0xce, 0xa3, 0xb5, 0x6c, 0x41, 0x01, 
+  0x20, 0x47, 0x05, 0x2a, 0x56, 0x27, 0x2e, 0x89, 0x86, 0x02, 0x82, 0xff, 0xd8, 0xb1, 0x67, 0x75, 
+  0x9c, 0x95, 0x6e, 0x74, 0xd1, 0xed, 0x1a, 0x73, 0x75, 0x63, 0x63, 0xa5, 0x57, 0x69, 0x66, 0xc5, 
+  0x7f, 0x04, 0x20, 0x3e, 0x3d, 0x71, 0x70, 0x42, 0x6f, 0x2d, 0x77, 0x64, 0x28, 0x98, 0x15, 0x4c, 
+  0x29, 0xa4, 0x51, 0x49, 0x74, 0x6e, 0x20, 0x30, 0x20, 0x72, 0x1f, 0x41, 0x3e, 0xb1, 0x61, 0x73, 
+  0x46, 0x69, 0x2c, 0xb5, 0xa1, 0xea, 0x06, 0x89, 0x27, 0xb2, 0x00, 0x4b, 0x62, 0x8e, 0xa1, 0xda, 
+  0x82, 0xad, 0x86, 0x60, 0xd7, 0x8a, 0x74, 0xaf, 0x45, 0xc8, 0x8b, 0x66, 0xad, 0x7b, 0x86, 0x25, 
+  0xa2, 0xd1, 0x17, 0x77, 0x6e, 0x6f, 0x93, 0x67, 0xff, 0x0d, 0x45, 0x03, 0x89, 0x20, 0xc0, 0x82, 
+  0xd4, 0xa2, 0x57, 0x6d, 0x69, 0x06, 0x50, 0x64, 0x67, 0xac, 0xa3, 0xcf, 0xb2, 0xa7, 0x9e, 0x42, 
+  0x20, 0xb1, 0x6f, 0x70, 0xe0, 0xad, 0x49, 0x69, 0x87, 0x71, 0x64, 0x69, 0xd5, 0xbb, 0x6c, 0x79, 
+  0x2a, 0xd5, 0xc6, 0x47, 0x8e, 0x41, 0xd2, 0x61, 0x64, 0x62, 0xef, 0x70, 0x7a, 0x65, 0x86, 0x44, 
+  0x6a, 0x4a, 0x41, 0x4c, 0x82, 0xf2, 0x90, 0x99, 0x65, 0x71, 0x75, 0x65, 0x6e, 0xfc, 0x97, 0x65, 
+  0x9b, 0x83, 0x7c, 0x00, 0x7f, 0x43, 0xd2, 0xb3, 0x6e, 0x6f, 0x8c, 0x74, 0x69, 0x64, 0xa3, 0x89, 
+  0x54, 0xa1, 0x2e, 0x47, 0xab, 0xa9, 0x6e, 0xea, 0x7a, 0xa1, 0x6c, 0x72, 0x72, 0x69, 0x2f, 0xa1, 
+  0xaa, 0x69, 0xa9, 0x73, 0x8c, 0x67, 0x57, 0x5f, 0xa0, 0x5c, 0xe9, 0x6e, 0x62, 0x34, 0x26, 0x0a, 
+  0x46, 0x14, 0x44, 0xde, 0x87, 0x10, 0x2f, 0x87, 0x2a, 0x2e, 0x89, 0x20, 0x4a, 0x68, 0x4d, 0x62, 
+  0x61, 0x52, 0x70, 0x70, 0x70, 0xf6, 0x62, 0x02, 0xa6, 0xfe, 0x09, 0x84, 0x06, 0x5e, 0xbf, 0x41, 
+  0x58, 0x5f, 0x49, 0x4e, 0x50, 0x55, 0x54, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0xbf, 0xa7, 0xf9, 
+  0x3c, 0x94, 0x20, 0x3a, 0xcd, 0xb2, 0x6f, 0x72, 0xea, 0x9c, 0x89, 0x74, 0x62, 0x84, 0xfe, 0xd0, 
+  0x55, 0x6f, 0x66, 0x67, 0x46, 0x15, 0x8b, 0x28, 0xc6, 0xa4, 0xaf, 0x2b, 0x97, 0x62, 0x65, 0x88, 
+  0x9a, 0x4e, 0x29, 0xa2, 0xa2, 0x0d, 0xf0, 0x75, 0x72, 0x6b, 0x3a, 0xa8, 0xac, 0x6e, 0xef, 0x05, 
+  0x94, 0x6f, 0x66, 0x32, 0x63, 0xfc, 0x61, 0xcd, 0x63, 0x40, 0x47, 0x9e, 0x7e, 0x60, 0xda, 0x48, 
+  0x63, 0xde, 0xf0, 0x73, 0x61, 0x81, 0x65, 0x52, 0x3c, 0x3d, 0x5a, 0x68, 0x4f, 0xd5, 0x53, 0x70, 
+  0x75, 0x58, 0x46, 0xa1, 0x06, 0xff, 0x61, 0xd3, 0x89, 0x30, 0x63, 0xa7, 0xc5, 0xef, 0xbf, 0x3f, 
+  0x61, 0x69, 0x6c, 0x73, 0x0a, 0x0a, 0x2d, 0xaf, 0xa6, 0x95, 0xa7, 0xf6, 0x4a, 0x00, 0x55, 0x61, 
+  0x18, 0x43, 0x59, 0x01, 0x30, 0x63, 0x69, 0x53, 0x63, 0xf4, 0x66, 0xff, 0x02, 0x47, 0xcf, 0x2c, 
+  0xa4, 0x7e, 0x61, 0x22, 0x66, 0xbf, 0x47, 0xb4, 0xee, 0x46, 0xc1, 0x83, 0x79, 0x94, 0x69, 0x6e, 
+  0x9f, 0xf8, 0x66, 0x1b, 0x67, 0xbb, 0x07, 0x77, 0x2e, 0x0a, 0xbf, 0xf2, 0x09, 0x4f, 0x64, 0x88, 
+  0x63, 0xba, 0x47, 0x98, 0xa7, 0x67, 0xb5, 0x47, 0x50, 0x7a, 0x67, 0xaf, 0x4f, 0x49, 0x50, 0xbf, 
+  0x86, 0x28, 0x68, 0x6c, 0x6c, 0x89, 0x67, 0xda, 0x9c, 0x00, 0x5b, 0x1d, 0x75, 0x67, 0x68, 0x2c, 
+  0x7e, 0xaa, 0x64, 0x6b, 0x70, 0x77, 0x69, 0xd3, 0xa3, 0xf8, 0xaa, 0x83, 0x78, 0x6b, 0x6f, 0x54, 
+  0x01, 0xa8, 0x48, 0x20, 0x7f, 0x68, 0x72, 0x61, 0x84, 0xfc, 0x5f, 0x27, 0x28, 0x3c, 0x30, 0x29, 
+  0x2e, 0x96, 0x62, 0xda, 0xa6, 0xbd, 0x62, 0x71, 0x73, 0x74, 0xfd, 0x6a, 0x6d, 0xc5, 0xa9, 0x64, 
+  0x21, 0x8a, 0x63, 0xf8, 0x3d, 0xe8, 0x6d, 0x82, 0x33, 0x81, 0xdf, 0x1c, 0xa7, 0x66, 0x42, 0x47, 
+  0x91, 0x46, 0x7e, 0x42, 0x88, 0x66, 0xd2, 0xa9, 0x61, 0xff, 0x9b, 0x49, 0x67, 0x43, 0xb5, 0x76, 
+  0x65, 0x3d, 0x47, 0x89, 0x2f, 0xa7, 0x6f, 0x99, 0xab, 0x69, 0x7c, 0x45, 0x8f, 0x48, 0x61, 0xc8, 
+  0x82, 0xbe, 0x94, 0xa7, 0xcd, 0x0c, 0xa9, 0x76, 0x23, 0xa1, 0x8c, 0xfc, 0x40, 0x38, 0x10, 0x78, 
+  0x70, 0x81, 0xbd, 0x54, 0x82, 0xb4, 0x5a, 0x0b, 0x63, 0x6c, 0x75, 0x0c, 0x42, 0x63, 0x50, 0x69, 
+  0x63, 0xbe, 0xb4, 0x75, 0x73, 0xee, 0x5f, 0x47, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x1d, 
+  0xaf, 0x74, 0xfc, 0x0e, 0x65, 0xdd, 0xa7, 0xf8, 0x0e, 0x47, 0xdf, 0x10, 0x37, 0x69, 0x6e, 0x1b, 
+  0x82, 0x08, 0xa7, 0xdf, 0x9b, 0x16, 0x99, 0x2c, 0x41, 0x64, 0x76, 0x61, 0x6e, 0xc5, 0xa7, 0xdf, 
+  0x99, 0x1a, 0xa6, 0xde, 0x17, 0x87, 0xca, 0x61, 0x5e, 0x53, 0x49, 0x5a, 0x45, 0x2c, 0x1b, 0x2f, 
+  0x30, 0x78, 0x37, 0x45, 0x30, 0xa4, 0xbc, 0xef, 0xa0, 0xf8, 0xf8, 0x6d, 0x31, 0x31, 0x33, 0x20, 
+  0x39, 0x32, 0x39, 0x20, 0x32, 0x85, 0x55, 0x47, 0xb7, 0x60, 0x9b, 0x43, 0x4f, 0x4d, 0x85, 0x97, 
+  0xba, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x28, 0x69, 0x73, 0xf9, 0x39, 0x81, 0xae, 0x89, 0x28, 0xda, 
+  0xec, 0xb1, 0x69, 0x67, 0xf4, 0x2e, 0x29, 0x61, 0xf7, 0x3e, 0x20, 0x47, 0x7e, 0xaf, 0xa9, 0x3f, 
+  0x15, 0x56, 0x3a, 0x20, 0xd3, 0xe8, 0x2b, 0x05, 0xa1, 0x3a, 0x2f, 0x32, 0x35, 0x35, 0x8d, 0x40, 
+  0x80, 0xab, 0x29, 0x9b, 0x87, 0xd9, 0x68, 0xa6, 0xda, 0x9e, 0xac, 0x50, 0xba, 0xa3, 0xfc, 0x14, 
+  0x82, 0xfb, 0xb1, 0x69, 0x6d, 0xa7, 0x2a, 0x42, 0xbc, 0x83, 0x08, 0x42, 0x53, 0x87, 0x63, 0xf4, 
+  0x41, 0xde, 0x6e, 0x79, 0x54, 0x8a, 0x69, 0xfc, 0xa6, 0x70, 0x22, 0x77, 0x56, 0x82, 0x94, 0xf8, 
+  0x17, 0x61, 0x73, 0x65, 0x22, 0xa1, 0x2b, 0x81, 0xef, 0x5c, 0x48, 0x6f, 0x6f, 0x63, 0x52, 0x84, 
+  0xf8, 0x87, 0xd3, 0x5b, 0xa9, 0x69, 0xaf, 0xc5, 0x97, 0x29, 0x0a, 0x8c, 0xee, 0x93, 0x69, 0x6d, 
+  0x20, 0xa2, 0x7a, 0x38, 0xa1, 0x55, 0x82, 0xab, 0xf1, 0x84, 0xe4, 0xa6, 0xd9, 0x3e, 0x43, 0xd6, 
+  0x40, 0xa9, 0x89, 0x72, 0x4c, 0x82, 0xbf, 0x7b, 0xa7, 0x6c, 0xad, 0xaf, 0x73, 0x9a, 0x12, 0x7f, 
+  0x4d, 0x61, 0x63, 0x72, 0x6f, 0x95, 0xad, 0x49, 0x29, 0x94, 0xa4, 0x80, 0xa6, 0x7d, 0x20, 0x42, 
+  0x97, 0x43, 0x5f, 0x53, 0x69, 0x6c, 0xb3, 0x08, 0x2d, 0xa9, 0x6d, 0xfb, 0x2e, 0x82, 0xdb, 0x44, 
+  0xa3, 0xb1, 0x28, 0x73, 0x99, 0xb3, 0x4f, 0x6b, 0x74, 0x43, 0xc7, 0xa4, 0xbc, 0xf5, 0x46, 0x8a, 
+  0x48, 0x4e, 0x14, 0x65, 0xc8, 0x87, 0x2a, 0xe6, 0x05, 0xa6, 0xdb, 0x07, 0x81, 0x8c, 0xb3, 0x65, 
+  0x6e, 0xc3, 0x6b, 0x47, 0x3d, 0x61, 0xf1, 0x87, 0xce, 0xb4, 0xb7, 0x72, 0x63, 0xe5, 0x0f, 0x63, 
+  0x99, 0x86, 0xdc, 0x12, 0xef, 0x6d, 0x87, 0xfa, 0x48, 0x87, 0xd8, 0x71, 0x66, 0x08, 0x65, 0x26, 
+  0x43, 0x7b, 0x67, 0x21, 0xfd, 0x03, 0x87, 0x90, 0xac, 0xaa, 0x2c, 0xf2, 0x64, 0x0b, 0x46, 0x3e, 
+  0xbd, 0x0e, 0x74, 0x6f, 0x6f, 0xe2, 0x48, 0x28, 0x32, 0x47, 0x7a, 0xa8, 0x89, 0x29, 0xf3, 0x82, 
+  0xba, 0x3d, 0x47, 0x18, 0x21, 0x5b, 0x45, 0x25, 0x87, 0xd9, 0xeb, 0x61, 0xc2, 0x87, 0xdc, 0x19, 
+  0xaa, 0x53, 0x96, 0x00, 0x7e, 0x67, 0x8d, 0xa2, 0xac, 0x0a, 0x6b, 0x74, 0x4a, 0xb3, 0x77, 0x73, 
+  0x42, 0x68, 0x65, 0x52, 0xab, 0x63, 0xe9, 0x74, 0x68, 0x22, 0x2a, 0x09, 0x63, 0x6b, 0x72, 0x33, 
+  0x69, 0x22, 0x6e, 0xa9, 0x63, 0x8c, 0xf6, 0x86, 0x5d, 0x4c, 0x65, 0x44, 0xab, 0x72, 0x83, 0xbc, 
+  0x47, 0xd7, 0x64, 0xa7, 0xa3, 0xea, 0x80, 0x65, 0x3b, 0x02, 0xa7, 0x51, 0xdc, 0x46, 0x90, 0xb4, 
+  0x73, 0x6f, 0x95, 0x21, 0x41, 0x51, 0x44, 0xba, 0xa7, 0xad, 0x3b, 0x85, 0xf6, 0xa4, 0xc5, 0x0e, 
+  0xb1, 0x74, 0x72, 0xae, 0x70, 0x2d, 0x6f, 0x01, 0x29, 0x2e, 0x78, 0xa2, 0x40, 0x82, 0xc9, 0xbb, 
+  0xa3, 0x89, 0x91, 0x74, 0x75, 0xe5, 0xf5, 0x85, 0x47, 0x89, 0x65, 0xab, 0x33, 0x83, 0x85, 0x42, 
+  0xbe, 0x74, 0x76, 0x65, 0x20, 0x84, 0x5d, 0x5b, 0x83, 0x8e, 0x8a, 0x72, 0xdc, 0x7e, 0x81, 0xe2, 
+  0x79, 0x1a, 0x2b, 0x7e, 0x33, 0x25, 0x84, 0xa4, 0xf5, 0xa5, 0xc9, 0x5c, 0x4f, 0x6e, 0x3e, 0x83, 
+  0xc0, 0x39, 0xbf, 0x22, 0x31, 0x22, 0xd0, 0x66, 0x65, 0xbb, 0x40, 0x5f, 0x51, 0x67, 0x75, 0x06, 
+  0x67, 0xb3, 0xec, 0x63, 0xe3, 0x6a, 0x56, 0xff, 0x8a, 0x73, 0x79, 0x8c, 0x30, 0xd7, 0x18, 0x8b, 
+  0x62, 0xb6, 0xb2, 0x6c, 0x61, 0xe9, 0xa0, 0x50, 0x62, 0x79, 0x91, 0xb1, 0x43, 0x43, 0x7b, 0xb2, 
+  0x52, 0x41, 0x75, 0x76, 0xb9, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0xf8, 0xbb, 0xb3, 
+  0x65, 0x65, 0x48, 0xb5, 0x63, 0x29, 0xaa, 0x96, 0xa3, 0x7f, 0x8e, 0x2e, 0xf8, 0xfb, 0x67, 0x21, 
+  0x8f, 0x20, 0xaf, 0x3a, 0x25, 0x06, 0x74, 0x67, 0x45, 0xa1, 0x9f, 0xa0, 0x87, 0xb5, 0xd7, 0x89, 
+  0x5f, 0x94, 0x91, 0x53, 0x74, 0xaf, 0xdd, 0x87, 0xac, 0x47, 0x87, 0xae, 0xc5, 0x40, 0xaa, 0xaa, 
+  0x6a, 0x44, 0x20, 0xed, 0xa4, 0x9c, 0x8c, 0x20, 0x7a, 0x5a, 0x81, 0x9d, 0x87, 0xa2, 0x98, 0x86, 
+  0x9f, 0x2d, 0x71, 0x73, 0x70, 0xed, 0x63, 0x74, 0x81, 0xa7, 0x47, 0xb1, 0x5d, 0x4a, 0x73, 0x92, 
+  0x64, 0x62, 0x94, 0x55, 0x73, 0xed, 0x82, 0xad, 0x74, 0x55, 0x6f, 0x66, 0x79, 0x42, 0xca, 0xb1, 
+  0x6b, 0x6e, 0x97, 0x29, 0x68, 0xeb, 0x70, 0x6d, 0x75, 0xfb, 0x45, 0xac, 0x86, 0x9b, 0xa7, 0xc1, 
+  0xe8, 0xea, 0x2c, 0x82, 0x46, 0x00, 0x06, 0x82, 0x7d, 0xbc, 0x49, 0x20, 0x9d, 0x94, 0x38, 0x2d, 
+  0x86, 0x8a, 0x62, 0xab, 0x79, 0x81, 0xc6, 0xa2, 0x9f, 0x47, 0x44, 0x49, 0x4b, 0x6d, 0xd6, 0x42, 
+  0x9b, 0x70, 0x79, 0x70, 0x77, 0x42, 0x44, 0x8f, 0x29, 0x09, 0x0e, 0xb5, 0x6e, 0x2c, 0xe7, 0x43, 
+  0xb9, 0xa9, 0x61, 0xa8, 0x89, 0x82, 0x66, 0x4c, 0x2a, 0x4f, 0x49, 0x27, 0x69, 0x67, 0xea, 0xc7, 
+  0x66, 0x39, 0x47, 0x37, 0x85, 0x82, 0x29, 0x06, 0x67, 0x8a, 0xe2, 0x57, 0x20, 0x28, 0x9c, 0x77, 
+  0x2c, 0x20, 0x08, 0xfe, 0x09, 0x86, 0xe2, 0x67, 0x09, 0xf1, 0x24, 0x4c, 0x64, 0xd1, 0x67, 0x0e, 
+  0xb2, 0x52, 0x65, 0x87, 0x6e, 0xac, 0x65, 0x6c, 0x70, 0x6f, 0x67, 0xe8, 0x89, 0x2c, 0xf7, 0x34, 
+  0x46, 0x13, 0x64, 0x12, 0x6b, 0x73, 0x76, 0xa3, 0x10, 0x02, 0x9d, 0x94, 0x70, 0x6f, 0x2f, 0x83, 
+  0x9a, 0x79, 0x87, 0x6d, 0x79, 0x87, 0x79, 0xfa, 0x03, 0x87, 0xc2, 0x59, 0x87, 0x79, 0x1e, 0x8a, 
+  0x74, 0x8f, 0x8f, 0x74, 0x90, 0x76, 0xa7, 0xab, 0xd3, 0xb3, 0x65, 0x69, 0x4d, 0xd2, 0x46, 0x3a, 
+  0xa5, 0x4a, 0xa1, 0x48, 0xad, 0x08, 0x69, 0x46, 0x7e, 0xa7, 0xa0, 0x85, 0x43, 0x81, 0x46, 0x9a, 
+  0x93, 0x69, 0x66, 0x9b, 0x9f, 0x87, 0x50, 0x5a, 0x8d, 0x0a, 0xd1, 0x89, 0x66, 0xb9, 0x52, 0xa7, 
+  0xe3, 0x39, 0x45, 0x9d, 0x92, 0x6c, 0x65, 0xf6, 0xa3, 0x3f, 0xc8, 0x47, 0x03, 0x0f, 0x87, 0xb1, 
+  0x30, 0x8f, 0x2a, 0x81, 0xa0, 0x50, 0x50, 0x74, 0x14, 0x8e, 0x3a, 0xe3, 0xd6, 0xa5, 0x8d, 0xa4, 
+  0x66, 0xa3, 0xa9, 0x69, 0x2b, 0x62, 0xed, 0x84, 0xf0, 0x1a, 0xbe, 0x61, 0x6e, 0x79, 0xaa, 0xf6, 
+  0x41, 0x1b, 0xab, 0x65, 0x0e, 0x67, 0xa4, 0x62, 0x57, 0x74, 0x6f, 0x54, 0x43, 0x92, 0x27, 0xfe, 
+  0xbf, 0x08, 0x4e, 0x65, 0x77, 0x19, 0x1a, 0xa7, 0xc3, 0x69, 0x95, 0x6f, 0x6c, 0xf4, 0xaf, 0x2e, 
+  0xd9, 0xf7, 0xb7, 0x4e, 0x62, 0xab, 0x73, 0xa7, 0xae, 0x7a, 0x67, 0x4f, 0x0a, 0xa7, 0x79, 0xfe, 
+  0x16, 0x86, 0x0d, 0x87, 0xfb, 0x70, 0xa7, 0x8f, 0x9e, 0x0e, 0x05, 0x36, 0x66, 0xa2, 0x23, 0x47, 
+  0x72, 0x6e, 0x87, 0x14, 0x3d, 0xb7, 0x64, 0x65, 0xc7, 0xd2, 0xa9, 0x6f, 0x47, 0x89, 0x69, 0xea, 
+  0x44, 0xa7, 0x5c, 0x55, 0x26, 0x84, 0x28, 0x9e, 0x62, 0x76, 0x8a, 0x66, 0xb6, 0xb7, 0x75, 0x6e, 
+  0xa1, 0xa3, 0xa3, 0x8a, 0xc8, 0xa7, 0x70, 0xf1, 0x09, 0x67, 0x3f, 0x87, 0xa3, 0x2a, 0xa6, 0xa3, 
+  0x79, 0xb5, 0x69, 0x6e, 0x05, 0x81, 0xba, 0xbf, 0x94, 0x64, 0x73, 0x30, 0x47, 0x9e, 0x6a, 0xaf, 
+  0x29, 0xe2, 0xfa, 0x6d, 0xaf, 0x44, 0x04, 0x89, 0x87, 0x5b, 0xfd, 0x02, 0xa2, 0x3e, 0x6b, 0x73, 
+  0xe2, 0x47, 0xdc, 0x1c, 0xa0, 0xa3, 0xf4, 0x69, 0x6e, 0x81, 0x77, 0xd0, 0x66, 0x8d, 0x87, 0x3a, 
+  0x2b, 0x84, 0xc6, 0xea, 0x6e, 0xaf, 0x3a, 0xa5, 0x75, 0x01, 0xbd, 0x82, 0xa8, 0x85, 0x4d, 0xa6, 
+  0x85, 0xfe, 0xa7, 0xe3, 0x30, 0x8a, 0x66, 0x84, 0x65, 0x8a, 0x72, 0x6c, 0x41, 0xd9, 0x44, 0x05, 
+  0x87, 0x47, 0x67, 0x47, 0x33, 0x4b, 0x93, 0x49, 0x74, 0x02, 0xa1, 0x1c, 0xe8, 0x8f, 0x74, 0x44, 
+  0x1c, 0x81, 0x90, 0x87, 0x8c, 0xe9, 0x47, 0xc6, 0x40, 0xba, 0x48, 0x6f, 0x77, 0xed, 0xe0, 0x8a, 
+  0x2c, 0xeb, 0x9c, 0x09, 0x64, 0x6f, 0x65, 0x04, 0x86, 0xdf, 0xd7, 0xa1, 0x47, 0x84, 0x99, 0xcd, 
+  0x44, 0x4a, 0x86, 0xcc, 0x00, 0xd7, 0x20, 0xe9, 0x6e, 0xa3, 0xdf, 0xe2, 0xa5, 0x08, 0x45, 0x6a, 
+  0x66, 0x42, 0x8f, 0x28, 0x90, 0xcc, 0xa4, 0xa5, 0x20, 0x47, 0x8b, 0xaa, 0x55, 0xe3, 0x71, 0x67, 
+  0xef, 0x83, 0x1e, 0xb7, 0x51, 0x72, 0x75, 0x47, 0x89, 0x64, 0x0b, 0xe8, 0x76, 0x00, 0x65, 0xa3, 
+  0x42, 0x00, 0xc4, 0x41, 0x9f, 0x4b, 0x28, 0xa7, 0x74, 0x74, 0x6f, 0x1b, 0xa3, 0x5e, 0x86, 0x66, 
+  0xdd, 0x4e, 0x61, 0xca, 0xa5, 0xf2, 0x8e, 0x29, 0xcc, 0x89, 0x45, 0x06, 0x87, 0x87, 0xf6, 0x1b, 
+  0x66, 0x37, 0x87, 0x37, 0x2a, 0x67, 0xba, 0x8d, 0x5f, 0x7b, 0xc7, 0x86, 0x54, 0x67, 0x20, 0x61, 
+  0x47, 0xd2, 0xb7, 0x20, 0x61, 0x88, 0xb1, 0x87, 0x61, 0x60, 0xa7, 0x65, 0xc9, 0xa8, 0x27, 0xe0, 
+  0x81, 0xea, 0x74, 0x83, 0x80, 0x87, 0x64, 0x09, 0x87, 0x89, 0x0c, 0x87, 0xde, 0x96, 0xa7, 0x6a, 
+  0x73, 0x86, 0xd7, 0x91, 0xa7, 0x10, 0x3c, 0x8b, 0x74, 0xcb, 0x96, 0x74, 0x6f, 0x8d, 0xa6, 0xa7, 
+  0xf3, 0x33, 0xa3, 0xf7, 0x64, 0x11, 0x69, 0x73, 0xdb, 0x23, 0xcd, 0x86, 0x3d, 0x84, 0x70, 0x65, 
+  0x44, 0x54, 0x09, 0x68, 0x91, 0x62, 0x65, 0x7b, 0x2a, 0x8a, 0x72, 0x3f, 0x86, 0xc5, 0x51, 0xaa, 
+  0x72, 0x37, 0x83, 0x06, 0x4c, 0x8f, 0x65, 0x79, 0x3a, 0xa2, 0x86, 0xa7, 0x8f, 0x18, 0x0f, 0xa1, 
+  0x60, 0xe1, 0x85, 0xa9, 0xa7, 0x8f, 0x1b, 0x28, 0xac, 0x4e, 0xfb, 0x86, 0xe9, 0x74, 0x45, 0x96, 
+  0xa6, 0x7c, 0x4f, 0x3c, 0x2f, 0xb7, 0xc9, 0x73, 0xdd, 0xc4, 0xb7, 0x6c, 0x64, 0xff, 0xcf, 0x87, 
+  0x83, 0x1c, 0x42, 0xc2, 0xaa, 0x73, 0x99, 0x83, 0x6f, 0x64, 0x07, 0x33, 0x9e, 0x41, 0x6c, 0x77, 
+  0x61, 0x79, 0x73, 0x2d, 0x80, 0x87, 0x07, 0x8d, 0x81, 0x08, 0x46, 0x21, 0x87, 0x7f, 0xe4, 0x7b, 
+  0xa7, 0x8e, 0x45, 0xaf, 0x66, 0x86, 0x42, 0x42, 0xa0, 0x45, 0xd5, 0xa6, 0x88, 0x3c, 0x46, 0xd6, 
+  0xa7, 0x39, 0x5e, 0x84, 0x6f, 0x87, 0xd1, 0x9b, 0x87, 0x79, 0x87, 0x87, 0x7d, 0xab, 0xa7, 0xd4, 
+  0xbd, 0xa7, 0xfe, 0x8d, 0x87, 0x4f, 0x55, 0x22, 0x67, 0x0c, 0x34, 0x87, 0x3f, 0xf4, 0x07, 0xa7, 
+  0x16, 0x44, 0xa7, 0x0d, 0xf4, 0x13, 0x63, 0x42, 0x61, 0x76, 0x87, 0x97, 0x33, 0x87, 0xfe, 0xb7, 
+  0x87, 0x5c, 0xf0, 0x1c, 0x81, 0x4c, 0xba, 0x09, 0x45, 0x41, 0x4d, 0x9e, 0x18, 0x8c, 0x5f, 0x55, 
+  0x36, 0x34, 0x20, 0x28, 0x28, 0x31, 0x20, 0x3c, 0x3c, 0xa7, 0x37, 0x11, 0x9a, 0x07, 0x2d, 0x33, 
+  0x29, 0xcf, 0x57, 0x34, 0x29, 0xc3, 0xea, 0x63, 0x01, 0x4f, 0x28, 0xaf, 0x94, 0x2a, 0x20, 0xa0, 
+  0x56, 0x59, 0x28, 0x6c, 0x6f, 0x3f, 0x02, 0xd2, 0x97, 0x29, 0x29, 0xad, 0x26, 0x84, 0x4a, 0xab, 
+  0x5f, 0x3f, 0x8f, 0x92, 0x69, 0x6e, 0x6e, 0xa4, 0x84, 0x47, 0x21, 0x91, 0x75, 0x63, 0x5a, 0x02, 
+  0xa3, 0xef, 0x20, 0xa8, 0xa2, 0xae, 0x84, 0xd6, 0x86, 0x85, 0x18, 0x4b, 0x2e, 0xcf, 0xaa, 0x6d, 
+  0x5f, 0x54, 0x69, 0x61, 0x26, 0x69, 0x3a, 0x8b, 0xb3, 0x69, 0x74, 0x6a, 0x47, 0xc5, 0x24, 0x86, 
+  0xab, 0x8c, 0x62, 0xc7, 0x6c, 0x91, 0x66, 0x69, 0x84, 0xa3, 0x1d, 0xe4, 0x49, 0x21, 0x81, 0xa6, 
+  0xbc, 0xb7, 0x6f, 0x6e, 0xa4, 0x73, 0xb1, 0x64, 0x69, 0x46, 0xad, 0x08, 0x74, 0x82, 0x52, 0x7f, 
+  0x47, 0xb5, 0xac, 0x69, 0x1a, 0x18, 0x08, 0x61, 0xa3, 0xaa, 0x73, 0xa4, 0xf8, 0xa1, 0x41, 0xd0, 
+  0xb5, 0x6e, 0x6b, 0x3d, 0x42, 0xae, 0xa6, 0x60, 0x68, 0x47, 0xd4, 0xa4, 0xa1, 0x07, 0xa2, 0x4b, 
+  0xa1, 0x07, 0xed, 0x00, 0xa2, 0x40, 0x4f, 0xbf, 0x44, 0x4c, 0x4c, 0x14, 0x59, 0xb1, 0x62, 0x65, 
+  0x67, 0xdf, 0x42, 0x56, 0x44, 0x0e, 0xa3, 0xcb, 0xa9, 0x65, 0x01, 0x7c, 0xb7, 0x64, 0x73, 0x49, 
+  0x02, 0x83, 0xbf, 0xa1, 0xad, 0x83, 0x69, 0x65, 0x49, 0x65, 0xe7, 0x73, 0x20, 0x7b, 0xb5, 0x04, 
+  0x8a, 0x74, 0x09, 0x9d, 0x6f, 0x5b, 0x33, 0x7f, 0x14, 0x5d, 0x3b, 0x20, 0x7d, 0x9b, 0x77, 0x3b, 
+  0x0a, 0x86, 0x26, 0x00, 0x81, 0x3f, 0xd0, 0x84, 0xa5, 0x01, 0x6d, 0xa7, 0xc2, 0x9b, 0xa4, 0x8e, 
+  0x8a, 0x69, 0x51, 0x78, 0x67, 0xe1, 0x47, 0xb1, 0x41, 0x67, 0x5b, 0x43, 0x5e, 0x82, 0x17, 0x6c, 
+  0x47, 0xa6, 0x57, 0x20, 0x28, 0x80, 0x3b, 0x6d, 0x2a, 0x43, 0x81, 0x7b, 0x4f, 0x29, 0x74, 0x42, 
+  0xa2, 0x22, 0x54, 0x74, 0x65, 0xcd, 0x84, 0x80, 0xdb, 0x66, 0x6f, 0xa2, 0x6f, 0x63, 0x24, 0x89, 
+  0x69, 0x58, 0xd1, 0x0a, 0x7a, 0x47, 0x7d, 0xed, 0x46, 0xb5, 0xe8, 0x66, 0x46, 0xb7, 0x00, 0x63, 
+  0x99, 0xaa, 0x73, 0x00, 0xda, 0xa5, 0xde, 0xa4, 0x0d, 0x4c, 0x82, 0xf7, 0x85, 0xf3, 0xe2, 0xca, 
+  0x78, 0xd8, 0xd7, 0x64, 0x69, 0x74, 0x20, 0x28, 0x58, 0x6f, 0x29, 0x60, 0x42, 0xd6, 0x20, 0xb1, 
+  0x66, 0x6d, 0x82, 0xa4, 0xae, 0x68, 0xc7, 0xf9, 0x20, 0x86, 0xf9, 0xf4, 0x45, 0x7a, 0x62, 0x57, 
+  0xa2, 0xeb, 0x6b, 0x79, 0x05, 0x41, 0x91, 0xa2, 0x3e, 0x81, 0x94, 0x74, 0x75, 0x57, 0x92, 0x6f, 
+  0x66, 0x56, 0x03, 0x83, 0x06, 0x43, 0x8e, 0x84, 0x0a, 0x0f, 0x22, 0x67, 0xac, 0x64, 0x41, 0x1a, 
+  0x64, 0x0e, 0x07, 0x39, 0x67, 0xd9, 0xa7, 0x93, 0xd4, 0x07, 0xf1, 0x66, 0xfe, 0x67, 0x82, 0xf3, 
+  0x15, 0x9a, 0x6c, 0x6f, 0x61, 0x64, 0x44, 0x69, 0x1f, 0x0b, 0x87, 0xf9, 0xe3, 0x42, 0xdf, 0x56, 
+  0x20, 0x61, 0x13, 0x12, 0x64, 0x69, 0xc2, 0xd6, 0xd5, 0x83, 0x1f, 0x0e, 0x46, 0x41, 0xa6, 0x6b, 
+  0xab, 0x41, 0xc5, 0x21, 0xb7, 0x65, 0x76, 0x25, 0x0a, 0xa5, 0x34, 0x83, 0x03, 0xe0, 0x92, 0x67, 
+  0x6f, 0x4c, 0xac, 0x2c, 0xc1, 0x7d, 0x4f, 0x27, 0xb6, 0x4b, 0x27, 0xdb, 0xc1, 0xd7, 0x1c, 0xea, 
+  0x6d, 0x00, 0xe3, 0x67, 0x51, 0x48, 0x4c, 0x61, 0x84, 0x43, 0x5d, 0xa6, 0xb0, 0x82, 0x37, 0x50, 
+  0xac, 0x73, 0x5c, 0xa1, 0x41, 0x17, 0xa3, 0x16, 0xa5, 0xa3, 0x6f, 0x47, 0x64, 0x8d, 0x73, 0x15, 
+  0x54, 0xa4, 0xae, 0xa7, 0x38, 0xec, 0x81, 0xe0, 0x14, 0x91, 0x4b, 0x42, 0xa3, 0x84, 0x64, 0xaa, 
+  0x67, 0xf8, 0x67, 0xc9, 0xf8, 0x01, 0x87, 0x93, 0x42, 0x67, 0xf8, 0x83, 0xd8, 0xe3, 0x22, 0x84, 
+  0x68, 0x7e, 0x66, 0xa3, 0x87, 0x3c, 0xac, 0x41, 0xc0, 0x81, 0x83, 0x8b, 0x75, 0xf1, 0x52, 0x86, 
+  0x53, 0x86, 0xa2, 0x1c, 0xa6, 0xfd, 0xa9, 0x27, 0x67, 0x48, 0x94, 0x27, 0x2c, 0xcc, 0x63, 0xbf, 
+  0xa4, 0xa3, 0xeb, 0x66, 0xac, 0xb7, 0x6c, 0x79, 0xb5, 0x83, 0x61, 0xf3, 0x6f, 0x73, 0x69, 0x96, 
+  0x74, 0x6f, 0x00, 0x1d, 0xa7, 0xe7, 0x9e, 0xa3, 0xc7, 0xef, 0x49, 0x24, 0x6f, 0x50, 0x54, 0x46, 
+  0xb0, 0xaa, 0x72, 0x60, 0xdc, 0x9d, 0x73, 0x75, 0x6d, 0x19, 0x3c, 0x6d, 0x74, 0x3d, 0x42, 0xb4, 
+  0x41, 0x5c, 0xc4, 0xd4, 0xbf, 0xae, 0x6e, 0x63, 0xa4, 0xe8, 0xb0, 0x91, 0x27, 0x64, 0xef, 0x87, 
+  0xaf, 0x0c, 0x09, 0xc5, 0xda, 0xca, 0x83, 0x02, 0xbf, 0xa4, 0xc7, 0x87, 0x5f, 0x43, 0x06, 0x61, 
+  0x8c, 0xa7, 0x1f, 0xa2, 0x0b, 0x83, 0xc1, 0xbb, 0xa7, 0xdc, 0x31, 0x45, 0x99, 0x82, 0xb3, 0x24, 
+  0x2a, 0x97, 0x69, 0x66, 0x14, 0x71, 0xa6, 0xed, 0x94, 0x66, 0x69, 0x84, 0x04, 0x47, 0x3f, 0x84, 
+  0xf1, 0xc1, 0x87, 0x0a, 0x91, 0x44, 0x97, 0x86, 0x1c, 0xa5, 0x21, 0x5e, 0x61, 0x80, 0x84, 0x1c, 
+  0x87, 0xf3, 0xb1, 0x67, 0x06, 0xef, 0x87, 0xa3, 0xf0, 0x0f, 0x41, 0x01, 0xa7, 0x7b, 0x00, 0xa5, 
+  0x7c, 0x22, 0x60, 0xa7, 0x7f, 0x56, 0x87, 0x46, 0xff, 0x00, 0xa7, 0x21, 0x51, 0xfe, 0x73, 0x61, 
+  0x76, 0x65, 0x97, 0x49, 0x66, 0xfd, 0xb8, 0x67, 0x03, 0x21, 0xa5, 0x7d, 0x67, 0x98, 0x5f, 0xa6, 
+  0x66, 0x91, 0x61, 0x76, 0x1e, 0xe6, 0xc3, 0xd9, 0x2e, 0xb7, 0x61, 0x74, 0xa9, 0x24, 0xae, 0x20, 
+  0x8f, 0x42, 0x9c, 0x42, 0x90, 0x6e, 0x20, 0xac, 0x09, 0x61, 0x86, 0x62, 0xb1, 0xa3, 0x10, 0x53, 
+  0x20, 0x28, 0x23, 0x03, 0x6f, 0x6b, 0x42, 0x99, 0xa2, 0x7f, 0xa5, 0xbd, 0xad, 0xa3, 0xa0, 0x68, 
+  0x64, 0xfd, 0xe8, 0x27, 0xc6, 0xd8, 0xb2, 0x82, 0x6f, 0x93, 0xa7, 0x66, 0x30, 0xa2, 0x17, 0x71, 
+  0x61, 0x66, 0x22, 0x92, 0x77, 0x61, 0x8d, 0xfb, 0xa7, 0x8d, 0x1e, 0x87, 0x6c, 0x40, 0x97, 0x73, 
+  0x20, 0x67, 0x03, 0x83, 0xe1, 0x42, 0x51, 0x4a, 0x2c, 0xa2, 0x62, 0x0f, 0x87, 0x82, 0x5d, 0x46, 
+  0xa2, 0x67, 0x57, 0xee, 0x97, 0x28, 0x29, 0xa6, 0x3e, 0x43, 0x2a, 0x8f, 0x64, 0xa0, 0x7e, 0x87, 
+  0xa1, 0xfe, 0x01, 0x87, 0xf3, 0x11, 0xae, 0x2c, 0x9f, 0xa4, 0x2e, 0x33, 0x86, 0x8f, 0x67, 0x66, 
+  0x0e, 0x87, 0x8f, 0xf7, 0x07, 0x67, 0xcf, 0x87, 0xe8, 0x95, 0x62, 0x16, 0x87, 0xbf, 0xac, 0x25, 
+  0x81, 0xab, 0x16, 0x87, 0xaa, 0xfb, 0x2c, 0x41, 0x29, 0x87, 0xa8, 0xa1, 0x38, 0x44, 0x45, 0x43, 
+  0x4f, 0xeb, 0x87, 0xa2, 0x0f, 0x57, 0x20, 0x34, 0xdc, 0x03, 0x86, 0xb3, 0xbb, 0x27, 0x7b, 0x87, 
+  0xb5, 0x92, 0x86, 0x09, 0x8f, 0x20, 0xb2, 0xac, 0xa7, 0xc9, 0xdf, 0x46, 0xda, 0xa7, 0xc8, 0xd6, 
+  0x47, 0x61, 0x7c, 0xa7, 0xd0, 0xe8, 0x8b, 0x44, 0xe7, 0xa1, 0xcb, 0xca, 0x84, 0x51, 0x27, 0x38, 
+  0x87, 0xbf, 0x4b, 0x1e, 0x87, 0xbf, 0x57, 0x03, 0x85, 0x4c, 0xd8, 0x63, 0xe5, 0xa5, 0xbe, 0x46, 
+  0x7a, 0x8c, 0x20, 0x25, 0x22, 0x21, 0x97, 0x28, 0x29, 0xbd, 0x31, 0x87, 0xcf, 0x27, 0x0c, 0x86, 
+  0xb2, 0x88, 0x61, 0x12, 0x81, 0x00, 0xc5, 0xd8, 0x4a, 0x97, 0x6f, 0x66, 0xbc, 0x82, 0x84, 0xbc, 
+  0x67, 0x87, 0x2d, 0xf2, 0x2a, 0x66, 0xba, 0x86, 0xda, 0x41, 0x05, 0x46, 0xbc, 0xaf, 0x2e, 0xc9, 
+  0x01, 0x46, 0x10, 0x87, 0xbf, 0xfb, 0x11, 0x46, 0x9f, 0x87, 0xbe, 0xf5, 0x47, 0xab, 0x5b, 0x87, 
+  0xef, 0xe9, 0x77, 0x2f, 0x0a, 0x0b, 0x47, 0x67, 0xe4, 0x87, 0x5d, 0x4f, 0x07, 0x6d, 0x47, 0x8c, 
+  0x4f, 0x28, 0xa4, 0xd6, 0x26, 0xa7, 0xe0, 0x55, 0x67, 0x0a, 0xbb, 0xa7, 0x68, 0xf5, 0x03, 0x44, 
+  0x13, 0x84, 0x05, 0x84, 0x56, 0x18, 0xa4, 0x81, 0xa7, 0xc2, 0x62, 0x63, 0xa1, 0xcc, 0x53, 0xd9, 
+  0xec, 0xa7, 0xce, 0xc3, 0xb1, 0x20, 0x28, 0x33, 0x37, 0xc6, 0xd7, 0x0c, 0xa4, 0x30, 0x41, 0x7d, 
+  0xaf, 0x29, 0xc5, 0xac, 0xaa, 0x31, 0xd0, 0xc4, 0x9f, 0x4f, 0x4b, 0x2c, 0xea, 0x3a, 0x47, 0x4b, 
+  0xae, 0x47, 0x0e, 0x27, 0x67, 0xa7, 0xcf, 0xb5, 0x15, 0xaf, 0x2a, 0xe2, 0x6b, 0xa6, 0x7b, 0xe6, 
+  0xa3, 0x69, 0xa6, 0x60, 0x5f, 0x67, 0xe3, 0x45, 0x26, 0x87, 0x75, 0xd7, 0x42, 0x0a, 0xa9, 0x6d, 
+  0x6f, 0x56, 0x89, 0x69, 0x01, 0xa6, 0xc2, 0xcf, 0xa9, 0x69, 0x2f, 0xae, 0x73, 0x96, 0xa8, 0x8a, 
+  0x22, 0x91, 0xa5, 0x3c, 0xa0, 0xaf, 0x50, 0x99, 0x07, 0x86, 0xc7, 0x46, 0xcd, 0x8a, 0x2a, 0xcd, 
+  0x2c, 0xaf, 0x2a, 0xf6, 0xc0, 0xfe, 0x74, 0x68, 0x65, 0xa6, 0x7a, 0x95, 0x66, 0x65, 0x81, 0xf1, 
+  0xa7, 0x84, 0x58, 0xa1, 0x3b, 0xaa, 0x6a, 0x70, 0x3d, 0x86, 0x80, 0x00, 0xfa, 0x85, 0x70, 0x87, 
+  0xa2, 0xe5, 0x69, 0x72, 0x4e, 0x85, 0xc1, 0x78, 0xcf, 0x73, 0xdb, 0xda, 0x87, 0x56, 0xb1, 0xa5, 
+  0x42, 0x22, 0x65, 0xf0, 0x9b, 0x2d, 0x20, 0x45, 0x78, 0x61, 0x94, 0x48, 0x62, 0x2e, 0x63, 0x13, 
+  0x62, 0x30, 0x57, 0x65, 0x6e, 0xc4, 0x84, 0x1f, 0xe3, 0x44, 0xdd, 0x40, 0x79, 0xaa, 0x64, 0xa5, 
+  0x51, 0x72, 0x75, 0x3d, 0x6b, 0x28, 0xea, 0x87, 0x53, 0xd4, 0x00, 0x22, 0x44, 0xb7, 0x46, 0x31, 
+  0x4a, 0x73, 0x55, 0x44, 0x53, 0xa4, 0x70, 0x42, 0x51, 0x83, 0x12, 0x28, 0x67, 0x7a, 0x4f, 0x26, 
+  0x90, 0x01, 0x47, 0x3d, 0xa5, 0x7c, 0xe0, 0x8a, 0x68, 0xeb, 0x20, 0xcb, 0xa4, 0x69, 0xc7, 0xdb, 
+  0xf9, 0x33, 0xa1, 0xb9, 0x8c, 0x79, 0x76, 0x03, 0xa1, 0x68, 0xa2, 0xd1, 0xb7, 0x75, 0x20, 0x3c, 
+  0xe4, 0x4d, 0x2e, 0x27, 0xae, 0x4c, 0xa6, 0x57, 0x61, 0x6e, 0x30, 0x95, 0xb7, 0x62, 0x79, 0xcd, 
+  0x3b, 0x83, 0xa9, 0x6a, 0x42, 0x51, 0x81, 0xba, 0xa7, 0xa4, 0x7d, 0xa7, 0x53, 0xca, 0x0f, 0x20, 
+  0x04, 0x84, 0xce, 0xd6, 0xa1, 0xed, 0xc3, 0xcb, 0x9b, 0xa5, 0x6a, 0x9e, 0x28, 0x70, 0x09, 0x64, 
+  0x81, 0xaa, 0x2e, 0x92, 0xc7, 0xdd, 0x1b, 0x9c, 0x82, 0x5c, 0x84, 0x52, 0x57, 0x8f, 0x64, 0x24, 
+  0x3c, 0x86, 0x15, 0xa2, 0xef, 0x42, 0x86, 0x9d, 0x6f, 0x2e, 0xd0, 0xc4, 0x63, 0x6f, 0x86, 0xad, 
+  0x67, 0x26, 0x7c, 0x89, 0x73, 0x01, 0x82, 0xbc, 0x4f, 0x86, 0x00, 0x83, 0x65, 0xe9, 0x50, 0x79, 
+  0x6e, 0xc4, 0x81, 0x47, 0xb4, 0x69, 0x7a, 0x22, 0x44, 0xa5, 0x42, 0x67, 0x97, 0xff, 0x1a, 0x67, 
+  0x9c, 0x06, 0x99, 0x00, 0x5f, 0x41, 0x74, 0x84, 0x82, 0xa3, 0x5e, 0x04, 0xa1, 0x84, 0x15, 0xad, 
+  0x38, 0x69, 0x6f, 0x2b, 0xac, 0x4f, 0x47, 0x29, 0x79, 0x8f, 0x6c, 0xf1, 0xe2, 0x67, 0xb0, 0x60, 
+  0xa5, 0x63, 0xe8, 0x57, 0x83, 0x69, 0x78, 0xa4, 0x36, 0xc7, 0xc8, 0x74, 0x62, 0x43, 0x68, 0xa6, 
+  0x66, 0x8b, 0x2c, 0xb0, 0x45, 0xa3, 0x55, 0xe9, 0x6c, 0xc3, 0xd1, 0x70, 0x81, 0xeb, 0xc4, 0x44, 
+  0xa9, 0xa5, 0xdc, 0x87, 0xb3, 0x2a, 0x65, 0x49, 0xa7, 0x11, 0xad, 0x86, 0x22, 0x5f, 0x85, 0x6e, 
+  0x8a, 0x69, 0x6b, 0x51, 0x84, 0xc7, 0xa7, 0xdf, 0x26, 0x02, 0x97, 0x28, 0x29, 0x6f, 0x62, 0x03, 
+  0x86, 0xae, 0xca, 0xa7, 0xab, 0xff, 0x11, 0xc7, 0xd2, 0x90, 0x36, 0x87, 0x4e, 0x0d, 0x47, 0x6a, 
+  0xf4, 0x3d, 0xa6, 0xde, 0x87, 0x23, 0x72, 0xc6, 0xd8, 0x79, 0xa7, 0xeb, 0x18, 0x89, 0x3a, 0xda, 
+  0xea, 0x63, 0xab, 0x82, 0xe8, 0x87, 0xdf, 0xe9, 0x09, 0x82, 0x23, 0xc9, 0xcf, 0x6b, 0xdd, 0x46, 
+  0x64, 0x4c, 0x62, 0xf4, 0x8e, 0x62, 0x4d, 0xf3, 0x77, 0x6f, 0x66, 0x60, 0xc5, 0xc6, 0x37, 0xc3, 
+  0xdd, 0x52, 0x67, 0xf1, 0x7a, 0x8f, 0x78, 0xd1, 0x26, 0x46, 0x7f, 0x8e, 0x79, 0xda, 0xf8, 0x0e, 
+  0x6e, 0x64, 0x2d, 0x81, 0x2b, 0x2b, 0x2e, 0x5a, 0x87, 0x24, 0x2e, 0xc2, 0xd3, 0x5e, 0xa4, 0x80, 
+  0x87, 0xcf, 0x34, 0x09, 0x8f, 0x2e, 0xff, 0xe2, 0x03, 0x47, 0x00, 0x1f, 0xc7, 0xd0, 0x97, 0x34, 
+  0xa7, 0xda, 0x65, 0xb0, 0x53, 0x74, 0xd8, 0x66, 0xef, 0x74, 0x87, 0xfe, 0xe2, 0x47, 0x6a, 0xff, 
+  0x18, 0x66, 0x07, 0x47, 0x85, 0x14, 0xc7, 0xce, 0xcd, 0xf1, 0x16, 0xf8, 0x4f, 0x62, 0x73, 0x6f, 
+  0xcf, 0x74, 0xce, 0xcb, 0xf6, 0x1c, 0xca, 0x2f, 0xcd, 0xf9, 0x41, 0x24, 0x83, 0x75, 0x48, 0x57, 
+  0x6b, 0xc2, 0xcc, 0xbd, 0x14, 0x73, 0x20, 0x34, 0xab, 0x53, 0x25, 0x85, 0x62, 0xdf, 0x2e, 0x77, 
+  0x81, 0x2b, 0xba, 0xa2, 0xa9, 0xab, 0x73, 0x2b, 0x33, 0xa2, 0xda, 0x89, 0x62, 0xde, 0x9f, 0x82, 
+  0xdd, 0x84, 0xe2, 0xf1, 0xc4, 0xc9, 0xde, 0x83, 0x1d, 0xa6, 0x02, 0xec, 0x83, 0x7b, 0x20, 0x3a, 
+  0x0b, 0x61, 0x4c, 0x68, 0xd3, 0xa4, 0x03, 0xba, 0x5e, 0x2d, 0x57, 0x6e, 0x6f, 0x2d, 0x64, 0x80, 
+  0x09, 0x64, 0xa9, 0xc1, 0xc4, 0x4e, 0xa4, 0x1d, 0xa4, 0x21, 0x32, 0xbc, 0x67, 0x63, 0x63, 0x0a, 
+  0x04, 0x6c, 0xda, 0x5f, 0x43, 0x52, 0x54, 0x5f, 0x53, 0x45, 0xc6, 0xd1, 0x9a, 0x97, 0x5f, 0x4e, 
+  0x4f, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x53, 0x00, 0xa8, 0x56, 0xc3, 0x10, 0xe8, 
+  0x75, 0xc7, 0xd7, 0x81, 0xcf, 0x2e, 0xc8, 0x02, 0x2a, 0xc4, 0xd7, 0x22, 0xa7, 0x6b, 0x26, 0x5e, 
+  0x44, 0x45, 0x50, 0x52, 0x45, 0x43, 0x41, 0x54, 0x45, 0xbb, 0x21, 0x74, 0x59, 0x46, 0x42, 0x4c, 
+  0x4f, 0x43, 0x4b, 0x2e, 0x07, 0xc2, 0xc8, 0x7e, 0xe9, 0x6e, 0x47, 0xd5, 0xff, 0x07, 0x40, 0xd9, 
+  0x4d, 0x20, 0xac, 0x47, 0xd7, 0x16, 0xde, 0x00, 0x47, 0x43, 0x43, 0xc9, 0xc6, 0xc2, 0xc8, 0x20, 
+  0x38, 0x47, 0x4e, 0x55, 0x87, 0xa9, 0x5f, 0xd4, 0xc4, 0xca, 0xc5, 0x04, 0x71, 0xc4, 0xc9, 0xf5, 
+  0x00, 0x49, 0x29, 0x9b, 0x82, 0xb6, 0x65, 0x4f, 0x28, 0xc7, 0x82, 0x7d, 0xb0, 0xd1, 0x34, 0x30, 
+  0xd5, 0x30, 0xd6, 0x7c, 0x7c, 0xc7, 0xd4, 0x41, 0xb5, 0x61, 0xc6, 0x55, 0x6e, 0x67, 0xcb, 0x47, 
+  0x64, 0x75, 0x44, 0x28, 0x44, 0x49, 0x29, 0x97, 0xd4, 0x61, 0x74, 0xc1, 0xd2, 0x08, 0x65, 0xa1, 
+  0x77, 0x28, 0x28, 0x7d, 0x47, 0xdd, 0x0e, 0x4b, 0x29, 0x82, 0x57, 0x65, 0x6c, 0x80, 0x5f, 0x0f, 
+  0x33, 0x30, 0x31, 0x96, 0x27, 0x47, 0x9f, 0x11, 0x47, 0x3b, 0x73, 0x4d, 0x53, 0xe2, 0x47, 0x3c, 
+  0xff, 0x10, 0x82, 0xd1, 0x82, 0x0a, 0xf4, 0x47, 0x40, 0x46, 0x41, 0x74, 0x73, 0x65, 0xf0, 0xc5, 
+  0xc6, 0x9b, 0x25, 0x1f, 0x75, 0x28, 0x22, 0x59, 0x8a, 0x3a, 0xda, 0xa6, 0xdc, 0x48, 0xa7, 0xd3, 
+  0x16, 0x67, 0xc8, 0xa2, 0x61, 0x27, 0xa3, 0x86, 0xc5, 0xd4, 0xe8, 0x7f, 0x0f, 0x65, 0x72, 0x22, 
+  0x99, 0x0c, 0x63, 0xbe, 0xc4, 0xc6, 0x57, 0x0b, 0x23, 0xcf, 0xc1, 0xd2, 0xf3, 0x87, 0x7e, 0xff, 
+  0x07, 0xcc, 0x20, 0xc7, 0x3f, 0xa6, 0x2e, 0xc7, 0xd8, 0x8c, 0xdf, 0xa5, 0x60, 0x85, 0xa5, 0xdd, 
+  0x26, 0x84, 0x62, 0x2c, 0xfd, 0x70, 0x6c, 0x61, 0x6e, 0x6e, 0x82, 0xef, 0x2b, 0xc6, 0xc6, 0x4f, 
+  0xa7, 0x3f, 0x20, 0xa9, 0x62, 0xbd, 0xb8, 0x0f, 0x31, 0x33, 0x31, 0x43, 0xe9, 0x70, 0xa1, 0xc7, 
+  0x05, 0x83, 0xb9, 0xa7, 0x7b, 0x28, 0xa7, 0xa5, 0x02, 0xc7, 0xd7, 0x7f, 0xfb, 0x18, 0xc7, 0xd9, 
+  0x19, 0xc5, 0xcc, 0x81, 0x83, 0x1f, 0xc0, 0xc7, 0xd7, 0x2e, 0x22, 0xa5, 0x1e, 0xb0, 0x47, 0x9c, 
+  0x82, 0xef, 0xa7, 0xc4, 0xd8, 0xb9, 0x07, 0x4f, 0xc7, 0xd8, 0xab, 0x20, 0x47, 0x35, 0xf1, 0x0d, 
+  0x47, 0x8b, 0x47, 0x99, 0xff, 0x20, 0x47, 0x1f, 0x12, 0xa7, 0x61, 0x97, 0x67, 0x60, 0x74, 0xa7, 
+  0xb0, 0x96, 0xa7, 0x84, 0x0f, 0x47, 0x0f, 0x39, 0x46, 0x7b, 0x47, 0x89, 0xfe, 0x33, 0x67, 0x1e, 
+  0xa7, 0xf5, 0xf0, 0xb7, 0x64, 0x65, 0xff, 0xee, 0x12, 0xb1, 0x20, 0x6e, 0xc5, 0xf5, 0xa3, 0x15, 
+  0xc7, 0xd8, 0x41, 0x3e, 0x87, 0x14, 0x1b, 0x82, 0x2d, 0x84, 0x92, 0x93, 0xb2, 0x6e, 0x6f, 0x47, 
+  0xa2, 0xb2, 0x99, 0x8a, 0x62, 0x4b, 0x85, 0x0c, 0x93, 0x86, 0x15, 0xa3, 0x21, 0xbe, 0xc7, 0xd0, 
+  0xe0, 0x83, 0xbd, 0x05, 0xc6, 0xd0, 0xdb, 0x81, 0x54, 0xc3, 0xc4, 0x7d, 0xc4, 0xd7, 0xe9, 0xc2, 
+  0xd8, 0xb4, 0x20, 0x1a, 0xc6, 0xc2, 0xbd, 0xad, 0x73, 0x1f, 0x63, 0xec, 0xc7, 0xd9, 0xd0, 0x16, 
+  0xc7, 0xd3, 0x9d, 0x87, 0xcb, 0x9d, 0x47, 0xc8, 0xca, 0x01, 0xc2, 0xd4, 0xfd, 0x6f, 0x6e, 0xe3, 
+  0x16, 0x47, 0xb6, 0xa7, 0xcb, 0xbd, 0x41, 0x38, 0x67, 0xea, 0x60, 0x83, 0xab, 0xaa, 0x6f, 0x2a, 
+  0x92, 0x86, 0xdf, 0xae, 0x77, 0xd9, 0x62, 0xd4, 0x64, 0x3b, 0xd9, 0x29, 0x82, 0xd0, 0xa3, 0xd1, 
+  0x56, 0x43, 0x06, 0x86, 0xe5, 0xb2, 0x72, 0x65, 0xd5, 0x2a, 0x83, 0x44, 0x03, 0x10, 0x62, 0xdc, 
+  0x85, 0x4e, 0xd2, 0x68, 0x69, 0xd2, 0x94, 0xc7, 0xc8, 0x54, 0x31, 0xc6, 0xdc, 0xd9, 0x84, 0xdf, 
+  0x84, 0xc2, 0xbc, 0x47, 0x86, 0x64, 0x85, 0x69, 0x69, 0xda, 0xab, 0x74, 0x83, 0x22, 0xa2, 0xea, 
+  0x92, 0x74, 0x61, 0xd9, 0x36, 0xa2, 0xdb, 0x66, 0x31, 0x21, 0x66, 0x67, 0xc4, 0xa7, 0xcf, 0x8e, 
+  0x0f, 0x87, 0xe2, 0xdf, 0x47, 0xb5, 0xbe, 0x67, 0xb1, 0x47, 0xa3, 0xfe, 0x0e, 0x97, 0x69, 0x73, 
+  0x74, 0xfe, 0x00, 0xa7, 0x43, 0x71, 0x85, 0xf3, 0xa7, 0x84, 0x41, 0xaa, 0x3b, 0x21, 0x8c, 0xc2, 
+  0xc2, 0x29, 0x05, 0xc7, 0xc1, 0xdc, 0x5a, 0xae, 0x77, 0x35, 0xa6, 0xad, 0x4e, 0x42, 0xad, 0xa7, 
+  0x3c, 0x62, 0x49, 0x22, 0xbf, 0xa7, 0xd3, 0x91, 0xae, 0x29, 0xb3, 0x28, 0x22, 0xbe, 0x83, 0x7e, 
+  0x47, 0xdd, 0x14, 0x86, 0x6a, 0xa4, 0xf4, 0x98, 0x85, 0x69, 0x4f, 0x3b, 0xa9, 0xf2, 0x1a, 0xa3, 
+  0x77, 0xc7, 0xd2, 0x65, 0x32, 0x43, 0x22, 0xc7, 0xd3, 0x28, 0x47, 0xac, 0xe1, 0xa6, 0xcf, 0x47, 
+  0xad, 0xa2, 0x46, 0xac, 0x46, 0xdd, 0x47, 0xad, 0xa7, 0xe5, 0x51, 0x47, 0x3f, 0xf3, 0x14, 0x86, 
+  0xf1, 0x47, 0x96, 0x4f, 0x01, 0x44, 0xbb, 0x44, 0x3f, 0xa9, 0x6c, 0xf1, 0x36, 0x6f, 0x49, 0xf1, 
+  0x87, 0xd4, 0xe3, 0x77, 0x29, 0x3b, 0x3a, 0xe7, 0xa7, 0x72, 0xae, 0x67, 0x60, 0x87, 0xaf, 0x33, 
+  0x06, 0x67, 0xaa, 0x7b, 0x47, 0xd2, 0x83, 0xd2, 0x39, 0x81, 0x46, 0x79, 0x33, 0x66, 0x69, 0x78, 
+  0x36, 0x34, 0x6b, 0x3e, 0xa7, 0xc5, 0xea, 0x87, 0x05, 0x93, 0xa7, 0xbe, 0xbd, 0x67, 0x65, 0x87, 
+  0xae, 0x23, 0x47, 0x5a, 0xeb, 0x47, 0xd2, 0x47, 0x5a, 0xf9, 0x10, 0xa7, 0xfc, 0xef, 0xc7, 0xbd, 
+  0x11, 0x04, 0xce, 0x7d, 0xbd, 0x1c, 0xe7, 0xf0, 0xe8,
+};
+
+static unsigned char buf[18830];
+
+int main() {
+
+        unsigned long cksum = adler32(0, NULL, 0);
+
+        decompress_lzsa2(compressed, buf);
+        cksum = adler32(cksum, buf, 18830);
+
+        return cksum == 0xf748269d ? 0 : 1;
+}
diff --git a/test/val/nullptr.c b/test/val/nullptr.c
new file mode 100644
index 000000000..a5b72e8c5
--- /dev/null
+++ b/test/val/nullptr.c
@@ -0,0 +1,73 @@
+/* Bug # - Pointer compared to null pointer constant */
+
+#include <stdio.h>
+
+unsigned failures;
+
+struct S {
+    char a[4];
+} *p;
+
+#define TEST_NULL(E) \
+    do { \
+        a = (E) == 0 && !(E); \
+        if (!a) \
+        { \
+            ++failures; \
+            printf("failed: " #E " should be null\n"); \
+        } \
+    } while(0);
+
+#define TEST_NON_NULL(E) \
+    do { \
+        a = (E) != 0 && !!(E) && (E); \
+        if (!a) \
+        { \
+            ++failures; \
+            printf("failed: " #E " should be non-null\n"); \
+        } \
+    } while(0);
+
+void func() { }
+
+int main()
+{
+    int a;
+
+    /* Null pointer constant (per ISO C) compared equal to null pointer constant */
+    TEST_NULL((void*)0)
+
+    /* Null pointer compared equal to null pointer constant */
+    TEST_NULL((char*)0)
+
+    /* Null pointer obtained with -> */
+    TEST_NULL(((struct S*)0)->a)
+
+    /* Null pointer obtained with -> */
+    TEST_NULL(p->a)
+
+    /* Null pointer obtained with cast and -> */
+    TEST_NULL(((struct S*)(a = 0))->a)
+
+    /* Null pointer obtained with cast and -> */
+    TEST_NULL((a = 0, ((struct S*)a)->a))
+
+    /* Non-null pointer obtained with cast and -> */
+    TEST_NON_NULL(((struct S*)(long)(a = 0x1234))->a)
+
+    /* Non-null pointer obtained with cast and -> */
+    TEST_NON_NULL((a = 0x1234, ((struct S*)a)->a))
+
+    /* Non-null pointer obtained with cast and -> */
+    TEST_NON_NULL(((struct S*)&a)->a)
+
+    /* Non-null pointer obtained with cast and -> */
+    TEST_NON_NULL(((struct S*)&func)->a)
+
+    if (failures != 0)
+    {
+        printf("failures: %u\n", failures);
+    }
+
+    return failures;
+}
diff --git a/test/val/optimizer-bug-pr2262.c b/test/val/optimizer-bug-pr2262.c
new file mode 100644
index 000000000..f2c08a98c
--- /dev/null
+++ b/test/val/optimizer-bug-pr2262.c
@@ -0,0 +1,53 @@
+
+// optimizer bug that occured after PR #2262, fixed by PR #2295
+
+#include <stdio.h>
+
+unsigned char n;
+unsigned long fp1;
+
+int failures = 0;
+
+void test1(void)
+{
+	asm("lda     _n");
+	asm("jeq     %g", L0004);
+
+	asm("lda     #$3F");
+	asm("sta     sreg+1");
+	asm("lda     #$C0");
+	asm("sta     sreg");
+	asm("lda     #$00");
+	asm("ldx     #$00");
+	asm("jmp     %g", L0005);
+
+L0004:
+	asm("lda     #$3F");
+	asm("sta     sreg+1");
+	asm("lda     #$00");
+	asm("sta     sreg");
+	asm("lda     #$00");
+	asm("ldx     #$00");
+
+L0005:
+	asm("sta     _fp1");
+	asm("stx     _fp1+1");
+	asm("ldy     sreg");
+	asm("sty     _fp1+2");
+	asm("ldy     sreg+1");
+	asm("sty     _fp1+3");
+}
+
+int main(void)
+{
+    n = 0;
+    test1();
+    printf("fp1:%08lx\n", fp1);
+    if (fp1 != 0x3f000000) failures++;
+    n = 0xff;
+    test1();
+    printf("fp1:%08lx\n", fp1);
+    if (fp1 != 0x3fc00000) failures++;
+    printf("failures:%d\n", failures);
+    return failures;
+}
diff --git a/test/val/pragmas.c b/test/val/pragmas.c
new file mode 100644
index 000000000..802c7a5c3
--- /dev/null
+++ b/test/val/pragmas.c
@@ -0,0 +1,44 @@
+/* Note: This tests just if the #pragmas are understood. It doesn't test if
+** they do really work. This would require much more work.
+*/
+
+void func(void);
+#pragma align(push, 1024)
+#pragma allow-eager-inline(push, on)
+#pragma allow_eager_inline(pop)
+#pragma bss-name(push, "BSS")
+#pragma bss_name(pop)
+#pragma charmap(1, 1)
+#pragma check-stack(on)
+#pragma check_stack(off)
+#pragma code-name(push, "CODE")
+#pragma code_name("CODE")
+#pragma codesize(200)
+#pragma data-name("DATA")
+#pragma data_name("DATA")
+#pragma inline-stdfuncs(off)
+#pragma inline_stdfuncs(on)
+#pragma local-strings(off)
+#pragma local_strings(off)
+#pragma message("in a bottle")
+#pragma optimize(off)
+#pragma register-vars(off)
+#pragma register_vars(on)
+#pragma regvaraddr(on)
+#pragma rodata-name("RODATA")
+#pragma rodata_name("RODATA")
+#pragma signed-chars(off)
+#pragma signed_chars(on)
+#pragma static-locals(off)
+#pragma static_locals(on)
+#pragma warn(unused-param, on)
+#pragma wrapped-call(push, func, 0)     // push is required for this #pragma
+#pragma wrapped_call(push, func, 1)
+#pragma writable-strings(on)
+#pragma writable_strings(off)
+#pragma zpsym("func")
+
+int main ()
+{
+    return 0;
+}
diff --git a/test/val/remove.c b/test/val/remove.c
new file mode 100644
index 000000000..eecf8be8f
--- /dev/null
+++ b/test/val/remove.c
@@ -0,0 +1,55 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+int fails = 0;
+
+
+static void create_out_file(const char *outfile_path) {
+    FILE *out;
+
+
+    out = fopen(outfile_path, "wb");
+    if (out == NULL) {
+        printf("Could not create %s\n", outfile_path);
+        fails++;
+        return;
+    }
+    fclose(out);
+}
+
+int main (int argc, char **argv)
+{
+    int r;
+    static char outfile_path[FILENAME_MAX+1];
+
+    sprintf(outfile_path, "%s.test.out", argv[0]);
+
+    create_out_file(outfile_path);
+    r = remove(outfile_path);
+    if (r != 0) {
+        printf("could not remove() %s\n", outfile_path);
+        fails++;
+    }
+
+    create_out_file(outfile_path);
+    r = unlink(outfile_path);
+    if (r != 0) {
+        printf("could not unlink() %s\n", outfile_path);
+        fails++;
+    }
+
+    r = remove("klsdfjqlsjdflkqjdsoizu");
+    if (r == 0) {
+        printf("remove()ing non-existent file succeeded\n");
+        fails++;
+    }
+
+    r = unlink("klsdfjqlsjdflkqjdsoizu");
+    if (r == 0) {
+        printf("unlink()ing non-existent file succeeded\n");
+        fails++;
+    }
+
+    return fails;
+}
diff --git a/test/val/static-long.c b/test/val/static-long.c
new file mode 100644
index 000000000..a2e4e53a3
--- /dev/null
+++ b/test/val/static-long.c
@@ -0,0 +1,41 @@
+#include <stdint.h>
+#include <stdio.h>
+
+int res = 0;
+
+int main(void)
+{
+    static long a, b;
+
+    a = 0x12345678L;
+
+    /* Test assignment */
+    b = a;
+    if (b != a) {
+      res++;
+    }
+
+    /* Test increment */
+    b++;
+    if (b != 0x12345679L) {
+      res++;
+    }
+
+    /* Test decrement */
+    b--;
+    if (b != 0x12345678L) {
+      res++;
+    }
+
+    /* Test pre-decrement with test */
+    if (--b != 0x12345677L) {
+      res++;
+    }
+
+    a = --b;
+    if (a != 0x12345676L) {
+      res++;
+    }
+
+    return res;
+}
diff --git a/test/val/stpcpy.c b/test/val/stpcpy.c
new file mode 100644
index 000000000..1cc6458ed
--- /dev/null
+++ b/test/val/stpcpy.c
@@ -0,0 +1,53 @@
+// 2024-07-15 Sven Michael Klose <pixel@hugbox.org>
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#define STR_SHORT   "Hello, World!"
+#define STR_LONG    "This is a longer test string for stpcpy."
+
+char dest[512];
+char multi_page[300];
+
+int
+main ()
+{
+    const char *src_empty;
+    const char *src_short;
+    const char *src_long;
+    char       *end;
+
+    src_empty = "";
+    end = stpcpy (dest, src_empty);
+    assert(!strcmp (dest, src_empty));
+    assert(!*end);
+    assert(end == dest);
+    printf ("Test 1 passed.\n");
+
+    src_short = STR_SHORT;
+    end = stpcpy (dest, src_short);
+    assert(!strcmp (dest, src_short));
+    assert(!*end);
+    assert(end == &dest[sizeof (STR_SHORT) - 1]);
+    printf ("Test 2 passed.\n");
+
+    src_long = STR_LONG;
+    end = stpcpy (dest, src_long);
+    assert(!strcmp (dest, src_long));
+    assert(!*end);
+    assert(end == &dest[sizeof (STR_LONG) - 1]);
+    printf ("Test 3 passed.\n");
+
+    memset(multi_page, 'a', sizeof(multi_page)-1);
+    multi_page[sizeof(multi_page)-1] = '\0';
+    end = stpcpy (dest, multi_page);
+    assert(!strcmp (dest, multi_page));
+    assert(!*end);
+    assert(end == &dest[sizeof (multi_page) - 1]);
+    printf ("Test 4 passed.\n");
+
+    printf ("All tests passed.\n");
+    return EXIT_SUCCESS;
+}
diff --git a/test/val/strstr-test.c b/test/val/strstr-test.c
new file mode 100644
index 000000000..5c8a147b0
--- /dev/null
+++ b/test/val/strstr-test.c
@@ -0,0 +1,41 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+int fails = 0;
+
+#define STRSTR_TEST(needle,expected)                     \
+  if (strstr(haystack, (needle)) != (expected)) {        \
+    printf("strstr failure: expected %p for \"%s\", "    \
+           "got %p\n",                                   \
+           expected, needle, strstr(haystack, (needle)));\
+    fails++;                                             \
+  }
+
+#define STRCASESTR_TEST(needle,expected)                     \
+  if (strcasestr(haystack, (needle)) != (expected)) {        \
+    printf("strcasestr failure: expected %p for \"%s\", "    \
+           "got %p\n",                                       \
+           expected, needle, strcasestr(haystack, (needle)));\
+    fails++;                                                 \
+  }
+
+int main (void)
+{
+    const char *haystack = "This is a string to search in";
+
+    STRSTR_TEST("This is", haystack + 0);
+    STRSTR_TEST("a string", haystack + 8);
+    STRSTR_TEST("This is a string to search in", haystack);
+    STRSTR_TEST("search in", haystack + 20);
+    STRSTR_TEST("This is a string to search in with extra chars", NULL);
+    STRSTR_TEST("nowhere", NULL);
+
+    STRCASESTR_TEST("this is", haystack + 0);
+    STRCASESTR_TEST("a STRING", haystack + 8);
+    STRCASESTR_TEST("this is a string TO search in", haystack);
+    STRCASESTR_TEST("This is a string to search in with extra chars", NULL);
+    STRCASESTR_TEST("search IN", haystack + 20);
+
+    return fails;
+}
diff --git a/test/val/strtok.c b/test/val/strtok.c
new file mode 100644
index 000000000..4d63bfb2a
--- /dev/null
+++ b/test/val/strtok.c
@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+void
+error (void)
+{
+    printf ("strtok() test failed!\n");
+    exit (EXIT_FAILURE);
+}
+
+void
+test (char * s)
+{
+    if (strcmp ("test", strtok (s, "/")))
+        error ();
+    if (strcmp ("foo", strtok (NULL, "/")))
+        error ();
+    if (strcmp ("bar", strtok (NULL, "/")))
+        error ();
+    if (strtok (NULL, "/"))
+        error ();
+    if (strtok (NULL, "/"))
+        error ();
+}
+
+int
+main (void)
+{
+    char s1[] = "test/foo/bar";
+    char s2[] = "/test/foo/bar";
+    char s3[] = "//test/foo/bar";
+    char s4[] = "//test/foo/bar//";
+
+    test (s1);
+    test (s2);
+    test (s3);
+    test (s4);
+
+    return EXIT_SUCCESS;
+}
diff --git a/test/val/sub3.c b/test/val/sub3.c
index 2a3646f9a..dd050224e 100644
--- a/test/val/sub3.c
+++ b/test/val/sub3.c
@@ -168,6 +168,31 @@ void post_dec_assign_test(void)
     failures++;
 }
 
+void dex_tests(void) {
+  static unsigned int a, b;
+
+  a = 257;
+  b = a - 1;
+  if (b != 256) {
+    printf("fail 257 => 256\n");
+    failures++;
+  }
+
+  a = 256;
+  b = a - 1;
+  if (b != 255) {
+    printf("fail 256 => 255\n");
+    failures++;
+  }
+
+  a = 255;
+  b = a - 1;
+  if (b != 254) {
+    printf("fail 255 => 254\n");
+    failures++;
+  }
+}
+
 int main(void)
 {
   int0 = 5;
@@ -186,6 +211,8 @@ int main(void)
   int1 = 5;
   post_dec_assign_test();
 
+  dex_tests();
+
   printf("failures: %d\n",failures);
 
   return failures;
diff --git a/test/val/time-test2.c b/test/val/time-test2.c
new file mode 100644
index 000000000..725bbd0e6
--- /dev/null
+++ b/test/val/time-test2.c
@@ -0,0 +1,61 @@
+/* Another test for time() */
+
+#include <stdio.h>
+#include <time.h>
+
+static int failures = 0;
+#define INV_TIME        ((time_t)-1)
+#define TEST_TIME       ((time_t)0x78AB1234)
+
+/* We supply our own clock_gettime function so we can control the values
+** supplied to time() internally.
+*/
+static time_t timeval;
+static int timeres;
+int __fastcall__ clock_gettime (clockid_t, struct timespec *tp)
+{
+    /* Don't touch tp in case of an error */
+    if (timeres != -1) {
+        tp->tv_sec = timeval;
+        tp->tv_nsec = 0;
+    }
+    return timeres;
+}
+
+int main()
+{
+    time_t res, pres;
+
+    /* First test: Force time() to return an error. Check that both, the
+    ** returned value and the value passed via pointer are (time_t)-1.
+    */
+    timeval = 42;
+    timeres = -1;
+    res = time(&pres);
+    if (res != INV_TIME || pres != INV_TIME) {
+        printf("Error in test 1\n");
+        ++failures;
+    }
+
+    /* Second test: Return a valid value and check both results */
+    timeval = TEST_TIME;
+    timeres = 0;
+    res = time(&pres);
+    if (res != TEST_TIME || pres != TEST_TIME) {
+        printf("Error in test 2\n");
+        ++failures;
+    }
+
+    /* Third test: Return no error but an invalid value and check both
+    ** results
+    */
+    timeval = INV_TIME;
+    timeres = 0;
+    res = time(&pres);
+    if (res != INV_TIME || pres != INV_TIME) {
+        printf("Error in test 3\n");
+        ++failures;
+    }
+
+    return failures;
+}
diff --git a/test/val/trampoline.c b/test/val/trampoline.c
index 8f1e1547c..d3e73b47d 100644
--- a/test/val/trampoline.c
+++ b/test/val/trampoline.c
@@ -22,23 +22,23 @@ void func3() {
 
 }
 
-#pragma wrapped-call(push, trampoline_inc, 0)
-
 void func2() {
         func3();
 }
 
+#pragma wrapped-call(push, trampoline_inc, 0)
+
+void func2(void);
+
 #pragma wrapped-call(push, trampoline_set, 4)
 
-void func1(void);
-
-#pragma wrapped-call(pop)
-#pragma wrapped-call(pop)
-
 void func1(void) {
         func2();
 }
 
+#pragma wrapped-call(pop)
+#pragma wrapped-call(pop)
+
 int main(void)
 {
         flag = 0;
diff --git a/test/val/zx02.c b/test/val/zx02.c
new file mode 100644
index 000000000..0c123f968
--- /dev/null
+++ b/test/val/zx02.c
@@ -0,0 +1,416 @@
+/*
+  !!DESCRIPTION!! zx02 decompression
+  !!ORIGIN!!      cc65 regression tests
+  !!LICENCE!!     BSD 2-clause
+  !!AUTHOR!!      Colin Leroy-Mira
+*/
+
+#include <zlib.h>
+#include <stdio.h>
+#include <zx02.h>
+
+/* The sample data is the original lz4.h, compressed with:
+ * zx02 lz4.h lz4.zx02
+ *
+ * We reused lz4.h from the LZ4 test to have a matching adler32 sum.
+ */
+static const unsigned char compressed[] = {
+  0xa2, 0x2f, 0x2a, 0x0a, 0x20, 0x2e, 0x42, 0x4c, 0x5a, 0x34, 0x20, 0x2d, 0x20, 0x46, 0x61, 0x73,
+  0x74, 0x15, 0xf9, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20,
+  0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x4e, 0x4d, 0x4d, 0x48, 0x65, 0x61, 0x64,
+  0x65, 0x72, 0x4e, 0x69, 0x6c, 0x65, 0x4a, 0x1d, 0x41, 0x43, 0x6f, 0x70, 0x79, 0x36, 0x67, 0x2b,
+  0x68, 0x43, 0x28, 0x43, 0x29, 0x20, 0x32, 0x30, 0x31, 0x31, 0x2d, 0x09, 0xd0, 0x35, 0x2c, 0x20,
+  0x59, 0x61, 0x6e, 0x6e, 0x3b, 0x4d, 0x6c, 0x4c, 0x74, 0x2e, 0x0a, 0x4d, 0x53, 0x42, 0x53, 0x44,
+  0x3a, 0x3e, 0x15, 0x2d, 0x43, 0x6c, 0x61, 0x75, 0x73, 0x65, 0x20, 0x4c, 0x69, 0x63, 0x65, 0x0e,
+  0x68, 0x39, 0x70, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x14, 0x00, 0x2e, 0x92, 0x25, 0x35, 0x6f,
+  0x75, 0x72, 0x32, 0x29, 0x14, 0x72, 0x67, 0x2f, 0x6c, 0x33, 0x45, 0x96, 0x73, 0x2f, 0x62, 0x73,
+  0x64, 0x2d, 0x19, 0x2d, 0x2e, 0x70, 0x68, 0x70, 0x29, 0x22, 0x9b, 0x99, 0x52, 0x65, 0x64, 0x69,
+  0x52, 0x21, 0xf2, 0x62, 0x75, 0x94, 0x45, 0xd8, 0x14, 0x64, 0xaf, 0x53, 0x69, 0x14, 0x85, 0x48,
+  0x23, 0xe0, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x0a, 0x66, 0x06, 0x72, 0x6d, 0x73, 0x2c, 0x77,
+  0x05, 0x85, 0x20, 0x14, 0x24, 0x0f, 0x46, 0x52, 0x74, 0x8b, 0x21, 0x6d, 0x6f, 0x66, 0x15, 0xb4,
+  0x61, 0x87, 0x56, 0x40, 0x56, 0x6c, 0x51, 0x06, 0x56, 0x3e, 0x74, 0x4c, 0xba, 0x12, 0x72, 0x6f,
+  0x76, 0x11, 0x64, 0x11, 0x51, 0x5a, 0x3e, 0x09, 0x58, 0x36, 0x8e, 0x9a, 0x48, 0x6f, 0x8a, 0x6e,
+  0x67, 0x15, 0x63, 0x5c, 0x70, 0x42, 0x69, 0x73, 0x92, 0x93, 0x60, 0xcc, 0x3a, 0xd3, 0x01, 0x19,
+  0x2a, 0x3d, 0xe4, 0x4a, 0x99, 0x6f, 0x66, 0x2f, 0xd5, 0x74, 0xa6, 0x64, 0x5a, 0x56, 0xa4, 0x45,
+  0x72, 0x64, 0x61, 0x98, 0x51, 0xb3, 0x88, 0x62, 0x47, 0xd6, 0x35, 0x76, 0x97, 0x41, 0x35, 0x6e,
+  0x44, 0x72, 0x5c, 0x2c, 0x3d, 0x48, 0x90, 0x20, 0x6c, 0x51, 0x5e, 0x87, 0x69, 0xef, 0x67, 0x12,
+  0x29, 0x84, 0x64, 0x50, 0x16, 0x63, 0xa2, 0x26, 0x12, 0x72, 0x2e, 0x6b, 0x11, 0x5c, 0x50, 0x2b,
+  0xf6, 0x76, 0x11, 0x61, 0xd6, 0x2a, 0x75, 0x62, 0xda, 0x17, 0xd1, 0x81, 0x8b, 0x1d, 0x67, 0x17,
+  0xe9, 0x58, 0x93, 0xcb, 0xd3, 0x28, 0x46, 0x6f, 0x63, 0x75, 0x22, 0x6e, 0x69, 0xea, 0x65, 0xc6,
+  0x2f, 0x51, 0x04, 0x92, 0x33, 0x14, 0x0a, 0x6d, 0x26, 0x0a, 0x6d, 0x69, 0xd0, 0x77, 0x96, 0xed,
+  0x68, 0x5d, 0xd1, 0x39, 0x58, 0x81, 0x87, 0xf6, 0xcc, 0x9b, 0xf9, 0x54, 0x48, 0x49, 0x53, 0x20,
+  0x53, 0x4f, 0x46, 0x54, 0x57, 0x41, 0x52, 0x45, 0x20, 0x0a, 0x17, 0x82, 0x50, 0x52, 0x4f, 0x56,
+  0x49, 0x44, 0x45, 0x44, 0x44, 0x42, 0x59, 0x39, 0x24, 0xa0, 0x43, 0x4f, 0x50, 0x59, 0xa9, 0x49,
+  0x47, 0x48, 0x54, 0x20, 0x48, 0x4f, 0x4c, 0x13, 0x2e, 0x52, 0x42, 0x42, 0x41, 0x4e, 0x44, 0x2b,
+  0x22, 0x4e, 0x54, 0x05, 0x42, 0x55, 0x4f, 0x20, 0x4d, 0x8d, 0x22, 0x41, 0x53, 0x05, 0x79, 0x22,
+  0x37, 0x44, 0x07, 0x72, 0xd1, 0x45, 0x58, 0x50, 0x9c, 0x53, 0x52, 0x26, 0x3c, 0x2c, 0xc9, 0x4d,
+  0x50, 0x4c, 0x49, 0x45, 0x04, 0xc1, 0x52, 0x34, 0x49, 0x54, 0x14, 0x53, 0x2c, 0x20, 0x26, 0x4e,
+  0x43, 0x91, 0x55, 0x44, 0x0a, 0x47, 0x50, 0x14, 0x86, 0xb2, 0x4e, 0x1f, 0x54, 0x24, 0x73, 0x54,
+  0x91, 0x49, 0x54, 0x53, 0x15, 0xa8, 0x2c, 0xf5, 0x2e, 0x73, 0x40, 0x9e, 0x46, 0x62, 0x4d, 0x06,
+  0x43, 0x43, 0x48, 0x1d, 0x45, 0x41, 0x42, 0x49, 0x3a, 0x54, 0xd4, 0x44, 0xe5, 0x46, 0x10, 0x45,
+  0x4e, 0xdd, 0x0e, 0x45, 0xde, 0x91, 0x24, 0x94, 0x8a, 0x64, 0x5e, 0xd4, 0x43, 0x55, 0x4c, 0x0c,
+  0x14, 0x0d, 0x55, 0x50, 0x4f, 0x53, 0x65, 0x9a, 0xbf, 0x25, 0xe4, 0x53, 0x43, 0x26, 0x46, 0xae,
+  0xa8, 0x2e, 0x11, 0x07, 0xef, 0x89, 0x50, 0x56, 0x45, 0x74, 0x94, 0x00, 0xa0, 0x99, 0x4c, 0x4c,
+  0xdd, 0xb5, 0x8f, 0x25, 0x4f, 0x57, 0xaa, 0x59, 0x80, 0xa6, 0xdd, 0xa6, 0x54, 0x62, 0x4a, 0xf0,
+  0xfa, 0x95, 0x4c, 0x45, 0xdd, 0x94, 0xdb, 0xad, 0x49, 0xb6, 0x43, 0x54, 0x94, 0xad, 0x13, 0xb0,
+  0x43, 0x05, 0x44, 0x68, 0x14, 0xac, 0x2c, 0x91, 0xd4, 0x53, 0x50, 0x45, 0x1e, 0x17, 0x41, 0xdc,
+  0x58, 0x86, 0xa9, 0x25, 0x14, 0x59, 0x2c, 0xad, 0x98, 0x30, 0x91, 0x51, 0x55, 0x4f, 0x12, 0x39,
+  0x8a, 0x9c, 0x41, 0x4d, 0x41, 0x47, 0x3a, 0x8a, 0x20, 0x28, 0xad, 0xa4, 0x49, 0x65, 0x43, 0xac,
+  0x94, 0x1c, 0x73, 0x25, 0x46, 0xbc, 0x55, 0xb6, 0x28, 0x04, 0xdc, 0x54, 0x3c, 0xc1, 0x20, 0x47,
+  0x4f, 0x44, 0xc9, 0xed, 0x27, 0xb0, 0x52, 0x56, 0x45, 0x02, 0x9c, 0x3b, 0x70, 0x9c, 0xfa, 0x71,
+  0x85, 0x55, 0x24, 0x94, 0x19, 0xcf, 0x05, 0x54, 0xfd, 0x57, 0x8b, 0x15, 0x71, 0x42, 0x17, 0x15,
+  0x42, 0x3a, 0xe0, 0xd5, 0x85, 0x0a, 0x72, 0x8a, 0xdc, 0x26, 0x55, 0x50, 0x1a, 0x38, 0x29, 0x77,
+  0xe6, 0x04, 0x18, 0x43, 0x53, 0x15, 0x41, 0x3e, 0xf6, 0xc9, 0xd7, 0x65, 0x2c, 0xe7, 0x1d, 0x91,
+  0x5f, 0x45, 0x72, 0x59, 0xb5, 0x66, 0x36, 0x99, 0x1b, 0xa0, 0x70, 0x57, 0x95, 0x2e, 0x62, 0x1c,
+  0x8f, 0x6b, 0xc7, 0x41, 0x44, 0x1d, 0x53, 0x0e, 0x24, 0x49, 0x4d, 0xe5, 0xe5, 0x71, 0x99, 0x96,
+  0xb1, 0x38, 0xdf, 0x61, 0x20, 0x02, 0x47, 0x75, 0x3c, 0x06, 0x1e, 0x95, 0x90, 0x38, 0x04, 0x41,
+  0x91, 0x57, 0x08, 0xf0, 0x29, 0x55, 0x52, 0x0c, 0x41, 0x56, 0x06, 0xf9, 0xc4, 0x23, 0xed, 0x65,
+  0xdc, 0xf5, 0x46, 0x47, 0x55, 0xb3, 0x91, 0x79, 0x1a, 0x9d, 0xb5, 0xca, 0xa5, 0xbb, 0x08, 0x66,
+  0x46, 0x76, 0x44, 0x16, 0x17, 0x7f, 0x5f, 0x6c, 0x1f, 0x58, 0x9a, 0x13, 0xdc, 0x7d, 0xdb, 0x76,
+  0xa0, 0xfb, 0x7c, 0x29, 0xc6, 0x59, 0xb0, 0xc4, 0x20, 0x7d, 0xae, 0xa9, 0x35, 0x6b, 0x23, 0xb4,
+  0x63, 0x74, 0x9b, 0xc0, 0x40, 0x68, 0x24, 0x72, 0x1a, 0x51, 0x3a, 0x45, 0x2d, 0xe9, 0xcf, 0x6e,
+  0x66, 0x17, 0xa4, 0xf1, 0x9f, 0x6f, 0x73, 0x44, 0xcc, 0x3c, 0x79, 0x38, 0x7a, 0x20, 0x47, 0x13,
+  0x73, 0xa0, 0x15, 0x7c, 0x67, 0xef, 0x37, 0x75, 0x62, 0x2e, 0xb0, 0x01, 0xd2, 0x2f, 0x43, 0x79,
+  0x98, 0xa4, 0x34, 0x39, 0x37, 0x33, 0x2f, 0x6c, 0x7a, 0x34, 0x79, 0xb1, 0x70, 0x7a, 0x3a, 0x1a,
+  0x1d, 0xd6, 0x7f, 0xa4, 0x9a, 0x6f, 0xf1, 0x72, 0x4f, 0xa8, 0x10, 0x49, 0x2e, 0x67, 0x6f, 0x6f,
+  0x67, 0x6c, 0x65, 0x7d, 0x52, 0x43, 0x0a, 0x49, 0x23, 0x21, 0x0f, 0x4e, 0x87, 0xd9, 0x63, 0x0a,
+  0x2a, 0x2f, 0x0a, 0x23, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x20, 0x46, 0x85, 0x02, 0x0a, 0x1a,
+  0xbc, 0xfe, 0xa0, 0x20, 0x64, 0x65, 0x66, 0xc2, 0x6e, 0x65, 0x64, 0x81, 0x28, 0x5f, 0x5f, 0x63,
+  0x6c, 0xb9, 0x22, 0x5e, 0x07, 0x89, 0xca, 0x65, 0x78, 0xac, 0x25, 0x6b, 0x30, 0x70, 0x22, 0x43,
+  0x22, 0x5a, 0x7b, 0x4c, 0xde, 0x6c, 0x85, 0x53, 0x5c, 0xf9, 0x55, 0x04, 0x2a, 0x95, 0x26, 0x2e,
+  0x68, 0xb7, 0x53, 0x06, 0x73, 0x01, 0x1c, 0x6f, 0x6b, 0xf9, 0x63, 0xa2, 0x5b, 0x66, 0x75, 0xb8,
+  0x88, 0x35, 0x6e, 0x2c, 0x26, 0x37, 0x14, 0xa4, 0x76, 0x30, 0x29, 0x6e, 0x4d, 0x3a, 0x56, 0x75,
+  0x66, 0x66, 0x72, 0xac, 0x43, 0x56, 0x7c, 0x1c, 0x51, 0xf6, 0x8d, 0x67, 0x86, 0x22, 0x6d, 0xf5,
+  0x6d, 0x46, 0xb7, 0x49, 0x1c, 0x1e, 0x79, 0x8d, 0x66, 0x1e, 0x51, 0x20, 0x3b, 0x67, 0x5d, 0xf0,
+  0x30, 0x78, 0xed, 0xb3, 0x60, 0x1d, 0x6f, 0x2d, 0x45, 0x24, 0x1b, 0xde, 0x5d, 0x1c, 0xdb, 0x04,
+  0x4b, 0x64, 0x3c, 0x04, 0x61, 0x28, 0x19, 0x56, 0x36, 0xe8, 0xe1, 0xf9, 0xd5, 0x49, 0xd8, 0x15,
+  0xa5, 0x4a, 0x25, 0x7b, 0x28, 0xc1, 0x95, 0x29, 0x2c, 0xbf, 0x96, 0x1f, 0x95, 0x47, 0x86, 0xa3,
+  0x3f, 0x71, 0x94, 0x62, 0x69, 0x54, 0x00, 0xd1, 0x8c, 0x31, 0x1d, 0xaf, 0xf8, 0x9b, 0x50, 0xd5,
+  0x84, 0x3c, 0x78, 0xf9, 0x36, 0x67, 0x2a, 0x7c, 0x7f, 0x16, 0x5f, 0xde, 0xc8, 0x96, 0xb7, 0x52,
+  0xeb, 0xab, 0x61, 0xf5, 0x6f, 0xca, 0x49, 0x1e, 0x2e, 0x64, 0x2e, 0xc7, 0x9f, 0x52, 0x27, 0x01,
+  0xe9, 0x68, 0x56, 0x80, 0x67, 0x56, 0x7a, 0x54, 0x3f, 0x14, 0x01, 0xaf, 0x69, 0x57, 0x68, 0x35,
+  0xd9, 0xa3, 0x1f, 0x5f, 0x07, 0x9d, 0x53, 0xc1, 0xb7, 0x5f, 0xb1, 0xdc, 0x4a, 0xe1, 0xc7, 0x05,
+  0x01, 0x31, 0x09, 0x5b, 0xf8, 0x46, 0x11, 0x20, 0x61, 0x86, 0x1c, 0x6b, 0x87, 0xf7, 0x31, 0x4d,
+  0x66, 0xb7, 0xf8, 0x19, 0x43, 0xa2, 0x75, 0x1e, 0x28, 0x44, 0x3f, 0x8f, 0x23, 0x49, 0x4e, 0x82,
+  0x37, 0xf6, 0xc2, 0x0c, 0x77, 0x18, 0x6e, 0x42, 0x5c, 0x2d, 0xa1, 0x4f, 0x29, 0xa3, 0x27, 0x61,
+  0x70, 0x1d, 0xf6, 0x69, 0x60, 0xd4, 0x98, 0xac, 0xab, 0xfd, 0xac, 0xb8, 0x07, 0x4c, 0x41, 0xd9,
+  0x64, 0x3b, 0xb2, 0x36, 0x74, 0x77, 0xda, 0x16, 0x09, 0xf9, 0x67, 0x2d, 0x04, 0x62, 0x78, 0x15,
+  0x45, 0x2b, 0x7a, 0xb1, 0x2a, 0x6c, 0xa7, 0xa0, 0xe5, 0x23, 0x3f, 0x9b, 0x29, 0x4e, 0x55, 0x4d,
+  0x42, 0x66, 0x14, 0x22, 0x2a, 0xff, 0x4d, 0x60, 0x31, 0x30, 0x30, 0x49, 0x07, 0x20, 0x2b, 0x8b,
+  0xa9, 0x93, 0x31, 0x62, 0x2f, 0xf7, 0x90, 0xac, 0xc4, 0x74, 0xb1, 0x76, 0xa3, 0x15, 0x1f, 0x4e,
+  0x16, 0x32, 0x62, 0x12, 0x07, 0xe6, 0x76, 0x89, 0x94, 0x29, 0x3b, 0xa3, 0x99, 0xe8, 0x79, 0x54,
+  0xc8, 0xd7, 0xe3, 0x6d, 0x26, 0x29, 0x71, 0x47, 0xa2, 0xab, 0xfd, 0xf6, 0x89, 0x64, 0x3b, 0x06,
+  0x4d, 0x4d, 0xf2, 0x86, 0x26, 0x59, 0x5f, 0xb1, 0x85, 0xa9, 0x94, 0x46, 0x2b, 0x4d, 0xc9, 0xef,
+  0xb0, 0xdf, 0x69, 0x61, 0x76, 0xab, 0x27, 0x45, 0xc4, 0x68, 0x61, 0x32, 0xac, 0x20, 0x4e, 0x2d,
+  0x3e, 0x32, 0x5e, 0x4e, 0x20, 0x42, 0x46, 0xce, 0x73, 0x6a, 0x58, 0x5e, 0x34, 0xe2, 0x50, 0x30,
+  0x12, 0x31, 0x65, 0x31, 0xd0, 0x34, 0x34, 0x0a, 0x4b, 0x42, 0x3b, 0x14, 0x28, 0x32, 0x21, 0x34,
+  0x20, 0x02, 0x17, 0x36, 0x84, 0x36, 0x19, 0x44, 0x16, 0x32, 0x45, 0xc3, 0x4d, 0x63, 0x4c, 0x7c,
+  0x63, 0x2e, 0x29, 0xcb, 0x9a, 0x9b, 0x3e, 0x02, 0x63, 0x73, 0x84, 0x6d, 0xe3, 0xf6, 0xad, 0x62,
+  0xa9, 0xab, 0x5a, 0xb2, 0x9a, 0x9b, 0x1f, 0x72, 0x59, 0x7d, 0x39, 0x06, 0x52, 0xb8, 0x4b, 0x56,
+  0x06, 0x65, 0x9f, 0x57, 0x99, 0x6d, 0x7d, 0xdf, 0x5a, 0x3c, 0x58, 0xb8, 0x4a, 0x76, 0x11, 0x74,
+  0x33, 0xe5, 0x06, 0x10, 0xa1, 0xaa, 0x66, 0xa8, 0x2f, 0x50, 0x7d, 0x44, 0x6d, 0x8c, 0x80, 0x9c,
+  0x74, 0xd5, 0x76, 0x61, 0x6c, 0x40, 0x66, 0x36, 0xc8, 0x31, 0x34, 0x2c, 0x58, 0xc7, 0x5b, 0x66,
+  0x4e, 0xb8, 0xba, 0x25, 0x77, 0x5e, 0xe5, 0x02, 0x08, 0xb1, 0x2a, 0x79, 0x6a, 0x2c, 0x59, 0x11,
+  0x3c, 0x61, 0x8a, 0x55, 0x80, 0xe6, 0x6c, 0xdc, 0x78, 0x38, 0x36, 0x62, 0x4c, 0x31, 0xa5, 0x6d,
+  0x0a, 0x5d, 0xa7, 0x7d, 0x8d, 0x1a, 0xa8, 0x0a, 0x3e, 0x8d, 0x86, 0x53, 0x1a, 0x79, 0x81, 0xf1,
+  0x46, 0xb9, 0x65, 0xda, 0x3a, 0x8d, 0x9b, 0x29, 0x95, 0xb9, 0x17, 0xc1, 0x5f, 0x8c, 0xc1, 0x55,
+  0x28, 0x20, 0x8c, 0x34, 0x9b, 0x52, 0x1e, 0x32, 0x2a, 0x98, 0xd5, 0x59, 0x2c, 0x1b, 0x54, 0x42,
+  0x30, 0x16, 0x71, 0x59, 0x2f, 0x24, 0xf8, 0x7a, 0x65, 0x1f, 0xde, 0x89, 0x22, 0x78, 0x44, 0x15,
+  0x39, 0x21, 0xe4, 0x0e, 0xb5, 0xa5, 0x5e, 0x29, 0xb9, 0xc2, 0xd8, 0x66, 0x4a, 0xb5, 0xf6, 0xf3,
+  0x37, 0x97, 0xbd, 0x96, 0x31, 0x95, 0xcd, 0xe5, 0x15, 0x8e, 0x83, 0x87, 0x29, 0x97, 0x1b, 0xad,
+  0xbd, 0x5d, 0x63, 0xa1, 0x18, 0x27, 0x8b, 0x63, 0x02, 0x27, 0x1e, 0x62, 0x79, 0x93, 0xa3, 0x3d,
+  0x72, 0x6f, 0x6d, 0x65, 0x3d, 0x34, 0x5a, 0x6d, 0x36, 0x71, 0x9b, 0xca, 0x09, 0xc5, 0x64, 0x79,
+  0x1e, 0x0f, 0xc6, 0x3f, 0xd5, 0x84, 0xe8, 0x46, 0x91, 0x47, 0x27, 0x77, 0x63, 0xa9, 0x27, 0x45,
+  0x99, 0x2a, 0x8b, 0xf5, 0x45, 0x7c, 0x2e, 0xed, 0xa6, 0x86, 0x1f, 0xd2, 0x4f, 0x7c, 0x67, 0x75,
+  0xc7, 0x5e, 0xa4, 0xcd, 0x25, 0x78, 0x68, 0x06, 0x57, 0x63, 0x15, 0xa5, 0xb0, 0x75, 0xb3, 0x18,
+  0x20, 0x3e, 0x3d, 0x99, 0xf1, 0x42, 0x9e, 0x20, 0x86, 0xa4, 0x28, 0x74, 0x6b, 0xb6, 0x38, 0x29,
+  0x98, 0x49, 0x74, 0x23, 0x41, 0x2a, 0x20, 0x59, 0x3a, 0xb2, 0xda, 0x67, 0x78, 0x14, 0x46, 0x44,
+  0x1f, 0xd9, 0xe0, 0x84, 0x5d, 0x32, 0x2c, 0x4b, 0x79, 0xc0, 0x46, 0x72, 0xc3, 0x1e, 0xec, 0x74,
+  0xd5, 0xa1, 0x6f, 0x97, 0xdc, 0xb5, 0x5f, 0xf9, 0xb5, 0xde, 0x5b, 0xef, 0xdc, 0x50, 0xd9, 0xb7,
+  0x29, 0x01, 0x99, 0xf9, 0xde, 0xe2, 0x7b, 0xb0, 0x5e, 0xbb, 0xe6, 0x9a, 0x68, 0xf3, 0x86, 0x64,
+  0x67, 0x95, 0x4a, 0x9f, 0xf6, 0xc3, 0x96, 0x36, 0xf6, 0x0e, 0xf1, 0xa5, 0x5f, 0x58, 0xf0, 0xdd,
+  0xcc, 0x54, 0xf0, 0x01, 0x7f, 0x2a, 0x25, 0x73, 0xe3, 0xb4, 0x5b, 0x68, 0x37, 0x75, 0x21, 0x9d,
+  0x98, 0xf2, 0x8c, 0x2b, 0x65, 0x41, 0x67, 0xb4, 0x29, 0xd9, 0x65, 0x71, 0x75, 0x68, 0xb1, 0x1b,
+  0x77, 0xd5, 0xf5, 0xc3, 0x49, 0x20, 0x5b, 0x9f, 0x4c, 0x26, 0xe7, 0xe4, 0xc0, 0x65, 0xc9, 0x54,
+  0x68, 0x4b, 0x26, 0xa9, 0x06, 0x6e, 0xf1, 0x13, 0xf0, 0xf6, 0x72, 0x69, 0xa1, 0x7e, 0x86, 0x2d,
+  0x5a, 0x1e, 0x7e, 0x6d, 0x51, 0x56, 0xa4, 0x80, 0x42, 0x95, 0x97, 0x3f, 0xd9, 0xd7, 0xd7, 0x43,
+  0x45, 0xaf, 0x01, 0x9c, 0xdb, 0xb4, 0x1a, 0x06, 0x3a, 0x4d, 0x98, 0x3a, 0xb4, 0x85, 0x75, 0x70,
+  0x7c, 0xd6, 0x07, 0xa7, 0xed, 0x6a, 0x33, 0x65, 0x83, 0x41, 0x58, 0x5f, 0x49, 0x4e, 0x50, 0xd7,
+  0x54, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x81, 0x7c, 0x0d, 0xf5, 0x80, 0xab, 0x35, 0x65, 0x7a,
+  0xbd, 0xc7, 0x65, 0x58, 0x7c, 0xb3, 0x5f, 0x6d, 0x6e, 0x66, 0xed, 0x71, 0x4d, 0x28, 0xac, 0x73,
+  0x9e, 0xf3, 0x97, 0x06, 0x62, 0xca, 0xef, 0xc5, 0x29, 0xbb, 0xdf, 0xa5, 0xe5, 0x85, 0x3e, 0x6e,
+  0xb0, 0xd6, 0xaf, 0x7a, 0xaa, 0x35, 0xf5, 0x9c, 0xe6, 0x9b, 0x75, 0x07, 0xc6, 0x65, 0x89, 0x7f,
+  0x7d, 0xc3, 0xc4, 0x4a, 0x63, 0x42, 0x89, 0x73, 0x61, 0xb8, 0x35, 0x26, 0x3c, 0x3d, 0x47, 0x4b,
+  0x4f, 0x6e, 0x14, 0x98, 0x10, 0x4f, 0x91, 0xbd, 0x3d, 0x01, 0x91, 0x5f, 0x30, 0xe1, 0x39, 0xa6,
+  0xc1, 0x9b, 0x47, 0xce, 0x72, 0x73, 0xda, 0xdc, 0x8b, 0xa5, 0x9f, 0x76, 0xd5, 0xa7, 0x6b, 0x97,
+  0x28, 0x59, 0x53, 0x4d, 0x55, 0x28, 0x60, 0x14, 0x75, 0x0e, 0x17, 0xdd, 0x01, 0x53, 0x31, 0x61,
+  0x9b, 0xa3, 0x03, 0x69, 0x0a, 0xca, 0x81, 0x4f, 0x97, 0xd7, 0x7d, 0x65, 0xab, 0x9f, 0xcc, 0xb3,
+  0x0f, 0x69, 0xc9, 0xdd, 0x89, 0xf9, 0x77, 0xba, 0x81, 0xf5, 0xaa, 0x39, 0xef, 0xc9, 0x8b, 0x2e,
+  0xcf, 0x77, 0x95, 0xd9, 0x5f, 0xf7, 0x2e, 0xa1, 0x18, 0x49, 0x5f, 0xbd, 0xe7, 0xaf, 0x17, 0x6c,
+  0x90, 0xe1, 0x07, 0xa6, 0x6a, 0xcd, 0xee, 0x67, 0x68, 0x2c, 0x88, 0x03, 0x7f, 0x64, 0x90, 0xff,
+  0x77, 0x67, 0x6e, 0xc9, 0xab, 0xf2, 0x8b, 0x5a, 0x38, 0x55, 0x57, 0x14, 0x78, 0x81, 0x5c, 0x72,
+  0x44, 0x76, 0x49, 0x66, 0xda, 0x28, 0x3c, 0x30, 0xd7, 0x22, 0xd3, 0xd9, 0xaf, 0x79, 0x89, 0x91,
+  0x7d, 0xc1, 0x05, 0x6d, 0x51, 0xd1, 0x5a, 0x74, 0x79, 0xb0, 0x85, 0x09, 0x6d, 0xaa, 0x5f, 0x27,
+  0x86, 0xc7, 0xa6, 0x33, 0x93, 0xdd, 0x99, 0x03, 0xd5, 0xef, 0xdc, 0x5b, 0x18, 0x61, 0xe6, 0x61,
+  0x67, 0x79, 0xf6, 0xd0, 0xa6, 0x85, 0x5a, 0xed, 0x6a, 0x7d, 0x21, 0x1f, 0x17, 0xc4, 0x99, 0xe1,
+  0xd5, 0x74, 0x6e, 0x5b, 0x98, 0xb0, 0xca, 0x65, 0x5b, 0x84, 0xa3, 0x14, 0x08, 0x6c, 0x6f, 0x77,
+  0x65, 0x78, 0x5f, 0x0c, 0xc7, 0x45, 0xa1, 0xb9, 0x7d, 0x6c, 0xac, 0x59, 0xe3, 0x39, 0x69, 0x82,
+  0x69, 0x82, 0x80, 0xbf, 0x37, 0x23, 0xdb, 0x66, 0x16, 0x24, 0x65, 0x42, 0x7c, 0xc5, 0x6a, 0x74,
+  0x3a, 0xe3, 0x77, 0x45, 0x6a, 0x7d, 0xe3, 0x2d, 0x41, 0x4b, 0xc2, 0x3f, 0x6f, 0x97, 0xef, 0xf3,
+  0xc9, 0xec, 0x9a, 0x41, 0x64, 0x99, 0xfa, 0x50, 0x9f, 0xa0, 0xda, 0xcd, 0xb6, 0xa9, 0xd1, 0xda,
+  0xde, 0x6b, 0x7e, 0xc1, 0xea, 0x5a, 0xf7, 0xe3, 0x28, 0x30, 0x78, 0x37, 0x45, 0x49, 0x01, 0xbb,
+  0x36, 0xe5, 0xbc, 0x0e, 0xac, 0x31, 0x31, 0x33, 0x20, 0x39, 0x32, 0x39, 0x20, 0x32, 0x9e, 0x65,
+  0x37, 0x91, 0xe3, 0x6a, 0x43, 0x4f, 0x4d, 0xb2, 0xd1, 0x01, 0x42, 0x55, 0xfe, 0x1d, 0x34, 0x28,
+  0xe4, 0xb5, 0xeb, 0x26, 0x76, 0x28, 0x28, 0x6a, 0x3a, 0x06, 0x5c, 0x67, 0xb1, 0x65, 0x72, 0x27,
+  0x2e, 0x3e, 0x20, 0x62, 0x03, 0xe0, 0x3f, 0x41, 0xe6, 0x3a, 0x70, 0x59, 0x2b, 0x96, 0x15, 0x29,
+  0x2f, 0x32, 0x35, 0x35, 0x51, 0x1f, 0xfe, 0x29, 0xfd, 0xc9, 0x9f, 0x9f, 0x2f, 0x6a, 0x71, 0xed,
+  0x50, 0xef, 0x66, 0x8b, 0xd7, 0xa1, 0xd7, 0x19, 0xb7, 0x06, 0xe8, 0xab, 0x56, 0x87, 0xbe, 0x34,
+  0xef, 0x71, 0x6b, 0x69, 0x91, 0x1a, 0x42, 0x79, 0x71, 0x57, 0x69, 0xb4, 0xb3, 0x9a, 0x22, 0x77,
+  0x6a, 0x52, 0xd7, 0x21, 0xb8, 0x49, 0x17, 0x22, 0x6c, 0x7c, 0xc2, 0x48, 0x26, 0x72, 0x68, 0x0c,
+  0x5b, 0xdb, 0x5f, 0x0f, 0x52, 0x4b, 0x83, 0xde, 0xf1, 0x75, 0x9b, 0x20, 0x3e, 0xe7, 0x5a, 0xf2,
+  0x8c, 0x29, 0x5a, 0x75, 0x94, 0xc5, 0xd7, 0x38, 0x6e, 0xb0, 0x99, 0xd1, 0xad, 0x09, 0xd5, 0x53,
+  0x1f, 0xac, 0x72, 0xe1, 0x67, 0x5a, 0x94, 0xc4, 0x8b, 0x27, 0x99, 0x6d, 0x7d, 0xa7, 0x86, 0x4d,
+  0xd9, 0xfa, 0xb0, 0xcb, 0xd5, 0x85, 0x29, 0xd7, 0x7f, 0x5a, 0xff, 0xec, 0xd1, 0xb5, 0xd1, 0x65,
+  0x41, 0x48, 0xf6, 0x99, 0x57, 0x2d, 0x08, 0xec, 0x9e, 0xc0, 0xd4, 0x5b, 0xb9, 0xc5, 0x28, 0xce,
+  0xe1, 0x95, 0x8b, 0x17, 0x95, 0x71, 0xbf, 0x35, 0x15, 0xeb, 0xc6, 0x4e, 0x76, 0xd6, 0x6f, 0x6b,
+  0x8f, 0xab, 0x96, 0x25, 0x6a, 0x9d, 0xf1, 0xf7, 0x0a, 0x59, 0xe8, 0x8e, 0x93, 0x63, 0x85, 0xd8,
+  0x45, 0x6a, 0xcf, 0x97, 0x9a, 0xdb, 0x2c, 0x9b, 0x3f, 0x72, 0xcd, 0x7e, 0x70, 0xdb, 0x6d, 0xae,
+  0x9b, 0x5f, 0x6b, 0x8a, 0x1d, 0x9a, 0x76, 0xef, 0x9d, 0xb3, 0x96, 0x09, 0x9b, 0xbd, 0x9e, 0xcb,
+  0xdf, 0x87, 0x2c, 0xb5, 0xe1, 0x5d, 0x62, 0x79, 0xbd, 0x3b, 0x00, 0x74, 0x6f, 0xf1, 0x28, 0x98,
+  0x9a, 0x0b, 0xb9, 0x9f, 0x8a, 0x1e, 0x27, 0x86, 0x4b, 0x2e, 0xcf, 0x44, 0x2b, 0x99, 0xdb, 0xb3,
+  0x4d, 0xf7, 0x5e, 0x7b, 0x28, 0x83, 0x7f, 0x53, 0xd5, 0xd3, 0x20, 0xcf, 0xe5, 0x9f, 0xa5, 0xeb,
+  0x69, 0x9a, 0x6b, 0x19, 0x77, 0x27, 0x62, 0x3c, 0x07, 0x65, 0x6c, 0x63, 0xa5, 0x17, 0x9a, 0xb6,
+  0x10, 0xaa, 0x63, 0x19, 0x68, 0x72, 0x99, 0x99, 0xba, 0x59, 0x5e, 0x2c, 0x94, 0xae, 0x75, 0x45,
+  0xa2, 0x95, 0x77, 0x38, 0xf2, 0x2d, 0x4f, 0x51, 0x73, 0xb1, 0x6f, 0x36, 0xff, 0x57, 0x0d, 0x45,
+  0x6f, 0xf7, 0x47, 0x5c, 0xdf, 0x15, 0x73, 0x2e, 0x8b, 0x61, 0x19, 0x37, 0x45, 0xcf, 0x8d, 0x6e,
+  0xdd, 0x13, 0xba, 0x55, 0xe3, 0x36, 0xb0, 0xbc, 0x00, 0x1a, 0x2d, 0x17, 0xfc, 0x2e, 0x22, 0x5e,
+  0xd5, 0x16, 0x9d, 0x58, 0xb2, 0x53, 0x69, 0x3a, 0xa8, 0xed, 0x6f, 0xe6, 0x71, 0x1e, 0x65, 0xb1,
+  0xf3, 0xbb, 0x25, 0xf5, 0x83, 0x6f, 0x63, 0x80, 0x0d, 0x79, 0x89, 0x9b, 0xd1, 0xfb, 0x72, 0xf9,
+  0x03, 0x7c, 0x7b, 0x29, 0x2b, 0x7e, 0x33, 0x25, 0x87, 0xcf, 0xbc, 0x15, 0xdb, 0xa6, 0x47, 0x18,
+  0x6e, 0x83, 0xb9, 0xfd, 0x6d, 0x36, 0x22, 0x31, 0x22, 0xa8, 0x33, 0xa7, 0x66, 0x89, 0xc1, 0x24,
+  0x67, 0x87, 0xf3, 0x3e, 0x99, 0x48, 0x9d, 0x57, 0x56, 0x7d, 0x82, 0x42, 0x3c, 0x1e, 0x30, 0xc9,
+  0xf1, 0x95, 0x5d, 0x4c, 0xf5, 0x08, 0xc6, 0x6e, 0xe0, 0x12, 0xdb, 0xdc, 0x7f, 0x43, 0x43, 0x83,
+  0xd9, 0x7f, 0x52, 0x41, 0x54, 0x90, 0xef, 0x44, 0x2d, 0x46, 0x41, 0x55, 0x4c, 0x54, 0xf1, 0x89,
+  0x9a, 0x1c, 0xe8, 0x6f, 0x89, 0x63, 0x29, 0xaa, 0x77, 0xd5, 0xe9, 0x01, 0x1b, 0x2e, 0x76, 0x09,
+  0x9f, 0xbd, 0x5e, 0x22, 0xe7, 0x8b, 0xe9, 0x76, 0x21, 0x69, 0xf1, 0xb1, 0x93, 0xb3, 0x95, 0xb1,
+  0x5f, 0xa9, 0x8a, 0x11, 0x64, 0x74, 0x46, 0x65, 0xb6, 0xa7, 0x9a, 0xec, 0xa3, 0xe9, 0xa0, 0xbc,
+  0x6a, 0x61, 0x2b, 0x7f, 0x06, 0x25, 0xc7, 0x2e, 0xaf, 0x8d, 0x4b, 0xb1, 0xbd, 0xae, 0x39, 0x55,
+  0xad, 0x55, 0xda, 0x71, 0x04, 0x25, 0xa2, 0x17, 0x6c, 0xb1, 0x5b, 0x9d, 0x51, 0x22, 0x51, 0xbf,
+  0x30, 0x83, 0x55, 0x7b, 0x37, 0x25, 0xd6, 0x6f, 0x99, 0x26, 0x0d, 0x94, 0x6b, 0x6f, 0x6b, 0x01,
+  0x72, 0x77, 0x68, 0x1a, 0x07, 0x99, 0x32, 0xec, 0x66, 0xa7, 0xbd, 0x3f, 0xd2, 0xd9, 0xde, 0xa3,
+  0x99, 0x6a, 0x95, 0xdb, 0x25, 0xd9, 0xee, 0x42, 0x42, 0xc5, 0x7b, 0x38, 0x2d, 0x25, 0xf3, 0x58,
+  0xf5, 0xa5, 0xa8, 0x6d, 0x6f, 0x58, 0x67, 0x6d, 0x94, 0x86, 0x53, 0x94, 0xc9, 0x9a, 0x79, 0x70,
+  0x64, 0x10, 0x77, 0x78, 0x29, 0xed, 0xa6, 0x6d, 0xc0, 0xa7, 0x95, 0x8d, 0xb4, 0x21, 0x6a, 0x27,
+  0xe4, 0x33, 0x63, 0x2a, 0x61, 0x18, 0x27, 0x2d, 0x73, 0x2b, 0xa6, 0x9d, 0x8d, 0x9f, 0x91, 0x6a,
+  0xe7, 0xad, 0x57, 0x35, 0x6b, 0xeb, 0x64, 0x2e, 0xc7, 0xe0, 0x2c, 0x69, 0xef, 0xfd, 0xac, 0x3b,
+  0xa6, 0x9e, 0xed, 0xf1, 0x64, 0x36, 0x5d, 0x8b, 0xe3, 0x1a, 0x52, 0xe5, 0x2b, 0xa7, 0x14, 0xc9,
+  0x19, 0xc7, 0x3a, 0x67, 0x5d, 0x2e, 0x90, 0x7e, 0x9d, 0xd9, 0xd7, 0x6d, 0x5a, 0x19, 0x5f, 0x13,
+  0x89, 0xab, 0x5b, 0x19, 0xdf, 0xd0, 0x8d, 0xa1, 0xfe, 0x27, 0x0d, 0xb9, 0x25, 0xf7, 0xf9, 0x0d,
+  0xb9, 0xea, 0x6d, 0xb7, 0xfe, 0x2c, 0x0d, 0x6b, 0x74, 0x47, 0xe1, 0x74, 0xf9, 0x13, 0xa7, 0xf7,
+  0x4f, 0xc6, 0x65, 0xb1, 0x13, 0x62, 0x72, 0x2b, 0x9a, 0xa6, 0x6b, 0x69, 0x68, 0x59, 0x38, 0x1c,
+  0x03, 0xde, 0xf2, 0xf5, 0xd5, 0xfd, 0x70, 0xcb, 0x69, 0x95, 0x76, 0x42, 0xbe, 0x6d, 0x5f, 0x26,
+  0xc3, 0xd6, 0xaa, 0xbe, 0xa1, 0x8b, 0xff, 0x79, 0x39, 0x41, 0xc5, 0x6c, 0xfb, 0x5a, 0x13, 0xc9,
+  0xfd, 0x8b, 0xf9, 0xb6, 0x5f, 0x67, 0xa6, 0x13, 0x0b, 0x2a, 0x86, 0x50, 0xe7, 0xc0, 0x6b, 0xc6,
+  0x77, 0x53, 0xbf, 0x67, 0xe5, 0xfc, 0x93, 0xd9, 0x40, 0x75, 0x16, 0x25, 0xe3, 0xcb, 0x78, 0x86,
+  0x7b, 0x79, 0xdd, 0x13, 0x85, 0xc9, 0x28, 0xd5, 0x6d, 0xbd, 0xb4, 0x67, 0x63, 0x57, 0x95, 0xdb,
+  0x3f, 0x01, 0x37, 0x4e, 0x65, 0x77, 0xf2, 0x03, 0xde, 0xa7, 0xe3, 0x89, 0x6f, 0x6c, 0xfd, 0x3b,
+  0x97, 0x7e, 0xf7, 0x11, 0xd1, 0x6e, 0x62, 0xfa, 0x2e, 0x19, 0x7e, 0x8f, 0x0b, 0xda, 0x29, 0x61,
+  0xfa, 0x3e, 0x0d, 0xdf, 0x77, 0x57, 0x8e, 0x1f, 0x9b, 0x8b, 0xed, 0xa5, 0x14, 0xda, 0xbb, 0x49,
+  0x27, 0x9e, 0x1b, 0x78, 0xe9, 0xf5, 0x6e, 0xfc, 0x71, 0xed, 0xf8, 0x61, 0x17, 0x67, 0x72, 0x7e,
+  0x12, 0x9b, 0x47, 0x5d, 0x2b, 0xaa, 0x9d, 0xff, 0x1b, 0x6e, 0x66, 0x97, 0x7b, 0x9e, 0x04, 0xf3,
+  0xb9, 0x9e, 0x5f, 0x61, 0xa2, 0x1f, 0xa9, 0xa2, 0x81, 0xde, 0xe3, 0xab, 0xdf, 0xa7, 0x0d, 0x55,
+  0xc4, 0x50, 0xbb, 0x77, 0xd2, 0xfa, 0x0d, 0x3a, 0x64, 0x57, 0x45, 0xc3, 0x87, 0x29, 0xbc, 0x3b,
+  0xab, 0xa1, 0x44, 0xbb, 0x2a, 0xcf, 0x7f, 0x9a, 0x49, 0xda, 0xa4, 0x83, 0x62, 0x73, 0x77, 0x4b,
+  0x47, 0x56, 0x12, 0x7a, 0xbc, 0xb9, 0xd8, 0x7e, 0x77, 0x27, 0xb9, 0x6b, 0xe3, 0x8b, 0x9b, 0xb3,
+  0x73, 0x0d, 0x6e, 0xda, 0x8c, 0x9e, 0xdd, 0x5e, 0x10, 0xd7, 0xaf, 0xab, 0x67, 0xb3, 0xb6, 0x03,
+  0x7a, 0x3d, 0x9f, 0x87, 0xdb, 0xa5, 0x5b, 0x11, 0x3a, 0x72, 0x4d, 0x8d, 0xf5, 0xeb, 0x9f, 0x31,
+  0x66, 0x99, 0x99, 0x38, 0xbe, 0x24, 0xfb, 0xee, 0x1a, 0x69, 0xe2, 0x77, 0xdf, 0x86, 0x89, 0xab,
+  0x3a, 0x2d, 0x5a, 0x73, 0x1a, 0x48, 0x9b, 0x40, 0xd7, 0x3f, 0x51, 0xb0, 0x72, 0xac, 0x6f, 0x65,
+  0x48, 0x5f, 0xec, 0x51, 0xa6, 0xa1, 0x71, 0xfb, 0x76, 0x65, 0x5f, 0x6b, 0xb7, 0x67, 0x50, 0x08,
+  0x22, 0x6e, 0xa7, 0xb5, 0xc3, 0xa9, 0xef, 0x99, 0x2b, 0x9a, 0x71, 0x7b, 0x28, 0xfb, 0x29, 0x67,
+  0xe8, 0xa3, 0xd6, 0xe9, 0xc7, 0x55, 0xa5, 0x1d, 0xeb, 0x6d, 0x4f, 0x5c, 0x04, 0x70, 0xb1, 0x45,
+  0x8d, 0xb4, 0x1b, 0xf6, 0x72, 0x82, 0xd0, 0x6d, 0x95, 0x0c, 0xc0, 0x49, 0x96, 0xb1, 0xa6, 0xca,
+  0x8d, 0xc9, 0xb2, 0x99, 0x6e, 0xb7, 0x45, 0x17, 0x61, 0x6b, 0x6d, 0x79, 0x96, 0xcc, 0xa3, 0x07,
+  0xd6, 0x56, 0xad, 0xf1, 0xae, 0x69, 0x91, 0xdb, 0xe6, 0x43, 0xdd, 0x8b, 0xf1, 0x5f, 0xae, 0xd9,
+  0x71, 0xf7, 0xe5, 0x69, 0xbf, 0xe4, 0x5b, 0xb6, 0x6a, 0x44, 0xf2, 0x9d, 0xa7, 0xb2, 0x31, 0xd2,
+  0x33, 0xdb, 0x26, 0x6d, 0xf0, 0xfc, 0x74, 0xd5, 0x34, 0x85, 0x6e, 0xe2, 0xed, 0xe7, 0xbc, 0x2f,
+  0xe7, 0xb3, 0xd3, 0xf6, 0xae, 0x79, 0xe7, 0xec, 0xdd, 0xf7, 0xcf, 0x6f, 0x1b, 0x74, 0x25, 0xc9,
+  0xa4, 0xf7, 0x77, 0x7f, 0x3d, 0x19, 0xb5, 0xe9, 0x37, 0xc7, 0x71, 0x64, 0x49, 0x27, 0x0f, 0xe7,
+  0x85, 0x6b, 0xe2, 0x35, 0xd1, 0xe6, 0x68, 0x7c, 0x2c, 0x53, 0x33, 0x65, 0x6e, 0x20, 0x76, 0x86,
+  0xb9, 0x5d, 0x97, 0x18, 0xaa, 0x51, 0x91, 0x8d, 0x3d, 0xa9, 0x1e, 0x85, 0xf5, 0xf3, 0xae, 0x8b,
+  0xcf, 0xe7, 0xe9, 0x71, 0x55, 0x80, 0x3d, 0xae, 0x9f, 0xc9, 0xf1, 0x4e, 0xf3, 0xf3, 0x0d, 0x74,
+  0x67, 0xd3, 0xa9, 0x07, 0x96, 0x70, 0x2e, 0xa1, 0x70, 0x16, 0x68, 0x21, 0x75, 0x6c, 0xaf, 0xce,
+  0x01, 0x9b, 0x39, 0xf9, 0x5a, 0x7a, 0x50, 0xf5, 0xcd, 0x6b, 0x98, 0x78, 0x9b, 0xe7, 0x41, 0x6c,
+  0x77, 0x61, 0x79, 0x73, 0xeb, 0x77, 0xff, 0xe2, 0xf1, 0xa6, 0xf1, 0xdb, 0x9d, 0xbd, 0xae, 0xcb,
+  0x37, 0xae, 0x6b, 0xa3, 0x75, 0xe1, 0x66, 0xae, 0x9e, 0x7b, 0x55, 0xbf, 0x55, 0x9b, 0xd4, 0x3f,
+  0x53, 0xf6, 0xba, 0x6d, 0x8d, 0xb8, 0x21, 0xde, 0xcb, 0xc9, 0x6b, 0xb2, 0xf1, 0xb6, 0xbb, 0x3e,
+  0xa9, 0x6a, 0x77, 0x7d, 0xdb, 0xe5, 0x9e, 0xb9, 0x55, 0xeb, 0x68, 0xe7, 0xf7, 0xae, 0x7e, 0x81,
+  0x6b, 0xe6, 0x09, 0x9e, 0xe8, 0xe5, 0xee, 0x68, 0x7b, 0x9a, 0x1e, 0x13, 0xac, 0xd1, 0xf6, 0xbe,
+  0x2f, 0x35, 0x7f, 0xa6, 0x4f, 0xbc, 0x83, 0x53, 0x54, 0x7f, 0x45, 0x41, 0x4d, 0xd7, 0xc3, 0xbe,
+  0x2c, 0x20, 0x36, 0x34, 0x20, 0x28, 0x28, 0x78, 0x90, 0x5e, 0x3c, 0x0c, 0xf9, 0x4f, 0xf3, 0x6b,
+  0x2d, 0x33, 0x29, 0xb4, 0x41, 0x93, 0x34, 0x29, 0x79, 0xe6, 0x95, 0xf9, 0x6a, 0x2e, 0xa1, 0x67,
+  0x7e, 0xa8, 0xc1, 0xc7, 0x28, 0x98, 0xe4, 0x81, 0x55, 0x09, 0x90, 0xfa, 0xce, 0xa5, 0x78, 0x33,
+  0xc9, 0x5f, 0x74, 0x57, 0x1f, 0xaa, 0x96, 0x23, 0xa3, 0x33, 0x46, 0x2f, 0xa6, 0xe4, 0xc7, 0xe5,
+  0xbc, 0x21, 0x96, 0x16, 0x86, 0x8f, 0xc5, 0x4d, 0x63, 0x0e, 0x20, 0x12, 0x2e, 0x61, 0x74, 0x1a,
+  0x60, 0x1c, 0x74, 0xdd, 0x11, 0x3a, 0x79, 0xb6, 0xca, 0xa2, 0x2b, 0x4e, 0x75, 0x6f, 0x9c, 0xb3,
+  0x6c, 0x62, 0x5d, 0xd8, 0x6c, 0x7e, 0x72, 0x89, 0x17, 0x11, 0x12, 0x21, 0x7b, 0xfd, 0x87, 0xd7,
+  0x46, 0xe9, 0x19, 0xa7, 0x95, 0xe2, 0x52, 0x7a, 0x6d, 0x24, 0xcd, 0x4e, 0x95, 0x1a, 0x69, 0xaa,
+  0x36, 0xcf, 0x95, 0xd6, 0x29, 0x7b, 0x50, 0xcd, 0x0f, 0x97, 0x9c, 0xea, 0xfb, 0x59, 0xeb, 0x2f,
+  0x57, 0xa3, 0xdd, 0xf7, 0x2d, 0x57, 0x54, 0xd8, 0x3d, 0x4c, 0x7f, 0x62, 0x85, 0x97, 0x20, 0xe9,
+  0x6f, 0x36, 0x44, 0x4c, 0x4c, 0xaa, 0x9a, 0x4d, 0x64, 0x36, 0xf2, 0x65, 0x77, 0x53, 0x5f, 0xd7,
+  0x30, 0x6d, 0x6d, 0x48, 0xf6, 0x6f, 0x64, 0x6a, 0xa8, 0x6d, 0xb6, 0xeb, 0x5e, 0x1d, 0xf1, 0xf9,
+  0x99, 0x3a, 0x8e, 0x8d, 0x25, 0x81, 0xe0, 0x7b, 0xca, 0x9f, 0x78, 0x03, 0x11, 0x62, 0x9e, 0x5b,
+  0xca, 0xf7, 0xc8, 0x5d, 0x3b, 0x1d, 0x7d, 0xc9, 0xa7, 0x9c, 0x00, 0xf3, 0xe6, 0xc5, 0x8f, 0xce,
+  0xb3, 0xb5, 0x47, 0x25, 0xf2, 0x7b, 0xe7, 0x73, 0xf0, 0xa9, 0x77, 0xbe, 0x2d, 0x3d, 0x69, 0x9d,
+  0xcb, 0x3d, 0x62, 0x43, 0x7e, 0x95, 0x2b, 0xb3, 0xf6, 0xd3, 0x24, 0x61, 0xd4, 0xca, 0x13, 0xc4,
+  0x50, 0x0a, 0x66, 0x29, 0x17, 0x85, 0x63, 0x2a, 0x16, 0xbb, 0x65, 0x6e, 0x52, 0x03, 0xe3, 0x9a,
+  0xd6, 0x39, 0x5a, 0x0d, 0x96, 0x47, 0xd5, 0x8e, 0x1d, 0x8f, 0x05, 0x97, 0x95, 0x09, 0x66, 0x75,
+  0x91, 0x08, 0xc9, 0xcd, 0xc0, 0x91, 0x74, 0x6b, 0xd9, 0x1d, 0xd6, 0x97, 0xf0, 0x36, 0x6e, 0xdb,
+  0x60, 0x3b, 0x78, 0x9e, 0x68, 0x36, 0x2d, 0xd9, 0x56, 0xa3, 0x4f, 0x1a, 0x29, 0x3d, 0x3f, 0x56,
+  0x53, 0x0a, 0x8a, 0x25, 0x79, 0x10, 0x6b, 0x0e, 0xdd, 0x0d, 0x6d, 0x08, 0x17, 0xd9, 0x0b, 0x95,
+  0xb9, 0xfd, 0x25, 0x1a, 0x79, 0x24, 0xf5, 0xdd, 0x6f, 0x59, 0xad, 0x36, 0xb8, 0x51, 0xd6, 0xca,
+  0xb5, 0x31, 0x55, 0xe8, 0xaf, 0xe3, 0x6a, 0xb8, 0xe1, 0xd5, 0x17, 0x9e, 0xa1, 0x61, 0xcb, 0xa3,
+  0xe3, 0x4f, 0x2d, 0x72, 0x4d, 0xb7, 0xfc, 0x57, 0xf4, 0x01, 0xb7, 0x77, 0x03, 0x3e, 0xfb, 0x9d,
+  0xd2, 0xb2, 0xc8, 0x66, 0x44, 0x69, 0x7e, 0xda, 0x0d, 0x95, 0x41, 0x99, 0x62, 0xd9, 0xdf, 0x49,
+  0x42, 0x31, 0x86, 0xc6, 0x79, 0xac, 0x83, 0xd2, 0xc7, 0xdc, 0xbb, 0x81, 0x41, 0x82, 0xfe, 0x70,
+  0x1e, 0x76, 0x8b, 0x0b, 0x7e, 0x9d, 0x97, 0xa8, 0xbb, 0x21, 0x67, 0x6f, 0xf2, 0xe8, 0x38, 0x6e,
+  0x2c, 0x4b, 0x27, 0x93, 0x13, 0x27, 0x49, 0x6e, 0xb8, 0xc6, 0x29, 0x6d, 0x68, 0x04, 0x5d, 0xe5,
+  0xbe, 0x7e, 0xfa, 0x37, 0x0d, 0xbb, 0x28, 0x1f, 0x6f, 0x30, 0xa3, 0x2b, 0x7c, 0x71, 0x79, 0x22,
+  0x21, 0x45, 0x52, 0xaa, 0x74, 0xff, 0xa3, 0xb4, 0x59, 0x9d, 0xe5, 0x7f, 0x66, 0x57, 0xa9, 0xc7,
+  0xf6, 0xe0, 0x35, 0xdd, 0x4b, 0x42, 0x29, 0xd1, 0x75, 0x85, 0xda, 0x0f, 0x76, 0x6d, 0xa6, 0xab,
+  0x69, 0xd9, 0x39, 0xd7, 0xe8, 0xe5, 0xd5, 0x1f, 0xba, 0x39, 0xbf, 0x6a, 0xb2, 0xe2, 0x87, 0xe6,
+  0xd4, 0xe7, 0x56, 0x79, 0x75, 0x5b, 0x7a, 0x29, 0x99, 0xf9, 0xbd, 0x9f, 0xbc, 0x05, 0xa0, 0x27,
+  0x7b, 0x06, 0xf6, 0x27, 0xb6, 0x75, 0x75, 0x81, 0xbe, 0x37, 0x2b, 0x76, 0xa7, 0x6a, 0x7c, 0xca,
+  0x93, 0x95, 0x84, 0xb6, 0x8f, 0xf5, 0x69, 0x28, 0xaa, 0xe7, 0xc5, 0x6a, 0xbc, 0x31, 0xad, 0xbc,
+  0x71, 0x82, 0x49, 0xf1, 0x50, 0xa6, 0x57, 0x97, 0x9f, 0x55, 0x28, 0x06, 0x6a, 0xae, 0x5b, 0xbe,
+  0xc4, 0xa3, 0xa3, 0x69, 0x85, 0x95, 0x97, 0x96, 0x47, 0xa4, 0x2b, 0x1e, 0x75, 0xa7, 0x49, 0x6f,
+  0x36, 0x9f, 0x9b, 0x9c, 0xb5, 0x6b, 0xee, 0x7f, 0xe7, 0x6b, 0xbd, 0x6b, 0xdf, 0xd7, 0x41, 0xec,
+  0xf7, 0xdb, 0xf9, 0x79, 0xed, 0xc7, 0xe7, 0xff, 0x2b, 0xbb, 0x9a, 0xb2, 0x89, 0x7f, 0xf3, 0x47,
+  0xd6, 0xcd, 0x7a, 0x53, 0xc9, 0x37, 0x67, 0x50, 0xb9, 0xd7, 0xf7, 0xff, 0x76, 0x25, 0x6a, 0x82,
+  0xe3, 0xf7, 0x66, 0x81, 0x9b, 0x37, 0x7d, 0xfe, 0x2b, 0xeb, 0x4d, 0x99, 0xf7, 0x39, 0x6b, 0xd9,
+  0x2d, 0xc7, 0x5f, 0xfe, 0x36, 0xc7, 0xdd, 0x9d, 0xa6, 0xf3, 0xe6, 0xcb, 0xb9, 0xe6, 0x1a, 0xfd,
+  0xb2, 0xfd, 0x9a, 0xb6, 0xfb, 0x56, 0x27, 0xad, 0xc1, 0xb6, 0xbe, 0x6e, 0x85, 0x7f, 0x3c, 0xc5,
+  0x87, 0x61, 0x76, 0x97, 0xad, 0x36, 0x23, 0xce, 0x8f, 0xda, 0x39, 0xf9, 0xfb, 0x99, 0x55, 0xdb,
+  0xcf, 0x6a, 0x75, 0x33, 0x94, 0x1a, 0x0a, 0x6c, 0xfe, 0x25, 0xa3, 0x5e, 0xbc, 0xad, 0xb5, 0x92,
+  0xeb, 0x9d, 0xc9, 0x51, 0xc7, 0xdf, 0x77, 0x3c, 0xa7, 0x57, 0xa8, 0x1c, 0x5b, 0x9d, 0xe9, 0xdf,
+  0x61, 0xf7, 0x8d, 0xa3, 0x47, 0x25, 0x42, 0x26, 0xcd, 0xa5, 0x01, 0xbf, 0x77, 0xa5, 0xf4, 0x67,
+  0x70, 0x64, 0x04, 0x27, 0x56, 0xfc, 0xe9, 0x7f, 0x5a, 0xc9, 0x9a, 0x33, 0x7b, 0xc5, 0x31, 0x74,
+  0xa1, 0xbb, 0xbf, 0x6a, 0x28, 0xb5, 0x09, 0xfc, 0xe5, 0xb6, 0xe6, 0x27, 0x99, 0x28, 0xaa, 0xe3,
+  0x31, 0x9f, 0x19, 0x8d, 0x5d, 0x15, 0x2c, 0xbb, 0xa5, 0xe1, 0xbb, 0x39, 0x7b, 0x5a, 0xbb, 0x6e,
+  0x51, 0x5a, 0xd6, 0xcf, 0xb3, 0x65, 0xab, 0x6b, 0xa6, 0x7d, 0xbf, 0xad, 0xbd, 0xad, 0x5e, 0x51,
+  0x66, 0x7f, 0xba, 0x75, 0xb3, 0xee, 0xb0, 0x42, 0x72, 0xed, 0x5a, 0xa7, 0xdf, 0xe1, 0x9d, 0x61,
+  0xf6, 0xb2, 0xd5, 0xa6, 0x96, 0xd3, 0xed, 0xa7, 0xfa, 0x6f, 0x86, 0x4d, 0xec, 0xab, 0xab, 0xd8,
+  0xad, 0x6e, 0xcb, 0x35, 0x8a, 0x5a, 0x44, 0x45, 0x43, 0x4f, 0x06, 0xe7, 0x21, 0x45, 0xec, 0x34,
+  0x47, 0xe9, 0xbb, 0x75, 0x89, 0x33, 0xf6, 0xed, 0x95, 0xf7, 0xee, 0x71, 0xc5, 0x20, 0xbb, 0x39,
+  0xa7, 0xaf, 0x2b, 0x41, 0x5d, 0x4b, 0xaf, 0x6a, 0x53, 0x5d, 0xc1, 0xaf, 0x3e, 0x5f, 0x75, 0x31,
+  0x6b, 0xa0, 0xc7, 0x6b, 0xd9, 0x97, 0x7d, 0x33, 0xbe, 0x6e, 0x69, 0xdb, 0xe6, 0x51, 0xf7, 0xa6,
+  0xe7, 0x56, 0xd1, 0xbd, 0x83, 0x4e, 0xd7, 0x6c, 0x89, 0x7d, 0xd5, 0x47, 0x2b, 0x9b, 0x2c, 0xe3,
+  0x9d, 0xb6, 0xb8, 0xb1, 0xaf, 0x6b, 0x9d, 0xaf, 0xa1, 0xdb, 0xb1, 0x95, 0xaf, 0xf6, 0x21, 0x5b,
+  0x4a, 0xb3, 0xfb, 0xa6, 0xf8, 0x31, 0xda, 0xe7, 0xa5, 0xad, 0xdf, 0x57, 0x7c, 0x5f, 0xa5, 0xba,
+  0x71, 0x87, 0x2e, 0xba, 0x79, 0xfd, 0x39, 0x5f, 0xbb, 0x3a, 0x09, 0x97, 0x61, 0x6e, 0xdb, 0x15,
+  0xd7, 0x47, 0x6e, 0xcf, 0x21, 0xde, 0x4a, 0x72, 0x9b, 0xd8, 0x31, 0xfd, 0xaf, 0x3d, 0xed, 0x79,
+  0x01, 0x3b, 0xe7, 0x13, 0x28, 0xb7, 0xb5, 0x27, 0xde, 0x9a, 0x55, 0x69, 0xeb, 0xf7, 0xa9, 0x2f,
+  0xb9, 0x8d, 0xd9, 0xbf, 0x8d, 0xf5, 0xbf, 0x8d, 0xcf, 0xbb, 0xcd, 0xfd, 0xb8, 0x43, 0xa6, 0xbd,
+  0x79, 0x8a, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x98, 0x3a, 0x5b, 0x73, 0xd6, 0xae, 0x77, 0xe7, 0xea,
+  0x36, 0x9f, 0x06, 0x05, 0x29, 0xbd, 0xa7, 0xb1, 0x31, 0xb9, 0x79, 0x36, 0x4f, 0x4b, 0x2c, 0xe6,
+  0x8b, 0xa5, 0x50, 0x8e, 0xe3, 0xb5, 0x27, 0xda, 0xf3, 0x95, 0xe8, 0x7a, 0x2a, 0x29, 0x29, 0xaf,
+  0xce, 0x33, 0x61, 0x53, 0xab, 0x8b, 0x45, 0x77, 0x39, 0x66, 0xb3, 0x6b, 0xb6, 0x51, 0xd9, 0xeb,
+  0x6e, 0xf8, 0x31, 0x5e, 0x3e, 0x1a, 0xfd, 0xe6, 0xc1, 0x79, 0x11, 0x18, 0x22, 0x1f, 0xd0, 0x12,
+  0x67, 0x56, 0x3c, 0x8c, 0xbb, 0x61, 0x95, 0x50, 0xfc, 0x3d, 0xa6, 0xaf, 0x75, 0xb3, 0x65, 0xc5,
+  0x2a, 0x86, 0x1f, 0x62, 0x2a, 0xcb, 0x13, 0xdd, 0xf1, 0x6d, 0x9f, 0x9a, 0xfc, 0xd5, 0xa6, 0x9d,
+  0x35, 0xf1, 0x77, 0xae, 0x9a, 0x4f, 0x72, 0x3c, 0x69, 0x75, 0x70, 0x61, 0x6e, 0xdd, 0xff, 0x6a,
+  0x00, 0x67, 0x6d, 0xcb, 0x8f, 0x58, 0xc4, 0x27, 0x6b, 0x99, 0x0f, 0xf9, 0xca, 0x8a, 0xc9, 0x6b,
+  0xde, 0xb5, 0x7b, 0xa6, 0xbb, 0x76, 0x1f, 0x2d, 0x2d, 0x20, 0x45, 0x78, 0x61, 0xfe, 0x26, 0x6f,
+  0x96, 0xa3, 0x8d, 0xd9, 0x45, 0x9e, 0x46, 0x6e, 0x77, 0xa7, 0xfb, 0x34, 0x39, 0x45, 0xd9, 0x0c,
+  0xaa, 0x1f, 0xe7, 0x02, 0x27, 0x75, 0x66, 0x26, 0x26, 0xc5, 0xfb, 0x3d, 0x57, 0x4d, 0x34, 0x4b,
+  0x9c, 0x9d, 0x65, 0x73, 0x55, 0x8d, 0x59, 0xfe, 0x99, 0x1f, 0x95, 0x5d, 0x9e, 0x68, 0x9a, 0x0b,
+  0xe1, 0x26, 0x29, 0xdf, 0x8f, 0x85, 0x7f, 0x21, 0xed, 0x68, 0xdb, 0x5e, 0xe8, 0xf3, 0xd9, 0x33,
+  0x6b, 0xac, 0x0d, 0xf5, 0x2c, 0xda, 0x68, 0xf8, 0xf9, 0xc5, 0x20, 0xca, 0xfd, 0x91, 0x7f, 0x76,
+  0x7a, 0x37, 0x19, 0x2e, 0xb1, 0x87, 0x4c, 0xff, 0x75, 0xb3, 0x7c, 0x8a, 0x9f, 0x9b, 0xfc, 0x64,
+  0x3e, 0x79, 0x49, 0x90, 0x78, 0x42, 0x96, 0x97, 0xc6, 0x7b, 0xe6, 0x5f, 0x6f, 0xf7, 0x6b, 0x55,
+  0x01, 0x3d, 0xa6, 0xac, 0x53, 0xdb, 0x1e, 0x27, 0xeb, 0x2d, 0xc9, 0x9e, 0x92, 0xdd, 0x86, 0x02,
+  0x1a, 0x1d, 0xed, 0xd7, 0x1a, 0x27, 0xbe, 0x2b, 0xc9, 0x6a, 0xd7, 0x8b, 0x94, 0x41, 0x49, 0x7e,
+  0xe3, 0xb7, 0xda, 0xe2, 0xd5, 0x98, 0x33, 0x6d, 0xc5, 0xc7, 0x2e, 0x3b, 0x5f, 0x67, 0x81, 0x6e,
+  0x5a, 0xa5, 0x7c, 0xb3, 0x50, 0x73, 0x20, 0xa6, 0x6e, 0x6b, 0x8b, 0xff, 0x69, 0xc8, 0x04, 0xa4,
+  0x79, 0x76, 0x65, 0x72, 0x34, 0xf8, 0xbb, 0xd9, 0x19, 0x57, 0x00, 0x75, 0x6a, 0xd1, 0xdd, 0xc7,
+  0xec, 0x90, 0x5f, 0x41, 0xea, 0x6c, 0x6b, 0x94, 0xfd, 0x31, 0xda, 0xe8, 0xd5, 0x1c, 0x38, 0x73,
+  0xd7, 0x12, 0x69, 0x69, 0x8b, 0xad, 0xaa, 0x1b, 0x6c, 0x2d, 0x3b, 0x7d, 0xf1, 0xff, 0x8c, 0x4b,
+  0x36, 0x57, 0xa5, 0xa4, 0x45, 0x6b, 0x5f, 0x65, 0xaa, 0x79, 0x17, 0x97, 0x2f, 0xee, 0x75, 0x39,
+  0xac, 0x45, 0xb8, 0xcb, 0x4f, 0x5c, 0xaa, 0x15, 0x71, 0x13, 0xdb, 0x10, 0x13, 0xa7, 0xad, 0x6f,
+  0xd9, 0x47, 0xbe, 0x3d, 0xab, 0x67, 0xcd, 0xff, 0x2d, 0xa5, 0xfb, 0x9d, 0x41, 0xa9, 0xf7, 0x96,
+  0xcc, 0xc5, 0xc5, 0xa7, 0x5a, 0x76, 0xa6, 0xb3, 0xb6, 0xe6, 0xa2, 0xee, 0x6e, 0x3b, 0x6e, 0x76,
+  0xef, 0xf3, 0xa9, 0xa9, 0xbe, 0xf2, 0xdf, 0xfa, 0x7a, 0xe3, 0xe5, 0xf6, 0x3b, 0x2b, 0xa7, 0xaf,
+  0x7d, 0x43, 0xe9, 0xef, 0x6e, 0xa9, 0x0d, 0xde, 0x8b, 0xcf, 0xc7, 0x3a, 0xb1, 0x2b, 0xc9, 0xa9,
+  0xbf, 0x5e, 0x81, 0xca, 0x2d, 0xb1, 0x77, 0x1a, 0xbe, 0x6b, 0xbe, 0x3d, 0x73, 0xa3, 0x67, 0x74,
+  0x17, 0x7a, 0x62, 0xb7, 0x19, 0x69, 0xd2, 0xa3, 0x3f, 0xb7, 0xeb, 0x99, 0x4f, 0xab, 0xe2, 0x5b,
+  0x77, 0x1d, 0xc7, 0x78, 0xe3, 0x33, 0x99, 0x01, 0xc6, 0x79, 0xeb, 0x73, 0x4b, 0x25, 0x6e, 0x64,
+  0x2d, 0x3c, 0xf4, 0x66, 0x2b, 0x9e, 0xe3, 0xb7, 0x96, 0x08, 0x6f, 0x1a, 0x36, 0xff, 0xb9, 0x97,
+  0xfd, 0x6d, 0x76, 0x3b, 0xb9, 0x8b, 0xff, 0x6f, 0xfc, 0xd1, 0xbb, 0xda, 0xa2, 0x35, 0xe7, 0x56,
+  0x1e, 0x12, 0x87, 0x56, 0x1d, 0xde, 0x3b, 0xd8, 0x2b, 0xff, 0x69, 0xf1, 0xd3, 0xf5, 0xbd, 0xbb,
+  0xa3, 0x9b, 0xec, 0xa8, 0x4f, 0x62, 0x73, 0x6f, 0x6c, 0x65, 0x74, 0x65, 0xeb, 0xd7, 0xca, 0xbc,
+  0x3f, 0x61, 0xb7, 0xa8, 0xab, 0x86, 0x57, 0x18, 0x14, 0x6e, 0xb5, 0x6d, 0x98, 0x31, 0x31, 0x53,
+  0xee, 0x9d, 0xb5, 0x90, 0x94, 0x36, 0x77, 0xa8, 0x5b, 0x6d, 0x1a, 0xf5, 0xad, 0x6a, 0x10, 0xe5,
+  0xf9, 0xbf, 0x5a, 0x4b, 0xc1, 0xb1, 0x6d, 0xad, 0x45, 0x6b, 0x37, 0x1d, 0xbe, 0xd9, 0x43, 0xbe,
+  0xd6, 0x79, 0xb7, 0xed, 0x6f, 0x59, 0x25, 0xb6, 0x55, 0x68, 0x15, 0x98, 0x36, 0x59, 0xa8, 0x4f,
+  0xc9, 0x2d, 0x57, 0xb2, 0x50, 0x5d, 0x2d, 0x64, 0xff, 0xb7, 0x9a, 0x1b, 0xd3, 0x97, 0x30, 0x78,
+  0x8c, 0xa3, 0x24, 0x66, 0x98, 0x95, 0x63, 0x63, 0x59, 0x0f, 0x13, 0x7e, 0x5f, 0x43, 0x52, 0x54,
+  0x5f, 0x53, 0x45, 0xbd, 0x5d, 0x2f, 0x1a, 0x5f, 0x4e, 0x4f, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49,
+  0x4e, 0x47, 0xe4, 0xcf, 0x45, 0x56, 0xb6, 0x75, 0xe0, 0xba, 0xb3, 0xfd, 0xc7, 0x2e, 0xea, 0x8e,
+  0xfb, 0x6b, 0xec, 0xf7, 0xde, 0xbe, 0x38, 0x3b, 0x09, 0x44, 0x50, 0x52, 0x21, 0x8e, 0x41, 0x54,
+  0x74, 0x89, 0x23, 0x3d, 0x46, 0x42, 0x4c, 0x4f, 0x43, 0x4b, 0x2e, 0x87, 0xf1, 0xea, 0x90, 0x03,
+  0x6e, 0xd7, 0x55, 0xe4, 0x4c, 0x59, 0x20, 0xa7, 0x3e, 0x51, 0xcd, 0x47, 0x43, 0x43, 0xee, 0xf7,
+  0x07, 0x7e, 0xa9, 0xbf, 0x35, 0x47, 0x4e, 0x55, 0x1e, 0xf9, 0x24, 0xde, 0xd6, 0xef, 0x34, 0x43,
+  0x21, 0xde, 0xef, 0x34, 0x6b, 0x16, 0x56, 0x29, 0x77, 0x57, 0x1a, 0x4e, 0x71, 0x9a, 0xed, 0x9f,
+  0x3d, 0x34, 0x30, 0x35, 0x29, 0x20, 0x7c, 0x7c, 0x61, 0xb5, 0x64, 0x1c, 0x95, 0x73, 0x69, 0x3c,
+  0x66, 0x69, 0x3b, 0x37, 0x26, 0x44, 0x28, 0x99, 0x77, 0x5d, 0x72, 0x4e, 0xc8, 0xfe, 0xb3, 0x83,
+  0x12, 0x65, 0x14, 0x68, 0x28, 0x28, 0x05, 0xb4, 0x45, 0xa5, 0x00, 0x5e, 0x91, 0xb4, 0x9e, 0xff,
+  0xf8, 0x05, 0x33, 0x31, 0xd3, 0xfe, 0x4b, 0xc1, 0x62, 0x89, 0xc9, 0x4d, 0x53, 0x24, 0xc9, 0xb3,
+  0xbf, 0x6d, 0x5d, 0x6a, 0xad, 0x17, 0x62, 0x7f, 0xe5, 0xbb, 0xde, 0x4d, 0x72, 0x97, 0xfa, 0xf6,
+  0xc9, 0x58, 0x3b, 0x9a, 0x28, 0x22, 0x61, 0x4d, 0x3a, 0xb5, 0x4b, 0xaa, 0x76, 0x6f, 0xbc, 0x59,
+  0xb5, 0xe7, 0xe6, 0xd7, 0xb5, 0xb8, 0x47, 0x9b, 0xbf, 0x67, 0x2f, 0x86, 0xbe, 0x22, 0x2e, 0x45,
+  0x95, 0x47, 0xfb, 0xa2, 0x51, 0x52, 0x10, 0x0d, 0x1f, 0x20, 0x6d, 0xa8, 0x5b, 0xf9, 0xe5, 0x01,
+  0xf5, 0xf5, 0xa9, 0xa3, 0xda, 0xfb, 0x3a, 0xbb, 0x6a, 0x67, 0x3f, 0xb6, 0x17, 0x5d, 0x2b, 0xbb,
+  0x8c, 0xa7, 0xb3, 0x70, 0x6c, 0x61, 0x6e, 0x6e, 0xda, 0xd7, 0xb3, 0xee, 0x9d, 0x61, 0xa8, 0x81,
+  0xb7, 0xa4, 0xc9, 0xa6, 0x72, 0x31, 0x33, 0x31, 0xa0, 0x78, 0x70, 0xdb, 0xa1, 0xf5, 0xae, 0xc9,
+  0x8d, 0xba, 0x8b, 0xaf, 0xdf, 0xa6, 0xf9, 0xdb, 0xae, 0x3f, 0x01, 0xda, 0xfe, 0x2f, 0xcd, 0x7a,
+  0xfd, 0xfd, 0x9f, 0xac, 0x97, 0x9b, 0xae, 0x7a, 0xa3, 0xd3, 0x7d, 0x4f, 0xc7, 0xda, 0xd6, 0xb1,
+  0xbf, 0xcd, 0x8d, 0x69, 0x01, 0xaf, 0xf6, 0xa9, 0xfd, 0x8b, 0x95, 0xa4, 0xe9, 0xb5, 0xcd, 0xbf,
+  0x63, 0xc1, 0xad, 0xae, 0x2d, 0x39, 0x9f, 0xc1, 0x7a, 0xf2, 0x9f, 0xb6, 0xbf, 0x29, 0xcf, 0x8e,
+  0xe1, 0xa9, 0x9d, 0x09, 0x7b, 0xed, 0x72, 0x01, 0xaf, 0x7d, 0x1f, 0xb5, 0x6a, 0xf3, 0x23, 0xac,
+  0x80, 0x20, 0x6e, 0x6d, 0x7c, 0x2d, 0x9b, 0xaa, 0x3d, 0x7d, 0xac, 0x57, 0xb6, 0xf9, 0xa5, 0x7e,
+  0xcd, 0xd9, 0xf9, 0x0a, 0xaf, 0xd7, 0x7d, 0xe0, 0xa8, 0x72, 0xa5, 0x20, 0xea, 0x96, 0x89, 0xb8,
+  0xd5, 0xf5, 0x34, 0x6f, 0x6e, 0xfc, 0x3f, 0xb5, 0x2a, 0x6f, 0x24, 0xfc, 0x49, 0xa7, 0xe1, 0x57,
+  0xfe, 0xa2, 0x05, 0x6e, 0xad, 0x2d, 0x9f, 0xef, 0x32, 0x84, 0x64, 0x65, 0x72, 0xa1, 0x73, 0xeb,
+  0x77, 0xf9, 0x59, 0x27, 0x26, 0x9d, 0x71, 0xbe, 0xb7, 0xc5, 0x9a, 0xb2, 0xc5, 0xf4, 0x6f, 0xe9,
+  0x1b, 0x15, 0xbf, 0x47, 0x05, 0x6e, 0x2d, 0x39, 0x7e, 0x93, 0x6b, 0xd4, 0x85, 0x93, 0x77, 0x2b,
+  0x99, 0x3b, 0x6b, 0x61, 0x3a, 0x60, 0x70, 0xd9, 0x35, 0x1a, 0xa5, 0xa7, 0x3b, 0x34, 0x64, 0x3b,
+  0x20, 0xdd, 0x9b, 0xd5, 0x05, 0xb1, 0x18, 0x6d, 0xf3, 0x9f, 0xed, 0x35, 0xd6, 0x56, 0xa9, 0xab,
+  0x6f, 0x35, 0x59, 0x39, 0x65, 0xbb, 0xaa, 0xe6, 0x63, 0x7b, 0xc1, 0x50, 0x67, 0x7e, 0x34, 0xa9,
+  0x57, 0xa6, 0xaf, 0xdd, 0x4d, 0xaf, 0x26, 0x59, 0xac, 0x87, 0xd6, 0xf3, 0x9d, 0xf5, 0x5b, 0x6a,
+  0x95, 0x33, 0x55, 0x69, 0xe6, 0xa1, 0xf3, 0x15, 0x07, 0x70, 0xe4, 0x69, 0x08, 0x9d, 0xd1, 0x27,
+  0xde, 0x07, 0x6b, 0xcb, 0xe3, 0xe6, 0xce, 0x7d, 0x4e, 0x95, 0x77, 0x9d, 0xf4, 0xb9, 0xbb, 0x67,
+  0xdc, 0x8f, 0x53, 0xde, 0x8a, 0x79, 0x9f, 0x37, 0x0f, 0xa9, 0x4f, 0xa5, 0x48, 0xdc, 0x20, 0xe7,
+  0x05, 0x65, 0x39, 0x9f, 0xfb, 0x6c, 0x47, 0x7e, 0x77, 0x9d, 0x95, 0xaf, 0x75, 0x75, 0xa5, 0x7b,
+  0x78, 0xb9, 0x47, 0x22, 0x81, 0xef, 0x2b, 0x59, 0x1f, 0x29, 0xfd, 0x99, 0xc5, 0x22, 0x12, 0xb8,
+  0x03, 0x92, 0x45, 0xde, 0xb9, 0x2b, 0xdf, 0x37, 0xcf, 0xae, 0x61, 0x2d, 0x3b, 0x6a, 0xad, 0xd9,
+  0xe3, 0x1b, 0x20, 0xee, 0x69, 0xa3, 0x5b, 0x45, 0xee, 0x2d, 0xaf, 0x6e, 0xa7, 0x7f, 0xf7, 0x61,
+  0x5f, 0xa5, 0x5d, 0xa7, 0x74, 0x45, 0xa5, 0xe6, 0xf6, 0x8f, 0xd8, 0x81, 0xef, 0x7a, 0xb7, 0xe9,
+  0x5b, 0xd3, 0x53, 0x00, 0x89, 0x4c, 0x45, 0x6a, 0x6c, 0x04, 0x93, 0x49, 0x9b, 0xb7, 0xa6, 0x6b,
+  0x96, 0xb4, 0x8f, 0x8b, 0x9e, 0xf2, 0xed, 0xe6, 0x8f, 0x3f, 0x9e, 0xe7, 0x99, 0xb7, 0x7d, 0xab,
+  0x3a, 0x5b, 0x6b, 0x47, 0x9d, 0x50, 0x8b, 0x4e, 0x19, 0x66, 0x69, 0x78, 0x36, 0x34, 0x3e, 0xef,
+  0xcf, 0x75, 0xde, 0xe7, 0xf5, 0xf5, 0x3e, 0x5d, 0x1f, 0x5b, 0xad, 0xad, 0xf3, 0xf6, 0x3a, 0x4b,
+  0xd5, 0x5b, 0x8f, 0x4b, 0xe7, 0xfd, 0x07, 0xf6, 0xab, 0xe6, 0xdd, 0xf1, 0x7d, 0xaa, 0xf9, 0xc7,
+  0xda, 0xaa, 0xa0,
+};
+
+static unsigned char buf[18830];
+
+int main() {
+
+        unsigned long cksum = adler32(0, NULL, 0);
+
+        decompress_zx02(compressed, buf);
+        cksum = adler32(cksum, buf, 18830);
+
+        return cksum == 0xf748269d ? 0 : 1;
+}
diff --git a/util/Makefile b/util/Makefile
index 6d960abf6..96d2ec629 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,3 +1,18 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+    PQ = "QUIET=1"
+    PD = --no-print-directory
+endif
 
 .PHONY: atari gamate zlib
 
@@ -6,16 +21,16 @@ util: atari gamate zlib
 all: util
 
 atari:
-	@$(MAKE) -C atari --no-print-directory $@
+	@$(MAKE) -C atari $(PD) $(PQ)
 gamate:
-	@$(MAKE) -C gamate --no-print-directory $@
+	@$(MAKE) -C gamate $(PD) $(PQ)
 zlib:
-	@$(MAKE) -C zlib --no-print-directory $@
+	@$(MAKE) -C zlib $(PD) $(PQ)
 
 mostlyclean clean:
-	@$(MAKE) -C atari --no-print-directory $@
-	@$(MAKE) -C gamate --no-print-directory $@
-	@$(MAKE) -C zlib --no-print-directory $@
+	@$(MAKE) -C atari $(PD) $@ $(PQ)
+	@$(MAKE) -C gamate $(PD) $@ $(PQ)
+	@$(MAKE) -C zlib $(PD) $@ $(PQ)
 
 install zip:
 
diff --git a/util/atari/Makefile b/util/atari/Makefile
index e53c837aa..74b7ee78a 100644
--- a/util/atari/Makefile
+++ b/util/atari/Makefile
@@ -1,3 +1,16 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
 
 CC = $(CROSS_COMPILE)gcc
 
@@ -22,6 +35,7 @@ CFLAGS += -O3 -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS)
 atari: ataricvt
 
 ataricvt: ataricvt.c
+	$(if $(QUIET),echo HOST:$@)
 	$(CC) $(CFLAGS) -o ataricvt ataricvt.c
 
 mostlyclean clean:
diff --git a/util/gamate/Makefile b/util/gamate/Makefile
index 54fa74191..7d1681c37 100644
--- a/util/gamate/Makefile
+++ b/util/gamate/Makefile
@@ -1,3 +1,16 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
 
 CC = $(CROSS_COMPILE)gcc
 
@@ -22,6 +35,7 @@ CFLAGS += -O3 -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS)
 gamate: gamate-fixcart
 
 gamate-fixcart: gamate-fixcart.c
+	$(if $(QUIET),echo HOST:$@)
 	$(CC) $(CFLAGS) -o gamate-fixcart gamate-fixcart.c
 
 mostlyclean clean:
diff --git a/util/zlib/Makefile b/util/zlib/Makefile
index f276ddaf2..5778ae821 100644
--- a/util/zlib/Makefile
+++ b/util/zlib/Makefile
@@ -1,3 +1,16 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
+ifdef QUIET
+    .SILENT:
+endif
 
 CC = $(CROSS_COMPILE)gcc
 
@@ -29,6 +42,7 @@ warning:
 	@echo "note that you need zlib installed first"
 
 deflater: deflater.c
+	$(if $(QUIET),echo HOST:$@)
 	$(CC) $(CFLAGS) -o deflater deflater.c -lz
 
 mostlyclean clean: