diff options
Diffstat (limited to 'asm.c')
| -rw-r--r-- | asm.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -21,8 +21,8 @@ enum asm_tok { TOK_ANY, TOK_LAST, TOK_LIT, TOK_NAME, /* Instructions (order like INST_*) */ - TOK_NOP, TOK_MOV, TOK_SWP, TOK_SAV, TOK_ADD, TOK_SUB, TOK_NEG, - TOK_NOT, TOK_AND, TOK_JMP, TOK_JEZ, TOK_JNZ, TOK_JRO, + TOK_NOP, TOK_MOV, TOK_SWP, TOK_SAV, TOK_ADD, TOK_SUB, + TOK_NEG, TOK_JMP, TOK_JEZ, TOK_JNZ, TOK_JGZ, TOK_JLZ, TOK_JRO, /* Misc */ TOK_COMMENT, TOK_LABEL, TOK_XPOS, TOK_YPOS, TOK_NL, TOK_EOF @@ -46,8 +46,8 @@ static const char *tok_strs[] = { "any", "last", NULL, NULL, /* Instructions (order like INST_*) */ - "nop", "mov", "swp", "sav", "add", "sub", "neg", - "not", "and", "jmp", "jez", "jnz", "jro", + "nop", "mov", "swp", "sav", "add", "sub", + "neg", "jmp", "jez", "jnz", "jgz", "jlz", "jro", /* Misc */ NULL, NULL, NULL, NULL, NULL, NULL @@ -62,8 +62,8 @@ static const char *tok_reprs[] = { "'ANY'", "'LAST'", "<LIT>", "<NAME>", /* Instructions (order like INST_*) */ - "'NOP'", "'MOV'", "'SWP'", "'SAV'", "'ADD'", "'SUB'", "'NEG'", - "'NOT'", "'AND'", "'JMP'", "'JEZ'", "'JNZ'", "'JRO'", + "'NOP'", "'MOV'", "'SWP'", "'SAV'", "'ADD'", "'SUB'", + "'NEG'", "'JMP'", "'JEZ'", "'JNZ'", "'JGZ'", "'JLZ'", "'JRO'", /* Misc */ "#<COMMENT>", "<LABEL>:", "X<INT>", "Y<INT>", "<NL>", "<EOF>" @@ -348,8 +348,8 @@ tis_load(struct tis *tis, const char *filepath) tok_next_in(&tokenizer, TOK_NL, -1); break; case TOK_NOP: case TOK_MOV: case TOK_SWP: case TOK_SAV: - case TOK_ADD: case TOK_SUB: case TOK_NEG: case TOK_NOT: - case TOK_AND: case TOK_JMP: case TOK_JEZ: case TOK_JNZ: + case TOK_ADD: case TOK_SUB: case TOK_NEG: case TOK_JMP: + case TOK_JEZ: case TOK_JNZ: case TOK_JGZ: case TOK_JLZ: case TOK_JRO: if (!tpu) goto disallowed; inst = tok_to_inst(tok); |