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

Remove get_opcode_data_type

Browse Source 
Was only used for OP_PUSH data types anyway, so is essentially
useless.  Only OP_PUSH has operands after it that directly relate to
it: the rest either have a fixed type (a byte for registers, for
example) or NIL (because they have no operand).
This commit is contained in:
Aryadev Chavali
2023-10-22 22:04:13 +01:00
parent 7243ac2533
commit b44eaefabb
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/inst.c
View File

@@ -184,27 +184,13 @@ word convert_bytes_to_word(byte *bytes)
return w; return w;
} }
data_type_t get_opcode_data_type(opcode_t opcode)
{
data_type_t type = DATA_TYPE_NIL;
if (OPCODE_IS_TYPE(opcode, OP_PUSH))
type = (data_type_t)opcode;
else if (OPCODE_IS_TYPE(opcode, OP_PUSH_REGISTER))
type = opcode >> 1;
else if (OPCODE_IS_TYPE(opcode, OP_POP))
type = opcode >> 2;
else if (OPCODE_IS_TYPE(opcode, OP_MOV))
type = opcode >> 3;
return type;
}
void inst_print(inst_t instruction, FILE *fp) void inst_print(inst_t instruction, FILE *fp)
{ {
static_assert(NUMBER_OF_OPCODES == 37, "inst_bytecode_size: Out of date"); static_assert(NUMBER_OF_OPCODES == 37, "inst_bytecode_size: Out of date");
fprintf(fp, "%s(", opcode_as_cstr(instruction.opcode)); fprintf(fp, "%s(", opcode_as_cstr(instruction.opcode));
if (OPCODE_IS_TYPE(instruction.opcode, OP_PUSH)) if (OPCODE_IS_TYPE(instruction.opcode, OP_PUSH))
{ {
data_type_t type = get_opcode_data_type(instruction.opcode); data_type_t type = (data_type_t)instruction.opcode;
fprintf(fp, "datum=0x"); fprintf(fp, "datum=0x");
data_print(instruction.operand, type, fp); data_print(instruction.operand, type, fp);
} }
@@ -337,7 +323,7 @@ inst_t inst_read_bytecode(darr_t *darr)
return inst; return inst;
// Read operands // Read operands
if (OPCODE_IS_TYPE(opcode, OP_PUSH)) if (OPCODE_IS_TYPE(opcode, OP_PUSH))
inst.operand = read_type_from_darr(darr, get_opcode_data_type(opcode)); inst.operand = read_type_from_darr(darr, (data_type_t)opcode);
// Read register (as a byte) // Read register (as a byte)
else if (OPCODE_IS_TYPE(opcode, OP_PUSH_REGISTER) || else if (OPCODE_IS_TYPE(opcode, OP_PUSH_REGISTER) ||
OPCODE_IS_TYPE(opcode, OP_MOV) || inst.opcode == OP_JUMP_STACK) OPCODE_IS_TYPE(opcode, OP_MOV) || inst.opcode == OP_JUMP_STACK)