fixup offset a little bit.

This commit is contained in:
Kelvin Sherlock 2019-04-06 20:55:05 -04:00
parent a7a0138754
commit e91201cff4
1 changed files with 6 additions and 4 deletions

View File

@ -312,6 +312,7 @@ int parse_line(const char *cp, uint32_t *pc) {
cp = parse_pc(cp, &addr);
if (!cp) return error(0, "error");
offset = cp - start;
/* label only? */
if (!*cp) {
@ -319,18 +320,18 @@ int parse_line(const char *cp, uint32_t *pc) {
return 0;
}
offset = cp - start;
cp = parse_opcode(cp, &opcode, &mode);
if (!cp) return error(offset, "bad opcode");
offset = cp - start;
if (mode & (reg | indir_reg | reg_imm)) {
if (*cp == '@') {
indir = 1;
++cp;
}
offset = cp - start;
cp = parse_register(cp, &opcode);
if (!cp) return error(offset, "bad register");
offset = cp - start;
/* cleanup indir */
/* LD / ST */
@ -343,18 +344,19 @@ int parse_line(const char *cp, uint32_t *pc) {
}
offset = cp - start;
bytes[size++] = opcode;
if (mode == reg_imm) {
if (*cp++ != ',')
return error(offset, "bad operand");
return error(offset, "expected ,");
cp = ltrim(cp);
offset = cp - start;
}
if (mode & (relative | reg_imm)) {
cp = parse_address(cp, &operand, addr);
if (!cp) return error(offset, "bad operand");
offset = cp - start;
if (mode == relative) {
int tmp = (addr + 2) & 0xffff;