- Implemented support for Sux's base extension.

  This is the biggest milestone I've reached for this
  project, since the base extension changes alot about
  what Sux can do by default, and now makes it a viable
  instruction set for modern day use, when compared
  with other instruction sets.

1 files changed, 210 insertions, 64 deletions

diff --git a/asmmon.h b/asmmon.h
index a031e7d..6f4e5f5 100644
--- a/asmmon.h
+++ b/asmmon.h
@@ -68,7 +68,7 @@ struct sym {
 };
 
 struct inst {
-	uint16_t am;	/* Addressing modes. */
+	uint32_t am;	/* Addressing modes. */
 	uint8_t op;	/* Base value used to get the actual opcode. */
 };
 
@@ -117,6 +117,7 @@ enum token {
 	TOK_IMM,
 	TOK_BREG,
 	TOK_OPCODE,
+	TOK_EXTOP,
 	TOK_RS,
 	TOK_OF,
 	TOK_COMMENT,
@@ -144,6 +145,7 @@ enum pre_token {
 	PTOK_RBRACK,
 	PTOK_COMMA,
 	PTOK_B,
+	PTOK_E,
 	PTOK_X,
 	PTOK_Y,
 	PTOK_S,
@@ -183,7 +185,14 @@ enum addrmode {
 	AM_BREG   = (1 <<  9),
 	AM_IMPL   = (1 << 10),
 	AM_INDX2  = (1 << 11),
-	AM_ZM2    = (1 << 12)
+	AM_ZM2    = (1 << 12),
+	AM_EIND   = (1 << 13),
+	AM_EIND2  = (1 << 14),
+	AM_ABY    = (1 << 15),
+	AM_ABX    = (1 << 16),
+	AM_AIND   = (1 << 17),
+	AM_AINDY  = (1 << 18),
+	AM_AINDX  = (1 << 19),
 };
 
 enum ind {
@@ -209,33 +218,59 @@ enum ind {
 	STY_IND = 19
 };
 
+enum eind {
+	DEC_EIND,
+	INC_EIND,
+	STY_EIND,
+	STA_EIND,
+	STB_EIND,
+	LDX_EIND,
+	STX_EIND,
+	CPB_EIND,
+	CPX_EIND,
+	CPY_EIND
+};
+
 static const uint8_t ind_ops[20] = {
-	[CMP_IND] = 0x8C,
-	[CMP_IDY] = 0xF9,
-	[CMP_IDX] = 0xAA,
-	[CPB_IND] = 0x7C,
-	[CPB_IDY] = 0xFA,
-	[CPB_IDX] = 0xBA,
-	[JMP_IND] = 0xEC,
-	[JSR_IND] = 0xDC,
-	[LDA_IND] = 0xC4,
-	[LDA_IDY] = 0xD9,
-	[LDB_IND] = 0xE4,
-	[LDB_IDY] = 0xE9,
-	[LDX_IND] = 0xBC,
-	[LDY_IND] = 0xAC,
-	[STA_IND] = 0xD4,
-	[STA_IDY] = 0xCA,
-	[STB_IND] = 0xF4,
-	[STB_IDY] = 0xDA,
-	[STX_IND] = 0xCC,
-	[STY_IND] = 0x9C
+	[CMP_IND] = CMP_IN,
+	[CMP_IDY] = CMP_IY,
+	[CMP_IDX] = CMP_IX,
+	[CPB_IND] = CPB_IN,
+	[CPB_IDY] = CPB_IY,
+	[CPB_IDX] = CPB_IX,
+	[JMP_IND] = JMP_IN,
+	[JSR_IND] = JSR_IN,
+	[LDA_IND] = LDA_IN,
+	[LDA_IDY] = LDA_IY,
+	[LDB_IND] = LDB_IN,
+	[LDB_IDY] = LDB_IY,
+	[LDX_IND] = LDX_IN,
+	[LDY_IND] = LDY_IN,
+	[STA_IND] = STA_IN,
+	[STA_IDY] = STA_IY,
+	[STB_IND] = STB_IN,
+	[STB_IDY] = STB_IY,
+	[STX_IND] = STX_IN,
+	[STY_IND] = STY_IN
+};
+
+static const uint8_t eind_base_ops[10] = {
+	[DEC_EIND] = DEC_E,
+	[INC_EIND] = INC_E,
+	[STY_EIND] = STY_E,
+	[STA_EIND] = STA_E,
+	[STB_EIND] = STB_E,
+	[LDX_EIND] = LDX_E,
+	[STX_EIND] = STX_E,
+	[CPB_EIND] = CPB_E,
+	[CPX_EIND] = CPX_E,
+	[CPY_EIND] = CPY_E
 };
 
 static const instruction inst[OPNUM] = {
-	[ADC] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x01},
-	[AND] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x41},
-	[ASR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x62},
+	[ADC] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x01},
+	[AND] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x41},
+	[ASR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x62},
 	[BCC] = {(AM_REL), 0xA0},
 	[BCS] = {(AM_REL), 0x90},
 	[BEQ] = {(AM_REL), 0xB0},
@@ -249,31 +284,31 @@ static const instruction inst[OPNUM] = {
 	[CLC] = {(AM_IMPL), 0x09},
 	[CLI] = {(AM_IMPL), 0x29},
 	[CLV] = {(AM_IMPL), 0x49},
-	[CMP] = {(AM_IMM|AM_ZM|AM_IND|AM_INDY|AM_ABS|AM_BREG|AM_INDX2), 0x82},
-	[CPB] = {(AM_IMM|AM_ZM|AM_IND|AM_INDY|AM_ABS|AM_INDX2), 0x04},
+	[CMP] = {(AM_IMM|AM_ZM|AM_IND|AM_INDY|AM_ABS|AM_BREG|AM_INDX2|AM_EIND), 0x82},
+	[CPB] = {(AM_IMM|AM_ZM|AM_IND|AM_INDY|AM_ABS|AM_INDX2|AM_EIND2), 0x04},
 	[CPS] = {(AM_IMPL), 0x00},
-	[CPX] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS), 0x24},
-	[CPY] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS), 0x44},
+	[CPX] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS|AM_EIND2), 0x24},
+	[CPY] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS|AM_EIND2), 0x44},
 	[DEB] = {(AM_IMPL), 0x99},
-	[DEC] = {(AM_IMPL|AM_ZM|AM_ABS), 0x84},
+	[DEC] = {(AM_IMPL|AM_ZM|AM_ABS|AM_EIND2), 0x84},
 	[DEX] = {(AM_IMPL), 0xB9},
 	[DEY] = {(AM_IMPL), 0x79},
-	[DIV] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x42},
+	[DIV] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x42},
 	[INB] = {(AM_IMPL), 0xA9},
-	[INC] = {(AM_IMPL|AM_ZM|AM_ABS), 0xA4},
+	[INC] = {(AM_IMPL|AM_ZM|AM_ABS|AM_EIND2), 0xA4},
 	[INX] = {(AM_IMPL), 0xC9},
 	[INY] = {(AM_IMPL), 0x89},
-	[JMP] = {(AM_ABS|AM_IND|AM_ZM2), 0x00},
-	[JSR] = {(AM_ABS|AM_IND|AM_ZM2), 0x20},
-	[LDA] = {(AM_IMM|AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS), 0xC2},
-	[LDB] = {(AM_IMM|AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS), 0xE2},
-	[LDX] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS), 0x64},
-	[LDY] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS), 0xA2},
-	[LSL] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0xA1},
-	[LSR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0xC1},
-	[MUL] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x22},
+	[JMP] = {(AM_ABS|AM_IND|AM_ZM2|AM_EIND), 0x00},
+	[JSR] = {(AM_ABS|AM_IND|AM_ZM2|AM_EIND), 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},
+	[LDY] = {(AM_IMM|AM_ZM|AM_IND|AM_ABS|AM_EIND), 0xA2},
+	[LSL] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0xA1},
+	[LSR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0xC1},
+	[MUL] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x22},
 	[NOP] = {(AM_IMPL), 0xEA},
-	[ORA] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x61},
+	[ORA] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x61},
 	[PHA] = {(AM_IMPL), 0x8E},
 	[PHB] = {(AM_IMPL), 0xAE},
 	[PHP] = {(AM_IMPL), 0x6E},
@@ -284,29 +319,81 @@ static const instruction inst[OPNUM] = {
 	[PLP] = {(AM_IMPL), 0x7E},
 	[PLX] = {(AM_IMPL), 0xFE},
 	[PLY] = {(AM_IMPL), 0xDE},
-	[ROL] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0xE1},
-	[ROR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x02},
+	[ROL] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0xE1},
+	[ROR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x02},
 	[RTI] = {(AM_IMPL), 0x60},
 	[RTS] = {(AM_IMPL), 0x50},
-	[SBC] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x21},
+	[SBC] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x21},
 	[SEC] = {(AM_IMPL), 0x19},
 	[SEI] = {(AM_IMPL), 0x39},
-	[STA] = {(AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS), 0x28},
-	[STB] = {(AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS), 0x48},
-	[STX] = {(AM_ZM|AM_IND|AM_ABS), 0x68},
-	[STY] = {(AM_ZM|AM_IND|AM_ABS), 0x08},
+	[STA] = {(AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS|AM_EIND2), 0x28},
+	[STB] = {(AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS|AM_EIND2), 0x48},
+	[STX] = {(AM_ZM|AM_IND|AM_ABS|AM_EIND2), 0x68},
+	[STY] = {(AM_ZM|AM_IND|AM_ABS|AM_EIND2), 0x08},
 	[TAB] = {(AM_IMPL), 0x0A},
 	[TAX] = {(AM_IMPL), 0x4A},
 	[TAY] = {(AM_IMPL), 0x2A},
 	[TBA] = {(AM_IMPL), 0x1A},
 	[TSX] = {(AM_IMPL), 0x8A},
 	[TXA] = {(AM_IMPL), 0x5A},
-	[TXS] = {(AM_IMPL|AM_IMM), 0x9A},
+	[TXS] = {(AM_IMPL), 0x9A},
 	[TXY] = {(AM_IMPL), 0x7A},
 	[TYA] = {(AM_IMPL), 0x3A},
 	[TYX] = {(AM_IMPL), 0x6A},
 	[WAI] = {(AM_IMPL), 0x59},
