diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2018-06-15 18:20:17 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2018-06-15 18:20:17 -0700 |
| commit | c51369067ce7cfac43d8bc8681a3c916d8d5e503 (patch) | |
| tree | 185bbd5df654b0e0c61c84aa2da144f18406e5f3 /output/outrdf2.c | |
| parent | d3b1832c049c533656fd1945440d637f01a0f1a4 (diff) | |
| download | nasm-c51369067ce7cfac43d8bc8681a3c916d8d5e503.tar.gz | |
errors: simplify nasm_fatal() and nasm_panic()
Nearly all instances of nasm_fatal() and nasm_panic() take a flags
argument of zero. Simplify the code by making nasm_fatal and
nasm_panic default to no flags, and add an alternate version if flags
really are desired. This also means that every call site doesn't have
to initialize a zero argument.
Furthermore, ERR_NOFILE is now often not necessary, as the error code
will no longer cause a null reference if there is no current
file. Therefore, we can remove many instances of ERR_NOFILE which only
deprives the user of information.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'output/outrdf2.c')
| -rw-r--r-- | output/outrdf2.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/output/outrdf2.c b/output/outrdf2.c index fa0886a7..456d1bdf 100644 --- a/output/outrdf2.c +++ b/output/outrdf2.c @@ -145,9 +145,8 @@ static void rdf2_init(void) segdata = seg_alloc(); segbss = seg_alloc(); if (segtext != 0 || segdata != 2 || segbss != 4) - nasm_panic(0, - "rdf segment numbers not allocated as expected (%d,%d,%d)", - segtext, segdata, segbss); + nasm_panic("rdf segment numbers not allocated as expected (%d,%d,%d)", + segtext, segdata, segbss); bsslength = 0; headerlength = 0; } @@ -227,7 +226,7 @@ static int32_t rdf2_section_names(char *name, int pass, int *bits) code = 3; } if (nsegments == RDF_MAXSEGS) { - nasm_fatal(0, "reached compiled-in maximum segment limit (%d)", + nasm_fatal("reached compiled-in maximum segment limit (%d)", RDF_MAXSEGS); return NO_SEG; } @@ -235,7 +234,7 @@ static int32_t rdf2_section_names(char *name, int pass, int *bits) segments[nsegments].segname = nasm_strdup(name); i = seg_alloc(); if (i % 2 != 0) - nasm_panic(0, "seg_alloc() returned odd number"); + nasm_panic("seg_alloc() returned odd number"); segments[nsegments].segnumber = i >> 1; segments[nsegments].segtype = code; segments[nsegments].segreserved = reserved; @@ -497,7 +496,7 @@ static void membufwrite(int segment, const void *data, int bytes) break; } if (i == nsegments) - nasm_panic(0, "can't find segment %d", segment); + nasm_panic("can't find segment %d", segment); if (bytes < 0) { b = buf; @@ -520,7 +519,7 @@ static int getsegmentlength(int segment) break; } if (i == nsegments) - nasm_panic(0, "can't find segment %d", segment); + nasm_panic("can't find segment %d", segment); return segments[i].seglength; } @@ -596,7 +595,7 @@ static void rdf2_out(int32_t segto, const void *data, membufwrite(segto, databuf, asize); } else if (type == OUT_REL2ADR) { if (segment == segto) - nasm_panic(0, "intra-segment OUT_REL2ADR"); + nasm_panic("intra-segment OUT_REL2ADR"); rr.reclen = 8; rr.offset = getsegmentlength(segto); /* current offset */ @@ -628,9 +627,9 @@ static void rdf2_out(int32_t segto, const void *data, membufwrite(segto, &rr.offset, -2); } else if (type == OUT_REL4ADR) { if ((segment == segto) && (globalbits != 64)) - nasm_panic(0, "intra-segment OUT_REL4ADR"); + nasm_panic("intra-segment OUT_REL4ADR"); if (segment != NO_SEG && segment % 2) { - nasm_panic(0, "erm... 4 byte segment base ref?"); + nasm_panic("erm... 4 byte segment base ref?"); } rr.type = RDFREC_RELOC; /* type signature */ |