summaryrefslogtreecommitdiff
path: root/parser.c
diff options
context:
space:
mode:
authorCharles Crayne <chuck@thor.crayne.org>2007-10-29 18:24:59 -0700
committerCharles Crayne <chuck@thor.crayne.org>2007-10-29 18:24:59 -0700
commit052c0bd4843e9222711bec40093ce294d0e32540 (patch)
tree150c2d51724fe18c03dacc438ec01cc54abdc115 /parser.c
parent6745d722f447a7489832746c614024a5dd4cd5a7 (diff)
downloadnasm-052c0bd4843e9222711bec40093ce294d0e32540.tar.gz
Reduce severity of redundant prefixes from error to warning.
Diffstat (limited to 'parser.c')
-rw-r--r--parser.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/parser.c b/parser.c
index 3bca1ce9..fad03e2d 100644
--- a/parser.c
+++ b/parser.c
@@ -258,7 +258,11 @@ insn *parse_line(int pass, char *buffer, insn * result,
} else {
int slot = prefix_slot(tokval.t_integer);
if (result->prefixes[slot]) {
- error(ERR_NONFATAL,
+ if (result->prefixes[slot] == tokval.t_integer)
+ error(ERR_WARNING,
+ "instruction has redundant prefixes");
+ else
+ error(ERR_NONFATAL,
"instruction has conflicting prefixes");
}
result->prefixes[slot] = tokval.t_integer;