Release v0.7.0

Downstream support seems to be too sparse for the time being,
not worth the tiny gain we get from it

.checkpatch.conf

@@ -1,88 +0,0 @@
-# Configuration for checkpatch.pl
-# ===============================
-
-# Enable more tests
---strict
-
-# Quiet
---quiet
-
-# No per-file summary
---no-summary
-
-# Don't expect the Linux kernel tree
---no-tree
-
-# Show file line, not input line
---showfile
-
-# Don't expect SPDX tag in the first line of a file
---ignore SPDX_LICENSE_TAG
-
-# Don't expect Signed-off-by lines in commit messages
---no-signoff
-
-# List of ignored rules
-# ---------------------
-
-# There's no BIT macro
---ignore BIT_MACRO
-
-# Don't complain when bools are used in structs
---ignore BOOL_MEMBER
-
-# Allow CamelCase
---ignore CAMELCASE
-
-# Comparing to NULL explicitly isn't a bad thing
---ignore COMPARISON_TO_NULL
-
-# Causes false positives
---ignore COMPLEX_MACRO
-
-# Don't complain about structs not being const
---ignore CONST_STRUCT
-
-# Don't complain about printing "warning:" without the function name, as warning
-# printing is relevant to the code being parsed, not RGBDS' code
---ignore EMBEDDED_FUNCTION_NAME
-
-# Do not check the format of commit messages
---ignore GIT_COMMIT_ID
-
-# Do not check for global initializers (this is specific to the kernel)
---ignore GLOBAL_INITIALISERS
-
-# Don't complain about initializing statics (this is specific to the kernel)
---ignore INITIALISED_STATIC
-
-# We don't have a MAINTAINERS file, don't complain about it.
---ignore FILE_PATH_CHANGES
-
-# Writing the continuation on the start of the line can make it clearer
---ignore LOGICAL_CONTINUATIONS
-
-# Don't complain if a line that contains a string is too long. It's better to
-# have a really long line that can be found with grep.
---ignore LONG_LINE_STRING
-
-# Don't complain when files are modified in 'include/asm'
---ignore MODIFIED_INCLUDE_ASM
-
-# Allow new typedefs
---ignore NEW_TYPEDEFS
-
-# We allow lines ending with parentheses for the usage prints
---ignore OPEN_ENDED_LINE
-
-# Prefer stdint.h types over kernel types
---ignore PREFER_KERNEL_TYPES
-
-# Don't ask to replace sscanf by kstrto
---ignore SSCANF_TO_KSTRTO
-
-# Parentheses can make the code clearer
---ignore UNNECESSARY_PARENTHESES
-
-# We don't have `fallthrough;` */
---ignore PREFER_FALLTHROUGH

.clang-format

@@ -93,7 +93,7 @@ SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: c++17
+Standard: c++20
 TabWidth: 4
 UseCRLF: false
 UseTab: ForIndentation

.dockerignore

@@ -1,7 +1,3 @@
-# This file is part of RGBDS.
-#
-# Copyright (c) 2018-2019, Phil Smith and RGBDS contributors.
-#
 # SPDX-License-Identifier: MIT
 .git
 docs

.github/FUNDING.yml

@@ -1 +1,2 @@
 open_collective: gbdev
+github: gbdev

.github/scripts/get_win_deps.ps1

@@ -15,9 +15,9 @@ function getlibrary ([string] $URI, [string] $filename, [string] $hash, [string]
 	Expand-Archive -DestinationPath $destdir $filename
 }
 
-getlibrary 'https://www.zlib.net/zlib1213.zip' 'zlib.zip' 'd233fca7cf68db4c16dc5287af61f3cd01ab62495224c66639ca3da537701e42' .
-getlibrary 'https://download.sourceforge.net/libpng/lpng1637.zip' 'libpng.zip'  '3b4b1cbd0bae6822f749d39b1ccadd6297f05e2b85a83dd2ce6ecd7d09eabdf2' .
+getlibrary 'https://www.zlib.net/zlib13.zip' 'zlib.zip' 'c561d09347f674f0d72692e7c75d9898919326c532aab7f8c07bb43b07efeb38' .
+getlibrary 'https://github.com/glennrp/libpng/archive/refs/tags/v1.6.37.zip' 'libpng.zip'  'c2c50c13a727af73ecd3fc0167d78592cf5e0bca9611058ca414b6493339c784' .
 getlibrary 'https://github.com/lexxmark/winflexbison/releases/download/v2.5.24/win_flex_bison-2.5.24.zip' 'winflexbison.zip'  '39c6086ce211d5415500acc5ed2d8939861ca1696aee48909c7f6daf5122b505' install_dir
 
-Move-Item zlib-1.2.13 zlib
-Move-Item lpng1637 libpng
+Move-Item zlib-1.3 zlib
+Move-Item libpng-1.6.37 libpng

.github/scripts/install.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 install -d /usr/local/bin/ /usr/local/share/man/man1/ /usr/local/share/man/man5/ /usr/local/share/man/man7/
 install -s -m 755 rgbasm rgblink rgbfix rgbgfx /usr/local/bin/
 install -m 644 rgbasm.1 rgblink.1 rgbfix.1 rgbgfx.1 /usr/local/share/man/man1/

.github/scripts/install_deps.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 case "${1%-*}" in

.github/scripts/mingw-w64-libpng-dev.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 set -e
 
 pngver=1.6.37

.github/workflows/checkpatch.yml

@@ -1,25 +0,0 @@
-name: "Code style checking"
-on: pull_request
-
-jobs:
-  checkpatch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up repo
-        run: |
-          git clone -b "${{ github.event.pull_request.head.ref }}" "${{ github.event.pull_request.head.repo.clone_url }}" rgbds
-          cd rgbds
-          git remote add upstream "${{ github.event.pull_request.base.repo.clone_url }}"
-          git fetch upstream
-      - name: Set up checkpatch
-        working-directory: rgbds
-        run: |
-          wget 'https://raw.githubusercontent.com/torvalds/linux/master/scripts/checkpatch.pl'
-          chmod +x checkpatch.pl
-          wget 'https://raw.githubusercontent.com/torvalds/linux/master/scripts/const_structs.checkpatch'
-          wget 'https://raw.githubusercontent.com/torvalds/linux/master/scripts/spelling.txt'
-      - name: Checkpatch
-        working-directory: rgbds
-        run: |
-          make checkpatch CHECKPATCH=./checkpatch.pl "BASE_REF=${{ github.event.pull_request.base.sha }}" Q= | tee log
-          if grep -q ERROR: log; then exit 1; else exit 0; fi

.github/workflows/create-release-artifacts.yml

@@ -83,19 +83,44 @@ jobs:
       - name: Build binaries
         run: |
           export PATH="/usr/local/opt/bison/bin:$PATH"
-          make -j WARNFLAGS="-Wall -Wextra -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q=
+          make -j CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q=
       - name: Package binaries
         run: |
-          zip --junk-paths rgbds-${{ env.version }}-macos-x86-64.zip rgb{asm,link,fix,gfx} man/* .github/scripts/install.sh
+          zip --junk-paths rgbds-${{ env.version }}-macos-x86_64.zip rgb{asm,link,fix,gfx} man/* .github/scripts/install.sh
       - name: Upload macOS binaries
         uses: actions/upload-artifact@v3
         with:
           name: macos
-          path: rgbds-${{ env.version }}-macos-x86-64.zip
+          path: rgbds-${{ env.version }}-macos-x86_64.zip
+
+  linux:
+    runs-on: ubuntu-20.04 # Oldest supported, for best glibc compatibility.
+    steps:
+      - name: Get version from tag
+        shell: bash
+        run: | # Turn "refs/tags/vX.Y.Z" into "X.Y.Z"
+          VERSION="${{ github.ref_name }}"
+          echo "version=${VERSION#v}" >> $GITHUB_ENV
+      - uses: actions/checkout@v3
+      - name: Install deps
+        shell: bash
+        run: |
+          ./.github/scripts/install_deps.sh ubuntu-20.04
+      - name: Build binaries
+        run: |
+          make -j WARNFLAGS="-Wall -Wextra -pedantic  -static" PKG_CONFIG="pkg-config --static" Q=
+      - name: Package binaries
+        run: |
+          tar caf rgbds-${{ env.version }}-linux-x86_64.tar.xz --transform='s#.*/##' rgb{asm,link,fix,gfx} man/* .github/scripts/install.sh
+      - name: Upload Linux binaries
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux
+          path: rgbds-${{ env.version }}-linux-x86_64.tar.xz
 
   release:
     runs-on: ubuntu-latest
-    needs: [windows, macos]
+    needs: [windows, macos, linux]
     steps:
       - name: Get version from tag
         shell: bash
@@ -112,15 +137,16 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           body: |
-            Please ensure that the three assets below work properly.
+            Please ensure that the four packages below work properly.
             Once that's done, replace this text with the changelog, un-draft the release, and update the `release` branch.
-            By the way, if you forgot to update `include/version.h`, RGBASM's version test is gonna fail in the tag's regression testing! (Use `git push --delete origin <tag>` to delete it)
+            By the way, if you forgot to update `include/version.hpp`, RGBASM's version test is gonna fail in the tag's regression testing! (Use `git push --delete origin <tag>` to delete it)
           draft: true # Don't publish the release quite yet...
           prerelease: ${{ contains(github.ref, '-rc') }}
           files: |
             win32/rgbds-${{ env.version }}-win32.zip
             win64/rgbds-${{ env.version }}-win64.zip
-            macos/rgbds-${{ env.version }}-macos-x86-64.zip
+            macos/rgbds-${{ env.version }}-macos-x86_64.zip
+            linux/rgbds-${{ env.version }}-linux-x86_64.tar.xz
             rgbds-${{ env.version }}.tar.gz
           fail_on_unmatched_files: true
         env:

.github/workflows/create-release-docs.yml

@@ -26,6 +26,7 @@ jobs:
         working-directory: rgbds/man
         run: | # The ref appears to be in the format "refs/tags/<version>", so strip that
           ../../rgbds-www/maintainer/man_to_html.sh ${GITHUB_REF##*/} *
+          ../../rgbds-www/maintainer/new_release.sh ${GITHUB_REF##*/}
       - name: Push new pages
         working-directory: rgbds-www
         run: |

.github/workflows/testing.yml

@@ -4,23 +4,18 @@ on:
   - pull_request
 
 jobs:
-  unix-testing:
+  unix:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
-        cc: [gcc, clang]
+        cxx: [g++, clang++]
         buildsys: [make, cmake]
         exclude:
-          # `gcc` is just an alias to `clang` on macOS, don't bother
+          # Don't use `g++` on macOS; it's just an alias to `clang++`.
           - os: macos-11
-            cc: gcc
-          - os: macos-12
-            cc: gcc
-        include:
-          - cc: gcc
             cxx: g++
-          - cc: clang
-            cxx: clang++
+          - os: macos-12
+            cxx: g++
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -29,23 +24,24 @@ jobs:
         shell: bash
         run: |
           ./.github/scripts/install_deps.sh ${{ matrix.os }}
-      # The `export` lines are to allow working on macOS...
-      # Apple's base version is severely outdated, not even supporting -Wall,
-      # but it overrides Homebrew's version nonetheless...
+      # Export `bison` to allow using the version we install from Homebrew,
+      # instead of the outdated one preinstalled on macOS (which doesn't
+      # even support `-Wall`...).
       - name: Build & install using Make
         if: matrix.buildsys == 'make'
         run: |
           export PATH="/usr/local/opt/bison/bin:$PATH"
-          make develop -j Q= CC=${{ matrix.cc }} CXX=${{ matrix.cxx }}
+          make develop -j Q= CXX=${{ matrix.cxx }}
           sudo make install -j Q=
       - name: Build & install using CMake
         if: matrix.buildsys == 'cmake'
         run: |
           export PATH="/usr/local/opt/bison/bin:$PATH"
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DSANITIZERS=ON -DMORE_WARNINGS=ON
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DSANITIZERS=ON -DMORE_WARNINGS=ON
           cmake --build build -j --verbose
           cp build/src/rgb{asm,link,fix,gfx} .
           sudo cmake --install build --verbose
+          cmake --install build --verbose --component "Test support programs"
       - name: Package binaries
         run: |
           mkdir bins
@@ -53,7 +49,7 @@ jobs:
       - name: Upload binaries
         uses: actions/upload-artifact@v3
         with:
-          name: rgbds-canary-${{ matrix.os }}-${{ matrix.cc }}-${{ matrix.buildsys }}
+          name: rgbds-canary-${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.buildsys }}
           path: bins
       - name: Compute test dependency cache params
         id: test-deps-cache-params
@@ -74,12 +70,73 @@ jobs:
         continue-on-error: true
         run: |
           test/fetch-test-deps.sh
-      - name: Test
+      - name: Install test dependency dependencies
+        shell: bash
+        run: |
+          test/fetch-test-deps.sh --get-deps ${{ matrix.os }}
+      - name: Run tests
         shell: bash
         run: |
           test/run-tests.sh
 
-  windows-testing:
+  macos-static:
+    strategy:
+      matrix:
+        # Don't run on macOS 11; our setup makes clang segfault (YES).
+        os: [macos-12]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install deps
+        shell: bash
+        run: |
+          ./.github/scripts/install_deps.sh ${{ matrix.os }}
+      # Export `bison` to allow using the version we install from Homebrew,
+      # instead of the outdated one preinstalled on macOS (which doesn't
+      # even support `-Wall`...).
+      - name: Build & install
+        run: |
+          export PATH="/usr/local/opt/bison/bin:$PATH"
+          make -j CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q=
+      - name: Package binaries
+        run: |
+          mkdir bins
+          cp rgb{asm,link,fix,gfx} bins
+      - name: Upload binaries
+        uses: actions/upload-artifact@v3
+        with:
+          name: rgbds-canary-${{ matrix.os }}-${{ matrix.buildsys }}
+          path: bins
+      - name: Compute test dependency cache params
+        id: test-deps-cache-params
+        shell: bash
+        run: |
+          paths=$(test/fetch-test-deps.sh --get-paths)
+          hash=$(test/fetch-test-deps.sh --get-hash)
+          tee -a <<<"paths=\"${paths//,/\\n}\"" $GITHUB_OUTPUT
+          tee -a <<<"hash=${hash%-}" $GITHUB_OUTPUT
+      - name: Check test dependency repositories cache
+        id: test-deps-cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ fromJSON(steps.test-deps-cache-params.outputs.paths) }}
+          key: ${{ matrix.os }}-${{ steps.test-deps-cache-params.outputs.hash }}
+      - if: steps.test-deps-cache.outputs.cache-hit != 'true'
+        name: Fetch test dependency repositories
+        continue-on-error: true
+        run: |
+          test/fetch-test-deps.sh
+      - name: Install test dependency dependencies
+        shell: bash
+        run: |
+          test/fetch-test-deps.sh --get-deps ${{ matrix.os }}
+      - name: Run tests
+        shell: bash
+        run: |
+          test/run-tests.sh
+
+  windows:
     strategy:
       matrix:
         bits: [32, 64]
@@ -127,6 +184,7 @@ jobs:
           cmake -S . -B build -A ${{ matrix.platform }} -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=Release -DZLIB_LIBRARY="$PWD"/install_dir/lib/zlib.lib -DZLIB_INCLUDE_DIR="$PWD"/install_dir/include -DPNG_LIBRARY="$PWD"/install_dir/lib/libpng16.lib -DPNG_INCLUDE_DIR="$PWD"/install_dir/include
           cmake --build build --config Release -j --verbose
           cmake --install build --verbose --prefix install_dir
+          cmake --install build --verbose --component "Test support programs"
       - name: Package binaries
         shell: bash
         run: |
@@ -157,14 +215,18 @@ jobs:
         continue-on-error: true
         run: |
           test/fetch-test-deps.sh
-      - name: Test
+      - name: Install test dependency dependencies
+        shell: bash
+        run: |
+          test/fetch-test-deps.sh --get-deps ${{ matrix.os }}
+      - name: Run tests
         shell: bash
         run: |
           cp bins/* .
           cp bins/*.dll test/gfx
           test/run-tests.sh
 
-  windows-xbuild:
+  windows-mingw-build:
     strategy:
       matrix:
         bits: [32, 64]
@@ -187,7 +249,7 @@ jobs:
           ./.github/scripts/install_deps.sh ${{ matrix.os }}
       - name: Install MinGW
         run: | # dpkg-dev is apparently required for pkg-config for cross-building
-          sudo apt-get install {gcc,g++}-mingw-w64-${{ matrix.arch }}-win32 mingw-w64-tools libz-mingw-w64-dev dpkg-dev
+          sudo apt-get install g++-mingw-w64-${{ matrix.arch }}-win32 mingw-w64-tools libz-mingw-w64-dev dpkg-dev
       - name: Install libpng dev headers for MinGW
         run: |
           sudo ./.github/scripts/mingw-w64-libpng-dev.sh ${{ matrix.triplet }}
@@ -195,12 +257,13 @@ jobs:
         run: |
           make mingw${{ matrix.bits }} -j Q=
       - name: Package binaries
-        run: | # DLL dependencies can be figured out using e.g. Dependency Walker
+        run: | # DLL dependencies can be figured out using e.g. Dependency Walker or objdump -p
           mkdir bins
           mv -v rgb{asm,link,fix,gfx}.exe bins/
           cp -v /usr/${{ matrix.triplet }}/lib/zlib1.dll bins
           cp -v /usr/${{ matrix.triplet }}/bin/libpng16-16.dll bins
-          [ "${{ matrix.bits }}" -ne 32 ] || cp -v /usr/lib/gcc/${{ matrix.triplet }}/10-win32/lib{gcc_s_dw2-1,ssp-0,stdc++-6}.dll bins
+          cp -v /usr/lib/gcc/${{ matrix.triplet }}/10-win32/lib{ssp-0,stdc++-6}.dll bins
+          [ "${{ matrix.bits }}" -ne 32 ] || cp -v /usr/lib/gcc/${{ matrix.triplet }}/10-win32/libgcc_s_dw2-1.dll bins
       - name: Upload Windows binaries
         uses: actions/upload-artifact@v3
         with:
@@ -214,8 +277,8 @@ jobs:
             test/gfx/randtilegen.exe
             test/gfx/rgbgfx_test.exe
 
-  windows-xtesting:
-    needs: windows-xbuild
+  windows-mingw-testing:
+    needs: windows-mingw-build
     strategy:
       matrix:
         os: [windows-2019, windows-2022]
@@ -259,6 +322,10 @@ jobs:
         continue-on-error: true
         run: |
           test/fetch-test-deps.sh
+      - name: Install test dependency dependencies
+        shell: bash
+        run: |
+          test/fetch-test-deps.sh --get-deps ${{ matrix.os }}
       - name: Run tests
         shell: bash
         run: |

.gitignore

@@ -3,10 +3,13 @@
 /rgbfix
 /rgbgfx
 /rgbshim.sh
+/coverage/
 *.o
 *.exe
 *.dll
-.checkpatch-camelcase.*
+*.gcno
+*.gcda
+*.gcov
 CMakeCache.txt
 CMakeFiles/
 cmake_install.cmake

CMakeLists.txt

@@ -1,16 +1,10 @@
-#
-# This file is part of RGBDS.
-#
-# Copyright (c) 2020 RGBDS contributors.
-#
 # SPDX-License-Identifier: MIT
-#
 
 # 3.9 required for LTO checks
 cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
 project(rgbds
-        LANGUAGES C CXX)
+        LANGUAGES CXX)
 
 # get real path of source and binary directories
 get_filename_component(srcdir "${CMAKE_SOURCE_DIR}" REALPATH)
@@ -29,12 +23,9 @@ option(MORE_WARNINGS "Turn on more warnings" OFF) # Ignored on MSVC
 if(MSVC)
   # MSVC's standard library triggers warning C5105,
   # "macro expansion producing 'defined' has undefined behavior"
-  add_compile_options(/MP /wd5105)
+  # We also opt into the C++20-conformant preprocessor.
+  add_compile_options(/MP /wd5105 /Zc:preprocessor)
   add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-  # Also, CMake appears not to pass the C11-enabling flag, so we must add it manually... but only for C!
-  if(NOT CMAKE_C_FLAGS MATCHES "std:c11") # The flag may already have been injected by an earlier CMake invocation, so don't add it twice
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std:c11" CACHE STRING "Flags used by the C compiler during all build types." FORCE)
-  endif()
 
   if(SANITIZERS)
     set(SAN_FLAGS /fsanitize=address)
@@ -42,8 +33,12 @@ if(MSVC)
     add_link_options(${SAN_FLAGS})
   endif()
 else()
-  add_compile_options(-Wall -pedantic)
-  add_definitions(-D_POSIX_C_SOURCE=200809L -D_ISOC11_SOURCE)
+  # TODO: use -pedantic after non-C++ idioms are gone
+  add_compile_options(-Wall)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    add_compile_options(-Wno-c99-designator)
+  endif()
+  add_definitions(-D_POSIX_C_SOURCE=200809L)
   if(SANITIZERS)
     set(SAN_FLAGS -fsanitize=shift -fsanitize=integer-divide-by-zero
                   -fsanitize=unreachable -fsanitize=vla-bound
@@ -55,7 +50,6 @@ else()
     add_definitions(-D_GLIBCXX_ASSERTIONS)
     # A non-zero optimization level is desired in debug mode, but allow overriding it nonetheless
     # TODO: this overrides anything previously set... that's a bit sloppy!
-    set(CMAKE_C_FLAGS_DEBUG "-g -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE STRING "" FORCE)
     set(CMAKE_CXX_FLAGS_DEBUG "-g -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE STRING "" FORCE)
   endif()
 
@@ -98,9 +92,7 @@ endif()
 
 include_directories("${PROJECT_SOURCE_DIR}/include")
 
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_C_STANDARD_REQUIRED True)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 add_subdirectory(src)

CONTRIBUTING.rst

@@ -12,14 +12,14 @@ Bug reports are essential to improve RGBDS and they are always welcome. If you
 want to report a bug:
 
 1. Make sure that there isn't a similar issue already reported
-   `here <https://github.com/rednex/rgbds/issues>`__.
+   `here <https://github.com/gbdev/rgbds/issues>`__.
 
 2. Figure out a way of reproducing it reliably.
 
 3. If there is a piece of code that triggers the bug, try to reduce it to the
    smallest file you can.
 
-4. Create a new `issue <https://github.com/rednex/rgbds/issues>`__.
+4. Create a new `issue <https://github.com/gbdev/rgbds/issues>`__.
 
 Of course, it may not always be possible to give an accurate bug report, but it
 always helps to fix it.
@@ -30,7 +30,7 @@ Requesting new features
 If you come up with a good idea that could be implemented, you can propose it to
 be done.
 
-1. Create a new `issue <https://github.com/rednex/rgbds/issues>`__.
+1. Create a new `issue <https://github.com/gbdev/rgbds/issues>`__.
 
 2. Try to be as accurate as possible. Describe what you need and why you need
    it, maybe with examples.
@@ -49,7 +49,7 @@ if your change is going to be small (and likely to be accepted as-is) or big
 (and will have to go through some rework).
 
 Big changes will most likely require some discussion, so open an
-`issue <https://github.com/rednex/rgbds/issues>`__ and explain what you want to
+`issue <https://github.com/gbdev/rgbds/issues>`__ and explain what you want to
 do and how you intend to do it. If you already have a prototype, it's always a
 good idea to show it. Tests help, too.
 
@@ -74,22 +74,10 @@ copyright and the reference to the MIT License.
    new warning (but it may be possible to remove some warning checks if it makes
    the code much easier).
 
-5. Follow the Linux kernel coding style, which can be found in the file
-   ``Documentation/process/coding-style.rst`` in the Linux kernel repository.
-   Note that the coding style isn't written in stone, if there is a good reason
-   to deviate from it, it should be fine.
+5. Format your changes according to ``clang-format``, which will reformat the
+   coding style according to our standards defined in ``.clang-format``.
 
-6. Download the files ``checkpatch.pl``, ``const_structs.checkpatch`` and
-   ``spelling.txt`` from the folder ``scripts`` in the Linux kernel repository.
+6. Create a pull request against the branch ``master``.
 
-7. To use ``checkpatch.pl`` you can use ``make checkpatch``, which will check
-   the coding style of all patches between the current one and the upstream
-   code. By default, the Makefile expects the script (and associate files) to be
-   located in ``../linux/scripts/``, but you can place them anywhere you like as
-   long as you specify it when executing the command:
-   ``make checkpatch CHECKPATCH=../path/to/folder``.
-
-8. Create a pull request against the branch ``master``.
-
-9. Be prepared to get some comments about your code and to modify it. Tip: Use
+7. Be prepared to get some comments about your code and to modify it. Tip: Use
     ``git rebase -i origin/master`` to modify chains of commits.

CONTRIBUTORS.rst

@@ -21,7 +21,7 @@ Main contributors
 
 - Eldred "ISSOtm" Habert <eldredhabert0@gmail.com>
 
-- Rangi <http://github.com/Rangi42>
+- Sylvie "Rangi" Oukaour <http://github.com/Rangi42>
 
 Other contributors
 ------------------

Dockerfile

@@ -1,24 +1,14 @@
-# This file is part of RGBDS.
-#
-# Copyright (c) 2018-2019, Phil Smith and RGBDS contributors.
-#
-# SPDX-License-Identifier: MIT
-# docker build -t rgbds:vX.X.X-alpine
-FROM alpine:latest
-RUN apk add --update \
-      build-base \
-      bison \
-      libpng-dev
-COPY . /rgbds
+FROM debian:11-slim
+LABEL org.opencontainers.image.source=https://github.com/gbdev/rgbds
+ARG version=0.7.0
 WORKDIR /rgbds
-RUN make Q='' all
 
-FROM alpine:latest
-RUN apk add --update \
-      libpng
-COPY --from=0 \
-  /rgbds/rgbasm \
-  /rgbds/rgbfix \
-  /rgbds/rgblink \
-  /rgbds/rgbgfx \
-  /bin/
+COPY . .
+
+RUN apt-get update && \
+    apt-get install sudo make cmake gcc build-essential -y
+
+RUN ./.github/scripts/install_deps.sh ubuntu-20.04
+RUN make -j CXXFLAGS="-O3 -flto -DNDEBUG -static" PKG_CONFIG="pkg-config --static" Q=
+
+RUN tar caf rgbds-${version}-linux-x86_64.tar.xz --transform='s#.*/##' rgbasm rgblink rgbfix rgbgfx man/* .github/scripts/install.sh

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 1997-2020, Carsten Sorensen and RGBDS contributors.
+Copyright (c) 1997-2023, Carsten Sørensen and RGBDS contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

Makefile

@@ -1,15 +1,9 @@
-#
-# This file is part of RGBDS.
-#
-# Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
-#
 # SPDX-License-Identifier: MIT
-#
 
 .SUFFIXES:
-.SUFFIXES: .h .y .c .cpp .o
+.SUFFIXES: .cpp .y .o
 
-.PHONY: all clean install checkcodebase checkpatch checkdiff develop debug mingw32 mingw64 wine-shim dist
+.PHONY: all clean install checkdiff develop debug coverage mingw32 mingw64 wine-shim dist
 
 # User-defined variables
 
@@ -20,7 +14,6 @@ mandir		:= ${PREFIX}/share/man
 STRIP		:= -s
 BINMODE		:= 755
 MANMODE		:= 644
-CHECKPATCH	:= ../linux/scripts/checkpatch.pl
 
 # Other variables
 
@@ -29,19 +22,16 @@ PNGCFLAGS	:= `${PKG_CONFIG} --cflags libpng`
 PNGLDFLAGS	:= `${PKG_CONFIG} --libs-only-L libpng`
 PNGLDLIBS	:= `${PKG_CONFIG} --libs-only-l libpng`
 
-# Note: if this comes up empty, `version.c` will automatically fall back to last release number
+# Note: if this comes up empty, `version.cpp` will automatically fall back to last release number
 VERSION_STRING	:= `git describe --tags --dirty --always 2>/dev/null`
 
-WARNFLAGS	:= -Wall -pedantic
+# TODO: use -pedantic after non-C++ idioms are gone
+WARNFLAGS	:= -Wall -Wno-unknown-warning-option -Wno-c99-designator
 
-# Overridable CFLAGS
-CFLAGS		?= -O3 -flto -DNDEBUG
+# Overridable CXXFLAGS
 CXXFLAGS	?= -O3 -flto -DNDEBUG
-# Non-overridable CFLAGS
-# _ISOC11_SOURCE is required on certain platforms to get C11 on top of the C99-based POSIX 2008
-REALCFLAGS	:= ${CFLAGS} ${WARNFLAGS} -std=gnu11 -I include \
-		   -D_POSIX_C_SOURCE=200809L -D_ISOC11_SOURCE
-REALCXXFLAGS	:= ${CXXFLAGS} ${WARNFLAGS} -std=c++17 -I include \
+# Non-overridable CXXFLAGS
+REALCXXFLAGS	:= ${CXXFLAGS} ${WARNFLAGS} -std=c++2a -I include \
 		   -D_POSIX_C_SOURCE=200809L -fno-exceptions -fno-rtti
 # Overridable LDFLAGS
 LDFLAGS		?=
@@ -49,9 +39,9 @@ LDFLAGS		?=
 REALLDFLAGS	:= ${LDFLAGS} ${WARNFLAGS} \
 		   -DBUILD_VERSION_STRING=\"${VERSION_STRING}\"
 
-YFLAGS		?= -Wall
+# Wrapper around bison that passes flags depending on what the version supports
+BISON		:= src/bison.sh
 
-BISON		:= bison
 RM		:= rm -rf
 
 # Used for checking pull requests
@@ -75,16 +65,16 @@ rgbasm_obj := \
 	src/asm/rpn.o \
 	src/asm/section.o \
 	src/asm/symbol.o \
-	src/asm/util.o \
 	src/asm/warning.o \
 	src/extern/getopt.o \
 	src/extern/utf8decoder.o \
 	src/error.o \
 	src/hashmap.o \
 	src/linkdefs.o \
-	src/opmath.o
+	src/opmath.o \
+	src/util.o
 
-src/asm/lexer.o src/asm/main.o: src/asm/parser.h
+src/asm/lexer.o src/asm/main.o: src/asm/parser.hpp
 
 rgblink_obj := \
 	src/link/assign.o \
@@ -101,7 +91,10 @@ rgblink_obj := \
 	src/error.o \
 	src/hashmap.o \
 	src/linkdefs.o \
-	src/opmath.o
+	src/opmath.o \
+	src/util.o
+
+src/link/main.o: src/link/script.hpp
 
 rgbfix_obj := \
 	src/fix/main.o \
@@ -121,19 +114,19 @@ rgbgfx_obj := \
 	src/error.o
 
 rgbasm: ${rgbasm_obj}
-	$Q${CC} ${REALLDFLAGS} -o $@ ${rgbasm_obj} ${REALCFLAGS} src/version.c -lm
+	$Q${CXX} ${REALLDFLAGS} -o $@ ${rgbasm_obj} ${REALCXXFLAGS} src/version.cpp -lm
 
 rgblink: ${rgblink_obj}
-	$Q${CC} ${REALLDFLAGS} -o $@ ${rgblink_obj} ${REALCFLAGS} src/version.c
+	$Q${CXX} ${REALLDFLAGS} -o $@ ${rgblink_obj} ${REALCXXFLAGS} src/version.cpp
 
 rgbfix: ${rgbfix_obj}
-	$Q${CC} ${REALLDFLAGS} -o $@ ${rgbfix_obj} ${REALCFLAGS} src/version.c
+	$Q${CXX} ${REALLDFLAGS} -o $@ ${rgbfix_obj} ${REALCXXFLAGS} src/version.cpp
 
 rgbgfx: ${rgbgfx_obj}
-	$Q${CXX} ${REALLDFLAGS} ${PNGLDFLAGS} -o $@ ${rgbgfx_obj} ${REALCXXFLAGS} ${PNGLDLIBS} -x c++ src/version.c
+	$Q${CXX} ${REALLDFLAGS} ${PNGLDFLAGS} -o $@ ${rgbgfx_obj} ${REALCXXFLAGS} ${PNGLDLIBS} src/version.cpp
 
-test/gfx/randtilegen: test/gfx/randtilegen.c
-	$Q${CC} ${REALLDFLAGS} ${PNGLDFLAGS} -o $@ $^ ${REALCFLAGS} ${PNGCFLAGS} ${PNGLDLIBS}
+test/gfx/randtilegen: test/gfx/randtilegen.cpp
+	$Q${CXX} ${REALLDFLAGS} ${PNGLDFLAGS} -o $@ $^ ${REALCXXFLAGS} ${PNGCFLAGS} ${PNGLDLIBS}
 
 test/gfx/rgbgfx_test: test/gfx/rgbgfx_test.cpp
 	$Q${CXX} ${REALLDFLAGS} ${PNGLDFLAGS} -o $@ $^ ${REALCXXFLAGS} ${PNGLDLIBS}
@@ -143,30 +136,35 @@ test/gfx/rgbgfx_test: test/gfx/rgbgfx_test.cpp
 # We want the Bison invocation to pass through our rules, not default ones
 .y.o:
 
-# Bison-generated C files have an accompanying header
-src/asm/parser.h: src/asm/parser.c
+.y.cpp:
+	$Q${BISON} $@ $<
+
+# Bison-generated C++ files have an accompanying header
+src/asm/parser.hpp: src/asm/parser.cpp
+	$Qtouch $@
+src/link/script.hpp: src/link/script.cpp
 	$Qtouch $@
 
-src/asm/parser.c: src/asm/parser.y
-	$QDEFS=; \
-	add_flag(){ \
-		if src/check_bison_ver.sh $$1 $$2; then \
-			DEFS="-D$$3 $$DEFS"; \
-		fi \
-	}; \
-	add_flag 3 5 api.token.raw=true; \
-	add_flag 3 6 parse.error=detailed; \
-	add_flag 3 0 parse.error=verbose; \
-	add_flag 3 0 parse.lac=full; \
-	add_flag 3 0 lr.type=ielr; \
-	echo "DEFS=$$DEFS"; \
-	${BISON} $$DEFS -d ${YFLAGS} -o $@ $<
-
-.c.o:
-	$Q${CC} ${REALCFLAGS} -c -o $@ $<
+# Only RGBGFX uses libpng (POSIX make doesn't support pattern rules to cover all these)
+src/gfx/main.o: src/gfx/main.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+src/gfx/pal_packing.o: src/gfx/pal_packing.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+src/gfx/pal_sorting.o: src/gfx/pal_sorting.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+src/gfx/pal_spec.o: src/gfx/pal_spec.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+src/gfx/process.o: src/gfx/process.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+src/gfx/proto_palette.o: src/gfx/proto_palette.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+src/gfx/reverse.o: src/gfx/reverse.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+src/gfx/rgba.o: src/gfx/rgba.cpp
+	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
 
 .cpp.o:
-	$Q${CXX} ${REALCXXFLAGS} ${PNGCFLAGS} -c -o $@ $<
+	$Q${CXX} ${REALCXXFLAGS} -c -o $@ $<
 
 # Target used to remove all files generated by other Makefile targets
 
@@ -176,8 +174,10 @@ clean:
 	$Q${RM} rgbfix rgbfix.exe
 	$Q${RM} rgbgfx rgbgfx.exe
 	$Qfind src/ -name "*.o" -exec rm {} \;
+	$Qfind . -type f \( -name "*.gcno" -o -name "*.gcda" -o -name "*.gcov" \) -exec rm {} \;
 	$Q${RM} rgbshim.sh
-	$Q${RM} src/asm/parser.c src/asm/parser.h
+	$Q${RM} src/asm/parser.cpp src/asm/parser.hpp
+	$Q${RM} src/link/script.cpp src/link/script.hpp src/link/stack.hh
 	$Q${RM} test/gfx/randtilegen test/gfx/rgbgfx_test
 
 # Target used to install the binaries and man pages.
@@ -189,30 +189,6 @@ install: all
 	$Qinstall -m ${MANMODE} man/rgbds.5 man/rgbasm.5 man/rgblink.5 ${DESTDIR}${mandir}/man5/
 	$Qinstall -m ${MANMODE} man/rgbds.7 man/gbz80.7 ${DESTDIR}${mandir}/man7/
 
