diff --git a/emulator b/emulator index bf0dc74..43cf2f0 100755 Binary files a/emulator and b/emulator differ diff --git a/emulator.c b/emulator.c index cfff66b..1f3b451 100644 --- a/emulator.c +++ b/emulator.c @@ -398,21 +398,21 @@ int main(int argc, char** argv) { switch(l_nib) { case 0x6: printf(" ∟ INC $%02X, X\n", one); - uint8_t addr = one + cpu.X; - memory[addr]++; + uint8_t u8_addr = one + cpu.X; + memory[u8_addr]++; - set_flag(N, memory[addr] & 0x80 != 0); - set_flag(Z, memory[addr] == 0); + set_flag(N, memory[u8_addr] & 0x80 != 0); + set_flag(Z, memory[u8_addr] == 0); cpu.PC++; break; case 0xE: printf(" ∟ INC $%04X, X\n", word); - uint16_t addr = word + cpu.X; - memory[addr]++; + uint16_t u16_addr = word + cpu.X; + memory[u16_addr]++; - set_flag(N, memory[addr] & 0x80 != 0); - set_flag(Z, cpu.Y == 0); + set_flag(N, memory[u16_addr] & 0x80 != 0); + set_flag(Z, memory[u16_addr] == 0); cpu.PC += 2; break; diff --git a/hello.o b/hello.o index aab3117..d13f283 100644 Binary files a/hello.o and b/hello.o differ diff --git a/implemented.txt b/implemented.txt index 194e95b..d704d1d 100644 --- a/implemented.txt +++ b/implemented.txt @@ -1,23 +1,23 @@ ==== LDA (completed) ==== LDA # -- LDA $ (Z) +LDA $ (Z) LDA $ (A) LDA $, X (Z) LDA $, X (A) LDA $, Y (A) -- LDA ($, X) +LDA ($, X) LDA ($), Y ==== LDX (completed) ==== -- LDX # -- LDX $ (Z) +LDX # +LDX $ (Z) LDX $ (A) LDX $, Y (Z) LDX $, Y (A) ==== LDY (completed) ==== -- LDY # -- LDY $ (Z) +LDY # +LDY $ (Z) LDY $ (A) LDY $, X (Z) LDY $, X (A)