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. --- enums.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'enums.h') diff --git a/enums.h b/enums.h index 1658c35..71a52f1 100644 --- a/enums.h +++ b/enums.h @@ -560,7 +560,7 @@ enum ortho { ORTHO_2OP(ADD, 0x03/**/), /* ADD Ortho. */ ORTHO_1OP(PSH, 0x04/**/), /* PuSH operand onto the stack. */ ORTHO_1CC(SET, 0x05, NG), /* SET if NeGative. */ - ORTHO_1OP(PEA, 0x0C/**/), /* PEA Ortho. */ + ORTHO_1OP(JMP, 0x0C/**/), /* JMP Ortho. */ /* 0x20-0x3C */ ORTHO_2OP(MPO, 0x20/**/), /* Move if POsitive. */ ORTHO_2OP(SBC, 0x21/**/), /* SBC Ortho. */ @@ -568,21 +568,23 @@ enum ortho { ORTHO_2OP(SUB, 0x23/**/), /* SUB Ortho. */ ORTHO_1OP(PUL, 0x24/**/), /* PuLl operand off of the stack. */ ORTHO_1CC(SET, 0x25, PO), /* SET if POsitive. */ - ORTHO_1OP(SWP, 0x2C/**/), /* SWP Ortho. */ - /* 0x40-0x55 */ + ORTHO_1OP(JSR, 0x2C/**/), /* JSR Ortho. */ + /* 0x40-0x5C */ ORTHO_2OP(MCS, 0x40/**/), /* Move if Carry Set. */ ORTHO_2OP(AND, 0x41/**/), /* AND Ortho. */ ORTHO_2OP(DIV, 0x42/**/), /* DIV Ortho. */ ORTHO_2OP(PCN, 0x43/**/), /* PCN Ortho. */ ORTHO_1OP(NOT, 0x44/**/), /* NOT Ortho. */ ORTHO_1CC(SET, 0x45, CS), /* SET if Carry Set. */ - /* 0x60-0x75 */ + ORTHO_1OP(PEA, 0x4C/**/), /* PEA Ortho. */ + /* 0x60-0x7C */ ORTHO_2OP(MCC, 0x60/**/), /* Move if Carry Clear. */ ORTHO_2OP(OR , 0x61/**/), /* Bitwise OR. */ ORTHO_2OP(ASR, 0x62/**/), /* ASR Ortho. */ ORTHO_2OP(LEA, 0x63/**/), /* LEA Ortho. */ ORTHO_1OP(NEG, 0x64/**/), /* NEGate operand. */ ORTHO_1CC(SET, 0x65, CC), /* SET if Carry Clear. */ + ORTHO_1OP(SWP, 0x6C/**/), /* SWP Ortho. */ /* 0x80-0x95 */ ORTHO_2OP(MEQ, 0x80/**/), /* Move if EQual. */ ORTHO_2OP(XOR, 0x81/**/), /* XOR Ortho. */ -- cgit v1.2.3-13-gbd6f