-	[XOR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG), 0x81}
+	[XOR] = {(AM_IMM|AM_ZM|AM_ABS|AM_BREG|AM_EIND), 0x81}
+};
+
+static const instruction ext_inst[EXT_OPNUM] = {
+	[LEA] = {(AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS|AM_ABX|AM_ABY|AM_AIND|AM_AINDX|AM_AINDY), 0x03},
+	[PEA] = {(AM_ZM|AM_ZMX|AM_ZMY|AM_IND|AM_INDX|AM_INDY|AM_ABS|AM_ABX|AM_ABY|AM_AIND|AM_AINDX|AM_AINDY), 0x23},
+	[ADD] = {(AM_IMM|AM_ZM|AM_ABS|AM_EIND), 0x06},
+	[SUB] = {(AM_IMM|AM_ZM|AM_ABS|AM_EIND), 0x26},
+	[ADE] = {(AM_IMM|AM_ZM|AM_ABS), 0x46},
+	[SBE] = {(AM_IMM|AM_ZM|AM_ABS), 0x66},
+	[ADS] = {(AM_IMM|AM_ZM|AM_ABS|AM_EIND), 0x86},
+	[SBS] = {(AM_IMM|AM_ZM|AM_ABS|AM_EIND), 0xA6},
+	[NOT] = {(AM_IMPL|AM_ZM|AM_ABS|AM_EIND), 0xC6},
+	[LLM] = {(AM_ZM|AM_ABS|AM_EIND), 0x48},
+	[LRM] = {(AM_ZM|AM_ABS|AM_EIND), 0x68},
+	[RLM] = {(AM_ZM|AM_ABS|AM_EIND), 0x88},
+	[RRM] = {(AM_ZM|AM_ABS|AM_EIND), 0xA8},
+	[ARM] = {(AM_ZM|AM_ABS|AM_EIND), 0xC8},
+	[PHE] = {(AM_IMPL), 0x6B},
+	[PLE] = {(AM_IMPL), 0x7B},
+	[CPE] = {(AM_IMM|AM_ZM|AM_ABS|AM_EIND), 0x08},
+	[ICE] = {(AM_ZM|AM_ABS|AM_EIND), 0x28},
+	[LDS] = {(AM_IMM|AM_ZM|AM_ABS|AM_EIND), 0x40},
+	[DEE] = {(AM_IMPL), 0x8B},
+	[INE] = {(AM_IMPL), 0x9B},
+	[DES] = {(AM_IMPL), 0xAB},
+	[INS] = {(AM_IMPL), 0xBB},
+	[STS] = {(AM_ZM|AM_ABS|AM_EIND), 0xA0},
+	[STE] = {(AM_ZM|AM_ABS), 0xC0},
+	[STZ] = {(AM_ZM|AM_ABS|AM_EIND), 0xE0},
+	[SCO] = {(AM_IMM|AM_ZM|AM_ABS|AM_EIND), 0x60},
+	[ECO] = {(AM_ZM|AM_ABS|AM_EIND), 0x80},
+	[CLZ] = {(AM_ZM|AM_ABS|AM_EIND), 0x05},
+	[CLO] = {(AM_ZM|AM_ABS|AM_EIND), 0x25},
+	[BIT] = {(AM_ZM|AM_ABS|AM_EIND), 0x45},
+	[MMV] = {(AM_IMPL), 0xCB},
+	[SWP] = {(AM_IMPL|AM_ZM|AM_ABS|AM_EIND), 0xE6},
+	[PCN] = {(AM_ZM|AM_ABS|AM_EIND), 0xE8},
+	[REP] = {(AM_REL), 0xBD},
+	[REQ] = {(AM_REL), 0xCD},
+	[RNE] = {(AM_REL), 0xDD},
+	[LNG] = {(AM_IMM|AM_EIND2), 0x0D},
+	[LPO] = {(AM_IMM|AM_EIND2), 0x2D},
+	[LCS] = {(AM_IMM|AM_EIND2), 0x4D},
+	[LCC] = {(AM_IMM|AM_EIND2), 0x6D},
+	[LEQ] = {(AM_IMM|AM_EIND2), 0x8D},
+	[LNE] = {(AM_IMM|AM_EIND2), 0xAD},
+	[SNG] = {(AM_EIND2), 0x1D},
+	[SPO] = {(AM_EIND2), 0x3D},
+	[SCS] = {(AM_EIND2), 0x5D},
+	[SCC] = {(AM_EIND2), 0x7D},
+	[SEQ] = {(AM_EIND2), 0x9D},
+	[SNE] = {(AM_EIND2), 0xBD}
 };
 
 static const char *dir_t[11] = {
@@ -330,7 +417,7 @@ static const char *rs_t[4] = {
 	[3] = ".q"
 };
 
-static const char *lex_tok[22] = {
+static const char *lex_tok[23] = {
 	[TOK_DIR    ] = "TOK_DIR",
 	[TOK_LOCAL  ] = "TOK_LOCAL",
 	[TOK_LABEL  ] = "TOK_LABEL",
@@ -343,6 +430,7 @@ static const char *lex_tok[22] = {
 	[TOK_IMM    ] = "TOK_IMM",
 	[TOK_BREG   ] = "TOK_BREG",
 	[TOK_OPCODE ] = "TOK_OPCODE",
+	[TOK_EXTOP  ] = "TOK_EXTOP",
 	[TOK_RS     ] = "TOK_RS",
 	[TOK_OF     ] = "TOK_OF",
 	[TOK_COMMENT] = "TOK_COMMENT",
@@ -355,18 +443,24 @@ static const char *lex_tok[22] = {
 	[TOK_MEMBER ] = "TOK_MEMBER"
 };
 
-static const char *adrmode[11] = {
-	[IMM ] = "IMM",
-	[ZM  ] = "ZM",
-	[ZMX ] = "ZMX",
-	[ZMY ] = "ZMY",
-	[IND ] = "IND",
-	[INDX] = "INDX",
-	[INDY] = "INDY",
-	[ABS ] = "ABS",
-	[REL ] = "REL",
-	[BREG] = "BREG",
-	[IMPL] = "IMPL"
+static const char *adrmode[] = {
+	[IMM  ] = "IMM",
+	[ZM   ] = "ZM",
+	[ZMX  ] = "ZMX",
+	[ZMY  ] = "ZMY",
+	[IND  ] = "IND",
+	[INDX ] = "INDX",
+	[INDY ] = "INDY",
+	[ABS  ] = "ABS",
+	[REL  ] = "REL",
+	[BREG ] = "BREG",
+	[IMPL ] = "IMPL",
+	[ABSX ] = "ABSX",
+	[ABSY ] = "ABSY",
+	[AIND ] = "AIND",
+	[AINDX] = "AINDX",
+	[AINDY] = "AINDY",
+	[EIND ] = "EIND"
 };
 
 static const char *mne[OPNUM] = {
@@ -446,6 +540,58 @@ static const char *mne[OPNUM] = {
 	[XOR] = "XOR"
 };
 
+static const char *ext_mne[EXT_OPNUM] = {
+	[LEA] = "LEA",
+        [PEA] = "PEA",
+        [ADD] = "ADD",
+        [SUB] = "SUB",
+        [ADE] = "ADE",
+        [SBE] = "SBE",
+        [ADS] = "ADS",
+        [SBS] = "SBS",
+        [NOT] = "NOT",
+        [LLM] = "LLM",
+        [LRM] = "LRM",
+        [RLM] = "RLM",
+        [RRM] = "RRM",
+        [ARM] = "ARM",
+        [PHE] = "PHE",
+        [PLE] = "PLE",
+        [CPE] = "CPE",
+        [ICE] = "ICE",
+        [LDS] = "LDS",
+        [DEE] = "DEE",
+        [INE] = "INE",
+        [DES] = "DES",
+        [INS] = "INS",
+        [STS] = "STS",
+        [STE] = "STE",
+        [STZ] = "STZ",
+        [SCO] = "SCO",
+        [ECO] = "ECO",
+        [CLZ] = "CLZ",
+        [CLO] = "CLO",
+        [BIT] = "BIT",
+        [MMV] = "MMV",
+        [SWP] = "SWP",
+        [PCN] = "PCN",
+        [REP] = "REP",
+        [REQ] = "REQ",
+        [RNE] = "RNE",
+        [LNG] = "LNG",
+        [LPO] = "LPO",
+        [LCS] = "LCS",
+        [LCC] = "LCC",
+        [LEQ] = "LEQ",
+        [LNE] = "LNE",
+        [SNG] = "SNG",
+        [SPO] = "SPO",
+        [SCS] = "SCS",
+        [SCC] = "SCC",
+        [SEQ] = "SEQ",
+        [SNE] = "SNE"
+};
+
 static const char *instdesc[OPNUM] = {
 	[ADC] = "ADd accumulator, with operand, Carry if needed.",
 	[AND] = "Bitwise AND accumulator, with operand.",