From 348697548884b8f1943fe4545df7f34adb79b0ae Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Mon, 21 Jul 2025 09:00:41 -0400 Subject: oasm: Implement encoding for 'ADD' instruction Signed-off-by: Ian Moffett --- usr.bin/oasm/emit.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'usr.bin/oasm/emit.c') diff --git a/usr.bin/oasm/emit.c b/usr.bin/oasm/emit.c index 4783afd..ee13582 100644 --- a/usr.bin/oasm/emit.c +++ b/usr.bin/oasm/emit.c @@ -169,6 +169,57 @@ emit_encode_incdec(struct emit_state *state, struct oasm_token *tok) return TAILQ_NEXT(tok, link); } +/* + * Encode an ADD instruction + * + * add [r], + * + * Returns the next token on success, + * otherwise NULL. + */ +static struct oasm_token * +emit_encode_add(struct emit_state *state, struct oasm_token *tok) +{ + inst_t curinst; + reg_t rd; + + /* + * The next operand must be an X + * register. + */ + tok = TAILQ_NEXT(tok, link); + if (tok == NULL) { + return NULL; + } + if (!tok_is_xreg(tok->type)) { + oasm_err("[emit error]: bad 'add' order\n"); + return NULL; + } + + /* Get the register and validate it */ + rd = ir_to_reg(tok->type); + if (rd == OSMX64_R_BAD) { + oasm_err("[emit error]: got bad reg in 'add'\n"); + return NULL; + } + + /* The next token should be an */ + tok = TAILQ_NEXT(tok, link); + if (tok == NULL) { + return NULL; + } + if (tok->type != TT_IMM) { + oasm_err("[emit error]: expected in 'add'\n"); + return NULL; + } + + curinst.opcode = OSMX64_ADD; + curinst.rd = rd; + curinst.imm = tok->imm; + emit_bytes(state, &curinst, sizeof(curinst)); + return TAILQ_NEXT(tok, link); +} + int emit_osxm64(struct emit_state *state, struct oasm_token *tp) { @@ -247,6 +298,9 @@ emit_process(struct oasm_state *oasm, struct emit_state *emit) case TT_DEC: curtok = emit_encode_incdec(emit, curtok); break; + case TT_ADD: + curtok = emit_encode_add(emit, curtok); + break; default: curtok = TAILQ_NEXT(curtok, link); break; -- cgit v1.2.3