5 files changed, 44 insertions, 6 deletions

diff --git a/usr.bin/oasm/emit.c b/usr.bin/oasm/emit.c
index 3261522..6b17eab 100644
--- a/usr.bin/oasm/emit.c
+++ b/usr.bin/oasm/emit.c
@@ -357,6 +357,26 @@ emit_encode_mro(struct emit_state *state, struct oasm_token *tok)
     return TAILQ_NEXT(tok, link);
 }
 
+/*
+ * Encode a NOP instruction
+ *
+ * 'nop' - no operands
+ *
+ * Returns the next token on success,
+ * otherwise NULL.
+ */
+static struct oasm_token *
+emit_encode_nop(struct emit_state *state, struct oasm_token *tok)
+{
+    inst_t curinst;
+
+    curinst.opcode = OSMX64_NOP;
+    curinst.rd = 0;
+    curinst.unused = 0;
+    emit_bytes(state, &curinst, sizeof(curinst));
+    return TAILQ_NEXT(tok, link);
+}
+
 int
 emit_osmx64(struct emit_state *state, struct oasm_token *tp)
 {
@@ -428,6 +448,9 @@ emit_process(struct oasm_state *oasm, struct emit_state *emit)
     curtok = TAILQ_FIRST(&emit->ir);
     while (curtok != NULL) {
         switch (curtok->type) {
+        case TT_NOP:
+            curtok = emit_encode_nop(emit, curtok);
+            break;
         case TT_MOV:
             curtok = emit_encode_mov(emit, curtok);
             break;
@@ -448,7 +471,7 @@ emit_process(struct oasm_state *oasm, struct emit_state *emit)
             curtok = emit_encode_hlt(emit, curtok);
             break;
         default:
-            if (lex_is_mro(curtok->type)) {
+            if (tok_is_mro(curtok->type)) {
                 curtok = emit_encode_mro(emit, curtok);
                 break;
             }
diff --git a/usr.bin/oasm/include/oasm/lex.h b/usr.bin/oasm/include/oasm/lex.h
index fa82398..873f6b9 100644
--- a/usr.bin/oasm/include/oasm/lex.h
+++ b/usr.bin/oasm/include/oasm/lex.h
@@ -33,6 +33,7 @@
 #include <sys/queue.h>
 #include <sys/cdefs.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 struct oasm_state;
 
@@ -89,6 +90,7 @@ struct oasm_state;
  */
 typedef enum {
     TT_UNKNOWN,     /* Unknown token */
+    TT_NOP,         /* No operation */
 
     /* Arithmetic instructions */
     TT_ADD,         /* 'add' */
@@ -165,7 +167,7 @@ tok_is_xreg(tt_t tok)
  * instruction. Returns true on match.
  */
 __always_inline static inline bool
-lex_is_mro(tt_t tok)
+tok_is_mro(tt_t tok)
 {
     switch (tok) {
     case TT_MROB:
diff --git a/usr.bin/oasm/label.c b/usr.bin/oasm/label.c
index c54209a..2647bb9 100644
--- a/usr.bin/oasm/label.c
+++ b/usr.bin/oasm/label.c
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
+#include <stdbool.h>
 
 static struct oasm_label *labels[MAX_LABELS];
 static size_t label_count = 0;
diff --git a/usr.bin/oasm/lex.c b/usr.bin/oasm/lex.c
index dcd7c1f..fea9dc3 100644
--- a/usr.bin/oasm/lex.c
+++ b/usr.bin/oasm/lex.c
@@ -40,6 +40,7 @@
 static char putback = '\0';
 
 /* Instruction mnemonic strings */
+#define S_IMN_NOP  "nop"
 #define S_IMN_MOV  "mov"
 #define S_IMN_ADD  "add"
 #define S_IMN_SUB  "sub"
@@ -372,6 +373,13 @@ lex_tok(struct oasm_state *state, struct oasm_token *ttp)
             return 0;
         }
 
+        /* No operation? */
+        if (strcmp(p, S_IMN_NOP) == 0) {
+            ttp->type = TT_NOP;
+            ttp->raw = p;
+            return 0;
+        }
+
         /* Arithmetic operation? */
         if ((tok = token_arith(p)) != TT_UNKNOWN) {
             ttp->type = tok;
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;