Make fatalerror and yyerror consistent

There are two ways in which the assembly process can fail:

1. If there is a really big problem that compromises the whole process,
   the assembler has to stop right there and generate an error message.
   This happens with unterminated REPT loops, macros, etc.

2. If the problem isn't that big and the process can still continue,
   even though the final result is invalid, the assembler can try to
   continue and warn the user about all errors it finds in the code.

This patch clarifies the use of each function and replaces the function
used in two places by the correct one.

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>

GNUmakefile

@@ -1,6 +0,0 @@
-# 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

Makefile

@@ -1,25 +1,35 @@
-PKG_CONFIG	= pkg-config
+# User-defined variables
-WARNFLAGS	= -Wall -Werror
-PNGFLAGS	!= ${PKG_CONFIG} --cflags libpng
-REALCFLAGS	= ${CFLAGS} ${WARNFLAGS} ${PNGFLAGS} -Iinclude -g \
-		-std=c99 -D_POSIX_C_SOURCE=200809L
 
+Q		:= @
+PREFIX		:= /usr/local
+bindir		:= ${PREFIX}/bin
+mandir		:= ${PREFIX}/man
+STRIP		:= -s
+BINMODE		:= 555
+MANMODE		:= 444
+
+# Other variables
+
+PKG_CONFIG	:= pkg-config
+PNGCFLAGS	:= `${PKG_CONFIG} --static --cflags libpng`
+PNGLDFLAGS	:= `${PKG_CONFIG} --static --libs-only-L libpng`
+PNGLDLIBS	:= `${PKG_CONFIG} --static --libs-only-l libpng`
+
+WARNFLAGS	:= -Wall -Werror
+CFLAGS		:= ${WARNFLAGS} -g -std=c99 -D_POSIX_C_SOURCE=200809L -Iinclude
+
+YFLAGS		:=
 LFLAGS		:= --nounistd
 
 YACC		:= yacc
-FLEX		:= flex
+LEX		:= flex
 RM		:= rm -rf
 
-# User-defined variables
+# Rules to build the RGBDS binaries
-PREFIX		= /usr/local
-bindir		= ${PREFIX}/bin
-mandir		= ${PREFIX}/man
-Q		= @
-STRIP		= -s
-BINMODE		= 555
-MANMODE		= 444
 
-rgbasm_obj = \
+all: rgbasm rgblink rgbfix rgbgfx
+
+rgbasm_obj := \
 	src/asm/asmy.o \
 	src/asm/charmap.o \
 	src/asm/fstack.o \
@@ -36,7 +46,10 @@ rgbasm_obj = \
 	src/extern/strlcpy.o \
 	src/extern/strlcat.o
 
-rgblink_obj = \
+src/asm/asmy.h: src/asm/asmy.c
+src/asm/locallex.o src/asm/globlex.o src/asm/lexer.o: src/asm/asmy.h
+
+rgblink_obj := \
 	src/link/assign.o \
 	src/link/lexer.o \
 	src/link/library.o \
@@ -50,17 +63,46 @@ rgblink_obj = \
 	src/link/symbol.o \
 	src/extern/err.o
 
-rgbfix_obj = \
+src/link/parser.h: src/link/parser.c
+src/link/lexer.o: src/link/parser.h
+
+rgbfix_obj := \
 	src/fix/main.o \
 	src/extern/err.o
 
-rgbgfx_obj = \
+rgbgfx_obj := \
 	src/gfx/gb.o \
 	src/gfx/main.o \
 	src/gfx/makepng.o \
 	src/extern/err.o
 
-all: rgbasm rgblink rgbfix rgbgfx
+rgbasm: ${rgbasm_obj}
+	$Q${CC} ${CFLAGS} -o $@ ${rgbasm_obj} -lm
+
+rgblink: ${rgblink_obj}
+	$Q${CC} ${CFLAGS} -o $@ ${rgblink_obj}
+
+rgbfix: ${rgbfix_obj}
+	$Q${CC} ${CFLAGS} -o $@ ${rgbfix_obj}
+
+rgbgfx: ${rgbgfx_obj}
+	$Q${CC} ${CFLAGS} ${PNGLDFLAGS} -o $@ ${rgbgfx_obj} ${PNGLDLIBS}
+
+# Rules to process files
+
+.y.c:
+	$Q${YACC} -d ${YFLAGS} -o $@ $<
+
+.l.o:
+	$Q${RM} $*.c
+	$Q${LEX} ${LFLAGS} -o $*.c $<
+	$Q${CC} ${CFLAGS} -c -o $@ $*.c
+	$Q${RM} $*.c
+
+.c.o:
+	$Q${CC} ${CFLAGS} ${PNGCFLAGS} -c -o $@ $<
+
+# Target used to remove all files generated by other Makefile targets.
 
 clean:
 	$Q${RM} rgbds.7.html gbz80.7.html rgbds.5.html
