Merge remote-tracking branch 'upstream/master' into pcenginetarget

doc/ca65.sgml

@@ -2316,21 +2316,25 @@ Here's a list of all control commands and a description, what they do:
   </verb></tscreen>
 
 
-<sect1><tt>.ISMNEM, .ISMNEMONIC</tt><label id=".ISMNEMONIC"><p>
+<sect1><tt>.DEFINEDMACRO</tt><label id=".DEFINEDMACRO"><p>
 
   Builtin function. The function expects an identifier as argument in braces.
-  The argument is evaluated, and the function yields "true" if the identifier
-  is defined as an instruction mnemonic that is recognized by the assembler.
-  Example:
+  The argument is evaluated, and the function yields "true" if the identifier 
+  has already been defined as the name of a macro. Otherwise the function yields 
+  false. Example:
 
   <tscreen><verb>
-  	.if  	.not .ismnemonic(ina)
-  	  	.macro ina
-  	  	  	clc
-  	  	  	adc #$01
-  	  	.endmacro
-  	.endif
-
+        .macro add foo
+                clc
+                adc foo
+        .endmacro
+                 
+  	.if	.definedmacro(add)
+                add #$01
+        .else
+                clc
+                adc #$01
+        .endif
   </verb></tscreen>
 
 
@@ -3158,6 +3162,23 @@ Here's a list of all control commands and a description, what they do:
   the feature in more detail.
 
 
+<sect1><tt>.ISMNEM, .ISMNEMONIC</tt><label id=".ISMNEMONIC"><p>
+
+  Builtin function. The function expects an identifier as argument in braces.
+  The argument is evaluated, and the function yields "true" if the identifier
+  is defined as an instruction mnemonic that is recognized by the assembler.
+  Example:
+
+  <tscreen><verb>
+  	.if  	.not .ismnemonic(ina)
+  	  	.macro ina
+  	  	  	clc
+  	  	  	adc #$01
+  	  	.endmacro
+  	.endif
+  </verb></tscreen>
+
+
 <sect1><tt>.LINECONT</tt><label id=".LINECONT"><p>
 
   Switch on or off line continuations using the backslash character