| @@ -48,12 +48,12 @@ static inline void e6502_adr_w16(e6502_Core* core, | |||||
| typedef uint16_t e6502_Address; | typedef uint16_t e6502_Address; | ||||
| static inline e6502_Address e6502_mem_adr(e6502_Core*, | |||||
| static inline e6502_Address e6502_mem_adr(e6502_Core* core, | |||||
| e6502_Mem_Addr adr) { | e6502_Mem_Addr adr) { | ||||
| return adr; | return adr; | ||||
| } | } | ||||
| static inline e6502_Mem_Addr e6502_adr_mem(e6502_Core*, | |||||
| static inline e6502_Mem_Addr e6502_adr_mem(e6502_Core* core, | |||||
| e6502_Address adr) { | e6502_Address adr) { | ||||
| return adr; | return adr; | ||||
| } | } | ||||
| @@ -96,7 +96,7 @@ static inline uint16_t arg16(e6502_Core* core) { | |||||
| // Interpret opcode values | // Interpret opcode values | ||||
| static inline e6502_Address adr_imp(e6502_Core*) { | |||||
| static inline e6502_Address adr_imp(e6502_Core* core) { | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| @@ -173,11 +173,11 @@ static inline e6502_Address adr_rel(e6502_Core* core) { | |||||
| // Instructions | // Instructions | ||||
| static inline void nop(e6502_Core*, e6502_Address) { | |||||
| static inline void nop(e6502_Core* core, e6502_Address adr) { | |||||
| // NOP | // NOP | ||||
| } | } | ||||
| static inline void brk(e6502_Core *core, e6502_Address) { | |||||
| static inline void brk(e6502_Core *core, e6502_Address adr) { | |||||
| e6502_push16(core, core->registers.PC + 1); | e6502_push16(core, core->registers.PC + 1); | ||||
| e6502_push8(core, core->registers.P | | e6502_push8(core, core->registers.P | | ||||
| e6502_Status_1 | | e6502_Status_1 | | ||||
| @@ -186,7 +186,7 @@ static inline void brk(e6502_Core *core, e6502_Address) { | |||||
| core->registers.PC = e6502_r16(core, e6502_IRQ_Vec); | core->registers.PC = e6502_r16(core, e6502_IRQ_Vec); | ||||
| } | } | ||||
| static inline void rti(e6502_Core *core, e6502_Address) { | |||||
| static inline void rti(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P = e6502_pop8(core) | | core->registers.P = e6502_pop8(core) | | ||||
| e6502_Status_1 | | e6502_Status_1 | | ||||
| e6502_Status_B; | e6502_Status_B; | ||||
| @@ -394,31 +394,31 @@ static inline void beq(e6502_Core *core, e6502_Address adr) { | |||||
| } | } | ||||
| } | } | ||||
| static inline void clc(e6502_Core *core, e6502_Address) { | |||||
| static inline void clc(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P &= ~e6502_Status_C; | core->registers.P &= ~e6502_Status_C; | ||||
| } | } | ||||
| static inline void cli(e6502_Core *core, e6502_Address) { | |||||
| static inline void cli(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P &= ~e6502_Status_I; | core->registers.P &= ~e6502_Status_I; | ||||
| } | } | ||||
| static inline void cld(e6502_Core *core, e6502_Address) { | |||||
| static inline void cld(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P &= ~e6502_Status_D; | core->registers.P &= ~e6502_Status_D; | ||||
| } | } | ||||
| static inline void clv(e6502_Core *core, e6502_Address) { | |||||
| static inline void clv(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P &= ~e6502_Status_V; | core->registers.P &= ~e6502_Status_V; | ||||
| } | } | ||||
| static inline void sec(e6502_Core *core, e6502_Address) { | |||||
| static inline void sec(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P |= e6502_Status_C; | core->registers.P |= e6502_Status_C; | ||||
| } | } | ||||
| static inline void sei(e6502_Core *core, e6502_Address) { | |||||
| static inline void sei(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P |= e6502_Status_I; | core->registers.P |= e6502_Status_I; | ||||
| } | } | ||||
| static inline void sed(e6502_Core *core, e6502_Address) { | |||||
| static inline void sed(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.P |= e6502_Status_D; | core->registers.P |= e6502_Status_D; | ||||
| } | } | ||||
| @@ -431,7 +431,7 @@ static inline void jmp(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.PC = e6502_adr_mem(core, adr); | core->registers.PC = e6502_adr_mem(core, adr); | ||||
| } | } | ||||
| static inline void rts(e6502_Core *core, e6502_Address) { | |||||
| static inline void rts(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.PC = e6502_pop16(core) + 1; | core->registers.PC = e6502_pop16(core) + 1; | ||||
| } | } | ||||
| @@ -532,11 +532,11 @@ static inline void ini(e6502_Core *core, uint8_t* reg) { | |||||
| *reg = val; | *reg = val; | ||||
| } | } | ||||
| static inline void inx(e6502_Core *core, e6502_Address) { | |||||
| static inline void inx(e6502_Core *core, e6502_Address adr) { | |||||
| ini(core, &core->registers.X); | ini(core, &core->registers.X); | ||||
| } | } | ||||
| static inline void iny(e6502_Core *core, e6502_Address) { | |||||
| static inline void iny(e6502_Core *core, e6502_Address adr) { | |||||
| ini(core, &core->registers.Y); | ini(core, &core->registers.Y); | ||||
| } | } | ||||
| @@ -557,11 +557,11 @@ static inline void dei(e6502_Core *core, uint8_t* reg) { | |||||
| *reg = val; | *reg = val; | ||||
| } | } | ||||
| static inline void dex(e6502_Core *core, e6502_Address) { | |||||
| static inline void dex(e6502_Core *core, e6502_Address adr) { | |||||
| return dei(core, &core->registers.X); | return dei(core, &core->registers.X); | ||||
| } | } | ||||
| static inline void dey(e6502_Core *core, e6502_Address) { | |||||
| static inline void dey(e6502_Core *core, e6502_Address adr) { | |||||
| return dei(core, &core->registers.Y); | return dei(core, &core->registers.Y); | ||||
| } | } | ||||
| @@ -586,27 +586,27 @@ static inline void t(e6502_Core *core, | |||||
| *reg = val; | *reg = val; | ||||
| } | } | ||||
| static inline void tax(e6502_Core *core, e6502_Address) { | |||||
| static inline void tax(e6502_Core *core, e6502_Address adr) { | |||||
| t(core, &core->registers.X, core->registers.A); | t(core, &core->registers.X, core->registers.A); | ||||
| } | } | ||||
| static inline void tay(e6502_Core *core, e6502_Address) { | |||||
| static inline void tay(e6502_Core *core, e6502_Address adr) { | |||||
| t(core, &core->registers.Y, core->registers.A); | t(core, &core->registers.Y, core->registers.A); | ||||
| } | } | ||||
| static inline void txs(e6502_Core *core, e6502_Address) { | |||||
| static inline void txs(e6502_Core *core, e6502_Address adr) { | |||||
| core->registers.S = core->registers.X; | core->registers.S = core->registers.X; | ||||
| } | } | ||||
| static inline void txa(e6502_Core *core, e6502_Address) { | |||||
| static inline void txa(e6502_Core *core, e6502_Address adr) { | |||||
| t(core, &core->registers.A, core->registers.X); | t(core, &core->registers.A, core->registers.X); | ||||
| } | } | ||||
| static inline void tya(e6502_Core *core, e6502_Address) { | |||||
| static inline void tya(e6502_Core *core, e6502_Address adr) { | |||||
| t(core, &core->registers.A, core->registers.Y); | t(core, &core->registers.A, core->registers.Y); | ||||
| } | } | ||||
| static inline void tsx(e6502_Core *core, e6502_Address) { | |||||
| static inline void tsx(e6502_Core *core, e6502_Address adr) { | |||||
| t(core, &core->registers.X, core->registers.S); | t(core, &core->registers.X, core->registers.S); | ||||
| } | } | ||||