Merge pull request #16 from yenatch/eval-rpn-bank

rgbasm: Evaluate BANK() arguments to verify they exist.

.gitignore

@@ -0,0 +1,7 @@
+rgbasm
+rgblink
+rgbfix
+rgbgfx
+*.o
+*.exe
+*.html

GNUmakefile

@@ -0,0 +1,6 @@
+# GNU Make 3.x doesn't support the "!=" shell syntax, so here's an alternative
+
+PKG_CONFIG = pkg-config
+PNGFLAGS = $(shell ${PKG_CONFIG} --cflags libpng)
+
+include Makefile

LICENSE

@@ -1,5 +1,5 @@
-rgbasm, rgblink, and rgblib are derived from Justin Lloyd's RGBDS, which
-is released under the following license:
+rgbasm and rgblink are derived from Justin Lloyd's RGBDS, which is
+released under the following license:
 
                       DO WHATEVER PUBLIC LICENSE*
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -17,3 +17,18 @@ is released under the following license:
 
 rgbfix was rewritten from scratch by Anthony J. Bentley, and is released
 under the ISC license; see the source file for the text of the license.
+
+rgbgfx was written by stag019, and is released under the ISC license.
+
+The UTF-8 decoder in src/asm/charmap.c was written by Björn Höhrmann and is
+released under the MIT license. The remainder of charmap.c was written by
+stag019, and is released under the ISC license.
+
+extern/err.c is derived from the Musl C library, http://www.musl-libc.org,
+and is released under the MIT license.
+
+extern/reallocarray.c is derived from the OpenBSD Project,
+http://www.openbsd.org, and is released under the ISC license.
+
+extern/strl.c is derived from the OpenBSD Project, http://www.openbsd.org,
+and is released under the BSD license.

Makefile

@@ -1,4 +1,8 @@
-CFLAGS +=	-Wall -Iinclude -Iinclude/asm/gameboy -g -std=c99
+PKG_CONFIG =	pkg-config
+WARNFLAGS =	-Wall -Werror=implicit
+PNGFLAGS !=	${PKG_CONFIG} --cflags libpng
+REALCFLAGS =	${CFLAGS} ${WARNFLAGS} ${PNGFLAGS} -Iinclude -g \
+		-std=c99 -D_POSIX_C_SOURCE=200809L
 
 # User-defined variables
 PREFIX =	/usr/local
@@ -6,15 +10,9 @@ BINPREFIX =	${PREFIX}/bin
 MANPREFIX =	${PREFIX}/man
 Q =		@
 
-yacc_pre := \
-	src/asm/yaccprt1.y\
-	src/asm/gameboy/yaccprt2.y\
-	src/asm/yaccprt3.y\
-	src/asm/gameboy/yaccprt4.y
-
-rgbasm_obj := \
-	src/asm/alloca.o \
+rgbasm_obj = \
 	src/asm/asmy.o \
+	src/asm/charmap.o \
 	src/asm/fstack.o \
 	src/asm/globlex.o \
 	src/asm/lexer.o \
@@ -23,13 +21,13 @@ rgbasm_obj := \
 	src/asm/output.o \
 	src/asm/rpn.o \
 	src/asm/symbol.o \
-	src/asm/gameboy/locallex.o
+	src/asm/locallex.o \
+	src/extern/err.o \
+	src/extern/reallocarray.o \
+	src/extern/strlcpy.o \
+	src/extern/strlcat.o
 
-rgblib_obj := \
-	src/lib/library.o \
-	src/lib/main.o
-
-rgblink_obj := \
+rgblink_obj = \
 	src/link/assign.o \
 	src/link/library.o \
 	src/link/main.o \
@@ -37,75 +35,88 @@ rgblink_obj := \
 	src/link/object.o \
 	src/link/output.o \
 	src/link/patch.o \
-	src/link/symbol.o
+	src/link/symbol.o \
+	src/extern/err.o
 
-rgbfix_obj := \
-	src/fix/main.o
+rgbfix_obj = \
+	src/fix/main.o \
+	src/extern/err.o
 
-all: rgbasm rgblib rgblink rgbfix
+rgbgfx_obj = \
+	src/gfx/gb.o \
+	src/gfx/main.o \
+	src/gfx/makepng.o \
+	src/extern/err.o
+
+all: rgbasm rgblink rgbfix rgbgfx
 
 clean:
-	${Q}rm -rf rgbasm rgbasm.exe ${rgbasm_obj}
-	${Q}rm -rf rgblib rgblib.exe ${rgblib_obj}
-	${Q}rm -rf rgblink rgblink.exe ${rgblink_obj}
-	${Q}rm -rf rgbfix rgbfix.exe ${rgbfix_obj}
-	${Q}rm -rf src/asm/asmy.c
+	$Qrm -rf rgbds.html
+	$Qrm -rf rgbasm rgbasm.exe ${rgbasm_obj} rgbasm.html
+	$Qrm -rf rgblink rgblink.exe ${rgblink_obj} rgblink.html
+	$Qrm -rf rgbfix rgbfix.exe ${rgbfix_obj} rgbfix.html
+	$Qrm -rf rgbgfx rgbgfx.exe ${rgbgfx_obj} rgbgfx.html
+	$Qrm -rf src/asm/asmy.c src/asm/asmy.h
 
 install: all
-	${Q}install -s -m 555 rgbasm ${BINPREFIX}/rgbasm
-	${Q}install -s -m 555 rgbfix ${BINPREFIX}/rgbfix
-	${Q}install -s -m 555 rgblink ${BINPREFIX}/rgblink
-	${Q}install -s -m 555 rgblib ${BINPREFIX}/rgblib
-	${Q}install -m 444 src/rgbds.7 ${MANPREFIX}/man7/rgbds.7
-	${Q}install -m 444 src/asm/rgbasm.1 \
-		${MANPREFIX}/man1/rgbasm.1
-	${Q}install -m 444 src/fix/rgbfix.1 \
-		${MANPREFIX}/man1/rgbfix.1
-	${Q}install -m 444 src/link/rgblink.1 \
-		${MANPREFIX}/man1/rgblink.1
-	${Q}install -m 444 src/lib/rgblib.1 \
-		${MANPREFIX}/man1/rgblib.1
+	$Qmkdir -p ${BINPREFIX}
+	$Qinstall -s -m 555 rgbasm ${BINPREFIX}/rgbasm
+	$Qinstall -s -m 555 rgbfix ${BINPREFIX}/rgbfix
+	$Qinstall -s -m 555 rgblink ${BINPREFIX}/rgblink
+	$Qinstall -s -m 555 rgbgfx ${BINPREFIX}/rgbgfx
+	$Qmkdir -p ${MANPREFIX}/man1 ${MANPREFIX}/man7
+	$Qinstall -m 444 src/rgbds.7 ${MANPREFIX}/man7/rgbds.7
+	$Qinstall -m 444 src/asm/rgbasm.1 ${MANPREFIX}/man1/rgbasm.1
+	$Qinstall -m 444 src/fix/rgbfix.1 ${MANPREFIX}/man1/rgbfix.1
+	$Qinstall -m 444 src/link/rgblink.1 ${MANPREFIX}/man1/rgblink.1
+	$Qinstall -m 444 src/gfx/rgbgfx.1 ${MANPREFIX}/man1/rgbgfx.1
 
 rgbasm: ${rgbasm_obj}
-	${Q}${CC} ${CFLAGS} -o $@ ${rgbasm_obj} -lm
-
-rgblib: ${rgblib_obj}
-	${Q}${CC} ${CFLAGS} -o $@ ${rgblib_obj}
+	$Q${CC} ${REALCFLAGS} -o $@ ${rgbasm_obj} -lm
 
 rgblink: ${rgblink_obj}
-	${Q}${CC} ${CFLAGS} -o $@ ${rgblink_obj}
+	$Q${CC} ${REALCFLAGS} -o $@ ${rgblink_obj}
 
 rgbfix: ${rgbfix_obj}
-	${Q}${CC} ${CFLAGS} -o $@ ${rgbfix_obj}
+	$Q${CC} ${REALCFLAGS} -o $@ ${rgbfix_obj}
+
+rgbgfx: ${rgbgfx_obj}
+	$Q${CC} ${REALCFLAGS} -o $@ ${rgbgfx_obj} `${PKG_CONFIG} --libs libpng`
+
+.y.c:
+	$Q${YACC} -d ${YFLAGS} -o $@ $<
 
 .c.o:
-	${Q}${CC} ${CFLAGS} -c -o $@ $<
-
-src/asm/asmy.c: src/asm/asmy.y
-	${Q}${YACC} -d -o $@ $<
-
-src/asm/asmy.y: ${yacc_pre}
-	${Q}cat ${yacc_pre} > $@
+	$Q${CC} ${REALCFLAGS} -c -o $@ $<
 
+src/asm/locallex.o src/asm/globlex.o src/asm/lexer.o: src/asm/asmy.h
+src/asm/asmy.h: src/asm/asmy.c
 
 # Below is a target for the project maintainer to easily create win32 exes.
 # This is not for Windows users!
 # If you're building on Windows with Cygwin or Mingw, just follow the Unix
 # install instructions instead.
 mingw:
-	${Q}env PATH=/usr/local/mingw32/bin:/bin:/usr/bin:/usr/local/bin make CC=gcc CFLAGS="-I/usr/local/mingw32/include ${CFLAGS}"
-	${Q}mv rgbasm rgbasm.exe
-	${Q}mv rgblib rgblib.exe
-	${Q}mv rgblink rgblink.exe
-	${Q}mv rgbfix rgbfix.exe
+	$Qenv PATH=/usr/local/mingw32/bin:/bin:/usr/bin:/usr/local/bin \
+		make WARNFLAGS= CC=gcc CFLAGS="-I/usr/local/mingw32/include \
+			${CFLAGS}"
+	$Qmv rgbasm rgbasm.exe
+	$Qmv rgblink rgblink.exe
+	$Qmv rgbfix rgbfix.exe
+	$Qmv rgbgfx rgbgfx.exe
 
 # Below is a target for the project maintainer to easily create web manuals.
 # It relies on mandoc: http://mdocml.bsd.lv
-MANDOC =	-Thtml -Oman=/rgbds/manual/%N/ -Ostyle=/rgbds/manual/manual.css -Ios=General
+MANDOC =	-Thtml -Ios=General -Oman=/rgbds/manual/%N/ \
+			-Ostyle=/rgbds/manual/manual.css
 
 wwwman:
-	${Q}mandoc ${MANDOC} src/rgbds.7 | sed s/OpenBSD/General/ > rgbds.html
-	${Q}mandoc ${MANDOC} src/asm/rgbasm.1 | sed s/OpenBSD/General/ > rgbasm.html
-	${Q}mandoc ${MANDOC} src/fix/rgbfix.1 | sed s/OpenBSD/General/ > rgbfix.html
-	${Q}mandoc ${MANDOC} src/lib/rgblib.1 | sed s/OpenBSD/General/ > rgblib.html
-	${Q}mandoc ${MANDOC} src/link/rgblink.1 | sed s/OpenBSD/General/ > rgblink.html
+	$Qmandoc ${MANDOC} src/rgbds.7 | sed s/OpenBSD/General/ > rgbds.html
+	$Qmandoc ${MANDOC} src/asm/rgbasm.1 | sed s/OpenBSD/General/ > \
+		rgbasm.html
+	$Qmandoc ${MANDOC} src/fix/rgbfix.1 | sed s/OpenBSD/General/ > \
+		rgbfix.html
+	$Qmandoc ${MANDOC} src/link/rgblink.1 | sed s/OpenBSD/General/ > \
+		rgblink.html
+	$Qmandoc ${MANDOC} src/gfx/rgbgfx.1 | sed s/OpenBSD/General/ > \
+		rgbgfx.html

README

@@ -1,59 +0,0 @@
-----------------
-  RGBDS README
-----------------
-
-RGBDS (Rednex Game Boy Development System) is a free assembler/linker package
-for the Game Boy and Game Boy Color. It consists of:
-
-  - rgbasm  (assembler)
-  - rgblink (linker)
-  - rgblib  (library manager)
-  - rgbfix  (checksum/header fixer)
-
-rgbds-linux is a fork of the original RGBDS which aims to make the programs
-more like other UNIX tools.
-
-
-  Installing RGBDS (UNIX)
-=========================
-
-To build the programs on a UNIX or UNIX-like system, just run in your terminal:
-
-  make
-
-Then to install the compiled programs and manual pages, run (with appropriate
-privileges):
-
-  make install
-
-After installation, you can read the manuals with the man(1) command. E.g.,
-
-  man 1 rgbasm
-
-
-Note: the variables described below can affect installation behavior when given
-on the make command line. For example, to install rgbds in your home directory
-instead of systemwide, run the following:
-
-  mkdir -p $HOME/{bin,man/man1,man/man7}
-  make install PREFIX=$HOME
-
-
-PREFIX: Location where RGBDS will be installed. Defaults to /usr/local.
-
-BINPREFIX: Location where the RGBDS programs will be installed. Defaults
-to ${PREFIX}/bin.
-
-MANPREFIX: Location where the RGBDS man pages will be installed. Defaults
-to ${PREFIX}/man.
-
-Q: Whether to quiet the build or not. To make the build more verbose, clear
-this variable. Defaults to @.
-
-
-  Installing RGBDS (Windows)
-============================
-
-Windows builds are available here: http://anthony.bentley.name/rgbds/
-
-Copy the .exe files to C:\Windows\ or similar.

README.md

