aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-07-24 10:25:42 -04:00
Code

nasm.c: use error helpers, remove ERR_NOFILE

Browse Source 
The current error handlers are much smarter about missing filenames,
and thus using ERR_NOFILE just makes it harder for the programmer.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2018-12-10 22:06:15 -08:00
parent a7bc437eab
commit c55702ecb8
1 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
asm/nasm.c
View File

@ -193,7 +193,7 @@ nasm_set_limit(const char *limit, const char *valstr)
} }
if (i > LIMIT_MAX) { if (i > LIMIT_MAX) {
if (passn == 0) if (passn == 0)
errlevel = ERR_WARNING|ERR_NOFILE|ERR_USAGE; errlevel = ERR_WARNING|ERR_USAGE;
else else
errlevel = ERR_WARNING|ERR_PASS1|ERR_WARN_UNKNOWN_PRAGMA; errlevel = ERR_WARNING|ERR_PASS1|ERR_WARN_UNKNOWN_PRAGMA;
nasm_error(errlevel, "unknown limit: `%s'", limit); nasm_error(errlevel, "unknown limit: `%s'", limit);
@ -206,7 +206,7 @@ nasm_set_limit(const char *limit, const char *valstr)
val = readnum(valstr, &rn_error); val = readnum(valstr, &rn_error);
if (rn_error || val < 0) { if (rn_error || val < 0) {
if (passn == 0) if (passn == 0)
errlevel = ERR_WARNING|ERR_NOFILE|ERR_USAGE; errlevel = ERR_WARNING|ERR_USAGE;
else else
errlevel = ERR_WARNING|ERR_PASS1|ERR_WARN_BAD_PRAGMA; errlevel = ERR_WARNING|ERR_PASS1|ERR_WARN_BAD_PRAGMA;
nasm_error(errlevel, "invalid limit value: `%s'", limit); nasm_error(errlevel, "invalid limit value: `%s'", limit);
@ -352,8 +352,7 @@ static void emit_dependencies(struct strlist *list)
if (depend_file && strcmp(depend_file, "-")) { if (depend_file && strcmp(depend_file, "-")) {
deps = nasm_open_write(depend_file, NF_TEXT); deps = nasm_open_write(depend_file, NF_TEXT);
if (!deps) { if (!deps) {
nasm_error(ERR_NONFATAL|ERR_NOFILE|ERR_USAGE, nasm_nonfatal("unable to write dependency file `%s'", depend_file);
"unable to write dependency file `%s'", depend_file);
return; return;
} }
} else { } else {
@ -525,9 +524,7 @@ int main(int argc, char **argv)
outname = filename_set_extension(inname, ofmt->extension); outname = filename_set_extension(inname, ofmt->extension);
if (!strcmp(outname, inname)) { if (!strcmp(outname, inname)) {
outname = "nasm.out"; outname = "nasm.out";
nasm_error(ERR_WARNING, nasm_warn("default output file same as input, using `%s' for output\n", outname);
"default output file same as input, using `%s' for output\n",
outname);
} }
} }
@ -601,8 +598,7 @@ int main(int argc, char **argv)
if (operating_mode & OP_NORMAL) { if (operating_mode & OP_NORMAL) {
ofile = nasm_open_write(outname, (ofmt->flags & OFMT_TEXT) ? NF_TEXT : NF_BINARY); ofile = nasm_open_write(outname, (ofmt->flags & OFMT_TEXT) ? NF_TEXT : NF_BINARY);
if (!ofile) if (!ofile)
nasm_fatalf(ERR_NOFILE, nasm_fatal("unable to open output file `%s'", outname);
"unable to open output file `%s'", outname);
ofmt->init(); ofmt->init();
dfmt->init(); dfmt->init();
@ -613,11 +609,8 @@ int main(int argc, char **argv)
ofmt->cleanup(); ofmt->cleanup();
cleanup_labels(); cleanup_labels();
fflush(ofile); fflush(ofile);
if (ferror(ofile)) { if (ferror(ofile))
nasm_error(ERR_NONFATAL|ERR_NOFILE, nasm_nonfatal("write error on output file `%s'", outname);
"write error on output file `%s'", outname);
terminate_after_phase = true;
}
} }
if (ofile) { if (ofile) {
@ -657,8 +650,7 @@ static char *get_param(char *p, char *q, bool *advance)
*advance = true; *advance = true;
return q; return q;
} }
nasm_error(ERR_NONFATAL | ERR_NOFILE | ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "option `-%c' requires an argument", p[1]);
"option `-%c' requires an argument", p[1]);
return NULL; return NULL;
} }
@ -1051,8 +1043,7 @@ static bool process_arg(char *p, char *q, int pass)
case 'W': case 'W':
if (pass == 2) { if (pass == 2) {
if (!set_warning_status(param)) { if (!set_warning_status(param)) {
nasm_error(ERR_WARNING|ERR_NOFILE|ERR_WARN_UNK_WARNING, nasm_warnf(ERR_WARN_UNK_WARNING, "unknown warning option: %s", param);
"unknown warning option: %s", param);
} }
} }
break; break;
@ -1107,14 +1098,12 @@ static bool process_arg(char *p, char *q, int pass)
/* handled in pass 1 */ /* handled in pass 1 */
break; break;
default: default:
nasm_error(ERR_NONFATAL|ERR_NOFILE|ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "unknown dependency option `-M%c'", p[2]);
"unknown dependency option `-M%c'", p[2]);
break; break;
} }
} }
if (advance && (!q || !q[0])) { if (advance && (!q || !q[0])) {
nasm_error(ERR_NONFATAL|ERR_NOFILE|ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "option `-M%c' requires a parameter", p[2]);
"option `-M%c' requires a parameter", p[2]);
break; break;
} }
break; break;
@ -1150,8 +1139,7 @@ static bool process_arg(char *p, char *q, int pass)
} }
if (!tx->label) { if (!tx->label) {
nasm_error(ERR_NONFATAL | ERR_NOFILE | ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "unrecognized option `--%s'", p);
"unrecognized option `--%s'", p);
} }
eqsave = param = strchr(p+olen, '='); eqsave = param = strchr(p+olen, '=');
@ -1166,17 +1154,12 @@ static bool process_arg(char *p, char *q, int pass)
/* Note: a null string is a valid parameter */ /* Note: a null string is a valid parameter */
if (!param) { if (!param) {
nasm_error(ERR_NONFATAL | ERR_NOFILE | ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "option `--%s' requires an argument", p);
"option `--%s' requires an argument",
p);
break; break;
} }
} else { } else {
if (param) { if (param) {
nasm_error(ERR_NONFATAL | ERR_NOFILE | ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "option `--%s' does not take an argument", p);
"option `--%s' does not take an argument",
p);
} }
} }
@ -1224,8 +1207,7 @@ static bool process_arg(char *p, char *q, int pass)
} }
default: default:
nasm_error(ERR_NONFATAL | ERR_NOFILE | ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "unrecognised option `-%c'", p[1]);
"unrecognised option `-%c'", p[1]);
break; break;
} }
} else if (pass == 2) { } else if (pass == 2) {
@ -1385,9 +1367,9 @@ static void parse_cmdline(int argc, char **argv, int pass)
if (rfile) { if (rfile) {
process_respfile(rfile, pass); process_respfile(rfile, pass);
fclose(rfile); fclose(rfile);
} else } else {
nasm_error(ERR_NONFATAL | ERR_NOFILE | ERR_USAGE, nasm_nonfatalf(ERR_USAGE, "unable to open response file `%s'", p);
"unable to open response file `%s'", p); }
} }
} else } else
advance = process_arg(argv[0], argc > 1 ? argv[1] : NULL, pass); advance = process_arg(argv[0], argc > 1 ? argv[1] : NULL, pass);
@ -1522,7 +1504,7 @@ static void assemble_file(const char *fname, struct strlist *depend_list)
/* forw_ref */ /* forw_ref */
if (output_ins.opcode == I_EQU) { if (output_ins.opcode == I_EQU) {
if (!output_ins.label) { if (!output_ins.label) {
nasm_error(ERR_NONFATAL, "EQU not preceded by label"); nasm_nonfatal("EQU not preceded by label");
} else if (output_ins.operands == 1 && } else if (output_ins.operands == 1 &&
(output_ins.oprs[0].type & IMMEDIATE) && (output_ins.oprs[0].type & IMMEDIATE) &&
output_ins.oprs[0].wrt == NO_SEG) { output_ins.oprs[0].wrt == NO_SEG) {
@ -1541,7 +1523,7 @@ static void assemble_file(const char *fname, struct strlist *depend_list)
output_ins.oprs[0].offset | SEG_ABS, output_ins.oprs[0].offset | SEG_ABS,
output_ins.oprs[1].offset, false); output_ins.oprs[1].offset, false);
} else { } else {
nasm_error(ERR_NONFATAL, "bad syntax for EQU"); nasm_nonfatal("bad syntax for EQU");
} }
} else { /* instruction isn't an EQU */ } else { /* instruction isn't an EQU */
int32_t n; int32_t n;
@ -1661,13 +1643,11 @@ static void assemble_file(const char *fname, struct strlist *depend_list)
if (global_offset_changed && !terminate_after_phase) { if (global_offset_changed && !terminate_after_phase) {
switch (pass0) { switch (pass0) {
case 1: case 1:
nasm_error(ERR_WARNING|ERR_WARN_PHASE, nasm_warnf(ERR_WARN_PHASE, "phase error during stabilization pass, hoping for the best");
"phase error during stabilization pass, hoping for the best");
break; break;
case 2: case 2:
nasm_error(ERR_NONFATAL, nasm_nonfatal("phase error during code generation pass");
"phase error during code generation pass");
break; break;
default: default:
@ -1704,11 +1684,9 @@ static void assemble_file(const char *fname, struct strlist *depend_list)
/* We get here if the labels don't converge /* We get here if the labels don't converge
* Example: FOO equ FOO + 1 * Example: FOO equ FOO + 1
*/ */
nasm_error(ERR_NONFATAL, nasm_nonfatal("Can't find valid values for all labels "
"Can't find valid values for all labels "
"after %"PRId64" passes, giving up.", passn); "after %"PRId64" passes, giving up.", passn);
nasm_error(ERR_NONFATAL, nasm_note("Possible causes: recursive EQUs, macro abuse.");
"Possible causes: recursive EQUs, macro abuse.");
break; break;
} }
} }