summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-09-17 16:31:33 -0700
committerH. Peter Anvin <hpa@zytor.com>2007-09-17 16:31:33 -0700
commit8f94f988f0413c35520095866e00ac358d36c99c (patch)
tree84df04291962d9a0fe17613967314a4ad6cd7f7a
parent19315e012fda54ec3e4af65849170ab335dcc36f (diff)
downloadnasm-8f94f988f0413c35520095866e00ac358d36c99c.tar.gz
Fix a few instances of missing renumbers
parser.c: change hard-coded argument count 3 to MAX_ARGUMENTS assemble.c: change a few missed code renumbers
-rw-r--r--assemble.c4
-rw-r--r--parser.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/assemble.c b/assemble.c
index 0821101a..f1b4dbb9 100644
--- a/assemble.c
+++ b/assemble.c
@@ -1272,7 +1272,7 @@ static void gencode(int32_t segment, int32_t offset, int bits,
errfunc(ERR_WARNING, "word value exceeds bounds");
}
out(offset, segment, &data, OUT_ADDRESS + 2,
- ins->oprs[c - 0140].segment, ins->oprs[c - 0130].wrt);
+ ins->oprs[c - 0140].segment, ins->oprs[c - 0140].wrt);
offset += 2;
}
break;
@@ -1302,7 +1302,7 @@ static void gencode(int32_t segment, int32_t offset, int bits,
offset++;
} else {
out(offset, segment, &data, OUT_ADDRESS + 4,
- ins->oprs[c - 0150].segment, ins->oprs[c - 0140].wrt);
+ ins->oprs[c - 0150].segment, ins->oprs[c - 0150].wrt);
offset += 4;
}
break;
diff --git a/parser.c b/parser.c
index 1c7b8d9b..16164d77 100644
--- a/parser.c
+++ b/parser.c
@@ -339,10 +339,10 @@ insn *parse_line(int pass, char *buffer, insn * result,
return result;
}
- /* right. Now we begin to parse the operands. There may be up to three
+ /* right. Now we begin to parse the operands. There may be up to four
* of these, separated by commas, and terminated by a zero token. */
- for (operand = 0; operand < 3; operand++) {
+ for (operand = 0; operand < MAX_OPERANDS; operand++) {
expr *value; /* used most of the time */
int mref; /* is this going to be a memory ref? */
int bracket; /* is it a [] mref, or a & mref? */