From 8d7f27d9a0b61d3694a62f3e54be885d8073f02b Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Sat, 13 Feb 2021 13:59:48 -0500 Subject: - Reverted back one commit before the previous commit. This is because the previous commit actually created a bug, rather than fixing one. - Added JMP, and JSR to the ortho extension, and implemented them both in the assembler, and emulator. --- assemble.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'assemble.c') diff --git a/assemble.c b/assemble.c index ce35e78..a3791d3 100644 --- a/assemble.c +++ b/assemble.c @@ -898,7 +898,11 @@ uint64_t handle_opcode(token *t, bytecount *bc, uint8_t isasm, uint64_t address, int i2 = 0; int j = 0; (op[i].type == 1) ? (opcode |= (1 << (3+!i))) : (opcode &= ~(1 << (3+!i))); - if (op[i].type == 1 && (am & AM_ORTHO|AM_ORTHO2)) { + if ((am & (AM_ORTHO|AM_ORTHO2)) == (AM_ORTHO|AM_ORTHO2)) { + opcode |= 0x0C; + } + + if (op[i].type == 1 && (am & (AM_ORTHO|AM_ORTHO2))) { switch (op[i].id) { case MEM_RIND: break; case MEM_IMM: -- cgit v1.2.3-13-gbd6f