@@ -0,0 +1,70 @@
+# RGBDS
+
+RGBDS (Rednex Game Boy Development System) is a free assembler/linker package
+for the Game Boy and Game Boy Color. It consists of:
+
+  - rgbasm  (assembler)
+  - rgblink (linker)
+  - rgbfix  (checksum/header fixer)
+  - rgbgfx  (PNG‐to‐Game Boy graphics converter)
+
+rgbds-linux is a fork of the original RGBDS which aims to make the programs
+more like other UNIX tools.
+
+
+## Installing RGBDS (UNIX)
+
+RGBDS requires libpng and pkg-config to be installed.
+
+On Mac OS X, install them with [Homebrew](http://brew.sh/). On other Unixes,
+use the built-in package manager.
+
+You can test if they're installed by running `pkg-config --cflags libpng`:
+if the output is a path, then you're good, and if it outputs an error then
+you need to install them via a package manager.
+
+To build the programs on a UNIX or UNIX-like system, just run in your terminal:
+
+```sh
+make
+```
+
+Then to install the compiled programs and manual pages, run (with appropriate
+privileges):
+
+```sh
+make install
+```
+
+After installation, you can read the manuals with the man(1) command. E.g.,
+
+```sh
+man 1 rgbasm
+```
+
+Note: the variables described below can affect installation behavior when given
+on the make command line. For example, to install rgbds in your home directory
+instead of systemwide, run the following:
+
+```sh
+mkdir -p $HOME/{bin,man/man1,man/man7}
+make install PREFIX=$HOME
+```
+
+`PREFIX`: Location where RGBDS will be installed. Defaults to /usr/local.
+
+`BINPREFIX`: Location where the RGBDS programs will be installed. Defaults
+to ${PREFIX}/bin.
+
+`MANPREFIX`: Location where the RGBDS man pages will be installed. Defaults
+to ${PREFIX}/man.
+
+`Q`: Whether to quiet the build or not. To make the build more verbose, clear
+this variable. Defaults to @.
+
+
+## Installing RGBDS (Windows)
+
+Windows builds are available here: https://github.com/bentley/rgbds/releases
+
+Copy the .exe files to C:\Windows\ or similar.

doc/asm.htm

@@ -1,127 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm</title>
-	<link rel="stylesheet" type="text/css" href="./style.css">
-</head>
-<body>
-<h1>xAsm Documentation</h1>
-<h2>Table of Contents</h2>
-<h3>General stuff</h3>
-<ul>
-	<li><a href="asm/history.htm">History</a>
-	<li><a href="asm/usage.htm">Usage</a>
-	<li><a href="asm/opt.htm">Changing options while assembling</a>
-	<li><a href="asm/popo.htm">The option stack</a>
-	<li><a href="asm/syntax.htm">Syntax and comments</a>
-	<li><a href="asm/section.htm">Sections</a>
-</ul>
-
-<h3>Symbols</h3>
-<ul>
-	<li><a href="asm/symbols.htm">Symbols</a>
-	<li><a href="asm/export.htm">Exporting and importing symbols</a>
-	<li><a href="asm/purge.htm">Purging symbols</a>
-	<li><a href="asm/presym.htm">Predeclared symbols</a>
-</ul>
-
-<h3>The macrolanguage</h3>
-<ul>
-	<li><a href="asm/print.htm">Printing out things during assembling</a>
-	<li><a href="asm/rept.htm">Automatically repeating blocks of code</a>
-	<li><a href="asm/fail.htm">Aborting the assembly process</a>
-	<li><a href="asm/include.htm">Including other sourcefiles</a>
-	<li><a href="asm/if.htm">Conditional assembling</a>
-	<li><a href="asm/expr_int.htm">Integer and Boolean expressions</a>
-	<li><a href="asm/expr_fix.htm">Fixed-point expressions and functions</a>
-	<li><a href="asm/expr_str.htm">String expressions, functions and formatting</a>
-	<li><a href="asm/miscfunc.htm">Other functions</a>
-</ul>
-
-<h3>Other ways than mnemonics to define data</h3>
-<ul>
-	<li><a href="asm/db.htm">Defining constant data</a>
-	<li><a href="asm/ds.htm">Declaring variables in a BSS section</a>
-	<li><a href="asm/incbin.htm">Including binary files</a>
-</ul>
-
-<h3>Target specific information</h3>
-<ul>
-	<li><a href="asm/trg_gb.htm">The Gameboy</a>
-</ul>
-
-<h3>Alphabetical list of the macro-language instructions and functions</h3>
-<ul>
-	<li><a href="asm/presym.htm">@</a>
-	<li><a href="asm/presym.htm">__DATE__</a>
-	<li><a href="asm/presym.htm">__LINE__</a>
-	<li><a href="asm/presym.htm">__TIME__</a>
-	<li><a href="asm/presym.htm">_NARG</a>
-	<li><a href="asm/presym.htm">_PI</a>
-	<li><a href="asm/presym.htm">_RS</a>
-	<li><a href="asm/expr_fix.htm">ACOS</a>
-	<li><a href="asm/expr_fix.htm">ASIN</a>
-	<li><a href="asm/expr_fix.htm">ATAN</a>
-	<li><a href="asm/expr_fix.htm">ATAN2</a>
-	<li><a href="asm/miscfunc.htm">BANK</a>
-	<li><a href="asm/section.htm">BSS</a>
-	<li><a href="asm/section.htm">CODE</a>
-	<li><a href="asm/expr_fix.htm">COS</a>
-	<li><a href="asm/section.htm">DATA</a>
-	<li><a href="asm/db.htm">DB</a>
-	<li><a href="asm/miscfunc.htm">DEF</a>
-	<li><a href="asm/expr_fix.htm">DIV</a>
-	<li><a href="asm/ds.htm">DS</a>
-	<li><a href="asm/db.htm">DW</a>
-	<li><a href="asm/if.htm">ELSE</a>
-	<li><a href="asm/if.htm">ENDC</a>
-	<li><a href="asm/macro.htm">ENDM</a>
-	<li><a href="asm/rept.htm">ENDR</a>
-	<li><a href="asm/equ.htm">EQU</a>
-	<li><a href="asm/equs.htm">EQUS</a>
-	<li><a href="asm/export.htm">EXPORT</a>
-	<li><a href="asm/fail.htm">FAIL</a>
-	<li><a href="asm/export.htm">GLOBAL</a>
-	<li><a href="asm/section.htm">HRAM</a>
-	<li><a href="asm/if.htm">IF</a>
-	<li><a href="asm/export.htm">IMPORT</a>
-	<li><a href="asm/incbin.htm">INCBIN</a>
-	<li><a href="asm/include.htm">INCLUDE</a>
-	<li><a href="asm/macro.htm">MACRO</a>
-	<li><a href="asm/expr_fix.htm">MUL</a>
-	<li><a href="asm/opt.htm">OPT</a>
-	<li><a href="asm/popo.htm">POPO</a>
-	<li><a href="asm/pops.htm">POPS</a>
-	<li><a href="asm/print.htm">PRINTF</a>
-	<li><a href="asm/print.htm">PRINTT</a>
-	<li><a href="asm/print.htm">PRINTV</a>
-	<li><a href="asm/purge.htm">PURGE</a>
-	<li><a href="asm/popo.htm">PUSHO</a>
-	<li><a href="asm/pops.htm">PUSHS</a>
-	<li><a href="asm/rept.htm">REPT</a>
-	<li><a href="asm/rs.htm">RB</a>
-	<li><a href="asm/rs.htm">RSRESET</a>
-	<li><a href="asm/rs.htm">RSSET</a>
-	<li><a href="asm/rs.htm">RW</a>
-	<li><a href="asm/section.htm">SECTION</a>
-	<li><a href="asm/set.htm">SET</a>
-	<li><a href="asm/shift.htm">SHIFT</a>
-	<li><a href="asm/expr_fix.htm">SIN</a>
-	<li><a href="asm/expr_str.htm">STRCAT</a>
-	<li><a href="asm/expr_str.htm">STRCMP</a>
-	<li><a href="asm/expr_str.htm">STRIN</a>
-	<li><a href="asm/expr_str.htm">STRLEN</a>
-	<li><a href="asm/expr_str.htm">STRLWR</a>
-	<li><a href="asm/expr_str.htm">STRSUB</a>
-	<li><a href="asm/expr_str.htm">STRUPR</a>
-	<li><a href="asm/expr_fix.htm">TAN</a>
-	<li><a href="asm/section.htm">VRAM</a>
-	<li><a href="asm/fail.htm">WARN</a>
-	<li><a href="asm/export.htm">XDEF</a>
-	<li><a href="asm/export.htm">XREF</a>
-</ul>
-
-<p>Last updated 20 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/db.htm

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm DB, DW</title>
-	<link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>DB, DW</h1>
-<p><dfn>DB</dfn> defines a list of bytes that will be stored in the final image. Ideal for tables and text.</p>
-<pre>DB   1,2,3,4,"This is a string"</pre>
-<p>Alternatively you can use <dfn>DW</dfn> to store a list of words. Strings are not allowed as arguments to DW.</p>
-<p>You can also use DB and DW without arguments. This works exactly like “DS 1” and “DS 2” respectively. Consequently DB and DW can be used in a BSS/HRAM/VRAM section.</p>
-<h1>See also:</h1>
-<ul>
-	<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-	<li><a href="expr_fix.htm">Fixed-point expressions and functions</a>
-	<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-	<li><a href="ds.htm">Declaring variables in a BSS section</a>
-	<li><a href="miscfunc.htm">Other functions</a>
-</ul>
-
-<hr>
-<p>Last updated 02 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/ds.htm

@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm DS</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>DS</h1>
-<p><dfn>DS</dfn> allocates a number of bytes. The content is undefined. This is the preferred method of allocationg space in a <a href="section.htm">BSS section</a>. You can however also use DB and DW without any arguments.</p>
-<pre>DS   str_SIZEOF     ;allocate str_SIZEOF bytes</pre>
-<h1>See also:</h1>
-<ul>
-	<li><a href="db.htm">Defining constant data (DB/DW)</a>
-	<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-</ul>
-<hr>
-<p>Last updated 02 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/equ.htm

@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm EQU</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>EQU</h1>
-<p>EQUates are constant symbols. They can for example be used for things such as bit-definitions of hardware-registers.</p>
-<pre>DONUT_ISGOOD   EQU  $01
-DONUT_ISBAD    EQU  $02</pre>          
-<p>Note that a colon (:) following the label-name is not allowed. EQUates can be <a href="export.htm">exported and imported</a>. They don't change their value during the link process.</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/equs.htm

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm EQUS</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>EQUS</h1>
-<p>EQUS is used to define string-symbols. Wherever the assembler meets a string symbol its name is replaced with its value. If you are familiar with C you can think of it as the same as #define.</p>
-<pre>COUNTREG EQUS "[hl+]"
-          
-         ld   a,COUNTREG</pre>
-<p>(Note that : following the label-name is not allowed.)</p>
-<p>This will be interpreted as:</p>
-<pre>         ld   a,[hl+]</pre>
-<p>String-symbols can also be used to define small one-line macros:</p>
-<pre>PUSHA    EQUS "push af\npush bc\npush de\npush hl\n"</pre>
-<p>Note that a colon (:) following the label-name is not allowed. String equates can't be exported or imported.</p>
-<h1>See also:</h1>
-<ul>
-	<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/export.htm

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm EXPORT/XREF, IMPORT/XDEF, GLOBAL</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>EXPORT/XREF, IMPORT/XDEF, GLOBAL</h1>
-<p>Importing and exporting of symbols is a feature that is very useful when your project spans many source-files and for example you need to jump to a routine defined in another file.</p>
-<table>
-	<caption>Import/export commands</caption>
-<thead>
-<tr>
-	<th scope="col">Command</th>
-	<th scope="col">Meaning</th>
-</tr>
-</thead>
-<tr>
-	<td>IMPORT (or XREF) <i>label</i>[,<i>label</i>,...]</td>
-	<td>This  instructs the assembler to define label as if it were present
-                  in the current file but leave the address calculation to the linker.</td>
-</tr>
-<tr>
-	<td>EXPORT (or XDEF) <i>label</i>[,<i>label</i>,...]</td>
-	<td>The  assembler will make <i>label</i> accessible to other files during the link process.</td>
-</tr>
-<tr>
-	<td>GLOBAL <i>label</i>[,<i>label</i>,...]</td>
-	<td>If <i>label</i> is defined during the assembly it will be exported, if not it will be imported. Handy (very!) for include-files.</td>
-</tr>
-</table>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body></html>

doc/asm/expr_fix.htm

@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Fixed-point expression</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>Fixed‐point Expressions</h1>
-<p>Fixed point constants are basically normal 32-bit constants where the upper 16 bits are used for the integer part and the lower 16 bits are used for the fraction (65536ths). This means that you can use them in normal integer expression and indeed some integer operators like plus and minus don't care whether the operands are integer or fixed-point. You can easily convert a fixed-point number to an integer by shifting it right 16 bits. It follows that you can convert an integer to a fixed-point number by shifting it left.</p>
-<p>Some things are different for fixed-point math though. Which is why you have the following functions to use:</p>
-
-<table>
-<thead>
-<tr>
-	<th scope="col">Name</th>
-	<th scope="col">Operation</th>
-</tr>
-</thead>
-<tr>
-	<td>DIV(x,y)</td>
-	<td>x/y</td>
-</tr>
-<tr>
-	<td>MUL(x,y)</td>
-	<td>x*y</td>
-</tr>
-<tr>
-	<td>SIN(x)</td>
-	<td>sin(x)</td>
-</tr>
-<tr>
-	<td>COS(x)</td>
-	<td>cos(x)</td>
-</tr>
-<tr>
-	<td>TAN(x)</td>
-	<td>tan(x)</td>
-</tr>
-<tr>
-	<td>ASIN(x)</td>
-	<td>sin<SUP>-1</SUP>(x)</td>
-</tr>
-<tr>
-	<td>ACOS(x)</td>
-	<td>cos<SUP>-1</SUP>(x)</td>
-</tr>
-<tr>
-	<td>ATAN(x)</td>
-	<td>tan<SUP>-1</SUP>(x)</td>
-</tr>
-<tr>
-	<td>ATAN2(x,y)</td>
-	<td>(x,y) angle</td>
-</tr>
-</table>
-<p>These  functions are extremely useful for automatic generation of various tables. A circle has 65536.0 degrees. Sine values are between [-1.0;1.0]</p>
-<pre>; --
-; -- Generate a 256 byte sine table with values between 0 and 128
-; --
-ANGLE   SET     0.0
-        REPT    256
-        DB      (MUL(64.0,SIN(ANGLE))+64.0)>>16
-ANGLE   SET     ANGLE+256.0
-        ENDR</pre>
-<h1>See also:</h1>
-<ul>
-	<li><a href="symbols.htm">Symbols</a>
-	<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-	<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-	<li><a href="miscfunc.htm">Other functions</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/expr_int.htm

@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Integer/Boolean expressions</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>Integer and Boolean expressions</h1>
-<p>An expression can be composed of many things. Expressions are always evaluated using signed 32-bit math.</p>
-<p>The most basic expression is just a single number.</p>
-<h2>Numeric Formats</h2>
-<p>xAsm has a number of numeric formats.</p>
-<ul>
-	<li>Hexadecimal: $0123456789ABCDEF. Case-insensitive
-	<li>Decimal: 0123456789
-	<li>Octal: &01234567
-	<li>Binary: %01
-	<li>Fixedpoint (16.16): 01234.56789
-	<li>Character constant: "ABYZ"
-	<li>Gameboy graphics: `0123
-</ul>
-<p>The last one, Gameboy graphics, is quite interesting and useful. The values are actually pixel values and it converts the “chunky” data to “planar” data as used in the Gameboy.</p>
-<pre>DW   `01012323</pre>
-<p>Admittedly an expression with just a single number is quite boring. To spice things up a bit there’s a few operators you can use to perform calculations between numbers.</p>
-<h2>Operators</h2>
-<p>A great number of operators you can use in expressions are available (listed in order of precedence):</p>
-<table>
-	<caption>Operators</caption>
-<thead>
-<tr>
-	<th scope="col">Operator</th>
-	<th scope="col">Meaning</th>
-</tr>
-</thead>
-<tr>
-	<td>( )</td>
-	<td>Precedence override</td>
-</tr>
-<tr>
-	<td>FUNC()</td>
-	<td>Functioncall</td>
-</tr>
-<tr>
-	<td>~ + -</td>
-	<td>Unary not/plus/minus</td>
-</tr>
-<tr>
-	<td>* / %</td>
-	<td>Multiply/divide/modulo</td>
-</tr>
-<tr>
-	<td>&lt;&lt; &gt;&gt;</td>
-	<td>Shift left/right</td>
-</tr>
-<tr>
-	<td>&amp; | ^</td>
-	<td>Binary and/or/xor</td>
-</tr>
-<tr>
-	<td>+ -</td>
-	<td>Add/subtract</td>
-</tr>
-<tr>
-	<td>!= == &lt;= &gt;= &lt; &gt;</td>
-	<td>Boolean comparison</td>
-</tr>
-<tr>
-	<td>&amp;&amp; ||</td>
-	<td>Boolean and/or</td>
-</tr>
-<tr>
-	<td>!</td>
-	<td>Unary Boolean not</td>
-</tr>
-</table>     
-
-<p>The result of the boolean operators is zero if when FALSE and non-zero when TRUE. Thus it is legal to use an integer as the condition for <a href="if.htm">IF</a> blocks. You can use symbols instead of numbers in your expression if you wish.</p>
-
-<p>An expression is said to be constant when it doesn't change its value during linking. This basically means that you can't use labels in those expressions. The instructions in the macro-language all require expressions that are constant.</p>
-<h1>See also:</h1>
-<ul>
-	<li><a href="symbols.htm">Symbols</a>
-	<li><a href="expr_fix.htm">Fixed-point expressions and functions</a>
-	<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-	<li><a href="miscfunc.htm">Other functions</a>
-</ul>
-
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/expr_str.htm

@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm String expressions</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>String Expressions</h1>
-<p>The most basic string expression is any number of characters contained in double quotes ("for instance"). As in C the escape character is <b>\</b> and there is a number of commands you can use within a string:</p>
-<table>
-	<caption>Escape characters:</caption>
-<thead>
-<tr>
-	<th scope="col">Character sequence</th>
-	<th scope="col">Meaning</th>
-	<th scope="col">Notes</th>
-</tr>
-</thead>
-<tr>
-	<td>\\</td>
-	<td>Backslash</td>
-	<td></td>
-</tr>
-<tr>
-	<td>\"</td>
-	<td>Double-quote</td>
-	<td></td>
-</tr>
-<tr>
-	<td>\{</td>
-	<td>Curly bracket left</td>
-	<td></td>
-</tr>
-<tr>
-	<td>\}</td>
-	<td>Curly bracket right</td>
-	<td></td>
-</tr>
-<tr>
-	<td>\n</td>
-	<td>Newline ($0A)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>\t</td>
-	<td>Tab ($09)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>\1-\9</td>
-	<td>Macroargument</td>
-	<td>Only in macros</td>
-</tr>
-<tr>
-	<td>\@</td>
-	<td>Labelname suffix</td>
-	<td>Only in macros and repts</td>
-</tr>
-</table>
-
-<p>A funky feature is <b>{symbol}</b> withing a string. This will examine the type of the symbol and insert its value accordingly. If symbol is a string symbol the symbols value is simply copied. If it's a numeric symbol the value is converted to hexadecimal notation and inserted as a string.</p>
-<p><strong>HINT:</strong> The <b>{symbol}</b> construct can also be used outside strings. The symbols value is again inserted as a string. This is just a short way of doing &quot;{symbol}&quot;.</p>
-<p>Whenever the macro-language expects a string you can actually use a string expression. This consists of one or more of these function. Yes, you can nest them. Note that some of these functions actually return an integer and can be used as part of an integer expression!</p>
-<table>
-	<caption>String functions:</caption>
-<thead>
-<tr>
-	<th scope="col">Name</th>
-	<th scope="col">Operation</th>
-</tr>
-</thead>
-<tr>
-	<td>STRLEN(<i>stringexpr</i>)</td>
-	<td>Returns the number of characters in <i>string</i></td>
-</tr>
-<tr>
-	<td>STRCAT(<i>stringexpr1,stringexpr2</i>)</td>
-	<td>Appends <i>stringexpr2</i> to <i>stringexpr1</i>.</td>
-</tr>
-<tr>
-	<td>STRCMP(<i>stringexpr1,stringexpr2</i>)</td>
-	<td>Returns negative if <i>stringexpr1</i> is alphabetically less than <i>stringexpr2</i><BR>Zero if they match<BR>Positive if greater than</td>
-</tr>
-<tr>
-	<td>STRIN(<i>haystack,needle</i>)</td>
-	<td>Returns <i>needle</i>s position within <i>haystack</i> or zero if it's not present</td>
-</tr>
-<tr>
-	<td>STRSUB(<i>stringexpr,pos,count</i>)</td>
-	<td>Returns a substring of <i>stringexpr</i> starting at <i>pos</i> (first character is position 1) and with <i>count</i> characters</td>
-</tr>
-<tr>
-	<td>STRUPR(<i>stringexpr</i>)</td>
-	<td>Converts all characters in <i>string</i> to capitals and returns the new string</td>
-</tr>
-<tr>
-	<td>STRLWR(<i>string</i>)</td>
-	<td>Converts all characters in <i>string</i> to lower case and returns the new string</td>
-</tr>
-</table>
-
-<h1>See also:</h1>
-<ul>
-	<li><a href="symbols.htm">Symbols</a>
-	<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-	<li><a href="expr_fix.htm">Fixed-point expressions and functions</a>
-	<li><a href="miscfunc.htm">Other functions</a>
-</ul>
-
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/fail.htm

@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm FAIL, WARN</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>FAIL, WARN</h1>
-<p>FAIL and WARN can be used to terminate the assembling process if you wish to do so. This is especially useful for macros that get an invalid argument. FAIL and WARN take a string as the only argument and they will print this string out as a normal error with a linenumber.</p>
-<p>FAIL stops assembling immediately while WARN continues after printing the errormessage.</p>
-
-<h1>See also:</h1>
-<ul>
-<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/history.htm

@@ -1,224 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm History</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>xAsm History</h1>
-<table>
-	<caption>The history of xAsm</caption>
-<thead>
-<tr>
-	<th scope="col">Version</th>
-	<th scope="col">Dated</th>
-	<th scope="col">Release notes</th>
-</tr>
-</thead>
-<tr>
-	<td>1.0</td>
-	<td>1 Oct. 96</td>
-	<td>First release</td>
-</tr>
-<tr>
-	<td>1.01</td>
-	<td>1 Dec. 96</td>
-	<td><ul>
-<li>Fixed  bug  in <a href="incbin.htm">INCBIN</a> (sometimes reported the section full)</li>
-                 <li>Added <a href="miscfunc.htm">DEF()</a> function
-</ul></td>
-</tr>
-<tr>
-	<td>1.02</td>
-	<td>12 Feb. 97</td>
-	<td><ul>
-<li>Added <a href="expr_str.htm">STRLEN(), STRCAT(), STRIN(), STRCMP(), STRSUB(), STRUPR() and STRLWR()</a> functions</li>
-	<li><a href="export.htm">IMPORT/EXPORT/GLOBAL</a> takes multiple arguments now</li>
-	<li><a href="section.htm">HRAM</a> sectiontype added</li>
-	<li>ORG like features added to <a href="section.htm">SECTION</a></li>
-	<li><a href="trg_gb.htm">LDIO</a> mnemonic added</li>
-</ul></td>
-</tr>
-<tr>
-	<td>1.03</td>
-	<td>23 Mar. 97</td>
-	<td><ul>
-<li>The <a href="section.htm">HRAM section</a> was 128 bytes long instead of 127. potentially thrashing the interrupt enable register if you filled the HRAM.</li>
-	<li>The <a href="miscfunc.htm">BANK() function</a>, when used on a symbol defined in the current sourcefile, returned the wrong bank ID. (reported by Harry P. Mulder)</li>
-	<li>The <a href="miscfunc.htm">BANK() function</a> didn't check whether the argument was a properly defined symbol. (reported by Harry P. Mulder)</li>
-	<li>Completely new lexical analyser module. This fixed several linenumber bugs and other macro/if/rept related bugs. Also fixed a bug which made it possible to have equated symbols with the same name as a reserved keyword (if you get a "parse error" with this release on some of your sources, this is probably what is going on)</li>
-	<li><a href="fail.htm">FAIL and WARN</a> commands.</li>
-	<li><a href="presym.htm">__LINE__, __FILE__, __TIME__, __DATE__</a> predefined symbols added.</li>
-</ul>
-</td>
-</tr>
-<tr>
-	<td>1.04</td>
-	<td>03 July 1997</td>
-	<td><ul><li>First ASMotor release</li>
-<li><a href="presym.htm">__TIME__ and __DATE__</a> give todays date instead of when the assembler was compiled.</li>
-<li>Sometimes the first line of a file wouldn't assemble correctly. Reported by Jeff Frohwein.</li>
-<li>Unrolling multiline <a href="equs.htm">string symbols</a> left the linecounter in a sorry state. Jeff Frohwein again.</li>
-<li><a href="db.htm">DB and DW</a> can now (officially ;-) be used in BSS/HRAM/VRAM sections without any arguments to reserve a byte or a word respectively. Reported/suggested/inspired by Mr. Frohwein.</li>
-<li>The character # can now be used as part of a <a href="symbols.htm">symbol name</A>. Jeff....</li>
-<li>The <a href="rs.htm">RS</a> counter "_RS" is now defined from the very start of the assembly process instead of after the first RSSET or RSRESET.</li>
-<li>Bug fixed: You couldn't use \0-\9 and \@ in <a href="expr_str.htm">{} constructs</a></li>
-<li><a href="purge.htm">PURGE</a> pseudo-op added. Purges a symbol from the symboltable and memory. Use with extreme caution! Inspired by Harry P. Mulder</li>
-<li><a href="macro.htm">MACRO</a> parameter passing method changed drastically. Read (and re-read) the manual for details. Suggested by Harry P. Mulder.</li>
-</ul>
-</td>
-<tr>
-	<td>1.05</td>
-	<td>20 July 1997</td>
-	<td><B>RGBDS fixes:</B><BR>
-	RGBAsm supports the LDD and LDI syntax plus [HLD] and [HLI]. LDH is
-	synonymous with LDIO.<BR>
-	<B>General fixes:</B><BR>
-There was a bug in the macro parameter passing. Any whitespace after the
-last parameter would be appended to the last parameter. Reported by Jeff Frohwein.<BR>
-A section stack has been implemented. Look up <a href="pops.htm">POPS and PUSHS</A>. Jeff Frohweins doing again.<BR>
-<a href="opt.htm">OPT</A> command added for defining and changing some options while assembling.<BR>
-You can now define which characters are used for the <a href="expr_int.htm">Gameboy graphics
-integer (`)</A> using the <a href="usage.htm">commandline</A> or the new <a href="opt.htm">OPT</A> command. Cool idea by (surprise surprise) Jeff Frohwein.<BR>
-Also, an option stack has been added. Look up <a href="popo.htm">POPO and PUSHO</A> in the
-manual.<BR>
-Fixed yet another line number bug reported by Jeff Frohwein (when will this guy leave me alone? ;)<BR>
-</td>
-<tr>
-	<td>1.06</td>
-	<td>22 July 1997</td>
-	<td><B>General fixes:</B><BR>
-The lamest typo bug of all time has been fixed. RGBAsm would output a word defined with DW as 4 bytes instead of 2. Jeff Frohwein reported this.<BR>
-The first line of an included file didn't assemble correctly.<BR>
-<a href="usage.htm">-b option</A> added for setting the characters used for binary constants.<BR>
-</td>
-</tr>
-<tr>
-	<td>1.08</td>
-	<td>21 September 1997</td>
-	<td><B>General fixes:</B><BR>
-A crash occured if you tried to use a macro symbol in an expression.
-(Jeff Frohwein)<BR>
-You couldn't use STRCMP, STRLEN and STRIN in relocatable expressions. (Harry
-P. Mulder)<BR>
-Relocatable symbols are no longer allowed as arguments to the DEF function.<BR>
-Bug fixed in the assembler where it would sometimes write out too many bytes
-for HRAM section definitions.<BR>
-</td>
-</tr>
-	<tr>
-		<td>1.08</td>
-		<td>02 July 1999</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			DQ directive added for defining 32-bit data constants. See operation of DW &amp; DB.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>05 July 1999</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			Allow only a part of a binary file to be included instead of the whole thing.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>10 June 1999</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			Added output of file dependency information for each file included/assembled. Enabled with a command line option.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>?? ???? 1999</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			Added ORG directive to allow anonymous sections.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>?? ???? 1999</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			Added ability to output error information in either RGBDS or Microsoft Developer Studio format.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>?? ???? 1999</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			Added pseudo-instructions to handle NE (not equal), EQ (equal), and LT (less than) on JR/JP/CALL instructions
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>?? ???? 1999</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			Added STRTRIM, STRLTRIM, STRRTRIM directives to allow trimming of white space from strings in macro arguments.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>?? ???? 1999</td>
-		<td>
-			<B>Bug Fix:</B>
-			<BR>
-			When an "unknown symbol" error was reported during the link phase the undefined symbol was not given.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.08</td>
-		<td>?? ???? 1999</td>
-		<td>
-			<B>Bug Fix:</B>
-			<BR>
-			Declaring a symbol as GLOBAL in a header file and then referencing it in code but never defining it would crash the linker.
-			<BR>
-		</td>
-	</tr>
-	<tr>
-		<td>1.09</td>
-		<td>08 February 2000</td>
-		<td>
-			<B>Feature:</B>
-			<BR>
-			Can now use a command line option to set the number format between a slightly tweaked Motorola/RGBDS format and Zilog.
-			<BR>
-			Hex numbers can now be represented as $FF or FFh.
-			<BR>
-			Octal as &amp;77 or 77o.
-			<BR>
-			Binary as %10010110 or 10010110b.
-			<BR>
-			Gameboy graphics numbers as `1001 or 1001g.
-			<BR>
-			Decimal numbers remain unchanged.
-			<BR>
-		</td>
-	</tr>
-
-</TABLE>
-
-<BR><HR>
-<FONT SIZE="-1"><I><P ALIGN=RIGHT>Last updated 21 September 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</A></P></I></FONT>

doc/asm/if.htm

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm IF, ELSE, ENDC</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>IF, ELSE, ENDC</h1>
-<p>These three commands is used to conditionally assemble parts of your file. It is a powerful feature commonly used in macros.</p>
-<pre>IF   2+2==4
-PRINTT    "2+2==4\n"
-ELSE
-PRINTT    "2+2!=4\n"
-ENDC</pre>
-<p>The ELSE block is optional. IF/ELSE/ENDC-blocks can be nested.</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/incbin.htm

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm INCBIN</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>INCBIN</h1>
-<p>You  probably have some graphics you’d like to include. Use <dfn>INCBIN</dfn> to include a raw binary file as it is. If the file isn’t found in the current directory the <a href="usage.htm">include-path</a> list will be searched.</p>
-<pre>INCBIN    "titlepic.bin"
-INCBIN    "sprites\\hero.bin"</pre>
-<p>You can also include only part of a file with <b>INCBIN</b>. The example below includes 256 bytes from <i>data.bin</i> starting from position 78.</p>
-<pre>INCBIN    "data.bin",78,256</pre>
-<h1>See also:</h1>
-<ul>
-	<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/include.htm

@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm INCLUDE</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>INCLUDE</h1>
-<p>Use INCLUDE to process another assembler-file and then return to the current file when done. If the file isn't found in the current directory the <a href="usage.htm">include-path</a> list will be searched. You may nest <b>INCLUDE</b> calls infinitely (or until you run out of memory whichever comes first).</p>
-<pre>INCLUDE   "irq.inc"</pre>
-<h1>See also:</h1>
-<ul>
-<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/labels.htm

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Labels</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>Labels</h1>
-<p>One of the assembler’s main tasks is to keep track of addresses for you so you dor’t have to remember obscure numbers but can make do with a meaningful name, a label.</p>
-<p>This can be done in a number of ways:</p>
-<pre>GlobalLabel
-AnotherGlobal:
-.locallabel
-.yet_a_local:
-ThisWillBeExported::        ;note the two colons</pre>
-<p>This  is very similar to other assemblers. Local labels are  only accessible within the scope they are defined. A scope starts after a global label and ends at the next global label. You  may  or  may not have seen the <b>::</b> feature  before. It declares a normal global label but does an <a href="export.htm">EXPORT</a> at the same time.</p>
-<p>Labels will normally change their value during the <a href="../link.htm">link process</a> and are thus <em>not</em> constant.</p>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/macro.htm

@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm MACRO/ENDM</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>MACRO, ENDM</h1>
-<p>One of the best features of an assembler is the ability to write macros for it. Macros also provide a method of passing arguments to them and they can then react to the input using IF-constructs.</p>
-<pre>MyMacro:  MACRO
-          ld   a,80
-          call MyFunc
-          ENDM</pre>
-<p>The above example is a very simple macro. You execute the macro by typing its name.</p>
-<pre>          add  a,b
-          ld   sp,hl
-          MyMacro        ;This will be expanded
-          sub  a,87</pre>
-<p>When the assembler meets MyMacro it will insert the macrodefinition (the text enclosed in <b>MACRO/ENDM</b>).</p>
-<p id="labelsuffix">Suppose your macro contains a loop.</p>
-<pre>LoopyMacro:    MACRO
-               xor  a,a
-.loop          ld   [hl+],a
-               dec  c
-               jr   nz,.loop
-               ENDM</pre>
-<p>This is fine. That is, if you only use the macro once per <a href="labels.htm">scope</a>. To get around this problem there is a special label string equate called <b>\@</b> that you can append to your labels and it will then expand to a unique string.</p>
-<p><b>\@</b> also works in <a href="rept.htm">REPT-blocks</a> should you have any loops there.</p>
-<pre>LoopyMacro:    MACRO
-               xor  a,a
-.loop\@        ld   [hl+],a
-               dec  c
-               jr   nz,.loop\@
-               ENDM</pre>
-<h2>Arguments</h2>
-<p>I’d like <i>LoopyMacro</i> a lot better if I didn’t have to pre-load the registers with values and <em>then</em> call it. What  I’d like is the ability to pass it arguments and it then loaded the registers itself.</p>
-<p>And I can do that. In macros you can get the arguments by using the special macro string equates <b>\1</b> through <b>\9</b>, <b>\1</b> being the first argument specified on the calling of the macro.</p>
-<pre>LoopyMacro:    MACRO
-               ld   hl,\1
-               ld   c,\2
-               xor  a,a
-.loop\@        ld   [hl+],a
-               dec  c
-               jr   nz,.loop\@
-               ENDM</pre>
-<p>Now I can call the macro specifying two arguments. The first being the address and the second being a bytecount. The macro will then reset all bytes in this range.</p>
-<pre>               LoopyMacro     MyVars,54</pre>
-<p>You can specify up to nine arguments when calling a macro. Arguments are passed as string equates. There’s no need to enclose them in quotes. Parameter passing has changed a bit since v1.03 in that an expression will not be evaluated first but passed directly. This means that it’s probably a very good idea to use brackets around \1–\9 if you perform further calculations on them. For instance if you pass 1+2 as the first argument and then do <code>    PRINTV  \1*2</code>
-you will get the value 5 on screen and not 6 as you might have expected.</p>
-<p>Note that a colon (:) following the macro-name is required. Macros can't be exported or imported. It's valid to call a macro from a macro (yes, even the same one).</p>
-
-<h1>See also:</h1>
-<ul>
-<li><a href="shift.htm">SHIFT</a>
-</ul>
-<hr>
-<p>Last updated 02 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/miscfunc.htm

@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Other functions</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>Other functions</h1>
-<p>There's a few other functions that do various useful things:</p>
-<table>
-	<caption>Other functions</caption>
-<thead>
-<tr>
-	<th scope="col">Name</th>
-	<th scope="col">Operation</th>
-</tr>
-</thead>
-<tr>
-	<td>BANK(<i>label</i>)</td>
-	<td>Gameboy ONLY: Returns the bank number <i>label</i> is in. The link will have to resolve this so it can't be used when the expression has to be constant</td>
-</tr>
-<tr>
-	<td>DEF(<i>label</i>)</td>
-	<td>Returns TRUE if <i>label</i> has been defined</td>
-</tr>
-</table>
-<h1>See alse:</h1>
-<ul>
-	<li><a href="section.htm">Sections</a>
-	<li><a href="symbols.htm">Symbols</a>
-	<li><a href="presym.htm">Predeclared symbols</a>
-	<li><a href="if.htm">Conditional assembling</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/opt.htm

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm OPT</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>OPT</h1>
-<p>OPT can be used to change <I>some</I> of the options during assembling you source instead of defining them on the commandline.</p>
-<p>OPT takes a comma-seperated list of options as its argument:</p>
-
-<pre>    PUSHO
-    OPT   g.oOX    ;Set the GB graphics constants to use these characters
-    DW    `..ooOOXX
-    POPO
-    DW    `00112233</pre>
-<p>The options that OPT can modify are currently: <b>b, e and g</b></p>
-<h1>See also:</h1>
-<ul>
-<li><a href="usage.htm">Usage</a>
-<li><a href="popo.htm">The option stack</a>
-</ul>
-<hr>
-<p>Last updated 20 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/popo.htm

@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm POPO, PUSHO</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>POPO, PUSHO</h1>
-<p>POPO and PUSHO provide the interface to the option stack. PUSHO will push the current set of options on the option stack. POPO can then later be used to restore them. Useful if you want to change some options in an include file and you don't want to destroy the options set by the program that included your file. The stacks number of entries is limited only by the amount of memory in your machine.</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="opt.htm">Changing options while assembling</a>
-</ul>
-<hr>
-<p>Last updated 20 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/pops.htm

@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm POPS, PUSHS</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>POPS, PUSHS</h1>
-<p>POPS and PUSHS provide the interface to the section stack. PUSHS will push the current section context on the section stack. POPS can then later be used to restore it. Useful for defining sections in included files when you don't want to destroy the section context for the program that included your file. The stacks number of entries is limited only by the amount of memory in your machine.</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="section.htm">Sections</a>
-</ul>
-<hr>
-<p>Last updated 18 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/presym.htm

@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Predeclared symbols</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>Predeclared symbols</h1>
-<table>
-	<caption>Symbols</caption>
-<thead>
-<tr>
-	<th scope="col">Name</th>
-	<th scope="col">Contents</th>
-	<th scope="col">Type</th>
-</tr>
-</thead>
-<tr>
-	<td>@</td>
-	<td>PC value</td>
-	<td>EQU</td>
-</tr>
-<tr>
-	<td>_PI</td>
-	<td>Fixed point ¶</td>
-	<td>EQU</td>
-</tr>
-<tr>
-	<td>_RS</td>
-	<td>_RS counter</td>
-	<td>SET</td>
-</tr>
-<tr>
-	<td>_NARG</td>
-	<td>Number of arguments passed to macro</td>
-	<td>EQU</td>
-</tr>
-<tr>
-	<td>__LINE__</td>
-	<td>The current linenumber</td>
-	<td>EQU</td>
-</tr>
-<tr>
-	<td>__FILE__</td>
-	<td>The current filename</td>
-	<td>EQUS</td>
-</tr>
-<tr>
-	<td>__DATE__</td>
-	<td>Todays date</td>
-	<td>EQUS</td>
-</tr>
-<tr>
-	<td>__TIME__</td>
-	<td>The current time</td>
-	<td>EQUS</td>
-</tr>
-</table>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/print.htm

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm PRINTT, PRINTV, PRINTF</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>PRINTT, PRINTV, PRINTF</h1>
-<p>These  three  instructions  type  text and  values  to stdout. Useful for debugging macros or wherever you may feel the need to tell yourself some important information.</p>
-<pre>PRINTT    "I'm the greatest programmer in the whole wide world\n"
-PRINTV    (2+3)/5
-PRINTF    MUL(3.14,3987.0)</pre>
-<ul>
-	<li><dfn>PRINTT</dfn> prints out a string</li>
-	<li><dfn>PRINTV</dfn> prints out an integer value or, as in the example, the result of a calculation. Unsurprisingly you can also print out a <a href="symbols.htm">constant symbols</a> value</li>
-	<li><dfn>PRINTF</dfn> prints out a fixed point value.</li>
-</ul>
-
-<h1>See also:</h1>
-<ul>
-	<li><a href="asm/expr_int.htm">Integer and Boolean expressions</a>
-	<li><a href="asm/expr_fix.htm">Fixed-point expressions and functions</a>
-	<li><a href="asm/expr_str.htm">String expressions, functions and formatting</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/purge.htm

@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm PURGE</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>PURGE</h1>
-<p>The PURGE command allows you to completely remove a symbol from the symbol table as if it had never existed. USE WITH EXTREME CAUTION!!! I can’t stress this enough but you <em>seriously</em> need to know what you are doing. DON’T purge symbol that you use in expressions the linker needs to calculate. In fact, it’s probably not even safe to purge anything other than string symbols and macros.</p>
-<pre>Kamikaze    EQUS    "I don't want to live anymore"
-AOLer       EQUS    "Me too"
-            PURGE   Kamikaze,AOLer</pre>
-<p>Note that string symbols that are part of a PURGE command WILL NOT BE EXPANDED as the ONLY exception to this rule.</p>
-<hr>
-<p>Last updated 02 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/rept.htm

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm REPT, ENDR</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>REPT, ENDR</h1>
-<p>Suppose you’re feeling lazy and you want to unroll a time consuming loop. <dfn>REPT</dfn> is here for that purpose. Everything between REPT and ENDR will be repeated a number of times just as if you done a copy/paste operation yourself</p>
-<pre>REPT 4
-add  a,c
-ENDR</pre>
-<p>This will assemble <code>add a,c</code> four times.</p>
-<p>You can also use REPT to generate tables on the fly:</p>
-<pre>; --
-; -- Generate a 256 byte sine table with values between 0 and 128
-; --
-ANGLE   SET     0.0
-        REPT    256
-        DB      (MUL(64.0,SIN(ANGLE))+64.0)>>16
-ANGLE   SET     ANGLE+256.0
-        ENDR</pre>
-<p>REPT is also very useful in recursive macros and as in macros you can also use the special label operator \@. REPT-blocks can be nested.<p>
-<h1>See also:</h1>
-<ul>
-<li><a href="macro.htm#labelsuffix">\@</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/rs.htm

@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm RSSET, RSRESET, RB, RW</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>RSSET, RERESET, RB, RW</h1>
-<p>The <dfn>RS</dfn> group of commands is a handy way of defining structures:</p>
-<pre>              RSRESET
-str_pStuff    RW   1
-str_tData     RB   256
-str_bCount    RB   1
-str_SIZEOF    RB   0</pre>
-<p>The example defines four <a href="equ.htm">equated</a> symbols:</p>
-<table>
-	<caption>Defined symbols</caption>
-<thead>
-<tr>
-	<th scope="col">Name</th>
-	<th scope="col">Value</th>
-</tr>
-</thead>
-<tr>
-	<td>str_pStuff</td>
-	<td>0</td>
-</tr>
-<tr>
-	<td>str_tData</td>
-	<td>2</td>
-</tr>
-<tr>
-	<td>str_bCount</td>
-	<td>258</td>
-</tr>
-<tr>
-	<td>str_SIZEOF</td>
-	<td>259</td>
-</tr>
-</table>
-<p>There are four commands in the RS group of commands:</p>
-<table>
-	<caption>RS related commands</caption>
-<thead>
-<tr>
-	<th scope="col">Command</th>
-	<th scope="col">Meaning</th>
-</tr>
-</thead>
-<tr>
-	<td>RSRESET</td>
-	<td>Resets the <a href="presym.htm">_RS</a> counter to zero</td>
-</tr>
-<tr>
-	<td>RSSET <i>constexpr</i></td>
-	<td>Sets the <a href="presym.htm">_RS</a> counter to <i>constexpr</i></td>
-</tr>
-<tr>
-	<td>RB <i>constexpr</i></td>
-	<td>Sets the preceding symbol to <a href="presym.htm">_RS</a> and adds <i>constexpr</i> to _RS</td>
-</tr>
-<tr>
-	<td>RW <i>constexpr</i></td>
-	<td>Sets the preceding symbol to <a href="presym.htm">_RS</a> and adds <i>constexpr*2</i> to _RS</td>
-</tr>
-</table>
-<p>Note that a colon (:) following the symbol-name is not allowed. RS symbols can be exported and imported. They don't change their value during the link process.</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/section.htm

@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm SECTION</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>SECTION</h1>
-<p>Before you can start writing code you must define a section. This tells the assembler what kind of data follows and if it is code where to put it.</p>
-<pre>SECTION   "CoolStuff",CODE</pre>
-<p>This switches to the section called <b>"CoolStuff"</b> (or creates it if it doesn't already exits) and it defines it as a code section. All sections within a sourcefile must be identified by a <em>unique</em> name.</p>
-<table>
-	<caption>Section types</caption>
-<thead>
-<tr>
-	<th scope="col">Name</th>
-	<th scope="col">Function</th>
-</tr>
-</thead>
-<tr>
-	<td>CODE</td>
-	<td>A code section. The linker decides where to put this. For the Gameboy it also decides which bank to put it in except #0 (the HOME bank).</td>
-</tr>
-<tr>
-	<td>DATA</td>
-	<td>Really just a synonym for CODE.</td>
-</tr>
-<tr>
-	<td>BSS</td>
-	<td>This section is for variables. For the Gameboy it will be placed where the Gameboy RAM is.</td>
-</tr>
-<tr>
-	<td>HOME</td>
-	<td>Gameboy ONLY: A code section that will be placed in Gameboy bank #0.</td>
-</tr>
-<tr>
-	<td>VRAM</td>
-	<td>Gameboy ONLY: This section is for allocating VRAM and will be placed where the Gameboy VRAM is.</td>
-</tr>
-<tr>
-	<td>HRAM</td>
-	<td>Gameboy ONLY: This section is for allocating variables in the high RAM area ($FF80-$FFFE) and will be placed there. Suggested by Jens Ch. Restemeier. NOTE WELL: if you use this method of allocating HRAM the assembler will NOT choose the short addressingmode in the LD instruction because the actual address calculation is done by the linker! If you find this undesirable you can use <a href="rs.htm">RSSET/RB/RW</a> instead or use the LDIO mnemonic. The address calculation is then done by the assembler.</td>
-</tr>
-</table>
-<p>Due to quite a lot of emails requesting an ORG directive you can now add an address to the sectiontype for the Gameboy:</p>
-<pre>SECTION   "CoolStuff",HOME[$1234]</pre>
-<p>This will force the section to address $1234. This also works with the other sectiontypes. For CODE/DATA sections the linker  will then place the section in any bank at the address you specify. If you also want to specify the bank you can do:</p>
-<pre>SECTION   "CoolStuff",DATA[$4567],BANK[3]</pre>
-<p>And if you only want to force the section into a certain bank, and not it's position within the bank, that's also possible:</p>
-<pre>SECTION   "CoolStuff",CODE,BANK[7]</pre>
-<p><strong>HINT:</strong> If you think this is a lot of typing for doing a simple ORG type thing you can quite easily write an intelligent macro (called ORG for example) that uses <a href="expr_str.htm">\@</a> for the sectionname and determines correct sectiontype etc as arguments for SECTION</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="../link.htm">xLink</a> documentation
-<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-<li><a href="expr_str.htm">String expressions, functions and formatting</a>
-<li><a href="pops.htm">POPS and PUSHS:</a> The section stack.
-</ul>
-<hr>
-<p>Last updated <20>18 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/set.htm

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm SET</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>SET</h1>
-<p>SETs are like <a href="equ.htm">EQUates</a> also constant symbols in the sense that their values are defined during the assembly process. These symbols are normally used in macros.</p>
-<pre>KINKYCOUNT     SET  2
-KINKYCOUNT     SET  DONUT_ISGOOD+KINKYCOUNT</pre>
-<p>Note that a colon (:) following the label-name is not allowed. SETs can be exported and imported but the result is undefined and might change in a later release. Alternatively you can use = as a synonym for SET.</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="expr_int.htm">Integer and Boolean expressions</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>
-

doc/asm/shift.htm

@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm SHIFT</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>SHIFT</h1>
-<p><dfn>SHIFT</dfn> is a special command only available in <a href="macro.htm">macros</a>. Very useful in <a href="rept.htm">REPT-blocks</a>. It will "shift" the arguments by one "to the left". <b>\1</b> will get <b>\2</b>'s value, <b>\2</b> will get <b>\3</b>'s value and so forth.</p>
-<h1>See also:</h1>
-<ul>
-<li><a href="macro.htm">Macros</a>
-<li><a href="rept.htm">Automatically repeating blocks of code</a>
-</ul>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/symbols.htm

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Symbols</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>xAsm Symbols</h1>
-<p>xAsm supports several types of symbols:</p>
-<ul>
-<li><a href="labels.htm">Label</a>. Used to assign a memory location with a name
-<li><a href="equ.htm">EQUate</a>. Give a constant a name.
-<li><a href="set.htm">SET</a>. Same as EQUate but with a subtle difference. You can change the value of a SET during assembling.
-<li><a href="rs.htm">Structures (the RS group)</a>. Define a structure easily.
-<li><a href="equs.htm">String equate (EQUS)</a>. Give an often used string a name. Can also be used as a mini-macro. Much like #define in C.
-<li><a href="macro.htm">MACROs</a>. A block of code or pseudo instructions that you invoke like any other mnemonic. You can give them arguments too! Life is good.
-</ul>
-
-<p><strong>A symbol cannot have the same name as a reserved keyword.</strong></p>
-
-<h1>See also:</h1>
-<ul>
-<li><a href="presym.htm">Predeclared symbols</a>
-<li><a href="export.htm">Importing and exporting symbols</a>
-<li><a href="purge.htm">Purging symbols</a>
-</ul>
-<hr>
-<p>Last updated 02 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/syntax.htm

@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Syntax</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-
-<body>
-<h1>xAsm Syntax</h1>
-<p>The syntax line‐based, just as in any other assembler. Meaning that you do one instruction or pseudo‐op per line:</p>
-<pre>[label] [instruction] [;comment]</pre>
-<p>Example:</p>
-<pre>John:          ld   a,87 ;Weee</pre>
-<p>A comment can also be an asterisk (*) followed by the comment if the asterisk is the first character on the line:</p>
-<pre>********************************
-* These are full line comments *
-********************************</pre>
-<p>All pseudo‐ops, mnemonics and registers (reserved keywords) are <em>case‐insensitive</em> and all labels are <em>case‐sensitive</em>.</p>
-<hr>
-<p>Last updated 21 June 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/trg_gb.htm

@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Gameboy</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>Gameboy</h1>
-<p>The full GB-Z80 instruction-set is implemented with a few modifications to the original Zilog syntax. This is due to a Bison problem but in my opinion the syntax is better than the original one.</p>
-<h2>Instructions</h2>
-<ul>
-    <li>ADC
-    <li>ADD
-    <li>AND
-    <li>BIT
-    <li>CALL
-    <li>CCF
-    <li>CP
-    <li>CPL
-    <li>DAA
-    <li>DEC
-    <li>DI
-    <li>EI
-    <li>EX
-    <li>HALT
-    <li>INC
-    <li>JP
-    <li>JR
-    <li>LD
-    <li>LDD
-    <li>LDI
-    <li>LDH/LDIO    (see note below)
-    <li>NOP
-    <li>OR
-    <li>POP
-    <li>PUSH
-    <li>RES
-    <li>RET
-    <li>RETI
-    <li>RL
-    <li>RLA
-    <li>RLC
-    <li>RLCA
-    <li>RR
-    <li>RRA
-    <li>RRC
-    <li>RRCA
-    <li>RST
-    <li>SBC
-    <li>SCF
-    <li>SET
-    <li>SLA
-    <li>SRA
-    <li>SRL
-    <li>STOP
-    <li>SUB
-    <li>SWAP
-    <li>XOR
-</ul>
-<p>Note that you can use both
-<pre>    OR   A,B
-    OR   B</pre>
-<h2>Addressingmodes</h2>
-<p>Indirect addressing has been changed to [ ] instead  of ( ):</p>
-<ul>
-   <li> A
-   <li> B
-   <li> C
-   <li> D
-   <li> E
-   <li> H
-   <li> L
-   <li> AF
-   <li> BC
-   <li> DE
-   <li> HL
-   <li> SP
-   <li> [BC]
-   <li> [DE]
-   <li> [HL]
-   <li> [HL-]/[HLI]
-   <li> [HL+]/[HLD]
-   <li> [SP]
-   <li> n8       (8 bit expression)
-   <li> n16      (16 bit expression)
-   <li> n3       (3 bit CONSTANT expression)
-   <li> [n16]/[$FF00+n8]
-   <li> [$FF00+C]/[C]
-</ul>
-<p>The  assembler will intelligently decide between  <b>[n16]</b> and  <b>[$FF00+n8]</b> in the LD instruction.  Note however  that  if  you  use  any <a href="symbols.htm">constant symbols</a> in the expression they had better  be defined before the instruction or your symbol-table may become mangled. Also worth noting is that it will only ever select the short $FF00 mode when you use constant symbols. NOT if you use symbols defined in a <a href="section.htm">HRAM section</a>. As this defies the whole point of implementing the HRAM sectiontype I've added the LDIO mnemonic. It works like the LD instruction but it will ALWAYS generate the $FF00+ form and it will also automatically logically AND the expression with $FF if it is relocatable. Which is what you want. Trust me ;)</p>
-<h2>Conditioncodes</h2>
-<ul>
-<li>    C
-<li>    NC
-<li>    Z
-<li>    NZ
-</ul>
-<hr>
-<p>Last updated 20 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/asm/usage.htm

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xAsm Usage</title>
-        <link rel="stylesheet" type="text/css" href="../style.css">
-</head>
-<body>
-<h1>xAsm Usage</h1>
-<pre>C:\>xAsm [options] asmfile</pre>
-<p>Options are preceded by a hyphen (-) and go as follows:</p>
-<pre>    o<b>objectfile</b> : Write an <a href="../rgb0.htm">object-file</a> for <a href="../link.htm">xLink</a>
-    i<b>path</b>       : Add an extra include-path
-    h           : Short help text
-    e<b>(l|b)</b>      : Change endianness (CAUTION!)
-    g<b>ASCI</b>       : Change the four characters used for Gameboy graphics
-                  constants (default is <b>0123</b>)
-    b<b>AS</b>         : Change the two characters used for binary constants
-                  (default is <b>01</b>)
-    z<b>HX</b>         : Set the byte value (hex format) used for uninitialised data (default is ? for random)
-</pre>
-
-<h1>See also:</h1>
-<ul>
-<li><a href="opt.htm">Changing options while assembling</a>
-</ul>
-<hr>
-<p>Last updated 08 October 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/geninfo.htm

@@ -1,116 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>General Information</title>
-	<link rel="stylesheet" type="text/css" href="./style.css">
-</head>
-<body>
-<h1><abbr title="Rednex Game Boy Development System">RGBDS</abbr>—ASMotor General Information</h1>
-<h2>Table of Contents</h2>
-<ul>
-	<li><a href="#license">License</a>
-	<li><a href="#Author">The Author</a>
-	<li><a href="#Introduction">Introduction</a>
-	<li><a href="#Installation">Installation</a>
-	<li><a href="#Documentation">The Documentation</a>
-	<li><a href="#History">History</a>
-</ul>
-<h2 id="license">License</h2>
-<p>The <dfn>ASMotor</dfn> package (<a href="asm.htm">xAsm</a>, <a href="link.htm">xLink</a>, <a href="fix.htm">RGBFix</a>, examples and <a href="#Documentation">documentation</a>) is freeware and distributed as is. The author retains his copyright and right to modify the specifications and operation of the software without notice.
-<p>In other words this means I encourage you to…
-<ul>
-	<li>use it for whatever purpose even professional work without me charging you a penny
-	<li>copy it to another person (wholly or in part, though I’m sure he’d appreciate the whole package) in
-whatever form you find suitable
-	<li>mass-distribute the ASMotor package if it is complete (<a href="asm.htm">xAsm</a>, <a href="link.htm">xLink</a>, <a href="fix.htm">RGBFix</a> and documentation).
-	<li>contact me if you have any problems
-</ul>
-<p>This also means you can’t…
-<ul>
-	<li>blame me for loss of profit, data, sleep, food or other nasty things through the use or distribution of ASMotor. If
-you choose to use ASMotor you do so at your own risk.
-	<li>expect me to be able to help you should you have a problem related or not to ASMotor.
-</ul>
-<h2 id="Author">The Author</h2>
-<p>Any questions? Write me!
-<h3>Address</h3>
-<p>
-Carsten Sorensen<br>
-1 Spring Court<br>
-Guildford<br>
-Surrey GU2 6QW<br>
-United Kingdom<br>
-<h3 id="Email">e-mail:</h3>
-<ul>
-	<li><a href="mailto:surfsmurf@matilde.demon.co.uk">surfsmurf@matilde.demon.co.uk</a> (private)
-	<li><a href="mailto:csorensen@ea.com">csorensen@ea.com</a> (work)
-</ul>
-<p>Get the latest version from my web page at <a href="http://www.matilde.demon.co.uk">http://www.matilde.demon.co.uk</a>
-<h2 id="History">History</h2>
-<table>
-	<caption>The history of ASMotor</caption>
-<thead>
-<tr>
-	<th>Version</th>
-	<th>Dated</th>
-	<th>Release notes</th>
-</tr>
-</thead>
-<tr>
-	<td>1.0</td>
-	<td>03 July 1997</td>
-	<td>First release</td>
-</tr>
-<tr>
-	<td>1.01</td>
-	<td>20 July 1997</td>
-	<td><p>RGBDS fixes:</p>
-<ul>
-	<li>RGBFix can now also truncate the ROM-images to a valid size.
-	<li>RGBAsm supports the LDD and LDI syntax plus [HLD] and [HLI]. LDH is synonymous with LDIO.
-	<li>Example filenames have been changed to adhere to Jeff Frohweins proposed standard.
-</ul>
-	<p>General fixes:</p>
-<ul>
-	<li>RGBLink knows about big and little endian. Plus it can do range checking on intermediate results in an expression. This is necessary to support
-different types of CPUs.
-	<li>RGBLink <em>didn’t</em> know about the special PC symbol “@” so if you used it more than once per sourcefile in an expression the linker had to resolve, things would go horribly wrong.
-	<li>There was a bug in the macro parameter passing. Any whitespace after the last parameter would be appended to the last parameter. Reported by Jeff Frohwein.
-	<li>A section stack has been implemented. Look up POPS and PUSHS in the
-manual. Jeff Frohwein’s doing again.
-	<li>OPT command added for defining and changing some options while assembling.
-	<li>You can now define which characters are used for the Gameboy graphics integer (`) using the commandline or the new OPT command. Cool idea by (surprise surprise) Jeff Frohwein.
-	<li>Also, an option stack has been added. Look up POPO and PUSHO in the manual.
-	<li>Fixed yet another line number bug reported by Jeff Frohwein (when will this guy leave me alone? ;)
-</ul>
-</td>
-<tr>
-	<td>1.02</td>
-	<td>22 July 1997</td>
-	<td><p>General fixes:</p>
-<ul>
-	<li>The lamest typo bug of all time has been fixed. RGBAsm would output a word defined with DW as 4 bytes instead of 2. Jeff Frohwein reported this.
-	<li>The first line of an included file didn’t assemble correctly.
-	<li>-b option added for setting the characters used for binary constants.
-</ul>
-</td>
-</tr>
-<tr>
-	<td>1.10</td>
-	<td>21 Sep 1997</td>
-	<td><p>General fixes:</p>
-<ul>
-	<li>The assembler would crash if you tried to use a macro symbol in an expression.  (Jeff Frohwein)
-	<li>You couldn’t use STRCMP, STRLEN and STRIN in relocatable expressions. (Harry P. Mulder)
-	<li>Relocatable symbols are no longer allowed as arguments to the DEF function.
-	<li>Finally! A librarian and smart linking has been added.
-	<li>Bug fixed in the assembler where it would sometimes write out too many bytes for HRAM section definitions.
-	<li>-z options (set fill value used for uninitialised data) added to the
-assembler and linker.
-	<li>The assembler will now read in any type of ASCII file on any type of OS.
-</ul>
-</table>
-<p>Last updated 08 October 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/index.htm

@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>RGBDS—ASMotor Documentation</title>
-	<link rel="stylesheet" type="text/css" href="./style.css">
-</head>
-<body>
-<h1><abbr title="Rednex Game Boy Development System">RGBDS</abbr>—ASMotor v1.10 Documentation</h1>
-<h2>Table of Contents</h2>
-<ul>
-	<li><a href="geninfo.htm">ASMotor General Information</a>
-	<li><a href="asm.htm">xASM Documentation</a>
-	<li><a href="link.htm">xLink Documentation</a>
-	<li><a href="lib.htm">xLib Documentation</a>
-	<li><a href="fix.htm">RGBFix Documentation</a>
-	<li><a href="rgb0.htm">The RGB0-2 ObjectFileFormat</a>
-</ul>
-<p>Last updated 21 September 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/lib.htm

@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBliC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xLib</title>
-        <link rel="stylesheet" type="text/css" href="./style.css">
-</head>
-<body>
-<h1>xLib Documentation</h1>
-<h2>Table of Contents</h2>
-<ul>
-<li><a href="#history"> History</A>
-<li><a href="#usage"> Usage</A>
-<li><a href="#commands"> The commands</A>
-</ul>
-<hr>
-<h2 id="history">History</h2>
-<table>
-	<caption>The history of xLib</caption>
-<thead>
-<tr>
-	<th scope="col">Version</th>
-	<th scope="col">Dated</th>
-	<th scope="col">Release notes</th>
-</tr>
-</thead>
-<tr>
-	<td>1.0</td>
-	<td>21 Sep. 1997</td>
-	<td>First release</td>
-</tr>
-</table>
-<h2 id="usage">Usage</h2>
-<pre>    xlib library command [module1 module2 ... modulen]</pre>
-<h2 id="commands">The Commands</h2>
-<p>The <b>command</b> specified after <b>library</b> on the <a href="#Usage">commandline</a> tells xLib what to do.
-<p>The following commands are available:
-<ul>
-	<li>a — Adds (or replaces if already present) the modules to the library
-	<li>d — Deletes the modules specified from the library
-	<li>l — Lists the library contents
-	<li>x — Extracts the modules from the library
-</ul>
-<hr>
-<p>Last updated 21 September 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/link.htm

@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBliC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>xLink</title>
-        <link rel="stylesheet" type="text/css" href="./style.css">
-</head>
-<body>
-<h1>xLink Documentation</h1>
-<h2>Table of Contents</h2>
-<ul>
-<li><a href="#history"> History</a>
-<li><a href="#usage"> Usage</a>
-<li><a href="#linkfile"> The Linkfile</a>
-<li><a href="#operationtg"> Operation for Gameboy</a>
-<li><a href="#smallmode"> Operation for Gameboy small mode</a>
-<li><a href="#psion2"> Operation for Psion2 relocatable modules</a>
-</ul>
-<hr>
-<h2 id="history">History</h2>
-<table>
-	<caption>The history of xLink</caption>
-<thead>
-<tr>
-	<th scope="col">Version</th>
-	<th scope="col">Dated</th>
-	<th scope="col">Release notes</th>
-</tr>
-</thead>
-<tr>
-	<td>1.0</td>
-	<td>1 Oct. 96</td>
-	<td>First release (RGBDS)</td>
-</tr>
-<tr>
-	<td>1.01</td>
-	<td>3 Dec. 96</td>
-	<td>
-<ul>
-	<li>BANK() didn't work. Fixed.</li>
-	<li>Sections were quite often output in the wrong order. Fixed.</li>
-</ul>
-</tr>
-<tr>
-	<td>1.02</td>
-	<td>12 Feb. 97</td>
-	<td><a href="#usage">-s switch and mapfile option</A> added</td>
-</tr>
-<tr>
-	<td>1.03</td>
-	<td>23 Mar. 97</td>
-	<td>
-<ul>
-	<li><a href="#usage">Mapfile</A> now shows BSS, VRAM and HRAM areas</li>
-	<li>There was a bug regarding <a href="#operation">fixed HOME sections.</a>
-</ul></td>
-</tr>
-<tr>
-	<td>1.04</td>
-	<td>03 July 1997</td>
-	<td>First ASMotor release. Supports big-endian CPUs as well. <a href="#usage">Usage</a> changed to allow for different 	output fileformats</td>
-</tr>
-<tr>
-	<td>1.05</td>
-	<td>20 July 1997</td>
-	<td>
-<ul>
-	<li>We can now do range checking on intermediate results in an expression. This is necessary to support different types of CPUs.</li>
-	<li>RGBLink DIDN’T know about the special PC symbol "@" so if you used it more than once per sourcefile in an expression the linker had to resolve, things would go horribly wrong.</li>
-</ul>
-</td>
-<tr>
-	<td>1.06</td>
-	<td>21 September 1997</td>
-	<td><ul><li>Smart linking and library support added
-	<li>Program renamed to xLink
-</ul>
-</td>
-</table>
-<h2 id="usage">Usage</h2>
-<pre>    xlink [options] linkfile</pre>
-<p>Options are preceded by a hyphen (-) and go as follows:
-<pre>    h         : Short help text
-    m<b>mapfile</b>  : Write a mapfile
-    t         : Output target:
-      tg      : Gameboy <a href="#operationtg">ROM image</a> (default)
-      ts      : Gameboy <a href="#smallmode">Small mode (32kB)</a> ROM image
-      tp      : <a href="#psion2">Psion2</a> relocatable module
-    z<b>HX</b>       : Set the byte value (hex format) used for uninitialised data (default is ? for random)
-</pre>
-<h2 id="linkfile">The Linkfile</h2>
-<p>A linkfile is used to tell <B>xLink</B> which objects to include and what the outputname should be. It is in plain ASCII-format.
-<pre>    # Linkfile for foobar.gb
-      
-    [Objects]
-    foo.obj
-    bar.obj
-      
-    [Libraries]
-    mylib.lib
-
-    [Output]
-    foobar.gb</pre>
-<p>A line starting with # is ignored.
-<p>If you use libraries they will only be included if one of the objects actually reference them. This works on a SECTION level and not on a module level. This means that when you write libraries you can put each subroutine in its own SECTION so only the relevant bits are included.
-<h2 id="operationtg">Operation for Gameboy (-tg)</h2>
-<p><a href="asm.htm#sections">Sections</a> created with <b>HOME</b> in the assembler are placed in the GB bank #0 (the fixed bank $0000-$3FFF) in the order they are loaded from the objectfiles specified in the linkfile. So you want the first file in the linkfile to contain your header. <b>CODE/DATA</b> sections are placed in <em>any bank other than #0</em>. This means you have absolutely <em>no</em> control over which sections goes where. This insures minimal slack (unused bytes) at the end of each bank in the image.
-<p>Currently  the linker doesn't calculate the GB checksums.
-You must use <a href="fix.htm">RGBFix</a> to do this.
-
-<h3 id="smallmode">Operation for Gameboy small mode (-ts)</h3>
-<p>Small mode forces all <b>DATA/CODE</b> sections to be of type <b>HOME</b> and increases the <b>HOME</b> section size from 16kB to 32kB. This also means that <b>CODE/DATA/HOME</b> sections are written to the final image in the order you have specified in the linkfile.
-<p>Currently  the linker doesn't calculate the GB checksums. You must use <a href="fix.htm">RGBFix</a> to do this.
-
-<h2 id="psion2">Operation for Psion2 relocatable modules (-tp)</h2>
-<p>This is a fileformat for the Psion2 that allows you to load your code into where ever there's any free space. The only sections types allowed are <b>HOME, DATA and BSS</b>. All CODE and DATA sections are written to the output file in the order specified in the linkfile. The BSS are actually then expanded to DATA sections filled with zeroes and appended. This might change later.
-<p>The file looks like this (all values are big endian):
-<pre>
-LONG    NumberOfDataBytes
-REPT    NumberOfDataBytes
-    DB  x
-ENDR
-LONG    NumberOfPatches
-REPT    NumberOfPatches
-    LONG    x    ; A value to add to the word at address x in the code
-ENDR
-</pre>
-<hr>
-<p>Last updated 08 October 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

doc/rgb0.htm

@@ -1,210 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<title>RGB? Fileformat</title>
-        <link rel="stylesheet" type="text/css" href="./style.css">
-</head>
-<body>
-<h1>The RGB ObjectFileFormats</h1>
-<h2>Table of Contents</h2>
-<ul>
-	<li><a href="#background">Background</A>
-	<li><a href="#filestructure">FileStructure</A>
-	<li><a href="#rpn">Rpn Data</A>
-</ul>
-<h2 id="background">Background</h2>
-<p>I developed the RGB0 fileformat mainly because I needed a suitable dataformat to hold the output from <a href="asm.htm">xAsm</a> that was powerful to accomodate all the features I needed and also would make it easy for me to add new ones. The reason for documenting it is so people can write converters between it and other formats. Perhaps even develop other compilers for it?</p>
-<p>The RGB1 fileformat saw the light of day with the V1.02 of the old RGBDS release because of the addition of fixed sections.</p>
-<p>The RGB2 fileformat emerged because I needed to add support for big endian CPUs.</p>
-<h2 id="filestructure">FileStructure</h2>
-<ul>
-	<li><dfn>LONG</dfn> is a 32‐bit integer stored in little‐endian  format (Intel)
-	<li><dfn>BYTE</dfn> is an 8‐bit integer
-	<li><dfn>STRING</dfn> is a 0‐terminated string of <b>BYTE</b>
-</ul>
-<p>Down to business...</p>
-<pre>
-    ; There's a header...
-      
-    BYTE    ID[4]                      ;"RGB0", "RGB1", "RGB2"
-    LONG    NumberOfSymbols            ;The number of symbols used in this file
-    LONG    NumberOfSections           ;The number of sections used in this file
-      
-    ; Now for some symbols
-      
-    REPT    NumberOfSymbols            ;<b>NumberOfSymbols</b> symboldefs follow
-        STRING  Name                   ;The name of this symbol
-        BYTE    Type                   ;0 = LOCAL symbol only used in this file
-                                       ;1 = IMPORT this symbol from elsewhere
-                                       ;2 = EXPORT this symbol to other objects
-        IF      Type != 1
-            LONG    SectionID          ;The section number in which this symbol
-                                       ;is defined.  If -1 this symbol is an EQUate
-            LONG Value                 ;The symbols value. If SectionID!=-1 it's the
-                                       ;offset into that section
-        ENDC
-    ENDR
-      
-    ; And I'll be... Sections!
-      
-    REPT NumberOfSections
-        LONG    Size                   ;Size in bytes of this section
-        BYTE    Type                   ;0 = BSS
-                                       ;1 = VRAM
-                                       ;2 = CODE
-                                       ;3 = HOME
-                                       ;4 = HRAM
-        LONG    Org                    ;Only present in RGB1. Address to fix this
-                                       ;section at. -1 if the linker should
-                                       ;decide (normal operation)
-        LONG    Bank                   ;Only present in RGB1. Bank to load this
-                                       ;section into. -1 if the linker should
-                                       ;decide (normal operation). This field is
-                                       ;only valid for CODE sections.
-        IF      Type==CODE || Type==HOME
-            BYTE Data[Size]
-            LONG NumberOfPatches
-               
-            ; These types of sections may have patches
-               
-            REPT NumberOfPatches
-                STRING    SourceFile   ;The name of the sourcefile (for
-                                       ;printing an errormessage)
-                LONG Line              ;The line of the sourcefile
-                LONG Offset            ;Offset into the section where patch
-                                       ;should be applied
-                BYTE Type              ;0 = BYTE patch
-                                       ;1 = little endian WORD patch
-                                       ;2 = little endianLONG patch
-                                       ;3 = big endian WORD patch (RGB2 and later)
-                                       ;4 = big endianLONG patch (RGB2 and later)
-                LONG RPNSize
-                BYTE RPN[RPNSize]      ;RPN definition below
-            ENDR
-        ENDC
-    ENDR</pre>
-<h2 id="rpn">Rpn Data</h2>
-<p>Expressions in the objectfile are stored as <abbr title="Reverse Polish Notation">RPN</abbr>. This is an expression of the form “2 5 +”. This will first push the value “2” to the stack. Then “5”. The “+” operator pops two arguments from the stack, adds them, and then pushes the result on the stack, effectively replacing the two top arguments with their sum. In the RGB format RPN expressions are stored as <b>BYTE</b>s with some bytes being special prefixes for integers and symbols.</p>
-<table>
-	<caption>RPN Expressions</caption>
-<thead>
-<tr>
-	<th scope="col">Byte value</th>
-	<th scope="col">Meaning</th>
-</tr>
-</thead>
-<tr>
-	<td>$00</td>
-	<td>+ operator</td>
-</tr>
-<tr>
-	<td>$01</td>
-	<td>- operator</td>
-</tr>
-<tr>
-	<td>$02</td>
-	<td>* operator</td>
-</tr>
-<tr>
-	<td>$03</td>
-	<td>/ operator</td>
-</tr>
-<tr>
-	<td>$04</td>
-	<td>% operator</td>
-</tr>
-<tr>
-	<td>$05</td>
-	<td>unary -</td>
-</tr>
-<tr>
-	<td>$06</td>
-	<td>| operator</td>
-</tr>
-<tr>
-	<td>$07</td>
-	<td>& operator</td>
-</tr>
-<tr>
-	<td>$08</td>
-	<td>^ operator</td>
-</tr>
-<tr>
-	<td>$09</td>
-	<td>unary ~</td>
-</tr>
-<tr>
-	<td>$0A</td>
-	<td>&& comparison</td>
-</tr>
-<tr>
-	<td>$0B</td>
-	<td>|| comparison</td>
-</tr>
-<tr>
-	<td>$0C</td>
-	<td>unary !</td>
-</tr>
-<tr>
-	<td>$0D</td>
-	<td>== comparison</td>
-</tr>
-<tr>
-	<td>$0E</td>
-	<td>!= comparison</td>
-</tr>
-<tr>
-	<td>$0F</td>
-	<td>&gt comparison</td>
-</tr>
-<tr>
-	<td>$10</td>
-	<td>&lt comparison</td>
-</tr>
-<tr>
-	<td>$11</td>
-	<td>&gt= comparison</td>
-</tr>
-<tr>
-	<td>$12</td>
-	<td>&lt= comparison</td>
-</tr>
-<tr>
-	<td>$13</td>
-	<td>&lt&lt operator</td>
-</tr>
-<tr>
-	<td>$14</td>
-	<td>&gt&gt operator</td>
-</tr>
-<tr>
-	<td>$15</td>
-	<td>BANK() function for Gameboy, a symbol ID follows</td>
-</tr>
-<tr>
-	<td>$16</td>
-	<td>HRAMCheck for Gameboy, check if value is in HRAM and logically and it with 0xFF</td>
-</tr>
-<tr>
-	<td>$17</td>
-	<td>ZeroPageCheck for PC-Engine, check if value is in ZP (0x2000-0x20FF) and logically and it with 0xFF</td>
-</tr>
-<tr>
-	<td>$18</td>
-	<td>RangeCheck. LOW and HIGH signed LONGs follow. Checks a value to see if within the range [LOW;HIGH]. If not, generate an error.
-</td>
-</tr>
-<tr>
-	<td>$80</td>
-	<td>LONG integer follows</td>
-</tr>
-<tr>
-	<td>$81</td>
-	<td>Symbol ID follows</td>
-</tr>
-</table>
-<hr>
-<p>Last updated 18 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
-</body>
-</html>

include/asm/asm.h

@@ -6,18 +6,17 @@
  *
  */
 
-#ifndef ASMOTOR_ASM_ASM_H
-#define ASMOTOR_ASM_ASM_H
+#ifndef RGBDS_ASM_ASM_H
+#define RGBDS_ASM_ASM_H
 
-#include <stdlib.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-#include "asm/types.h"
+#include "types.h"
 #include "asm/symbol.h"
 
-#include "localasm.h"
-
-#include "asmotor.h"
+#include "asm/localasm.h"
 
 extern SLONG nLineNo;
 extern ULONG nTotalLines;
@@ -28,9 +27,9 @@ extern char tzCurrentFileName[_MAX_PATH + 1];
 extern struct Section *pCurrentSection;
 extern struct sSymbol *tHashedSymbols[HASHSIZE];
 extern struct sSymbol *pPCSymbol;
-extern UBYTE oDontExpandStrings;
+extern bool oDontExpandStrings;
 
-#define MAXMACROARGS	9
-#define MAXINCPATHS		16
+#define MAXMACROARGS	256
+#define MAXINCPATHS		128
 
 #endif	/* //       ASM_H */

include/asm/charmap.h

@@ -0,0 +1,18 @@
+#ifndef RGBDS_ASM_CHARMAP_H
+#define RGBDS_ASM_CHARMAP_H
+
+#define MAXCHARMAPS	512
+#define CHARMAPLENGTH	16
+
+struct Charmap {
+	int count;
+	char input[MAXCHARMAPS][CHARMAPLENGTH + 1];
+	char output[MAXCHARMAPS];
+};
+
+int readUTF8Char(char *destination, char *source);
+void charmap_Sort();
+int charmap_Add(char *input, UBYTE output);
+int charmap_Convert(char **input);
+
+#endif

include/asm/fstack.h

@@ -6,11 +6,13 @@
  *
  */
 
-#ifndef ASMOTOR_ASM_FSTACK_H
-#define ASMOTOR_ASM_FSTACK_H
+#ifndef RGBDS_ASM_FSTACK_H
+#define RGBDS_ASM_FSTACK_H
+
+#include <stdio.h>
 
 #include "asm/asm.h"
-#include "asm/types.h"
+#include "types.h"
 #include "asm/lexer.h"
 
 struct sContext {
@@ -27,14 +29,17 @@ struct sContext {
 	ULONG nREPTBlockSize;
 };
 
-extern ULONG fstk_RunInclude(char *s);
+void
+fstk_RunInclude(char *);
 extern void fstk_RunMacroArg(SLONG s);
-extern ULONG fstk_Init(char *s);
+void
+fstk_Init(char *);
 extern void fstk_Dump(void);
 extern void fstk_AddIncludePath(char *s);
 extern ULONG fstk_RunMacro(char *s);
 extern void fstk_RunRept(ULONG count);
-extern void fstk_FindFile(char *s);
+FILE *
+fstk_FindFile(char *);
 
 extern int yywrap(void);
 

include/asm/lexer.h

@@ -1,11 +1,12 @@
-#ifndef ASMOTOR_ASM_LEXER_H
-#define ASMOTOR_ASM_LEXER_H
+#ifndef RGBDS_ASM_LEXER_H
+#define RGBDS_ASM_LEXER_H
 
 #include <stdio.h>
 
-#include "asm/types.h"
+#include "types.h"
 
-#define LEXHASHSIZE	512
+#define LEXHASHSIZE (1 << 11)
+#define MAXSTRLEN 255
 
 struct sLexInitString {
 	char *tzName;
@@ -18,7 +19,9 @@ struct sLexFloat {
 };
 
 struct yy_buffer_state {
-	char *pBufferStart;
+	char *pBufferRealStart; // actual starting address
+	char *pBufferStart; // address where the data is initially written
+	                    // after the "safety margin"
 	char *pBuffer;
 	ULONG nBufferSize;
 	ULONG oAtLineStart;
@@ -56,9 +59,7 @@ extern void yyunputbytes(ULONG count);
 
 extern YY_BUFFER_STATE pCurrentBuffer;
 
-#ifdef __GNUC__
-extern void strupr(char *s);
-extern void strlwr(char *s);
-#endif
+extern void upperstring(char *s);
+extern void lowerstring(char *s);
 
 #endif

include/asm/main.h

@@ -1,10 +1,16 @@
-#ifndef	ASMOTOR_MAIN_H
-#define	ASMOTOR_MAIN_H
+#ifndef	RGBDS_MAIN_H
+#define	RGBDS_MAIN_H
+
+#include <stdbool.h>
+#include "extern/stdnoreturn.h"
 
 struct sOptions {
 	char gbgfx[4];
 	char binary[2];
 	SLONG fillchar;
+	bool verbose;
+	bool haltnop;
+	bool exportall;
 	    //-1 == random
 };
 
@@ -19,10 +25,8 @@ extern void opt_Push(void);
 extern void opt_Pop(void);
 extern void opt_Parse(char *s);
 
-void fatalerror(char *s);
-void yyerror(char *s);
-
-extern char temptext[1024];
+noreturn void fatalerror(const char *fmt, ...);
+void yyerror(const char *fmt, ...);
 
 #define	YY_FATAL_ERROR fatalerror
 

include/asm/mylink.h

@@ -1,5 +1,5 @@
-#ifndef ASMOTOR_ASM_LINK_H
-#define ASMOTOR_ASM_LINK_H
+#ifndef RGBDS_ASM_LINK_H
+#define RGBDS_ASM_LINK_H
 
 /* RGB0 .obj format:
  *
@@ -30,7 +30,7 @@
  * Section:
  * LONG SizeInBytes
  * char Type
- * if( Type!=BSS )
+ * if( Type!=WRAM0 )
  * {
  *		char Data[SizeInBytes]
  *		Patches
@@ -95,11 +95,13 @@ enum {
 };
 
 enum {
-	SECT_BSS = 0,
+	SECT_WRAM0 = 0,
 	SECT_VRAM,
-	SECT_CODE,
-	SECT_HOME,
-	SECT_HRAM
+	SECT_ROMX,
+	SECT_ROM0,
+	SECT_HRAM,
+	SECT_WRAMX,
+	SECT_SRAM
 };
 
 enum {

include/asm/mymath.h

@@ -1,7 +1,7 @@
-#ifndef ASMOTOR_ASM_MATH_H
-#define ASMOTOR_ASM_MATH_H
+#ifndef RGBDS_ASM_MATH_H
+#define RGBDS_ASM_MATH_H
 
-#include "asm/types.h"
+#include "types.h"
 
 void math_DefinePI(void);
 void math_Print(SLONG i);
@@ -14,5 +14,8 @@ SLONG math_ATan(SLONG i);
 SLONG math_ATan2(SLONG i, SLONG j);
 SLONG math_Mul(SLONG i, SLONG j);
 SLONG math_Div(SLONG i, SLONG j);
+SLONG math_Round(SLONG i);
+SLONG math_Ceil(SLONG i);
+SLONG math_Floor(SLONG i);
 
 #endif

include/asm/output.h

@@ -1,8 +1,8 @@
-#ifndef ASMOTOR_ASM_OUTPUT_H
-#define ASMOTOR_ASM_OUTPUT_H
+#ifndef RGBDS_ASM_OUTPUT_H
+#define RGBDS_ASM_OUTPUT_H
 
 #include "asm/rpn.h"
-#include "asm/types.h"
+#include "types.h"
 
 struct Section {
 	char *pzName;
@@ -12,6 +12,7 @@ struct Section {
 	ULONG nBank;
 	struct Section *pNext;
 	struct Patch *pPatches;
+	struct Charmap *charmap;
 	UBYTE *tData;
 };
 
@@ -20,12 +21,14 @@ void out_SetFileName(char *s);
 void out_NewSection(char *pzName, ULONG secttype);
 void out_NewAbsSection(char *pzName, ULONG secttype, SLONG org, SLONG bank);
 void out_AbsByte(int b);
+void out_AbsByteGroup(char *s, int length);
 void out_RelByte(struct Expression * expr);
 void out_RelWord(struct Expression * expr);
 void out_PCRelByte(struct Expression * expr);
 void out_WriteObject(void);
 void out_Skip(int skip);
 void out_BinaryFile(char *s);
+void out_BinaryFileSlice(char *s, SLONG start_pos, SLONG length);
 void out_String(char *s);
 void out_AbsLong(SLONG b);
 void out_RelLong(struct Expression * expr);

include/asm/rpn.h

@@ -1,5 +1,5 @@
-#ifndef ASMOTOR_ASM_RPN_H
-#define ASMOTOR_ASM_RPN_H
+#ifndef RGBDS_ASM_RPN_H
+#define RGBDS_ASM_RPN_H
 
 struct Expression {
 	SLONG nVal;

include/asm/symbol.h

@@ -1,9 +1,9 @@
-#ifndef ASMOTOR_SYMBOL_H
-#define ASMOTOR_SYMBOL_H
+#ifndef RGBDS_SYMBOL_H
+#define RGBDS_SYMBOL_H
 
-#include "asm/types.h"
+#include "types.h"
 
-#define HASHSIZE 73
+#define HASHSIZE (1 << 16)
 #define MAXSYMLEN 256
 
 struct sSymbol {
@@ -35,6 +35,8 @@ struct sSymbol {
 #define SYMF_CONST		0x200	/* symbol has a constant value, will
 					 * not be changed during linking */
 
+ULONG calchash(char *s);
+void sym_SetExportAll(BBOOL set);
 void sym_PrepPass1(void);
 void sym_PrepPass2(void);
 void sym_AddLocalReloc(char *tzSym);

include/asm/types.h

@@ -1,15 +0,0 @@
-#ifndef ASMOTOR_ASM_TYPES_H
-#define ASMOTOR_ASM_TYPES_H
-
-#if	defined(AMIGA) || defined(__GNUC__)
-#define	_MAX_PATH	512
-#endif
-
-typedef unsigned char UBYTE;
-typedef signed char SBYTE;
-typedef unsigned short UWORD;
-typedef signed short SWORD;
-typedef unsigned long ULONG;
-typedef signed long SLONG;
-
-#endif

include/asmotor.h

@@ -1,21 +0,0 @@
-/*	asmotor.h
- *
- *	Contains defines for every program in the ASMotor package
- *
- *	Copyright 1997 Carsten Sorensen
- *
- */
-
-#ifndef	ASMOTOR_ASMOTOR_H
-#define	ASMOTOR_ASMOTOR_H
-
-#define	ASMOTOR
-
-#define	ASMOTOR_VERSION	"1.10-linux"
-
-#define	ASM_VERSION		"1.08c"
-#define	LINK_VERSION	"1.06c"
-#define	RGBFIX_VERSION	"1.02"
-#define	LIB_VERSION		"1.00"
-
-#endif

include/extern/err.h

@@ -0,0 +1,33 @@
+#ifndef EXTERN_ERR_H
+#define EXTERN_ERR_H
+
+#ifdef ERR_IN_LIBC
+#include <err.h>
+#else
+
+#include <stdarg.h>
+#include "extern/stdnoreturn.h"
+
+#define warn rgbds_warn
+#define vwarn rgbds_vwarn
+#define warnx rgbds_warnx
+#define vwarnx rgbds_vwarnx
+
+#define err rgbds_err
+#define verr rgbds_verr
+#define errx rgbds_errx
+#define verrx rgbds_verrx
+
+void warn(const char *, ...);
+void vwarn(const char *, va_list);
+void warnx(const char *, ...);
+void vwarnx(const char *, va_list);
+
+noreturn void err(int, const char *, ...);
+noreturn void verr(int, const char *, va_list);
+noreturn void errx(int, const char *, ...);
+noreturn void verrx(int, const char *, va_list);
+
+#endif
+
+#endif

include/extern/reallocarray.h

@@ -0,0 +1,14 @@
+#ifndef EXTERN_REALLOCARRAY_H
+#define EXTERN_REALLOCARRAY_H
+
+#ifdef REALLOCARRAY_IN_LIBC
+#include <stdlib.h>
+#else
+
+#define reallocarray rgbds_reallocarray
+
+void *reallocarray(void *, size_t, size_t);
+
+#endif
+
+#endif

include/extern/stdnoreturn.h

@@ -0,0 +1,16 @@
+#if __STDC_VERSION__ >= 201112L
+    /* C11 or newer */
+    #define noreturn _Noreturn
+#elif __cplusplus >= 201103L
+    /* C++11 or newer */
+    #define noreturn [[noreturn]]
+#elif __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ >= 5))
+    /* GCC 2.5 or newer */
+    #define noreturn __attribute__ ((noreturn))
+#elif _MSC_VER >= 1310
+    /* MS Visual Studio 2003/.NET Framework 1.1 or newer */
+    #define noreturn _declspec( noreturn)
+#else
+    /* unsupported, but no need to throw a fit */
+    #define noreturn 
+#endif

include/extern/strl.h

@@ -0,0 +1,13 @@
+#ifndef STRL_H
+#define STRL_H
+
+#ifdef STRL_IN_LIBC
+#include <string.h>
+#else
+#define strlcpy rgbds_strlcpy
+#define strlcat rgbds_strlcat
+size_t strlcpy(char *, const char *, size_t);
+size_t strlcat(char *, const char *, size_t);
+#endif
+
+#endif

include/gfx/gb.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2013 stag019 <stag019@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef RGBDS_GFX_GB_H
+#define RGBDS_GFX_GB_H
+
+#include <stdint.h>
+#include "gfx/main.h"
+
+void png_to_gb(struct PNGImage png, struct GBImage *gb);
+void output_file(struct Options opts, struct GBImage gb);
+int get_tile_index(uint8_t *tile, uint8_t **tiles, int num_tiles, int tile_size);
+void create_tilemap(struct Options opts, struct GBImage *gb, struct Tilemap *tilemap);
+void output_tilemap_file(struct Options opts, struct Tilemap tilemap);
+void output_palette_file(struct Options opts, struct PNGImage png);
+
+#endif

include/gfx/main.h

@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2013 stag019 <stag019@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef RGBDS_GFX_MAIN_H
+#define RGBDS_GFX_MAIN_H
+
+#include <png.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "extern/err.h"
+
+struct Options {
+	bool debug;
+	bool verbose;
+	bool hardfix;
+	bool fix;
+	bool horizontal;
+	bool unique;
+	int trim;
+	char *mapfile;
+	bool mapout;
+	char *palfile;
+	bool palout;
+	char *outfile;
+	char *infile;
+};
+
+struct PNGImage {
+	png_struct *png;
+	png_info *info;
+	png_byte **data;
+	int width;
+	int height;
+	png_byte depth;
+	png_byte type;
+	bool horizontal;
+	int trim;
+	char *mapfile;
+	bool mapout;
+	char *palfile;
+	bool palout;
+};
+
+struct GBImage {
+	uint8_t *data;
+	int size;
+	bool horizontal;
+	int trim;
+};
+
+struct Tilemap {
+	uint8_t *data;
+	int size;
+};
+
+int depth, colors;
+
+#include "gfx/makepng.h"
+#include "gfx/gb.h"
+
+#endif

include/gfx/makepng.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2013 stag019 <stag019@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef RGBDS_GFX_PNG_H
+#define RGBDS_GFX_PNG_H
+
+#include "gfx/main.h"
+
+void input_png_file(struct Options opts, struct PNGImage *img);
+void get_text(struct PNGImage *png);
+void set_text(struct PNGImage *png);
+void output_png_file(struct Options opts, struct PNGImage *png);
+void free_png_data(struct PNGImage *png);
+
+#endif

include/lib/library.h

@@ -1,13 +0,0 @@
-#ifndef ASMOTOR_LIB_LIBRARY_H
-#define ASMOTOR_LIB_LIBRARY_H
-
-#include "lib/libwrap.h"
-
-extern sLibrary *lib_Read(char *filename);
-extern BBOOL lib_Write(sLibrary * lib, char *filename);
-extern sLibrary *lib_AddReplace(sLibrary * lib, char *filename);
-extern void lib_Free(sLibrary * lib);
-extern sLibrary *lib_DeleteModule(sLibrary * lib, char *filename);
-extern sLibrary *lib_Find(sLibrary * lib, char *filename);
-
-#endif

include/lib/libwrap.h

@@ -1,19 +0,0 @@
-#ifndef ASMOTOR_LIB_LIBWRAP_H
-#define ASMOTOR_LIB_LIBWRAP_H
-
-#include "lib/types.h"
-
-#define MAXNAMELENGTH	256
-
-struct LibraryWrapper {
-	char tName[MAXNAMELENGTH];
-	UWORD uwTime;
-	UWORD uwDate;
-	SLONG nByteLength;
-	UBYTE *pData;
-	struct LibraryWrapper *pNext;
-};
-
-typedef struct LibraryWrapper sLibrary;
-
-#endif

include/link/assign.h

@@ -1,15 +1,30 @@
-#ifndef ASMOTOR_LINK_ASSIGN_H
-#define ASMOTOR_LINK_ASSIGN_H
+#ifndef RGBDS_LINK_ASSIGN_H
+#define RGBDS_LINK_ASSIGN_H
 
-#include "link/types.h"
+#include "types.h"
 
 enum eBankDefine {
-	BANK_HOME = 0,
-	BANK_BSS = 512,
-	BANK_VRAM,
-	BANK_HRAM
+	BANK_ROM0 = 0,
+	BANK_ROMX,
+	BANK_WRAM0 = 512,
+	BANK_WRAMX,
+	BANK_VRAM = 520,
+	BANK_HRAM = 522,
+	BANK_SRAM = 523
 };
-#define MAXBANKS	515
+
+enum eBankCount {
+	BANK_COUNT_ROM0 = 1,
+	BANK_COUNT_ROMX = 511,
+	BANK_COUNT_WRAM0 = 1,
+	BANK_COUNT_WRAMX = 7,
+	BANK_COUNT_VRAM = 2,
+	BANK_COUNT_HRAM = 1,
+	BANK_COUNT_SRAM = 16
+};
+
+#define MAXBANKS	(BANK_COUNT_ROM0 + BANK_COUNT_ROMX + BANK_COUNT_WRAM0 + BANK_COUNT_WRAMX \
+					+ BANK_COUNT_VRAM + BANK_COUNT_HRAM + BANK_COUNT_SRAM)
 
 extern SLONG area_Avail(SLONG bank);
 extern void AssignSections(void);

include/link/library.h

@@ -1,5 +1,5 @@
-#ifndef	ASMOTOR_LINK_LIBRARY_H
-#define	ASMOTOR_LINK_LIBRARY_H
+#ifndef	RGBDS_LINK_LIBRARY_H
+#define	RGBDS_LINK_LIBRARY_H
 
 extern void AddNeededModules(void);
 

include/link/main.h

@@ -1,9 +1,9 @@
-#ifndef ASMOTOR_LINK_MAIN_H
-#define ASMOTOR_LINK_MAIN_H
+#ifndef RGBDS_LINK_MAIN_H
+#define RGBDS_LINK_MAIN_H
 
-#include "link/types.h"
+#include "types.h"
 
 extern SLONG fillchar;
-extern char smartlinkstartsymbol[256];
+extern char *smartlinkstartsymbol;
 
 #endif

include/link/mapfile.h

@@ -1,5 +1,5 @@
-#ifndef	ASMOTOR_LINK_MAPFILE_H
-#define	ASMOTOR_LINK_MAPFILE_H
+#ifndef	RGBDS_LINK_MAPFILE_H
+#define	RGBDS_LINK_MAPFILE_H
 
 extern void SetMapfileName(char *name);
 extern void SetSymfileName(char *name);

include/link/mylink.h

@@ -1,11 +1,11 @@
-#ifndef ASMOTOR_LINK_LINK_H
-#define ASMOTOR_LINK_LINK_H
+#ifndef RGBDS_LINK_LINK_H
+#define RGBDS_LINK_LINK_H
 
-#if defined(AMIGA) || defined(__GNUC__)
+#ifndef _MAX_PATH
 #define _MAX_PATH	512
 #endif
 
-#include "link/types.h"
+#include "types.h"
 
 extern SLONG options;
 #define OPT_SMALL	0x01
@@ -51,11 +51,13 @@ enum eRpnData {
 };
 
 enum eSectionType {
-	SECT_BSS,
+	SECT_WRAM0,
 	SECT_VRAM,
-	SECT_CODE,
-	SECT_HOME,
-	SECT_HRAM
+	SECT_ROMX,
+	SECT_ROM0,
+	SECT_HRAM,
+	SECT_WRAMX,
+	SECT_SRAM
 };
 
 struct sSection {

include/link/object.h

@@ -1,7 +1,6 @@
-#ifndef	ASMOTOR_LINK_OBJECT_H
-#define	ASMOTOR_LINK_OBJECT_H
+#ifndef	RGBDS_LINK_OBJECT_H
+#define	RGBDS_LINK_OBJECT_H
 
 extern void obj_Readfile(char *tzObjectfile);
-extern void lib_Readfile(char *tzLibfile);
 
 #endif

include/link/output.h

@@ -1,5 +1,5 @@
-#ifndef	ASMOTOR_LINK_OUTPUT_H
-#define	ASMOTOR_LINK_OUTPUT_H
+#ifndef	RGBDS_LINK_OUTPUT_H
+#define	RGBDS_LINK_OUTPUT_H
 
 void out_Setname(char *tzOutputfile);
 void Output(void);

include/link/patch.h

@@ -1,7 +1,7 @@
-#ifndef ASMOTOR_LINK_PATCH_H
-#define ASMOTOR_LINK_PATCH_H
+#ifndef RGBDS_LINK_PATCH_H
+#define RGBDS_LINK_PATCH_H
 
-#include "link/types.h"
+#include "types.h"
 
 void Patch(void);
 extern SLONG nPC;

include/link/symbol.h

@@ -1,10 +1,10 @@
-#ifndef ASMOTOR_LINK_SYMBOL_H
-#define ASMOTOR_LINK_SYMBOL_H
+#ifndef RGBDS_LINK_SYMBOL_H
+#define RGBDS_LINK_SYMBOL_H
 
-#include "link/types.h"
+#include "types.h"
 
 void sym_Init(void);
-void sym_CreateSymbol(char *tzName, SLONG nValue, SBYTE nBank);
+void sym_CreateSymbol(char *tzName, SLONG nValue, SLONG nBank);
 SLONG sym_GetValue(char *tzName);
 SLONG sym_GetBank(char *tzName);
 

include/link/types.h

@@ -1,16 +0,0 @@
-#ifndef ASMOTOR_LINK_TYPES_H
-#define ASMOTOR_LINK_TYPES_H
-
-#if defined(AMIGA) || defined(__GNUC__)
-#define	_MAX_PATH	512
-#endif
-
-typedef unsigned char UBYTE;
-typedef signed char SBYTE;
-typedef unsigned short UWORD;
-typedef signed short SWORD;
-typedef unsigned long ULONG;
-typedef signed long SLONG;
-typedef signed char BBOOL;
-
-#endif

include/types.h

@@ -1,7 +1,7 @@
-#ifndef ASMOTOR_LIB_TYPES_H
-#define ASMOTOR_LIB_TYPES_H
+#ifndef RGBDS_TYPES_H
+#define RGBDS_TYPES_H
 
-#if	defined(AMIGA) || defined(__GNUC__)
+#ifndef _MAX_PATH
 #define	_MAX_PATH	512
 #endif
 

src/asm/.gitignore

@@ -1,3 +1,2 @@
 asmy.c
 asmy.h
-asmy.y

src/asm/alloca.c

@@ -1,466 +0,0 @@
-/* alloca.c -- allocate automatically reclaimed memory
-   (Mostly) portable public-domain implementation -- D A Gwyn
-
-   This implementation of the PWB library alloca function,
-   which is used to allocate space off the run-time stack so
-   that it is automatically reclaimed upon procedure exit,
-   was inspired by discussions with J. Q. Johnson of Cornell.
-   J.Otto Tennant <jot@cray.com> contributed the Cray support.
-
-   There are some preprocessor constants that can
-   be defined when compiling for your specific system, for
-   improved efficiency; however, the defaults should be okay.
-
-   The general concept of this implementation is to keep
-   track of all alloca-allocated blocks, and reclaim any
-   that are found to be deeper in the stack than the current
-   invocation.  This heuristic does not reclaim storage as
-   soon as it becomes invalid, but it will do so eventually.
-
-   As a special case, alloca(0) reclaims storage without
-   allocating any.  It is a good idea to use alloca(0) in
-   your main control loop, etc. to force garbage collection.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef emacs
-#include "blockinput.h"
-#endif
-
-/* If compiling with GCC 2, this file's not needed.  */
-#if !defined (__GNUC__) || __GNUC__ < 2
-
-/* If someone has defined alloca as a macro,
-   there must be some other way alloca is supposed to work.  */
-#ifndef alloca
-
-#ifdef emacs
-#ifdef static
-/* actually, only want this if static is defined as ""
-   -- this is for usg, in which emacs must undefine static
-   in order to make unexec workable
-   */
-#ifndef STACK_DIRECTION
-you lose-- must know STACK_DIRECTION at compile - time
-#endif				/* STACK_DIRECTION undefined */
-#endif				/* static */
-#endif				/* emacs */
-/* If your stack is a linked list of frames, you have to
-   provide an "address metric" ADDRESS_FUNCTION macro.  */
-#if defined (CRAY) && defined (CRAY_STACKSEG_END)
-long i00afunc();
-#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
-#else
-#define ADDRESS_FUNCTION(arg) &(arg)
-#endif
-#if __STDC__
-     typedef void *pointer;
-#else
-     typedef char *pointer;
-#endif
-
-#define NULL	0
-
-/* Different portions of Emacs need to call different versions of
-   malloc.  The Emacs executable needs alloca to call xmalloc, because
-   ordinary malloc isn't protected from input signals.  On the other
-   hand, the utilities in lib-src need alloca to call malloc; some of
-   them are very simple, and don't have an xmalloc routine.
-
-   Non-Emacs programs expect this to call use xmalloc.
-
-   Callers below should use malloc.  */
-
-/*	Carsten Sorensen 09/09/97
- *	Commented out the following, I want malloc!
-#ifndef emacs
-#define malloc xmalloc
-#endif
-extern pointer malloc ();
-	And added the following line:
- */
-#include <stdlib.h>
-
-/* Define STACK_DIRECTION if you know the direction of stack
-   growth for your system; otherwise it will be automatically
-   deduced at run-time.
-
-   STACK_DIRECTION > 0 => grows toward higher addresses
-   STACK_DIRECTION < 0 => grows toward lower addresses
-   STACK_DIRECTION = 0 => direction of growth unknown  */
-
-#ifndef STACK_DIRECTION
-#define STACK_DIRECTION	0	/* Direction unknown.  */
-#endif
-
-#if STACK_DIRECTION != 0
-
-#define STACK_DIR	STACK_DIRECTION	/* Known at compile-time.  */
-
-#else				/* STACK_DIRECTION == 0; need run-time code.  */
-
-static int stack_dir;		/* 1 or -1 once known.  */
-#define STACK_DIR	stack_dir
-
-static void 
-find_stack_direction()
-{
-	static char *addr = NULL;	/* Address of first `dummy', once
-					 * known.  */
-	auto char dummy;	/* To get stack address.  */
-
-	if (addr == NULL) {	/* Initial entry.  */
-		addr = ADDRESS_FUNCTION(dummy);
-
-		find_stack_direction();	/* Recurse once.  */
-	} else {
-		/* Second entry.  */
-		if (ADDRESS_FUNCTION(dummy) > addr)
-			stack_dir = 1;	/* Stack grew upward.  */
-		else
-			stack_dir = -1;	/* Stack grew downward.  */
-	}
-}
-#endif				/* STACK_DIRECTION == 0 */
-
-/* An "alloca header" is used to:
-   (a) chain together all alloca'ed blocks;
-   (b) keep track of stack depth.
-
-   It is very important that sizeof(header) agree with malloc
-   alignment chunk size.  The following default should work okay.  */
-
-#ifndef ALIGN_SIZE
-#define ALIGN_SIZE	sizeof(double)
-#endif
-
-typedef union hdr {
-	char align[ALIGN_SIZE];	/* To force sizeof(header).  */
-	struct {
-		union hdr *next;/* For chaining headers.  */
-		char *deep;	/* For stack depth measure.  */
-	}      h;
-}   header;
-
-static header *last_alloca_header = NULL;	/* -> last alloca header.  */
-
-/* Return a pointer to at least SIZE bytes of storage,
-   which will be automatically reclaimed upon exit from
-   the procedure that called alloca.  Originally, this space
-   was supposed to be taken from the current stack frame of the
-   caller, but that method cannot be made to work for some
-   implementations of C, for example under Gould's UTX/32.  */
-
-pointer 
-alloca(size)
-	unsigned size;
-{
-	auto char probe;	/* Probes stack depth: */
-	register char *depth = ADDRESS_FUNCTION(probe);
-
-#if STACK_DIRECTION == 0
-	if (STACK_DIR == 0)	/* Unknown growth direction.  */
-		find_stack_direction();
-#endif
-
-	/* Reclaim garbage, defined as all alloca'd storage that was allocated
-	 * from deeper in the stack than currently. */
-
-	{
-		register header *hp;	/* Traverses linked list.  */
-
-#ifdef emacs
-		BLOCK_INPUT;
-#endif
-
-		for (hp = last_alloca_header; hp != NULL;)
-			if ((STACK_DIR > 0 && hp->h.deep > depth)
-			    || (STACK_DIR < 0 && hp->h.deep < depth)) {
-				register header *np = hp->h.next;
-
-				free((pointer) hp);	/* Collect garbage.  */
-
-				hp = np;	/* -> next header.  */
-			} else
-				break;	/* Rest are not deeper.  */
-
-		last_alloca_header = hp;	/* -> last valid storage.  */
-
-#ifdef emacs
-		UNBLOCK_INPUT;
-#endif
-	}
-
-	if (size == 0)
-		return NULL;	/* No allocation required.  */
-
-	/* Allocate combined header + user data storage.  */
-
-	{
-		register pointer new = malloc(sizeof(header) + size);
-		/* Address of header.  */
-
-		((header *) new)->h.next = last_alloca_header;
-		((header *) new)->h.deep = depth;
-
-		last_alloca_header = (header *) new;
-
-		/* User storage begins just after header.  */
-
-		return (pointer) ((char *) new + sizeof(header));
-	}
-}
-#if defined (CRAY) && defined (CRAY_STACKSEG_END)
-
-#ifdef DEBUG_I00AFUNC
-#include <stdio.h>
-#endif
-
-#ifndef CRAY_STACK
-#define CRAY_STACK
-#ifndef CRAY2
-/* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */
-struct stack_control_header {
-	long shgrow:32;		/* Number of times stack has grown.  */
-	long shaseg:32;		/* Size of increments to stack.  */
-	long shhwm:32;		/* High water mark of stack.  */
-	long shsize:32;		/* Current size of stack (all segments).  */
-};
-/* The stack segment linkage control information occurs at
-   the high-address end of a stack segment.  (The stack
-   grows from low addresses to high addresses.)  The initial
-   part of the stack segment linkage control information is
-   0200 (octal) words.  This provides for register storage
-   for the routine which overflows the stack.  */
-
-struct stack_segment_linkage {
-	long ss[0200];		/* 0200 overflow words.  */
-	long sssize:32;		/* Number of words in this segment.  */
-	long ssbase:32;		/* Offset to stack base.  */
-	long:32;
-	long sspseg:32;		/* Offset to linkage control of previous
-				 * segment of stack.  */
-	long:32;
-	long sstcpt:32;		/* Pointer to task common address block.  */
-	long sscsnm;		/* Private control structure number for
-				 * microtasking.  */
-	long ssusr1;		/* Reserved for user.  */
-	long ssusr2;		/* Reserved for user.  */
-	long sstpid;		/* Process ID for pid based multi-tasking.  */
-	long ssgvup;		/* Pointer to multitasking thread giveup.  */
-	long sscray[7];		/* Reserved for Cray Research.  */
-	long ssa0;
-	long ssa1;
-	long ssa2;
-	long ssa3;
-	long ssa4;
-	long ssa5;
-	long ssa6;
-	long ssa7;
-	long sss0;
-	long sss1;
-	long sss2;
-	long sss3;
-	long sss4;
-	long sss5;
-	long sss6;
-	long sss7;
-};
-#else				/* CRAY2 */
-/* The following structure defines the vector of words
-   returned by the STKSTAT library routine.  */
-struct stk_stat {
-	long now;		/* Current total stack size.  */
-	long maxc;		/* Amount of contiguous space which would be
-				 * required to satisfy the maximum stack
-				 * demand to date.  */
-	long high_water;	/* Stack high-water mark.  */
-	long overflows;		/* Number of stack overflow ($STKOFEN) calls.  */
-	long hits;		/* Number of internal buffer hits.  */
-	long extends;		/* Number of block extensions.  */
-	long stko_mallocs;	/* Block allocations by $STKOFEN.  */
-	long underflows;	/* Number of stack underflow calls ($STKRETN).  */
-	long stko_free;		/* Number of deallocations by $STKRETN.  */
-	long stkm_free;		/* Number of deallocations by $STKMRET.  */
-	long segments;		/* Current number of stack segments.  */
-	long maxs;		/* Maximum number of stack segments so far.  */
-	long pad_size;		/* Stack pad size.  */
-	long current_address;	/* Current stack segment address.  */
-	long current_size;	/* Current stack segment size.  This number is
-				 * actually corrupted by STKSTAT to include
-				 * the fifteen word trailer area.  */
-	long initial_address;	/* Address of initial segment.  */
-	long initial_size;	/* Size of initial segment.  */
-};
-/* The following structure describes the data structure which trails
-   any stack segment.  I think that the description in 'asdef' is
-   out of date.  I only describe the parts that I am sure about.  */
-
-struct stk_trailer {
-	long this_address;	/* Address of this block.  */
-	long this_size;		/* Size of this block (does not include this
-				 * trailer).  */
-	long unknown2;
-	long unknown3;
-	long link;		/* Address of trailer block of previous
-				 * segment.  */
-	long unknown5;
-	long unknown6;
-	long unknown7;
-	long unknown8;
-	long unknown9;
-	long unknown10;
-	long unknown11;
-	long unknown12;
-	long unknown13;
-	long unknown14;
-};
-#endif				/* CRAY2 */
-#endif				/* not CRAY_STACK */
-
-#ifdef CRAY2
-/* Determine a "stack measure" for an arbitrary ADDRESS.
-   I doubt that "lint" will like this much. */
-
-static long 
-i00afunc(long *address)
-{
-	struct stk_stat status;
-	struct stk_trailer *trailer;
-	long *block, size;
-	long result = 0;
-
-	/* We want to iterate through all of the segments.  The first step is
-	 * to get the stack status structure.  We could do this more quickly
-	 * and more directly, perhaps, by referencing the $LM00 common block,
-	 * but I know that this works.  */
-
-	STKSTAT(&status);
-
-	/* Set up the iteration.  */
-
-	trailer = (struct stk_trailer *) (status.current_address
-	    + status.current_size - 15);
-
-	/* There must be at least one stack segment.  Therefore it is a fatal
-	 * error if "trailer" is null.  */
-
-	if (trailer == 0)
-		abort();
-
-	/* Discard segments that do not contain our argument address.  */
-
-	while (trailer != 0) {
-		block = (long *) trailer->this_address;
-		size = trailer->this_size;
-		if (block == 0 || size == 0)
-			abort();
-		trailer = (struct stk_trailer *) trailer->link;
-		if ((block <= address) && (address < (block + size)))
-			break;
-	}
-
-	/* Set the result to the offset in this segment and add the sizes of
-	 * all predecessor segments.  */
-
-	result = address - block;
-
-	if (trailer == 0) {
-		return result;
-	}
-	do {
-		if (trailer->this_size <= 0)
-			abort();
-		result += trailer->this_size;
-		trailer = (struct stk_trailer *) trailer->link;
-	}
-	while (trailer != 0);
-
-	/* We are done.  Note that if you present a bogus address (one not in
-	 * any segment), you will get a different number back, formed from
-	 * subtracting the address of the first block.  This is probably not
-	 * what you want.  */
-
-	return (result);
-}
-#else				/* not CRAY2 */
-/* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP.
-   Determine the number of the cell within the stack,
-   given the address of the cell.  The purpose of this
-   routine is to linearize, in some sense, stack addresses
-   for alloca.  */
-
-static long 
-i00afunc(long address)
-{
-	long stkl = 0;
-
-	long size, pseg, this_segment, stack;
-	long result = 0;
-
-	struct stack_segment_linkage *ssptr;
-
-	/* Register B67 contains the address of the end of the current stack
-	 * segment.  If you (as a subprogram) store your registers on the
-	 * stack and find that you are past the contents of B67, you have
-	 * overflowed the segment.
-	 * 
-	 * B67 also points to the stack segment linkage control area, which is
-	 * what we are really interested in.  */
-
-	stkl = CRAY_STACKSEG_END();
-	ssptr = (struct stack_segment_linkage *) stkl;
-
-	/* If one subtracts 'size' from the end of the segment, one has the
-	 * address of the first word of the segment.
-	 * 
-	 * If this is not the first segment, 'pseg' will be nonzero.  */
-
-	pseg = ssptr->sspseg;
-	size = ssptr->sssize;
-
-	this_segment = stkl - size;
-
-	/* It is possible that calling this routine itself caused a stack
-	 * overflow.  Discard stack segments which do not contain the target
-	 * address.  */
-
-	while (!(this_segment <= address && address <= stkl)) {
-#ifdef DEBUG_I00AFUNC
-		fprintf(stderr, "%011o %011o %011o\n", this_segment, address,
-		    stkl);
-#endif
-		if (pseg == 0)
-			break;
-		stkl = stkl - pseg;
-		ssptr = (struct stack_segment_linkage *) stkl;
-		size = ssptr->sssize;
-		pseg = ssptr->sspseg;
-		this_segment = stkl - size;
-	}
-
-	result = address - this_segment;
-
-	/* If you subtract pseg from the current end of the stack, you get the
-	 * address of the previous stack segment's end. This seems a little
-	 * convoluted to me, but I'll bet you save a cycle somewhere.  */
-
-	while (pseg != 0) {
-#ifdef DEBUG_I00AFUNC
-		fprintf(stderr, "%011o %011o\n", pseg, size);
-#endif
-		stkl = stkl - pseg;
-		ssptr = (struct stack_segment_linkage *) stkl;
-		size = ssptr->sssize;
-		pseg = ssptr->sspseg;
-		result += size;
-	}
-	return (result);
-}
-#endif				/* not CRAY2 */
-#endif				/* CRAY */
-
-#endif				/* no alloca */
-#endif				/* not GCC version 2 */

src/asm/charmap.c

@@ -0,0 +1,217 @@
+/*
+ * UTF-8 decoder copyright © 2008–2009 Björn Höhrmann <bjoern@hoehrmann.de>
+ * http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+ *
+ * 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.
+ */
+
+#include <stdint.h>
+
+static const uint8_t utf8d[] = {
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf
+  8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df
+  0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef
+  0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff
+  0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2
+  1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4
+  1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6
+  1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
+};
+
+uint32_t
+decode(uint32_t* state, uint32_t* codep, uint32_t byte) {
+  uint32_t type = utf8d[byte];
+
+  *codep = (*state != 0) ?
+    (byte & 0x3fu) | (*codep << 6) :
+    (0xff >> type) & (byte);
+
+  *state = utf8d[256 + *state*16 + type];
+  return *state;
+}
+
+/*
+ * Copyright © 2013 stag019 <stag019@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "asm/asm.h"
+#include "asm/charmap.h"
+#include "asm/main.h"
+#include "asm/output.h"
+
+struct Charmap globalCharmap = {0};
+
+extern struct Section *pCurrentSection;
+
+int
+readUTF8Char(char *dest, char *src)
+{
+	uint32_t state;
+	uint32_t codep;
+	int i;
+
+	for (i = 0, state = 0;; i++) {
+		if (decode(&state, &codep, (uint8_t)src[i]) == 1) {
+			fatalerror("invalid UTF-8 character");
+		}
+
+		dest[i] = src[i];
+
+		i++;
+		if (state == 0) {
+			dest[i] = '\0';
+			return i;
+		}
+		dest[i] = src[i];
+	}
+}
+
+int
+charmap_Add(char *input, UBYTE output)
+{
+	int i, input_length;
+	char temp1i[CHARMAPLENGTH + 1], temp2i[CHARMAPLENGTH + 1], temp1o = 0,
+	    temp2o = 0;
+
+	struct Charmap *charmap;
+
+	if (pCurrentSection) {
+		if (pCurrentSection->charmap) {
+			charmap = pCurrentSection->charmap;
+		} else {
+			if ((charmap = calloc(1, sizeof(struct Charmap))) ==
+			    NULL) {
+				fatalerror("Not enough memory for charmap");
+			}
+			pCurrentSection->charmap = charmap;
+		}
+	} else {
+		charmap = &globalCharmap;
+	}
+
+	if (nPass == 2) {
+		return charmap->count;
+	}
+
+	if (charmap->count > MAXCHARMAPS || strlen(input) > CHARMAPLENGTH) {
+		return -1;
+	}
+
+	input_length = strlen(input);
+	if (input_length > 1) {
+		i = 0;
+		while (i < charmap->count + 1) {
+			if (input_length > strlen(charmap->input[i])) {
+				memcpy(temp1i, charmap->input[i],
+				    CHARMAPLENGTH + 1);
+				memcpy(charmap->input[i], input, input_length);
+				temp1o = charmap->output[i];
+				charmap->output[i] = output;
+				i++;
+				break;
+			}
+			i++;
+		}
+		while (i < charmap->count + 1) {
+			memcpy(temp2i, charmap->input[i], CHARMAPLENGTH + 1);
+			memcpy(charmap->input[i], temp1i, CHARMAPLENGTH + 1);
+			memcpy(temp1i, temp2i, CHARMAPLENGTH + 1);
+			temp2o = charmap->output[i];
+			charmap->output[i] = temp1o;
+			temp1o = temp2o;
+			i++;
+		}
+		memcpy(charmap->input[charmap->count + 1], temp1i,
+		    CHARMAPLENGTH + 1);
+		charmap->output[charmap->count + 1] = temp1o;
+	} else {
+		memcpy(charmap->input[charmap->count], input, input_length);
+		charmap->output[charmap->count] = output;
+	}
+	return ++charmap->count;
+}
+
+int
+charmap_Convert(char **input)
+{
+	struct Charmap *charmap;
+
+	char outchar[CHARMAPLENGTH + 1];
+	char *buffer;
+	int i, j, length;
+
+	if (pCurrentSection && pCurrentSection->charmap) {
+		charmap = pCurrentSection->charmap;
+	} else {
+		charmap = &globalCharmap;
+	}
+
+	if ((buffer = malloc(strlen(*input))) == NULL) {
+		fatalerror("Not enough memory for buffer");
+	}
+
+	length = 0;
+	while (**input) {
+		j = 0;
+		for (i = 0; i < charmap->count; i++) {
+			j = strlen(charmap->input[i]);
+			if (memcmp(*input, charmap->input[i], j) == 0) {
+				outchar[0] = charmap->output[i];
+				outchar[1] = 0;
+				break;
+			}
+			j = 0;
+		}
+		if (!j) {
+			j = readUTF8Char(outchar, *input);
+		}
+		if (!outchar[0]) {
+			buffer[length++] = 0;
+		} else {
+			for (i = 0; outchar[i]; i++) {
+				buffer[length++] = outchar[i];
+			}
+		}
+		*input += j;
+	}
+	*input = buffer;
+	return length;
+}

src/asm/fstack.c

@@ -1,26 +1,24 @@
 /*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * INCLUDES
- *
+ * FileStack routines
  */
 
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "asm/symbol.h"
 #include "asm/fstack.h"
-#include "asm/types.h"
+#include "types.h"
 #include "asm/main.h"
 #include "asm/lexer.h"
+#include "extern/err.h"
+#include "extern/strl.h"
 
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * VARIABLES
- *
- */
+#ifndef PATH_MAX
+#define PATH_MAX 256
+#endif
 
 struct sContext *pFileStack;
 struct sSymbol *pCurrentMacro;
@@ -47,12 +45,8 @@ ULONG ulMacroReturnValue;
 #define STAT_isREPTBlock	3
 
 /*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
  * Context push and pop
- *
  */
-
 void 
 pushcontext(void)
 {
@@ -62,8 +56,7 @@ pushcontext(void)
 	while (*ppFileStack)
 		ppFileStack = &((*ppFileStack)->pNext);
 
-	if ((*ppFileStack =
-		(struct sContext *) malloc(sizeof(struct sContext))) != NULL) {
+	if ((*ppFileStack = malloc(sizeof(struct sContext))) != NULL) {
 		(*ppFileStack)->FlexHandle = CurrentFlexHandle;
 		(*ppFileStack)->pNext = NULL;
 		strcpy((char *) (*ppFileStack)->tzFileName,
@@ -160,13 +153,10 @@ yywrap(void)
 {
 	return (popcontext());
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Dump the context stack to stdout
- *
- */
 
+/*
+ * Dump the context stack to stderr
+ */
 void 
 fstk_Dump(void)
 {
@@ -175,90 +165,92 @@ fstk_Dump(void)
 	pLastFile = pFileStack;
 
 	while (pLastFile) {
-		printf("%s(%ld) -> ", pLastFile->tzFileName, pLastFile->nLine);
+		fprintf(stderr, "%s(%ld) -> ", pLastFile->tzFileName,
+		    pLastFile->nLine);
 		pLastFile = pLastFile->pNext;
 	}
 
-	printf("%s(%ld)", tzCurrentFileName, nLineNo);
+	fprintf(stderr, "%s(%ld)", tzCurrentFileName, nLineNo);
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Extra includepath stuff
- *
- */
 
+/*
+ * Extra includepath stuff
+ */
 void 
 fstk_AddIncludePath(char *s)
 {
-	strcpy(IncludePaths[NextIncPath++], s);
-}
+	if (NextIncPath == MAXINCPATHS) {
+		fatalerror("Too many include directories passed from command line");
+		return;
+	}
 
-void 
-fstk_FindFile(char *s)
-{
-	char t[_MAX_PATH + 1];
-	SLONG i = -1;
-
-	strcpy(t, s);
-
-	while (i < NextIncPath) {
-		FILE *f;
-
-		if ((f = fopen(t, "rb")) != NULL) {
-			fclose(f);
-			strcpy(s, t);
-			return;
-		}
-		i += 1;
-		if (i < NextIncPath) {
-			strcpy(t, IncludePaths[i]);
-			strcat(t, s);
-		}
+	if (strlcpy(IncludePaths[NextIncPath++], s, _MAX_PATH) >= _MAX_PATH) {
+		fatalerror("Include path too long '%s'",s);
+		return;
 	}
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Set up an include file for parsing
- *
- */
 
-ULONG 
+FILE *
+fstk_FindFile(char *fname)
+{
+	char path[PATH_MAX];
+	int i;
+	FILE *f;
+
+	if ((f = fopen(fname, "rb")) != NULL || errno != ENOENT) {
+		return f;
+	}
+
+	for (i = 0; i < NextIncPath; ++i) {
+		if (strlcpy(path, IncludePaths[i], sizeof path) >= 
+		    sizeof path) {
+			continue;
+		}
+		if (strlcat(path, fname, sizeof path) >= sizeof path) {
+			continue;
+		}
+
+		if ((f = fopen(path, "rb")) != NULL || errno != ENOENT) {
+			return f;
+		}
+	}
+
+	errno = ENOENT;
+	return NULL;
+}
+
+/*
+ * Set up an include file for parsing
+ */
+void
 fstk_RunInclude(char *tzFileName)
 {
 	FILE *f;
 
-	//printf("INCLUDE: %s\n", s);
+	f = fstk_FindFile(tzFileName);
 
-	fstk_FindFile(tzFileName);
-	//printf("INCLUDING: %s\n", tzFileName);
+	if (f == NULL) {
+		err(1, "Unable to open included file '%s'",
+		    tzFileName);
+	}
 
-	if ((f = fopen(tzFileName, "r")) != NULL) {
-		pushcontext();
-		nLineNo = 1;
-		nCurrentStatus = STAT_isInclude;
-		strcpy(tzCurrentFileName, tzFileName);
-		pCurrentFile = f;
-		CurrentFlexHandle = yy_create_buffer(pCurrentFile);
-		yy_switch_to_buffer(CurrentFlexHandle);
+	pushcontext();
+	nLineNo = 1;
+	nCurrentStatus = STAT_isInclude;
+	strcpy(tzCurrentFileName, tzFileName);
+	pCurrentFile = f;
+	CurrentFlexHandle = yy_create_buffer(pCurrentFile);
+	yy_switch_to_buffer(CurrentFlexHandle);
 
-		//Dirty hack to give the INCLUDE directive a linefeed
+	//Dirty hack to give the INCLUDE directive a linefeed
 
-		    yyunput('\n');
-		nLineNo -= 1;
-
-		return (1);
-	} else
-		return (0);
+	yyunput('\n');
+	nLineNo -= 1;
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Set up a macro for parsing
- *
- */
 
+/*
+ * Set up a macro for parsing
+ */
 ULONG 
 fstk_RunMacro(char *s)
 {
@@ -271,22 +263,21 @@ fstk_RunMacro(char *s)
 		sym_UseNewMacroArgs();
 		nCurrentStatus = STAT_isMacro;
 		strcpy(tzCurrentFileName, s);
+		if (sym->pMacro == NULL)
+			return 0;
 		pCurrentMacro = sym;
 		CurrentFlexHandle =
 		    yy_scan_bytes(pCurrentMacro->pMacro,
-		    pCurrentMacro->ulMacroSize);
+		    strlen(pCurrentMacro->pMacro));
 		yy_switch_to_buffer(CurrentFlexHandle);
 		return (1);
 	} else
 		return (0);
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Set up a macroargument for parsing
- *
- */
 
+/*
+ * Set up a macroargument for parsing
+ */
 void 
 fstk_RunMacroArg(SLONG s)
 {
@@ -306,13 +297,10 @@ fstk_RunMacroArg(SLONG s)
 	} else
 		fatalerror("No such macroargument");
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Set up a stringequate for parsing
- *
- */
 
+/*
+ * Set up a stringequate for parsing
+ */
 void 
 fstk_RunString(char *s)
 {
@@ -326,15 +314,12 @@ fstk_RunString(char *s)
 		    yy_scan_bytes(pSym->pMacro, strlen(pSym->pMacro));
 		yy_switch_to_buffer(CurrentFlexHandle);
 	} else
-		yyerror("No such string symbol");
+		yyerror("No such string symbol '%s'", s);
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Set up a repeat block for parsing
- *
- */
 
+/*
+ * Set up a repeat block for parsing
+ */
 void 
 fstk_RunRept(ULONG count)
 {
@@ -352,14 +337,11 @@ fstk_RunRept(ULONG count)
 		yy_switch_to_buffer(CurrentFlexHandle);
 	}
 }
-/*
- * RGBAsm - FSTACK.C (FileStack routines)
- *
- * Initialize the filestack routines
- *
- */
 
-ULONG 
+/*
+ * Initialize the filestack routines
+ */
+void
 fstk_Init(char *s)
 {
 	char tzFileName[_MAX_PATH + 1];
@@ -367,17 +349,16 @@ fstk_Init(char *s)
 	sym_AddString("__FILE__", s);
 
 	strcpy(tzFileName, s);
-	fstk_FindFile(tzFileName);
-
 	pFileStack = NULL;
-	if ((pCurrentFile = fopen(tzFileName, "r")) != NULL) {
-		nMacroCount = 0;
-		nCurrentStatus = STAT_isInclude;
-		strcpy(tzCurrentFileName, tzFileName);
-		CurrentFlexHandle = yy_create_buffer(pCurrentFile);
-		yy_switch_to_buffer(CurrentFlexHandle);
-		nLineNo = 1;
-		return (1);
-	} else
-		return (0);
+	pCurrentFile = fopen(tzFileName, "rb");
+	if (pCurrentFile == NULL) {
+		err(1, "Unable to open file '%s'", tzFileName);
+	}
+
+	nMacroCount = 0;
+	nCurrentStatus = STAT_isInclude;
+	strcpy(tzCurrentFileName, tzFileName);
+	CurrentFlexHandle = yy_create_buffer(pCurrentFile);
+	yy_switch_to_buffer(CurrentFlexHandle);
+	nLineNo = 1;
 }

src/asm/gameboy/yaccprt2.y

@@ -1,41 +0,0 @@
-%token	T_SECT_BSS T_SECT_VRAM T_SECT_CODE T_SECT_HOME T_SECT_HRAM
-
-%token	T_Z80_ADC T_Z80_ADD T_Z80_AND
-%token	T_Z80_BIT
-%token	T_Z80_CALL T_Z80_CCF T_Z80_CP T_Z80_CPL
-%token	T_Z80_DAA T_Z80_DEC T_Z80_DI
-%token	T_Z80_EI T_Z80_EX
-%token	T_Z80_HALT
-%token	T_Z80_INC
-%token	T_Z80_JP T_Z80_JR
-%token	T_Z80_LD
-%token	T_Z80_LDI
-%token	T_Z80_LDD
-%token	T_Z80_LDIO
-%token	T_Z80_NOP
-%token	T_Z80_OR
-%token	T_Z80_POP T_Z80_PUSH
-%token	T_Z80_RES T_Z80_RET T_Z80_RETI T_Z80_RST
-%token	T_Z80_RL T_Z80_RLA T_Z80_RLC T_Z80_RLCA
-%token	T_Z80_RR T_Z80_RRA T_Z80_RRC T_Z80_RRCA
-%token	T_Z80_SBC T_Z80_SCF T_Z80_STOP
-%token	T_Z80_SLA T_Z80_SRA T_Z80_SRL T_Z80_SUB T_Z80_SWAP
-%token	T_Z80_XOR
-
-%token	T_MODE_A T_MODE_B T_MODE_C T_MODE_C_IND T_MODE_D T_MODE_E T_MODE_H T_MODE_L
-%token	T_MODE_AF
-%token	T_MODE_BC T_MODE_BC_IND
-%token	T_MODE_DE T_MODE_DE_IND
-%token	T_MODE_SP T_MODE_SP_IND
-%token	T_MODE_HL T_MODE_HL_IND T_MODE_HL_INDDEC T_MODE_HL_INDINC
-%token	T_CC_NZ T_CC_Z T_CC_NC
-
-%type	<nConstValue>	reg_r
-%type	<nConstValue>	reg_ss
-%type	<nConstValue>	reg_rr
-%type	<nConstValue>	reg_tt
-%type	<nConstValue>	ccode
-%type	<sVal>			op_a_n
-%type	<nConstValue>	op_a_r
-%type	<nConstValue>	op_hl_ss
-%type	<sVal>			op_mem_ind

src/asm/gameboy/yaccprt4.y

@@ -1,496 +0,0 @@
-section:
-		T_POP_SECTION string ',' sectiontype
-		{
-			out_NewSection($2,$4);
-		}
-	|	T_POP_SECTION string ',' sectiontype '[' const ']'
-		{
-			if( $6>=0 && $6<0x10000 )
-				out_NewAbsSection($2,$4,$6,-1);
-			else
-				yyerror( "Address must be 16-bit" );
-		}
-	|	T_POP_SECTION string ',' sectiontype ',' T_OP_BANK '[' const ']'
-		{
-			if( $4==SECT_CODE ) {
-				if( $8>=1 && $8<=0x1ff )
-					out_NewAbsSection($2,$4,-1,$8);
-				else
-					yyerror( "BANK value out of range" );
-			} else
-				yyerror( "BANK only allowed for CODE/DATA" );
-		}
-	|	T_POP_SECTION string ',' sectiontype '[' const ']' ',' T_OP_BANK '[' const ']'
-		{
-			if( $4==SECT_CODE ) {
-				if( $6>=0 && $6<0x10000 ) {
-					if( $11>=1 && $11<=0x1ff )
-						out_NewAbsSection($2,$4,$6,$11);
-					else
-						yyerror( "BANK value out of range" );
-				} else
-					yyerror( "Address must be 16-bit" );
-			} else
-				yyerror( "BANK only allowed for CODE/DATA" );
-		}
-;
-
-sectiontype:
-		T_SECT_BSS	{ $$=SECT_BSS; }
-	|	T_SECT_VRAM	{ $$=SECT_VRAM; }
-	|	T_SECT_CODE	{ $$=SECT_CODE; }
-	|	T_SECT_HOME	{ $$=SECT_HOME; }
-	|	T_SECT_HRAM	{ $$=SECT_HRAM; }
-;
-
-
-cpu_command		:	z80_adc
-				|	z80_add
-				|	z80_and
-				|	z80_bit
-				|	z80_call
-				|	z80_ccf
-				|	z80_cp
-				|	z80_cpl
-				|	z80_daa
-				|	z80_dec
-				|	z80_di
-				|	z80_ei
-				|	z80_ex
-				|	z80_halt
-				|	z80_inc
-				|	z80_jp
-				|	z80_jr
-				|	z80_ld
-				|	z80_ldd
-				|	z80_ldi
-				|	z80_ldio
-				|	z80_nop
-				|	z80_or
-				|	z80_pop
-				|	z80_push
-				|	z80_res
-				|	z80_ret
-				|	z80_reti
-				|	z80_rl
-				|	z80_rla
-				|	z80_rlc
-				|	z80_rlca
-				|	z80_rr
-				|	z80_rra
-				|	z80_rrc
-				|	z80_rrca
-				|	z80_rst
-				|	z80_sbc
-				|	z80_scf
-				|	z80_set
-				|	z80_sla
-				|	z80_sra
-				|	z80_srl
-				|	z80_stop
-				|	z80_sub
-				|	z80_swap
-				|	z80_xor
-;
-
-z80_adc			:	T_Z80_ADC op_a_n	{ out_AbsByte(0xCE); out_RelByte(&$2); }
-				|	T_Z80_ADC op_a_r	{ out_AbsByte(0x88|$2); }
-;
-
-z80_add			:	T_Z80_ADD op_a_n	{ out_AbsByte(0xC6); out_RelByte(&$2); }
-				|	T_Z80_ADD op_a_r	{ out_AbsByte(0x80|$2); }
-				|	T_Z80_ADD op_hl_ss	{ out_AbsByte(0x09|($2<<4)); }
-				|	T_Z80_ADD T_MODE_SP comma const_8bit
-					{ out_AbsByte(0xE8); out_RelByte(&$4); }
-
-;
-
-z80_and			:	T_Z80_AND op_a_n	{ out_AbsByte(0xE6); out_RelByte(&$2); }
-				|	T_Z80_AND op_a_r	{ out_AbsByte(0xA0|$2); }
-;
-
-z80_bit			:	T_Z80_BIT const_3bit comma reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x40|($2<<3)|$4); }
-;
-
-z80_call		:	T_Z80_CALL const_16bit
-					{ out_AbsByte(0xCD); out_RelWord(&$2); }
-				|	T_Z80_CALL ccode comma const_16bit
-					{ out_AbsByte(0xC4|($2<<3)); out_RelWord(&$4); }
-;
-
-z80_ccf			:	T_Z80_CCF
-					{ out_AbsByte(0x3F); }
-;
-
-z80_cp			:	T_Z80_CP op_a_n	{ out_AbsByte(0xFE); out_RelByte(&$2); }
-				|	T_Z80_CP op_a_r	{ out_AbsByte(0xB8|$2); }
-;
-
-z80_cpl			:	T_Z80_CPL { out_AbsByte(0x2F); }
-;
-
-z80_daa			:	T_Z80_DAA { out_AbsByte(0x27); }
-;
-
-z80_dec			:	T_Z80_DEC reg_r
-					{ out_AbsByte(0x05|($2<<3)); }
-				|	T_Z80_DEC reg_ss
-					{ out_AbsByte(0x0B|($2<<4)); }
-;
-
-z80_di			:	T_Z80_DI
-					{ out_AbsByte(0xF3); }
-;
-
-z80_ei			:	T_Z80_EI
-					{ out_AbsByte(0xFB); }
-;
-
-z80_ex			:	T_Z80_EX T_MODE_HL comma T_MODE_SP_IND
-					{ out_AbsByte(0xE3); }
-				|	T_Z80_EX T_MODE_SP_IND comma T_MODE_HL
-					{ out_AbsByte(0xE3); }
-;
-
-z80_halt		:	T_Z80_HALT
-					{ out_AbsByte(0x76); out_AbsByte(0x00); }
-;
-
-z80_inc			:	T_Z80_INC reg_r
-					{ out_AbsByte(0x04|($2<<3)); }
-				|	T_Z80_INC reg_ss
-					{ out_AbsByte(0x03|($2<<4)); }
-;
-
-z80_jp			:	T_Z80_JP const_16bit
-					{ out_AbsByte(0xC3); out_RelWord(&$2); }
-				|	T_Z80_JP ccode comma const_16bit
-					{ out_AbsByte(0xC2|($2<<3)); out_RelWord(&$4); }
-				|	T_Z80_JP T_MODE_HL_IND
-					{ out_AbsByte(0xE9); }
-;
-
-z80_jr			:	T_Z80_JR const_PCrel
-					{ out_AbsByte(0x18); out_PCRelByte(&$2); }
-				|	T_Z80_JR ccode comma const_PCrel
-					{ out_AbsByte(0x20|($2<<3)); out_PCRelByte(&$4); }
-;
-
-z80_ldi			:	T_Z80_LDI T_MODE_HL_IND comma T_MODE_A
-					{ out_AbsByte(0x02|(2<<4)); }
-				|	T_Z80_LDI T_MODE_A comma T_MODE_HL
-					{ out_AbsByte(0x0A|(2<<4)); }
-;
-
-z80_ldd			:	T_Z80_LDD T_MODE_HL_IND comma T_MODE_A
-					{ out_AbsByte(0x02|(3<<4)); }
-				|	T_Z80_LDD T_MODE_A comma T_MODE_HL
-					{ out_AbsByte(0x0A|(3<<4)); }
-;
-
-z80_ldio		:	T_Z80_LDIO T_MODE_A comma op_mem_ind
-					{
-						rpn_CheckHRAM(&$4,&$4);
-
-						if( (!rpn_isReloc(&$4))
-						&&	($4.nVal<0 || ($4.nVal>0xFF && $4.nVal<0xFF00) || $4.nVal>0xFFFF) )
-						{
-							yyerror( "Source must be in the IO/HRAM area" );
-						}
-
-						out_AbsByte(0xF0);
-						$4.nVal&=0xFF;
-						out_RelByte(&$4);
-					}
-				|	T_Z80_LDIO op_mem_ind comma T_MODE_A
-					{
-						rpn_CheckHRAM(&$2,&$2);
-
-						if( (!rpn_isReloc(&$2))
-						&&	($2.nVal<0 || ($2.nVal>0xFF && $2.nVal<0xFF00) || $2.nVal>0xFFFF) )
-						{
-							yyerror( "Destination must be in the IO/HRAM area" );
-						}
-
-						out_AbsByte(0xE0);
-						$2.nVal&=0xFF;
-						out_RelByte(&$2);
-					}
-;
-
-z80_ld			:	z80_ld_mem
-				|	z80_ld_cind
-				|	z80_ld_rr
-				|	z80_ld_ss
-				|	z80_ld_hl
-				|	z80_ld_sp
-				|	z80_ld_r
-				|	z80_ld_a
-;
-
-z80_ld_hl		:	T_Z80_LD T_MODE_HL comma '[' T_MODE_SP const_8bit ']'
-					{ out_AbsByte(0xF8); out_RelByte(&$6); }
-				|	T_Z80_LD T_MODE_HL comma const_16bit
-					{ out_AbsByte(0x01|(REG_HL<<4)); out_RelWord(&$4); }
-;
-z80_ld_sp		:	T_Z80_LD T_MODE_SP comma T_MODE_HL
-					{ out_AbsByte(0xF9); }
-				|	T_Z80_LD T_MODE_SP comma const_16bit
-					{ out_AbsByte(0x01|(REG_SP<<4)); out_RelWord(&$4); }
-;
-
-z80_ld_mem		:	T_Z80_LD op_mem_ind comma T_MODE_SP
-					{ out_AbsByte(0x08); out_RelWord(&$2); }
-				|	T_Z80_LD op_mem_ind comma T_MODE_A
-					{
-						if( (!rpn_isReloc(&$2)) && $2.nVal>=0xFF00)
-						{
-							out_AbsByte(0xE0);
-							out_AbsByte($2.nVal&0xFF);
-						}
-						else
-						{
-							out_AbsByte(0xEA);
-							out_RelWord(&$2);
-						}
-					}
-;
-
-z80_ld_cind		:	T_Z80_LD T_MODE_C_IND comma T_MODE_A
-					{ out_AbsByte(0xE2); }
-;
-
-z80_ld_rr		:	T_Z80_LD reg_rr comma T_MODE_A
-					{ out_AbsByte(0x02|($2<<4)); }
-;
-
-z80_ld_r		:	T_Z80_LD reg_r comma const_8bit
-					{ out_AbsByte(0x06|($2<<3)); out_RelByte(&$4); }
-				|	T_Z80_LD reg_r comma reg_r
-					{
-						if( ($2==REG_HL_IND) && ($4==REG_HL_IND) )
-						{
-							yyerror( "LD (HL),(HL) not allowed" );
-						}
-						else
-							out_AbsByte(0x40|($2<<3)|$4);
-					}
-;
-
-z80_ld_a		:	T_Z80_LD reg_r comma T_MODE_C_IND
-					{
-						if( $2==REG_A )
-							out_AbsByte(0xF2);
-						else
-						{
-							yyerror( "Destination operand must be A" );
-						}
-					}
-				|	T_Z80_LD reg_r comma reg_rr
-					{
-						if( $2==REG_A )
-							out_AbsByte(0x0A|($4<<4));
-						else
-						{
-							yyerror( "Destination operand must be A" );
-						}
-					}
-				|	T_Z80_LD reg_r comma op_mem_ind
-					{
-						if( $2==REG_A )
-						{
-							if( (!rpn_isReloc(&$4)) && $4.nVal>=0xFF00 )
-							{
-								out_AbsByte(0xF0);
-								out_AbsByte($4.nVal&0xFF);
-							}
-							else
-							{
-								out_AbsByte(0xFA);
-								out_RelWord(&$4);
-							}
-						}
-						else
-						{
-							yyerror( "Destination operand must be A" );
-						}
-					}
-;
-
-z80_ld_ss		:	T_Z80_LD reg_ss comma const_16bit
-					{ out_AbsByte(0x01|($2<<4)); out_RelWord(&$4); }
-;
-
-z80_nop			:	T_Z80_NOP
-					{ out_AbsByte(0x00); }
-;
-
-z80_or			:	T_Z80_OR op_a_n
-					{ out_AbsByte(0xF6); out_RelByte(&$2); }
-				|	T_Z80_OR op_a_r
-					{ out_AbsByte(0xB0|$2); }
-;
-
-z80_pop			:	T_Z80_POP reg_tt
-					{ out_AbsByte(0xC1|($2<<4)); }
-;
-
-z80_push		:	T_Z80_PUSH reg_tt
-					{ out_AbsByte(0xC5|($2<<4)); }
-;
-
-z80_res			:	T_Z80_RES const_3bit comma reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x80|($2<<3)|$4); }
-;
-
-z80_ret			:	T_Z80_RET
-					{ out_AbsByte(0xC9); }
-				|	T_Z80_RET ccode
-					{ out_AbsByte(0xC0|($2<<3)); }
-;
-
-z80_reti		:	T_Z80_RETI
-					{ out_AbsByte(0xD9); }
-;
-
-z80_rl			:	T_Z80_RL reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x10|$2); }
-;
-
-z80_rla			:	T_Z80_RLA
-					{ out_AbsByte(0x17); }
-;
-
-z80_rlc			:	T_Z80_RLC reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x00|$2); }
-;
-
-z80_rlca 		:	T_Z80_RLCA
-					{ out_AbsByte(0x07); }
-;
-
-z80_rr			:	T_Z80_RR reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x18|$2); }
-;
-
-z80_rra			:	T_Z80_RRA
-					{ out_AbsByte(0x1F); }
-;
-
-z80_rrc			:	T_Z80_RRC reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x08|$2); }
-;
-
-z80_rrca 		:	T_Z80_RRCA
-					{ out_AbsByte(0x0F); }
-;
-
-z80_rst 		:	T_Z80_RST const_8bit
-					{
-						if( rpn_isReloc(&$2) )
-						{
-							yyerror( "Address for RST must be absolute" );
-						}
-						else if( ($2.nVal&0x38)!=$2.nVal )
-						{
-							yyerror( "Invalid address for RST" );
-						}
-						else
-							out_AbsByte(0xC7|$2.nVal);
-					}
-;
-
-z80_sbc			:	T_Z80_SBC op_a_n	{ out_AbsByte(0xDE); out_RelByte(&$2); }
-				|	T_Z80_SBC op_a_r	{ out_AbsByte(0x98|$2); }
-;
-
-z80_scf			:	T_Z80_SCF
-					{ out_AbsByte(0x37); }
-;
-
-z80_set			:	T_POP_SET const_3bit comma reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0xC0|($2<<3)|$4); }
-;
-
-z80_sla			:	T_Z80_SLA reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x20|$2); }
-;
-
-z80_sra			:	T_Z80_SRA reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x28|$2); }
-;
-
-z80_srl			:	T_Z80_SRL reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x38|$2); }
-;
-
-z80_stop		:	T_Z80_STOP
-					{ out_AbsByte(0x10); out_AbsByte(0x00); }
-;
-
-z80_sub			:	T_Z80_SUB op_a_n	{ out_AbsByte(0xD6); out_RelByte(&$2); }
-				|	T_Z80_SUB op_a_r	{ out_AbsByte(0x90|$2); }
-;
-
-z80_swap		:	T_Z80_SWAP reg_r
-					{ out_AbsByte(0xCB); out_AbsByte(0x30|$2); }
-;
-
-z80_xor			:	T_Z80_XOR op_a_n	{ out_AbsByte(0xEE); out_RelByte(&$2); }
-				|	T_Z80_XOR op_a_r	{ out_AbsByte(0xA8|$2); }
-;
-
-op_mem_ind		:	'[' const_16bit ']'	{ $$ = $2; }
-;
-
-op_hl_ss 		:	reg_ss					{ $$ = $1; }
-				|	T_MODE_HL comma reg_ss	{ $$ = $3; }
-;
-
-op_a_r			:	reg_r				{ $$ = $1; }
-				|	T_MODE_A comma reg_r	{ $$ = $3; }
-;
-
-op_a_n			:	const_8bit				{ $$ = $1; }
-				|	T_MODE_A comma const_8bit	{ $$ = $3; }
-;
-
-comma			:	','
-;
-
-ccode			:	T_CC_NZ		{ $$ = CC_NZ; }
-				|	T_CC_Z		{ $$ = CC_Z; }
-				|	T_CC_NC		{ $$ = CC_NC; }
-				|	T_MODE_C	{ $$ = CC_C; }
-;
-
-reg_r			:	T_MODE_B		{ $$ = REG_B; }
-				|	T_MODE_C		{ $$ = REG_C; }
-				|	T_MODE_D		{ $$ = REG_D; }
-				|	T_MODE_E		{ $$ = REG_E; }
-				|	T_MODE_H		{ $$ = REG_H; }
-				|	T_MODE_L		{ $$ = REG_L; }
-				|	T_MODE_HL_IND	{ $$ = REG_HL_IND; }
-				|	T_MODE_A		{ $$ = REG_A; }
-;
-
-reg_tt			:	T_MODE_BC		{ $$ = REG_BC; }
-				|	T_MODE_DE		{ $$ = REG_DE; }
-				|	T_MODE_HL		{ $$ = REG_HL; }
-				|	T_MODE_AF		{ $$ = REG_AF; }
-;
-
-reg_ss			:	T_MODE_BC		{ $$ = REG_BC; }
-				|	T_MODE_DE		{ $$ = REG_DE; }
-				|	T_MODE_HL		{ $$ = REG_HL; }
-				|	T_MODE_SP		{ $$ = REG_SP; }
-;
-
-reg_rr			:	T_MODE_BC_IND		{ $$ = REG_BC_IND; }
-				|	T_MODE_DE_IND		{ $$ = REG_DE_IND; }
-				|	T_MODE_HL_INDINC	{ $$ = REG_HL_INDINC; }
-				|	T_MODE_HL_INDDEC	{ $$ = REG_HL_INDDEC; }
-;
-
-%%

