Cleaned up lexer

- separated the lexer into multiple functions so it is more readable - fixed issue with long label names in macro arguments - added error checking code to prevent buffer overflows
Remove __LINE__
2025-11-22 11:12:07 +00:00 · 2014-08-22 21:44:18 -07:00 · 2014-08-22 01:52:21 -07:00 · 2014-08-21 19:53:42 -07:00 · 2014-08-21 11:29:34 -06:00 · 2014-08-21 02:57:43 -07:00
36 changed files with 1418 additions and 1373 deletions
--- a/19
+++ b/19
@@ -13,7 +13,6 @@ yacc_pre := \
 	src/asm/gameboy/yaccprt4.y

 rgbasm_obj := \
-	src/asm/alloca.o \
 	src/asm/asmy.o \
 	src/asm/fstack.o \
 	src/asm/globlex.o \
@@ -45,18 +44,24 @@ rgbfix_obj := \
 all: rgbasm rgblib rgblink rgbfix

 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
+	${Q}rm -rf rgbds.html
+	${Q}rm -rf rgbasm rgbasm.exe ${rgbasm_obj} rgbasm.html
+	${Q}rm -rf rgblib rgblib.exe ${rgblib_obj} rgblib.html
+	${Q}rm -rf rgblink rgblink.exe ${rgblink_obj} rgblink.html
+	${Q}rm -rf rgbfix rgbfix.exe ${rgbfix_obj} rgbfix.html
+	${Q}rm -rf src/asm/asmy.c src/asm/asmy.h src/asm/asmy.y

 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/rgbds.7 ${MANPREFIX}/man7/rgbds.7 || \
+		(echo Installing manpages to ${MANPREFIX} failed. >&2 && \
+		 echo Check where your manpages are installed and set the \
+		      proper directory >&2 && \
+		 echo with, e.g., make install MANPREFIX=/usr/share/man \
+		 >&2 ; false)
 	${Q}install -m 444 src/asm/rgbasm.1 \
 		${MANPREFIX}/man1/rgbasm.1
 	${Q}install -m 444 src/fix/rgbfix.1 \
--- a/doc/asm.htm
+++ b/doc/asm.htm
@@ -42,7 +42,7 @@
 <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/ds.htm">Declaring variables in a RAM section</a>
 	<li><a href="asm/incbin.htm">Including binary files</a>
 </ul>

@@ -65,10 +65,7 @@
 	<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>
@@ -101,6 +98,8 @@
 	<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/section.htm">ROM0</a>
+	<li><a href="asm/section.htm">ROMX</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>
@@ -108,6 +107,7 @@
 	<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/section.htm">SRAM</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>
@@ -117,6 +117,8 @@
 	<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/section.htm">WRAM0</a>
+	<li><a href="asm/section.htm">WRAMX</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>
--- a/doc/asm/db.htm
+++ b/doc/asm/db.htm
@@ -10,13 +10,13 @@
 <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>
+<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 WRAM0/WRAMX/HRAM/VRAM/SRAM 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="ds.htm">Declaring variables in a RAM section</a>
 	<li><a href="miscfunc.htm">Other functions</a>
 </ul>

--- a/doc/asm/ds.htm
+++ b/doc/asm/ds.htm
@@ -7,7 +7,7 @@
 </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>
+<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">RAM 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>
--- a/doc/asm/section.htm
+++ b/doc/asm/section.htm
@@ -8,47 +8,54 @@
 <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>
+<pre>SECTION   "CoolStuff",ROMX</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>Possible section types are as follows:
+
+<dl>
+	<dt>ROM0</dt>
+	<dd>A ROM section. Mapped to memory at $0000–$3fff.</dd>
+
+	<dt>ROMX</dt>
+	<dd>A banked ROM section. Mapped to memory at $4000–$7fff. Valid banks range from 1 to 511.</dd>
+
+	<dt>VRAM</dt>
+	<dd>A banked video RAM section. Mapped to memory at $8000–$9fff. Can only allocate memory, not fill it. Valid banks range from 0 to 1.</dd>
+
+	<dt>SRAM</dt>
+	<dd>A banked external (save) RAM section. Mapped to memory at $a000–$bfff. Can only allocate memory, not fill it. Valid banks range from 0 to 3.</dd>
+
+	<dt>WRAM0</dt>
+	<dd>A general-purpose RAM section. Mapped to memory at $c000–$cfff. Can only allocate memory, not fill it.</dd>
+
+	<dt>WRAMX</dt>
+	<dd>A banked general-purpose RAM section. Mapped to memory at $d000–$dfff. Can only allocate memory, not fill it. Valid banks range from 1 to 7.</dd>
+
+	<dt>HRAM</dt>
+	<dd>A high RAM section. Mapped to memory at $ff80–$fffe. Can only allocate memory, not fill it. 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.</dd>
+</dl>
+
+<p>The following deprecated section names are aliases for some of the above sections:
+
+<dl>
+	<dt>HOME</dt>
+	<dd>Alias for ROM0.</dd>
+
+	<dt>CODE</dt>
+	<dt>DATA</dt>
+	<dd>Alias for ROMX.</dd>
+
+	<dt>BSS</dt>
+	<dd>Alias for WRAM0.</dd>
+</dl>
+
 <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>
+<pre>SECTION   "CoolStuff",ROM0[$1234]</pre>
+<p>This will force the section to address $1234. This also works with the other sectiontypes. For ROMX 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",ROMX[$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>
+<pre>SECTION   "CoolStuff",ROMX,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>
@@ -58,6 +65,6 @@
 <li><a href="pops.htm">POPS and PUSHS:</a> The section stack.
 </ul>
 <hr>
-<p>Last updated <EFBFBD>18 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
+<p>Last updated 18 July 1997 by <a href="mailto:surfsmurf@matilde.demon.co.uk">Carsten Sorensen</a></p>
 </body>
 </html>
--- a/doc/link.htm
+++ b/doc/link.htm
@@ -104,27 +104,14 @@
 <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><a href="asm.htm#sections">Sections</a> created with <b>ROM0</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>ROMX</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>Small mode forces all <b>ROMX</b> sections to be of type <b>ROM0</b> and increases the <b>ROM0</b> section size from 16kB to 32kB. This also means that <b>ROM0/ROMX</b> sections are written to the final image in the order you have specified on the command line.
 <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>
--- a/doc/rgb0.htm
+++ b/doc/rgb0.htm
@@ -50,10 +50,10 @@
      
    REPT NumberOfSections
        LONG    Size                   ;Size in bytes of this section
-        BYTE    Type                   ;0 = BSS
+        BYTE    Type                   ;0 = WRAM0
                                       ;1 = VRAM
-                                       ;2 = CODE
-                                       ;3 = HOME
+                                       ;2 = ROMX
+                                       ;3 = ROM0
                                       ;4 = HRAM
        LONG    Org                    ;Only present in RGB1. Address to fix this
                                       ;section at. -1 if the linker should
@@ -61,8 +61,8 @@
        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
+                                       ;only valid for ROMX sections.
+        IF      Type==ROMX || Type==ROM0
            BYTE Data[Size]
            LONG NumberOfPatches
               
--- a/include/asm/lexer.h
+++ b/include/asm/lexer.h
@@ -5,7 +5,8 @@

 #include "asm/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;
--- a/include/asm/main.h
+++ b/include/asm/main.h
@@ -1,10 +1,13 @@
 #ifndef	ASMOTOR_MAIN_H
 #define	ASMOTOR_MAIN_H

+#include <stdbool.h>
+
 struct sOptions {
 	char gbgfx[4];
 	char binary[2];
 	SLONG fillchar;
+	bool verbose;
 	    //-1 == random
 };

@@ -19,10 +22,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];
+void fatalerror(const char *fmt, ...);
+void yyerror(const char *fmt, ...);

 #define	YY_FATAL_ERROR fatalerror

