6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-06-02 04:41:35 +00:00
Code Issues Projects Releases Wiki Activity

Implement changing-size opcodes

Browse Source
This commit is contained in:
Lauri Kasanen 2022-10-12 14:45:10 +03:00
parent e8ee8435e9
commit 1294c1c253
5 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/da65/handler.c
View File

@ -231,6 +231,28 @@ void OH_Immediate (const OpcDesc* D)
void OH_Immediate65816M (const OpcDesc* D)
{
if (GetAttr (PC) & atMem16) {
OneLine (D, "#$%04X", GetCodeWord (PC+1));
} else {
OneLine (D, "#$%02X", GetCodeByte (PC+1));
}
}
void OH_Immediate65816X (const OpcDesc* D)
{
if (GetAttr (PC) & atIdx16) {
OneLine (D, "#$%04X", GetCodeWord (PC+1));
} else {
OneLine (D, "#$%02X", GetCodeByte (PC+1));
}
}
void OH_ImmediateWord (const OpcDesc* D) void OH_ImmediateWord (const OpcDesc* D)
{ {
OneLine (D, "#$%04X", GetCodeWord (PC+1)); OneLine (D, "#$%04X", GetCodeWord (PC+1));

2
src/da65/handler.h
View File

@ -57,6 +57,8 @@ void OH_Illegal (const OpcDesc* D attribute ((unused)));
void OH_Accumulator (const OpcDesc*); void OH_Accumulator (const OpcDesc*);
void OH_Implicit (const OpcDesc*); void OH_Implicit (const OpcDesc*);
void OH_Immediate (const OpcDesc*); void OH_Immediate (const OpcDesc*);
void OH_Immediate65816M (const OpcDesc*);
void OH_Immediate65816X (const OpcDesc*);
void OH_ImmediateWord (const OpcDesc*); void OH_ImmediateWord (const OpcDesc*);
void OH_Direct (const OpcDesc*); void OH_Direct (const OpcDesc*);
void OH_DirectX (const OpcDesc*); void OH_DirectX (const OpcDesc*);

9
src/da65/main.c
View File

@ -55,6 +55,7 @@
#include "data.h" #include "data.h"
#include "error.h" #include "error.h"
#include "global.h" #include "global.h"
#include "handler.h"
#include "infofile.h" #include "infofile.h"
#include "labels.h" #include "labels.h"
#include "opctable.h" #include "opctable.h"
@ -447,6 +448,14 @@ static void OneOpcode (unsigned RemainingBytes)
} }
/* Output the insn */ /* Output the insn */
D->Handler (D); D->Handler (D);
if (CPU == CPU_65816 && (D->Flags & flSizeChanges)) {
if ((D->Handler == OH_Immediate65816M &&
GetAttr (PC) & atMem16) ||
(D->Handler == OH_Immediate65816X &&
GetAttr (PC) & atIdx16)) {
PC++;
}
}
PC += D->Size; PC += D->Size;
break; break;
} }

24
src/da65/opc65816.c
View File