@@ -71,6 +113,8 @@ clean:
 	$Q${RM} src/asm/asmy.c src/asm/asmy.h
 	$Q${RM} src/link/lexer.c src/link/parser.c src/link/parser.h
 
+# Target used to install the binaries and man pages.
+
 install: all
 	$Qmkdir -p ${DESTDIR}${bindir}
 	$Qinstall ${STRIP} -m ${BINMODE} rgbasm ${DESTDIR}${bindir}/rgbasm
@@ -80,70 +124,18 @@ install: all
 	$Qmkdir -p ${DESTDIR}${mandir}/man1 ${DESTDIR}${mandir}/man5 ${DESTDIR}${mandir}/man7
 	$Qinstall -m ${MANMODE} src/rgbds.7 ${DESTDIR}${mandir}/man7/rgbds.7
 	$Qinstall -m ${MANMODE} src/gbz80.7 ${DESTDIR}${mandir}/man7/gbz80.7
-	$Qinstall -m ${MANMODE} src/rgbds.5 ${DESTDIR}${mandir}/man7/rgbds.5
+	$Qinstall -m ${MANMODE} src/rgbds.5 ${DESTDIR}${mandir}/man5/rgbds.5
 	$Qinstall -m ${MANMODE} src/asm/rgbasm.1 ${DESTDIR}${mandir}/man1/rgbasm.1
-	$Qinstall -m ${MANMODE} src/asm/rgbasm.5 ${DESTDIR}${mandir}/man1/rgbasm.5
+	$Qinstall -m ${MANMODE} src/asm/rgbasm.5 ${DESTDIR}${mandir}/man5/rgbasm.5
 	$Qinstall -m ${MANMODE} src/fix/rgbfix.1 ${DESTDIR}${mandir}/man1/rgbfix.1
 	$Qinstall -m ${MANMODE} src/link/rgblink.1 ${DESTDIR}${mandir}/man1/rgblink.1
 	$Qinstall -m ${MANMODE} src/link/rgblink.5 ${DESTDIR}${mandir}/man5/rgblink.5
 	$Qinstall -m ${MANMODE} src/gfx/rgbgfx.1 ${DESTDIR}${mandir}/man1/rgbgfx.1
 
