diff options
Diffstat (limited to 'usr.bin/oasm/parse.c')
| -rw-r--r-- | usr.bin/oasm/parse.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/oasm/parse.c b/usr.bin/oasm/parse.c index 229455b..c81b498 100644 --- a/usr.bin/oasm/parse.c +++ b/usr.bin/oasm/parse.c @@ -39,6 +39,7 @@ static struct emit_state emit_state; static const char *tokstr[] = { [ TT_UNKNOWN] = "bad", + [ TT_NOP ] = "nop", [ TT_ADD ] = "add", [ TT_SUB ] = "sub", [ TT_MUL ] = "mul", @@ -126,13 +127,12 @@ parse_reg(struct oasm_state *state, struct oasm_token *tok) state->last = tok->type; break; default: - if (lex_is_mro(state->last)) { - state->last = tok->type; + if (tok_is_mro(state->last)) { break; } p = tokstr[state->last]; - oasm_err("bad instruction '%s' for regop\n", p); + oasm_err("bad token '%s' for regop\n", p); return -1; } @@ -154,6 +154,10 @@ parse_tok(struct oasm_state *state, struct oasm_token *tok) int error; switch (tok->type) { + case TT_NOP: + state->last = tok->type; + emit_osmx64(&emit_state, tok); + break; case TT_BR: state->last = tok->type; emit_osmx64(&emit_state, tok); @@ -200,7 +204,7 @@ parse_tok(struct oasm_state *state, struct oasm_token *tok) emit_osmx64(&emit_state, tok); break; default: - if (lex_is_mro(tok->type)) { + if (tok_is_mro(tok->type)) { state->last = tok->type; emit_osmx64(&emit_state, tok); return 0; |