@ -56,7 +56,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "asl", 2, flUseLabel, OH_Direct }, /* $06 */ { "asl", 2, flUseLabel, OH_Direct }, /* $06 */
{ "ora", 2, flUseLabel, OH_DirectIndirectLong }, /* $07 */ { "ora", 2, flUseLabel, OH_DirectIndirectLong }, /* $07 */
{ "php", 1, flNone, OH_Implicit }, /* $08 */ { "php", 1, flNone, OH_Implicit }, /* $08 */
{ "ora", 2, flNone, OH_Immediate }, /* $09 */ { "ora", 2, flSizeChanges, OH_Immediate65816M }, /* $09 */
{ "asl", 1, flNone, OH_Accumulator }, /* $0a */ { "asl", 1, flNone, OH_Accumulator }, /* $0a */
{ "phd", 1, flNone, OH_Implicit }, /* $0b */ { "phd", 1, flNone, OH_Implicit }, /* $0b */
{ "tsb", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $0c */ { "tsb", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $0c */
@ -88,7 +88,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "rol", 2, flUseLabel, OH_Direct }, /* $26 */ { "rol", 2, flUseLabel, OH_Direct }, /* $26 */
{ "and", 2, flUseLabel, OH_DirectIndirectLong }, /* $27 */ { "and", 2, flUseLabel, OH_DirectIndirectLong }, /* $27 */
{ "plp", 1, flNone, OH_Implicit }, /* $28 */ { "plp", 1, flNone, OH_Implicit }, /* $28 */
{ "and", 2, flNone, OH_Immediate }, /* $29 */ { "and", 2, flSizeChanges, OH_Immediate65816M }, /* $29 */
{ "rol", 1, flNone, OH_Accumulator }, /* $2a */ { "rol", 1, flNone, OH_Accumulator }, /* $2a */
{ "pld", 1, flNone, OH_Implicit }, /* $2b */ { "pld", 1, flNone, OH_Implicit }, /* $2b */
{ "bit", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $2c */ { "bit", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $2c */
@ -120,7 +120,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "lsr", 2, flUseLabel, OH_Direct }, /* $46 */ { "lsr", 2, flUseLabel, OH_Direct }, /* $46 */
{ "eor", 2, flUseLabel, OH_DirectIndirectLong }, /* $47 */ { "eor", 2, flUseLabel, OH_DirectIndirectLong }, /* $47 */
{ "pha", 1, flNone, OH_Implicit }, /* $48 */ { "pha", 1, flNone, OH_Implicit }, /* $48 */
{ "eor", 2, flNone, OH_Immediate }, /* $49 */ { "eor", 2, flSizeChanges, OH_Immediate65816M }, /* $49 */
{ "lsr", 1, flNone, OH_Accumulator }, /* $4a */ { "lsr", 1, flNone, OH_Accumulator }, /* $4a */
{ "phk", 1, flNone, OH_Implicit }, /* $4b */ { "phk", 1, flNone, OH_Implicit }, /* $4b */
{ "jmp", 3, flLabel, OH_JmpAbsolute }, /* $4c */ { "jmp", 3, flLabel, OH_JmpAbsolute }, /* $4c */
@ -152,7 +152,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "ror", 2, flUseLabel, OH_Direct }, /* $66 */ { "ror", 2, flUseLabel, OH_Direct }, /* $66 */
{ "adc", 2, flUseLabel, OH_DirectIndirectLong }, /* $67 */ { "adc", 2, flUseLabel, OH_DirectIndirectLong }, /* $67 */
{ "pla", 1, flNone, OH_Implicit }, /* $68 */ { "pla", 1, flNone, OH_Implicit }, /* $68 */
{ "adc", 2, flNone, OH_Immediate }, /* $69 */ { "adc", 2, flSizeChanges, OH_Immediate65816M }, /* $69 */
{ "ror", 1, flNone, OH_Accumulator }, /* $6a */ { "ror", 1, flNone, OH_Accumulator }, /* $6a */
{ "rtl", 1, flNone, OH_Implicit }, /* $6b */ { "rtl", 1, flNone, OH_Implicit }, /* $6b */
{ "jmp", 3, flLabel, OH_JmpAbsoluteIndirect }, /* $6c */ { "jmp", 3, flLabel, OH_JmpAbsoluteIndirect }, /* $6c */
@ -184,7 +184,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "stx", 2, flUseLabel, OH_Direct }, /* $86 */ { "stx", 2, flUseLabel, OH_Direct }, /* $86 */
{ "sta", 2, flUseLabel, OH_DirectIndirectLong }, /* $87 */ { "sta", 2, flUseLabel, OH_DirectIndirectLong }, /* $87 */
{ "dey", 1, flNone, OH_Implicit }, /* $88 */ { "dey", 1, flNone, OH_Implicit }, /* $88 */
{ "bit", 2, flNone, OH_Immediate }, /* $89 */ { "bit", 2, flSizeChanges, OH_Immediate65816M }, /* $89 */
{ "txa", 1, flNone, OH_Implicit }, /* $8a */ { "txa", 1, flNone, OH_Implicit }, /* $8a */
{ "phb", 1, flNone, OH_Implicit }, /* $8b */ { "phb", 1, flNone, OH_Implicit }, /* $8b */
{ "sty", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $8c */ { "sty", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $8c */
@ -207,16 +207,16 @@ const OpcDesc OpcTable_65816[256] = {
{ "sta", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $9d */ { "sta", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $9d */
{ "stz", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $9e */ { "stz", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $9e */
{ "sta", 4, flUseLabel, OH_AbsoluteLongX }, /* $9f */ { "sta", 4, flUseLabel, OH_AbsoluteLongX }, /* $9f */
{ "ldy", 2, flNone, OH_Immediate }, /* $a0 */ { "ldy", 2, flSizeChanges, OH_Immediate65816X }, /* $a0 */
{ "lda", 2, flUseLabel, OH_DirectXIndirect }, /* $a1 */ { "lda", 2, flUseLabel, OH_DirectXIndirect }, /* $a1 */
{ "ldx", 2, flNone, OH_Immediate }, /* $a2 */ { "ldx", 2, flSizeChanges, OH_Immediate65816X }, /* $a2 */
{ "lda", 2, flNone, OH_StackRelative }, /* $a3 */ { "lda", 2, flNone, OH_StackRelative }, /* $a3 */
{ "ldy", 2, flUseLabel, OH_Direct }, /* $a4 */ { "ldy", 2, flUseLabel, OH_Direct }, /* $a4 */
{ "lda", 2, flUseLabel, OH_Direct }, /* $a5 */ { "lda", 2, flUseLabel, OH_Direct }, /* $a5 */
{ "ldx", 2, flUseLabel, OH_Direct }, /* $a6 */ { "ldx", 2, flUseLabel, OH_Direct }, /* $a6 */
{ "lda", 2, flUseLabel, OH_DirectIndirectLong }, /* $a7 */ { "lda", 2, flUseLabel, OH_DirectIndirectLong }, /* $a7 */
{ "tay", 1, flNone, OH_Implicit }, /* $a8 */ { "tay", 1, flNone, OH_Implicit }, /* $a8 */
{ "lda", 2, flNone, OH_Immediate }, /* $a9 */ { "lda", 2, flSizeChanges, OH_Immediate65816M }, /* $a9 */
{ "tax", 1, flNone, OH_Implicit }, /* $aa */ { "tax", 1, flNone, OH_Implicit }, /* $aa */
{ "plb", 1, flNone, OH_Implicit }, /* $ab */ { "plb", 1, flNone, OH_Implicit }, /* $ab */
{ "ldy", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $ac */ { "ldy", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $ac */
@ -239,7 +239,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "lda", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $bd */ { "lda", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $bd */
{ "ldx", 3, flUseLabel|flAbsOverride, OH_AbsoluteY }, /* $be */ { "ldx", 3, flUseLabel|flAbsOverride, OH_AbsoluteY }, /* $be */
{ "lda", 4, flUseLabel, OH_AbsoluteLongX }, /* $bf */ { "lda", 4, flUseLabel, OH_AbsoluteLongX }, /* $bf */
{ "cpy", 2, flNone, OH_Immediate }, /* $c0 */ { "cpy", 2, flSizeChanges, OH_Immediate65816X }, /* $c0 */
{ "cmp", 2, flUseLabel, OH_DirectXIndirect }, /* $c1 */ { "cmp", 2, flUseLabel, OH_DirectXIndirect }, /* $c1 */
{ "rep", 2, flNone, OH_Immediate }, /* $c2 */ { "rep", 2, flNone, OH_Immediate }, /* $c2 */
{ "cmp", 2, flNone, OH_StackRelative }, /* $c3 */ { "cmp", 2, flNone, OH_StackRelative }, /* $c3 */
@ -248,7 +248,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "dec", 2, flUseLabel, OH_Direct }, /* $c6 */ { "dec", 2, flUseLabel, OH_Direct }, /* $c6 */
{ "cmp", 2, flUseLabel, OH_DirectIndirectLong }, /* $c7 */ { "cmp", 2, flUseLabel, OH_DirectIndirectLong }, /* $c7 */
{ "iny", 1, flNone, OH_Implicit }, /* $c8 */ { "iny", 1, flNone, OH_Implicit }, /* $c8 */
{ "cmp", 2, flNone, OH_Immediate }, /* $c9 */ { "cmp", 2, flSizeChanges, OH_Immediate65816M }, /* $c9 */
{ "dex", 1, flNone, OH_Implicit }, /* $ca */ { "dex", 1, flNone, OH_Implicit }, /* $ca */
{ "wai", 1, flNone, OH_Implicit }, /* $cb */ { "wai", 1, flNone, OH_Implicit }, /* $cb */
{ "cpy", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $cc */ { "cpy", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $cc */
@ -271,7 +271,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "cmp", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $dd */ { "cmp", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $dd */
{ "dec", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $de */ { "dec", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $de */
{ "cmp", 4, flUseLabel, OH_AbsoluteLongX }, /* $df */ { "cmp", 4, flUseLabel, OH_AbsoluteLongX }, /* $df */
{ "cpx", 2, flNone, OH_Immediate }, /* $e0 */ { "cpx", 2, flSizeChanges, OH_Immediate65816X }, /* $e0 */
{ "sbc", 2, flUseLabel, OH_DirectXIndirect }, /* $e1 */ { "sbc", 2, flUseLabel, OH_DirectXIndirect }, /* $e1 */
{ "sep", 2, flNone, OH_Immediate }, /* $e2 */ { "sep", 2, flNone, OH_Immediate }, /* $e2 */
{ "sbc", 2, flNone, OH_StackRelative }, /* $e3 */ { "sbc", 2, flNone, OH_StackRelative }, /* $e3 */
@ -280,7 +280,7 @@ const OpcDesc OpcTable_65816[256] = {
{ "inc", 2, flUseLabel, OH_Direct }, /* $e6 */ { "inc", 2, flUseLabel, OH_Direct }, /* $e6 */
{ "sbc", 2, flUseLabel, OH_DirectIndirectLong }, /* $e7 */ { "sbc", 2, flUseLabel, OH_DirectIndirectLong }, /* $e7 */
{ "inx", 1, flNone, OH_Implicit }, /* $e8 */ { "inx", 1, flNone, OH_Implicit }, /* $e8 */
{ "sbc", 2, flNone, OH_Immediate }, /* $e9 */ { "sbc", 2, flSizeChanges, OH_Immediate65816M }, /* $e9 */
{ "nop", 1, flNone, OH_Implicit }, /* $ea */ { "nop", 1, flNone, OH_Implicit }, /* $ea */
{ "xba", 1, flNone, OH_Implicit }, /* $eb */ { "xba", 1, flNone, OH_Implicit }, /* $eb */
{ "cpx", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $ec */ { "cpx", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $ec */

3
src/da65/opcdesc.h
View File

@ -53,7 +53,8 @@ enum {
flLabel = flUseLabel|flGenLabel, /* Generate and use a label */ flLabel = flUseLabel|flGenLabel, /* Generate and use a label */
flIllegal = 0x10, /* Illegal instruction */ flIllegal = 0x10, /* Illegal instruction */
flAbsOverride = 0x20, /* Need a: override */ flAbsOverride = 0x20, /* Need a: override */
flFarOverride = 0x40 /* Need f: override */ flFarOverride = 0x40, /* Need f: override */
flSizeChanges = 0x80 /* 65816: size may change */
}; };
/* Forward/typedef for struct OpcDesc */ /* Forward/typedef for struct OpcDesc */