mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-02-23 17:29:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

BR 1783117: Document that %+ needs a space after it, and fix crash

Browse Source 
Document that %+ needs a space after it due to collision with %+1
syntax for multiline macro arguments; make it issue an error message
rather than crashing.
This commit is contained in:
H. Peter Anvin 2007-09-22 17:45:45 -07:00
parent 441ad9d9b2
commit 25a993488c
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/nasmdoc.src
View File

@ -1891,6 +1891,9 @@ Individual tokens in single line macros can be concatenated, to produce
longer tokens for later processing. This can be useful if there are
several similar macros that perform similar functions.
Please note that a space is required after \c{%+}, in order to
disambiguate it from the syntax \c{%+1} used in multiline macros.
As an example, consider the following:
\c %define BDASTART 400h ; Start of BIOS data area

25
preproc.c
View File

@ -74,7 +74,7 @@ struct SMacro {
SMacro *next;
char *name;
int casesense;
int nparam;
unsigned int nparam;
int in_progress;
Token *expansion;
};
@ -113,7 +113,8 @@ struct MMacro {
MMacro *rep_nest; /* used for nesting %rep */
Token **params; /* actual parameters */
Token *iline; /* invocation line */
int nparam, rotate, *paramlen;
unsigned int nparam, rotate;
int *paramlen;
uint32_t unique;
int lineno; /* Current line number on expansion */
};
@ -2148,12 +2149,13 @@ static int do_directive(Token * tline)
error(ERR_NONFATAL,
"`%%rotate' invoked within macro without parameters");
} else {
mmac->rotate = mmac->rotate + reloc_value(evalresult);
int rotate = mmac->rotate + reloc_value(evalresult);
if (mmac->rotate < 0)
mmac->rotate =
mmac->nparam - (-mmac->rotate) % mmac->nparam;
mmac->rotate %= mmac->nparam;
rotate %= (int)mmac->nparam;
if (rotate < 0)
rotate += mmac->nparam;
mmac->rotate = rotate;
}
return DIRECTIVE_FOUND;
@ -2742,6 +2744,9 @@ static int find_cc(Token * t)
Token *tt;
int i, j, k, m;
if (!t)
return -1; /* Probably a %+ without a space */
skip_white_(t);
if (t->type != TOK_ID)
return -1;
@ -2788,7 +2793,8 @@ static Token *expand_mmac_params(Token * tline)
char *text = NULL;
int type = 0, cc; /* type = 0 to placate optimisers */
char tmpbuf[30];
int n, i;
unsigned int n;
int i;
MMacro *mac;
t = tline;
@ -2945,7 +2951,8 @@ static Token *expand_smacro(Token * tline)
SMacro *head = NULL, *m;
Token **params;
int *paramsize;
int nparam, sparam, brackets, rescan;
unsigned int nparam, sparam;
int brackets, rescan;
Token *org_tline = tline;
Context *ctx;
char *mname;