diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2018-11-11 13:25:16 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2018-11-11 13:36:13 -0800 |
| commit | bf6230baa909cd66455abd83b81f97d692f3456f (patch) | |
| tree | 92a7b003c997429cb98433d21de8da7106c12e43 /doc | |
| parent | 9a1216a1efa0ccb48e5df97acc763ea3de71e0ce (diff) | |
| download | nasm-bf6230baa909cd66455abd83b81f97d692f3456f.tar.gz | |
preproc: command-line preproc directive after system-generated
BR 3392527: make sure that all command-line specified preprocessing
directives are processed after the system-generated ones. In
particular __OUTPUT_FORMAT__ was generated after command line pass 2,
at which point -p, -d, -u, --pragma and --before had already been
processed.
There is no reason to split up defined_macros() anymore: the right
place to execute it is simply between command line passes 1 and 2. We
can also set dfmt here, which lets us define a __DEBUG_FORMAT__ macro
as well.
Finally move some options that have no business being processed in
pass 2 to pass 1.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/changes.src | 12 | ||||
| -rw-r--r-- | doc/nasmdoc.src | 15 |
2 files changed, 23 insertions, 4 deletions
diff --git a/doc/changes.src b/doc/changes.src index efed8a19..6ffad2a2 100644 --- a/doc/changes.src +++ b/doc/changes.src @@ -7,9 +7,19 @@ The NASM 2 series supports x86-64, and is the production version of NASM since 2007. +\S{cl-2.14.01} Version 2.14.01 + +\b Create all system-defined macros defore processing command-line +given preprocessing directives (\c{-p}, \c{-d}, \c{-u}, \c{--pragma}, +\c{--before}). + +\b If debugging is enabled, define a \c{__DEBUG_FORMAT__} predefined +macro. See \k{dfmtm}. + \S{cl-2.14} Version 2.14 -\b Changed \c{-I} option semantics by adding a trailing path separator unconditionally. +\b Changed \c{-I} option semantics by adding a trailing path separator + unconditionally. \b Fixed null dereference in corrupted invalid single line macros. diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src index 9ebe657e..ebbd29b3 100644 --- a/doc/nasmdoc.src +++ b/doc/nasmdoc.src @@ -3898,9 +3898,9 @@ mode-dependent macros. \S{ofmtm} \i\c{__OUTPUT_FORMAT__}: Current Output Format -The \c{__OUTPUT_FORMAT__} standard macro holds the current Output Format, -as given by the \c{-f} option or NASM's default. Type \c{nasm -hf} for a -list. +The \c{__OUTPUT_FORMAT__} standard macro holds the current output +format name, as given by the \c{-f} option or NASM's default. Type +\c{nasm -hf} for a list. \c %ifidn __OUTPUT_FORMAT__, win32 \c %define NEWLINE 13, 10 @@ -3908,6 +3908,15 @@ list. \c %define NEWLINE 10 \c %endif +\S{dfmtm} \i\c{__DEBUG_FORMAT__}: Current Debug Format + +If debugging information generation is enabled, The +\c{__DEBUG_FORMAT__} standard macro holds the current debug format +name as specified by the \c{-F} or \c{-g} option or the output format +default. Type \c{nasm -f} \e{output} \c{y} for a list. + +\c{__DEBUG_FORMAT__} is not defined if debugging is not enabled, or if +the debug format specified is \c{null}. \S{datetime} Assembly Date and Time Macros |