6502/rk65c02
1
0
Fork 0
mirror of https://github.com/rkujawa/rk65c02.git synced 2025-04-03 16:33:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix indirect indexed with Y addressing.

Browse Source 
Also fix test case for this. Problem wasn't detected, because test case
was broken too.
This commit is contained in:
Radosław Kujawa 2018-03-31 12:38:45 +02:00
parent 4f299a6f36
commit 7c4d6cea3f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/instruction.c
View File

@ -302,11 +302,10 @@ instruction_data_write_1(rk65c02emu_t *e, instrdef_t *id, instruction_t *i, uint
iaddr |= (bus_read_1(e->bus, i->op1 + e->regs.X + 1) << 8);
bus_write_1(e->bus, iaddr, val);
break;
case IZPY:
/* XXX */
case IZPY: /* Zero Page Indirect Indexed with Y */
iaddr = bus_read_1(e->bus, i->op1);
iaddr |= (bus_read_1(e->bus, i->op1 + 1) << 8);
bus_write_1(e->bus, iaddr, val + e->regs.Y);
bus_write_1(e->bus, iaddr + e->regs.Y, val);
break;
case ABSOLUTEX:
bus_write_1(e->bus, (i->op1 + (i->op2 << 8)) + e->regs.X, val);
@ -369,11 +368,10 @@ instruction_data_read_1(rk65c02emu_t *e, instrdef_t *id, instruction_t *i)
iaddr |= (bus_read_1(e->bus, i->op1 + e->regs.X + 1) << 8);
rv = bus_read_1(e->bus, iaddr);
break;
case IZPY:
/* XXX: what about page wraps / roll over */
case IZPY: /* Zero Page Indirect Indexed with Y */
iaddr = bus_read_1(e->bus, i->op1);
iaddr |= (bus_read_1(e->bus, i->op1 + 1) << 8);
rv = bus_read_1(e->bus, iaddr) + e->regs.Y;
rv = bus_read_1(e->bus, iaddr + e->regs.Y);
break;
case ABSOLUTE:
rv = bus_read_1(e->bus, i->op1 + (i->op2 << 8));

8
test/test_emulation.c
View File

@ -122,7 +122,7 @@ ATF_TC_BODY(emul_cmp, tc)
e.regs.Y = 0x01;
bus_write_1(&b, 0x22, 0x0);
bus_write_1(&b, 0x23, 0x20);
bus_write_1(&b, 0x2000, 0xF);
bus_write_1(&b, 0x2001, 0x10);
rk65c02_dump_regs(e.regs);
ATF_REQUIRE(rom_start(&e, "test_emulation_cmp_izpy.rom", tc));
rk65c02_dump_regs(e.regs);
@ -662,11 +662,11 @@ ATF_TC_BODY(emul_sta, tc)
ATF_REQUIRE(rom_start(&e, "test_emulation_sta_izpx.rom", tc));
ATF_CHECK(bus_read_1(&b, 0x2010) == 0xAA);
/* STA indirect zero page Y */
e.regs.A = 0x54;
e.regs.A = 0x55;
e.regs.X = 0;
e.regs.Y = 0x1;
ATF_REQUIRE(rom_start(&e, "test_emulation_sta_izpy.rom", tc));
ATF_CHECK(bus_read_1(&b, 0x2010) == 0x55);
ATF_CHECK(bus_read_1(&b, 0x2011) == 0x55);
bus_finish(&b);
}
@ -729,7 +729,7 @@ ATF_TC_BODY(emul_ora, tc)
e.regs.A = 0xAA;
e.regs.X = 0;
e.regs.Y = 0x1;
bus_write_1(&b, 0x2A04, 0x54);
bus_write_1(&b, 0x2A05, 0x55);
bus_write_1(&b, 0x14, 0x04);
bus_write_1(&b, 0x15, 0x2A);
ATF_REQUIRE(rom_start(&e, "test_emulation_ora_izpy.rom", tc));