src/asm/globlex.c

@@ -7,12 +7,13 @@
 
 #include "asmy.h"
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
-UBYTE oDontExpandStrings = 0;
+bool oDontExpandStrings = false;
 SLONG nGBGfxID = -1;
 SLONG nBinaryID = -1;
 
@@ -96,7 +97,7 @@ ascii2bin(char *s)
 
 		while (*s != '\0') {
 			c = convertfunc(*s++);
-			result = result * 2 + ((c & 1) << 8) + ((c & 2) >> 1);
+			result = result * 2 + ((c & 2) << 7) + (c & 1);
 		}
 	} else {
 		while (*s != '\0')
@@ -109,7 +110,7 @@ ascii2bin(char *s)
 ULONG 
 ParseFixedPoint(char *s, ULONG size)
 {
-	char dest[256];
+	//char dest[256];
 	ULONG i = 0, dot = 0;
 
 	while (size && dot != 2) {
@@ -117,13 +118,13 @@ ParseFixedPoint(char *s, ULONG size)
 			dot += 1;
 
 		if (dot < 2) {
-			dest[i] = s[i];
+			//dest[i] = s[i];
 			size -= 1;
 			i += 1;
 		}
 	}
 
-	dest[i] = 0;
+	//dest[i] = 0;
 
 	yyunputbytes(size);
 
@@ -160,7 +161,7 @@ ParseSymbol(char *src, ULONG size)
 			if (*src == '@')
 				marg = sym_FindMacroArg(-1);
 			else if (*src >= '0' && *src <= '9')
-				marg = sym_FindMacroArg(*src);
+				marg = sym_FindMacroArg(*src - '0');
 			else {
 				fatalerror("Malformed ID");
 				return (0);
@@ -184,7 +185,7 @@ ParseSymbol(char *src, ULONG size)
 
 	dest[copied] = 0;
 
-	if (oDontExpandStrings == 0 && sym_isString(dest)) {
+	if (!oDontExpandStrings && sym_isString(dest)) {
 		char *s;
 
 		yyskipbytes(size_backup);
@@ -208,10 +209,14 @@ PutMacroArg(char *src, ULONG size)
 	char *s;
 
 	yyskipbytes(size);
-	if ((s = sym_FindMacroArg(src[1] - '0')) != NULL) {
-		yyunputstr(s);
+	if ((size == 2 && src[1] >= '1' && src[1] <= '9')) {
+		if ((s = sym_FindMacroArg(src[1] - '0')) != NULL) {
+			yyunputstr(s);
+		} else {
+			yyerror("Macro argument not defined");
+		}
 	} else {
-		yyerror("Macro argument not defined");
+		yyerror("Invalid macro argument");
 	}
 	return (0);
 }
@@ -219,9 +224,14 @@ PutMacroArg(char *src, ULONG size)
 ULONG 
 PutUniqueArg(char *src, ULONG size)
 {
-	src = src;
+	char *s;
+
 	yyskipbytes(size);
-	yyunputstr(sym_FindMacroArg(-1));
+	if ((s = sym_FindMacroArg(-1)) != NULL) {
+		yyunputstr(s);
+	} else {
+		yyerror("Macro unique label string not defined");
+	}
 	return (0);
 }
 
@@ -258,6 +268,9 @@ struct sLexInitString staticstrings[] = {
 
 	{"bank", T_OP_BANK},
 
+	{"round", T_OP_ROUND},
+	{"ceil", T_OP_CEIL},
+	{"floor", T_OP_FLOOR},
 	{"div", T_OP_FDIV},
 	{"mul", T_OP_FMUL},
 	{"sin", T_OP_SIN},
@@ -298,6 +311,7 @@ struct sLexInitString staticstrings[] = {
 	{"rsset", T_POP_RSSET},
 
 	{"incbin", T_POP_INCBIN},
+	{"charmap", T_POP_CHARMAP},
 
 	{"fail", T_POP_FAIL},
 	{"warn", T_POP_WARN},
@@ -316,12 +330,17 @@ struct sLexInitString staticstrings[] = {
 	{"else", T_POP_ELSE},
 	{"endc", T_POP_ENDC},
 
-	{"bss", T_SECT_BSS},
+	{"wram0", T_SECT_WRAM0},
+	{"bss", T_SECT_WRAM0}, /* deprecated */
 	{"vram", T_SECT_VRAM},
-	{"code", T_SECT_CODE},
-	{"data", T_SECT_CODE},
-	{"home", T_SECT_HOME},
+	{"code", T_SECT_ROMX}, /* deprecated */
+	{"data", T_SECT_ROMX}, /* deprecated */
+	{"romx", T_SECT_ROMX},
+	{"home", T_SECT_ROM0}, /* deprecated */
+	{"rom0", T_SECT_ROM0},
 	{"hram", T_SECT_HRAM},
+	{"wramx", T_SECT_WRAMX},
+	{"sram", T_SECT_SRAM},
 
 	{NAME_RB, T_POP_RB},
 	{NAME_RW, T_POP_RW},
@@ -382,7 +401,7 @@ setuplex(void)
 
 	    id = lex_FloatAlloc(&tMacroArgToken);
 	lex_FloatAddFirstRange(id, '\\', '\\');
-	lex_FloatAddSecondRange(id, '0', '9');
+	lex_FloatAddSecondRange(id, '1', '9');
 	id = lex_FloatAlloc(&tMacroUniqueToken);
 	lex_FloatAddFirstRange(id, '\\', '\\');
 	lex_FloatAddSecondRange(id, '@', '@');

src/asm/locallex.c

@@ -2,7 +2,7 @@
 #include "asm/lexer.h"
 #include "asm/rpn.h"
 
-#include "../asmy.h"
+#include "asmy.h"
 
 struct sLexInitString localstrings[] = {
 	{"adc", T_Z80_ADC},

src/asm/main.c

@@ -1,12 +1,5 @@
-/*
- * RGBAsm - MAIN.C
- *
- * INCLUDES
- *
- */
-
 #include <math.h>
-#include <getopt.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,21 +10,17 @@
 #include "asm/fstack.h"
 #include "asm/output.h"
 #include "asm/main.h"
+#include "extern/err.h"
+#include "extern/reallocarray.h"
 
 int yyparse(void);
 void setuplex(void);
 
-#ifdef AMIGA
-__near long __stack = 65536L;
+int cldefines_index;
+int cldefines_size;
+char **cldefines;
 
-#endif
-
-/*
- * RGBAsm - MAIN.C
- *
- * VARIABLES
- *
- */
+char *progname;
 
 clock_t nStartClock, nEndClock;
 SLONG nLineNo;
@@ -39,13 +28,8 @@ ULONG nTotalLines, nPass, nPC, nIFDepth, nErrors;
 
 extern int yydebug;
 
-char temptext[1024];
-
 /*
- * RGBAsm - MAIN.C
- *
  * Option stack
- *
  */
 
 struct sOptions DefaultOptions;
@@ -136,9 +120,8 @@ opt_Parse(char *s)
 			newopt.gbgfx[2] = s[3];
 			newopt.gbgfx[3] = s[4];
 		} else {
-			fprintf(stderr, "Must specify exactly 4 characters "
-			    "for option 'g'\n");
-			exit(1);
+			errx(1, "Must specify exactly 4 characters for "
+			    "option 'g'");
 		}
 		break;
 	case 'b':
@@ -146,9 +129,8 @@ opt_Parse(char *s)
 			newopt.binary[0] = s[1];
 			newopt.binary[1] = s[2];
 		} else {
-			fprintf(stderr, "Must specify exactly 2 characters "
-			    "for option 'b'\n");
-			exit(1);
+			errx(1, "Must specify exactly 2 characters for option "
+			    "'b'");
 		}
 		break;
 	case 'z':
@@ -157,12 +139,10 @@ opt_Parse(char *s)
 
 			result = sscanf(&s[1], "%lx", &newopt.fillchar);
 			if (!((result == EOF) || (result == 1))) {
-				fprintf(stderr,
-				    "Invalid argument for option 'z'\n");
-				exit(1);
+				errx(1, "Invalid argument for option 'z'");
 			}
 		} else {
-			fprintf(stderr, "Invalid argument for option 'z'\n");
+			errx(1, "Invalid argument for option 'z'");
 			exit(1);
 		}
 		break;
@@ -179,9 +159,7 @@ opt_Push(void)
 {
 	struct sOptionStackEntry *pOpt;
 
-	if ((pOpt =
-		(struct sOptionStackEntry *)
-		malloc(sizeof(struct sOptionStackEntry))) != NULL) {
+	if ((pOpt = malloc(sizeof(struct sOptionStackEntry))) != NULL) {
 		pOpt->Options = CurrentOptions;
 		pOpt->pNext = pOptionStack;
 		pOptionStack = pOpt;
@@ -202,49 +180,87 @@ opt_Pop(void)
 	} else
 		fatalerror("No entries in the option stack");
 }
-/*
- * RGBAsm - MAIN.C
- *
- * Error handling
- *
- */
 
-void 
-yyerror(char *s)
+void
+opt_AddDefine(char *s)
 {
-	printf("*ERROR*\t");
+	char *value, *equals;
+	if(cldefines_index >= cldefines_size)
+	{
+		cldefines_size *= 2;
+		cldefines = reallocarray(cldefines, cldefines_size,
+		                        2 * sizeof(void *));
+		if(!cldefines)
+		{
+			fatalerror("No memory for command line defines");
+		}
+	}
+	equals = strchr(s, '=');
+	if(equals)
+	{
+		*equals = '\0';
+		value = equals + 1;
+	}
+	else
+	{
+		value = "1";
+	}
+	cldefines[cldefines_index++] = s;
+	cldefines[cldefines_index++] = value;
+}
+
+void
+opt_ParseDefines()
+{
+	int i;
+
+	for(i = 0; i < cldefines_index; i += 2)
+	{
+		sym_AddString(cldefines[i], cldefines[i + 1]);
+	}
+}
+
+/*
+ * Error handling
+ */
+void
+verror(const char *fmt, va_list args)
+{
+	fprintf(stderr, "ERROR:\t");
 	fstk_Dump();
-	printf(" :\n\t%s\n", s);
+	fprintf(stderr, " :\n\t");
+	vfprintf(stderr, fmt, args);
+	fprintf(stderr, "\n");
 	nErrors += 1;
 }
 
 void 
-fatalerror(char *s)
+yyerror(const char *fmt, ...)
 {
-	yyerror(s);
-	exit(5);
+	va_list args;
+	va_start(args, fmt);
+	verror(fmt, args);
+	va_end(args);
 }
-/*
- * RGBAsm - MAIN.C
- *
- * Help text
- *
- */
 
 void 
-PrintUsage(void)
+fatalerror(const char *fmt, ...)
 {
-	printf("RGBAsm v" ASM_VERSION " (part of ASMotor " ASMOTOR_VERSION
-	    ")\n\n");
-	printf("Usage: rgbasm [-b chars] [-g chars] [-i path] [-o outfile] [-p pad_value] file\n");
+	va_list args;
+	va_start(args, fmt);
+	verror(fmt, args);
+	va_end(args);
+	exit(5);
+}
+
+static void 
+usage(void)
+{
+	printf(
+"Usage: rgbasm [-hvE] [-b chars] [-Dname[=value]] [-g chars] [-i path]\n"
+"              [-o outfile] [-p pad_value] file.asm\n");
 	exit(1);
 }
-/*
- * RGBAsm - MAIN.C
- *
- * main
- *
- */
 
 int 
 main(int argc, char *argv[])
@@ -256,8 +272,18 @@ main(int argc, char *argv[])
 
 	char *tzMainfile;
 
+	cldefines_size = 32;
+	cldefines = reallocarray(cldefines, cldefines_size,
+	                        2 * sizeof(void *));
+	if(!cldefines)
+	{
+		fatalerror("No memory for command line defines");
+	}
+
 	if (argc == 1)
-		PrintUsage();
+		usage();
+
+	progname = argv[0];
 
 	/* yydebug=1; */
 
@@ -268,22 +294,28 @@ main(int argc, char *argv[])
 	DefaultOptions.binary[0] = '0';
 	DefaultOptions.binary[1] = '1';
 	DefaultOptions.fillchar = 0;
+	DefaultOptions.verbose = false;
+	DefaultOptions.haltnop = true;
+	DefaultOptions.exportall = false;
 
 	opt_SetCurrentOptions(&DefaultOptions);
 
 	newopt = CurrentOptions;
 
-	while ((ch = getopt(argc, argv, "b:g:i:o:p:")) != -1) {
+	while ((ch = getopt(argc, argv, "b:D:g:hi:o:p:vE")) != -1) {
 		switch (ch) {
 		case 'b':
 			if (strlen(optarg) == 2) {
 				newopt.binary[0] = optarg[1];
 				newopt.binary[1] = optarg[2];
 			} else {
-				fprintf(stderr, "Must specify exactly "
-				    "2 characters for option 'b'\n");
-				exit(1);
+				errx(1, "Must specify exactly 2 characters for "
+				    "option 'b'");
 			}
+			break;
+		case 'D':
+			opt_AddDefine(optarg);
+			break;
 		case 'g':
 			if (strlen(optarg) == 4) {
 				newopt.gbgfx[0] = optarg[1];
@@ -291,11 +323,13 @@ main(int argc, char *argv[])
 				newopt.gbgfx[2] = optarg[3];
 				newopt.gbgfx[3] = optarg[4];
 			} else {
-				fprintf(stderr, "Must specify exactly "
-				    "4 characters for option 'g'\n");
-				exit(1);
+				errx(1, "Must specify exactly 4 characters for "
+				    "option 'g'");
 			}
 			break;
+		case 'h':
+			newopt.haltnop = false;
+			break;
 		case 'i':
 			fstk_AddIncludePath(optarg);
 			break;
@@ -305,18 +339,21 @@ main(int argc, char *argv[])
 		case 'p':
 			newopt.fillchar = strtoul(optarg, &ep, 0);
 			if (optarg[0] == '\0' || *ep != '\0') {
-				fprintf(stderr,
-				    "Invalid argument for option 'p'\n");
-				exit(1);
+				errx(1, "Invalid argument for option 'p'");
 			}
 			if (newopt.fillchar < 0 || newopt.fillchar > 0xFF) {
-				fprintf(stderr, "Argument for option 'p' "
-				    "must be between 0 and 0xFF\n");
-				exit(1);
+				errx(1, "Argument for option 'p' must be "
+				    "between 0 and 0xFF");
 			}
 			break;
+		case 'v':
+			newopt.verbose = true;
+			break;
+		case 'E':
+			newopt.exportall = true;
+			break;
 		default:
-			PrintUsage();
+			usage();
 		}
 	}
 	argc -= optind;
@@ -326,12 +363,16 @@ main(int argc, char *argv[])
 
 	DefaultOptions = CurrentOptions;
 
-	/* tzMainfile=argv[argn++]; argc-=1; */
+	if (argc == 0)
+		usage();
+
 	tzMainfile = argv[argc - 1];
 
 	setuplex();
 
-	printf("Assembling %s\n", tzMainfile);
+	if (CurrentOptions.verbose) {
+		printf("Assembling %s\n", tzMainfile);
+	}
 
 	nStartClock = clock();
 
@@ -342,69 +383,60 @@ main(int argc, char *argv[])
 	nPass = 1;
 	nErrors = 0;
 	sym_PrepPass1();
-	if (fstk_Init(tzMainfile)) {
+	sym_SetExportAll(CurrentOptions.exportall);
+	fstk_Init(tzMainfile);
+	opt_ParseDefines();
+
+	if (CurrentOptions.verbose) {
 		printf("Pass 1...\n");
-
-		yy_set_state(LEX_STATE_NORMAL);
-		opt_SetCurrentOptions(&DefaultOptions);
-
-		if (yyparse() == 0 && nErrors == 0) {
-			if (nIFDepth == 0) {
-				nTotalLines = 0;
-				nLineNo = 1;
-				nIFDepth = 0;
-				nPC = 0;
-				nPass = 2;
-				nErrors = 0;
-				sym_PrepPass2();
-				out_PrepPass2();
-				fstk_Init(tzMainfile);
-				yy_set_state(LEX_STATE_NORMAL);
-				opt_SetCurrentOptions(&DefaultOptions);
-
-				printf("Pass 2...\n");
-
-				if (yyparse() == 0 && nErrors == 0) {
-					double timespent;
-
-					nEndClock = clock();
-					timespent =
-					    ((double) (nEndClock - nStartClock))
-					    / (double) CLOCKS_PER_SEC;
-					printf
-					    ("Success! %ld lines in %d.%02d seconds ",
-					    nTotalLines, (int) timespent,
-					    ((int) (timespent * 100.0)) % 100);
-					if (timespent == 0)
-						printf
-						    ("(INFINITY lines/minute)\n");
-					else
-						printf("(%d lines/minute)\n",
-						    (int) (60 / timespent *
-							nTotalLines));
-					out_WriteObject();
-				} else {
-					printf
-					    ("Assembly aborted in pass 2 (%ld errors)!\n",
-					    nErrors);
-					//sym_PrintSymbolTable();
-					exit(5);
-				}
-			} else {
-				fprintf(stderr,
-				    "Unterminated IF construct (%ld levels)!\n",
-				    nIFDepth);
-				exit(1);
-			}
-		} else {
-			fprintf(stderr,
-			    "Assembly aborted in pass 1 (%ld errors)!\n",
-			    nErrors);
-			exit(1);
-		}
-	} else {
-		printf("File '%s' not found\n", tzMainfile);
-		exit(5);
 	}
-	return (0);
+
+	yy_set_state(LEX_STATE_NORMAL);
+	opt_SetCurrentOptions(&DefaultOptions);
+
+	if (yyparse() != 0 || nErrors != 0) {
+		errx(1, "Assembly aborted in pass 1 (%ld errors)!", nErrors);
+	}
+
+	if (nIFDepth != 0) {
+		errx(1, "Unterminated IF construct (%ld levels)!", nIFDepth);
+	}
+
+	nTotalLines = 0;
+	nLineNo = 1;
+	nIFDepth = 0;
+	nPC = 0;
+	nPass = 2;
+	nErrors = 0;
+	sym_PrepPass2();
+	out_PrepPass2();
+	fstk_Init(tzMainfile);
+	yy_set_state(LEX_STATE_NORMAL);
+	opt_SetCurrentOptions(&DefaultOptions);
+	opt_ParseDefines();
+
+	if (CurrentOptions.verbose) {
+		printf("Pass 2...\n");
+	}
+
+	if (yyparse() != 0 || nErrors != 0) {
+		errx(1, "Assembly aborted in pass 2 (%ld errors)!", nErrors);
+	}
+
+	double timespent;
+
+	nEndClock = clock();
+	timespent = ((double)(nEndClock - nStartClock))
+	    / (double)CLOCKS_PER_SEC;
+	if (CurrentOptions.verbose) {
+		printf("Success! %ld lines in %d.%02d seconds ", nTotalLines,
+		    (int) timespent, ((int) (timespent * 100.0)) % 100);
+		if (timespent == 0)
+			printf("(INFINITY lines/minute)\n");
+		else
+			printf("(%d lines/minute)\n",
+			    (int) (60 / timespent * nTotalLines));
+	}
+	out_WriteObject();
+	return 0;
 }

src/asm/math.c

@@ -1,14 +1,11 @@
 /*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * INCLUDES
- *
+ * Fixedpoint math routines
  */
 
 #include <math.h>
 #include <stdio.h>
 
-#include "asm/types.h"
+#include "types.h"
 #include "asm/mymath.h"
 #include "asm/symbol.h"
 
@@ -19,24 +16,17 @@
 #endif
 
 /*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
  * Define the _PI symbol
- *
  */
-
 void 
 math_DefinePI(void)
 {
 	sym_AddEqu("_PI", double2fix(PI));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Print a fixed point value
- *
- */
 
+/*
+ * Print a fixed point value
+ */
 void 
 math_Print(SLONG i)
 {
@@ -47,112 +37,112 @@ math_Print(SLONG i)
 		printf("-%ld.%05ld", (-i) >> 16,
 		    ((SLONG) (fix2double(-i) * 100000 + 0.5)) % 100000);
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Calculate sine
- *
- */
 
+/*
+ * Calculate sine
+ */
 SLONG 
 math_Sin(SLONG i)
 {
 	return (double2fix(sin(fix2double(i) * 2 * PI / 65536)));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Calculate cosine
- *
- */
 
+/*
+ * Calculate cosine
+ */
 SLONG 
 math_Cos(SLONG i)
 {
 	return (double2fix(cos(fix2double(i) * 2 * PI / 65536)));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Calculate tangent
- *
- */
 
+/*
+ * Calculate tangent
+ */
 SLONG 
 math_Tan(SLONG i)
 {
 	return (double2fix(tan(fix2double(i) * 2 * PI / 65536)));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Calculate sine^-1
- *
- */
 
+/*
+ * Calculate arcsine
+ */
 SLONG 
 math_ASin(SLONG i)
 {
 	return (double2fix(asin(fix2double(i)) / 2 / PI * 65536));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Calculate cosine^-1
- *
- */
 
+/*
+ * Calculate arccosine
+ */
 SLONG 
 math_ACos(SLONG i)
 {
 	return (double2fix(acos(fix2double(i)) / 2 / PI * 65536));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Calculate tangent^-1
- *
- */
 
+/*
+ * Calculate arctangent
+ */
 SLONG 
 math_ATan(SLONG i)
 {
 	return (double2fix(atan(fix2double(i)) / 2 / PI * 65536));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Calculate atan2
- *
- */
 
+/*
+ * Calculate atan2
+ */
 SLONG 
 math_ATan2(SLONG i, SLONG j)
 {
 	return (double2fix
 	    (atan2(fix2double(i), fix2double(j)) / 2 / PI * 65536));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Multiplication
- *
- */
 
+/*
+ * Multiplication
+ */
 SLONG 
 math_Mul(SLONG i, SLONG j)
 {
 	return (double2fix(fix2double(i) * fix2double(j)));
 }
-/*
- * RGBAsm - MATH.C (Fixedpoint math routines)
- *
- * Division
- *
- */
 
+/*
+ * Division
+ */
 SLONG 
 math_Div(SLONG i, SLONG j)
 {
 	return (double2fix(fix2double(i) / fix2double(j)));
 }
+
+/*
+ * Round
+ */
+SLONG 
+math_Round(SLONG i)
+{
+	return double2fix(round(fix2double(i)));
+}
+
+/*
+ * Ceil
+ */
+SLONG 
+math_Ceil(SLONG i)
+{
+	return double2fix(ceil(fix2double(i)));
+}
+
+/*
+ * Floor
+ */
+SLONG 
+math_Floor(SLONG i)
+{
+	return double2fix(floor(fix2double(i)));
+}

src/asm/output.c

@@ -1,31 +1,24 @@
 /*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * INCLUDES
- *
+ * Outputs an objectfile
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "asm/asm.h"
+#include "asm/charmap.h"
 #include "asm/output.h"
 #include "asm/symbol.h"
 #include "asm/mylink.h"
 #include "asm/main.h"
 #include "asm/rpn.h"
 #include "asm/fstack.h"
+#include "extern/err.h"
 
 #define SECTIONCHUNK	0x4000
 
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Internal structures
- *
- */
-
 void out_SetCurrentSection(struct Section * pSect);
 
 struct Patch {
@@ -42,39 +35,30 @@ struct PatchSymbol {
 	ULONG ID;
 	struct sSymbol *pSymbol;
 	struct PatchSymbol *pNext;
+	struct PatchSymbol *pBucketNext; // next symbol in hash table bucket
 };
 
 struct SectionStackEntry {
 	struct Section *pSection;
 	struct SectionStackEntry *pNext;
 };
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * VARIABLES
- *
- */
 
+struct PatchSymbol *tHashedPatchSymbols[HASHSIZE];
 struct Section *pSectionList = NULL, *pCurrentSection = NULL;
 struct PatchSymbol *pPatchSymbols = NULL;
-char tzObjectname[_MAX_PATH];
+struct PatchSymbol **ppPatchSymbolsTail = &pPatchSymbols;
+char *tzObjectname;
 struct SectionStackEntry *pSectionStack = NULL;
 
 /*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
  * Section stack routines
- *
  */
-
 void 
 out_PushSection(void)
 {
 	struct SectionStackEntry *pSect;
 
-	if ((pSect =
-		(struct SectionStackEntry *)
-		malloc(sizeof(struct SectionStackEntry))) != NULL) {
+	if ((pSect = malloc(sizeof(struct SectionStackEntry))) != NULL) {
 		pSect->pSection = pCurrentSection;
 		pSect->pNext = pSectionStack;
 		pSectionStack = pSect;
@@ -95,13 +79,10 @@ out_PopSection(void)
 	} else
 		fatalerror("No entries in the section stack");
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Count the number of symbols used in this object
- *
- */
 
+/*
+ * Count the number of symbols used in this object
+ */
 ULONG 
 countsymbols(void)
 {
@@ -117,13 +98,10 @@ countsymbols(void)
 
 	return (count);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Count the number of sections used in this object
- *
- */
 
+/*
+ * Count the number of sections used in this object
+ */
 ULONG 
 countsections(void)
 {
@@ -139,13 +117,10 @@ countsections(void)
 
 	return (count);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Count the number of patches used in this object
- *
- */
 
+/*
+ * Count the number of patches used in this object
+ */
 ULONG 
 countpatches(struct Section * pSect)
 {
@@ -160,13 +135,10 @@ countpatches(struct Section * pSect)
 
 	return (r);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Write a long to a file (little-endian)
- *
- */
 
+/*
+ * Write a long to a file (little-endian)
+ */
 void 
 fputlong(ULONG i, FILE * f)
 {
@@ -175,13 +147,10 @@ fputlong(ULONG i, FILE * f)
 	fputc(i >> 16, f);
 	fputc(i >> 24, f);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Write a NULL-terminated string to a file
- *
- */
 
+/*
+ * Write a NULL-terminated string to a file
+ */
 void 
 fputstring(char *s, FILE * f)
 {
@@ -189,13 +158,10 @@ fputstring(char *s, FILE * f)
 		fputc(*s++, f);
 	fputc(0, f);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Return a sections ID
- *
- */
 
+/*
+ * Return a section's ID
+ */
 ULONG 
 getsectid(struct Section * pSect)
 {
@@ -214,13 +180,10 @@ getsectid(struct Section * pSect)
 	fatalerror("INTERNAL: Unknown section");
 	return ((ULONG) - 1);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Write a patch to a file
- *
- */
 
+/*
+ * Write a patch to a file
+ */
 void 
 writepatch(struct Patch * pPatch, FILE * f)
 {
@@ -231,13 +194,10 @@ writepatch(struct Patch * pPatch, FILE * f)
 	fputlong(pPatch->nRPNSize, f);
 	fwrite(pPatch->pRPN, 1, pPatch->nRPNSize, f);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Write a section to a file
- *
- */
 
+/*
+ * Write a section to a file
+ */
 void 
 writesection(struct Section * pSect, FILE * f)
 {
@@ -251,8 +211,8 @@ writesection(struct Section * pSect, FILE * f)
 	    fputlong(pSect->nBank, f);
 	//RGB1 addition
 
-	    if ((pSect->nType == SECT_HOME)
-	    || (pSect->nType == SECT_CODE)) {
+	    if ((pSect->nType == SECT_ROM0)
+	    || (pSect->nType == SECT_ROMX)) {
 		struct Patch *pPatch;
 
 		fwrite(pSect->tData, 1, pSect->nPC, f);
@@ -265,13 +225,10 @@ writesection(struct Section * pSect, FILE * f)
 		}
 	}
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Write a symbol to a file
- *
- */
 
+/*
+ * Write a symbol to a file
+ */
 void 
 writesymbol(struct sSymbol * pSym, FILE * f)
 {
@@ -286,25 +243,27 @@ writesymbol(struct sSymbol * pSym, FILE * f)
 		offset = 0;
 		sectid = -1;
 		type = SYM_IMPORT;
-	} else if (pSym->nType & SYMF_EXPORT) {
-		/* Symbol should be exported */
-		strcpy(symname, pSym->tzName);
-		type = SYM_EXPORT;
-		offset = pSym->nValue;
-		if (pSym->nType & SYMF_CONST)
-			sectid = -1;
-		else
-			sectid = getsectid(pSym->pSection);
 	} else {
-		/* Symbol is local to this file */
 		if (pSym->nType & SYMF_LOCAL) {
 			strcpy(symname, pSym->pScope->tzName);
 			strcat(symname, pSym->tzName);
 		} else
 			strcpy(symname, pSym->tzName);
-		type = SYM_LOCAL;
-		offset = pSym->nValue;
-		sectid = getsectid(pSym->pSection);
+		
+		if (pSym->nType & SYMF_EXPORT) {
+			/* Symbol should be exported */
+			type = SYM_EXPORT;
+			offset = pSym->nValue;
+			if (pSym->nType & SYMF_CONST)
+				sectid = -1;
+			else
+				sectid = getsectid(pSym->pSection);
+		} else {
+			/* Symbol is local to this file */
+			type = SYM_LOCAL;
+			offset = pSym->nValue;
+			sectid = getsectid(pSym->pSection);
+		}
 	}
 
 	fputstring(symname, f);
@@ -315,49 +274,44 @@ writesymbol(struct sSymbol * pSym, FILE * f)
 		fputlong(offset, f);
 	}
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Add a symbol to the object
- *
- */
 
+/*
+ * Add a symbol to the object
+ */
 ULONG 
 addsymbol(struct sSymbol * pSym)
 {
 	struct PatchSymbol *pPSym, **ppPSym;
-	ULONG ID = 0;
+	static ULONG nextID = 0;
+	ULONG hash;
+	
 
-	pPSym = pPatchSymbols;
-	ppPSym = &(pPatchSymbols);
+	hash = calchash(pSym->tzName);
+	ppPSym = &(tHashedPatchSymbols[hash]);
 
-	while (pPSym) {
-		if (pSym == pPSym->pSymbol)
-			return (pPSym->ID);
-		ppPSym = &(pPSym->pNext);
-		pPSym = pPSym->pNext;
-		ID += 1;
+	while ((*ppPSym) != NULL) {
+		if (pSym == (*ppPSym)->pSymbol)
+			return (*ppPSym)->ID;
+		ppPSym = &((*ppPSym)->pBucketNext);
 	}
 
-	if ((*ppPSym = pPSym =
-		(struct PatchSymbol *) malloc(sizeof(struct PatchSymbol))) !=
-	    NULL) {
+	if ((*ppPSym = pPSym = malloc(sizeof(struct PatchSymbol))) != NULL) {
 		pPSym->pNext = NULL;
+		pPSym->pBucketNext = NULL;
 		pPSym->pSymbol = pSym;
-		pPSym->ID = ID;
-		return (ID);
+		pPSym->ID = nextID++;
 	} else
 		fatalerror("No memory for patchsymbol");
 
-	return ((ULONG) - 1);
-}
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Add all exported symbols to the object
- *
- */
+	*ppPatchSymbolsTail = pPSym;
+	ppPatchSymbolsTail = &(pPSym->pNext);
 
+	return pPSym->ID;
+}
+
+/*
+ * Add all exported symbols to the object
+ */
 void 
 addexports(void)
 {
@@ -374,43 +328,30 @@ addexports(void)
 		}
 	}
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Allocate a new patchstructure and link it into the list
- *
- */
 
+/*
+ * Allocate a new patchstructure and link it into the list
+ */
 struct Patch *
 allocpatch(void)
 {
-	struct Patch *pPatch, **ppPatch;
+	struct Patch *pPatch;
 
-	pPatch = pCurrentSection->pPatches;
-	ppPatch = &(pCurrentSection->pPatches);
-
-	while (pPatch) {
-		ppPatch = &(pPatch->pNext);
-		pPatch = pPatch->pNext;
-	}
-
-	if ((*ppPatch = pPatch =
-		(struct Patch *) malloc(sizeof(struct Patch))) != NULL) {
-		pPatch->pNext = NULL;
+	if ((pPatch = malloc(sizeof(struct Patch))) != NULL) {
+		pPatch->pNext = pCurrentSection->pPatches;
 		pPatch->nRPNSize = 0;
 		pPatch->pRPN = NULL;
 	} else
 		fatalerror("No memory for patch");
 
+	pCurrentSection->pPatches = pPatch;
+
 	return (pPatch);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Create a new patch (includes the rpn expr)
- *
- */
 
+/*
+ * Create a new patch (includes the rpn expr)
+ */
 void 
 createpatch(ULONG type, struct Expression * expr)
 {
@@ -448,7 +389,10 @@ createpatch(ULONG type, struct Expression * expr)
 				rpnexpr[rpnptr++] = value >> 16;
 				rpnexpr[rpnptr++] = value >> 24;
 			} else {
-				symptr = addsymbol(sym_FindSymbol(tzSym));
+				struct sSymbol *sym;
+				if ((sym = sym_FindSymbol(tzSym)) == NULL)
+					break;
+				symptr = addsymbol(sym);
 				rpnexpr[rpnptr++] = RPN_SYM;
 				rpnexpr[rpnptr++] = symptr & 0xFF;
 				rpnexpr[rpnptr++] = symptr >> 8;
@@ -456,33 +400,34 @@ createpatch(ULONG type, struct Expression * expr)
 				rpnexpr[rpnptr++] = symptr >> 24;
 			}
 			break;
-		case RPN_BANK:
+		case RPN_BANK: {
+			struct sSymbol *sym;
 			symptr = 0;
 			while ((tzSym[symptr++] = rpn_PopByte(expr)) != 0);
-			symptr = addsymbol(sym_FindSymbol(tzSym));
+			if ((sym = sym_FindSymbol(tzSym)) == NULL)
+				break;
+			symptr = addsymbol(sym);
 			rpnexpr[rpnptr++] = RPN_BANK;
 			rpnexpr[rpnptr++] = symptr & 0xFF;
 			rpnexpr[rpnptr++] = symptr >> 8;
 			rpnexpr[rpnptr++] = symptr >> 16;
 			rpnexpr[rpnptr++] = symptr >> 24;
+			}
 			break;
 		default:
 			rpnexpr[rpnptr++] = rpndata;
 			break;
 		}
 	}
-	if ((pPatch->pRPN = (UBYTE *) malloc(rpnptr)) != NULL) {
+	if ((pPatch->pRPN = malloc(rpnptr)) != NULL) {
 		memcpy(pPatch->pRPN, rpnexpr, rpnptr);
 		pPatch->nRPNSize = rpnptr;
 	}
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * A quick check to see if we have an initialized section
- *
- */
 
+/*
+ * A quick check to see if we have an initialized section
+ */
 void 
 checksection(void)
 {
@@ -491,47 +436,49 @@ checksection(void)
 	else
 		fatalerror("Code generation before SECTION directive");
 }
+
 /*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
  * A quick check to see if we have an initialized section that can contain
  * this much initialized data
- *
  */
-
 void 
 checkcodesection(SLONG size)
 {
 	checksection();
-	if ((pCurrentSection->nType == SECT_HOME
-		|| pCurrentSection->nType == SECT_CODE)
-	    && (pCurrentSection->nPC + size <= MAXSECTIONSIZE)) {
-		if (((pCurrentSection->nPC % SECTIONCHUNK) >
-			((pCurrentSection->nPC + size) % SECTIONCHUNK))
-		    && (pCurrentSection->nType == SECT_HOME
-			|| pCurrentSection->nType == SECT_CODE)) {
-			if ((pCurrentSection->tData =
-				(UBYTE *) realloc(pCurrentSection->tData,
-				    ((pCurrentSection->nPC +
-					    size) / SECTIONCHUNK +
-					1) * SECTIONCHUNK)) != NULL) {
-				return;
-			} else
-				fatalerror
-				    ("Not enough memory to expand section");
-		}
-		return;
-	} else
-		fatalerror
-		    ("Section can't contain initialized data or section limit exceeded");
-}
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Write an objectfile
- *
- */
+	if (pCurrentSection->nType != SECT_ROM0 &&
+	    pCurrentSection->nType != SECT_ROMX) {
+		errx(1, "Section '%s' cannot contain code or data (not a "
+		    "ROM0 or ROMX)", pCurrentSection->pzName);
+	}
+	if (pCurrentSection->nPC + size > MAXSECTIONSIZE) {
+		/*
+		 * N.B.: This check is not sufficient to ensure the section
+		 * will fit, because there can be multiple sections of this
+		 * type. The definitive check must be done at the linking
+		 * stage.
+		 */
+		errx(1, "Section '%s' is too big (old size %d + %d > %d)",
+		    pCurrentSection->pzName, pCurrentSection->nPC, size,
+		    MAXSECTIONSIZE);
+	}
+	if (((pCurrentSection->nPC % SECTIONCHUNK) >
+	    ((pCurrentSection->nPC + size) % SECTIONCHUNK)) &&
+	    (pCurrentSection->nType == SECT_ROM0 ||
+	    pCurrentSection->nType == SECT_ROMX)) {
+		pCurrentSection->tData = realloc(pCurrentSection->tData,
+		    ((pCurrentSection->nPC + size) / SECTIONCHUNK + 1) *
+		    SECTIONCHUNK);
 
+		if (pCurrentSection->tData == NULL) {
+			err(1, "Could not expand section");
+		}
+	}
+	return;
+}
+
+/*
+ * Write an objectfile
+ */
 void 
 out_WriteObject(void)
 {
@@ -562,13 +509,10 @@ out_WriteObject(void)
 		fclose(f);
 	}
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Prepare for pass #2
- *
- */
 
+/*
+ * Prepare for pass #2
+ */
 void 
 out_PrepPass2(void)
 {
@@ -582,32 +526,27 @@ out_PrepPass2(void)
 	pCurrentSection = NULL;
 	pSectionStack = NULL;
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Set the objectfilename
- *
- */
 
+/*
+ * Set the objectfilename
+ */
 void 
 out_SetFileName(char *s)
 {
-	strcpy(tzObjectname, s);
-	printf("Output filename %s\n", s);
+	tzObjectname = s;
+	if (CurrentOptions.verbose) {
+		printf("Output filename %s\n", s);
+	}
 	pSectionList = NULL;
 	pCurrentSection = NULL;
 	pPatchSymbols = NULL;
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Find a section by name and type.  If it doesn't exist, create it
- *
- */
 
+/*
+ * Find a section by name and type.  If it doesn't exist, create it
+ */
 struct Section *
-out_FindSection(char *pzName, ULONG secttype, SLONG org,
-    SLONG bank)
+out_FindSection(char *pzName, ULONG secttype, SLONG org, SLONG bank)
 {
 	struct Section *pSect, **ppSect;
 
@@ -628,11 +567,8 @@ out_FindSection(char *pzName, ULONG secttype, SLONG org,
 		pSect = pSect->pNext;
 	}
 
-	if ((*ppSect =
-		(pSect =
-		    (struct Section *) malloc(sizeof(struct Section)))) != NULL) {
-		if ((pSect->pzName =
-			(char *) malloc(strlen(pzName) + 1)) != NULL) {
+	if ((*ppSect = (pSect = malloc(sizeof(struct Section)))) != NULL) {
+		if ((pSect->pzName = malloc(strlen(pzName) + 1)) != NULL) {
 			strcpy(pSect->pzName, pzName);
 			pSect->nType = secttype;
 			pSect->nPC = 0;
@@ -640,10 +576,10 @@ out_FindSection(char *pzName, ULONG secttype, SLONG org,
 			pSect->nBank = bank;
 			pSect->pNext = NULL;
 			pSect->pPatches = NULL;
+			pSect->charmap = NULL;
 			pPatchSymbols = NULL;
 
-			if ((pSect->tData =
-				(UBYTE *) malloc(SECTIONCHUNK)) != NULL) {
+			if ((pSect->tData = malloc(SECTIONCHUNK)) != NULL) {
 				return (pSect);
 			} else
 				fatalerror("Not enough memory for section");
@@ -654,13 +590,10 @@ out_FindSection(char *pzName, ULONG secttype, SLONG org,
 
 	return (NULL);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Set the current section
- *
- */
 
+/*
+ * Set the current section
+ */
 void 
 out_SetCurrentSection(struct Section * pSect)
 {
@@ -670,37 +603,28 @@ out_SetCurrentSection(struct Section * pSect)
 	pPCSymbol->nValue = nPC;
 	pPCSymbol->pSection = pCurrentSection;
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Set the current section by name and type
- *
- */
 
+/*
+ * Set the current section by name and type
+ */
 void 
 out_NewSection(char *pzName, ULONG secttype)
 {
 	out_SetCurrentSection(out_FindSection(pzName, secttype, -1, -1));
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Set the current section by name and type
- *
- */
 
+/*
+ * Set the current section by name and type
+ */
 void 
 out_NewAbsSection(char *pzName, ULONG secttype, SLONG org, SLONG bank)
 {
 	out_SetCurrentSection(out_FindSection(pzName, secttype, org, bank));
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Output an absolute byte
- *
- */
 
+/*
+ * Output an absolute byte
+ */
 void 
 out_AbsByte(int b)
 {
@@ -713,19 +637,24 @@ out_AbsByte(int b)
 	nPC += 1;
 	pPCSymbol->nValue += 1;
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Skip this many bytes
- *
- */
 
+void 
+out_AbsByteGroup(char *s, int length)
+{
+	checkcodesection(length);
+	while (length--)
+		out_AbsByte(*s++);
+}
+
+/*
+ * Skip this many bytes
+ */
 void 
 out_Skip(int skip)
 {
 	checksection();
-	if (!((pCurrentSection->nType == SECT_HOME)
-		|| (pCurrentSection->nType == SECT_CODE))) {
+	if (!((pCurrentSection->nType == SECT_ROM0)
+		|| (pCurrentSection->nType == SECT_ROMX))) {
 		pCurrentSection->nPC += skip;
 		nPC += skip;
 		pPCSymbol->nValue += skip;
@@ -735,13 +664,10 @@ out_Skip(int skip)
 			out_AbsByte(CurrentOptions.fillchar);
 	}
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Output a NULL terminated string (excluding the NULL-character)
- *
- */
 
+/*
+ * Output a NULL terminated string (excluding the NULL-character)
+ */
 void 
 out_String(char *s)
 {
@@ -749,12 +675,10 @@ out_String(char *s)
 	while (*s)
 		out_AbsByte(*s++);
 }
+
 /*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
  * Output a relocatable byte.  Checking will be done to see if it
  * is an absolute value in disguise.
- *
  */
 
 void 
@@ -774,13 +698,10 @@ out_RelByte(struct Expression * expr)
 
 	rpn_Reset(expr);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Output an absolute word
- *
- */
 
+/*
+ * Output an absolute word
+ */
 void 
 out_AbsWord(int b)
 {
@@ -794,14 +715,11 @@ out_AbsWord(int b)
 	nPC += 2;
 	pPCSymbol->nValue += 2;
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Output a relocatable word.  Checking will be done to see if
- * is an absolute value in disguise.
- *
- */
 
+/*
+ * Output a relocatable word.  Checking will be done to see if
+ * it's an absolute value in disguise.
+ */
 void 
 out_RelWord(struct Expression * expr)
 {
@@ -822,13 +740,10 @@ out_RelWord(struct Expression * expr)
 		out_AbsWord(expr->nVal);
 	rpn_Reset(expr);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Output an absolute longword
- *
- */
 
+/*
+ * Output an absolute longword
+ */
 void 
 out_AbsLong(SLONG b)
 {
@@ -843,14 +758,11 @@ out_AbsLong(SLONG b)
 	nPC += 4;
 	pPCSymbol->nValue += 4;
 }
+
 /*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
  * Output a relocatable longword.  Checking will be done to see if
  * is an absolute value in disguise.
- *
  */
-
 void 
 out_RelLong(struct Expression * expr)
 {
@@ -873,13 +785,10 @@ out_RelLong(struct Expression * expr)
 		out_AbsLong(expr->nVal);
 	rpn_Reset(expr);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Output a PC-relative byte
- *
- */
 
+/*
+ * Output a PC-relative byte
+ */
 void 
 out_PCRelByte(struct Expression * expr)
 {
@@ -893,42 +802,39 @@ out_PCRelByte(struct Expression * expr)
 	out_AbsByte(b);
 	rpn_Reset(expr);
 }
-/*
- * RGBAsm - OUTPUT.C - Outputs an objectfile
- *
- * Output a binary file
- *
- */
 
+/*
+ * Output a binary file
+ */
 void 
 out_BinaryFile(char *s)
 {
 	FILE *f;
 
-	fstk_FindFile(s);
+	f = fstk_FindFile(s);
+	if (f == NULL) {
+		err(1, "Unable to open incbin file '%s'", s);
+	}
 
-	if ((f = fopen(s, "rb")) != NULL) {
-		SLONG fsize;
+	SLONG fsize;
 
-		fseek(f, 0, SEEK_END);
-		fsize = ftell(f);
-		fseek(f, 0, SEEK_SET);
+	fseek(f, 0, SEEK_END);
+	fsize = ftell(f);
+	fseek(f, 0, SEEK_SET);
 
-		checkcodesection(fsize);
+	checkcodesection(fsize);
 
-		if (nPass == 2) {
-			SLONG dest = nPC;
-			SLONG todo = fsize;
+	if (nPass == 2) {
+		SLONG dest = nPC;
+		SLONG todo = fsize;
 
-			while (todo--)
-				pCurrentSection->tData[dest++] = fgetc(f);
-		}
-		pCurrentSection->nPC += fsize;
-		nPC += fsize;
-		pPCSymbol->nValue += fsize;
-		fclose(f);
-	} else
-		fatalerror("File not found");
+		while (todo--)
+			pCurrentSection->tData[dest++] = fgetc(f);
+	}
+	pCurrentSection->nPC += fsize;
+	nPC += fsize;
+	pPCSymbol->nValue += fsize;
+	fclose(f);
 }
 
 void 
@@ -942,36 +848,36 @@ out_BinaryFileSlice(char *s, SLONG start_pos, SLONG length)
 	if (length < 0)
 		fatalerror("Number of bytes to read must be greater than zero");
 
-	fstk_FindFile(s);
+	f = fstk_FindFile(s);
+	if (f == NULL) {
+		err(1, "Unable to open included file '%s'", s);
+	}
 
-	if ((f = fopen(s, "rb")) != NULL) {
-		SLONG fsize;
+	SLONG fsize;
 
-		fseek(f, 0, SEEK_END);
-		fsize = ftell(f);
+	fseek(f, 0, SEEK_END);
+	fsize = ftell(f);
 
-		if (start_pos >= fsize)
-			fatalerror("Specified start position is greater than length of file");
+	if (start_pos >= fsize)
+		fatalerror("Specified start position is greater than length of file");
 
-		if ((start_pos + length) > fsize)
-			fatalerror("Specified range in INCBIN is out of bounds");
+	if ((start_pos + length) > fsize)
+		fatalerror("Specified range in INCBIN is out of bounds");
 
-		fseek(f, start_pos, SEEK_SET);
+	fseek(f, start_pos, SEEK_SET);
 
-		checkcodesection(length);
+	checkcodesection(length);
 
-		if (nPass == 2) {
-			SLONG dest = nPC;
-			SLONG todo = length;
+	if (nPass == 2) {
+		SLONG dest = nPC;
+		SLONG todo = length;
 
-			while (todo--)
-				pCurrentSection->tData[dest++] = fgetc(f);
-		}
-		pCurrentSection->nPC += length;
-		nPC += length;
-		pPCSymbol->nValue += length;
+		while (todo--)
+			pCurrentSection->tData[dest++] = fgetc(f);
+	}
+	pCurrentSection->nPC += length;
+	nPC += length;
+	pPCSymbol->nValue += length;
 
-		fclose(f);
-	} else
-		fatalerror("File not found");
+	fclose(f);
 }

src/asm/rgbasm.1

@@ -1,4 +1,4 @@
-.Dd $Mdocdate$
+.Dd February 26, 2015
 .Dt RGBASM 1
 .Os RGBDS Manual
 .Sh NAME
@@ -6,7 +6,9 @@
 .Nd Game Boy assembler
 .Sh SYNOPSIS
 .Nm rgbasm
+.Op Fl Ehv
 .Op Fl b Ar chars
+.Op Fl D Ar name Ns Op = Ns Ar value
 .Op Fl g Ar chars
 .Op Fl i Ar path
 .Op Fl o Ar outfile
@@ -21,9 +23,28 @@ Its arguments are as follows:
 .It Fl b Ar chars
 Change the two characters used for binary constants.
 The defaults are 01.
+.It Fl D Ar name Ns Op = Ns Ar value
+Add string symbol to the compiled source code. This is equivalent to
+.Ar name
+.Cm EQUS
+.Qq Ar "value"
+in code. If a value is not specified, a value of 1 is given.
+.It Fl E
+Export all labels, including unreferenced and local labels.
 .It Fl g Ar chars
 Change the four characters used for binary constants.
 The defaults are 0123.
+.It Fl h
+By default,
+.Nm
+inserts a
+.Sq nop
+instruction immediately after any
+.Sq halt
+instruction.
+The
+.Fl h
+option disables this behavior.
 .It Fl i Ar path
 Add an include path.
 .It Fl o Ar outfile
@@ -31,11 +52,13 @@ Write an object file to the given filename.
 .It Fl p Ar pad_value
 When padding an image, pad with this value.
 The default is 0x00.
+.It Fl v
+Be verbose.
 .El
 .Sh EXAMPLES
 Assembling a basic source file is simple:
 .Pp
-.D1 $ rgbasm \-o bar.o foo.asm
+.D1 $ rgbasm -o bar.o foo.asm
 .Pp
 The resulting object file is not yet a usable ROM image \(em it must first be
 run through
@@ -43,11 +66,11 @@ run through
 and
 .Xr rgbfix 1 .
 .Sh SEE ALSO
-.Xr rgbds 7 ,
 .Xr rgbfix 1 ,
-.Xr rgblib 1 ,
 .Xr rgblink 1 ,
-.Xr gbz80 7
+.Xr rgbds 7
+.Pp
+.Lk https://rednex.github.io/rgbds/asm.htm rgbasm assembly commands
 .Sh HISTORY
 .Nm
 was originally written by Carsten S\(/orensen as part of the ASMotor package,

src/asm/rpn.c

@@ -1,15 +1,12 @@
 /*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
- * INCLUDES
- *
+ * Controls RPN expressions for objectfiles
  */
 
 #include <stdio.h>
 #include <string.h>
 
 #include "asm/mylink.h"
-#include "asm/types.h"
+#include "types.h"
 #include "asm/symbol.h"
 #include "asm/asm.h"
 #include "asm/main.h"
@@ -29,49 +26,26 @@ mergetwoexpressions(struct Expression * expr, struct Expression * src1,
 #define joinexpr() mergetwoexpressions(expr,src1,src2)
 
 /*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
- * VARIABLES
- *
- */
-
-//UBYTE rpnexpr[2048];
-//ULONG rpnptr = 0;
-//ULONG rpnoutptr = 0;
-//ULONG reloc = 0;
-//ULONG pcrel = 0;
-
-/*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
  * Add a byte to the RPN expression
- *
  */
-
 void 
 pushbyte(struct Expression * expr, int b)
 {
 	expr->tRPN[expr->nRPNLength++] = b & 0xFF;
 }
-/*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
- * Reset the RPN module
- *
- */
 
+/*
+ * Reset the RPN module
+ */
 void 
 rpn_Reset(struct Expression * expr)
 {
 	expr->nRPNLength = expr->nRPNOut = expr->isReloc = expr->isPCRel = 0;
 }
-/*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
- * Returns the next rpn byte in expression
- *
- */
 
+/*
+ * Returns the next rpn byte in expression
+ */
 UWORD 
 rpn_PopByte(struct Expression * expr)
 {
@@ -80,37 +54,28 @@ rpn_PopByte(struct Expression * expr)
 	} else
 		return (expr->tRPN[expr->nRPNOut++]);
 }
-/*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
- * Determine if the current expression is relocatable
- *
- */
 
+/*
+ * Determine if the current expression is relocatable
+ */
 ULONG 
 rpn_isReloc(struct Expression * expr)
 {
 	return (expr->isReloc);
 }
-/*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
- * Determine if the current expression can be pc-relative
- *
- */
 
+/*
+ * Determine if the current expression can be pc-relative
+ */
 ULONG 
 rpn_isPCRelative(struct Expression * expr)
 {
 	return (expr->isPCRel);
 }
-/*
- * RGBAsm - RPN.C - Controls RPN expressions for objectfiles
- *
- * Add symbols, constants and operators to expression
- *
- */
 
+/*
+ * Add symbols, constants and operators to expression
+ */
 void 
 rpn_Number(struct Expression * expr, ULONG i)
 {
@@ -149,15 +114,11 @@ void
 rpn_Bank(struct Expression * expr, char *tzSym)
 {
 	if (!sym_isConstant(tzSym)) {
-		struct sSymbol *psym;
-
 		rpn_Reset(expr);
 
-		psym = sym_FindSymbol(tzSym);
-		if (nPass == 2 && psym == NULL) {
-			sprintf(temptext, "'%s' not defined", tzSym);
-			yyerror(temptext);
-		}
+		/* Check that the symbol exists by evaluating and discarding the value. */
+		sym_GetValue(tzSym);
+
 		expr->isReloc = 1;
 		pushbyte(expr, RPN_BANK);
 		while (*tzSym)
@@ -188,6 +149,7 @@ rpn_RangeCheck(struct Expression * expr, struct Expression * src, SLONG low,
 		return (expr->nVal >= low && expr->nVal <= high);
 	}
 }
+
 void 
 rpn_CheckHRAM(struct Expression * expr, struct Expression * src)
 {
@@ -351,6 +313,9 @@ rpn_DIV(struct Expression * expr, struct Expression * src1,
     struct Expression * src2)
 {
 	joinexpr();
+	if (src2->nVal == 0) {
+		fatalerror("division by zero");
+	}
 	expr->nVal = (expr->nVal / src2->nVal);
 	pushbyte(expr, RPN_DIV);
 }
@@ -360,6 +325,9 @@ rpn_MOD(struct Expression * expr, struct Expression * src1,
     struct Expression * src2)
 {
 	joinexpr();
+	if (src2->nVal == 0) {
+		fatalerror("division by zero");
+	}
 	expr->nVal = (expr->nVal % src2->nVal);
 	pushbyte(expr, RPN_MOD);
 }

src/asm/symbol.c

@@ -1,10 +1,8 @@
 /*
- * RGBAsm - SYMBOL.C - Symboltable and macroargs stuff
- *
- * INCLUDES
- *
+ * Symboltable and macroargs stuff
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -15,48 +13,30 @@
 #include "asm/mymath.h"
 #include "asm/output.h"
 
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * VARIABLES
- *
- */
-
 struct sSymbol *tHashedSymbols[HASHSIZE];
 struct sSymbol *pScope = NULL;
 struct sSymbol *pPCSymbol = NULL;
 struct sSymbol *p_NARGSymbol = NULL;
-struct sSymbol *p__LINE__Symbol = NULL;
 char *currentmacroargs[MAXMACROARGS + 1];
 char *newmacroargs[MAXMACROARGS + 1];
 char SavedTIME[256];
 char SavedDATE[256];
+bool exportall;
 
 SLONG 
 Callback_NARG(struct sSymbol * sym)
 {
 	ULONG i = 0;
 
-	sym = sym;
 	while (currentmacroargs[i] && i < MAXMACROARGS)
 		i += 1;
 
 	return (i);
 }
 
-SLONG 
-Callback__LINE__(struct sSymbol * sym)
-{
-	sym = sym;
-	return (nLineNo);
-}
 /*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
  * Get the nValue field of a symbol
- *
  */
-
 SLONG 
 getvaluefield(struct sSymbol * sym)
 {
@@ -65,30 +45,24 @@ getvaluefield(struct sSymbol * sym)
 	} else
 		return (sym->nValue);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Calculate the hash value for a string
- *
- */
 
+/*
+ * Calculate the hash value for a string
+ */
 ULONG 
 calchash(char *s)
 {
-	ULONG hash = 0;
+	ULONG hash = 5381;
 
 	while (*s != 0)
-		hash += (*s++);
+		hash = (hash * 33) ^ (*s++);
 
 	return (hash % HASHSIZE);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Create a new symbol by name
- *
- */
 
+/*
+ * Create a new symbol by name
+ */
 struct sSymbol *
 createsymbol(char *s)
 {
@@ -101,8 +75,7 @@ createsymbol(char *s)
 	while ((*ppsym) != NULL)
 		ppsym = &((*ppsym)->pNext);
 
-	if (((*ppsym) =
-		(struct sSymbol *) malloc(sizeof(struct sSymbol))) != NULL) {
+	if (((*ppsym) = malloc(sizeof(struct sSymbol))) != NULL) {
 		strcpy((*ppsym)->tzName, s);
 		(*ppsym)->nValue = 0;
 		(*ppsym)->nType = 0;
@@ -118,12 +91,8 @@ createsymbol(char *s)
 	}
 }
 /*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
  * Find a symbol by name and scope
- *
  */
-
 struct sSymbol *
 findsymbol(char *s, struct sSymbol * scope)
 {
@@ -142,13 +111,10 @@ findsymbol(char *s, struct sSymbol * scope)
 	}
 	return (NULL);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Find the pointer to a symbol by name and scope
- *
- */
 
+/*
+ * Find the pointer to a symbol by name and scope
+ */
 struct sSymbol **
 findpsymbol(char *s, struct sSymbol * scope)
 {
@@ -167,13 +133,10 @@ findpsymbol(char *s, struct sSymbol * scope)
 	}
 	return (NULL);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Find a symbol by name and scope
- *
- */
 
+/*
+ * Find a symbol by name and scope
+ */
 struct sSymbol *
 sym_FindSymbol(char *tzName)
 {
@@ -186,13 +149,10 @@ sym_FindSymbol(char *tzName)
 
 	return (findsymbol(tzName, pscope));
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Purge a symbol
- *
- */
 
+/*
+ * Purge a symbol
+ */
 void 
 sym_Purge(char *tzName)
 {
@@ -217,17 +177,13 @@ sym_Purge(char *tzName)
 
 		free(pSym);
 	} else {
-		sprintf(temptext, "'%s' not defined", tzName);
-		yyerror(temptext);
+		yyerror("'%s' not defined", tzName);
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Determine if a symbol has been defined
- *
- */
 
+/*
+ * Determine if a symbol has been defined
+ */
 ULONG 
 sym_isConstDefined(char *tzName)
 {
@@ -245,10 +201,8 @@ sym_isConstDefined(char *tzName)
 		    nType & (SYMF_EQU | SYMF_SET | SYMF_MACRO | SYMF_STRING)) {
 			return (1);
 		} else {
-			sprintf(temptext,
-			    "'%s' is not allowed as argument to the DEF function",
-			    tzName);
-			fatalerror(temptext);
+			fatalerror("'%s' is not allowed as argument to the "
+			    "DEF function", tzName);
 		}
 	}
 	return (0);
@@ -271,13 +225,10 @@ sym_isDefined(char *tzName)
 	else
 		return (0);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Determine if the symbol is a constant
- *
- */
 
+/*
+ * Determine if the symbol is a constant
+ */
 ULONG 
 sym_isConstant(char *s)
 {
@@ -294,13 +245,10 @@ sym_isConstant(char *s)
 	}
 	return (0);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Get a string equate's value
- *
- */
 
+/*
+ * Get a string equate's value
+ */
 char *
 sym_GetStringValue(char *tzSym)
 {
@@ -309,19 +257,15 @@ sym_GetStringValue(char *tzSym)
 	if ((pSym = sym_FindSymbol(tzSym)) != NULL)
 		return (pSym->pMacro);
 	else {
-		sprintf(temptext, "Stringsymbol '%s' not defined", tzSym);
-		yyerror(temptext);
+		yyerror("Stringsymbol '%s' not defined", tzSym);
 	}
 
 	return (NULL);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Return a constant symbols value
- *
- */
 
+/*
+ * Return a constant symbols value
+ */
 ULONG 
 sym_GetConstantValue(char *s)
 {
@@ -339,19 +283,15 @@ sym_GetConstantValue(char *s)
 			fatalerror("Expression must have a constant value");
 		}
 	} else {
-		sprintf(temptext, "'%s' not defined", s);
-		yyerror(temptext);
+		yyerror("'%s' not defined", s);
 	}
 
 	return (0);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Return a symbols value... "estimated" if not defined yet
- *
- */
 
+/*
+ * Return a symbols value... "estimated" if not defined yet
+ */
 ULONG 
 sym_GetValue(char *s)
 {
@@ -365,39 +305,32 @@ sym_GetValue(char *s)
 	if ((psym = findsymbol(s, pscope)) != NULL) {
 		if (psym->nType & SYMF_DEFINED) {
 			if (psym->nType & (SYMF_MACRO | SYMF_STRING)) {
-				sprintf(temptext,
-				    "'%s' is a macro or string symbol", s);
-				yyerror(temptext);
+				yyerror("'%s' is a macro or string symbol", s);
 			}
 			return (getvaluefield(psym));
 		} else {
-			if ((nPass == 1) || (psym->nType & SYMF_IMPORT)) {
-				/* 0x80 seems like a good default value... */
-				return (0x80);
-			} else {
-				sprintf(temptext, "'%s' not defined", s);
-				yyerror(temptext);
+			if (nPass == 2) {
+				/* Assume undefined symbols are imported from somewhere else */
+				psym->nType |= SYMF_IMPORT;
 			}
+			/* 0x80 seems like a good default value... */
+			return (0x80);
 		}
 	} else {
 		if (nPass == 1) {
 			createsymbol(s);
 			return (0x80);
 		} else {
-			sprintf(temptext, "'%s' not defined", s);
-			yyerror(temptext);
+			yyerror("'%s' not defined", s);
 		}
 	}
 
 	return (0);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Return a defined symbols value... aborts if not defined yet
- *
- */
 
+/*
+ * Return a defined symbols value... aborts if not defined yet
+ */
 ULONG 
 sym_GetDefinedValue(char *s)
 {
@@ -411,29 +344,22 @@ sym_GetDefinedValue(char *s)
 	if ((psym = findsymbol(s, pscope)) != NULL) {
 		if ((psym->nType & SYMF_DEFINED)) {
 			if (psym->nType & (SYMF_MACRO | SYMF_STRING)) {
-				sprintf(temptext,
-				    "'%s' is a macro or string symbol", s);
-				yyerror(temptext);
+				yyerror("'%s' is a macro or string symbol", s);
 			}
 			return (getvaluefield(psym));
 		} else {
-			sprintf(temptext, "'%s' not defined", s);
-			yyerror(temptext);
+			yyerror("'%s' not defined", s);
 		}
 	} else {
-		sprintf(temptext, "'%s' not defined", s);
-		yyerror(temptext);
+		yyerror("'%s' not defined", s);
 	}
 
 	return (0);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Macro argument stuff
- *
- */
 
+/*
+ * Macro argument stuff
+ */
 void 
 sym_ShiftCurrentMacroArgs(void)
 {
@@ -452,6 +378,8 @@ sym_FindMacroArg(SLONG i)
 	if (i == -1)
 		i = MAXMACROARGS + 1;
 
+	assert(i-1 >= 0 &&
+	    i-1 < sizeof currentmacroargs / sizeof *currentmacroargs);
 	return (currentmacroargs[i - 1]);
 }
 
@@ -509,7 +437,7 @@ sym_AddNewMacroArg(char *s)
 		else
 			newmacroargs[i] = NULL;
 	} else
-		yyerror("A maximum of 9 arguments allowed");
+		yyerror("A maximum of %d arguments allowed", MAXMACROARGS);
 }
 
 void 
@@ -529,25 +457,19 @@ sym_UseCurrentMacroArgs(void)
 	for (i = 1; i <= MAXMACROARGS; i += 1)
 		sym_AddNewMacroArg(sym_FindMacroArg(i));
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Find a macro by name
- *
- */
 
+/*
+ * Find a macro by name
+ */
 struct sSymbol *
 sym_FindMacro(char *s)
 {
 	return (findsymbol(s, NULL));
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Add an equated symbol
- *
- */
 
+/*
+ * Add an equated symbol
+ */
 void 
 sym_AddEqu(char *tzSym, SLONG value)
 {
@@ -558,9 +480,7 @@ sym_AddEqu(char *tzSym, SLONG value)
 
 		if ((nsym = findsymbol(tzSym, NULL)) != NULL) {
 			if (nsym->nType & SYMF_DEFINED) {
-				sprintf(temptext, "'%s' already defined",
-				    tzSym);
-				yyerror(temptext);
+				yyerror("'%s' already defined", tzSym);
 			}
 		} else
 			nsym = createsymbol(tzSym);
@@ -572,13 +492,10 @@ sym_AddEqu(char *tzSym, SLONG value)
 		}
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Add a string equated symbol
- *
- */
 
+/*
+ * Add a string equated symbol
+ */
 void 
 sym_AddString(char *tzSym, char *tzValue)
 {
@@ -586,15 +503,13 @@ sym_AddString(char *tzSym, char *tzValue)
 
 	if ((nsym = findsymbol(tzSym, NULL)) != NULL) {
 		if (nsym->nType & SYMF_DEFINED) {
-			sprintf(temptext, "'%s' already defined", tzSym);
-			yyerror(temptext);
+			yyerror("'%s' already defined", tzSym);
 		}
 	} else
 		nsym = createsymbol(tzSym);
 
 	if (nsym) {
-		if ((nsym->pMacro =
-			(char *) malloc(strlen(tzValue) + 1)) != NULL)
+		if ((nsym->pMacro = malloc(strlen(tzValue) + 1)) != NULL)
 			strcpy(nsym->pMacro, tzValue);
 		else
 			fatalerror("No memory for stringequate");
@@ -603,13 +518,10 @@ sym_AddString(char *tzSym, char *tzValue)
 		nsym->pScope = NULL;
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * check if symbol is a string equated symbol
- *
- */
 
+/*
+ * check if symbol is a string equated symbol
+ */
 ULONG 
 sym_isString(char *tzSym)
 {
@@ -621,13 +533,10 @@ sym_isString(char *tzSym)
 	}
 	return (0);
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Alter a SET symbols value
- *
- */
 
+/*
+ * Alter a SET symbols value
+ */
 void 
 sym_AddSet(char *tzSym, SLONG value)
 {
@@ -643,13 +552,10 @@ sym_AddSet(char *tzSym, SLONG value)
 		nsym->pScope = NULL;
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Add a local (.name) relocatable symbol
- *
- */
 
+/*
+ * Add a local (.name) relocatable symbol
+ */
 void 
 sym_AddLocalReloc(char *tzSym)
 {
@@ -661,9 +567,7 @@ sym_AddLocalReloc(char *tzSym)
 		if (pScope) {
 			if ((nsym = findsymbol(tzSym, pScope)) != NULL) {
 				if (nsym->nType & SYMF_DEFINED) {
-					sprintf(temptext,
-					    "'%s' already defined", tzSym);
-					yyerror(temptext);
+					yyerror("'%s' already defined", tzSym);
 				}
 			} else
 				nsym = createsymbol(tzSym);
@@ -672,6 +576,9 @@ sym_AddLocalReloc(char *tzSym)
 				nsym->nValue = nPC;
 				nsym->nType |=
 				    SYMF_RELOC | SYMF_LOCAL | SYMF_DEFINED;
+				if (exportall) {
+				   nsym->nType |= SYMF_EXPORT;
+				}
 				nsym->pScope = pScope;
 				nsym->pSection = pCurrentSection;
 			}
@@ -679,13 +586,10 @@ sym_AddLocalReloc(char *tzSym)
 			fatalerror("Local label in main scope");
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Add a relocatable symbol
- *
- */
 
+/*
+ * Add a relocatable symbol
+ */
 void 
 sym_AddReloc(char *tzSym)
 {
@@ -696,9 +600,7 @@ sym_AddReloc(char *tzSym)
 
 		if ((nsym = findsymbol(tzSym, NULL)) != NULL) {
 			if (nsym->nType & SYMF_DEFINED) {
-				sprintf(temptext, "'%s' already defined",
-				    tzSym);
-				yyerror(temptext);
+				yyerror("'%s' already defined", tzSym);
 			}
 		} else
 			nsym = createsymbol(tzSym);
@@ -706,20 +608,19 @@ sym_AddReloc(char *tzSym)
 		if (nsym) {
 			nsym->nValue = nPC;
 			nsym->nType |= SYMF_RELOC | SYMF_DEFINED;
+			if (exportall) {
+			   nsym->nType |= SYMF_EXPORT;
+			}
 			nsym->pScope = NULL;
 			nsym->pSection = pCurrentSection;
 		}
 	}
 	pScope = findsymbol(tzSym, NULL);
-
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Export a symbol
- *
- */
 
+/*
+ * Export a symbol
+ */
 void 
 sym_Export(char *tzSym)
 {
@@ -739,18 +640,14 @@ sym_Export(char *tzSym)
 			if (nsym->nType & SYMF_DEFINED)
 				return;
 		}
-		sprintf(temptext, "'%s' not defined", tzSym);
-		yyerror(temptext);
+		yyerror("'%s' not defined", tzSym);
 	}
 
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Import a symbol
- *
- */
 
+/*
+ * Import a symbol
+ */
 void 
 sym_Import(char *tzSym)
 {
@@ -759,20 +656,16 @@ sym_Import(char *tzSym)
 		struct sSymbol *nsym;
 
 		if (findsymbol(tzSym, NULL)) {
-			sprintf(temptext, "'%s' already defined", tzSym);
-			yyerror(temptext);
+			yyerror("'%s' already defined", tzSym);
 		}
 		if ((nsym = createsymbol(tzSym)) != NULL)
 			nsym->nType |= SYMF_IMPORT;
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Globalize a symbol (export if defined, import if not)
- *
- */
 
+/*
+ * Globalize a symbol (export if defined, import if not)
+ */
 void 
 sym_Global(char *tzSym)
 {
@@ -794,13 +687,10 @@ sym_Global(char *tzSym)
 		}
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Add a macro definition
- *
- */
 
+/*
+ * Add a macro definition
+ */
 void 
 sym_AddMacro(char *tzSym)
 {
@@ -811,9 +701,7 @@ sym_AddMacro(char *tzSym)
 
 		if ((nsym = findsymbol(tzSym, NULL)) != NULL) {
 			if (nsym->nType & SYMF_DEFINED) {
-				sprintf(temptext, "'%s' already defined",
-				    tzSym);
-				yyerror(temptext);
+				yyerror("'%s' already defined", tzSym);
 			}
 		} else
 			nsym = createsymbol(tzSym);
@@ -827,25 +715,26 @@ sym_AddMacro(char *tzSym)
 		}
 	}
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Prepare for pass #1
- *
- */
 
+/* 
+ * Set whether to export all relocable symbols by default
+ */
+void sym_SetExportAll(BBOOL set) {
+	exportall = set;
+}
+
+/*
+ * Prepare for pass #1
+ */
 void 
 sym_PrepPass1(void)
 {
 	sym_Init();
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Prepare for pass #2
- *
- */
 
+/*
+ * Prepare for pass #2
+ */
 void 
 sym_PrepPass2(void)
 {
@@ -872,14 +761,17 @@ sym_PrepPass2(void)
 	sym_AddString("__TIME__", SavedTIME);
 	sym_AddString("__DATE__", SavedDATE);
 	sym_AddSet("_RS", 0);
-}
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * Initialise the symboltable
- *
- */
 
+	sym_AddEqu("_NARG", 0);
+	p_NARGSymbol = findsymbol("_NARG", NULL);
+	p_NARGSymbol->Callback = Callback_NARG;
+	
+	math_DefinePI();
+}
+
+/*
+ * Initialize the symboltable
+ */
 void 
 sym_Init(void)
 {
@@ -899,11 +791,7 @@ sym_Init(void)
 	sym_AddEqu("_NARG", 0);
 	p_NARGSymbol = findsymbol("_NARG", NULL);
 	p_NARGSymbol->Callback = Callback_NARG;
-	sym_AddEqu("__LINE__", 0);
-	p__LINE__Symbol = findsymbol("__LINE__", NULL);
-	p__LINE__Symbol->Callback = Callback__LINE__;
 
-	sym_AddEqu("__ASM__", (SLONG) (atof(ASM_VERSION) * 65536));
 	sym_AddSet("_RS", 0);
 
 	if (time(&tod) != -1) {
@@ -920,72 +808,3 @@ sym_Init(void)
 	math_DefinePI();
 
 }
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * DEBUG: Print the symbol table
- *
- */
-
-void 
-sym_PrintSymbolTable(void)
-{
-	ULONG i;
-
-	for (i = 0; i < HASHSIZE; i += 1) {
-		struct sSymbol *sym = tHashedSymbols[i];
-
-		if (sym != NULL)
-			printf("\nHashTable #%ld:\n", i);
-
-		while (sym != NULL) {
-			if (sym->nType & SYMF_LOCAL)
-				printf("LOCAL : '%s%s' - %08lX\n",
-				    sym->pScope->tzName, sym->tzName,
-				    getvaluefield(sym));
-			else if (sym->nType & (SYMF_MACRO | SYMF_STRING)) {
-				ULONG i = 0;
-
-				printf("MACRO : '%s'\n\"", sym->tzName);
-				while (i < sym->ulMacroSize) {
-					if (sym->pMacro[i] == '\n') {
-						printf("\n");
-						i += 1;
-					} else
-						printf("%c", sym->pMacro[i++]);
-				}
-				printf("\"\n");
-			} else if (sym->nType & SYMF_EXPORT)
-				printf("EXPORT: '%s' - %08lX\n", sym->tzName,
-				    getvaluefield(sym));
-			else if (sym->nType & SYMF_IMPORT)
-				printf("IMPORT: '%s'\n", sym->tzName);
-			else if (sym->nType & SYMF_EQU)
-				printf("EQU   : '%s' - %08lX\n", sym->tzName,
-				    getvaluefield(sym));
-			else if (sym->nType & SYMF_SET)
-				printf("SET   : '%s' - %08lX\n", sym->tzName,
-				    getvaluefield(sym));
-			else
-				printf("SYMBOL: '%s' - %08lX\n", sym->tzName,
-				    getvaluefield(sym));
-
-			sym = sym->pNext;
-		}
-	}
-}
-/*
- * RGBAsm - SYMBOL.C - Symboltable stuff
- *
- * DEBUG: Dump the macroargs
- *
- */
-
-void 
-sym_DumpMacroArgs(void)
-{
-	ULONG i;
-
-	for (i = 0; i < MAXMACROARGS; i += 1)
-		printf("CurrentArg%ld: %s\n", i + 1, currentmacroargs[i]);
-}

src/asm/yaccprt1.y

@@ -1,434 +0,0 @@
-%{
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "asm/symbol.h"
-#include "asm/asm.h"
-#include "asm/output.h"
-#include "asm/mylink.h"
-#include "asm/fstack.h"
-#include "asm/mymath.h"
-#include "asm/rpn.h"
-#include "asm/main.h"
-#include "asm/lexer.h"
-
-char	*tzNewMacro;
-ULONG	ulNewMacroSize;
-
-ULONG	symvaluetostring( char *dest, char *sym )
-{
-	if( sym_isString(sym) )
-		strcpy( dest, sym_GetStringValue(sym) );
-	else
-		sprintf( dest, "$%lX", sym_GetConstantValue(sym) );
-
-	return( strlen(dest) );
-}
-
-ULONG	str2int( char *s )
-{
-	ULONG r=0;
-	while( *s )
-	{
-		r<<=8;
-		r|=(UBYTE)(*s++);
-	}
-	return( r );
-}
-
-ULONG	isWhiteSpace( char s )
-{
-	return( s==' ' || s=='\t' || s=='\0' || s=='\n' );
-}
-
-ULONG	isRept( char *s )
-{
-	return( (strncasecmp(s,"REPT",4)==0) && isWhiteSpace(*(s-1)) && isWhiteSpace(s[4]) );
-}
-
-ULONG	isEndr( char *s )
-{
-	return( (strncasecmp(s,"Endr",4)==0) && isWhiteSpace(*(s-1)) && isWhiteSpace(s[4]) );
-}
-
-void	copyrept( void )
-{
-	SLONG	level=1, len, instring=0;
-	char	*src=pCurrentBuffer->pBuffer;
-
-	while( *src && level )
-	{
-		if( instring==0 )
-		{
-			if( isRept(src) )
-			{
-				level+=1;
-				src+=4;
-			}
-			else if( isEndr(src) )
-			{
-				level-=1;
-				src+=4;
-			}
-			else
-			{
-				if( *src=='\"' )
-					instring=1;
-				src+=1;
-			}
-		}
-		else
-		{
-			if( *src=='\\' )
-			{
-				src+=2;
-			}
-			else if( *src=='\"' )
-			{
-				src+=1;
-				instring=0;
-			}
-			else
-			{
-				src+=1;
-			}
-		}
-	}
-
-	len=src-pCurrentBuffer->pBuffer-4;
-
-	src=pCurrentBuffer->pBuffer;
-	ulNewMacroSize=len;
-
-	if( (tzNewMacro=(char *)malloc(ulNewMacroSize+1))!=NULL )
-	{
-		ULONG i;
-
-		tzNewMacro[ulNewMacroSize]=0;
-		for( i=0; i<ulNewMacroSize; i+=1 )
-		{
-			if( (tzNewMacro[i]=src[i])=='\n' )
-				nLineNo+=1;
-		}
-	}
-	else
-		fatalerror( "No mem for REPT block" );
-
-	yyskipbytes( ulNewMacroSize+4 );
-
-}
-
-ULONG	isMacro( char *s )
-{
-	return( (strncasecmp(s,"MACRO",4)==0) && isWhiteSpace(*(s-1)) && isWhiteSpace(s[5]) );
-}
-
-ULONG	isEndm( char *s )
-{
-	return( (strncasecmp(s,"Endm",4)==0) && isWhiteSpace(*(s-1)) && isWhiteSpace(s[4]) );
-}
-
-void	copymacro( void )
-{
-	SLONG	level=1, len, instring=0;
-	char	*src=pCurrentBuffer->pBuffer;
-
-	while( *src && level )
-	{
-		if( instring==0 )
-		{
-			if( isMacro(src) )
-			{
-				level+=1;
-				src+=4;
-			}
-			else if( isEndm(src) )
-			{
-				level-=1;
-				src+=4;
-			}
-			else
-			{
-				if( *src=='\"' )
-					instring=1;
-				src+=1;
-			}
-		}
-		else
-		{
-			if( *src=='\\' )
-			{
-				src+=2;
-			}
-			else if( *src=='\"' )
-			{
-				src+=1;
-				instring=0;
-			}
-			else
-			{
-				src+=1;
-			}
-		}
-	}
-
-	len=src-pCurrentBuffer->pBuffer-4;
-
-	src=pCurrentBuffer->pBuffer;
-	ulNewMacroSize=len;
-
-	if( (tzNewMacro=(char *)malloc(ulNewMacroSize+2))!=NULL )
-	{
-		ULONG i;
-
-		tzNewMacro[ulNewMacroSize]='\n';
-		tzNewMacro[ulNewMacroSize+1]=0;
-		for( i=0; i<ulNewMacroSize; i+=1 )
-		{
-			if( (tzNewMacro[i]=src[i])=='\n' )
-				nLineNo+=1;
-		}
-	}
-	else
-		fatalerror( "No mem for MACRO definition" );
-
-	yyskipbytes( ulNewMacroSize+4 );
-}
-
-ULONG	isIf( char *s )
-{
-	return( (strncasecmp(s,"If",2)==0) && isWhiteSpace(*(s-1)) && isWhiteSpace(s[2]) );
-}
-
-ULONG	isElse( char *s )
-{
-	return( (strncasecmp(s,"Else",4)==0) && isWhiteSpace(*(s-1)) && isWhiteSpace(s[4]) );
-}
-
-ULONG	isEndc( char *s )
-{
-	return( (strncasecmp(s,"Endc",4)==0) && isWhiteSpace(*(s-1)) && isWhiteSpace(s[4]) );
-}
-
-void	if_skip_to_else( void )
-{
-	SLONG	level=1, len, instring=0;
-	char	*src=pCurrentBuffer->pBuffer;
-
-	while( *src && level )
-	{
-		if( *src=='\n' )
-			nLineNo+=1;
-
-		if( instring==0 )
-		{
-			if( isIf(src) )
-			{
-				level+=1;
-				src+=2;
-			}
-			else if( level==1 && isElse(src) )
-			{
-				level-=1;
-				src+=4;
-			}
-			else if( isEndc(src) )
-			{
-				level-=1;
-				if( level!=0 )
-					src+=4;
-			}
-			else
-			{
-				if( *src=='\"' )
-					instring=1;
-				src+=1;
-			}
-		}
-		else
-		{
-			if( *src=='\\' )
-			{
-				src+=2;
-			}
-			else if( *src=='\"' )
-			{
-				src+=1;
-				instring=0;
-			}
-			else
-			{
-				src+=1;
-			}
-		}
-	}
-
-	len=src-pCurrentBuffer->pBuffer;
-
-	yyskipbytes( len );
-	yyunput( '\n' );
-	nLineNo-=1;
-}
-
-void	if_skip_to_endc( void )
-{
-	SLONG	level=1, len, instring=0;
-	char	*src=pCurrentBuffer->pBuffer;
-
-	while( *src && level )
-	{
-		if( *src=='\n' )
-			nLineNo+=1;
-
-		if( instring==0 )
-		{
-			if( isIf(src) )
-			{
-				level+=1;
-				src+=2;
-			}
-			else if( isEndc(src) )
-			{
-				level-=1;
-				if( level!=0 )
-					src+=4;
-			}
-			else
-			{
-				if( *src=='\"' )
-					instring=1;
-				src+=1;
-			}
-		}
-		else
-		{
-			if( *src=='\\' )
-			{
-				src+=2;
-			}
-			else if( *src=='\"' )
-			{
-				src+=1;
-				instring=0;
-			}
-			else
-			{
-				src+=1;
-			}
-		}
-	}
-
-	len=src-pCurrentBuffer->pBuffer;
-
-	yyskipbytes( len );
-	yyunput( '\n' );
-	nLineNo-=1;
-}
-
-
-#ifdef PCENGINE
-ULONG	ZP( struct Expression *expr )
-{
-	return( (!rpn_isReloc(expr)) && (expr->nVal>0x1FFF) && (expr->nVal<0x2100) );
-}
-
-void	out_ZPByte( struct Expression *expr )
-{
-	if( rpn_isReloc(expr) )
-	{
-		rpn_CheckZP(expr,expr);
-		out_RelByte(expr);
-	}
-	else
-	{
-		if( ZP(expr) )
-			out_AbsByte(expr->nVal-0x2000);
-		else
-			fatalerror( "Value not in zeropage");
-	}
-}
-#endif
-
-%}
-
-%union
-{
-    char tzSym[MAXSYMLEN+1];
-    char tzString[256];
-    struct Expression sVal;
-    SLONG nConstValue;
-}
-
-%type	<sVal>	relocconst
-%type	<nConstValue>	const
-%type	<nConstValue>	const_3bit
-%type	<sVal>	const_8bit
-%type	<sVal>	const_16bit
-%type	<sVal>	const_PCrel
-%type	<nConstValue>	sectiontype
-
-%type	<tzString>	string
-
-%token	<nConstValue>		T_NUMBER
-%token	<tzString>	T_STRING
-
-%left	T_OP_LOGICNOT
-%left	T_OP_LOGICOR T_OP_LOGICAND T_OP_LOGICEQU
-%left	T_OP_LOGICGT T_OP_LOGICLT T_OP_LOGICGE T_OP_LOGICLE T_OP_LOGICNE
-%left	T_OP_ADD T_OP_SUB
-%left	T_OP_OR T_OP_XOR T_OP_AND
-%left	T_OP_SHL T_OP_SHR
-%left	T_OP_MUL T_OP_DIV T_OP_MOD
-%left	T_OP_NOT
-%left	T_OP_DEF
-%left	T_OP_BANK
-%left	T_OP_SIN
-%left	T_OP_COS
-%left	T_OP_TAN
-%left	T_OP_ASIN
-%left	T_OP_ACOS
-%left	T_OP_ATAN
-%left	T_OP_ATAN2
-%left	T_OP_FDIV
-%left	T_OP_FMUL
-
-%left	T_OP_STRCMP
-%left	T_OP_STRIN
-%left	T_OP_STRSUB
-%left	T_OP_STRLEN
-%left	T_OP_STRCAT
-%left	T_OP_STRUPR
-%left	T_OP_STRLWR
-
-%left	NEG     /* negation--unary minus */
-
-%token	<tzSym> T_LABEL
-%token	<tzSym> T_ID
-%token	<tzSym> T_POP_EQU
-%token	<tzSym> T_POP_SET
-%token	<tzSym> T_POP_EQUS
-
-%token	T_POP_INCLUDE T_POP_PRINTF T_POP_PRINTT T_POP_PRINTV T_POP_IF T_POP_ELSE T_POP_ENDC
-%token	T_POP_IMPORT T_POP_EXPORT T_POP_GLOBAL
-%token	T_POP_DB T_POP_DS T_POP_DW T_POP_DL
-%token	T_POP_SECTION
-%token	T_POP_RB
-%token	T_POP_RW
-%token	T_POP_RL
-%token	T_POP_MACRO
-%token	T_POP_ENDM
-%token	T_POP_RSRESET T_POP_RSSET
-%token	T_POP_INCBIN T_POP_REPT
-%token	T_POP_SHIFT
-%token	T_POP_ENDR
-%token	T_POP_FAIL
-%token	T_POP_WARN
-%token	T_POP_PURGE
-%token	T_POP_POPS
-%token	T_POP_PUSHS
-%token	T_POP_POPO
-%token	T_POP_PUSHO
-%token	T_POP_OPT

src/asm/yaccprt3.y

@@ -1,538 +0,0 @@
-%start asmfile
-
-%%
-
-asmfile			:	lines lastline
-;
-
-lastline		:	/* empty */
-				|	line
-					{ nLineNo+=1; nTotalLines+=1; }
-;
-
-lines			:	/* empty */
-				|	lines line '\n'
-					{ nLineNo+=1; nTotalLines+=1; }
-;
-
-line			:	/* empty */
-				|	label
-				|	label cpu_command
-				|	label macro
-				|	label simple_pseudoop
-				|	pseudoop
-;
-
-label			:	/* empty */
-				|	T_LABEL			{	if( $1[0]=='.' )
-											sym_AddLocalReloc($1);
-										else
-											sym_AddReloc($1);
-									}
-				|	T_LABEL ':'		{	if( $1[0]=='.' )
-											sym_AddLocalReloc($1);
-										else
-											sym_AddReloc($1);
-									}
-				|	T_LABEL ':' ':'	{ sym_AddReloc($1); sym_Export($1); }
-;
-
-macro			:	T_ID
-					{
-						yy_set_state( LEX_STATE_MACROARGS );
-					}
-					macroargs
-					{
-						yy_set_state( LEX_STATE_NORMAL );
-
-						if( !fstk_RunMacro($1) )
-						{
-							fprintf(stderr, "Macro '%s' not defined", $1);
-							yyerror( "No such macro" );
-						}
-					}
-;
-
-macroargs		:	/* empty */
-				|	macroarg
-				|	macroarg ',' macroargs
-;
-
-macroarg 		:	T_STRING
-					{ sym_AddNewMacroArg( $1 ); }
-;
-
-pseudoop		:	equ
-				|	set
-				|	rb
-				|	rw
-				|	rl
-				|	equs
-				|	macrodef
-;
-
-simple_pseudoop	:	include
-				|	printf
-				|	printt
-				|	printv
-				|	if
-				|	else
-				|	endc
-				|	import
-				|	export
-				|	global
-				|	db
-				|	dw
-				|	dl
-				|	ds
-				|	section
-				|	rsreset
-				|	rsset
-				|	incbin
-				|	rept
-				|	shift
-				|	fail
-				|	warn
-				|	purge
-				|	pops
-				|	pushs
-				|	popo
-				|	pusho
-				|	opt
-;
-
-opt				:	T_POP_OPT
-					{
-						yy_set_state( LEX_STATE_MACROARGS );
-					}
-					opt_list
-					{
-						yy_set_state( LEX_STATE_NORMAL );
-					}
-;
-
-opt_list		:	opt_list_entry
-				|	opt_list_entry ',' opt_list
-;
-
-opt_list_entry	:	T_STRING
-					{
-						opt_Parse($1);
-					}
-;
-
-popo			:	T_POP_POPO
-					{ opt_Pop(); }
-;
-
-pusho			:	T_POP_PUSHO
-					{ opt_Push(); }
-;
-
-pops			:	T_POP_POPS
-					{ out_PopSection(); }
-;
-
-pushs			:	T_POP_PUSHS
-					{ out_PushSection(); }
-;
-
-fail			:	T_POP_FAIL string
-					{ fatalerror($2); }
-;
-
-warn			:	T_POP_WARN string
-					{ yyerror($2); }
-;
-
-shift			:	T_POP_SHIFT
-					{ sym_ShiftCurrentMacroArgs(); }
-;
-
-rept			:	T_POP_REPT const
-					{
-						copyrept();
-						fstk_RunRept( $2 );
-					}
-;
-
-macrodef		:	T_LABEL ':' T_POP_MACRO
-					{
-						copymacro();
-						sym_AddMacro($1);
-					}
-;
-
-equs			:	T_LABEL T_POP_EQUS string
-					{ sym_AddString( $1, $3 ); }
-;
-
-rsset			:	T_POP_RSSET const
-					{ sym_AddSet( "_RS", $2 ); }
-;
-
-rsreset			:	T_POP_RSRESET
-					{ sym_AddSet( "_RS", 0 ); }
-;
-
-rl				:	T_LABEL T_POP_RL const
-					{
-						sym_AddEqu( $1, sym_GetConstantValue("_RS") );
-						sym_AddSet( "_RS", sym_GetConstantValue("_RS")+4*$3 );
-					}
-;
-
-rw				:	T_LABEL T_POP_RW const
-					{
-						sym_AddEqu( $1, sym_GetConstantValue("_RS") );
-						sym_AddSet( "_RS", sym_GetConstantValue("_RS")+2*$3 );
-					}
-;
-
-rb				:	T_LABEL T_POP_RB const
-					{
-						sym_AddEqu( $1, sym_GetConstantValue("_RS") );
-						sym_AddSet( "_RS", sym_GetConstantValue("_RS")+$3 );
-					}
-;
-
-ds				:	T_POP_DS const
-					{ out_Skip( $2 ); }
-;
-
-db				:	T_POP_DB constlist_8bit
-;
-
-dw				:	T_POP_DW constlist_16bit
-;
-
-dl				:	T_POP_DL constlist_32bit
-;
-
-purge			:	T_POP_PURGE
-					{
-						oDontExpandStrings=1;
-					}
-					purge_list
-					{
-						oDontExpandStrings=0;
-					}
-;
-
-purge_list		:	purge_list_entry
-				|	purge_list_entry ',' purge_list
-;
-
-purge_list_entry	:	T_ID	{ sym_Purge($1); }
-;
-
-import			:	T_POP_IMPORT import_list
-;
-
-import_list		:	import_list_entry
-				|	import_list_entry ',' import_list
-;
-
-import_list_entry	:	T_ID	{ sym_Import($1); }
-;
-
-export			:	T_POP_EXPORT export_list
-;
-
-export_list		:	export_list_entry
-				|	export_list_entry ',' export_list
-;
-
-export_list_entry	:	T_ID	{ sym_Export($1); }
-;
-
-global			:	T_POP_GLOBAL global_list
-;
-
-global_list		:	global_list_entry
-				|	global_list_entry ',' global_list
-;
-
-global_list_entry	:	T_ID	{ sym_Global($1); }
-;
-
-equ				:	T_LABEL T_POP_EQU const
-					{ sym_AddEqu( $1, $3 ); }
-;
-
-set				:	T_LABEL T_POP_SET const
-					{ sym_AddSet( $1, $3 ); }
-;
-
-include			:	T_POP_INCLUDE string
-					{
-						if( !fstk_RunInclude($2) )
-						{
-							fprintf(stderr, "Could not open file '%s' : %s\n", $2, strerror(errno));
-							yyerror( "File not found" );
-						}
-					}
-;
-
-incbin			:	T_POP_INCBIN string
-					{ out_BinaryFile( $2 ); }
-				|	T_POP_INCBIN string ',' const ',' const
-					{
-						out_BinaryFileSlice( $2, $4, $6 );
-					}
-;
-
-printt			:	T_POP_PRINTT string
-					{
-						if( nPass==1 )
-							printf( "%s", $2 );
-					}
-;
-
-printv			:	T_POP_PRINTV const
-					{
-						if( nPass==1 )
-							printf( "$%lX", $2 );
-					}
-;
-
-printf			:	T_POP_PRINTF const
-					{
-						if( nPass==1 )
-							math_Print( $2 );
-					}
-;
-
-if				:	T_POP_IF const
-					{
-						nIFDepth+=1;
-						if( !$2 )
-						{
-							if_skip_to_else();	/* will continue parsing just after ELSE or just at ENDC keyword */
-						}
-					}
-
-else			:	T_POP_ELSE
-					{
-						if_skip_to_endc();		/* will continue parsing just at ENDC keyword */
-					}
-;
-
-endc			:	T_POP_ENDC
-					{
-						nIFDepth-=1;
-					}
-;
-
-const_3bit		:	const
-					{
-						if( ($1<0) || ($1>7) )
-						{
-							yyerror( "Immediate value must be 3-bit" );
-						}
-						else
-							$$=$1&0x7;
-					}
-;
-
-constlist_8bit	:	constlist_8bit_entry
-				|	constlist_8bit_entry ',' constlist_8bit
-;
-
-constlist_8bit_entry	:               { out_Skip( 1 ); }
-						|	const_8bit	{ out_RelByte( &$1 ); }
-			   			|	string		{ out_String( $1 );  }
-;
-
-constlist_16bit	:	constlist_16bit_entry
-				|	constlist_16bit_entry ',' constlist_16bit
-;
-
-constlist_16bit_entry	:  				{ out_Skip( 2 ); }
-						|	const_16bit	{ out_RelWord( &$1 ); }
-;
-
-
-constlist_32bit	:	constlist_32bit_entry
-				|	constlist_32bit_entry ',' constlist_32bit
-;
-
-constlist_32bit_entry	:				{ out_Skip( 4 ); }
-						|	relocconst	{ out_RelLong( &$1 ); }
-;
-
-
-const_PCrel		:	relocconst
-					{
-						$$ = $1;
-						if( !rpn_isPCRelative(&$1) )
-							yyerror( "Expression must be PC-relative" );
-					}
-;
-
-const_8bit		:	relocconst
-					{
-						if( (!rpn_isReloc(&$1)) && (($1.nVal<-128) || ($1.nVal>255)) )
-						{
-							yyerror( "Expression must be 8-bit" );
-						}
-						$$=$1;
-					}
-;
-
-const_16bit		:	relocconst
-					{
-						if( (!rpn_isReloc(&$1)) && (($1.nVal<-32768) || ($1.nVal>65535)) )
-						{
-							yyerror( "Expression must be 16-bit" );
-						}
-						$$=$1;
-					}
-;
-
-
-relocconst		:	T_ID
-						{ rpn_Symbol(&$$,$1);	$$.nVal = sym_GetValue($1); }
-				|	T_NUMBER
-						{ rpn_Number(&$$,$1);	$$.nVal = $1; }
-				|	string
-						{ ULONG r; r=str2int($1); rpn_Number(&$$,r); $$.nVal=r; }
-				|	T_OP_LOGICNOT relocconst %prec NEG
-						{ rpn_LOGNOT(&$$,&$2); }
-				|	relocconst T_OP_LOGICOR relocconst
-						{ rpn_LOGOR(&$$,&$1,&$3); }
-				|	relocconst T_OP_LOGICAND relocconst
-						{ rpn_LOGAND(&$$,&$1,&$3); }
-				|	relocconst T_OP_LOGICEQU relocconst
-						{ rpn_LOGEQU(&$$,&$1,&$3); }
-				|	relocconst T_OP_LOGICGT relocconst
-						{ rpn_LOGGT(&$$,&$1,&$3); }
-				|	relocconst T_OP_LOGICLT relocconst
-						{ rpn_LOGLT(&$$,&$1,&$3); }
-				|	relocconst T_OP_LOGICGE relocconst
-					 	{ rpn_LOGGE(&$$,&$1,&$3); }
-				|	relocconst T_OP_LOGICLE relocconst
-					 	{ rpn_LOGLE(&$$,&$1,&$3); }
-				|	relocconst T_OP_LOGICNE relocconst
-					 	{ rpn_LOGNE(&$$,&$1,&$3); }
-				|	relocconst T_OP_ADD relocconst
-						{ rpn_ADD(&$$,&$1,&$3); }
-				|	relocconst T_OP_SUB relocconst
-						{ rpn_SUB(&$$,&$1,&$3); }
-				|	relocconst T_OP_XOR relocconst
-						{ rpn_XOR(&$$,&$1,&$3); }
-				|	relocconst T_OP_OR relocconst
-						{ rpn_OR(&$$,&$1,&$3); }
-				|	relocconst T_OP_AND relocconst
-						{ rpn_AND(&$$,&$1,&$3); }
-				|	relocconst T_OP_SHL relocconst
-						{ rpn_SHL(&$$,&$1,&$3); }
-				|	relocconst T_OP_SHR relocconst
-						{ rpn_SHR(&$$,&$1,&$3); }
-				|	relocconst T_OP_MUL relocconst
-						{ rpn_MUL(&$$,&$1,&$3); }
-				|	relocconst T_OP_DIV relocconst
-						{ rpn_DIV(&$$,&$1,&$3); }
-				|	relocconst T_OP_MOD relocconst
-						{ rpn_MOD(&$$,&$1,&$3); }
-				|	T_OP_ADD relocconst %prec NEG
-						{ $$ = $2; }
-				|	T_OP_SUB relocconst %prec NEG
-						{ rpn_UNNEG(&$$,&$2); }
-				|	T_OP_NOT relocconst %prec NEG
-						{ rpn_UNNOT(&$$,&$2); }
-				|	T_OP_BANK '(' T_ID ')'
-						{ rpn_Bank(&$$,$3); $$.nVal = 0; }
-				|	T_OP_DEF '(' T_ID ')'
-						{ rpn_Number(&$$,sym_isConstDefined($3)); }
-				|	T_OP_FDIV '(' const ',' const ')'			{ rpn_Number(&$$,math_Div($3,$5)); }
-				|	T_OP_FMUL '(' const ',' const ')'			{ rpn_Number(&$$,math_Mul($3,$5)); }
-				|	T_OP_SIN '(' const ')'			{ rpn_Number(&$$,math_Sin($3)); }
-				|	T_OP_COS '(' const ')'			{ rpn_Number(&$$,math_Cos($3)); }
-				|	T_OP_TAN '(' const ')'			{ rpn_Number(&$$,math_Tan($3)); }
-				|	T_OP_ASIN '(' const ')'			{ rpn_Number(&$$,math_ASin($3)); }
-				|	T_OP_ACOS '(' const ')'			{ rpn_Number(&$$,math_ACos($3)); }
-				|	T_OP_ATAN '(' const ')'			{ rpn_Number(&$$,math_ATan($3)); }
-				|	T_OP_ATAN2 '(' const ',' const ')'	{ rpn_Number(&$$,math_ATan2($3,$5)); }
-				|	T_OP_STRCMP '(' string ',' string ')'	{ rpn_Number(&$$,strcmp($3,$5)); }
-				|	T_OP_STRIN '(' string ',' string ')'
-					{
-						char	*p;
-  						if( (p=strstr($3,$5))!=NULL )
-						{
-							rpn_Number(&$$,p-$3+1);
-						}
-						else
-						{
-							rpn_Number(&$$,0);
-						}
-					}
-				|	T_OP_STRLEN '(' string ')'		{ rpn_Number(&$$,strlen($3)); }
-				|	'(' relocconst ')'
-						{ $$ = $2; }
-;
-
-const			:	T_ID							{ $$ = sym_GetConstantValue($1); }
-				|	T_NUMBER 						{ $$ = $1; }
-				|	string						{ $$ = str2int($1); }
-				|	T_OP_LOGICNOT const %prec NEG	{ $$ = !$2; }
-				|	const T_OP_LOGICOR const		{ $$ = $1 || $3; }
-				|	const T_OP_LOGICAND const		{ $$ = $1 && $3; }
-				|	const T_OP_LOGICEQU const		{ $$ = $1 == $3; }
-				|	const T_OP_LOGICGT const 		{ $$ = $1 > $3; }
-				|	const T_OP_LOGICLT const		{ $$ = $1 < $3; }
-				|	const T_OP_LOGICGE const 		{ $$ = $1 >= $3; }
-				|	const T_OP_LOGICLE const 		{ $$ = $1 <= $3; }
-				|	const T_OP_LOGICNE const 		{ $$ = $1 != $3; }
-				|	const T_OP_ADD const			{ $$ = $1 + $3; }
-				|	const T_OP_SUB const			{ $$ = $1 - $3; }
-				|	T_ID  T_OP_SUB T_ID				{ $$ = sym_GetDefinedValue($1) - sym_GetDefinedValue($3); }
-				|	const T_OP_XOR const			{ $$ = $1 ^ $3; }
-				|	const T_OP_OR const				{ $$ = $1 | $3; }
-				|	const T_OP_AND const			{ $$ = $1 & $3; }
-				|	const T_OP_SHL const			{ $$ = $1 << $3; }
-				|	const T_OP_SHR const			{ $$ = $1 >> $3; }
-				|	const T_OP_MUL const			{ $$ = $1 * $3; }
-				|	const T_OP_DIV const			{ $$ = $1 / $3; }
-				|	const T_OP_MOD const			{ $$ = $1 % $3; }
-				|	T_OP_ADD const %prec NEG		{ $$ = +$2; }
-				|	T_OP_SUB const %prec NEG		{ $$ = -$2; }
-				|	T_OP_NOT const %prec NEG		{ $$ = 0xFFFFFFFF^$2; }
-				|	T_OP_FDIV '(' const ',' const ')'			{ $$ = math_Div($3,$5); }
-				|	T_OP_FMUL '(' const ',' const ')'			{ $$ = math_Mul($3,$5); }
-				|	T_OP_SIN '(' const ')'			{ $$ = math_Sin($3); }
-				|	T_OP_COS '(' const ')'			{ $$ = math_Cos($3); }
-				|	T_OP_TAN '(' const ')'			{ $$ = math_Tan($3); }
-				|	T_OP_ASIN '(' const ')'			{ $$ = math_ASin($3); }
-				|	T_OP_ACOS '(' const ')'			{ $$ = math_ACos($3); }
-				|	T_OP_ATAN '(' const ')'			{ $$ = math_ATan($3); }
-				|	T_OP_ATAN2 '(' const ',' const ')'	{ $$ = math_ATan2($3,$5); }
-				|	T_OP_DEF '(' T_ID ')'				{ $$ = sym_isConstDefined($3); }
-				|	T_OP_STRCMP '(' string ',' string ')'	{ $$ = strcmp( $3, $5 ); }
-				|	T_OP_STRIN '(' string ',' string ')'
-					{
-						char	*p;
-  						if( (p=strstr($3,$5))!=NULL )
-						{
-							$$ = p-$3+1;
-						}
-						else
-						{
-							$$ = 0;
-						}
-					}
-				|	T_OP_STRLEN '(' string ')'		{ $$ = strlen($3); }
-				|	'(' const ')'					{ $$ = $2; }
-;
-
-string			:	T_STRING
-					{ strcpy($$,$1); }
-				|	T_OP_STRSUB '(' string ',' const ',' const ')'
-					{ strncpy($$,$3+$5-1,$7); $$[$7]=0; }
-				|	T_OP_STRCAT '(' string ',' string ')'
-					{ strcpy($$,$3); strcat($$,$5); }
-				|	T_OP_STRUPR '(' string ')'
-					{ strcpy($$,$3); strupr($$); }
-				|	T_OP_STRLWR '(' string ')'
-					{ strcpy($$,$3); strlwr($$); }
-;

src/extern/err.c

@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2005-2013 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.
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include "extern/err.h"
+
+extern char *progname;
+
+void rgbds_vwarn(const char *fmt, va_list ap)
+{
+	fprintf (stderr, "%s: ", progname);
+	if (fmt) {
+		vfprintf(stderr, fmt, ap);
+		fputs (": ", stderr);
+	}
+	perror(0);
+}
+
+void rgbds_vwarnx(const char *fmt, va_list ap)
+{
+	fprintf (stderr, "%s: ", progname);
+	if (fmt) vfprintf(stderr, fmt, ap);
+	putc('\n', stderr);
+}
+
+noreturn void rgbds_verr(int status, const char *fmt, va_list ap)
+{
+	vwarn(fmt, ap);
+	exit(status);
+}
+
+noreturn void rgbds_verrx(int status, const char *fmt, va_list ap)
+{
+	vwarnx(fmt, ap);
+	exit(status);
+}
+
+void rgbds_warn(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	vwarn(fmt, ap);
+	va_end(ap);
+}
+
+void rgbds_warnx(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	vwarnx(fmt, ap);
+	va_end(ap);
+}
+
+noreturn void rgbds_err(int status, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	verr(status, fmt, ap);
+	va_end(ap);
+}
+
+noreturn void rgbds_errx(int status, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	verrx(status, fmt, ap);
+	va_end(ap);
+}

src/extern/reallocarray.c

@@ -0,0 +1,38 @@
+/*	$OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $	*/
+/*
+ * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/*
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
+ */
+#define MUL_NO_OVERFLOW	((size_t)1 << (sizeof(size_t) * 4))
+
+void *
+rgbds_reallocarray(void *optr, size_t nmemb, size_t size)
+{
+	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    nmemb > 0 && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return realloc(optr, size * nmemb);
+}

src/extern/strlcat.c

@@ -0,0 +1,55 @@
+/*	$OpenBSD: strlcat.c,v 1.14 2015/01/15 03:54:12 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Appends src to string dst of size dsize (unlike strncat, dsize is the
+ * full size of dst, not space left).  At most dsize-1 characters
+ * will be copied.  Always NUL terminates (unless dsize <= strlen(dst)).
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
+ * If retval >= dsize, truncation occurred.
+ */
+size_t
+rgbds_strlcat(char *dst, const char *src, size_t dsize)
+{
+	const char *odst = dst;
+	const char *osrc = src;
+	size_t n = dsize;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end. */
+	while (n-- != 0 && *dst != '\0')
+		dst++;
+	dlen = dst - odst;
+	n = dsize - dlen;
+
+	if (n-- == 0)
+		return(dlen + strlen(src));
+	while (*src != '\0') {
+		if (n != 0) {
+			*dst++ = *src;
+			n--;
+		}
+		src++;
+	}
+	*dst = '\0';
+
+	return(dlen + (src - osrc));	/* count does not include NUL */
+}

src/extern/strlcpy.c

@@ -0,0 +1,50 @@
+/*	$OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Copy string src to buffer dst of size dsize.  At most dsize-1
+ * chars will be copied.  Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
+ */
+size_t
+rgbds_strlcpy(char *dst, const char *src, size_t dsize)
+{
+	const char *osrc = src;
+	size_t nleft = dsize;
+
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0) {
+		while (--nleft != 0) {
+			if ((*dst++ = *src++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0) {
+		if (dsize != 0)
+			*dst = '\0';		/* NUL-terminate dst */
+		while (*src++)
+			;
+	}
+
+	return(src - osrc - 1);	/* count does not include NUL */
+}

src/fix/main.c

@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <getopt.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -22,13 +21,17 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "extern/err.h"
+
+char *progname;
+
 static void
 usage(void)
 {
-	printf("usage: rgbfix [-Ccjsv] [-i game_id] [-k licensee_str] "
-	    "[-l licensee_id]\n" "              [-m mbc_type] [-n rom_version] "
-	    "[-p pad_value] [-r ram_size]\n"
-	    "              [-t title_str] file.gb\n");
+	printf(
+"usage: rgbfix [-Ccjsv] [-i game_id] [-k licensee_str] [-l licensee_id]\n"
+"              [-m mbc_type] [-n rom_version] [-p pad_value] [-r ram_size]\n"
+"              [-t title_str] file\n");
 	exit(1);
 }
 
@@ -39,19 +42,6 @@ main(int argc, char *argv[])
 	int ch;
 	char *ep;
 
-	/*
-	 * Open the ROM file
-	 */
-
-	if (argc < 2)
-		usage();
-
-	if ((rom = fopen(argv[argc - 1], "rb+")) == NULL) {
-		fprintf(stderr, "Error opening file %s: \n", argv[argc - 1]);
-		perror(NULL);
-		exit(1);
-	}
-
 	/*
 	 * Parse command-line options
 	 */
@@ -71,15 +61,17 @@ main(int argc, char *argv[])
 	bool resize = false;
 	bool setversion = false;
 
-	char *title = NULL; /* game title in ASCII */
-	char *id = NULL; /* game ID in ASCII */
-	char *newlicensee = NULL; /* new licensee ID, two ASCII characters */
+	char *title; /* game title in ASCII */
+	char *id; /* game ID in ASCII */
+	char *newlicensee; /* new licensee ID, two ASCII characters */
 
-	int licensee = -1;  /* old licensee ID */
-	int cartridge = -1; /* cartridge hardware ID */
-	int ramsize = -1;   /* RAM size ID */
-	int version = -1;   /* mask ROM version number */
-	int padvalue = -1;  /* to pad the rom with if it changes size */
+	int licensee;  /* old licensee ID */
+	int cartridge; /* cartridge hardware ID */
+	int ramsize;   /* RAM size ID */
+	int version;   /* mask ROM version number */
+	int padvalue;  /* to pad the rom with if it changes size */
+
+	progname = argv[0];
 
 	while ((ch = getopt(argc, argv, "Cci:jk:l:m:n:p:sr:t:v")) != -1) {
 		switch (ch) {
@@ -93,9 +85,8 @@ main(int argc, char *argv[])
 			setid = true;
 
 			if (strlen(optarg) != 4) {
-				fprintf(stderr, "Game ID %s must be exactly 4 "
-				    "characters\n", optarg);
-				exit(1);
+				errx(1, "Game ID %s must be exactly 4 "
+				    "characters", optarg);
 			}
 
 			id = optarg;
@@ -107,10 +98,8 @@ main(int argc, char *argv[])
 			setnewlicensee = true;
 
 			if (strlen(optarg) != 2) {
-				fprintf(stderr,
-				    "New licensee code %s is not the correct "
-				    "length of 2 characters\n", optarg);
-				exit(1);
+				errx(1, "New licensee code %s is not the "
+				    "correct length of 2 characters", optarg);
 			}
 
 			newlicensee = optarg;
@@ -120,15 +109,11 @@ main(int argc, char *argv[])
 
 			licensee = strtoul(optarg, &ep, 0);
 			if (optarg[0] == '\0' || *ep != '\0') {
-				fprintf(stderr,
-				    "Invalid argument for option 'l'\n");
-				exit(1);
+				errx(1, "Invalid argument for option 'l'");
 			}
 			if (licensee < 0 || licensee > 0xFF) {
-				fprintf(stderr,
-				    "Argument for option 'l' must be "
-				    "between 0 and 255\n");
-				exit(1);
+				errx(1, "Argument for option 'l' must be "
+				    "between 0 and 255");
 			}
 			break;
 		case 'm':
@@ -136,15 +121,11 @@ main(int argc, char *argv[])
 
 			cartridge = strtoul(optarg, &ep, 0);
 			if (optarg[0] == '\0' || *ep != '\0') {
-				fprintf(stderr,
-				    "Invalid argument for option 'm'\n");
-				exit(1);
+				errx(1, "Invalid argument for option 'm'");
 			}
 			if (cartridge < 0 || cartridge > 0xFF) {
-				fprintf(stderr,
-				    "Argument for option 'm' must be "
-				    "between 0 and 255\n");
-				exit(1);
+				errx(1, "Argument for option 'm' must be "
+				    "between 0 and 255");
 			}
 			break;
 		case 'n':
@@ -152,15 +133,11 @@ main(int argc, char *argv[])
 
 			version = strtoul(optarg, &ep, 0);
 			if (optarg[0] == '\0' || *ep != '\0') {
-				fprintf(stderr,
-				    "Invalid argument for option 'n'\n");
-				exit(1);
+				errx(1, "Invalid argument for option 'n'");
 			}
 			if (version < 0 || version > 0xFF) {
-				fprintf(stderr,
-				    "Argument for option 'n' must be "
-				    "between 0 and 255\n");
-				exit(1);
+				errx(1, "Argument for option 'n' must be "
+				    "between 0 and 255");
 			}
 			break;
 		case 'p':
@@ -168,15 +145,11 @@ main(int argc, char *argv[])
 
 			padvalue = strtoul(optarg, &ep, 0);
 			if (optarg[0] == '\0' || *ep != '\0') {
-				fprintf(stderr,
-				    "Invalid argument for option 'p'\n");
-				exit(1);
+				errx(1, "Invalid argument for option 'p'");
 			}
 			if (padvalue < 0 || padvalue > 0xFF) {
-				fprintf(stderr,
-				    "Argument for option 'p' must be "
-				    "between 0 and 255\n");
-				exit(1);
+				errx(1, "Argument for option 'p' must be "
+				    "between 0 and 255");
 			}
 			break;
 		case 'r':
@@ -184,14 +157,11 @@ main(int argc, char *argv[])
 
 			ramsize = strtoul(optarg, &ep, 0);
 			if (optarg[0] == '\0' || *ep != '\0') {
-				fprintf(stderr,
-				    "Invalid argument for option 'r'\n");
+				errx(1, "Invalid argument for option 'r'");
 			}
 			if (ramsize < 0 || ramsize > 0xFF) {
-				fprintf(stderr,
-				    "Argument for option 'r' must be "
-				    "between 0 and 255\n");
-				exit(1);
+				errx(1, "Argument for option 'r' must be "
+				    "between 0 and 255");
 			}
 			break;
 		case 's':
@@ -201,15 +171,13 @@ main(int argc, char *argv[])
 			settitle = true;
 
 			if (strlen(optarg) > 16) {
-				fprintf(stderr, "Title %s is greater than the "
-				    "maximum of 16 characters\n", optarg);
-				exit(1);
+				errx(1, "Title %s is greater than the "
+				    "maximum of 16 characters", optarg);
 			}
 
 			if (strlen(optarg) == 16)
-				fprintf(stderr,
-				    "Title %s is 16 chars, it is best "
-				    "to keep it to 15 or fewer\n", optarg);
+				warnx("Title %s is 16 chars, it is best to "
+				    "keep it to 15 or fewer", optarg);
 
 			title = optarg;
 			break;
@@ -221,9 +189,21 @@ main(int argc, char *argv[])
 			/* NOTREACHED */
 		}
 	}
+
 	argc -= optind;
 	argv += optind;
 
+	if (argc == 0)
+		usage();
+
+	/*
+	 * Open the ROM file
+	 */
+
+	if ((rom = fopen(argv[argc - 1], "rb+")) == NULL) {
+		err(1, "Error opening file %s", argv[argc - 1]);
+	}
+
 	/*
 	 * Write changes to ROM
 	 */
@@ -315,8 +295,7 @@ main(int argc, char *argv[])
 			byte |= 1 << 6;
 
 		if (byte & 0x3F)
-			fprintf(stderr,
-			    "Color flag conflicts with game title\n");
+			warnx("Color flag conflicts with game title");
 
 		fseek(rom, 0x143, SEEK_SET);
 		fputc(byte, rom);
@@ -353,9 +332,8 @@ main(int argc, char *argv[])
 		 */
 
 		if (!setlicensee)
-			fprintf(stderr,
-			    "You should probably set both '-s' and "
-			    "'-l 0x33'\n");
+			warnx("You should probably set both '-s' and "
+			    "'-l 0x33'");
 
 		fseek(rom, 0x146, SEEK_SET);
 		fputc(3, rom);
@@ -379,7 +357,9 @@ main(int argc, char *argv[])
 		 */
 
 		/* We will pad the ROM to match the size given in the header. */
-		int romsize, newsize, headbyte;
+		long romsize, newsize;
+		int headbyte;
+		uint8_t *buf;
 		fseek(rom, 0, SEEK_END);
 		romsize = ftell(rom);
 		newsize = 0x8000;
@@ -390,14 +370,17 @@ main(int argc, char *argv[])
 			headbyte++;
 		}
 
-		while (newsize != ftell(rom)) /* ROM needs resizing */
-			fputc(padvalue, rom);
-
 		if (newsize > 0x800000) /* ROM is bigger than 8MiB */
-			fprintf(stderr, "ROM size is bigger than 8MiB\n");
+			warnx("ROM size is bigger than 8MiB");
+
+		buf = malloc(newsize - romsize);
+		memset(buf, padvalue, newsize - romsize);
+		fwrite(buf, 1, newsize - romsize, rom);
 
 		fseek(rom, 0x148, SEEK_SET);
 		fputc(headbyte, rom);
+
+		free(buf);
 	}
 
 	if (setramsize) {

src/fix/rgbfix.1

@@ -1,4 +1,4 @@
-.Dd $Mdocdate$
+.Dd February 26, 2015
 .Dt RGBFIX 1
 .Os RGBDS Manual
 .Sh NAME
@@ -41,7 +41,7 @@ flag are set,
 takes precedence.
 .It Fl i Ar game_id
 Set the game ID string
-.Pq Ad 0x13F No Ns \(en Ns Ad 0x142
+.Pq Ad 0x13F Ns \(en Ns Ad 0x142
 to a given string of exactly 4 characters.
 If both this and the title are set, the game ID will overwrite the
 overlapping portion of the title.
@@ -51,7 +51,7 @@ Set the non-Japanese region flag:
 = 1.
 .It Fl k Ar licensee_str
 Set the new licensee string
-.Pq Ad 0x144 No Ns \(en Ns Ad 0x145
+.Pq Ad 0x144 Ns \(en Ns Ad 0x145
 to a given string, truncated to at most two characters.
 .It Fl l Ar licensee_id
 Set the old licensee code,
@@ -84,7 +84,7 @@ Set the SGB flag:
 = 3.
 .It Fl t Ar title
 Set the title string
-.Pq Ad 0x134 No Ns \(en Ns Ad 0x143
+.Pq Ad 0x134 Ns \(en Ns Ad 0x143
 to a given string, truncated to at most 16 characters.
 It is recommended to use 15 characters instead, to avoid clashing with the CGB
 flag
@@ -93,23 +93,23 @@ If both this and the game ID are set, the game ID will overwrite the
 overlapping portion of the title.
 .It Fl v
 Validate the header and fix checksums: the Nintendo character area
-.Pq Ad 0x104 No Ns \(en Ns Ad 0x133 ,
+.Pq Ad 0x104 Ns \(en Ns Ad 0x133 ,
 the header checksum
 .Pq Ad 0x14D ,
 and the global checksum
-.Pq Ad 0x14E No Ns \(en Ns Ad 0x14F .
+.Pq Ad 0x14E Ns \(en Ns Ad 0x14F .
 .El
 .Sh EXAMPLES
 Most values in the ROM header are only cosmetic.
 The bare minimum requirements for a workable image are checksums, the Nintendo
 logo, and (if needed) the CGB/SGB flags.
 It is a good idea to pad the image to a valid size as well
-.Pq Dq valid No meaning a multiple of 32KiB .
+.Pq Do valid Dc meaning a multiple of 32KiB .
 .Pp
 The following will make a plain, no-color Game Boy game without checking for
 a valid size:
 .Pp
-.D1 $ rgbfix \-v foo.gb
+.D1 $ rgbfix -v foo.gb
 .Pp
 The following will make a SGB-enabled, color-enabled game with a title of
 .Dq foobar ,
@@ -119,20 +119,19 @@ The Game Boy itself does not use the title, but some emulators or ROM managers
 might.
 .Pc
 .Pp
-.D1 $ rgbfix \-vcs \-l 0x33 \-p 0 \-t foobar baz.gb
+.D1 $ rgbfix -vcs -l 0x33 -p 0 -t foobar baz.gb
 .Pp
 The following will duplicate the header
 .Pq sans global checksum
 of the game
 .Dq Survival Kids :
 .Pp
-.D1 $ rgbfix \-cjsv \-k A4 \-l 0x33 \-m 0x1B \-p 0xFF \-r 3 \-t SURVIVALKIDAVKE SurvivalKids.gbc
+.D1 $ rgbfix -cjsv -k A4 -l 0x33 -m 0x1B -p 0xFF -r 3 -t SURVIVALKIDAVKE \
+SurvivalKids.gbc
 .Sh SEE ALSO
-.Xr rgbds 7 ,
 .Xr rgbasm 1 ,
-.Xr rgblib 1 ,
 .Xr rgblink 1 ,
-.Xr gbz80 7
+.Xr rgbds 7
 .Sh HISTORY
 .Nm
 was originally released by Carsten S\(/orensen as a standalone program called