oreodave/ovm
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented stack versions of MGET and MSET in assembler

Browse Source
This commit is contained in:
Aryadev Chavali
2023-11-01 22:09:39 +00:00
parent 26dea6ce72
commit 90e04542a2
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
asm/lexer.c
View File

@@ -46,8 +46,12 @@ const char *token_type_as_cstr(token_type_t type)
return "MALLOC"; return "MALLOC";
case TOKEN_MSET: case TOKEN_MSET:
return "MSET"; return "MSET";
case TOKEN_MSET_STACK:
return "MSET_STACK";
case TOKEN_MGET: case TOKEN_MGET:
return "MGET"; return "MGET";
case TOKEN_MGET_STACK:
return "MGET_STACK";
case TOKEN_MDELETE: case TOKEN_MDELETE:
return "MDELETE"; return "MDELETE";
case TOKEN_MSIZE: case TOKEN_MSIZE:
@@ -127,7 +131,7 @@ bool is_valid_hex_char(char c)
token_t tokenise_symbol(buffer_t *buffer, size_t *column) token_t tokenise_symbol(buffer_t *buffer, size_t *column)
{ {
static_assert(NUMBER_OF_OPCODES == 84, "tokenise_buffer: Out of date!"); static_assert(NUMBER_OF_OPCODES == 90, "tokenise_buffer: Out of date!");
size_t sym_size = 0; size_t sym_size = 0;
for (; sym_size < space_left(buffer) && for (; sym_size < space_left(buffer) &&
@@ -183,11 +187,21 @@ token_t tokenise_symbol(buffer_t *buffer, size_t *column)
offset = 6; offset = 6;
type = TOKEN_MALLOC; type = TOKEN_MALLOC;
} }
else if (sym_size >= 10 && strncmp(opcode, "MSET.STACK", 10) == 0)
{
offset = 10;
type = TOKEN_MSET_STACK;
}
else if (sym_size >= 4 && strncmp(opcode, "MSET", 4) == 0) else if (sym_size >= 4 && strncmp(opcode, "MSET", 4) == 0)
{ {
offset = 4; offset = 4;
type = TOKEN_MSET; type = TOKEN_MSET;
} }
else if (sym_size >= 10 && strncmp(opcode, "MGET.STACK", 10) == 0)
{
offset = 10;
type = TOKEN_MGET_STACK;
}
else if (sym_size >= 4 && strncmp(opcode, "MGET", 4) == 0) else if (sym_size >= 4 && strncmp(opcode, "MGET", 4) == 0)
{ {
offset = 4; offset = 4;

2
asm/lexer.h
View File

@@ -28,7 +28,9 @@ typedef enum TokenType
TOKEN_DUP, TOKEN_DUP,
TOKEN_MALLOC, TOKEN_MALLOC,
TOKEN_MSET, TOKEN_MSET,
TOKEN_MSET_STACK,
TOKEN_MGET, TOKEN_MGET,
TOKEN_MGET_STACK,
TOKEN_MDELETE, TOKEN_MDELETE,
TOKEN_MSIZE, TOKEN_MSIZE,
TOKEN_NOT, TOKEN_NOT,

6
asm/parser.c
View File

@@ -230,6 +230,12 @@ perr_t parse_next_inst(token_stream_t *stream, inst_t *ret)
case TOKEN_MGET: case TOKEN_MGET:
ret->opcode = OP_MGET_BYTE; ret->opcode = OP_MGET_BYTE;
return parse_utype_inst_with_operand(stream, ret); return parse_utype_inst_with_operand(stream, ret);
case TOKEN_MSET_STACK:
ret->opcode = OP_MSET_STACK_BYTE;
return parse_utype_inst(stream, ret);
case TOKEN_MGET_STACK:
ret->opcode = OP_MGET_STACK_BYTE;
return parse_utype_inst(stream, ret);
case TOKEN_MDELETE: case TOKEN_MDELETE:
ret->opcode = OP_MDELETE; ret->opcode = OP_MDELETE;
break; break;