Prepare structures for adding emulation of instructions.

src/65c02isa.awk

@@ -4,6 +4,7 @@ BEGIN {
 	print "#define _65C02ISA_H_"
 	print "#include <stdint.h>"
 	print "#include \"instruction.h\""
+	print "#include \"emulation.h\""
 
 	print "const struct instrdef instrs[] = {"
 }
@@ -11,9 +12,9 @@ BEGIN {
 {
 	printf "#define %s 0x%X\n", $1, NR-1
 	if (NR < 256)
-		printf "\t{ %s, %s, %s, %d },\n", $1, $2, $3, $4 
+		printf "\t{ %s, %s, %s, %d, %s },\n", $1, $2, $3, $4, $5
 	else
-		printf "\t{ %s, %s, %s, %d }\n", $1, $2, $3, $4 
+		printf "\t{ %s, %s, %s, %d, %s }\n", $1, $2, $3, $4, $5
 
 }
 

src/65c02isa.csv

@@ -1,256 +1,256 @@
-OP_BRK,"brk",IMPLIED,1,
-OP_ORA_IZPX,"ora",IZPX,1,
-OP_NOPI,"nop",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_TSB_ZP,"tsb",ZP,2,
-OP_ORA_ZP,"ora",ZP,2,
-OP_ASL_ZP,"asl",ZP,2,
-OP_RMB0_ZP,"rmb0",ZP,2,
-OP_PHP,"php",IMPLIED,1,
-OP_ORA_IMM,"ora",IMMEDIATE,2,
-OP_ASL,"asl",ACCUMULATOR,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_TSB_ABS,"tsb",ABSOLUTE,3,
-OP_ORA_ABS,"abs",ABSOLUTE,3,
-OP_ASL_ABS,"asl",ABSOLUTE,3,
-OP_BBR0_REL,"bbr0",RELATIVE,2,
-OP_BPL_REL,"bpl",RELATIVE,2,
-OP_ORA_IZPY,"ora",IZPY,2,
-OP_ORA_IZP,"ora",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_TRB_ZP,"trb",ZP,2,
-OP_ORA_ZPX,"ora",ZPX,2,
-OP_ASL_ZPX,"asl",ZPX,2,
-OP_RMB1_ZP,"rmb1",ZP,1,
-OP_CLC,"clc",IMPLIED,1,
-OP_ORA_ABSY,"ora",ABSOLUTEY,3,
-OP_INC,"inc",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_TRB_ABS,"trb",ABSOLUTE,3,
-OP_ORA_ABSX,"ora",ABSOLUTEX,3,
-OP_ASL_ABSX,"asl",ABSOLUTEX,3,
-OP_BBR1_REL,"bbr1",RELATIVE,2,
-OP_JSR,"jsr",ABSOLUTE,3,
-OP_AND_IZPX,"and",IZPX,2,
-OP_NOPI,"nop",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_BIT_ZP,"bit",ZP,2,
-OP_AND_ZP,"and",ZP,2,
-OP_ROL_ZP,"rol",ZP,2,
-OP_RMB2_ZP,"rmb2",ZP,2,
-OP_PLP,"plp",IMPLIED,1,
-OP_AND_IMM,"and",IMMEDIATE,2,
-OP_ROL,"rol",ACCUMULATOR,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_BIT_ABS,"bit",ABSOLUTE,3,
-OP_AND_ABS,"and",ABSOLUTE,3,
-OP_ROL_ABS,"rol",ABSOLUTE,3,
-OP_BBR2_REL,"bbr2",RELATIVE,2,
-OP_BMI_REL,"bmi",RELATIVE,2,
-OP_AND_IZPY,"and",IZPY,2,
-OP_AND_IZP,"and",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_BIT_ZPX,"bit",ZPX,2,
-OP_AND_ZPX,"and",ZPX,2,
-OP_ROL_ZPX,"rol",ZPX,2,
-OP_RMB3_ZP,"rmb3",ZP,2,
-OP_SEC,"sec",IMPLIED,1,
-OP_AND_ABSY,"and",ABSOLUTEY,3,
-OP_DEC,"dec",ACCUMULATOR,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_BIT_ABSX,"bit",ABSOLUTEX,3,
-OP_AND_ABSX,"and",ABSOLUTEX,3,
-OP_ROL_ABSX,"rol",ABSOLUTEX,3,
-OP_BBR3_REL,"bbr3",RELATIVE,2,
-OP_RTI,"rti",IMPLIED,1,
-OP_EOR_IZPX,"eor",IZPX,2,
-OP_NOPI,"nop",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_NOPI,"nop",ZP,2,
-OP_EOR_ZP,"eor",ZP,2,
-OP_LSR_ZP,"lsr",ZP,2,
-OP_RMB4_ZP,"rmb4",ZP,2,
-OP_PHA,"pha",IMPLIED,1,
-OP_EOR_IMM,"eor",IMMEDIATE,2,
-OP_LSR,"lsr",ACCUMULATOR,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_JMP_ABS,"jmp",ABSOLUTE,3,
-OP_EOR_ABS,"eor",ABSOLUTE,3,
-OP_LSR_ABS,"lsr",ABSOLUTE,3,
-OP_BBR4_REL,"bbr4",RELATIVE,2,
-OP_BVC_REL,"bvc",RELATIVE,2,
-OP_EOR_IZPY,"eor",IZPY,2,
-OP_EOR_IZP,"eor",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_NOPI,"nop",ZPX,2,
-OP_EOR_ZPX,"eor",ZPX,2,
-OP_LSR_ZPX,"lsr",ZPX,2,
-OP_RMB5_ZP,"rmb5",ZP,2,
-OP_CLI,"cli",IMPLIED,1,
-OP_EOR_ABSY,"eor",ABSOLUTEY,3,
-OP_PHY,"phy",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_NOPI,"nop",ABSOLUTE,3,
-OP_EOR_ABSX,"eor",ABSOLUTEX,3,
-OP_LSR_ABSX,"lsr",ABSOLUTEX,3,
-OP_BBR5_REL,"bbr5",RELATIVE,2,
-OP_RTS,"rts",IMPLIED,1,
-OP_ADC_IZPX,"adc",IZPX,2,
-OP_NOPI,"nop",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_STZ_ZP,"stz",ZP,2,
-OP_ADC_ZP,"adc",ZP,2,
-OP_ROR_ZP,"ror",ZP,2,
-OP_RMB6_ZP,"rmb6",ZP,2,
-OP_PLA,"pla",IMPLIED,1,
-OP_ADC_IMM,"adc",IMMEDIATE,2,
-OP_ROR,"ror",ACCUMULATOR,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_JMP_IABS,"jmp",IABSOLUTE,3,
-OP_ADC_ABS,"adc",ABSOLUTE,3,
-OP_ROR_ABS,"ror",ABSOLUTE,3,
-OP_BBR6_REL,"bbr6",RELATIVE,2,
-OP_BVS_REL,"bvs",RELATIVE,2,
-OP_ADC_IZPY,"adc",IZPY,2,
-OP_ADC_IZP,"adc",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_STZ_ZPX,"stz",ZPX,2,
-OP_ADC_ZPX,"adc",ZPX,2,
-OP_ROR_ZPX,"ror",ZPX,2,
-OP_RMB7_ZP,"rmb7",ZP,2,
-OP_SEI,"sei",IMPLIED,1,
-OP_ADC_ABSY,"adc",ABSOLUTEY,3,
-OP_PLY,"ply",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_JMP_IABSX,"jmp",IABSOLUTEX,3,
-OP_ADC_ABSX,"adc",ABSOLUTEX,3,
-OP_ROR_ABSX,"ror",ABSOLUTEX,3,
-OP_BBR7_REL,"bbr7",RELATIVE,2,
-OP_BRA_REL,"bra",RELATIVE,2,
-OP_STA_IZPX,"sta",IZPX,2,
-OP_NOPI,"nop",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_STY_ZP,"sty",ZP,2,
-OP_STA_ZP,"sta",ZP,2,
-OP_STX_ZP,"stx",ZP,2,
-OP_SMB0_ZP,"smb0",ZP,2,
-OP_DEY,"dey",IMPLIED,1,
-OP_BIT_IMM,"bit",IMMEDIATE,2,
-OP_TXA,"txa",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_STY_ABS,"sty",ABSOLUTE,3,
-OP_STA_ABS,"sta",ABSOLUTE,3,
-OP_STX_ABS,"stx",ABSOLUTE,3,
-OP_BBS0_REL,"bbs0",RELATIVE,2,
-OP_BCC_REL,"bcc",RELATIVE,2,
-OP_STA_IZPY,"sta",IZPY,2,
-OP_STA_IZP,"sta",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_STY_ZPX,"sty",ZPX,2,
-OP_STA_ZPX,"sta",ZPX,2,
-OP_STX_ZPY,"stx",ZPY,2,
-OP_SMB1_ZP,"smb1",ZP,2,
-OP_TYA,"tya",IMPLIED,1,
-OP_STA_ABSY,"sta",ABSOLUTEY,3,
-OP_TXS,"txs",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_STZ_ABS,"stz",ABSOLUTE,3,
-OP_STA_ABSX,"sta",ABSOLUTEX,3,
-OP_STZ_ABSX,"stz",ABSOLUTEX,3,
-OP_BBS1_REL,"bbs1",RELATIVE,2,
-OP_LDY_IMM,"ldy",IMMEDIATE,2,
-OP_LDA_IZPX,"lda",IZPX,2,
-OP_LDX_IMM,"ldx",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_LDY_ZP,"ldy",ZP,2,
-OP_LDA_ZP,"lda",ZP,2,
-OP_LDX_ZP,"ldx",ZP,2,
-OP_SMB2_ZP,"smb2",ZP,2,
-OP_TAY,"tay",IMPLIED,1,
-OP_LDA_IMM,"lda",IMMEDIATE,2,
-OP_TAX,"tax",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_LDY_ABS,"ldy",ABSOLUTE,3,
-OP_LDA_ABS,"lda",ABSOLUTE,3,
-OP_LDX_ABS,"ldx",ABSOLUTE,3,
-OP_BBS2_REL,"bbs2",RELATIVE,2,
-OP_BCS_REL,"bcs",RELATIVE,2,
-OP_LDA_IZPY,"lda",IZPY,2,
-OP_LDA_IZP,"lda",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_LDY_ZPX,"ldy",ZPX,2,
-OP_LDA_ZPX,"lda",ZPX,2,
-OP_LDX_ZPY,"unimpl",ZPY,1,
-OP_SMB3_ZP,"smb3",ZP,2,
-OP_CLV,"clv",IMPLIED,1,
-OP_LDA_ABSY,"lda",ABSOLUTEY,3,
-OP_TSX,"tsx",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_LDY_ABSX,"ldy",ABSOLUTEX,3,
-OP_LDA_ABSX,"lda",ABSOLUTEX,3,
-OP_LDX_ABSY,"ldx",ABSOLUTEY,3,
-OP_BBS3_REL,"bbs3",RELATIVE,2,
-OP_CPY_IMM,"cpy",IMMEDIATE,2,
-OP_CMP_IZPX,"cmp",IZPX,2,
-OP_NOPI,"nop",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_CPY_ZP,"cpy",ZP,2,
-OP_CMP_ZP,"cmp",ZP,2,
-OP_DEC_ZP,"dec",ZP,2,
-OP_SMB4_ZP,"smb4",ZP,2,
-OP_INY,"iny",IMPLIED,1,
-OP_CMP_IMM,"cmp",IMMEDIATE,2,
-OP_DEX,"dex",IMPLIED,1,
-OP_WAI,"wai",IMPLIED,1,
-OP_CPY_ABS,"cpy",ABSOLUTE,3,
-OP_CMP_ABS,"cmp",ABSOLUTE,3,
-OP_DEC_ABS,"dec",ABSOLUTE,3,
-OP_BBS4_REL,"bbs4",RELATIVE,2,
-OP_BNE_REL,"bne",RELATIVE,2,
-OP_CMP_IZPY,"cmp",IZPY,2,
-OP_CMP_IZP,"cmp",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_NOPI,"nop",ZPX,2,
-OP_CMP_ZPX,"cmp",ZPX,2,
-OP_DEC_ZPX,"dec",ZPX,2,
-OP_SMB5_ZP,"smb5",ZP,2,
-OP_CLD,"cld",IMPLIED,1,
-OP_CMP_ABSY,"cmp",ABSOLUTEY,3,
-OP_PHX,"phx",IMPLIED,1,
-OP_STP,"stp",IMPLIED,1,
-OP_NOPI,"nop",ABSOLUTE,3,
-OP_CMP_ABSX,"cmp",ABSOLUTEX,3,
-OP_DEC_ABSX,"dec",ABSOLUTEX,3,
-OP_BBS5_REL,"bbs5",RELATIVE,2,
-OP_CPX_IMM,"cpx",IMMEDIATE,2,
-OP_SBC_IZPX,"sbc",IZPX,2,
-OP_NOPI,"nop",IMMEDIATE,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_CPX_ZP,"cpx",ZP,2,
-OP_SBC_ZP,"sbc",ZP,2,
-OP_INC_ZP,"inc",ZP,2,
-OP_SMB6_ZP,"smb6",ZP,2,
-OP_INX,"inx",IMPLIED,1,
-OP_SBC_IMM,"sbc",IMMEDIATE,2,
-OP_NOP,"nop",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_CPX_ABS,"cpx",ABSOLUTE,3,
-OP_SBC_ABS,"sbc",ABSOLUTE,3,
-OP_INC_ABS,"inc",ABSOLUTE,3,
-OP_BBS6_REL,"bbs6",RELATIVE,2,
-OP_BEQ_REL,"beq",RELATIVE,2,
-OP_SBC_IZPY,"sbc",IZPY,2,
-OP_SBC_IZP,"sbc",IZP,2,
-OP_NOPI,"nop",IMPLIED,1,
-OP_NOPI,"nop",ZPX,2,
-OP_SBC_ZPX,"sbc",ZPX,2,
-OP_INC_ZPX,"inc",ZPX,2,
-OP_SMB7_ZP,"smb7",ZP,2,
-OP_SED,"sed",IMPLIED,1,
-OP_SBC_ABSY,"sbc",ABSOLUTEY,3,
-OP_PLX,"plx",IMPLIED,1,
-OP_NOPI,"nop",IMPLIED,1,
-OP_NOPI,"nop",ABSOLUTE,3,
-OP_SBC_ABSX,"sbc",ABSOLUTEX,1,
-OP_INC_ABSX,"inc",ABSOLUTEX,1,
-OP_BBS7_REL,"bbs7",RELATIVE,1,
+OP_BRK,"brk",IMPLIED,1,NULL
+OP_ORA_IZPX,"ora",IZPX,1,NULL
+OP_NOPI,"nop",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_TSB_ZP,"tsb",ZP,2,NULL
+OP_ORA_ZP,"ora",ZP,2,NULL
+OP_ASL_ZP,"asl",ZP,2,NULL
+OP_RMB0_ZP,"rmb0",ZP,2,NULL
+OP_PHP,"php",IMPLIED,1,NULL
+OP_ORA_IMM,"ora",IMMEDIATE,2,NULL
+OP_ASL,"asl",ACCUMULATOR,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_TSB_ABS,"tsb",ABSOLUTE,3,NULL
+OP_ORA_ABS,"abs",ABSOLUTE,3,NULL
+OP_ASL_ABS,"asl",ABSOLUTE,3,NULL
+OP_BBR0_REL,"bbr0",RELATIVE,2,NULL
+OP_BPL_REL,"bpl",RELATIVE,2,NULL
+OP_ORA_IZPY,"ora",IZPY,2,NULL
+OP_ORA_IZP,"ora",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_TRB_ZP,"trb",ZP,2,NULL
+OP_ORA_ZPX,"ora",ZPX,2,NULL
+OP_ASL_ZPX,"asl",ZPX,2,NULL
+OP_RMB1_ZP,"rmb1",ZP,1,NULL
+OP_CLC,"clc",IMPLIED,1,NULL
+OP_ORA_ABSY,"ora",ABSOLUTEY,3,NULL
+OP_INC,"inc",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_TRB_ABS,"trb",ABSOLUTE,3,NULL
+OP_ORA_ABSX,"ora",ABSOLUTEX,3,NULL
+OP_ASL_ABSX,"asl",ABSOLUTEX,3,NULL
+OP_BBR1_REL,"bbr1",RELATIVE,2,NULL
+OP_JSR,"jsr",ABSOLUTE,3,NULL
+OP_AND_IZPX,"and",IZPX,2,NULL
+OP_NOPI,"nop",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_BIT_ZP,"bit",ZP,2,NULL
+OP_AND_ZP,"and",ZP,2,NULL
+OP_ROL_ZP,"rol",ZP,2,NULL
+OP_RMB2_ZP,"rmb2",ZP,2,NULL
+OP_PLP,"plp",IMPLIED,1,NULL
+OP_AND_IMM,"and",IMMEDIATE,2,NULL
+OP_ROL,"rol",ACCUMULATOR,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_BIT_ABS,"bit",ABSOLUTE,3,NULL
+OP_AND_ABS,"and",ABSOLUTE,3,NULL
+OP_ROL_ABS,"rol",ABSOLUTE,3,NULL
+OP_BBR2_REL,"bbr2",RELATIVE,2,NULL
+OP_BMI_REL,"bmi",RELATIVE,2,NULL
+OP_AND_IZPY,"and",IZPY,2,NULL
+OP_AND_IZP,"and",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_BIT_ZPX,"bit",ZPX,2,NULL
+OP_AND_ZPX,"and",ZPX,2,NULL
+OP_ROL_ZPX,"rol",ZPX,2,NULL
+OP_RMB3_ZP,"rmb3",ZP,2,NULL
+OP_SEC,"sec",IMPLIED,1,NULL
+OP_AND_ABSY,"and",ABSOLUTEY,3,NULL
+OP_DEC,"dec",ACCUMULATOR,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_BIT_ABSX,"bit",ABSOLUTEX,3,NULL
+OP_AND_ABSX,"and",ABSOLUTEX,3,NULL
+OP_ROL_ABSX,"rol",ABSOLUTEX,3,NULL
+OP_BBR3_REL,"bbr3",RELATIVE,2,NULL
+OP_RTI,"rti",IMPLIED,1,NULL
+OP_EOR_IZPX,"eor",IZPX,2,NULL
+OP_NOPI,"nop",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_NOPI,"nop",ZP,2,NULL
+OP_EOR_ZP,"eor",ZP,2,NULL
+OP_LSR_ZP,"lsr",ZP,2,NULL
+OP_RMB4_ZP,"rmb4",ZP,2,NULL
+OP_PHA,"pha",IMPLIED,1,NULL
+OP_EOR_IMM,"eor",IMMEDIATE,2,NULL
+OP_LSR,"lsr",ACCUMULATOR,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_JMP_ABS,"jmp",ABSOLUTE,3,NULL
+OP_EOR_ABS,"eor",ABSOLUTE,3,NULL
+OP_LSR_ABS,"lsr",ABSOLUTE,3,NULL
+OP_BBR4_REL,"bbr4",RELATIVE,2,NULL
+OP_BVC_REL,"bvc",RELATIVE,2,NULL
+OP_EOR_IZPY,"eor",IZPY,2,NULL
+OP_EOR_IZP,"eor",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_NOPI,"nop",ZPX,2,NULL
+OP_EOR_ZPX,"eor",ZPX,2,NULL
+OP_LSR_ZPX,"lsr",ZPX,2,NULL
+OP_RMB5_ZP,"rmb5",ZP,2,NULL
+OP_CLI,"cli",IMPLIED,1,NULL
+OP_EOR_ABSY,"eor",ABSOLUTEY,3,NULL
+OP_PHY,"phy",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_NOPI,"nop",ABSOLUTE,3,NULL
+OP_EOR_ABSX,"eor",ABSOLUTEX,3,NULL
+OP_LSR_ABSX,"lsr",ABSOLUTEX,3,NULL
+OP_BBR5_REL,"bbr5",RELATIVE,2,NULL
+OP_RTS,"rts",IMPLIED,1,NULL
+OP_ADC_IZPX,"adc",IZPX,2,NULL
+OP_NOPI,"nop",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_STZ_ZP,"stz",ZP,2,NULL
+OP_ADC_ZP,"adc",ZP,2,NULL
+OP_ROR_ZP,"ror",ZP,2,NULL
+OP_RMB6_ZP,"rmb6",ZP,2,NULL
+OP_PLA,"pla",IMPLIED,1,NULL
+OP_ADC_IMM,"adc",IMMEDIATE,2,NULL
+OP_ROR,"ror",ACCUMULATOR,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_JMP_IABS,"jmp",IABSOLUTE,3,NULL
+OP_ADC_ABS,"adc",ABSOLUTE,3,NULL
+OP_ROR_ABS,"ror",ABSOLUTE,3,NULL
+OP_BBR6_REL,"bbr6",RELATIVE,2,NULL
+OP_BVS_REL,"bvs",RELATIVE,2,NULL
+OP_ADC_IZPY,"adc",IZPY,2,NULL
+OP_ADC_IZP,"adc",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_STZ_ZPX,"stz",ZPX,2,NULL
+OP_ADC_ZPX,"adc",ZPX,2,NULL
+OP_ROR_ZPX,"ror",ZPX,2,NULL
+OP_RMB7_ZP,"rmb7",ZP,2,NULL
+OP_SEI,"sei",IMPLIED,1,NULL
+OP_ADC_ABSY,"adc",ABSOLUTEY,3,NULL
+OP_PLY,"ply",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_JMP_IABSX,"jmp",IABSOLUTEX,3,NULL
+OP_ADC_ABSX,"adc",ABSOLUTEX,3,NULL
+OP_ROR_ABSX,"ror",ABSOLUTEX,3,NULL
+OP_BBR7_REL,"bbr7",RELATIVE,2,NULL
+OP_BRA_REL,"bra",RELATIVE,2,NULL
+OP_STA_IZPX,"sta",IZPX,2,NULL
+OP_NOPI,"nop",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_STY_ZP,"sty",ZP,2,NULL
+OP_STA_ZP,"sta",ZP,2,NULL
+OP_STX_ZP,"stx",ZP,2,NULL
+OP_SMB0_ZP,"smb0",ZP,2,NULL
+OP_DEY,"dey",IMPLIED,1,NULL
+OP_BIT_IMM,"bit",IMMEDIATE,2,NULL
+OP_TXA,"txa",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_STY_ABS,"sty",ABSOLUTE,3,NULL
+OP_STA_ABS,"sta",ABSOLUTE,3,NULL
+OP_STX_ABS,"stx",ABSOLUTE,3,NULL
+OP_BBS0_REL,"bbs0",RELATIVE,2,NULL
+OP_BCC_REL,"bcc",RELATIVE,2,NULL
+OP_STA_IZPY,"sta",IZPY,2,NULL
+OP_STA_IZP,"sta",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_STY_ZPX,"sty",ZPX,2,NULL
+OP_STA_ZPX,"sta",ZPX,2,NULL
+OP_STX_ZPY,"stx",ZPY,2,NULL
+OP_SMB1_ZP,"smb1",ZP,2,NULL
+OP_TYA,"tya",IMPLIED,1,NULL
+OP_STA_ABSY,"sta",ABSOLUTEY,3,NULL
+OP_TXS,"txs",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_STZ_ABS,"stz",ABSOLUTE,3,NULL
+OP_STA_ABSX,"sta",ABSOLUTEX,3,NULL
+OP_STZ_ABSX,"stz",ABSOLUTEX,3,NULL
+OP_BBS1_REL,"bbs1",RELATIVE,2,NULL
+OP_LDY_IMM,"ldy",IMMEDIATE,2,NULL
+OP_LDA_IZPX,"lda",IZPX,2,NULL
+OP_LDX_IMM,"ldx",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_LDY_ZP,"ldy",ZP,2,NULL
+OP_LDA_ZP,"lda",ZP,2,NULL
+OP_LDX_ZP,"ldx",ZP,2,NULL
+OP_SMB2_ZP,"smb2",ZP,2,NULL
+OP_TAY,"tay",IMPLIED,1,NULL
+OP_LDA_IMM,"lda",IMMEDIATE,2,NULL
+OP_TAX,"tax",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_LDY_ABS,"ldy",ABSOLUTE,3,NULL
+OP_LDA_ABS,"lda",ABSOLUTE,3,NULL
+OP_LDX_ABS,"ldx",ABSOLUTE,3,NULL
+OP_BBS2_REL,"bbs2",RELATIVE,2,NULL
+OP_BCS_REL,"bcs",RELATIVE,2,NULL
+OP_LDA_IZPY,"lda",IZPY,2,NULL
+OP_LDA_IZP,"lda",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_LDY_ZPX,"ldy",ZPX,2,NULL
+OP_LDA_ZPX,"lda",ZPX,2,NULL
+OP_LDX_ZPY,"unimpl",ZPY,1,NULL
+OP_SMB3_ZP,"smb3",ZP,2,NULL
+OP_CLV,"clv",IMPLIED,1,NULL
+OP_LDA_ABSY,"lda",ABSOLUTEY,3,NULL
+OP_TSX,"tsx",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_LDY_ABSX,"ldy",ABSOLUTEX,3,NULL
+OP_LDA_ABSX,"lda",ABSOLUTEX,3,NULL
+OP_LDX_ABSY,"ldx",ABSOLUTEY,3,NULL
+OP_BBS3_REL,"bbs3",RELATIVE,2,NULL
+OP_CPY_IMM,"cpy",IMMEDIATE,2,NULL
+OP_CMP_IZPX,"cmp",IZPX,2,NULL
+OP_NOPI,"nop",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_CPY_ZP,"cpy",ZP,2,NULL
+OP_CMP_ZP,"cmp",ZP,2,NULL
+OP_DEC_ZP,"dec",ZP,2,NULL
+OP_SMB4_ZP,"smb4",ZP,2,NULL
+OP_INY,"iny",IMPLIED,1,NULL
+OP_CMP_IMM,"cmp",IMMEDIATE,2,NULL
+OP_DEX,"dex",IMPLIED,1,NULL
+OP_WAI,"wai",IMPLIED,1,NULL
+OP_CPY_ABS,"cpy",ABSOLUTE,3,NULL
+OP_CMP_ABS,"cmp",ABSOLUTE,3,NULL
+OP_DEC_ABS,"dec",ABSOLUTE,3,NULL
+OP_BBS4_REL,"bbs4",RELATIVE,2,NULL
+OP_BNE_REL,"bne",RELATIVE,2,NULL
+OP_CMP_IZPY,"cmp",IZPY,2,NULL
+OP_CMP_IZP,"cmp",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_NOPI,"nop",ZPX,2,NULL
+OP_CMP_ZPX,"cmp",ZPX,2,NULL
+OP_DEC_ZPX,"dec",ZPX,2,NULL
+OP_SMB5_ZP,"smb5",ZP,2,NULL
+OP_CLD,"cld",IMPLIED,1,NULL
+OP_CMP_ABSY,"cmp",ABSOLUTEY,3,NULL
+OP_PHX,"phx",IMPLIED,1,NULL
+OP_STP,"stp",IMPLIED,1,NULL
+OP_NOPI,"nop",ABSOLUTE,3,NULL
+OP_CMP_ABSX,"cmp",ABSOLUTEX,3,NULL
+OP_DEC_ABSX,"dec",ABSOLUTEX,3,NULL
+OP_BBS5_REL,"bbs5",RELATIVE,2,NULL
+OP_CPX_IMM,"cpx",IMMEDIATE,2,NULL
+OP_SBC_IZPX,"sbc",IZPX,2,NULL
+OP_NOPI,"nop",IMMEDIATE,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_CPX_ZP,"cpx",ZP,2,NULL
+OP_SBC_ZP,"sbc",ZP,2,NULL
+OP_INC_ZP,"inc",ZP,2,NULL
+OP_SMB6_ZP,"smb6",ZP,2,NULL
+OP_INX,"inx",IMPLIED,1,NULL
+OP_SBC_IMM,"sbc",IMMEDIATE,2,NULL
+OP_NOP,"nop",IMPLIED,1,emul_nop
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_CPX_ABS,"cpx",ABSOLUTE,3,NULL
+OP_SBC_ABS,"sbc",ABSOLUTE,3,NULL
+OP_INC_ABS,"inc",ABSOLUTE,3,NULL
+OP_BBS6_REL,"bbs6",RELATIVE,2,NULL
+OP_BEQ_REL,"beq",RELATIVE,2,NULL
+OP_SBC_IZPY,"sbc",IZPY,2,NULL
+OP_SBC_IZP,"sbc",IZP,2,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_NOPI,"nop",ZPX,2,NULL
+OP_SBC_ZPX,"sbc",ZPX,2,NULL
+OP_INC_ZPX,"inc",ZPX,2,NULL
+OP_SMB7_ZP,"smb7",ZP,2,NULL
+OP_SED,"sed",IMPLIED,1,NULL
+OP_SBC_ABSY,"sbc",ABSOLUTEY,3,NULL
+OP_PLX,"plx",IMPLIED,1,NULL
+OP_NOPI,"nop",IMPLIED,1,NULL
+OP_NOPI,"nop",ABSOLUTE,3,NULL
+OP_SBC_ABSX,"sbc",ABSOLUTEX,1,NULL
+OP_INC_ABSX,"inc",ABSOLUTEX,1,NULL
+OP_BBS7_REL,"bbs7",RELATIVE,1,NULL

src/Makefile

@@ -1,4 +1,4 @@
-OBJS=rk65c02.o bus.o instruction.o
+OBJS=rk65c02.o bus.o instruction.o emulation.o
 LIB_SO=librk65c02.so
 LIB_STATIC=librk65c02.a
 LDFLAGS=-shared

src/emulation.c

@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+#include "emulation.h"
+
+void
+emul_nop(void)
+{
+	printf("nop!\n");
+}
+

src/emulation.h

@@ -0,0 +1,7 @@
+#ifndef _EMULATION_H_
+#define _EMULATION_H_
+
+void emul_nop(void);
+
+#endif /* _EMULATION_H_*/
+

src/instruction.h

@@ -24,6 +24,7 @@ struct instrdef {
 	const char *mnemonic;
 	addressing_t mode;
 	uint8_t size;
+	void (*emul)(void);
 };
 
 typedef struct instrdef instrdef_t;

src/rk65c02.c

@@ -14,22 +14,25 @@ static bool run = false;
 
 void
 rk6502_start(bus_t *b, uint16_t addr) {
-	reg_state_t r;
 	instruction_t i;
+	reg_state_t r;
+	rk65c02emu_t e;
 
-	r.PC = addr;
+	e.bus = b;
+	e.regs = &r;
+	e.regs->PC = addr;
 
 	run = true;
 	while (run) {
-		disassemble(b, r.PC);
-		i = instruction_fetch(b, r.PC);
+		disassemble(e.bus, e.regs->PC);
+		i = instruction_fetch(e.bus, e.regs->PC);
 
 		//execute(i, r);
 
 		if (i.def.opcode == 0xDB) // STP
 			run = false;
 
-		r.PC += i.def.size;
+		e.regs->PC += i.def.size;
 	}
 }
 /*

src/rk65c02.h

@@ -24,8 +24,8 @@ typedef struct reg_state reg_state_t;
 
 struct rk65c02emu {
 	emu_state_t state;
-	bus_t bus;
-	reg_state_t regs;
+	bus_t *bus;
+	reg_state_t *regs;
 };
 
 typedef struct rk65c02emu rk65c02emu_t;