During command line parsing, warning_state_init is NULL as the warning
stack is naturally not set up yet. Furthermore, -w* would mean return
to command-line default, which isn't even defined yet.
Rather than ignoring it or returning an error, do something useful by
allowing -w* to reset to the *compile time* default when specified on
the command line.
Reported-by: <momo-trip@github.com>
Fixes: https://github.com/netwide-assembler/nasm/issues/155
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Formalize the mechanism for storing mapped (non-filesystem) filenames
in the filenames array. These are not compared against input or output
files for overwrite checks.
Add the infrastructure for comparing more than one input filename
(future proofing.)
Move the Makefile dependency target name to the filenames system.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Adds an option to remap file prefixes in output object files. This is
analogous to the "-fdebug-prefix-map" option in GCC, and allows files to
be built in a reproducible manner regardless of the build directory.
[ hpa: this still needs to be documented in doc/running.src. ]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
- Register the map file with the filename system.
- Check to see if the mapfile is clobbering the input.
- Remove the map file if the output file is also removed.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Replace the direct setting of variables for input and output variables
with accessors. This allows for properly tracking the lifetimes of the
data and allows for things like checking of the overwrite of the
primary input file to be centralized.
It isn't possible *in the general case* to check for overwrite of
*any* of the input files, although in the particularly important case
of the assembler proper it ought to be possible to do a bit better:
it should be able to guard for overwrites of non-primary input files
except for the error file or the list file if and only if -Lp is used.
That is, however, a latter project.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
It seems pretty clear from the API that [do_]delete_Token() always was
intended to allow for a NULL option; the test for "if (tp)" is
somewhat pointless when invoking the delete_Token() macro which does a
do_delete_Token(&(t)).
Add in the null check to *tp as well.
Fixes: https://github.com/netwide-assembler/nasm/issues/176
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Do allow the ! as a wildcard for all options to be used in %pragma as
well as on the command line.
Keep track of the command-line default to allow the * modifier (like
warnings) to reset to the command-line default.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
When tokens exceeded INLINE_TEXT, free_Token() had managed to miss
freeing the allocated token buffer.
This is different from the pull request merely in forward-porting the
change to the current code base.
Reported-by: <sorokin@github.com>
Fixes: https://github.com/netwide-assembler/nasm/pull/70
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Allow the user to suppress the abbreviation of the output from TIMES
(and therefore ALIGN) and INCBIN.
Sync the documentation with the help text, too.
Fixes: https://github.com/netwide-assembler/nasm/issues/211
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
pp_getline() returns a string in heap storage, it needs to be freed.
This is done correctly in the other modes, but in preprocessor mode,
the freeing was missed.
This also replaces nasm_free() ... assignment with the nasm_strto()
idiom.
Reported-by: <for-just-we@github.com>
Fixes: https://github.com/netwide-assembler/nasm/issues/254
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
-M* options in response files would hold on to a pointer to the new
value, but in response files that is not a persistent buffer. Make
sure to make a copy instead.
This uses the new nasm_str[dup]to() helpers.
(Note that calling nasm_free() on a NULL pointer is guaranteed safe.)
Reported-by: <BreakingBad6@github.com>
Fixes: https://github.com/netwide-assembler/nasm/issues/222
Fixes: CVE-2026-6068
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
1fc631a173 [directiv.c: $-hex requires nasm_isnumstart, not just nasm_isnumchar]
... was accidentally a commit of a wrong, broken version of the fix
(SIGMY: My fault (core dumped)).
Both the nasm_isidchar() and !nasm_isnumstart() checks need to be
applied to the *same* character, the one immediately after '$'.
Huge special thanks to ecm-pushbx for the quick testing and timely bug
report!
Reported-by: <ecm-pushbx@github.com>
Fixes: https://github.com/netwide-assembler/nasm/issues/252
Fixes: 1fc631a173
Fixes: 178a1b7443
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Travis CI testing with AddressSanitizer (ASan) triggered a severe memory
leak in the assembler label tracking. Local label structures were not
properly freed during cleanup stages. This fix adds proper verification
and destruction of tracking labels, resolving the ASan memory leak.
Signed-off-by: alexvoste <alexvostedev@proton.me>
[ hpa: fixed indentation style and removed unnecessary { } ]
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
The parser incorrectly treated colons as memory segment overrides inside
EQU directives because of an inverted far_jmp_ok check. This regression
was introduced in commit 8981724. Removing the incorrect negation
restores proper parsing of FAR pointer constants.
Fixes#242
Signed-off-by: alexvoste <alexvostedev@proton.me>
When complaining about a valid token where an identifier was expected,
do include the leading $ if at all applicable to avoid confusing the
user.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
For identifier-escapes beginning with $a-f to work, the $ hexadecimal
prefix cannot be used, nor could it ever be used, with A-F immediately
after the $. This is the main reason the $-hex has been deprecated.
When adding the non-dollarhex mode, this got accidentally promoted to
nasm_isnumchar() instead of nasm_isnumstart(), which broke using
$-escaped identifiers in directives.
To fix this properly, it would be a good thing to add a central
identifier-skipping function.
Fixes: https://github.com/netwide-assembler/nasm/issues/223
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
The sequence EXTERN, GLOBAL, definition would fail, because the EXTERN
would create a pseudo-segment and consider it a definition, whereas
GLOBAL would set change it to a global definition, but leaving the
definition existing, which is not the normal case for a GLOBAL symbol
(define_label would not be called.)
Therefore, explicitly "undefine" the symbol by setting defn.defined to
0, as it would be after a GLOBAL statement, as as it is when an EXTERN
statement is followed by a definition (causing it to be implicitly
promoted to GLOBAL.)
Reported-by: E. C. Masloch <ecm-pushbx@github.com>
Reported-by: <roel-z@github.com>
Fixes: https://github.com/netwide-assembler/nasm/issues/224
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
The %clear loop was missing advancing to the next token. Also allow
the list to be comma-separated, like most other cases in NASM.
Reported-by: <magicelk235@gmail.com>
Fixes: https://github.com/netwide-assembler/nasm/issues/227
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Unfortunately, the %rmacro and %irmacro directives were not disabled
when recursive macros were removed due to the implementation did not
work. Make them issue a warning and document that they might change in
the future.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This reverts commit 35ffac3ea0.
This commit caused a regression, causing segment overrides to get
lost. Multiple travis tests failed as a result.
Revert this until a proper solution exists.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
The parser incorrectly treated colons as memory segment overrides inside
EQU directives because of an inverted far_jmp_ok check. This regression
was introduced in commit 8981724. Removing the incorrect negation restores
proper parsing of FAR pointer constants.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
When there is an ill formed assembly (e.g. a macro without a correct
ending), the assembly processing will end with a defining->refcnt
in non-zero value that further causes a nasm_assert in free_mmacro,
the nasm_assert causes a panic.
Force the defining->refcnt to zero in pp_clean_pass as a bailout.
Signed-off-by: Yongjie Sheng (Intel) <sheng.yongjie@outlook.com>
When there is an invalid radix specifier, the parse_smacro_template
set the current char pointer (cp) to NULL, but the tailing processing
of the for loop increases the cp so its value is 0x1 that deceives
the for loop condition check.
Add a NULL pointer checking on the cp after the switch statement
to quit the for loop because of the invalid radix specifier.
Signed-off-by: Yongjie Sheng (Intel) <sheng.yongjie@outlook.com>
A comment accidentally was left with a merge resolution
annotation. This was of course harmless, being in a comment, but it
shouldn't be there.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
ppscan() had a break; statement followed immediately by a return
statement. The latter was left over from code restructuring and is
dead code.
Remove it.
Fix a nearby comment indicating that we should not need to strip a
const from a string pointer. Probably Token::t_charptr should be
const, but it might need additional work.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
When %exitrep incorrectly occurs outside a %rep block, do_exit_macro()
returns NULL, but the %exitrep code would try to set m->in_progress =
1 anyway, causing a NULL pointer dereference and crashing NASM.
Add a NULL pointer guard around this assignment; an error has already
been issued.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
In list_smacro_def(), the number of characters required for the
parameter string description was off by one; fix.
Improve the comment to explain the exact calculation, and make it more
explicit by specifying the calculation as (5+3+1) instead of just 9.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Normally, end of included files or special inputs should be handled by
pp_tokline(), but under some conditions it might be handled by
pp_cleanup_pass(). The latter case would assume the input was from a
file, which would cause a crash if istk->fp is NULL.
Although this should never happen, this is a good reason to merge
these two pieces of code, which ought to be doing the same thing
anyway.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
It is fairly common to want to represent characters like
Ctrl-Z. Instead of having to use character codes, allow these to be
coded as `\^z` or `\^Z` instead.
`\^?` is DEL.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Allow limits to be queried via a %limit() preprocessor function and a
__?NASM_LIMITS?__ macro.
Reset limits at the top of each pass. Note that the pass number limits
are checked at the *end* of the pass, so a %pragma limit will be
properly honored anyway.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This function is invoked separately for each pass; therefore the stall
count would never get incremented. Make it a static variable to make
sure it does get incremented correctly.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Revamp the limit processor to allow a limit to have an absolute
maximum other than LIMIT_MAX_VAL.
Use LIMIT_MAX as a final enum parameter == parameter count == final
actual value + 1, which is the more usual construct and doesn't need
manual updating.
Allow setting a limit to the default value by setting it to "0" or
"default".
Accept "max" or "maximum" instead of "unlimited", specifically to
better handle the case of a fixed maximum < LIMIT_MAX_VAL.
Change the mmacro limit parameter to a dynamic limit, in case someone
needs it.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
There is no conceivable way that a *specified* mmacro parameter count
of anywhere near that much would make sense, and as such almost
certainly represents an error.
Note that the code will still support varadic macros with an excessive
number of parameters.
Use int64_t to make (reasonably) sure that we actually catch
overflows.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
There are still places in the code where "int" are used as
length. Reduce MAX_TEXT to INT_MAX >> 2 so that even adding two
lengths together should make a valid "int".
A token shouldn't be 512GB anyway...
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Add an %env() function for expanding environment variables as a more
flexible and robust alternative to %! (the variable name can be
computed without doing weird things like %tok(%strcat("%!",...)) and a
fallback value can be specified by the user.)
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
The buffer size passed in did not account for the terminating zero,
even though space was allocated for it. Explicitly use the size of the
buffer minus two bytes for the radix prefix instead of 64 (which is
the maximum possible number of digits, not the length of the string
buffer.)
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
C2y adds \o for octal byte escapes, and allows \x, \o, or \u escape
sequences to be enclosed in braces to indicate their termination.
Add a \d sequence as a NASM extension to allow decimal bytes to be
specified.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
When using -LX to debug template selection, emit the specific template
number (as per insnsa.c) as well as the xda line number.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Disentangle the list option setting from the list option
checking. This makes the code simpler for the compiler to grok, and
centralizing code is usually a good idea.
The option setting is hardly performance critical anyway.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Adding information about the NASM internal state to the list file can
be useful for debugging purposes. Separate the list of options that
are "user" options and those that are "debugging" options. The latter
are not implied by -L+ and are intended for NASM developer use.
Introduce -LX, which lists which instruction patterns are matched by
each instruction.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
The "rel" and "iwd" byte codes are supposed to be sensitive to the
operand size of the instruction, but inadvertently were only sensitive
to the CPU mode or an explicit size override for the operand.
"rel" affects direct near jumps, calls, and XBEGIN; "iwd" direct far
jumps and calls. No other instructions use these opcodes.
Fix this, so that e.g. "o32 jmp foo" is treated the same as "jmp dword
foo".
Correct the golden copies of the jmpxx travis tests (which were always
wrong.)
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
To assemble a JMP in the NEAR form the STRICT keyword is needed. This
change introduced recently reportedly breaks building boot sectors and
is non-intuitive since other JMP versions don't behave this way.
Disable optimizing the JMP size if the NEAR keyword is used.
Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