-# Target used to check the coding style of the whole codebase.
-# `extern/` is excluded, as it contains external code that should not be patched
-# to meet our coding style, so applying upstream patches is easier.
-# `.y` files aren't checked, unfortunately...
-
-checkcodebase:
-	$Qfor file in `git ls-files | grep -E '(\.c|\.h)$$' | grep -Ev '(src|include)/extern/'`; do	\
-		${CHECKPATCH} -f "$$file";					\
-	done
-
-# Target used to check the coding style of the patches from the upstream branch
-# to the HEAD. Runs checkpatch once for each commit between the current HEAD and
-# the first common commit between the HEAD and origin/master.
-# `.y` files aren't checked, unfortunately...
-
-checkpatch:
-	$QCOMMON_COMMIT=`git merge-base HEAD ${BASE_REF}`;		\
-	for commit in `git rev-list $$COMMON_COMMIT..HEAD`; do		\
-		echo "[*] Analyzing commit '$$commit'";			\
-		git format-patch --stdout "$$commit~..$$commit"		\
-			-- src include '!src/extern' '!include/extern'	\
-			| ${CHECKPATCH} - || true;			\
-	done
-
 # Target used to check for suspiciously missing changed files.
 
 checkdiff:
@@ -224,32 +200,35 @@ checkdiff:
 # The rationale for some of the flags is documented in the CMakeLists.
 
 develop:
-	$Qenv ${MAKE} WARNFLAGS="-Werror -Wextra \
+	$Q${MAKE} WARNFLAGS="${WARNFLAGS} -Werror -Wextra \
 		-Walloc-zero -Wcast-align -Wcast-qual -Wduplicated-branches -Wduplicated-cond \
 		-Wfloat-equal -Wlogical-op -Wnull-dereference -Wshift-overflow=2 \
 		-Wstringop-overflow=4 -Wstrict-overflow=5 -Wundef -Wuninitialized -Wunused \
 		-Wshadow \
 		-Wformat=2 -Wformat-overflow=2 -Wformat-truncation=1 \
-		-Wno-format-nonliteral \
+		-Wno-format-nonliteral -Wno-strict-overflow \
 		-Wno-type-limits -Wno-tautological-constant-out-of-range-compare \
 		-Wvla \
-		-Wno-unknown-warning-option \
 		-D_GLIBCXX_ASSERTIONS \
 		-fsanitize=shift -fsanitize=integer-divide-by-zero \
 		-fsanitize=unreachable -fsanitize=vla-bound \
 		-fsanitize=signed-integer-overflow -fsanitize=bounds \
 		-fsanitize=object-size -fsanitize=bool -fsanitize=enum \
 		-fsanitize=alignment -fsanitize=null -fsanitize=address" \
-		CFLAGS="-ggdb3 -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls" \
 		CXXFLAGS="-ggdb3 -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls"
 
 # This target is used during development in order to more easily debug with gdb.
 
 debug:
 	$Qenv ${MAKE} \
-		CFLAGS="-ggdb3 -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls" \
 		CXXFLAGS="-ggdb3 -Og -fno-omit-frame-pointer -fno-optimize-sibling-calls"
 
+# This target is used during development in order to inspect code coverage with gcov.
+
+coverage:
+	$Qenv ${MAKE} \
+		CXXFLAGS="-ggdb3 -Og --coverage -fno-omit-frame-pointer -fno-optimize-sibling-calls"
+
 # Targets for the project maintainer to easily create Windows exes.
 # This is not for Windows users!
 # If you're building on Windows with Cygwin or Mingw, just follow the Unix
@@ -257,16 +236,17 @@ debug:
 
 mingw32:
 	$Q${MAKE} all test/gfx/randtilegen test/gfx/rgbgfx_test \
-		CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ \
-		BISON=bison PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/i686-w64-mingw32 pkg-config"
+		CXX=i686-w64-mingw32-g++ \
+		CXXFLAGS="-O3 -flto -DNDEBUG -static-libgcc" \
+		PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/i686-w64-mingw32 pkg-config"
 
 mingw64:
 	$Q${MAKE} all test/gfx/randtilegen test/gfx/rgbgfx_test \
-		CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ \
-		BISON=bison PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/x86_64-w64-mingw32 pkg-config"
+		CXX=x86_64-w64-mingw32-g++ \
+		PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/x86_64-w64-mingw32 pkg-config"
 
 wine-shim:
-	$Qecho '#!/bin/bash' > rgbshim.sh
+	$Qecho '#!/usr/bin/env bash' > rgbshim.sh
 	$Qecho 'WINEDEBUG=-all wine $$0.exe "$${@:1}"' >> rgbshim.sh
 	$Qchmod +x rgbshim.sh
 	$Qln -s rgbshim.sh rgbasm

README.rst

@@ -14,16 +14,20 @@ other UNIX tools.
 
 This toolchain is maintained `on GitHub <https://github.com/gbdev/rgbds>`__.
 
-The documentation of this toolchain can be viewed online `here <https://rgbds.gbdev.io/docs/>`__, it is generated from the man pages found in this repository.
-The source code of the website itself is on GitHub as well under the repo `rgbds-www <https://github.com/gbdev/rgbds-www>`__.
+The documentation of this toolchain can be viewed online `here <https://rgbds.gbdev.io/docs/>`__.
+It is generated from the man pages found in this repository.
+The source code of the website itself is on GitHub as well under the repo
+`rgbds-www <https://github.com/gbdev/rgbds-www>`__.
 
-If you want to contribute or maintain RGBDS, and have questions regarding the code, its organisation, etc. you can find me `on GBDev <https://gbdev.io/chat>`__ or via mail at ``rgbds at eldred dot fr``.
+If you want to contribute or maintain RGBDS, and have questions regarding the code, its
+organisation, etc. you can find the maintainers `on the gbdev community channels <https://gbdev.io/chat>`__
+or via mail at ``rgbds at gbdev dot io``.
 
 1. Installing RGBDS
 -------------------
 
 The `installation procedure <https://rgbds.gbdev.io/install>`__ is available
-online for various platforms. `Building from source <https://rgbds.gbdev.io/install/#building-from-source>`__
+online for various platforms. `Building from source <https://rgbds.gbdev.io/install/source>`__
 is possible using ``make`` or ``cmake``; follow the link for more detailed instructions.
 
 .. code:: sh
@@ -40,13 +44,13 @@ is possible using ``make`` or ``cmake``; follow the link for more detailed instr
 2. RGBDS Folder Organization
 ----------------------------
 
-The RGBDS source code file structure somewhat resembles the following:
+The RGBDS source code file structure is as follows:
 
 ::
 
        .
        ├── .github/
-       │   ├── actions/
+       │   ├── scripts/
        │   │   └── ...
        │   └── workflows/
        │       └── ...
@@ -76,6 +80,7 @@ The RGBDS source code file structure somewhat resembles the following:
        │   └── run-tests.sh
        ├── .clang-format
        ├── CMakeLists.txt
+       ├── Dockerfile
        ├── Makefile
        └── README.rst
 
@@ -85,50 +90,75 @@ The RGBDS source code file structure somewhat resembles the following:
 - ``.github/`` - files and scripts related to the integration of the RGBDS codebase with
   GitHub.
 
-  * ``actions/`` - scripts used by workflow files.
+  * ``scripts/`` - scripts used by workflow files.
   * ``workflows/`` - CI workflow description files.
 
 - ``contrib/`` - scripts and other resources which may be useful to users and developers of
   RGBDS.
 
-  * ``zsh_compl`` contains tab completion scripts for use with zsh. Put them somewhere in your ``fpath``, and they should auto-load.
+  * ``zsh_compl`` contains tab completion scripts for use with zsh. Put them somewhere in
+    your ``fpath``, and they should auto-load.
 
-  * ``bash_compl`` contains tab completion scripts for use with bash. Run them with ``source`` somewhere in your ``.bashrc``, and they should load every time you open a shell.
+  * ``bash_compl`` contains tab completion scripts for use with bash. Run them with ``source``
+    somewhere in your ``.bashrc``, and they should load every time you open a shell.
 
-- ``include/`` - header files for each respective C files in `src`.
+- ``include/`` - header files for the respective source files in `src`.
 
 - ``man/`` - manual pages.
 
 - ``src/`` - source code of RGBDS.
 
   * Note that the code unique to each RGBDS tool is stored in its respective subdirectory
-    (rgbasm -> ``src/asm/``, for example). ``src/extern/`` contains code imported from external sources.
+    (rgbasm -> ``src/asm/``, for example). ``src/extern/`` contains code imported from
+    external sources.
 
-- ``test/`` - testing framework used to verify that changes to the code don't break or modify the behavior of RGBDS.
+- ``test/`` - testing framework used to verify that changes to the code don't break or
+  modify the behavior of RGBDS.
 
-- ``.clang-format`` - code style for automated formatting with |clang-format|_. The C code does not currently follow this style, but all C++ code should.
+- ``.clang-format`` - code style for automated C++ formatting with |clang-format|_.
+
+- ``Dockerfile`` - defines how to build RGBDS with Docker.
 
 3. History
 ----------
 
-- Around 1997, Carsten Sørensen (AKA SurfSmurf) writes ASMotor as a
-  general-purpose assembler/linker system for DOS/Win32
+- 1996-10-01: Carsten Sørensen (a.k.a. SurfSmurf) releases
+  `xAsm <http://otakunozoku.com/RGBDSdocs/asm.htm>`__,
+  `xLink <http://otakunozoku.com/RGBDSdocs/link.htm>`__, and
+  `RGBFix <http://otakunozoku.com/RGBDSdocs/fix.htm>`__,
+  a Game Boy SM83 (GBZ80) assembler/linker system for DOS/Win32.
 
-- Around 1999, Justin Lloyd (AKA Otaku no Zoku) adapts ASMotor to read and
-  produce GBZ80 assembly/machine code, and releases this version as RGBDS.
+- 1997-07-03: Sørensen releases `ASMotor <http://otakunozoku.com/RGBDSdocs/geninfo.htm>`__,
+  packaging the three programs together and moving towards making them a
+  general-purpose target-independent system.
 
-- 2009, Vegard Nossum adapts the code to be more UNIX-like and releases
-  this version as rgbds-linux on
-  `GitHub <https://github.com/vegard/rgbds-linux>`__.
+- 1999-08-01: Justin Lloyd (a.k.a. Otaku no Zoku) adapts ASMotor to re-focus
+  on SM83 assembly/machine code, and releases this version as
+  `RGBDS <http://otakunozoku.com/rednex-gameboy-development-system/>`__.
 
-- 2010, Anthony J. Bentley forks that repository. The fork becomes the reference
-  implementation of rgbds.
+- 2009-06-11: Vegard Nossum adapts the code to be more UNIX-like and releases
+  this version as `rgbds-linux <https://github.com/vegard/rgbds-linux>`__.
 
-- 2017, Bentley's repository is moved to a neutral name.
+- 2010-01-12: Anthony J. Bentley `forks <https://github.com/bentley>`__ Nossum's
+  repository. The fork becomes the reference implementation of RGBDS.
 
-- 2018, codebase relicensed under the MIT license.
+- 2015-01-18: stag019 begins implementing `rgbgfx <https://github.com/stag019/rgbgfx>`__,
+  a PNG‐to‐Game Boy graphics converter, for eventual integration into RGBDS.
 
-- 2020, repository is moved to the `gbdev <https://github.com/gbdev>`__ organisation. The `rgbds.gbdev.io <https://rgbds.gbdev.io>`__ website serving documentation and downloads is created.
+- 2016-09-05: rgbgfx is `integrated <https://github.com/gbdev/rgbds/commit/c3c31138ddbd8680d4e67957e387f2816798a71b>`__
+  into Bentley's repository.
+
+- 2017-02-23: Bentley's repository is moved to the `rednex <https://github.com/rednex>`__
+  organization.
+
+- 2018-01-26: The codebase is `relicensed <https://github.com/gbdev/rgbds/issues/128>`__
+  under the MIT license.
+
+- 2020-09-15: The repository is `moved <https://github.com/gbdev/rgbds/issues/567>`__
+  to the `gbdev <https://github.com/gbdev>`__ organization.
+
+- 2022-05-17: The `rgbds.gbdev.io <https://rgbds.gbdev.io>`__ website for RGBDS
+  documentation and downloads is published.
 
 4. Acknowledgements
 -------------------
@@ -137,3 +167,5 @@ RGBGFX generates palettes using algorithms found in the paper
 `"Algorithms for the Pagination Problem, a Bin Packing with Overlapping Items" <http://arxiv.org/abs/1605.00558>`__
 (`GitHub <https://github.com/pagination-problem/pagination>`__, MIT license),
 by Aristide Grange, Imed Kacem, and Sébastien Martin.
+
+RGBGFX's color palette was taken from `SameBoy <https://sameboy.github.io>`__, with permission and help by `LIJI <https://github.com/LIJI32>`__.

RELEASE.rst

@@ -4,16 +4,17 @@ Releasing
 This describes for the maintainers of RGBDS how to publish a new release on
 GitHub.
 
-1. Update, commit, and push `include/version.h <include/version.h>`__ with
+1. Update, commit, and push `include/version.hpp <include/version.hpp>`__ with
    values for ``PACKAGE_VERSION_MAJOR``, ``PACKAGE_VERSION_MINOR``,
-   ``PACKAGE_VERSION_PATCH``, and ``PACKAGE_VERSION_RC``. Only define
+   ``PACKAGE_VERSION_PATCH``, and ``PACKAGE_VERSION_RC``, as well as
+   `Dockerfile <Dockerfile>`__ with a value for ``ARG version``. Only define
    ``PACKAGE_VERSION_RC`` if you are publishing a release candidate! You can
    use ``git commit -m "Release <version>"`` and ``git push origin master``.
 
 2. Create a Git tag formatted as ``v<MAJOR>.<MINOR>.<PATCH>``, or
    ``v<MAJOR>.<MINOR>.<PATCH>-rc<RC>`` for a release candidate. ``MAJOR``,
    ``MINOR``, ``PATCH``, and ``RC`` should match their values from
-   `include/version.h <include/version.h>`__. You can use ``git tag <tag>``.
+   `include/version.hpp <include/version.hpp>`__. You can use ``git tag <tag>``.
 
 3. Push the tag to GitHub. You can use ``git push origin <tag>``.
 

contrib/bash_compl/_rgbasm.bash

@@ -43,6 +43,7 @@ _rgbasm_completions() {
 		[Q]="q-precision:unk"
 		[r]="recursion-depth:unk"
 		[W]="warning:warning"
+		[X]="max-errors:unk"
 	)
 	# Parse command-line up to current word
 	local opt_ena=true

contrib/bash_compl/_rgbgfx.bash

