X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=doc%2Fca65.sgml;h=9bcbfa41c38bb35c27432c4ea52b61fcf58f7f61;hb=f6825b244a17980ef453b58a3afbf7e5a6cb0ac3;hp=edef9e433c04e412bd3f41fee17580088a183189;hpb=7391c1597123f7f1276307dd215d8729ca224e31;p=cc65

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index edef9e433..9bcbfa41c 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -87,39 +87,43 @@ The assembler accepts the following options:
 ---------------------------------------------------------------------------
 Usage: ca65 [options] file
 Short options:
-  -D name[=value]	Define a symbol
-  -I dir		Set an include directory search path
-  -U			Mark unresolved symbols as import
-  -V		      	Print the assembler version
-  -W n			Set warning level n
-  -g			Add debug info to object file
-  -h			Help (this text)
-  -i			Ignore case of symbols
-  -l			Create a listing if assembly was ok
-  -mm model		Set the memory model
-  -o name		Name the output file
-  -s			Enable smart mode
-  -t sys		Set the target system
-  -v			Increase verbosity
+  -D name[=value]               Define a symbol
+  -I dir                        Set an include directory search path
+  -U                            Mark unresolved symbols as import
+  -V                            Print the assembler version
+  -W n                          Set warning level n
+  -g                            Add debug info to object file
+  -h                            Help (this text)
+  -i                            Ignore case of symbols
+  -l name                       Create a listing file if assembly was ok
+  -mm model                     Set the memory model
+  -o name                       Name the output file
+  -s                            Enable smart mode
+  -t sys                        Set the target system
+  -v                            Increase verbosity
 
 Long options:
-  --auto-import		Mark unresolved symbols as import
-  --cpu type		Set cpu type
-  --debug-info		Add debug info to object file
-  --feature name	Set an emulation feature
-  --forget-inc-paths    Forget include search paths
-  --help		Help (this text)
-  --ignore-case		Ignore case of symbols
-  --include-dir dir	Set an include directory search path
-  --listing		Create a listing if assembly was ok
-  --list-bytes n	Maximum number of bytes per listing line
-  --macpack-dir dir	Set a macro package directory
-  --memory-model model	Set the memory model
-  --pagelength n	Set the page length for the listing
-  --smart		Enable smart mode
-  --target sys		Set the target system
-  --verbose		Increase verbosity
-  --version		Print the assembler version
+  --auto-import                 Mark unresolved symbols as import
+  --bin-include-dir dir         Set a search path for binary includes
+  --cpu type                    Set cpu type
+  --create-dep name             Create a make dependency file
+  --create-full-dep name        Create a full make dependency file
+  --debug-info                  Add debug info to object file
+  --feature name                Set an emulation feature
+  --forget-inc-paths            Forget include search paths
+  --help                        Help (this text)
+  --ignore-case                 Ignore case of symbols
+  --include-dir dir             Set an include directory search path
+  --large-alignment             Don't warn about large alignments
+  --listing name                Create a listing file if assembly was ok
+  --list-bytes n                Maximum number of bytes per listing line
+  --macpack-dir dir             Set a macro package directory
+  --memory-model model          Set the memory model
+  --pagelength n                Set the page length for the listing
+  --smart                       Enable smart mode
+  --target sys                  Set the target system
+  --verbose                     Increase verbosity
+  --version                     Print the assembler version
 ---------------------------------------------------------------------------
 </verb></tscreen>
 
@@ -130,6 +134,16 @@ Here is a description of all the command line options:
 
 <descrip>
 
+  <label id="option--bin-include-dir">
+  <tag><tt>--bin-include-dir dir</tt></tag>
+
+  Name a directory which is searched for binary include files. The option
+  may be used more than once to specify more than one directory to search. The
+  current directory is always searched first before considering any
+  additional directories. See also the section about <ref id="search-paths"
+  name="search paths">.
+
+
   <label id="option--cpu">
   <tag><tt>--cpu type</tt></tag>
 
@@ -142,6 +156,24 @@ Here is a description of all the command line options:
   instruction set is "proprietary and confidential".
 
 
+  <label id="option-create-dep">
+  <tag><tt>--create-dep name</tt></tag>
+
+  Tells the assembler to generate a file containing the dependency list for
+  the assembled module in makefile syntax. The output is written to a file
+  with the given name. The output does not include files passed via debug
+  information to the assembler.
+
+
+  <label id="option-create-full-dep">
+  <tag><tt>--create-full-dep name</tt></tag>
+
+  Tells the assembler to generate a file containing the dependency list for
+  the assembled module in makefile syntax. The output is written to a file
+  with the given name. The output does include files passed via debug
+  information to the assembler.
+
+
   <label id="option--feature">
   <tag><tt>--feature name</tt></tag>
 
@@ -154,6 +186,7 @@ Here is a description of all the command line options:
   command for a list of emulation features.
 
 
+  <label id="option--forget-inc-paths">
   <tag><tt>--forget-inc-paths</tt></tag>
 
   Forget the builtin include paths. This is most useful when building
@@ -172,11 +205,13 @@ Here is a description of all the command line options:
   monitor.
 
 
+  <label id="option-h">
   <tag><tt>-h, --help</tt></tag>
 
   Print the short option summary shown above.
 
 
+  <label id="option-i">
   <tag><tt>-i, --ignore-case</tt></tag>
 
   This option makes the assembler case insensitive on identifiers and labels.
@@ -184,13 +219,21 @@ Here is a description of all the command line options:
   <tt><ref id=".CASE" name=".CASE"></tt> control command.
 
 
-  <tag><tt>-l, --listing</tt></tag>
+  <label id="option-l">
+  <tag><tt>-l name, --listing name</tt></tag>
+
+  Generate an assembler listing with the given name. A listing file will
+  never be generated in case of assembly errors.
 
-  Generate an assembler listing. The listing file will always have the
-  name of the main input file with the extension replaced by ".lst". This
-  may change in future versions.
 
+  <label id="option--large-alignment">
+  <tag><tt>--large-alignment</tt></tag>
 
