mirror of
https://github.com/netwide-assembler/nasm
synced 2026-08-26 16:23:04 -04:00
BR 3392652: hold smacro expansion warnings until we are sure
Don't issue smacro expansion warnings until we are sure we are actually *done* with the smacro expansion. The last pass of expand_smacro_noreset() gets to commit warnings. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel)
parent
12df4dd12f
commit
4964d80fe4
4 changed files with 157 additions and 37 deletions
157
asm/nasm.c
157
asm/nasm.c
|
|
@ -1892,6 +1892,76 @@ fatal_func nasm_verror_critical(errflags severity, const char *fmt, va_list args
|
|||
die_hard(true_type, severity);
|
||||
}
|
||||
|
||||
/**
|
||||
* Stack of tentative error hold lists.
|
||||
*/
|
||||
struct nasm_errtext {
|
||||
struct nasm_errtext *next;
|
||||
const char *currentfile; /* Owned by the filename system */
|
||||
char *msg; /* Owned by this structure */
|
||||
errflags severity;
|
||||
errflags true_type;
|
||||
int32_t lineno;
|
||||
};
|
||||
struct nasm_errhold {
|
||||
struct nasm_errhold *up;
|
||||
struct nasm_errtext *head, **tail;
|
||||
};
|
||||
static struct nasm_errhold *errhold_stack;
|
||||
|
||||
static void nasm_free_error(struct nasm_errtext *et)
|
||||
{
|
||||
nasm_free(et->msg);
|
||||
nasm_free(et);
|
||||
}
|
||||
|
||||
static void nasm_issue_error(struct nasm_errtext *et);
|
||||
|
||||
struct nasm_errhold *nasm_error_hold_push(void)
|
||||
{
|
||||
struct nasm_errhold *eh;
|
||||
|
||||
nasm_new(eh);
|
||||
eh->up = errhold_stack;
|
||||
eh->tail = &eh->head;
|
||||
errhold_stack = eh;
|
||||
|
||||
return eh;
|
||||
}
|
||||
|
||||
void nasm_error_hold_pop(struct nasm_errhold *eh, bool issue)
|
||||
{
|
||||
struct nasm_errtext *et, *etmp;
|
||||
|
||||
/* Allow calling with a null argument saying no hold in the first place */
|
||||
if (!eh)
|
||||
return;
|
||||
|
||||
/* This *must* be the current top of the errhold stack */
|
||||
nasm_assert(eh == errhold_stack);
|
||||
|
||||
if (eh->head) {
|
||||
if (issue) {
|
||||
if (eh->up) {
|
||||
/* Commit the current hold list to the previous level */
|
||||
*eh->up->tail = eh->head;
|
||||
eh->up->tail = eh->tail;
|
||||
} else {
|
||||
/* Issue errors */
|
||||
list_for_each_safe(et, etmp, eh->head)
|
||||
nasm_issue_error(et);
|
||||
}
|
||||
} else {
|
||||
/* Free the list, drop errors */
|
||||
list_for_each_safe(et, etmp, eh->head)
|
||||
nasm_free_error(et);
|
||||
}
|
||||
}
|
||||
|
||||
errhold_stack = eh->up;
|
||||
nasm_free(eh);
|
||||
}
|
||||
|
||||
/**
|
||||
* common error reporting
|
||||
* This is the common back end of the error reporting schemes currently
|
||||
|
|
@ -1904,13 +1974,8 @@ fatal_func nasm_verror_critical(errflags severity, const char *fmt, va_list args
|
|||
*/
|
||||
void nasm_verror(errflags severity, const char *fmt, va_list args)
|
||||
{
|
||||
char msg[1024];
|
||||
char warnsuf[64];
|
||||
char linestr[64];
|
||||
const char *pfx;
|
||||
struct nasm_errtext *et;
|
||||
errflags true_type = true_error_type(severity);
|
||||
const char *currentfile = NULL;
|
||||
int32_t lineno = 0;
|
||||
|
||||
if (true_type >= ERR_CRITICAL)
|
||||
nasm_verror_critical(severity, fmt, args);
|
||||
|
|
@ -1918,23 +1983,60 @@ void nasm_verror(errflags severity, const char *fmt, va_list args)
|
|||
if (is_suppressed(severity))
|
||||
return;
|
||||
|
||||
nasm_new(et);
|
||||
et->severity = severity;
|
||||
et->true_type = true_type;
|
||||
et->msg = nasm_vasprintf(fmt, args);
|
||||
if (!(severity & ERR_NOFILE)) {
|
||||
src_get(&lineno, ¤tfile);
|
||||
if (!currentfile) {
|
||||
currentfile =
|
||||
src_get(&et->lineno, &et->currentfile);
|
||||
|
||||
if (!et->currentfile) {
|
||||
et->currentfile =
|
||||
inname && inname[0] ? inname :
|
||||
outname && outname[0] ? outname :
|
||||
NULL;
|
||||
lineno = 0;
|
||||
et->lineno = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (errhold_stack && true_type <= ERR_NONFATAL) {
|
||||
/* It is a tentative error */
|
||||
*errhold_stack->tail = et;
|
||||
errhold_stack->tail = &et->next;
|
||||
} else {
|
||||
nasm_issue_error(et);
|
||||
}
|
||||
|
||||
/*
|
||||
* Don't do this before then, if we do, we lose messages in the list
|
||||
* file, as the list file is only generated in the last pass.
|
||||
*/
|
||||
if (skip_this_pass(severity))
|
||||
return;
|
||||
|
||||
if (!(severity & (ERR_HERE|ERR_PP_LISTMACRO)))
|
||||
if (preproc)
|
||||
preproc->error_list_macros(severity);
|
||||
}
|
||||
|
||||
/*
|
||||
* Actually print, list and take action on an error
|
||||
*/
|
||||
static void nasm_issue_error(struct nasm_errtext *et)
|
||||
{
|
||||
const char *pfx;
|
||||
char warnsuf[64]; /* Warning suffix */
|
||||
char linestr[64]; /* Formatted line number if applicable */
|
||||
const errflags severity = et->severity;
|
||||
const errflags true_type = et->true_type;
|
||||
const char * const currentfile = et->currentfile;
|
||||
const uint32_t lineno = et->lineno;
|
||||
|
||||
if (severity & ERR_NO_SEVERITY)
|
||||
pfx = "";
|
||||
else
|
||||
pfx = error_pfx_table[true_type];
|
||||
|
||||
vsnprintf(msg, sizeof msg, fmt, args);
|
||||
*warnsuf = 0;
|
||||
if ((severity & (ERR_MASK|ERR_HERE|ERR_PP_LISTMACRO)) == ERR_WARNING) {
|
||||
/*
|
||||
|
|
@ -1956,19 +2058,15 @@ void nasm_verror(errflags severity, const char *fmt, va_list args)
|
|||
const char *file = currentfile ? currentfile : no_file_name;
|
||||
const char *here = "";
|
||||
|
||||
if (severity & ERR_HERE)
|
||||
here = currentfile ? " here" : " in an unknown location";
|
||||
|
||||
if (warn_list && true_type < ERR_NONFATAL &&
|
||||
!(pass_first() && (severity & ERR_PASS1)))
|
||||
{
|
||||
!(pass_first() && (severity & ERR_PASS1))) {
|
||||
/*
|
||||
* Buffer up warnings until we either get an error
|
||||
* or we are on the code-generation pass.
|
||||
*/
|
||||
strlist_printf(warn_list, "%s%s%s%s%s%s%s",
|
||||
file, linestr, errfmt->beforemsg,
|
||||
pfx, msg, here, warnsuf);
|
||||
pfx, et->msg, here, warnsuf);
|
||||
} else {
|
||||
/*
|
||||
* If we have buffered warnings, and this is a non-warning,
|
||||
|
|
@ -1979,16 +2077,13 @@ void nasm_verror(errflags severity, const char *fmt, va_list args)
|
|||
strlist_free(&warn_list);
|
||||
}
|
||||
|
||||
fprintf(error_file, "%s%s%s%s%s%s%s\n",
|
||||
file, linestr, errfmt->beforemsg,
|
||||
pfx, msg, here, warnsuf);
|
||||
|
||||
fprintf(error_file, "%s\n", et->msg);
|
||||
}
|
||||
}
|
||||
|
||||
/* Are we recursing from error_list_macros? */
|
||||
if (severity & ERR_PP_LISTMACRO)
|
||||
return;
|
||||
goto done;
|
||||
|
||||
/*
|
||||
* Don't suppress this with skip_this_pass(), or we don't get
|
||||
|
|
@ -1997,29 +2092,27 @@ void nasm_verror(errflags severity, const char *fmt, va_list args)
|
|||
if (severity & ERR_HERE) {
|
||||
if (lineno)
|
||||
lfmt->error(severity, "%s%s at %s:%"PRId32"%s",
|
||||
pfx, msg, currentfile, lineno, warnsuf);
|
||||
pfx, et->msg, currentfile, lineno, warnsuf);
|
||||
else if (currentfile)
|
||||
lfmt->error(severity, "%s%s in file %s%s",
|
||||
pfx, msg, currentfile, warnsuf);
|
||||
pfx, et->msg, currentfile, warnsuf);
|
||||
else
|
||||
lfmt->error(severity, "%s%s in an unknown location%s",
|
||||
pfx, msg, warnsuf);
|
||||
pfx, et->msg, warnsuf);
|
||||
} else {
|
||||
lfmt->error(severity, "%s%s%s", pfx, msg, warnsuf);
|
||||
lfmt->error(severity, "%s%s%s", pfx, et->msg, warnsuf);
|
||||
}
|
||||
|
||||
if (skip_this_pass(severity))
|
||||
return;
|
||||
|
||||
/* error_list_macros can for obvious reasons not work with ERR_HERE */
|
||||
if (!(severity & ERR_HERE))
|
||||
if (preproc)
|
||||
preproc->error_list_macros(severity);
|
||||
goto done;
|
||||
|
||||
if (true_type >= ERR_FATAL)
|
||||
die_hard(true_type, severity);
|
||||
else if (true_type >= ERR_NONFATAL)
|
||||
terminate_after_phase = true;
|
||||
|
||||
done:
|
||||
nasm_free_error(et);
|
||||
}
|
||||
|
||||
static void usage(void)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* ----------------------------------------------------------------------- *
|
||||
*
|
||||
* Copyright 1996-2019 The NASM Authors - All Rights Reserved
|
||||
* Copyright 1996-2020 The NASM Authors - All Rights Reserved
|
||||
* See the file AUTHORS included with the NASM distribution for
|
||||
* the specific copyright holders.
|
||||
*
|
||||
|
|
@ -5127,7 +5127,7 @@ static SMacro *expand_one_smacro(Token ***tpp)
|
|||
*! warns about \i{single-line macros} being invoked
|
||||
*! with the wrong number of parameters.
|
||||
*/
|
||||
nasm_warn(WARN_MACRO_PARAMS_SINGLE,
|
||||
nasm_warn(WARN_MACRO_PARAMS_SINGLE|ERR_HOLD,
|
||||
"single-line macro `%s' exists, "
|
||||
"but not taking %d parameter%s",
|
||||
mname, nparam, (nparam == 1) ? "" : "s");
|
||||
|
|
@ -5455,6 +5455,7 @@ static Token *expand_smacro_noreset(Token *org_tline)
|
|||
{
|
||||
Token *tline;
|
||||
bool expanded;
|
||||
errhold errhold; /* Hold warning/errors during expansion */
|
||||
|
||||
if (!org_tline)
|
||||
return NULL; /* Empty input */
|
||||
|
|
@ -5474,6 +5475,7 @@ static Token *expand_smacro_noreset(Token *org_tline)
|
|||
* look up the macro "MACROTAIL", which we don't want.
|
||||
*/
|
||||
expanded = true;
|
||||
|
||||
while (true) {
|
||||
static const struct tokseq_match tmatch[] = {
|
||||
{
|
||||
|
|
@ -5489,7 +5491,14 @@ static Token *expand_smacro_noreset(Token *org_tline)
|
|||
}
|
||||
};
|
||||
Token **tail = &tline;
|
||||
errhold = nasm_error_hold_push();
|
||||
|
||||
/*
|
||||
* We hold warnings/errors until we are done this this loop. It is
|
||||
* possible for nuisance warnings to appear that disappear on later
|
||||
* passes.
|
||||
*/
|
||||
errhold = nasm_error_hold_push();
|
||||
while (*tail) /* main token loop */
|
||||
expanded |= !!expand_one_smacro(&tail);
|
||||
|
||||
|
|
@ -5507,7 +5516,9 @@ static Token *expand_smacro_noreset(Token *org_tline)
|
|||
break; /* Done again! */
|
||||
|
||||
expanded = false;
|
||||
nasm_error_hold_pop(errhold, false);
|
||||
}
|
||||
nasm_error_hold_pop(errhold, true);
|
||||
|
||||
if (!tline) {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* ----------------------------------------------------------------------- *
|
||||
*
|
||||
* Copyright 1996-2019 The NASM Authors - All Rights Reserved
|
||||
* Copyright 1996-2020 The NASM Authors - All Rights Reserved
|
||||
* See the file AUTHORS included with the NASM distribution for
|
||||
* the specific copyright holders.
|
||||
*
|
||||
|
|
@ -99,13 +99,14 @@ fatal_func nasm_verror_critical(errflags severity, const char *fmt, va_list ap);
|
|||
#define ERR_NO_SEVERITY 0x00000200 /* suppress printing severity */
|
||||
#define ERR_PP_PRECOND 0x00000400 /* for preprocessor use */
|
||||
#define ERR_PP_LISTMACRO 0x00000800 /* from preproc->error_list_macros() */
|
||||
#define ERR_HOLD 0x00001000 /* this error/warning can be held */
|
||||
|
||||
/*
|
||||
* These codes define specific types of suppressible warning.
|
||||
* They are assumed to occupy the most significant bits of the
|
||||
* severity code.
|
||||
*/
|
||||
#define WARN_SHR 12 /* how far to shift right */
|
||||
#define WARN_SHR 16 /* how far to shift right */
|
||||
#define WARN_IDX(x) (((errflags)(x)) >> WARN_SHR)
|
||||
#define WARN_MASK ((~(errflags)0) << WARN_SHR)
|
||||
|
||||
|
|
@ -127,6 +128,21 @@ void pop_warnings(void);
|
|||
void init_warnings(void);
|
||||
void reset_warnings(void);
|
||||
|
||||
/*
|
||||
* Tentative error hold for warnings/errors indicated with ERR_HOLD.
|
||||
*
|
||||
* This is a stack; the "hold" argument *must*
|
||||
* match the value returned from nasm_error_hold_push().
|
||||
* If "issue" is true the errors are committed (or promoted to the next
|
||||
* higher stack level), if false then they are discarded.
|
||||
*
|
||||
* Errors stronger than ERR_NONFATAL cannot be held.
|
||||
*/
|
||||
struct nasm_errhold;
|
||||
typedef struct nasm_errhold *errhold;
|
||||
errhold nasm_error_hold_push(void);
|
||||
void nasm_error_hold_pop(errhold hold, bool issue);
|
||||
|
||||
/* Should be included from within error.h only */
|
||||
#include "warnings.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1344,4 +1344,4 @@ extern const char *outname; /* output filename */
|
|||
*/
|
||||
int64_t switch_segment(int32_t segment);
|
||||
|
||||
#endif
|
||||
#endif /* NASM_NASM_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue