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. --- asmmon.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'asmmon.h') diff --git a/asmmon.h b/asmmon.h index e98afff..29697e5 100644 --- a/asmmon.h +++ b/asmmon.h @@ -280,13 +280,13 @@ enum baseext_ortho { static const uint8_t ext_ortho_ops[9] = { [OP_LEA] = 0x63, - [OP_PEA] = 0x0C, + [OP_PEA] = 0x4C, [OP_ADD] = 0x03, [OP_SUB] = 0x23, [OP_NOT] = 0x44, [OP_CLZ] = 0xC4, [OP_CLO] = 0xE4, - [OP_SWP] = 0x2C, + [OP_SWP] = 0x6C, [OP_PCN] = 0x43 }; @@ -357,8 +357,8 @@ static const instruction inst[OPNUM] = { [INC] = {(AM_IMPL|AM_ZM|AM_ABS|AM_EIND2|AM_ORTHO2), 0xA4}, [INX] = {(AM_IMPL), 0xC9}, [INY] = {(AM_IMPL), 0x89}, - [JMP] = {(AM_ABS|AM_IND|AM_ZM2|AM_EIND), 0x00}, - [JSR] = {(AM_ABS|AM_IND|AM_ZM2|AM_EIND), 0x20}, + [JMP] = {(AM_ABS|AM_IND|AM_ZM2|AM_EIND|AM_ORTHO|AM_ORTHO2), 0x00}, + [JSR] = {(AM_ABS|AM_IND|AM_ZM2|AM_EIND|AM_ORTHO|AM_ORTHO2), 0x20}, [LDA] = {(AM_IMM|AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS|AM_EIND), 0xC2}, [LDB] = {(AM_IMM|AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS|AM_EIND), 0xE2}, [LDX] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS|AM_EIND2), 0x64}, -- cgit v1.2.3-13-gbd6f