- 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.

1 files changed, 6 insertions, 4 deletions

diff --git a/disasm.h b/disasm.h
index 2b65d12..446cc77 100644
--- a/disasm.h
+++ b/disasm.h
@@ -365,7 +365,7 @@ static const char *ortho_opname[] = {
 	ORTHO_2OP(ADD/**/),	/* ADD Ortho. */
 	ORTHO_1OP(PSH/**/),	/* PuSH operand onto the stack. */
 	ORTHO_1CC(SET, NG),	/* SET if NeGative. */
-	ORTHO_1OP(PEA/**/),	/* PEA Ortho. */
+	ORTHO_1OP(JMP/**/),	/* JMP Ortho. */
 	/* 0x20-0x3C */
 	ORTHO_2OP(MPO/**/),	/* Move if POsitive. */
 	ORTHO_2OP(SBC/**/),	/* SBC Ortho. */
@@ -373,21 +373,23 @@ static const char *ortho_opname[] = {
 	ORTHO_2OP(SUB/**/),	/* SUB Ortho. */
 	ORTHO_1OP(PUL/**/),	/* PuLl operand off of the stack. */
 	ORTHO_1CC(SET, PO),	/* SET if POsitive. */
-	ORTHO_1OP(SWP/**/),	/* SWP Ortho. */
-	/* 0x40-0x55 */
+	ORTHO_1OP(JSR/**/),	/* JSR Ortho. */
+	/* 0x40-0x5C */
 	ORTHO_2OP(MCS/**/),	/* Move if Carry Set. */
 	ORTHO_2OP(AND/**/),	/* AND Ortho. */
 	ORTHO_2OP(DIV/**/),	/* DIV Ortho. */
 	ORTHO_2OP(PCN/**/),	/* PCN Ortho. */
 	ORTHO_1OP(NOT/**/),	/* NOT Ortho. */
 	ORTHO_1CC(SET, CS),	/* SET if Carry Set. */
-	/* 0x60-0x75 */
+	ORTHO_1OP(PEA/**/),	/* PEA Ortho. */
+	/* 0x60-0x7C */
 	ORTHO_2OP(MCC/**/),	/* Move if Carry Clear. */
 	ORTHO_2OP(OR /**/),	/* Bitwise OR. */
 	ORTHO_2OP(ASR/**/),	/* ASR Ortho. */
 	ORTHO_2OP(LEA/**/),	/* LEA Ortho. */
 	ORTHO_1OP(NEG/**/),	/* NEGate operand. */
 	ORTHO_1CC(SET, CC),	/* SET if Carry Clear. */
+	ORTHO_1OP(SWP/**/),	/* SWP Ortho. */
 	/* 0x80-0x95 */
 	ORTHO_2OP(MEQ/**/),	/* Move if EQual. */
 	ORTHO_2OP(XOR/**/),	/* XOR Ortho. */