--- a/include/asm/mylink.h
+++ b/include/asm/mylink.h
@@ -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 {
--- a/include/asm/symbol.h
+++ b/include/asm/symbol.h
@@ -3,7 +3,7 @@

 #include "asm/types.h"

-#define HASHSIZE 73
+#define HASHSIZE (1 << 16)
 #define MAXSYMLEN 256

 struct sSymbol {
@@ -35,6 +35,7 @@ struct sSymbol {
 #define SYMF_CONST		0x200	/* symbol has a constant value, will
 					 * not be changed during linking */

+ULONG calchash(char *s);
 void sym_PrepPass1(void);
 void sym_PrepPass2(void);
 void sym_AddLocalReloc(char *tzSym);
--- a/include/asm/types.h
+++ b/include/asm/types.h
@@ -1,9 +1,7 @@
 #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;
--- a/include/lib/types.h
+++ b/include/lib/types.h
@@ -1,9 +1,7 @@
 #ifndef ASMOTOR_LIB_TYPES_H
 #define ASMOTOR_LIB_TYPES_H

-#if	defined(AMIGA) || defined(__GNUC__)
 #define	_MAX_PATH	512
-#endif

 typedef unsigned char UBYTE;
 typedef signed char SBYTE;
--- a/include/link/assign.h
+++ b/include/link/assign.h
@@ -4,12 +4,14 @@
 #include "link/types.h"

 enum eBankDefine {
-	BANK_HOME = 0,
-	BANK_BSS = 256,
-	BANK_VRAM,
-	BANK_HRAM
+	BANK_ROM0 = 0,
+	BANK_WRAM0 = 512,
+	BANK_WRAMX,
+	BANK_VRAM = 520,
+	BANK_HRAM = 522,
+	BANK_SRAM = 523
 };
-#define MAXBANKS	259
+#define MAXBANKS	527

 extern SLONG area_Avail(SLONG bank);
 extern void AssignSections(void);
--- a/include/link/mylink.h
+++ b/include/link/mylink.h
@@ -1,9 +1,7 @@
 #ifndef ASMOTOR_LINK_LINK_H
 #define ASMOTOR_LINK_LINK_H

-#if defined(AMIGA) || defined(__GNUC__)
 #define _MAX_PATH	512
-#endif

 #include "link/types.h"

@@ -51,11 +49,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 {
--- a/include/link/types.h
+++ b/include/link/types.h
@@ -1,9 +1,7 @@
 #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;
--- a/src/asm/alloca.c
+++ b/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 */
--- a/src/asm/fstack.c
+++ b/src/asm/fstack.c
@@ -163,7 +163,7 @@ yywrap(void)
 /*
 * RGBAsm - FSTACK.C (FileStack routines)
 *
- * Dump the context stack to stdout
+ * Dump the context stack to stderr
 *
 */

@@ -175,11 +175,12 @@ 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)
@@ -326,7 +327,7 @@ 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)
--- a/src/asm/gameboy/yaccprt2.y
+++ b/src/asm/gameboy/yaccprt2.y
@@ -1,4 +1,4 @@
-%token	T_SECT_BSS T_SECT_VRAM T_SECT_CODE T_SECT_HOME T_SECT_HRAM
+%token	T_SECT_WRAM0 T_SECT_VRAM T_SECT_ROMX T_SECT_ROM0 T_SECT_HRAM T_SECT_WRAMX T_SECT_SRAM

 %token	T_Z80_ADC T_Z80_ADD T_Z80_AND
 %token	T_Z80_BIT
--- a/src/asm/gameboy/yaccprt4.y
+++ b/src/asm/gameboy/yaccprt4.y
@@ -1,48 +1,98 @@
-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" );
+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 $%x not 16-bit", $6);
+		}
+	|	T_POP_SECTION string ',' sectiontype ',' T_OP_BANK '[' const ']'
+		{
+			if( $4==SECT_ROMX ) {
+				if( $8>=1 && $8<=0x1ff )
+					out_NewAbsSection($2,$4,-1,$8);
+				else
+					yyerror("ROM bank value $%x out of range (1 to $1ff)", $8);
+			} else if ($4 == SECT_SRAM) {
+				if ($8 >= 0 && $8 <= 3) {
+					out_NewAbsSection($2, $4, -1, $8);
+				} else {
+					yyerror("SRAM bank value $%x out of range (0 to 3)", $8);
+				}
+			} else if ($4 == SECT_WRAMX) {
+				if ($8 >= 1 && $8 <= 7) {
+					out_NewAbsSection($2, $4, -1, $8);
+				} else {
+					yyerror("WRAMX bank value $%x out of range (1 to 7)", $8);
+				}
+			} else if ($4 == SECT_VRAM) {
+				if ($8 >= 0 && $8 <= 1) {
+					out_NewAbsSection($2, $4, -1, $8);
+				} else {
+					yyerror("VRAM bank value $%x out of range (0 to 1)", $8);
+				}
+			} else {
+				yyerror("BANK only allowed for ROMX, WRAMX, SRAM, or VRAM sections");
+			}
+		}
+	|	T_POP_SECTION string ',' sectiontype '[' const ']' ',' T_OP_BANK '[' const ']'
+		{
+			if( $4==SECT_ROMX ) {
+				if( $6>=0 && $6<0x10000 ) {
+					if( $11>=1 && $11<=0x1ff )
+						out_NewAbsSection($2,$4,$6,$11);
+					else
+						yyerror("ROM bank value $%x out of range (1 to $1ff)", $11);
+				} else
+					yyerror("Address $%x not 16-bit", $6);
+			} else if ($4 == SECT_SRAM) {
+				if ($6 >= 0 && $6 < 0x10000) {
+					if ($11 >= 0 && $11 <= 3) {
+						out_NewAbsSection($2, $4, $6, $11);
+					} else {
+						yyerror("SRAM bank value $%x out of range (0 to 3)", $11);
 					}
-				|	T_POP_SECTION string ',' sectiontype ',' T_OP_BANK '[' const ']'
-					{
-						if( $4==SECT_CODE )
-						{
-							if( $8>=1 && $8<=255 )
-								out_NewAbsSection($2,$4,-1,$8);
-							else
-								yyerror( "BANK value out of range" );
-						}
-						else
-							yyerror( "BANK only allowed for CODE/DATA" );
+				} else {
+					yyerror("Address $%x not 16-bit", $6);
+				}
+			} else if ($4 == SECT_WRAMX) {
+				if ($6 >= 0 && $6 < 0x10000) {
+					if ($11 >= 1 && $11 <= 7) {
+						out_NewAbsSection($2, $4, $6, $11);
+					} else {
+						yyerror("WRAMX bank value $%x out of range (1 to 7)", $11);
 					}
-				|	T_POP_SECTION string ',' sectiontype '[' const ']' ',' T_OP_BANK '[' const ']'
-					{
-						if( $4==SECT_CODE )
-						{
-							if( $6>=0 && $6<0x10000 )
-							{
-								if( $11>=1 && $11<=255 )
-									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" );
+				} else {
+					yyerror("Address $%x not 16-bit", $6);
+				}
+			} else if ($4 == SECT_VRAM) {
+				if ($6 >= 0 && $6 < 0x10000) {
+					if ($11 >= 0 && $11 <= 1) {
+						out_NewAbsSection($2,$4,$6,$11);
+					} else {
+						yyerror("VRAM bank value $%x out of range (0 to 1)", $11);
 					}
+				} else {
+					yyerror("Address $%x not 16-bit", $6);
+				}
+			} else {
+				yyerror("BANK only allowed for ROMX, WRAMX, SRAM, or VRAM sections");
+			}
+		}
 ;

-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; }
+sectiontype:
+		T_SECT_WRAM0	{ $$=SECT_WRAM0; }
+	|	T_SECT_VRAM	{ $$=SECT_VRAM; }
+	|	T_SECT_ROMX	{ $$=SECT_ROMX; }
+	|	T_SECT_ROM0	{ $$=SECT_ROM0; }
+	|	T_SECT_HRAM	{ $$=SECT_HRAM; }
+	|	T_SECT_WRAMX	{ $$=SECT_WRAMX; }
+	|	T_SECT_SRAM	{ $$=SECT_SRAM; }
 ;


@@ -155,8 +205,13 @@ z80_ex			:	T_Z80_EX T_MODE_HL comma T_MODE_SP_IND
 					{ out_AbsByte(0xE3); }
 ;

-z80_halt		:	T_Z80_HALT
-					{ out_AbsByte(0x76); out_AbsByte(0x00); }
+z80_halt: T_Z80_HALT
+		{
+			out_AbsByte(0x76);
+			if (haltnop) {
+				out_AbsByte(0x00);
+			}
+		}
 ;

 z80_inc			:	T_Z80_INC reg_r
@@ -171,6 +226,8 @@ z80_jp			:	T_Z80_JP const_16bit
 					{ out_AbsByte(0xC2|($2<<3)); out_RelWord(&$4); }
 				|	T_Z80_JP T_MODE_HL_IND
 					{ out_AbsByte(0xE9); }
+				|	T_Z80_JP T_MODE_HL
+					{ out_AbsByte(0xE9); }
 ;

 z80_jr			:	T_Z80_JR const_PCrel
@@ -198,7 +255,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 must be in the IO/HRAM area" );
+							yyerror("Source address $%x not in HRAM ($FF00 to $FFFE)", $4.nVal);
 						}

 						out_AbsByte(0xF0);
@@ -212,7 +269,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 must be in the IO/HRAM area" );
+							yyerror("Destination address $%x not in HRAM ($FF00 to $FFFE)", $2.nVal);
 						}

 						out_AbsByte(0xE0);
@@ -233,6 +290,8 @@ 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); }
+				|	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
 					{ out_AbsByte(0x01|(REG_HL<<4)); out_RelWord(&$4); }
 ;
@@ -273,7 +332,7 @@ z80_ld_r		:	T_Z80_LD reg_r comma const_8bit
 					{
 						if( ($2==REG_HL_IND) && ($4==REG_HL_IND) )
 						{
-							yyerror( "LD (HL),(HL) not allowed" );
+							yyerror("LD [HL],[HL] not a valid instruction");
 						}
 						else
 							out_AbsByte(0x40|($2<<3)|$4);
@@ -286,7 +345,7 @@ z80_ld_a		:	T_Z80_LD reg_r comma T_MODE_C_IND
 							out_AbsByte(0xF2);
 						else
 						{
-							yyerror( "Destination operand must be A" );
+							yyerror("Destination operand must be A");
 						}
 					}
 				|	T_Z80_LD reg_r comma reg_rr
@@ -295,7 +354,7 @@ z80_ld_a		:	T_Z80_LD reg_r comma T_MODE_C_IND
 							out_AbsByte(0x0A|($4<<4));
 						else
 						{
-							yyerror( "Destination operand must be A" );
+							yyerror("Destination operand must be A");
 						}
 					}
 				|	T_Z80_LD reg_r comma op_mem_ind