+  Disable warnings about a large combined alignment. See the discussion of the
+  <tt><ref id=".ALIGN" name=".ALIGN"></tt> directive for futher information.
+
+
+  <label id="option--list-bytes">
   <tag><tt>--list-bytes n</tt></tag>
 
   Set the maximum number of bytes printed in the listing for one line of
@@ -199,6 +242,7 @@ Here is a description of all the command line options:
   number of printed bytes.
 
 
+  <label id="option--macpack-dir">
   <tag><tt>--macpack-dir dir</tt></tag>
 
   This options allows to specify a directory containing macro files that are
@@ -209,12 +253,14 @@ Here is a description of all the command line options:
   when debugging the builtin macro packages.
 
 
+  <label id="option-mm">
   <tag><tt>-mm model, --memory-model model</tt></tag>
 
   Define the default memory model. Possible model specifiers are near, far and
   huge.
 
 
+  <label id="option-o">
   <tag><tt>-o name</tt></tag>
 
   The default output name is the name of the input file with the extension
@@ -223,12 +269,14 @@ Here is a description of all the command line options:
   the source file, or, if -o is given, the full path in this name is used.
 
 
+  <label id="option--pagelength">
   <tag><tt>--pagelength n</tt></tag>
 
   sets the length of a listing page in lines. See the <tt><ref
   id=".PAGELENGTH" name=".PAGELENGTH"></tt> directive for more information.
 
 