@@ -10,11 +10,12 @@ _rgbgfx_completions() {
 		[V]="version:normal"
 		[C]="color-curve:normal"
 		[m]="mirror-tiles:normal"
+		[O]="group-outputs:normal"
 		[u]="unique-tiles:normal"
 		[v]="verbose:normal"
 		[Z]="columns:normal"
 		[a]="attr-map:glob-*.attrmap"
-		[A]="output-attr-map:normal"
+		[A]="auto-attr-map:normal"
 		[b]="base-tiles:unk"
 		[d]="depth:unk"
 		[L]="slice:unk"
@@ -22,13 +23,13 @@ _rgbgfx_completions() {
 		[n]="nb-palettes:unk"
 		[o]="output:glob-*.2bpp"
 		[p]="palette:glob-*.pal"
-		[P]="output-palette:normal"
+		[P]="auto-palette:normal"
 		[q]="palette-map:glob-*.palmap"
-		[Q]="output-palette-map:normal"
+		[Q]="auto-palette-map:normal"
 		[r]="reverse:unk"
 		[s]="palette-size:unk"
 		[t]="tilemap:glob-*.tilemap"
-		[T]="output-tilemap:normal"
+		[T]="auto-tilemap:normal"
 		[x]="trim-end:unk"
 	)
 	# Parse command-line up to current word

contrib/checkdiff.bash

@@ -1,26 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # SPDX-License-Identifier: MIT
-#
-# Copyright (c) 2021 Rangi
-#
-# 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.
 
 declare -A FILES
 while read -r -d '' file; do
@@ -40,18 +20,21 @@ dependency () {
 # Pull requests that edit the first file without the second may be correct,
 # but are suspicious enough to require review.
 
-dependency include/linkdefs.h    man/rgbds.5 \
+dependency include/linkdefs.hpp    man/rgbds.5 \
            "Was the object file format changed?"
 
 dependency src/asm/parser.y        man/rgbasm.5 \
            "Was the rgbasm grammar changed?"
 
-dependency include/asm/warning.h man/rgbasm.1 \
+dependency src/link/script.y       man/rgblink.5 \
+           "Was the linker script grammar changed?"
+
+dependency include/asm/warning.hpp man/rgbasm.1 \
            "Were the rgbasm warnings changed?"
 
-dependency src/asm/object.c      include/linkdefs.h \
+dependency src/asm/object.cpp      include/linkdefs.hpp \
            "Should the object file revision be bumped?"
-dependency src/link/object.c     include/linkdefs.h \
+dependency src/link/object.cpp     include/linkdefs.hpp \
            "Should the object file revision be bumped?"
 
 dependency Makefile                CMakeLists.txt \
@@ -59,23 +42,23 @@ dependency Makefile              CMakeLists.txt \
 dependency Makefile                src/CMakeLists.txt \
            "Did the build process change?"
 
-dependency src/asm/main.c        man/rgbasm.1 \
+dependency src/asm/main.cpp        man/rgbasm.1 \
            "Did the rgbasm CLI change?"
-dependency src/asm/main.c        contrib/zsh_compl/_rgbasm \
+dependency src/asm/main.cpp        contrib/zsh_compl/_rgbasm \
            "Did the rgbasm CLI change?"
-dependency src/asm/main.c        contrib/bash_compl/_rgbasm.bash \
+dependency src/asm/main.cpp        contrib/bash_compl/_rgbasm.bash \
            "Did the rgbasm CLI change?"
-dependency src/link/main.c       man/rgblink.1 \
+dependency src/link/main.cpp       man/rgblink.1 \
            "Did the rgblink CLI change?"
-dependency src/link/main.c       contrib/zsh_compl/_rgblink \
+dependency src/link/main.cpp       contrib/zsh_compl/_rgblink \
            "Did the rgblink CLI change?"
-dependency src/link/main.c        contrib/bash_compl/_rgblink.bash \
+dependency src/link/main.cpp        contrib/bash_compl/_rgblink.bash \
            "Did the rgblink CLI change?"
-dependency src/fix/main.c        man/rgbfix.1 \
+dependency src/fix/main.cpp        man/rgbfix.1 \
            "Did the rgbfix CLI change?"
-dependency src/fix/main.c        contrib/zsh_compl/_rgbfix \
+dependency src/fix/main.cpp        contrib/zsh_compl/_rgbfix \
            "Did the rgbfix CLI change?"
-dependency src/fix/main.c        contrib/bash_compl/_rgbfix.bash \
+dependency src/fix/main.cpp        contrib/bash_compl/_rgbfix.bash \
            "Did the rgbfix CLI change?"
 dependency src/gfx/main.cpp        man/rgbgfx.1 \
            "Did the rgbgfx CLI change?"

contrib/coverage.bash

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -e
+
+# Build RGBDS with gcov support
+make coverage -j
+
+# Run the tests
+for dir in asm link fix gfx; do
+	pushd test/$dir
+	./test.sh
+	popd
+done
+
+# Generate coverage logs
+gcov src/**/*.{c,cpp}
+mkdir -p coverage
+
+# Generate coverage report
+lcov -c --no-external -d . -o coverage/coverage.info
+genhtml -f -s -o coverage/ coverage/coverage.info
+
+# Open report in web browser
+if [ "$(uname)" == "Darwin" ]; then
+  open coverage/index.html
+else
+  xdg-open coverage/index.html
+fi

contrib/gbdiff.bash

@@ -1,26 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # SPDX-License-Identifier: MIT
-#
-# Copyright (c) 2020 Eldred Habert
-#
-# 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.
 
 STATE=0
 diff <(xxd "$1") <(xxd "$2") | while read -r LINE; do
@@ -57,7 +37,7 @@ diff <(xxd "$1") <(xxd "$2") | while read -r LINE; do
 			 while read -r SYMADDR SYM; do
 				SYMADDR=$((0x${SYMADDR#*:}))
 				if [[ $SYMADDR -le $ADDR ]]; then
-					printf " (%s+%#x)\n" "$SYM" $((ADDR - SYMADDR))
+					printf " (%s+0x%x)\n" "$SYM" $((ADDR - SYMADDR))
 				fi
 			# TODO: assumes sorted sym files
 			done | tail -n 1

contrib/zsh_compl/_rgbasm

@@ -60,6 +60,7 @@ local args=(
 	'(-Q --q-precision)'{-Q,--q-precision}'+[Set fixed-point precision]:precision:'
 	'(-r --recursion-depth)'{-r,--recursion-depth}'+[Set maximum recursion depth]:depth:'
 	'(-W --warning)'{-W,--warning}'+[Toggle warning flags]:warning flag:_rgbasm_warnings'
+	'(-X --max-errors)'{-X,--max-errors}'+[Set maximum errors before aborting]:maximum errors:'
 
 	":assembly sources:_files -g '*.asm'"
 )

contrib/zsh_compl/_rgbgfx

@@ -13,28 +13,29 @@ local args=(
 	# Arguments are listed here in the same order as in the manual, except for the version
 	'(- : * options)'{-V,--version}'[Print version number]'
 
-	'(-a --attr-map -A --output-attr-map)'{-A,--output-attr-map}'[Shortcut for -a <file>.attrmap]'
+	'(-a --attr-map -A --auto-attr-map)'{-A,--auto-attr-map}'[Shortcut for -a <file>.attrmap]'
 	'(-C --color-curve)'{-C,--color-curve}'[Generate palettes using GBC color curve]'
 	'(-m --mirror-tiles)'{-m,--mirror-tiles}'[Eliminate mirrored tiles from output]'
-	'(-p --palette -P --output-palette)'{-P,--output-palette}'[Shortcut for -p <file>.pal]'
-	'(-q --palette-map -Q --output-palette-map)'{-Q,--output-palette-map}'[Shortcut for -p <file>.palmap]'
-	'(-t --tilemap -T --output-tilemap)'{-T,--output-tilemap}'[Shortcut for -t <file>.tilemap]'
+	'(-O --group-outputs)'{-O,--group-outputs}'[Base "shortcut" options on the output path, not input]'
+	'(-p --palette -P --auto-palette)'{-P,--auto-palette}'[Shortcut for -p <file>.pal]'
+	'(-q --palette-map -Q --auto-palette-map)'{-Q,--auto-palette-map}'[Shortcut for -p <file>.palmap]'
+	'(-t --tilemap -T --auto-tilemap)'{-T,--auto-tilemap}'[Shortcut for -t <file>.tilemap]'
 	'(-u --unique-tiles)'{-u,--unique-tiles}'[Eliminate redundant tiles]'
 	{-v,--verbose}'[Enable verbose output]'
-	'(-h --horizontal -Z --columns)'{-Z,--columns}'[Read the image in column-major order]'
+	'(-Z --columns)'{-Z,--columns}'[Read the image in column-major order]'
 
-	'(-a --attr-map -A --output-attr-map)'{-a,--attr-map}'+[Generate a map of tile attributes (mirroring)]:attrmap file:_files'
+	'(-a --attr-map -A --auto-attr-map)'{-a,--attr-map}'+[Generate a map of tile attributes (mirroring)]:attrmap file:_files'
 	'(-b --base-tiles)'{-b,--base-tiles}'+[Base tile IDs for tile map output]:base tile IDs:'
 	'(-d --depth)'{-d,--depth}'+[Set bit depth]:bit depth:_depths'
 	'(-L --slice)'{-L,--slice}'+[Only process a portion of the image]:input slice:'
-	'(-N --nb-tiles)'{-n,--nb-tiles}'+[Limit number of tiles]:tile count:'
+	'(-N --nb-tiles)'{-N,--nb-tiles}'+[Limit number of tiles]:tile count:'
 	'(-n --nb-palettes)'{-n,--nb-palettes}'+[Limit number of palettes]:palette count:'
 	'(-o --output)'{-o,--output}'+[Set output file]:output file:_files'
-	'(-p --palette -P --output-palette)'{-p,--palette}"+[Output the image's palette in little-endian native RGB555 format]:palette file:_files"
-	'(-q --palette-map -Q --output-palette-map)'{-p,--palette-map}"+[Output the image's palette map]:palette map file:_files"
+	'(-p --palette -P --auto-palette)'{-p,--palette}"+[Output the image's palette in little-endian native RGB555 format]:palette file:_files"
+	'(-q --palette-map -Q --auto-palette-map)'{-q,--palette-map}"+[Output the image's palette map]:palette map file:_files"
 	'(-r --reverse)'{-r,--reverse}'+[Yield an image from binary data]:image width (in tiles):'
 	'(-s --palette-size)'{-s,--palette-size}'+[Limit palette size]:palette size:'
-	'(-t --tilemap -T --output-tilemap)'{-t,--tilemap}'+[Generate a map of tile indices]:tilemap file:_files'
+	'(-t --tilemap -T --auto-tilemap)'{-t,--tilemap}'+[Generate a map of tile indices]:tilemap file:_files'
 	'(-x --trim-end)'{-x,--trim-end}'+[Trim end of output by this many tiles]:tile count:'
 
 	":input png file:_files -g '*.png'"

include/asm/charmap.hpp

@@ -1,24 +1,19 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_ASM_CHARMAP_H
 #define RGBDS_ASM_CHARMAP_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #define DEFAULT_CHARMAP_NAME "main"
 
 struct Charmap *charmap_New(char const *name, char const *baseName);
-void charmap_Delete(struct Charmap *charmap);
 void charmap_Set(char const *name);
 void charmap_Push(void);
 void charmap_Pop(void);
 void charmap_Add(char *mapping, uint8_t value);
+bool charmap_HasChar(char const *input);
 size_t charmap_Convert(char const *input, uint8_t *output);
 size_t charmap_ConvertNext(char const **input, uint8_t **output);
 

include/asm/fixpoint.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2021, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_ASM_FIXPOINT_H
 #define RGBDS_ASM_FIXPOINT_H

include/asm/format.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2020, RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_FORMAT_SPEC_H
 #define RGBDS_FORMAT_SPEC_H

include/asm/fstack.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Contains some assembler-wide defines and externs
 
@@ -15,8 +9,9 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "asm/lexer.h"
+#include "asm/lexer.hpp"
 
+#include "linkdefs.hpp"
 
 struct FileStackNode {
 	struct FileStackNode *parent; // Pointer to parent node, for error reporting
@@ -27,11 +22,7 @@ struct FileStackNode {
 	bool referenced; // If referenced, don't free!
 	uint32_t ID; // Set only if referenced: ID within the object file, -1 if not output yet
 
-	enum {
-		NODE_REPT,
-		NODE_FILE,
-		NODE_MACRO,
-	} type;
+	enum FileStackNodeType type;
 };
 
 struct FileStackReptNode { // NODE_REPT

include/asm/lexer.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_ASM_LEXER_H
 #define RGBDS_ASM_LEXER_H
@@ -90,6 +84,11 @@ int yylex(void);
 bool lexer_CaptureRept(struct CaptureBody *capture);
 bool lexer_CaptureMacroBody(struct CaptureBody *capture);
 
+struct AlignmentSpec {
+	uint8_t alignment;
+	uint16_t alignOfs;
+};
+
 #define INITIAL_DS_ARG_SIZE 2
 struct DsArgList {
 	size_t nbArgs;
@@ -97,4 +96,11 @@ struct DsArgList {
 	struct Expression *args;
 };
 
+#define INITIAL_PURGE_ARG_SIZE 2
+struct PurgeArgList {
+	size_t nbArgs;
+	size_t capacity;
+	char **args;
+};
+
 #endif // RGBDS_ASM_LEXER_H

include/asm/macro.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2020, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_MACRO_H
 #define RGBDS_MACRO_H
@@ -13,9 +7,9 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "asm/warning.h"
+#include "asm/warning.hpp"
 
-#include "helpers.h"
+#include "helpers.hpp"
 
 struct MacroArgs;
 

include/asm/main.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2021, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_MAIN_H
 #define RGBDS_MAIN_H
@@ -13,9 +7,9 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "helpers.h"
+#include "helpers.hpp"
 
-extern bool haltnop;
+extern bool haltNop;
 extern bool warnOnHaltNop;
 extern bool optimizeLoads;
 extern bool warnOnLdOpt;

include/asm/opt.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2021, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_OPT_H
 #define RGBDS_OPT_H
@@ -17,8 +11,8 @@ void opt_G(char const chars[4]);
 void opt_P(uint8_t padByte);
 void opt_Q(uint8_t precision);
 void opt_L(bool optimize);
-void opt_W(char const *flag);
-void opt_Parse(char const *option);
+void opt_W(char *flag);
+void opt_Parse(char *option);
 
 void opt_Push(void);
 void opt_Pop(void);

include/asm/output.hpp

@@ -1,17 +1,11 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_ASM_OUTPUT_H
 #define RGBDS_ASM_OUTPUT_H
 
 #include <stdint.h>
 
-#include "linkdefs.h"
+#include "linkdefs.hpp"
 
 struct Expression;
 struct FileStackNode;

include/asm/rpn.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_ASM_RPN_H
 #define RGBDS_ASM_RPN_H
@@ -12,7 +6,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "linkdefs.h"
+#include "linkdefs.hpp"
 
 #define MAXRPNLEN 1048576
 
@@ -50,13 +44,15 @@ void rpn_BinaryOp(enum RPNCommand op, struct Expression *expr,
 void rpn_HIGH(struct Expression *expr, const struct Expression *src);
 void rpn_LOW(struct Expression *expr, const struct Expression *src);
 void rpn_ISCONST(struct Expression *expr, const struct Expression *src);
-void rpn_UNNEG(struct Expression *expr, const struct Expression *src);
-void rpn_UNNOT(struct Expression *expr, const struct Expression *src);
+void rpn_NEG(struct Expression *expr, const struct Expression *src);
+void rpn_NOT(struct Expression *expr, const struct Expression *src);
 void rpn_BankSymbol(struct Expression *expr, char const *symName);
 void rpn_BankSection(struct Expression *expr, char const *sectionName);
 void rpn_BankSelf(struct Expression *expr);
 void rpn_SizeOfSection(struct Expression *expr, char const *sectionName);
 void rpn_StartOfSection(struct Expression *expr, char const *sectionName);
+void rpn_SizeOfSectionType(struct Expression *expr, enum SectionType type);
+void rpn_StartOfSectionType(struct Expression *expr, enum SectionType type);
 void rpn_Free(struct Expression *expr);
 void rpn_CheckHRAM(struct Expression *expr, const struct Expression *src);
 void rpn_CheckRST(struct Expression *expr, const struct Expression *src);

include/asm/section.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2020, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_SECTION_H
 #define RGBDS_SECTION_H
@@ -12,8 +6,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "linkdefs.h"
-#include "platform.h" // NONNULL
+#include "linkdefs.hpp"
+#include "platform.hpp" // NONNULL
 
 extern uint8_t fillByte;
 
@@ -44,15 +38,16 @@ struct SectionSpec {
 extern struct Section *currentSection;
 
 struct Section *sect_FindSectionByName(char const *name);
-void sect_NewSection(char const *name, uint32_t secttype, uint32_t org,
+void sect_NewSection(char const *name, enum SectionType type, uint32_t org,
 		     struct SectionSpec const *attributes, enum SectionModifier mod);
-void sect_SetLoadSection(char const *name, uint32_t secttype, uint32_t org,
+void sect_SetLoadSection(char const *name, enum SectionType type, uint32_t org,
 			 struct SectionSpec const *attributes, enum SectionModifier mod);
 void sect_EndLoadSection(void);
 
 struct Section *sect_GetSymbolSection(void);
 uint32_t sect_GetSymbolOffset(void);
 uint32_t sect_GetOutputOffset(void);
+uint32_t sect_GetAlignBytes(uint8_t alignment, uint16_t offset);
 void sect_AlignPC(uint8_t alignment, uint16_t offset);
 
 void sect_StartUnion(void);
@@ -65,7 +60,6 @@ void sect_AbsByteGroup(uint8_t const *s, size_t length);
 void sect_AbsWordGroup(uint8_t const *s, size_t length);
 void sect_AbsLongGroup(uint8_t const *s, size_t length);
 void sect_Skip(uint32_t skip, bool ds);
-void sect_String(char const *s);
 void sect_RelByte(struct Expression *expr, uint32_t pcShift);
 void sect_RelBytes(uint32_t n, struct Expression *exprs, size_t size);
 void sect_RelWord(struct Expression *expr, uint32_t pcShift);
@@ -74,6 +68,7 @@ void sect_PCRelByte(struct Expression *expr, uint32_t pcShift);
 void sect_BinaryFile(char const *s, int32_t startPos);
 void sect_BinaryFileSlice(char const *s, int32_t start_pos, int32_t length);
 
+void sect_EndSection(void);
 void sect_PushSection(void);
 void sect_PopSection(void);
 

include/asm/symbol.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2020, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_SYMBOL_H
 #define RGBDS_SYMBOL_H
@@ -14,9 +8,9 @@
 #include <string.h>
 #include <time.h>
 
-#include "asm/section.h"
+#include "asm/section.hpp"
 
-#include "platform.h" // MIN_NB_ELMS
+#include "platform.hpp" // MIN_NB_ELMS
 
 #define MAXSYMLEN	255
 
@@ -123,8 +117,6 @@ uint32_t sym_GetConstantSymValue(struct Symbol const *sym);
 uint32_t sym_GetConstantValue(char const *symName);
 // Find a symbol by exact name, bypassing expansion checks
 struct Symbol *sym_FindExactSymbol(char const *symName);
-// Find a symbol by exact name; may not be scoped, produces an error if it is
-struct Symbol *sym_FindUnscopedSymbol(char const *symName);
 // Find a symbol, possibly scoped, by name
 struct Symbol *sym_FindScopedSymbol(char const *symName);
 // Find a scoped symbol by name; do not return `@` or `_NARG` when they have no value

include/asm/warning.hpp

@@ -1,17 +1,11 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2019, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef WARNING_H
 #define WARNING_H
 
-#include "helpers.h"
+#include "helpers.hpp"
 
-extern unsigned int nbErrors;
+extern unsigned int nbErrors, maxErrors;
 
 enum WarningState {
 	WARNING_DEFAULT,
@@ -83,7 +77,7 @@ void warning(enum WarningID id, char const *fmt, ...) format_(printf, 2, 3);
  * It is also used when the assembler goes into an invalid state (for example,
  * when it fails to allocate memory).
  */
-_Noreturn void fatalerror(char const *fmt, ...) format_(printf, 1, 2);
+[[noreturn]] void fatalerror(char const *fmt, ...) format_(printf, 1, 2);
 
 /*
  * Used for errors that make it impossible to assemble correctly, but don't

include/error.h

@@ -1,29 +0,0 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2021, RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
-
-#ifndef RGBDS_ERROR_H
-#define RGBDS_ERROR_H
-
-#include "helpers.h"
-#include "platform.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void warn(char const NONNULL(fmt), ...) format_(printf, 1, 2);
-void warnx(char const NONNULL(fmt), ...) format_(printf, 1, 2);
-
-_Noreturn void err(char const NONNULL(fmt), ...) format_(printf, 1, 2);
-_Noreturn void errx(char const NONNULL(fmt), ...) format_(printf, 1, 2);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // RGBDS_ERROR_H

include/error.hpp

@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT */
+
+#ifndef RGBDS_ERROR_H
+#define RGBDS_ERROR_H
+
+#include "helpers.hpp"
+#include "platform.hpp"
+
+extern "C" {
+
+void warn(char const NONNULL(fmt), ...) format_(printf, 1, 2);
+void warnx(char const NONNULL(fmt), ...) format_(printf, 1, 2);
+
+[[noreturn]] void err(char const NONNULL(fmt), ...) format_(printf, 1, 2);
+[[noreturn]] void errx(char const NONNULL(fmt), ...) format_(printf, 1, 2);
+
+}
+
+#endif // RGBDS_ERROR_H

include/extern/getopt.h

@@ -1,54 +0,0 @@
-/*
- * Copyright © 2005-2020 Rich Felker, et al.
- *
- * 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.
- */
-
-/* This implementation was taken from musl and modified for RGBDS */
-
-#ifndef RGBDS_EXTERN_GETOPT_H
-#define RGBDS_EXTERN_GETOPT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern char *musl_optarg;
-extern int musl_optind, musl_opterr, musl_optopt, musl_optreset;
-
-struct option {
-	char const *name;
-	int has_arg;
-	int *flag;
-	int val;
-};
-
-int musl_getopt_long_only(int argc, char **argv, char const *optstring,
-			  const struct option *longopts, int *idx);
-
-#define no_argument        0
-#define required_argument  1
-#define optional_argument  2
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif

include/extern/getopt.hpp

@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: MIT */
+
+/* This implementation was taken from musl and modified for RGBDS */
+
+#ifndef RGBDS_EXTERN_GETOPT_H
+#define RGBDS_EXTERN_GETOPT_H
+
+extern "C" {
+
+extern char *musl_optarg;
+extern int musl_optind, musl_opterr, musl_optopt, musl_optreset;
+
+struct option {
+	char const *name;
+	int has_arg;
+	int *flag;
+	int val;
+};
+
+int musl_getopt_long_only(int argc, char **argv, char const *optstring,
+			  const struct option *longopts, int *idx);
+
+#define no_argument        0
+#define required_argument  1
+#define optional_argument  2
+
+} // extern "C"
+
+#endif

include/extern/utf8decoder.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2018, Antonio Nino Diaz and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef EXTERN_UTF8DECODER_H
 #define EXTERN_UTF8DECODER_H

include/file.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_FILE_HPP
 #define RGBDS_FILE_HPP
@@ -22,8 +16,8 @@
 #include <string_view>
 #include <variant>
 
-#include "helpers.h"
-#include "platform.h"
+#include "helpers.hpp"
+#include "platform.hpp"
 
 #include "gfx/main.hpp"
 
@@ -94,7 +88,8 @@ public:
 	char const *c_str(std::string const &path) const {
 		return std::visit(Visitor{[&path](std::filebuf const &) { return path.c_str(); },
 		                          [](std::streambuf const *buf) {
-			                          return buf == std::cin.rdbuf() ? "<stdin>" : "<stdout>";
+			                          return buf == std::cin.rdbuf()
+			                                 ? "<stdin>" : "<stdout>";
 		                          }},
 		                  _file);
 	}

include/gfx/main.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_MAIN_HPP
 #define RGBDS_GFX_MAIN_HPP
@@ -16,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include "helpers.h"
+#include "helpers.hpp"
 
 #include "gfx/rgba.hpp"
 
@@ -116,7 +110,8 @@ static constexpr auto flipTable(std::integer_sequence<T, i...>) {
 		return byte;
 	}(i)...};
 }
-}
+} // namespace detail
+
 // Flipping tends to happen fairly often, so take a bite out of dcache to speed it up
 static constexpr auto flipTable = detail::flipTable(std::make_integer_sequence<uint16_t, 256>());
 

include/gfx/pal_packing.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_PAL_PACKING_HPP
 #define RGBDS_GFX_PAL_PACKING_HPP
@@ -27,6 +21,6 @@ namespace packing {
 std::tuple<DefaultInitVec<size_t>, size_t>
     overloadAndRemove(std::vector<ProtoPalette> const &protoPalettes);
 
-}
+} // namespace packing
 
 #endif // RGBDS_GFX_PAL_PACKING_HPP

include/gfx/pal_sorting.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_PAL_SORTING_HPP
 #define RGBDS_GFX_PAL_SORTING_HPP
@@ -22,11 +16,11 @@ struct Palette;
 namespace sorting {
 
 void indexed(std::vector<Palette> &palettes, int palSize, png_color const *palRGB,
-             png_byte *palAlpha);
+             int palAlphaSize, png_byte *palAlpha);
 void grayscale(std::vector<Palette> &palettes,
                std::array<std::optional<Rgba>, 0x8001> const &colors);
 void rgb(std::vector<Palette> &palettes);
 
-}
+} // namespace sorting
 
 #endif // RGBDS_GFX_PAL_SORTING_HPP

include/gfx/pal_spec.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_PAL_SPEC_HPP
 #define RGBDS_GFX_PAL_SPEC_HPP

include/gfx/process.hpp

@@ -1,14 +1,9 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_CONVERT_HPP
 #define RGBDS_GFX_CONVERT_HPP
 
+void processPalettes();
 void process();
 
 #endif // RGBDS_GFX_CONVERT_HPP

include/gfx/proto_palette.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_PROTO_PALETTE_HPP
 #define RGBDS_GFX_PROTO_PALETTE_HPP
@@ -15,15 +9,20 @@
 #include <stdint.h>
 
 class ProtoPalette {
+public:
+	static constexpr size_t capacity = 4;
+
+private:
 	// Up to 4 colors, sorted, and where SIZE_MAX means the slot is empty
 	// (OK because it's not a valid color index)
 	// Sorting is done on the raw numerical values to lessen `compare`'s complexity
-	std::array<uint16_t, 4> _colorIndices{UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX};
+	std::array<uint16_t, capacity> _colorIndices{UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX};
 
 public:
 	/*
-	 * Adds the specified color to the set
-	 * Returns false if the set is full
+	 * Adds the specified color to the set, or **silently drops it** if the set is full.
+	 *
+	 * Returns whether the color was unique.
 	 */
 	bool add(uint16_t color);
 

include/gfx/reverse.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_REVERSE_HPP
 #define RGBDS_GFX_REVERSE_HPP

include/gfx/rgba.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_GFX_RGBA_HPP
 #define RGBDS_GFX_RGBA_HPP
@@ -43,6 +37,7 @@ struct Rgba {
 		auto shl = [](uint8_t val, unsigned shift) { return static_cast<uint32_t>(val) << shift; };
 		return shl(red, 24) | shl(green, 16) | shl(blue, 8) | shl(alpha, 0);
 	}
+	friend bool operator==(Rgba const &lhs, Rgba const &rhs) { return lhs.toCSS() == rhs.toCSS(); }
 	friend bool operator!=(Rgba const &lhs, Rgba const &rhs) { return lhs.toCSS() != rhs.toCSS(); }
 
 	/*

include/hashmap.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Generic hashmap implementation (C++ templates are calling...)
 #ifndef RGBDS_LINK_HASHMAP_H

include/helpers.hpp

@@ -1,19 +1,8 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2014-2020, RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef HELPERS_H
 #define HELPERS_H
 
-// Of course, MSVC does not support C11, so no _Noreturn there...
-#ifdef _MSC_VER
-	#define _Noreturn __declspec(noreturn)
-#endif
-
 // Ideally, we'd use `__has_attribute` and `__has_builtin`, but these were only introduced in GCC 9
 #ifdef __GNUC__ // GCC or compatible
 	#define format_(archetype, str_index, first_arg) \
@@ -30,8 +19,8 @@
 	#define format_(archetype, str_index, first_arg)
 	#define attr_(...)
 	// This seems to generate similar code to __builtin_unreachable, despite different semantics
-	// Note that executing this is undefined behavior (declared _Noreturn, but does return)
-	static inline _Noreturn void unreachable_(void) {}
+	// Note that executing this is undefined behavior (declared [[noreturn]], but does return)
+	[[noreturn]] static inline void unreachable_(void) {}
 #endif
 
 // Use builtins whenever possible, and shim them otherwise
@@ -93,4 +82,7 @@
 // (Having two instances of `arr` is OK because the contents of `sizeof` are not evaluated.)
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof *(arr))
 
+// For lack of <ranges>, this adds some more brevity
+#define RANGE(s) std::begin(s), std::end(s)
+
 #endif // HELPERS_H

include/itertools.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_ITERTOOLS_HPP
 #define RGBDS_ITERTOOLS_HPP
@@ -12,11 +6,49 @@
 #include <tuple>
 #include <utility>
 
+#include "platform.hpp" // __PRETTY_FUNCTION__
+
 template<typename... Ts>
 static inline void report() {
 	puts(__PRETTY_FUNCTION__);
 }
 
+template<typename T>
+class EnumSeqIterator {
+	T _value;
+
+public:
+	explicit EnumSeqIterator(T value) : _value(value) {}
+
+	EnumSeqIterator &operator++() {
+		_value = (T)(_value + 1);
+		return *this;
+	}
+
+	auto operator*() const { return _value; }
+
+	friend auto operator==(EnumSeqIterator const &lhs, EnumSeqIterator const &rhs) {
+		return lhs._value == rhs._value;
+	}
+
+	friend auto operator!=(EnumSeqIterator const &lhs, EnumSeqIterator const &rhs) {
+		return lhs._value != rhs._value;
+	}
+};
+
+template<typename T>
+class EnumSeq {
+	T _start;
+	T _stop;
+
+public:
+	explicit EnumSeq(T stop) : _start((T)0), _stop(stop) {}
+	explicit EnumSeq(T start, T stop) : _start(start), _stop(stop) {}
+
+	EnumSeqIterator<T> begin() { return EnumSeqIterator(_start); }
+	EnumSeqIterator<T> end() { return EnumSeqIterator(_stop); }
+};
+
 // This is not a fully generic implementation; its current use cases only require for-loop behavior.
 // We also assume that all iterators have the same length.
 template<typename... Iters>
@@ -77,7 +109,7 @@ public:
 template<typename T>
 using Holder = std::conditional_t<std::is_lvalue_reference_v<T>, T,
                                   std::remove_cv_t<std::remove_reference_t<T>>>;
-}
+} // namespace detail
 
 // Does the same number of iterations as the first container's iterator!
 template<typename... Containers>

include/link/assign.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Assigning all sections a place
 #ifndef RGBDS_LINK_ASSIGN_H

include/link/main.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Declarations that all modules use, as well as `main` and related
 #ifndef RGBDS_LINK_MAIN_H
@@ -14,7 +8,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "helpers.h"
+#include "helpers.hpp"
+#include "linkdefs.hpp"
 
 // Variables related to CLI options
 extern bool isDmgMode;
@@ -38,11 +33,7 @@ struct FileStackNode {
 	// Line at which the parent context was exited; meaningless for the root level
 	uint32_t lineNo;
 
-	enum {
-		NODE_REPT,
-		NODE_FILE,
-		NODE_MACRO,
-	} type;
+	enum FileStackNodeType type;
 	union {
 		char *name; // NODE_FILE, NODE_MACRO
 		struct { // NODE_REPT
@@ -70,7 +61,7 @@ void warning(struct FileStackNode const *where, uint32_t lineNo,
 void error(struct FileStackNode const *where, uint32_t lineNo,
 	   char const *fmt, ...) format_(printf, 3, 4);
 
-_Noreturn void fatal(struct FileStackNode const *where, uint32_t lineNo,
+[[noreturn]] void fatal(struct FileStackNode const *where, uint32_t lineNo,
 		     char const *fmt, ...) format_(printf, 3, 4);
 
 /*

include/link/object.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Declarations related to processing of object (.o) files
 

include/link/output.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Outputting the result of linking
 #ifndef RGBDS_LINK_OUTPUT_H
@@ -12,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "link/section.h"
+#include "link/section.hpp"
 
 /*
  * Registers a section for output.

include/link/patch.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Applying patches to SECTIONs
 #ifndef RGBDS_LINK_PATCH_H
@@ -13,9 +7,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "link/section.h"
+#include "link/section.hpp"
 
-#include "linkdefs.h"
+#include "linkdefs.hpp"
 
 struct Assertion {
 	struct Patch patch;

include/link/script.h

@@ -1,38 +0,0 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
-
-// Parsing a linker script
-#ifndef RGBDS_LINK_SCRIPT_H
-#define RGBDS_LINK_SCRIPT_H
-
-#include <stdint.h>
-#include "linkdefs.h"
-
-extern FILE * linkerScript;
-
-struct SectionPlacement {
-	struct Section *section;
-        enum SectionType type;
-	uint16_t org;
-	uint32_t bank;
-};
-
-extern uint64_t script_lineNo;
-
-/*
- * Parses the linker script to return the next section constraint
- * @return A pointer to a struct, or NULL on EOF. The pointer shouldn't be freed
- */
-struct SectionPlacement *script_NextSection(void);
-
-/*
- * `free`s all assignment memory that was allocated.
- */
-void script_Cleanup(void);
-
-#endif // RGBDS_LINK_SCRIPT_H

include/link/sdas_obj.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Assigning all sections a place
 #ifndef RGBDS_LINK_SDAS_OBJ_H

include/link/section.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Declarations manipulating symbols
 #ifndef RGBDS_LINK_SECTION_H
@@ -15,9 +9,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "link/main.h"
+#include "link/main.hpp"
 
-#include "linkdefs.h"
+#include "linkdefs.hpp"
 
 struct FileStackNode;
 struct Section;

include/link/symbol.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Declarations manipulating symbols
 #ifndef RGBDS_LINK_SYMBOL_H
@@ -14,7 +8,7 @@
 
 #include <stdint.h>
 
-#include "linkdefs.h"
+#include "linkdefs.hpp"
 
 struct FileStackNode;
 

include/linkdefs.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_LINKDEFS_H
 #define RGBDS_LINKDEFS_H
@@ -12,6 +6,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <string>
 
 #define RGBDS_OBJECT_VERSION_STRING "RGB9"
 #define RGBDS_OBJECT_REV 9U
@@ -28,17 +23,17 @@ enum RPNCommand {
 	RPN_MUL			= 0x02,
 	RPN_DIV			= 0x03,
 	RPN_MOD			= 0x04,
-	RPN_UNSUB		= 0x05, // FIXME: should be renamed to "NEG" for consistency
+	RPN_NEG			= 0x05,
 	RPN_EXP			= 0x06,
 
 	RPN_OR			= 0x10,
 	RPN_AND			= 0x11,
 	RPN_XOR			= 0x12,
-	RPN_UNNOT		= 0x13, // FIXME: should be renamed to "NOT" for consistency
+	RPN_NOT			= 0x13,
 
 	RPN_LOGAND		= 0x21,
 	RPN_LOGOR		= 0x22,
-	RPN_LOGUNNOT		= 0x23, // FIXME: should be renamed to "LOGNOT" for consistency
+	RPN_LOGNOT		= 0x23,
 
 	RPN_LOGEQ		= 0x30,
 	RPN_LOGNE		= 0x31,
@@ -56,6 +51,8 @@ enum RPNCommand {
 	RPN_BANK_SELF		= 0x52,
 	RPN_SIZEOF_SECT		= 0x53,
 	RPN_STARTOF_SECT	= 0x54,
+	RPN_SIZEOF_SECTTYPE     = 0x55,
+	RPN_STARTOF_SECTTYPE    = 0x56,
 
 	RPN_HRAM		= 0x60,
 	RPN_RST			= 0x61,
@@ -79,9 +76,15 @@ enum SectionType {
 	SECTTYPE_INVALID
 };
 
+enum FileStackNodeType {
+	NODE_REPT,
+	NODE_FILE,
+	NODE_MACRO,
+};
+
 // Nont-`const` members may be patched in RGBLINK depending on CLI flags
 extern struct SectionTypeInfo {
-	char const *const name;
+	std::string const name;
 	uint16_t const startAddr;
 	uint16_t size;
 	uint32_t const firstBank;

include/opmath.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2021, RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_OP_MATH_H
 #define RGBDS_OP_MATH_H

include/platform.hpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2020 RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // platform-specific hacks
 
@@ -33,6 +27,15 @@
 # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
 
+// gcc has __PRETTY_FUNCTION__, MSVC has __FUNCSIG__, __func__ is standard
+#ifndef __PRETTY_FUNCTION__
+# ifdef __FUNCSIG__
+#  define __PRETTY_FUNCTION__ __FUNCSIG__
+# else
+#  define __PRETTY_FUNCTION__ __func__
+# endif
+#endif
+
 // MSVC doesn't use POSIX types or defines for `read`
 #ifdef _MSC_VER
 # include <io.h>
@@ -46,15 +49,17 @@
 # include <unistd.h>
 #endif
 
-// MSVC doesn't support `[static N]` for array arguments from C99 or C11
-#ifdef _MSC_VER
-# define MIN_NB_ELMS(N)
-# define ARR_QUALS(...)
-# define NONNULL(ptr) *ptr
+// C++ doesn't support `[static N]` for array arguments from C99 or C11
+#define MIN_NB_ELMS(N) // static (N)
+#define ARR_QUALS(...) // __VA_ARGS__
+#define NONNULL(ptr) *ptr // ptr[static 1]
+#define restrict
+
+// C++ doesn't support designated array initializers, but they're a gcc extension
+#ifdef __GNUC__
+# define AT(index) [index] =
 #else
-# define MIN_NB_ELMS(N) static (N)
-# define ARR_QUALS(...) __VA_ARGS__
-# define NONNULL(ptr) ptr[static 1]
+# define AT(index)
 #endif
 
 // MSVC uses a different name for O_RDWR, and needs an additional _O_BINARY flag

include/util.hpp

@@ -1,14 +1,9 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #ifndef RGBDS_UTIL_H
 #define RGBDS_UTIL_H
 
+#include <stddef.h>
 #include <stdint.h>
 
 char const *printChar(int c);

include/version.h

@@ -1,26 +0,0 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2017-2021, Antonio Nino Diaz and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
-
-#ifndef EXTERN_VERSION_H
-#define EXTERN_VERSION_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PACKAGE_VERSION_MAJOR 0
-#define PACKAGE_VERSION_MINOR 6
-#define PACKAGE_VERSION_PATCH 1
-
-char const *get_package_version_string(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // EXTERN_VERSION_H

include/version.hpp

@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT */
+
+#ifndef EXTERN_VERSION_H
+#define EXTERN_VERSION_H
+
+extern "C" {
+
+#define PACKAGE_VERSION_MAJOR 0
+#define PACKAGE_VERSION_MINOR 7
+#define PACKAGE_VERSION_PATCH 0
+
+char const *get_package_version_string(void);
+
+}
+
+#endif // EXTERN_VERSION_H

man/gbz80.7

@@ -1,11 +1,6 @@
-.\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2017-2021, Antonio Nino Diaz and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt GBZ80 7
 .Os
 .Sh NAME
@@ -633,7 +628,7 @@ Enter CPU low-power consumption mode until an interrupt occurs.
 The exact behavior of this instruction depends on the state of the
 .Sy IME
 flag.
-.Bl -tag -width indent
+.Bl -tag -width Ds
 .It Sy IME No set
 The CPU enters low-power mode until
 .Em after
@@ -645,7 +640,7 @@ when that returns.
 The behavior depends on whether an interrupt is pending (i.e.\&
 .Ql [IE] & [IF]
 is non-zero).
-.Bl -tag -width indent
+.Bl -tag -width Ds
 .It None pending
 As soon as an interrupt becomes pending, the CPU resumes execution.
 This is like the above, except that the handler is
@@ -1321,9 +1316,13 @@ Flags: None affected.
 .Ss RL r8
 Rotate bits in register
 .Ar r8
-left through carry.
-.Pp
-.D1 C <- [7 <- 0] <- C
+left, through the carry flag.
+.Bd -literal
+  ┏━ Flags ━┓ ┏━━━━━━━ r8 ━━━━━━┓
+┌─╂─   C   ←╂─╂─ b7 ← ... ← b0 ←╂─┐
+│ ┗━━━━━━━━━┛ ┗━━━━━━━━━━━━━━━━━┛ │
+└─────────────────────────────────┘
+.Ed
 .Pp
 Cycles: 2
 .Pp
@@ -1343,9 +1342,13 @@ Set according to result.
 .Ss RL [HL]
 Rotate the byte pointed to by
 .Sy HL
-left through carry.
-.Pp
-.D1 C <- [7 <- 0] <- C
+left, through the carry flag.
+.Bd -literal
+  ┏━ Flags ━┓ ┏━━━━━━ [HL] ━━━━━┓
+┌─╂─   C   ←╂─╂─ b7 ← ... ← b0 ←╂─┐
+│ ┗━━━━━━━━━┛ ┗━━━━━━━━━━━━━━━━━┛ │
+└─────────────────────────────────┘
+.Ed
 .Pp
 Cycles: 4
 .Pp
@@ -1356,9 +1359,13 @@ Flags: See
 .Ss RLA
 Rotate register
 .Sy A
-left through carry.
-.Pp
-.D1 C <- [7 <- 0] <- C
+left, through the carry flag.
+.Bd -literal
+  ┏━ Flags ━┓ ┏━━━━━━━ A ━━━━━━━┓
+┌─╂─   C   ←╂─╂─ b7 ← ... ← b0 ←╂─┐
+│ ┗━━━━━━━━━┛ ┗━━━━━━━━━━━━━━━━━┛ │
+└─────────────────────────────────┘
+.Ed
 .Pp
 Cycles: 1
 .Pp
@@ -1379,8 +1386,12 @@ Set according to result.
 Rotate register
 .Ar r8
 left.
-.Pp
-.D1 C <- [7 <- 0] <- [7]
+.Bd -literal
+┏━ Flags ━┓   ┏━━━━━━━ r8 ━━━━━━┓
+┃    C   ←╂─┬─╂─ b7 ← ... ← b0 ←╂─┐
+┗━━━━━━━━━┛ │ ┗━━━━━━━━━━━━━━━━━┛ │
+            └─────────────────────┘
+.Ed
 .Pp
 Cycles: 2
 .Pp
@@ -1401,8 +1412,12 @@ Set according to result.
 Rotate the byte pointed to by
 .Sy HL
 left.
-.Pp
-.D1 C <- [7 <- 0] <- [7]
+.Bd -literal
+┏━ Flags ━┓   ┏━━━━━━ [HL] ━━━━━┓
+┃    C   ←╂─┬─╂─ b7 ← ... ← b0 ←╂─┐
+┗━━━━━━━━━┛ │ ┗━━━━━━━━━━━━━━━━━┛ │
+            └─────────────────────┘
+.Ed
 .Pp
 Cycles: 4
 .Pp
@@ -1414,8 +1429,12 @@ Flags: See
 Rotate register
 .Sy A
 left.
-.Pp
-.D1 C <- [7 <- 0] <- [7]
+.Bd -literal
+┏━ Flags ━┓   ┏━━━━━━━ A ━━━━━━━┓
+┃    C   ←╂─┬─╂─ b7 ← ... ← b0 ←╂─┐
+┗━━━━━━━━━┛ │ ┗━━━━━━━━━━━━━━━━━┛ │
+            └─────────────────────┘
+.Ed
 .Pp
 Cycles: 1
 .Pp
@@ -1435,9 +1454,13 @@ Set according to result.
 .Ss RR r8
 Rotate register
 .Ar r8
-right through carry.
-.Pp
-.D1 C -> [7 -> 0] -> C
+right, through the carry flag.
+.Bd -literal
+  ┏━━━━━━━ r8 ━━━━━━┓ ┏━ Flags ━┓
+┌─╂→ b7 → ... → b0 ─╂─╂→   C   ─╂─┐
+│ ┗━━━━━━━━━━━━━━━━━┛ ┗━━━━━━━━━┛ │
+└─────────────────────────────────┘
+.Ed
 .Pp
 Cycles: 2
 .Pp
@@ -1457,9 +1480,13 @@ Set according to result.
 .Ss RR [HL]
 Rotate the byte pointed to by
 .Sy HL
-right through carry.
-.Pp
-.D1 C -> [7 -> 0] -> C
+right, through the carry flag.
+.Bd -literal
+  ┏━━━━━━ [HL] ━━━━━┓ ┏━ Flags ━┓
+┌─╂→ b7 → ... → b0 ─╂─╂→   C   ─╂─┐
+│ ┗━━━━━━━━━━━━━━━━━┛ ┗━━━━━━━━━┛ │
+└─────────────────────────────────┘
+.Ed
 .Pp
 Cycles: 4
 .Pp
@@ -1470,9 +1497,13 @@ Flags: See
 .Ss RRA
 Rotate register
 .Sy A
-right through carry.
-.Pp
-.D1 C -> [7 -> 0] -> C
+right, through the carry flag.
+.Bd -literal
+  ┏━━━━━━━ A ━━━━━━━┓ ┏━ Flags ━┓
+┌─╂→ b7 → ... → b0 ─╂─╂→   C   ─╂─┐
+│ ┗━━━━━━━━━━━━━━━━━┛ ┗━━━━━━━━━┛ │
+└─────────────────────────────────┘
+.Ed
 .Pp
 Cycles: 1
 .Pp
@@ -1493,8 +1524,12 @@ Set according to result.
 Rotate register
 .Ar r8
 right.
-.Pp
-.D1 [0] -> [7 -> 0] -> C
+.Bd -literal
+  ┏━━━━━━━ r8 ━━━━━━┓   ┏━ Flags ━┓
+┌─╂→ b7 → ... → b0 ─╂─┬─╂→   C    ┃
+│ ┗━━━━━━━━━━━━━━━━━┛ │ ┗━━━━━━━━━┛
+└─────────────────────┘
+.Ed
 .Pp
 Cycles: 2
 .Pp
@@ -1515,8 +1550,12 @@ Set according to result.
 Rotate the byte pointed to by
 .Sy HL
 right.
-.Pp
-.D1 [0] -> [7 -> 0] -> C
+.Bd -literal
+  ┏━━━━━━ [HL] ━━━━━┓   ┏━ Flags ━┓
+┌─╂→ b7 → ... → b0 ─╂─┬─╂→   C    ┃
+│ ┗━━━━━━━━━━━━━━━━━┛ │ ┗━━━━━━━━━┛
+└─────────────────────┘
+.Ed
 .Pp
 Cycles: 4
 .Pp
@@ -1528,8 +1567,12 @@ Flags: See
 Rotate register
 .Sy A
 right.
-.Pp
-.D1 [0] -> [7 -> 0] -> C
+.Bd -literal
+  ┏━━━━━━━ A ━━━━━━━┓   ┏━ Flags ━┓
+┌─╂→ b7 → ... → b0 ─╂─┬─╂→   C    ┃
+│ ┗━━━━━━━━━━━━━━━━━┛ │ ┗━━━━━━━━━┛
+└─────────────────────┘
+.Ed
 .Pp
 Cycles: 1
 .Pp
@@ -1653,8 +1696,11 @@ Flags: None affected.
 .Ss SLA r8
 Shift Left Arithmetically register
 .Ar r8 .
-.Pp
-.D1 C <- [7 <- 0] <- 0
+.Bd -literal
+┏━ Flags ━┓ ┏━━━━━━━ r8 ━━━━━━┓
+┃    C   ←╂─╂─ b7 ← ... ← b0 ←╂─ 0
+┗━━━━━━━━━┛ ┗━━━━━━━━━━━━━━━━━┛
+.Ed
 .Pp
 Cycles: 2
 .Pp
@@ -1674,8 +1720,11 @@ Set according to result.
 .Ss SLA [HL]
 Shift Left Arithmetically the byte pointed to by
 .Sy HL .
-.Pp
-.D1 C <- [7 <- 0] <- 0
+.Bd -literal
+┏━ Flags ━┓ ┏━━━━━━ [HL] ━━━━━┓
+┃    C   ←╂─╂─ b7 ← ... ← b0 ←╂─ 0
+┗━━━━━━━━━┛ ┗━━━━━━━━━━━━━━━━━┛
+.Ed
 .Pp
 Cycles: 4
 .Pp
@@ -1685,9 +1734,13 @@ Flags: See
 .Sx SLA r8
 .Ss SRA r8
 Shift Right Arithmetically register
-.Ar r8 .
-.Pp
-.D1 [7] -> [7 -> 0] -> C
+.Ar r8
+.Pq bit 7 of Ar r8 No is unchanged .
+.Bd -literal
+┏━━━━━━ r8 ━━━━━━┓ ┏━ Flags ━┓
+┃ b7 → ... → b0 ─╂─╂→   C    ┃
+┗━━━━━━━━━━━━━━━━┛ ┗━━━━━━━━━┛
+.Ed
 .Pp
 Cycles: 2
 .Pp
@@ -1706,9 +1759,13 @@ Set according to result.
 .El
 .Ss SRA [HL]
 Shift Right Arithmetically the byte pointed to by
-.Sy HL .
-.Pp
-.D1 [7] -> [7 -> 0] -> C
+.Sy HL
+.Pq bit 7 of the byte pointed to by Sy HL No is unchanged .
+.Bd -literal
+┏━━━━━ [HL] ━━━━━┓ ┏━ Flags ━┓
+┃ b7 → ... → b0 ─╂─╂→   C    ┃
+┗━━━━━━━━━━━━━━━━┛ ┗━━━━━━━━━┛
+.Ed
 .Pp
 Cycles: 4
 .Pp
@@ -1719,8 +1776,11 @@ Flags: See
 .Ss SRL r8
 Shift Right Logically register
 .Ar r8 .
-.Pp
-.D1 0 -> [7 -> 0] -> C
+.Bd -literal
+   ┏━━━━━━━ r8 ━━━━━━┓ ┏━ Flags ━┓
+0 ─╂→ b7 → ... → b0 ─╂─╂→   C    ┃
+   ┗━━━━━━━━━━━━━━━━━┛ ┗━━━━━━━━━┛
+.Ed
 .Pp
 Cycles: 2
 .Pp
@@ -1740,15 +1800,18 @@ Set according to result.
 .Ss SRL [HL]
 Shift Right Logically the byte pointed to by
 .Sy HL .
-.Pp
-.D1 0 -> [7 -> 0] -> C
+.Bd -literal
+   ┏━━━━━━ [HL] ━━━━━┓ ┏━ Flags ━┓
+0 ─╂→ b7 → ... → b0 ─╂─╂→   C    ┃
+   ┗━━━━━━━━━━━━━━━━━┛ ┗━━━━━━━━━┛
+.Ed
 .Pp
 Cycles: 4
 .Pp
 Bytes: 2
 .Pp
 Flags: See
-.Sx SRA r8
+.Sx SRL r8
 .Ss STOP
 Enter CPU very low power mode.
 Also used to switch between double and normal speed CPU modes in GBC.
@@ -1884,10 +1947,15 @@ Flags: See
 .Sx XOR A,r8
 .Sh SEE ALSO
 .Xr rgbasm 1 ,
+.Xr rgblink 1 ,
+.Xr rgbfix 1 ,
+.Xr rgbgfx 1 ,
 .Xr rgbds 7
 .Sh HISTORY
-.Nm rgbds
-was originally written by Carsten S\(/orensen as part of the ASMotor package,
-and was later packaged in RGBDS by Justin Lloyd.
+.Xr rgbasm 1
+was originally written by
+.An Carsten S\(/orensen
+as part of the ASMotor package, and was later repackaged in RGBDS by
+.An Justin Lloyd .
 It is now maintained by a number of contributors at
 .Lk https://github.com/gbdev/rgbds .

man/rgbasm.1

@@ -1,11 +1,6 @@
-.\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2010-2021, Anthony J. Bentley and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBASM 1
 .Os
 .Sh NAME
@@ -29,11 +24,15 @@
 .Op Fl Q Ar fix_precision
 .Op Fl r Ar recursion_depth
 .Op Fl W Ar warning
+.Op Fl X Ar max_errors
 .Ar asmfile
 .Sh DESCRIPTION
 The
 .Nm
 program creates an RGB object file from an assembly source file.
+The object file format is documented in
+.Xr rgbds 5 .
+.Pp
 The input
 .Ar asmfile
 can be a path to a file, or
@@ -41,19 +40,19 @@ can be a path to a file, or
 to read from standard input.
 .Pp
 Note that options can be abbreviated as long as the abbreviation is unambiguous:
-.Fl Fl verb
+.Fl \-verb
 is
-.Fl Fl verbose ,
+.Fl \-verbose ,
 but
-.Fl Fl ver
+.Fl \-ver
 is invalid because it could also be
-.Fl Fl version .
+.Fl \-version .
 The arguments are as follows:
 .Bl -tag -width Ds
-.It Fl b Ar chars , Fl Fl binary-digits Ar chars
+.It Fl b Ar chars , Fl \-binary-digits Ar chars
 Change the two characters used for binary constants.
 The defaults are 01.
-.It Fl D Ar name Ns Oo = Ns Ar value Oc , Fl Fl define Ar name Ns Oo = Ns Ar value Oc
+.It Fl D Ar name Ns Oo = Ns Ar value Oc , Fl \-define Ar name Ns Oo = Ns Ar value Oc
 Add a string symbol to the compiled source code.
 This is equivalent to
 .Ql Ar name Ic EQUS No \(dq Ns Ar value Ns \(dq
@@ -62,33 +61,24 @@ in code, or
 if
 .Ar value
 is not specified.
-.It Fl E , Fl Fl export-all
+.It Fl E , Fl \-export-all
 Export all labels, including unreferenced and local labels.
-.It Fl g Ar chars , Fl Fl gfx-chars Ar chars
+.It Fl g Ar chars , Fl \-gfx-chars Ar chars
 Change the four characters used for gfx constants.
 The defaults are 0123.
-.It Fl H , Fl Fl nop-after-halt
-By default,
-.Nm
-inserts a
-.Ic nop
-instruction immediately after any
-.Ic halt
-instruction,
-but this has been deprecated and prints a warning message the first time it occurs.
-The
-.Fl H
-option opts into this insertion,
-so no warning will be printed.
-.It Fl h , Fl Fl halt-without-nop
-Disables inserting a
+.It Fl H , Fl \-nop-after-halt
+Inserts a
 .Ic nop
 instruction immediately after any
 .Ic halt
 instruction.
-.It Fl I Ar path , Fl Fl include Ar path
+This option is deprecated and will be removed in the next version.
+.It Fl h , Fl \-halt-without-nop
+This option is redundant and will be removed in the next version.
+.It Fl I Ar path , Fl \-include Ar path
 Add a new
-.Dq include path ; Ar path
+.Dq include path ;
+.Ar path
 must point to a directory.
 When a
 .Ic INCLUDE
@@ -100,23 +90,15 @@ is attempted,
 first looks up the provided path from its working directory; if this fails, it tries again from each of the
 .Dq include path
 directories, in the order they were provided.
-.It Fl L , Fl Fl preserve-ld
-By default,
-.Nm
-optimizes loads of the form
-.Ic LD [$FF00+n8],A
-into the opcode
-.Ic LDH [$FF00+n8],A ,
-but this has been deprecated and prints a warning message the first time it occurs.
-The
-.Fl L
-option disables this optimization.
-.It Fl l , Fl Fl auto-ldh
+.It Fl L , Fl \-preserve-ld
+This option is redundant and will be removed in the next version.
+.It Fl l , Fl \-auto-ldh
 Optimize loads of the form
 .Ic LD [$FF00+n8],A
 into the opcode
 .Ic LDH [$FF00+n8],A .
-.It Fl M Ar depend_file , Fl Fl dependfile Ar depend_file
+This option is deprecated and will be removed in the next version.
+.It Fl M Ar depend_file , Fl \-dependfile Ar depend_file
 Print
 .Xr make 1
 dependencies to
@@ -157,32 +139,34 @@ but additionally escapes any special
 .Xr make 1
 characters, essentially
 .Sq $ .
-.It Fl o Ar out_file , Fl Fl output Ar out_file
+.It Fl o Ar out_file , Fl \-output Ar out_file
 Write an object file to the given filename.
-.It Fl P Ar include_file , Fl Fl preinclude Ar include_file
+.It Fl P Ar include_file , Fl \-preinclude Ar include_file
 Pre-include a file.
 This acts as if a
 .Ql Ic INCLUDE Qq Ar include_file
 was read before the input
 .Ar asmfile .
-.It Fl p Ar pad_value , Fl Fl pad-value Ar pad_value
-When padding an image, pad with this value.
+.It Fl p Ar pad_value , Fl \-pad-value Ar pad_value
+Use this as the value for
+.Ic DS
+directives in ROM sections, unless overridden.
 The default is 0x00.
-.It Fl Q Ar fix_precision , Fl Fl q-precision Ar fix_precision
+.It Fl Q Ar fix_precision , Fl \-q-precision Ar fix_precision
 Use this as the precision of fixed-point numbers after the decimal point, unless they specify their own precision.
 The default is 16, so fixed-point numbers are Q16.16 (since they are 32-bit integers).
 The argument may start with a
 .Ql \&.
 to match the Q notation, for example,
 .Ql Fl Q Ar .16 .
-.It Fl r Ar recursion_depth , Fl Fl recursion-depth Ar recursion_depth
+.It Fl r Ar recursion_depth , Fl \-recursion-depth Ar recursion_depth
 Specifies the recursion depth past which RGBASM will assume being in an infinite loop.
 The default is 64.
-.It Fl V , Fl Fl version
+.It Fl V , Fl \-version
 Print the version of the program and exit.
-.It Fl v , Fl Fl verbose
+.It Fl v , Fl \-verbose
 Be verbose.
-.It Fl W Ar warning , Fl Fl warning Ar warning
+.It Fl W Ar warning , Fl \-warning Ar warning
 Set warning flag
 .Ar warning .
 A warning message will be printed if
@@ -193,6 +177,13 @@ See the
 section for a list of warnings.
 .It Fl w
 Disable all warning output, even when turned into errors.
+.It Fl X Ar max_errors , Fl \-max-errors Ar max_errors
+If more than this number of errors (not warnings) occur, then abort the assembly process;
+.Fl X 0
+disables this behavior.
+The default is 100 if
+.Nm
+is printing errors to a terminal, and 0 otherwise.
 .El
 .Sh DIAGNOSTICS
 Warnings are diagnostic messages that indicate possibly erroneous behavior that does not necessarily compromise the assembling process.
@@ -315,7 +306,7 @@ or
 .Fl Wno-truncation
 disables this warning.
 .Fl Wtruncation=1
-warns when an N-bit value's absolute value is 2**N or greater.
+warns when an N-bit value is 2**N or greater, or less than -2**N.
 .Fl Wtruncation=2
 or just
 .Fl Wtruncation
@@ -362,13 +353,17 @@ Please report bugs on
 .Lk https://github.com/gbdev/rgbds/issues GitHub .
 .Sh SEE ALSO
 .Xr rgbasm 5 ,
-.Xr rgbfix 1 ,
 .Xr rgblink 1 ,
+.Xr rgbfix 1 ,
+.Xr rgbgfx 1 ,
+.Xr gbz80 7 ,
 .Xr rgbds 5 ,
-.Xr rgbds 7 ,
-.Xr gbz80 7
+.Xr rgbds 7
 .Sh HISTORY
 .Nm
-was originally written by Carsten S\(/orensen as part of the ASMotor package, and was later packaged in RGBDS by Justin Lloyd.
+was originally written by
+.An Carsten S\(/orensen
+as part of the ASMotor package, and was later repackaged in RGBDS by
+.An Justin Lloyd .
 It is now maintained by a number of contributors at
 .Lk https://github.com/gbdev/rgbds .

man/rgbasm.5

@@ -1,12 +1,8 @@
 '\" e
 .\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2017-2021, Antonio Nino Diaz and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBASM 5
 .Os
 .Sh NAME
@@ -30,35 +26,55 @@ but any program that processes RGBDS object files (described in
 .Xr rgbds 5 )
 can be used in its place.
 .Sh SYNTAX
-The syntax is line-based, just as in any other assembler, meaning that you do one instruction or directive per line:
+The syntax is line-based, just as in any other assembler.
+Each line may have components in this order:
 .Pp
-.Dl Oo Ar label Oc Oo Ar instruction Oc Oo Ar ;\ comment Oc
+.Dl Oo Ar directive Oc Oo ;\  Ns Ar comment Oc
+.Dl Oo Ar label : Oc Oo Ar instruction Oo :: Ar instruction ... Oc Oc Oo ;\  Ns Ar comment Oc
 .Pp
-Example:
-.Bd -literal -offset indent
-John: ld a,87 ;Weee
-.Ed
+Directives are commands to the assembler itself, such as
+.Ic PRINTLN ,
+.Ic SECTION ,
+or
+.Ic OPT .
 .Pp
-All reserved keywords (directives, mnemonics, registers, etc.) are case-insensitive;
-all identifiers (symbol names) are case-sensitive.
+Labels tie a name to a specific location within a section (see
+.Sx Labels
+below).
+They must come first in the line.
+.Pp
+Instructions are assembled into Game Boy opcodes.
+Multiple instructions on one line can be separated by double colons
+.Ql :: .
+.Pp
+All reserved keywords (directives, register names, etc.) are case-insensitive;
+all identifiers (labels and other symbol names) are case-sensitive.
 .Pp
 Comments are used to give humans information about the code, such as explanations.
 The assembler
 .Em always
 ignores comments and their contents.
 .Pp
-There are two syntaxes for comments.
-The most common is that anything that follows a semicolon
+There are two kinds of comments, inline and block.
+Inline comments are anything that follows a semicolon
 .Ql \&;
-not inside a string, is a comment until the end of the line.
-The second is a block comment, beginning with
+not inside a string, until the end of the line.
+Block comments, beginning with
 .Ql /*
 and ending with
-.Ql */ .
-It can be split across multiple lines, or occur in the middle of an expression:
+.Ql */ ,
+can be split across multiple lines, or occur in the middle of an expression.
+.Pp
+An example demonstrating these syntax features:
 .Bd -literal -offset indent
-DEF X = /* the value of x
-           should be 3 */ 3
+SECTION "My Code", ROM0\ \ ;\ a directive
+MyFunction:\ \ \ \ \ \ \ \ \ \ \ \ \ \ ;\ a label
+    push hl\ \ \ \ \ \ \ \ \ \ \ \ \ \ ;\ an instruction
+    /* ...and multiple instructions,
+       with mixed case */
+    ld a, [hli] :: LD H, [HL] :: Ld l, a
+    pop /*wait for it*/ hl
+    ret
 .Ed
 .Pp
 Sometimes lines can be too long and it may be necessary to split them.
@@ -188,7 +204,7 @@ PRINTLN "Hello {s:WHO}!"
 .Pp
 Although, for these examples,
 .Ic STRFMT
-would be more approriate; see
+would be more appropriate; see
 .Sx String expressions
 further below.
 .Sh EXPRESSIONS
@@ -324,7 +340,7 @@ The following functions are designed to operate with fixed-point numbers:
 .EQ
 delim $$
 .EN
-.Bl -column -offset indent "ATAN2(x, y)"
+.Bl -column -offset indent "ATAN2(y, x)"
 .It Sy Name Ta Sy Operation
 .It Fn DIV x y Ta Fixed-point division $( x \[di] y ) \[mu] ( 2 ^ precision )$
 .It Fn MUL x y Ta Fixed-point multiplication $( x \[mu] y ) \[di] ( 2 ^ precision )$
@@ -340,7 +356,7 @@ delim $$
 .It Fn ASIN x Ta Inverse sine of $x$
 .It Fn ACOS x Ta Inverse cosine of $x$
 .It Fn ATAN x Ta Inverse tangent of $x$
-.It Fn ATAN2 x y Ta Angle between $( x , y )$ and $( 1 , 0 )$
+.It Fn ATAN2 y x Ta Angle between $( x , y )$ and $( 1 , 0 )$
 .El
 .EQ
 delim off
@@ -390,20 +406,29 @@ There are a number of escape sequences you can use within a string:
 .It Ql \en Ta Newline ($0A)
 .It Ql \er Ta Carriage return ($0D)
 .It Ql \et Ta Tab ($09)
-.It Qo \e1 Qc \[en] Qo \e9 Qc Ta Macro argument (Only in the body of a macro; see Sx Invoking macros )
-.It Ql \e# Ta All Dv _NARG No macro arguments, separated by commas (Only in the body of a macro)
-.It Ql \e@ Ta Label name suffix (Only in the body of a macro or a Ic REPT No block)
+.It Qo \e1 Qc \[en] Qo \e9 Qc Ta Macro argument Pq Only in the body of a macro; see Sx Invoking macros
+.It Ql \e# Ta All Dv _NARG No macro arguments, separated by commas Pq Only in the body of a macro
+.It Ql \e@ Ta Label name suffix Pq Only in the body of a macro or a Ic REPT No block
 .El
 (Note that some of those can be used outside of strings, when noted further in this document.)
 .Pp
 Multi-line strings are contained in triple quotes
 .Pq Ql \&"\&"\&"for instance\&"\&"\&" .
-Escape sequences work the same way in multi-line strings; however, literal newline
-characters will be included as-is, without needing to escape them with
+Escape sequences work the same way in multi-line strings; however, literal newline characters will be included as-is, without needing to escape them with
 .Ql \er
 or
 .Ql \en .
 .Pp
+Raw strings are prefixed by a hash
+.Sq # .
+Inside them, backslashes and braces are treated like regular characters, so they will not be expanded as macro arguments, interpolated symbols, or escape sequences.
+For example, the raw string
+.Ql #"\et\e1{s}\e"
+is equivalent to the regular string
+.Ql "\e\et\e\e1\e{s}\e\e" .
+(Note that this prevents raw strings from including the double quote character.)
+Raw strings also may be contained in triple quotes for them to be multi-line, so they can include literal newline or quote characters (although still not three quotes in a row).
+.Pp
 The following functions operate on string expressions.
 Most of them return a string, however some of these functions actually return an integer and can be used as part of an integer expression!
 .Bl -column "STRSUB(str, pos, len)"
@@ -414,8 +439,12 @@ Most of them return a string, however some of these functions actually return an
 .It Fn STRIN str1 str2 Ta Returns the first position of Ar str2 No in Ar str1 No or zero if it's not present Pq first character is position 1 .
 .It Fn STRRIN str1 str2 Ta Returns the last position of Ar str2 No in Ar str1 No or zero if it's not present Pq first character is position 1 .
 .It Fn STRSUB str pos len Ta Returns a substring from Ar str No starting at Ar pos No (first character is position 1, last is position -1) and Ar len No characters long. If Ar len No is not specified the substring continues to the end of Ar str .
-.It Fn STRUPR str Ta Returns Ar str No with all letters in uppercase.
-.It Fn STRLWR str Ta Returns Ar str No with all letters in lowercase.
+.It Fn STRUPR str Ta Returns Ar str No with all ASCII letters
+.Pq Ql a-z
+in uppercase.
+.It Fn STRLWR str Ta Returns Ar str No with all ASCII letters
+.Pq Ql A-Z
+in lowercase.
 .It Fn STRRPL str old new Ta Returns Ar str No with each non-overlapping occurrence of the substring Ar old No replaced with Ar new .
 .It Fn STRFMT fmt args... Ta Returns the string Ar fmt No with each
 .Ql %spec
@@ -425,8 +454,9 @@ pattern replaced by interpolating the format
 with its corresponding argument in
 .Ar args
 .Pq So %% Sc is replaced by the So % Sc character .
-.It Fn CHARLEN str Ta Returns the number of charmap entries in Ar str No with the current charmap.
-.It Fn CHARSUB str pos Ta Returns the substring for the charmap entry at Ar pos No in Ar str No (first character is position 1, last is position -1) with the current charmap.
+.It Fn INCHARMAP str Ta Returns 1 if Ar str No has an entry in the current charmap, and 0 otherwise .
+.It Fn CHARLEN str Ta Returns the number of charmap entries in Ar str No with the current charmap .
+.It Fn CHARSUB str pos Ta Returns the substring for the charmap entry at Ar pos No in Ar str No (first character is position 1, last is position -1) with the current charmap .
 .El
 .Ss Character maps
 When writing text strings that are meant to be displayed on the Game Boy, the character encoding in the ROM may need to be different than the source file encoding.
@@ -438,6 +468,7 @@ CHARMAP "<LF>", 10
 CHARMAP "&iacute", 20
 CHARMAP "A", 128
 .Ed
+.Pp
 This would result in
 .Ql db \(dqAmen<LF>\(dq
 being equivalent to
@@ -453,14 +484,14 @@ and it is automatically selected as the current character map from the beginning
 There is also a character map stack that can be used to save and restore which character map is currently active.
 .Bl -column "NEWCHARMAP name, basename"
 .It Sy Command Ta Sy Meaning
-.It Ic NEWCHARMAP Ar name Ta Creates a new, empty character map called Ar name No and switches to it.
-.It Ic NEWCHARMAP Ar name , basename Ta Creates a new character map called Ar name , No copied from character map Ar basename , No and switches to it.
+.It Ic NEWCHARMAP Ar name Ta Creates a new, empty character map called Ar name No and switches to it .
+.It Ic NEWCHARMAP Ar name , basename Ta Creates a new character map called Ar name , No copied from character map Ar basename , No and switches to it .
 .It Ic SETCHARMAP Ar name Ta Switch to character map Ar name .
 .It Ic PUSHC Ta Push the current character map onto the stack.
 .It Ic POPC Ta Pop a character map off the stack and switch to it.
 .El
 .Pp
-.Sy Note:
+.Sy Note :
 Modifications to a character map take effect immediately from that point onward.
 .Ss Other functions
 There are a few other functions that do various useful things:
@@ -486,17 +517,27 @@ is able to compute it.
 is in.
 .Ar symbol
 must have been defined already.
-.It Fn SIZEOF arg Ta Returns the size of the section named
+.It Fn SIZEOF arg Ta If
+.Ar arg
+is a string, this function returns the size of the section named
 .Ar arg .
+If
+.Ar arg
+is a section type keyword, it returns the size of that section type.
 The result is not constant, since only RGBLINK can compute its value.
-.It Fn STARTOF arg Ta Returns the starting address of the section named
+.It Fn STARTOF arg Ta If
+.Ar arg
+is a string, this function returns the starting address of the section named
 .Ar arg .
+If
+.Ar arg
+is a section type keyword, it returns the starting address of that section type.
 The result is not constant, since only RGBLINK can compute its value.
 .It Fn DEF symbol Ta Returns TRUE (1) if
 .Ar symbol
 has been defined, FALSE (0) otherwise.
 String constants are not expanded within the parentheses.
-.It Fn HIGH arg Ta Returns the top 8 bits of the operand if Ar arg No is a label or constant, or the top 8-bit register if it is a 16-bit register.
+.It Fn HIGH arg Ta Returns the top 8 bits of the operand if Ar arg No is a label or constant, or the top 8-bit register if it is a 16-bit register .
 .It Fn LOW arg Ta Returns the bottom 8 bits of the operand if Ar arg No is a label or constant, or the bottom 8-bit register if it is a 16-bit register Pq Cm AF No isn't a valid register for this function .
 .It Fn ISCONST arg Ta Returns 1 if Ar arg Ap s value is known by RGBASM (e.g. if it can be an argument to
 .Ic IF ) ,
@@ -641,14 +682,14 @@ Place the section at an address whose
 .Ar align
 least-significant bits are equal to
 .Ar offset .
-(Note that
+Note that
 .Ic ALIGN Ns Bq Ar align
 is a shorthand for
-.Ic ALIGN Ns Bq Ar align , No 0 ) .
+.Ic ALIGN Ns Bq Ar align , No 0 .
 This option can be used with
 .Bq Ar addr ,
-as long as they don't contradict eachother.
-It's also possible to request alignment in the middle of a section, see
+as long as they don't contradict each other.
+It's also possible to request alignment in the middle of a section; see
 .Sx Requesting alignment
 below.
 .El
@@ -703,6 +744,11 @@ SECTION "OAM Data",WRAM0,ALIGN[8] ;\ align to 256 bytes
 SECTION "VRAM Data",ROMX,BANK[2],ALIGN[4] ;\ align to 16 bytes
 .Ed
 .El
+.Pp
+The current section can be ended without starting a new section by using
+.Ic ENDSECTION .
+This directive will clear the section context, so you can no longer write code until you start another section.
+It can be useful to avoid accidentally defining code or data in the wrong section.
 .Ss Section stack
 .Ic POPS
 and
@@ -774,7 +820,7 @@ The former is situated in ROM, where the code is stored, the latter in RAM, wher
 .Pp
 You cannot nest
 .Ic LOAD
-blocks, nor can you change the current section within them.
+blocks, nor can you change or stop the current section within them.
 .Pp
 .Ic LOAD
 blocks can use the
@@ -824,7 +870,7 @@ or
 .Ic ROMX .
 .El
 .Pp
-Different declarations of the same unionized section are not appended, but instead overlaid on top of eachother, just like
+Different declarations of the same unionized section are not appended, but instead overlaid on top of each other, just like
 .Sx Unions .
 Similarly, the size of an unionized section is the largest of all its declarations.
 .Ss Section fragments
@@ -1173,7 +1219,7 @@ For example:
 DEF s EQUS "Hello, "
 REDEF s EQUS "{s}world!"
 ; prints "Hello, world!"
-PRINTLN "{s}\n"
+PRINTLN "{s}\en"
 .Ed
 .Pp
 .Sy Important note :
@@ -1238,16 +1284,6 @@ The example above defines
 as a new macro.
 String constants are not expanded within the name of the macro.
 .Pp
-(Using the
-.Em deprecated
-older syntax
-.Ql MyMacro: MACRO
-instead of
-.Ql MACRO MyMacro ,
-with a single colon
-.Ql \&:
-following the macro's name, string constants may be expanded for the name.)
-.Pp
 Macros can't be exported or imported.
 .Pp
 Plainly nesting macro definitions is not allowed, but this can be worked around using
@@ -1292,13 +1328,13 @@ and so on to be accessible to other files during the link process:
 For example, if you have the following three files:
 .Pp
 .Ql a.asm :
-.Bd -literal -compact
+.Bd -literal -offset indent -compact
 SECTION "a", WRAM0
 LabelA:
 .Ed
 .Pp
 .Ql b.asm :
-.Bd -literal -compact
+.Bd -literal -offset indent -compact
 SECTION "b", WRAM0
 ExportedLabelB1::
 ExportedLabelB2:
@@ -1306,7 +1342,7 @@ ExportedLabelB2:
 .Ed
 .Pp
 .Ql c.asm :
-.Bd -literal -compact
+.Bd -literal -offset indent -compact
 SECTION "C", ROM0[0]
 	dw LabelA
 	dw ExportedLabelB1
@@ -1322,7 +1358,7 @@ and
 but not
 .Ql LabelA ,
 so linking them together will fail:
-.Bd -literal
+.Bd -literal -offset indent
 $ rgbasm -o a.o a.asm
 $ rgbasm -o b.o b.asm
 $ rgbasm -o c.o c.asm
@@ -1336,7 +1372,7 @@ Note also that only exported symbols will appear in symbol and map files produce
 .Ss Purging symbols
 .Ic PURGE
 allows you to completely remove a symbol from the symbol table as if it had never existed.
-.Em USE WITH EXTREME CAUTION!
+.Em USE WITH EXTREME CAUTION !
 I can't stress this enough,
 .Sy you seriously need to know what you are doing .
 DON'T purge a symbol that you use in expressions the linker needs to calculate.
@@ -1398,6 +1434,27 @@ In ROM sections, it will be filled with the value passed to the
 .Fl p
 command-line option, except when using overlays with
 .Fl O .
+.Pp
+Instead of an exact number of bytes, you can specify
+.Ic ALIGN Ns Bq Ar align , offset
+to allocate however many bytes are required to align the subsequent data.
+Thus,
+.Sq Ic DS ALIGN Ns Bo Ar align , offset Bc , No ...
+is equivalent to
+.Sq Ic DS Ar n , No ...
+followed by
+.Sq Ic ALIGN Ns Bq Ar align , offset ,
+where
+.Ar n
+is the minimum value needed to satisfy the
+.Ic ALIGN
+constraint (see
+.Sx Requesting alignment
+below).
+Note that
+.Ic ALIGN Ns Bq Ar align
+is a shorthand for
+.Ic ALIGN Ns Bq Ar align , No 0 .
 .Ss Defining constant data in ROM
 .Ic DB
 defines a list of bytes that will be stored in the final image.
@@ -2102,16 +2159,31 @@ Note that
 .Ic ALIGN Ar align
 is a shorthand for
 .Ic ALIGN Ar align , No 0 .
+.Pp
+There may be times when you don't just want to specify an alignment constraint at the current location, but also skip ahead until the constraint can be satisfied.
+In that case, you can use
+.Ic DS ALIGN Ns Bq Ar align , offset
+to allocate however many bytes are required to align the subsequent data.
+.Pp
+If the constraint cannot be met by skipping any amount of space, an error is produced.
+Note that
+.Ic ALIGN Ns Bq Ar align
+is a shorthand for
+.Ic ALIGN Ns Bq Ar align , No 0 .
 .Sh SEE ALSO
 .Xr rgbasm 1 ,
 .Xr rgblink 1 ,
 .Xr rgblink 5 ,
+.Xr rgbfix 1 ,
+.Xr rgbgfx 1 ,
+.Xr gbz80 7 ,
 .Xr rgbds 5 ,
-.Xr rgbds 7 ,
-.Xr gbz80 7
+.Xr rgbds 7
 .Sh HISTORY
-.Nm
-was originally written by Carsten S\(/orensen as part of the ASMotor package,
-and was later packaged in RGBDS by Justin Lloyd.
+.Xr rgbasm 1
+was originally written by
+.An Carsten S\(/orensen
+as part of the ASMotor package, and was later repackaged in RGBDS by
+.An Justin Lloyd .
 It is now maintained by a number of contributors at
 .Lk https://github.com/gbdev/rgbds .

man/rgbds.5

@@ -1,11 +1,6 @@
-.\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2017-2021, Antonio Nino Diaz and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBDS 5
 .Os
 .Sh NAME
@@ -121,9 +116,9 @@ Local symbols are stored as their full name
 .It Cm BYTE Ar Type
 .Bl -column "Value" -compact
 .It Sy Value Ta Sy Meaning
-.It 0 Ta Sy Local No symbol only used in this file.
-.It 1 Ta Sy Import No of an exported symbol (by name) from another object file.
-.It 2 Ta Sy Exported No symbol visible from other object files.
+.It 0 Ta Sy Local No symbol only used in this file .
+.It 1 Ta Sy Import No of an exported symbol (by name) from another object file .
+.It 2 Ta Sy Exported No symbol visible from other object files .
 .El
 .It Cm IF Ar Type No \(!= 1
 If the symbol is defined in this object file...
@@ -323,8 +318,8 @@ RGBDS encodes RPN expressions as an array of
 .Cm BYTE Ns s .
 The first byte encodes either an operator, or a literal, which consumes more
 .Cm BYTE Ns s
-after it.
-.Bl -column -offset Ds "Value"
+after it:
+.Bl -column "Value"
 .It Sy Value Ta Sy Meaning
 .It Li $00 Ta Addition operator Pq Ql +
 .It Li $01 Ta Subtraction operator Pq Ql -
@@ -349,23 +344,33 @@ after it.
 .It Li $40 Ta Left shift operator Pq Ql <<
 .It Li $41 Ta Arithmetic/signed right shift operator Pq Ql >>
 .It Li $42 Ta Logical/unsigned right shift operator Pq Ql >>>
-.It Li $50 Ta Fn BANK symbol ,
+.It Li $50 Ta Fn BANK symbol ;
 followed by the
 .Ar symbol Ap s Cm LONG
 ID.
-.It Li $51 Ta Fn BANK section ,
+.It Li $51 Ta Fn BANK section ;
 followed by the
 .Ar section Ap s Cm STRING
 name.
 .It Li $52 Ta PC's Fn BANK Pq i.e. Ql BANK(@) .
-.It Li $53 Ta Fn SIZEOF section ,
+.It Li $53 Ta Fn SIZEOF section ;
 followed by the
 .Ar section Ap s Cm STRING
 name.
-.It Li $54 Ta Fn STARTOF section ,
+.It Li $54 Ta Fn STARTOF section ;
 followed by the
 .Ar section Ap s Cm STRING
 name.
+.It Li $55 Ta Fn SIZEOF sectiontype ;
+followed by the
+.Ar sectiontype Ap s Cm BYTE
+value
+.Pq see the Ar Type No values in Sx Sections .
+.It Li $56 Ta Fn STARTOF sectiontype ;
+followed by the
+.Ar sectiontype Ap s Cm BYTE
+value
+.Pq see the Ar Type No values in Sx Sections .
 .It Li $60 Ta Ql ldh
 check.
 Checks if the value is a valid
@@ -383,23 +388,29 @@ Checks if the value is a valid
 vector, that is one of $00, $08, $10, $18, $20, $28, $30, or $38.
 The value is then ORed with $C7
 .Pq Ql \&| $C7 .
-.It Li $80 Ta Integer literal.
-Followed by the
+.It Li $80 Ta Integer literal; followed by the
 .Cm LONG
 integer.
-.It Li $81 Ta A symbol's value.
-Followed by the symbol's
+.It Li $81 Ta A symbol's value; followed by the symbol's
 .Cm LONG
 ID.
 .El
 .Sh SEE ALSO
 .Xr rgbasm 1 ,
+.Xr rgbasm 5 ,
 .Xr rgblink 1 ,
-.Xr rgbds 7 ,
-.Xr gbz80 7
+.Xr rgblink 5 ,
+.Xr rgbfix 1 ,
+.Xr rgbgfx 1 ,
+.Xr gbz80 7 ,
+.Xr rgbds 7
 .Sh HISTORY
-.Nm
-was originally written by Carsten S\(/orensen as part of the ASMotor package,
-and was later packaged in RGBDS by Justin Lloyd.
+.Xr rgbasm 1
+and
+.Xr rgblink 1
+were originally written by
+.An Carsten S\(/orensen
+as part of the ASMotor package, and was later repackaged in RGBDS by
+.An Justin Lloyd .
 It is now maintained by a number of contributors at
 .Lk https://github.com/gbdev/rgbds .

man/rgbds.7

@@ -1,11 +1,6 @@
-.\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2010-2021, Anthony J. Bentley and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBDS 7
 .Os
 .Sh NAME
@@ -14,44 +9,65 @@
 .Sh EXAMPLES
 To get a working ROM image from a single assembly source file:
 .Bd -literal -offset indent
-$ rgbasm \-o bar.o foo.asm
-$ rgblink \-o baz.gb bar.o
-$ rgbfix \-v \-p 0 baz.gb
+$ rgbasm \-o game.o game.asm
+$ rgblink \-o game.gb game.o
+$ rgbfix \-v \-p 0 game.gb
 .Ed
-Or in a single command line:
+.Pp
+Or in a single command line, without creating an intermediate object file:
 .Bd -literal -offset indent
-$ rgbasm \-o - foo.asm | rgblink \-o - - | rgbfix \-v \-p 0 - > baz.gb
+$ (rgbasm -o - - | rgblink -o - - | rgbfix -v -p 0) < game.asm > game.gb
 .Ed
 .Sh SEE ALSO
 .Xr rgbasm 1 ,
-.Xr rgbfix 1 ,
+.Xr rgbasm 5 ,
 .Xr rgblink 1 ,
-.Xr rgbds 5 ,
-.Xr gbz80 7
+.Xr rgblink 5 ,
+.Xr rgbfix 1 ,
+.Xr rgbgfx 1 ,
+.Xr gbz80 7 ,
+.Xr rgbds 5
 .Sh HISTORY
 .Bl -item
 .It
-1997, Carsten S\(/orensen (AKA SurfSmurf) writes ASMotor as a general-purpose
-assembler/linker system for DOS/Win32.
+1996-10-01:
+.An Carsten S\(/orensen
+.Pq a.k.a. SurfSmurf
+releases xAsm, xLink, and RGBFix, a Game Boy SM83 (GBZ80) assembler/linker system for DOS/Win32.
 .It
-1999, Justin Lloyd (AKA Otaku no Zoku) adapts ASMotor to read and produce GBZ80
-assembly/machine code, and releases this version as RGBDS.
+1997-07-03: S\(/orensen releases ASMotor, packaging the three programs together and moving towards making them a general-purpose target-independent system.
 .It
-2009, Vegard Nossum adapts the code to be more UNIX-like and releases this
-version as rgbds-linux on GitHub.
+1999-08-01:
+.An Justin Lloyd
+.Pq a.k.a. Otaku no Zoku
+adapts ASMotor to re-focus on SM83 assembly/machine code, and releases this version as RGBDS.
 .It
-2010, Anthony J. Bentley forks that repository.
-The fork becomes the reference implementation of rgbds.
+2009-06-11:
+.An Vegard Nossum
+adapts the code to be more UNIX-like and releases this version as rgbds-linux.
 .It
-2017, Bentley's repository is moved to a neutral name.
-It is now maintained by a number of contributors at
-.Lk https://github.com/rednex/rgbds .
+2010-01-12:
+.An Anthony J. Bentley
+forks Nossum's repository.
+The fork becomes the reference implementation of RGBDS.
 .It
-2018, codebase relicensed under the MIT license.
+2015-01-18:
+.An stag019
+begins implementing rgbgfx, a PNG‐to‐Game Boy graphics converter, for eventual integration into RGBDS.
 .It
-2020, repository is moved to the gbdev organisation, at
-.Lk https://github.com/gbdev/rgbds .
-The
+2016-09-05: rgbgfx is integrated into Bentley's repository.
+.It
+2017-02-23: Bentley's repository is moved to the
+.Lk https://github.com/rednex/rgbds rednex
+organization.
+.It
+2018-01-26: The codebase is relicensed under the MIT license.
+.It
+2020-09-15: The repository is moved to the
+.Lk https://github.com/gbdev/rgbds gbdev
+organization.
+.It
+2022-05-17: The
 .Lk https://rgbds.gbdev.io
-website serving documentation and downloads is created.
+website for RGBDS documentation and downloads is published.
 .El

man/rgbfix.1

@@ -1,11 +1,6 @@
-.\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2010-2021, Anthony J. Bentley and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBFIX 1
 .Os
 .Sh NAME
@@ -41,32 +36,38 @@ Developers are advised to fill those fields with 0x00 bytes in their source code
 and to have already populated whichever fields they don't specify using
 .Nm .
 .Pp
+The input
+.Ar asmfile
+can be a path to a file, or
+.Cm \-
+to read from standard input.
+.Pp
 Note that options can be abbreviated as long as the abbreviation is unambiguous:
-.Fl Fl color-o
+.Fl \-color-o
 is
-.Fl Fl color-only ,
+.Fl \-color-only ,
 but
-.Fl Fl color
+.Fl \-color
 is invalid because it could also be
-.Fl Fl color-compatible .
+.Fl \-color-compatible .
 Options later in the command line override those set earlier.
 Accepted options are as follows:
 .Bl -tag -width Ds
-.It Fl C , Fl Fl color-only
+.It Fl C , Fl \-color-only
 Set the Game Boy Color\(enonly flag
 .Pq Ad 0x143
 to 0xC0.
 This overrides
 .Fl c
 if it was set prior.
-.It Fl c , Fl Fl color-compatible
+.It Fl c , Fl \-color-compatible
 Set the Game Boy Color\(encompatible flag:
 .Pq Ad 0x143
 to 0x80.
 This overrides
 .Fl c
 if it was set prior.
-.It Fl f Ar fix_spec , Fl Fl fix-spec Ar fix_spec
+.It Fl f Ar fix_spec , Fl \-fix-spec Ar fix_spec
 Fix certain header values that the Game Boy checks for correctness.
 Alternatively, intentionally trash these values by writing their binary inverse instead.
 .Ar fix_spec
@@ -89,26 +90,26 @@ Fix the global checksum
 .It Cm G
 Trash the global checksum.
 .El
-.It Fl i Ar game_id , Fl Fl game-id Ar game_id
+.It Fl i Ar game_id , Fl \-game-id Ar game_id
 Set the game ID string
 .Pq Ad 0x13F Ns \(en Ns Ad 0x142
 to a given string.
 If it's longer than 4 chars, it will be truncated, and a warning emitted.
-.It Fl j , Fl Fl non-japanese
+.It Fl j , Fl \-non-japanese
 Set the non-Japanese region flag
 .Pq Ad 0x14A
 to 0x01.
-.It Fl k Ar licensee_str , Fl Fl new-licensee Ar licensee_str
+.It Fl k Ar licensee_str , Fl \-new-licensee Ar licensee_str
 Set the new licensee string
 .Pq Ad 0x144 Ns \(en Ns Ad 0x145
 to a given string.
 If it's longer than 2 chars, it will be truncated, and a warning emitted.
-.It Fl l Ar licensee_id , Fl Fl old-licensee Ar licensee_id
+.It Fl l Ar licensee_id , Fl \-old-licensee Ar licensee_id
 Set the old licensee code
 .Pq Ad 0x14B
 to a given value from 0 to 0xFF.
 This value is deprecated and should be set to 0x33 in all new software.
-.It Fl m Ar mbc_type , Fl Fl mbc-type Ar mbc_type
+.It Fl m Ar mbc_type , Fl \-mbc-type Ar mbc_type
 Set the MBC type
 .Pq Ad 0x147
 to a given value from 0 to 0xFF.
@@ -121,13 +122,13 @@ Any amount of whitespace (space and tabs) is allowed around plus signs, and the
 There are special considerations to take for the TPP1 mapper; see the
 .Sx TPP1
 section below.
-.It Fl n Ar rom_version , Fl Fl rom-version Ar rom_version
+.It Fl n Ar rom_version , Fl \-rom-version Ar rom_version
 Set the ROM version
 .Pq Ad 0x14C
 to a given value from 0 to 0xFF.
-.It Fl O , Fl Fl overwrite
+.It Fl O , Fl \-overwrite
 Allow overwriting different non-zero bytes in the header without a warning being emitted.
-.It Fl p Ar pad_value , Fl Fl pad-value Ar pad_value
+.It Fl p Ar pad_value , Fl \-pad-value Ar pad_value
 Pad the ROM image to a valid size with a given pad value from 0 to 255 (0xFF).
 .Nm
 will automatically pick a size from 32 KiB, 64 KiB, 128 KiB, ..., 8192 KiB.
@@ -135,11 +136,11 @@ The cartridge size byte
 .Pq Ad 0x148
 will be changed to reflect this new size.
 The recommended padding value is 0xFF, to speed up writing the ROM to flash chips, and to avoid "nop slides" into VRAM.
-.It Fl r Ar ram_size , Fl Fl ram-size Ar ram_size
+.It Fl r Ar ram_size , Fl \-ram-size Ar ram_size
 Set the RAM size
 .Pq Ad 0x149
 to a given value from 0 to 0xFF.
-.It Fl s , Fl Fl sgb-compatible
+.It Fl s , Fl \-sgb-compatible
 Set the SGB flag
 .Pq Ad 0x146
 to 0x03.
@@ -147,7 +148,7 @@ This flag will be ignored by the SGB unless the old licensee code is 0x33!
 If this is given as well as
 .Fl l ,
 but is not set to 0x33, a warning will be printed.
-.It Fl t Ar title , Fl Fl title Ar title
+.It Fl t Ar title , Fl \-title Ar title
 Set the title string
 .Pq Ad 0x134 Ns \(en Ns Ad 0x143
 to a given string.
@@ -159,9 +160,9 @@ is specified, 15 characters if the CGB flag
 or
 .Fl C )
 is specified but the game ID is not, and 16 characters otherwise.
-.It Fl V , Fl Fl version
+.It Fl V , Fl \-version
 Print the version of the program and exit.
-.It Fl v , Fl Fl validate
+.It Fl v , Fl \-validate
 Equivalent to
 .Fl f Cm lhg .
 .El
@@ -235,9 +236,14 @@ Please report bugs on
 .Sh SEE ALSO
 .Xr rgbasm 1 ,
 .Xr rgblink 1 ,
+.Xr rgbgfx 1 ,
+.Xr gbz80 7 ,
 .Xr rgbds 7
 .Sh HISTORY
 .Nm
-was originally released by Carsten S\(/orensen as a standalone program called gbfix, and was later packaged in RGBDS by Justin Lloyd.
+was originally written by
+.An Carsten S\(/orensen
+as a standalone program called GBFix, which was then packaged in ASMotor, and was later repackaged in RGBDS by
+.An Justin Lloyd .
 It is now maintained by a number of contributors at
 .Lk https://github.com/gbdev/rgbds .

man/rgbgfx.1

@@ -1,12 +1,8 @@
 '\" e
 .\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2013-2021, stag019 and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBGFX 1
 .Os
 .Sh NAME
@@ -14,7 +10,7 @@
 .Nd Game Boy graphics converter
 .Sh SYNOPSIS
 .Nm
-.Op Fl CmuVZ
+.Op Fl CmOuVZ
 .Op Fl v Op Fl v No ...
 .Op Fl a Ar attrmap | Fl A
 .Op Fl b Ar base_ids
@@ -44,13 +40,13 @@ convert each of those squares into 1bpp or 2bpp tile data, and save all of the t
 It also has options to generate a tile map, attribute map, and/or palette set as well; more on that and how the conversion process can be tweaked below.
 .Sh ARGUMENTS
 Note that options can be abbreviated as long as the abbreviation is unambiguous:
-.Fl Fl verb
+.Fl \-verb
 is
-.Fl Fl verbose ,
+.Fl \-verbose ,
 but
-.Fl Fl ver
+.Fl \-ver
 is invalid because it could also be
-.Fl Fl version .
+.Fl \-version .
 .Pp
 .Nm
 accepts decimal, binary, and hexadecimal numbers in option arguments.
@@ -86,7 +82,7 @@ Using standard input or output more than once in a single command will likely pr
 .Pp
 The following options are accepted:
 .Bl -tag -width Ds
-.It Fl a Ar attrmap , Fl Fl attr-map Ar attrmap
+.It Fl a Ar attrmap , Fl \-attr-map Ar attrmap
 Generate an attribute map, which is a file containing tile
 .Dq attributes .
 For each square of the input image, its corresponding attribute map byte contains the mirroring bits (if
@@ -102,23 +98,20 @@ The output is written just like the tile map (see
 follows the same order
 .Pq Fl Z ,
 and has the same size.
-.It Fl A , Fl Fl output-attr-map
+.It Fl A , Fl \-auto-attr-map
 Same as
-.Fl a Ar path ,
-where
-.Ar path
-is the input image's path with the extension set to
-.Pa .attrmap .
-.It Fl b Ar base_ids , Fl Fl base-tiles Ar base_ids
+.Fl a Ar base_path Ns .attrmap
+.Pq see Sx Automatic output paths .
+.It Fl b Ar base_ids , Fl \-base-tiles Ar base_ids
 Set the base IDs for tile map output.
 .Ar base_ids
 should be one or two numbers between 0 and 255, separated by a comma; they are for bank 0 and bank 1 respectively.
 Both default to 0.
-.It Fl C , Fl Fl color-curve
+.It Fl C , Fl \-color-curve
 When generating palettes, use a color curve mimicking the Game Boy Color's screen.
 The resulting colors may look closer to the input image's
 .Sy on hardware and accurate emulators .
-.It Fl c Ar color_spec , Fl Fl colors Ar color_spec
+.It Fl c Ar color_spec , Fl \-colors Ar color_spec
 Use the specified color palettes instead of having
 .Nm
 automatically determine some.
@@ -165,10 +158,10 @@ See
 .Sx PALETTE SPECIFICATION FORMATS
 for a list of formats and their descriptions.
 .El
-.It Fl d Ar depth , Fl Fl depth Ar depth
+.It Fl d Ar depth , Fl \-depth Ar depth
 Set the bit depth of the output tile data, in bits per pixel (bpp), either 1 or 2 (the default).
 This changes how tile data is output, and the maximum number of colors per palette (2 and 4 respectively).
-.It Fl L Ar slice , Fl Fl slice Ar slice
+.It Fl L Ar slice , Fl \-slice Ar slice
 Only process a given rectangle of the image.
 This is useful for example if the input image is a sheet of some sort, and you want to convert each cel individually.
 The default is to process the whole image as-is.
@@ -179,14 +172,19 @@ The numbers must be separated by commas; space is allowed around all punctuation
 The first number pair specifies the X and Y coordinates of the top-left pixel that will be processed (anything above it or to its left will be ignored).
 The second number pair specifies how many tiles to process horizontally and vertically, respectively.
 .Pp
-.Sy Fl L Sy is ignored in reverse mode , No no padding is inserted .
-.It Fl m , Fl Fl mirror-tiles
-Deduplicate tiles that are mirrors of each other.
+.Fl L Sy is ignored in reverse mode , No no padding is inserted .
+.It Fl m , Fl \-mirror-tiles
+Deduplicate tiles that are symmetrical mirror images of each other.
+Only one of each unique tile will be saved in the tile data file, with mirror images counting as duplicates.
 Tiles are checked for horizontal, vertical, and horizontal-vertical mirroring.
-Useful with a tile map and attribute map together to keep track of the duplicated tiles and the dimension(s) mirrored.
+Useful with a tile map and attribute map together (see
+.Fl a
+and
+.Fl t )
+to keep track of the duplicated tiles and the dimension(s) mirrored.
 Implies
 .Fl u .
-.It Fl N Ar nb_tiles , Fl Fl nb-tiles Ar nb_tiles
+.It Fl N Ar nb_tiles , Fl \-nb-tiles Ar nb_tiles
 Set a maximum number of tiles that can be placed in each VRAM bank.
 .Ar nb_tiles
 should be one or two numbers between 0 and 256, separated by a comma; if the latter is omitted, it defaults to 0.
@@ -198,7 +196,7 @@ will abort.
 If
 .Fl N
 is not specified, no limit will be set on the amount of tiles placed in bank 0, and tiles will not be placed in bank 1.
-.It Fl n Ar nb_pals , Fl Fl nb-palettes Ar nb_pals
+.It Fl n Ar nb_pals , Fl \-nb-palettes Ar nb_pals
 Abort if more than
 .Ar nb_pals
 palettes are generated.
@@ -206,30 +204,31 @@ This may not be more than 256.
 .Pp
 Note that attribute map output only has 3 bits for the palette ID, so a limit higher than 8 may yield incomplete data unless relying on a palette map
 .Pq see Fl q .
-.It Fl o Ar out_file , Fl Fl output Ar out_file
+.It Fl O , Fl \-group-outputs
+Sets the
+.Sq base path
+to be the output tile data path from
+.Fl o
+instead of the input image path
+.Pq see Sx Automatic output paths .
+.It Fl o Ar out_file , Fl \-output Ar out_file
 Output the tile data in native 2bpp format or in 1bpp
 .Pq depending on Fl d
 to this file.
-.It Fl p Ar pal_file , Fl Fl palette Ar pal_file
+.It Fl p Ar pal_file , Fl \-palette Ar pal_file
 Output the image's palette set to this file.
-.It Fl P , Fl Fl output-palette
+.It Fl P , Fl \-auto-palette
 Same as
-.Fl p Ar path ,
-where
-.Ar path
-is the input image's path with the extension set to
-.Pa .pal .
-.It Fl q Ar pal_file , Fl Fl palette-map Ar pal_file
+.Fl p Ar base_path Ns .pal
+.Pq see Sx Automatic output paths .
+.It Fl q Ar pal_file , Fl \-palette-map Ar pal_file
 Output the image's palette map to this file.
 This is useful if the input image contains more than 8 palettes, as the attribute map only contains the lower 3 bits of the palette indices.
-.It Fl Q , Fl Fl output-palette-map
+.It Fl Q , Fl \-auto-palette-map
 Same as
-.Fl q Ar path ,
-where
-.Ar path
-is the input image's path with the extension set to
-.Pa .palmap .
-.It Fl r Ar width , Fl Fl reverse Ar width
+.Fl q Ar base_path Ns .palmap
+.Pq see Sx Automatic output paths .
+.It Fl r Ar width , Fl \-reverse Ar width
 Switches
 .Nm
 into
@@ -243,15 +242,14 @@ See
 below for details.
 .Pp
 .Ar width
-is the image's width, in tiles
-.Pq including any margins specified by Fl L .
-.It Fl s Ar nb_colors , Fl Fl palette-size Ar nb_colors
+is the width of the image to generate, in tiles.
+.It Fl s Ar nb_colors , Fl \-palette-size Ar nb_colors
 Specify how many colors each palette contains, including the transparent one if any.
 .Ar nb_colors
 cannot be more than
 .Ql 1 << Ar depth
 .Pq see Fl d .
-.It Fl t Ar tilemap , Fl Fl tilemap Ar tilemap
+.It Fl t Ar tilemap , Fl \-tilemap Ar tilemap
 Generate a file of tile indices.
 For each square of the input image, its corresponding tile map byte contains the index of the associated tile in the tile data file.
 The IDs wrap around from 255 back to 0, and do not include the bank bit; use
@@ -262,15 +260,13 @@ Useful in combination with
 and/or
 .Fl m
 to keep track of duplicate tiles.
-.It Fl T , Fl Fl output-tilemap
+.It Fl T , Fl \-auto-tilemap
 Same as
-.Fl t Ar path ,
-where
-.Ar path
-is the input image's path with the extension set to
-.Pa .tilemap .
-.It Fl u , Fl Fl unique-tiles
-Deduplicate identical tiles, and omit the duplicates from the tile data file.
+.Fl t Ar base_path Ns .tilemap
+.Pq see Sx Automatic output paths .
+.It Fl u , Fl \-unique-tiles
+Deduplicate identical tiles.
+Only one of each unique tile will be saved in the tile data file.
 Useful with a tile map
 .Pq see Fl t
 to keep track of the duplicated tiles.
@@ -280,12 +276,12 @@ Note that if this option is enabled, no guarantee is made on the order in which
 be consistent across identical runs of a given
 .Nm
 release, the same is not true for different releases.
-.It Fl V , Fl Fl version
+.It Fl V , Fl \-version
 Print the version of the program and exit.
-.It Fl v , Fl Fl verbose
+.It Fl v , Fl \-verbose
 Be verbose.
 The verbosity level is increased by one each time the flag is specified, with each level including the previous:
-.Bl -enum -width 2n -compact
+.Bl -enum -compact
 .It
 .Nm
 prints out its configuration before doing anything.
@@ -299,7 +295,7 @@ Some internal debug printing is enabled.
 The verbosity level does not go past 6.
 .Pp
 Note that verbose output is only intended to be consumed by humans, and may change without notice between RGBDS releases; relying on those for scripts is not advised.
-.It Fl x Ar quantity , Fl Fl trim-end Ar quantity
+.It Fl x Ar quantity , Fl \-trim-end Ar quantity
 Do not output the last
 .Ar quantity
 tiles to the tile data file; no other output is affected.
@@ -319,7 +315,7 @@ was enabled, so you probably don't want to use this option in combination with
 Note also that the tiles that don't get output will not count towards
 .Fl N Ap s
 limit.
-.It Fl Z , Fl Fl columns
+.It Fl Z , Fl \-columns
 Read squares from the PNG in column-major order (column by column), instead of the default row-major order (line by line).
 This primarily affects tile map and attribute map output, although it may also change generated tile data and palettes.
 .El
@@ -488,7 +484,7 @@ What follows is succinct descriptions of those formats, including
 .Nm Ns -specific
 details.
 For more complete, beginner-friendly descriptions of the native formats with illustrations, please check out
-.Lk https://gbdev.io/pandocs/Rendering Pan Docs .
+.Lk https://gbdev.io/pandocs/Graphics Pan Docs .
 .Ss Tile data
 Tile data is output like a binary dump of VRAM, with no padding between tiles.
 Each tile is 16 bytes, 2 per row of 8 pixels; the bits of color IDs are split into each byte
@@ -533,6 +529,29 @@ The contents of individual bytes follows the GBC's native format:
 .El
 .Pp
 Note that if more than 8 palettes are used, only the lowest 3 bits of the palette ID are output.
+.Ss Automatic output paths
+For convenience,
+.Nm
+provides shortcuts to generate all files in the same directory.
+This is done by using the uppercase version of a flag
+.Pq for example, Fl A No instead of Fl a .
+The
+.Ar base_path
+is the input image path
+.Pq or the output tile data path from Fl o , No if Fl O No was given
+with its extension, if any, removed.
+.Pp
+For example, these two commands are equivalent:
+.Bd -literal -offset indent
+$ rgbgfx img/player.png -o build/player.2bpp -P
+$ rgbgfx img/player.png -o build/player.2bpp -p img/player.pal
+.Ed
+.Pp
+And so are these two:
+.Bd -literal -offset indent
+$ rgbgfx img/player.png -o build/player.2bpp -O -P
+$ rgbgfx img/player.png -o build/player.2bpp -p build/player.pal
+.Ed
 .Sh REVERSE MODE
 .Nm
 can produce a PNG image from valid data.
@@ -595,37 +614,53 @@ It is possible to compute the optimal solution externally (using a solver, for e
 via
 .Fl c .
 .Sh EXAMPLES
-The following will only validate the PNG (check its size, that all tiles have a suitable amount of colors, etc.), but output nothing:
+The following will only validate the
+.Ql tileset.png
+image (check its size, that all tiles have a suitable amount of colors, etc.), but output nothing:
 .Pp
 .Dl $ rgbgfx src/res/maps/overworld/tileset.png
 .Pp
-The following will convert the image using the two given palettes (and only those), and store the generated 2bpp tile data in
+The following will convert the
+.Ql tileset.png
+image using the two given palettes (and only those), and store the generated 2bpp tile data in
 .Ql tileset.2bpp ,
 and the attribute map in
 .Ql tileset.attrmap .
 .Pp
 .Dl $ rgbgfx -c '#ffffff,#8d05de, #dc7905,#000000 ; #fff,#8d05de, #7e0000 \&, #000' -A -o tileset.2bpp tileset.png
 .Pp
+The following will deduplicate the tiles in the
+.Ql title_screen.png
+image, keeping only one of each unique tile, and store the generated 2bpp tile data in
+.Ql title_screen.2bpp ,
+and the tile map in
+.Ql title_screen.tilemap .
+.Pp
+.Dl $ rgbgfx -u title_screen.png -o title_screen.2bpp -t title_screen.tilemap
+.Pp
+The following will convert the given inline palette specification to a palette set, and store the palette set in
+.Ql colors.pal ,
+without needing an input image.
+.Pp
+.Dl $ rgbgfx -c '#fff,#ff0,#f80,#000' -p colors.pal
+.Pp
 TODO: more examples.
 .Sh BUGS
 Please report bugs and mistakes in this man page on
 .Lk https://github.com/gbdev/rgbds/issues GitHub .
 Bug reports and feature requests about RGBDS are also welcome!
 .Sh SEE ALSO
-.Xr rgbds 7 ,
 .Xr rgbasm 1 ,
 .Xr rgblink 1 ,
 .Xr rgbfix 1 ,
-.Xr gbz80 7
+.Xr rgbds 7
 .Pp
 The Game Boy hardware reference
-.Lk https://gbdev.io/pandocs/Rendering.html Pan Docs ,
+.Lk https://gbdev.io/pandocs/Graphics Pan Docs ,
 particularly the section about graphics.
 .Sh HISTORY
 .Nm
-was originally created by
-.An stag019
-to be included in RGBDS.
+was originally written by stag019 as a program to be packaged in RGBDS.
 It was later rewritten by
 .An ISSOtm ,
 and is now maintained by a number of contributors at

man/rgblink.1

@@ -1,11 +1,6 @@
-.\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2010-2021, Anthony J. Bentley and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBLINK 1
 .Os
 .Sh NAME
@@ -29,7 +24,7 @@ The
 program links RGB object files, typically created by
 .Xr rgbasm 1 ,
 into a single Game Boy ROM file.
-The format is documented in
+The object file format is documented in
 .Xr rgbds 5 .
 .Pp
 ROM0 sections are placed in the first 16 KiB of the output ROM, and ROMX sections are placed in any 16 KiB
@@ -52,47 +47,58 @@ option, which implies
 .Fl w
 but also prohibits the use of banked VRAM.
 .Pp
+The input
+.Ar asmfile
+can be a path to a file, or
+.Cm \-
+to read from standard input.
+.Pp
 Note that options can be abbreviated as long as the abbreviation is unambiguous:
-.Fl Fl verb
+.Fl \-verb
 is
-.Fl Fl verbose ,
+.Fl \-verbose ,
 but
-.Fl Fl ver
+.Fl \-ver
 is invalid because it could also be
-.Fl Fl version .
+.Fl \-version .
 The arguments are as follows:
 .Bl -tag -width Ds
-.It Fl d , Fl Fl dmg
+.It Fl d , Fl \-dmg
 Enable DMG mode.
 Prohibit the use of sections that doesn't exist on a DMG, such as VRAM bank 1.
 This option automatically enables
 .Fl w .
-.It Fl l Ar linker_script , Fl Fl linkerscript Ar linker_script
+.It Fl l Ar linker_script , Fl \-linkerscript Ar linker_script
 Specify a linker script file that tells the linker how sections must be placed in the ROM.
 The attributes assigned in the linker script must be consistent with any assigned in the code.
 See
 .Xr rgblink 5
 for more information about the linker script format.
-.It Fl M , Fl Fl no-sym-in-map
+.It Fl M , Fl \-no-sym-in-map
 If specified, the map file will not list symbols, only sections.
-.It Fl m Ar map_file , Fl Fl map Ar map_file
+.It Fl m Ar map_file , Fl \-map Ar map_file
 Write a map file to the given filename, listing how sections and symbols were assigned.
-.It Fl n Ar sym_file , Fl Fl sym Ar sym_file
+.It Fl n Ar sym_file , Fl \-sym Ar sym_file
 Write a symbol file to the given filename, listing the address of all exported symbols.
 Several external programs can use this information, for example to help debugging ROMs.
-.It Fl O Ar overlay_file , Fl Fl overlay Ar overlay_file
-If specified, sections will be overlaid "on top" of the provided ROM image.
-In that case, all sections must be fixed.
-This may be used to patch an existing binary.
-.It Fl o Ar out_file , Fl Fl output Ar out_file
+.It Fl O Ar overlay_file , Fl \-overlay Ar overlay_file
+If specified, sections will be overlaid "on top" of the ROM image
+.Ar overlay_file :
+empty space between sections will be filled by the corresponding bytes from
+.Ar overlay_file .
+This is useful to patch an existing ROM.
+Note that all sections must be fixed (forced bank
+.Sy and
+address)!
+.It Fl o Ar out_file , Fl \-output Ar out_file
 Write the ROM image to the given file.
-.It Fl p Ar pad_value , Fl Fl pad Ar pad_value
+.It Fl p Ar pad_value , Fl \-pad Ar pad_value
 When inserting padding between sections, pad with this value.
 Has no effect if
 .Fl O
 is specified.
 The default is 0.
-.It Fl S Ar spec , Fl Fl scramble Ar spec
+.It Fl S Ar spec , Fl \-scramble Ar spec
 Enables a different
 .Dq scrambling
 algorithm for placing sections.
@@ -100,22 +106,22 @@ See
 .Sx Scrambling algorithm
 below for an explanation and a description of
 .Ar spec .
-.It Fl s Ar symbol , Fl Fl smart Ar symbol
+.It Fl s Ar symbol , Fl \-smart Ar symbol
 This option is ignored.
 It was supposed to perform smart linking but fell into disrepair, and so has been removed.
 It will be reimplemented at some point.
-.It Fl t , Fl Fl tiny
+.It Fl t , Fl \-tiny
 Expand the ROM0 section size from 16 KiB to the full 32 KiB assigned to ROM.
 ROMX sections that are fixed to a bank other than 1 become errors, other ROMX sections are treated as ROM0.
 Useful for ROMs that fit in 32 KiB.
-.It Fl V , Fl Fl version
+.It Fl V , Fl \-version
 Print the version of the program and exit.
-.It Fl v , Fl Fl verbose
+.It Fl v , Fl \-verbose
 Verbose: enable printing more information to standard error.
-.It Fl w , Fl Fl wramx
+.It Fl w , Fl \-wramx
 Expand the WRAM0 section size from 4 KiB to the full 8 KiB assigned to WRAM.
 WRAMX sections that are fixed to a bank other than 1 become errors, other WRAMX sections are treated as WRAM0.
-.It Fl x , Fl Fl nopad
+.It Fl x , Fl \-nopad
 Disables padding the end of the final file.
 This option automatically enables
 .Fl t .
@@ -198,10 +204,15 @@ Please report bugs on
 .Xr rgbasm 1 ,
 .Xr rgblink 5 ,
 .Xr rgbfix 1 ,
+.Xr rgbgfx 1 ,
+.Xr gbz80 7 ,
 .Xr rgbds 5 ,
 .Xr rgbds 7
 .Sh HISTORY
 .Nm
-was originally written by Carsten S\(/orensen as part of the ASMotor package, and was later packaged in RGBDS by Justin Lloyd.
+was originally written by
+.An Carsten S\(/orensen
+as part of the ASMotor package, and was later repackaged in RGBDS by
+.An Justin Lloyd .
 It is now maintained by a number of contributors at
 .Lk https://github.com/gbdev/rgbds .

man/rgblink.5

@@ -1,59 +1,47 @@
-.\"
-.\" This file is part of RGBDS.
-.\"
-.\" Copyright (c) 2017-2021, Antonio Nino Diaz and RGBDS contributors.
-.\"
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd March 28, 2021
+.Dd December 22, 2023
 .Dt RGBLINK 5
 .Os
 .Sh NAME
 .Nm rgblink
 .Nd linker script file format
 .Sh DESCRIPTION
-The linker script is an external file that allows the user to specify the order of sections at link time and in a centralized manner.
+The linker script is a file that allows specifying attributes for sections at link time, and in a centralized manner.
+There can only be one linker script per invocation of
+.Nm ,
+but it can be split into several files
+.Pq using the Ic INCLUDE No directive .
+.Ss Basic syntax
+The linker script syntax is line-based.
+Each line may have a directive or section name, a comment, both, or neither.
+Whitespace (space and tab characters) is used to separate syntax elements, but is otherwise ignored.
 .Pp
-A linker script consists of a series of bank declarations, each optionally followed by a list of section names (in double quotes) or commands.
-All reserved keywords (bank types and command names) are case-insensitive; all section names are case-sensitive.
-.Pp
-Any line can contain a comment starting with
+Comments begin with a semicolon
 .Ql \&;
-that ends at the end of the line.
+character, until the end of the line.
+They are simply ignored.
 .Pp
-.Bd -literal -offset indent
-; This line is a comment
-ROMX $F            ; start a bank
-  "Some functions" ; a section name
-  ALIGN 8          ; a command
-  "Some array"
-
-WRAMX 2            ; start another bank
-  org $d123        ; another command
-  "Some variables"
-.Ed
+Keywords are composed of letters and digits (but they can't start with a digit); they are all case-insensitive.
 .Pp
-Numbers can be in decimal or hexadecimal format
-.Pq the prefix is Ql $ .
-It is an error if any section name or command is found before setting a bank.
-.Pp
-Files can be included by using the
-.Ic INCLUDE
-keyword, followed by a string with the path of the file that has to be included.
-.Pp
-The possible bank types are:
-.Cm ROM0 , ROMX , VRAM , SRAM , WRAM0 , WRAMX , OAM
-and
-.Cm HRAM .
-Unless there is a single bank, which can occur with types
-.Cm ROMX , VRAM , SRAM
-and
-.Cm WRAMX ,
-it is needed to specify a bank number after the type.
-.Pp
-Section names in double quotes support the same character escape sequences as strings in
+Numbers can be written in decimal format, or in binary using the
+.Ql %
+prefix, or in hexadecimal using the
+.Ql $
+prefix (hexadecimal digits are case-insensitive).
+Note that unlike
 .Xr rgbasm 5 ,
-specifically
+an octal
+.Ql &
+prefix is not supported, nor are
+.Ql _
+digit separators.
+.Pp
+Strings begin with a double quote, and end at the next (non-escaped) double quote.
+Strings must not contain literal newline characters.
+Most of the same character escapes as
+.Xr rgbasm 5
+are supported, specifically
 .Ql \e\e ,
 .Ql \e" ,
 .Ql \en ,
@@ -62,46 +50,126 @@ and
 .Ql \et .
 Other backslash escape sequences in
 .Xr rgbasm 5
-are only relevant to assembly code and do not apply in section names.
-.Pp
-When a new bank statement is found, sections found after it will be placed right from the beginning of that bank.
-If the linker script switches to a different bank and then comes back to a previous one, it will continue from the last address that was used.
-.Pp
-The only two commands are
-.Ic ORG
+are only relevant to assembly code and do not apply in linker scripts.
+.Ss Directives
+.Bl -tag -width Ds
+.It Including other files
+.Ql Ic INCLUDE Ar path
+acts as if the contents of the file at
+.Ar path
+were copy-pasted in place of the
+.Ic INCLUDE
+directive.
+.Ar path
+must be a string.
+.It Specifying the active bank
+The active bank can be set by specifying its type (memory region) and number.
+The possible types are:
+.Ic ROM0 , ROMX , VRAM , SRAM , WRAM0 , WRAMX , OAM ,
 and
-.Ic ALIGN :
-.Bl -bullet
-.It
-.Ic ORG
-sets the address in which new sections will be placed.
-It can not be lower than the current address.
-.It
-.Ic ALIGN
-will increase the address until it is aligned to the specified boundary
-.Po it tries to set to 0 the number of bits specified after the command:
-.Ql ALIGN 8
-will align to $100
-.Pc .
-.El
+.Ic HRAM .
+The bank number can be omitted from the types that only contain a single bank, which are:
+.Ic ROM0 ,
+.Ic ROMX No if Fl t No is passed to Xr rgblink 1 ,
+.Ic VRAM No if Fl d No is passed to Xr rgblink 1 ,
+.Ic WRAM0 ,
+.Ic WRAMX No if Fl w No is passed to Xr rgblink 1 ,
+.Ic OAM ,
+and
+.Ic HRAM .
+.Pq Ic SRAM No is the only type that can never have its bank number omitted.
 .Pp
-.Sy Note:
-The bank, alignment, address and type of sections can be specified both in the source code and in the linker script.
-For a section to be able to be placed with the linker script, the bank, address and alignment must be left unassigned in the source code or be compatible with what is specified in the linker script.
-For example,
-.Ql ALIGN[8]
-in the source code is compatible with
-.Ql ORG $F00
-in the linker script.
+After a bank specification, the
+.Dq current address
+is set to the last value it had for that bank.
+If the bank has never been active thus far, the
+.Dq current address
+defaults to the beginning of the bank
+.Pq e.g. Ad $4000 No for Ic ROMX No sections .
+.It Changing the current address
+A bank must be active for any of these directives to be used.
+.Pp
+.Ql Ic ORG Ar addr
+sets the
+.Dq current address
+to
+.Ar addr .
+This directive cannot be used to move the address backwards:
+.Ar addr
+must be greater than or equal to the
+.Dq current address .
+.Pp
+.Ql Ic FLOATING
+causes all sections between it and the next
+.Ic ORG
+or bank specification to be placed at addresses automatically determined by
+.Nm .
+.Pp
+.Ql Ic ALIGN Ar addr , Ar offset
+increases the
+.Dq current address
+until it is aligned to the specified boundary (i.e. the
+.Ar align
+lowest bits of the address are equal to
+.Ar offset ) .
+If
+.Ar offset
+is omitted, it is implied to be 0.
+For example, if the
+.Dq current address
+is $0007,
+.Ql ALIGN 8
+would set it to $0100, and
+.Ql ALIGN 8 , 10
+would set it to $000A.
+.Pp
+.Ql Ic DS Ar size
+increases the
+.Dq current address
+by
+.Ar size .
+The gap is not allocated, so smaller floating sections can later be placed there.
+.El
+.Ss Section placement
+A section can be placed simply by naming it (with a string).
+Its bank is set to the active bank, and its address to the
+.Dq current address .
+Any constraints the section already possesses (whether from earlier in the linker script, or from the object files being linked) must be consistent with what the linker script specifies: the section's type must match, the section's bank number (if set) must match the active bank, etc.
+In particular, if the section has an alignment constraint, the address at which it is placed by the linker script must obey that constraint; otherwise, an error will occur.
+.Pp
+After a section is placed, the
+.Dq current address
+is increased by the section's size.
+This must not increase it past the end of the active memory region.
+.Pp
+The section must have been defined in the object files being linked, unless the section name is followed by the keyword
+.Ic OPTIONAL .
+.Sh EXAMPLES
+.Bd -literal -offset indent
+; This line contains only a comment
+ROMX $F            ; start a bank
+  "Some functions" ; a section name
+  ALIGN 8          ; a directive
+  "Some \e"array\e""
+
+WRAMX 2            ; start another bank
+  org $d123        ; another directive
+  "Some variables"
+.Ed
 .Sh SEE ALSO
 .Xr rgbasm 1 ,
+.Xr rgbasm 5 ,
 .Xr rgblink 1 ,
 .Xr rgbfix 1 ,
+.Xr rgbgfx 1 ,
+.Xr gbz80 7 ,
 .Xr rgbds 5 ,
 .Xr rgbds 7
 .Sh HISTORY
-.Nm
-was originally written by Carsten S\(/orensen as part of the ASMotor package,
-and was later packaged in RGBDS by Justin Lloyd.
+.Xr rgblink 1
+was originally written by
+.An Carsten S\(/orensen
+as part of the ASMotor package, and was later repackaged in RGBDS by
+.An Justin Lloyd .
 It is now maintained by a number of contributors at
 .Lk https://github.com/gbdev/rgbds .

src/.gitignore

@@ -1,2 +1,2 @@
 # Generated by CMake
-/.version.c
+/.version.cpp

src/CMakeLists.txt

@@ -1,17 +1,11 @@
-#
-# This file is part of RGBDS.
-#
-# Copyright (c) 2020 RGBDS contributors.
-#
 # SPDX-License-Identifier: MIT
-#
 
-configure_file(version.c _version.c ESCAPE_QUOTES)
+configure_file(version.cpp _version.cpp ESCAPE_QUOTES)
 
 set(common_src
-    "error.c"
-    "extern/getopt.c"
-    "_version.c"
+    "error.cpp"
+    "extern/getopt.cpp"
+    "_version.cpp"
     )
 
 find_package(BISON 3.0.0 REQUIRED)
@@ -28,36 +22,42 @@ endif()
 set(BISON_FLAGS "${BISON_FLAGS} -Dparse.lac=full")
 set(BISON_FLAGS "${BISON_FLAGS} -Dlr.type=ielr")
 
-BISON_TARGET(PARSER "asm/parser.y"
-             "${PROJECT_SOURCE_DIR}/src/asm/parser.c"
+BISON_TARGET(ASM_PARSER "asm/parser.y"
+             "${PROJECT_SOURCE_DIR}/src/asm/parser.cpp"
              COMPILE_FLAGS "${BISON_FLAGS}"
-             DEFINES_FILE "${PROJECT_SOURCE_DIR}/src/asm/parser.h"
+             DEFINES_FILE "${PROJECT_SOURCE_DIR}/src/asm/parser.hpp"
+             )
+
+BISON_TARGET(LINKER_SCRIPT_PARSER "link/script.y"
+             "${PROJECT_SOURCE_DIR}/src/link/script.cpp"
+             COMPILE_FLAGS "${BISON_FLAGS}"
+             DEFINES_FILE "${PROJECT_SOURCE_DIR}/src/link/script.hpp"
              )
 
 set(rgbasm_src
-    "${BISON_PARSER_OUTPUT_SOURCE}"
-    "asm/charmap.c"
-    "asm/fixpoint.c"
-    "asm/format.c"
-    "asm/fstack.c"
-    "asm/lexer.c"
-    "asm/macro.c"
-    "asm/main.c"
-    "asm/opt.c"
-    "asm/output.c"
-    "asm/rpn.c"
-    "asm/section.c"
-    "asm/symbol.c"
-    "asm/util.c"
-    "asm/warning.c"
-    "extern/utf8decoder.c"
-    "hashmap.c"
-    "linkdefs.c"
-    "opmath.c"
+    "${BISON_ASM_PARSER_OUTPUT_SOURCE}"
+    "asm/charmap.cpp"
+    "asm/fixpoint.cpp"
+    "asm/format.cpp"
+    "asm/fstack.cpp"
+    "asm/lexer.cpp"
+    "asm/macro.cpp"
+    "asm/main.cpp"
+    "asm/opt.cpp"
+    "asm/output.cpp"
+    "asm/rpn.cpp"
+    "asm/section.cpp"
+    "asm/symbol.cpp"
+    "asm/warning.cpp"
+    "extern/utf8decoder.cpp"
+    "hashmap.cpp"
+    "linkdefs.cpp"
+    "opmath.cpp"
+    "util.cpp"
     )
 
 set(rgbfix_src
-    "fix/main.c"
+    "fix/main.cpp"
     )
 
 set(rgbgfx_src
@@ -69,24 +69,25 @@ set(rgbgfx_src
     "gfx/proto_palette.cpp"
     "gfx/reverse.cpp"
     "gfx/rgba.cpp"
-    "extern/getopt.c"
-    "error.c"
+    "extern/getopt.cpp"
+    "error.cpp"
     )
 
 set(rgblink_src
-    "link/assign.c"
-    "link/main.c"
-    "link/object.c"
-    "link/output.c"
-    "link/patch.c"
-    "link/script.c"
-    "link/sdas_obj.c"
-    "link/section.c"
-    "link/symbol.c"
-    "extern/utf8decoder.c"
-    "hashmap.c"
-    "linkdefs.c"
-    "opmath.c"
+    "${BISON_LINKER_SCRIPT_PARSER_OUTPUT_SOURCE}"
+    "link/assign.cpp"
+    "link/main.cpp"
+    "link/object.cpp"
+    "link/output.cpp"
+    "link/patch.cpp"
+    "link/sdas_obj.cpp"
+    "link/section.cpp"
+    "link/symbol.cpp"
+    "extern/utf8decoder.cpp"
+    "hashmap.cpp"
+    "linkdefs.cpp"
+    "opmath.cpp"
+    "util.cpp"
     )
 
 foreach(PROG "asm" "fix" "gfx" "link")

src/asm/.gitignore

@@ -1,2 +1,2 @@
-/parser.c
-/parser.h
+/parser.cpp
+/parser.hpp

src/asm/charmap.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2013-2018, stag019 and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <errno.h>
 #include <stdbool.h>
@@ -13,13 +7,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "asm/charmap.h"
-#include "asm/main.h"
-#include "asm/output.h"
-#include "asm/util.h"
-#include "asm/warning.h"
+#include "asm/charmap.hpp"
+#include "asm/main.hpp"
+#include "asm/output.hpp"
+#include "asm/warning.hpp"
 
-#include "hashmap.h"
+#include "hashmap.hpp"
+#include "util.hpp"
 
 // Charmaps are stored using a structure known as "trie".
 // Essentially a tree, where each nodes stores a single character's worth of info:
@@ -55,12 +49,12 @@ struct CharmapStackEntry *charmapStack;
 
 static struct Charmap *charmap_Get(char const *name)
 {
-	return hash_GetElement(charmaps, name);
+	return (struct Charmap *)hash_GetElement(charmaps, name);
 }
 
 static void resizeCharmap(struct Charmap **map, size_t capacity)
 {
-	*map = realloc(*map, sizeof(**map) + sizeof(*(*map)->nodes) * capacity);
+	*map = (struct Charmap *)realloc(*map, sizeof(**map) + sizeof(*(*map)->nodes) * capacity);
 
 	if (!*map)
 		fatalerror("Failed to %s charmap: %s\n",
@@ -110,12 +104,6 @@ struct Charmap *charmap_New(char const *name, char const *baseName)
 	return charmap;
 }
 
-void charmap_Delete(struct Charmap *charmap)
-{
-	free(charmap->name);
-	free(charmap);
-}
-
 void charmap_Set(char const *name)
 {
 	struct Charmap **charmap = (struct Charmap **)hash_GetNode(charmaps, name);
@@ -128,9 +116,8 @@ void charmap_Set(char const *name)
 
 void charmap_Push(void)
 {
-	struct CharmapStackEntry *stackEntry;
+	struct CharmapStackEntry *stackEntry = (struct CharmapStackEntry *)malloc(sizeof(*stackEntry));
 
-	stackEntry = malloc(sizeof(*stackEntry));
 	if (stackEntry == NULL)
 		fatalerror("Failed to alloc charmap stack entry: %s\n", strerror(errno));
 
@@ -187,6 +174,22 @@ void charmap_Add(char *mapping, uint8_t value)
 	node->value = value;
 }
 
+bool charmap_HasChar(char const *input)
+{
+	struct Charmap const *charmap = *currentCharmap;
+	struct Charnode const *node = &charmap->nodes[0];
+
+	for (; *input; input++) {
+		size_t next = node->next[*input - 1];
+
+		if (!next)
+			return false;
+		node = &charmap->nodes[next];
+	}
+
+	return node->isTerminal;
+}
+
 size_t charmap_Convert(char const *input, uint8_t *output)
 {
 	uint8_t *start = output;
@@ -242,7 +245,7 @@ size_t charmap_ConvertNext(char const **input, uint8_t **output)
 								   *input);
 
 				if (codepointLen == 0)
-					error("Input string is not valid UTF-8!\n");
+					error("Input string is not valid UTF-8\n");
 
 				// OK because UTF-8 has no NUL in multi-byte chars
 				*input += codepointLen;

src/asm/fixpoint.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2021, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Fixed-point math routines
 
@@ -12,9 +6,9 @@
 #include <math.h>
 #include <stdint.h>
 
-#include "asm/fixpoint.h"
-#include "asm/symbol.h"
-#include "asm/warning.h"
+#include "asm/fixpoint.hpp"
+#include "asm/symbol.hpp"
+#include "asm/warning.hpp"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846

src/asm/format.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2020, RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <assert.h>
 #include <inttypes.h>
@@ -15,13 +9,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/fixpoint.h"
-#include "asm/format.h"
-#include "asm/warning.h"
+#include "asm/fixpoint.hpp"
+#include "asm/format.hpp"
+#include "asm/warning.hpp"
 
 struct FormatSpec fmt_NewSpec(void)
 {
-	struct FormatSpec fmt = {0};
+	struct FormatSpec fmt = {};
 
 	return fmt;
 }

src/asm/fstack.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <sys/stat.h>
 #include <assert.h>
@@ -14,13 +8,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "asm/fstack.h"
-#include "asm/macro.h"
-#include "asm/main.h"
-#include "asm/symbol.h"
-#include "asm/warning.h"
-#include "error.h"
-#include "platform.h" // S_ISDIR (stat macro)
+#include "asm/fstack.hpp"
+#include "asm/macro.hpp"
+#include "asm/main.hpp"
+#include "asm/symbol.hpp"
+#include "asm/warning.hpp"
+#include "error.hpp"
+#include "platform.hpp" // S_ISDIR (stat macro)
 
 #define MAXINCPATHS 128
 
@@ -120,7 +114,7 @@ void fstk_AddIncludePath(char const *path)
 	}
 	size_t len = strlen(path);
 	size_t allocSize = len + (path[len - 1] != '/') + 1;
-	char *str = malloc(allocSize);
+	char *str = (char *)malloc(allocSize);
 
 	if (!str) {
 		// Attempt to continue without that path
@@ -169,7 +163,7 @@ bool fstk_FindFile(char const *path, char **fullPath, size_t *size)
 {
 	if (!*size) {
 		*size = 64; // This is arbitrary, really
-		*fullPath = realloc(*fullPath, *size);
+		*fullPath = (char *)realloc(*fullPath, *size);
 		if (!*fullPath)
 			error("realloc error during include path search: %s\n",
 			      strerror(errno));
@@ -189,7 +183,7 @@ bool fstk_FindFile(char const *path, char **fullPath, size_t *size)
 			// Oh how I wish `asnprintf` was standard...
 			if ((size_t)len >= *size) { // `size` includes the terminator, `len` doesn't
 				*size = len + 1;
-				*fullPath = realloc(*fullPath, *size);
+				*fullPath = (char *)realloc(*fullPath, *size);
 				if (!*fullPath) {
 					error("realloc error during include path search: %s\n",
 					      strerror(errno));
@@ -231,7 +225,7 @@ bool yywrap(void)
 		// If the node is referenced, we can't edit it; duplicate it
 		if (contextStack->fileInfo->referenced) {
 			size_t size = sizeof(*fileInfo) + sizeof(fileInfo->iters[0]) * fileInfo->reptDepth;
-			struct FileStackReptNode *copy = malloc(size);
+			struct FileStackReptNode *copy = (struct FileStackReptNode *)malloc(size);
 
 			if (!copy)
 				fatalerror("Failed to duplicate REPT file node: %s\n", strerror(errno));
@@ -246,7 +240,11 @@ bool yywrap(void)
 
 		// If this is a FOR, update the symbol value
 		if (contextStack->forName && fileInfo->iters[0] <= contextStack->nbReptIters) {
-			contextStack->forValue += contextStack->forStep;
+			// Avoid arithmetic overflow runtime error
+			uint32_t forValue = (uint32_t)contextStack->forValue +
+				(uint32_t)contextStack->forStep;
+			contextStack->forValue = forValue >= 0 ? (int32_t)forValue
+				: -(int32_t)~forValue - 1;
 			struct Symbol *sym = sym_AddVar(contextStack->forName,
 				contextStack->forValue);
 
@@ -274,8 +272,10 @@ bool yywrap(void)
 
 	lexer_DeleteState(context->lexerState);
 	// Restore args if a macro (not REPT) saved them
-	if (context->fileInfo->type == NODE_MACRO)
+	if (context->fileInfo->type == NODE_MACRO) {
+		macro_FreeArgs(macro_GetCurrentArgs());
 		macro_UseNewArgs(contextStack->macroArgs);
+	}
 	// Free the file stack node
 	if (!context->fileInfo->referenced)
 		free(context->fileInfo);
@@ -301,7 +301,7 @@ static void newContext(struct FileStackNode *fileInfo)
 	// Save the current `\@` value, to be restored when this context ends
 	contextStack->uniqueID = macro_GetUniqueID();
 
-	struct Context *context = malloc(sizeof(*context));
+	struct Context *context = (struct Context *)malloc(sizeof(*context));
 
 	if (!context)
 		fatalerror("Failed to allocate memory for new context: %s\n", strerror(errno));
@@ -336,7 +336,8 @@ void fstk_RunInclude(char const *path)
 		return;
 	}
 
-	struct FileStackNamedNode *fileInfo = malloc(sizeof(*fileInfo) + size);
+	struct FileStackNamedNode *fileInfo =
+		(struct FileStackNamedNode *)malloc(sizeof(*fileInfo) + size);
 
 	if (!fileInfo) {
 		error("Failed to alloc file info for INCLUDE: %s\n", strerror(errno));
@@ -351,8 +352,10 @@ void fstk_RunInclude(char const *path)
 	if (!contextStack->lexerState)
 		fatalerror("Failed to set up lexer for file include\n");
 	lexer_SetStateAtEOL(contextStack->lexerState);
-	// We're back at top-level, so most things are reset
-	contextStack->uniqueID = macro_UndefUniqueID();
+	// We're back at top-level, so most things are reset,
+	// but not the unique ID, since INCLUDE may be inside a
+	// MACRO or REPT/FOR loop
+	contextStack->uniqueID = contextStack->parent->uniqueID;
 }
 
 // Similar to `fstk_RunInclude`, but not subject to `-MG`, and
@@ -371,7 +374,8 @@ static void runPreIncludeFile(void)
 		return;
 	}
 
-	struct FileStackNamedNode *fileInfo = malloc(sizeof(*fileInfo) + size);
+	struct FileStackNamedNode *fileInfo =
+		(struct FileStackNamedNode *)malloc(sizeof(*fileInfo) + size);
 
 	if (!fileInfo) {
 		error("Failed to alloc file info for pre-include: %s\n", strerror(errno));
@@ -421,8 +425,8 @@ void fstk_RunMacro(char const *macroName, struct MacroArgs *args)
 	struct FileStackNamedNode const *baseNode = (struct FileStackNamedNode const *)node;
 	size_t baseLen = strlen(baseNode->name);
 	size_t macroNameLen = strlen(macro->name);
-	struct FileStackNamedNode *fileInfo = malloc(sizeof(*fileInfo) + baseLen
-						     + reptNameLen + 2 + macroNameLen + 1);
+	struct FileStackNamedNode *fileInfo = (struct FileStackNamedNode *)malloc(sizeof(*fileInfo) +
+			baseLen + reptNameLen + 2 + macroNameLen + 1);
 
 	if (!fileInfo) {
 		error("Failed to alloc file info for \"%s\": %s\n", macro->name, strerror(errno));
@@ -465,7 +469,7 @@ static bool newReptContext(int32_t reptLineNo, char *body, size_t size)
 	uint32_t reptDepth = contextStack->fileInfo->type == NODE_REPT
 				? ((struct FileStackReptNode *)contextStack->fileInfo)->reptDepth
 				: 0;
-	struct FileStackReptNode *fileInfo = malloc(sizeof(*fileInfo)
+	struct FileStackReptNode *fileInfo = (struct FileStackReptNode *)malloc(sizeof(*fileInfo)
 			+ (reptDepth + 1) * sizeof(fileInfo->iters[0]));
 
 	if (!fileInfo) {
@@ -515,9 +519,9 @@ void fstk_RunFor(char const *symName, int32_t start, int32_t stop, int32_t step,
 	uint32_t count = 0;
 
 	if (step > 0 && start < stop)
-		count = (stop - start - 1) / step + 1;
+		count = ((int64_t)stop - start - 1) / step + 1;
 	else if (step < 0 && stop < start)
-		count = (start - stop - 1) / -step + 1;
+		count = ((int64_t)start - stop - 1) / -(int64_t)step + 1;
 	else if (step == 0)
 		error("FOR cannot have a step value of 0\n");
 
@@ -567,12 +571,13 @@ void fstk_Init(char const *mainPath, size_t maxDepth)
 	struct LexerState *state = lexer_OpenFile(mainPath);
 
 	if (!state)
-		fatalerror("Failed to open main file!\n");
+		fatalerror("Failed to open main file\n");
 	lexer_SetState(state);
 	char const *fileName = lexer_GetFileName();
 	size_t len = strlen(fileName);
-	struct Context *context = malloc(sizeof(*contextStack));
-	struct FileStackNamedNode *fileInfo = malloc(sizeof(*fileInfo) + len + 1);
+	struct Context *context = (struct Context *)malloc(sizeof(*contextStack));
+	struct FileStackNamedNode *fileInfo =
+		(struct FileStackNamedNode *)malloc(sizeof(*fileInfo) + len + 1);
 
 	if (!context)
 		fatalerror("Failed to allocate memory for main context: %s\n", strerror(errno));

src/asm/lexer.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2020, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -24,20 +18,20 @@
 #include <unistd.h>
 #endif
 
-#include "platform.h" // For `ssize_t`
+#include "platform.hpp" // For `ssize_t` and `AT`
+#include "util.hpp"
 
-#include "asm/lexer.h"
-#include "asm/fixpoint.h"
-#include "asm/format.h"
-#include "asm/fstack.h"
-#include "asm/macro.h"
-#include "asm/main.h"
-#include "asm/rpn.h"
-#include "asm/symbol.h"
-#include "asm/util.h"
-#include "asm/warning.h"
+#include "asm/lexer.hpp"
+#include "asm/fixpoint.hpp"
+#include "asm/format.hpp"
+#include "asm/fstack.hpp"
+#include "asm/macro.hpp"
+#include "asm/main.hpp"
+#include "asm/rpn.hpp"
+#include "asm/symbol.hpp"
+#include "asm/warning.hpp"
 // Include this last so it gets all type & constant definitions
-#include "parser.h" // For token definitions, generated from parser.y
+#include "parser.hpp" // For token definitions, generated from parser.y
 
 // Neither MSVC nor MinGW provide `mmap`
 #if defined(_MSC_VER) || defined(__MINGW32__)
@@ -206,6 +200,7 @@ static struct KeywordMapping {
 
 	{"CHARLEN", T_OP_CHARLEN},
 	{"CHARSUB", T_OP_CHARSUB},
+	{"INCHARMAP", T_OP_INCHARMAP},
 
 	{"INCLUDE", T_POP_INCLUDE},
 	{"PRINT", T_POP_PRINT},
@@ -216,6 +211,7 @@ static struct KeywordMapping {
 	{"DW", T_POP_DW},
 	{"DL", T_POP_DL},
 	{"SECTION", T_POP_SECTION},
+	{"ENDSECTION", T_POP_ENDSECTION},
 	{"PURGE", T_POP_PURGE},
 
 	{"RSRESET", T_POP_RSRESET},
@@ -394,7 +390,7 @@ uint32_t lexer_GetIFDepth(void)
 
 void lexer_IncIFDepth(void)
 {
-	struct IfStack *ifStack = malloc(sizeof(*ifStack));
+	struct IfStack *ifStack = (struct IfStack *)malloc(sizeof(*ifStack));
 
 	if (!ifStack)
 		fatalerror("Unable to allocate new IF depth: %s\n", strerror(errno));
@@ -441,7 +437,7 @@ void lexer_ReachELSEBlock(void)
 struct LexerState *lexer_OpenFile(char const *path)
 {
 	bool isStdin = !strcmp(path, "-");
-	struct LexerState *state = malloc(sizeof(*state));
+	struct LexerState *state = (struct LexerState *)malloc(sizeof(*state));
 	struct stat fileInfo;
 
 	// Give stdin a nicer file name
@@ -483,7 +479,7 @@ struct LexerState *lexer_OpenFile(char const *path)
 
 			state->isMmapped = true;
 			state->isReferenced = false; // By default, a state isn't referenced
-			state->ptr = mappingAddr;
+			state->ptr = (char *)mappingAddr;
 			assert(fileInfo.st_size >= 0);
 			state->size = (size_t)fileInfo.st_size;
 			state->offset = 0;
@@ -514,7 +510,7 @@ struct LexerState *lexer_OpenFile(char const *path)
 
 struct LexerState *lexer_OpenFileView(char const *path, char *buf, size_t size, uint32_t lineNo)
 {
-	struct LexerState *state = malloc(sizeof(*state));
+	struct LexerState *state = (struct LexerState *)malloc(sizeof(*state));
 
 	if (!state) {
 		error("Failed to allocate memory for lexer state: %s\n", strerror(errno));
@@ -571,7 +567,7 @@ struct KeywordDictNode {
 	uint16_t children[0x60 - ' '];
 	struct KeywordMapping const *keyword;
 // Since the keyword structure is invariant, the min number of nodes is known at compile time
-} keywordDict[365] = {0}; // Make sure to keep this correct when adding keywords!
+} keywordDict[377] = {}; // Make sure to keep this correct when adding keywords!
 
 // Convert a char into its index into the dict
 static uint8_t dictIndex(char c)
@@ -641,7 +637,7 @@ static void reallocCaptureBuf(void)
 		lexerState->captureCapacity = SIZE_MAX;
 	else
 		lexerState->captureCapacity *= 2;
-	lexerState->captureBuf = realloc(lexerState->captureBuf, lexerState->captureCapacity);
+	lexerState->captureBuf = (char *)realloc(lexerState->captureBuf, lexerState->captureCapacity);
 	if (!lexerState->captureBuf)
 		fatalerror("realloc error while resizing capture buffer: %s\n", strerror(errno));
 }
@@ -657,7 +653,7 @@ static void beginExpansion(char const *str, bool owned, char const *name)
 	if (name)
 		lexer_CheckRecursionDepth();
 
-	struct Expansion *exp = malloc(sizeof(*exp));
+	struct Expansion *exp = (struct Expansion *)malloc(sizeof(*exp));
 
 	if (!exp)
 		fatalerror("Unable to allocate new expansion: %s\n", strerror(errno));
@@ -1463,7 +1459,7 @@ static size_t appendEscapedSubstring(char const *str, size_t i)
 	return i;
 }
 
-static void readString(void)
+static void readString(bool raw)
 {
 	lexerState->disableMacroArgs = true;
 	lexerState->disableInterpolation = true;
@@ -1521,6 +1517,8 @@ static void readString(void)
 			goto finish;
 
 		case '\\': // Character escape or macro arg
+			if (raw)
+				break;
 			c = peek();
 			switch (c) {
 			case '\\':
@@ -1585,6 +1583,8 @@ static void readString(void)
 			break;
 
 		case '{': // Symbol interpolation
+			if (raw)
+				break;
 			// We'll be exiting the string scope, so re-enable expansions
 			// (Not interpolations, since they're handled by the function itself...)
 			lexerState->disableMacroArgs = false;
@@ -1613,7 +1613,7 @@ finish:
 	lexerState->disableInterpolation = false;
 }
 
-static size_t appendStringLiteral(size_t i)
+static size_t appendStringLiteral(size_t i, bool raw)
 {
 	lexerState->disableMacroArgs = true;
 	lexerState->disableInterpolation = true;
@@ -1674,6 +1674,8 @@ static size_t appendStringLiteral(size_t i)
 			goto finish;
 
 		case '\\': // Character escape or macro arg
+			if (raw)
+				break;
 			c = peek();
 			switch (c) {
 			// Character escape
@@ -1721,12 +1723,6 @@ static size_t appendStringLiteral(size_t i)
 				c = '\\';
 				break;
 
-			case ',': // `\,` inside a macro arg string literal
-				warning(WARNING_OBSOLETE,
-					"`\\,` is deprecated inside strings\n");
-				shiftChar();
-				break;
-
 			default:
 				error("Illegal character escape %s\n", printChar(c));
 				shiftChar();
@@ -1735,6 +1731,8 @@ static size_t appendStringLiteral(size_t i)
 			break;
 
 		case '{': // Symbol interpolation
+			if (raw)
+				break;
 			// We'll be exiting the string scope, so re-enable expansions
 			// (Not interpolations, since they're handled by the function itself...)
 			lexerState->disableMacroArgs = false;
@@ -1769,11 +1767,8 @@ static int yylex_SKIP_TO_ENDC(void); // forward declaration for yylex_NORMAL
 
 static int yylex_NORMAL(void)
 {
-	uint32_t num = 0;
-
 	for (;;) {
 		int c = nextChar();
-		char secondChar;
 
 		switch (c) {
 		// Ignore whitespace and comments
@@ -1920,15 +1915,19 @@ static int yylex_NORMAL(void)
 				return T_OP_LOGICGT;
 			}
 
-		// Handle colon, which may begin an anonymous label ref
-
-		case ':':
+		case ':': // Either :, ::, or an anonymous label ref
 			c = peek();
-			if (c != '+' && c != '-')
-				return T_COLON;
-
+			switch (c) {
+			case ':':
+				shiftChar();
+				return T_DOUBLE_COLON;
+			case '+':
+			case '-':
 				readAnonLabelRef(c);
 				return T_ANON;
+			default:
+				return T_COLON;
+			}
 
 		// Handle numbers
 
@@ -1941,36 +1940,37 @@ static int yylex_NORMAL(void)
 		case '6':
 		case '7':
 		case '8':
-		case '9':
-			num = readNumber(10, c - '0');
+		case '9': {
+			uint32_t n = readNumber(10, c - '0');
+
 			if (peek() == '.') {
 				shiftChar();
-				yylval.constValue = readFractionalPart(num);
-			} else {
-				yylval.constValue = num;
+				n = readFractionalPart(n);
 			}
+			yylval.constValue = n;
 			return T_NUMBER;
+		}
 
 		case '&': // Either &=, binary AND, logical AND, or an octal constant
-			secondChar = peek();
-			if (secondChar == '=') {
+			c = peek();
+			if (c == '=') {
 				shiftChar();
 				return T_POP_ANDEQ;
-			} else if (secondChar == '&') {
+			} else if (c == '&') {
 				shiftChar();
 				return T_OP_LOGICAND;
-			} else if (secondChar >= '0' && secondChar <= '7') {
+			} else if (c >= '0' && c <= '7') {
 				yylval.constValue = readNumber(8, 0);
 				return T_NUMBER;
 			}
 			return T_OP_AND;
 
 		case '%': // Either %=, MOD, or a binary constant
-			secondChar = peek();
-			if (secondChar == '=') {
+			c = peek();
+			if (c == '=') {
 				shiftChar();
 				return T_POP_MODEQ;
-			} else if (secondChar == binDigits[0] || secondChar == binDigits[1]) {
+			} else if (c == binDigits[0] || c == binDigits[1]) {
 				yylval.constValue = readBinaryNumber();
 				return T_NUMBER;
 			}
@@ -1987,7 +1987,7 @@ static int yylex_NORMAL(void)
 		// Handle strings
 
 		case '"':
-			readString();
+			readString(false);
 			return T_STRING;
 
 		// Handle newlines and EOF
@@ -2009,6 +2009,16 @@ static int yylex_NORMAL(void)
 			readLineContinuation();
 			break;
 
+		// Handle raw strings... or fall through if '#' is not followed by '"'
+
+		case '#':
+			if (peek() == '"') {
+				shiftChar();
+				readString(true);
+				return T_STRING;
+			}
+			// fallthrough
+
 		// Handle identifiers... or report garbage characters
 
 		default:
@@ -2087,7 +2097,16 @@ static int yylex_RAW(void)
 		switch (c) {
 		case '"': // String literals inside macro args
 			shiftChar();
-			i = appendStringLiteral(i);
+			i = appendStringLiteral(i, false);
+			break;
+
+		case '#': // Raw string literals inside macro args
+			append_yylval_string(c);
+			shiftChar();
+			if (peek() == '"') {
+				shiftChar();
+				i = appendStringLiteral(i, true);
+			}
 			break;
 
 		case ';': // Comments inside macro args
@@ -2407,11 +2426,11 @@ int yylex(void)
 		nextLine();
 
 	static int (* const lexerModeFuncs[])(void) = {
-		[LEXER_NORMAL]       = yylex_NORMAL,
-		[LEXER_RAW]          = yylex_RAW,
-		[LEXER_SKIP_TO_ELIF] = yylex_SKIP_TO_ELIF,
-		[LEXER_SKIP_TO_ENDC] = yylex_SKIP_TO_ENDC,
-		[LEXER_SKIP_TO_ENDR] = yylex_SKIP_TO_ENDR,
+		AT(LEXER_NORMAL)       yylex_NORMAL,
+		AT(LEXER_RAW)          yylex_RAW,
+		AT(LEXER_SKIP_TO_ELIF) yylex_SKIP_TO_ELIF,
+		AT(LEXER_SKIP_TO_ENDC) yylex_SKIP_TO_ENDC,
+		AT(LEXER_SKIP_TO_ENDR) yylex_SKIP_TO_ENDR,
 	};
 	int token = lexerModeFuncs[lexerState->mode]();
 

src/asm/macro.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <errno.h>
 #include <inttypes.h>
@@ -13,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/macro.h"
-#include "asm/warning.h"
+#include "asm/macro.hpp"
+#include "asm/warning.hpp"
 
 #define MAXMACROARGS 99999
 
@@ -32,7 +26,7 @@ struct MacroArgs {
 };
 
 #define SIZEOF_ARGS(nbArgs) (sizeof(struct MacroArgs) + \
-			    sizeof(((struct MacroArgs){0}).args[0]) * (nbArgs))
+			    sizeof(((struct MacroArgs *)0)->args[0]) * (nbArgs))
 
 static struct MacroArgs *macroArgs = NULL;
 static uint32_t uniqueID = 0;
@@ -50,7 +44,7 @@ struct MacroArgs *macro_GetCurrentArgs(void)
 
 struct MacroArgs *macro_NewArgs(void)
 {
-	struct MacroArgs *args = malloc(SIZEOF_ARGS(INITIAL_ARG_SIZE));
+	struct MacroArgs *args = (struct MacroArgs *)malloc(SIZEOF_ARGS(INITIAL_ARG_SIZE));
 
 	if (!args)
 		fatalerror("Unable to register macro arguments: %s\n", strerror(errno));
@@ -73,7 +67,7 @@ void macro_AppendArg(struct MacroArgs **argPtr, char *s)
 		// Check that overflow didn't roll us back
 		if (macArgs->capacity <= macArgs->nbArgs)
 			fatalerror("Failed to add new macro argument: capacity overflow\n");
-		macArgs = realloc(macArgs, SIZEOF_ARGS(macArgs->capacity));
+		macArgs = (struct MacroArgs *)realloc(macArgs, SIZEOF_ARGS(macArgs->capacity));
 		if (!macArgs)
 			fatalerror("Error adding new macro argument: %s\n", strerror(errno));
 	}
@@ -116,7 +110,7 @@ char const *macro_GetAllArgs(void)
 	for (uint32_t i = macroArgs->shift; i < macroArgs->nbArgs; i++)
 		len += strlen(macroArgs->args[i]) + 1; // 1 for comma
 
-	char *str = malloc(len + 1); // 1 for '\0'
+	char *str = (char *)malloc(len + 1); // 1 for '\0'
 	char *ptr = str;
 
 	if (!str)

src/asm/main.cpp

@@ -1,15 +1,10 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <inttypes.h>
+#include <limits.h>
 #include <math.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -18,24 +13,24 @@
 #include <string.h>
 #include <time.h>
 
-#include "asm/charmap.h"
-#include "asm/fixpoint.h"
-#include "asm/format.h"
-#include "asm/fstack.h"
-#include "asm/lexer.h"
-#include "asm/main.h"
-#include "asm/opt.h"
-#include "asm/output.h"
-#include "asm/rpn.h"
-#include "asm/symbol.h"
-#include "asm/warning.h"
-#include "parser.h"
+#include "asm/charmap.hpp"
+#include "asm/fixpoint.hpp"
+#include "asm/format.hpp"
+#include "asm/fstack.hpp"
+#include "asm/lexer.hpp"
+#include "asm/main.hpp"
+#include "asm/opt.hpp"
+#include "asm/output.hpp"
+#include "asm/rpn.hpp"
+#include "asm/symbol.hpp"
+#include "asm/warning.hpp"
+#include "parser.hpp"
 
-#include "extern/getopt.h"
+#include "extern/getopt.hpp"
 
-#include "helpers.h"
-#include "error.h"
-#include "version.h"
+#include "helpers.hpp"
+#include "error.hpp"
+#include "version.hpp"
 
 #ifdef __clang__
 #if __has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__)
@@ -46,7 +41,9 @@
 #ifdef __SANITIZE_ADDRESS__
 // There are known, non-trivial to fix leaks. We would still like to have `make develop'
 // detect memory corruption, though.
+extern "C" {
 char const *__asan_default_options(void) { return "detect_leaks=0"; }
+}
 #endif
 
 // Old Bison versions (confirmed for 2.3) do not forward-declare `yyparse` in the generated header
@@ -59,7 +56,7 @@ bool failedOnMissingInclude = false;
 bool generatePhonyDeps = false;
 char *targetFileName = NULL;
 
-bool haltnop;
+bool haltNop;
 bool warnOnHaltNop;
 bool optimizeLoads;
 bool warnOnLdOpt;
@@ -69,7 +66,7 @@ bool warnings; // True to enable warnings, false to disable them.
 // Escapes Make-special chars from a string
 static char *make_escape(char const *str)
 {
-	char * const escaped_str = malloc(strlen(str) * 2 + 1);
+	char *escaped_str = (char *)malloc(strlen(str) * 2 + 1);
 	char *dest = escaped_str;
 
 	if (escaped_str == NULL)
@@ -87,7 +84,7 @@ static char *make_escape(char const *str)
 }
 
 // Short options
-static const char *optstring = "b:D:Eg:Hhi:I:LlM:o:P:p:Q:r:VvW:w";
+static const char *optstring = "b:D:Eg:Hhi:I:LlM:o:P:p:Q:r:VvW:wX:";
 
 // Variables for the long-only options
 static int depType; // Variants of `-M`
@@ -114,6 +111,7 @@ static struct option const longopts[] = {
 	{ "MG",               no_argument,       &depType, 'G' },
 	{ "MP",               no_argument,       &depType, 'P' },
 	{ "MT",               required_argument, &depType, 'T' },
+	{ "warning",          required_argument, NULL,     'W' },
 	{ "MQ",               required_argument, &depType, 'Q' },
 	{ "output",           required_argument, NULL,     'o' },
 	{ "preinclude",       required_argument, NULL,     'P' },
@@ -123,16 +121,17 @@ static struct option const longopts[] = {
 	{ "version",          no_argument,       NULL,     'V' },
 	{ "verbose",          no_argument,       NULL,     'v' },
 	{ "warning",          required_argument, NULL,     'W' },
+	{ "max-errors",       required_argument, NULL,     'X' },
 	{ NULL,               no_argument,       NULL,     0   }
 };
 
-static void print_usage(void)
+static void printUsage(void)
 {
 	fputs(
 "Usage: rgbasm [-EHhLlVvw] [-b chars] [-D name[=value]] [-g chars] [-I path]\n"
 "              [-M depend_file] [-MG] [-MP] [-MT target_file] [-MQ target_file]\n"
 "              [-o out_file] [-P include_file] [-p pad_value] [-Q precision]\n"
-"              [-r depth] [-W warning] <file>\n"
+"              [-r depth] [-W warning] [-X max_errors] <file>\n"
 "Useful options:\n"
 "    -E, --export-all         export all labels\n"
 "    -M, --dependfile <path>  set the output dependency file\n"
@@ -143,7 +142,6 @@ static void print_usage(void)
 "\n"
 "For help, use `man rgbasm' or go to https://rgbds.gbdev.io/docs/\n",
 	      stderr);
-	exit(1);
 }
 
 int main(int argc, char *argv[])
@@ -165,21 +163,25 @@ int main(int argc, char *argv[])
 	opt_G("0123");
 	opt_P(0);
 	opt_Q(16);
-	haltnop = true;
+	haltNop = false;
 	warnOnHaltNop = true;
-	optimizeLoads = true;
+	optimizeLoads = false;
 	warnOnLdOpt = true;
 	verbose = false;
 	warnings = true;
 	sym_SetExportAll(false);
 	uint32_t maxDepth = DEFAULT_MAX_DEPTH;
-	char *dependFileName = NULL;
+	char const *dependFileName = NULL;
 	size_t targetFileNameLen = 0;
 
-	int ch;
-	char *ep;
-	while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts, NULL)) != -1) {
+	// Maximum of 100 errors only applies if rgbasm is printing errors to a terminal.
+	if (isatty(STDERR_FILENO))
+		maxErrors = 100;
+
+	for (int ch; (ch = musl_getopt_long_only(argc, argv, optstring, longopts, NULL)) != -1;) {
 		switch (ch) {
+			char *endptr;
+
 		case 'b':
 			if (strlen(musl_optarg) == 2)
 				opt_B(musl_optarg);
@@ -210,32 +212,39 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'H':
-			if (!haltnop)
+			if (warnOnHaltNop)
+				warning(WARNING_OBSOLETE,
+					"Automatic `nop` after `halt` is deprecated\n");
+			else
 				errx("`-H` and `-h` don't make sense together");
+			haltNop = true;
 			warnOnHaltNop = false;
 			break;
 		case 'h':
-			if (!warnOnHaltNop)
+			if (haltNop)
 				errx("`-H` and `-h` don't make sense together");
-			haltnop = false;
 			break;
 
 		// `-i` was the only short option for `--include` until `-I` was
 		// introduced to better match the `-I dir` option of gcc and clang.
-		// `-i` is now undocumented but still supported for now.
-		case 'I':
 		case 'i':
+			warning(WARNING_OBSOLETE, "`-i` is deprecated; use `-I`\n");
+			// fallthrough
+		case 'I':
 			fstk_AddIncludePath(musl_optarg);
 			break;
 
 		case 'L':
-			if (!warnOnLdOpt)
+			if (optimizeLoads)
 				errx("`-L` and `-l` don't make sense together");
-			optimizeLoads = false;
 			break;
 		case 'l':
-			if (!optimizeLoads)
+			if (warnOnLdOpt)
+				warning(WARNING_OBSOLETE,
+					"Automatic `ld` to `ldh` optimization is deprecated\n");
+			else
 				errx("`-L` and `-l` don't make sense together");
+			optimizeLoads = true;
 			warnOnLdOpt = false;
 			break;
 
@@ -263,9 +272,9 @@ int main(int argc, char *argv[])
 
 			unsigned long padByte;
 		case 'p':
-			padByte = strtoul(musl_optarg, &ep, 0);
+			padByte = strtoul(musl_optarg, &endptr, 0);
 
-			if (musl_optarg[0] == '\0' || *ep != '\0')
+			if (musl_optarg[0] == '\0' || *endptr != '\0')
 				errx("Invalid argument for option 'p'");
 
 			if (padByte > 0xFF)
@@ -280,9 +289,9 @@ int main(int argc, char *argv[])
 			precisionArg = musl_optarg;
 			if (precisionArg[0] == '.')
 				precisionArg++;
-			precision = strtoul(precisionArg, &ep, 0);
+			precision = strtoul(precisionArg, &endptr, 0);
 
-			if (musl_optarg[0] == '\0' || *ep != '\0')
+			if (musl_optarg[0] == '\0' || *endptr != '\0')
 				errx("Invalid argument for option 'Q'");
 
 			if (precision < 1 || precision > 31)
@@ -292,9 +301,9 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'r':
-			maxDepth = strtoul(musl_optarg, &ep, 0);
+			maxDepth = strtoul(musl_optarg, &endptr, 0);
 
-			if (musl_optarg[0] == '\0' || *ep != '\0')
+			if (musl_optarg[0] == '\0' || *endptr != '\0')
 				errx("Invalid argument for option 'r'");
 			break;
 
@@ -314,6 +323,19 @@ int main(int argc, char *argv[])
 			warnings = false;
 			break;
 
+			unsigned int maxValue;
+		case 'X':
+			maxValue = strtoul(musl_optarg, &endptr, 0);
+
+			if (musl_optarg[0] == '\0' || *endptr != '\0')
+				errx("Invalid argument for option 'X'");
+
+			if (maxValue > UINT_MAX)
+				errx("Argument for option 'X' must be between 0 and %u", UINT_MAX);
+
+			maxErrors = maxValue;
+			break;
+
 		// Long-only options
 		case 0:
 			switch (depType) {
@@ -333,7 +355,7 @@ int main(int argc, char *argv[])
 					newTarget = make_escape(newTarget);
 				size_t newTargetLen = strlen(newTarget) + 1; // Plus the space
 
-				targetFileName = realloc(targetFileName,
+				targetFileName = (char *)realloc(targetFileName,
 							 targetFileNameLen + newTargetLen + 1);
 				if (targetFileName == NULL)
 					err("Cannot append new file to target file list");
@@ -348,8 +370,9 @@ int main(int argc, char *argv[])
 
 		// Unrecognized options
 		default:
-			print_usage();
-			// NOTREACHED
+			fprintf(stderr, "FATAL: unknown option '%c'\n", ch);
+			printUsage();
+			exit(1);
 		}
 	}
 
@@ -360,10 +383,12 @@ int main(int argc, char *argv[])
 
 	if (argc == musl_optind) {
 		fputs("FATAL: Please specify an input file (pass `-` to read from standard input)\n", stderr);
-		print_usage();
+		printUsage();
+		exit(1);
 	} else if (argc != musl_optind + 1) {
 		fputs("FATAL: More than one input file specified\n", stderr);
-		print_usage();
+		printUsage();
+		exit(1);
 	}
 
 	char const *mainFileName = argv[musl_optind];
@@ -394,8 +419,7 @@ int main(int argc, char *argv[])
 	sect_CheckUnionClosed();
 
 	if (nbErrors != 0)
-		errx("Assembly aborted (%u error%s)!", nbErrors,
-			nbErrors == 1 ? "" : "s");
+		errx("Assembly aborted (%u error%s)!", nbErrors, nbErrors == 1 ? "" : "s");
 
 	// If parse aborted due to missing an include, and `-MG` was given, exit normally
 	if (failedOnMissingInclude)

src/asm/opt.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <ctype.h>
 #include <errno.h>
@@ -14,26 +8,27 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/fixpoint.h"
-#include "asm/fstack.h"
-#include "asm/lexer.h"
-#include "asm/main.h"
-#include "asm/section.h"
-#include "asm/warning.h"
+#include "asm/fixpoint.hpp"
+#include "asm/fstack.hpp"
+#include "asm/lexer.hpp"
+#include "asm/main.hpp"
+#include "asm/section.hpp"
+#include "asm/warning.hpp"
+
+static constexpr size_t numWarningStates = sizeof(warningStates);
 
 struct OptStackEntry {
 	char binary[2];
 	char gbgfx[4];
 	uint8_t fixPrecision;
 	uint8_t fillByte;
-	bool haltnop;
+	bool haltNop;
 	bool warnOnHaltNop;
 	bool optimizeLoads;
 	bool warnOnLdOpt;
 	bool warningsAreErrors;
 	size_t maxRecursionDepth;
-	// Don't be confused: we use the size of the **global variable** `warningStates`!
-	enum WarningState warningStates[sizeof(warningStates)];
+	enum WarningState warningStates[numWarningStates];
 	struct OptStackEntry *next;
 };
 
@@ -72,7 +67,7 @@ void opt_H(bool warn)
 
 void opt_h(bool halt)
 {
-	haltnop = halt;
+	haltNop = halt;
 }
 
 void opt_L(bool optimize)
@@ -247,12 +242,12 @@ void opt_Parse(char *s)
 
 void opt_Push(void)
 {
-	struct OptStackEntry *entry = malloc(sizeof(*entry));
+	struct OptStackEntry *entry = (struct OptStackEntry *)malloc(sizeof(*entry));
 
 	if (entry == NULL)
 		fatalerror("Failed to alloc option stack entry: %s\n", strerror(errno));
 
-	// Both of these pulled from lexer.h
+	// Both of these pulled from lexer.hpp
 	entry->binary[0] = binDigits[0];
 	entry->binary[1] = binDigits[1];
 
@@ -261,19 +256,21 @@ void opt_Push(void)
 	entry->gbgfx[2] = gfxDigits[2];
 	entry->gbgfx[3] = gfxDigits[3];
 
-	entry->fixPrecision = fixPrecision; // Pulled from fixpoint.h
+	entry->fixPrecision = fixPrecision; // Pulled from fixpoint.hpp
 
-	entry->fillByte = fillByte; // Pulled from section.h
+	entry->fillByte = fillByte; // Pulled from section.hpp
 
-	entry->haltnop = haltnop; // Pulled from main.h
+	entry->haltNop = haltNop; // Pulled from main.hpp
 	entry->warnOnHaltNop = warnOnHaltNop;
 
-	entry->optimizeLoads = optimizeLoads; // Pulled from main.h
+	entry->optimizeLoads = optimizeLoads; // Pulled from main.hpp
 	entry->warnOnLdOpt = warnOnLdOpt;
 
-	// Both of these pulled from warning.h
+	// Both of these pulled from warning.hpp
 	entry->warningsAreErrors = warningsAreErrors;
-	memcpy(entry->warningStates, warningStates, sizeof(warningStates));
+	memcpy(entry->warningStates, warningStates, numWarningStates);
+
+	entry->maxRecursionDepth = maxRecursionDepth; // Pulled from fstack.h
 
 	entry->next = stack;
 	stack = entry;
@@ -293,13 +290,14 @@ void opt_Pop(void)
 	opt_P(entry->fillByte);
 	opt_Q(entry->fixPrecision);
 	opt_H(entry->warnOnHaltNop);
-	opt_h(entry->haltnop);
+	opt_h(entry->haltNop);
 	opt_L(entry->optimizeLoads);
 	opt_l(entry->warnOnLdOpt);
+	opt_R(entry->maxRecursionDepth);
 
 	// opt_W does not apply a whole warning state; it processes one flag string
 	warningsAreErrors = entry->warningsAreErrors;
-	memcpy(warningStates, entry->warningStates, sizeof(warningStates));
+	memcpy(warningStates, entry->warningStates, numWarningStates);
 
 	stack = entry->next;
 	free(entry);

src/asm/output.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Outputs an objectfile
 
@@ -16,18 +10,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/charmap.h"
-#include "asm/fstack.h"
-#include "asm/main.h"
-#include "asm/output.h"
-#include "asm/rpn.h"
-#include "asm/section.h"
-#include "asm/symbol.h"
-#include "asm/warning.h"
+#include "asm/charmap.hpp"
+#include "asm/fstack.hpp"
+#include "asm/main.hpp"
+#include "asm/output.hpp"
+#include "asm/rpn.hpp"
+#include "asm/section.hpp"
+#include "asm/symbol.hpp"
+#include "asm/warning.hpp"
 
-#include "error.h"
-#include "linkdefs.h"
-#include "platform.h" // strdup
+#include "error.hpp"
+#include "linkdefs.hpp"
+#include "platform.hpp" // strdup
 
 struct Patch {
 	struct FileStackNode const *src;
@@ -136,9 +130,8 @@ void out_RegisterNode(struct FileStackNode *node)
 	}
 }
 
-void out_ReplaceNode(struct FileStackNode *node)
+void out_ReplaceNode(struct FileStackNode * /* node */)
 {
-	(void)node;
 #if 0
 This is code intended to replace a node, which is pretty useless until ref counting is added...
 
@@ -372,14 +365,14 @@ static void writerpn(uint8_t *rpnexpr, uint32_t *rpnptr, uint8_t *rpn,
 // WARNING: all patches are assumed to eventually be written, so the file stack node is registered
 static struct Patch *allocpatch(uint32_t type, struct Expression const *expr, uint32_t ofs)
 {
-	struct Patch *patch = malloc(sizeof(struct Patch));
-	uint32_t rpnSize = expr->isKnown ? 5 : expr->rpnPatchSize;
+	struct Patch *patch = (struct Patch *)malloc(sizeof(*patch));
+	uint32_t rpnSize = rpn_isKnown(expr) ? 5 : expr->rpnPatchSize;
 	struct FileStackNode *node = fstk_GetFileStack();
 
 	if (!patch)
 		fatalerror("No memory for patch: %s\n", strerror(errno));
 
-	patch->rpn = malloc(sizeof(*patch->rpn) * rpnSize);
+	patch->rpn = (uint8_t *)malloc(sizeof(*patch->rpn) * rpnSize);
 	if (!patch->rpn)
 		fatalerror("No memory for patch's RPN rpnSize: %s\n", strerror(errno));
 
@@ -392,7 +385,7 @@ static struct Patch *allocpatch(uint32_t type, struct Expression const *expr, ui
 	patch->pcOffset = sect_GetSymbolOffset();
 
 	// If the rpnSize's value is known, output a constant RPN rpnSize directly
-	if (expr->isKnown) {
+	if (rpn_isKnown(expr)) {
 		patch->rpnSize = rpnSize;
 		// Make sure to update `rpnSize` above if modifying this!
 		patch->rpn[0] = RPN_CONST;
@@ -427,7 +420,7 @@ void out_CreatePatch(uint32_t type, struct Expression const *expr, uint32_t ofs,
 bool out_CreateAssert(enum AssertionType type, struct Expression const *expr,
 		      char const *message, uint32_t ofs)
 {
-	struct Assertion *assertion = malloc(sizeof(*assertion));
+	struct Assertion *assertion = (struct Assertion *)malloc(sizeof(*assertion));
 
 	if (!assertion)
 		return false;
@@ -475,10 +468,8 @@ static void writeFileStackNode(struct FileStackNode const *node, FILE *f)
 	}
 }
 
-static void registerUnregisteredSymbol(struct Symbol *symbol, void *arg)
+static void registerUnregisteredSymbol(struct Symbol *symbol, void *)
 {
-	(void)arg; // sym_ForEach requires a void* parameter, but we are not using it.
-
 	// Check for symbol->src, to skip any built-in symbol from rgbasm
 	if (symbol->src && symbol->ID == (uint32_t)-1) {
 		registerSymbol(symbol);

src/asm/parser.y

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2019, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 %{
 #include <ctype.h>
@@ -16,25 +10,25 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/charmap.h"
-#include "asm/fixpoint.h"
-#include "asm/format.h"
-#include "asm/fstack.h"
-#include "asm/lexer.h"
-#include "asm/macro.h"
-#include "asm/main.h"
-#include "asm/opt.h"
-#include "asm/output.h"
-#include "asm/rpn.h"
-#include "asm/section.h"
-#include "asm/symbol.h"
-#include "asm/util.h"
-#include "asm/warning.h"
+#include "asm/charmap.hpp"
+#include "asm/fixpoint.hpp"
+#include "asm/format.hpp"
+#include "asm/fstack.hpp"
+#include "asm/lexer.hpp"
+#include "asm/macro.hpp"
+#include "asm/main.hpp"
+#include "asm/opt.hpp"
+#include "asm/output.hpp"
+#include "asm/rpn.hpp"
+#include "asm/section.hpp"
+#include "asm/symbol.hpp"
+#include "util.hpp"
+#include "asm/warning.hpp"
 
-#include "extern/utf8decoder.h"
+#include "extern/utf8decoder.hpp"
 
-#include "linkdefs.h"
-#include "platform.h" // strncasecmp, strdup
+#include "linkdefs.hpp"
+#include "platform.hpp" // strncasecmp, strdup
 
 static struct CaptureBody captureBody; // Captures a REPT/FOR or MACRO
 
@@ -263,7 +257,7 @@ static void initStrFmtArgList(struct StrFmtArgList *args)
 {
 	args->nbArgs = 0;
 	args->capacity = INITIAL_STRFMT_ARG_SIZE;
-	args->args = malloc(args->capacity * sizeof(*args->args));
+	args->args = (struct StrFmtArg *)malloc(args->capacity * sizeof(*args->args));
 	if (!args->args)
 		fatalerror("Failed to allocate memory for STRFMT arg list: %s\n",
 			   strerror(errno));
@@ -273,7 +267,7 @@ static size_t nextStrFmtArgListIndex(struct StrFmtArgList *args)
 {
 	if (args->nbArgs == args->capacity) {
 		args->capacity = (args->capacity + 1) * 2;
-		args->args = realloc(args->args, args->capacity * sizeof(*args->args));
+		args->args = (struct StrFmtArg *)realloc(args->args, args->capacity * sizeof(*args->args));
 		if (!args->args)
 			fatalerror("realloc error while resizing STRFMT arg list: %s\n",
 				   strerror(errno));
@@ -375,7 +369,7 @@ static void initDsArgList(struct DsArgList *args)
 {
 	args->nbArgs = 0;
 	args->capacity = INITIAL_DS_ARG_SIZE;
-	args->args = malloc(args->capacity * sizeof(*args->args));
+	args->args = (struct Expression *)malloc(args->capacity * sizeof(*args->args));
 	if (!args->args)
 		fatalerror("Failed to allocate memory for ds arg list: %s\n",
 			   strerror(errno));
@@ -385,7 +379,7 @@ static void appendDsArgList(struct DsArgList *args, const struct Expression *exp
 {
 	if (args->nbArgs == args->capacity) {
 		args->capacity = (args->capacity + 1) * 2;
-		args->args = realloc(args->args, args->capacity * sizeof(*args->args));
+		args->args = (struct Expression *)realloc(args->args, args->capacity * sizeof(*args->args));
 		if (!args->args)
 			fatalerror("realloc error while resizing ds arg list: %s\n",
 				   strerror(errno));
@@ -398,6 +392,35 @@ static void freeDsArgList(struct DsArgList *args)
 	free(args->args);
 }
 
+static void initPurgeArgList(struct PurgeArgList *args)
+{
+	args->nbArgs = 0;
+	args->capacity = INITIAL_PURGE_ARG_SIZE;
+	args->args = (char **)malloc(args->capacity * sizeof(*args->args));
+	if (!args->args)
+		fatalerror("Failed to allocate memory for purge arg list: %s\n",
+			   strerror(errno));
+}
+
+static void appendPurgeArgList(struct PurgeArgList *args, char *arg)
+{
+	if (args->nbArgs == args->capacity) {
+		args->capacity = (args->capacity + 1) * 2;
+		args->args = (char **)realloc(args->args, args->capacity * sizeof(*args->args));
+		if (!args->args)
+			fatalerror("realloc error while resizing purge arg list: %s\n",
+				   strerror(errno));
+	}
+	args->args[args->nbArgs++] = arg;
+}
+
+static void freePurgeArgList(struct PurgeArgList *args)
+{
+	for (size_t i = 0; i < args->nbArgs; i++)
+		free(args->args[i]);
+	free(args->args);
+}
+
 static void failAssert(enum AssertionType type)
 {
 	switch (type) {
@@ -480,7 +503,9 @@ enum {
 	struct SectionSpec sectSpec;
 	struct MacroArgs *macroArg;
 	enum AssertionType assertType;
+	struct AlignmentSpec alignSpec;
 	struct DsArgList dsArgs;
+	struct PurgeArgList purgeArgs;
 	struct {
 		int32_t start;
 		int32_t stop;
@@ -518,7 +543,7 @@ enum {
 
 %token	T_PERIOD "."
 %token	T_COMMA ","
-%token	T_COLON ":"
+%token	T_COLON ":" T_DOUBLE_COLON "::"
 %token	T_LBRACK "[" T_RBRACK "]"
 %token	T_LPAREN "(" T_RPAREN ")"
 %token	T_NEWLINE "newline"
@@ -576,6 +601,7 @@ enum {
 
 %token	T_OP_CHARLEN "CHARLEN"
 %token	T_OP_CHARSUB "CHARSUB"
+%token	T_OP_INCHARMAP "INCHARMAP"
 
 %token	<symName> T_LABEL "label"
 %token	<symName> T_ID "identifier"
@@ -601,6 +627,7 @@ enum {
 %token	T_POP_EXPORT "EXPORT"
 %token	T_POP_DB "DB" T_POP_DS "DS" T_POP_DW "DW" T_POP_DL "DL"
 %token	T_POP_SECTION "SECTION" T_POP_FRAGMENT "FRAGMENT"
+%token	T_POP_ENDSECTION "ENDSECTION"
 %token	T_POP_RB "RB" T_POP_RW "RW" // There is no T_POP_RL, only T_Z80_RL
 %token	T_POP_MACRO "MACRO"
 %token	T_POP_ENDM "ENDM"
@@ -634,8 +661,10 @@ enum {
 %type	<sectMod> sectmod
 %type	<macroArg> macroargs
 
-%type	<dsArgs> ds_args
+%type	<alignSpec> align_spec
 
+%type	<dsArgs> ds_args
+%type	<purgeArgs> purge_args
 %type	<forArgs> for_args
 
 %token	T_Z80_ADC "adc" T_Z80_ADD "add" T_Z80_AND "and"
@@ -789,7 +818,7 @@ else		: T_POP_ELSE T_NEWLINE {
 ;
 
 plain_directive	: label
-		| label cpu_command
+		| label cpu_commands
 		| label macro
 		| label directive
 		| assignment_directive
@@ -816,7 +845,9 @@ redef_id	: T_POP_REDEF {
 		}
 ;
 
-scoped_id	: T_ID | T_LOCAL_ID;
+// T_LABEL covers identifiers followed by a double colon (e.g. `call Function::ret`,
+// to be read as `call Function :: ret`). This should not conflict with anything.
+scoped_id	: T_ID | T_LOCAL_ID | T_LABEL;
 scoped_anon_id	: scoped_id | T_ANON;
 
 label		: %empty
@@ -832,11 +863,11 @@ label		: %empty
 		| T_LABEL T_COLON {
 			sym_AddLabel($1);
 		}
-		| T_LOCAL_ID T_COLON T_COLON {
+		| T_LOCAL_ID T_DOUBLE_COLON {
 			sym_AddLocalLabel($1);
 			sym_Export($1);
 		}
-		| T_LABEL T_COLON T_COLON {
+		| T_LABEL T_DOUBLE_COLON {
 			sym_AddLabel($1);
 			sym_Export($1);
 		}
@@ -903,6 +934,7 @@ directive	: endc
 		| purge
 		| pops
 		| pushs
+		| endsection
 		| popo
 		| pusho
 		| opt
@@ -924,48 +956,90 @@ compoundeq	: T_POP_ADDEQ { $$ = RPN_ADD; }
 		| T_POP_SHREQ { $$ = RPN_SHR; }
 ;
 
-equ		: T_LABEL T_POP_EQU const { sym_AddEqu($1, $3); }
+equ		: T_LABEL T_POP_EQU const {
+			warning(WARNING_OBSOLETE, "`%s EQU` is deprecated; use `DEF %s EQU`\n", $1, $1);
+			sym_AddEqu($1, $3);
+		}
 ;
 
-assignment	: T_LABEL T_POP_EQUAL const { sym_AddVar($1, $3); }
-		| T_LABEL compoundeq const { compoundAssignment($1, $2, $3); }
+assignment	: T_LABEL T_POP_EQUAL const {
+			warning(WARNING_OBSOLETE, "`%s =` is deprecated; use `DEF %s =`\n", $1, $1);
+			sym_AddVar($1, $3);
+		}
+		| T_LABEL compoundeq const {
+			const char *compoundEqOperator = NULL;
+			switch ($2) {
+				case RPN_ADD: compoundEqOperator = "+="; break;
+				case RPN_SUB: compoundEqOperator = "-="; break;
+				case RPN_MUL: compoundEqOperator = "*="; break;
+				case RPN_DIV: compoundEqOperator = "/="; break;
+				case RPN_MOD: compoundEqOperator = "%="; break;
+				case RPN_XOR: compoundEqOperator = "^="; break;
+				case RPN_OR:  compoundEqOperator = "|="; break;
+				case RPN_AND: compoundEqOperator = "&="; break;
+				case RPN_SHL: compoundEqOperator = "<<="; break;
+				case RPN_SHR: compoundEqOperator = ">>="; break;
+				default: break;
+			}
+
+			warning(WARNING_OBSOLETE, "`%s %s` is deprecated; use `DEF %s %s`\n",
+				$1, compoundEqOperator, $1, compoundEqOperator);
+			compoundAssignment($1, $2, $3);
+		}
 ;
 
-equs		: T_LABEL T_POP_EQUS string { sym_AddString($1, $3); }
+equs		: T_LABEL T_POP_EQUS string {
+			warning(WARNING_OBSOLETE, "`%s EQUS` is deprecated; use `DEF %s EQUS`\n", $1, $1);
+			sym_AddString($1, $3);
+		}
 ;
 
 rb		: T_LABEL T_POP_RB rs_uconst {
+			warning(WARNING_OBSOLETE, "`%s RB` is deprecated; use `DEF %s RB`\n", $1, $1);
 			sym_AddEqu($1, sym_GetConstantValue("_RS"));
 			sym_AddVar("_RS", sym_GetConstantValue("_RS") + $3);
 		}
 ;
 
 rw		: T_LABEL T_POP_RW rs_uconst {
+			warning(WARNING_OBSOLETE, "`%s RW` is deprecated; use `DEF %s RW`\n", $1, $1);
 			sym_AddEqu($1, sym_GetConstantValue("_RS"));
 			sym_AddVar("_RS", sym_GetConstantValue("_RS") + 2 * $3);
 		}
 ;
 
 rl		: T_LABEL T_Z80_RL rs_uconst {
+			warning(WARNING_OBSOLETE, "`%s RL` is deprecated; use `DEF %s RL`\n", $1, $1);
 			sym_AddEqu($1, sym_GetConstantValue("_RS"));
 			sym_AddVar("_RS", sym_GetConstantValue("_RS") + 4 * $3);
 		}
 ;
 
-align		: T_OP_ALIGN uconst {
-			if ($2 > 16)
-				error("Alignment must be between 0 and 16, not %u\n", $2);
-			else
-				sect_AlignPC($2, 0);
+align		: T_OP_ALIGN align_spec { sect_AlignPC($2.alignment, $2.alignOfs); }
+;
+
+align_spec	: uconst {
+			if ($1 > 16) {
+				error("Alignment must be between 0 and 16, not %u\n", $1);
+				$$.alignment = $$.alignOfs = 0;
+			} else {
+				$$.alignment = $1;
+				$$.alignOfs = 0;
+			}
+		}
+		| uconst T_COMMA const {
+			if ($1 > 16) {
+				error("Alignment must be between 0 and 16, not %u\n", $1);
+				$$.alignment = $$.alignOfs = 0;
+			} else if ($3 <= -(1 << $1) || $3 >= 1 << $1) {
+				error("The absolute alignment offset (%" PRIu32
+				      ") must be less than alignment size (%d)\n",
+				      (uint32_t)($3 < 0 ? -$3 : $3), 1 << $1);
+				$$.alignment = $$.alignOfs = 0;
+			} else {
+				$$.alignment = $1;
+				$$.alignOfs = $3 < 0 ? (1 << $1) + $3 : $3;
 			}
-		| T_OP_ALIGN uconst T_COMMA uconst {
-			if ($2 > 16)
-				error("Alignment must be between 0 and 16, not %u\n", $2);
-			else if ($4 >= 1 << $2)
-				error("Offset must be between 0 and %u, not %u\n",
-					(1 << $2) - 1, $4);
-			else
-				sect_AlignPC($2, $4);
 		}
 ;
 
@@ -994,6 +1068,9 @@ pops		: T_POP_POPS { sect_PopSection(); }
 pushs		: T_POP_PUSHS { sect_PushSection(); }
 ;
 
+endsection	: T_POP_ENDSECTION { sect_EndSection(); }
+;
+
 fail		: T_POP_FAIL string { fatalerror("%s\n", $2); }
 ;
 
@@ -1043,7 +1120,7 @@ shift		: T_POP_SHIFT { macro_ShiftCurrentArgs(1); }
 ;
 
 load		: T_POP_LOAD sectmod string T_COMMA sectiontype sectorg sectattrs {
-			sect_SetLoadSection($3, $5, $6, &$7, $2);
+			sect_SetLoadSection($3, (enum SectionType)$5, $6, &$7, $2);
 		}
 		| T_POP_ENDL { sect_EndLoadSection(); }
 ;
@@ -1103,14 +1180,6 @@ macrodef	: T_POP_MACRO {
 				sym_AddMacro($3, captureBody.lineNo, captureBody.body,
 					     captureBody.size);
 		}
-		| T_LABEL T_COLON T_POP_MACRO T_NEWLINE {
-			warning(WARNING_OBSOLETE, "`%s: MACRO` is deprecated; use `MACRO %s`\n", $1, $1);
-			$<captureTerminated>$ = lexer_CaptureMacroBody(&captureBody);
-		} endofline {
-			if ($<captureTerminated>5)
-				sym_AddMacro($1, captureBody.lineNo, captureBody.body,
-					     captureBody.size);
-		}
 ;
 
 rsset		: T_POP_RSSET uconst { sym_AddVar("_RS", $2); }
@@ -1137,6 +1206,19 @@ ds		: T_POP_DS uconst { sect_Skip($2, true); }
 			sect_RelBytes($2, $4.args, $4.nbArgs);
 			freeDsArgList(&$4);
 		}
+		| T_POP_DS T_OP_ALIGN T_LBRACK align_spec T_RBRACK trailing_comma {
+			uint32_t n = sect_GetAlignBytes($4.alignment, $4.alignOfs);
+
+			sect_Skip(n, true);
+			sect_AlignPC($4.alignment, $4.alignOfs);
+		}
+		| T_POP_DS T_OP_ALIGN T_LBRACK align_spec T_RBRACK T_COMMA ds_args trailing_comma {
+			uint32_t n = sect_GetAlignBytes($4.alignment, $4.alignOfs);
+
+			sect_RelBytes(n, $7.args, $7.nbArgs);
+			sect_AlignPC($4.alignment, $4.alignOfs);
+			freeDsArgList(&$7);
+		}
 ;
 
 ds_args		: reloc_8bit {
@@ -1199,16 +1281,22 @@ redef_equs	: redef_id T_POP_EQUS string { sym_RedefString($1, $3); }
 
 purge		: T_POP_PURGE {
 			lexer_ToggleStringExpansion(false);
-		} purge_list trailing_comma {
+		} purge_args trailing_comma {
+			for (uint32_t i = 0; i < $3.nbArgs; i++)
+				sym_Purge($3.args[i]);
+			freePurgeArgList(&$3);
 			lexer_ToggleStringExpansion(true);
 		}
 ;
 
-purge_list	: purge_list_entry
-		| purge_list T_COMMA purge_list_entry
-;
-
-purge_list_entry : scoped_id { sym_Purge($1); }
+purge_args	: scoped_id {
+			initPurgeArgList(&$$);
+			appendPurgeArgList(&$$, strdup($1));
+		}
+		| purge_args T_COMMA scoped_id {
+			appendPurgeArgList(&$1, strdup($3));
+			$$ = $1;
+		}
 ;
 
 export		: T_POP_EXPORT export_list trailing_comma
@@ -1304,7 +1392,7 @@ constlist_8bit_entry : reloc_8bit_no_str {
 			sect_RelByte(&$1, 0);
 		}
 		| string {
-			uint8_t *output = malloc(strlen($1)); // Cannot be larger than that
+			uint8_t *output = (uint8_t *)malloc(strlen($1)); // Cannot be larger than that
 			size_t length = charmap_Convert($1, output);
 
 			sect_AbsByteGroup(output, length);
@@ -1320,7 +1408,7 @@ constlist_16bit_entry : reloc_16bit_no_str {
 			sect_RelWord(&$1, 0);
 		}
 		| string {
-			uint8_t *output = malloc(strlen($1)); // Cannot be larger than that
+			uint8_t *output = (uint8_t *)malloc(strlen($1)); // Cannot be larger than that
 			size_t length = charmap_Convert($1, output);
 
 			sect_AbsWordGroup(output, length);
@@ -1337,7 +1425,7 @@ constlist_32bit_entry : relocexpr_no_str {
 		}
 		| string {
 			// Charmaps cannot increase the length of a string
-			uint8_t *output = malloc(strlen($1));
+			uint8_t *output = (uint8_t *)malloc(strlen($1));
 			size_t length = charmap_Convert($1, output);
 
 			sect_AbsLongGroup(output, length);
@@ -1362,7 +1450,7 @@ reloc_8bit_offset : T_OP_ADD relocexpr {
 			$$ = $2;
 		}
 		| T_OP_SUB relocexpr {
-			rpn_UNNEG(&$$, &$2);
+			rpn_NEG(&$$, &$2);
 			rpn_CheckNBit(&$$, 8);
 		}
 ;
@@ -1383,7 +1471,7 @@ reloc_16bit_no_str : relocexpr_no_str {
 relocexpr	: relocexpr_no_str
 		| string {
 			// Charmaps cannot increase the length of a string
-			uint8_t *output = malloc(strlen($1));
+			uint8_t *output = (uint8_t *)malloc(strlen($1));
 			uint32_t length = charmap_Convert($1, output);
 			uint32_t r = str2int2(output, length);
 
@@ -1458,8 +1546,8 @@ relocexpr_no_str : scoped_anon_id { rpn_Symbol(&$$, $1); }
 			rpn_BinaryOp(RPN_EXP, &$$, &$1, &$3);
 		}
 		| T_OP_ADD relocexpr %prec NEG { $$ = $2; }
-		| T_OP_SUB relocexpr %prec NEG { rpn_UNNEG(&$$, &$2); }
-		| T_OP_NOT relocexpr %prec NEG { rpn_UNNOT(&$$, &$2); }
+		| T_OP_SUB relocexpr %prec NEG { rpn_NEG(&$$, &$2); }
+		| T_OP_NOT relocexpr %prec NEG { rpn_NOT(&$$, &$2); }
 		| T_OP_HIGH T_LPAREN relocexpr T_RPAREN { rpn_HIGH(&$$, &$3); }
 		| T_OP_LOW T_LPAREN relocexpr T_RPAREN { rpn_LOW(&$$, &$3); }
 		| T_OP_ISCONST T_LPAREN relocexpr T_RPAREN { rpn_ISCONST(&$$, &$3); }
@@ -1470,6 +1558,12 @@ relocexpr_no_str : scoped_anon_id { rpn_Symbol(&$$, $1); }
 		| T_OP_BANK T_LPAREN string T_RPAREN { rpn_BankSection(&$$, $3); }
 		| T_OP_SIZEOF T_LPAREN string T_RPAREN { rpn_SizeOfSection(&$$, $3); }
 		| T_OP_STARTOF T_LPAREN string T_RPAREN { rpn_StartOfSection(&$$, $3); }
+		| T_OP_SIZEOF T_LPAREN sectiontype T_RPAREN {
+			rpn_SizeOfSectionType(&$$, (enum SectionType)$3);
+		}
+		| T_OP_STARTOF T_LPAREN sectiontype T_RPAREN {
+			rpn_StartOfSectionType(&$$, (enum SectionType)$3);
+		}
 		| T_OP_DEF {
 			lexer_ToggleStringExpansion(false);
 		} T_LPAREN scoped_anon_id T_RPAREN {
@@ -1541,6 +1635,9 @@ relocexpr_no_str : scoped_anon_id { rpn_Symbol(&$$, $1); }
 		| T_OP_CHARLEN T_LPAREN string T_RPAREN {
 			rpn_Number(&$$, charlenUTF8($3));
 		}
+		| T_OP_INCHARMAP T_LPAREN string T_RPAREN {
+			rpn_Number(&$$, charmap_HasChar($3));
+		}
 		| T_LPAREN relocexpr T_RPAREN { $$ = $2; }
 ;
 
@@ -1664,7 +1761,7 @@ strfmt_va_args	: %empty {
 ;
 
 section		: T_POP_SECTION sectmod string T_COMMA sectiontype sectorg sectattrs {
-			sect_NewSection($3, $5, $6, &$7, $2);
+			sect_NewSection($3, (enum SectionType)$5, $6, &$7, $2);
 		}
 ;
 
@@ -1699,12 +1796,9 @@ sectattrs	: %empty {
 			$$.alignOfs = 0;
 			$$.bank = -1;
 		}
-		| sectattrs T_COMMA T_OP_ALIGN T_LBRACK uconst T_RBRACK {
-			$$.alignment = $5;
-		}
-		| sectattrs T_COMMA T_OP_ALIGN T_LBRACK uconst T_COMMA uconst T_RBRACK {
-			$$.alignment = $5;
-			$$.alignOfs = $7;
+		| sectattrs T_COMMA T_OP_ALIGN T_LBRACK align_spec T_RBRACK {
+			$$.alignment = $5.alignment;
+			$$.alignOfs = $5.alignOfs;
 		}
 		| sectattrs T_COMMA T_OP_BANK T_LBRACK uconst T_RBRACK {
 			// We cannot check the validity of this now
@@ -1712,6 +1806,9 @@ sectattrs	: %empty {
 		}
 ;
 
+cpu_commands	: cpu_command
+		| cpu_command T_DOUBLE_COLON cpu_commands
+;
 
 cpu_command	: z80_adc
 		| z80_add
@@ -1832,10 +1929,11 @@ z80_ei		: T_Z80_EI { sect_AbsByte(0xFB); }
 
 z80_halt	: T_Z80_HALT {
 			sect_AbsByte(0x76);
-			if (haltnop) {
+			if (haltNop) {
 				if (warnOnHaltNop) {
 					warnOnHaltNop = false;
-					warning(WARNING_OBSOLETE, "`nop` after `halt` will stop being the default; pass `-H` to opt into it\n");
+					warning(WARNING_OBSOLETE,
+						"Automatic `nop` after `halt` is deprecated\n");
 				}
 				sect_AbsByte(0x00);
 			}
@@ -1907,7 +2005,7 @@ z80_ldio	: T_Z80_LDH T_MODE_A T_COMMA op_mem_ind {
 
 c_ind		: T_LBRACK T_MODE_C T_RBRACK
 		| T_LBRACK relocexpr T_OP_ADD T_MODE_C T_RBRACK {
-			if (!rpn_isKnown(&$2) || $2.val != 0xff00)
+			if (!rpn_isKnown(&$2) || $2.val != 0xFF00)
 				error("Expected constant expression equal to $FF00 for \"$ff00+c\"\n");
 		}
 ;
@@ -1948,7 +2046,8 @@ z80_ld_mem	: T_Z80_LD op_mem_ind T_COMMA T_MODE_SP {
 			 && $2.val >= 0xFF00) {
 				if (warnOnLdOpt) {
 					warnOnLdOpt = false;
-					warning(WARNING_OBSOLETE, "ld optimization will stop being the default; pass `-l` to opt into it\n");
+					warning(WARNING_OBSOLETE,
+						"Automatic `ld` to `ldh` optimization is deprecated\n");
 				}
 				sect_AbsByte(0xE0);
 				sect_AbsByte($2.val & 0xFF);
@@ -2000,7 +2099,8 @@ z80_ld_a	: T_Z80_LD reg_r T_COMMA c_ind {
 				 && $4.val >= 0xFF00) {
 					if (warnOnLdOpt) {
 						warnOnLdOpt = false;
-						warning(WARNING_OBSOLETE, "ld optimization will stop being the default; pass `-l` to opt into it\n");
+						warning(WARNING_OBSOLETE,
+							"Automatic `ld` to `ldh` optimization is deprecated\n");
 					}
 					sect_AbsByte(0xF0);
 					sect_AbsByte($4.val & 0xFF);

src/asm/rpn.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Controls RPN expressions for objectfiles
 
@@ -17,26 +11,26 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/main.h"
-#include "asm/output.h"
-#include "asm/rpn.h"
-#include "asm/section.h"
-#include "asm/symbol.h"
-#include "asm/warning.h"
+#include "asm/main.hpp"
+#include "asm/output.hpp"
+#include "asm/rpn.hpp"
+#include "asm/section.hpp"
+#include "asm/symbol.hpp"
+#include "asm/warning.hpp"
 
-#include "opmath.h"
+#include "opmath.hpp"
 
 // Makes an expression "not known", also setting its error message
 #define makeUnknown(expr_, ...) do { \
 	struct Expression *_expr = expr_; \
 	_expr->isKnown = false; \
 	/* If we had `asprintf` this would be great, but alas. */ \
-	_expr->reason = malloc(128); /* Use an initial reasonable size */ \
+	_expr->reason = (char *)malloc(128); /* Use an initial reasonable size */ \
 	if (!_expr->reason) \
 		fatalerror("Can't allocate err string: %s\n", strerror(errno)); \
 	int size = snprintf(_expr->reason, 128, __VA_ARGS__); \
 	if (size >= 128) { /* If this wasn't enough, try again */ \
-		_expr->reason = realloc(_expr->reason, size + 1); \
+		_expr->reason = (char *)realloc(_expr->reason, size + 1); \
 		if (!_expr->reason) \
 			fatalerror("Can't allocate err string: %s\n", strerror(errno)); \
 		sprintf(_expr->reason, __VA_ARGS__); \
@@ -61,7 +55,7 @@ static uint8_t *reserveSpace(struct Expression *expr, uint32_t size)
 			else
 				expr->rpnCapacity *= 2;
 		}
-		expr->rpn = realloc(expr->rpn, expr->rpnCapacity);
+		expr->rpn = (uint8_t *)realloc(expr->rpn, expr->rpnCapacity);
 
 		if (!expr->rpn)
 			fatalerror("Failed to grow RPN expression: %s\n", strerror(errno));
@@ -233,6 +227,30 @@ void rpn_StartOfSection(struct Expression *expr, char const *sectionName)
 	}
 }
 
+void rpn_SizeOfSectionType(struct Expression *expr, enum SectionType type)
+{
+	rpn_Init(expr);
+	makeUnknown(expr, "Section type's size is not known");
+
+	uint8_t *ptr = reserveSpace(expr, 2);
+
+	expr->rpnPatchSize += 2;
+	*ptr++ = RPN_SIZEOF_SECTTYPE;
+	*ptr++ = type;
+}
+
+void rpn_StartOfSectionType(struct Expression *expr, enum SectionType type)
+{
+	rpn_Init(expr);
+	makeUnknown(expr, "Section type's start is not known");
+
+	uint8_t *ptr = reserveSpace(expr, 2);
+
+	expr->rpnPatchSize += 2;
+	*ptr++ = RPN_STARTOF_SECTTYPE;
+	*ptr++ = type;
+}
+
 void rpn_CheckHRAM(struct Expression *expr, const struct Expression *src)
 {
 	*expr = *src;
@@ -274,7 +292,7 @@ void rpn_CheckNBit(struct Expression const *expr, uint8_t n)
 	if (rpn_isKnown(expr)) {
 		int32_t val = expr->val;
 
-		if (val <= -(1 << n) || val >= 1 << n)
+		if (val < -(1 << n) || val >= 1 << n)
 			warning(WARNING_TRUNCATION_1, "Expression must be %u-bit\n", n);
 		else if (val < -(1 << (n - 1)))
 			warning(WARNING_TRUNCATION_2, "Expression must be %u-bit\n", n);
@@ -299,7 +317,7 @@ void rpn_LOGNOT(struct Expression *expr, const struct Expression *src)
 		expr->val = !expr->val;
 	} else {
 		expr->rpnPatchSize++;
-		*reserveSpace(expr, 1) = RPN_LOGUNNOT;
+		*reserveSpace(expr, 1) = RPN_LOGNOT;
 	}
 }
 
@@ -376,8 +394,8 @@ void rpn_BinaryOp(enum RPNCommand op, struct Expression *expr,
 	int32_t constMaskVal;
 
 	// First, check if the expression is known
-	expr->isKnown = src1->isKnown && src2->isKnown;
-	if (expr->isKnown) {
+	expr->isKnown = rpn_isKnown(src1) && rpn_isKnown(src2);
+	if (rpn_isKnown(expr)) {
 		rpn_Init(expr); // Init the expression to something sane
 
 		// If both expressions are known, just compute the value
@@ -494,20 +512,19 @@ void rpn_BinaryOp(enum RPNCommand op, struct Expression *expr,
 			if (src2->val < 0)
 				fatalerror("Exponentiation by negative power\n");
 
-			if (src1->val == INT32_MIN && src2->val == -1)
-				expr->val = 0;
-			else
 			expr->val = op_exponent(src1->val, src2->val);
 			break;
 
-		case RPN_UNSUB:
-		case RPN_UNNOT:
-		case RPN_LOGUNNOT:
+		case RPN_NEG:
+		case RPN_NOT:
+		case RPN_LOGNOT:
 		case RPN_BANK_SYM:
 		case RPN_BANK_SECT:
 		case RPN_BANK_SELF:
 		case RPN_SIZEOF_SECT:
 		case RPN_STARTOF_SECT:
+		case RPN_SIZEOF_SECTTYPE:
+		case RPN_STARTOF_SECTTYPE:
 		case RPN_HRAM:
 		case RPN_RST:
 		case RPN_CONST:
@@ -528,10 +545,10 @@ void rpn_BinaryOp(enum RPNCommand op, struct Expression *expr,
 		// If it's not known, start computing the RPN expression
 
 		// Convert the left-hand expression if it's constant
-		if (src1->isKnown) {
+		if (rpn_isKnown(src1)) {
 			uint32_t lval = src1->val;
-			uint8_t bytes[] = {RPN_CONST, lval, lval >> 8,
-					   lval >> 16, lval >> 24};
+			uint8_t bytes[] = {RPN_CONST, (uint8_t)lval, (uint8_t)(lval >> 8),
+					   (uint8_t)(lval >> 16), (uint8_t)(lval >> 24)};
 			expr->rpnPatchSize = sizeof(bytes);
 			expr->rpn = NULL;
 			expr->rpnCapacity = 0;
@@ -559,9 +576,9 @@ void rpn_BinaryOp(enum RPNCommand op, struct Expression *expr,
 
 		// If the right expression is constant, merge a shim instead
 		uint32_t rval = src2->val;
-		uint8_t bytes[] = {RPN_CONST, rval, rval >> 8, rval >> 16,
-				   rval >> 24};
-		if (src2->isKnown) {
+		uint8_t bytes[] = {RPN_CONST, (uint8_t)rval, (uint8_t)(rval >> 8),
+				   (uint8_t)(rval >> 16), (uint8_t)(rval >> 24)};
+		if (rpn_isKnown(src2)) {
 			ptr = bytes;
 			len = sizeof(bytes);
 			patchSize = sizeof(bytes);
@@ -615,7 +632,7 @@ void rpn_ISCONST(struct Expression *expr, const struct Expression *src)
 	expr->isSymbol = false;
 }
 
-void rpn_UNNEG(struct Expression *expr, const struct Expression *src)
+void rpn_NEG(struct Expression *expr, const struct Expression *src)
 {
 	*expr = *src;
 	expr->isSymbol = false;
@@ -624,11 +641,11 @@ void rpn_UNNEG(struct Expression *expr, const struct Expression *src)
 		expr->val = -(uint32_t)expr->val;
 	} else {
 		expr->rpnPatchSize++;
-		*reserveSpace(expr, 1) = RPN_UNSUB;
+		*reserveSpace(expr, 1) = RPN_NEG;
 	}
 }
 
-void rpn_UNNOT(struct Expression *expr, const struct Expression *src)
+void rpn_NOT(struct Expression *expr, const struct Expression *src)
 {
 	*expr = *src;
 	expr->isSymbol = false;
@@ -637,6 +654,6 @@ void rpn_UNNOT(struct Expression *expr, const struct Expression *src)
 		expr->val = ~expr->val;
 	} else {
 		expr->rpnPatchSize++;
-		*reserveSpace(expr, 1) = RPN_UNNOT;
+		*reserveSpace(expr, 1) = RPN_NOT;
 	}
 }

src/asm/section.cpp

@@ -1,11 +1,6 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2022, RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
+#include <algorithm>
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -14,17 +9,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/fstack.h"
-#include "asm/main.h"
-#include "asm/output.h"
-#include "asm/rpn.h"
-#include "asm/section.h"
-#include "asm/symbol.h"
-#include "asm/warning.h"
+#include "asm/fstack.hpp"
+#include "asm/main.hpp"
+#include "asm/output.hpp"
+#include "asm/rpn.hpp"
+#include "asm/section.hpp"
+#include "asm/symbol.hpp"
+#include "asm/warning.hpp"
 
-#include "error.h"
-#include "linkdefs.h"
-#include "platform.h" // strdup
+#include "error.hpp"
+#include "linkdefs.hpp"
+#include "platform.hpp" // strdup
 
 uint8_t fillByte;
 
@@ -48,6 +43,7 @@ struct SectionStackEntry *sectionStack;
 uint32_t curOffset; // Offset into the current section (see sect_GetSymbolOffset)
 struct Section *currentSection = NULL;
 static struct Section *currentLoadSection = NULL;
+char const *currentLoadScope = NULL;
 int32_t loadOffset; // Offset into the LOAD section's parent (see sect_GetOutputOffset)
 
 // A quick check to see if we have an initialized section
@@ -160,7 +156,7 @@ static unsigned int mergeSectUnion(struct Section *sect, enum SectionType type,
 			   != (sect->alignOfs & mask(alignment))) {
 			fail("Section already declared with incompatible %u"
 			     "-byte alignment (offset %" PRIu16 ")\n",
-			     1u << sect->align, sect->alignOfs);
+			     1U << sect->align, sect->alignOfs);
 		} else if (alignment > sect->align) {
 			// If the section is not fixed, its alignment is the largest of both
 			sect->align = alignment;
@@ -171,10 +167,9 @@ static unsigned int mergeSectUnion(struct Section *sect, enum SectionType type,
 	return nbSectErrors;
 }
 
-static unsigned int mergeFragments(struct Section *sect, enum SectionType type, uint32_t org,
-				   uint8_t alignment, uint16_t alignOffset)
+static unsigned int mergeFragments(struct Section *sect, uint32_t org, uint8_t alignment,
+				   uint16_t alignOffset)
 {
-	(void)type;
 	assert(alignment < 16); // Should be ensured by the caller
 	unsigned int nbSectErrors = 0;
 
@@ -187,8 +182,7 @@ static unsigned int mergeFragments(struct Section *sect, enum SectionType type,
 		// If both are fixed, they must be the same
 		if (sect->org != (uint32_t)-1 && sect->org != curOrg)
 			fail("Section already declared as fixed at incompatible address $%04"
-			     PRIx32 " (cur addr = %04" PRIx32 ")\n",
-			     sect->org, sect->org + sect->size);
+			     PRIx32 "\n", sect->org);
 		else if (sect->align != 0 && (mask(sect->align) & (curOrg - sect->alignOfs)))
 			fail("Section already declared as aligned to %u bytes (offset %"
 			     PRIu16 ")\n", 1U << sect->align, sect->alignOfs);
@@ -211,7 +205,7 @@ static unsigned int mergeFragments(struct Section *sect, enum SectionType type,
 		} else if ((curOfs & mask(sect->align)) != (sect->alignOfs & mask(alignment))) {
 			fail("Section already declared with incompatible %u"
 			     "-byte alignment (offset %" PRIu16 ")\n",
-			     1u << sect->align, sect->alignOfs);
+			     1U << sect->align, sect->alignOfs);
 		} else if (alignment > sect->align) {
 			// If the section is not fixed, its alignment is the largest of both
 			sect->align = alignment;
@@ -228,7 +222,7 @@ static void mergeSections(struct Section *sect, enum SectionType type, uint32_t
 	unsigned int nbSectErrors = 0;
 
 	if (type != sect->type)
-		fail("Section already exists but with type %s\n", sectionTypeInfo[sect->type].name);
+		fail("Section already exists but with type %s\n", sectionTypeInfo[sect->type].name.c_str());
 
 	if (sect->modifier != mod) {
 		fail("Section already declared as %s section\n", sectionModNames[sect->modifier]);
@@ -236,8 +230,9 @@ static void mergeSections(struct Section *sect, enum SectionType type, uint32_t
 		switch (mod) {
 		case SECTION_UNION:
 		case SECTION_FRAGMENT:
-			nbSectErrors += (mod == SECTION_UNION ? mergeSectUnion : mergeFragments)
-						(sect, type, org, alignment, alignOffset);
+			nbSectErrors += mod == SECTION_UNION ?
+				mergeSectUnion(sect, type, org, alignment, alignOffset) :
+				mergeFragments(sect, org, alignment, alignOffset);
 
 			// Common checks
 
@@ -270,7 +265,7 @@ static struct Section *createSection(char const *name, enum SectionType type,
 				     uint32_t org, uint32_t bank, uint8_t alignment,
 				     uint16_t alignOffset, enum SectionModifier mod)
 {
-	struct Section *sect = malloc(sizeof(*sect));
+	struct Section *sect = (struct Section *)malloc(sizeof(*sect));
 
 	if (sect == NULL)
 		fatalerror("Not enough memory for section: %s\n", strerror(errno));
@@ -293,7 +288,7 @@ static struct Section *createSection(char const *name, enum SectionType type,
 
 	// It is only needed to allocate memory for ROM sections.
 	if (sect_HasData(type)) {
-		sect->data = malloc(sectionTypeInfo[type].size);
+		sect->data = (uint8_t *)malloc(sectionTypeInfo[type].size);
 		if (sect->data == NULL)
 			fatalerror("Not enough memory for section: %s\n", strerror(errno));
 	} else {
@@ -319,7 +314,7 @@ static struct Section *getSection(char const *name, enum SectionType type, uint3
 			error("BANK only allowed for ROMX, WRAMX, SRAM, or VRAM sections\n");
 		else if (bank < sectionTypeInfo[type].firstBank || bank > sectionTypeInfo[type].lastBank)
 			error("%s bank value $%04" PRIx32 " out of range ($%04" PRIx32 " to $%04"
-				PRIx32 ")\n", sectionTypeInfo[type].name, bank,
+				PRIx32 ")\n", sectionTypeInfo[type].name.c_str(), bank,
 				sectionTypeInfo[type].firstBank, sectionTypeInfo[type].lastBank);
 	} else if (nbbanks(type) == 1) {
 		// If the section type only has a single bank, implicitly force it
@@ -334,8 +329,8 @@ static struct Section *getSection(char const *name, enum SectionType type, uint3
 
 	if (org != (uint32_t)-1) {
 		if (org < sectionTypeInfo[type].startAddr || org > endaddr(type))
-			error("Section \"%s\"'s fixed address %#" PRIx32
-				" is outside of range [%#" PRIx16 "; %#" PRIx16 "]\n",
+			error("Section \"%s\"'s fixed address $%04" PRIx32
+				" is outside of range [$%04" PRIx16 "; $%04" PRIx16 "]\n",
 				name, org, sectionTypeInfo[type].startAddr, endaddr(type));
 	}
 
@@ -354,7 +349,7 @@ static struct Section *getSection(char const *name, enum SectionType type, uint3
 			alignment = 0; // Ignore it if it's satisfied
 		} else if (sectionTypeInfo[type].startAddr & mask) {
 			error("Section \"%s\"'s alignment cannot be attained in %s\n",
-				name, sectionTypeInfo[type].name);
+				name, sectionTypeInfo[type].name.c_str());
 			alignment = 0; // Ignore it if it's unattainable
 			org = 0;
 		} else if (alignment == 16) {
@@ -391,7 +386,7 @@ static void changeSection(void)
 }
 
 // Set the current section by name and type
-void sect_NewSection(char const *name, uint32_t type, uint32_t org,
+void sect_NewSection(char const *name, enum SectionType type, uint32_t org,
 		     struct SectionSpec const *attribs, enum SectionModifier mod)
 {
 	if (currentLoadSection)
@@ -411,7 +406,7 @@ void sect_NewSection(char const *name, uint32_t type, uint32_t org,
 }
 
 // Set the current section by name and type
-void sect_SetLoadSection(char const *name, uint32_t type, uint32_t org,
+void sect_SetLoadSection(char const *name, enum SectionType type, uint32_t org,
 			 struct SectionSpec const *attribs, enum SectionModifier mod)
 {
 	// Important info: currently, UNION and LOAD cannot interact, since UNION is prohibited in
@@ -439,6 +434,7 @@ void sect_SetLoadSection(char const *name, uint32_t type, uint32_t org,
 
 	struct Section *sect = getSection(name, type, org, attribs, mod);
 
+	currentLoadScope = sym_GetCurrentSymbolScope();
 	changeSection();
 	loadOffset = curOffset - (mod == SECTION_UNION ? 0 : sect->size);
 	curOffset -= loadOffset;
@@ -456,6 +452,7 @@ void sect_EndLoadSection(void)
 	curOffset += loadOffset;
 	loadOffset = 0;
 	currentLoadSection = NULL;
+	sym_SetCurrentSymbolScope(currentLoadScope);
 }
 
 struct Section *sect_GetSymbolSection(void)
@@ -474,29 +471,46 @@ uint32_t sect_GetOutputOffset(void)
 	return curOffset + loadOffset;
 }
 
+// Returns how many bytes need outputting for the specified alignment and offset to succeed
+uint32_t sect_GetAlignBytes(uint8_t alignment, uint16_t offset)
+{
+	struct Section *sect = sect_GetSymbolSection();
+	if (!sect)
+		return 0;
+
+	bool isFixed = sect->org != (uint32_t)-1;
+
+	// If the section is not aligned, no bytes are needed
+	// (fixed sections count as being maximally aligned for this purpose)
+	uint8_t curAlignment = isFixed ? 16 : sect->align;
+	if (curAlignment == 0)
+		return 0;
+
+	// We need `(pcValue + curOffset + return value) % (1 << alignment) == offset`
+	uint16_t pcValue = isFixed ? sect->org : sect->alignOfs;
+	return static_cast<uint16_t>(offset - curOffset - pcValue)
+		% (1u << std::min(alignment, curAlignment));
+}
+
 void sect_AlignPC(uint8_t alignment, uint16_t offset)
 {
 	if (!checksection())
 		return;
 
 	struct Section *sect = sect_GetSymbolSection();
-	uint16_t alignSize = 1 << alignment; // Size of an aligned "block"
+	uint32_t alignSize = 1 << alignment; // Size of an aligned "block"
 
 	if (sect->org != (uint32_t)-1) {
-		if ((sym_GetPCValue() - offset) % alignSize)
+		if ((sect->org + curOffset - offset) % alignSize)
 			error("Section's fixed address fails required alignment (PC = $%04" PRIx32
-			      ")\n", sym_GetPCValue());
-	} else if (sect->align != 0) {
-		if ((((sect->alignOfs + curOffset) % (1 << sect->align)) - offset) % alignSize) {
+			      ")\n", sect->org + curOffset);
+	} else if (sect->align != 0 && (((sect->alignOfs + curOffset) % (1u << sect->align))
+					- offset) % alignSize) {
 		error("Section's alignment fails required alignment (offset from section start = $%04"
 			PRIx32 ")\n", curOffset);
 	} else if (alignment > sect->align) {
 		sect->align = alignment;
-			sect->alignOfs = (offset - curOffset) % alignSize;
-		}
-	} else {
-		sect->align = alignment;
-		// We need `(sect->alignOfs + curOffset) % alignSize == offset
+		// We need `(sect->alignOfs + curOffset) % alignSize == offset`
 		sect->alignOfs = (offset - curOffset) % alignSize;
 	}
 }
@@ -550,7 +564,7 @@ void sect_StartUnion(void)
 		error("Cannot use UNION inside of ROM0 or ROMX sections\n");
 		return;
 	}
-	struct UnionStackEntry *entry = malloc(sizeof(*entry));
+	struct UnionStackEntry *entry = (struct UnionStackEntry *)malloc(sizeof(*entry));
 
 	if (!entry)
 		fatalerror("Failed to allocate new union stack entry: %s\n", strerror(errno));
@@ -595,7 +609,7 @@ void sect_EndUnion(void)
 void sect_CheckUnionClosed(void)
 {
 	if (unionStack)
-		error("Unterminated UNION construct!\n");
+		error("Unterminated UNION construct\n");
 }
 
 // Output an absolute byte
@@ -662,18 +676,6 @@ void sect_Skip(uint32_t skip, bool ds)
 	}
 }
 
-// Output a NULL terminated string (excluding the NULL-character)
-void sect_String(char const *s)
-{
-	if (!checkcodesection())
-		return;
-	if (!reserveSpace(strlen(s)))
-		return;
-
-	while (*s)
-		writebyte(*s++);
-}
-
 // Output a relocatable byte. Checking will be done to see if it
 // is an absolute value in disguise.
 void sect_RelByte(struct Expression *expr, uint32_t pcShift)
@@ -936,7 +938,7 @@ cleanup:
 // Section stack routines
 void sect_PushSection(void)
 {
-	struct SectionStackEntry *entry = malloc(sizeof(*entry));
+	struct SectionStackEntry *entry = (struct SectionStackEntry *)malloc(sizeof(*entry));
 
 	if (entry == NULL)
 		fatalerror("No memory for section stack: %s\n",  strerror(errno));
@@ -962,7 +964,7 @@ void sect_PopSection(void)
 		fatalerror("No entries in the section stack\n");
 
 	if (currentLoadSection)
-		fatalerror("Cannot change the section within a `LOAD` block!\n");
+		fatalerror("Cannot change the section within a `LOAD` block\n");
 
 	struct SectionStackEntry *entry = sectionStack;
 
@@ -978,6 +980,22 @@ void sect_PopSection(void)
 	free(entry);
 }
 
+void sect_EndSection(void)
+{
+	if (!currentSection)
+		fatalerror("Cannot end the section outside of a SECTION\n");
+
+	if (currentLoadSection)
+		fatalerror("Cannot end the section within a `LOAD` block\n");
+
+	if (unionStack)
+		fatalerror("Cannot end the section within a UNION\n");
+
+	// Reset the section scope
+	currentSection = NULL;
+	sym_SetCurrentSymbolScope(NULL);
+}
+
 bool sect_IsSizeKnown(struct Section const NONNULL(sect))
 {
 	// SECTION UNION and SECTION FRAGMENT can still grow

src/asm/symbol.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 // Symboltable and macroargs stuff
 
@@ -17,20 +11,20 @@
 #include <string.h>
 #include <time.h>
 
-#include "asm/fixpoint.h"
-#include "asm/fstack.h"
-#include "asm/macro.h"
-#include "asm/main.h"
-#include "asm/output.h"
-#include "asm/section.h"
-#include "asm/symbol.h"
-#include "asm/util.h"
-#include "asm/warning.h"
+#include "asm/fixpoint.hpp"
+#include "asm/fstack.hpp"
+#include "asm/macro.hpp"
+#include "asm/main.hpp"
+#include "asm/output.hpp"
+#include "asm/section.hpp"
+#include "asm/symbol.hpp"
+#include "util.hpp"
+#include "asm/warning.hpp"
 
-#include "error.h"
-#include "hashmap.h"
-#include "helpers.h"
-#include "version.h"
+#include "error.hpp"
+#include "hashmap.hpp"
+#include "helpers.hpp"
+#include "version.hpp"
 
 HashMap symbols;
 
@@ -41,7 +35,7 @@ static char savedTIME[256];
 static char savedDATE[256];
 static char savedTIMESTAMP_ISO8601_LOCAL[256];
 static char savedTIMESTAMP_ISO8601_UTC[256];
-static bool exportall;
+static bool exportAll;
 
 bool sym_IsPC(struct Symbol const *sym)
 {
@@ -55,8 +49,8 @@ struct ForEachArgs {
 
 static void forEachWrapper(void *_sym, void *_argWrapper)
 {
-	struct ForEachArgs *argWrapper = _argWrapper;
-	struct Symbol *sym = _sym;
+	struct ForEachArgs *argWrapper = (struct ForEachArgs *)_argWrapper;
+	struct Symbol *sym = (struct Symbol *)_sym;
 
 	argWrapper->func(sym, argWrapper->arg);
 }
@@ -77,50 +71,6 @@ static int32_t Callback_NARG(void)
 	return macro_NbArgs();
 }
 
-static int32_t Callback__LINE__(void)
-{
-	warning(WARNING_OBSOLETE, "`__LINE__` is deprecated\n");
-
-	return lexer_GetLineNo();
-}
-
-static char const *Callback__FILE__(void)
-{
-	warning(WARNING_OBSOLETE, "`__FILE__` is deprecated\n");
-
-	// There are only two call sites for this; one copies the contents directly, the other is
-	// EQUS expansions, which cannot straddle file boundaries. So this should be fine.
-	static char *buf = NULL;
-	static size_t bufsize = 0;
-	char const *fileName = fstk_GetFileName();
-	size_t j = 1;
-
-	assert(fileName[0]);
-	// The assertion above ensures the loop runs at least once
-	for (size_t i = 0; fileName[i]; i++, j++) {
-		// Account for the extra backslash inserted below
-		if (fileName[i] == '"')
-			j++;
-		// Ensure there will be enough room; DO NOT PRINT ANYTHING ABOVE THIS!
-		if (j + 2 >= bufsize) { // Always keep room for 2 tail chars
-			bufsize = bufsize ? bufsize * 2 : 64;
-			buf = realloc(buf, bufsize);
-			if (!buf)
-				fatalerror("Failed to grow buffer for file name: %s\n",
-					   strerror(errno));
-		}
-		// Escape quotes, since we're returning a string
-		if (fileName[i] == '"')
-			buf[j - 1] = '\\';
-		buf[j] = fileName[i];
-	}
-	// Write everything after the loop, to ensure the buffer has been allocated
-	buf[0] = '"';
-	buf[j++] = '"';
-	buf[j] = '\0';
-	return buf;
-}
-
 static int32_t CallbackPC(void)
 {
 	struct Section const *section = sect_GetSymbolSection();
@@ -173,7 +123,7 @@ static void updateSymbolFilename(struct Symbol *sym)
 // Create a new symbol by name
 static struct Symbol *createsymbol(char const *symName)
 {
-	struct Symbol *sym = malloc(sizeof(*sym));
+	struct Symbol *sym = (struct Symbol *)malloc(sizeof(*sym));
 
 	if (!sym)
 		fatalerror("Failed to create symbol '%s': %s\n", symName, strerror(errno));
@@ -220,16 +170,7 @@ static void assignStringSymbol(struct Symbol *sym, char const *value)
 
 struct Symbol *sym_FindExactSymbol(char const *symName)
 {
-	return hash_GetElement(symbols, symName);
-}
-
-struct Symbol *sym_FindUnscopedSymbol(char const *symName)
-{
-	if (strchr(symName, '.')) {
-		error("Expected non-scoped symbol name, not \"%s\"\n", symName);
-		return NULL;
-	}
-	return sym_FindExactSymbol(symName);
+	return (struct Symbol *)hash_GetElement(symbols, symName);
 }
 
 struct Symbol *sym_FindScopedSymbol(char const *symName)
@@ -513,7 +454,8 @@ static struct Symbol *addLabel(char const *symName)
 	// If the symbol already exists as a ref, just "take over" it
 	sym->type = SYM_LABEL;
 	sym->value = sect_GetSymbolOffset();
-	if (exportall)
+	// Don't export anonymous labels
+	if (exportAll && symName[0] != '!')
 		sym->isExported = true;
 	sym->section = sect_GetSymbolSection();
 
@@ -525,16 +467,14 @@ static struct Symbol *addLabel(char const *symName)
 // Add a local (`.name` or `Parent.name`) relocatable symbol
 struct Symbol *sym_AddLocalLabel(char const *symName)
 {
-	if (!labelScope) {
-		error("Local label '%s' in main scope\n", symName);
-		return NULL;
-	}
-	assert(!strchr(labelScope, '.')); // Assuming no dots in `labelScope`
+	// Assuming no dots in `labelScope` if defined
+	assert(!labelScope || !strchr(labelScope, '.'));
 
 	char fullName[MAXSYMLEN + 1];
 	char const *localName = strchr(symName, '.');
 
 	assert(localName); // There should be at least one dot in `symName`
+
 	// Check for something after the dot in `localName`
 	if (localName[1] == '\0') {
 		fatalerror("'%s' is a nonsensical reference to an empty local label\n",
@@ -546,23 +486,13 @@ struct Symbol *sym_AddLocalLabel(char const *symName)
 			   symName);
 
 	if (localName == symName) {
+		if (!labelScope) {
+			error("Unqualified local label '%s' in main scope\n", symName);
+			return NULL;
+		}
 		// Expand `symName` to the full `labelScope.symName` name
 		fullSymbolName(fullName, sizeof(fullName), symName, labelScope);
 		symName = fullName;
-	} else {
-		size_t i = 0;
-
-		// Find where `labelScope` and `symName` first differ
-		while (labelScope[i] && symName[i] == labelScope[i])
-			i++;
-
-		// Check that `symName` starts with `labelScope` and then a '.'
-		if (labelScope[i] != '\0' || symName[i] != '.') {
-			size_t parentLen = localName - symName;
-
-			assert(parentLen <= INT_MAX);
-			error("Not currently in the scope of '%.*s'\n", (int)parentLen, symName);
-		}
 	}
 
 	return addLabel(symName);
@@ -680,7 +610,7 @@ struct Symbol *sym_Ref(char const *symName)
 // Set whether to export all relocatable symbols by default
 void sym_SetExportAll(bool set)
 {
-	exportall = set;
+	exportAll = set;
 }
 
 static struct Symbol *createBuiltinSymbol(char const *symName)
@@ -698,21 +628,13 @@ static struct Symbol *createBuiltinSymbol(char const *symName)
 void sym_Init(time_t now)
 {
 	PCSymbol = createBuiltinSymbol("@");
-	_NARGSymbol = createBuiltinSymbol("_NARG");
-	// __LINE__ is deprecated
-	struct Symbol *__LINE__Symbol = createBuiltinSymbol("__LINE__");
-	// __FILE__ is deprecated
-	struct Symbol *__FILE__Symbol = createBuiltinSymbol("__FILE__");
-
 	PCSymbol->type = SYM_LABEL;
 	PCSymbol->section = NULL;
 	PCSymbol->numCallback = CallbackPC;
+
+	_NARGSymbol = createBuiltinSymbol("_NARG");
 	_NARGSymbol->type = SYM_EQU;
 	_NARGSymbol->numCallback = Callback_NARG;
-	__LINE__Symbol->type = SYM_EQU;
-	__LINE__Symbol->numCallback = Callback__LINE__;
-	__FILE__Symbol->type = SYM_EQUS;
-	__FILE__Symbol->strCallback = Callback__FILE__;
 
 	sym_AddVar("_RS", 0)->isBuiltin = true;
 
@@ -769,4 +691,5 @@ void sym_Init(time_t now)
 #undef addSym
 
 	sym_SetCurrentSymbolScope(NULL);
-	anonLabelID = 0;}
+	anonLabelID = 0;
+}

src/asm/warning.cpp

@@ -1,10 +1,4 @@
-/*
- * This file is part of RGBDS.
- *
- * Copyright (c) 2019, Eldred Habert and RGBDS contributors.
- *
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: MIT */
 
 #include <inttypes.h>
 #include <limits.h>
@@ -14,38 +8,40 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asm/fstack.h"
-#include "asm/main.h"
-#include "asm/warning.h"
+#include "asm/fstack.hpp"
+#include "asm/main.hpp"
+#include "asm/warning.hpp"
 
-#include "error.h"
+#include "error.hpp"
+#include "itertools.hpp"
 
 unsigned int nbErrors = 0;
+unsigned int maxErrors = 0;
 
 static const enum WarningState defaultWarnings[ARRAY_SIZE(warningStates)] = {
-	[WARNING_ASSERT]		= WARNING_ENABLED,
-	[WARNING_BACKWARDS_FOR]		= WARNING_DISABLED,
-	[WARNING_BUILTIN_ARG]		= WARNING_DISABLED,
-	[WARNING_CHARMAP_REDEF]		= WARNING_DISABLED,
-	[WARNING_DIV]			= WARNING_DISABLED,
-	[WARNING_EMPTY_DATA_DIRECTIVE]	= WARNING_DISABLED,
-	[WARNING_EMPTY_MACRO_ARG]	= WARNING_DISABLED,
-	[WARNING_EMPTY_STRRPL]		= WARNING_DISABLED,
-	[WARNING_LARGE_CONSTANT]	= WARNING_DISABLED,
-	[WARNING_LONG_STR]		= WARNING_DISABLED,
-	[WARNING_MACRO_SHIFT]		= WARNING_DISABLED,
-	[WARNING_NESTED_COMMENT]	= WARNING_ENABLED,
-	[WARNING_OBSOLETE]		= WARNING_ENABLED,
-	[WARNING_SHIFT]			= WARNING_DISABLED,
-	[WARNING_SHIFT_AMOUNT]		= WARNING_DISABLED,
-	[WARNING_USER]			= WARNING_ENABLED,
+	AT(WARNING_ASSERT)               WARNING_ENABLED,
+	AT(WARNING_BACKWARDS_FOR)        WARNING_DISABLED,
+	AT(WARNING_BUILTIN_ARG)          WARNING_DISABLED,
+	AT(WARNING_CHARMAP_REDEF)        WARNING_DISABLED,
+	AT(WARNING_DIV)                  WARNING_DISABLED,
+	AT(WARNING_EMPTY_DATA_DIRECTIVE) WARNING_DISABLED,
+	AT(WARNING_EMPTY_MACRO_ARG)      WARNING_DISABLED,
+	AT(WARNING_EMPTY_STRRPL)         WARNING_DISABLED,
+	AT(WARNING_LARGE_CONSTANT)       WARNING_DISABLED,
+	AT(WARNING_LONG_STR)             WARNING_DISABLED,
+	AT(WARNING_MACRO_SHIFT)          WARNING_DISABLED,
+	AT(WARNING_NESTED_COMMENT)       WARNING_ENABLED,
+	AT(WARNING_OBSOLETE)             WARNING_ENABLED,
+	AT(WARNING_SHIFT)                WARNING_DISABLED,
+	AT(WARNING_SHIFT_AMOUNT)         WARNING_DISABLED,
+	AT(WARNING_USER)                 WARNING_ENABLED,
 
-	[WARNING_NUMERIC_STRING_1]	= WARNING_ENABLED,
-	[WARNING_NUMERIC_STRING_2]	= WARNING_DISABLED,
-	[WARNING_TRUNCATION_1]		= WARNING_ENABLED,
-	[WARNING_TRUNCATION_2]		= WARNING_DISABLED,
-	[WARNING_UNMAPPED_CHAR_1]	= WARNING_ENABLED,
-	[WARNING_UNMAPPED_CHAR_2]	= WARNING_DISABLED,
+	AT(WARNING_NUMERIC_STRING_1)     WARNING_ENABLED,
+	AT(WARNING_NUMERIC_STRING_2)     WARNING_DISABLED,
+	AT(WARNING_TRUNCATION_1)         WARNING_ENABLED,
+	AT(WARNING_TRUNCATION_2)         WARNING_DISABLED,
+	AT(WARNING_UNMAPPED_CHAR_1)      WARNING_ENABLED,
+	AT(WARNING_UNMAPPED_CHAR_2)      WARNING_DISABLED,
 };
 
 enum WarningState warningStates[ARRAY_SIZE(warningStates)];
@@ -145,7 +141,7 @@ static bool tryProcessParamWarning(char const *flag, uint8_t param, enum Warning
 			return true;
 		}
 
-		baseID += maxParam;
+		baseID = (enum WarningID)(baseID + maxParam);
 	}
 	return false;
 }
@@ -220,7 +216,7 @@ void processWarningFlag(char *flag)
 	static bool setError = false;
 
 	// First, try to match against a "meta" warning
-	for (enum WarningID id = META_WARNINGS_START; id < NB_WARNINGS; id++) {
+	for (enum WarningID id : EnumSeq(META_WARNINGS_START, NB_WARNINGS)) {
 		// TODO: improve the matching performance?
 		if (!strcmp(flag, warningFlags[id])) {
 			// We got a match!
@@ -266,7 +262,7 @@ void processWarningFlag(char *flag)
 				  // Not an error, then check if this is a negation
 				  strncmp(flag, "no-", strlen("no-")) ? WARNING_ENABLED
 								      : WARNING_DISABLED;
-	char const *rootFlag = state == WARNING_DISABLED ? flag + strlen("no-") : flag;
+	char *rootFlag = state == WARNING_DISABLED ? flag + strlen("no-") : flag;
 
 	// Is this a "parametric" warning?
 	if (state != WARNING_DISABLED) { // The `no-` form cannot be parametrized
@@ -315,7 +311,7 @@ void processWarningFlag(char *flag)
 	}
 
 	// Try to match the flag against a "normal" flag
-	for (enum WarningID id = 0; id < NB_PLAIN_WARNINGS; id++) {
+	for (enum WarningID id : EnumSeq(NB_PLAIN_WARNINGS)) {
 		if (!strcmp(rootFlag, warningFlags[id])) {
 			// We got a match!
 			warningStates[id] = state;
@@ -348,10 +344,15 @@ void error(char const *fmt, ...)
 	va_start(args, fmt);
 	printDiag(fmt, args, "error: ", ":\n    ", NULL);
 	va_end(args);
+
+	// This intentionally makes 0 act as "unlimited" (or at least "limited to sizeof(unsigned)")
 	nbErrors++;
+	if (nbErrors == maxErrors)
+		errx("The maximum of %u error%s was reached (configure with \"-X/--max-errors\"); assembly aborted!",
+		     maxErrors, maxErrors == 1 ? "" : "s");
 }
 
-_Noreturn void fatalerror(char const *fmt, ...)
+[[noreturn]] void fatalerror(char const *fmt, ...)
 {
 	va_list args;
 

src/bison.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+BISONFLAGS=-Wall
+
+readonly BISON_VER=$(bison -V)
+add_flag () {
+	if awk <<<"$BISON_VER" -v major="$1" -v minor="$2" '
+	/^bison.*[0-9]+(\.[0-9]+)(\.[0-9]+)?$/ {
+		match($0, /[0-9]+(\.[0-9]+)(\.[0-9]+)?$/);
+		split(substr($0, RSTART), ver, ".");
+		if (ver[1] == major && ver[2] >= minor) { exit 0 } else { exit 1 }
+	}'; then
+		BISONFLAGS="-D$3 $BISONFLAGS"
+	fi
+}
+
+add_flag 3 5 api.token.raw=true
+add_flag 3 6 parse.error=detailed
+add_flag 3 0 parse.error=verbose
+add_flag 3 0 parse.lac=full
+add_flag 3 0 lr.type=ielr
+
+echo "BISONFLAGS=$BISONFLAGS"
+
+exec bison $BISONFLAGS -d -o "$1" "$2"