@@ -315,7 +374,7 @@ z80_ld_a		:	T_Z80_LD reg_r comma T_MODE_C_IND
 						}
 						else
 						{
-							yyerror( "Destination operand must be A" );
+							yyerror("Destination operand must be A");
 						}
 					}
 ;
@@ -392,11 +451,11 @@ z80_rst 		:	T_Z80_RST const_8bit
 					{
 						if( rpn_isReloc(&$2) )
 						{
-							yyerror( "Address for RST must be absolute" );
+							yyerror("Address for RST must be absolute");
 						}
 						else if( ($2.nVal&0x38)!=$2.nVal )
 						{
-							yyerror( "Invalid address for RST" );
+							yyerror("Invalid address $%x for RST", $2.nVal);
 						}
 						else
 							out_AbsByte(0xC7|$2.nVal);
--- a/src/asm/globlex.c
+++ b/src/asm/globlex.c
@@ -316,12 +316,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},
--- a/src/asm/lexer.c
+++ b/src/asm/lexer.c
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -7,6 +7,8 @@

 #include <math.h>
 #include <getopt.h>
+#include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,11 +23,6 @@
 int yyparse(void);
 void setuplex(void);

-#ifdef AMIGA
-__near long __stack = 65536L;
-
-#endif
-
 /*
 * RGBAsm - MAIN.C
 *
@@ -33,14 +30,14 @@ __near long __stack = 65536L;
 *
 */

+bool haltnop;
+
 clock_t nStartClock, nEndClock;
 SLONG nLineNo;
 ULONG nTotalLines, nPass, nPC, nIFDepth, nErrors;

 extern int yydebug;

-char temptext[1024];
-
 /*
 * RGBAsm - MAIN.C
 *
@@ -209,19 +206,33 @@ opt_Pop(void)
 *
 */

-void 
-yyerror(char *s)
+void
+verror(const char *fmt, va_list args)
 {
-	printf("*ERROR*\t");
+	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);
+	va_list args;
+	va_start(args, fmt);
+	verror(fmt, args);
+	va_end(args);
+}
+
+void 
+fatalerror(const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	verror(fmt, args);
+	va_end(args);
 	exit(5);
 }
 /*
@@ -236,7 +247,8 @@ PrintUsage(void)
 {
 	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");
+	printf("Usage: rgbasm [-v] [-h] [-b chars] [-g chars] [-i path] [-o outfile] [-p pad_value]\n"
+	    "              file\n");
 	exit(1);
 }
 /*
@@ -256,6 +268,8 @@ main(int argc, char *argv[])

 	char *tzMainfile;

+	haltnop = true;
+
 	if (argc == 1)
 		PrintUsage();

@@ -268,12 +282,13 @@ main(int argc, char *argv[])
 	DefaultOptions.binary[0] = '0';
 	DefaultOptions.binary[1] = '1';
 	DefaultOptions.fillchar = 0;
+	DefaultOptions.verbose = false;

 	opt_SetCurrentOptions(&DefaultOptions);

 	newopt = CurrentOptions;

-	while ((ch = getopt(argc, argv, "b:g:i:o:p:")) != -1) {
+	while ((ch = getopt(argc, argv, "b:g:hi:o:p:v")) != -1) {
 		switch (ch) {
 		case 'b':
 			if (strlen(optarg) == 2) {
@@ -284,6 +299,7 @@ main(int argc, char *argv[])
 				    "2 characters for option 'b'\n");
 				exit(1);
 			}
+			break;
 		case 'g':
 			if (strlen(optarg) == 4) {
 				newopt.gbgfx[0] = optarg[1];
@@ -296,6 +312,9 @@ main(int argc, char *argv[])
 				exit(1);
 			}
 			break;
+		case 'h':
+			haltnop = false;
+			break;
 		case 'i':
 			fstk_AddIncludePath(optarg);
 			break;
@@ -315,6 +334,9 @@ main(int argc, char *argv[])
 				exit(1);
 			}
 			break;
+		case 'v':
+			newopt.verbose = true;
+			break;
 		default:
 			PrintUsage();
 		}
@@ -331,7 +353,9 @@ main(int argc, char *argv[])

 	setuplex();

-	printf("Assembling %s\n", tzMainfile);
+	if (CurrentOptions.verbose) {
+		printf("Assembling %s\n", tzMainfile);
+	}

 	nStartClock = clock();

@@ -343,7 +367,9 @@ main(int argc, char *argv[])
 	nErrors = 0;
 	sym_PrepPass1();
 	if (fstk_Init(tzMainfile)) {
-		printf("Pass 1...\n");
+		if (CurrentOptions.verbose) {
+			printf("Pass 1...\n");
+		}

 		yy_set_state(LEX_STATE_NORMAL);
 		opt_SetCurrentOptions(&DefaultOptions);
@@ -362,7 +388,9 @@ main(int argc, char *argv[])
 				yy_set_state(LEX_STATE_NORMAL);
 				opt_SetCurrentOptions(&DefaultOptions);

-				printf("Pass 2...\n");
+				if (CurrentOptions.verbose) {
+					printf("Pass 2...\n");
+				}

 				if (yyparse() == 0 && nErrors == 0) {
 					double timespent;
@@ -371,17 +399,19 @@ main(int argc, char *argv[])
 					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)
+					if (CurrentOptions.verbose) {
 						printf
-						    ("(INFINITY lines/minute)\n");
-					else
-						printf("(%d lines/minute)\n",
-						    (int) (60 / timespent *
-							nTotalLines));
+						    ("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
--- a/src/asm/output.c
+++ b/src/asm/output.c
@@ -5,6 +5,7 @@
 *
 */

+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,6 +43,7 @@ struct PatchSymbol {
 	ULONG ID;
 	struct sSymbol *pSymbol;
 	struct PatchSymbol *pNext;
+	struct PatchSymbol *pBucketNext; // next symbol in hash table bucket
 };

 struct SectionStackEntry {
@@ -55,8 +57,10 @@ struct SectionStackEntry {
 *
 */

+struct PatchSymbol *tHashedPatchSymbols[HASHSIZE];
 struct Section *pSectionList = NULL, *pCurrentSection = NULL;
 struct PatchSymbol *pPatchSymbols = NULL;
+struct PatchSymbol **ppPatchSymbolsTail = &pPatchSymbols;
 char tzObjectname[_MAX_PATH];
 struct SectionStackEntry *pSectionStack = NULL;

@@ -251,8 +255,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);
@@ -326,30 +330,32 @@ 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) {
 		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);