-rgbasm: ${rgbasm_obj}
+# Target for the project maintainer to easily create web manuals.
-	$Q${CC} ${REALCFLAGS} -o $@ ${rgbasm_obj} -lm
-
-rgblink: ${rgblink_obj}
-	$Q${CC} ${REALCFLAGS} -o $@ ${rgblink_obj}
-
-rgbfix: ${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 $@ $<
-
-.l.o:
-	$Q${RM} $*.c
-	$Q${FLEX} ${LFLAGS} -o $*.c $<
-	$Q${CC} ${REALCFLAGS} -c -o $@ $*.c
-	$Q${RM} $*.c
-
-.c.o:
-	$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
-
-src/link/lexer.o : src/link/parser.h
-src/link/parser.h : src/link/parser.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${RM} win32 win64
-	$Qmkdir win32 win64
-	$Qenv make clean
-	$Qenv PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
-		make CC=i686-w64-mingw32-gcc YACC=bison WARNFLAGS= -j
-	$Qmv rgbasm win32/rgbasm.exe
-	$Qmv rgblink win32/rgblink.exe
-	$Qmv rgbfix win32/rgbfix.exe
-	$Qmv rgbgfx win32/rgbgfx.exe
-	$Qenv make clean
-	$Qenv PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
-		make CC=x86_64-w64-mingw32-gcc YACC=bison WARNFLAGS= -j
-	$Qmv rgbasm win64/rgbasm.exe
-	$Qmv rgblink win64/rgblink.exe
-	$Qmv rgbfix win64/rgbfix.exe
-	$Qmv rgbgfx win64/rgbgfx.exe
-	$Qenv make clean
-
-# Below is a target for the project maintainer to easily create web manuals.
 # It relies on mandoc: http://mdocml.bsd.lv
-MANDOC =	-Thtml -Ios=General -Oman=%N.%S.html -Ostyle=manual.css
+
+MANDOC	:= -Thtml -Ios=General -Oman=%N.%S.html -Ostyle=manual.css
 
 wwwman:
 	$Qmandoc ${MANDOC} src/rgbds.7 > rgbds.7.html
@@ -155,3 +147,24 @@ wwwman:
 	$Qmandoc ${MANDOC} src/link/rgblink.1 > rgblink.1.html
 	$Qmandoc ${MANDOC} src/link/rgblink.5 > rgblink.5.html
 	$Qmandoc ${MANDOC} src/gfx/rgbgfx.1 > rgbgfx.1.html
+
+# Targets for the project maintainer to easily create Windows exes.
+# This is not for Windows users!
+# If you're building on Windows with Cygwin or Mingw, just follow the Unix
+# install instructions instead.
+
+mingw32:
+	$Qenv PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
+		make CC=i686-w64-mingw32-gcc YACC=bison WARNFLAGS= -j
+	$Qmv rgbasm rgbasm.exe
+	$Qmv rgblink rgblink.exe
+	$Qmv rgbfix rgbfix.exe
+	$Qmv rgbgfx rgbgfx.exe
+
+mingw64:
+	$Qenv PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
+		make CC=x86_64-w64-mingw32-gcc YACC=bison WARNFLAGS= -j
+	$Qmv rgbasm rgbasm.exe
+	$Qmv rgblink rgblink.exe
+	$Qmv rgbfix rgbfix.exe
+	$Qmv rgbgfx rgbgfx.exe

README.md

@@ -110,7 +110,6 @@ 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
 ```
 

include/asm/localasm.h

@@ -80,8 +80,6 @@
 
  */
 
-#define MAXSECTIONSIZE	0x4000
-
 #define	NAME_DB			"db"
 #define	NAME_DW			"dw"
 #define	NAME_RB			"rb"

include/asm/main.h

@@ -26,8 +26,25 @@ extern void opt_Push(void);
 extern void opt_Pop(void);
 extern void opt_Parse(char *s);
 
+/*
+ * Used for errors that compromise the whole assembly process by affecting the
+ * folliwing code, potencially making the assembler generate errors caused by
+ * the first one and unrelated to the code that the assembler complains about.
+ * It is also used when the assembler goes into an invalid state (for example,
+ * when it fails to allocate memory).
+ */
 noreturn void fatalerror(const char *fmt, ...);
+/*
+ * Used for errors that make it impossible to assemble correctly, but don't
+ * affect the following code. The code will fail to assemble but the user will
+ * get a list of all errors at the end, making it easier to fix all of them at
+ * once.
+ */
 void yyerror(const char *fmt, ...);
+/*
+ * Used to warn the user about problems that don't prevent the generation of
+ * valid code.
+ */
 void warning(const char *fmt, ...);
 
 #define	YY_FATAL_ERROR fatalerror

src/asm/asmy.y

@@ -1351,7 +1351,7 @@ z80_ldio		:	T_Z80_LDIO T_MODE_A comma op_mem_ind
 						if( (!rpn_isReloc(&$4))
 						&&	($4.nVal<0 || ($4.nVal>0xFF && $4.nVal<0xFF00) || $4.nVal>0xFFFF) )
 						{
-							yyerror("Source address $%x not in HRAM ($FF00 to $FFFE)", $4.nVal);
+							yyerror("Source address $%x not in $FF00 to $FFFF", $4.nVal);
 						}
 
 						out_AbsByte(0xF0);
@@ -1365,7 +1365,7 @@ z80_ldio		:	T_Z80_LDIO T_MODE_A comma op_mem_ind
 						if( (!rpn_isReloc(&$2))
 						&&	($2.nVal<0 || ($2.nVal>0xFF && $2.nVal<0xFF00) || $2.nVal>0xFFFF) )
 						{
-							yyerror("Destination address $%x not in HRAM ($FF00 to $FFFE)", $2.nVal);
+							yyerror("Destination address $%x not in $FF00 to $FFFF", $2.nVal);
 						}
 
 						out_AbsByte(0xE0);
@@ -1385,7 +1385,10 @@ z80_ld			:	z80_ld_mem
 ;
 
 z80_ld_hl		:	T_Z80_LD T_MODE_HL comma '[' T_MODE_SP const_8bit ']'
-					{ out_AbsByte(0xF8); out_RelByte(&$6); }
+					{
+						out_AbsByte(0xF8); out_RelByte(&$6);
+						warning("'LD HL,[SP+e8]' is obsolete, use 'LD HL,SP+e8' instead.");
+					}
 				|	T_Z80_LD T_MODE_HL comma T_MODE_SP const_8bit
 					{ out_AbsByte(0xF8); out_RelByte(&$5); }
 				|	T_Z80_LD T_MODE_HL comma const_16bit

src/asm/fstack.c

@@ -36,6 +36,9 @@ ULONG nCurrentREPTBlockCount;
 
 ULONG ulMacroReturnValue;
 
+extern char *tzObjectname;
+extern FILE *dependfile;
+
 /*
  * defines for nCurrentStatus
  */
@@ -198,6 +201,9 @@ fstk_FindFile(char *fname)
 	FILE *f;
 
 	if ((f = fopen(fname, "rb")) != NULL || errno != ENOENT) {
+		if (dependfile) {
+			fprintf(dependfile, "%s: %s\n", tzObjectname, fname);
+		}
 		return f;
 	}
 
@@ -211,6 +217,9 @@ fstk_FindFile(char *fname)
 		}
 
 		if ((f = fopen(path, "rb")) != NULL || errno != ENOENT) {
+			if (dependfile) {
+				fprintf(dependfile, "%s: %s\n", tzObjectname, path);
+			}
 			return f;
 		}
 	}

src/asm/lexer.c

@@ -535,7 +535,7 @@ yylex_ReadBracketedSymbol(char *dest, size_t index)
 	if (*pLexBuffer == '}')
 		pLexBuffer++;
 	else
-		yyerror("Missing }");
+		fatalerror("Missing }");
 
 	return length;
 }
@@ -601,7 +601,7 @@ yylex_ReadQuotedString()
 	if (*pLexBuffer == '"')
 		pLexBuffer++;
 	else
-		yyerror("Unterminated string");
+		fatalerror("Unterminated string");
 }
 
 ULONG

src/asm/main.c

@@ -26,6 +26,9 @@ ULONG nTotalLines, nPass, nPC, nIFDepth, nErrors;
 
 extern int yydebug;
 
+FILE *dependfile;
+extern char *tzObjectname;
+
 /*
  * Option stack
  */
@@ -274,7 +277,7 @@ usage(void)
 {
 	printf(
 "Usage: rgbasm [-hvE] [-b chars] [-Dname[=value]] [-g chars] [-i path]\n"
-"              [-o outfile] [-p pad_value] file.asm\n");
+"              [-M dependfile] [-o outfile] [-p pad_value] file.asm\n");
 	exit(1);
 }
 
@@ -288,6 +291,8 @@ main(int argc, char *argv[])
 
 	char *tzMainfile;
 
+	dependfile = NULL;
+
 	cldefines_size = 32;
 	cldefines = reallocarray(cldefines, cldefines_size,
 	                        2 * sizeof(void *));
@@ -317,7 +322,7 @@ main(int argc, char *argv[])
 
 	newopt = CurrentOptions;
 
-	while ((ch = getopt(argc, argv, "b:D:g:hi:o:p:vEw")) != -1) {
+	while ((ch = getopt(argc, argv, "b:D:g:hi:M:o:p:vEw")) != -1) {
 		switch (ch) {
 		case 'b':
 			if (strlen(optarg) == 2) {
@@ -348,6 +353,11 @@ main(int argc, char *argv[])
 		case 'i':
 			fstk_AddIncludePath(optarg);
 			break;
+		case 'M':
+			if ((dependfile = fopen(optarg, "w")) == NULL) {
+				err(1, "Could not open dependfile %s", optarg);
+			}
+			break;
 		case 'o':
 			out_SetFileName(optarg);
 			break;
@@ -392,6 +402,13 @@ main(int argc, char *argv[])
 		printf("Assembling %s\n", tzMainfile);
 	}
 
+	if (dependfile) {
+		if (!tzObjectname)
+			errx(1, "Dependency files can only be created if an output object file is specified.\n");
+
+		fprintf(dependfile, "%s: %s\n", tzObjectname, tzMainfile);
+	}
+
 	nStartClock = clock();
 
 	nLineNo = 1;

src/asm/output.c

@@ -17,8 +17,6 @@
 #include "asm/fstack.h"
 #include "extern/err.h"
 
-#define SECTIONCHUNK	0x4000
-
 void out_SetCurrentSection(struct Section * pSect);
 
 struct Patch {
@@ -80,6 +78,24 @@ out_PopSection(void)
 		fatalerror("No entries in the section stack");
 }
 
+ULONG
+getmaxsectionsize(ULONG secttype, char * sectname)
+{
+	switch (secttype)
+	{
+		case SECT_ROM0:  return 0x8000; /* If ROMX sections not used. */
+		case SECT_ROMX:  return 0x4000;
+		case SECT_VRAM:  return 0x2000;
+		case SECT_SRAM:  return 0x2000;
+		case SECT_WRAM0: return 0x2000; /* If WRAMX sections not used. */
+		case SECT_WRAMX: return 0x1000;
+		case SECT_OAM:   return 0xA0;
+		case SECT_HRAM:  return 0x7F;
+		default: break;
+	}
+	errx(1, "Section \"%s\" has an invalid section type.", sectname);
+}
+
 /*
  * Count the number of symbols used in this object
  */
@@ -441,38 +457,36 @@ checksection(void)
  * this much initialized data
  */
 void
-checkcodesection(SLONG size)
+checkcodesection(void)
 {
 	checksection();
 	if (pCurrentSection->nType != SECT_ROM0 &&
 	    pCurrentSection->nType != SECT_ROMX) {
-		errx(1, "Section '%s' cannot contain code or data (not a "
+		fatalerror("Section '%s' cannot contain code or data (not ROM0 or ROMX)",
-		    "ROM0 or ROMX)", pCurrentSection->pzName);
+		     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");
+ * Check if the section has grown too much.
-		}
+ */
+void
+checksectionoverflow(ULONG delta_size)
+{
+	ULONG maxsize = getmaxsectionsize(pCurrentSection->nType,
+					  pCurrentSection->pzName);
+
+	if (pCurrentSection->nPC + delta_size > maxsize) {
+		/*
+		 * This check is here to trap broken code that generates
+		 * sections that are too big and to prevent the assembler from
+		 * generating huge object files or trying to allocate too much
+		 * memory.
+		 * The real check must be done at the linking stage.
+		 */
+		fatalerror("Section '%s' is too big (max size = 0x%X bytes).",
+			pCurrentSection->pzName, maxsize);
 	}
-	return;
 }
 
 /*
@@ -580,10 +594,15 @@ out_FindSection(char *pzName, ULONG secttype, SLONG org, SLONG bank, SLONG align
 			pSect->charmap = NULL;
 			pPatchSymbols = NULL;
 
-			if ((pSect->tData = malloc(SECTIONCHUNK)) != NULL) {
+			pSect->tData = NULL;
-				return (pSect);
+			if (secttype == SECT_ROM0 || secttype == SECT_ROMX) {
-			} else
+				/* It is only needed to allocate memory for ROM
-				fatalerror("Not enough memory for section");
+				 * sections. */
+				ULONG sectsize = getmaxsectionsize(secttype, pzName);
+				if ((pSect->tData = malloc(sectsize)) == NULL)
+					fatalerror("Not enough memory for section");
+			}
+			return (pSect);
 		} else
 			fatalerror("Not enough memory for sectionname");
 	} else
@@ -641,7 +660,8 @@ out_NewAlignedSection(char *pzName, ULONG secttype, SLONG alignment, SLONG bank)
 void
 out_AbsByte(int b)
 {
-	checkcodesection(1);
+	checkcodesection();
+	checksectionoverflow(1);
 	b &= 0xFF;
 	if (nPass == 2)
 		pCurrentSection->tData[nPC] = b;
@@ -654,7 +674,8 @@ out_AbsByte(int b)
 void
 out_AbsByteGroup(char *s, int length)
 {
-	checkcodesection(length);
+	checkcodesection();
+	checksectionoverflow(length);
 	while (length--)
 		out_AbsByte(*s++);
 }
@@ -666,13 +687,14 @@ void
 out_Skip(int skip)
 {
 	checksection();
+	checksectionoverflow(skip);
 	if (!((pCurrentSection->nType == SECT_ROM0)
 		|| (pCurrentSection->nType == SECT_ROMX))) {
 		pCurrentSection->nPC += skip;
 		nPC += skip;
 		pPCSymbol->nValue += skip;
 	} else {
-		checkcodesection(skip);
+		checkcodesection();
 		while (skip--)
 			out_AbsByte(CurrentOptions.fillchar);
 	}
@@ -684,7 +706,8 @@ out_Skip(int skip)
 void
 out_String(char *s)
 {
-	checkcodesection(strlen(s));
+	checkcodesection();
+	checksectionoverflow(strlen(s));
 	while (*s)
 		out_AbsByte(*s++);
 }
@@ -697,7 +720,8 @@ out_String(char *s)
 void
 out_RelByte(struct Expression * expr)
 {
-	checkcodesection(1);
+	checkcodesection();
+	checksectionoverflow(1);
 	if (rpn_isReloc(expr)) {
 		if (nPass == 2) {
 			pCurrentSection->tData[nPC] = 0;
@@ -718,7 +742,8 @@ out_RelByte(struct Expression * expr)
 void
 out_AbsWord(int b)
 {
-	checkcodesection(2);
+	checkcodesection();
+	checksectionoverflow(2);
 	b &= 0xFFFF;
 	if (nPass == 2) {
 		pCurrentSection->tData[nPC] = b & 0xFF;
@@ -738,7 +763,8 @@ out_RelWord(struct Expression * expr)
 {
 	ULONG b;
 
-	checkcodesection(2);
+	checkcodesection();
+	checksectionoverflow(2);
 	b = expr->nVal & 0xFFFF;
 	if (rpn_isReloc(expr)) {
 		if (nPass == 2) {
@@ -760,7 +786,8 @@ out_RelWord(struct Expression * expr)
 void
 out_AbsLong(SLONG b)
 {
-	checkcodesection(sizeof(SLONG));
+	checkcodesection();
+	checksectionoverflow(sizeof(SLONG));
 	if (nPass == 2) {
 		pCurrentSection->tData[nPC] = b & 0xFF;
 		pCurrentSection->tData[nPC + 1] = b >> 8;
@@ -781,7 +808,8 @@ out_RelLong(struct Expression * expr)
 {
 	SLONG b;
 
-	checkcodesection(4);
+	checkcodesection();
+	checksectionoverflow(4);
 	b = expr->nVal;
 	if (rpn_isReloc(expr)) {
 		if (nPass == 2) {
@@ -807,7 +835,8 @@ out_PCRelByte(struct Expression * expr)
 {
 	SLONG b = expr->nVal;
 
-	checkcodesection(1);
+	checkcodesection();
+	checksectionoverflow(1);
 	b = (b & 0xFFFF) - (nPC + 1);
 	if (nPass == 2 && (b < -128 || b > 127))
 		yyerror("PC-relative value must be 8-bit");
@@ -835,7 +864,8 @@ out_BinaryFile(char *s)
 	fsize = ftell(f);
 	fseek(f, 0, SEEK_SET);
 
-	checkcodesection(fsize);
+	checkcodesection();
+	checksectionoverflow(fsize);
 
 	if (nPass == 2) {
 		SLONG dest = nPC;
@@ -879,7 +909,8 @@ out_BinaryFileSlice(char *s, SLONG start_pos, SLONG length)
 
 	fseek(f, start_pos, SEEK_SET);
 
-	checkcodesection(length);
+	checkcodesection();
+	checksectionoverflow(length);
 
 	if (nPass == 2) {
 		SLONG dest = nPC;

src/asm/rgbasm.1

@@ -25,6 +25,7 @@
 .Op Fl D Ar name Ns Op = Ns Ar value
 .Op Fl g Ar chars
 .Op Fl i Ar path
+.Op Fl M Ar dependfile
 .Op Fl o Ar outfile
 .Op Fl p Ar pad_value
 .Ar file
@@ -61,6 +62,11 @@ The
 option disables this behavior.
 .It Fl i Ar path
 Add an include path.
+.It Fl M Ar dependfile
+Print
+.Xr make 1
+dependencies to
+.Ar dependfile .
 .It Fl o Ar outfile
 Write an object file to the given filename.
 .It Fl p Ar pad_value
@@ -88,10 +94,9 @@ and
 .Xr rgbds 5 ,
 .Xr rgbds 7 ,
 .Xr gbz80 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,
 and was later packaged in RGBDS by Justin Lloyd. It is now maintained by a
-number of contributors at https://github.com/rednex/rgbds.
+number of contributors at
+.Lk https://github.com/rednex/rgbds .

src/asm/rgbasm.5

@@ -340,6 +340,14 @@ String-symbols can also be used to define small one-line macros:
 Note that a colon (:) following the label-name is not allowed.
 String equates can't be exported or imported.
 .Pp
+.Sy Important note :
+An EQUS can be expanded to a string that contains another EQUS
+and it will be expanded as well.
+This means that, if you aren't careful, you may trap the assembler into an
+infinite loop if there's a circular dependency in the expansions.
+Also, a MACRO can have inside an EQUS which references the same MACRO, which has
+the same problem.
+.Pp
 .It Sy MACRO
 .Pp
 One of the best features of an assembler is the ability to write macros for it.
@@ -401,6 +409,14 @@ LoopyMacro: MACRO
             ENDM
 .Ed
 .Pp
+.Sy Important note :
+Since a MACRO can call itself (or a different MACRO that calls the first one)
+there can be problems of circular dependency.
+They trap the assembler in an infinite loop, so you have to be careful when
+using recursion with MACROs.
+Also, a MACRO can have inside an EQUS which references the same MACRO, which has
+the same problem.
+.Pp
 .Sy Macro Arguments
 .Pp
 I'd like LoopyMacro a lot better if I didn't have to pre-load the registers
@@ -521,6 +537,12 @@ The following symbols are defined by the assembler:
 .It Ic EQUS Ta Ic __TIME__ Ta Ta The current time
 .It Ic EQUS Ta Ic __ISO_8601_LOCAL__ Ta ISO 8601 timestamp (local)
 .It Ic EQUS Ta Ic __ISO_8601_UTC__ Ta ISO 8601 timestamp (UTC)
+.It Ic EQU Ta Ic __UTC_YEAR__ Ta Ta Today's year
+.It Ic EQU Ta Ic __UTC_MONTH__ Ta Ta Today's month number, 1-12
+.It Ic EQU Ta Ic __UTC_DAY__ Ta Ta Today's day of the month, 1-31
+.It Ic EQU Ta Ic __UTC_HOUR__ Ta Ta Current hour, 0-23
+.It Ic EQU Ta Ic __UTC_MINUTE__ Ta Ta Current minute, 0-59
+.It Ic EQU Ta Ic __UTC_SECOND__ Ta Ta Current second, 0-59
 .El
 .Pp
 .Sh DEFINING DATA
@@ -1005,4 +1027,4 @@ machine.
 was originally written by Carsten S\(/orensen as part of the ASMotor package,
 and was later packaged in RGBDS by Justin Lloyd.
 It is now maintained by a number of contributors at
-https://github.com/rednex/rgbds.
+.Lk https://github.com/rednex/rgbds .

src/asm/symbol.c

@@ -24,8 +24,29 @@ char SavedTIME[256];
 char SavedDATE[256];
 char SavedTIMESTAMP_ISO8601_LOCAL[256];
 char SavedTIMESTAMP_ISO8601_UTC[256];
+char SavedDAY[3];
+char SavedMONTH[3];
+char SavedYEAR[5];
+char SavedHOUR[3];
+char SavedMINUTE[3];
+char SavedSECOND[3];
 bool exportall;
 
+void helper_RemoveLeadingZeros(char * string){
+	char * new_beginning = string;
+
+	while(*new_beginning == '0')
+		new_beginning++;
+
+	if(new_beginning == string)
+		return;
+
+	if(*new_beginning == '\0')
+		new_beginning--;
+
+	memmove(string, new_beginning, strlen(new_beginning) + 1);
+}
+
 SLONG
 Callback_NARG(struct sSymbol * sym)
 {
@@ -800,6 +821,12 @@ sym_PrepPass2(void)
 	sym_AddString("__DATE__", SavedDATE);
 	sym_AddString("__ISO_8601_LOCAL__", SavedTIMESTAMP_ISO8601_LOCAL);
 	sym_AddString("__ISO_8601_UTC__", SavedTIMESTAMP_ISO8601_UTC);
+	sym_AddString("__UTC_DAY__", SavedDAY);
+	sym_AddString("__UTC_MONTH__", SavedMONTH);
+	sym_AddString("__UTC_YEAR__", SavedYEAR);
+	sym_AddString("__UTC_HOUR__", SavedHOUR);
+	sym_AddString("__UTC_MINUTE__", SavedMINUTE);
+	sym_AddString("__UTC_SECOND__", SavedSECOND);
 	sym_AddSet("_RS", 0);
 
 	sym_AddEqu("_NARG", 0);
@@ -845,6 +872,19 @@ sym_Init(void)
 		struct tm *time_utc = gmtime(&now);
 		strftime(SavedTIMESTAMP_ISO8601_UTC,
 			sizeof(SavedTIMESTAMP_ISO8601_UTC), "\"%FT%TZ\"", time_utc);
+
+		strftime(SavedDAY, sizeof(SavedDAY), "%d", time_utc);
+		strftime(SavedMONTH, sizeof(SavedMONTH), "%m", time_utc);
+		strftime(SavedYEAR, sizeof(SavedYEAR), "%Y", time_utc);
+		strftime(SavedHOUR, sizeof(SavedHOUR), "%H", time_utc);
+		strftime(SavedMINUTE, sizeof(SavedMINUTE), "%M", time_utc);
+		strftime(SavedSECOND, sizeof(SavedSECOND), "%S", time_utc);
+
+		helper_RemoveLeadingZeros(SavedDAY);
+		helper_RemoveLeadingZeros(SavedMONTH);
+		helper_RemoveLeadingZeros(SavedHOUR);
+		helper_RemoveLeadingZeros(SavedMINUTE);
+		helper_RemoveLeadingZeros(SavedSECOND);
 	} else {
 		warnx("Couldn't determine current time.");
 		/* The '?' have to be escaped or they will be treated as
@@ -853,12 +893,24 @@ sym_Init(void)
 		strcpy(SavedDATE, "\"\?\? \?\?\? \?\?\?\?\"");
 		strcpy(SavedTIMESTAMP_ISO8601_LOCAL, "\"\?\?\?\?-\?\?-\?\?T\?\?:\?\?:\?\?+\?\?\?\?\"");
 		strcpy(SavedTIMESTAMP_ISO8601_UTC, "\"\?\?\?\?-\?\?-\?\?T\?\?:\?\?:\?\?Z\"");
+		strcpy(SavedDAY, "1");
+		strcpy(SavedMONTH, "1");
+		strcpy(SavedYEAR, "1900");
+		strcpy(SavedHOUR, "0");
+		strcpy(SavedMINUTE, "0");
+		strcpy(SavedSECOND, "0");
 	}
 
 	sym_AddString("__TIME__", SavedTIME);
 	sym_AddString("__DATE__", SavedDATE);
 	sym_AddString("__ISO_8601_LOCAL__", SavedTIMESTAMP_ISO8601_LOCAL);
 	sym_AddString("__ISO_8601_UTC__", SavedTIMESTAMP_ISO8601_UTC);
+	sym_AddString("__UTC_DAY__", SavedDAY);
+	sym_AddString("__UTC_MONTH__", SavedMONTH);
+	sym_AddString("__UTC_YEAR__", SavedYEAR);
+	sym_AddString("__UTC_HOUR__", SavedHOUR);
+	sym_AddString("__UTC_MINUTE__", SavedMINUTE);
+	sym_AddString("__UTC_SECOND__", SavedSECOND);
 
 	pScope = NULL;
 

src/fix/rgbfix.1

@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 16, 2017
+.Dd April 17, 2017
 .Dt RGBFIX 1
 .Os RGBDS Manual
 .Sh NAME
@@ -153,4 +153,5 @@ SurvivalKids.gbc
 .Nm
 was originally released by Carsten S\(/orensen as a standalone program called
 gbfix, and was later packaged in RGBDS by Justin Lloyd. It is now maintained by
-a number of contributors at https://github.com/rednex/rgbds.
+a number of contributors at
+.Lk https://github.com/rednex/rgbds .

src/gbz80.7

@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 16, 2017
+.Dd April 17, 2017
 .Dt GBZ80 7
 .Os RGBDS Manual
 .Sh NAME
@@ -1821,4 +1821,4 @@ Flags: See
 was originally written by Carsten S\(/orensen as part of the ASMotor package,
 and was later packaged in RGBDS by Justin Lloyd.
 It is now maintained by a number of contributors at
-https://github.com/rednex/rgbds.
+.Lk https://github.com/rednex/rgbds .

src/gfx/rgbgfx.1

@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 8, 2017
+.Dd April 17, 2017
 .Dt RGBGFX 1
 .Os RGBDS Manual
 .Sh NAME
@@ -103,4 +103,4 @@ was created by
 .An stag019
 to be included in RGBDS.
 It is now maintained by a number of contributors at
-https://github.com/rednex/rgbds.
+.Lk https://github.com/rednex/rgbds .

src/link/object.c

@@ -160,15 +160,51 @@ obj_ReadRGBSection(FILE * f)
 		errx(1,  "ROMX sections can't be used with option -t.");
 	}
 	if ((options & OPT_CONTWRAM) && (pSection->Type == SECT_WRAMX)) {
-		errx(1, "WRAMX sections can't be used with option -w.");
+		errx(1, "WRAMX sections can't be used with options -w or -d.");
 	}
 	if (options & OPT_DMG_MODE) {
 		/* WRAMX sections are checked for OPT_CONTWRAM */
 		if (pSection->Type == SECT_VRAM && pSection->nBank == 1) {
-			errx(1, "VRAM bank 1 can't be used with option -w.");
+			errx(1, "VRAM bank 1 can't be used with option -d.");
 		}
 	}
 
+	unsigned int maxsize = 0;
+
+	/* Verify that the section isn't too big */
+	switch (pSection->Type)
+	{
+		case SECT_ROM0:
+			maxsize = (options & OPT_TINY) ? 0x8000 : 0x4000;
+			break;
+		case SECT_ROMX:
+			maxsize = 0x4000;
+			break;
+		case SECT_VRAM:
+		case SECT_SRAM:
+			maxsize = 0x2000;
+			break;
+		case SECT_WRAM0:
+			maxsize = (options & OPT_CONTWRAM) ? 0x2000 : 0x1000;
+			break;
+		case SECT_WRAMX:
+			maxsize = 0x1000;
+			break;
+		case SECT_OAM:
+			maxsize = 0xA0;
+			break;
+		case SECT_HRAM:
+			maxsize = 0x7F;
+			break;
+		default:
+			errx(1, "Section \"%s\" has an invalid section type.", pzName);
+			break;
+	}
+	if (pSection->nByteSize > maxsize) {
+		errx(1, "Section \"%s\" is bigger than the max size for that type: 0x%X > 0x%X",
+			pzName, pSection->nByteSize, maxsize);
+	}
+
 	if ((pSection->Type == SECT_ROMX) || (pSection->Type == SECT_ROM0)) {
 		/*
 		 * These sectiontypes contain data...
@@ -339,24 +375,3 @@ file_Length(FILE * f)
 
 	return (r);
 }
-
-void
-lib_ReadXLB0(FILE * f)
-{
-	SLONG size;
-
-	size = file_Length(f) - 4;
-	while (size) {
-		char *name;
-
-		size -= readasciiz(&name, f);
-		readword(f);
-		size -= 2;
-		readword(f);
-		size -= 2;
-		size -= readlong(f);
-		size -= 4;
-		obj_ReadOpenFile(f, name);
-		free(name);
-	}
-}

src/link/rgblink.1

@@ -119,4 +119,5 @@ to fix these so that the program will actually run in a Game Boy:
 .Nm
 was originally written by Carsten S\(/orensen as part of the ASMotor package,
 and was later packaged in RGBDS by Justin Lloyd. It is now maintained by a
-number of contributors at https://github.com/rednex/rgbds.
+number of contributors at
+.Lk https://github.com/rednex/rgbds .

src/link/rgblink.5

@@ -98,4 +98,5 @@ linkerscript. The address and alignment musn't be set.
 .Nm
 was originally written by Carsten S\(/orensen as part of the ASMotor package,
 and was later packaged in RGBDS by Justin Lloyd. It is now maintained by a
-number of contributors at https://github.com/rednex/rgbds.
+number of contributors at
+.Lk https://github.com/rednex/rgbds .

src/rgbds.5

@@ -187,4 +187,4 @@ Symbol ID follows.
 was originally written by Carsten S\(/orensen as part of the ASMotor package,
 and was later packaged in RGBDS by Justin Lloyd.
 It is now maintained by a number of contributors at
-https://github.com/rednex/rgbds.
+.Lk https://github.com/rednex/rgbds .

src/rgbds.7

@@ -47,5 +47,5 @@ implementation of rgbds.
 .It
 2017, Bentley's repository is moved to a neutral name.
 It is now maintained by a number of contributors at
-https://github.com/rednex/rgbds
+.Lk https://github.com/rednex/rgbds .
 .El

test/link/vram-fixed-dmg-mode-d.out

@@ -1 +1 @@
-error: VRAM bank 1 can't be used with option -w.
+error: VRAM bank 1 can't be used with option -d.

test/link/wramx-dmg-mode-d.out

@@ -1 +1 @@
-error: WRAMX sections can't be used with option -w.
+error: WRAMX sections can't be used with options -w or -d.