+  <label id="option-s">
   <tag><tt>-s, --smart-mode</tt></tag>
 
   In smart mode (enabled by -s or the <tt><ref id=".SMART" name=".SMART"></tt>
@@ -247,13 +295,17 @@ Here is a description of all the command line options:
   <label id="option-t">
   <tag><tt>-t sys, --target sys</tt></tag>
 
-  Set the target system. This will enable translation of character strings
-  and character constants into the character set of the target platform.
-  The default for the target system is "none", which means that no translation
+  Set the target system. This will enable translation of character strings and
+  character constants into the character set of the target platform. The
+  default for the target system is "none", which means that no translation
   will take place. The assembler supports the same target systems as the
   compiler, see there for a list.
 
+  Depending on the target, the default CPU type is also set. This can be
+  overriden by using the <tt/<ref id="option--cpu" name="--cpu">/ option.
+
 
+  <label id="option-v">
   <tag><tt>-v, --verbose</tt></tag>
 
   Increase the assembler verbosity. Usually only needed for debugging
@@ -261,6 +313,7 @@ Here is a description of all the command line options:
   verbose output.
 
 
+  <label id="option-D">
   <tag><tt>-D</tt></tag>
 
   This option allows you to define symbols on the command line. Without a
@@ -270,6 +323,7 @@ Here is a description of all the command line options:
   you may have to quote the expression.
 
 
+  <label id="option-I">
   <tag><tt>-I dir, --include-dir dir</tt></tag>
 
   Name a directory which is searched for include files. The option may be
@@ -279,6 +333,7 @@ Here is a description of all the command line options:
   name="search paths">.
 
 
+  <label id="option-U">
   <tag><tt>-U, --auto-import</tt></tag>
 
   Mark symbols that are not defined in the sources as imported symbols. This
@@ -290,6 +345,7 @@ Here is a description of all the command line options:
   which is not always true for assembler programmers.
 
 
+  <label id="option-V">
   <tag><tt>-V, --version</tt></tag>
 
   Print the version number of the assembler. If you send any suggestions
@@ -311,7 +367,7 @@ Here is a description of all the command line options:
 
 <sect>Search paths<label id="search-paths"><p>
 
-Include files are searched in the following places:
+Normal include files are searched in the following places:
 
 <enum>
 <item>The current directory.
@@ -320,7 +376,16 @@ Include files are searched in the following places:
 <item>The value of the environment variable <tt/CA65_INC/ if it is defined.
 <item>A subdirectory named <tt/asminc/ of the directory defined in the
       environment variable <tt/CC65_HOME/, if it is defined.
-<item>Any directory added with the <tt/-I/ option on the command line.
+<item>Any directory added with the <tt/<ref id="option-I" name="-I">/ option
+on the command line.
+</enum>
+
+Binary include files are searched in the following places:
+
+<enum>
+<item>The current directory.
+<item>Any directory added with the <tt/<ref id="option--bin-include-dir"
+name="--bin-include-dir">/ option on the command line.
 </enum>
 
 
@@ -393,13 +458,13 @@ mnemonics:
 mnemonics for illegal instructions of the NMOS 6502 CPUs are accepted. Since
 these instructions are illegal, there are no official mnemonics for them. The
 unofficial ones are taken from <htmlurl
-url="http://oxyron.net/graham/opcodes02.html"
-name="http://oxyron.net/graham/opcodes02.html">. Please note that only the
+url="http://www.oxyron.de/html/opcodes02.html"
+name="http://www.oxyron.de/html/opcodes02.html">. Please note that only the
 ones marked as "stable" are supported. The following table uses information
 from the mentioned web page, for more information, see there.
 
 <itemize>
-<item><tt>ALR: A:=(A and #{imm})*2;</tt>
+<item><tt>ALR: A:=(A and #{imm})/2;</tt>
 <item><tt>ANC: A:=A and #{imm};</tt> Generates opcode &dollar;0B.
 <item><tt>ARR: A:=(A and #{imm})/2;</tt>
 <item><tt>AXS: X:=A and X-#{imm};</tt>
@@ -497,7 +562,7 @@ expression:
 <item> 	If the expression contains symbols that are not defined, and these
        	symbols are local symbols, the enclosing scopes are searched for a
        	symbol with the same name. If one exists and this symbol is defined,
-       	it's attributes are used to determine the result size.
+       	its attributes are used to determine the result size.
 <item> 	In all other cases the expression is assumed to be word sized.
 </itemize>
 
@@ -620,22 +685,55 @@ Numeric constants are defined using the equal sign or the label assignment
 operator. After doing
 
 <tscreen><verb>
-      two = 2
+        two = 2
 </verb></tscreen>
 
 may use the symbol "two" in every place where a number is expected, and it is
-evaluated to the value 2 in this context. The label assignment operator causes
-the same, but causes the symbol to be marked as a label, which may cause a
-different handling in the debugger:
+evaluated to the value 2 in this context. The label assignment operator is
+almost identical, but causes the symbol to be marked as a label, so it may be
+handled differently in a debugger:
 
 <tscreen><verb>
-      io := $d000
+        io := $d000
 </verb></tscreen>
 
 The right side can of course be an expression:
 
 <tscreen><verb>
-      four = two * two
+        four = two * two
+</verb></tscreen>
+
+
+<label id=".SET">
+<sect1>Numeric variables<p>
+
+Within macros and other control structures (<tt><ref id=".REPEAT"
+name=".REPEAT"></tt>, ...) it is sometimes useful to have some sort of
+variable. This can be achieved by the <tt>.SET</tt> operator. It creates a
+symbol that may get assigned a different value later:
+
+<tscreen><verb>
+        four .set 4
+        lda     #four           ; Loads 4 into A
+        four .set 3
+        lda     #four           ; Loads 3 into A
+</verb></tscreen>
+
+Since the value of the symbol can change later, it must be possible to
+evaluate it when used (no delayed evaluation as with normal symbols). So the
+expression used as the value must be constant.
+
+Following is an example for a macro that generates a different label each time
+it is used. It uses the <tt><ref id=".SPRINTF" name=".SPRINTF"></tt> function
+and a numeric variable named <tt>lcount</tt>.
+
+<tscreen><verb>
+        .lcount .set 0          ; Initialize the counter
+
+        .macro  genlab
+                .ident (.sprintf ("L%04X", lcount)):
+                lcount .set lcount + 1
+        .endmacro
 </verb></tscreen>
 
 
@@ -674,14 +772,14 @@ You may use cheap local labels as an easy way to reuse common label
 names like "Loop". Here is an example:
 
 <tscreen><verb>
-	Clear:  lda    #$00   	     	; Global label
-		ldy    #$20
-	@Loop:  sta    Mem,y  	     	; Local label
-		dey
-		bne    @Loop  	     	; Ok
-		rts
+      	Clear:  lda    #$00   	     	; Global label
+      		ldy    #$20
+      	@Loop:  sta    Mem,y  	     	; Local label
+      		dey
+      		bne    @Loop  	     	; Ok
+      		rts
        	Sub:    ... 	       	     	; New global label
-	 	bne    @Loop  	     	; ERROR: Unknown identifier!
+      	 	bne    @Loop  	     	; ERROR: Unknown identifier!
 </verb></tscreen>
 
 <sect1>Unnamed labels<p>
@@ -697,23 +795,23 @@ reference (use the n'th label in forward direction). An example will help to
 understand this:
 
 <tscreen><verb>
-	:	lda	(ptr1),y	; #1
-		cmp	(ptr2),y
-		bne    	:+     		; -> #2
-		tax
-		beq	:+++   		; -> #4
-		iny
-		bne	:-     		; -> #1
-		inc	ptr1+1
-		inc	ptr2+1
-		bne	:-     		; -> #1
-
-	:	bcs	:+     	       	; #2 -> #3
-		ldx	#$FF
-		rts
-
-	:	ldx	#$01   		; #3
-	:	rts	       		; #4
+      	:	lda	(ptr1),y	; #1
+      		cmp	(ptr2),y
+      		bne    	:+     		; -> #2
+      		tax
+      		beq	:+++   		; -> #4
+      		iny
+      		bne	:-     		; -> #1
+      		inc	ptr1+1
+      		inc	ptr2+1
+      		bne	:-     		; -> #1
+
+      	:	bcs	:+     	       	; #2 -> #3
+      		ldx	#$FF
+      		rts
+
+      	:	ldx	#$01   		; #3
+      	:	rts	       		; #4
 </verb></tscreen>
 
 As you can see from the example, unnamed labels will make even short
@@ -725,25 +823,31 @@ convenient in some situations, so it's your decision.
 
 <sect1>Using macros to define labels and constants<p>
 
-While there are drawbacks with this approach, it may be handy in some
-situations. Using <tt><ref id=".DEFINE" name=".DEFINE"></tt>, it is
-possible to define symbols or constants that may be used elsewhere. Since
-the macro facility works on a very low level, there is no scoping. On the
-other side, you may also define string constants this way (this is not
+While there are drawbacks with this approach, it may be handy in a few rare
+situations. Using <tt><ref id=".DEFINE" name=".DEFINE"></tt>, it is possible
+to define symbols or constants that may be used elsewhere. One of the
+advantages is that you can use it to define string constants (this is not
 possible with the other symbol types).
 
+Please note: <tt/.DEFINE/ style macros do token replacements on a low level,
+so the names do not adhere to scoping, diagnostics may be misleading, there
+are no symbols to look up in the map file, and there is no debug info.
+Especially the first problem in the list can lead to very nasty programming
+errors. Because of these problems, the general advice is, <bf/NOT/ do use
+<tt/.DEFINE/ if you don't have to.
+
 Example:
 
 <tscreen><verb>
-	.DEFINE	two	2
-	.DEFINE version	"SOS V2.3"
+      	.DEFINE	two	2
+      	.DEFINE version	"SOS V2.3"
 
-	four = two * two       	; Ok
-	.byte	version	       	; Ok
+      	four = two * two       	; Ok
+      	.byte	version	       	; Ok
 
-	.PROC		       	; Start local scope
-	two = 3		       	; Will give "2 = 3" - invalid!
-	.ENDPROC
+      	.PROC		       	; Start local scope
+      	two = 3		       	; Will give "2 = 3" - invalid!
+      	.ENDPROC
 </verb></tscreen>
 
 
@@ -1177,6 +1281,49 @@ Pseudo functions expect their arguments in parenthesis, and they have a result,
 either a string or an expression.
 
 
+<sect1><tt>.BANK</tt><label id=".BANK"><p>
+
+  The <tt/.BANK/ function is used to support systems with banked memory. The
+  argument is an expression with exactly one segment reference - usually a
+  label. The function result is the value of the <tt/bank/ attribute assigned
+  to the run memory area of the segment. Please see the linker documentation
+  for more information about memory areas and their attributes.
+
+  The value of <tt/.BANK/ can be used to switch memory so that a memory bank
+  containing specific data is available.
+
+  The <tt/bank/ attribute is a 32 bit integer and so is the result of the
+  <tt/.BANK/ function. You will have to use <tt><ref id=".LOBYTE"
+  name=".LOBYTE"></tt> or similar functions to address just part of it.
+
+  Please note that <tt/.BANK/ will always get evaluated in the link stage, so
+  an expression containing <tt/.BANK/ can never be used where a constant known
+  result is expected (for example with <tt/.RES/).
+
+  Example:
+
+  <tscreen><verb>
+        .segment "BANK1"
+        .proc   banked_func_1
+                ...
+        .endproc
+
+        .segment "BANK2"
+        .proc   banked_func_2
+                ...
+        .endproc
+
+        .proc   bank_table
+  	        .addr   banked_func_1
+                .byte   <.BANK (banked_func_1)
+
+                .addr   banked_func_2
+                .byte   <.BANK (banked_func_2)
+        .endproc
+  </verb></tscreen>
+
+
+
 <sect1><tt>.BANKBYTE</tt><label id=".BANKBYTE"><p>
 
   The function returns the bank byte (that is, bits 16-23) of its argument.
@@ -1385,6 +1532,26 @@ either a string or an expression.
   See: <tt><ref id=".XMATCH" name=".XMATCH"></tt>
 
 
+<sect1><tt>.MAX</tt><label id=".MAX"><p>
+
+  Builtin function. The result is the larger of two values.
+
+  The syntax is
+
+  <tscreen><verb>
+       	.MAX (&lt;value #1&gt;, &lt;value #2&gt;)
+  </verb></tscreen>
+
+  Example:
+
+  <tscreen><verb>
+        ; Reserve space for the larger of two data blocks
+       	savearea:       .max (.sizeof (foo), .sizeof (bar))
+  </verb></tscreen>
+
+  See: <tt><ref id=".MIN" name=".MIN"></tt>
+
+
 <sect1><tt>.MID</tt><label id=".MID"><p>
 
   Builtin function. Takes a starting index, a count and a token list as
@@ -1425,6 +1592,26 @@ either a string or an expression.
   name=".RIGHT"></tt> builtin functions.
 
 
+<sect1><tt>.MIN</tt><label id=".MIN"><p>
+
+  Builtin function. The result is the smaller of two values.
+
+  The syntax is
+
+  <tscreen><verb>
+       	.MIN (&lt;value #1&gt;, &lt;value #2&gt;)
+  </verb></tscreen>
+
+  Example:
+
+  <tscreen><verb>
+        ; Reserve space for some data, but 256 bytes minimum
+       	savearea:       .min (.sizeof (foo), 256)
+  </verb></tscreen>
+
+  See: <tt><ref id=".MAX" name=".MAX"></tt>
+
+
 <sect1><tt>.REF, .REFERENCED</tt><label id=".REFERENCED"><p>
 
   Builtin function. The function expects an identifier as argument in braces.
@@ -1714,14 +1901,20 @@ Here's a list of all control commands and a description, what they do:
 <sect1><tt>.ALIGN</tt><label id=".ALIGN"><p>
 
   Align data to a given boundary. The command expects a constant integer
-  argument that must be a power of two, plus an optional second argument
+  argument in the range 1 ... 65536, plus an optional second argument
   in byte range. If there is a second argument, it is used as fill value,
   otherwise the value defined in the linker configuration file is used
   (the default for this value is zero).
 
-  Since alignment depends on the base address of the module, you must
-  give the same (or a greater) alignment for the segment when linking.
-  The linker will give you a warning, if you don't do that.
+  <tt/.ALIGN/ will insert fill bytes, and the number of fill bytes depend of
+  the final address of the segment. <tt/.ALIGN/ cannot insert a variable
+  number of bytes, since that would break address calculations within the
+  module. So each <tt/.ALIGN/ expects the segment to be aligned to a multiple
+  of the alignment, because that allows the number of fill bytes to be
+  calculated in advance by the assembler. You are therefore required to
+  specify a matching alignment for the segment in the linker config. The
+  linker will output a warning if the alignment of the segment is less than
+  what is necessary to have a correct alignment in the object file.
 
   Example:
 
@@ -1729,6 +1922,50 @@ Here's a list of all control commands and a description, what they do:
       	.align	256
   </verb></tscreen>
 
+  Some unexpected behaviour might occur if there are multiple <tt/.ALIGN/
+  commands with different arguments. To allow the assembler to calculate the
+  number of fill bytes in advance, the alignment of the segment must be a
+  multiple of each of the alignment factors. This may result in unexpectedly
+  large alignments for the segment within the module.
+
+  Example:
+
+  <tscreen><verb>
+        .align  15
+        .byte   15
+        .align  18
+        .byte   18
+  </verb></tscreen>
+
+  For the assembler to be able to align correctly, the segment must be aligned
+  to the least common multiple of 15 and 18 which is 90. The assembler will
+  calculate this automatically and will mark the segment with this value.
+
+  Unfortunately, the combined alignment may get rather large without the user
+  knowing about it, wasting space in the final executable. If we add another
+  alignment to the example above
+
+  <tscreen><verb>
+        .align  15
+        .byte   15
+        .align  18
+        .byte   18
+        .align  251
+        .byte   0
+  </verb></tscreen>
+
+  the assembler will force a segment alignment to the least common multiple of
+  15, 18 and 251 - which is 22590. To protect the user against errors, the
+  assembler will issue a warning when the combined alignment exceeds 256. The
+  command line option <tt><ref id="option--large-alignment"
+  name="--large-alignment"></tt> will disable this warning.
+
+  Please note that with alignments that are a power of two (which were the
+  only alignments possible in older versions of the assembler), the problem is
+  less severe, because the least common multiple of powers to the same base is
+  always the larger one.
+
+
 
 <sect1><tt>.ASCIIZ</tt><label id=".ASCIIZ"><p>
 
@@ -2016,7 +2253,27 @@ Here's a list of all control commands and a description, what they do:
   Start a define style macro definition. The command is followed by an
   identifier (the macro name) and optionally by a list of formal arguments
   in braces.
-  See section <ref id="macros" name="Macros">.
+
+  Please note that <tt/.DEFINE/ shares most disadvantages with its C
+  counterpart, so the general advice is, <bf/NOT/ do use <tt/.DEFINE/ if you
+  don't have to.
+
+  See also the <tt><ref id=".UNDEFINE" name=".UNDEFINE"></tt> command and
+  section <ref id="macros" name="Macros">.
+
+
+<sect1><tt>.DELMAC, .DELMACRO</tt><label id=".DELMACRO"><p>
+
+  Delete a classic macro (defined with <tt><ref id=".MACRO"
+  name=".MACRO"></tt>) . The command is followed by the name of an
+  existing macro. Its definition will be deleted together with the name.
+  If necessary, another macro with this name may be defined later.
+
+  See: <tt><ref id=".ENDMACRO" name=".ENDMACRO"></tt>,
+       <tt><ref id=".EXITMACRO" name=".EXITMACRO"></tt>,
+       <tt><ref id=".MACRO" name=".MACRO"></tt>
+
+  See also section <ref id="macros" name="Macros">.
 
 
 <sect1><tt>.DEF, .DEFINED</tt><label id=".DEFINED"><p>
@@ -2028,7 +2285,7 @@ Here's a list of all control commands and a description, what they do:
   <tt><ref id=".IFDEF" name=".IFDEF"></tt> statement may be replaced by
 
   <tscreen><verb>
-	.if	.defined(a)
+  	.if	.defined(a)
   </verb></tscreen>
 
 
@@ -2104,7 +2361,13 @@ Here's a list of all control commands and a description, what they do:
 
 <sect1><tt>.ENDMAC, .ENDMACRO</tt><label id=".ENDMACRO"><p>
 
-  End of macro definition (see section <ref id="macros" name="Macros">).
+  Marks the end of a macro definition.
+
+  See: <tt><ref id=".DELMACRO" name=".DELMACRO"></tt>,
+       <tt><ref id=".EXITMACRO" name=".EXITMACRO"></tt>,
+       <tt><ref id=".MACRO" name=".MACRO"></tt>
+
+  See also section <ref id="macros" name="Macros">.
 
 
 <sect1><tt>.ENDPROC</tt><label id=".ENDPROC"><p>
@@ -2192,7 +2455,8 @@ Here's a list of all control commands and a description, what they do:
 <sect1><tt>.ERROR</tt><label id=".ERROR"><p>
 
   Force an assembly error. The assembler will output an error message
-  preceded by "User error" and will <em/not/ produce an object file.
+  preceded by "User error". Assembly is continued but no object file will
+  generated.
 
   This command may be used to check for initial conditions that must be
   set before assembling a source file.
@@ -2209,14 +2473,21 @@ Here's a list of all control commands and a description, what they do:
 	.endif
   </verb></tscreen>
 
-  See also the <tt><ref id=".WARNING" name=".WARNING"></tt> and <tt><ref
-  id=".OUT" name=".OUT"></tt> directives.
+  See also: <tt><ref id=".FATAL" name=".FATAL"></tt>,
+            <tt><ref id=".OUT" name=".OUT"></tt>,
+            <tt><ref id=".WARNING" name=".WARNING"></tt>
 
 
 <sect1><tt>.EXITMAC, .EXITMACRO</tt><label id=".EXITMACRO"><p>
 
   Abort a macro expansion immediately. This command is often useful in
-  recursive macros. See separate section <ref id="macros" name="Macros">.
+  recursive macros.
+
+  See: <tt><ref id=".DELMACRO" name=".DELMACRO"></tt>,
+       <tt><ref id=".ENDMACRO" name=".ENDMACRO"></tt>,
+       <tt><ref id=".MACRO" name=".MACRO"></tt>
+
+  See also section <ref id="macros" name="Macros">.
 
 
 <sect1><tt>.EXPORT</tt><label id=".EXPORT"><p>
@@ -2276,6 +2547,32 @@ Here's a list of all control commands and a description, what they do:
   See: <tt><ref id=".ADDR" name=".ADDR"></tt>
 
 
+<sect1><tt>.FATAL</tt><label id=".FATAL"><p>
+
+  Force an assembly error and terminate assembly. The assembler will output an
+  error message preceded by "User error" and will terminate assembly
+  immediately.
+
+  This command may be used to check for initial conditions that must be
+  set before assembling a source file.
+
+  Example:
+
+  <tscreen><verb>
+	.if    	foo = 1
+	...
+	.elseif	bar = 1
+	...
+	.else
+       	.fatal  "Must define foo or bar!"
+	.endif
+  </verb></tscreen>
+
+  See also: <tt><ref id=".ERROR" name=".ERROR"></tt>,
+            <tt><ref id=".OUT" name=".OUT"></tt>,
+            <tt><ref id=".WARNING" name=".WARNING"></tt>
+
+
 <sect1><tt>.FEATURE</tt><label id=".FEATURE"><p>
 
   This directive may be used to enable one or more compatibility features
@@ -2300,7 +2597,7 @@ Here's a list of all control commands and a description, what they do:
     at character is not allowed to start an identifier, even with this
     feature enabled.
 
-  <tag><tt>c_comments</tt></tag>
+  <tag><tt>c_comments</tt><label id="c_comments"></tag>
 
     Allow C like comments using <tt>/*</tt> and <tt>*/</tt> as left and right
     comment terminators. Note that C comments may not be nested. There's also a
@@ -2319,13 +2616,20 @@ Here's a list of all control commands and a description, what they do:
     dollar character is not allowed to start an identifier, even with this
     feature enabled.
 
-  <tag><tt>dollar_is_pc</tt></tag>
+  <tag><tt>dollar_is_pc</tt><label id="dollar_is_pc"></tag>
 
     The dollar sign may be used as an alias for the star (`*'), which
     gives the value of the current PC in expressions.
     Note: Assignment to the pseudo variable is not allowed.
 
-  <tag><tt>labels_without_colons</tt></tag>
+  <tag><tt>force_range</tt><label id="force_range"></tag>
+
+    Force expressions into their valid range for immediate addressing and
+    storage operators like <tt><ref id=".BYTE" name=".BYTE"></tt> and
+    <tt><ref id=".WORD" name=".WORD"></tt>. Be very careful with this one,
+    since it will completely disable error checks.
+
+  <tag><tt>labels_without_colons</tt><label id="labels_without_colons"></tag>
 
     Allow labels without a trailing colon. These labels are only accepted,
     if they start at the beginning of a line (no leading white space).
@@ -2339,17 +2643,17 @@ Here's a list of all control commands and a description, what they do:
     overridden. When using this feature, you may also get into trouble if
     later versions of the assembler define new keywords starting with a dot.
 
-  <tag><tt>loose_char_term</tt></tag>
+  <tag><tt>loose_char_term</tt><label id="loose_char_term"></tag>
 
     Accept single quotes as well as double quotes as terminators for char
     constants.
 
-  <tag><tt>loose_string_term</tt></tag>
+  <tag><tt>loose_string_term</tt><label id="loose_string_term"></tag>
 
     Accept single quotes as well as double quotes as terminators for string
     constants.
 
-  <tag><tt>missing_char_term</tt></tag>
+  <tag><tt>missing_char_term</tt><label id="missing_char_term"></tag>
 
     Accept single quoted character constants where the terminating quote is
     missing.
@@ -2366,7 +2670,7 @@ Here's a list of all control commands and a description, what they do:
     effect will only enable absolute mode for the current segment. Dito for
     <tt><ref id=".RELOC" name=".RELOC"></tt>.
 
-  <tag><tt>pc_assignment</tt></tag>
+  <tag><tt>pc_assignment</tt><label id="pc_assignment"></tag>
 
     Allow assignments to the PC symbol (`*' or `&dollar;' if <tt/dollar_is_pc/
     is enabled). Such an assignment is handled identical to the <tt><ref
@@ -2374,7 +2678,7 @@ Here's a list of all control commands and a description, what they do:
     removing the lines with the assignments may also be an option when porting
     code written for older assemblers).
 
-  <tag><tt>ubiquitous_idents</tt></tag>
+  <tag><tt>ubiquitous_idents</tt><label id="ubiquitous_idents"></tag>
 
     Allow the use of instructions names as names for macros and symbols. This
     makes it possible to "overload" instructions by defining a macro with the
@@ -2948,21 +3252,34 @@ Here's a list of all control commands and a description, what they do:
   <tscreen><verb>
        	.macpack	longbranch	; Include macro package
 
-       		cmp	#$20		; Set condition codes
-       		jne    	Label		; Jump long on condition
+       	   	cmp	#$20		; Set condition codes
+       	   	jne    	Label		; Jump long on condition
   </verb></tscreen>
 
   Macro packages are explained in more detail in section <ref
   id="macropackages" name="Macro packages">.
 
 
-<sect1><tt>.MAC, .MACRO</tt><label id=".MAC"><p>
+<sect1><tt>.MAC, .MACRO</tt><label id=".MACRO"><p>
 
   Start a classic macro definition. The command is followed by an identifier
   (the macro name) and optionally by a comma separated list of identifiers
-  that are macro parameters.
+  that are macro parameters. A macro definition is terminated by <tt><ref
+  id=".ENDMACRO" name=".ENDMACRO"></tt>.
 
-  See section <ref id="macros" name="Macros">.
+  Example:
+
+  <tscreen><verb>
+       	.macro  ldax    arg             ; Define macro ldax
+                lda     arg
+                ldx     arg+1
+  </verb></tscreen>
+
+  See: <tt><ref id=".DELMACRO" name=".DELMACRO"></tt>,
+       <tt><ref id=".ENDMACRO" name=".ENDMACRO"></tt>,
+       <tt><ref id=".EXITMACRO" name=".EXITMACRO"></tt>
+
+  See also section <ref id="macros" name="Macros">.
 
 
 <sect1><tt>.ORG</tt><label id=".ORG"><p>
@@ -2999,8 +3316,9 @@ Here's a list of all control commands and a description, what they do:
   	.out	"This code was written by the codebuster(tm)"
   </verb></tscreen>
 
-  See also the <tt><ref id=".WARNING" name=".WARNING"></tt> and <tt><ref
-  id=".ERROR" name=".ERROR"></tt> directives.
+  See also: <tt><ref id=".ERROR" name=".ERROR"></tt>,
+            <tt><ref id=".FATAL" name=".FATAL"></tt>,
+            <tt><ref id=".WARNING" name=".WARNING"></tt>
 
 
 <sect1><tt>.P02</tt><label id=".P02"><p>
@@ -3050,6 +3368,21 @@ Here's a list of all control commands and a description, what they do:
   name=".PSC02"></tt> and <tt><ref id=".P816" name=".P816"></tt>
 
 
+<sect1><tt>.POPCPU</tt><label id=".POPCPU"><p>
+
+  Pop the last CPU setting from the stack, and activate it.
+
+  This command will switch back to the CPU that was last pushed onto the CPU
+  stack using the <tt><ref id=".PUSHCPU" name=".PUSHCPU"></tt> command, and
+  remove this entry from the stack.
+
+  The assembler will print an error message if the CPU stack is empty when
+  this command is issued.
+
+  See: <tt><ref id=".CPU" name=".CPU"></tt>, <tt><ref id=".PUSHCPU"
+  name=".PUSHCPU"></tt>, <tt><ref id=".SETCPU" name=".SETCPU"></tt>
+
+
 <sect1><tt>.POPSEG</tt><label id=".POPSEG"><p>
 
   Pop the last pushed segment from the stack, and set it.
@@ -3108,6 +3441,22 @@ Here's a list of all control commands and a description, what they do:
   name=".PC02"></tt> and <tt><ref id=".P816" name=".P816"></tt>
 
 
+<sect1><tt>.PUSHCPU</tt><label id=".PUSHCPU"><p>
+
+  Push the currently active CPU onto a stack. The stack has a size of 8
+  entries.
+
+  <tt/.PUSHCPU/ allows together with <tt><ref id=".POPCPU"
+  name=".POPCPU"></tt> to switch to another CPU and to restore the old CPU
+  later, without knowledge of the current CPU setting.
+
+  The assembler will print an error message if the CPU stack is already full,
+  when this command is issued.
+
+  See: <tt><ref id=".CPU" name=".CPU"></tt>, <tt><ref id=".POPCPU"
+  name=".POPCPU"></tt>, <tt><ref id=".SETCPU" name=".SETCPU"></tt>
+
+
 <sect1><tt>.PUSHSEG</tt><label id=".PUSHSEG"><p>
 
   Push the currently active segment onto a stack. The entries on the stack
@@ -3362,6 +3711,17 @@ Here's a list of all control commands and a description, what they do:
   </verb></tscreen>
 
 
+<sect1><tt>.UNDEF, .UNDEFINE</tt><label id=".UNDEFINE"><p>
+
+  Delete a define style macro definition. The command is followed by an
+  identifier which specifies the name of the macro to delete. Macro
+  replacement is switched of when reading the token following the command
+  (otherwise the macro name would be replaced by its replacement list).
+
+  See also the <tt><ref id=".DEFINE" name=".DEFINE"></tt> command and
+  section <ref id="macros" name="Macros">.
+
+
 <sect1><tt>.WARNING</tt><label id=".WARNING"><p>
 
   Force an assembly warning. The assembler will output a warning message
@@ -3376,20 +3736,21 @@ Here's a list of all control commands and a description, what they do:
 
   <tscreen><verb>
 	.macro	jne	target
-		.local L1
-		.ifndef	target
-		.warning "Forward jump in jne, cannot optimize!"
-		beq	L1
-		jmp	target
+	   	.local L1
+	   	.ifndef	target
+	   	.warning "Forward jump in jne, cannot optimize!"
+	   	beq	L1
+	   	jmp	target
 	L1:
 	   	.else
-		...
-		.endif
+	   	...
+	   	.endif
 	.endmacro
   </verb></tscreen>
 
-  See also the <tt><ref id=".ERROR" name=".ERROR"></tt> and <tt><ref id=".OUT"
-  name=".OUT"></tt> directives.
+  See also: <tt><ref id=".ERROR" name=".ERROR"></tt>
+            <tt><ref id=".FATAL" name=".FATAL"></tt>,
+            <tt><ref id=".OUT" name=".OUT"></tt>
 
 
 <sect1><tt>.WORD</tt><label id=".WORD"><p>
@@ -3436,14 +3797,14 @@ were specified when the macro was defined.
 
 <sect1>Macros without parameters<p>
 
-In it's simplest form, a macro does not have parameters. Here's an
+In its simplest form, a macro does not have parameters. Here's an
 example:
 
 <tscreen><verb>
        	.macro  asr		; Arithmetic shift right
-  	       	cmp	#$80	; Put bit 7 into carry
-  		ror		; Rotate right with carry
-  	.endmacro
+      	       	cmp	#$80	; Put bit 7 into carry
+      		ror		; Rotate right with carry
+      	.endmacro
 </verb></tscreen>
 
 The macro above consists of two real instructions, that are inserted into
@@ -3451,9 +3812,9 @@ the code, whenever the macro is expanded. Macro expansion is simply done
 by using the name, like this:
 
 <tscreen><verb>
-  	lda    	$2010
-  	asr
-  	sta	$2010
+      	lda    	$2010
+      	asr
+      	sta	$2010
 </verb></tscreen>
 
 
@@ -3462,15 +3823,15 @@ by using the name, like this:
 When using macro parameters, macros can be even more useful:
 
 <tscreen><verb>
-  	.macro 	inc16	addr
-  		clc
-  		lda    	addr
-  		adc	#$01
-  		sta	addr
-  		lda	addr+1
-  	 	adc	#$00
-  		sta	addr+1
-  	.endmacro
+      	.macro 	inc16	addr
+      		clc
+      		lda    	addr
+      		adc	#$01
+      		sta	addr
+      		lda	addr+1
+      	 	adc	#$00
+      		sta	addr+1
+      	.endmacro
 </verb></tscreen>
 
 When calling the macro, you may give a parameter, and each occurrence of
@@ -3478,19 +3839,19 @@ the name "addr" in the macro definition will be replaced by the given
 parameter. So
 
 <tscreen><verb>
-  	inc16  	$1000
+      	inc16  	$1000
 </verb></tscreen>
 
 will be expanded to
 
 <tscreen><verb>
-  	       	clc
-  		lda	$1000
-  		adc	#$01
-  		sta	$1000
-  		lda	$1000+1
-  		adc	#$00
-  		sta	$1000+1
+      	       	clc
+      		lda	$1000
+      		adc	#$01
+      		sta	$1000
+      		lda	$1000+1
+      		adc	#$00
+      		sta	$1000+1
 </verb></tscreen>
 
 A macro may have more than one parameter, in this case, the parameters
@@ -3511,23 +3872,23 @@ opposite.
 Look at this example:
 
 <tscreen><verb>
-  	.macro 	ldaxy  	a, x, y
-  	.ifnblank      	a
-  	     	lda    	#a
-  	.endif
-  	.ifnblank      	x
-  		ldx    	#x
-  	.endif
-  	.ifnblank      	y
-  		ldy    	#y
-  	.endif
-  	.endmacro
+      	.macro 	ldaxy  	a, x, y
+      	.ifnblank      	a
+      	     	lda    	#a
+      	.endif
+      	.ifnblank      	x
+      		ldx    	#x
+      	.endif
+      	.ifnblank      	y
+      		ldy    	#y
+      	.endif
+      	.endmacro
 </verb></tscreen>
 
 This macro may be called as follows:
 
 <tscreen><verb>
-  	ldaxy  	1, 2, 3		; Load all three registers
+      	ldaxy  	1, 2, 3		; Load all three registers
 
   	ldaxy	1, , 3 		; Load only a and y
 
@@ -3628,24 +3989,24 @@ id=".EXITMACRO" name=".EXITMACRO"></tt> This command will stop macro expansion
 immediately:
 
 <tscreen><verb>
-  	.macro 	push   	r1, r2, r3, r4, r5, r6, r7
-  	.ifblank       	r1
-  	      	; First parameter is empty
-  	      	.exitmacro
-  	.else
-  	      	lda    	r1
-  	      	pha
-  	.endif
-  	      	push   	r2, r3, r4, r5, r6, r7
-  	.endmacro
+      	.macro 	push   	r1, r2, r3, r4, r5, r6, r7
+      	.ifblank       	r1
+      	      	; First parameter is empty
+      	      	.exitmacro
+      	.else
+      	      	lda    	r1
+      	      	pha
+      	.endif
+      	      	push   	r2, r3, r4, r5, r6, r7
+      	.endmacro
 </verb></tscreen>
 
 When expanding this macro, the expansion will push all given parameters
 until an empty one is encountered. The macro may be called like this:
 
 <tscreen><verb>
-  	push   	$20, $21, $32		; Push 3 ZP locations
-  	push  	$21    			; Push one ZP location
+      	push   	$20, $21, $32		; Push 3 ZP locations
+      	push  	$21    			; Push one ZP location
 </verb></tscreen>
 
 
@@ -3751,7 +4112,7 @@ different:
 	be omitted.
 
 <item>	Since <tt><ref id=".DEFINE" name=".DEFINE"></tt> style macros may not
-	contain end-of-line tokens, there are things that cannot be done. They
+      	contain end-of-line tokens, there are things that cannot be done. They
 	may not contain several processor instructions for example. So, while
 	some things may be done with both macro types, each type has special
 	usages. The types complement each other.
@@ -3816,6 +4177,47 @@ doing more complex macros. If you compare characters against numeric values,
 be sure to take the translation into account.
 
 
+<sect1>Deleting macros<p>
+
+Macros can be deleted. This will not work if the macro that should be deleted
+is currently expanded as in the following non working example:
+
+<tscreen><verb>
+   	.macro 	notworking
+   	     	.delmacro       notworking
+   	.endmacro
+
+        notworking              ; Will not work
+</verb></tscreen>
+
+The commands to delete classic and define style macros differ. Classic macros
+can be deleted by use of <tt><ref id=".DELMACRO" name=".DELMACRO"></tt>, while
+for <tt><ref id=".DEFINE" name=".DEFINE"></tt> style macros, <tt><ref
+id=".UNDEFINE" name=".UNDEFINE"></tt> must be used. Example:
+
+<tscreen><verb>
+        .define value   1
+   	.macro 	mac
+   	       	.byte   2
+   	.endmacro
+
+                .byte   value           ; Emit one byte with value 1
+                mac                     ; Emit another byte with value 2
+
+        .undefine value
+        .delmacro mac
+
+                .byte   value           ; Error: Unknown identifier
+                mac                     ; Error: Missing ":"
+</verb></tscreen>
+
+A separate command for <tt>.DEFINE</tt> style macros was necessary, because
+the name of such a macro is replaced by its replacement list on a very low
+level. To get the actual name, macro replacement has to be switched off when
+reading the argument to <tt>.UNDEFINE</tt>. This does also mean that the
+argument to <tt>.UNDEFINE</tt> is not allowed to come from another
+<tt>.DEFINE</tt>. All this is not necessary for classic macros, so having two
+different commands increases flexibility.
 
 
 <sect>Macro packages<label id="macropackages"><p>
@@ -3828,18 +4230,38 @@ are:
 <sect1><tt>.MACPACK generic</tt><p>
 
 This macro package defines macros that are useful in almost any program.
-Currently, two macros are defined:
+Currently defined macros are:
 
 <tscreen><verb>
       	.macro  add     Arg
       	     	clc
-   	     	adc     Arg
-   	.endmacro
+      	     	adc     Arg
+      	.endmacro
 
-   	.macro  sub     Arg
-   	     	sec
-   	     	sbc     Arg
-   	.endmacro
+      	.macro  sub     Arg
+      	     	sec
+      	     	sbc     Arg
+      	.endmacro
+
+        .macro  bge     Arg
+                bcs     Arg
+        .endmacro
+
+        .macro  blt     Arg
+                bcc     Arg
+        .endmacro
+
+        .macro  bgt     Arg
+                .local  L
+                beq     L
+                bcs     Arg
+        L:
+        .endmacro
+
+        .macro  ble     Arg
+                beq     Arg
+                bcc     Arg
+        .endmacro
 </verb></tscreen>
 
 
@@ -3851,12 +4273,12 @@ definition for the "<tt/jeq/" macro, the other macros are built using the same
 scheme:
 
 <tscreen><verb>
-       	.macro	jeq	Target
+       	.macro	jeq    	Target
        	    	.if	.def(Target) .and ((*+2)-(Target) <= 127)
        	    	beq	Target
        	    	.else
-       	    	bne	*+5
-       	    	jmp	Target
+       	    	bne    	*+5
+       	    	jmp    	Target
        	    	.endif
        	.endmacro
 </verb></tscreen>
@@ -3874,6 +4296,13 @@ The package defines the following macros:
 
 
 
+<sect1><tt>.MACPACK atari</tt><p>
+
+The atari macro package will define a macro named <tt/scrcode/. It takes a
+string as argument and places this string into memory translated into screen
+codes.
+
+
 <sect1><tt>.MACPACK cbm</tt><p>
 
 The cbm macro package will define a macro named <tt/scrcode/. It takes a