+	*ppPatchSymbolsTail = pPSym;
+	ppPatchSymbolsTail = &(pPSym->pNext);
+
+	return pPSym->ID;
 }
 /*
 * RGBAsm - OUTPUT.C - Outputs an objectfile
@@ -384,24 +390,18 @@ addexports(void)
 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 =
+	if ((pPatch =
 		(struct Patch *) malloc(sizeof(struct Patch))) != NULL) {
-		pPatch->pNext = NULL;
+		pPatch->pNext = pCurrentSection->pPatches;
 		pPatch->nRPNSize = 0;
 		pPatch->pRPN = NULL;
 	} else
 		fatalerror("No memory for patch");

+	pCurrentSection->pPatches = pPatch;
+
 	return (pPatch);
 }
 /*
@@ -503,13 +503,13 @@ void
 checkcodesection(SLONG size)
 {
 	checksection();
-	if ((pCurrentSection->nType == SECT_HOME
-		|| pCurrentSection->nType == SECT_CODE)
+	if ((pCurrentSection->nType == SECT_ROM0
+		|| pCurrentSection->nType == SECT_ROMX)
 	    && (pCurrentSection->nPC + size <= MAXSECTIONSIZE)) {
 		if (((pCurrentSection->nPC % SECTIONCHUNK) >
 			((pCurrentSection->nPC + size) % SECTIONCHUNK))
-		    && (pCurrentSection->nType == SECT_HOME
-			|| pCurrentSection->nType == SECT_CODE)) {
+		    && (pCurrentSection->nType == SECT_ROM0
+			|| pCurrentSection->nType == SECT_ROMX)) {
 			if ((pCurrentSection->tData =
 				(UBYTE *) realloc(pCurrentSection->tData,
 				    ((pCurrentSection->nPC +
@@ -593,7 +593,9 @@ void
 out_SetFileName(char *s)
 {
 	strcpy(tzObjectname, s);
-	printf("Output filename %s\n", s);
+	if (CurrentOptions.verbose) {
+		printf("Output filename %s\n", s);
+	}
 	pSectionList = NULL;
 	pCurrentSection = NULL;
 	pPatchSymbols = NULL;
@@ -724,8 +726,8 @@ 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;
@@ -928,7 +930,7 @@ out_BinaryFile(char *s)
 		pPCSymbol->nValue += fsize;
 		fclose(f);
 	} else
-		fatalerror("File not found");
+		fatalerror("Could not open file '%s': %s", s, strerror(errno));
 }

 void 
@@ -973,5 +975,5 @@ out_BinaryFileSlice(char *s, SLONG start_pos, SLONG length)

 		fclose(f);
 	} else
-		fatalerror("File not found");
+		fatalerror("Could not open file '%s': %s", s, strerror(errno));
 }
--- a/src/asm/rgbasm.1
+++ b/src/asm/rgbasm.1
@@ -6,6 +6,8 @@
 .Nd Game Boy assembler
 .Sh SYNOPSIS
 .Nm rgbasm
+.Op Fl v
+.Op Fl h
 .Op Fl b Ar chars
 .Op Fl g Ar chars
 .Op Fl i Ar path
@@ -24,6 +26,17 @@ The defaults are 01.
 .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,6 +44,8 @@ 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:
--- a/src/asm/rpn.c
+++ b/src/asm/rpn.c
@@ -155,8 +155,7 @@ rpn_Bank(struct Expression * expr, char *tzSym)

 		psym = sym_FindSymbol(tzSym);
 		if (nPass == 2 && psym == NULL) {
-			sprintf(temptext, "'%s' not defined", tzSym);
-			yyerror(temptext);
+			yyerror("'%s' not defined", tzSym);
 		}
 		expr->isReloc = 1;
 		pushbyte(expr, RPN_BANK);
--- a/src/asm/symbol.c
+++ b/src/asm/symbol.c
@@ -26,7 +26,6 @@ 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];
@@ -44,12 +43,6 @@ Callback_NARG(struct sSymbol * sym)
 	return (i);
 }

-SLONG 
-Callback__LINE__(struct sSymbol * sym)
-{
-	sym = sym;
-	return (nLineNo);
-}
 /*
 * RGBAsm - SYMBOL.C - Symboltable stuff
 *
@@ -75,10 +68,10 @@ getvaluefield(struct sSymbol * sym)
 ULONG 
 calchash(char *s)
 {
-	ULONG hash = 0;
+	ULONG hash = 5381;

 	while (*s != 0)
-		hash += (*s++);
+		hash = (hash * 33) ^ (*s++);

 	return (hash % HASHSIZE);
 }
@@ -217,8 +210,7 @@ sym_Purge(char *tzName)

 		free(pSym);
 	} else {
-		sprintf(temptext, "'%s' not defined", tzName);
-		yyerror(temptext);
+		yyerror("'%s' not defined", tzName);
 	}
 }
 /*
@@ -245,10 +237,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);
@@ -309,8 +299,7 @@ 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);
@@ -339,8 +328,7 @@ 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);
@@ -365,27 +353,23 @@ 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);
 		}
 	}

@@ -411,18 +395,14 @@ 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);
@@ -558,9 +538,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);
@@ -586,8 +564,7 @@ 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);
@@ -661,9 +638,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);
@@ -696,9 +671,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);
@@ -739,8 +712,7 @@ sym_Export(char *tzSym)
 			if (nsym->nType & SYMF_DEFINED)
 				return;
 		}
-		sprintf(temptext, "'%s' not defined", tzSym);
-		yyerror(temptext);
+		yyerror("'%s' not defined", tzSym);
 	}

 }
@@ -759,8 +731,7 @@ 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;
@@ -811,9 +782,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);
@@ -872,6 +841,10 @@ sym_PrepPass2(void)
 	sym_AddString("__TIME__", SavedTIME);
 	sym_AddString("__DATE__", SavedDATE);
 	sym_AddSet("_RS", 0);
+
+	sym_AddEqu("_NARG", 0);
+	p_NARGSymbol = findsymbol("_NARG", NULL);
+	p_NARGSymbol->Callback = Callback_NARG;
 }
 /*
 * RGBAsm - SYMBOL.C - Symboltable stuff
@@ -899,9 +872,6 @@ 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);
--- a/src/asm/yaccprt1.y
+++ b/src/asm/yaccprt1.y
@@ -1,6 +1,7 @@
 %{
 #include <ctype.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,17 +16,43 @@
 #include "asm/main.h"
 #include "asm/lexer.h"

+extern bool haltnop;
+
 char	*tzNewMacro;
 ULONG	ulNewMacroSize;

-ULONG	symvaluetostring( char *dest, char *sym )
+size_t symvaluetostring(char *dest, size_t maxLength, char *sym)
 {
-	if( sym_isString(sym) )
-		strcpy( dest, sym_GetStringValue(sym) );
-	else
-		sprintf( dest, "$%lX", sym_GetConstantValue(sym) );
+	size_t length;

-	return( strlen(dest) );
+	if (sym_isString(sym)) {
+		char *src = sym_GetStringValue(sym);
+		size_t i;
+
+		for (i = 0; src[i] != 0; i++) {
+			if (i >= maxLength) {
+				fatalerror("Symbol value too long to fit buffer");
+			}
+			dest[i] = src[i];
+		}
+
+		length = i;
+	} else {
+		ULONG value = sym_GetConstantValue(sym);
+		int fullLength = snprintf(dest, maxLength + 1, "$%lX", value);
+
+		if (fullLength < 0) {
+			fatalerror("snprintf encoding error");
+		} else {
+			length = (size_t)fullLength;
+
+			if (length > maxLength) {
+				fatalerror("Symbol value too long to fit buffer");
+			}
+		}
+	}
+
+	return length;
 }

 ULONG	str2int( char *s )
@@ -328,36 +355,12 @@ void	if_skip_to_endc( void )
 	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];
+    char tzSym[MAXSYMLEN + 1];
+    char tzString[MAXSTRLEN + 1];
    struct Expression sVal;
    SLONG nConstValue;
 }
--- a/src/asm/yaccprt3.y
+++ b/src/asm/yaccprt3.y
@@ -47,8 +47,7 @@ macro			:	T_ID

 						if( !fstk_RunMacro($1) )
 						{
-							fprintf(stderr, "Macro '%s' not defined", $1);
-							yyerror( "No such macro" );
+							yyerror("Macro '%s' not defined", $1);
 						}
 					}
 ;
@@ -138,11 +137,11 @@ pushs			:	T_POP_PUSHS
 ;

 fail			:	T_POP_FAIL string
-					{ fatalerror($2); }
+					{ fatalerror("%s", $2); }
 ;

 warn			:	T_POP_WARN string
-					{ yyerror($2); }
+					{ yyerror("%s", $2); }
 ;

 shift			:	T_POP_SHIFT
@@ -268,8 +267,7 @@ 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" );
+							yyerror("Could not open file '%s' : %s\n", $2, strerror(errno));
 						}
 					}
 ;
@@ -328,7 +326,7 @@ const_3bit		:	const
 					{
 						if( ($1<0) || ($1>7) )
 						{
-							yyerror( "Immediate value must be 3-bit" );
+							yyerror("Immediate value must be 3-bit");
 						}
 						else
 							$$=$1&0x7;
@@ -366,7 +364,7 @@ const_PCrel		:	relocconst
 					{
 						$$ = $1;
 						if( !rpn_isPCRelative(&$1) )
-							yyerror( "Expression must be PC-relative" );
+							yyerror("Expression must be PC-relative");
 					}
 ;

@@ -374,7 +372,7 @@ const_8bit		:	relocconst
 					{
 						if( (!rpn_isReloc(&$1)) && (($1.nVal<-128) || ($1.nVal>255)) )
 						{
-							yyerror( "Expression must be 8-bit" );
+							yyerror("Expression must be 8-bit");
 						}
 						$$=$1;
 					}
@@ -384,7 +382,7 @@ const_16bit		:	relocconst
 					{
 						if( (!rpn_isReloc(&$1)) && (($1.nVal<-32768) || ($1.nVal>65535)) )
 						{
-							yyerror( "Expression must be 16-bit" );
+							yyerror("Expression must be 16-bit");
 						}
 						$$=$1;
 					}
--- a/src/fix/main.c
+++ b/src/fix/main.c
@@ -29,6 +29,7 @@ usage(void)
 	    "[-l licensee_id]\n" "              [-m mbc_type] [-n rom_version] "
 	    "[-p pad_value] [-r ram_size]\n"
 	    "              [-t title_str] file.gb\n");
+	exit(1);
 }

 int
@@ -379,6 +380,7 @@ main(int argc, char *argv[])

 		/* We will pad the ROM to match the size given in the header. */
 		int romsize, newsize, headbyte;
+		uint8_t *buf;
 		fseek(rom, 0, SEEK_END);
 		romsize = ftell(rom);
 		newsize = 0x8000;
@@ -389,14 +391,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");

