Implemented CALL(_STACK) and RET on the assembler

3 files changed, 38 insertions, 1 deletions

diff --git a/asm/lexer.c b/asm/lexer.c
index baa5e92..525deb2 100644
--- a/asm/lexer.c
+++ b/asm/lexer.c
@@ -92,6 +92,12 @@ const char *token_type_as_cstr(token_type_t type)
     return "JUMP_STACK";
   case TOKEN_JUMP_IF:
     return "JUMP_IF";
+  case TOKEN_CALL:
+    return "CALL";
+  case TOKEN_CALL_STACK:
+    return "CALL_STACK";
+  case TOKEN_RET:
+    return "RET";
   case TOKEN_SYMBOL:
     return "SYMBOL";
   }
@@ -139,7 +145,7 @@ bool is_valid_hex_char(char c)
 
 token_t tokenise_symbol(buffer_t *buffer, size_t *column)
 {
-  static_assert(NUMBER_OF_OPCODES == 95, "tokenise_buffer: Out of date!");
+  static_assert(NUMBER_OF_OPCODES == 98, "tokenise_buffer: Out of date!");
 
   size_t sym_size = 0;
   for (; sym_size < space_left(buffer) &&
@@ -310,6 +316,21 @@ token_t tokenise_symbol(buffer_t *buffer, size_t *column)
     offset = 8;
     type   = TOKEN_JUMP_IF;
   }
+  else if (sym_size == 10 && strncmp(opcode, "CALL.STACK", 10) == 0)
+  {
+    offset = 10;
+    type   = TOKEN_CALL_STACK;
+  }
+  else if (sym_size == 4 && strncmp(opcode, "CALL", 4) == 0)
+  {
+    offset = 4;
+    type   = TOKEN_CALL;
+  }
+  else if (sym_size == 3 && strncmp(opcode, "RET", 3) == 0)
+  {
+    offset = 3;
+    type   = TOKEN_RET;
+  }
   else
     is_opcode = false;
 
diff --git a/asm/lexer.h b/asm/lexer.h
index 687e1a6..cdddb6a 100644
--- a/asm/lexer.h
+++ b/asm/lexer.h
@@ -51,6 +51,9 @@ typedef enum TokenType
   TOKEN_JUMP_ABS,
   TOKEN_JUMP_STACK,
   TOKEN_JUMP_IF,
+  TOKEN_CALL,
+  TOKEN_CALL_STACK,
+  TOKEN_RET,
   TOKEN_SYMBOL,
 } token_type_t;
 
diff --git a/asm/parser.c b/asm/parser.c
index 4f76fe5..cf2e53e 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -418,6 +418,19 @@ perr_t parse_next(token_stream_t *stream, presult_t *ret)
     *ret = (presult_t){.instruction = INST_JUMP_IF(BYTE, 0)};
     return parse_jump_inst_operand(stream, ret);
   }
+  case TOKEN_CALL:
+    *ret = (presult_t){.instruction = INST_CALL(0)};
+    ++stream->used;
+    if (stream->used >= stream->available)
+      return PERR_EXPECTED_OPERAND;
+    return parse_word_label_or_relative(stream, ret);
+  case TOKEN_CALL_STACK:
+    *ret = (presult_t){.instruction = INST_CALL_STACK,
+                       .type        = PRES_COMPLETE_RESULT};
+    break;
+  case TOKEN_RET:
+    *ret = (presult_t){.instruction = INST_RET, .type = PRES_COMPLETE_RESULT};
+    break;
   case TOKEN_SYMBOL: {
     size_t label_size = strcspn(token.str, ":");
     if (label_size == strlen(token.str))