Added 65C02 instructions

git-svn-id: svn://svn.cc65.org/cc65/trunk@2249 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 1ba11e556f95b3b5924fa811961a82b7ff5d15fa..dd1729ec3578a9fef482f60dab0af8cf0b63732d 100644 (file)
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -66,6 +66,7 @@
 static void PutPCRel8 (const InsDesc* Ins);
 static void PutPCRel16 (const InsDesc* Ins);
 static void PutBlockMove (const InsDesc* Ins);
+static void PutBitBranch (const InsDesc* Ins);
 static void PutREP (const InsDesc* Ins);
 static void PutSEP (const InsDesc* Ins);
 static void PutJmp (const InsDesc* Ins);
@@ -81,62 +82,62 @@ static const struct {
 } InsTab6502 = {
     INS_COUNT_6502,
     {
-       { "ADC", 0x080A26C, 0x60, 0, PutAll },
-       { "AND", 0x080A26C, 0x20, 0, PutAll },
-       { "ASL", 0x000006e, 0x02, 1, PutAll },
-       { "BCC", 0x0020000, 0x90, 0, PutPCRel8 },
-       { "BCS", 0x0020000, 0xb0, 0, PutPCRel8 },
-       { "BEQ", 0x0020000, 0xf0, 0, PutPCRel8 },
-       { "BIT", 0x000000C, 0x00, 2, PutAll },
-       { "BMI", 0x0020000, 0x30, 0, PutPCRel8 },
-       { "BNE", 0x0020000, 0xd0, 0, PutPCRel8 },
-       { "BPL", 0x0020000, 0x10, 0, PutPCRel8 },
-       { "BRK", 0x0000001, 0x00, 0, PutAll },
-       { "BVC", 0x0020000, 0x50, 0, PutPCRel8 },
-       { "BVS", 0x0020000, 0x70, 0, PutPCRel8 },
-       { "CLC", 0x0000001, 0x18, 0, PutAll },
-       { "CLD", 0x0000001, 0xd8, 0, PutAll },
-       { "CLI", 0x0000001, 0x58, 0, PutAll },
-       { "CLV", 0x0000001, 0xb8, 0, PutAll },
-       { "CMP", 0x080A26C, 0xc0, 0, PutAll },
-       { "CPX", 0x080000C, 0xe0, 1, PutAll },
-       { "CPY", 0x080000C, 0xc0, 1, PutAll },
-       { "DEC", 0x000006C, 0x00, 3, PutAll },
-       { "DEX", 0x0000001, 0xca, 0, PutAll },
-       { "DEY", 0x0000001, 0x88, 0, PutAll },
-       { "EOR", 0x080A26C, 0x40, 0, PutAll },
-       { "INC", 0x000006c, 0x00, 4, PutAll },
-       { "INX", 0x0000001, 0xe8, 0, PutAll },
-       { "INY", 0x0000001, 0xc8, 0, PutAll },
-       { "JMP", 0x0000808, 0x4c, 6, PutJmp },
-       { "JSR", 0x0000008, 0x20, 7, PutAll },
-       { "LDA", 0x080A26C, 0xa0, 0, PutAll },
-       { "LDX", 0x080030C, 0xa2, 1, PutAll },
-       { "LDY", 0x080006C, 0xa0, 1, PutAll },
-       { "LSR", 0x000006F, 0x42, 1, PutAll },
-       { "NOP", 0x0000001, 0xea, 0, PutAll },
-       { "ORA", 0x080A26C, 0x00, 0, PutAll },
-       { "PHA", 0x0000001, 0x48, 0, PutAll },
-       { "PHP", 0x0000001, 0x08, 0, PutAll },
-       { "PLA", 0x0000001, 0x68, 0, PutAll },
-       { "PLP", 0x0000001, 0x28, 0, PutAll },
-       { "ROL", 0x000006F, 0x22, 1, PutAll },
-       { "ROR", 0x000006F, 0x62, 1, PutAll },
-       { "RTI", 0x0000001, 0x40, 0, PutAll },
-       { "RTS", 0x0000001, 0x60, 0, PutAll },
-       { "SBC", 0x080A26C, 0xe0, 0, PutAll },
-       { "SEC", 0x0000001, 0x38, 0, PutAll },
-       { "SED", 0x0000001, 0xf8, 0, PutAll },
-       { "SEI", 0x0000001, 0x78, 0, PutAll },
-       { "STA", 0x000A26C, 0x80, 0, PutAll },
-       { "STX", 0x000010c, 0x82, 1, PutAll },
-       { "STY", 0x000002c, 0x80, 1, PutAll },
-       { "TAX", 0x0000001, 0xaa, 0, PutAll },
-       { "TAY", 0x0000001, 0xa8, 0, PutAll },
-       { "TSX", 0x0000001, 0xba, 0, PutAll },
-       { "TXA", 0x0000001, 0x8a, 0, PutAll },
-       { "TXS", 0x0000001, 0x9a, 0, PutAll },
-       { "TYA", 0x0000001, 0x98, 0, PutAll }
+               { "ADC",  0x080A26C, 0x60, 0, PutAll },
+               { "AND",  0x080A26C, 0x20, 0, PutAll },
+               { "ASL",  0x000006e, 0x02, 1, PutAll },
+               { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
+               { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
+               { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
+               { "BIT",  0x000000C, 0x00, 2, PutAll },
+               { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
+               { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
+               { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
+               { "BRK",  0x0000001, 0x00, 0, PutAll },
+               { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
+               { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
+               { "CLC",  0x0000001, 0x18, 0, PutAll },
+               { "CLD",  0x0000001, 0xd8, 0, PutAll },
+               { "CLI",  0x0000001, 0x58, 0, PutAll },
+               { "CLV",  0x0000001, 0xb8, 0, PutAll },
+               { "CMP",  0x080A26C, 0xc0, 0, PutAll },
+               { "CPX",  0x080000C, 0xe0, 1, PutAll },
+               { "CPY",  0x080000C, 0xc0, 1, PutAll },
+               { "DEC",  0x000006C, 0x00, 3, PutAll },
+               { "DEX",  0x0000001, 0xca, 0, PutAll },
+               { "DEY",  0x0000001, 0x88, 0, PutAll },
+               { "EOR",  0x080A26C, 0x40, 0, PutAll },
+               { "INC",  0x000006c, 0x00, 4, PutAll },
+               { "INX",  0x0000001, 0xe8, 0, PutAll },
+               { "INY",  0x0000001, 0xc8, 0, PutAll },
+               { "JMP",  0x0000808, 0x4c, 6, PutJmp },
+               { "JSR",  0x0000008, 0x20, 7, PutAll },
+               { "LDA",  0x080A26C, 0xa0, 0, PutAll },
+               { "LDX",  0x080030C, 0xa2, 1, PutAll },
+               { "LDY",  0x080006C, 0xa0, 1, PutAll },
+               { "LSR",  0x000006F, 0x42, 1, PutAll },
+               { "NOP",  0x0000001, 0xea, 0, PutAll },
+               { "ORA",  0x080A26C, 0x00, 0, PutAll },
+               { "PHA",  0x0000001, 0x48, 0, PutAll },
+               { "PHP",  0x0000001, 0x08, 0, PutAll },
+               { "PLA",  0x0000001, 0x68, 0, PutAll },
+               { "PLP",  0x0000001, 0x28, 0, PutAll },
+               { "ROL",  0x000006F, 0x22, 1, PutAll },
+               { "ROR",  0x000006F, 0x62, 1, PutAll },
+               { "RTI",  0x0000001, 0x40, 0, PutAll },
+               { "RTS",  0x0000001, 0x60, 0, PutAll },
+               { "SBC",  0x080A26C, 0xe0, 0, PutAll },
+               { "SEC",  0x0000001, 0x38, 0, PutAll },
+               { "SED",  0x0000001, 0xf8, 0, PutAll },
+               { "SEI",  0x0000001, 0x78, 0, PutAll },
+               { "STA",  0x000A26C, 0x80, 0, PutAll },
+               { "STX",  0x000010c, 0x82, 1, PutAll },
+               { "STY",  0x000002c, 0x80, 1, PutAll },
+               { "TAX",  0x0000001, 0xaa, 0, PutAll },
+               { "TAY",  0x0000001, 0xa8, 0, PutAll },
+               { "TSX",  0x0000001, 0xba, 0, PutAll },
+               { "TXA",  0x0000001, 0x8a, 0, PutAll },
+               { "TXS",  0x0000001, 0x9a, 0, PutAll },
+               { "TYA",  0x0000001, 0x98, 0, PutAll }
     }
 };
 
@@ -148,149 +149,181 @@ static const struct {
 } InsTab65SC02 = {
     INS_COUNT_65SC02,
     {
-       { "ADC", 0x080A66C, 0x60, 0, PutAll },
-       { "AND", 0x080A66C, 0x20, 0, PutAll },
-       { "ASL", 0x000006e, 0x02, 1, PutAll },
-       { "BCC", 0x0020000, 0x90, 0, PutPCRel8 },
-       { "BCS", 0x0020000, 0xb0, 0, PutPCRel8 },
-       { "BEQ", 0x0020000, 0xf0, 0, PutPCRel8 },
-       { "BIT", 0x0A0006C, 0x00, 2, PutAll },
-       { "BMI", 0x0020000, 0x30, 0, PutPCRel8 },
-       { "BNE", 0x0020000, 0xd0, 0, PutPCRel8 },
-       { "BPL", 0x0020000, 0x10, 0, PutPCRel8 },
-       { "BRA", 0x0020000, 0x80, 0, PutPCRel8 },
-       { "BRK", 0x0000001, 0x00, 0, PutAll },
-       { "BVC", 0x0020000, 0x50, 0, PutPCRel8 },
-       { "BVS", 0x0020000, 0x70, 0, PutPCRel8 },
-       { "CLC", 0x0000001, 0x18, 0, PutAll },
-       { "CLD", 0x0000001, 0xd8, 0, PutAll },
-       { "CLI", 0x0000001, 0x58, 0, PutAll },
-       { "CLV", 0x0000001, 0xb8, 0, PutAll },
-       { "CMP", 0x080A66C, 0xc0, 0, PutAll },
-       { "CPX", 0x080000C, 0xe0, 1, PutAll },
-       { "CPY", 0x080000C, 0xc0, 1, PutAll },
-       { "DEA", 0x0000001, 0x00, 3, PutAll },   /* == DEC */
-       { "DEC", 0x000006F, 0x00, 3, PutAll },
-       { "DEX", 0x0000001, 0xca, 0, PutAll },
-       { "DEY", 0x0000001, 0x88, 0, PutAll },
-       { "EOR", 0x080A66C, 0x40, 0, PutAll },
-       { "INA", 0x0000001, 0x00, 4, PutAll },   /* == INC */
-       { "INC", 0x000006f, 0x00, 4, PutAll },
-       { "INX", 0x0000001, 0xe8, 0, PutAll },
-       { "INY", 0x0000001, 0xc8, 0, PutAll },
-       { "JMP", 0x0010808, 0x4c, 6, PutAll },
-       { "JSR", 0x0000008, 0x20, 7, PutAll },
-       { "LDA", 0x080A66C, 0xa0, 0, PutAll },
-       { "LDX", 0x080030C, 0xa2, 1, PutAll },
-       { "LDY", 0x080006C, 0xa0, 1, PutAll },
-       { "LSR", 0x000006F, 0x42, 1, PutAll },
-       { "NOP", 0x0000001, 0xea, 0, PutAll },
-       { "ORA", 0x080A66C, 0x00, 0, PutAll },
-       { "PHA", 0x0000001, 0x48, 0, PutAll },
-       { "PHP", 0x0000001, 0x08, 0, PutAll },
-       { "PHX", 0x0000001, 0xda, 0, PutAll },
-       { "PHY", 0x0000001, 0x5a, 0, PutAll },
-       { "PLA", 0x0000001, 0x68, 0, PutAll },
-       { "PLP", 0x0000001, 0x28, 0, PutAll },
-       { "PLX", 0x0000001, 0xfa, 0, PutAll },
-       { "PLY", 0x0000001, 0x7a, 0, PutAll },
-       { "ROL", 0x000006F, 0x22, 1, PutAll },
-       { "ROR", 0x000006F, 0x62, 1, PutAll },
-       { "RTI", 0x0000001, 0x40, 0, PutAll },
-       { "RTS", 0x0000001, 0x60, 0, PutAll },
-       { "SBC", 0x080A66C, 0xe0, 0, PutAll },
-       { "SEC", 0x0000001, 0x38, 0, PutAll },
-       { "SED", 0x0000001, 0xf8, 0, PutAll },
-       { "SEI", 0x0000001, 0x78, 0, PutAll },
-       { "STA", 0x000A66C, 0x80, 0, PutAll },
-       { "STX", 0x000010c, 0x82, 1, PutAll },
-       { "STY", 0x000002c, 0x80, 1, PutAll },
-       { "STZ", 0x000006c, 0x04, 5, PutAll },
-       { "TAX", 0x0000001, 0xaa, 0, PutAll },
-       { "TAY", 0x0000001, 0xa8, 0, PutAll },
-       { "TRB", 0x000000c, 0x10, 1, PutAll },
-       { "TSB", 0x000000c, 0x00, 1, PutAll },
-       { "TSX", 0x0000001, 0xba, 0, PutAll },
-       { "TXA", 0x0000001, 0x8a, 0, PutAll },
-       { "TXS", 0x0000001, 0x9a, 0, PutAll },
-       { "TYA", 0x0000001, 0x98, 0, PutAll }
+               { "ADC",  0x080A66C, 0x60, 0, PutAll },
+               { "AND",  0x080A66C, 0x20, 0, PutAll },
+               { "ASL",  0x000006e, 0x02, 1, PutAll },
+               { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
+               { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
+               { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
+               { "BIT",  0x0A0006C, 0x00, 2, PutAll },
+               { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
+               { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
+               { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
+               { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
+               { "BRK",  0x0000001, 0x00, 0, PutAll },
+               { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
+               { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
+               { "CLC",  0x0000001, 0x18, 0, PutAll },
+               { "CLD",  0x0000001, 0xd8, 0, PutAll },
+               { "CLI",  0x0000001, 0x58, 0, PutAll },
+               { "CLV",  0x0000001, 0xb8, 0, PutAll },
+               { "CMP",  0x080A66C, 0xc0, 0, PutAll },
+               { "CPX",  0x080000C, 0xe0, 1, PutAll },
+               { "CPY",  0x080000C, 0xc0, 1, PutAll },
+               { "DEA",  0x0000001, 0x00, 3, PutAll },   /* == DEC */
+               { "DEC",  0x000006F, 0x00, 3, PutAll },
+               { "DEX",  0x0000001, 0xca, 0, PutAll },
+               { "DEY",  0x0000001, 0x88, 0, PutAll },
+               { "EOR",  0x080A66C, 0x40, 0, PutAll },
+               { "INA",  0x0000001, 0x00, 4, PutAll },   /* == INC */
+               { "INC",  0x000006f, 0x00, 4, PutAll },
+               { "INX",  0x0000001, 0xe8, 0, PutAll },
+               { "INY",  0x0000001, 0xc8, 0, PutAll },
+               { "JMP",  0x0010808, 0x4c, 6, PutAll },
+               { "JSR",  0x0000008, 0x20, 7, PutAll },
+               { "LDA",  0x080A66C, 0xa0, 0, PutAll },
+               { "LDX",  0x080030C, 0xa2, 1, PutAll },
+               { "LDY",  0x080006C, 0xa0, 1, PutAll },
+               { "LSR",  0x000006F, 0x42, 1, PutAll },
+               { "NOP",  0x0000001, 0xea, 0, PutAll },
+               { "ORA",  0x080A66C, 0x00, 0, PutAll },
+               { "PHA",  0x0000001, 0x48, 0, PutAll },
+               { "PHP",  0x0000001, 0x08, 0, PutAll },
+               { "PHX",  0x0000001, 0xda, 0, PutAll },
+               { "PHY",  0x0000001, 0x5a, 0, PutAll },
+               { "PLA",  0x0000001, 0x68, 0, PutAll },
+               { "PLP",  0x0000001, 0x28, 0, PutAll },
+               { "PLX",  0x0000001, 0xfa, 0, PutAll },
+               { "PLY",  0x0000001, 0x7a, 0, PutAll },
+               { "ROL",  0x000006F, 0x22, 1, PutAll },
+               { "ROR",  0x000006F, 0x62, 1, PutAll },
+               { "RTI",  0x0000001, 0x40, 0, PutAll },
+               { "RTS",  0x0000001, 0x60, 0, PutAll },
+               { "SBC",  0x080A66C, 0xe0, 0, PutAll },
+               { "SEC",  0x0000001, 0x38, 0, PutAll },
+               { "SED",  0x0000001, 0xf8, 0, PutAll },
+               { "SEI",  0x0000001, 0x78, 0, PutAll },
+               { "STA",  0x000A66C, 0x80, 0, PutAll },
+               { "STX",  0x000010c, 0x82, 1, PutAll },
+               { "STY",  0x000002c, 0x80, 1, PutAll },
+               { "STZ",  0x000006c, 0x04, 5, PutAll },
+               { "TAX",  0x0000001, 0xaa, 0, PutAll },
+               { "TAY",  0x0000001, 0xa8, 0, PutAll },
+               { "TRB",  0x000000c, 0x10, 1, PutAll },
+               { "TSB",  0x000000c, 0x00, 1, PutAll },
+               { "TSX",  0x0000001, 0xba, 0, PutAll },
+               { "TXA",  0x0000001, 0x8a, 0, PutAll },
+               { "TXS",  0x0000001, 0x9a, 0, PutAll },
+               { "TYA",  0x0000001, 0x98, 0, PutAll }
     }
 };
 
 /* Instruction table for the 65C02 */
-#define INS_COUNT_65C02        66
+#define INS_COUNT_65C02        98
 static const struct {
     unsigned Count;
     InsDesc  Ins[INS_COUNT_65C02];
 } InsTab65C02 = {
     INS_COUNT_65C02,
     {
-       { "ADC", 0x080A66C, 0x60, 0, PutAll },
-       { "AND", 0x080A66C, 0x20, 0, PutAll },
-       { "ASL", 0x000006e, 0x02, 1, PutAll },
-       { "BCC", 0x0020000, 0x90, 0, PutPCRel8 },
-       { "BCS", 0x0020000, 0xb0, 0, PutPCRel8 },
-       { "BEQ", 0x0020000, 0xf0, 0, PutPCRel8 },
-       { "BIT", 0x0A0006C, 0x00, 2, PutAll },
-       { "BMI", 0x0020000, 0x30, 0, PutPCRel8 },
-       { "BNE", 0x0020000, 0xd0, 0, PutPCRel8 },
-       { "BPL", 0x0020000, 0x10, 0, PutPCRel8 },
-       { "BRA", 0x0020000, 0x80, 0, PutPCRel8 },
-       { "BRK", 0x0000001, 0x00, 0, PutAll },
-       { "BVC", 0x0020000, 0x50, 0, PutPCRel8 },
-       { "BVS", 0x0020000, 0x70, 0, PutPCRel8 },
-       { "CLC", 0x0000001, 0x18, 0, PutAll },
-       { "CLD", 0x0000001, 0xd8, 0, PutAll },
-       { "CLI", 0x0000001, 0x58, 0, PutAll },
-       { "CLV", 0x0000001, 0xb8, 0, PutAll },
-       { "CMP", 0x080A66C, 0xc0, 0, PutAll },
-       { "CPX", 0x080000C, 0xe0, 1, PutAll },
-       { "CPY", 0x080000C, 0xc0, 1, PutAll },
-       { "DEA", 0x0000001, 0x00, 3, PutAll },   /* == DEC */
-       { "DEC", 0x000006F, 0x00, 3, PutAll },
-       { "DEX", 0x0000001, 0xca, 0, PutAll },
-       { "DEY", 0x0000001, 0x88, 0, PutAll },
-       { "EOR", 0x080A66C, 0x40, 0, PutAll },
-       { "INA", 0x0000001, 0x00, 4, PutAll },   /* == INC */
-       { "INC", 0x000006f, 0x00, 4, PutAll },
-       { "INX", 0x0000001, 0xe8, 0, PutAll },
-       { "INY", 0x0000001, 0xc8, 0, PutAll },
-       { "JMP", 0x0010808, 0x4c, 6, PutAll },
-       { "JSR", 0x0000008, 0x20, 7, PutAll },
-       { "LDA", 0x080A66C, 0xa0, 0, PutAll },
-       { "LDX", 0x080030C, 0xa2, 1, PutAll },
-       { "LDY", 0x080006C, 0xa0, 1, PutAll },
-       { "LSR", 0x000006F, 0x42, 1, PutAll },
-       { "NOP", 0x0000001, 0xea, 0, PutAll },
-       { "ORA", 0x080A66C, 0x00, 0, PutAll },
-       { "PHA", 0x0000001, 0x48, 0, PutAll },
-       { "PHP", 0x0000001, 0x08, 0, PutAll },
-       { "PHX", 0x0000001, 0xda, 0, PutAll },
-       { "PHY", 0x0000001, 0x5a, 0, PutAll },
-       { "PLA", 0x0000001, 0x68, 0, PutAll },
-       { "PLP", 0x0000001, 0x28, 0, PutAll },
-       { "PLX", 0x0000001, 0xfa, 0, PutAll },
-       { "PLY", 0x0000001, 0x7a, 0, PutAll },
-       { "ROL", 0x000006F, 0x22, 1, PutAll },
-       { "ROR", 0x000006F, 0x62, 1, PutAll },
-       { "RTI", 0x0000001, 0x40, 0, PutAll },
-       { "RTS", 0x0000001, 0x60, 0, PutAll },
-       { "SBC", 0x080A66C, 0xe0, 0, PutAll },
-       { "SEC", 0x0000001, 0x38, 0, PutAll },
-       { "SED", 0x0000001, 0xf8, 0, PutAll },
-       { "SEI", 0x0000001, 0x78, 0, PutAll },
-       { "STA", 0x000A66C, 0x80, 0, PutAll },
-       { "STX", 0x000010c, 0x82, 1, PutAll },
-       { "STY", 0x000002c, 0x80, 1, PutAll },
-       { "STZ", 0x000006c, 0x04, 5, PutAll },
-       { "TAX", 0x0000001, 0xaa, 0, PutAll },
-       { "TAY", 0x0000001, 0xa8, 0, PutAll },
-       { "TRB", 0x000000c, 0x10, 1, PutAll },
-       { "TSB", 0x000000c, 0x00, 1, PutAll },
-       { "TSX", 0x0000001, 0xba, 0, PutAll },
-       { "TXA", 0x0000001, 0x8a, 0, PutAll },
-       { "TXS", 0x0000001, 0x9a, 0, PutAll },
-       { "TYA", 0x0000001, 0x98, 0, PutAll }
+               { "ADC",  0x080A66C, 0x60, 0, PutAll },
+               { "AND",  0x080A66C, 0x20, 0, PutAll },
+               { "ASL",  0x000006e, 0x02, 1, PutAll },
+        { "BBR0", 0x0000000, 0x0F, 0, PutBitBranch },
+        { "BBR1", 0x0000000, 0x1F, 0, PutBitBranch },
+        { "BBR2", 0x0000000, 0x2F, 0, PutBitBranch },
+        { "BBR3", 0x0000000, 0x3F, 0, PutBitBranch },
+        { "BBR4", 0x0000000, 0x4F, 0, PutBitBranch },
+        { "BBR5", 0x0000000, 0x5F, 0, PutBitBranch },
+        { "BBR6", 0x0000000, 0x6F, 0, PutBitBranch },
+        { "BBR7", 0x0000000, 0x7F, 0, PutBitBranch },
+        { "BBS0", 0x0000000, 0x8F, 0, PutBitBranch },
+        { "BBS1", 0x0000000, 0x9F, 0, PutBitBranch },
+        { "BBS2", 0x0000000, 0xAF, 0, PutBitBranch },
+        { "BBS3", 0x0000000, 0xBF, 0, PutBitBranch },
+        { "BBS4", 0x0000000, 0xCF, 0, PutBitBranch },
+        { "BBS5", 0x0000000, 0xDF, 0, PutBitBranch },
+        { "BBS6", 0x0000000, 0xEF, 0, PutBitBranch },
+        { "BBS7", 0x0000000, 0xFF, 0, PutBitBranch },
+               { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
+               { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
+               { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
+               { "BIT",  0x0A0006C, 0x00, 2, PutAll },
+               { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
+               { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
+               { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
+               { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
+               { "BRK",  0x0000001, 0x00, 0, PutAll },
+               { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
+               { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
+               { "CLC",  0x0000001, 0x18, 0, PutAll },
+               { "CLD",  0x0000001, 0xd8, 0, PutAll },
+               { "CLI",  0x0000001, 0x58, 0, PutAll },
+               { "CLV",  0x0000001, 0xb8, 0, PutAll },
+               { "CMP",  0x080A66C, 0xc0, 0, PutAll },
+               { "CPX",  0x080000C, 0xe0, 1, PutAll },
+               { "CPY",  0x080000C, 0xc0, 1, PutAll },
+               { "DEA",  0x0000001, 0x00, 3, PutAll },   /* == DEC */
+               { "DEC",  0x000006F, 0x00, 3, PutAll },
+               { "DEX",  0x0000001, 0xca, 0, PutAll },
+               { "DEY",  0x0000001, 0x88, 0, PutAll },
+               { "EOR",  0x080A66C, 0x40, 0, PutAll },
+               { "INA",  0x0000001, 0x00, 4, PutAll },   /* == INC */
+               { "INC",  0x000006f, 0x00, 4, PutAll },
+               { "INX",  0x0000001, 0xe8, 0, PutAll },
+               { "INY",  0x0000001, 0xc8, 0, PutAll },
+               { "JMP",  0x0010808, 0x4c, 6, PutAll },
+               { "JSR",  0x0000008, 0x20, 7, PutAll },
+               { "LDA",  0x080A66C, 0xa0, 0, PutAll },
+               { "LDX",  0x080030C, 0xa2, 1, PutAll },
+               { "LDY",  0x080006C, 0xa0, 1, PutAll },
+               { "LSR",  0x000006F, 0x42, 1, PutAll },
+               { "NOP",  0x0000001, 0xea, 0, PutAll },
+               { "ORA",  0x080A66C, 0x00, 0, PutAll },
+               { "PHA",  0x0000001, 0x48, 0, PutAll },
+               { "PHP",  0x0000001, 0x08, 0, PutAll },
+               { "PHX",  0x0000001, 0xda, 0, PutAll },
+               { "PHY",  0x0000001, 0x5a, 0, PutAll },
+               { "PLA",  0x0000001, 0x68, 0, PutAll },
+               { "PLP",  0x0000001, 0x28, 0, PutAll },
+               { "PLX",  0x0000001, 0xfa, 0, PutAll },
+               { "PLY",  0x0000001, 0x7a, 0, PutAll },
+               { "RMB0", 0x0000004, 0x07, 1, PutAll },
+               { "RMB1", 0x0000004, 0x17, 1, PutAll },
+               { "RMB2", 0x0000004, 0x27, 1, PutAll },
+               { "RMB3", 0x0000004, 0x37, 1, PutAll },
+               { "RMB4", 0x0000004, 0x47, 1, PutAll },
+               { "RMB5", 0x0000004, 0x57, 1, PutAll },
+               { "RMB6", 0x0000004, 0x67, 1, PutAll },
+               { "RMB7", 0x0000004, 0x77, 1, PutAll },
+               { "ROL",  0x000006F, 0x22, 1, PutAll },
+               { "ROR",  0x000006F, 0x62, 1, PutAll },
+               { "RTI",  0x0000001, 0x40, 0, PutAll },
+               { "RTS",  0x0000001, 0x60, 0, PutAll },
+               { "SBC",  0x080A66C, 0xe0, 0, PutAll },
+               { "SEC",  0x0000001, 0x38, 0, PutAll },
+               { "SED",  0x0000001, 0xf8, 0, PutAll },
+               { "SEI",  0x0000001, 0x78, 0, PutAll },
+               { "SMB0", 0x0000004, 0x87, 1, PutAll },
+               { "SMB1", 0x0000004, 0x97, 1, PutAll },
+               { "SMB2", 0x0000004, 0xA7, 1, PutAll },
+               { "SMB3", 0x0000004, 0xB7, 1, PutAll },
+               { "SMB4", 0x0000004, 0xC7, 1, PutAll },
+               { "SMB5", 0x0000004, 0xD7, 1, PutAll },
+               { "SMB6", 0x0000004, 0xE7, 1, PutAll },
+               { "SMB7", 0x0000004, 0xF7, 1, PutAll },
+               { "STA",  0x000A66C, 0x80, 0, PutAll },
+               { "STX",  0x000010c, 0x82, 1, PutAll },
+               { "STY",  0x000002c, 0x80, 1, PutAll },
+               { "STZ",  0x000006c, 0x04, 5, PutAll },
+               { "TAX",  0x0000001, 0xaa, 0, PutAll },
+               { "TAY",  0x0000001, 0xa8, 0, PutAll },
+               { "TRB",  0x000000c, 0x10, 1, PutAll },
+               { "TSB",  0x000000c, 0x00, 1, PutAll },
+               { "TSX",  0x0000001, 0xba, 0, PutAll },
+               { "TXA",  0x0000001, 0x8a, 0, PutAll },
+               { "TXS",  0x0000001, 0x9a, 0, PutAll },
+               { "TYA",  0x0000001, 0x98, 0, PutAll }
     }
 };
 
@@ -302,107 +335,107 @@ static const struct {
 } InsTab65816 = {
     INS_COUNT_65816,
     {
-       { "ADC", 0x0b8f6fc, 0x60, 0, PutAll },
-       { "AND", 0x0b8f6fc, 0x20, 0, PutAll },
-       { "ASL", 0x000006e, 0x02, 1, PutAll },
-       { "BCC", 0x0020000, 0x90, 0, PutPCRel8 },
-       { "BCS", 0x0020000, 0xb0, 0, PutPCRel8 },
-       { "BEQ", 0x0020000, 0xf0, 0, PutPCRel8 },
-       { "BGE", 0x0020000, 0xb0, 0, PutPCRel8 },   /* == BCS */
-       { "BIT", 0x0a0006c, 0x00, 2, PutAll },
-       { "BLT", 0x0020000, 0x90, 0, PutPCRel8 },   /* == BCC */
-       { "BMI", 0x0020000, 0x30, 0, PutPCRel8 },
-       { "BNE", 0x0020000, 0xd0, 0, PutPCRel8 },
-       { "BPL", 0x0020000, 0x10, 0, PutPCRel8 },
-       { "BRA", 0x0020000, 0x80, 0, PutPCRel8 },
-       { "BRK", 0x0000001, 0x00, 0, PutAll },
-       { "BRL", 0x0040000, 0x82, 0, PutPCRel16 },
-       { "BVC", 0x0020000, 0x50, 0, PutPCRel8 },
-       { "BVS", 0x0020000, 0x70, 0, PutPCRel8 },
-       { "CLC", 0x0000001, 0x18, 0, PutAll },
-       { "CLD", 0x0000001, 0xd8, 0, PutAll },
-       { "CLI", 0x0000001, 0x58, 0, PutAll },
-       { "CLV", 0x0000001, 0xb8, 0, PutAll },
-       { "CMP", 0x0b8f6fc, 0xc0, 0, PutAll },
-       { "COP", 0x0000004, 0x02, 6, PutAll },
-       { "CPA", 0x0b8f6fc, 0xc0, 0, PutAll },   /* == CMP */
-       { "CPX", 0x0c0000c, 0xe0, 1, PutAll },
-       { "CPY", 0x0c0000c, 0xc0, 1, PutAll },
-       { "DEA", 0x0000001, 0x00, 3, PutAll },   /* == DEC */
-       { "DEC", 0x000006F, 0x00, 3, PutAll },
-       { "DEX", 0x0000001, 0xca, 0, PutAll },
-       { "DEY", 0x0000001, 0x88, 0, PutAll },
-       { "EOR", 0x0b8f6fc, 0x40, 0, PutAll },
-       { "INA", 0x0000001, 0x00, 4, PutAll },   /* == INC */
-       { "INC", 0x000006F, 0x00, 4, PutAll },
-       { "INX", 0x0000001, 0xe8, 0, PutAll },
-       { "INY", 0x0000001, 0xc8, 0, PutAll },
-       { "JML", 0x0000810, 0x5c, 1, PutAll },
-       { "JMP", 0x0010818, 0x4c, 6, PutAll },
-       { "JSL", 0x0000010, 0x20, 7, PutAll },
-       { "JSR", 0x0010018, 0x20, 7, PutAll },
-       { "LDA", 0x0b8f6fc, 0xa0, 0, PutAll },
-       { "LDX", 0x0c0030c, 0xa2, 1, PutAll },
-       { "LDY", 0x0c0006c, 0xa0, 1, PutAll },
-       { "LSR", 0x000006F, 0x42, 1, PutAll },
-       { "MVN", 0x1000000, 0x54, 0, PutBlockMove },
-       { "MVP", 0x1000000, 0x44, 0, PutBlockMove },
-       { "NOP", 0x0000001, 0xea, 0, PutAll },
-       { "ORA", 0x0b8f6fc, 0x00, 0, PutAll },
-       { "PEA", 0x0000008, 0xf4, 6, PutAll },
-       { "PEI", 0x0000400, 0xd4, 1, PutAll },
-       { "PER", 0x0040000, 0x62, 0, PutPCRel16 },
-       { "PHA", 0x0000001, 0x48, 0, PutAll },
-       { "PHB", 0x0000001, 0x8b, 0, PutAll },
-       { "PHD", 0x0000001, 0x0b, 0, PutAll },
-       { "PHK", 0x0000001, 0x4b, 0, PutAll },
-       { "PHP", 0x0000001, 0x08, 0, PutAll },
-       { "PHX", 0x0000001, 0xda, 0, PutAll },
-       { "PHY", 0x0000001, 0x5a, 0, PutAll },
-       { "PLA", 0x0000001, 0x68, 0, PutAll },
-       { "PLB", 0x0000001, 0xab, 0, PutAll },
-       { "PLD", 0x0000001, 0x2b, 0, PutAll },
-       { "PLP", 0x0000001, 0x28, 0, PutAll },
-       { "PLX", 0x0000001, 0xfa, 0, PutAll },
-       { "PLY", 0x0000001, 0x7a, 0, PutAll },
-       { "REP", 0x0800000, 0xc2, 1, PutREP },
-       { "ROL", 0x000006F, 0x22, 1, PutAll },
-       { "ROR", 0x000006F, 0x62, 1, PutAll },
-       { "RTI", 0x0000001, 0x40, 0, PutAll },
-       { "RTL", 0x0000001, 0x6b, 0, PutAll },
-       { "RTS", 0x0000001, 0x60, 0, PutAll },
-       { "SBC", 0x0b8f6fc, 0xe0, 0, PutAll },
-       { "SEC", 0x0000001, 0x38, 0, PutAll },
-       { "SED", 0x0000001, 0xf8, 0, PutAll },
-       { "SEI", 0x0000001, 0x78, 0, PutAll },
-       { "SEP", 0x0800000, 0xe2, 1, PutSEP },
-       { "STA", 0x018f6fc, 0x80, 0, PutAll },
-       { "STP", 0x0000001, 0xdb, 0, PutAll },
-       { "STX", 0x000010c, 0x82, 1, PutAll },
-       { "STY", 0x000002c, 0x80, 1, PutAll },
-       { "STZ", 0x000006c, 0x04, 5, PutAll },
-       { "SWA", 0x0000001, 0xeb, 0, PutAll },   /* == XBA */
-       { "TAD", 0x0000001, 0x5b, 0, PutAll },   /* == TCD */
-       { "TAS", 0x0000001, 0x1b, 0, PutAll },   /* == TCS */
-       { "TAX", 0x0000001, 0xaa, 0, PutAll },
-       { "TAY", 0x0000001, 0xa8, 0, PutAll },
-       { "TCD", 0x0000001, 0x5b, 0, PutAll },
-       { "TCS", 0x0000001, 0x1b, 0, PutAll },
-       { "TDA", 0x0000001, 0x7b, 0, PutAll },   /* == TDC */
-       { "TDC", 0x0000001, 0x7b, 0, PutAll },
-       { "TRB", 0x000000c, 0x10, 1, PutAll },
-       { "TSA", 0x0000001, 0x3b, 0, PutAll },   /* == TSC */
-       { "TSB", 0x000000c, 0x00, 1, PutAll },
-       { "TSC", 0x0000001, 0x3b, 0, PutAll },
-       { "TSX", 0x0000001, 0xba, 0, PutAll },
-       { "TXA", 0x0000001, 0x8a, 0, PutAll },
-       { "TXS", 0x0000001, 0x9a, 0, PutAll },
-       { "TXY", 0x0000001, 0x9b, 0, PutAll },
-       { "TYA", 0x0000001, 0x98, 0, PutAll },
-       { "TYX", 0x0000001, 0xbb, 0, PutAll },
-       { "WAI", 0x0000001, 0xcb, 0, PutAll },
-       { "XBA", 0x0000001, 0xeb, 0, PutAll },
-       { "XCE", 0x0000001, 0xfb, 0, PutAll }
+               { "ADC",  0x0b8f6fc, 0x60, 0, PutAll },
+               { "AND",  0x0b8f6fc, 0x20, 0, PutAll },
+               { "ASL",  0x000006e, 0x02, 1, PutAll },
+               { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
+               { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
+               { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
+               { "BGE",  0x0020000, 0xb0, 0, PutPCRel8 },   /* == BCS */
+               { "BIT",  0x0a0006c, 0x00, 2, PutAll },
+               { "BLT",  0x0020000, 0x90, 0, PutPCRel8 },   /* == BCC */
+               { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
+               { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
+               { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
+               { "BRA",  0x0020000, 0x80, 0, PutPCRel8 },
+               { "BRK",  0x0000001, 0x00, 0, PutAll },
+               { "BRL",  0x0040000, 0x82, 0, PutPCRel16 },
+               { "BVC",  0x0020000, 0x50, 0, PutPCRel8 },
+               { "BVS",  0x0020000, 0x70, 0, PutPCRel8 },
+               { "CLC",  0x0000001, 0x18, 0, PutAll },
+               { "CLD",  0x0000001, 0xd8, 0, PutAll },
+               { "CLI",  0x0000001, 0x58, 0, PutAll },
+               { "CLV",  0x0000001, 0xb8, 0, PutAll },
+               { "CMP",  0x0b8f6fc, 0xc0, 0, PutAll },
+               { "COP",  0x0000004, 0x02, 6, PutAll },
+               { "CPA",  0x0b8f6fc, 0xc0, 0, PutAll },   /* == CMP */
+               { "CPX",  0x0c0000c, 0xe0, 1, PutAll },
+               { "CPY",  0x0c0000c, 0xc0, 1, PutAll },
+               { "DEA",  0x0000001, 0x00, 3, PutAll },   /* == DEC */
+               { "DEC",  0x000006F, 0x00, 3, PutAll },
+               { "DEX",  0x0000001, 0xca, 0, PutAll },
+               { "DEY",  0x0000001, 0x88, 0, PutAll },
+               { "EOR",  0x0b8f6fc, 0x40, 0, PutAll },
+               { "INA",  0x0000001, 0x00, 4, PutAll },   /* == INC */
+               { "INC",  0x000006F, 0x00, 4, PutAll },
+               { "INX",  0x0000001, 0xe8, 0, PutAll },
+               { "INY",  0x0000001, 0xc8, 0, PutAll },
+               { "JML",  0x0000810, 0x5c, 1, PutAll },
+               { "JMP",  0x0010818, 0x4c, 6, PutAll },
+               { "JSL",  0x0000010, 0x20, 7, PutAll },
+               { "JSR",  0x0010018, 0x20, 7, PutAll },
+               { "LDA",  0x0b8f6fc, 0xa0, 0, PutAll },
+               { "LDX",  0x0c0030c, 0xa2, 1, PutAll },
+               { "LDY",  0x0c0006c, 0xa0, 1, PutAll },
+               { "LSR",  0x000006F, 0x42, 1, PutAll },
+               { "MVN",  0x1000000, 0x54, 0, PutBlockMove },
+               { "MVP",  0x1000000, 0x44, 0, PutBlockMove },
+               { "NOP",  0x0000001, 0xea, 0, PutAll },
+               { "ORA",  0x0b8f6fc, 0x00, 0, PutAll },
+               { "PEA",  0x0000008, 0xf4, 6, PutAll },
+               { "PEI",  0x0000400, 0xd4, 1, PutAll },
+               { "PER",  0x0040000, 0x62, 0, PutPCRel16 },
+               { "PHA",  0x0000001, 0x48, 0, PutAll },
+               { "PHB",  0x0000001, 0x8b, 0, PutAll },
+               { "PHD",  0x0000001, 0x0b, 0, PutAll },
+               { "PHK",  0x0000001, 0x4b, 0, PutAll },
+               { "PHP",  0x0000001, 0x08, 0, PutAll },
+               { "PHX",  0x0000001, 0xda, 0, PutAll },
+               { "PHY",  0x0000001, 0x5a, 0, PutAll },
+               { "PLA",  0x0000001, 0x68, 0, PutAll },
+               { "PLB",  0x0000001, 0xab, 0, PutAll },
+               { "PLD",  0x0000001, 0x2b, 0, PutAll },
+               { "PLP",  0x0000001, 0x28, 0, PutAll },
+               { "PLX",  0x0000001, 0xfa, 0, PutAll },
+               { "PLY",  0x0000001, 0x7a, 0, PutAll },
+               { "REP",  0x0800000, 0xc2, 1, PutREP },
+               { "ROL",  0x000006F, 0x22, 1, PutAll },
+               { "ROR",  0x000006F, 0x62, 1, PutAll },
+               { "RTI",  0x0000001, 0x40, 0, PutAll },
+               { "RTL",  0x0000001, 0x6b, 0, PutAll },
+               { "RTS",  0x0000001, 0x60, 0, PutAll },
+               { "SBC",  0x0b8f6fc, 0xe0, 0, PutAll },
+               { "SEC",  0x0000001, 0x38, 0, PutAll },
+               { "SED",  0x0000001, 0xf8, 0, PutAll },
+               { "SEI",  0x0000001, 0x78, 0, PutAll },
+               { "SEP",  0x0800000, 0xe2, 1, PutSEP },
+               { "STA",  0x018f6fc, 0x80, 0, PutAll },
+               { "STP",  0x0000001, 0xdb, 0, PutAll },
+               { "STX",  0x000010c, 0x82, 1, PutAll },
+               { "STY",  0x000002c, 0x80, 1, PutAll },
+               { "STZ",  0x000006c, 0x04, 5, PutAll },
+               { "SWA",  0x0000001, 0xeb, 0, PutAll },   /* == XBA */
+               { "TAD",  0x0000001, 0x5b, 0, PutAll },   /* == TCD */
+               { "TAS",  0x0000001, 0x1b, 0, PutAll },   /* == TCS */
+               { "TAX",  0x0000001, 0xaa, 0, PutAll },
+               { "TAY",  0x0000001, 0xa8, 0, PutAll },
+               { "TCD",  0x0000001, 0x5b, 0, PutAll },
+               { "TCS",  0x0000001, 0x1b, 0, PutAll },
+               { "TDA",  0x0000001, 0x7b, 0, PutAll },   /* == TDC */
+               { "TDC",  0x0000001, 0x7b, 0, PutAll },
+               { "TRB",  0x000000c, 0x10, 1, PutAll },
+               { "TSA",  0x0000001, 0x3b, 0, PutAll },   /* == TSC */
+               { "TSB",  0x000000c, 0x00, 1, PutAll },
+               { "TSC",  0x0000001, 0x3b, 0, PutAll },
+               { "TSX",  0x0000001, 0xba, 0, PutAll },
+               { "TXA",  0x0000001, 0x8a, 0, PutAll },
+               { "TXS",  0x0000001, 0x9a, 0, PutAll },
+               { "TXY",  0x0000001, 0x9b, 0, PutAll },
+               { "TYA",  0x0000001, 0x98, 0, PutAll },
+               { "TYX",  0x0000001, 0xbb, 0, PutAll },
+               { "WAI",  0x0000001, 0xcb, 0, PutAll },
+               { "XBA",  0x0000001, 0xeb, 0, PutAll },
+               { "XCE",  0x0000001, 0xfb, 0, PutAll }
     }
 };
 
@@ -433,49 +466,49 @@ unsigned char EATab [9][AMI_COUNT] = {
        0x00, 0x00, 0x05, 0x0D, 0x0F, 0x15, 0x1D, 0x1F,
        0x00, 0x19, 0x12, 0x00, 0x07, 0x11, 0x17, 0x01,
        0x00, 0x00, 0x00, 0x03, 0x13, 0x09, 0x00, 0x09,
-       0x00
+               0x00
     },
     {   /* Table 1 */
        0x08, 0x08, 0x04, 0x0C, 0x00, 0x14, 0x1C, 0x00,
        0x14, 0x1C, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00
+               0x00
     },
     {   /* Table 2 */
        0x00, 0x00, 0x24, 0x2C, 0x0F, 0x34, 0x3C, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00,
-       0x00
+               0x00
     },
     {   /* Table 3 */
        0x3A, 0x3A, 0xC6, 0xCE, 0x00, 0xD6, 0xDE, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00
+               0x00
     },
     {   /* Table 4 */
        0x1A, 0x1A, 0xE6, 0xEE, 0x00, 0xF6, 0xFE, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00
+               0x00
     },
     {   /* Table 5 */
        0x00, 0x00, 0x60, 0x98, 0x00, 0x70, 0x9E, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00
+               0x00
     },
     {   /* Table 6 */
        0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
        0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00
+               0x00
     },
     {   /* Table 7 */
        0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00
+               0x00
     },
     {   /* Table 8 */
                0x00, 0x40, 0x01, 0x41, 0x00, 0x09, 0x49, 0x00,
@@ -487,31 +520,31 @@ unsigned char EATab [9][AMI_COUNT] = {
 
 /* Table that encodes the additional bytes for each instruction */
 unsigned char ExtBytes [AMI_COUNT] = {
-    0,         /* Implicit */
-    0,         /* Accu */
-    1,         /* Direct */
-    2,         /* Absolute */
-    3,                 /* Absolute long */
-    1,         /* Direct,X */
-    2,         /* Absolute,X */
-    3,         /* Absolute long,X */
-    1,         /* Direct,Y */
-    2,         /* Absolute,Y */
-    1,         /* (Direct) */
-    2,         /* (Absolute) */
-    1,         /* [Direct] */
-    1,         /* (Direct),Y */
-    1,         /* [Direct],Y */
-    1,         /* (Direct,X) */
-    2,         /* (Absolute,X) */
-    1,         /* Relative short */
-    2,         /* Relative long */
-    1,         /* r,s */
-    1,         /* (r,s),y */
-    1,         /* Immidiate accu */
-    1,         /* Immidiate index */
+    0,         /* Implicit */
+    0,         /* Accu */
+    1,         /* Direct */
+    2,         /* Absolute */
+    3,                 /* Absolute long */
+    1,         /* Direct,X */
+    2,         /* Absolute,X */
+    3,         /* Absolute long,X */
+    1,         /* Direct,Y */
+    2,         /* Absolute,Y */
+    1,         /* (Direct) */
+    2,         /* (Absolute) */
+    1,         /* [Direct] */
+    1,         /* (Direct),Y */
+    1,         /* [Direct],Y */
+    1,         /* (Direct,X) */
+    2,         /* (Absolute,X) */
+    1,         /* Relative short */
+    2,         /* Relative long */
+    1,         /* r,s */
+    1,         /* (r,s),y */
+    1,         /* Immidiate accu */
+    1,         /* Immidiate index */
     1,         /* Immidiate byte */
-    2          /* Blockmove */
+    2          /* Blockmove */
 };
 
 
@@ -688,6 +721,17 @@ static void PutBlockMove (const InsDesc* Ins)
 
 
 
+static void PutBitBranch (const InsDesc* Ins)
+/* Handle 65C02 branch on bit condition */
+{
+    Emit0 (Ins->BaseCode);
+    EmitByte (Expression ());
+    ConsumeComma ();
+    EmitSigned (GenBranchExpr (1), 1);
+}
+
+
+
 static void PutREP (const InsDesc* Ins)
 /* Emit a REP instruction, track register sizes */
 {
@@ -837,29 +881,26 @@ int FindInstruction (const char* Ident)
  * instruction table. If not, return -1.
  */
 {
-    const InsDesc* I;
-    char Key [sizeof (I->Mnemonic)];
-
-    /* Accept only strings with the right length */
-    if (strlen (Ident) != sizeof (I->Mnemonic)-1) {
-               /* Wrong length */
-               return -1;
-    }
+    unsigned I;
+    const InsDesc* ID;
+    char Key[sizeof (ID->Mnemonic)];
 
     /* Make a copy, and uppercase that copy */
-    Key [0] = toupper (Ident [0]);
-    Key [1] = toupper (Ident [1]);
-    Key [2] = toupper (Ident [2]);
-    Key [3] = '\0';
+    I = 0;
+    while (Ident[I]) {
+        Key[I] = toupper ((unsigned char)Ident[I]);
+        ++I;
+    }
+    Key[I] = '\0';
 
     /* Search for the key */
-    I = bsearch (Key, InsTab->Ins, InsTab->Count, sizeof (InsDesc), CmpName);
-    if (I == 0) {
+    ID = bsearch (Key, InsTab->Ins, InsTab->Count, sizeof (InsDesc), CmpName);
+    if (ID == 0) {
                /* Not found */
                return -1;
     } else {
                /* Found, return the entry */
-               return I - InsTab->Ins;
+               return ID - InsTab->Ins;
     }
 }
 

diff --git a/src/ca65/instr.h b/src/ca65/instr.h
index 7d01e15ea2f1eea28969605a6b88f6913911d963..20f957203ae6b7d2a465b8b7358c4efd95ca4b69 100644 (file)
--- a/src/ca65/instr.h
+++ b/src/ca65/instr.h
@@ -97,9 +97,9 @@
 /* Description for one instruction */
 typedef struct InsDesc InsDesc;
 struct InsDesc {
-    char                       Mnemonic [4];
-    unsigned long              AddrMode;               /* Valid adressing modes */
-    unsigned char      BaseCode;               /* Base opcode */
+    char                       Mnemonic [8];
+    unsigned long              AddrMode;               /* Valid adressing modes */
+    unsigned char      BaseCode;               /* Base opcode */
     unsigned char      ExtCode;                /* Number of ext code table */
     void                       (*Emit) (const InsDesc*);/* Handler function */
 };

diff --git a/src/ca65/objcode.c b/src/ca65/objcode.c
index bbb42b8f18488cff36dd04a40d1bd2274a4a47c9..bf61ebfaa3db236f8044b638ea92457729c8da72 100644 (file)
--- a/src/ca65/objcode.c
+++ b/src/ca65/objcode.c
@@ -633,13 +633,20 @@ void Emit3b (unsigned char OPC, ExprNode* Expr, ExprNode* Bank)
 
 
 
+void EmitSigned (ExprNode* Expr, unsigned Size)
+/* Emit a signed expression with the given size */
+{
+    Fragment* F = NewFragment (FRAG_SEXPR, Size);
+    F->V.Expr = Expr;
+}
+
+
+
 void EmitPCRel (unsigned char OPC, ExprNode* Expr, unsigned Size)
 /* Emit an opcode with a PC relative argument of one or two bytes */
 {
-    Fragment* F;
     Emit0 (OPC);
-    F = NewFragment (FRAG_SEXPR, Size);
-    F->V.Expr = Expr;
+    EmitSigned (Expr, Size);
 }
 
 

diff --git a/src/ca65/objcode.h b/src/ca65/objcode.h
index 8387ba5763f7c202e17d1cb09730e9436202de48..ddfbc4154e17f242cc42d97cff6902a591d8af60 100644 (file)
--- a/src/ca65/objcode.h
+++ b/src/ca65/objcode.h
@@ -133,6 +133,9 @@ void Emit3 (unsigned char OPC, ExprNode* Expr);
 void Emit3b (unsigned char OPC, ExprNode* Expr, ExprNode* Bank);
 /* Emit an instruction with a three byte argument and separate bank */
 
+void EmitSigned (ExprNode* Expr, unsigned Size);
+/* Emit a signed expression with the given size */
+
 void EmitPCRel (unsigned char OPC, ExprNode* Expr, unsigned Size);
 /* Emit an opcode with a PC relative argument of one or two bytes */