+		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) {
--- a/src/fix/rgbfix.1
+++ b/src/fix/rgbfix.1
@@ -104,7 +104,7 @@ 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:
--- a/src/link/assign.c
+++ b/src/link/assign.c
@@ -15,8 +15,14 @@ struct sFreeArea {
 struct sFreeArea *BankFree[MAXBANKS];
 SLONG MaxAvail[MAXBANKS];
 SLONG MaxBankUsed;
+SLONG MaxWBankUsed;
+SLONG MaxSBankUsed;
+SLONG MaxVBankUsed;

 #define DOMAXBANK(x)	{if( (x)>MaxBankUsed ) MaxBankUsed=(x);}
+#define DOMAXWBANK(x)	{if( (x)>MaxWBankUsed ) MaxWBankUsed=(x);}
+#define DOMAXSBANK(x)	{if( (x)>MaxSBankUsed ) MaxSBankUsed=(x);}
+#define DOMAXVBANK(x)	{if( (x)>MaxVBankUsed ) MaxVBankUsed=(x);}

 SLONG 
 area_Avail(SLONG bank)
@@ -85,12 +91,52 @@ area_AllocAbs(struct sFreeArea ** ppArea, SLONG org, SLONG size)
 	return (-1);
 }

-SLONG 
-area_AllocAbsCODEAnyBank(SLONG org, SLONG size)
+SLONG
+area_AllocAbsSRAMAnyBank(SLONG org, SLONG size)
+{
+	int i;
+	for (i = 0; i < 4; ++i) {
+		if (area_AllocAbs(&BankFree[BANK_SRAM + i], org, size) == org) {
+			return BANK_SRAM + i;
+		}
+	}
+
+	return -1;
+}
+
+SLONG
+area_AllocAbsWRAMAnyBank(SLONG org, SLONG size)
 {
 	SLONG i;

-	for (i = 1; i <= 255; i += 1) {
+	for (i = 1; i <= 7; i += 1) {
+		if (area_AllocAbs(&BankFree[BANK_WRAMX + i - 1], org, size) == org) {
+			return BANK_WRAMX + i - 1;
+		}
+	}
+
+	return -1;
+}
+
+SLONG
+area_AllocAbsVRAMAnyBank(SLONG org, SLONG size)
+{
+	if (area_AllocAbs(&BankFree[BANK_VRAM], org, size) == org) {
+		return BANK_VRAM;
+	}
+	if (area_AllocAbs(&BankFree[BANK_VRAM + 1], org, size) == org) {
+		return BANK_VRAM + 1;
+	}
+
+	return -1;
+}
+
+SLONG 
+area_AllocAbsROMXAnyBank(SLONG org, SLONG size)
+{
+	SLONG i;
+
+	for (i = 1; i <= 511; i += 1) {
 		if (area_AllocAbs(&BankFree[i], org, size) == org)
 			return (i);
 	}
@@ -121,12 +167,12 @@ area_Alloc(struct sFreeArea ** ppArea, SLONG size)
 	return (-1);
 }

-SLONG 
-area_AllocCODEAnyBank(SLONG size)
+SLONG
+area_AllocVRAMAnyBank(SLONG size)
 {
 	SLONG i, org;

-	for (i = 1; i <= 255; i += 1) {
+	for (i = BANK_VRAM; i <= BANK_VRAM + 1; i += 1) {
 		if ((org = area_Alloc(&BankFree[i], size)) != -1)
 			return ((i << 16) | org);
 	}
@@ -134,6 +180,103 @@ area_AllocCODEAnyBank(SLONG size)
 	return (-1);
 }

+SLONG
+area_AllocSRAMAnyBank(SLONG size)
+{
+	SLONG i, org;
+	for (i = 0; i < 4; ++i) {
+		if ((org = area_Alloc(&BankFree[BANK_SRAM + i], size)) != -1) {
+			return (i << 16) | org;
+		}
+	}
+
+	return -1;
+}
+
+SLONG
+area_AllocWRAMAnyBank(SLONG size)
+{
+	SLONG i, org;
+
+	for (i = 1; i <= 7; i += 1) {
+		if ((org = area_Alloc(&BankFree[BANK_WRAMX + i - 1], size)) != -1) {
+			return (i << 16) | org;
+		}
+	}
+
+	return -1;
+}
+
+SLONG 
+area_AllocROMXAnyBank(SLONG size)
+{
+	SLONG i, org;
+
+	for (i = 1; i <= 511; i += 1) {
+		if ((org = area_Alloc(&BankFree[i], size)) != -1)
+			return ((i << 16) | org);
+	}
+
+	return (-1);
+}
+
+struct sSection *
+FindLargestWRAM(void)
+{
+	struct sSection *pSection, *r = NULL;
+	SLONG nLargest = 0;
+
+	pSection = pSections;
+	while (pSection) {
+		if (pSection->oAssigned == 0 && pSection->Type == SECT_WRAMX) {
+			if (pSection->nByteSize > nLargest) {
+				nLargest = pSection->nByteSize;
+				r = pSection;
+			}
+		}
+		pSection = pSection->pNext;
+	}
+	return r;
+}
+
+struct sSection *
+FindLargestVRAM(void)
+{
+	struct sSection *pSection, *r = NULL;
+	SLONG nLargest = 0;
+
+	pSection = pSections;
+	while (pSection) {
+		if (pSection->oAssigned == 0 && pSection->Type == SECT_VRAM) {
+			if (pSection->nByteSize > nLargest) {
+				nLargest = pSection->nByteSize;
+				r = pSection;
+			}
+		}
+		pSection = pSection->pNext;
+	}
+	return r;
+}
+
+struct sSection *
+FindLargestSRAM(void)
+{
+	struct sSection *pSection, *r = NULL;
+	SLONG nLargest = 0;
+
+	pSection = pSections;
+	while (pSection) {
+		if (pSection->oAssigned == 0 && pSection->Type == SECT_SRAM) {
+			if (pSection->nByteSize > nLargest) {
+				nLargest = pSection->nByteSize;
+				r = pSection;
+			}
+		}
+		pSection = pSection->pNext;
+	}
+	return r;
+}
+
 struct sSection *
 FindLargestCode(void)
 {
@@ -142,7 +285,7 @@ FindLargestCode(void)

 	pSection = pSections;
 	while (pSection) {
-		if (pSection->oAssigned == 0 && pSection->Type == SECT_CODE) {
+		if (pSection->oAssigned == 0 && pSection->Type == SECT_ROMX) {
 			if (pSection->nByteSize > nLargest) {
 				nLargest = pSection->nByteSize;
 				r = pSection;
@@ -153,6 +296,69 @@ FindLargestCode(void)
 	return (r);
 }

+void
+AssignVRAMSections(void)
+{
+	struct sSection *pSection;
+
+	while ((pSection = FindLargestVRAM())) {
+		SLONG org;
+
+		if ((org = area_AllocVRAMAnyBank(pSection->nByteSize)) != -1) {
+			pSection->nOrg = org & 0xFFFF;
+			pSection->nBank = org >> 16;
+			pSection->oAssigned = 1;
+			DOMAXVBANK(pSection->nBank);
+		} else {
+			fprintf(stderr,
+			    "Unable to place VRAM section anywhere\n");
+			exit(1);
+		}
+	}
+}
+
+void
+AssignSRAMSections(void)
+{
+	struct sSection *pSection;
+
+	while ((pSection = FindLargestSRAM())) {
+		SLONG org;
+
+		if ((org = area_AllocSRAMAnyBank(pSection->nByteSize)) != -1) {
+			pSection->nOrg = org & 0xFFFF;
+			pSection->nBank = org >> 16;
+			pSection->oAssigned = 1;
+			DOMAXSBANK(pSection->nBank);
+		} else {
+			fprintf(stderr,
+			    "Unable to place SRAM section anywhere\n");
+			exit(1);
+		}
+	}
+}
+
+void
+AssignWRAMSections(void)
+{
+	struct sSection *pSection;
+
+	while ((pSection = FindLargestWRAM())) {
+		SLONG org;
+
+		if ((org = area_AllocWRAMAnyBank(pSection->nByteSize)) != -1) {
+			pSection->nOrg = org & 0xFFFF;
+			pSection->nBank = org >> 16;
+			pSection->oAssigned = 1;
+			DOMAXWBANK(pSection->nBank);
+		} else {
+			fprintf(stderr,
+			    "Unable to place WRAMX section anywhere\n");
+			exit(1);
+		}
+	}
+}
+
 void 
 AssignCodeSections(void)
 {
@@ -161,14 +367,14 @@ AssignCodeSections(void)
 	while ((pSection = FindLargestCode())) {
 		SLONG org;

-		if ((org = area_AllocCODEAnyBank(pSection->nByteSize)) != -1) {
+		if ((org = area_AllocROMXAnyBank(pSection->nByteSize)) != -1) {
 			pSection->nOrg = org & 0xFFFF;
 			pSection->nBank = org >> 16;
 			pSection->oAssigned = 1;
 			DOMAXBANK(pSection->nBank);
 		} else {
 			fprintf(stderr,
-			    "Unable to place CODE section anywhere\n");
+			    "Unable to place ROMX section anywhere\n");
 			exit(1);
 		}
 	}
@@ -196,6 +402,7 @@ AssignSections(void)
 		}

 		if (i == 0) {
+			/* ROM0 bank */
 			BankFree[i]->nOrg = 0x0000;
 			if (options & OPT_SMALL) {
 				BankFree[i]->nSize = 0x8000;
@@ -204,7 +411,8 @@ AssignSections(void)
 				BankFree[i]->nSize = 0x4000;
 				MaxAvail[i] = 0x4000;
 			}
-		} else if (i >= 1 && i <= 255) {
+		} else if (i >= 1 && i <= 511) {
+			/* Swappable ROM bank */
 			BankFree[i]->nOrg = 0x4000;
 			/*
 			 * Now, this shouldn't really be necessary... but for
@@ -217,15 +425,28 @@ AssignSections(void)
 				BankFree[i]->nSize = 0x4000;
 				MaxAvail[i] = 0x4000;
 			}
-		} else if (i == BANK_BSS) {
+		} else if (i == BANK_WRAM0) {
+			/* WRAM */
 			BankFree[i]->nOrg = 0xC000;
+			BankFree[i]->nSize = 0x1000;
+			MaxAvail[i] = 0x1000;
+		} else if (i >= BANK_SRAM && i <= BANK_SRAM + 3) {
+			/* Swappable SRAM bank */
+			BankFree[i]->nOrg = 0xA000;
 			BankFree[i]->nSize = 0x2000;
 			MaxAvail[i] = 0x2000;
-		} else if (i == BANK_VRAM) {
+		} else if (i >= BANK_WRAMX && i <= BANK_WRAMX + 6) {
+			/* Swappable WRAM bank */
+			BankFree[i]->nOrg = 0xD000;
+			BankFree[i]->nSize = 0x1000;
+			MaxAvail[i] = 0x1000;
+		} else if (i == BANK_VRAM || i == BANK_VRAM + 1) {
+			/* Swappable VRAM bank */
 			BankFree[i]->nOrg = 0x8000;
 			BankFree[i]->nSize = 0x2000;
 			MaxAvail[i] = 0x2000;
 		} else if (i == BANK_HRAM) {
+			/* HRAM */
 			BankFree[i]->nOrg = 0xFF80;
 			BankFree[i]->nSize = 0x007F;
 			MaxAvail[i] = 0x007F;
@@ -247,17 +468,17 @@ AssignSections(void)
 			/* User wants to have a say... */

 			switch (pSection->Type) {
-			case SECT_BSS:
+			case SECT_WRAM0:
 				if (area_AllocAbs
-				    (&BankFree[BANK_BSS], pSection->nOrg,
+				    (&BankFree[BANK_WRAM0], pSection->nOrg,
 					pSection->nByteSize) != pSection->nOrg) {
 					fprintf(stderr,
-					    "Unable to load fixed BSS section "
+					    "Unable to load fixed WRAM0 section "
 					    "at $%lX\n", pSection->nOrg);
 					exit(1);
 				}
 				pSection->oAssigned = 1;
-				pSection->nBank = BANK_BSS;
+				pSection->nBank = BANK_WRAM0;
 				break;
 			case SECT_HRAM:
 				if (area_AllocAbs
@@ -271,31 +492,178 @@ AssignSections(void)
 				pSection->oAssigned = 1;
 				pSection->nBank = BANK_HRAM;
 				break;
+			case SECT_SRAM:
+				if (pSection->nBank == -1) {
+					/*
+					 * User doesn't care which bank.
+					 * Therefore he must here be specifying
+					 * position within the bank.
+					 * Defer until later.
+					 */
+					;
+				} else {
+					/*
+					 * User specified which bank to use.
+					 * Does he also care about position
+					 * within the bank?
+					 */
+					if (pSection->nOrg == -1) {
+						/*
+						 * Nope, any position will do
+						 * Again, we'll do that later
+						 *
+						 */
+						;
+					} else {
+						/*
+						 * Bank and position within the
+						 * bank are hardcoded.
+						 */
+
+						if (pSection->nBank >= 0
+						    && pSection->nBank <= 3) {
+							pSection->nBank +=
+							    BANK_SRAM;
+							if (area_AllocAbs
+							    (&BankFree
+							    [pSection->nBank],
+							    pSection->nOrg,
+							    pSection->nByteSize)
+							    != pSection->nOrg) {
+								fprintf(stderr,
+"Unable to load fixed SRAM section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+								exit(1);
+							}
+							DOMAXVBANK(pSection->
+							    nBank);
+							pSection->oAssigned = 1;
+						} else {
+							fprintf(stderr,
+"Unable to load fixed SRAM section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+							exit(1);
+						}
+					}
+				}
+				break;
+			case SECT_WRAMX:
+				if (pSection->nBank == -1) {
+					/*
+					 * User doesn't care which bank.
+					 * Therefore he must here be specifying
+					 * position within the bank.
+					 * Defer until later.
+					 */
+					;
+				} else {
+					/*
+					 * User specified which bank to use.
+					 * Does he also care about position
+					 * within the bank?
+					 */
+					if (pSection->nOrg == -1) {
+						/*
+						 * Nope, any position will do
+						 * Again, we'll do that later
+						 *
+						 */
+						;
+					} else {
+						/*
+						 * Bank and position within the
+						 * bank are hardcoded.
+						 */
+
+						if (pSection->nBank >= 1
+						    && pSection->nBank <= 7) {
+							pSection->nBank +=
+							    BANK_WRAMX;
+							if (area_AllocAbs
+							    (&BankFree
+							    [pSection->nBank],
+							    pSection->nOrg,
+							    pSection->nByteSize)
+							    != pSection->nOrg) {
+								fprintf(stderr,
+"Unable to load fixed WRAMX section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+								exit(1);
+							}
+							DOMAXWBANK(pSection->
+							    nBank);
+							pSection->oAssigned = 1;
+						} else {
+							fprintf(stderr,
+"Unable to load fixed WRAMX section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+							exit(1);
+						}
+					}
+				}
+				break;
 			case SECT_VRAM:
+				if (pSection->nBank == -1) {
+					/*
+					 * User doesn't care which bank.
+					 * Therefore he must here be specifying
+					 * position within the bank.
+					 * Defer until later.
+					 */
+					;
+				} else {
+					/*
+					 * User specified which bank to use.
+					 * Does he also care about position
+					 * within the bank?
+					 */
+					if (pSection->nOrg == -1) {
+						/*
+						 * Nope, any position will do
+						 * Again, we'll do that later
+						 *
+						 */
+						;
+					} else {
+						/*
+						 * Bank and position within the
+						 * bank are hardcoded.
+						 */
+
+						if (pSection->nBank >= 0
+						    && pSection->nBank <= 1) {
+							pSection->nBank +=
+							    BANK_VRAM;
+							if (area_AllocAbs
+							    (&BankFree
+							    [pSection->nBank],
+							    pSection->nOrg,
+							    pSection->nByteSize)
+							    != pSection->nOrg) {
+								fprintf(stderr,
+"Unable to load fixed VRAM section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+								exit(1);
+							}
+							DOMAXVBANK(pSection->
+							    nBank);
+							pSection->oAssigned = 1;
+						} else {
+							fprintf(stderr,
+"Unable to load fixed VRAM section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+							exit(1);
+						}
+					}
+				}
+				break;
+			case SECT_ROM0:
 				if (area_AllocAbs
-				    (&BankFree[BANK_VRAM], pSection->nOrg,
+				    (&BankFree[BANK_ROM0], pSection->nOrg,
 					pSection->nByteSize) != pSection->nOrg) {
 					fprintf(stderr, "Unable to load fixed "
-					    "VRAM section at $%lX\n",
+					    "ROM0 section at $%lX\n",
 					    pSection->nOrg);
 					exit(1);
 				}
 				pSection->oAssigned = 1;
-				pSection->nBank = BANK_VRAM;
+				pSection->nBank = BANK_ROM0;
 				break;
-			case SECT_HOME:
-				if (area_AllocAbs
-				    (&BankFree[BANK_HOME], pSection->nOrg,
-					pSection->nByteSize) != pSection->nOrg) {
-					fprintf(stderr, "Unable to load fixed "
-					    "HOME section at $%lX\n",
-					    pSection->nOrg);
-					exit(1);
-				}
-				pSection->oAssigned = 1;
-				pSection->nBank = BANK_HOME;
-				break;
-			case SECT_CODE:
+			case SECT_ROMX:
 				if (pSection->nBank == -1) {
 					/*
 					 * User doesn't care which bank, so he must want to
@@ -327,7 +695,7 @@ AssignSections(void)
 						 */

 						if (pSection->nBank >= 1
-						    && pSection->nBank <= 255) {
+						    && pSection->nBank <= 511) {
 							if (area_AllocAbs
 							    (&BankFree
 								[pSection->nBank],
@@ -335,14 +703,14 @@ AssignSections(void)
 								pSection->
 								nByteSize) !=
 							    pSection->nOrg) {
-								fprintf(stderr, "Unable to load fixed CODE/DATA section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+								fprintf(stderr, "Unable to load fixed ROMX section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
 								exit(1);
 							}
 							DOMAXBANK(pSection->
 							    nBank);
 							pSection->oAssigned = 1;
 						} else {
-							fprintf(stderr, "Unable to load fixed CODE/DATA section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
+							fprintf(stderr, "Unable to load fixed ROMX section at $%lX in bank $%02lX\n", pSection->nOrg, pSection->nBank);
 							exit(1);
 						}
 					}
@@ -355,27 +723,81 @@ AssignSections(void)
 	}

 	/*
-	 * Next, let's assign all the bankfixed ONLY CODE sections...
+	 * Next, let's assign all the bankfixed ONLY ROMX sections...
 	 *
 	 */

 	pSection = pSections;
 	while (pSection) {
 		if (pSection->oAssigned == 0
-		    && pSection->Type == SECT_CODE
+		    && pSection->Type == SECT_ROMX
 		    && pSection->nOrg == -1 && pSection->nBank != -1) {
 			/* User wants to have a say... and he's pissed */
-			if (pSection->nBank >= 1 && pSection->nBank <= 255) {
+			if (pSection->nBank >= 1 && pSection->nBank <= 511) {
 				if ((pSection->nOrg =
 					area_Alloc(&BankFree[pSection->nBank],
 					    pSection->nByteSize)) == -1) {
-					fprintf(stderr, "Unable to load fixed CODE/DATA section into bank $%02lX\n", pSection->nBank);
+					fprintf(stderr, "Unable to load fixed ROMX section into bank $%02lX\n", pSection->nBank);
 					exit(1);
 				}
 				pSection->oAssigned = 1;
 				DOMAXBANK(pSection->nBank);
 			} else {
-				fprintf(stderr, "Unable to load fixed CODE/DATA section into bank $%02lX\n", pSection->nBank);
+				fprintf(stderr, "Unable to load fixed ROMX section into bank $%02lX\n", pSection->nBank);
+				exit(1);
+			}
+		} else if (pSection->oAssigned == 0
+		    && pSection->Type == SECT_SRAM
+		    && pSection->nOrg == -1 && pSection->nBank != -1) {
+			pSection->nBank += BANK_SRAM;
+			/* User wants to have a say... and he's pissed */
+			if (pSection->nBank >= BANK_SRAM && pSection->nBank <= BANK_SRAM + 3) {
+				if ((pSection->nOrg =
+					area_Alloc(&BankFree[pSection->nBank],
+					    pSection->nByteSize)) == -1) {
+					fprintf(stderr, "Unable to load fixed SRAM section into bank $%02lX\n", pSection->nBank);
+					exit(1);
+				}
+				pSection->oAssigned = 1;
+				DOMAXSBANK(pSection->nBank);
+			} else {
+				fprintf(stderr, "Unable to load fixed VRAM section into bank $%02lX\n", pSection->nBank);
+				exit(1);
+			}
+		} else if (pSection->oAssigned == 0
+		    && pSection->Type == SECT_VRAM
+		    && pSection->nOrg == -1 && pSection->nBank != -1) {
+			pSection->nBank += BANK_VRAM;
+			/* User wants to have a say... and he's pissed */
+			if (pSection->nBank >= BANK_VRAM && pSection->nBank <= BANK_VRAM + 1) {
+				if ((pSection->nOrg =
+					area_Alloc(&BankFree[pSection->nBank],
+					    pSection->nByteSize)) == -1) {
+					fprintf(stderr, "Unable to load fixed VRAM section into bank $%02lX\n", pSection->nBank);
+					exit(1);
+				}
+				pSection->oAssigned = 1;
+				DOMAXVBANK(pSection->nBank);
+			} else {
+				fprintf(stderr, "Unable to load fixed VRAM section into bank $%02lX\n", pSection->nBank);
+				exit(1);
+			}
+		} else if (pSection->oAssigned == 0
+		    && pSection->Type == SECT_WRAMX
+		    && pSection->nOrg == -1 && pSection->nBank != -1) {
+			pSection->nBank += BANK_WRAMX;
+			/* User wants to have a say... and he's pissed */
+			if (pSection->nBank >= BANK_WRAMX && pSection->nBank <= BANK_WRAMX + 6) {
+				if ((pSection->nOrg =
+					area_Alloc(&BankFree[pSection->nBank],
+					    pSection->nByteSize)) == -1) {
+					fprintf(stderr, "Unable to load fixed WRAMX section into bank $%02lX\n", pSection->nBank - BANK_WRAMX);
+					exit(1);
+				}
+				pSection->oAssigned = 1;
+				DOMAXWBANK(pSection->nBank);
+			} else {
+				fprintf(stderr, "Unable to load fixed WRAMX section into bank $%02lX\n", pSection->nBank - BANK_WRAMX);
 				exit(1);
 			}
 		}
@@ -383,26 +805,68 @@ AssignSections(void)
 	}

 	/*
-	 * Now, let's assign all the floating bank but fixed CODE sections...
+	 * Now, let's assign all the floating bank but fixed ROMX sections...
 	 *
 	 */

 	pSection = pSections;
 	while (pSection) {
 		if (pSection->oAssigned == 0
-		    && pSection->Type == SECT_CODE
+		    && pSection->Type == SECT_ROMX
 		    && pSection->nOrg != -1 && pSection->nBank == -1) {
 			/* User wants to have a say... and he's back with a
 			 * vengeance */
 			if ((pSection->nBank =
-				area_AllocAbsCODEAnyBank(pSection->nOrg,
+				area_AllocAbsROMXAnyBank(pSection->nOrg,
 				    pSection->nByteSize)) ==
 			    -1) {
-				fprintf(stderr, "Unable to load fixed CODE/DATA section at $%lX into any bank\n", pSection->nOrg);
+				fprintf(stderr, "Unable to load fixed ROMX section at $%lX into any bank\n", pSection->nOrg);
 				exit(1);
 			}
 			pSection->oAssigned = 1;
 			DOMAXBANK(pSection->nBank);
+		} else if (pSection->oAssigned == 0
+		    && pSection->Type == SECT_VRAM
+		    && pSection->nOrg != -1 && pSection->nBank == -1) {
+			/* User wants to have a say... and he's back with a
+			 * vengeance */
+			if ((pSection->nBank =
+				area_AllocAbsVRAMAnyBank(pSection->nOrg,
+				    pSection->nByteSize)) ==
+			    -1) {
+				fprintf(stderr, "Unable to load fixed VRAM section at $%lX into any bank\n", pSection->nOrg);
+				exit(1);
+			}
+			pSection->oAssigned = 1;
+			DOMAXVBANK(pSection->nBank);
+		} else if (pSection->oAssigned == 0
+		    && pSection->Type == SECT_SRAM
+		    && pSection->nOrg != -1 && pSection->nBank == -1) {
+			/* User wants to have a say... and he's back with a
+			 * vengeance */
+			if ((pSection->nBank =
+				area_AllocAbsSRAMAnyBank(pSection->nOrg,
+				    pSection->nByteSize)) ==
+			    -1) {
+				fprintf(stderr, "Unable to load fixed SRAM section at $%lX into any bank\n", pSection->nOrg);
+				exit(1);
+			}
+			pSection->oAssigned = 1;
+			DOMAXSBANK(pSection->nBank);
+		} else if (pSection->oAssigned == 0
+		    && pSection->Type == SECT_WRAMX
+		    && pSection->nOrg != -1 && pSection->nBank == -1) {
+			/* User wants to have a say... and he's back with a
+			 * vengeance */
+			if ((pSection->nBank =
+				area_AllocAbsWRAMAnyBank(pSection->nOrg,
+				    pSection->nByteSize)) ==
+			    -1) {
+				fprintf(stderr, "Unable to load fixed WRAMX section at $%lX into any bank\n", pSection->nOrg);
+				exit(1);
+			}
+			pSection->oAssigned = 1;
+			DOMAXWBANK(pSection->nBank);
 		}
 		pSection = pSection->pNext;
 	}
@@ -417,14 +881,14 @@ AssignSections(void)
 	while (pSection) {
 		if (pSection->oAssigned == 0) {
 			switch (pSection->Type) {
-			case SECT_BSS:
+			case SECT_WRAM0:
 				if ((pSection->nOrg =
-					area_Alloc(&BankFree[BANK_BSS],
+					area_Alloc(&BankFree[BANK_WRAM0],
 					    pSection->nByteSize)) == -1) {
-					fprintf(stderr, "BSS section too large\n");
+					fprintf(stderr, "WRAM0 section too large\n");
 					exit(1);
 				}
-				pSection->nBank = BANK_BSS;
+				pSection->nBank = BANK_WRAM0;
 				pSection->oAssigned = 1;
 				break;
 			case SECT_HRAM:
@@ -437,27 +901,23 @@ AssignSections(void)
 				pSection->nBank = BANK_HRAM;
 				pSection->oAssigned = 1;
 				break;
+			case SECT_SRAM:
+				break;
 			case SECT_VRAM:
+				break;
+			case SECT_WRAMX:
+				break;
+			case SECT_ROM0:
 				if ((pSection->nOrg =
-					area_Alloc(&BankFree[BANK_VRAM],
+					area_Alloc(&BankFree[BANK_ROM0],
 					    pSection->nByteSize)) == -1) {
-					fprintf(stderr, "VRAM section too large\n");
+					fprintf(stderr, "ROM0 section too large\n");
 					exit(1);
 				}
-				pSection->nBank = BANK_VRAM;
+				pSection->nBank = BANK_ROM0;
 				pSection->oAssigned = 1;
 				break;
-			case SECT_HOME:
-				if ((pSection->nOrg =
-					area_Alloc(&BankFree[BANK_HOME],
-					    pSection->nByteSize)) == -1) {
-					fprintf(stderr, "HOME section too large\n");
-					exit(1);
-				}
-				pSection->nBank = BANK_HOME;
-				pSection->oAssigned = 1;
-				break;
-			case SECT_CODE:
+			case SECT_ROMX:
 				break;
 			default:
 				fprintf(stderr, "(INTERNAL) Unknown section type!\n");
@@ -469,6 +929,9 @@ AssignSections(void)
 	}

 	AssignCodeSections();
+	AssignVRAMSections();
+	AssignWRAMSections();
+	AssignSRAMSections();
 }

 void 
--- a/src/link/mapfile.c
+++ b/src/link/mapfile.c
@@ -59,17 +59,17 @@ MapfileInitBank(SLONG bank)
 		currentbank = bank;
 		if (bank == 0)
 			fprintf(mf, "Bank #0 (HOME):\n");
-		else if (bank <= 255)
+		else if (bank < BANK_WRAM0)
 			fprintf(mf, "Bank #%ld:\n", bank);
-		else if (bank == BANK_BSS)
-			fprintf(mf, "BSS:\n");
+		else if (bank == BANK_WRAM0)
+			fprintf(mf, "WRAM0:\n");
 		else if (bank == BANK_HRAM)
 			fprintf(mf, "HRAM:\n");
-		else if (bank == BANK_VRAM)
-			fprintf(mf, "VRAM:\n");
+		else if (bank == BANK_VRAM || bank == BANK_VRAM + 1)
+			fprintf(mf, "VRAM Bank #%ld:\n", bank - BANK_VRAM);
 	}
 	if (sf) {
-		sfbank = (bank >= 1 && bank <= 255) ? bank : 0;
+		sfbank = (bank >= 1 && bank <= 511) ? bank : 0;
 	}
 }

--- a/src/link/object.c
+++ b/src/link/object.c
@@ -139,10 +139,10 @@ obj_ReadRGB0Section(FILE * f)

 	/* does the user want the -s mode? */

-	if ((options & OPT_SMALL) && (pSection->Type == SECT_CODE)) {
-		pSection->Type = SECT_HOME;
+	if ((options & OPT_SMALL) && (pSection->Type == SECT_ROMX)) {
+		pSection->Type = SECT_ROM0;
 	}
-	if ((pSection->Type == SECT_CODE) || (pSection->Type == SECT_HOME)) {
+	if ((pSection->Type == SECT_ROMX) || (pSection->Type == SECT_ROM0)) {
 		/*
 		 * These sectiontypes contain data...
 		 *
@@ -294,10 +294,10 @@ obj_ReadRGB1Section(FILE * f)

 	/* does the user want the -s mode? */

-	if ((options & OPT_SMALL) && (pSection->Type == SECT_CODE)) {
-		pSection->Type = SECT_HOME;
+	if ((options & OPT_SMALL) && (pSection->Type == SECT_ROMX)) {
+		pSection->Type = SECT_ROM0;
 	}
-	if ((pSection->Type == SECT_CODE) || (pSection->Type == SECT_HOME)) {
+	if ((pSection->Type == SECT_ROMX) || (pSection->Type == SECT_ROM0)) {
 		/*
 		 * These sectiontypes contain data...
 		 *
--- a/src/link/output.c
+++ b/src/link/output.c
@@ -16,16 +16,16 @@ writehome(FILE * f)
 	struct sSection *pSect;
 	UBYTE *mem;

-	mem = malloc(MaxAvail[BANK_HOME]);
+	mem = malloc(MaxAvail[BANK_ROM0]);
 	if (!mem)
 		return;

-	memset(mem, fillchar, MaxAvail[BANK_HOME]);
+	memset(mem, fillchar, MaxAvail[BANK_ROM0]);
 	MapfileInitBank(0);

 	pSect = pSections;
 	while (pSect) {
-		if (pSect->Type == SECT_HOME) {
+		if (pSect->Type == SECT_ROM0) {
 			memcpy(mem + pSect->nOrg, pSect->pData,
 			    pSect->nByteSize);
 			MapfileWriteSection(pSect);
@@ -35,7 +35,7 @@ writehome(FILE * f)

 	MapfileCloseBank(area_Avail(0));

-	fwrite(mem, 1, MaxAvail[BANK_HOME], f);
+	fwrite(mem, 1, MaxAvail[BANK_ROM0], f);
 	free(mem);
 }

@@ -54,7 +54,7 @@ writebank(FILE * f, SLONG bank)

 	pSect = pSections;
 	while (pSect) {
-		if (pSect->Type == SECT_CODE && pSect->nBank == bank) {
+		if (pSect->Type == SECT_ROMX && pSect->nBank == bank) {
 			memcpy(mem + pSect->nOrg - 0x4000, pSect->pData,
 			    pSect->nByteSize);
 			MapfileWriteSection(pSect);
--- a/src/link/rgblink.1
+++ b/src/link/rgblink.1
@@ -21,8 +21,8 @@ program links objects created by
 .Xr rgbasm 1
 into a single Game Boy ROM file.
 .Pp
-By default, HOME sections created by the assembler are placed in the 16KiB
-bank 0, and CODE/DATA sections are placed in any bank except bank 0.
+By default, ROM0 sections created by the assembler are placed in the 16KiB
+bank 0, and ROMX sections are placed in any bank except bank 0.
 If your ROM will only be 32KiB, you can use the
 .Fl t
 option to override this.
@@ -50,7 +50,7 @@ The default is 0x00.
 Write a tiny
 .Pq 32KiB
 ROM file.
-This forces all DATA/CODE sections to be of type HOME, and increases the HOME
+This forces all ROMX sections to be of type ROM0, and increases the ROM0
 section size from 16KiB to 32KiB.
 .El
 .Sh EXAMPLES
Author	SHA1	Message	Date
YamaArashi	2bf31870a7	Cleaned up lexer - separated the lexer into multiple functions so it is more readable - fixed issue with long label names in macro arguments - added error checking code to prevent buffer overflows	2014-08-22 21:44:18 -07:00
YamaArashi	6198cc185c	Remove __LINE__	2014-08-22 01:52:21 -07:00
YamaArashi	e4571bc0fc	Make _NARG work	2014-08-21 19:53:42 -07:00
Anthony J. Bentley	46269240c8	Merge branch 'update-legacy-instructions' of https://github.com/yenatch/rgbds	2014-08-21 11:29:34 -06:00
YamaArashi	b1269ab53a	Improve rgbasm performance	2014-08-21 02:57:43 -07:00
Anthony J. Bentley	3ecd169cd6	Revert previous commit. asmy.y is autogenerated from other .y files.	2014-02-21 03:20:44 -07:00
Anthony J. Bentley	2dab1474b8	asmy.y should not be in gitignore.	2014-02-21 00:56:34 -07:00
Anthony J. Bentley	08b1b97a45	Preserve the ability to set pad_value in rgbfix.	2014-02-09 02:58:00 -07:00
Anthony J. Bentley	17192ea6f0	Improve performance when padding: don't write a byte at a time.	2014-02-08 23:26:43 -07:00
Anthony J. Bentley	0f488b6759	Remove unused alloca() implementation.	2014-01-31 00:01:42 -07:00
yenatch	2ff286223b	add instruction "ld hl, sp+nn" The previous "ld hl, [sp+nn]" is incorrect, but remains for compatibility.	2014-01-14 11:51:18 -05:00
Anthony J. Bentley	af5f889326	Merge https://github.com/yenatch/rgbds	2014-01-12 21:30:39 -07:00
Anthony J. Bentley	3e92f33319	Provide a friendlier error when manpage directories don’t exist.	2014-01-11 18:46:33 -07:00
yenatch	0ffa4ce9ef	rgbasm: let rgblink try to import undefined symbols Manual imports are inconvenient and don't provide any functionality.	2014-01-07 18:14:58 -05:00
yenatch	fd4b5c8925	rgbasm: update manpage to include -v	2013-12-03 21:58:39 -05:00
yenatch	bc99ee2210	rgbasm: -v option (verbose)	2013-12-03 00:25:12 -05:00
Anthony J. Bentley	de269987f7	Add "jp hl" as a valid instruction. "jp [hl]" has been around for decades even though it makes no sense. This is better.	2013-09-05 20:51:58 -06:00
Anthony J. Bentley	7770827cce	Redefine consistent names for section types, and document the changes.	2013-07-31 22:14:31 -06:00
Anthony J. Bentley	7ab9742299	Implement SRAM sections.	2013-07-31 20:15:40 -06:00
Anthony J. Bentley	6aecf65552	Fix incorrect manpage macro.	2013-07-23 19:04:02 -06:00
Anthony J. Bentley	2571dc459c	Delete more files on clean.	2013-06-20 04:56:55 -06:00
Anthony J. Bentley	da19380cc4	Add a new WRAMX section type, for banked (CGB) WRAM sections.	2013-06-19 21:19:51 -06:00
Anthony J. Bentley	ab47428c0e	Improve error message.	2013-05-28 02:23:48 -06:00
Anthony J. Bentley	23b29a9ae1	Fix bug recently introduced to fatalerror().	2013-05-28 02:22:49 -06:00
Anthony J. Bentley	35448887af	Implement VRAM banks.	2013-05-23 13:44:12 -06:00
Anthony J. Bentley	6ccd386587	Make it possible to disable emitting nop after halt.	2013-05-19 17:56:41 -06:00
Anthony J. Bentley	34d40a67c9	Remove unused variable.	2013-05-19 17:08:44 -06:00
Anthony J. Bentley	c21c0f458f	Improve error messages.	2013-05-19 17:07:34 -06:00
Anthony J. Bentley	51c01e3aad	Remove some dead code.	2013-05-19 16:14:31 -06:00
Anthony J. Bentley	d0d85abb97	Fix accidental case fallthrough.	2013-05-19 15:51:40 -06:00
Anthony J. Bentley	88ac0282e4	Add HTML manuals to the clean target.	2013-04-11 13:27:31 -06:00
Anthony J. Bentley	8811784b71	rgbfix: exit on invalid usage.	2013-04-11 09:28:38 -06:00
Anthony J. Bentley	6579743410	Add support for 8 MiB ROMs, the largest size possible with MBC5.	2012-12-26 21:41:47 -07:00
Anthony J. Bentley	b90406861d	Readability (whitespace).	2012-12-26 21:12:52 -07:00