summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKeith Kanios <keith@kanios.net>2011-07-30 13:14:18 -0500
committerKeith Kanios <keith@kanios.net>2011-07-30 13:14:18 -0500
commit099749292ce28df9987ae7b643eecfe019dfe4e6 (patch)
treea0141e75edd88e71c29e9a8da4b604c85e5bdf73 /doc
parent21e7050c1aa2a50de5f3c1877b89db8fa7b3436d (diff)
downloadnasm-099749292ce28df9987ae7b643eecfe019dfe4e6.tar.gz
nasm-099749292ce28df9987ae7b643eecfe019dfe4e6.tar.bz2
nasm-099749292ce28df9987ae7b643eecfe019dfe4e6.zip
doc: update documentation for pending 2.10 release
Diffstat (limited to 'doc')
-rw-r--r--doc/changes.src24
-rw-r--r--doc/nasmdoc.src25
2 files changed, 43 insertions, 6 deletions
diff --git a/doc/changes.src b/doc/changes.src
index d3ed574..103d5a3 100644
--- a/doc/changes.src
+++ b/doc/changes.src
@@ -9,6 +9,24 @@ since 2007.
\S{cl-2.10} Version 2.10
+\b Support for delayed preprocessing \c{%final}
+ See \k{final}.
+
+\b Support for comment blocks \c{%comment}.
+ See \k{comment}.
+
+\b Support for arbitrarily terminating conditional loops \c{%exitwhile}.
+ See \k{exitwhile}.
+
+\b Support for conditional loops \c{%while}.
+ See \k{while}.
+
+\b Support for arbitrarily terminating macro expansions \c{%exitmacro}.
+ See \k{exitmacro}.
+
+\b Support for recursive macro expansion \c{%rmacro}/\c{%irmacro}.
+ See \k{mlrmacro}.
+
\b When optimization is enabled, \c{mov r64,imm} now optimizes to the
shortest form possible between:
@@ -194,12 +212,6 @@ To force a specific form, use the \c{STRICT} keyword, see \k{strict}.
\b A number of enhancements/fixes in macros area.
-\#\b Support for arbitrarily terminating macro expansions \c{%exitmacro}.
-\# See \k{exitmacro}.
-
-\#\b Support for recursive macro expansion \c{%rmacro}/\c{%irmacro}.
-\# See \k{mlrmacro}.
-
\b Support for converting strings to tokens. See \k{deftok}.
\b Fuzzy operand size logic introduced.
diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index 34e8386..61c2814 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -3233,6 +3233,20 @@ code to be replicated as long as certain conditions are met:
\c ; some code which only repeats while <condition> is met
\c %endwhile
+\S{exitwhile} Exiting Conditional Loops: \i\c{%exitwhile}
+
+Conditional loops can be arbitrarily terminated with the
+\i\c{%exitwhile} directive.
+
+For example:
+
+\c %while<condition>
+\c %if<some other condition>
+\c %exitwhile
+\c %endif
+\c ; some code which only repeats while <condition> is met
+\c %endwhile
+
\H{files} Source Files and Dependencies
@@ -3814,6 +3828,17 @@ until all other "normal" preprocessing is complete. Multiple
declaration, last one first and first one last.
+\H{comment} Comment Blocks: \i\c{%comment}
+
+The \c{%comment} and \c{%endcomment} directives are used to specify
+a block of commented (i.e. unprocessed) code/text. Everything between
+\c{%comment} and \c{%endcomment} will be ignored by the preprocessor.
+
+\c %comment
+\c ; some code, text or data to be ignored
+\c %endcomment
+
+
\H{stdmac} \i{Standard Macros}
NASM defines a set of standard macros, which are already defined