mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-18 16:25:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

errors: unify nasm_verror_{gnu,vc} and remove some ERR_NOFILE

Browse Source 
The differences between nasm_verror_{gnu,vc} are a short handful of
strings, so unify them. Remove some additional ERR_NOFILE that are not
necessary.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2018-12-10 22:29:49 -08:00 committed by H. Peter Anvin (Intel)
parent dea7f4733f
commit c0b32a3650
1 changed files with 51 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
asm/nasm.c
View File

@ -77,12 +77,20 @@ struct forwrefinfo { /* info held on forward refs. */
static void parse_cmdline(int, char **, int); static void parse_cmdline(int, char **, int);
static void assemble_file(const char *, StrList **); static void assemble_file(const char *, StrList **);
static bool skip_this_pass(int severity); static bool skip_this_pass(int severity);
static void nasm_verror_gnu(int severity, const char *fmt, va_list args); static void nasm_verror_asm(int severity, const char *fmt, va_list args);
static void nasm_verror_vc(int severity, const char *fmt, va_list args);
static void nasm_verror_common(int severity, const char *fmt, va_list args);
static void usage(void); static void usage(void);
static void help(char xopt); static void help(char xopt);
struct error_format {
const char *beforeline; /* Before line number, if present */
const char *afterline; /* After line number, if present */
const char *beforemsg; /* Before actual message */
};
static const struct error_format errfmt_gnu = { ":", "", ": " };
static const struct error_format errfmt_msvc = { "(", ")", " : " };
static const struct error_format *errfmt = &errfmt_gnu;
static bool using_debug_info, opt_verbose_info; static bool using_debug_info, opt_verbose_info;
static const char *debug_format; static const char *debug_format;
@ -452,7 +460,7 @@ int main(int argc, char **argv)
pass0 = 0; pass0 = 0;
want_usage = terminate_after_phase = false; want_usage = terminate_after_phase = false;
nasm_set_verror(nasm_verror_gnu); nasm_set_verror(nasm_verror_asm);
error_file = stderr; error_file = stderr;
@ -489,7 +497,7 @@ int main(int argc, char **argv)
} else { } else {
dfmt = dfmt_find(ofmt, debug_format); dfmt = dfmt_find(ofmt, debug_format);
if (!dfmt) { if (!dfmt) {
nasm_fatal(ERR_NOFILE | ERR_USAGE, nasm_fatal(ERR_USAGE,
"unrecognized debug format `%s' for" "unrecognized debug format `%s' for"
" output format `%s'", " output format `%s'",
debug_format, ofmt->shortname); debug_format, ofmt->shortname);
@ -556,9 +564,7 @@ int main(int argc, char **argv)
if (outname) { if (outname) {
ofile = nasm_open_write(outname, NF_TEXT); ofile = nasm_open_write(outname, NF_TEXT);
if (!ofile) if (!ofile)
nasm_fatal(ERR_NOFILE, nasm_fatal(0, "unable to open output file `%s'", outname);
"unable to open output file `%s'",
outname);
} else } else
ofile = NULL; ofile = NULL;
@ -898,9 +904,7 @@ static bool process_arg(char *p, char *q, int pass)
if (pass == 1) { if (pass == 1) {
ofmt = ofmt_find(param, &ofmt_alias); ofmt = ofmt_find(param, &ofmt_alias);
if (!ofmt) { if (!ofmt) {
nasm_fatal(ERR_NOFILE | ERR_USAGE, nasm_fatal(ERR_USAGE, "unrecognised output format `%s' - use -hf for a list", param);
"unrecognised output format `%s' - "
"use -hf for a list", param);
} }
} }
break; break;
@ -994,14 +998,12 @@ static bool process_arg(char *p, char *q, int pass)
case 'X': /* specify error reporting format */ case 'X': /* specify error reporting format */
if (pass == 1) { if (pass == 1) {
if (nasm_stricmp("vc", param) == 0) if (!nasm_stricmp("vc", param) || !nasm_stricmp("msvc", param) || !nasm_stricmp("ms", param))
nasm_set_verror(nasm_verror_vc); errfmt = &errfmt_msvc;
else if (nasm_stricmp("gnu", param) == 0) else if (!nasm_stricmp("gnu", param) || !nasm_stricmp("gcc", param))
nasm_set_verror(nasm_verror_gnu); errfmt = &errfmt_gnu;
else else
nasm_fatal(ERR_NOFILE | ERR_USAGE, nasm_fatal(ERR_USAGE, "unrecognized error reporting format `%s'", param);
"unrecognized error reporting format `%s'",
param);
} }
break; break;
@ -1401,8 +1403,7 @@ static void parse_cmdline(int argc, char **argv, int pass)
return; return;
if (!inname) if (!inname)
nasm_fatal(ERR_NOFILE | ERR_USAGE, "no input file specified"); nasm_fatal(ERR_USAGE, "no input file specified");
else if ((errname && !strcmp(inname, errname)) || else if ((errname && !strcmp(inname, errname)) ||
(outname && !strcmp(inname, outname)) || (outname && !strcmp(inname, outname)) ||
(listname && !strcmp(inname, listname)) || (listname && !strcmp(inname, listname)) ||
@ -1413,9 +1414,7 @@ static void parse_cmdline(int argc, char **argv, int pass)
error_file = nasm_open_write(errname, NF_TEXT); error_file = nasm_open_write(errname, NF_TEXT);
if (!error_file) { if (!error_file) {
error_file = stderr; /* Revert to default! */ error_file = stderr; /* Revert to default! */
nasm_fatal(ERR_NOFILE | ERR_USAGE, nasm_fatal(ERR_USAGE, "cannot open file `%s' for error messages", errname);
"cannot open file `%s' for error messages",
errname);
} }
} }
} }
@ -1786,85 +1785,6 @@ static bool warning_is_error(int severity)
return !!(warning_state[warn_index(severity)] & WARN_ST_ERROR); return !!(warning_state[warn_index(severity)] & WARN_ST_ERROR);
} }
/**
* gnu style error reporting
* This function prints an error message to error_file in the
* style used by GNU. An example would be:
* file.asm:50: error: blah blah blah
* where file.asm is the name of the file, 50 is the line number on
* which the error occurs (or is detected) and "error:" is one of
* the possible optional diagnostics -- it can be "error" or "warning"
* or something else. Finally the line terminates with the actual
* error message.
*
* @param severity the severity of the warning or error
* @param fmt the printf style format string
*/
static void nasm_verror_gnu(int severity, const char *fmt, va_list ap)
{
const char *currentfile = NULL;
int32_t lineno = 0;
if (is_suppressed(severity))
return;
if (!(severity & ERR_NOFILE)) {
src_get(&lineno, &currentfile);
if (!currentfile) {
currentfile = inname && inname[0] ?
inname : outname && outname[0] ?
outname : NULL;
lineno = 0;
}
}
if (!skip_this_pass(severity)) {
if (!lineno)
fprintf(error_file, "%s: ", currentfile ? currentfile : "nasm");
else
fprintf(error_file, "%s:%"PRId32": ", currentfile, lineno);
}
nasm_verror_common(severity, fmt, ap);
}
/**
* MS style error reporting
* This function prints an error message to error_file in the
* style used by Visual C and some other Microsoft tools. An example
* would be:
* file.asm(50) : error: blah blah blah
* where file.asm is the name of the file, 50 is the line number on
* which the error occurs (or is detected) and "error:" is one of
* the possible optional diagnostics -- it can be "error" or "warning"
* or something else. Finally the line terminates with the actual
* error message.
*
* @param severity the severity of the warning or error
* @param fmt the printf style format string
*/
static void nasm_verror_vc(int severity, const char *fmt, va_list ap)
{
const char *currentfile = NULL;
int32_t lineno = 0;
if (is_suppressed(severity))
return;
if (!(severity & ERR_NOFILE))
src_get(&lineno, &currentfile);
if (!skip_this_pass(severity)) {
if (lineno) {
fprintf(error_file, "%s(%"PRId32") : ", currentfile, lineno);
} else {
fprintf(error_file , "%s : ", currentfile ? currentfile : "nasm");
}
}
nasm_verror_common(severity, fmt, ap);
}
/** /**
* common error reporting * common error reporting
* This is the common back end of the error reporting schemes currently * This is the common back end of the error reporting schemes currently
@ -1875,11 +1795,29 @@ static void nasm_verror_vc(int severity, const char *fmt, va_list ap)
* @param severity the severity of the warning or error * @param severity the severity of the warning or error
* @param fmt the printf style format string * @param fmt the printf style format string
*/ */
static void nasm_verror_common(int severity, const char *fmt, va_list args) static void nasm_verror_asm(int severity, const char *fmt, va_list args)
{ {
char msg[1024]; char msg[1024];
const char *pfx; const char *pfx;
bool warn_is_err = warning_is_error(severity); bool warn_is_err = warning_is_error(severity);
const char *currentfile = NULL;
int32_t lineno = 0;
if (is_suppressed(severity))
return;
if (!(severity & ERR_NOFILE)) {
src_get(&lineno, &currentfile);
if (!currentfile) {
currentfile = currentfile ? currentfile :
inname && inname[0] ? inname :
outname && outname[0] ? outname :
NULL;
lineno = 0;
}
}
if (!currentfile)
currentfile = "nasm";
switch (severity & (ERR_MASK|ERR_NO_SEVERITY)) { switch (severity & (ERR_MASK|ERR_NO_SEVERITY)) {
case ERR_NOTE: case ERR_NOTE:
@ -1916,8 +1854,16 @@ static void nasm_verror_common(int severity, const char *fmt, va_list args)
warnings[warn_index(severity)].name); warnings[warn_index(severity)].name);
} }
if (!skip_this_pass(severity)) if (!skip_this_pass(severity)) {
fprintf(error_file, "%s%s\n", pfx, msg); if (!lineno) {
fprintf(error_file, "%s%s%s%s\n",
currentfile, errfmt->beforemsg, pfx, msg);
} else {
fprintf(error_file, "%s%s%"PRId32"%s%s%s%s\n",
currentfile, errfmt->beforeline, lineno,
errfmt->afterline, errfmt->beforemsg, pfx, msg);
}
}
/* Are we recursing from error_list_macros? */ /* Are we recursing from error_list_macros? */
if (severity & ERR_PP_LISTMACRO) if (severity & ERR_PP_LISTMACRO)